WIP

Author: ismailsunni

packages/viewer/src/store/plugins/storeSync/params/swisssearch.param.ts

@@ -12,13 +12,18 @@ const swisssearchParamConfig = new UrlParamConfig<string>({
     urlParamName: URL_PARAM_NAME_SWISSSEARCH,
     // no mutation to watch, we only react to this param if it is there at app start-up
     actionsToWatch: [],
-    extractValueFromStore: () => useSearchStore().query,
+    // Always return default value so this param never gets re-added to URL by storeToUrl plugin
+    extractValueFromStore: () => '',
     setValuesInStore: (_: RouteLocationNormalizedGeneric, urlParamValue?: string) => {
         if (urlParamValue) {
             useSearchStore().setSearchQuery(urlParamValue, STORE_DISPATCHER_ROUTER_PLUGIN)
         }
     },
-    afterSetValuesInStore: () => removeQueryParamFromHref(URL_PARAM_NAME_SWISSSEARCH),
+    afterSetValuesInStore: () => {
+        // Defer removal to next event loop tick to ensure all URL params are processed
+        // and router state is stable before manually modifying the URL
+        setTimeout(() => removeQueryParamFromHref(URL_PARAM_NAME_SWISSSEARCH), 0)
+    },
     keepInUrlWhenDefault: false,
     valueType: String,
     defaultValue: '',

packages/viewer/src/store/plugins/storeSync/params/swisssearchAutoSelect.param.ts

@@ -13,6 +13,7 @@ const swisssearchAutoSelectParam = new UrlParamConfig<boolean>({
     urlParamName: URL_PARAM_NAME,
     actionsToWatch: ['setAutoSelect'],
     setValuesInStore: (to: RouteLocationNormalizedGeneric, urlParamValue?: boolean) => {
+        console.log('[swisssearchAutoSelectParam] setValuesInStore swisssearchAutoSelectParam', urlParamValue)
         const searchStore = useSearchStore()
         // avoiding setting the swisssearch autoselect to the store when there is nothing to autoselect because there is no swisssearch query
         if (typeof urlParamValue === 'boolean') {
@@ -23,8 +24,14 @@ const swisssearchAutoSelectParam = new UrlParamConfig<boolean>({
             searchStore.setAutoSelect(false, STORE_DISPATCHER_ROUTER_PLUGIN)
         }
     },
-    afterSetValuesInStore: () => removeQueryParamFromHref(URL_PARAM_NAME),
-    extractValueFromStore: () => useSearchStore().autoSelect,
+    afterSetValuesInStore: () => {
+        console.log('[swisssearchAutoSelectParam] afterSetValuesInStore swisssearchAutoSelectParam')
+        // Defer removal to next event loop tick to ensure all URL params are processed
+        // and router state is stable before manually modifying the URL
+        setTimeout(() => removeQueryParamFromHref(URL_PARAM_NAME), 0)
+    },
+    // Always return default value so this param never gets re-added to URL by storeToUrl plugin
+    extractValueFromStore: () => false,
     keepInUrlWhenDefault: false,
     valueType: Boolean,
     defaultValue: false,

packages/viewer/src/utils/searchParamUtils.ts

@@ -7,6 +7,9 @@
  */
 export function removeQueryParamFromHref(key: string): void {
     const [baseUrl, queryString] = window.location.href.split('?')
+    console.log('[removeQueryParamFromHref] baseUrl', baseUrl)
+    console.log('[removeQueryParamFromHref] queryString', queryString)
+
     if (!queryString) {
         return
     }
@@ -16,8 +19,11 @@ export function removeQueryParamFromHref(key: string): void {
         return
     }
     params.delete(key)
+    console.log('[removeQueryParamFromHref] replaced key', key)
 
     const newQueryString = params.toString()
+    console.log('[removeQueryParamFromHref] newQueryString', newQueryString)
     const newUrl = newQueryString ? `${baseUrl}?${newQueryString}` : baseUrl
+    console.log('[removeQueryParamFromHref] newUrl', newUrl)
     window.history.replaceState({}, document.title, newUrl)
 }

packages/viewer/tests/cypress/tests-e2e/search/search-results.cy.ts

@@ -527,7 +527,7 @@ describe('Test the search bar result handling', () => {
         })
         cy.get('@locationSearchResults').should('not.exist')
     })
-    it('autoselects the first swisssearch result when swisssearch_autoselect is true', () => {
+    it.only('autoselects the first swisssearch result when swisssearch_autoselect is true', () => {
         cy.intercept('**/rest/services/ech/SearchServer*?type=layers*', {
             body: { results: [] },
         }).as('search-layers')