From 2e3970c0cc930cf39ef939158b760fa57b7546bf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 5 Jul 2024 13:18:46 +0200
Subject: [PATCH] refs #7355 fix accountAlias

---
 src/pages/Account/AccountAcls.vue | 72 ++++++++++++++++---------------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue
index 0ea4f9192..7c686eda9 100644
--- a/src/pages/Account/AccountAcls.vue
+++ b/src/pages/Account/AccountAcls.vue
@@ -1,13 +1,16 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
-import FetchData from 'components/FetchData.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AclFilter from './Acls/AclFilter.vue';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useQuasar } from 'quasar';
+
+import FetchData from 'components/FetchData.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
 
 defineProps({
     id: {
@@ -19,8 +22,9 @@ defineProps({
 const { notify } = useNotify();
 const { t } = useI18n();
 const stateStore = useStateStore();
+const quasar = useQuasar();
 
-const paginateRef = ref();
+const tableRef = ref();
 const rolesOptions = ref([]);
 
 const exprBuilder = (param, value) => {
@@ -73,14 +77,6 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
-    {
-        align: 'left',
-        name: 'accessType',
-        label: t('accessType'),
-        field: 'accessType',
-        cardVisible: true,
-        create: true,
-    },
     {
         align: 'right',
         label: '',
@@ -89,17 +85,32 @@ const columns = computed(() => [
             {
                 title: t('Delete'),
                 icon: 'delete',
-                action: deleteAcl(),
+                action: deleteAcl,
                 isPrimary: true,
             },
         ],
     },
 ]);
-const deleteAcl = async (id) => {
+const deleteAcl = async ({ id }) => {
     try {
+        await new Promise((resolve) => {
+            quasar
+                .dialog({
+                    component: VnConfirm,
+                    componentProps: {
+                        title: t('CAMBIA-HO'),
+                        message: t('CAMBIA-HO'),
+                    },
+                })
+                .onOk(() => {
+                    resolve(true);
+                })
+                .onCancel(() => {
+                    resolve(false);
+                });
+        });
         await axios.delete(`ACLs/${id}`);
-        console.log('hola');
-        paginateRef.value.fetch();
+        tableRef.value.reload();
         notify('ACL removed', 'positive');
     } catch (error) {
         console.error('Error deleting Acl: ', error);
@@ -114,26 +125,19 @@ const deleteAcl = async (id) => {
         @on-fetch="(data) => (rolesOptions = data)"
         auto-load
     />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="AccountAcls"
-                url="ACLs"
-                :expr-builder="exprBuilder"
-                :label="t('acls.search')"
-                :info="t('acls.searchInfo')"
-            />
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <AclFilter data-key="AccountAcls" />
-        </QScrollArea>
-    </QDrawer>
 
+    <VnSearchbar
+        data-key="AccountAcls"
+        url="ACLs"
+        :expr-builder="exprBuilder"
+        :label="t('acls.search')"
+        :info="t('acls.searchInfo')"
+    />
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+    </QDrawer>
     <VnTable
         ref="tableRef"
-        data-key="AccountUsers"
+        data-key="AccountAcls"
         :url="`ACLs`"
         :create="{
             urlCreate: 'ACLs',
@@ -145,7 +149,7 @@ const deleteAcl = async (id) => {
         :columns="columns"
         default-mode="table"
         auto-load
-        :right-search="false"
+        :right-search="true"
         :is-editable="true"
         :use-model="true"
     />