From c916bd5945a660586421d1b6a71e84e8929b135f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 19 Feb 2024 10:50:35 +0100
Subject: [PATCH] refs #6863 fix: VnSelect + url,  VnLocation

---
 src/components/common/VnLocation.vue             | 12 +++++-------
 src/components/common/VnSelectFilter.vue         | 16 ++++++++--------
 .../invoiceIn/invoiceInBasicData.spec.js         |  6 ++----
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index b55706ad2..446bb371e 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -50,7 +50,10 @@ const value = computed({
         return $props.modelValue;
     },
     set(value) {
-        emit('update:modelValue', value);
+        emit(
+            'update:modelValue',
+            postcodesOptions.value.find((p) => p.code === value)
+        );
     },
 });
 
@@ -101,16 +104,11 @@ function handleFetch(data) {
         :label="t('Location')"
         :placeholder="t('Search by postalcode, town, province or country')"
         @input-value="locationFilter"
-        :default-filter="true"
+        :default-filter="false"
         :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
-        emit-value
-        map-options
-        use-input
         clearable
-        hide-selected
-        fill-input
     >
         <template #form>
             <CreateNewPostcode @on-data-saved="locationFilter()" />
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a5ebd80ad..44f73bfed 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -111,15 +111,15 @@ async function fetchFilter(val) {
     return dataRef.value.fetch({ fields, where, order: sortBy, limit });
 }
 
-function filterHandler(val, update) {
+async function filterHandler(val, update) {
+    if (!$props.defaultFilter) return update();
+    let newOptions;
+    if ($props.url) {
+        newOptions = await fetchFilter(val);
+    } else newOptions = filter(val, myOptionsOriginal.value);
     update(
-        async () => {
-            if (!$props.defaultFilter) return;
-            // if ($props.url) {
-            //     myOptions.value = await fetchFilter(val);
-            //     return;
-            // }
-            myOptions.value = filter(val, myOptionsOriginal.value);
+        () => {
+            myOptions.value = newOptions;
         },
         (ref) => {
             if (val !== '' && ref.options.length > 0) {
diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index 7617a69d1..20f137aeb 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 describe('InvoiceInBasicData', () => {
-    const selects = '.q-form .q-select';
+    const selects = ':nth-child(1) > :nth-child(1) > .q-field';
     const appendBtns = 'label button';
     const dialogAppendBtns = '.q-dialog label button';
     const dialogInputs = '.q-dialog input';
@@ -12,9 +12,7 @@ describe('InvoiceInBasicData', () => {
     });
 
     it('should edit the provideer and supplier ref', () => {
-        cy.get(selects).eq(0).click();
-        cy.get(selects).eq(0).type('Bros');
-        cy.get(selects).eq(0).type('{enter}');
+        cy.selectOption(selects, 'Bros');
 
         cy.get('[title="Reset"]').click();
         cy.get(appendBtns).eq(0).click();