From 0e7e804475de24d22033c44211576858473d3fcc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 3 May 2024 13:18:46 +0200
Subject: [PATCH 01/29] feat: refs #6598 create useAcl composable

---
 src/composables/useAcl.js     | 35 +++++++++++++++++++++++++++++++++++
 src/composables/useSession.js |  2 ++
 src/composables/useState.js   | 11 +++++++++++
 src/router/index.js           |  2 ++
 4 files changed, 50 insertions(+)
 create mode 100644 src/composables/useAcl.js

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
new file mode 100644
index 000000000..3121646f1
--- /dev/null
+++ b/src/composables/useAcl.js
@@ -0,0 +1,35 @@
+import { useState } from './useState';
+import axios from 'axios';
+
+export function useAcl() {
+    const state = useState();
+
+    async function fetch() {
+        const { data } = await axios.get('VnUsers/acls');
+        const acls = {};
+        data.forEach((acl) => {
+            acls[acl.model] = acls[acl.model] || {};
+            acls[acl.model][acl.property] = acls[acl.model][acl.property] || {};
+            acls[acl.model][acl.property][acl.accessType] = true;
+        });
+
+        state.setAcls(acls);
+    }
+
+    function hasAny(model, property, accessType) {
+        const acls = acls[model];
+        if (acls) {
+            for (const prop of ['*', property]) {
+                const acl = acls[prop];
+                if (acl && (acl['*'] || acl[accessType])) return true;
+            }
+        }
+        return false;
+    }
+
+    return {
+        fetch,
+        hasAny,
+        state,
+    };
+}
diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 56bce0279..ca2abef00 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -1,5 +1,6 @@
 import { useState } from './useState';
 import { useRole } from './useRole';
+import { useAcl } from './useAcl';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
 import useNotify from './useNotify';
