Keep select param on navigation and toggles

app/composables/useCatalogSearch.ts

@@ -308,17 +308,13 @@ export function useCatalogSearch() {
   })
   const lastViewMode = useState<MapViewMode>('catalog-last-view-mode', () => 'offers')
   const setMapViewMode = (mode: MapViewMode) => {
-    if (selectMode.value) {
-      const newSelectMode: SelectMode = mode === 'hubs' ? 'hub'
-        : mode === 'suppliers' ? 'supplier'
-        : 'product'
-      updateQuery({
-        view: mode === 'offers' ? null : mode,
-        select: newSelectMode
-      })
-      return
-    }
-    updateQuery({ view: mode === 'offers' ? null : mode })
+    const newSelectMode: SelectMode = mode === 'hubs' ? 'hub'
+      : mode === 'suppliers' ? 'supplier'
+      : 'product'
+    updateQuery({
+      view: mode === 'offers' ? null : mode,
+      select: newSelectMode
+    })
   }
 
   // Drawer state for list view
@@ -368,10 +364,14 @@ export function useCatalogSearch() {
   })
 
   const setCatalogMode = (newMode: CatalogMode) => {
+    const defaultSelect: SelectMode = selectMode.value
+      || (mapViewMode.value === 'hubs' ? 'hub'
+        : mapViewMode.value === 'suppliers' ? 'supplier'
+        : 'product')
     if (newMode === 'explore') {
-      updateQuery({ mode: newMode, qty: null })
+      updateQuery({ mode: newMode, qty: null, select: defaultSelect })
     } else {
-      updateQuery({ mode: newMode })
+      updateQuery({ mode: newMode, select: defaultSelect })
     }
   }