From 41b466790dba3b5a0ecc46dde4c4e1baeac304a0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 31 Jan 2025 09:43:41 +0100
Subject: [PATCH] fix: refs #8197 workerDepartment router

---
 src/components/common/VnSection.vue              |  9 ++++++---
 .../Customer/Defaulter/CustomerDefaulter.vue     |  2 +-
 src/pages/Worker/Card/WorkerDescriptor.vue       |  2 +-
 src/pages/Worker/Card/WorkerSummary.vue          |  2 +-
 .../Department/Card/DepartmentBasicData.vue      |  0
 .../Department/Card/DepartmentCard.vue           |  2 +-
 .../Department/Card/DepartmentDescriptor.vue     |  0
 .../Card/DepartmentDescriptorProxy.vue           |  0
 .../Department/Card/DepartmentSummary.vue        |  0
 .../Department/Card/DepartmentSummaryDialog.vue  |  0
 src/pages/Worker/WorkerDepartment.vue            |  2 +-
 src/pages/Worker/WorkerDepartmentTree.vue        |  2 +-
 src/router/modules/worker.js                     | 16 +++++++++-------
 src/stores/useNavigationStore.js                 |  4 ++--
 14 files changed, 23 insertions(+), 18 deletions(-)
 rename src/pages/{ => Worker}/Department/Card/DepartmentBasicData.vue (100%)
 rename src/pages/{ => Worker}/Department/Card/DepartmentCard.vue (77%)
 rename src/pages/{ => Worker}/Department/Card/DepartmentDescriptor.vue (100%)
 rename src/pages/{ => Worker}/Department/Card/DepartmentDescriptorProxy.vue (100%)
 rename src/pages/{ => Worker}/Department/Card/DepartmentSummary.vue (100%)
 rename src/pages/{ => Worker}/Department/Card/DepartmentSummaryDialog.vue (100%)

