From c71877cdb1a35db8c7861b72acf5fb15bfe2d429 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 4 Jun 2024 12:23:28 -0300
Subject: [PATCH 1/5] Account connections

---
 src/pages/Account/AccountAliasList.vue        | 106 ---------------
 src/pages/Account/AccountConnections.vue      | 112 ++++++++++++++++
 src/pages/Account/Alias/AliasCreateForm.vue   |  57 --------
 .../Account/Alias/Card/AliasBasicData.vue     |  36 ------
 src/pages/Account/Alias/Card/AliasCard.vue    |  32 -----
 .../Account/Alias/Card/AliasDescriptor.vue    |  93 -------------
 src/pages/Account/Alias/Card/AliasSummary.vue |  49 -------
 src/pages/Account/Alias/Card/AliasUsers.vue   | 122 ------------------
 src/pages/Account/locale/en.yml               |  16 +--
 src/pages/Account/locale/es.yml               |  16 +--
 src/router/modules/account.js                 |  12 +-
 src/router/modules/index.js                   |   2 -
 src/router/modules/mailAlias.js               |  57 --------
 src/router/routes.js                          |   2 -
 14 files changed, 128 insertions(+), 584 deletions(-)
 delete mode 100644 src/pages/Account/AccountAliasList.vue
 create mode 100644 src/pages/Account/AccountConnections.vue
 delete mode 100644 src/pages/Account/Alias/AliasCreateForm.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasBasicData.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasCard.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasDescriptor.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasSummary.vue
 delete mode 100644 src/pages/Account/Alias/Card/AliasUsers.vue
 delete mode 100644 src/router/modules/mailAlias.js

