From a1aa9337c8fd79f2da24899c100468030712c2ec Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Nov 2024 09:21:20 +0100
Subject: [PATCH 1/4] fix: show data and fixed search button when excluding a
 location

---
 src/components/FormPopup.vue                  | 23 ++++----
 .../Zone/Card/ZoneEventExclusionForm.vue      | 52 +++++++------------
 src/pages/Zone/Card/ZoneLocationsTree.vue     | 43 +++++----------
 3 files changed, 48 insertions(+), 70 deletions(-)

diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue
index d7f744984..893ee8393 100644
--- a/src/components/FormPopup.vue
+++ b/src/components/FormPopup.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-defineProps({
+const $props = defineProps({
     title: {
         type: String,
         default: '',
@@ -25,16 +25,21 @@ defineProps({
         type: String,
         default: '',
     },
+    submitOnEnter: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const { t } = useI18n();
-
 const closeButton = ref(null);
 const isLoading = ref(false);
 
 const onSubmit = () => {
-    emit('onSubmit');
-    closeForm();
+    if ($props.submitOnEnter) {
+        emit('onSubmit');
+        closeForm();
+    }
 };
 
 const closeForm = () => {
@@ -52,12 +57,12 @@ const closeForm = () => {
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ title }}</h1>
-            <p>{{ subtitle }}</p>
+            <h1 class="title">{{ $props.title }}</h1>
+            <p>{{ $props.subtitle }}</p>
             <slot name="form-inputs" />
             <div class="q-mt-lg row justify-end">
                 <QBtn
-                    v-if="defaultCancelButton"
+                    v-if="$props.defaultCancelButton"
                     :label="t('globals.cancel')"
                     color="primary"
                     flat
@@ -67,8 +72,8 @@ const closeForm = () => {
                     v-close-popup
                 />
                 <QBtn
-                    v-if="defaultSubmitButton"
-                    :label="customSubmitButtonLabel || t('globals.save')"
+                    v-if="$props.defaultSubmitButton"
+                    :label="$props.customSubmitButtonLabel || t('globals.save')"
                     type="submit"
                     color="primary"
                     :disabled="isLoading"
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 215c12f46..7557f95bd 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -57,34 +57,23 @@ const excludeType = computed({
 const arrayData = useArrayData('ZoneEvents');
 
 const exclusionGeoCreate = async () => {
-    try {
-        const params = {
-            zoneFk: parseInt(route.params.id),
-            date: dated.value,
-            geoIds: tickedNodes.value,
-        };
-        await axios.post('Zones/exclusionGeo', params);
-        await refetchEvents();
-    } catch (err) {
-        console.error('Error creating exclusion geo: ', err);
-    }
+    const params = {
+        zoneFk: parseInt(route.params.id),
+        date: dated.value,
+        geoIds: tickedNodes.value,
+    };
+    await axios.post('Zones/exclusionGeo', params);
+    await refetchEvents();
 };
 
 const exclusionCreate = async () => {
-    try {
-        if (isNew.value)
-            await axios.post(`Zones/${route.params.id}/exclusions`, [
-                { dated: dated.value },
-            ]);
-        else
-            await axios.post(`Zones/${route.params.id}/exclusions`, {
-                dated: dated.value,
-            });
-
-        await refetchEvents();
-    } catch (err) {
-        console.error('Error creating exclusion: ', err);
-    }
+    if (isNew.value)
+        await axios.post(`Zones/${route.params.id}/exclusions`, [{ dated: dated.value }]);
+    else
+        await axios.post(`Zones/${route.params.id}/exclusions`, {
+            dated: dated.value,
+        });
+    await refetchEvents();
 };
 
 const onSubmit = async () => {
@@ -93,13 +82,9 @@ const onSubmit = async () => {
 };
 
 const deleteEvent = async () => {
-    try {
-        if (!props.event) return;
-        await axios.delete(`Zones/${route.params.id}/exclusions`);
-        await refetchEvents();
-    } catch (err) {
-        console.error('Error deleting event: ', err);
-    }
+    if (!props.event) return;
+    await axios.delete(`Zones/${route.params.id}/exclusions`);
+    await refetchEvents();
 };
 
 const closeForm = () => emit('closeForm');
@@ -129,6 +114,7 @@ onMounted(() => {
         @on-submit="onSubmit()"
         :default-cancel-button="false"
         :default-submit-button="false"
+        :submit-on-enter="false"
     >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-lg">
@@ -136,6 +122,7 @@ onMounted(() => {
                     :label="t('eventsInclusionForm.day')"
                     v-model="dated"
                     :model-value="props.date"
+                    :required="true"
                 />
             </VnRow>
             <div class="column q-gutter-y-sm q-mb-md">
@@ -196,6 +183,7 @@ onMounted(() => {
                 :label="isNew ? t('globals.add') : t('globals.save')"
                 type="submit"
                 color="primary"
+                @click="onSubmit()"
             />
         </template>
     </FormPopup>
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 23a37ef7c..d0d4b18b8 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -38,6 +38,7 @@ const datakey = 'ZoneLocations';
 const url = computed(() => `Zones/${route.params.id}/getLeaves`);
 const arrayData = useArrayData(datakey, {
     url: url.value,
+    limit: null,
 });
 const store = arrayData.store;
 
@@ -90,21 +91,16 @@ const onNodeExpanded = async (nodeKeysArray) => {
     previousExpandedNodes.value = nodeKeysSet;
 };
 
-const formatNodeSelected = (node) => {
-    if (node.selected === 1) node.selected = true;
-    else if (node.selected === 0) node.selected = false;
-
-    if (node.sons > 0 && !node.childs) node.childs = [{}];
-};
-
 const fetchNodeLeaves = async (nodeKey) => {
     if (!treeRef.value) return;
     const node = treeRef.value?.getNodeByKey(nodeKey);
-    if (node.selected === 1) node.selected = true;
-    else if (node.selected === 0) node.selected = false;
+    if (typeof node.selected === 'number') node.selected = !!node.selected;
+    if (node.sons > 0 && !node.childs) {
+        node.childs = [{}];
+        const index = expanded.value.indexOf(node.id);
+        expanded.value.splice(index, 1);
+    }
     if (!node || node.sons === 0) return;
-
-    state.set('Tree', node);
 };
 
 function getNodeIds(node) {
@@ -128,18 +124,9 @@ watch(
         nodes.value[0].childs = [...val];
         const fetchedNodeKeys = val.flatMap(getNodeIds);
         state.set('Tree', [...fetchedNodeKeys]);
-
-        if (!store.userParams?.search) {
-            val.forEach((n) => {
-                formatNodeSelected(n);
-            });
-            store.data = null;
-            expanded.value = [null];
-        } else {
-            for (let n of state.get('Tree')) {
-                await fetchNodeLeaves(n);
-            }
-            expanded.value = [null, ...fetchedNodeKeys];
+        expanded.value = [null, ...fetchedNodeKeys];
+        for (let n of state.get('Tree')) {
+            await fetchNodeLeaves(n);
         }
         previousExpandedNodes.value = new Set(expanded.value);
     },
@@ -147,13 +134,11 @@ watch(
 );
 
 const reFetch = async () => {
-    const { data } = await arrayData.fetch({ append: false });
-    nodes.value = data;
-    expanded.value = [null];
+    await arrayData.fetch({});
 };
 
 onMounted(async () => {
-    if (store.userParams?.search) await arrayData.fetch({});
+    await reFetch();
 });
 
 onUnmounted(() => {
@@ -167,13 +152,13 @@ onUnmounted(() => {
         v-if="showSearchBar"
         v-model="store.userParams.search"
         :placeholder="$t('globals.search')"
-        @update:model-value="reFetch()"
+        @keyup.enter="reFetch"
     >
         <template #prepend>
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
-    <VnSearchbar :data-key="datakey" :url="url" :redirect="false" />
+    <VnSearchbar v-if="!showSearchBar" :data-key="datakey" :url="url" :redirect="false" />
     <QTree
         ref="treeRef"
         :nodes="nodes"

From c5586367995c98d3ab7e29305a8d571aafaec719 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Nov 2024 11:12:11 +0100
Subject: [PATCH 2/4] refactor: requested changes

---
 src/components/FormPopup.vue                   | 10 +++++-----
 src/pages/Zone/Card/ZoneEventExclusionForm.vue | 11 -----------
 src/pages/Zone/Card/ZoneLocationsTree.vue      |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/components/FormPopup.vue b/src/components/FormPopup.vue
index 893ee8393..e1c15fcf4 100644
--- a/src/components/FormPopup.vue
+++ b/src/components/FormPopup.vue
@@ -57,12 +57,12 @@ const closeForm = () => {
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ $props.title }}</h1>
-            <p>{{ $props.subtitle }}</p>
+            <h1 class="title">{{ title }}</h1>
+            <p>{{ subtitle }}</p>
             <slot name="form-inputs" />
             <div class="q-mt-lg row justify-end">
                 <QBtn
-                    v-if="$props.defaultCancelButton"
+                    v-if="defaultCancelButton"
                     :label="t('globals.cancel')"
                     color="primary"
                     flat
@@ -72,8 +72,8 @@ const closeForm = () => {
                     v-close-popup
                 />
                 <QBtn
-                    v-if="$props.defaultSubmitButton"
-                    :label="$props.customSubmitButtonLabel || t('globals.save')"
+                    v-if="defaultSubmitButton"
+                    :label="customSubmitButtonLabel || t('globals.save')"
                     type="submit"
                     color="primary"
                     :disabled="isLoading"
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index d5fd40634..7b50ada3a 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -64,13 +64,6 @@ const exclusionGeoCreate = async () => {
     };
     await axios.post('Zones/exclusionGeo', params);
     await refetchEvents();
-    const params = {
-        zoneFk: parseInt(route.params.id),
-        date: dated.value,
-        geoIds: tickedNodes.value,
-    };
-    await axios.post('Zones/exclusionGeo', params);
-    await refetchEvents();
 };
 
 const exclusionCreate = async () => {
@@ -92,9 +85,6 @@ const deleteEvent = async () => {
     if (!props.event) return;
     await axios.delete(`Zones/${route.params.id}/exclusions`);
     await refetchEvents();
-    if (!props.event) return;
-    await axios.delete(`Zones/${route.params.id}/exclusions`);
-    await refetchEvents();
 };
 
 const closeForm = () => emit('closeForm');
@@ -131,7 +121,6 @@ onMounted(() => {
                 <VnInputDate
                     :label="t('eventsInclusionForm.day')"
                     v-model="dated"
-                    :model-value="props.date"
                     :required="true"
                 />
             </VnRow>
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index d0d4b18b8..cc84b3665 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -152,7 +152,7 @@ onUnmounted(() => {
         v-if="showSearchBar"
         v-model="store.userParams.search"
         :placeholder="$t('globals.search')"
-        @keyup.enter="reFetch"
+        @keydown.enter="reFetch"
     >
         <template #prepend>
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />

From d191d88e81decbe9a0171a9cc848879ee9c01659 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Nov 2024 12:19:20 +0100
Subject: [PATCH 3/4] refactor: modified button to prevent submit

---
 src/pages/Zone/Card/ZoneLocationsTree.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index cc84b3665..751d8d11d 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -152,7 +152,7 @@ onUnmounted(() => {
         v-if="showSearchBar"
         v-model="store.userParams.search"
         :placeholder="$t('globals.search')"
-        @keydown.enter="reFetch"
+        @keydown.enter.stop.prevent="reFetch"
     >
         <template #prepend>
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />

From 8e7cb9c46efda8d05b9742000da95850aed8fa7e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 25 Nov 2024 12:54:15 +0100
Subject: [PATCH 4/4] fix: zoneLocationsTree check selected sons

---
 src/pages/Zone/Card/ZoneLocationsTree.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 751d8d11d..650047e40 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -75,6 +75,7 @@ const onNodeExpanded = async (nodeKeysArray) => {
         if (response.data) {
             node.childs = response.data.map((n) => {
                 if (n.sons > 0) n.childs = [{}];
+                n.selected = isSelected(n.selected);
                 return n;
             });
         }
@@ -115,6 +116,10 @@ function getNodeIds(node) {
     return ids;
 }
 
+function isSelected(selected) {
+    if (typeof selected === 'number') return !!selected;
+}
+
 watch(
     () => store.data,
     async (val) => {