From 1558b600bebe044c32716cc08c72780a30660b73 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 23 May 2024 09:20:16 +0200
Subject: [PATCH 1/6] refactor: refs #5447 changed warehouse filter

---
 src/pages/Travel/ExtraCommunityFilter.vue | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 7fe628180..6123b0384 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -7,6 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import axios from 'axios';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -34,6 +35,30 @@ const decrement = (paramsObj, key) => {
 
     paramsObj[key]--;
 };
+
+const warehouseAm = ref([]);
+const warehouses = async () => {
+    const warehouses = await axios.get('Warehouses');
+    const countries = await axios.get('Countries');
+    const continents = await axios.get('Continents');
+
+    const countryContinent = countries.data.reduce((acc, c) => {
+        acc[c.id] = c.continentFk;
+        return acc;
+    }, {});
+
+    const continentAMId = continents.data.find((continent) => continent.code === 'AM').id;
+
+    const countriesInAM = Object.keys(countryContinent).filter(
+        (countryId) => countryContinent[countryId] === continentAMId.toString()
+    );
+
+    warehouseAm.value = warehouses.data.filter((w) =>
+        countriesInAM.includes(w.countryFk.toString())
+    );
+    console.log('warehouseAm: ', warehouseAm.value);
+};
+warehouses();
 </script>
 
 <template>
@@ -150,6 +175,20 @@ const decrement = (paramsObj, key) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
+                        v-if="params.continent === 'AM'"
+                        :label="t('params.warehouseOutFk')"
+                        v-model="params.warehouseOutFk"
+                        @update:model-value="searchFn()"
+                        :options="warehouseAm"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                    <VnSelect
+                        v-else
                         :label="t('params.warehouseOutFk')"
                         v-model="params.warehouseOutFk"
                         @update:model-value="searchFn()"

From 8414f5c12eb221976f36a04736fdd454386162ff Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 23 May 2024 10:39:32 +0200
Subject: [PATCH 2/6] fix: refs #5447 deleted console.log

---
 src/pages/Travel/ExtraCommunityFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 6123b0384..9b088a25b 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -56,7 +56,6 @@ const warehouses = async () => {
     warehouseAm.value = warehouses.data.filter((w) =>
         countriesInAM.includes(w.countryFk.toString())
     );
-    console.log('warehouseAm: ', warehouseAm.value);
 };
 warehouses();
 </script>

From 45a6c49907a86d505771501d50ee844dbbe647f3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 3 Jun 2024 10:15:51 +0200
Subject: [PATCH 3/6] refactor: refs #5447 fix request

---
 src/pages/Travel/ExtraCommunityFilter.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 9b088a25b..c96ea19c2 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -36,24 +36,26 @@ const decrement = (paramsObj, key) => {
     paramsObj[key]--;
 };
 
