instant search: unset page param with new query or filter (#4707)

mozilla/sumo#794
mozilla · Mar 11, 2021 · f93fc09 · f93fc09
1 parent 36865f0
commit f93fc09
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/kitsune/sumo/static/sumo/js/instant_search.es6 b/kitsune/sumo/static/sumo/js/instant_search.es6
@@ -175,6 +175,7 @@
         if (search.hasLastQuery) {
           trackEvent('Instant Search', 'Exit Search', search.lastQueryUrl());
         }
+        search.unsetParam("page");
         search.setParams(params);
         let query = $this.val();
         queries.push(query);

diff --git a/kitsune/sumo/static/sumo/tpl/search-results-list.html b/kitsune/sumo/static/sumo/tpl/search-results-list.html
@@ -20,17 +20,17 @@ <h2 class="sumo-card-heading search-results-heading mb-0">
 <nav class="tabs">
   <ul id="doctype-filter" class="tabs--list search-filter cf">
     <li class="tabs--item">
-      <a {{ w|class_selected(3) }} href="#" data-instant-search-set-params="w=3" data-instant-search="link">
+      <a {{ w|class_selected(3) }} href="#" data-instant-search-set-params="w=3" data-instant-search-unset-params="page" data-instant-search="link">
         <span>{{ _('View All') }}</span>
       </a>
     </li>
     <li class="tabs--item">
-      <a {{ w|class_selected(1) }} href="#" data-instant-search-set-params="w=1" data-instant-search="link">
+      <a {{ w|class_selected(1) }} href="#" data-instant-search-set-params="w=1" data-instant-search-unset-params="page" data-instant-search="link">
         <span>{{ _('Help Articles Only') }}</span>
       </a>
     </li>
     <li class="tabs--item">
-      <a {{ w|class_selected(2) }} href="#" data-instant-search-set-params="w=2" data-instant-search="link">
+      <a {{ w|class_selected(2) }} href="#" data-instant-search-set-params="w=2" data-instant-search-unset-params="page" data-instant-search="link">
         <span>{{ _('Community Discussion Only') }}</span>
       </a>
     </li>

diff --git a/kitsune/sumo/static/sumo/tpl/search-results.html b/kitsune/sumo/static/sumo/tpl/search-results.html
@@ -8,13 +8,13 @@ <h3 class="sidebar-subheading">{{ _('Filter by product') }}</h3>
       <a class="details-heading">Menu Title</a>
       <ul id="product-filter" class="search-filter sidebar-nav--list">
         <li {{ product|class_selected(null) }}>
-          <a href="#" data-instant-search-unset-params="product" data-instant-search-set-params="all_products=1" data-instant-search="link">
+          <a href="#" data-instant-search-unset-params="product&page" data-instant-search-set-params="all_products=1" data-instant-search="link">
             {{ _('All Products') }}
           </a>
         </li>
         {% for p in products %}
           <li {{ product|class_selected(p.slug) }}>
-            <a href="#" data-instant-search-set-params="product={{ p.slug }}" data-instant-search-unset-params="all_products" data-instant-search="link">
+            <a href="#" data-instant-search-set-params="product={{ p.slug }}" data-instant-search-unset-params="all_products&page" data-instant-search="link">
               {{ p.title }}
             </a>
           </li>