Issue #5955: Clear URL query when using reset button on modules and p…

…ermissions pages. By @yorkshire-pudding, @klonos, @argiepiano, and @quicksketch.
backdrop · Sep 13, 2023 · 3ff93ba · 3ff93ba · backdrop-ci · Sep 13, 2023
1 parent 8fe9313
commit 3ff93ba
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/core/modules/system/js/modules.js b/core/modules/system/js/modules.js
@@ -90,10 +90,17 @@ Backdrop.behaviors.moduleFilter = {
       }
     }
 
-    // Clear out the input field when clicking the reset button.
+    // Clear out the input field and search query when clicking the reset
+    // button.
     function resetModuleList(e) {
+      // Clear the input field.
       $input.val('').triggerHandler('keyup');
       e.preventDefault();
+
+      // Clear the search query.
+      var currentUrl = new URL(window.location);
+      currentUrl.searchParams.delete('search');
+      window.history.replaceState({}, '', currentUrl);
     }
 
     if ($form.length) {

diff --git a/core/modules/user/js/user.permissions.js b/core/modules/user/js/user.permissions.js
@@ -47,10 +47,17 @@ Backdrop.behaviors.permissionsFilter = {
       }
     }
 
-    // Clear out the input field when clicking the reset button.
+    // Clear out the input field and search query when clicking the reset
+    // button.
     function resetPermissionsList(e) {
+      // Clear the input field.
       $input.val('').triggerHandler('keyup');
       e.preventDefault();
+
+      // Clear the search query.
+      var currentUrl = new URL(window.location);
+      currentUrl.searchParams.delete('search');
+      window.history.replaceState({}, '', currentUrl);
     }
 
     if ($form.length) {