-const warehouseAm = ref([]);
+const warehousesAm = ref([]);
 const warehouses = async () => {
     const warehouses = await axios.get('Warehouses');
     const countries = await axios.get('Countries');
-    const continents = await axios.get('Continents');
+    const continents = await axios.get('Continents', {
+        params: {
+            filter: { where: { code: 'AM' } },
+        },
+    });
 
     const countryContinent = countries.data.reduce((acc, c) => {
         acc[c.id] = c.continentFk;
         return acc;
     }, {});
 
-    const continentAMId = continents.data.find((continent) => continent.code === 'AM').id;
-
     const countriesInAM = Object.keys(countryContinent).filter(
-        (countryId) => countryContinent[countryId] === continentAMId.toString()
+        (countryId) => countryContinent[countryId] === continents.data[0].id.toString()
     );
 
-    warehouseAm.value = warehouses.data.filter((w) =>
+    warehousesAm.value = warehouses.data.filter((w) =>
         countriesInAM.includes(w.countryFk.toString())
     );
 };
@@ -178,7 +180,7 @@ warehouses();
                         :label="t('params.warehouseOutFk')"
                         v-model="params.warehouseOutFk"
                         @update:model-value="searchFn()"
-                        :options="warehouseAm"
+                        :options="warehousesAm"
                         option-value="id"
                         option-label="name"
                         hide-selected

From 83d56e5d32d6e96d804338ee431fd92ac391f42f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 10 Jun 2024 09:28:38 +0200
Subject: [PATCH 4/6] refactor: refs #5447 changed warehouse out filter
 behavior

---
 src/pages/Travel/ExtraCommunityFilter.vue | 49 ++++++++---------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index c96ea19c2..095d8cbfb 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -21,6 +21,7 @@ const warehousesOptions = ref([]);
 const continentsOptions = ref([]);
 const agenciesOptions = ref([]);
 const suppliersOptions = ref([]);
+const warehousesByContinent = ref({});
 
 const add = (paramsObj, key) => {
     if (paramsObj[key] === undefined) {
@@ -36,28 +37,25 @@ const decrement = (paramsObj, key) => {
     paramsObj[key]--;
 };
 
-const warehousesAm = ref([]);
 const warehouses = async () => {
-    const warehouses = await axios.get('Warehouses');
-    const countries = await axios.get('Countries');
-    const continents = await axios.get('Continents', {
-        params: {
-            filter: { where: { code: 'AM' } },
-        },
-    });
+    const warehousesResponse = await axios.get('Warehouses');
+    const countriesResponse = await axios.get('Countries');
+    const continentsResponse = await axios.get('Continents');
 
-    const countryContinent = countries.data.reduce((acc, c) => {
-        acc[c.id] = c.continentFk;
+    const countryContinentMap = countriesResponse.data.reduce((acc, country) => {
+        acc[country.id] = country.continentFk;
         return acc;
     }, {});
 
-    const countriesInAM = Object.keys(countryContinent).filter(
-        (countryId) => countryContinent[countryId] === continents.data[0].id.toString()
-    );
+    continentsResponse.data.forEach((continent) => {
+        const countriesInContinent = Object.keys(countryContinentMap).filter(
+            (countryId) => countryContinentMap[countryId] === continent.id.toString()
+        );
 
-    warehousesAm.value = warehouses.data.filter((w) =>
-        countriesInAM.includes(w.countryFk.toString())
-    );
+        warehousesByContinent.value[continent.code] = warehousesResponse.data.filter(
+            (warehouse) => countriesInContinent.includes(warehouse.countryFk.toString())
+        );
+    });
 };
 warehouses();
 </script>
@@ -173,27 +171,13 @@ warehouses();
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
+            <QItem v-if="warehousesByContinent[params.continent]">
                 <QItemSection>
                     <VnSelect
-                        v-if="params.continent === 'AM'"
                         :label="t('params.warehouseOutFk')"
                         v-model="params.warehouseOutFk"
                         @update:model-value="searchFn()"
-                        :options="warehousesAm"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                    <VnSelect
-                        v-else
-                        :label="t('params.warehouseOutFk')"
-                        v-model="params.warehouseOutFk"
-                        @update:model-value="searchFn()"
-                        :options="warehousesOptions"
+                        :options="warehousesByContinent[params.continent]"
                         option-value="id"
                         option-label="name"
                         hide-selected
@@ -240,7 +224,6 @@ warehouses();
                     <VnSelect
                         :label="t('params.continent')"
                         v-model="params.continent"
-                        @update:model-value="searchFn()"
                         :options="continentsOptions"
                         option-value="code"
                         option-label="name"

From cbd3ab3da2ee2c886df6435d2dd04f0553269cde Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 10 Jun 2024 09:39:03 +0200
Subject: [PATCH 5/6] refactor: refs #5447 refactor filters

---
 src/pages/Travel/ExtraCommunityFilter.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 095d8cbfb..25b70e4f7 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -140,7 +140,6 @@ warehouses();
                     <VnSelect
                         :label="t('params.agencyModeFk')"
                         v-model="params.agencyModeFk"
-                        @update:model-value="searchFn()"
                         :options="agenciesOptions"
                         option-value="agencyFk"
                         option-label="name"
@@ -176,7 +175,6 @@ warehouses();
                     <VnSelect
                         :label="t('params.warehouseOutFk')"
                         v-model="params.warehouseOutFk"
-                        @update:model-value="searchFn()"
                         :options="warehousesByContinent[params.continent]"
                         option-value="id"
                         option-label="name"
@@ -192,7 +190,6 @@ warehouses();
                     <VnSelect
                         :label="t('params.warehouseInFk')"
                         v-model="params.warehouseInFk"
-                        @update:model-value="searchFn()"
                         :options="warehousesOptions"
                         option-value="id"
                         option-label="name"
@@ -208,7 +205,6 @@ warehouses();
                     <VnSelect
                         :label="t('supplier.pageTitles.supplier')"
                         v-model="params.cargoSupplierFk"
-                        @update:model-value="searchFn()"
                         :options="suppliersOptions"
                         option-value="id"
                         option-label="name"

From c017493cb81957d82318751d7f993de27b2dddb2 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 14 Jun 2024 08:47:25 +0200
Subject: [PATCH 6/6] refactor: refs #5447 fixed filter if continent not
 selected

---
 src/pages/Travel/ExtraCommunityFilter.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 25b70e4f7..78905ee5f 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -185,6 +185,21 @@ warehouses();
                     />
                 </QItemSection>
             </QItem>
+            <QItem v-else>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.warehouseOutFk')"
+                        v-model="params.warehouseOutFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect