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] 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"