src/pages/Zone/Card/ZoneBasicData.vue

@@ -9,22 +9,22 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
-const validAddresses = ref([]);
 const addresses = ref([]);
 
 const setFilteredAddresses = (data) => {
-    const validIds = new Set(validAddresses.value.map((item) => item.addressFk));
-    addresses.value = data.filter((address) => validIds.has(address.id));
+    addresses.value = data.map(({ address }) => address);
 };
 </script>
 
 <template>
     <FetchData
         url="RoadmapAddresses"
+        :filter="{
+            include: { relation: 'address' },
+        }"
         auto-load
-        @on-fetch="(data) => (validAddresses = data)"
+        @on-fetch="setFilteredAddresses"
     />
-    <FetchData url="Addresses" auto-load @on-fetch="setFilteredAddresses" />
     <FormModel auto-load model="Zone">
         <template #form="{ data, validate }">
             <VnRow>
@@ -125,7 +125,6 @@ const setFilteredAddresses = (data) => {
                     map-options
                     :rules="validate('data.addressFk')"
                     :filter-options="['id']"
-                    :where="filterWhere"
                 />
             </VnRow>
             <VnRow>

test/cypress/integration/zone/zoneWarehouse.spec.js

@@ -3,7 +3,7 @@ describe('ZoneWarehouse', () => {
         Warehouse: { val: 'Warehouse One', type: 'select' },
     };
 
-    const dataError = 'ER_DUP_ENTRY: Duplicate entry';
+    const dataError = 'The introduced warehouse already exists';
     const saveBtn = '.q-btn--standard > .q-btn__content > .block';
 
     beforeEach(() => {