Issue #3070721 by DanielVeza, ranjith_kumar_k_u, justcaldwell, anmolgoyal74,... (6ec16df9) · Commits · project / drupal

core/modules/menu_ui/src/MenuListBuilder.php

+16 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,22 @@
		*/
		class MenuListBuilder extends ConfigEntityListBuilder {

		/**
		* {@inheritdoc}
		*/
		protected function getEntityIds() {
		$query = $this
		->getStorage()
		->getQuery()
		->sort('label', 'ASC');

		// Only add the pager if a limit is specified.
		if ($this->limit) {
		$query->pager($this->limit);
		}
		return $query->execute();
		}

		/**
		* {@inheritdoc}
		*/

core/modules/menu_ui/tests/src/Functional/MenuUiTest.php

+42 −0

Original line number	Diff line number	Diff line
		@@ -177,6 +177,48 @@ public function testMenuAdministration() {
		$instance = $menu_link_manager->createInstance($instance->getPluginId());
		$this->assertEquals($edit['weight'], $instance->getWeight(), 'Saving an existing link updates the weight.');
		$this->resetMenuLink($instance, $old_weight);

		// Tests the menus are listed alphabetically
		// Delete all existing menus.
		$existing = Menu::loadMultiple();
		foreach ($existing as $existingMenu) {
		$existingMenu->delete();
		}

		// Test alphabetical order without pager.
		$menus = [];
		for ($i = 1; $i < 6; $i++) {
		$menus[] = strtolower($this->getRandomGenerator()->name());
		}
		sort($menus);
		foreach ($menus as $menu) {
		Menu::create(['id' => $menu, 'label' => $menu])->save();
		}
		$this->drupalGet('/admin/structure/menu');
		$base_path = parse_url($this->baseUrl, PHP_URL_PATH) ?? '';
		$first_link = $this->assertSession()->elementExists('css', 'tbody tr:nth-of-type(1) a');
		$last_link = $this->assertSession()->elementExists('css', 'tbody tr:nth-of-type(5) a');
		$this->assertEquals($first_link->getAttribute('href'), sprintf('%s/admin/structure/menu/manage/%s', $base_path, $menus[0]));
		$this->assertEquals($last_link->getAttribute('href'), sprintf('%s/admin/structure/menu/manage/%s', $base_path, $menus[4]));
		// Test alphabetical order with pager.
		$new_menus = [];
		for ($i = 1; $i < 61; $i++) {
		$new_menus[] = strtolower($this->getRandomGenerator()->name());
		}
		foreach ($new_menus as $menu) {
		Menu::create(['id' => $menu, 'label' => $menu])->save();
		}
		$menus = array_merge($menus, $new_menus);
		sort($menus);
		$this->drupalGet('/admin/structure/menu', [
		'query' => [
		'page' => 1,
		],
		]);
		$first_link = $this->assertSession()->elementExists('css', 'tbody tr:nth-of-type(1) a');
		$last_link = $this->assertSession()->elementExists('css', 'tbody tr:nth-of-type(15) a');
		$this->assertEquals($first_link->getAttribute('href'), sprintf('%s/admin/structure/menu/manage/%s', $base_path, $menus[50]));
		$this->assertEquals($last_link->getAttribute('href'), sprintf('%s/admin/structure/menu/manage/%s', $base_path, $menus[64]));
		}

		/**