From 35cef37d4f31f09e975e1ac023a9a666cfa282d9 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Dec 2024 08:04:05 +0100
Subject: [PATCH 1/7] fix: refs #8201 use arrayData to fix the error

---
 src/pages/Supplier/Card/SupplierDescriptor.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 28cfe49ce..9d469bcc1 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -9,7 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import { toDateString } from 'src/filters';
 import useCardDescription from 'src/composables/useCardDescription';
 import { getUrl } from 'src/composables/getUrl';
-import { useState } from 'src/composables/useState';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const $props = defineProps({
     id: {
@@ -26,7 +26,7 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 const url = ref();
-const state = useState();
+const arrayData = useArrayData();
 
 const filter = {
     fields: [
@@ -77,7 +77,7 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
 
-const supplier = computed(() => state.get('supplier'));
+const supplier = computed(() => arrayData.store.data);
 
 const getEntryQueryParams = (supplier) => {
     if (!supplier) return null;
@@ -127,6 +127,7 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
         <template #icons>
+            {{ console.log('supplier: ', supplier) }}
             <QCardActions v-if="supplier" class="q-gutter-x-md">
                 <QIcon
                     v-if="!supplier.isActive"
-- 
2.40.1


From 1a0789b77fc71cbf78839a331925e992c9475c07 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Dec 2024 08:05:03 +0100
Subject: [PATCH 2/7] refactor: refs #8201 deleted log

---
 src/pages/Supplier/Card/SupplierDescriptor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 9d469bcc1..a1a2a0991 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -127,7 +127,6 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
         <template #icons>
-            {{ console.log('supplier: ', supplier) }}
             <QCardActions v-if="supplier" class="q-gutter-x-md">
                 <QIcon
                     v-if="!supplier.isActive"
-- 
2.40.1


From 43c24e0383cdca8ae82c20aeae3d19da24811118 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Dec 2024 14:20:17 +0100
Subject: [PATCH 3/7] fix: refs #8201 added onDataSaved emi to refetch when
 cahnges are made

---
 src/pages/Account/Card/AccountDescriptor.vue  | 7 +++----
 src/pages/Supplier/Card/SupplierBasicData.vue | 7 +++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 3156f8e1e..ed7adc455 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -53,7 +53,6 @@ const hasAccount = ref(false);
             <AccountDescriptorMenu :has-account="hasAccount" />
         </template>
         <template #before>
-            <!-- falla id :id="entityId.value" collection="user" size="160x160" -->
             <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
                 <template #error>
                     <div
@@ -75,8 +74,8 @@ const hasAccount = ref(false);
             <VnLv :label="t('account.card.nickname')" :value="entity.name" />
             <VnLv :label="t('account.card.role')" :value="entity.role.name" />
         </template>
-        <template #actions="{ entity }">
-            <QCardActions class="q-gutter-x-md">
+        <template #icons="{ entity }">
+            <QCardActions v-if="accountData" class="q-gutter-x-md">
                 <QIcon
                     v-if="!entity.active"
                     color="primary"
@@ -91,7 +90,7 @@ const hasAccount = ref(false);
                 <QIcon
                     color="primary"
                     name="contact_mail"
-                    v-if="entity.hasAccount"
+                    v-if="hasAccount"
                     flat
                     round
                     size="sm"
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 842109656..4b4988789 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -6,14 +6,20 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 const { t } = useI18n();
+const arrayData = useArrayData();
 const companySizes = [
     { id: 'small', name: t('globals.small'), size: '1-5' },
     { id: 'medium', name: t('globals.medium'), size: '6-50' },
     { id: 'big', name: t('globals.big'), size: '>50' },
 ];
+
+const onSave = () => {
+    arrayData.fetch({});
+};
 </script>
 <template>
     <FormModel
@@ -22,6 +28,7 @@ const companySizes = [
         model="supplier"
         auto-load
         :clear-store-on-unmount="false"
+        @on-data-saved="onSave"
     >
         <template #form="{ data, validate }">
             <VnRow>
-- 
2.40.1


From fe1d9e93a33d2027f7922402bedd50ce3c0ea843 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 17 Dec 2024 06:27:03 +0100
Subject: [PATCH 4/7] refactor: refs #8201  added onMounted to stablish the
 value to show icons

---
 src/pages/Claim/Card/ClaimDevelopment.vue         | 14 +-------------
 src/pages/Customer/Card/CustomerDescriptor.vue    | 12 +++++++++---
 src/pages/Department/Card/DepartmentBasicData.vue |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index e288d8614..d17c6b4e6 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -164,19 +164,7 @@ const columns = computed(() => [
                             :autofocus="col.tabIndex == 1"
                             input-debounce="0"
                             hide-selected
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ scope.opt?.nickname }}
-                                            {{ scope.opt?.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectWorker>
+                        />
                         <VnSelect
                             v-else
                             v-model="row[col.model]"
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 98e53d568..a17b7c796 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -14,7 +14,13 @@ import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 import { useState } from 'src/composables/useState';
 const state = useState();
 
-const customer = computed(() => state.get('customer'));
+const customer = ref();
+
+onMounted(async () => {
+    console.log('state.get(customer): ', state.get('customer'));
+    customer.value = state.get('customer');
+    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
+});
 
 const $props = defineProps({
     id: {
@@ -38,7 +44,6 @@ const entityId = computed(() => {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     data.value = useCardDescription(entity?.name, entity?.id);
-    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
 };
 const debtWarning = computed(() => {
     return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
@@ -94,6 +99,7 @@ const debtWarning = computed(() => {
             />
         </template>
         <template #icons>
+            {{ console.log('customer: ', customer) }}
             <QCardActions v-if="customer" class="q-gutter-x-md">
                 <QIcon
                     v-if="!customer.isActive"
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 22ce06821..b13aed2d3 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -52,7 +52,7 @@ const { t } = useI18n();
                 <VnSelectWorker
                     :label="t('department.bossDepartment')"
                     v-model="data.workerFk"
-                    :rules="validate('department.workerFk')"
+                    :rules="validate('department.bossDepartment')"
                 />
                 <VnSelect
                     :label="t('department.selfConsumptionCustomer')"
-- 
2.40.1


From 410052d6ec28e4cc8b1145134cd69e386b2bc35f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Dec 2024 10:04:21 +0100
Subject: [PATCH 5/7] refactor: refs #8201 deleted logs

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index a17b7c796..dc5f08d37 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -17,7 +17,6 @@ const state = useState();
 const customer = ref();
 
 onMounted(async () => {
-    console.log('state.get(customer): ', state.get('customer'));
     customer.value = state.get('customer');
     if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
 });
@@ -99,7 +98,6 @@ const debtWarning = computed(() => {
             />
         </template>
         <template #icons>
-            {{ console.log('customer: ', customer) }}
             <QCardActions v-if="customer" class="q-gutter-x-md">
                 <QIcon
                     v-if="!customer.isActive"
-- 
2.40.1


From 1ff54d7423c9bd621249d96ac41a831c8c3f102a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 27 Dec 2024 09:18:29 +0100
Subject: [PATCH 6/7] refactor: refs #8201 deleted condition

---
 src/pages/Account/Card/AccountDescriptor.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index ed7adc455..826c285b3 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -75,14 +75,14 @@ const hasAccount = ref(false);
             <VnLv :label="t('account.card.role')" :value="entity.role.name" />
         </template>
         <template #icons="{ entity }">
-            <QCardActions v-if="accountData" class="q-gutter-x-md">
+            <QCardActions class="q-gutter-x-md">
                 <QIcon
                     v-if="!entity.active"
                     color="primary"
                     name="vn:disabled"
                     flat
                     round
-                    size="sm"
+                    size="xs"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.deactivated') }}</QTooltip>
@@ -93,7 +93,7 @@ const hasAccount = ref(false);
                     v-if="hasAccount"
                     flat
                     round
-                    size="sm"
+                    size="xs"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.enabled') }}</QTooltip>
-- 
2.40.1


From de307253225f992d032267e29df7ac185af41578 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 27 Dec 2024 10:36:03 +0100
Subject: [PATCH 7/7] perf: refs #8201 onDataSaved fetch

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 4b4988789..22a6deaab 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -16,10 +16,6 @@ const companySizes = [
     { id: 'medium', name: t('globals.medium'), size: '6-50' },
     { id: 'big', name: t('globals.big'), size: '>50' },
 ];
-
-const onSave = () => {
-    arrayData.fetch({});
-};
 </script>
 <template>
     <FormModel
@@ -28,7 +24,7 @@ const onSave = () => {
         model="supplier"
         auto-load
         :clear-store-on-unmount="false"
-        @on-data-saved="onSave"
+        @on-data-saved="arrayData.fetch({})"
     >
         <template #form="{ data, validate }">
             <VnRow>
-- 
2.40.1