From 36f44179b274ef7c498f6d366bbf0b8cb88bfdb2 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 10 Jan 2025 14:04:29 +0100
Subject: [PATCH 1/6] feat: refs #7305 deleted warnings

---
 src/components/common/VnLocation.vue     | 3 ---
 src/components/common/VnSelectWorker.vue | 5 +++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index f58222187..9f376c419 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -64,9 +64,6 @@ const handleModelValue = (data) => {
     <VnSelectDialog
         v-model="modelValue"
         option-filter-value="search"
-        :option-label="
-            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
-        "
         url="Postcodes/filter"
         @update:model-value="handleModelValue"
         :use-like="false"
diff --git a/src/components/common/VnSelectWorker.vue b/src/components/common/VnSelectWorker.vue
index 9a8151a3d..2762d6c02 100644
--- a/src/components/common/VnSelectWorker.vue
+++ b/src/components/common/VnSelectWorker.vue
@@ -55,7 +55,7 @@ const url = computed(() => {
         sort-by="nickname ASC"
     >
         <template #prepend v-if="$props.hasAvatar">
-            <VnAvatar :worker-id="value" color="primary" :title="title" />
+            <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
         </template>
         <template #append v-if="$props.hasInfo">
             <QIcon name="info" class="cursor-pointer">
@@ -72,7 +72,8 @@ const url = computed(() => {
                         {{ scope.opt.nickname }}
                     </QItemLabel>
                     <QItemLabel caption v-else>
-                        #{{ scope.opt.id }}, {{ scope.opt.nickname }}, {{ scope.opt.code }}
+                        #{{ scope.opt.id }}, {{ scope.opt.nickname }},
+                        {{ scope.opt.code }}
                     </QItemLabel>
                 </QItemSection>
             </QItem>

From efb0162f9ca7a565dcd0654465da70edc852f8b4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 20 Jan 2025 10:58:49 +0100
Subject: [PATCH 2/6] feat: refs #7068 created VnVisibleColumns unit test

---
 .../__tests__/VnVisibleColumns.spec.js        | 119 ++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 src/components/VnTable/__tests__/VnVisibleColumns.spec.js

diff --git a/src/components/VnTable/__tests__/VnVisibleColumns.spec.js b/src/components/VnTable/__tests__/VnVisibleColumns.spec.js
new file mode 100644
index 000000000..3589ca676
--- /dev/null
+++ b/src/components/VnTable/__tests__/VnVisibleColumns.spec.js
@@ -0,0 +1,119 @@
+import { describe, expect, it, beforeEach, vi } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnVisibleColumn from '../VnVisibleColumn.vue';
+import { axios } from 'app/test/vitest/helper';
+
+describe('VnVisibleColumns', () => {
+    let wrapper;
+    let vm;
+    let columnsMock = [];
+    beforeEach(() => {
+        wrapper = createWrapper(VnVisibleColumn, {
+            propsData: {
+                tableCode: 'testTable',
+                skip: ['skippedColumn'],
+            },
+        });
+        vm = wrapper.vm;
+    });
+
+    describe('setUserConfigViewData()', () => {
+        it('should initialize localColumns with visible configuration', () => {
+            columnsMock = [
+                { name: 'columnMockName', label: undefined },
+                { name: 'columnMockAddress', label: undefined },
+                { name: 'columnMockId', label: undefined },
+            ];
+            vm.columns = columnsMock;
+            const configuration = {
+                columnMockName: true,
+                columnMockAddress: false,
+                columnMockId: true,
+            };
+
+            vm.setUserConfigViewData(configuration, false);
+
+            expect(vm.localColumns).toEqual([
+                { name: 'columnMockName', label: undefined, visible: true },
+                { name: 'columnMockAddress', label: undefined, visible: false },
+                { name: 'columnMockId', label: undefined, visible: true },
+            ]);
+        });
+
+        it('should skip columns based on props', () => {
+            columnsMock = [
+                { name: 'columnMockName', label: undefined },
+                { name: 'columnMockId', label: undefined },
+                { name: 'skippedColumn', label: 'Skipped Column' },
+            ];
+            const configuration = {
+                columnMockName: true,
+                skippedColumn: false,
+                columnMockId: true,
+            };
+            vm.columns = columnsMock;
+
+            vm.setUserConfigViewData(configuration, false);
+
+            expect(vm.localColumns).toEqual([
+                { name: 'columnMockName', label: undefined, visible: true },
+                { name: 'columnMockId', label: undefined, visible: true },
+            ]);
+        });
+    });
+
+    describe('toggleMarkAll()', () => {
+        it('should set all localColumns to visible=true', () => {
+            vm.localColumns = [
+                { name: 'columnMockName', visible: false },
+                { name: 'columnMockId', visible: false },
+            ];
+
+            vm.toggleMarkAll(true);
+
+            expect(vm.localColumns.every((col) => col.visible)).toBe(true);
+        });
+
+        it('should set all localColumns to visible=false', () => {
+            vm.localColumns = [
+                { name: 'columnMockName', visible: true },
+                { name: 'columnMockId', visible: true },
+            ];
+
+            vm.toggleMarkAll(false);
+
+            expect(vm.localColumns.every((col) => col.visible)).toBe(false);
+        });
+    });
+
+    describe('saveConfig()', () => {
+        it('should call setUserConfigViewData and axios.post with correct params', async () => {
+            const mockAxiosPost = vi.spyOn(axios, 'post').mockResolvedValue({
+                data: [{ id: 1 }],
+            });
+
+            vm.localColumns = [
+                { name: 'columnMockName', visible: true },
+                { name: 'columnMockId', visible: false },
+            ];
+
+            await vm.saveConfig();
+
+            expect(mockAxiosPost).toHaveBeenCalledWith('UserConfigViews/crud', {
+                creates: [
+                    {
+                        userFk: vm.user.id,
+                        tableCode: vm.tableCode,
+                        tableConfig: vm.tableCode,
+                        configuration: {
+                            columnMockName: true,
+                            columnMockId: false,
+                        },
+                    },
+                ],
+            });
+
+            mockAxiosPost.mockRestore();
+        });
+    });
+});

From b36c53119c9970d9d16971de4915389e242a7b19 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 21 Jan 2025 09:06:53 +0100
Subject: [PATCH 3/6] refactor: refs #7068 requested changes

---
 src/components/VnTable/__tests__/VnVisibleColumns.spec.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/__tests__/VnVisibleColumns.spec.js b/src/components/VnTable/__tests__/VnVisibleColumns.spec.js
index 3589ca676..a9578126c 100644
--- a/src/components/VnTable/__tests__/VnVisibleColumns.spec.js
+++ b/src/components/VnTable/__tests__/VnVisibleColumns.spec.js
@@ -1,4 +1,4 @@
-import { describe, expect, it, beforeEach, vi } from 'vitest';
+import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import VnVisibleColumn from '../VnVisibleColumn.vue';
 import { axios } from 'app/test/vitest/helper';
@@ -17,6 +17,10 @@ describe('VnVisibleColumns', () => {
         vm = wrapper.vm;
     });
 
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
     describe('setUserConfigViewData()', () => {
         it('should initialize localColumns with visible configuration', () => {
             columnsMock = [
@@ -112,8 +116,6 @@ describe('VnVisibleColumns', () => {
                     },
                 ],
             });
-
-            mockAxiosPost.mockRestore();
         });
     });
 });

From 28db9256455459c7d488795a7c3bfcb09daa67d6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 21 Jan 2025 11:05:24 +0100
Subject: [PATCH 4/6] refactor: refs #7068 adjust variables

---
 .../__tests__/VnVisibleColumns.spec.js        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/VnTable/__tests__/VnVisibleColumns.spec.js b/src/components/VnTable/__tests__/VnVisibleColumns.spec.js
index a9578126c..bf767688b 100644
--- a/src/components/VnTable/__tests__/VnVisibleColumns.spec.js
+++ b/src/components/VnTable/__tests__/VnVisibleColumns.spec.js
@@ -6,7 +6,7 @@ import { axios } from 'app/test/vitest/helper';
 describe('VnVisibleColumns', () => {
     let wrapper;
     let vm;
-    let columnsMock = [];
+
     beforeEach(() => {
         wrapper = createWrapper(VnVisibleColumn, {
             propsData: {
@@ -23,29 +23,29 @@ describe('VnVisibleColumns', () => {
 
     describe('setUserConfigViewData()', () => {
         it('should initialize localColumns with visible configuration', () => {
-            columnsMock = [
+            vm.columns = [
                 { name: 'columnMockName', label: undefined },
                 { name: 'columnMockAddress', label: undefined },
                 { name: 'columnMockId', label: undefined },
             ];
-            vm.columns = columnsMock;
             const configuration = {
                 columnMockName: true,
                 columnMockAddress: false,
                 columnMockId: true,
             };
-
-            vm.setUserConfigViewData(configuration, false);
-
-            expect(vm.localColumns).toEqual([
+            const expectedColumns = [
                 { name: 'columnMockName', label: undefined, visible: true },
                 { name: 'columnMockAddress', label: undefined, visible: false },
                 { name: 'columnMockId', label: undefined, visible: true },
-            ]);
+            ];
+
+            vm.setUserConfigViewData(configuration, false);
+
+            expect(vm.localColumns).toEqual(expectedColumns);
         });
 
         it('should skip columns based on props', () => {
-            columnsMock = [
+            vm.columns = [
                 { name: 'columnMockName', label: undefined },
                 { name: 'columnMockId', label: undefined },
                 { name: 'skippedColumn', label: 'Skipped Column' },
@@ -55,14 +55,14 @@ describe('VnVisibleColumns', () => {
                 skippedColumn: false,
                 columnMockId: true,
             };
-            vm.columns = columnsMock;
+            const expectedColumns = [
+                { name: 'columnMockName', label: undefined, visible: true },
+                { name: 'columnMockId', label: undefined, visible: true },
+            ];
 
             vm.setUserConfigViewData(configuration, false);
 
-            expect(vm.localColumns).toEqual([
-                { name: 'columnMockName', label: undefined, visible: true },
-                { name: 'columnMockId', label: undefined, visible: true },
-            ]);
+            expect(vm.localColumns).toEqual(expectedColumns);
         });
     });
 

From 21251a51670856194dd820bb55d7d5ae4ec11095 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 21 Jan 2025 13:25:45 +0100
Subject: [PATCH 5/6] fix: init

---
 src/components/UserPanel.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index a0ef73a1f..110828f55 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -22,6 +22,7 @@ const { t, locale } = useI18n();
 const { copyText } = useClipboard();
 const { notify } = useNotify();
 
+const langList = import.meta.glob('../../node_modules/quasar/lang/*.js');
 const userLocale = computed({
     get() {
         return locale.value;
@@ -32,8 +33,7 @@ const userLocale = computed({
         value = localeEquivalence[value] ?? value;
 
         try {
-            /* @vite-ignore */
-            import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
+            langList[`../../node_modules/quasar/lang/${value}.js`]().then((lang) => {
                 Quasar.lang.set(lang.default);
             });
         } catch (error) {

From 00cea34ddef406bf937a1202795a2eb90ac436d2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 21 Jan 2025 13:55:20 +0100
Subject: [PATCH 6/6] perf: use util in OutLayout

---
 src/components/UserPanel.vue | 14 +++++---------
 src/layouts/OutLayout.vue    | 15 ++++-----------
 src/utils/quasarLang.js      | 12 ++++++++++++
 3 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 src/utils/quasarLang.js

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 110828f55..5f3266eb2 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -1,6 +1,9 @@
 <script setup>
+import quasarLang from 'src/utils/quasarLang';
+
 import { onMounted, computed, ref } from 'vue';
-import { Dark, Quasar } from 'quasar';
+
+import { Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
@@ -22,7 +25,6 @@ const { t, locale } = useI18n();
 const { copyText } = useClipboard();
 const { notify } = useNotify();
 
-const langList = import.meta.glob('../../node_modules/quasar/lang/*.js');
 const userLocale = computed({
     get() {
         return locale.value;
@@ -32,13 +34,7 @@ const userLocale = computed({
 
         value = localeEquivalence[value] ?? value;
 
-        try {
-            langList[`../../node_modules/quasar/lang/${value}.js`]().then((lang) => {
-                Quasar.lang.set(lang.default);
-            });
-        } catch (error) {
-            //
-        }
+        quasarLang(value);
     },
 });
 
diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
index 0eb1329a4..4ccc6bf9e 100644
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@@ -2,6 +2,8 @@
 import { Dark, Quasar } from 'quasar';
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { localeEquivalence } from 'src/i18n/index';
+import quasarLang from 'src/utils/quasarLang';
 
 const { t, locale } = useI18n();
 
@@ -12,18 +14,9 @@ const userLocale = computed({
     set(value) {
         locale.value = value;
 
-        if (value === 'en') value = 'en-GB';
+        value = localeEquivalence[value] ?? value;
 
-        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
-        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
-        try {
-            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
-            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
-                Quasar.lang.set(lang.default);
-            });
-        } catch (error) {
-            //
-        }
+        quasarLang(value);
     },
 });
 
diff --git a/src/utils/quasarLang.js b/src/utils/quasarLang.js
new file mode 100644
index 000000000..ebd590c05
--- /dev/null
+++ b/src/utils/quasarLang.js
@@ -0,0 +1,12 @@
+const langList = import.meta.glob('../../node_modules/quasar/lang/*.js');
+import { Quasar } from 'quasar';
+
+export default function (value) {
+    try {
+        langList[`../../node_modules/quasar/lang/${value}.js`]().then((lang) => {
+            Quasar.lang.set(lang.default);
+        });
+    } catch (error) {
+        //
+    }
+}