diff --git a/src/pages/Account/AccountAliasList.vue b/src/pages/Account/AccountAliasList.vue
deleted file mode 100644
index 896804484..000000000
--- a/src/pages/Account/AccountAliasList.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<script setup>
-import { useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
-
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import AliasSummary from './Alias/Card/AliasSummary.vue';
-import AliasCreateForm from './Alias/AliasCreateForm.vue';
-
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useStateStore } from 'stores/useStateStore';
-
-defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
-const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
-const router = useRouter();
-const stateStore = useStateStore();
-const aliasCreateDialogRef = ref(null);
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : { alias: { like: `%${value}%` } };
-    }
-};
-
-const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } });
-
-const openCreateModal = () => aliasCreateDialogRef.value.show();
-</script>
-
-<template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="AccountAliasList"
-                url="MailAliases"
-                :expr-builder="exprBuilder"
-                :label="t('mailAlias.search')"
-                :info="t('mailAlias.searchInfo')"
-            />
-        </Teleport>
-    </template>
-    <QPage class="flex justify-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                ref="paginateRef"
-                data-key="AccountAliasList"
-                url="MailAliases"
-                auto-load
-                :expr-builder="exprBuilder"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.alias"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('mailAlias.alias')" :value="row.alias">
-                            </VnLv>
-                            <VnLv
-                                :label="t('mailAlias.description')"
-                                :value="row.description"
-                            >
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AliasSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QDialog
-            ref="aliasCreateDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <AliasCreateForm />
-        </QDialog>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="add" color="primary" @click="openCreateModal()">
-                <QTooltip class="text-no-wrap">{{ t('mailAlias.newAlias') }}</QTooltip>
-            </QBtn>
-        </QPageSticky>
-    </QPage>
-</template>
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
new file mode 100644
index 000000000..931c925ce
--- /dev/null
+++ b/src/pages/Account/AccountConnections.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import { toDateTimeFormat } from 'src/filters/date.js';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { useVnConfirm } from 'composables/useVnConfirm';
+
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+const filter = computed(() => ({
+    fields: ['id', 'created', 'userId'],
+    include: {
+        relation: 'user',
+        scope: {
+            fields: ['username'],
+        },
+    },
+    order: 'created DESC',
+}));
+
+const urlPath = 'AccessTokens';
+
+const refresh = () => paginateRef.value.fetch();
+
+const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
+
+const killSession = async (id) => {
+    try {
+        await axios.delete(`AccessTokens/${id}`);
+        paginateRef.value.fetch();
+        notify(t('Session killed'), 'positive');
+    } catch (error) {
+        console.error('Error killing session', error);
+    }
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AccessTokens"
+                ref="paginateRef"
+                :filter="filter"
+                :url="urlPath"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :key="row.id"
+                        :id="row.id"
+                        :title="row.user?.username"
+                        @click="navigate($event, row.id)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <div style="flex-direction: column; width: 100%">
+                                <VnLv
+                                    :label="t('connections.username')"
+                                    :value="row.user?.username"
+                                >
+                                </VnLv>
+                                <VnLv
+                                    :label="t('connections.created')"
+                                    :value="toDateTimeFormat(row.created)"
+                                >
+                                </VnLv>
+                            </div>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('connections.killSession')"
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('Session will be killed'),
+                                        t('Are you sure you want to continue?'),
+                                        () => killSession(row.id)
+                                    )
+                                "
+                                outline
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="refresh" color="primary" @click="refresh()">
+                <QTooltip>{{ t('connections.refresh') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Session killed: Sesión matada
+    Session will be killed: Se va a matar la sesión
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+</i18n>
diff --git a/src/pages/Account/Alias/AliasCreateForm.vue b/src/pages/Account/Alias/AliasCreateForm.vue
deleted file mode 100644
index d4d61a804..000000000
--- a/src/pages/Account/Alias/AliasCreateForm.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<script setup>
-import { useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
-import FormModelPopup from 'components/FormModelPopup.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import { useArrayData } from 'src/composables/useArrayData';
-
-const router = useRouter();
-const { t } = useI18n();
-const arrayData = useArrayData('AliasCreate');
-const { store } = arrayData;
-
-const defaultInitialData = {
-    alias: null,
-    description: null,
-};
-
-const onDataSaved = ({ id }) => {
-    router.push({ name: 'AliasBasicData', params: { id } });
-    store.data = null;
-};
-</script>
-
-<template>
-    <FormModelPopup
-        :title="t('Create alias')"
-        ref="formModelPopupRef"
-        url-create="MailAliases"
-        model="AliasCreate"
-        :form-initial-data="defaultInitialData"
-        @on-data-saved="onDataSaved"
-    >
-        <template #form-inputs="{ 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>
-        </template>
-    </FormModelPopup>
-</template>
-
-<i18n>
-    es:
-        Create alias: Crear alias
-</i18n>
diff --git a/src/pages/Account/Alias/Card/AliasBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
deleted file mode 100644
index 5d8062739..000000000
--- a/src/pages/Account/Alias/Card/AliasBasicData.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<script setup>
-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();
-const { t } = useI18n();
-</script>
-
-<template>
-    <FormModel :url="`MailAliases/${route.params.id}`" model="Alias" auto-load>
-        <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>
-        </template>
-    </FormModel>
-</template>
diff --git a/src/pages/Account/Alias/Card/AliasCard.vue b/src/pages/Account/Alias/Card/AliasCard.vue
deleted file mode 100644
index 8b6c9c3cf..000000000
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<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>
-    <VnCard
-        data-key="Alias"
-        :descriptor="AliasDescriptor"
-        :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
-        :search-redirect="!!customRouteRedirectName"
-        :searchbar-label="t('mailAlias.search')"
-        :searchbar-info="t('mailAlias.searchInfo')"
-    />
-</template>
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
deleted file mode 100644
index bc174aa0e..000000000
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-
-import useCardDescription from 'src/composables/useCardDescription';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
-
-const { t } = useI18n();
-const route = useRoute();
-const quasar = useQuasar();
-const router = useRouter();
-const { notify } = useNotify();
-
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
-
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
-
-const filter = {
-    where: { id: entityId },
-};
-
-const removeAlias = () => {
-    quasar
-        .dialog({
-            title: t('Alias will be removed'),
-            message: t('Are you sure you want to continue?'),
-            ok: {
-                push: true,
-                color: 'primary',
-            },
-            cancel: true,
-        })
-        .onOk(async () => {
-            try {
-                await axios.delete(`MailAliases/${entityId.value}`);
-                notify(t('Alias removed'), 'positive');
-                router.push({ name: 'AccountAlias' });
-            } catch (err) {
-                console.error('Error removing alias');
-            }
-        });
-};
-</script>
-
-<template>
-    <CardDescriptor
-        ref="descriptor"
-        url="MailAliases"
-        :filter="filter"
-        module="Account"
-        @on-fetch="setData"
-        data-key="aliasData"
-        :title="data.title"
-        :subtitle="data.subtitle"
-    >
-        <template #menu>
-            <QItem v-ripple clickable @click="removeAlias()">
-                <QItemSection>{{ t('Delete') }}</QItemSection>
-            </QItem>
-        </template>
-        <template #body="{ entity }">
-            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
-        </template>
-    </CardDescriptor>
-</template>
-
-<i18n>
-    en:
-        accountRate: Claming rate
-    es:
-        accountRate: Ratio de reclamación
-        Delete: Eliminar
-        Alias will be removed: El alias será eliminado
-        Are you sure you want to continue?: ¿Seguro que quieres continuar?
-        Alias removed: Alias eliminado
-</i18n>
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
deleted file mode 100644
index cedae28b7..000000000
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
-import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-
-import { useArrayData } from 'src/composables/useArrayData';
-
-const route = useRoute();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
-const { store } = useArrayData('Alias');
-const alias = ref(store.data);
-const entityId = computed(() => $props.id || route.params.id);
-</script>
-
-<template>
-    <CardSummary
-        ref="summary"
-        :url="`MailAliases/${entityId}`"
-        @on-fetch="(data) => (alias = data)"
-    >
-        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
-        <template #body>
-            <QCard class="vn-one">
-                <QCardSection class="q-pa-none">
-                    <router-link
-                        :to="{ name: 'AliasBasicData', params: { id: entityId } }"
-                        class="header header-link"
-                    >
-                        {{ t('globals.summary.basicData') }}
-                        <QIcon name="open_in_new" />
-                    </router-link>
-                </QCardSection>
-                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
-                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
-            </QCard>
-        </template>
-    </CardSummary>
-</template>
diff --git a/src/pages/Account/Alias/Card/AliasUsers.vue b/src/pages/Account/Alias/Card/AliasUsers.vue
deleted file mode 100644
index 4a9c449e4..000000000
--- a/src/pages/Account/Alias/Card/AliasUsers.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<script setup>
-import { useRoute } from 'vue-router';
-import { computed, ref, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnPaginate from 'components/ui/VnPaginate.vue';
-
-import { useVnConfirm } from 'composables/useVnConfirm';
-import { useArrayData } from 'composables/useArrayData';
-import useNotify from 'src/composables/useNotify.js';
-import axios from 'axios';
-
-const { t } = useI18n();
-const { notify } = useNotify();
-const route = useRoute();
-const { openConfirmationModal } = useVnConfirm();
-
-const paginateRef = ref(null);
-
-const arrayData = useArrayData('AliasUsers');
-const { store } = arrayData;
-
-const data = computed(() => {
-    const dataCopy = JSON.parse(JSON.stringify(store.data));
-    return dataCopy.sort((a, b) => a.user?.name.localeCompare(b.user?.name));
-});
-
-const filter = {
-    include: {
-        relation: 'user',
-        scope: {
-            fields: ['id', 'name'],
-        },
-    },
-};
-
-const urlPath = computed(() => `MailAliases/${route.params.id}/accounts`);
-
-const columns = computed(() => [
-    {
-        name: 'alias',
-    },
-    {
-        name: 'action',
-    },
-]);
-
-const deleteAlias = async (row) => {
-    try {
-        await axios.delete(`${urlPath.value}/${row.id}`);
-        notify(t('User removed'), 'positive');
-        fetchAliases();
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-watch(
-    () => route.params.id,
-    () => {
-        store.url = urlPath.value;
-        store.filter = filter;
-        fetchAliases();
-    }
-);
-
-const fetchAliases = () => paginateRef.value.fetch();
-</script>
-
-<template>
-    <QPage class="column items-center q-pa-md">
-        <div class="full-width" style="max-width: 400px">
-            <VnPaginate
-                ref="paginateRef"
-                data-key="AliasUsers"
-                :filter="filter"
-                :url="urlPath"
-                :limit="0"
-                auto-load
-            >
-                <template #body>
-                    <QTable :rows="data" :columns="columns" hide-header>
-                        <template #body="{ row }">
-                            <QTr>
-                                <QTd>
-                                    <span>{{ row.user?.name }}</span>
-                                </QTd>
-                                <QTd style="width: 50px !important">
-                                    <QIcon
-                                        name="delete"
-                                        size="sm"
-                                        class="cursor-pointer"
-                                        color="primary"
-                                        @click="
-                                            openConfirmationModal(
-                                                t('User will be removed from alias'),
-                                                t('Are you sure you want to continue?'),
-                                                () => deleteAlias(row)
-                                            )
-                                        "
-                                    >
-                                        <QTooltip>
-                                            {{ t('Delete') }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </QTd>
-                            </QTr>
-                        </template>
-                    </QTable>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-</template>
-
-<i18n>
-es:
-    User will be removed from alias: El usuario será borrado del alias
-    Are you sure you want to continue?: ¿Seguro que quieres continuar?
-    User removed: Usuario borrado
-    Delete: Eliminar
-</i18n>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index d90b3a383..aabe41ad8 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -41,17 +41,6 @@ role:
         description: Description
         id: Id
         name: Name
-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
     server: Server
@@ -73,3 +62,8 @@ samba:
     verifyCertificate: Verify certificate
     testConnection: Test connection
     success: Samba connection established!
+connections:
+    refresh: Refresh
+    username: Username
+    created: Created
+    killSession: Kill session
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index e0a6cf29f..9018a34c4 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -52,17 +52,6 @@ role:
         description: Descripción
         id: Idd
         name: Nombre
-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
     server: Servidor
@@ -83,3 +72,8 @@ samba:
     Verify certificate: Verificar certificado
     testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
+connections:
+    refresh: Actualizar
+    username: Nombre de usuario
+    created: Creado
+    killSession: Matar sesión
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index e13215afc..b78e1a191 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'AccountMain' },
     menus: {
-        main: ['AccountList', 'AccountAliasList'],
+        main: ['AccountList', 'AccountConnections'],
         card: [],
     },
     children: [
@@ -31,13 +31,13 @@ export default {
                     component: () => import('src/pages/Account/AccountList.vue'),
                 },
                 {
-                    path: 'alias-list',
-                    name: 'AccountAliasList',
+                    path: 'connections',
+                    name: 'AccountConnections',
                     meta: {
-                        title: 'alias',
-                        icon: 'email',
+                        title: 'connections',
+                        icon: 'check',
                     },
-                    component: () => import('src/pages/Account/AccountAliasList.vue'),
+                    component: () => import('src/pages/Account/AccountConnections.vue'),
                 },
             ],
         },
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index d69098a58..ca60c78d8 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -13,7 +13,6 @@ import Travel from './travel';
 import Order from './order';
 import Department from './department';
 import Role from './role';
-import mailAlias from './mailAlias';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
@@ -39,7 +38,6 @@ export default [
     invoiceIn,
     Department,
     Role,
-    mailAlias,
     Entry,
     roadmap,
     Parking,
diff --git a/src/router/modules/mailAlias.js b/src/router/modules/mailAlias.js
deleted file mode 100644
index 8e0f8abdc..000000000
--- a/src/router/modules/mailAlias.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import { RouterView } from 'vue-router';
-
-export default {
-    path: 'account/alias',
-    name: 'Alias',
-    meta: {
-        title: 'alias',
-        icon: 'email',
-        moduleName: 'Alias',
-    },
-    component: RouterView,
-    redirect: { name: 'AccountAliasList' },
-    menus: {
-        main: [],
-        card: ['AliasBasicData', 'AliasUsers'],
-    },
-    children: [
-        {
-            name: 'AliasCard',
-            path: ':id',
-            component: () => import('src/pages/Account/Alias/Card/AliasCard.vue'),
-            redirect: { name: 'AliasSummary' },
-            children: [
-                {
-                    name: 'AliasSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Alias/Card/AliasSummary.vue'),
-                },
-                {
-                    name: 'AliasBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Alias/Card/AliasBasicData.vue'),
-                },
-                {
-                    name: 'AliasUsers',
-                    path: 'users',
-                    meta: {
-                        title: 'aliasUsers',
-                        icon: 'group',
-                    },
-                    component: () =>
-                        import('src/pages/Account/Alias/Card/AliasUsers.vue'),
-                },
-            ],
-        },
-    ],
-};
diff --git a/src/router/routes.js b/src/router/routes.js
index 9d3dc8710..60cc24a75 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -11,7 +11,6 @@ import route from './modules/route';
 import travel from './modules/travel';
 import department from './modules/department';
 import role from './modules/role';
-import mailAlias from './modules/mailAlias';
 import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
@@ -77,7 +76,6 @@ const routes = [
             travel,
             department,
             role,
-            mailAlias,
             roadmap,
             entry,
             parking,

From f3ec9ea58d854e36d00f6d7193a7ca90bb672272 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 08:03:57 +0200
Subject: [PATCH 2/5] fix: VnPaginate order

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

diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 931c925ce..4acdb597f 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -54,6 +54,7 @@ const killSession = async (id) => {
                 ref="paginateRef"
                 :filter="filter"
                 :url="urlPath"
+                order="created DESC"
                 auto-load
             >
                 <template #body="{ rows }">

From fe9adb7a3cb85d5b45f98b797df7793837961eb0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 08:09:05 +0200
Subject: [PATCH 3/5] perf: minor changes

---
 src/pages/Account/AccountConnections.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 4acdb597f..f248685ae 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -37,7 +37,7 @@ const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } })
 
 const killSession = async (id) => {
     try {
-        await axios.delete(`AccessTokens/${id}`);
+        await axios.delete(`${urlPath}/${id}`);
         paginateRef.value.fetch();
         notify(t('Session killed'), 'positive');
     } catch (error) {
@@ -50,7 +50,7 @@ const killSession = async (id) => {
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
-                data-key="AccessTokens"
+                :data-key="urlPath"
                 ref="paginateRef"
                 :filter="filter"
                 :url="urlPath"
@@ -81,6 +81,7 @@ const killSession = async (id) => {
                         </template>
                         <template #actions>
                             <QBtn
+                                class="q-mt-xs"
                                 :label="t('connections.killSession')"
                                 @click.stop="
                                     openConfirmationModal(
@@ -90,7 +91,6 @@ const killSession = async (id) => {
                                     )
                                 "
                                 outline
-                                style="margin-top: 15px"
                             />
                         </template>
                     </CardList>

From a26401d8eb0551908e550944337917f0d09e9dc3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 6 Jun 2024 23:51:45 +0200
Subject: [PATCH 4/5] feat: hide ID

---
 src/components/ui/CardList.vue           | 2 +-
 src/pages/Account/AccountConnections.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ui/CardList.vue b/src/components/ui/CardList.vue
index e8392b13e..c9b062457 100644
--- a/src/components/ui/CardList.vue
+++ b/src/components/ui/CardList.vue
@@ -28,7 +28,7 @@ const toggleCardCheck = (item) => {
                         <div class="title text-primary text-weight-bold text-h5">
                             {{ $props.title }}
                         </div>
-                        <QChip class="q-chip-color" outline size="sm">
+                        <QChip v-if="$props.id" class="q-chip-color" outline size="sm">
                             {{ t('ID') }}: {{ $props.id }}
                         </QChip>
                     </div>
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index f248685ae..83e089f25 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -60,7 +60,6 @@ const killSession = async (id) => {
                 <template #body="{ rows }">
                     <CardList
                         :key="row.id"
-                        :id="row.id"
                         :title="row.user?.username"
                         @click="navigate($event, row.id)"
                         v-for="row of rows"

From 0289c167ee11281dfad16e3382e3fbbd57373dcd Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 11 Jun 2024 08:30:18 +0200
Subject: [PATCH 5/5] refactor: unnecessary computed

---
 src/pages/Account/AccountConnections.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 8c20d9f57..98208e5f2 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -18,7 +18,7 @@ const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 
 const paginateRef = ref(null);
-const filter = computed(() => ({
+const filter = {
     fields: ['id', 'created', 'userId'],
     include: {
         relation: 'user',
@@ -27,7 +27,7 @@ const filter = computed(() => ({
         },
     },
     order: 'created DESC',
-}));
+};
 
 const urlPath = 'AccessTokens';