@@ -88,6 +89,7 @@ export function useSession() {
         setSession(data);
 
         await useRole().fetch();
+        await useAcl().fetch();
         await useUserConfig().fetch();
         await useTokenConfig().fetch();
 
diff --git a/src/composables/useState.js b/src/composables/useState.js
index e671d41bd..95b9fdfd2 100644
--- a/src/composables/useState.js
+++ b/src/composables/useState.js
@@ -13,6 +13,7 @@ const user = ref({
 });
 
 const roles = ref([]);
+const acls = ref([]);
 const tokenConfig = ref({});
 const drawer = ref(true);
 const headerMounted = ref(false);
@@ -53,6 +54,14 @@ export function useState() {
     function setRoles(data) {
         roles.value = data;
     }
+
+    function getAcls() {
+        return computed(() => acls.value);
+    }
+
+    function setAcls(data) {
+        acls.value = data;
+    }
     function getTokenConfig() {
         return computed(() => {
             return tokenConfig.value;
@@ -80,6 +89,8 @@ export function useState() {
         setUser,
         getRoles,
         setRoles,
+        getAcls,
+        setAcls,
         getTokenConfig,
         setTokenConfig,
         set,
diff --git a/src/router/index.js b/src/router/index.js
index 7a0aedcae..41ff4c1da 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,6 +13,7 @@ import { useRole } from 'src/composables/useRole';
 import { useUserConfig } from 'src/composables/useUserConfig';
 import { toLowerCamel } from 'src/filters';
 import { useTokenConfig } from 'src/composables/useTokenConfig';
+import { useAcl } from 'src/composables/useAcl';
 
 const state = useState();
 const session = useSession();
@@ -55,6 +56,7 @@ export default route(function (/* { store, ssrContext } */) {
             const stateRoles = state.getRoles().value;
             if (stateRoles.length === 0) {
                 await useRole().fetch();
+                await useAcl().fetch();
                 await useUserConfig().fetch();
                 await useTokenConfig().fetch();
             }

From 7c1ce7f56039b333bc1adf3156f0d0a761a430c6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 3 May 2024 17:38:16 +0200
Subject: [PATCH 02/29] feat: refs #6243 replace url

---
 src/pages/Route/Cmr/CmrList.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 69f030fa0..6963baf41 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -91,8 +91,7 @@ function downloadPdfs() {
 }
 </script>
 <template>
-      <template v-if="stateStore.isHeaderMounted()">
-
+    <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
                 <QBtn
@@ -113,7 +112,7 @@ function downloadPdfs() {
         <div class="list">
             <VnPaginate
                 data-key="CmrList"
-                :url="`Routes/getExternalCmrs`"
+                :url="`Routes/cmrs`"
                 order="cmrFk DESC"
                 limit="null"
                 auto-load

From 12ff55a010487a4f6717b191b400471a2f3bbb74 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 15 May 2024 17:24:01 +0200
Subject: [PATCH 03/29] fix: refs #6598 get acls

---
 src/composables/useAcl.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 3121646f1..362a7c551 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -1,5 +1,5 @@
-import { useState } from './useState';
 import axios from 'axios';
+import { useState } from './useState';
 
 export function useAcl() {
     const state = useState();
@@ -17,14 +17,13 @@ export function useAcl() {
     }
 
     function hasAny(model, property, accessType) {
-        const acls = acls[model];
-        if (acls) {
-            for (const prop of ['*', property]) {
-                const acl = acls[prop];
-                if (acl && (acl['*'] || acl[accessType])) return true;
-            }
-        }
-        return false;
+        const modelAcls = state.getAcls().value[model];
+        if (!modelAcls) return false;
+    
+        return ['*', property].some(prop => {
+            const acl = modelAcls[prop];
+            return acl && (acl['*'] || acl[accessType]);
+        });
     }
 
     return {

From 74e330e523e0aa9a82c79f2e817b613e8e44aeff Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 16 May 2024 14:05:39 +0200
Subject: [PATCH 04/29] fix: refs #6598 fix unit tests

---
 .../__tests__/composables/useSession.spec.js    | 17 ++++++++---------
 test/vitest/__tests__/pages/Login/Login.spec.js |  5 +++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 2292859a9..6e08807cf 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -1,5 +1,5 @@
 import { vi, describe, expect, it, beforeAll, beforeEach } from 'vitest';
-import { axios, flushPromises } from 'app/test/vitest/helper';
+import { axios } from 'app/test/vitest/helper';
 import { useSession } from 'composables/useSession';
 import { useState } from 'composables/useState';
 
@@ -7,6 +7,7 @@ const session = useSession();
 const state = useState();
 
 describe('session', () => {
+
     describe('getToken / setToken', () => {
         it('should return an empty string if no token is found in local or session storage', async () => {
             const expectedToken = '';
@@ -87,13 +88,15 @@ describe('session', () => {
                     },
                 },
             ];
+            beforeEach(() => {
+                vi.spyOn(axios, 'get').mockImplementation((url) => {
+                    if(url === 'VnUsers/acls') return Promise.resolve({data: []});
+                    return Promise.resolve({data: { roles: rolesData, user: expectedUser }}); 
+                });
+            })
 
             it('should fetch the user roles and then set token in the sessionStorage', async () => {
                 const expectedRoles = ['salesPerson', 'admin'];
-                vi.spyOn(axios, 'get').mockResolvedValue({
-                    data: { roles: rolesData, user: expectedUser },
-                });
-
                 const expectedToken = 'mySessionToken';
                 const expectedTokenMultimedia = 'mySessionTokenMultimedia';
                 const keepLogin = false;
@@ -117,10 +120,6 @@ describe('session', () => {
 
             it('should fetch the user roles and then set token in the localStorage', async () => {
                 const expectedRoles = ['salesPerson', 'admin'];
-                vi.spyOn(axios, 'get').mockResolvedValue({
-                    data: { roles: rolesData, user: expectedUser },
-                });
-
                 const expectedToken = 'myLocalToken';
                 const expectedTokenMultimedia = 'myLocalTokenMultimedia';
                 const keepLogin = true;
diff --git a/test/vitest/__tests__/pages/Login/Login.spec.js b/test/vitest/__tests__/pages/Login/Login.spec.js
index 6e2de9870..9b9968736 100644
--- a/test/vitest/__tests__/pages/Login/Login.spec.js
+++ b/test/vitest/__tests__/pages/Login/Login.spec.js
@@ -23,8 +23,9 @@ describe('Login', () => {
             },
         };
         vi.spyOn(axios, 'post').mockResolvedValueOnce({ data: { token: 'token' } });
-        vi.spyOn(axios, 'get').mockResolvedValue({
-            data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }},
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+            return Promise.resolve({data: { roles: [], user: expectedUser , multimediaToken: {id:'multimediaToken' }}});
         });
         vi.spyOn(vm.quasar, 'notify');
 

From 1d67233e691c0c7cdd03b273a4c1039c880d1af7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 16 May 2024 16:29:42 +0200
Subject: [PATCH 05/29] feat: refs #6598 unit tests

---
 src/composables/useAcl.js                     | 15 +++--
 .../__tests__/composables/useAcl.spec.js      | 57 +++++++++++++++++++
 .../__tests__/composables/useSession.spec.js  |  9 +--
 3 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 test/vitest/__tests__/composables/useAcl.spec.js

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 362a7c551..46aaa3c25 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,14 +16,13 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, property, accessType) {
-        const modelAcls = state.getAcls().value[model];
-        if (!modelAcls) return false;
-    
-        return ['*', property].some(prop => {
-            const acl = modelAcls[prop];
-            return acl && (acl['*'] || acl[accessType]);
-        });
+    function hasAny(model, prop, accessType) {
+        const acls = state.getAcls().value[model];
+        if (acls) 
+            return ['*', prop].some((key) => {
+                const acl = acls[key];
+                return acl && (acl['*'] || acl[accessType]);
+            });
     }
 
     return {
diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/test/vitest/__tests__/composables/useAcl.spec.js
new file mode 100644
index 000000000..d468720e5
--- /dev/null
+++ b/test/vitest/__tests__/composables/useAcl.spec.js
@@ -0,0 +1,57 @@
+import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
+import { axios, flushPromises } from 'app/test/vitest/helper';
+import { useAcl } from 'src/composables/useAcl';
+
+describe('useAcl', () => {
+    const acl = useAcl();
+    const mockAcls = [
+        {
+            model: 'Address',
+            property: '*',
+            accessType: '*',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: 'employee',
+            id: 3,
+        },
+        {
+            model: 'Worker',
+            property: 'holidays',
+            accessType: 'READ',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: 'employee',
+            id: 13,
+        },
+    ];
+    const expectedAcls = {
+        Address: { '*': { '*': true } },
+        Worker: { holidays: { READ: true } },
+    };
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockResolvedValue({ data: mockAcls });
+        vi.spyOn(acl.state, 'setAcls');
+    });
+
+    beforeEach(async () => await acl.fetch());
+
+    afterEach(async () => {
+        await flushPromises();
+        acl.state.setAcls([]);
+    });
+
+    describe('fetch', () => {
+        it('should call setUser and setRoles of the state with the expected data', async () => {
+            expect(acl.state.setAcls).toHaveBeenCalledWith(expectedAcls);
+        });
+    });
+
+    describe('hasAny', () => {
+        it('should return true if a role matched', async () =>
+            expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy());
+
+        it('should return false if no roles matched', async () => {
+            expect(acl.hasAny('Worker', '*', 'WRITE')).toBeFalsy();
+        });
+    });
+});
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 6e08807cf..831acbf18 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -7,7 +7,6 @@ const session = useSession();
 const state = useState();
 
 describe('session', () => {
-
     describe('getToken / setToken', () => {
         it('should return an empty string if no token is found in local or session storage', async () => {
             const expectedToken = '';
@@ -90,10 +89,12 @@ describe('session', () => {
             ];
             beforeEach(() => {
                 vi.spyOn(axios, 'get').mockImplementation((url) => {
-                    if(url === 'VnUsers/acls') return Promise.resolve({data: []});
-                    return Promise.resolve({data: { roles: rolesData, user: expectedUser }}); 
+                    if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+                    return Promise.resolve({
+                        data: { roles: rolesData, user: expectedUser },
+                    });
                 });
-            })
+            });
 
             it('should fetch the user roles and then set token in the sessionStorage', async () => {
                 const expectedRoles = ['salesPerson', 'admin'];

From 12811692eb5c799f915863dfedd9177dbdd6fd56 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 17 May 2024 12:09:42 +0200
Subject: [PATCH 06/29] feat: refs #6598 add more tests

---
 .../__tests__/composables/useAcl.spec.js      | 79 +++++++++++++------
 1 file changed, 55 insertions(+), 24 deletions(-)

diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/test/vitest/__tests__/composables/useAcl.spec.js
index d468720e5..a2b44b5e7 100644
--- a/test/vitest/__tests__/composables/useAcl.spec.js
+++ b/test/vitest/__tests__/composables/useAcl.spec.js
@@ -1,4 +1,4 @@
-import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
+import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
 import { axios, flushPromises } from 'app/test/vitest/helper';
 import { useAcl } from 'src/composables/useAcl';
 
@@ -12,7 +12,6 @@ describe('useAcl', () => {
             permission: 'ALLOW',
             principalType: 'ROLE',
             principalId: 'employee',
-            id: 3,
         },
         {
             model: 'Worker',
@@ -21,37 +20,69 @@ describe('useAcl', () => {
             permission: 'ALLOW',
             principalType: 'ROLE',
             principalId: 'employee',
-            id: 13,
+        },
+        {
+            model: 'Url',
+            property: 'getByUser',
+            accessType: 'READ',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: '$everyone',
+        },
+        {
+            model: 'TpvTransaction',
+            property: 'start',
+            accessType: 'WRITE',
+            permission: 'ALLOW',
+            principalType: 'ROLE',
+            principalId: '$authenticated',
         },
     ];
-    const expectedAcls = {
-        Address: { '*': { '*': true } },
-        Worker: { holidays: { READ: true } },
-    };
-    beforeAll(() => {
+
+    beforeAll(async () => {
         vi.spyOn(axios, 'get').mockResolvedValue({ data: mockAcls });
-        vi.spyOn(acl.state, 'setAcls');
+        await acl.fetch();
     });
 
-    beforeEach(async () => await acl.fetch());
-
-    afterEach(async () => {
-        await flushPromises();
-        acl.state.setAcls([]);
-    });
-
-    describe('fetch', () => {
-        it('should call setUser and setRoles of the state with the expected data', async () => {
-            expect(acl.state.setAcls).toHaveBeenCalledWith(expectedAcls);
-        });
-    });
+    afterAll(async () => await flushPromises());
 
     describe('hasAny', () => {
-        it('should return true if a role matched', async () =>
-            expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy());
+        it('should return false if no roles matched', async () => {
+            expect(acl.hasAny('Worker', 'updateAttributes', 'WRITE')).toBeFalsy();
+        });
 
         it('should return false if no roles matched', async () => {
-            expect(acl.hasAny('Worker', '*', 'WRITE')).toBeFalsy();
+            expect(acl.hasAny('Worker', 'holidays', 'READ')).toBeTruthy();
+        });
+
+        describe('*', () => {
+            it('should return true if an acl matched', async () => {
+                expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy();
+            });
+
+            it('should return false if no acls matched', async () => {
+                expect(acl.hasAny('Worker', '*', 'READ')).toBeFalsy();
+            });
+        });
+
+        describe('$authenticated', () => {
+            it('should return false if no acls matched', async () => {
+                expect(acl.hasAny('Url', 'getByUser', '*')).toBeFalsy();
+            });
+
+            it('should return true if an acl matched', async () => {
+                expect(acl.hasAny('Url', 'getByUser', 'READ')).toBeTruthy();
+            });
+        });
+
+        describe('$everyone', () => {
+            it('should return false if no acls matched', async () => {
+                expect(acl.hasAny('TpvTransaction', 'start', 'READ')).toBeFalsy();
+            });
+
+            it('should return false if an acl matched', async () => {
+                expect(acl.hasAny('TpvTransaction', 'start', 'WRITE')).toBeTruthy();
+            });
         });
     });
 });

From 1bc99cbd228b092c5dc956ea07b7d22a67e8ff82 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 3 Jun 2024 16:30:59 +0200
Subject: [PATCH 07/29] feat: refs  #6243 show all cmrs & filter by warehouse

---
 CHANGELOG.md                      |  1 +
 src/i18n/locale/en.yml            |  2 +-
 src/i18n/locale/es.yml            |  2 +-
 src/pages/Route/Cmr/CmrFilter.vue | 30 ++++++++++++++++++++++--------
 src/pages/Route/Cmr/CmrList.vue   | 21 ++++++++++++++++++---
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 250aa01a2..f589b5e9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
+-   (Route) => Ahora se muestran todos los cmrs
 
 ## [2418.01]
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 0ce21e9b2..010a9f481 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -956,7 +956,7 @@ roadmap:
 route:
     pageTitles:
         routes: Routes
-        cmrsList: External CMRs list
+        cmrsList: CMRs list
         RouteList: List
         routeCreate: New route
         basicData: Basic Data
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index c2f61d001..d469046bc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -944,7 +944,7 @@ roadmap:
 route:
     pageTitles:
         routes: Rutas
-        cmrsList: Listado de CMRs externos
+        cmrsList: Listado de CMRs
         RouteList: Listado
         routeCreate: Nueva ruta
         basicData: Datos básicos
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index 553f19431..32040ddd6 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -1,11 +1,11 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -16,10 +16,11 @@ const props = defineProps({
 });
 
 const countries = ref();
+const warehouses = ref();
 </script>
-
 <template>
     <FetchData url="Countries" @on-fetch="(data) => (countries = data)" auto-load />
+    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -93,13 +94,13 @@ const countries = ref();
                 <QItemSection v-if="!countries">
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
-                <QItemSection v-if="countries" class="q-mb-sm">
-                    <QSelect
+                <QItemSection v-if="countries">
+                    <VnSelect
                         :label="t('route.cmr.list.country')"
                         v-model="params.country"
                         :options="countries"
-                        option-value="country"
-                        option-label="country"
+                        option-label="name"
+                        option-value="id"
                         transition-show="jump-down"
                         transition-hide="jump-up"
                         emit-value
@@ -111,9 +112,23 @@ const countries = ref();
                         <template #prepend>
                             <QIcon name="flag" size="sm"></QIcon>
                         </template>
-                    </QSelect>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
+            <QItem>
+                <VnSelect
+                    :label="t('globals.warehouse')"
+                    :options="warehouses"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="params.warehouseFk"
+                    rounded
+                    dense
+                    outlined
+                >
+                </VnSelect>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInputDate
@@ -126,7 +141,6 @@ const countries = ref();
         </template>
     </VnFilterPanel>
 </template>
-
 <i18n>
     en:
         params:
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 6963baf41..5198e9fa2 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -9,12 +9,14 @@ import { toDate } from 'filters/index';
 import CmrFilter from './CmrFilter.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const selected = ref([]);
+const warehouses = ref([]);
 
 const columns = computed(() => [
     {
@@ -64,6 +66,13 @@ const columns = computed(() => [
         sortable: true,
         headerStyle: 'padding-left: 33px',
     },
+    {
+        name: 'warehouseFk',
+        label: t('globals.warehouse'),
+        field: ({ warehouseFk }) => warehouseFk,
+        align: 'center',
+        sortable: true,
+    },
     {
         name: 'icons',
         align: 'center',
@@ -108,6 +117,7 @@ function downloadPdfs() {
             </div>
         </Teleport>
     </template>
+    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <div class="column items-center">
         <div class="list">
             <VnPaginate
@@ -160,6 +170,11 @@ function downloadPdfs() {
                                 <CustomerDescriptorProxy :id="value" />
                             </QTd>
                         </template>
+                        <template #body-cell-warehouseFk="{ value }">
+                            <QTd align="center">
+                                {{ warehouses.find(({ id }) => id === value)?.name }}
+                            </QTd>
+                        </template>
                         <template #body-cell-icons="{ value }">
                             <QTd align="center">
                                 <a :href="getCmrUrl(value)" target="_blank">
@@ -181,13 +196,13 @@ function downloadPdfs() {
         </div>
         <QPageSticky :offset="[20, 20]">
             <QBtn @click="downloadPdfs" fab icon="cloud_download" color="primary" />
+            <QTooltip>
+                {{ t('route.cmr.list.downloadCmrs') }}
+            </QTooltip>
         </QPageSticky>
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
             <QScrollArea class="fit text-grey-8">
                 <CmrFilter data-key="CmrList" />
-                <QTooltip>
-                    {{ t('route.cmr.list.downloadCmrs') }}
-                </QTooltip>
             </QScrollArea>
         </QDrawer>
     </div>

From c71877cdb1a35db8c7861b72acf5fb15bfe2d429 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 4 Jun 2024 12:23:28 -0300
Subject: [PATCH 08/29] Account connections

---
 src/pages/Account/AccountAliasList.vue        | 106 ---------------
 src/pages/Account/AccountConnections.vue      | 112 ++++++++++++++++
 src/pages/Account/Alias/AliasCreateForm.vue   |  57 --------
 .../Account/Alias/Card/AliasBasicData.vue     |  36 ------
 src/pages/Account/Alias/Card/AliasCard.vue    |  32 -----
 .../Account/Alias/Card/AliasDescriptor.vue    |  93 -------------
 src/pages/Account/Alias/Card/AliasSummary.vue |  49 -------
 src/pages/Account/Alias/Card/AliasUsers.vue   | 122 ------------------
 src/pages/Account/locale/en.yml               |  16 +--
 src/pages/Account/locale/es.yml               |  16 +--
 src/router/modules/account.js                 |  12 +-
 src/router/modules/index.js                   |   2 -
 src/router/modules/mailAlias.js               |  57 --------
 src/router/routes.js                          |   2 -
 14 files changed, 128 insertions(+), 584 deletions(-)
 delete mode 100644 src/pages/Account/AccountAliasList.vue
 create mode 100644 src/pages/Account/AccountConnections.vue
 delete mode 100644 src/pages/Account/Alias/AliasCreateForm.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasBasicData.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasCard.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasDescriptor.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasSummary.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasUsers.vue
 delete mode 100644 src/router/modules/mailAlias.js

diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
deleted file mode 100644
index 896804484..000000000
--- a/src/pages/Account/AccountAliasList.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<script setup>
-import { useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
-
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import AliasSummary from './Alias/Card/AliasSummary.vue';
-import AliasCreateForm from './Alias/AliasCreateForm.vue';
-
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useStateStore } from 'stores/useStateStore';
-
-defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
-const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
-const router = useRouter();
-const stateStore = useStateStore();
-const aliasCreateDialogRef = ref(null);
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : { alias: { like: `%${value}%` } };
-    }
-};
-
-const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } });
-
-const openCreateModal = () => aliasCreateDialogRef.value.show();
-</script>
-
-<template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="AccountAliasList"
-                url="MailAliases"
-                :expr-builder="exprBuilder"
-                :label="t('mailAlias.search')"
-                :info="t('mailAlias.searchInfo')"
-            />
-        </Teleport>
-    </template>
-    <QPage class="flex justify-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                ref="paginateRef"
-                data-key="AccountAliasList"
-                url="MailAliases"
-                auto-load
-                :expr-builder="exprBuilder"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.alias"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('mailAlias.alias')" :value="row.alias">
-                            </VnLv>
-                            <VnLv
-                                :label="t('mailAlias.description')"
-                                :value="row.description"
-                            >
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AliasSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QDialog
-            ref="aliasCreateDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <AliasCreateForm />
-        </QDialog>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="add" color="primary" @click="openCreateModal()">
-                <QTooltip class="text-no-wrap">{{ t('mailAlias.newAlias') }}</QTooltip>
-            </QBtn>
-        </QPageSticky>
-    </QPage>
-</template>
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
new file mode 100644
index 000000000..931c925ce
--- /dev/null
+++ b/src/pages/Account/AccountConnections.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import { toDateTimeFormat } from 'src/filters/date.js';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+const filter = computed(() => ({
+    fields: ['id', 'created', 'userId'],
+    include: {
+        relation: 'user',
+        scope: {
+            fields: ['username'],
+        },
+    },
+    order: 'created DESC',
+}));
+
+const urlPath = 'AccessTokens';
+
+const refresh = () => paginateRef.value.fetch();
+
+const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
+
+const killSession = async (id) => {
+    try {
+        await axios.delete(`AccessTokens/${id}`);
+        paginateRef.value.fetch();
+        notify(t('Session killed'), 'positive');
+    } catch (error) {
+        console.error('Error killing session', error);
+    }
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AccessTokens"
+                ref="paginateRef"
+                :filter="filter"
+                :url="urlPath"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :key="row.id"
+                        :id="row.id"
+                        :title="row.user?.username"
+                        @click="navigate($event, row.id)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <div style="flex-direction: column; width: 100%">
+                                <VnLv
+                                    :label="t('connections.username')"
+                                    :value="row.user?.username"
+                                >
+                                </VnLv>
+                                <VnLv
+                                    :label="t('connections.created')"
+                                    :value="toDateTimeFormat(row.created)"
+                                >
+                                </VnLv>
+                            </div>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('connections.killSession')"
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('Session will be killed'),
+                                        t('Are you sure you want to continue?'),
+                                        () => killSession(row.id)
+                                    )
+                                "
+                                outline
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="refresh" color="primary" @click="refresh()">
+                <QTooltip>{{ t('connections.refresh') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Session killed: Sesión matada
+    Session will be killed: Se va a matar la sesión
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+</i18n>
diff --git a/src/pages/Account/Alias/AliasCreateForm.vue b/src/pages/Account/Alias/AliasCreateForm.vue
deleted file mode 100644
index d4d61a804..000000000
--- a/src/pages/Account/Alias/AliasCreateForm.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<script setup>
-import { useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
-import FormModelPopup from 'components/FormModelPopup.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import { useArrayData } from 'src/composables/useArrayData';
-
-const router = useRouter();
-const { t } = useI18n();
-const arrayData = useArrayData('AliasCreate');
-const { store } = arrayData;
-
-const defaultInitialData = {
-    alias: null,
-    description: null,
-};
-
-const onDataSaved = ({ id }) => {
-    router.push({ name: 'AliasBasicData', params: { id } });
-    store.data = null;
-};
-</script>
-
-<template>
-    <FormModelPopup
-        :title="t('Create alias')"
-        ref="formModelPopupRef"
-        url-create="MailAliases"
-        model="AliasCreate"
-        :form-initial-data="defaultInitialData"
-        @on-data-saved="onDataSaved"
-    >
-        <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('mailAlias.description')"
-                    />
-                </div>
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-    es:
-        Create alias: Crear alias
-</i18n>
diff --git a/src/pages/Account/Alias/Card/AliasBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
deleted file mode 100644
index 5d8062739..000000000
--- a/src/pages/Account/Alias/Card/AliasBasicData.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
-import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-const route = useRoute();
-const { t } = useI18n();
-</script>
-
-<template>
-    <FormModel :url="`MailAliases/${route.params.id}`" model="Alias" auto-load>
-        <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('mailAlias.description')"
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
-                </div>
-            </VnRow>
-        </template>
-    </FormModel>
-</template>
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
deleted file mode 100644
index 8b6c9c3cf..000000000
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import { computed } from 'vue';
-
-import VnCard from 'components/common/VnCard.vue';
-import AliasDescriptor from './AliasDescriptor.vue';
-
-const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => {
-    return routeName.value;
-});
-const searchBarDataKeys = {
-    AliasBasicData: 'AliasBasicData',
-    AliasUsers: 'AliasUsers',
-};
-</script>
-
-<template>
-    <VnCard
-        data-key="Alias"
-        :descriptor="AliasDescriptor"
-        :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
-        :search-redirect="!!customRouteRedirectName"
-        :searchbar-label="t('mailAlias.search')"
-        :searchbar-info="t('mailAlias.searchInfo')"
-    />
-</template>
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
deleted file mode 100644
index bc174aa0e..000000000
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-
-import useCardDescription from 'src/composables/useCardDescription';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
-
-const { t } = useI18n();
-const route = useRoute();
-const quasar = useQuasar();
-const router = useRouter();
-const { notify } = useNotify();
-
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
-
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
-
-const filter = {
-    where: { id: entityId },
-};
-
-const removeAlias = () => {
-    quasar
-        .dialog({
-            title: t('Alias will be removed'),
-            message: t('Are you sure you want to continue?'),
-            ok: {
-                push: true,
-                color: 'primary',
-            },
-            cancel: true,
-        })
-        .onOk(async () => {
-            try {
-                await axios.delete(`MailAliases/${entityId.value}`);
-                notify(t('Alias removed'), 'positive');
-                router.push({ name: 'AccountAlias' });
-            } catch (err) {
-                console.error('Error removing alias');
-            }
-        });
-};
-</script>
-
-<template>
-    <CardDescriptor
-        ref="descriptor"
-        url="MailAliases"
-        :filter="filter"
-        module="Account"
-        @on-fetch="setData"
-        data-key="aliasData"
-        :title="data.title"
-        :subtitle="data.subtitle"
-    >
-        <template #menu>
-            <QItem v-ripple clickable @click="removeAlias()">
-                <QItemSection>{{ t('Delete') }}</QItemSection>
-            </QItem>
-        </template>
-        <template #body="{ entity }">
-            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
-        </template>
-    </CardDescriptor>
-</template>
-
-<i18n>
-    en:
-        accountRate: Claming rate
-    es:
-        accountRate: Ratio de reclamación
-        Delete: Eliminar
-        Alias will be removed: El alias será eliminado
-        Are you sure you want to continue?: ¿Seguro que quieres continuar?
-        Alias removed: Alias eliminado
-</i18n>
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
deleted file mode 100644
index cedae28b7..000000000
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
-import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-
-import { useArrayData } from 'src/composables/useArrayData';
-
-const route = useRoute();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
-const { store } = useArrayData('Alias');
-const alias = ref(store.data);
-const entityId = computed(() => $props.id || route.params.id);
-</script>
-
-<template>
-    <CardSummary
-        ref="summary"
-        :url="`MailAliases/${entityId}`"
-        @on-fetch="(data) => (alias = data)"
-    >
-        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
-        <template #body>
-            <QCard class="vn-one">
-                <QCardSection class="q-pa-none">
-                    <router-link
-                        :to="{ name: 'AliasBasicData', params: { id: entityId } }"
-                        class="header header-link"
-                    >
-                        {{ t('globals.summary.basicData') }}
-                        <QIcon name="open_in_new" />
-                    </router-link>
-                </QCardSection>
-                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
-                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
-            </QCard>
-        </template>
-    </CardSummary>
-</template>
diff --git a/src/pages/Account/Alias/Card/AliasUsers.vue b/src/pages/Account/Alias/Card/AliasUsers.vue
deleted file mode 100644
index 4a9c449e4..000000000
--- a/src/pages/Account/Alias/Card/AliasUsers.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<script setup>
-import { useRoute } from 'vue-router';
-import { computed, ref, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnPaginate from 'components/ui/VnPaginate.vue';
-
-import { useVnConfirm } from 'composables/useVnConfirm';
-import { useArrayData } from 'composables/useArrayData';
-import useNotify from 'src/composables/useNotify.js';
-import axios from 'axios';
-
-const { t } = useI18n();
-const { notify } = useNotify();
-const route = useRoute();
-const { openConfirmationModal } = useVnConfirm();
-
-const paginateRef = ref(null);
-
-const arrayData = useArrayData('AliasUsers');
-const { store } = arrayData;
-
-const data = computed(() => {
-    const dataCopy = JSON.parse(JSON.stringify(store.data));
-    return dataCopy.sort((a, b) => a.user?.name.localeCompare(b.user?.name));
-});
-
-const filter = {
-    include: {
-        relation: 'user',
-        scope: {
-            fields: ['id', 'name'],
-        },
-    },
-};
-
-const urlPath = computed(() => `MailAliases/${route.params.id}/accounts`);
-
-const columns = computed(() => [
-    {
-        name: 'alias',
-    },
-    {
-        name: 'action',
-    },
-]);
-
-const deleteAlias = async (row) => {
-    try {
-        await axios.delete(`${urlPath.value}/${row.id}`);
-        notify(t('User removed'), 'positive');
-        fetchAliases();
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-watch(
-    () => route.params.id,
-    () => {
-        store.url = urlPath.value;
-        store.filter = filter;
-        fetchAliases();
-    }
-);
-
-const fetchAliases = () => paginateRef.value.fetch();
-</script>
-
-<template>
-    <QPage class="column items-center q-pa-md">
-        <div class="full-width" style="max-width: 400px">
-            <VnPaginate
-                ref="paginateRef"
-                data-key="AliasUsers"
-                :filter="filter"
-                :url="urlPath"
-                :limit="0"
-                auto-load
-            >
-                <template #body>
-                    <QTable :rows="data" :columns="columns" hide-header>
-                        <template #body="{ row }">
-                            <QTr>
-                                <QTd>
-                                    <span>{{ row.user?.name }}</span>
-                                </QTd>
-                                <QTd style="width: 50px !important">
-                                    <QIcon
-                                        name="delete"
-                                        size="sm"
-                                        class="cursor-pointer"
-                                        color="primary"
-                                        @click="
-                                            openConfirmationModal(
-                                                t('User will be removed from alias'),
-                                                t('Are you sure you want to continue?'),
-                                                () => deleteAlias(row)
-                                            )
-                                        "
-                                    >
-                                        <QTooltip>
-                                            {{ t('Delete') }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </QTd>
-                            </QTr>
-                        </template>
-                    </QTable>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-</template>
-
-<i18n>
-es:
-    User will be removed from alias: El usuario será borrado del alias
-    Are you sure you want to continue?: ¿Seguro que quieres continuar?
-    User removed: Usuario borrado
-    Delete: Eliminar
-</i18n>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index d90b3a383..aabe41ad8 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -41,17 +41,6 @@ role:
         description: Description
         id: Id
         name: Name
-mailAlias:
-    pageTitles:
-        aliasUsers: Users
-    search: Search mail alias
-    searchInfo: Search alias by id or name
-    alias: Alias
-    description: Description
-    id: Id
-    newAlias: New alias
-    name: Name
-    isPublic: Public
 ldap:
     enableSync: Enable synchronization
     server: Server
@@ -73,3 +62,8 @@ samba:
     verifyCertificate: Verify certificate
     testConnection: Test connection
     success: Samba connection established!
+connections:
+    refresh: Refresh
+    username: Username
+    created: Created
+    killSession: Kill session
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index e0a6cf29f..9018a34c4 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -52,17 +52,6 @@ role:
         description: Descripción
         id: Idd
         name: Nombre
-mailAlias:
-    pageTitles:
-        aliasUsers: Usuarios
-    search: Buscar alias de correo
-    searchInfo: Buscar alias por id o nombre
-    alias: Alias
-    description: Descripción
-    id: Id
-    newAlias: Nuevo alias
-    name: Nombre
-    isPublic: Público
 ldap:
     enableSync: Habilitar sincronización
     server: Servidor
@@ -83,3 +72,8 @@ samba:
     Verify certificate: Verificar certificado
     testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
+connections:
+    refresh: Actualizar
+    username: Nombre de usuario
+    created: Creado
+    killSession: Matar sesión
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index e13215afc..b78e1a191 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'AccountMain' },
     menus: {
-        main: ['AccountList', 'AccountAliasList'],
+        main: ['AccountList', 'AccountConnections'],
         card: [],
     },
     children: [
@@ -31,13 +31,13 @@ export default {
                     component: () => import('src/pages/Account/AccountList.vue'),
                 },
                 {
-                    path: 'alias-list',
-                    name: 'AccountAliasList',
+                    path: 'connections',
+                    name: 'AccountConnections',
                     meta: {
-                        title: 'alias',
-                        icon: 'email',
+                        title: 'connections',
+                        icon: 'check',
                     },
-                    component: () => import('src/pages/Account/AccountAliasList.vue'),
+                    component: () => import('src/pages/Account/AccountConnections.vue'),
                 },
             ],
         },
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index d69098a58..ca60c78d8 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -13,7 +13,6 @@ import Travel from './travel';
 import Order from './order';
 import Department from './department';
 import Role from './role';
-import mailAlias from './mailAlias';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
@@ -39,7 +38,6 @@ export default [
     invoiceIn,
     Department,
     Role,
-    mailAlias,
     Entry,
     roadmap,
     Parking,
diff --git a/src/router/modules/mailAlias.js b/src/router/modules/mailAlias.js
deleted file mode 100644
index 8e0f8abdc..000000000
--- a/src/router/modules/mailAlias.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { RouterView } from 'vue-router';
-
-export default {
-    path: 'account/alias',
-    name: 'Alias',
-    meta: {
-        title: 'alias',
-        icon: 'email',
-        moduleName: 'Alias',
-    },
-    component: RouterView,
-    redirect: { name: 'AccountAliasList' },
-    menus: {
-        main: [],
-        card: ['AliasBasicData', 'AliasUsers'],
-    },
-    children: [
-        {
-            name: 'AliasCard',
-            path: ':id',
-            component: () => import('src/pages/Account/Alias/Card/AliasCard.vue'),
-            redirect: { name: 'AliasSummary' },
-            children: [
-                {
-                    name: 'AliasSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Alias/Card/AliasSummary.vue'),
-                },
-                {
-                    name: 'AliasBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Alias/Card/AliasBasicData.vue'),
-                },
-                {
-                    name: 'AliasUsers',
-                    path: 'users',
-                    meta: {
-                        title: 'aliasUsers',
-                        icon: 'group',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Alias/Card/AliasUsers.vue'),
-                },
-            ],
-        },
-    ],
-};
diff --git a/src/router/routes.js b/src/router/routes.js
index 9d3dc8710..60cc24a75 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -11,7 +11,6 @@ import route from './modules/route';
 import travel from './modules/travel';
 import department from './modules/department';
 import role from './modules/role';
-import mailAlias from './modules/mailAlias';
 import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
@@ -77,7 +76,6 @@ const routes = [
             travel,
             department,
             role,
-            mailAlias,
             roadmap,
             entry,
             parking,

From f3ec9ea58d854e36d00f6d7193a7ca90bb672272 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 08:03:57 +0200
Subject: [PATCH 09/29] fix: VnPaginate order

---
 src/pages/Account/AccountConnections.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 931c925ce..4acdb597f 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -54,6 +54,7 @@ const killSession = async (id) => {
                 ref="paginateRef"
                 :filter="filter"
                 :url="urlPath"
+                order="created DESC"
                 auto-load
             >
                 <template #body="{ rows }">

From fe9adb7a3cb85d5b45f98b797df7793837961eb0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 08:09:05 +0200
Subject: [PATCH 10/29] perf: minor changes

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

diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 4acdb597f..f248685ae 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -37,7 +37,7 @@ const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } })
 
 const killSession = async (id) => {
     try {
-        await axios.delete(`AccessTokens/${id}`);
+        await axios.delete(`${urlPath}/${id}`);
         paginateRef.value.fetch();
         notify(t('Session killed'), 'positive');
     } catch (error) {
@@ -50,7 +50,7 @@ const killSession = async (id) => {
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
-                data-key="AccessTokens"
+                :data-key="urlPath"
                 ref="paginateRef"
                 :filter="filter"
                 :url="urlPath"
@@ -81,6 +81,7 @@ const killSession = async (id) => {
                         </template>
                         <template #actions>
                             <QBtn
+                                class="q-mt-xs"
                                 :label="t('connections.killSession')"
                                 @click.stop="
                                     openConfirmationModal(
@@ -90,7 +91,6 @@ const killSession = async (id) => {
                                     )
                                 "
                                 outline
-                                style="margin-top: 15px"
                             />
                         </template>
                     </CardList>

From f305cee3ce7d96fc6597cbf8a5f6b186b0d741a2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 6 Jun 2024 14:07:40 -0300
Subject: [PATCH 11/29] Account view forms

---
 src/pages/Account/AccountAccounts.vue | 111 ++++++++++++++++
 src/pages/Account/AccountLdap.vue     | 167 +++++++++++++++++++++++
 src/pages/Account/AccountSamba.vue    | 182 ++++++++++++++++++++++++++
 src/pages/Account/locale/en.yml       |  10 ++
 src/pages/Account/locale/es.yml       |  10 ++
 src/router/modules/account.js         |   5 +-
 6 files changed, 484 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Account/AccountAccounts.vue
 create mode 100644 src/pages/Account/AccountLdap.vue
 create mode 100644 src/pages/Account/AccountSamba.vue

diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
new file mode 100644
index 000000000..236790f8d
--- /dev/null
+++ b/src/pages/Account/AccountAccounts.vue
@@ -0,0 +1,111 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const onSynchronizeAll = async () => {
+    try {
+        notify(t('Synchronizing in the background'), 'positive');
+        await axios.patch(`Accounts/syncAll`);
+    } catch (error) {
+        console.error('Error synchronizing all accounts', error);
+    }
+};
+
+const onSynchronizeRoles = async () => {
+    try {
+        await axios.patch(`RoleInherits/sync`);
+        notify(t('Roles synchronized!'), 'positive');
+    } catch (error) {
+        console.error('Error synchronizing roles', error);
+    }
+};
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            :url="`AccountConfigs/${1}`"
+            :url-update="`AccountConfigs/${1}`"
+            model="AccountAccounts"
+            auto-load
+        >
+            <template #moreActions>
+                <QBtn
+                    round
+                    flat
+                    color="primary"
+                    :label="t('accounts.syncAll')"
+                    @click="onSynchronizeAll()"
+                />
+                <QBtn
+                    round
+                    flat
+                    color="primary"
+                    :label="t('accounts.syncRoles')"
+                    @click="onSynchronizeRoles()"
+                />
+            </template>
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput :label="t('accounts.homedir')" v-model="data.homedir" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput :label="t('accounts.shell')" v-model="data.shell" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        :label="t('accounts.idBase')"
+                        v-model="data.idBase"
+                        type="number"
+                        min="0"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        :label="t('accounts.min')"
+                        v-model="data.min"
+                        type="number"
+                        min="0"
+                    />
+                    <VnInput
+                        :label="t('accounts.max')"
+                        v-model="data.max"
+                        type="number"
+                        min="0"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        :label="t('accounts.warn')"
+                        v-model="data.warn"
+                        type="number"
+                        min="0"
+                    />
+                    <VnInput
+                        :label="t('accounts.inact')"
+                        v-model="data.inact"
+                        type="number"
+                        min="0"
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Roles synchronized!: ¡Roles sincronizados!
+    Synchronizing in the background: Sincronizando en segundo plano
+</i18n>
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
new file mode 100644
index 000000000..13356cee3
--- /dev/null
+++ b/src/pages/Account/AccountLdap.vue
@@ -0,0 +1,167 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    groupDn: null,
+    password: null,
+    rdn: null,
+    server: null,
+    userDn: null,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) customFn.value = deleteMailForward;
+        else customFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const urlCreate = ref(null);
+const urlUpdate = ref(null);
+const customFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`LdapConfigs/test`);
+        notify(t('LDAP connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialLdapConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(`LdapConfigs/${1}`);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        console.error('Error fetching initial LDAP config', error);
+        return null;
+    } finally {
+        if (hasData.value) {
+            urlUpdate.value = `LdapConfigs/${1}`;
+            urlCreate.value = null;
+        } else {
+            urlUpdate.value = null;
+            urlCreate.value = `LdapConfigs`;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(`LdapConfigs/${1}`);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialLdapConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar></VnSubToolbar>
+        <FormModel
+            :key="initialDataLoaded"
+            model="AccountLdap"
+            :form-initial-data="initialData"
+            :url-create="urlCreate"
+            :url-update="urlUpdate"
+            :save-fn="customFn"
+            auto-load
+            @on-data-saved="getInitialLdapConfig()"
+        >
+            <template #moreActions>
+                <QBtnGroup push class="q-gutter-x-sm">
+                    <QBtn
+                        round
+                        flat
+                        color="primary"
+                        :label="t('ldap.testConnection')"
+                        @click="onTestConection()"
+                    >
+                        <QTooltip>
+                            {{ t('ldap.testConnection') }}
+                        </QTooltip>
+                    </QBtn>
+                </QBtnGroup>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('ldap.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('ldap.server')"
+                        clearable
+                        v-model="data.server"
+                        :required="true"
+                        :rules="validate('LdapConfig.server')"
+                    />
+                    <VnInput
+                        :label="t('ldap.rdn')"
+                        clearable
+                        v-model="data.rdn"
+                        :required="true"
+                        :rules="validate('LdapConfig.rdn')"
+                    />
+                    <VnInput
+                        :label="t('ldap.password')"
+                        clearable
+                        type="password"
+                        v-model="data.password"
+                        :required="true"
+                        :rules="validate('LdapConfig.password')"
+                    />
+                    <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
+                    <VnInput
+                        :label="t('ldap.groupDN')"
+                        clearable
+                        v-model="data.groupDn"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    LDAP connection established!: ¡Conexión con LDAP establecida!
+</i18n>
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
new file mode 100644
index 000000000..0a6bd2e10
--- /dev/null
+++ b/src/pages/Account/AccountSamba.vue
@@ -0,0 +1,182 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const formModel = ref(null);
+const DEFAULT_DATA = {
+    id: 1,
+    hasData: false,
+    adDomain: null,
+    adController: null,
+    adUser: null,
+    adPassword: null,
+    userDn: null,
+    verifyCert: false,
+};
+
+const initialData = ref({
+    ...DEFAULT_DATA,
+});
+
+const hasData = computed({
+    get: () => initialData.value.hasData,
+    set: (val) => {
+        initialData.value.hasData = val;
+        if (!val) customFn.value = deleteMailForward;
+        else customFn.value = null;
+    },
+});
+
+const initialDataLoaded = ref(false);
+const urlCreate = ref(null);
+const urlUpdate = ref(null);
+const customFn = ref(null);
+
+const onTestConection = async () => {
+    try {
+        await axios.get(`SambaConfigs/test`);
+        notify(t('Samba connection established!'), 'positive');
+    } catch (error) {
+        console.error('Error testing connection', error);
+    }
+};
+
+const getInitialLdapConfig = async () => {
+    try {
+        initialDataLoaded.value = false;
+        const { data } = await axios.get(`SambaConfigs/${1}`);
+        initialData.value = data;
+        hasData.value = true;
+        return data;
+    } catch (error) {
+        hasData.value = false;
+        console.error('Error fetching initial LDAP config', error);
+        return null;
+    } finally {
+        if (hasData.value) {
+            urlUpdate.value = `SambaConfigs/${1}`;
+            urlCreate.value = null;
+        } else {
+            urlUpdate.value = null;
+            urlCreate.value = `SambaConfigs`;
+        }
+        initialDataLoaded.value = true;
+    }
+};
+
+const deleteMailForward = async () => {
+    try {
+        await axios.delete(`SambaConfigs/${1}`);
+        initialData.value = { ...DEFAULT_DATA };
+        hasData.value = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error deleting mail forward', err);
+    }
+};
+
+onMounted(async () => await getInitialLdapConfig());
+</script>
+
+<template>
+    <QPage>
+        <VnSubToolbar></VnSubToolbar>
+        <FormModel
+            ref="formModel"
+            :key="initialDataLoaded"
+            model="AccountSamba"
+            :form-initial-data="initialData"
+            :url-create="urlCreate"
+            :url-update="urlUpdate"
+            :save-fn="customFn"
+            auto-load
+            @on-data-saved="getInitialLdapConfig()"
+        >
+            <template #moreActions>
+                <QBtnGroup push class="q-gutter-x-sm">
+                    <QBtn
+                        round
+                        flat
+                        color="primary"
+                        :label="t('ldap.testConnection')"
+                        :disable="formModel.hasChanges"
+                        @click="onTestConection()"
+                    >
+                        <QTooltip>
+                            {{ t('ldap.testConnection') }}
+                        </QTooltip>
+                    </QBtn>
+                </QBtnGroup>
+            </template>
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('ldap.enableSync')"
+                            v-model="data.hasData"
+                            @update:model-value="($event) => (hasData = $event)"
+                            :toggle-indeterminate="false"
+                        />
+                    </div>
+                </VnRow>
+                <template v-if="hasData">
+                    <VnInput
+                        :label="t('samba.domainAD')"
+                        clearable
+                        v-model="data.adDomain"
+                        :required="true"
+                        :rules="validate('SambaConfigs.server')"
+                    />
+                    <VnInput
+                        :label="t('samba.domainController')"
+                        clearable
+                        v-model="data.adController"
+                        :required="true"
+                        :rules="validate('SambaConfigs.adController')"
+                    />
+                    <VnInput
+                        :label="t('samba.userAD')"
+                        clearable
+                        v-model="data.adUser"
+                        :rules="validate('SambaConfigs.adUser')"
+                    />
+                    <VnInput
+                        :label="t('samba.passwordAD')"
+                        clearable
+                        type="password"
+                        v-model="data.adPassword"
+                    />
+                    <VnInput
+                        :label="t('samba.domainPart')"
+                        clearable
+                        v-model="data.userDn"
+                        :required="true"
+                        :rules="validate('SambaConfigs.userDn')"
+                    />
+                    <QCheckbox
+                        :label="t('samba.verifyCertificate')"
+                        v-model="data.verifyCert"
+                        :rules="validate('SambaConfigs.groupDn')"
+                        :toggle-indeterminate="false"
+                    />
+                </template>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Samba connection established!: ¡Conexión con LDAP establecida!
+</i18n>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index 0a511888b..83b98b528 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -65,3 +65,13 @@ samba:
     verifyCertificate: Verify certificate
     testConnection: Test connection
     success: Samba connection established!
+accounts:
+    homedir: Homedir base
+    shell: Shell
+    idBase: User and role base id
+    min: Min
+    max: Max
+    warn: Warn
+    inact: Inact
+    syncAll: Synchronize all
+    syncRoles: Synchronize roles
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index f339f71ca..ff572b2cc 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -76,3 +76,13 @@ samba:
     Verify certificate: Verificar certificado
     testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
+accounts:
+    homedir: Directorio base para carpetas de usuario
+    shell: Intérprete de línea de comandos
+    idBase: Id base usuarios y roles
+    min: Min
+    max: Max
+    warn: Warn
+    inact: Inact
+    syncAll: Sincronizar todo
+    syncRoles: Sincronizar roles
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index 4bcf33d85..8020f0865 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'AccountMain' },
     menus: {
-        main: ['AccountRoles'],
+        main: ['AccountRoles', 'AccountAccounts', 'AccountLdap', 'AccountSamba'],
         card: [],
     },
     children: [
@@ -54,6 +54,7 @@ export default {
                     meta: {
                         title: 'accounts',
                         icon: 'accessibility',
+                        roles: ['itManagement'],
                     },
                     component: () => import('src/pages/Account/AccountAccounts.vue'),
                 },
@@ -63,6 +64,7 @@ export default {
                     meta: {
                         title: 'ldap',
                         icon: 'account_tree',
+                        roles: ['itManagement'],
                     },
                     component: () => import('src/pages/Account/AccountLdap.vue'),
                 },
@@ -72,6 +74,7 @@ export default {
                     meta: {
                         title: 'samba',
                         icon: 'preview',
+                        roles: ['itManagement'],
                     },
                     component: () => import('src/pages/Account/AccountSamba.vue'),
                 },

From 17924dfeb376077886a883af5fc7a272e9cd5b9d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 23:39:38 +0200
Subject: [PATCH 12/29] fix: styles and i18n

---
 src/pages/Account/AccountAccounts.vue |  5 +----
 src/pages/Account/AccountLdap.vue     | 14 ++++++--------
 src/pages/Account/AccountSamba.vue    | 14 ++++++--------
 src/pages/Account/locale/en.yml       |  1 +
 src/pages/Account/locale/es.yml       |  3 ++-
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
index 236790f8d..ebca1c3db 100644
--- a/src/pages/Account/AccountAccounts.vue
+++ b/src/pages/Account/AccountAccounts.vue
@@ -42,15 +42,12 @@ const onSynchronizeRoles = async () => {
         >
             <template #moreActions>
                 <QBtn
-                    round
-                    flat
+                    style="margin-left: 0"
                     color="primary"
                     :label="t('accounts.syncAll')"
                     @click="onSynchronizeAll()"
                 />
                 <QBtn
-                    round
-                    flat
                     color="primary"
                     :label="t('accounts.syncRoles')"
                     @click="onSynchronizeRoles()"
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 13356cee3..f41d040b8 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -38,7 +38,7 @@ const hasData = computed({
 
 const initialDataLoaded = ref(false);
 const urlCreate = ref(null);
-const urlUpdate = ref(null);
+const urlUpdate = ref(`LdapConfigs/${1}`);
 const customFn = ref(null);
 
 const onTestConection = async () => {
@@ -53,7 +53,7 @@ const onTestConection = async () => {
 const getInitialLdapConfig = async () => {
     try {
         initialDataLoaded.value = false;
-        const { data } = await axios.get(`LdapConfigs/${1}`);
+        const { data } = await axios.get(urlUpdate.value);
         initialData.value = data;
         hasData.value = true;
         return data;
@@ -62,10 +62,8 @@ const getInitialLdapConfig = async () => {
         console.error('Error fetching initial LDAP config', error);
         return null;
     } finally {
-        if (hasData.value) {
-            urlUpdate.value = `LdapConfigs/${1}`;
-            urlCreate.value = null;
-        } else {
+        if (hasData.value) urlCreate.value = null;
+        else {
             urlUpdate.value = null;
             urlCreate.value = `LdapConfigs`;
         }
@@ -75,7 +73,7 @@ const getInitialLdapConfig = async () => {
 
 const deleteMailForward = async () => {
     try {
-        await axios.delete(`LdapConfigs/${1}`);
+        await axios.delete(urlUpdate.value);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
@@ -89,7 +87,7 @@ onMounted(async () => await getInitialLdapConfig());
 
 <template>
     <QPage>
-        <VnSubToolbar></VnSubToolbar>
+        <VnSubToolbar />
         <FormModel
             :key="initialDataLoaded"
             model="AccountLdap"
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 0a6bd2e10..f76d2fbc5 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -40,7 +40,7 @@ const hasData = computed({
 
 const initialDataLoaded = ref(false);
 const urlCreate = ref(null);
-const urlUpdate = ref(null);
+const urlUpdate = ref(`SambaConfigs/${1}`);
 const customFn = ref(null);
 
 const onTestConection = async () => {
@@ -55,7 +55,7 @@ const onTestConection = async () => {
 const getInitialLdapConfig = async () => {
     try {
         initialDataLoaded.value = false;
-        const { data } = await axios.get(`SambaConfigs/${1}`);
+        const { data } = await axios.get(urlUpdate.value);
         initialData.value = data;
         hasData.value = true;
         return data;
@@ -64,10 +64,8 @@ const getInitialLdapConfig = async () => {
         console.error('Error fetching initial LDAP config', error);
         return null;
     } finally {
-        if (hasData.value) {
-            urlUpdate.value = `SambaConfigs/${1}`;
-            urlCreate.value = null;
-        } else {
+        if (hasData.value) urlCreate.value = null;
+        else {
             urlUpdate.value = null;
             urlCreate.value = `SambaConfigs`;
         }
@@ -77,7 +75,7 @@ const getInitialLdapConfig = async () => {
 
 const deleteMailForward = async () => {
     try {
-        await axios.delete(`SambaConfigs/${1}`);
+        await axios.delete(urlUpdate.value);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
@@ -91,7 +89,7 @@ onMounted(async () => await getInitialLdapConfig());
 
 <template>
     <QPage>
-        <VnSubToolbar></VnSubToolbar>
+        <VnSubToolbar />
         <FormModel
             ref="formModel"
             :key="initialDataLoaded"
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index 83b98b528..045eec3b1 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -54,6 +54,7 @@ ldap:
     groupDN: Group DN
     testConnection: Test connection
     success: LDAP connection established!
+    password: Password
 samba:
     enableSync: Enable synchronization
     domainController: Domain controller
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index ff572b2cc..5c53b841c 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -57,6 +57,7 @@ role:
     name: Nombre
     description: Descripción
 ldap:
+    password: Contraseña
     enableSync: Habilitar sincronización
     server: Servidor
     rdn: RDN
@@ -73,7 +74,7 @@ samba:
     userAD: Usuario AD
     passwordAD: Contraseña AD
     domainPart: DN usuarios (sin la parte del dominio)
-    Verify certificate: Verificar certificado
+    verifyCertificate: Verificar certificado
     testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
 accounts:

From fe3ad9dc081c7722763ce2e5077e4f91a523077a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 23:40:52 +0200
Subject: [PATCH 13/29] fix: styles and i18n

---
 src/pages/Account/AccountLdap.vue  | 2 +-
 src/pages/Account/AccountSamba.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index f41d040b8..d64bb90ba 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -114,7 +114,7 @@ onMounted(async () => await getInitialLdapConfig());
                 </QBtnGroup>
             </template>
             <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
                             :label="t('ldap.enableSync')"
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index f76d2fbc5..20234f468 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -118,7 +118,7 @@ onMounted(async () => await getInitialLdapConfig());
                 </QBtnGroup>
             </template>
             <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
                             :label="t('ldap.enableSync')"

From e178778264dc3704ccdc709b0b51e0da3c0482d1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 23:46:26 +0200
Subject: [PATCH 14/29] fix: styles

---
 src/pages/Account/AccountAccounts.vue       |  2 +-
 src/pages/Account/AccountLdap.vue           | 23 +++++++++----------
 src/pages/Account/AccountSamba.vue          | 25 +++++++++------------
 src/pages/Worker/Card/WorkerTimeControl.vue |  2 +-
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
index ebca1c3db..65d5d5a9d 100644
--- a/src/pages/Account/AccountAccounts.vue
+++ b/src/pages/Account/AccountAccounts.vue
@@ -42,7 +42,7 @@ const onSynchronizeRoles = async () => {
         >
             <template #moreActions>
                 <QBtn
-                    style="margin-left: 0"
+                    class="q-ml-none"
                     color="primary"
                     :label="t('accounts.syncAll')"
                     @click="onSynchronizeAll()"
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index d64bb90ba..637788314 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -99,19 +99,16 @@ onMounted(async () => await getInitialLdapConfig());
             @on-data-saved="getInitialLdapConfig()"
         >
             <template #moreActions>
-                <QBtnGroup push class="q-gutter-x-sm">
-                    <QBtn
-                        round
-                        flat
-                        color="primary"
-                        :label="t('ldap.testConnection')"
-                        @click="onTestConection()"
-                    >
-                        <QTooltip>
-                            {{ t('ldap.testConnection') }}
-                        </QTooltip>
-                    </QBtn>
-                </QBtnGroup>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('ldap.testConnection')"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('ldap.testConnection') }}
+                    </QTooltip>
+                </QBtn>
             </template>
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md">
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 20234f468..53ace6029 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -102,20 +102,17 @@ onMounted(async () => await getInitialLdapConfig());
             @on-data-saved="getInitialLdapConfig()"
         >
             <template #moreActions>
-                <QBtnGroup push class="q-gutter-x-sm">
-                    <QBtn
-                        round
-                        flat
-                        color="primary"
-                        :label="t('ldap.testConnection')"
-                        :disable="formModel.hasChanges"
-                        @click="onTestConection()"
-                    >
-                        <QTooltip>
-                            {{ t('ldap.testConnection') }}
-                        </QTooltip>
-                    </QBtn>
-                </QBtnGroup>
+                <QBtn
+                    class="q-ml-none"
+                    color="primary"
+                    :label="t('ldap.testConnection')"
+                    :disable="formModel.hasChanges"
+                    @click="onTestConection()"
+                >
+                    <QTooltip>
+                        {{ t('ldap.testConnection') }}
+                    </QTooltip>
+                </QBtn>
             </template>
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md">
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index d9a650d9a..f466c4f9a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -460,7 +460,7 @@ onMounted(async () => {
                     style="margin-left: 1px"
                 />
             </QBtnGroup>
-            <QBtnGroup push class="q-gutter-x-sm" flat style="margin-left: 0px">
+            <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
                     v-if="reason && state && (isHimSelf || isHr)"
                     :label="t('Reason')"

From a26401d8eb0551908e550944337917f0d09e9dc3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 23:51:45 +0200
Subject: [PATCH 15/29] feat: hide ID

---
 src/components/ui/CardList.vue           | 2 +-
 src/pages/Account/AccountConnections.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ui/CardList.vue b/src/components/ui/CardList.vue
index e8392b13e..c9b062457 100644
--- a/src/components/ui/CardList.vue
+++ b/src/components/ui/CardList.vue
@@ -28,7 +28,7 @@ const toggleCardCheck = (item) => {
                         <div class="title text-primary text-weight-bold text-h5">
                             {{ $props.title }}
                         </div>
-                        <QChip class="q-chip-color" outline size="sm">
+                        <QChip v-if="$props.id" class="q-chip-color" outline size="sm">
                             {{ t('ID') }}: {{ $props.id }}
                         </QChip>
                     </div>
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index f248685ae..83e089f25 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -60,7 +60,6 @@ const killSession = async (id) => {
                 <template #body="{ rows }">
                     <CardList
                         :key="row.id"
-                        :id="row.id"
                         :title="row.user?.username"
                         @click="navigate($event, row.id)"
                         v-for="row of rows"

From 9ceac32d8986d1388bd8d8a6fa0ec0e890291f3c Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Fri, 7 Jun 2024 11:59:26 +0200
Subject: [PATCH 16/29] feat: refs #7548 grafana

---
 src/i18n/locale/en.yml                  |  1 +
 src/i18n/locale/es.yml                  |  1 +
 src/pages/Ticket/Card/TicketSummary.vue | 14 ++++++++++++++
 3 files changed, 16 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 85f78a7ee..725df7985 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -470,6 +470,7 @@ ticket:
         agency: Agency
         zone: Zone
         warehouse: Warehouse
+        collection: Collection
         route: Route
         invoice: Invoice
         shipped: Shipped
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ae3f24e51..9b6c9b922 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -468,6 +468,7 @@ ticket:
         agency: Agencia
         zone: Zona
         warehouse: Almacén
+        collection: Colección
         route: Ruta
         invoice: Factura
         shipped: Enviado
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index f55669619..7c4d8f821 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -35,6 +35,7 @@ const ticket = ref();
 const salesLines = ref(null);
 const editableStates = ref([]);
 const ticketUrl = ref();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -159,6 +160,19 @@ async function changeState(value) {
                     :label="t('ticket.summary.warehouse')"
                     :value="ticket.warehouse?.name"
                 />
+                <VnLv
+                    :label="t('ticket.summary.collection')"
+                    :value="ticket.ticketCollections[0]?.collectionFk"
+                >
+                    <template #value>
+                        <a
+                            :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${ticket.ticketCollections[0]?.collectionFk}`"
+                            target="_blank"
+                        >
+                            {{ ticket.ticketCollections[0]?.collectionFk }}
+                        </a>
+                    </template>
+                </VnLv>
                 <VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" />
                 <VnLv :label="t('ticket.summary.invoice')">
                     <template #value>

From 1e67a0feca408375ecf591a734ff33912971c88f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 7 Jun 2024 09:35:36 -0300
Subject: [PATCH 17/29] Make AccountLdap work again

---
 src/pages/Account/AccountLdap.vue | 37 +++++++++++++++++++------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 637788314..411c1e702 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -7,12 +7,17 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
+import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
 const { t } = useI18n();
 const { notify } = useNotify();
 
+const arrayData = useArrayData('AccountLdap');
+
+const URL_UPDATE = `LdapConfigs/${1}`;
+const URL_CREATE = `LdapConfigs`;
 const DEFAULT_DATA = {
     id: 1,
     hasData: false,
@@ -31,15 +36,15 @@ const hasData = computed({
     get: () => initialData.value.hasData,
     set: (val) => {
         initialData.value.hasData = val;
-        if (!val) customFn.value = deleteMailForward;
-        else customFn.value = null;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
     },
 });
 
 const initialDataLoaded = ref(false);
-const urlCreate = ref(null);
-const urlUpdate = ref(`LdapConfigs/${1}`);
-const customFn = ref(null);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(`LdapConfigs/${1}`);
+const formCustomFn = ref(null);
 
 const onTestConection = async () => {
     try {
@@ -53,19 +58,23 @@ const onTestConection = async () => {
 const getInitialLdapConfig = async () => {
     try {
         initialDataLoaded.value = false;
-        const { data } = await axios.get(urlUpdate.value);
+        const { data } = await axios.get(URL_UPDATE);
         initialData.value = data;
         hasData.value = true;
         return data;
     } catch (error) {
         hasData.value = false;
+        arrayData.destroy();
         console.error('Error fetching initial LDAP config', error);
         return null;
     } finally {
-        if (hasData.value) urlCreate.value = null;
-        else {
-            urlUpdate.value = null;
-            urlCreate.value = `LdapConfigs`;
+        // Si asignamos un valor a urlUpdate, debemos asignar null a urlCreate y viceversa, ya puede causar problemas en formModel
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
         }
         initialDataLoaded.value = true;
     }
@@ -73,7 +82,7 @@ const getInitialLdapConfig = async () => {
 
 const deleteMailForward = async () => {
     try {
-        await axios.delete(urlUpdate.value);
+        await axios.delete(URL_UPDATE);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
@@ -92,9 +101,9 @@ onMounted(async () => await getInitialLdapConfig());
             :key="initialDataLoaded"
             model="AccountLdap"
             :form-initial-data="initialData"
-            :url-create="urlCreate"
-            :url-update="urlUpdate"
-            :save-fn="customFn"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
             auto-load
             @on-data-saved="getInitialLdapConfig()"
         >

From fa4a18fbbb34d7f9b8d241d8736bd9f3176e59f9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 7 Jun 2024 09:46:04 -0300
Subject: [PATCH 18/29] make account samba work again

---
 src/pages/Account/AccountLdap.vue  |  2 +-
 src/pages/Account/AccountSamba.vue | 52 ++++++++++++++++++------------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 411c1e702..77c4d89f8 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -43,7 +43,7 @@ const hasData = computed({
 
 const initialDataLoaded = ref(false);
 const formUrlCreate = ref(null);
-const formUrlUpdate = ref(`LdapConfigs/${1}`);
+const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 
 const onTestConection = async () => {
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 53ace6029..25428a674 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -7,13 +7,20 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
+import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
 const { t } = useI18n();
 const { notify } = useNotify();
 
+const arrayData = useArrayData('AccountSamba');
+
 const formModel = ref(null);
+
+const URL_UPDATE = `SambaConfigs/${1}`;
+const URL_CREATE = `SambaConfigs`;
+
 const DEFAULT_DATA = {
     id: 1,
     hasData: false,
@@ -33,15 +40,15 @@ const hasData = computed({
     get: () => initialData.value.hasData,
     set: (val) => {
         initialData.value.hasData = val;
-        if (!val) customFn.value = deleteMailForward;
-        else customFn.value = null;
+        if (!val) formCustomFn.value = deleteMailForward;
+        else formCustomFn.value = null;
     },
 });
 
 const initialDataLoaded = ref(false);
-const urlCreate = ref(null);
-const urlUpdate = ref(`SambaConfigs/${1}`);
-const customFn = ref(null);
+const formUrlCreate = ref(null);
+const formUrlUpdate = ref(null);
+const formCustomFn = ref(null);
 
 const onTestConection = async () => {
     try {
@@ -52,22 +59,25 @@ const onTestConection = async () => {
     }
 };
 
-const getInitialLdapConfig = async () => {
+const getInitialSambaConfig = async () => {
     try {
         initialDataLoaded.value = false;
-        const { data } = await axios.get(urlUpdate.value);
+        const { data } = await axios.get(URL_UPDATE);
         initialData.value = data;
         hasData.value = true;
         return data;
     } catch (error) {
         hasData.value = false;
-        console.error('Error fetching initial LDAP config', error);
+        arrayData.destroy();
+        console.error('Error fetching initial Samba config', error);
         return null;
     } finally {
-        if (hasData.value) urlCreate.value = null;
-        else {
-            urlUpdate.value = null;
-            urlCreate.value = `SambaConfigs`;
+        if (hasData.value) {
+            formUrlUpdate.value = URL_UPDATE;
+            formUrlCreate.value = null;
+        } else {
+            formUrlUpdate.value = null;
+            formUrlCreate.value = URL_CREATE;
         }
         initialDataLoaded.value = true;
     }
@@ -75,7 +85,7 @@ const getInitialLdapConfig = async () => {
 
 const deleteMailForward = async () => {
     try {
-        await axios.delete(urlUpdate.value);
+        await axios.delete(URL_UPDATE);
         initialData.value = { ...DEFAULT_DATA };
         hasData.value = false;
         notify(t('globals.dataSaved'), 'positive');
@@ -84,7 +94,7 @@ const deleteMailForward = async () => {
     }
 };
 
-onMounted(async () => await getInitialLdapConfig());
+onMounted(async () => await getInitialSambaConfig());
 </script>
 
 <template>
@@ -95,22 +105,22 @@ onMounted(async () => await getInitialLdapConfig());
             :key="initialDataLoaded"
             model="AccountSamba"
             :form-initial-data="initialData"
-            :url-create="urlCreate"
-            :url-update="urlUpdate"
-            :save-fn="customFn"
+            :url-create="formUrlCreate"
+            :url-update="formUrlUpdate"
+            :save-fn="formCustomFn"
             auto-load
-            @on-data-saved="getInitialLdapConfig()"
+            @on-data-saved="getInitialSambaConfig()"
         >
             <template #moreActions>
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('ldap.testConnection')"
+                    :label="t('samba.testConnection')"
                     :disable="formModel.hasChanges"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('ldap.testConnection') }}
+                        {{ t('samba.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -118,7 +128,7 @@ onMounted(async () => await getInitialLdapConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('ldap.enableSync')"
+                            :label="t('samba.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"

From 3f94eabc3d9e725baf8272fc470ac62e308f33cc Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 10 Jun 2024 14:47:43 +0200
Subject: [PATCH 19/29] =?UTF-8?q?feat:=20refs=20#7548=20a=C3=B1ado=20link?=
 =?UTF-8?q?=20grafana?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Ticket/Card/TicketSummary.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 7c4d8f821..0715cf7ba 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -168,6 +168,7 @@ async function changeState(value) {
                         <a
                             :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${ticket.ticketCollections[0]?.collectionFk}`"
                             target="_blank"
+                            class="grafana"
                         >
                             {{ ticket.ticketCollections[0]?.collectionFk }}
                         </a>
@@ -501,4 +502,7 @@ async function changeState(value) {
 .fetched-tags {
     max-width: 70%;
 }
+.grafana {
+    color: $primary-light;
+}
 </style>

From 1b82ca9243b26956b05fd30ccd388fc60caf9dfc Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 10 Jun 2024 15:55:22 +0200
Subject: [PATCH 20/29] feat: add changelog

---
 CHANGELOG.md | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 changelog.sh | 34 ++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 changelog.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 250aa01a2..0eb5912c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,100 @@
+# Version 24.24 - 2024-06-11
+
+### Added 🆕
+
+-   feat: 6942 hashtag in key : value summary by:jgallego
+-   feat: #6957: Rename FetchedTags instance tag by:Javier Segarra
+-   feat: refactor template by:Javier Segarra
+-   feat: refs #6600 Add option to add comment for photo motivation by:jorgep
+-   feat: refs #6942 test e2e tobook & toUnbook by:jorgep
+-   feat: refs #6942 to book summary button & reactive value by:jorgep
+-   feat: refs #6942 to unbook by:jorgep
+-   feat: refs #6942 url update by:jorgep
+-   feat: refs #6942 use correct currency in InvoiceIn components by:jorgep
+-   feat: refs #6942 vat rate total by:jorgep
+-   feat: refs #7494 new icons (7494-icons) by:alexm
+-   feat: refs #7494 new icons by:alexm
+-   feat: refs #7542 drop space by:jorgep
+-   feat: refs #7542 empty by:jorgep
+-   fix: refs #6942 changes and new features by:jorgep
+-   fix: style by:Javier Segarra
+-   style: color transparent when is fetive by:Javier Segarra
+-   style: fix color when is empty by:Javier Segarra
+-   style: reset poc style (6957_refactorFetechedTags) by:Javier Segarra
+-   style: reset poc style by:Javier Segarra
+-   style updates by:Javier Segarra
+
+### Changed 📦
+
+-   feat: refactor template by:Javier Segarra
+-   perf: 6957 add color as new shared variable by:Javier Segarra
+-   perf: 6957 change fetchedTags color by:Javier Segarra
+-   perf: remove local tree variable by:Javier Segarra
+-   refactor: add flat by:alexm
+-   refactor: refs #6600 replace QInput to VnInput by:jorgep
+-   refactor: refs #6652 improved defaulter section by:Jon
+-   refactor: refs #6942 Fix getTotalAmount function to correctly calculate the total amount in InvoiceInDueDay.vue by:jorgep
+-   refactor: refs #6942 new summary layout by:jorgep
+-   refactor: refs #6942 store key & actions by:jorgep
+-   refactor: refs #6942 summary by:jorgep
+-   refactor: refs #6942 use router hook by:jorgep
+-   refactor: refs #6942 WIP summary layout by:jorgep
+
+### Fixed 🛠️
+
+-   fix: 9-12 by:Javier Segarra
+-   fix: defaulter icon by:alexm
+-   fix: refs #5186 validation by:jorgep
+-   fix: refs #6095 add reFfk null on search by:pablone
+-   fix: refs #6942 cardDescriptor use store if its popup or different source data by:jorgep
+-   fix: refs #6942 changes and new features by:jorgep
+-   fix: refs #6942 drop comments by:jorgep
+-   fix: refs #6942 drop console by:jorgep
+-   fix: refs #6942 drop console.log by:jorgep
+-   fix: refs #6942 e2e test (origin/6942-warmfix-fixFormModel) by:jorgep
+-   fix: refs #6942 e2e tests by:jorgep
+-   fix: refs #6942 e2e tests by:jorgep
+-   fix: refs #6942 fix emit on data saved by:jorgep
+-   fix: refs #6942 fix emit on reset by:jorgep
+-   fix: refs #6942 fix vncard by:jorgep
+-   fix: refs #6942 formModel & CardDescriptor by:jorgep
+-   fix: refs #6942 formModel watch changes & invoiceInCreate by:jorgep
+-   fix: refs #6942 import by:jorgep
+-   fix: refs #6942 reloading by:jorgep
+-   fix: refs #6942 rollback by:jorgep
+-   fix: refs #6942 selectable expense by:jorgep
+-   fix: refs #6942 skip e2e tests by:jorgep
+-   fix: refs #6942 table bottom highlight & drop isBooked field by:jorgep
+-   fix: refs #6942 tests e2e by:jorgep
+-   fix: refs #6942 tests & summary table spacing by:jorgep
+-   fix: refs #6942 unit tests by:jorgep
+-   fix: refs #6942 vnLocation by:jorgep
+-   fix: refs #6942 wip: formModel by:jorgep
+-   fix: refs #7542 use right panel by:jorgep
+-   fix: searchbar redirect by:alexm
+-   fix: style by:Javier Segarra
+-   fix: WorkerCalendarItem by:Javier Segarra
+-   mini fix by:wbuezas
+-   refs #6111 clean code fix changes by:carlossa
+-   refs #6111 fix merge, fix column by:carlossa
+-   refs #6111 fix qtable, actions, scroll by:carlossa
+-   refs #6111 fix routeList by:carlossa
+-   refs #6111 fix sticky by:carlossa
+-   refs #6111 fix trad remove logs by:carlossa
+-   refs #6111 fix visibleColumns by:carlossa
+-   refs #6111 routeList fix by:carlossa
+-   refs #6332 fix calendar by:carlossa
+-   refs #6332 fix colors by:carlossa
+-   refs #6332 fix festive by:carlossa
+-   refs #6820 fix BasicData Tickets by:carlossa
+-   refs #6820 fix error front by:carlossa
+-   refs #6820 fix traduction by:carlossa
+-   refs #7391 fix textarea by:carlossa
+-   refs #7396 fix summary by:carlossa
+-   Search childs fix by:wbuezas
+-   small fix by:wbuezas
+-   style: fix color when is empty by:Javier Segarra
+
 # Changelog
 
 All notable changes to this project will be documented in this file.
diff --git a/changelog.sh b/changelog.sh
new file mode 100644
index 000000000..8cd7b4716
--- /dev/null
+++ b/changelog.sh
@@ -0,0 +1,34 @@
+features_types=(chore feat style)
+changes_types=(refactor perf)
+fix_types=(fix revert)
+file="CHANGELOG.md"
+file_tmp="temp_log.txt"
+file_current_tmp="temp_current_log.txt"
+
+setType(){
+    echo "### $1" >> $file_tmp
+    arr=("$@")
+    echo "" > $file_current_tmp
+    for i in "${arr[@]}"
+    do
+        git log --grep="$i" --oneline --no-merges --format="- %s %d by:%an" master..test >> $file_current_tmp
+    done
+    # remove duplicates
+    sort -o $file_current_tmp -u $file_current_tmp
+    cat $file_current_tmp >> $file_tmp
+    echo "" >> $file_tmp
+    # remove tmp current file
+    [ -e $file_current_tmp ] && rm $file_current_tmp
+}
+
+echo "# Version XX.XX - XXXX-XX-XX" >> $file_tmp
+echo "" >> $file_tmp
+
+setType "Added 🆕" "${features_types[@]}"
+setType "Changed 📦" "${changes_types[@]}"
+setType "Fixed 🛠️" "${fix_types[@]}"
+
+cat $file >> $file_tmp
+mv $file_tmp $file
+
+

From c1df20a09b3fcdcecc3325ca0464f143b1e0fa26 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 10 Jun 2024 11:21:23 -0300
Subject: [PATCH 21/29] Worker descriptor menu

---
 src/components/common/VnInput.vue             |  9 ++
 .../Worker/Card/WorkerChangePasswordForm.vue  | 99 +++++++++++++++++++
 src/pages/Worker/Card/WorkerDescriptor.vue    | 68 +++++++++++++
 src/pages/Worker/locale/en.yml                |  1 +
 src/pages/Worker/locale/es.yml                |  1 +
 5 files changed, 178 insertions(+)
 create mode 100644 src/pages/Worker/Card/WorkerChangePasswordForm.vue
 create mode 100644 src/pages/Worker/locale/en.yml

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 6144f975d..c84a55122 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -13,6 +13,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    info: {
+        type: String,
+        default: '',
+    },
 });
 
 const { t } = useI18n();
@@ -83,6 +87,11 @@ const inputRules = [
                     v-if="hover && value && !$attrs.disabled"
                     @click="value = null"
                 ></QIcon>
+                <QIcon v-if="info" name="info">
+                    <QTooltip max-width="350px">
+                        {{ info }}
+                    </QTooltip>
+                </QIcon>
             </template>
         </QInput>
     </div>
diff --git a/src/pages/Worker/Card/WorkerChangePasswordForm.vue b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
new file mode 100644
index 000000000..ef75ba55a
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
@@ -0,0 +1,99 @@
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'src/components/FormPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const emit = defineEmits(['onSubmit']);
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const formData = reactive({
+    newPassword: null,
+    repeatPassword: null,
+});
+
+const passRequirements = ref([]);
+
+const setPassword = async () => {
+    try {
+        if (!formData.newPassword) {
+            notify(t('You must enter a new password'), 'negative');
+            return;
+        }
+
+        if (formData.newPassword != formData.repeatPassword) {
+            notify(t(`Passwords don't match`), 'negative');
+            return;
+        }
+
+        await axios.patch(`Workers/${$props.id}/setPassword`, {
+            newPass: formData.newPassword,
+        });
+        notify(t('Password changed!'), 'positive');
+        emit('onSubmit');
+    } catch (err) {
+        console.error('Error setting password', err);
+    }
+};
+
+const getPassRequirements = async () => {
+    const { data } = await axios.get('UserPasswords/findOne');
+    passRequirements.value = data;
+};
+
+onMounted(async () => await getPassRequirements());
+</script>
+
+<template>
+    <FormPopup :title="t('Reset password')" @on-submit="setPassword()">
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    :label="t('New password')"
+                    v-model="formData.newPassword"
+                    type="password"
+                    :required="true"
+                    :info="
+                        t('passwordRequirements', {
+                            length: passRequirements.length,
+                            nAlpha: passRequirements.nAlpha,
+                            nUpper: passRequirements.nUpper,
+                            nDigits: passRequirements.nDigits,
+                            nPunct: passRequirements.nPunct,
+                        })
+                    "
+                />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    :label="t('Repeat password')"
+                    v-model="formData.repeatPassword"
+                    type="password"
+                />
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>
+
+<i18n>
+es:
+    Reset password: Restablecer contraseña
+    New password: Nueva contraseña
+    Repeat password: Repetir contraseña
+    You must enter a new password: Debes introducir la nueva contraseña
+    Passwords don't match: Las contraseñas no coinciden
+</i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index daa290ea1..86c846aca 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -6,8 +6,10 @@ import { useSession } from 'src/composables/useSession';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
+import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import { useState } from 'src/composables/useState';
+import axios from 'axios';
 
 const $props = defineProps({
     id: {
@@ -25,12 +27,16 @@ const route = useRoute();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const state = useState();
+const user = state.getUser();
+const changePasswordFormDialog = ref(null);
+const cardDescriptorRef = ref(null);
 
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
 const worker = ref();
+const workerExcluded = ref(false);
 const filter = {
     include: [
         {
@@ -71,14 +77,44 @@ function getWorkerAvatar() {
     const token = getTokenMultimedia();
     return `/api/Images/user/160x160/${entityId.value}/download?access_token=${token}`;
 }
+
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
     data.value = useCardDescription(entity.user.nickname, entity.id);
 };
+
+const openChangePasswordForm = () => changePasswordFormDialog.value.show();
+
+const getIsExcluded = async () => {
+    try {
+        const { data } = await axios.get(
+            `WorkerDisableExcludeds/${entityId.value}/exists`
+        );
+        if (!data) return;
+        workerExcluded.value = data.exists;
+    } catch (err) {
+        console.error('Error getting worker excluded: ', err);
+    }
+};
+
+const handleExcluded = async () => {
+    if (workerExcluded.value)
+        await axios.delete(`WorkerDisableExcludeds/${entityId.value}`);
+    else
+        await axios.post(`WorkerDisableExcludeds`, {
+            workerFk: entityId.value,
+            dated: new Date(),
+        });
+
+    workerExcluded.value = !workerExcluded.value;
+};
+
+const refetch = async () => await cardDescriptorRef.value.getData();
 </script>
 <template>
     <CardDescriptor
+        ref="cardDescriptorRef"
         module="Worker"
         data-key="workerData"
         :url="`Workers/${entityId}`"
@@ -90,9 +126,34 @@ const setData = (entity) => {
             (data) => {
                 worker = data;
                 setData(data);
+                getIsExcluded();
             }
         "
     >
+        <template #menu="{}">
+            <QItem v-ripple clickable @click="handleExcluded()">
+                <QItemSection>
+                    {{
+                        workerExcluded
+                            ? t('Click to allow the user to be disabled')
+                            : t('Click to exclude the user from getting disabled')
+                    }}
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="!worker.user.emailVerified && user.id != worker.id"
+                v-ripple
+                clickable
+                @click="openChangePasswordForm()"
+            >
+                <QItemSection>
+                    {{ t('Change password') }}
+                    <QDialog ref="changePasswordFormDialog">
+                        <WorkerChangePasswordForm @on-submit="refetch()" :id="entityId" />
+                    </QDialog>
+                </QItemSection>
+            </QItem>
+        </template>
         <template #before>
             <QImg :src="getWorkerAvatar()" class="photo">
                 <template #error>
@@ -139,3 +200,10 @@ const setData = (entity) => {
     height: 256px;
 }
 </style>
+
+<i18n>
+es:
+    Click to allow the user to be disabled: Marcar para deshabilitar
+    Click to exclude the user from getting disabled: Marcar para no deshabilitar
+    Change password: Cambiar contraseña
+</i18n>
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
new file mode 100644
index 000000000..f947b30e7
--- /dev/null
+++ b/src/pages/Worker/locale/en.yml
@@ -0,0 +1 @@
+passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index a960dffe6..646ee452e 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -1,3 +1,4 @@
 Search worker: Buscar trabajador
 You can search by worker id or name: Puedes buscar por id o nombre del trabajador
 Locker: Taquilla
+passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'

From 5e7ef68439ad0c8ff9e8f01f0700f9011c53539c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 11 Jun 2024 08:22:26 +0200
Subject: [PATCH 22/29] feat: simplify html

---
 src/pages/Account/AccountAccounts.vue | 64 +++++++++++++--------------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
index 65d5d5a9d..3d7dda899 100644
--- a/src/pages/Account/AccountAccounts.vue
+++ b/src/pages/Account/AccountAccounts.vue
@@ -54,48 +54,44 @@ const onSynchronizeRoles = async () => {
                 />
             </template>
             <template #form="{ data }">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <div class="q-gutter-y-sm">
                     <VnInput :label="t('accounts.homedir')" v-model="data.homedir" />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput :label="t('accounts.shell')" v-model="data.shell" />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput
                         :label="t('accounts.idBase')"
                         v-model="data.idBase"
                         type="number"
                         min="0"
                     />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <VnInput
-                        :label="t('accounts.min')"
-                        v-model="data.min"
-                        type="number"
-                        min="0"
-                    />
-                    <VnInput
-                        :label="t('accounts.max')"
-                        v-model="data.max"
-                        type="number"
-                        min="0"
-                    />
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <VnInput
-                        :label="t('accounts.warn')"
-                        v-model="data.warn"
-                        type="number"
-                        min="0"
-                    />
-                    <VnInput
-                        :label="t('accounts.inact')"
-                        v-model="data.inact"
-                        type="number"
-                        min="0"
-                    />
-                </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.min')"
+                            v-model="data.min"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.max')"
+                            v-model="data.max"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                    <VnRow>
+                        <VnInput
+                            :label="t('accounts.warn')"
+                            v-model="data.warn"
+                            type="number"
+                            min="0"
+                        />
+                        <VnInput
+                            :label="t('accounts.inact')"
+                            v-model="data.inact"
+                            type="number"
+                            min="0"
+                        />
+                    </VnRow>
+                </div>
             </template>
         </FormModel>
     </QPage>

From 0289c167ee11281dfad16e3382e3fbbd57373dcd Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 11 Jun 2024 08:30:18 +0200
Subject: [PATCH 23/29] refactor: unnecessary computed

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

diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 8c20d9f57..98208e5f2 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -18,7 +18,7 @@ const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 
 const paginateRef = ref(null);
-const filter = computed(() => ({
+const filter = {
     fields: ['id', 'created', 'userId'],
     include: {
         relation: 'user',
@@ -27,7 +27,7 @@ const filter = computed(() => ({
         },
     },
     order: 'created DESC',
-}));
+};
 
 const urlPath = 'AccessTokens';
 

From 9cfdbb3a8bb925fa2c828d362a5c6f6e894d2950 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 11 Jun 2024 08:54:30 +0200
Subject: [PATCH 24/29] hotFix: increase version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fb77b3f0a..01b5c1582 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.24.3",
+    "version": "24.24.4",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From e5a590a9f93b891202baa127a66877103525bb02 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 11 Jun 2024 13:48:15 +0200
Subject: [PATCH 25/29] feat: refs #7154 new item descriptor field

---
 src/i18n/locale/en.yml                 | 1 +
 src/i18n/locale/es.yml                 | 1 +
 src/pages/Item/Card/ItemDescriptor.vue | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 8ccdf640f..23c323653 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1177,6 +1177,7 @@ item:
         available: Available
         warehouseText: 'Calculated on the warehouse of { warehouseName }'
         itemDiary: Item diary
+        subName: Grower
     list:
         id: Identifier
         grouping: Grouping
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 452421343..481f043f4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1166,6 +1166,7 @@ item:
         available: Disponible
         warehouseText: 'Calculado sobre el almacén de { warehouseName }'
         itemDiary: Registro de compra-venta
+        subName: Productor
     list:
         id: Identificador
         grouping: Grouping
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 305d29b8b..3b57aae8d 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -16,6 +16,7 @@ import useCardDescription from 'src/composables/useCardDescription';
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
+import { dashIfEmpty } from 'src/filters';
 
 const $props = defineProps({
     id: {
@@ -182,6 +183,10 @@ const openCloneDialog = async () => {
                     </span>
                 </template>
             </VnLv>
+            <VnLv
+                :label="t('item.descriptor.subName')"
+                :value="dashIfEmpty(entity.subName)"
+            />
             <VnLv
                 v-if="entity.value5"
                 :label="t('item.descriptor.color')"

From 7ac2aed326a87bdcddd15310e0d89e2e72bb5cd5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 11 Jun 2024 14:09:42 +0200
Subject: [PATCH 26/29] fix: default model value depends on route

---
 src/components/FormModel.vue | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 377708143..426d99b9a 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -12,6 +12,7 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
+import { useRoute } from 'vue-router';
 
 const { push } = useRouter();
 const quasar = useQuasar();
@@ -20,6 +21,7 @@ const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
 const { notify } = useNotify();
+const route = useRoute();
 
 const $props = defineProps({
     url: {
@@ -28,7 +30,7 @@ const $props = defineProps({
     },
     model: {
         type: String,
-        default: '',
+        default: null,
     },
     filter: {
         type: Object,
@@ -82,17 +84,18 @@ const $props = defineProps({
         description: 'It is used for redirect on click "save and continue"',
     },
 });
-
 const emit = defineEmits(['onFetch', 'onDataSaved']);
-
+const modelValue = computed(
+    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
+);
 const componentIsRendered = ref(false);
-const arrayData = useArrayData($props.model);
+const arrayData = useArrayData(modelValue);
 const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
 const originalData = ref({});
-const formData = computed(() => state.get($props.model));
+const formData = computed(() => state.get(modelValue));
 const formUrl = computed(() => $props.url);
 const defaultButtons = computed(() => ({
     save: {
@@ -114,7 +117,7 @@ onMounted(async () => {
     nextTick(() => (componentIsRendered.value = true));
 
     // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
-    state.set($props.model, $props.formInitialData);
+    state.set(modelValue, $props.formInitialData);
 
     if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
     else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
@@ -161,8 +164,8 @@ onBeforeRouteLeave((to, from, next) => {
 
 onUnmounted(() => {
     // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
-    if (hasChanges.value) return state.set($props.model, originalData.value);
-    if ($props.clearStoreOnUnmount) state.unset($props.model);
+    if (hasChanges.value) return state.set(modelValue, originalData.value);
+    if ($props.clearStoreOnUnmount) state.unset(modelValue);
 });
 
 async function fetch() {
@@ -174,7 +177,7 @@ async function fetch() {
 
         updateAndEmit('onFetch', data);
     } catch (e) {
-        state.set($props.model, {});
+        state.set(modelValue, {});
         originalData.value = {};
     }
 }
@@ -235,11 +238,11 @@ function filter(value, update, filterOptions) {
 }
 
 function updateAndEmit(evt, val, res) {
-    state.set($props.model, val);
+    state.set(modelValue, val);
     originalData.value = val && JSON.parse(JSON.stringify(val));
     if (!$props.url) arrayData.store.data = val;
 
-    emit(evt, state.get($props.model), res);
+    emit(evt, state.get(modelValue), res);
 }
 
 defineExpose({ save, isLoading, hasChanges });

From de18b670eaf064197280cc87e0dc7b7aaa66f921 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 11 Jun 2024 14:29:42 +0200
Subject: [PATCH 27/29] feat: refs #7154 changed label

---
 src/i18n/locale/en.yml                 | 2 +-
 src/i18n/locale/es.yml                 | 2 +-
 src/pages/Item/Card/ItemDescriptor.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 23c323653..e672a16e9 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1177,7 +1177,7 @@ item:
         available: Available
         warehouseText: 'Calculated on the warehouse of { warehouseName }'
         itemDiary: Item diary
-        subName: Grower
+        producer: Producer
     list:
         id: Identifier
         grouping: Grouping
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 481f043f4..a7f599edb 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1166,7 +1166,7 @@ item:
         available: Disponible
         warehouseText: 'Calculado sobre el almacén de { warehouseName }'
         itemDiary: Registro de compra-venta
-        subName: Productor
+        producer: Productor
     list:
         id: Identificador
         grouping: Grouping
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 3b57aae8d..155c9eb4c 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -184,7 +184,7 @@ const openCloneDialog = async () => {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('item.descriptor.subName')"
+                :label="t('item.descriptor.producer')"
                 :value="dashIfEmpty(entity.subName)"
             />
             <VnLv

From 937f75ec6333908978bbfe7f4b466738fcc3a429 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 12 Jun 2024 07:40:04 +0200
Subject: [PATCH 28/29] feat(jenkinsfile): use build_id

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7cad5ef41..1766e3aea 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ pipeline {
                 sh 'quasar build'
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                 }
                 dockerBuild()
             }
@@ -106,7 +106,7 @@ pipeline {
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                 }
                 withKubeConfig([
                     serverUrl: "$KUBERNETES_API",

From 135e05b139999b2ef033d820e3876c333e2fcd75 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 12 Jun 2024 12:00:43 +0200
Subject: [PATCH 29/29] hotfix: refs #6636 EN i18n

---
 src/i18n/locale/en.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 0ce21e9b2..9bc792aee 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -575,6 +575,9 @@ claim:
         created: Created
         state: State
         pickup: Pick up
+        null: No
+        agency: Agency
+        delivery: Delivery
     photo:
         fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
         noData: 'There are no images/videos, click here or drag and drop the file'