diff --git a/src/components/common/VnSection.vue b/src/components/common/VnSection.vue
index ef65b841f..93523cb71 100644
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@@ -98,11 +98,14 @@ function checkIsMain() {
         />
         <div :id="searchbarId"></div>
     </slot>
-    <RightAdvancedMenu :is-main-section="isMainSection">
-        <template #advanced-menu v-if="$slots[advancedMenuSlot] || rightFilter">
+    <RightAdvancedMenu
+        :is-main-section="isMainSection"
+        v-if="$slots[advancedMenuSlot] || rightFilter"
+    >
+        <template #advanced-menu>
             <slot :name="advancedMenuSlot">
                 <VnTableFilter
-                    v-if="rightFilter && columns"
+                    v-if="columns"
                     :data-key="dataKey"
                     :array-data="arrayData"
                     :columns="columns"
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index eca2ad596..dc4ac9162 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -9,7 +9,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
-import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index d87fd4a54..70f7e0cd5 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -10,7 +10,7 @@ import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
 import EditPictureForm from 'components/EditPictureForm.vue';
 import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
-import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index bfb503f6b..7b2172169 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -9,7 +9,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
-import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
 import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
 
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Worker/Department/Card/DepartmentBasicData.vue
similarity index 100%
rename from src/pages/Department/Card/DepartmentBasicData.vue
rename to src/pages/Worker/Department/Card/DepartmentBasicData.vue
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Worker/Department/Card/DepartmentCard.vue
similarity index 77%
rename from src/pages/Department/Card/DepartmentCard.vue
rename to src/pages/Worker/Department/Card/DepartmentCard.vue
index 4b9fe419c..6b954a825 100644
--- a/src/pages/Department/Card/DepartmentCard.vue
+++ b/src/pages/Worker/Department/Card/DepartmentCard.vue
@@ -1,6 +1,6 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
-import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
+import DepartmentDescriptor from 'pages/Worker/Department/Card/DepartmentDescriptor.vue';
 </script>
 <template>
     <VnCardBeta
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
similarity index 100%
rename from src/pages/Department/Card/DepartmentDescriptor.vue
rename to src/pages/Worker/Department/Card/DepartmentDescriptor.vue
diff --git a/src/pages/Department/Card/DepartmentDescriptorProxy.vue b/src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
similarity index 100%
rename from src/pages/Department/Card/DepartmentDescriptorProxy.vue
rename to src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Worker/Department/Card/DepartmentSummary.vue
similarity index 100%
rename from src/pages/Department/Card/DepartmentSummary.vue
rename to src/pages/Worker/Department/Card/DepartmentSummary.vue
diff --git a/src/pages/Department/Card/DepartmentSummaryDialog.vue b/src/pages/Worker/Department/Card/DepartmentSummaryDialog.vue
similarity index 100%
rename from src/pages/Department/Card/DepartmentSummaryDialog.vue
rename to src/pages/Worker/Department/Card/DepartmentSummaryDialog.vue
diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue
index baf6db154..2b4f58bf5 100644
--- a/src/pages/Worker/WorkerDepartment.vue
+++ b/src/pages/Worker/WorkerDepartment.vue
@@ -4,7 +4,7 @@ import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
 <template>
-    <VnSection data-key="WorkerDepartment" :search-bar="false">
+    <VnSection data-key="WorkerDepartmentList" :search-bar="false" :right-filter="false">
         <template #body>
             <div class="flex flex-center q-pa-md">
                 <WorkerDepartmentTree />
diff --git a/src/pages/Worker/WorkerDepartmentTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
index 9abf4e312..36ffb2ad6 100644
--- a/src/pages/Worker/WorkerDepartmentTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -3,7 +3,7 @@ import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
-import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
 import CreateDepartmentChild from './CreateDepartmentChild.vue';
 import axios from 'axios';
 import { useRouter } from 'vue-router';
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index e9fb0c4f1..13d471866 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -191,7 +191,7 @@ const workerCard = {
 const departmentCard = {
     name: 'DepartmentCard',
     path: ':id',
-    component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
+    component: () => import('src/pages/Worker/Department/Card/DepartmentCard.vue'),
     redirect: { name: 'DepartmentSummary' },
     meta: {
         menu: ['DepartmentBasicData'],
@@ -204,7 +204,8 @@ const departmentCard = {
                 title: 'summary',
                 icon: 'launch',
             },
-            component: () => import('src/pages/Department/Card/DepartmentSummary.vue'),
+            component: () =>
+                import('src/pages/Worker/Department/Card/DepartmentSummary.vue'),
         },
         {
             path: 'basic-data',
@@ -213,7 +214,8 @@ const departmentCard = {
                 title: 'basicData',
                 icon: 'vn:settings',
             },
-            component: () => import('src/pages/Department/Card/DepartmentBasicData.vue'),
+            component: () =>
+                import('src/pages/Worker/Department/Card/DepartmentBasicData.vue'),
         },
     ],
 };
@@ -256,14 +258,14 @@ export default {
                 },
                 {
                     path: 'department',
-                    name: 'Department',
-                    redirect: { name: 'WorkerDepartment' },
+                    name: 'WorkerDepartment',
+                    redirect: { name: 'WorkerDepartmentList' },
+                    meta: { title: 'department', icon: 'vn:greuge' },
                     component: () => import('src/pages/Worker/WorkerDepartment.vue'),
                     children: [
                         {
-                            name: 'WorkerDepartment',
+                            name: 'WorkerDepartmentList',
                             path: 'list',
-                            meta: { title: 'department', icon: 'vn:greuge' },
                         },
                         departmentCard,
                     ],
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 4a819bf19..0afc7eed0 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -55,8 +55,8 @@ export const useNavigationStore = defineStore('navigationStore', () => {
 
     function addMenuItem(module, route, parent) {
         const { meta } = route;
-        let { menuChildren = null } = meta;
-        if (meta.hidden) return;
+        if (meta?.hidden) return;
+        const menuChildren = meta?.menuChildren;
         if (menuChildren)
             menuChildren = menuChildren.map(({ name, title, icon }) => ({
                 name,