PB-1895: bug corrections and test fixing

PB-1895: resolve issue with tests failing

- Issue: The updateLayers mutation was not present in the watched mutations.
for some reason, it worked fine outside of the test environments, but the test
environment was not pleased at all

- Fix : We added the mutation watcher where it belongs :)

Author: ltkum

packages/mapviewer/src/modules/infobox/components/styling/FeatureStyleEdit.vue

@@ -258,8 +258,8 @@ function mediaTypes() {
                         {{ t('modify_description') }}
                     </label>
                     <GeoadminTooltip
-                        :tooltip-content="t('display_on_map')"
                         v-if="isFeatureMarker || isFeatureText"
+                        :tooltip-content="t('display_on_map')"
                     >
                         <button
                             class="btn btn-sm btn-light d-flex align-items-center mb-2"

packages/mapviewer/src/router/storeSync/LayerParamConfig.class.js

@@ -320,6 +320,7 @@ export default class LayerParamConfig extends AbstractParamConfig {
                 'setSelectedFeatures',
                 'addSelectedFeatures',
                 'updateLayer',
+                'updateLayers',
             ],
             setValuesInStore: dispatchLayersFromUrlIntoStore,
             extractValueFromStore: generateLayerUrlParamFromStoreValues,

packages/mapviewer/src/store/modules/ui.store.js

@@ -322,6 +322,13 @@ export default {
         getFirstWarning(state) {
             return Array.from(state.warnings).find((warning) => !warning.isAcknowledged)
         },
+        getNumberOfNonAcknowledgedErrors(state) {
+            return Array.from(state.errors).filter((error) => !error.isAcknowledged).length
+        },
+
+        getNumberOfNonAcknowledgedWarnings(state) {
+            return Array.from(state.warnings).filter((warning) => !warning.isAcknowledged).length
+        },
     },
     actions: {
         setSize({ commit, state }, { width, height, dispatcher }) {

packages/mapviewer/src/store/plugins/load-kml-kmz-data.plugin.js

@@ -40,20 +40,7 @@ async function loadMetadata(store, kmlLayer) {
                 ...dispatcher,
             })
         }
-        // if admin id dispatch open drawing
     } catch (error) {
-        // ajouter error message here
-        if (kmlLayer?.adminId) {
-            //kmlLayer.adminId = null
-            kmlLayer.addErrorMessage(
-                new ErrorMessage({
-                    msg: 'BONJOUR EDITEUR',
-                    params: { layerName: kmlLayer.name ?? kmlLayer.id },
-                    sourceId: kmlLayer.id,
-                })
-            )
-        }
-        // TODO set admin Id to null
         log.error(`Error while fetching KML metadata for layer ${kmlLayer?.id}`, error)
     }
 }
@@ -174,7 +161,7 @@ async function loadData(store, kmlLayer) {
             error: errorMessage,
             ...dispatcher,
         })
-        store.dispatch('addErrors', [errorMessage], dispatcher)
+        store.dispatch('addErrors', { errors: [errorMessage], dispatcher })
     }
 }
 

packages/mapviewer/src/utils/components/ErrorWindow.vue

@@ -23,7 +23,7 @@ const store = useStore()
 const showBody = ref(true)
 const hasDevSiteWarning = computed(() => store.getters.hasDevSiteWarning)
 
-const errorCount = computed(() => store.state.ui.errors.size)
+const errorCount = computed(() => store.getters.getNumberOfNonAcknowledgedErrors)
 
 const { t } = useI18n()
 
@@ -33,7 +33,7 @@ const emit = defineEmits(['close'])
 <template>
     <div
         v-show="!hide"
-        class="simple-window card bg-danger text-white fw-bold"
+        class="simple-window card bg-danger fw-bold text-white"
         :class="{ 'dev-disclaimer-present': hasDevSiteWarning }"
         data-cy="error-window"
     >
@@ -43,7 +43,7 @@ const emit = defineEmits(['close'])
         >
             <span
                 v-if="title"
