From 6e5b70301867d3cd78ea697574e44daabfdb3650 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 14 Jan 2025 07:47:33 +0100
Subject: [PATCH] fix: refs #8247 conflicts

---
 .../Account/Card/AccountDescriptorMenu.vue    | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index 151c1bf24a..ccf029e449 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -1,43 +1,45 @@
 <script setup>
 import axios from 'axios';
-import { computed, onMounted, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
+import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useState } from 'src/composables/useState';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
-import VnChangePassword from 'src/components/common/VnChangePassword.vue';
-import useNotify from 'src/composables/useNotify.js';
-import useHasAccount from 'src/composables/useHasAccount.js';
 import VnInputPassword from 'src/components/common/VnInputPassword.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
+import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
 
 const $props = defineProps({
-    entityId: {
-        type: Number,
+    hasAccount: {
+        type: Boolean,
+        default: false,
         required: true,
     },
 });
 
 const { t } = useI18n();
+const { hasAccount } = toRefs($props);
 const { openConfirmationModal } = useVnConfirm();
+const route = useRoute();
 const router = useRouter();
 const state = useState();
 const user = state.getUser();
-const { notify } = useNotify();
+const { notify } = useQuasar();
 const account = computed(() => useArrayData('AccountId').store.data[0]);
-
-onMounted(async () => {
-    account.value.hasAccount = await useHasAccount($props.entityId);
-});
+account.value.hasAccount = hasAccount.value;
+const entityId = computed(() => +route.params.id);
 const hasitManagementAccess = ref();
 const hasSysadminAccess = ref();
+
 async function updateStatusAccount(active) {
     if (active) {
-        await axios.post(`Accounts`, { id: $props.entityId });
+        await axios.post(`Accounts`, { id: entityId.value });
     } else {
-        await axios.delete(`Accounts/${$props.entityId}`);
+        await axios.delete(`Accounts/${entityId.value}`);
     }
 
     account.value.hasAccount = active;
@@ -48,7 +50,7 @@ async function updateStatusAccount(active) {
     });
 }
 async function updateStatusUser(active) {
-    await axios.patch(`VnUsers/${$props.entityId}`, { active });
+    await axios.patch(`VnUsers/${entityId.value}`, { active });
     account.value.active = active;
     const status = active ? 'activate' : 'deactivate';
     notify({