Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Issue #3272629 by kelly.m.jacobs, alexpott, Abhijith S, imclean, heni_deepak, azinck: Media Library widget display doesn't return to first page on applying filters" 

This reverts commit 09af975434.
merge-requests/7888/head
Dave Long 2024-05-01 21:22:32 +01:00
parent a708e542dd
commit a2f2ac96ed
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/media_library/media_library.module
View File

@ -214,8 +214,6 @@ function media_library_views_post_render(ViewExecutable $view, &$output, CachePl
$ajax_path = &$output['#attached']['drupalSettings']['views']['ajax_path'];
$parsed_url = UrlHelper::parse($ajax_path);
$query = array_merge($query, $parsed_url['query']);
// Reset the pager so that the user starts on the first page.
unset($query['page']);
$ajax_path = $parsed_url['path'] . '?' . UrlHelper::buildQuery($query);
}
}

21
core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php
View File

@ -116,25 +116,7 @@ class WidgetViewsTest extends MediaLibraryTestBase {
$assert_session->pageTextContains('Bear');
$assert_session->pageTextNotContains('Turtle');
// Assert the exposed filters can be applied and page is reset from second
// page.
$page->clickLink('Next page');
$this->waitForElementTextContains('.js-media-library-view .js-pager__items > li:nth-of-type(2)', 'Page 2');
$page->fillField('Name', 'Bear');
$page->pressButton('Apply filters');
$assert_session->assertWaitOnAjaxRequest();
$assert_session->pageTextNotContains('Dog');
$assert_session->pageTextContains('Bear');
$assert_session->pageTextNotContains('Turtle');
// Test clearing the filters.
$page->fillField('Name', '');
$page->pressButton('Apply filters');
$assert_session->waitForLink('Next page');
$page->clickLink('Next page');
$this->waitForElementTextContains('.js-media-library-view .js-pager__items > li:nth-of-type(2)', 'Page 2');
// Assert the exposed filters are persisted when changing display.
// Assert the exposed filters can be applied.
$page->fillField('Name', 'Dog');
$page->pressButton('Apply filters');
$assert_session->assertWaitOnAjaxRequest();
@ -145,6 +127,7 @@ class WidgetViewsTest extends MediaLibraryTestBase {
$assert_session->linkExists('Table');
$this->switchToMediaLibraryGrid();
// Assert the exposed filters are persisted when changing display.
$this->assertSame('Dog', $page->findField('Name')->getValue());
$assert_session->pageTextContains('Dog');
$assert_session->pageTextNotContains('Crocodile');