src/components/common/VnLog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
@@ -376,6 +376,10 @@ async function clearFilter() {
 }
 
 setLogTree();
+
+onUnmounted(() => {
+    stateStore.rightDrawer = false;
+});
 </script>
 <template>
     <FetchData

src/pages/Account/Card/AccountMailAlias.vue

@@ -183,5 +183,5 @@ es:
     Unsubscribed from alias!: ¡Desuscrito del alias!
     Subscribed to alias!: ¡Suscrito al alias!
     User will be removed from alias: El usuario será borrado del alias
-    ¿Seguro que quieres continuar?: Are you sure you want to continue?
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
 </i18n>

src/pages/Account/Card/AccountMailForwarding.vue

@@ -1,9 +1,8 @@
 <script setup>
-import { ref, onMounted, watch } from 'vue';
+import { ref, onMounted, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnRow from 'components/ui/VnRow.vue';
 
@@ -16,6 +15,7 @@ const route = useRoute();
 const stateStore = useStateStore();
 const { notify } = useNotify();
 
+const initialData = ref({});
 const formData = ref({
     forwardTo: null,
     account: null,
@@ -24,6 +24,11 @@ const formData = ref({
 const hasAccount = ref(false);
 const hasData = ref(false);
 const loading = ref(false);
+const hasDataChanged = computed(
+    () =>
+        formData.value.forwardTo !== initialData.value.forwardTo ||
+        initialData.value.hasData !== hasData.value
+);
 
 const fetchAccountExistence = async () => {
     try {
@@ -49,6 +54,8 @@ const deleteMailForward = async () => {
     try {
         await axios.delete(`MailForwards/${route.params.id}`);
         formData.value.forwardTo = null;
+        initialData.value.forwardTo = null;
+        initialData.value.hasData = hasData.value;
         notify(t('globals.dataSaved'), 'positive');
     } catch (err) {
         console.error('Error deleting mail forward', err);
@@ -58,6 +65,8 @@ const deleteMailForward = async () => {
 const updateMailForward = async () => {
     try {
         await axios.patch('MailForwards', formData.value);
+        initialData.value = { ...formData.value };
+        initialData.value.hasData = hasData.value;
     } catch (err) {
         console.error('Error creating mail forward', err);
     }
@@ -70,6 +79,7 @@ const onSubmit = async () => {
 
 const setInitialData = async () => {
     loading.value = true;
+    initialData.value.account = route.params.id;
     formData.value.account = route.params.id;
     hasAccount.value = await fetchAccountExistence(route.params.id);
     if (!hasAccount.value) {
@@ -80,7 +90,9 @@ const setInitialData = async () => {
     const result = await fetchMailForwards(route.params.id);
     const forwardTo = result ? result.forwardTo : null;
     formData.value.forwardTo = forwardTo;
+    initialData.value.forwardTo = forwardTo;
 
+    initialData.value.hasData = hasAccount.value && !!forwardTo;
     hasData.value = hasAccount.value && !!forwardTo;
     loading.value = false;
 };
@@ -116,6 +128,7 @@ onMounted(async () => await setInitialData());
                             color="primary"
                             icon="save"
                             @click="onSubmit()"
+                            :disable="!hasDataChanged"
                             :label="t('globals.save')"
                         />
                     </QBtnGroup>

src/pages/Account/InheritedRoles.vue

@@ -20,20 +20,23 @@ const store = arrayData.store;
 
 const data = computed(() => {
     const dataCopy = store.data;
-    return dataCopy.sort((a, b) => a.inherits?.name.localeCompare(b.inherits?.name));
+    return dataCopy.sort((a, b) => a.role?.name.localeCompare(b.role?.name));
 });
 
 const filter = computed(() => ({
-    where: { role: route.params.id },
+    where: {
+        prindicpalType: 'USER',
+        principalId: route.params.id,
+    },
     include: {
-        relation: 'inherits',
+        relation: 'role',
         scope: {
             fields: ['id', 'name', 'description'],
         },
     },
 }));
 
-const urlPath = computed(() => 'RoleRoles');
+const urlPath = 'RoleMappings';
 
 const columns = computed(() => [
     {
@@ -44,8 +47,9 @@ const columns = computed(() => [
 watch(
     () => route.params.id,
     () => {
-        store.url = urlPath.value;
+        store.url = urlPath;
         store.filter = filter.value;
+        store.limit = 0;
         fetchSubRoles();
     }
 );
@@ -64,20 +68,21 @@ const redirectToRoleSummary = (id) =>
                 :data-key="dataKey"
                 :filter="filter"
                 :url="urlPath"
+                :limit="0"
                 auto-load
             >
                 <template #body>
                     <QTable :rows="data" :columns="columns" hide-header>
                         <template #body="{ row }">
                             <QTr
-                                @click="redirectToRoleSummary(row.inherits?.id)"
+                                @click="redirectToRoleSummary(row.role?.id)"
                                 class="cursor-pointer"
                             >
                                 <QTd>
                                     <div class="column">
-                                        <span>{{ row.inherits?.name }}</span>
+                                        <span>{{ row.role?.name }}</span>
                                         <span class="color-vn-label">{{
-                                            row.inherits?.description
+                                            row.role?.description
                                         }}</span>
                                     </div>
                                 </QTd>

src/pages/Account/locale/en.yml

@@ -19,7 +19,7 @@ account:
     card:
         name: Name
         nickname: User
-        role: Rol
+        role: Role
         email: Email
         alias: Alias
         lang: Language
@@ -44,7 +44,7 @@ account:
         password: Password
         active: Active
     mailForwarding:
-        forwardingMail: Dirección de reenvío
+        forwardingMail: Forward email
         accountNotEnabled: Account not enabled
         enableMailForwarding: Enable mail forwarding
         mailInputInfo: All emails will be forwarded to the specified address.