From d82de6da5809dd401f90fe378661e99166d44633 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 29 May 2024 16:14:29 -0300
Subject: [PATCH] Account roles

---
 src/components/ui/VnFilterPanel.vue           |   8 +-
 src/pages/Account/AccountAccounts.vue         | 111 ---------
 src/pages/Account/AccountAcls.vue             | 114 ---------
 src/pages/Account/AccountAlias.vue            |  75 ------
 src/pages/Account/AccountConnections.vue      |  75 ------
 src/pages/Account/AccountCreate.vue           | 159 -------------
 src/pages/Account/AccountFilter.vue           | 225 ------------------
 src/pages/Account/AccountLdap.vue             |  65 -----
 src/pages/Account/AccountList.vue             | 110 +--------
 src/pages/Account/AccountSamba.vue            |  82 -------
 src/pages/Account/Role/AccountRoles.vue       |  11 +-
 src/pages/Account/Role/AccountRolesFilter.vue |   6 +-
 src/pages/Account/Role/Card/RoleForm.vue      |  15 +-
 src/pages/Account/locale/es.yml               |   2 +-
 src/router/modules/account.js                 |   2 +-
 src/router/modules/role.js                    |   4 +-
 16 files changed, 31 insertions(+), 1033 deletions(-)
 delete mode 100644 src/pages/Account/AccountAccounts.vue
 delete mode 100644 src/pages/Account/AccountAcls.vue
 delete mode 100644 src/pages/Account/AccountAlias.vue
 delete mode 100644 src/pages/Account/AccountConnections.vue
 delete mode 100644 src/pages/Account/AccountCreate.vue
 delete mode 100644 src/pages/Account/AccountFilter.vue
 delete mode 100644 src/pages/Account/AccountLdap.vue
 delete mode 100644 src/pages/Account/AccountSamba.vue

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 386594750..fd508cea3 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -46,6 +46,10 @@ const props = defineProps({
         type: Array,
         default: () => [],
     },
+    redirect: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
@@ -93,7 +97,7 @@ async function search() {
 
     isLoading.value = false;
     emit('search');
-    navigate(store.data, {});
+    if (props.redirect) navigate(store.data, {});
 }
 
 async function reload() {
@@ -104,7 +108,7 @@ async function reload() {
     if (!props.showAll && !params.length) store.data = [];
     isLoading.value = false;
     emit('refresh');
-    navigate(store.data, {});
+    if (props.redirect) navigate(store.data, {});
 }
 
 async function clearFilters() {
diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
deleted file mode 100644
index dc6690487..000000000
--- a/src/pages/Account/AccountAccounts.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<script setup>
-import { reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
-
-import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import { toDate } from 'src/filters';
-
-const { t } = useI18n();
-
-const newAccountForm = reactive({
-    supplierFk: null,
-    travelFk: null,
-    companyFk: null,
-});
-</script>
-
-<template>
-    <QPage>
-        <VnSubToolbar />
-        <pre>TODO <b>Cuentas</b></pre>
-
-        <FormModel
-            url-create="Entries"
-            model="account"
-            :form-initial-data="newAccountForm"
-        >
-            <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Supplier')"
-                            class="full-width"
-                            v-model="data.supplierFk"
-                            :options="suppliersOptions"
-                            option-value="id"
-                            option-label="nickname"
-                            hide-selected
-                            :required="true"
-                            :rules="validate('account.supplierFk')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            #{{ scope.opt?.id }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Travel')"
-                            class="full-width"
-                            v-model="data.travelFk"
-                            :options="travelsOptions"
-                            option-value="id"
-                            option-label="warehouseInName"
-                            map-options
-                            hide-selected
-                            :required="true"
-                            :rules="validate('account.travelFk')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel
-                                            >{{ scope.opt?.agencyModeName }} -
-                                            {{ scope.opt?.warehouseInName }} ({{
-                                                toDate(scope.opt?.shipped)
-                                            }}) &#x2192;
-                                            {{ scope.opt?.warehouseOutName }} ({{
-                                                toDate(scope.opt?.landed)
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Company')"
-                            class="full-width"
-                            v-model="data.companyFk"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                            map-options
-                            hide-selected
-                            :required="true"
-                            :rules="validate('account.companyFk')"
-                        />
-                    </div>
-                </VnRow>
-            </template>
-        </FormModel>
-    </QPage>
-</template>
diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue
deleted file mode 100644
index 8de4d3dc1..000000000
--- a/src/pages/Account/AccountAcls.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
-import { toDate } from 'filters/index';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import AccountFilter from './AccountFilter.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import AccountSummary from './Card/AccountSummary.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
-const stateStore = useStateStore();
-const router = useRouter();
-const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
-
-const STATE_COLOR = {
-    pending: 'warning',
-    managed: 'info',
-    resolved: 'positive',
-};
-function getApiUrl() {
-    return new URL(window.location).origin;
-}
-function stateColor(code) {
-    return STATE_COLOR[code];
-}
-function navigate(event, id) {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/account/${id}/summary`);
-    router.push({ path: `/account/${id}` });
-}
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <AccountFilter data-key="AccountList" />
-        </QScrollArea>
-    </QDrawer>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="AccountList"
-                url="Accounts/filter"
-                :order="['priority ASC', 'created DESC']"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.clientName"
-                        @click="navigate($event, row.id)"
-                        v-for="row of rows"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('account.list.customer')">
-                                <template #value>
-                                    <span class="link" @click.stop>
-                                        {{ row.clientName }}
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv :label="t('account.list.assignedTo')">
-                                <template #value>
-                                    <span @click.stop>
-                                        <VnUserLink
-                                            :name="row.workerName"
-                                            :worker-id="row.workerFk"
-                                        />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('account.list.created')"
-                                :value="toDate(row.created)"
-                            />
-                            <VnLv :label="t('account.list.state')">
-                                <template #value>
-                                    <QBadge
-                                        text-color="black"
-                                        :color="stateColor(row.stateCode)"
-                                        dense
-                                    >
-                                        {{ row.stateDescription }}
-                                    </QBadge>
-                                </template>
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('globals.description')"
-                                @click.stop
-                                outline
-                                style="margin-top: 15px"
-                            >
-                                <CustomerDescriptorProxy :id="row.clientFk" />
-                            </QBtn>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AccountSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-</template>
diff --git a/src/pages/Account/AccountAlias.vue b/src/pages/Account/AccountAlias.vue
deleted file mode 100644
index dd484bc8c..000000000
--- a/src/pages/Account/AccountAlias.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<script setup>
-import { onMounted, computed } from 'vue';
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-
-const { t } = useI18n();
-const filter = computed(() => ({
-    fields: ['id', 'created', 'userId'],
-    include: { relation: 'user', scope: { fields: ['username'] } },
-    order: 'created DESC',
-    limit: 20,
-}));
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
-const urlPath = computed(() => `AccessTokens`);
-const entityId = computed(() => $props.id || useRoute().params.id);
-
-onMounted(async () => {});
-</script>
-
-<template>
-    <QPage class="column items-center q-pa-md">
-        <div class="full-width" style="max-width: 400px">
-            <VnPaginate
-                ref="paginateRef"
-                data-key="AccessTokens"
-                :filter="filter"
-                :url="urlPath"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <QTable :rows="data" :columns="columns" hide-header>
-                        <template #body="{ row, rowIndex }">
-                            <QTr>
-                                <QTd>
-                                    <span>{{ row.warehouse?.name }}</span>
-                                </QTd>
-                                <QTd style="width: 50px !important">
-                                    <QIcon
-                                        name="delete"
-                                        size="sm"
-                                        class="cursor-pointer"
-                                        color="primary"
-                                        @click="
-                                            openConfirmationModal(
-                                                t('warehouses.deleteTitle'),
-                                                t('warehouses.deleteSubtitle'),
-                                                () => deleteWarehouse(row, rows, rowIndex)
-                                            )
-                                        "
-                                    >
-                                        <QTooltip>
-                                            {{ t('warehouses.delete') }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </QTd>
-                            </QTr>
-                        </template>
-                    </QTable>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="add" color="primary" @click="createMailAlias()">
-                <QTooltip>{{ t('warehouses.add') }}</QTooltip>
-            </QBtn>
-        </QPageSticky>
-    </QPage>
-</template>
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
deleted file mode 100644
index 1128205b8..000000000
--- a/src/pages/Account/AccountConnections.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<script setup>
-import { onMounted, computed } from 'vue';
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-
-const { t } = useI18n();
-const filter = computed(() => ({
-    fields: ['id', 'created', 'userId'],
-    include: { relation: 'user', scope: { fields: ['username'] } },
-    order: 'created DESC',
-    limit: 20,
-}));
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
-const urlPath = computed(() => `AccessTokens`);
-const entityId = computed(() => $props.id || useRoute().params.id);
-
-onMounted(async () => {});
-</script>
-
-<template>
-    <QPage class="column items-center q-pa-md">
-        <div class="full-width" style="max-width: 400px">
-            <VnPaginate
-                ref="paginateRef"
-                data-key="AccessTokens"
-                :filter="filter"
-                :url="urlPath"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <QTable :rows="data" :columns="columns" hide-header>
-                        <template #body="{ row, rowIndex }">
-                            <QTr>
-                                <QTd>
-                                    <span>{{ row.warehouse?.name }}</span>
-                                </QTd>
-                                <QTd style="width: 50px !important">
-                                    <QIcon
-                                        name="delete"
-                                        size="sm"
-                                        class="cursor-pointer"
-                                        color="primary"
-                                        @click="
-                                            openConfirmationModal(
-                                                t('warehouses.deleteTitle'),
-                                                t('warehouses.deleteSubtitle'),
-                                                () => deleteWarehouse(row, rows, rowIndex)
-                                            )
-                                        "
-                                    >
-                                        <QTooltip>
-                                            {{ t('warehouses.delete') }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </QTd>
-                            </QTr>
-                        </template>
-                    </QTable>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="refresh" color="primary" @click="refresh()">
-                <QTooltip>{{ t('warehouses.refresh') }}</QTooltip>
-            </QBtn>
-        </QPageSticky>
-    </QPage>
-</template>
diff --git a/src/pages/Account/AccountCreate.vue b/src/pages/Account/AccountCreate.vue
deleted file mode 100644
index ca69fbb00..000000000
--- a/src/pages/Account/AccountCreate.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<script setup>
-import { reactive, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
-import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import { useState } from 'src/composables/useState';
-import { toDate } from 'src/filters';
-
-const state = useState();
-const { t } = useI18n();
-const route = useRoute();
-const stateStore = useStateStore();
-
-const user = state.getUser();
-const newAccountForm = reactive({
-    supplierFk: null,
-    travelFk: Number(route.query?.travelFk) || null,
-    companyFk: user.value.companyFk || null,
-});
-const suppliersOptions = ref([]);
-const travelsOptions = ref([]);
-const companiesOptions = ref([]);
-</script>
-
-<template>
-    <FetchData
-        url="Suppliers"
-        :filter="{ fields: ['id', 'nickname'] }"
-        order="nickname"
-        @on-fetch="(data) => (suppliersOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Travels/filter"
-        :filter="{ fields: ['id', 'warehouseInName'] }"
-        order="id"
-        @on-fetch="(data) => (travelsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        ref="companiesRef"
-        url="Companies"
-        :filter="{ fields: ['id', 'code'] }"
-        order="code"
-        @on-fetch="(data) => (companiesOptions = data)"
-        auto-load
-    />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                url="Entries/filter"
-                custom-route-redirect-name="AccountSummary"
-                data-key="AccountSummary"
-                :label="t('Search entries')"
-                :info="t('You can search by account reference')"
-            />
-        </Teleport>
-    </template>
-    <QPage>
-        <VnSubToolbar />
-        <FormModel
-            url-create="Entries"
-            model="account"
-            :form-initial-data="newAccountForm"
-        >
-            <template #form="{ data, validate }">
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Supplier')"
-                            class="full-width"
-                            v-model="data.supplierFk"
-                            :options="suppliersOptions"
-                            option-value="id"
-                            option-label="nickname"
-                            hide-selected
-                            :required="true"
-                            :rules="validate('account.supplierFk')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            #{{ scope.opt?.id }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Travel')"
-                            class="full-width"
-                            v-model="data.travelFk"
-                            :options="travelsOptions"
-                            option-value="id"
-                            option-label="warehouseInName"
-                            map-options
-                            hide-selected
-                            :required="true"
-                            :rules="validate('account.travelFk')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel
-                                            >{{ scope.opt?.agencyModeName }} -
-                                            {{ scope.opt?.warehouseInName }} ({{
-                                                toDate(scope.opt?.shipped)
-                                            }}) &#x2192;
-                                            {{ scope.opt?.warehouseOutName }} ({{
-                                                toDate(scope.opt?.landed)
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelect
-                            :label="t('Company')"
-                            class="full-width"
-                            v-model="data.companyFk"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                            map-options
-                            hide-selected
-                            :required="true"
-                            :rules="validate('account.companyFk')"
-                        />
-                    </div>
-                </VnRow>
-            </template>
-        </FormModel>
-    </QPage>
-</template>
-
-<i18n>
-    es:
-        Supplier: Proveedor
-        Travel: Envío
-        Company: Empresa
-</i18n>
diff --git a/src/pages/Account/AccountFilter.vue b/src/pages/Account/AccountFilter.vue
deleted file mode 100644
index 23b72266c..000000000
--- a/src/pages/Account/AccountFilter.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const workers = ref();
-const states = ref();
-</script>
-
-<template>
-    <FetchData url="AccountStates" @on-fetch="(data) => (states = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Customer ID')"
-                        v-model="params.clientFk"
-                        lazy-rules
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="badge" size="xs"></QIcon> </template
-                    ></VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Client Name')"
-                        v-model="params.clientName"
-                        lazy-rules
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="t('Salesperson')"
-                        v-model="params.salesPersonFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="t('Attender')"
-                        v-model="params.attenderFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="t('Responsible')"
-                        v-model="params.accountResponsibleFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!states">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="states">
-                    <VnSelect
-                        :label="t('State')"
-                        v-model="params.accountStateFk"
-                        @update:model-value="searchFn()"
-                        :options="states"
-                        option-value="id"
-                        option-label="description"
-                        emit-value
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        v-model="params.myTeam"
-                        :label="t('myTeam')"
-                        toggle-indeterminate
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-            <QExpansionItem :label="t('More options')" expand-separator>
-                <!-- <QItem>
-                        <QItemSection>
-                            <qSelect
-                                :label="t('Item')"
-                                v-model="params.itemFk"
-                                :options="items"
-                                :loading="loading"
-                                @filter="filterFn"
-                                @virtual-scroll="onScroll"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                            />
-                        </QItemSection>
-                    </QItem> -->
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.created"
-                            :label="t('Created')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QExpansionItem>
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        search: Contains
-        clientFk: Customer
-        clientName: Customer
-        salesPersonFk: Salesperson
-        attenderFk: Attender
-        accountResponsibleFk: Responsible
-        accountStateFk: State
-        created: Created
-    myTeam: My team
-es:
-    params:
-        search: Contiene
-        clientFk: Cliente
-        clientName: Cliente
-        salesPersonFk: Comercial
-        attenderFk: Asistente
-        accountResponsibleFk: Responsable
-        accountStateFk: Estado
-        created: Creada
-    Customer ID: ID cliente
-    Client Name: Nombre del cliente
-    Salesperson: Comercial
-    Attender: Asistente
-    Responsible: Responsable
-    State: Estado
-    Item: Artículo
-    Created: Creada
-    More options: Más opciones
-    myTeam: Mi equipo
-</i18n>
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
deleted file mode 100644
index 4d5fdfb34..000000000
--- a/src/pages/Account/AccountLdap.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<script setup>
-import { reactive } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-const { t } = useI18n();
-
-const newAccountForm = reactive({
-    supplierFk: null,
-    travelFk: null,
-    companyFk: null,
-});
-</script>
-
-<template>
-    <QPage>
-        <VnSubToolbar> </VnSubToolbar>
-        <pre>TODO <b>LDAP</b></pre>
-        <FormModel
-            url-create="Entries"
-            model="account"
-            :form-initial-data="newAccountForm"
-        >
-            <template #moreActions>
-                <QBtnGroup push class="q-gutter-x-sm">
-                    <QBtn round flat color="primary" :label="t('ldap.testConnection')">
-                        <QTooltip>
-                            {{ t('ldap.testConnection') }}
-                        </QTooltip>
-                    </QBtn>
-                </QBtnGroup>
-            </template>
-            <template #form="{ data }">
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QCheckbox
-                            :label="t('ldap.enableSync')"
-                            v-model="data.enableSync"
-                        />
-                    </div>
-                </VnRow>
-                <template v-if="data.enableSync">
-                    <VnInput :label="t('ldap.server')" clearable v-model="data.server" />
-                    <VnInput :label="t('ldap.rdn')" clearable v-model="data.rdn" />
-                    <VnInput
-                        :label="t('ldap.passwordAD')"
-                        clearable
-                        type="password"
-                        v-model="data.passwordAD"
-                    />
-                    <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDN" />
-                    <VnInput
-                        :label="t('ldap.groupDN')"
-                        clearable
-                        v-model="data.groupDN"
-                    />
-                </template>
-            </template>
-        </FormModel>
-    </QPage>
-</template>
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 56d54a47d..40a017533 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -1,109 +1 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
-import { toDate } from 'filters/index';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import AccountFilter from './AccountFilter.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import AccountSummary from './Card/AccountSummary.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
-const stateStore = useStateStore();
-const router = useRouter();
-const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
-const filter = {
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
-
-function getApiUrl() {
-    return new URL(window.location).origin;
-}
-function navigate(event, id) {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/account/${id}/summary`);
-    router.push({ path: `/account/${id}` });
-}
-</script>
-
-<template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="AccountList"
-                :label="t('account.search')"
-                :info="t('You can search by account id or customer name')"
-            />
-        </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" /> -->
-        </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
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.clientName"
-                        @click="navigate($event, row.id)"
-                        v-for="row of rows"
-                    >
-                        <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('globals.description')"
-                                @click.stop
-                                outline
-                                style="margin-top: 15px"
-                            >
-                            </QBtn>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AccountSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-</template>
+<template>account list view</template>
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
deleted file mode 100644
index d04ba1ed5..000000000
--- a/src/pages/Account/AccountSamba.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<script setup>
-import { reactive } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-const { t } = useI18n();
-
-const newAccountForm = reactive({
-    supplierFk: null,
-    travelFk: null,
-    companyFk: null,
-});
-</script>
-
-<template>
-    <QPage>
-        <VnSubToolbar></VnSubToolbar>
-        <pre>TODO <b>SAMBA</b></pre>
-        <FormModel
-            url-create="Entries"
-            model="account"
-            :form-initial-data="newAccountForm"
-        >
-            <template #moreActions>
-                <QBtn round flat color="primary" :label="t('samba.testConnection')">
-                    <QTooltip>
-                        {{ t('samba.testConnection') }}
-                    </QTooltip>
-                </QBtn>
-                <QBtn round flat color="primary" :label="t('samba.verifyCertificate')">
-                    <QTooltip>
-                        {{ t('samba.verifyCertificate') }}
-                    </QTooltip>
-                </QBtn>
-            </template>
-            <template #form="{ data }">
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <QCheckbox
-                            :label="t('samba.enableSync')"
-                            v-model="data.enableSync"
-                        />
-                    </div>
-                </VnRow>
-                <template v-if="data.enableSync">
-                    <VnInput
-                        :label="t('samba.domainController')"
-                        clearable
-                        v-model="data.domainController"
-                    />
-                    <VnInput
-                        :label="t('samba.domainAD')"
-                        clearable
-                        v-model="data.domainAD"
-                    />
-                    <VnInput
-                        :label="t('samba.groupDN')"
-                        clearable
-                        v-model="data.groupDN"
-                    />
-
-                    <VnInput :label="t('samba.userAD')" clearable v-model="data.userAD" />
-                    <VnInput
-                        :label="t('samba.passwordAD')"
-                        clearable
-                        type="password"
-                        v-model="data.passwordAD"
-                    />
-                    <VnInput
-                        :label="t('samba.domainPart')"
-                        clearable
-                        v-model="data.domainPart"
-                    />
-                </template>
-            </template>
-        </FormModel>
-    </QPage>
-</template>
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index 6f5d929bd..afa86a480 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -6,16 +6,18 @@ import { ref } from 'vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
-import AccountSummary from '../Card/AccountSummary.vue';
+import RoleSummary from './Card/RoleSummary.vue';
 import RoleForm from './Card/RoleForm.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AccountRolesFilter from './AccountRolesFilter.vue';
 
 import { useStateStore } from 'stores/useStateStore';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
 const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
 
 const roleCreateDialogRef = ref(null);
 
@@ -42,8 +44,8 @@ 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: `/role/${id}/summary` });
+        return window.open(`${getApiUrl()}/#/account/role/${id}/summary`);
+    router.push({ name: 'RoleSummary', params: { id } });
 };
 </script>
 
@@ -55,7 +57,6 @@ const navigate = (event, id) => {
                 url="VnRoles"
                 :label="t('role.searchRoles')"
                 :info="t('role.searchInfo')"
-                :expr-builder="exprBuilder"
             />
         </Teleport>
         <Teleport to="#actions-append">
@@ -104,7 +105,7 @@ const navigate = (event, id) => {
                         <template #actions>
                             <QBtn
                                 :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AccountSummary)"
+                                @click.stop="viewSummary(row.id, RoleSummary)"
                                 color="primary"
                                 style="margin-top: 15px"
                             />
diff --git a/src/pages/Account/Role/AccountRolesFilter.vue b/src/pages/Account/Role/AccountRolesFilter.vue
index c4bfeb73a..ed2543e71 100644
--- a/src/pages/Account/Role/AccountRolesFilter.vue
+++ b/src/pages/Account/Role/AccountRolesFilter.vue
@@ -14,7 +14,11 @@ const props = defineProps({
 </script>
 
 <template>
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="['search']"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`role.${tag.label}`) }}: </strong>
diff --git a/src/pages/Account/Role/Card/RoleForm.vue b/src/pages/Account/Role/Card/RoleForm.vue
index 0fef124c6..bd9dc957e 100644
--- a/src/pages/Account/Role/Card/RoleForm.vue
+++ b/src/pages/Account/Role/Card/RoleForm.vue
@@ -1,18 +1,21 @@
 <script setup>
-import { useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+
 import FormModelPopup from 'components/FormModelPopup.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-const route = useRoute();
+
+const router = useRouter();
 const { t } = useI18n();
-const shelvingId = route.params?.id || null;
-const isNew = Boolean(!shelvingId);
+
 const defaultInitialData = {
     name: null,
     description: null,
 };
+
+const redirectToRoleBasicData = (_, { id }) =>
+    router.push({ name: 'RoleBasicData', params: { id } });
 </script>
 <template>
     <FormModelPopup
@@ -21,7 +24,7 @@ const defaultInitialData = {
         url-create="VnRoles"
         model="VnRole"
         :form-initial-data="defaultInitialData"
-        @on-data-saved="onSave"
+        @on-data-saved="redirectToRoleBasicData"
     >
         <template #form-inputs="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index f7ff72d52..f339f71ca 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -49,7 +49,7 @@ role:
         newRole: Nuevo rol
     card:
         description: Descripción
-        id: Idd
+        id: Id
         name: Nombre
     newRole: Nuevo rol
     searchRoles: Buscar roles
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index 0f38d8a40..7688dc67d 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -46,7 +46,7 @@ export default {
                     component: () => import('src/pages/Account/AccountList.vue'),
                 },
                 {
-                    path: 'role',
+                    path: 'role-list',
                     name: 'AccountRoles',
                     meta: {
                         title: 'roles',
diff --git a/src/router/modules/role.js b/src/router/modules/role.js
index 6aab5f945..47cd10b18 100644
--- a/src/router/modules/role.js
+++ b/src/router/modules/role.js
@@ -1,7 +1,7 @@
 import { RouterView } from 'vue-router';
 
 export default {
-    path: '/role',
+    path: 'account/role',
     name: 'Role',
     meta: {
         title: 'role',
@@ -17,7 +17,7 @@ export default {
     children: [
         {
             name: 'RoleCard',
-            path: '/role/:id',
+            path: ':id',
             component: () => import('src/pages/Account/Role/Card/RoleCard.vue'),
             redirect: { name: 'RoleSummary' },
             children: [