From 351c2a07dc85a553a976fa37928cc57d4fd631a8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 09:15:35 +0200
Subject: [PATCH 01/23] chore: refs #4074 wip replace useRole for useAcl

---
 src/components/ui/VnPaginate.vue                 |  4 ++--
 src/pages/Account/AccountList.vue                |  4 ++--
 src/pages/Customer/Card/CustomerBalance.vue      |  6 +++---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 15 +++++++--------
 src/pages/Worker/Card/WorkerLocker.vue           |  6 +++---
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c27111df4..42fa4f766 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -115,8 +115,8 @@ watch(
 );
 
 watch(
-    () => [props.url, props.filter],
-    ([url, filter]) => fetch({ url, filter })
+    () => [props.url, props.filter, props.userParams],
+    ([url, filter, userParams]) => fetch({ url, filter, userParams })
 );
 
 const addFilter = async (filter, params) => {
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index dee019fed..79c77a3c1 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -13,7 +13,7 @@ import AccountCreate from './AccountCreate.vue';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useStateStore } from 'stores/useStateStore';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { QDialog } from 'quasar';
 
 const stateStore = useStateStore();
@@ -21,7 +21,7 @@ const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const accountCreateDialogRef = ref(null);
-const showNewUserBtn = computed(() => useRole().hasAny(['itManagement']));
+const showNewUserBtn = computed(() => useAcl().hasAny('Account', '*', 'WRITE'));
 
 const filter = {
     fields: ['id', 'nickname', 'name', 'role'],
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 411c44ad3..2dc0c5564 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -2,7 +2,7 @@
 import { computed, onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
 
@@ -25,7 +25,7 @@ import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescr
 const { openConfirmationModal } = useVnConfirm();
 const { sendEmail } = usePrintService();
 const { t } = useI18n();
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 
 const session = useSession();
 const tokenMultimedia = session.getTokenMultimedia();
@@ -317,7 +317,7 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAny(['administrative'])"
+                    :disable="!hasAny('Receipt','*', 'WRITE')"
                     @keypress.enter="scope.set"
                     autofocus
                 />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index da24e50fa..17e5133ab 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
@@ -24,7 +24,7 @@ const $props = defineProps({ id: { type: Number, default: null } });
 const { push, currentRoute } = useRouter();
 
 const quasar = useQuasar();
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const arrayData = useArrayData();
@@ -195,10 +195,9 @@ async function cloneInvoice() {
     push({ path: `/invoice-in/${data.id}/summary` });
 }
 
-const isAdministrative = () => hasAny(['administrative']);
+const canEditProp = (prop) => hasAny('InvoiceIn', prop, 'WRITE');
 
 const isAgricultural = () => {
-    console.error(config);
     if (!config.value) return false;
     return (
         invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
@@ -284,7 +283,7 @@ const createInvoiceInCorrection = async () => {
             <InvoiceInToBook>
                 <template #content="{ book }">
                     <QItem
-                        v-if="!entity?.isBooked && isAdministrative()"
+                        v-if="!entity?.isBooked && canEditProp('toBook')"
                         v-ripple
                         clickable
                         @click="book(entityId)"
@@ -294,7 +293,7 @@ const createInvoiceInCorrection = async () => {
                 </template>
             </InvoiceInToBook>
             <QItem
-                v-if="entity?.isBooked && isAdministrative()"
+                v-if="entity?.isBooked && canEditProp('toUnBook')"
                 v-ripple
                 clickable
                 @click="triggerMenu('unbook')"
@@ -304,7 +303,7 @@ const createInvoiceInCorrection = async () => {
                 </QItemSection>
             </QItem>
             <QItem
-                v-if="isAdministrative()"
+                v-if="canEditProp('deleteById')"
                 v-ripple
                 clickable
                 @click="triggerMenu('delete')"
@@ -312,7 +311,7 @@ const createInvoiceInCorrection = async () => {
                 <QItemSection>{{ t('Delete invoice') }}</QItemSection>
             </QItem>
             <QItem
-                v-if="isAdministrative()"
+                v-if="canEditProp('clone')"
                 v-ripple
                 clickable
                 @click="triggerMenu('clone')"
diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue
index f19fc8ae6..ba5c0de97 100644
--- a/src/pages/Worker/Card/WorkerLocker.vue
+++ b/src/pages/Worker/Card/WorkerLocker.vue
@@ -3,13 +3,13 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import FetchData from 'components/FetchData.vue';
 
-const { hasAny } = useRole();
+const { hasAny } = useAcl();
 const { t } = useI18n();
 const fetchData = ref();
 const originaLockerId = ref();
@@ -57,7 +57,7 @@ const init = async (data) => {
                 option-label="code"
                 option-value="id"
                 hide-selected
-                :readonly="!hasAny(['productionBoss', 'hr'])"
+                :readonly="!hasAny('Worker','__get__locker','READ')"
             />
         </template>
     </FormModel>

From c766110bd90016c3de35ff3d1d33067b0247b940 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 14:13:37 +0200
Subject: [PATCH 02/23] chore: refs #4074 wip replace useRole for useAcl

---
 src/components/common/VnSelectDialog.vue      |  7 +++
 src/pages/Item/Card/ItemSummary.vue           | 55 ++++++++-----------
 src/pages/Supplier/Card/SupplierSummary.vue   | 13 ++---
 .../Travel/Card/TravelDescriptorMenuItems.vue |  9 +--
 src/pages/Worker/Card/WorkerTimeControl.vue   | 18 +++---
 .../Worker/Card/WorkerTimeReasonForm.vue      |  4 +-
 src/pages/Worker/WorkerList.vue               |  2 +-
 7 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 7f7c29f5d..6f2be4bfe 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 import VnSelect from 'src/components/common/VnSelect.vue';
 const emit = defineEmits(['update:modelValue']);
@@ -11,6 +12,10 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
+    acls: {
+        type: Array,
+        default: () => [],
+    },
     actionIcon: {
         type: String,
         default: 'add',
@@ -22,9 +27,11 @@ const $props = defineProps({
 });
 
 const role = useRole();
+const acl = useAcl()
 const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
+    if ($props.acls.length) console.log(acl.hasAny($props.acls));
     return role.hasAny($props.rolesAllowedToCreate);
 });
 
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 7af3e0fa0..1571a903e 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -9,6 +9,7 @@ import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 const $props = defineProps({
     id: {
@@ -19,21 +20,13 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const roleState = useRole();
 
 const entityId = computed(() => $props.id || route.params.id);
 
-const isBuyer = computed(() => {
-    return roleState.hasAny(['buyer']);
-});
+const canEdit = computed(() => useAcl().hasAny('Item', '*', 'WRITE'));
 
-const isReplenisher = computed(() => {
-    return roleState.hasAny(['replenisher']);
-});
+const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
 
-const isAdministrative = computed(() => {
-    return roleState.hasAny(['administrative']);
-});
 </script>
 
 <template>
@@ -66,13 +59,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBasicData', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.basicData') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
@@ -105,13 +98,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBasicData', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.otherData') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv
                     :label="t('item.summary.intrastatCode')"
@@ -138,13 +131,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
+                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
                     :to="{ name: 'ItemTags', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer || isReplenisher }"
+                    :class="{ 'header-link': canEdit || isReplenisher }"
                 >
                     {{ t('item.summary.tags') }}
-                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
+                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
                 </component>
                 <VnLv
                     v-for="(tag, index) in tags"
@@ -155,13 +148,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one" v-if="item.description">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBasicData', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.description') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <p>
                     {{ item.description }}
@@ -169,13 +162,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer || isAdministrative ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemTax', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer || isAdministrative }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.tax') }}
-                    <QIcon v-if="isBuyer || isAdministrative" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv
                     v-for="(tax, index) in item.taxes"
@@ -186,13 +179,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer ? 'router-link' : 'span'"
+                    :is="canEdit ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBotanical', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer }"
+                    :class="{ 'header-link': canEdit }"
                 >
                     {{ t('item.summary.botanical') }}
-                    <QIcon v-if="isBuyer" name="open_in_new" />
+                    <QIcon v-if="canEdit" name="open_in_new" />
                 </component>
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
                 <VnLv
@@ -202,13 +195,13 @@ const isAdministrative = computed(() => {
             </QCard>
             <QCard class="vn-one">
                 <component
-                    :is="isBuyer || isReplenisher ? 'router-link' : 'span'"
+                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
                     :to="{ name: 'ItemBarcode', params: { id: entityId } }"
                     class="header"
-                    :class="{ 'header-link': isBuyer || isReplenisher }"
+                    :class="{ 'header-link': canEdit || isReplenisher }"
                 >
                     {{ t('item.summary.barcode') }}
-                    <QIcon v-if="isBuyer || isReplenisher" name="open_in_new" />
+                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
                 </component>
                 <p v-for="(barcode, index) in item.itemBarcode" :key="index">
                     {{ barcode.code }}
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 822586b47..04f763c15 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -4,13 +4,12 @@ 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 { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { dashIfEmpty } from 'src/filters';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
 const route = useRoute();
-const roleState = useRole();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -32,13 +31,11 @@ async function setData(data) {
     }
 }
 
-const isAdministrative = computed(() => {
-    return roleState.hasAny(['administrative']);
-});
 
-function getUrl(section) {
-    return isAdministrative.value && `#/supplier/${entityId.value}/${section}`;
-}
+
+const getUrl = (section) => 
+    useAcl().hasAny('Supplier','*','WRITE') ? `#/supplier/${entityId.value}/${section}`:'';
+
 </script>
 
 <template>
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index bd2561211..47b6f0aa6 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -8,7 +8,7 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 
 const $props = defineProps({
     travel: {
@@ -21,7 +21,6 @@ const { t } = useI18n();
 const router = useRouter();
 const quasar = useQuasar();
 const { notify } = useNotify();
-const role = useRole();
 
 const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
@@ -42,9 +41,7 @@ const cloneTravelWithEntries = async () => {
     }
 };
 
-const isBuyer = computed(() => {
-    return role.hasAny(['buyer']);
-});
+const canDelete = computed(() => useAcl().hasAny('Travel','*','WRITE'));
 
 const openDeleteEntryDialog = (id) => {
     quasar
@@ -81,7 +78,7 @@ const deleteTravel = async (id) => {
         </QItemSection>
     </QItem>
     <QItem
-        v-if="isBuyer && travel.totalEntries === 0"
+        v-if="canDelete && travel.totalEntries === 0"
         v-ripple
         clickable
         @click="openDeleteEntryDialog(travel.id)"
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 7bce5983c..1081cba61 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -13,6 +13,7 @@ import WorkerTimeControlCalendar from 'pages/Worker/Card/WorkerTimeControlCalend
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
@@ -26,7 +27,6 @@ import { date } from 'quasar';
 const route = useRoute();
 const { t, locale } = useI18n();
 const { notify } = useNotify();
-const { hasAny } = useRole();
 const _state = useState();
 const user = _state.getUser();
 const stateStore = useStateStore();
@@ -62,9 +62,11 @@ const arrayData = useArrayData('workerData');
 
 const worker = computed(() => arrayData.store?.data);
 
-const isHr = computed(() => hasAny(['hr']));
+const isHr = computed(() => useRole().hasAny(['hr']));
 
-const isHimSelf = computed(() => user.value.id === Number(route.params.id));
+const canSend = computed(() => useAcl().hasAny('WorkerTimeControl', 'sendMail', 'WRITE'));
+
+const isHimself = computed(() => user.value.id === Number(route.params.id));
 
 const columns = computed(() => {
     return weekdayStore.getLocales?.map((day, index) => {
@@ -443,7 +445,7 @@ onMounted(async () => {
         <div>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtn
-                    v-if="isHimSelf && state"
+                    v-if="isHimself && state"
                     :label="t('Satisfied')"
                     color="primary"
                     type="submit"
@@ -451,7 +453,7 @@ onMounted(async () => {
                     @click="isSatisfied()"
                 />
                 <QBtn
-                    v-if="isHimSelf && state"
+                    v-if="isHimself && state"
                     :label="t('Not satisfied')"
                     color="primary"
                     type="submit"
@@ -462,14 +464,14 @@ onMounted(async () => {
             </QBtnGroup>
             <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
-                    v-if="reason && state && (isHimSelf || isHr)"
+                    v-if="reason && state && (isHimself || isHr)"
                     :label="t('Reason')"
                     color="primary"
                     type="submit"
                     @click="showReasonForm()"
                 />
                 <QBtn
-                    v-if="isHr && state !== 'CONFIRMED' && canResend"
+                    v-if="canSend && state !== 'CONFIRMED' && canResend"
                     :label="state ? t('Resend') : t('globals.send')"
                     color="primary"
                     type="submit"
@@ -596,7 +598,7 @@ onMounted(async () => {
             <WorkerTimeReasonForm
                 @on-submit="isUnsatisfied($event)"
                 :reason="reason"
-                :is-him-self="isHimSelf"
+                :is-himself="isHimself"
             />
         </QDialog>
     </QPage>
diff --git a/src/pages/Worker/Card/WorkerTimeReasonForm.vue b/src/pages/Worker/Card/WorkerTimeReasonForm.vue
index 5c1ab9118..23bdba15e 100644
--- a/src/pages/Worker/Card/WorkerTimeReasonForm.vue
+++ b/src/pages/Worker/Card/WorkerTimeReasonForm.vue
@@ -9,7 +9,7 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    isHimSelf: {
+    isHimself: {
         type: Boolean,
         default: false,
     },
@@ -40,7 +40,7 @@ const closeForm = () => {
                 v-model="reasonFormData"
                 type="textarea"
                 autogrow
-                :disable="!isHimSelf"
+                :disable="!isHimself"
             />
         </template>
     </FormPopup>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 0c2656597..45bc41856 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -269,7 +269,7 @@ function uppercaseStreetModel(data) {
                         option-label="name"
                         option-value="id"
                         hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
+                        :acls="[]"
                         :disable="data.isFreelance"
                     >
                         <template #form>

From dcc2f4dfde6ba958c59938c316f57327ca8a2a66 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 14:14:28 +0200
Subject: [PATCH 03/23] chore: refs #4074 admit several acls

---
 src/composables/useAcl.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 46aaa3c25..be6dbc241 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,10 +16,11 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, prop, accessType) {
+    function hasAny(model, props = [], accessType) {
         const acls = state.getAcls().value[model];
+        Array.isArray(props) || (props = [props]);
         if (acls) 
-            return ['*', prop].some((key) => {
+            return ['*', ...props].some((key) => {
                 const acl = acls[key];
                 return acl && (acl['*'] || acl[accessType]);
             });

From 27034d1dc249513d7b33f7fb589f7a9167cbae99 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 14:46:04 +0200
Subject: [PATCH 04/23] chore: refs #4074 admit several acls

---
 src/composables/useAcl.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index be6dbc241..f746b6677 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,9 +16,8 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, props = [], accessType) {
+    function hasAny(model, props, accessType) {
         const acls = state.getAcls().value[model];
-        Array.isArray(props) || (props = [props]);
         if (acls) 
             return ['*', ...props].some((key) => {
                 const acl = acls[key];

From fb496d7fc6af75774a8574f06e16d1a26778d6a4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 16:08:40 +0200
Subject: [PATCH 05/23] chore: refs #4074 admit several acls

---
 src/composables/useAcl.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index f746b6677..bebeda039 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -18,6 +18,7 @@ export function useAcl() {
 
     function hasAny(model, props, accessType) {
         const acls = state.getAcls().value[model];
+        Array.isArray(props) || (props = [props]);
         if (acls) 
             return ['*', ...props].some((key) => {
                 const acl = acls[key];

From db18e8c937c0f2684232fd162541f6f43acbf1ab Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 16:10:26 +0200
Subject: [PATCH 06/23] fix: refs #4074 workerCard data-key

---
 src/pages/Worker/Card/WorkerCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 1a5bacf2f..fb9ab9666 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -5,7 +5,7 @@ import WorkerFilter from '../WorkerFilter.vue';
 </script>
 <template>
     <VnCard
-        data-key="Workers"
+        data-key="Worker"
         base-url="Workers"
         :descriptor="WorkerDescriptor"
         :filter-panel="WorkerFilter"

From 199ed8021211338361b8b9d8f6ed345699d05623 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 1 Aug 2024 16:39:20 +0200
Subject: [PATCH 07/23] Merge branch 'dev' of
 https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls

---
 src/pages/Account/AccountList.vue | 185 ++++++++++++------------------
 1 file changed, 72 insertions(+), 113 deletions(-)

diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 79c77a3c1..ecb027e49 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -1,33 +1,66 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { computed, ref } from 'vue';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import { ref, computed } from 'vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import AccountSummary from './Card/AccountSummary.vue';
-import AccountFilter from './AccountFilter.vue';
-import AccountCreate from './AccountCreate.vue';
-
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useStateStore } from 'stores/useStateStore';
-import { useAcl } from 'src/composables/useAcl';
-import { QDialog } from 'quasar';
 
-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const accountCreateDialogRef = ref(null);
-const showNewUserBtn = computed(() => useAcl().hasAny('Account', '*', 'WRITE'));
-
-const filter = {
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
+const tableRef = ref();
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('id'),
+        isId: true,
+        field: 'id',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'username',
+        label: t('nickname'),
+        isTitle: true,
+        component: 'input',
+        columnField: {
+            component: null,
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('name'),
+        component: 'input',
+        columnField: {
+            component: null,
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('View Summary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, AccountSummary),
+            },
+        ],
+    },
+]);
 const exprBuilder = (param, value) => {
     switch (param) {
         case 'search':
@@ -46,99 +79,25 @@ const exprBuilder = (param, value) => {
             return { [param]: value };
     }
 };
-
-const getApiUrl = () => new URL(window.location).origin;
-
-const navigate = (event, id) => {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/account/${id}/summary`);
-    router.push({ path: `/account/${id}` });
-};
-
-const openCreateModal = () => accountCreateDialogRef.value.show();
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="AccountList"
-                url="VnUsers/preview"
-                :expr-builder="exprBuilder"
-                :label="t('account.search')"
-                :info="t('account.searchInfo')"
-            />
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <AccountFilter data-key="AccountList" :expr-builder="exprBuilder" />
-        </QScrollArea>
-    </QDrawer>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                :filter="filter"
-                data-key="AccountList"
-                url="VnUsers/preview"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.nickname"
-                        @click="navigate($event, row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('account.card.name')" :value="row.nickname">
-                            </VnLv>
-                            <VnLv
-                                :label="t('account.card.nickname')"
-                                :value="row.username"
-                            >
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AccountSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QDialog
-            ref="accountCreateDialogRef"
-            transition-hide="scale"
-            transition-show="scale"
-        >
-            <AccountCreate />
-        </QDialog>
-        <QPageSticky :offset="[20, 20]" v-if="showNewUserBtn">
-            <QBtn @click="openCreateModal" color="primary" fab icon="add" />
-            <QTooltip class="text-no-wrap">
-                {{ t('account.card.newUser') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
+    <VnSearchbar
+        :label="t('account.search')"
+        data-key="AccountUsers"
+        :expr-builder="exprBuilder"
+        :info="t('account.searchInfo')"
+    />
+
+    <VnTable
+        ref="tableRef"
+        data-key="AccountUsers"
+        url="VnUsers/preview"
+        order="id DESC"
+        :columns="columns"
+        default-mode="table"
+        auto-load
+        redirect="account"
+        :use-model="true"
+    />
 </template>

From 53aec247904b6117a08cdb28438b36d5ef46aaba Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 2 Aug 2024 09:04:16 +0200
Subject: [PATCH 08/23] chore: refs #4074 drop workerCreate

---
 src/pages/Worker/WorkerCreate.vue | 245 ------------------------------
 src/router/modules/worker.js      |   9 --
 2 files changed, 254 deletions(-)
 delete mode 100644 src/pages/Worker/WorkerCreate.vue

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
deleted file mode 100644
index a1ded2bfd..000000000
--- a/src/pages/Worker/WorkerCreate.vue
+++ /dev/null
@@ -1,245 +0,0 @@
-<script setup>
-import { onBeforeMount, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-import { useUserConfig } from 'src/composables/useUserConfig';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLocation from 'src/components/common/VnLocation.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnRadio from 'src/components/common/VnRadio.vue';
-
-const { t } = useI18n();
-
-const companiesOptions = ref([]);
-const workersOptions = ref([]);
-const payMethodsOptions = ref([]);
-const bankEntitiesOptions = ref([]);
-const formData = ref({ isFreelance: false });
-const defaultPayMethod = ref(0);
-
-function handleLocation(data, location) {
-    const { town, code, provinceFk, countryFk } = location ?? {};
-    data.postcode = code;
-    data.city = town;
-    data.provinceFk = provinceFk;
-    data.countryFk = countryFk;
-}
-
-onBeforeMount(async () => {
-    const userInfo = await useUserConfig().fetch();
-    formData.value.companyFk = userInfo.companyFk;
-
-    const { data } = await axios.get('WorkerConfigs/findOne', {
-        params: { field: ['payMethodFk'] },
-    });
-    defaultPayMethod.value = data.payMethodFk;
-    formData.value.payMethodFk = defaultPayMethod.value;
-});
-</script>
-<template>
-    <FetchData
-        url="Companies"
-        @on-fetch="(data) => (companiesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Paymethods"
-        @on-fetch="(data) => (payMethodsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="BankEntities"
-        @on-fetch="(data) => (bankEntitiesOptions = data)"
-        auto-load
-    />
-    <QPage>
-        <VnSubToolbar>
-            <template #st-data>
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="false"
-                    :label="`${t('Internal')}`"
-                    @update:model-value="formData.payMethodFk = defaultPayMethod"
-                />
-                <VnRadio
-                    v-model="formData.isFreelance"
-                    :val="true"
-                    :label="`${t('External')}`"
-                    @update:model-value="delete formData.payMethodFk"
-                />
-            </template>
-        </VnSubToolbar>
-        <FormModel
-            url-create="Workers/new"
-            model="worker"
-            :form-initial-data="formData"
-            @on-data-saved="(__, { id }) => $router.push({ path: `/worker/${id}` })"
-        >
-            <template #form="{ data, validate }">
-                <VnRow>
-                    <VnInput
-                        v-model="data.firstName"
-                        :label="t('worker.create.name')"
-                        :rules="validate('Worker.firstName')"
-                    />
-                    <VnInput
-                        v-model="data.lastNames"
-                        :label="t('worker.create.lastName')"
-                        :rules="validate('Worker.lastNames')"
-                    />
-                    <VnInput
-                        v-model="data.code"
-                        :label="t('worker.create.code')"
-                        :rules="validate('Worker.code')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('worker.create.webUser')"
-                        :rules="validate('Worker.name')"
-                    />
-                    <VnInput
-                        v-model="data.email"
-                        :label="t('worker.create.personalEmail')"
-                        :rules="validate('Worker.email')"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('worker.create.company')"
-                        v-model="data.companyFk"
-                        :options="companiesOptions"
-                        option-value="id"
-                        option-label="code"
-                        hide-selected
-                        :rules="validate('Worker.company')"
-                    />
-                    <VnSelect
-                        :label="t('worker.create.boss')"
-                        v-model="data.bossFk"
-                        :options="workersOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        :rules="validate('Worker.boss')"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                    <QItemLabel caption
-                                        >{{ scope.opt.nickname }},
-                                        {{ scope.opt.code }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        v-model="data.fi"
-                        :label="t('worker.create.fi')"
-                        :rules="validate('Worker.fi')"
-                    />
-                    <VnInputDate
-                        v-model="data.birth"
-                        :label="t('worker.create.birth')"
-                        :rules="validate('Worker.birth')"
-                        :disable="formData.isFreelance"
-                    />
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('worker.create.phone')"
-                        :rules="validate('Worker.phone')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnLocation
-                        :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
-                        @update:model-value="(location) => handleLocation(data, location)"
-                        :disable="formData.isFreelance"
-                    >
-                    </VnLocation>
-                </VnRow>
-                <VnRow>
-                    <VnInput
-                        :label="t('worker.create.street')"
-                        v-model="data.street"
-                        :rules="validate('Worker.street')"
-                        :disable="formData.isFreelance"
-                    />
-                </VnRow>
-                <VnRow>
-                    <VnSelect
-                        :label="t('worker.create.payMethods')"
-                        v-model="data.payMethodFk"
-                        :options="payMethodsOptions"
-                        option-value="id"
-                        option-label="name"
-                        map-options
-                        hide-selected
-                        :rules="validate('Worker.payMethodFk')"
-                        :disable="formData.isFreelance"
-                        @update:model-value="(val) => !val && delete formData.payMethodFk"
-                    />
-                    <VnInput
-                        v-model="data.iban"
-                        :label="t('worker.create.iban')"
-                        :rules="validate('Worker.iban')"
-                        :disable="formData.isFreelance"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                    <VnSelectDialog
-                        :label="t('worker.create.bankEntity')"
-                        v-model="data.bankEntityFk"
-                        :options="bankEntitiesOptions"
-                        option-label="name"
-                        option-value="id"
-                        hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
-                        :rules="validate('Worker.bankEntity')"
-                        :disable="formData.isFreelance"
-                    >
-                        <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection v-if="scope.opt">
-                                    <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
-                </VnRow>
-            </template>
-        </FormModel>
-    </QPage>
-</template>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index f80df5e06..b40c411c2 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -52,15 +52,6 @@ export default {
                     },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                 },
-                {
-                    path: 'create',
-                    name: 'WorkerCreate',
-                    meta: {
-                        title: 'workerCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Worker/WorkerCreate.vue'),
-                },
             ],
         },
         {

From 6c3c03722f263203f5707f72ca021533e97dd3d4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 2 Aug 2024 09:37:48 +0200
Subject: [PATCH 09/23] feat: refs #4074 useAcl in vnSelectDialog

---
 src/components/common/VnSelectDialog.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 6f2be4bfe..0ade82bda 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -27,17 +27,17 @@ const $props = defineProps({
 });
 
 const role = useRole();
-const acl = useAcl()
+const acl = useAcl();
 const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
-    if ($props.acls.length) console.log(acl.hasAny($props.acls));
-    return role.hasAny($props.rolesAllowedToCreate);
+    const hasMissingAcl = $props.acls.some(
+        (x) => !acl.hasAny(x.model, x.props, x.accessType)
+    );
+    const hasRequiredRole = role.hasAny($props.rolesAllowedToCreate);
+    if ($props.acls.length) return !hasMissingAcl;
+    return hasRequiredRole;
 });
-
-const toggleForm = () => {
-    showForm.value = !showForm.value;
-};
 </script>
 
 <template>
@@ -48,7 +48,7 @@ const toggleForm = () => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
-                @click.stop.prevent="toggleForm()"
+                @click.stop.prevent="showForm = true"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"

From 51fec906071e3f62300c780ecd48259aa66c2120 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 2 Aug 2024 12:04:19 +0200
Subject: [PATCH 10/23] feat: refs #4074 useAcl in vnSelectDialog

---
 src/components/CreateNewPostcodeForm.vue                | 2 +-
 src/components/VnSelectProvince.vue                     | 2 +-
 src/pages/Customer/Card/CustomerBillingData.vue         | 2 +-
 src/pages/Customer/Card/CustomerFiscalData.vue          | 2 +-
 src/pages/Customer/CustomerCreate.vue                   | 2 +-
 src/pages/Customer/CustomerList.vue                     | 2 +-
 src/pages/Customer/components/CustomerAddressCreate.vue | 2 +-
 src/pages/Customer/components/CustomerAddressEdit.vue   | 2 +-
 src/pages/Supplier/Card/SupplierAddressesCreate.vue     | 2 +-
 src/pages/Supplier/Card/SupplierFiscalData.vue          | 2 +-
 src/pages/Worker/WorkerList.vue                         | 4 ++--
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index e6247226e..14f629c42 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -104,7 +104,7 @@ async function setProvince(id, data) {
                     option-label="name"
                     option-value="id"
                     :rules="validate('postcode.city')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
                     clearable
                 >
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index ea10ace19..2f08db611 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -38,7 +38,7 @@ async function onProvinceCreated(_, data) {
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
-        :roles-allowed-to-create="['deliveryAssistant']"
+        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
     >
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index b01dc4523..495b871df 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -70,7 +70,7 @@ const getBankEntities = (data, formData) => {
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
                     :options="bankEntitiesOptions"
-                    :roles-allowed-to-create="['salesAssistant', 'hr']"
+                    :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                     :rules="validate('Worker.bankEntity')"
                     hide-selected
                     option-label="name"
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 5cc656bb3..c2adace5e 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,7 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     v-model="data.postcode"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 041c92d17..79da63283 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -86,7 +86,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 82ad559ad..3c66b1281 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -412,7 +412,7 @@ function handleLocation(data, location) {
     >
         <template #more-create-dialog="{ data }">
             <VnLocation
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..88204cbaa 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -92,7 +92,7 @@ function handleLocation(data, location) {
 
             <VnLocation
                 :rules="validate('Worker.postcode')"
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..0be7e475a 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -176,7 +176,7 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.postalCode"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index da6549a24..6e51ee94e 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -83,7 +83,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index fd9667112..65c34c4ed 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -129,7 +129,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     v-model="data.postCode"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 45bc41856..6a039b269 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -221,7 +221,7 @@ function uppercaseStreetModel(data) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
@@ -269,7 +269,7 @@ function uppercaseStreetModel(data) {
                         option-label="name"
                         option-value="id"
                         hide-selected
-                        :acls="[]"
+                        :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                         :disable="data.isFreelance"
                     >
                         <template #form>

From 3693ba0c995bf3467b760760e93747815a7301da Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 15:37:33 +0200
Subject: [PATCH 11/23] feat: refs #4074 drop useless code

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

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 04f763c15..5791db1eb 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -4,7 +4,6 @@ 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 { useAcl } from 'src/composables/useAcl';
 import { dashIfEmpty } from 'src/filters';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
@@ -31,11 +30,7 @@ async function setData(data) {
     }
 }
 
-
-
-const getUrl = (section) => 
-    useAcl().hasAny('Supplier','*','WRITE') ? `#/supplier/${entityId.value}/${section}`:'';
-
+const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
 </script>
 
 <template>

From d0131dd5521ad83d16694ee55805c773c3b74274 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 15:52:06 +0200
Subject: [PATCH 12/23] fix: refs #4074 drop wrong acl

---
 src/router/modules/ticket.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 4074f089f..698f02554 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -53,7 +53,6 @@ export default {
                     meta: {
                         title: 'createTicket',
                         icon: 'vn:ticketAdd',
-                        roles: ['developer'],
                     },
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },

From b87e7ce75025020a72e5039097ee22e8583a51a4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 6 Sep 2024 17:01:23 +0200
Subject: [PATCH 13/23] refactor: refs #4074 use VnTitle

---
 src/css/app.scss                    |   4 +
 src/pages/Item/Card/ItemSummary.vue | 125 +++++++++-------------------
 2 files changed, 44 insertions(+), 85 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 357c9ecdb..ecffd576c 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -37,6 +37,10 @@ a {
 .link {
     color: $color-link;
     cursor: pointer;
+
+    &--white {
+        color: white;
+    }
 }
 
 .tx-color-link {
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 1571a903e..081eb2afb 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -7,9 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-
-import { useRole } from 'src/composables/useRole';
-import { useAcl } from 'src/composables/useAcl';
+import VnTitle from 'src/components/common/VnTitle.vue';
 
 const $props = defineProps({
     id: {
@@ -22,13 +20,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-
-const canEdit = computed(() => useAcl().hasAny('Item', '*', 'WRITE'));
-
-const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
-
 </script>
-
 <template>
     <CardSummary
         ref="summary"
@@ -37,13 +29,15 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
         data-key="ItemSummary"
     >
         <template #header-left>
-            <router-link
-                v-if="route.name !== 'ItemSummary'"
+            <QBtn
+                v-if="$route.name !== 'ItemSummary'"
                 :to="{ name: 'ItemSummary', params: { id: entityId } }"
-                class="header link"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
+                class="header link--white"
+                icon="open_in_new"
+                flat
+                dense
+                round
+            />
         </template>
         <template #header="{ entity: { item } }">
             {{ item.id }} - {{ item.name }}
@@ -58,15 +52,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.basicData') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/basic-data`"
+                    :text="t('item.summary.basicData')"
+                />
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
                 <VnLv :label="t('item.summary.family')" :value="item.itemType.name" />
@@ -97,15 +86,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.otherData') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/basic-data`"
+                    :text="t('item.summary.otherData')"
+                />
                 <VnLv
                     :label="t('item.summary.intrastatCode')"
                     :value="item.intrastat.id"
@@ -130,15 +114,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemTags', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit || isReplenisher }"
-                >
-                    {{ t('item.summary.tags') }}
-                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/tags`"
+                    :text="t('item.summary.tags')"
+                />
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
@@ -147,29 +126,14 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one" v-if="item.description">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBasicData', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.description') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
-                <p>
-                    {{ item.description }}
-                </p>
+                <VnTitle
+                    :url="`#/item/${entityId}/basic-data`"
+                    :text="t('item.summary.description')"
+                />
+                <p v-text="item.description" />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemTax', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.tax') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle :url="`#/item/${entityId}/tax`" :text="t('item.summary.tax')" />
                 <VnLv
                     v-for="(tax, index) in item.taxes"
                     :key="index"
@@ -178,15 +142,10 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBotanical', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit }"
-                >
-                    {{ t('item.summary.botanical') }}
-                    <QIcon v-if="canEdit" name="open_in_new" />
-                </component>
+                <VnTitle
+                    :url="`#/item/${entityId}/botanical`"
+                    :text="t('item.summary.botanical')"
+                />
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
                 <VnLv
                     :label="t('item.summary.specie')"
@@ -194,23 +153,19 @@ const isReplenisher = computed(() => useRole().hasAny(['replenisher']));
                 />
             </QCard>
             <QCard class="vn-one">
-                <component
-                    :is="canEdit || isReplenisher ? 'router-link' : 'span'"
-                    :to="{ name: 'ItemBarcode', params: { id: entityId } }"
-                    class="header"
-                    :class="{ 'header-link': canEdit || isReplenisher }"
-                >
-                    {{ t('item.summary.barcode') }}
-                    <QIcon v-if="canEdit || isReplenisher" name="open_in_new" />
-                </component>
-                <p v-for="(barcode, index) in item.itemBarcode" :key="index">
-                    {{ barcode.code }}
-                </p>
+                <VnTitle
+                    :url="`#/item/${entityId}/barcode`"
+                    :text="t('item.summary.barcode')"
+                />
+                <p
+                    v-for="(barcode, index) in item.itemBarcode"
+                    :key="index"
+                    v-text="barcode.code"
+                />
             </QCard>
         </template>
     </CardSummary>
 </template>
-
 <i18n>
 en:
     Este artículo necesita una foto: Este artículo necesita una foto

From c978cca8c5c760f03c67d3cf1693a4f998d3d492 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 11:35:49 +0200
Subject: [PATCH 14/23] refactor: refs #4074 useAcl in navigationStore & router

---
 src/components/common/VnSelectDialog.vue |  8 ++------
 src/composables/useAcl.js                | 21 +++++++++++++--------
 src/router/index.js                      | 11 ++++-------
 src/router/modules/account.js            |  6 +++---
 src/stores/useNavigationStore.js         |  6 +++---
 5 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 0ade82bda..7338e752d 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -31,12 +31,8 @@ const acl = useAcl();
 const showForm = ref(false);
 
 const isAllowedToCreate = computed(() => {
-    const hasMissingAcl = $props.acls.some(
-        (x) => !acl.hasAny(x.model, x.props, x.accessType)
-    );
-    const hasRequiredRole = role.hasAny($props.rolesAllowedToCreate);
-    if ($props.acls.length) return !hasMissingAcl;
-    return hasRequiredRole;
+    if ($props.acls.length) return acl.hasAny($props.acls);
+    return role.hasAny($props.rolesAllowedToCreate);
 });
 </script>
 
diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index bebeda039..539e89622 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -16,14 +16,19 @@ export function useAcl() {
         state.setAcls(acls);
     }
 
-    function hasAny(model, props, accessType) {
-        const acls = state.getAcls().value[model];
-        Array.isArray(props) || (props = [props]);
-        if (acls) 
-            return ['*', ...props].some((key) => {
-                const acl = acls[key];
-                return acl && (acl['*'] || acl[accessType]);
-            });
+    function hasAny(acls) {
+        if (!Array.isArray(acls)) acls = [acls];
+        for (const acl of acls) {
+            let { model, props, accessType } = acl;
+            const modelAcls = state.getAcls().value[model];
+            Array.isArray(props) || (props = [props]);
+            if (modelAcls)
+                return ['*', ...props].some((key) => {
+                    const acl = modelAcls[key];
+                    return acl && (acl['*'] || acl[accessType]);
+                });
+        }
+        return false;
     }
 
     return {
diff --git a/src/router/index.js b/src/router/index.js
index 686da2dde..18541c0b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,15 +60,12 @@ export default route(function (/* { store, ssrContext } */) {
                 await useTokenConfig().fetch();
             }
             const matches = to.matched;
-            const hasRequiredRoles = matches.every((route) => {
+            const hasRequiredAcls = matches.every((route) => {
                 const meta = route.meta;
-                if (meta && meta.roles) return useRole().hasAny(meta.roles);
-                return true;
+                if (!meta?.acls) return true;
+                return useAcl().hasAny(meta.acls);
             });
-
-            if (!hasRequiredRoles) {
-                return next({ path: '/' });
-            }
+            if (!hasRequiredAcls) return next({ path: '/' });
         }
 
         next();
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index cfec2b95d..bb1c38c8e 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -79,7 +79,7 @@ export default {
                     meta: {
                         title: 'accounts',
                         icon: 'accessibility',
-                        roles: ['itManagement'],
+                        acls: [{ model: 'Account', props: '*', accessType: '*' }],
                     },
                     component: () => import('src/pages/Account/AccountAccounts.vue'),
                 },
@@ -89,7 +89,7 @@ export default {
                     meta: {
                         title: 'ldap',
                         icon: 'account_tree',
-                        roles: ['itManagement'],
+                        acls: [{ model: 'LdapConfig', props: '*', accessType: '*' }],
                     },
                     component: () => import('src/pages/Account/AccountLdap.vue'),
                 },
@@ -99,7 +99,7 @@ export default {
                     meta: {
                         title: 'samba',
                         icon: 'preview',
-                        roles: ['itManagement'],
+                        acls: [{ model: 'SambaConfig', props: '*', accessType: '*' }],
                     },
                     component: () => import('src/pages/Account/AccountSamba.vue'),
                 },
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 961e80377..784e5063a 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -2,7 +2,7 @@ import axios from 'axios';
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
 import { toLowerCamel } from 'src/filters';
-import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';
 import routes from 'src/router/modules';
 
 export const useNavigationStore = defineStore('navigationStore', () => {
@@ -26,7 +26,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'zone',
     ];
     const pinnedModules = ref([]);
-    const role = useRole();
+    const acl = useAcl();
 
     function getModules() {
         const modulesRoutes = ref([]);
@@ -63,7 +63,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
                 title: `globals.pageTitles.${title}`,
             }));
 
-        if (meta && meta.roles && role.hasAny(meta.roles) === false) return;
+        if (meta && meta.acls && acl.hasAny(meta.acls) === false) return;
 
         const item = {
             name: route.name,

From 803ce3b909a0f1c515db0ff2350b94061011bf89 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 11:53:59 +0200
Subject: [PATCH 15/23] refactor: refs #4074 rollback

---
 src/router/modules/worker.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 6eebdddac..2a523e7fe 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -53,6 +53,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                 },
+                {
+                    path: 'create',
+                    name: 'WorkerCreate',
+                    meta: {
+                        title: 'workerCreate',
+                        icon: 'add',
+                    },
+                    component: () => import('src/pages/Worker/WorkerCreate.vue'),
+                },
             ],
         },
         {

From 6438f36ecaa880f68aedf76b96fc51c5f16d460b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 12:28:14 +0200
Subject: [PATCH 16/23] refactor: refs #4074 accept array

---
 src/composables/useAcl.js                        | 1 -
 src/pages/Customer/Card/CustomerBalance.vue      | 4 +++-
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/composables/useAcl.js b/src/composables/useAcl.js
index 539e89622..ede359186 100644
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@@ -17,7 +17,6 @@ export function useAcl() {
     }
 
     function hasAny(acls) {
-        if (!Array.isArray(acls)) acls = [acls];
         for (const acl of acls) {
             let { model, props, accessType } = acl;
             const modelAcls = state.getAcls().value[model];
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 501ea6d68..95f5f0981 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -284,7 +284,9 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAny('Receipt','*', 'WRITE')"
+                    :disable="
+                        !hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
+                    "
                     @keypress.enter="scope.set"
                     autofocus
                 />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index d431e1f96..b7f470b0c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -195,7 +195,8 @@ async function cloneInvoice() {
     push({ path: `/invoice-in/${data.id}/summary` });
 }
 
-const canEditProp = (prop) => hasAny('InvoiceIn', prop, 'WRITE');
+const canEditProp = (props) =>
+    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
 
 const isAgricultural = () => {
     if (!config.value) return false;

From 381b236a18bc0b3186bbd1e6145d2108200b2f50 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 12:56:37 +0200
Subject: [PATCH 17/23] refactor: refs #4074 use acl & drop useless roles

---
 src/router/modules/claim.js     | 10 ++++++++--
 src/router/modules/invoiceIn.js |  1 -
 src/router/modules/shelving.js  |  1 -
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index cced9e24d..ae794448e 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -61,7 +61,7 @@ export default {
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
+                        acls: [{ model: 'Claim', props: 'findById', accessType: 'READ' }],
                     },
                     component: () => import('src/pages/Claim/Card/ClaimBasicData.vue'),
                 },
@@ -98,7 +98,13 @@ export default {
                     meta: {
                         title: 'development',
                         icon: 'vn:traceability',
-                        roles: ['claimManager'],
+                        acls: [
+                            {
+                                model: 'ClaimDevelopment',
+                                props: '*',
+                                accessType: 'WRITE',
+                            },
+                        ],
                     },
                     component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'),
                 },
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 906db8a58..c8027ffbf 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -80,7 +80,6 @@ export default {
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
                     },
                     component: () =>
                         import('src/pages/InvoiceIn/Card/InvoiceInBasicData.vue'),
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 70145dfb4..b7f50a3b6 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -76,7 +76,6 @@ export default {
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
                     },
                     component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
                 },

From bd00f86d74e9b52af56b34a126faaba11c6109e6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 14:09:29 +0200
Subject: [PATCH 18/23] chore: refs #4074 fix tests

---
 .../__tests__/composables/useAcl.spec.js      | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/test/vitest/__tests__/composables/useAcl.spec.js
index a2b44b5e7..6cb29984c 100644
--- a/test/vitest/__tests__/composables/useAcl.spec.js
+++ b/test/vitest/__tests__/composables/useAcl.spec.js
@@ -48,40 +48,62 @@ describe('useAcl', () => {
 
     describe('hasAny', () => {
         it('should return false if no roles matched', async () => {
-            expect(acl.hasAny('Worker', 'updateAttributes', 'WRITE')).toBeFalsy();
+            expect(
+                acl.hasAny([
+                    { model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
+                ])
+            ).toBeFalsy();
         });
 
         it('should return false if no roles matched', async () => {
-            expect(acl.hasAny('Worker', 'holidays', 'READ')).toBeTruthy();
+            expect(
+                acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }])
+            ).toBeTruthy();
         });
 
         describe('*', () => {
             it('should return true if an acl matched', async () => {
-                expect(acl.hasAny('Address', '*', 'WRITE')).toBeTruthy();
+                expect(
+                    acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }])
+                ).toBeTruthy();
             });
 
             it('should return false if no acls matched', async () => {
-                expect(acl.hasAny('Worker', '*', 'READ')).toBeFalsy();
+                expect(
+                    acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }])
+                ).toBeFalsy();
             });
         });
 
         describe('$authenticated', () => {
             it('should return false if no acls matched', async () => {
-                expect(acl.hasAny('Url', 'getByUser', '*')).toBeFalsy();
+                expect(
+                    acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }])
+                ).toBeFalsy();
             });
 
             it('should return true if an acl matched', async () => {
-                expect(acl.hasAny('Url', 'getByUser', 'READ')).toBeTruthy();
+                expect(
+                    acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: 'READ' }])
+                ).toBeTruthy();
             });
         });
 
         describe('$everyone', () => {
             it('should return false if no acls matched', async () => {
-                expect(acl.hasAny('TpvTransaction', 'start', 'READ')).toBeFalsy();
+                expect(
+                    acl.hasAny([
+                        { model: 'TpvTransaction', props: 'start', accessType: 'READ' },
+                    ])
+                ).toBeFalsy();
             });
 
             it('should return false if an acl matched', async () => {
-                expect(acl.hasAny('TpvTransaction', 'start', 'WRITE')).toBeTruthy();
+                expect(
+                    acl.hasAny([
+                        { model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
+                    ])
+                ).toBeTruthy();
             });
         });
     });

From 26c7dfde35095ad44f64be45d4be8de70fdd6002 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 16:44:43 +0200
Subject: [PATCH 19/23] chore: refs #4074 fix tests

---
 src/components/common/VnSelectDialog.vue         | 4 ++--
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 7338e752d..219e6dc98 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -44,7 +44,7 @@ const isAllowedToCreate = computed(() => {
     >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
-                @click.stop.prevent="showForm = true"
+                @click.stop.prevent="$refs.dialog.show()"
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"
@@ -54,7 +54,7 @@ const isAllowedToCreate = computed(() => {
             >
                 <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
             </QIcon>
-            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+            <QDialog ref="dialog" transition-show="scale" transition-hide="scale">
                 <slot name="form" />
             </QDialog>
         </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index b7f470b0c..ee829ccdd 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -294,7 +294,7 @@ const createInvoiceInCorrection = async () => {
                 </template>
             </InvoiceInToBook>
             <QItem
-                v-if="entity?.isBooked && canEditProp('toUnBook')"
+                v-if="entity?.isBooked && canEditProp('toUnbook')"
                 v-ripple
                 clickable
                 @click="triggerMenu('unbook')"

From 04aa96b798661a0d8bfe4b1f002eed4966ac1d95 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 17:01:36 +0200
Subject: [PATCH 20/23] chore: refs #4074 fix tests

---
 test/cypress/integration/outLogin/login.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/outLogin/login.spec.js b/test/cypress/integration/outLogin/login.spec.js
index f8a9f5c64..6757ba7d0 100755
--- a/test/cypress/integration/outLogin/login.spec.js
+++ b/test/cypress/integration/outLogin/login.spec.js
@@ -53,8 +53,8 @@ describe('Login', () => {
     });
 
     it(`should get redirected to dashboard since employee can't create tickets`, () => {
-        cy.visit('/#/ticket/create', { failOnStatusCode: false });
-        cy.url().should('contain', '/#/login?redirect=/ticket/create');
+        cy.visit('/#/account/ldap', { failOnStatusCode: false });
+        cy.url().should('contain', '/#/login?redirect=/account/ldap');
         cy.get('input[aria-label="Username"]').type('employee');
         cy.get('input[aria-label="Password"]').type('nightmare');
         cy.get('button[type="submit"]').click();

From f8cbb0a7629d7ffd9dd6145c12722deb73411162 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 17:10:35 +0200
Subject: [PATCH 21/23] chore: refs #4074 fix tests

---
 src/pages/Worker/Card/WorkerLocker.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerLocker.vue b/src/pages/Worker/Card/WorkerLocker.vue
index ba5c0de97..4a19e472c 100644
--- a/src/pages/Worker/Card/WorkerLocker.vue
+++ b/src/pages/Worker/Card/WorkerLocker.vue
@@ -57,7 +57,11 @@ const init = async (data) => {
                 option-label="code"
                 option-value="id"
                 hide-selected
-                :readonly="!hasAny('Worker','__get__locker','READ')"
+                :readonly="
+                    !hasAny([
+                        { model: 'Worker', props: '__get__locker', accessType: 'READ' },
+                    ])
+                "
             />
         </template>
     </FormModel>

From f3471fe5ab683768331a2c6c566156d8954a4c2f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Sep 2024 17:20:16 +0200
Subject: [PATCH 22/23] fix: refs #4074 await to watch

---
 src/components/ui/VnPaginate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index d51b0fcef..441a8ff48 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -120,7 +120,7 @@ watch(
 
 watch(
     () => [props.url, props.filter, props.userParams],
-    ([url, filter, userParams]) => fetch({ url, filter, userParams })
+    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
 );
 
 const addFilter = async (filter, params) => {

From 3fafb15eb8cd0da28757a9d1a20a5518b021824e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Sep 2024 09:18:57 +0200
Subject: [PATCH 23/23] refactor: refs #4074 use fn

---
 src/pages/Item/Card/ItemSummary.vue            | 18 ++++++++----------
 .../cypress/integration/outLogin/login.spec.js |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 081eb2afb..7b6015c30 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -20,6 +20,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
+const getUrl = (id, param) => `#/Item/${id}/${param}`;
 </script>
 <template>
     <CardSummary
@@ -53,7 +54,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/basic-data`"
+                    :url="getUrl(entityId, 'basic-data')"
                     :text="t('item.summary.basicData')"
                 />
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
@@ -87,7 +88,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/basic-data`"
+                    :url="getUrl(entityId, 'basic-data')"
                     :text="t('item.summary.otherData')"
                 />
                 <VnLv
@@ -114,10 +115,7 @@ const entityId = computed(() => $props.id || route.params.id);
                 />
             </QCard>
             <QCard class="vn-one">
-                <VnTitle
-                    :url="`#/item/${entityId}/tags`"
-                    :text="t('item.summary.tags')"
-                />
+                <VnTitle :url="getUrl(entityId, 'tags')" :text="t('item.summary.tags')" />
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
@@ -127,13 +125,13 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one" v-if="item.description">
                 <VnTitle
-                    :url="`#/item/${entityId}/basic-data`"
+                    :url="getUrl(entityId, 'basic-data')"
                     :text="t('item.summary.description')"
                 />
                 <p v-text="item.description" />
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :url="`#/item/${entityId}/tax`" :text="t('item.summary.tax')" />
+                <VnTitle :url="getUrl(entityId, 'tax')" :text="t('item.summary.tax')" />
                 <VnLv
                     v-for="(tax, index) in item.taxes"
                     :key="index"
@@ -143,7 +141,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/botanical`"
+                    :url="getUrl(entityId, 'botanical')"
                     :text="t('item.summary.botanical')"
                 />
                 <VnLv :label="t('item.summary.genus')" :value="botanical?.genus?.name" />
@@ -154,7 +152,7 @@ const entityId = computed(() => $props.id || route.params.id);
             </QCard>
             <QCard class="vn-one">
                 <VnTitle
-                    :url="`#/item/${entityId}/barcode`"
+                    :url="getUrl(entityId, 'barcode')"
                     :text="t('item.summary.barcode')"
                 />
                 <p
diff --git a/test/cypress/integration/outLogin/login.spec.js b/test/cypress/integration/outLogin/login.spec.js
index 6757ba7d0..3db223cdb 100755
--- a/test/cypress/integration/outLogin/login.spec.js
+++ b/test/cypress/integration/outLogin/login.spec.js
@@ -52,7 +52,7 @@ describe('Login', () => {
         cy.url().should('contain', '/login');
     });
 
-    it(`should get redirected to dashboard since employee can't create tickets`, () => {
+    it(`should be redirected to dashboard since the employee is not enabled to see ldap`, () => {
         cy.visit('/#/account/ldap', { failOnStatusCode: false });
         cy.url().should('contain', '/#/login?redirect=/account/ldap');
         cy.get('input[aria-label="Username"]').type('employee');