-                class="me-auto text-truncate"
+                class="text-truncate me-auto"
             >
                 {{ t(title) }}
                 <span v-if="errorCount > 1">({{ errorCount }})</span>

packages/mapviewer/src/utils/components/FeedbackPopup.vue

@@ -25,7 +25,7 @@ const warning = computed(() => store.getters.getFirstWarning)
         <WarningWindow
             v-if="warning"
             title="warning"
-            @close="store.dispatch('acknowledgedWarning', { warning, ...dispatcher })"
+            @close="store.dispatch('acknowledgeWarning', { warning, ...dispatcher })"
         >
             <div>{{ t(warning.msg, warning.params) }}</div>
         </WarningWindow>

packages/mapviewer/src/utils/components/WarningWindow.vue

@@ -23,7 +23,7 @@ const store = useStore()
 const showBody = ref(true)
 const hasDevSiteWarning = computed(() => store.getters.hasDevSiteWarning)
 
-const warningCount = computed(() => store.state.ui.warnings.size)
+const warningCount = computed(() => store.getters.getNumberOfNonAcknowledgedWarnings)
 
 const { t } = useI18n()
 
@@ -43,7 +43,7 @@ const emit = defineEmits(['close'])
         >
             <span
                 v-if="title"
-                class="me-auto text-truncate"
+                class="text-truncate me-auto"
             >
                 {{ t(title) }}
                 <span v-if="warningCount > 1">({{ warningCount }})</span>

packages/mapviewer/tests/cypress/tests-e2e/geolocation.cy.js

@@ -140,12 +140,12 @@ describe('Geolocation cypress', () => {
                 // null island
                 cy.goToMapView({}, true, { latitude: 0, longitude: 0 })
                 getGeolocationButtonAndClickIt()
-                testErrorMessage('geoloc_out_of_bounds')
+                testErrorMessage('geoloc_out_of_bounds', true)
 
                 // Java island
                 cy.goToMapView({}, true, { latitude: -7.71, longitude: 110.37 })
                 getGeolocationButtonAndClickIt()
-                testErrorMessage('geoloc_out_of_bounds')
+                testErrorMessage('geoloc_out_of_bounds', false)
             })
         }
     )

packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.js

@@ -122,7 +122,7 @@ describe('Test on legacy param import', () => {
         const kmlServiceFilePath = `${kmlServiceBasePath}/files/${kmlId}`
         beforeEach(() => {
             // serving a dummy KML so that we don't get a 404
-            cy.intercept(`**${kmlServiceFilePath}`, '<kml />').as('get-kml')
+            cy.intercept(`**${kmlServiceFilePath}`, '<kml></kml>').as('get-kml')
             cy.intercept(`**${kmlServiceAdminPath}?admin_id=${adminId}`, (request) => {
                 request.reply({
                     id: kmlId,

packages/mapviewer/tests/cypress/tests-e2e/utils.js

@@ -14,7 +14,7 @@ export function getGeolocationButtonAndClickIt() {
     cy.get(geolocationButtonSelector).should('be.visible').click()
 }
 
-export function testErrorMessage(message) {
+export function testErrorMessage(message, shouldErrorMessageBeShown = true) {
     const geolocationButtonSelector = '[data-cy="geolocation-button"]'
     // move the mouse away from the button because the tooltip covers the
     // error message
@@ -28,10 +28,14 @@ export function testErrorMessage(message) {
 
         const error = errors.values().next().value
         expect(error.msg).to.eq(message)
+        // When we are checking an acknowledged error, it should not appear in the UI (and won't be added to the set)
+        expect(error.isAcknowledged).to.eq(!shouldErrorMessageBeShown)
     })
     // Check error in UI
-    cy.get('[data-cy="error-window"]').should('be.visible')
-    cy.get('[data-cy="error-window-close"]').should('be.visible').click() // close the error window
+    if (shouldErrorMessageBeShown) {
+        cy.get('[data-cy="error-window"]').should('be.visible')
+        cy.get('[data-cy="error-window-close"]').should('be.visible').click() // close the error window
+    }
 }
 
 export function checkStorePosition(storeString, x, y) {