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] 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()" />