From 6b69a1612222cf94b65e99724a4943e2af991489 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 7 Aug 2024 12:22:52 +0200
Subject: [PATCH 1/7] refs #7355 changes BasicData

---
 src/i18n/locale/es.yml                      | 2 +-
 src/pages/Account/AccountList.vue           | 9 ++++++++-
 src/pages/Account/Card/AccountBasicData.vue | 4 +++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 0266bd208..708084d45 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -873,7 +873,7 @@ worker:
     card:
         workerId: ID Trabajador
         name: Nombre
-        email: Email
+        email: Correo personal
         phone: Teléfono
         mobile: Móvil
         active: Activo
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index ecb027e49..d789fdf84 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -48,6 +48,14 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'email',
+        label: t('email'),
+        component: 'input',
+        create: true,
+        visible: false,
+    },
     {
         align: 'right',
         label: '',
@@ -96,7 +104,6 @@ const exprBuilder = (param, value) => {
         order="id DESC"
         :columns="columns"
         default-mode="table"
-        auto-load
         redirect="account"
         :use-model="true"
     />
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index 42b77419f..f38299f9e 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -37,9 +37,11 @@ watch(
                 <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
                 <VnInput v-model="data.email" :label="t('account.card.email')" />
                 <VnSelect
+                    url="Languages"
                     v-model="data.lang"
-                    :options="['es', 'en']"
                     :label="t('account.card.lang')"
+                    option-value="code"
+                    option-label="code"
                 />
             </div>
         </template>
-- 
2.40.1


From 3eaa5c864d45c28ada6322ef5d333b8588260a95 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 8 Aug 2024 13:57:01 +0200
Subject: [PATCH 2/7] refs #7355 account fixes

---
 src/components/ui/VnFilterPanel.vue           |  8 ++--
 src/pages/Account/AccountAcls.vue             | 26 ++++++++--
 src/pages/Account/Card/AccountCard.vue        |  5 +-
 .../Account/Card/AccountDescriptorMenu.vue    | 48 +++++++++++++++++++
 src/pages/Account/Card/AccountPrivileges.vue  |  9 +---
 src/pages/Account/Role/AccountRoles.vue       | 17 ++++++-
 src/pages/Account/Role/Card/RoleBasicData.vue |  5 --
 src/router/modules/account.js                 | 18 +++----
 8 files changed, 102 insertions(+), 34 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 430383e40..ebae673a2 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -37,7 +37,7 @@ const $props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => ['filter'],
+        default: () => ['filter', 'search', 'or', 'and'],
     },
     customTags: {
         type: Array,
@@ -195,8 +195,10 @@ function formatValue(value) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (typeof value == 'object')
-            params[key] = Object.values(value)[0].replaceAll('%', '');
+        if (typeof value == 'object') {
+            const param = Object.values(value)[0];
+            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
+        }
     }
     return params;
 }
diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue
index ad8600786..3a6679956 100644
--- a/src/pages/Account/AccountAcls.vue
+++ b/src/pages/Account/AccountAcls.vue
@@ -41,14 +41,12 @@ const columns = computed(() => [
         name: 'id',
         label: t('id'),
         isId: true,
-        field: 'id',
         cardVisible: true,
     },
     {
         align: 'left',
         name: 'model',
         label: t('model'),
-        field: 'model',
         cardVisible: true,
         create: true,
     },
@@ -56,15 +54,19 @@ const columns = computed(() => [
         align: 'left',
         name: 'principalId',
         label: t('principalId'),
-        field: 'principalId',
         cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'VnRoles',
+            optionLabel: 'name',
+            optionValue: 'name',
+        },
         create: true,
     },
     {
         align: 'left',
         name: 'property',
         label: t('property'),
-        field: 'property',
         cardVisible: true,
         create: true,
     },
@@ -72,7 +74,10 @@ const columns = computed(() => [
         align: 'left',
         name: 'accessType',
         label: t('accessType'),
-        field: 'accessType',
+        component: 'select',
+        attrs: {
+            options: ['READ', 'WRITE', '*'],
+        },
         cardVisible: true,
         create: true,
     },
@@ -162,4 +167,15 @@ es:
     Are you sure you want to continue?: ¿Seguro que quieres continuar?
     Remove ACL: Eliminar Acl
     Do you want to remove this ACL?: ¿Quieres eliminar este ACL?
+    principalId: Rol
+    model: Modelo
+en:
+    New ACL: New ACL
+    ACL removed: ACL removed
+    ACL will be removed: ACL will be removed
+    Are you sure you want to continue?: Are you sure you want to continue?
+    Remove ACL: Remove ACL
+    Do you want to remove this ACL?: Do you want to remove this ACL?
+    principalId: Rol
+    model: Models
 </i18n>
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index e4db3ee2b..555ce0866 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -25,9 +25,8 @@ const searchBarDataKeys = {
     <VnCard
         data-key="Account"
         :descriptor="AccountDescriptor"
-        :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
-        :search-redirect="!!customRouteRedirectName"
+        search-data-key="AccountUsers"
+        search-url="VnUsers/preview"
         :searchbar-label="t('account.search')"
         :searchbar-info="t('account.searchInfo')"
     />
diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index 05576b145..f67cc0c6b 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -82,6 +82,54 @@ const removeAccount = async () => {
 };
 </script>
 <template>
+    <VnConfirm
+        v-model="showSyncDialog"
+        :message="t('account.card.actions.sync.message')"
+        :title="t('account.card.actions.sync.title')"
+        :promise="sync"
+    >
+        <template #customHTML>
+            {{ shouldSyncPassword }}
+            <QCheckbox
+                :label="t('account.card.actions.sync.checkbox')"
+                v-model="shouldSyncPassword"
+                class="full-width"
+                clearable
+                clear-icon="close"
+            >
+                <QIcon style="padding-left: 10px" color="primary" name="info" size="sm">
+                    <QTooltip>{{ t('account.card.actions.sync.tooltip') }}</QTooltip>
+                </QIcon></QCheckbox
+            >
+            <QInput
+                v-if="shouldSyncPassword"
+                :label="t('login.password')"
+                v-model="syncPassword"
+                class="full-width"
+                clearable
+                clear-icon="close"
+                type="password"
+            />
+        </template>
+    </VnConfirm>
+    <!-- <QItem v-ripple clickable @click="setPassword">
+        <QItemSection>{{ t('account.card.actions.setPassword') }}</QItemSection>
+    </QItem>
+    <QItem
+        v-if="!account.hasAccount"
+        v-ripple
+        clickable
+        @click="
+            openConfirmationModal(
+                t('account.card.actions.enableAccount.title'),
+                t('account.card.actions.enableAccount.subtitle'),
+                () => updateStatusAccount(true)
+            )
+        "
+    >
+        <QItemSection>{{ t('account.card.actions.enableAccount.name') }}</QItemSection>
+    </QItem> -->
+
     <QItem
         v-if="account.hasAccount"
         v-ripple
diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index f1f24f19b..1300f5018 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -14,16 +14,11 @@ const rolesOptions = ref([]);
 const formModelRef = ref();
 </script>
 <template>
-    <FetchData
-        url="VnRoles"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        auto-load
-        @on-fetch="(data) => (rolesOptions = data)"
-    />
+    <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
     <FormModel
         ref="formModelRef"
         model="AccountPrivileges"
-        :url="`VnUsers/${route.params.id}`"
+        :url="`VnUsers/${route.params.id}/privileges`"
         :url-create="`VnUsers/${route.params.id}/privileges`"
         auto-load
         @on-data-saved="formModelRef.fetch()"
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index c11bb340a..07b205993 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -5,6 +5,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import { useRoute } from 'vue-router';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RoleSummary from './Card/RoleSummary.vue';
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -16,7 +18,7 @@ const $props = defineProps({
 });
 const tableRef = ref();
 const entityId = computed(() => $props.id || route.params.id);
-
+const { viewSummary } = useSummaryDialog();
 const columns = computed(() => [
     {
         align: 'left',
@@ -42,6 +44,18 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('View Summary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, RoleSummary),
+            },
+        ],
+    },
 ]);
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -89,6 +103,5 @@ const exprBuilder = (param, value) => {
         default-mode="table"
         auto-load
         redirect="account/role"
-        :is-editable="true"
     />
 </template>
diff --git a/src/pages/Account/Role/Card/RoleBasicData.vue b/src/pages/Account/Role/Card/RoleBasicData.vue
index cddf755f0..56f4f0c27 100644
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Role/Card/RoleBasicData.vue
@@ -23,11 +23,6 @@ const { t } = useI18n();
                     />
                 </div>
             </VnRow>
-            <VnRow>
-                <div class="col">
-                    <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
-                </div>
-            </VnRow>
         </template>
     </FormModel>
 </template>
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index 3faa00fbc..cfec2b95d 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -65,13 +65,13 @@ export default {
                     component: () => import('src/pages/Account/AccountAliasList.vue'),
                 },
                 {
-                    path: 'connections',
-                    name: 'AccountConnections',
+                    path: 'acls',
+                    name: 'AccountAcls',
                     meta: {
-                        title: 'connections',
+                        title: 'acls',
                         icon: 'check',
                     },
-                    component: () => import('src/pages/Account/AccountConnections.vue'),
+                    component: () => import('src/pages/Account/AccountAcls.vue'),
                 },
                 {
                     path: 'accounts',
@@ -104,13 +104,13 @@ export default {
                     component: () => import('src/pages/Account/AccountSamba.vue'),
                 },
                 {
-                    path: 'acls',
-                    name: 'AccountAcls',
+                    path: 'connections',
+                    name: 'AccountConnections',
                     meta: {
-                        title: 'acls',
-                        icon: 'check',
+                        title: 'connections',
+                        icon: 'share',
                     },
-                    component: () => import('src/pages/Account/AccountAcls.vue'),
+                    component: () => import('src/pages/Account/AccountConnections.vue'),
                 },
                 {
                     path: 'acl-form',
-- 
2.40.1


From 40c3ba15e6e0e02756526535af42462df54d3f11 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 8 Aug 2024 14:55:53 +0200
Subject: [PATCH 3/7] refs #7355 account acls roles cars

---
 src/pages/Account/AccountAcls.vue        |  7 -------
 src/pages/Account/Role/AccountRoles.vue  | 16 ++++++----------
 src/pages/Account/Role/Card/RoleCard.vue |  5 ++---
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue
index 3a6679956..080956d46 100644
--- a/src/pages/Account/AccountAcls.vue
+++ b/src/pages/Account/AccountAcls.vue
@@ -123,13 +123,6 @@ const deleteAcl = async ({ id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="VnRoles"
-        :filter="{ fields: ['name'], order: 'name ASC' }"
-        @on-fetch="(data) => (rolesOptions = data)"
-        auto-load
-    />
-
     <VnSearchbar
         data-key="AccountAcls"
         url="ACLs"
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index 07b205993..0604b71af 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -76,16 +76,12 @@ const exprBuilder = (param, value) => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="Roles"
-                :expr-builder="exprBuilder"
-                :label="t('role.searchRoles')"
-                :info="t('role.searchInfo')"
-            />
-        </Teleport>
-    </template>
+    <VnSearchbar
+        data-key="Roles"
+        :expr-builder="exprBuilder"
+        :label="t('role.searchRoles')"
+        :info="t('role.searchInfo')"
+    />
     <VnTable
         ref="tableRef"
         data-key="Roles"
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 8a65d37d7..e5c8c3ebb 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -22,9 +22,8 @@ const searchBarDataKeys = {
     <VnCard
         data-key="Role"
         :descriptor="RoleDescriptor"
-        :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
-        :search-redirect="!!customRouteRedirectName"
+        search-data-key="AccountRoles"
+        search-url="VnRoles"
         :searchbar-label="t('role.searchRoles')"
         :searchbar-info="t('role.searchInfo')"
     />
-- 
2.40.1


From b21ba3dc2c0f06924eb30c266aff0c0a0128dec1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 9 Aug 2024 13:55:29 +0200
Subject: [PATCH 4/7] refs #7355 account cards roles cards

---
 src/pages/Account/AccountList.vue        |  2 +-
 src/pages/Account/Card/AccountCard.vue   | 15 ---------------
 src/pages/Account/Role/Card/RoleCard.vue | 13 -------------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index d789fdf84..cdd88551b 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -91,9 +91,9 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        :label="t('account.search')"
         data-key="AccountUsers"
         :expr-builder="exprBuilder"
+        :label="t('account.search')"
         :info="t('account.searchInfo')"
     />
 
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 555ce0866..813e7fffd 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -1,24 +1,9 @@
 <script setup>
-import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
 import VnCard from 'components/common/VnCard.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
 
 const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => routeName.value);
-const searchBarDataKeys = {
-    AccountSummary: 'AccountSummary',
-    AccountInheritedRoles: 'AccountInheritedRoles',
-    AccountMailForwarding: 'AccountMailForwarding',
-    AccountMailAlias: 'AccountMailAlias',
-    AccountPrivileges: 'AccountPrivileges',
-    AccountLog: 'AccountLog',
-};
 </script>
 
 <template>
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index e5c8c3ebb..97c842b8f 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -1,22 +1,9 @@
 <script setup>
-import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
 import VnCard from 'components/common/VnCard.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
 
 const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => routeName.value);
-const searchBarDataKeys = {
-    RoleSummary: 'RoleSummary',
-    RoleBasicData: 'RoleBasicData',
-    SubRoles: 'SubRoles',
-    InheritedRoles: 'InheritedRoles',
-    RoleLog: 'RoleLog',
-};
 </script>
 <template>
     <VnCard
-- 
2.40.1


From 94878b700b0ead02425718e75d0dd8d995daace6 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 12 Aug 2024 12:39:06 +0200
Subject: [PATCH 5/7] refs #7355 account cards loads

---
 src/pages/Account/AccountAcls.vue       | 1 -
 src/pages/Account/AccountAliasList.vue  | 1 -
 src/pages/Account/Role/AccountRoles.vue | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue
index 080956d46..fdb0ecee1 100644
--- a/src/pages/Account/AccountAcls.vue
+++ b/src/pages/Account/AccountAcls.vue
@@ -145,7 +145,6 @@ const deleteAcl = async ({ id }) => {
         order="id DESC"
         :columns="columns"
         default-mode="table"
-        auto-load
         :right-search="true"
         :is-editable="true"
         :use-model="true"
diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
index b86580017..b8d594d6d 100644
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@@ -70,7 +70,6 @@ const columns = computed(() => [
         order="id DESC"
         :columns="columns"
         default-mode="table"
-        auto-load
         redirect="account/alias"
         :is-editable="true"
         :use-model="true"
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index 0604b71af..2f80606b4 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -97,7 +97,6 @@ const exprBuilder = (param, value) => {
         order="id ASC"
         :columns="columns"
         default-mode="table"
-        auto-load
         redirect="account/role"
     />
 </template>
-- 
2.40.1


From aae881c24a1fb7ac372981f07aae7b29976f2b25 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 13 Aug 2024 12:59:22 +0200
Subject: [PATCH 6/7] fix(account_card): redirection

---
 src/pages/Account/Card/AccountCard.vue   | 3 +--
 src/pages/Account/Role/Card/RoleCard.vue | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index a76d549a5..a9857b283 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -13,10 +13,9 @@ const { t } = useI18n();
         search-data-key="AccountUsers"
         :searchbar-props="{
             url: 'VnUsers/preview',
-            redirect: !!customRouteRedirectName,
-            customRouteRedirectName,
             label: t('account.search'),
             info: t('account.searchInfo'),
+            searchUrl: 'table',
         }"
     />
 </template>
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 0c6e3aca0..ba98b9c19 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -12,8 +12,6 @@ const { t } = useI18n();
         search-data-key="AccountRoles"
         :searchbar-props="{
             url: 'VnRoles',
-            redirect: !!customRouteRedirectName,
-            customRouteRedirectName,
             label: t('role.searchRoles'),
             info: t('role.searchInfo'),
         }"
-- 
2.40.1


From 405092f66d2cb145530e34797f0abfca2c1f45f8 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 13 Aug 2024 13:11:23 +0200
Subject: [PATCH 7/7] fix: account subsections cards

---
 src/pages/Account/AccountAliasList.vue     |  2 +-
 src/pages/Account/Alias/Card/AliasCard.vue | 20 +++-----------------
 src/pages/Account/Role/Card/RoleCard.vue   |  1 +
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
index b8d594d6d..b6f7b219c 100644
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@@ -60,7 +60,7 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="AccountAliasList"
-        :url="`MailAliases`"
+        url="MailAliases"
         :create="{
             urlCreate: 'MailAliases',
             title: 'Create MailAlias',
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
index feb9b6240..65951b3bf 100644
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@@ -1,22 +1,8 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import { computed } from 'vue';
-
 import VnCard from 'components/common/VnCard.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
-
 const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => {
-    return routeName.value;
-});
-const searchBarDataKeys = {
-    AliasBasicData: 'AliasBasicData',
-    AliasUsers: 'AliasUsers',
-};
 </script>
 
 <template>
@@ -24,12 +10,12 @@ const searchBarDataKeys = {
         data-key="Alias"
         base-url="MailAliases"
         :descriptor="AliasDescriptor"
-        :search-data-key="searchBarDataKeys[routeName]"
+        search-data-key="AccountAliasList"
         :searchbar-props="{
-            redirect: !!customRouteRedirectName,
-            customRouteRedirectName,
+            url: 'MailAliases',
             info: t('mailAlias.searchInfo'),
             label: t('mailAlias.search'),
+            searchUrl: 'table',
         }"
     />
 </template>
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index ba98b9c19..35f9a1f27 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -14,6 +14,7 @@ const { t } = useI18n();
             url: 'VnRoles',
             label: t('role.searchRoles'),
             info: t('role.searchInfo'),
+            searchUrl: 'table',
         }"
     />
 </template>
-- 
2.40.1