Merge pull request #1108 from geoadmin/bug-PB-1116-drawing-name-fix

src/api/layers/KMLLayer.class.js

@@ -81,6 +81,12 @@ export default class KMLLayer extends AbstractLayer {
         this.kmlMetadata = kmlMetadata
         if (kmlData) {
             this.name = parseKmlName(kmlData)
+            if (!this.name || this.name === '') {
+                this.name = isLocalFile
+                    ? kmlFileUrl
+                    : // only keeping what is after the last slash
+                      kmlFileUrl.split('/').pop()
+            }
             this.isLoading = false
         } else {
             this.isLoading = true

src/modules/drawing/DrawingModule.vue

@@ -2,6 +2,7 @@
 import VectorLayer from 'ol/layer/Vector'
 import VectorSource from 'ol/source/Vector'
 import { computed, inject, onBeforeUnmount, onMounted, provide, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
 import { useStore } from 'vuex'
 
 import { IS_TESTING_WITH_CYPRESS } from '@/config/staging.config'
@@ -22,6 +23,7 @@ const olMap = inject('olMap')
 const drawingInteractions = ref(null)
 const isNewDrawing = ref(true)
 
+const i18n = useI18n()
 const store = useStore()
 const availableIconSets = computed(() => store.state.drawing.iconSets)
 const projection = computed(() => store.state.position.projection)
@@ -130,6 +132,11 @@ onMounted(() => {
     if (hasKml.value) {
         isNewDrawing.value = false
         addKmlToDrawing()
+    } else {
+        store.dispatch('setDrawingName', {
+            name: i18n.t('draw_layer_label'),
+            ...dispatcher,
+        })
     }
     olMap.addLayer(drawingLayer)
 

src/modules/drawing/components/DrawingToolbox.vue

@@ -7,14 +7,14 @@ import { useStore } from 'vuex'
 
 import { EditableFeatureTypes } from '@/api/features/EditableFeature.class'
 import DrawingExporter from '@/modules/drawing/components/DrawingExporter.vue'
+import DrawingHeader from '@/modules/drawing/components/DrawingHeader.vue'
 import DrawingToolboxButton from '@/modules/drawing/components/DrawingToolboxButton.vue'
 import SharePopup from '@/modules/drawing/components/SharePopup.vue'
 import { DrawingState } from '@/modules/drawing/lib/export-utils'
 import useSaveKmlOnChange from '@/modules/drawing/useKmlDataManagement.composable'
 import ModalWithBackdrop from '@/utils/components/ModalWithBackdrop.vue'
-import { useTippyTooltip } from '@/utils/composables/useTippyTooltip.js'
-
-import DrawingHeader from './DrawingHeader.vue'
+import { useTippyTooltip } from '@/utils/composables/useTippyTooltip'
+import debounce from '@/utils/debounce'
 
 const dispatcher = { dispatcher: 'DrawingToolbox.vue' }
 
@@ -39,7 +39,10 @@ const isDrawingLineOrMeasure = computed(() =>
     )
 )
 const activeKmlLayer = computed(() => store.getters.activeKmlLayer)
-const drawingName = ref(activeKmlLayer.value?.name || i18n.t('draw_layer_label'))
+const drawingName = computed({
+    get: () => store.state.drawing.name,
+    set: (value) => debounceSaveDrawingName(value),
+})
 const isDrawingStateError = computed(() => saveState.value < 0)
 /** Return a different translation key depending on the saving status */
 const drawingStateMessage = computed(() => {
@@ -64,7 +67,7 @@ function onCloseClearConfirmation(confirmed) {
         store.dispatch('clearDrawingFeatures', dispatcher)
         store.dispatch('clearAllSelectedFeatures', dispatcher)
         drawingLayer.getSource().clear()
-        debounceSaveDrawing({ drawingName: drawingName.value })
+        debounceSaveDrawing()
         store.dispatch('setDrawingMode', { mode: null, ...dispatcher })
     }
 }
@@ -78,40 +81,35 @@ onMounted(() => {
     }
 })
 
-watch(drawingName, () => {
-    sanitizeDrawingName()
-    debounceSaveDrawing({
-        // Lowering the risk of the user changing the name and leaving the drawing module without the name being saved.
-        // It is terrible design that this can occur, but moving the drawing name management other places raises the complexity tenfold
-        // so that is a trade-off we can live with.
-        debounceTime: 500,
-        drawingName: drawingName.value.trim(),
-    })
-})
-
 watch(activeKmlLayer, () => {
     if (activeKmlLayer.value) {
         // no need for the message telling the user the drawing is empty, and he can't edit the drawing name
         removeNoActiveKmlWarning()
     }
 })
 
-function sanitizeDrawingName() {
-    drawingName.value = DOMPurify.sanitize(drawingName.value, {
-        USE_PROFILES: { xml: true },
-    })
-}
-
 function closeDrawing() {
     emits('closeDrawing')
 }
+
 function selectDrawingMode(drawingMode) {
     store.dispatch('setDrawingMode', { mode: drawingMode, ...dispatcher })
 }
 
 function onDeleteLastPoint() {
     emits('removeLastPoint')
 }
+
+const debounceSaveDrawingName = debounce(async (newName) => {
+    await store.dispatch('setDrawingName', {
+        // sanitizing to avoid any XSS vector
+        name: DOMPurify.sanitize(newName, {
+            USE_PROFILES: { xml: true },
+        }).trim(),
+        ...dispatcher,
+    })
+    debounceSaveDrawing()
+}, 200)
 </script>
 
 <template>

src/modules/drawing/useKmlDataManagement.composable.js

@@ -1,4 +1,5 @@
 import { computed, inject, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
 import { useStore } from 'vuex'
 
 import { createKml, getKmlUrl, updateKml } from '@/api/files.api'
@@ -17,6 +18,7 @@ const saveState = ref(DrawingState.INITIAL)
 export default function useSaveKmlOnChange(drawingLayerDirectReference) {
     const drawingLayer = inject('drawingLayer', drawingLayerDirectReference)
 
+    const i18n = useI18n()
     const store = useStore()
     const online = computed(() => store.state.drawing.online)
     const projection = computed(() => store.state.position.projection)
@@ -26,6 +28,9 @@ export default function useSaveKmlOnChange(drawingLayerDirectReference) {
     const temporaryKml = computed(() =>
         store.state.layers.systemLayers.find((l) => l.id === temporaryKmlId.value)
     )
+    const drawingName = computed(
+        () => store.state.drawing.name ?? activeKmlLayer.value?.name ?? i18n.t('draw_layer_label')
+    )
 
     let addKmlLayerTimeout = null
     const savesInProgress = ref([])
@@ -46,6 +51,10 @@ export default function useSaveKmlOnChange(drawingLayerDirectReference) {
             const features = parseKml(availableKmlLayer, projection.value, availableIconSets.value)
             log.debug('Add features to drawing layer', features, drawingLayer)
             drawingLayer.getSource().addFeatures(features)
+            store.dispatch('setDrawingName', {
+                name: availableKmlLayer.name,
+                ...dispatcher,
+            })
             store.dispatch('setDrawingFeatures', {
                 featureIds: features.map((feature) => feature.getId()),
                 ...dispatcher,
@@ -75,7 +84,7 @@ export default function useSaveKmlOnChange(drawingLayerDirectReference) {
         }
     }
 
-    async function saveDrawing({ retryOnError = true, drawingName = null }) {
+    async function saveDrawing({ retryOnError = true }) {
         try {
             log.debug(
                 `Save drawing retryOnError ${retryOnError}, differSaveDrawing=${differSaveDrawingTimeout}`
@@ -85,35 +94,34 @@ export default function useSaveKmlOnChange(drawingLayerDirectReference) {
             const kmlData = generateKmlString(
                 projection.value,
                 drawingLayer.getSource().getFeatures(),
-                drawingName ?? activeKmlLayer.value?.name
+                drawingName.value
             )
             if (online.value) {
-                await saveOnlineDrawing(kmlData, drawingName)
+                await saveOnlineDrawing(kmlData)
             } else {
-                await saveLocalDrawing(kmlData, drawingName)
+                await saveLocalDrawing(kmlData)
             }
             saveState.value = DrawingState.SAVED
         } catch (e) {
             log.error('Could not save KML layer: ', e)
             saveState.value = DrawingState.SAVE_ERROR
             if (!IS_TESTING_WITH_CYPRESS && retryOnError) {
                 // Retry saving in 5 seconds
-                debounceSaveDrawing({ debounceTime: 5000, retryOnError: false, drawingName })
+                debounceSaveDrawing({ debounceTime: 5000, retryOnError: false })
             }
         }
     }
 
     /**
      * @param {String} kmlData
-     * @param {String} [drawingName=null] Default is `null`
      * @returns {Promise<void>}
      */
-    async function saveOnlineDrawing(kmlData, drawingName = null) {
+    async function saveOnlineDrawing(kmlData) {
         if (!activeKmlLayer.value?.adminId) {
             // creation of the new KML (copy or new)
             const kmlMetadata = await createKml(kmlData)
             const kmlLayer = new KMLLayer({
-                name: drawingName ?? activeKmlLayer.value?.name,
+                name: drawingName.value,
                 kmlFileUrl: getKmlUrl(kmlMetadata.id),
                 visible: true,
                 opacity: activeKmlLayer.value?.opacity, // re-use current KML layer opacity, or null
@@ -152,12 +160,11 @@ export default function useSaveKmlOnChange(drawingLayerDirectReference) {
 
     /**
      * @param {String} kmlData
-     * @param {String} [drawingName=null] Default is `null`
      * @returns {Promise<void>}
      */
-    async function saveLocalDrawing(kmlData, drawingName = null) {
+    async function saveLocalDrawing(kmlData) {
         const kmlLayer = new KMLLayer({
-            name: drawingName,
+            name: drawingName.value,
             kmlFileUrl: temporaryKmlId.value,
             visible: true,
             opacity: 1,
@@ -170,11 +177,7 @@ export default function useSaveKmlOnChange(drawingLayerDirectReference) {
         }
     }
 
-    async function debounceSaveDrawing({
-        debounceTime = 2000,
-        retryOnError = true,
-        drawingName = null,
-    } = {}) {
+    async function debounceSaveDrawing({ debounceTime = 2000, retryOnError = true } = {}) {
         log.debug(
             `Debouncing save drawing debounceTime=${debounceTime} differSaveDrawingTimeout=${differSaveDrawingTimeout}`
         )

src/store/modules/drawing.store.js

@@ -63,6 +63,12 @@ export default {
          * @type {String | null}
          */
         temporaryKmlId: null,
+        /**
+         * The name of the drawing, or null if no drawing is currently edited.
+         *
+         * @type {String | null}
+         */
+        name: null,
     },
     getters: {
         isDrawingEmpty(state) {
@@ -118,6 +124,9 @@ export default {
                 dispatcher,
             })
         },
+        setDrawingName({ commit }, { name, dispatcher }) {
+            commit('setDrawingName', { name, dispatcher })
+        },
     },
     mutations: {
         setDrawingMode: (state, { mode }) => (state.mode = mode),
@@ -132,5 +141,8 @@ export default {
             state.online = online
             state.temporaryKmlId = kmlId
         },
+        setDrawingName(state, { name }) {
+            state.name = name
+        },
     },
 }