Another WIP

Author: ismailsunni

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

@@ -19,7 +19,11 @@ const swisssearchParamConfig = new UrlParamConfig<string>({
             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

@@ -26,7 +26,9 @@ const swisssearchAutoSelectParam = new UrlParamConfig<boolean>({
     },
     afterSetValuesInStore: () => {
         console.log('[swisssearchAutoSelectParam] afterSetValuesInStore swisssearchAutoSelectParam')
-        removeQueryParamFromHref(URL_PARAM_NAME)
+        // 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,

packages/viewer/tests/cypress/support/commands.ts

@@ -209,6 +209,7 @@ function goToView(view: 'embed' | 'map', options?: GoToViewOptions): void {
             routerView += '-embed'
         }
     }
+    console.log(`[GoToMapView] Visiting /${withHash ? `#/${routerView}` : ''}${flattenedQueryParams}`)
     cy.visit(`/${withHash ? `#/${routerView}` : ''}${flattenedQueryParams}`, {
         onBeforeLoad: (win) => {
             // initializing the spy every time the app is loaded

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

@@ -582,32 +582,32 @@ describe('Test the search bar result handling', () => {
             expect(searchStore4.query).to.eq('1530 Payerne')
         })
         cy.url().should('not.contain', 'swisssearch')
-        // cy.url().should('not.contain', 'swisssearch_autoselect')
-        // const acceptableDelta = 0.25
-
-        // cy.getPinia().then((pinia) => {
-        //     const mapStore8 = useMapStore(pinia)
-        //     const feature = mapStore8.pinnedLocation
-        //     assertDefined(feature)
-        //     expect(feature).to.be.a('array').that.is.not.empty
-        //     expect(feature.length).to.greaterThan(1)
-        //     expect(feature[0]).to.be.approximately(coordinates[0]!, acceptableDelta)
-        //     expect(feature[1]).to.be.approximately(coordinates[1]!, acceptableDelta)
-        // })
-
-        // // ----------------------------------------------------------------------
-        // cy.log('Ensuring the search dialog closes once you have selected an item')
-        // cy.get('[data-cy="search-results-locations"] [data-cy="search-result-entry"]')
-        //     .as('locationSearchResults')
-        //     .first()
-        //     .invoke('text')
-        //     .then((text) => text.trim())
-        //     .should('contains', '1530 Payerne')
-
-        // cy.log('Clicking the result, will hide the dropdown of the search result')
-        // cy.get('@locationSearchResults').should('be.visible')
-        // cy.get('@locationSearchResults').first().click()
-        // cy.get('@locationSearchResults').should('not.be.visible')
+        cy.url().should('not.contain', 'swisssearch_autoselect')
+        const acceptableDelta = 0.25
+
+        cy.getPinia().then((pinia) => {
+            const mapStore8 = useMapStore(pinia)
+            const feature = mapStore8.pinnedLocation
+            assertDefined(feature)
+            expect(feature).to.be.a('array').that.is.not.empty
+            expect(feature.length).to.greaterThan(1)
+            expect(feature[0]).to.be.approximately(coordinates[0]!, acceptableDelta)
+            expect(feature[1]).to.be.approximately(coordinates[1]!, acceptableDelta)
+        })
+
+        // ----------------------------------------------------------------------
+        cy.log('Ensuring the search dialog closes once you have selected an item')
+        cy.get('[data-cy="search-results-locations"] [data-cy="search-result-entry"]')
+            .as('locationSearchResults')
+            .first()
+            .invoke('text')
+            .then((text) => text.trim())
+            .should('contains', '1530 Payerne')
+
+        cy.log('Clicking the result, will hide the dropdown of the search result')
+        cy.get('@locationSearchResults').should('be.visible')
+        cy.get('@locationSearchResults').first().click()
+        cy.get('@locationSearchResults').should('not.be.visible')
     })
 
     it('handle swisssearch and crosshair together correctly', () => {