From 668dc5fd538631a1b683d76b15a3d9ff3d638ec2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Jun 2024 15:09:21 +0200
Subject: [PATCH 1/5] fix: List without limit

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

diff --git a/src/pages/Account/Alias/Card/AliasUsers.vue b/src/pages/Account/Alias/Card/AliasUsers.vue
index 39f881a4e..4a9c449e4 100644
--- a/src/pages/Account/Alias/Card/AliasUsers.vue
+++ b/src/pages/Account/Alias/Card/AliasUsers.vue
@@ -75,6 +75,7 @@ const fetchAliases = () => paginateRef.value.fetch();
                 data-key="AliasUsers"
                 :filter="filter"
                 :url="urlPath"
+                :limit="0"
                 auto-load
             >
                 <template #body>

From 0d1453ddeb7415a7ce6f98d33dc46ce55b66b51f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Jun 2024 15:09:34 +0200
Subject: [PATCH 2/5] feat: isPublic checkbox

---
 src/components/common/VnInput.vue               | 4 ++--
 src/pages/Account/Alias/Card/AliasBasicData.vue | 5 +++++
 src/pages/Account/locale/en.yml                 | 1 +
 src/pages/Account/locale/es.yml                 | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 8358cd6e6..6144f975d 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -74,13 +74,13 @@ const inputRules = [
             <template v-if="$slots.prepend" #prepend>
                 <slot name="prepend" />
             </template>
-            
+
             <template #append>
                 <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="$slots.append && hover && value && !$attrs.disabled"
+                    v-if="hover && value && !$attrs.disabled"
                     @click="value = null"
                 ></QIcon>
             </template>
diff --git a/src/pages/Account/Alias/Card/AliasBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
index 3f682fd67..5d8062739 100644
--- a/src/pages/Account/Alias/Card/AliasBasicData.vue
+++ b/src/pages/Account/Alias/Card/AliasBasicData.vue
@@ -26,6 +26,11 @@ const { t } = useI18n();
                     />
                 </div>
             </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+                </div>
+            </VnRow>
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index f9bd7dc18..d90b3a383 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -51,6 +51,7 @@ mailAlias:
     id: Id
     newAlias: New alias
     name: Name
+    isPublic: Public
 ldap:
     enableSync: Enable synchronization
     server: Server
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index 763143940..e0a6cf29f 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -62,6 +62,7 @@ mailAlias:
     id: Id
     newAlias: Nuevo alias
     name: Nombre
+    isPublic: Público
 ldap:
     enableSync: Habilitar sincronización
     server: Servidor

From 6053d42442b9e903af264433563acdc56b96864c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 7 Jun 2024 11:09:46 +0200
Subject: [PATCH 3/5] fix: descriptor and i18n

---
 src/pages/Account/Alias/Card/AliasDescriptor.vue | 2 +-
 src/pages/Account/locale/en.yml                  | 9 +++++++++
 src/pages/Account/locale/es.yml                  | 9 +++++++++
 src/router/modules/index.js                      | 2 ++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index bc174aa0e..f821aaf2f 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -64,7 +64,7 @@ const removeAlias = () => {
         ref="descriptor"
         url="MailAliases"
         :filter="filter"
-        module="Account"
+        module="Alias"
         @on-fetch="setData"
         data-key="aliasData"
         :title="data.title"
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index d6360d316..babedae70 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -47,7 +47,16 @@ role:
     name: Name
     description: Description
     id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Users
+    search: Search mail alias
+    searchInfo: Search alias by id or name
+    alias: Alias
+    description: Description
+    id: Id
     newAlias: New alias
+    name: Name
     isPublic: Public
 ldap:
     enableSync: Enable synchronization
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index 0aa39752f..36125f361 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -58,7 +58,16 @@ role:
     name: Nombre
     description: Descripción
     id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Usuarios
+    search: Buscar alias de correo
+    searchInfo: Buscar alias por id o nombre
+    alias: Alias
+    description: Descripción
+    id: Id
     newAlias: Nuevo alias
+    name: Nombre
     isPublic: Público
 ldap:
     enableSync: Habilitar sincronización
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 78d4d94cc..fb1bdc466 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -20,6 +20,7 @@ import ItemType from './itemType';
 import Zone from './zone';
 import Account from './account';
 import Monitor from './monitor';
+import MailAlias from './mailAlias';
 
 export default [
     Item,
@@ -43,5 +44,6 @@ export default [
     ItemType,
     Zone,
     Account,
+    MailAlias,
     Monitor,
 ];

From 5551077c92c952972c625214abe8e220e142d5ea Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 7 Jun 2024 11:16:15 +0200
Subject: [PATCH 4/5] fix: roles

---
 .../Account/Role/Card/RoleDescriptor.vue      | 92 +++++++++++++++++++
 src/router/modules/index.js                   |  2 +
 src/router/routes.js                          |  2 +
 3 files changed, 96 insertions(+)
 create mode 100644 src/pages/Account/Role/Card/RoleDescriptor.vue

diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
new file mode 100644
index 000000000..89712b0b9
--- /dev/null
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -0,0 +1,92 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
+import { useQuasar } from 'quasar';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+
+const quasar = useQuasar();
+const router = useRouter();
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
+const filter = {
+    where: { id: entityId },
+};
+const removeRole = () => {
+    quasar
+        .dialog({
+            title: 'Are you sure you want to delete it?',
+            message: 'Delete department',
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(
+                    `/Departments/${entityId.value}/removeChild`,
+                    entityId.value
+                );
+                router.push({ name: 'WorkerDepartment' });
+                notify('department.departmentRemoved', 'positive');
+            } catch (err) {
+                console.error('Error removing department');
+            }
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        ref="descriptor"
+        :url="`VnRoles`"
+        :filter="filter"
+        module="Role"
+        @on-fetch="setData"
+        data-key="accountData"
+        :title="data.title"
+        :subtitle="data.subtitle"
+    >
+        <template #menu>
+            <QItem v-ripple clickable @click="removeRole()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('role.card.description')" :value="entity.description" />
+        </template>
+    </CardDescriptor>
+</template>
+<style scoped>
+.q-item__label {
+    margin-top: 0;
+}
+</style>
+<i18n>
+    en:
+        accountRate: Claming rate
+    es:
+        accountRate: Ratio de reclamación
+</i18n>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index fb1bdc466..bf7e46b00 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -21,6 +21,7 @@ import Zone from './zone';
 import Account from './account';
 import Monitor from './monitor';
 import MailAlias from './mailAlias';
+import Role from './role';
 
 export default [
     Item,
@@ -46,4 +47,5 @@ export default [
     Account,
     MailAlias,
     Monitor,
+    Role,
 ];
diff --git a/src/router/routes.js b/src/router/routes.js
index 3ca2175f8..359ce5317 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -21,6 +21,7 @@ import zone from 'src/router/modules/zone';
 import account from './modules/account';
 import monitor from 'src/router/modules/monitor';
 import mailAlias from './modules/mailAlias';
+import role from './modules/role';
 
 const routes = [
     {
@@ -82,6 +83,7 @@ const routes = [
             ItemType,
             zone,
             account,
+            role,
             mailAlias,
             {
                 path: '/:catchAll(.*)*',

From dce95824be88ab550ff7bd7b714af8f22f82675c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 7 Jun 2024 12:51:38 +0200
Subject: [PATCH 5/5] fix(AccountAlias): fix and optimization

---
 src/pages/Account/AccountAliasList.vue        |  1 -
 .../Account/Alias/Card/AliasBasicData.vue     | 26 +++++--------------
 src/pages/Account/Alias/Card/AliasCard.vue    |  1 +
 .../Account/Alias/Card/AliasDescriptor.vue    |  7 +----
 4 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
index 896804484..29e8d4d78 100644
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@@ -58,7 +58,6 @@ const openCreateModal = () => aliasCreateDialogRef.value.show();
                 ref="paginateRef"
                 data-key="AccountAliasList"
                 url="MailAliases"
-                auto-load
                 :expr-builder="exprBuilder"
             >
                 <template #body="{ rows }">
diff --git a/src/pages/Account/Alias/Card/AliasBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
index 5d8062739..035ba0e8b 100644
--- a/src/pages/Account/Alias/Card/AliasBasicData.vue
+++ b/src/pages/Account/Alias/Card/AliasBasicData.vue
@@ -3,7 +3,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const route = useRoute();
@@ -11,26 +10,13 @@ const { t } = useI18n();
 </script>
 
 <template>
-    <FormModel :url="`MailAliases/${route.params.id}`" model="Alias" auto-load>
+    <FormModel model="Alias">
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('mailAlias.description')"
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
-                </div>
-            </VnRow>
+            <div class="column q-gutter-y-md">
+                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
+                <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+            </div>
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
index 8b6c9c3cf..f5103cf03 100644
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -22,6 +22,7 @@ const searchBarDataKeys = {
 <template>
     <VnCard
         data-key="Alias"
+        base-url="MailAliases"
         :descriptor="AliasDescriptor"
         :search-data-key="searchBarDataKeys[routeName]"
         :search-custom-route-redirect="customRouteRedirectName"
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index f821aaf2f..963f84547 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -32,10 +32,6 @@ const entityId = computed(() => {
 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
 
-const filter = {
-    where: { id: entityId },
-};
-
 const removeAlias = () => {
     quasar
         .dialog({
@@ -62,8 +58,7 @@ const removeAlias = () => {
 <template>
     <CardDescriptor
         ref="descriptor"
-        url="MailAliases"
-        :filter="filter"
+        :url="`MailAliases/${entityId}`"
         module="Alias"
         @on-fetch="setData"
         data-key="aliasData"