From 17dba2ac99b351337d714614c7dadc5fd525878c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 6 Nov 2024 12:51:06 +0100
Subject: [PATCH 1/3] feat: refs #7925 redirect to not found

---
 src/composables/useArrayData.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index a2eaa649a..e5742f771 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -260,9 +260,15 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 });
             const { matched: matches } = router.currentRoute.value;
             const { path } = matches.at(-1);
+            const rowsNumber = store.data.length;
+
+            if (path.includes(':id') && !rowsNumber)
+                return router.push({
+                    name: 'NotFound',
+                });
 
             const to =
-                store?.data?.length === 1
+                rowsNumber === 1
                     ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
                     : path.replace(/:id.*/, '');
 
-- 
2.40.1


From c64f87533d264d3a62d8cc066f5ef71f475236db Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 7 Nov 2024 14:34:33 +0100
Subject: [PATCH 2/3] feat: refs #7925 wip redirect not found

---
 src/composables/useArrayData.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index e5742f771..8258b673e 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -262,15 +262,14 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             const { path } = matches.at(-1);
             const rowsNumber = store.data.length;
 
-            if (path.includes(':id') && !rowsNumber)
-                return router.push({
-                    name: 'NotFound',
-                });
-
-            const to =
-                rowsNumber === 1
-                    ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
-                    : path.replace(/:id.*/, '');
+            let to;
+            if (path.includes(':id') && !rowsNumber) {
+                return router.push({ name: 'NotFound' });
+            } else if (rowsNumber === 1) {
+                to = path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`);
+            } else {
+                to = path.replace(/:id.*/, '');
+            }
 
             if (route.path != to) {
                 const pushUrl = { path: to };
-- 
2.40.1


From 1f79d871e3d8930877bd89fbe15b00230d6216a6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 7 Nov 2024 14:36:43 +0100
Subject: [PATCH 3/3] feat: refs #7925 w/o card redirect

---
 src/components/VnTable/VnTable.vue | 4 ++--
 src/composables/useArrayData.js    | 1 +
 src/router/modules/Supplier.js     | 1 -
 src/router/modules/account.js      | 1 -
 src/router/modules/agency.js       | 1 -
 src/router/modules/claim.js        | 1 -
 src/router/modules/customer.js     | 1 -
 src/router/modules/department.js   | 1 -
 src/router/modules/entry.js        | 1 -
 src/router/modules/invoiceIn.js    | 1 -
 src/router/modules/invoiceOut.js   | 1 -
 src/router/modules/item.js         | 1 -
 src/router/modules/itemType.js     | 1 -
 src/router/modules/mailAlias.js    | 1 -
 src/router/modules/order.js        | 1 -
 src/router/modules/parking.js      | 1 -
 src/router/modules/roadmap.js      | 1 -
 src/router/modules/role.js         | 1 -
 src/router/modules/route.js        | 1 -
 src/router/modules/shelving.js     | 1 -
 src/router/modules/ticket.js       | 1 -
 src/router/modules/travel.js       | 1 -
 src/router/modules/worker.js       | 1 -
 src/router/modules/zone.js         | 1 -
 24 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index dc8671369..f30ac8cb0 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -274,7 +274,7 @@ const rowCtrlClickFunction = computed(() => {
 });
 
 function redirectFn(id) {
-    router.push({ path: `/${$props.redirect}/${id}` });
+    router.push({ path: `/${$props.redirect}/${id}/summary` });
 }
 
 function stopEventPropagation(event) {
@@ -599,7 +599,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                 <template #item="{ row, colsMap }">
                     <component
                         :is="$props.redirect ? 'router-link' : 'span'"
-                        :to="`/${$props.redirect}/` + row.id"
+                        :to="`/${$props.redirect}/${row.id}/summary`"
                     >
                         <QCard
                             bordered
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 8258b673e..20063d461 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -267,6 +267,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 return router.push({ name: 'NotFound' });
             } else if (rowsNumber === 1) {
                 to = path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`);
+                if (!to.includes('summary')) to += '/summary';
             } else {
                 to = path.replace(/:id.*/, '');
             }
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 143d7c824..050ada316 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -57,7 +57,6 @@ export default {
             name: 'SupplierCard',
             path: ':id',
             component: () => import('src/pages/Supplier/Card/SupplierCard.vue'),
-            redirect: { name: 'SupplierSummary' },
             children: [
                 {
                     name: 'SupplierSummary',
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index 7200131da..6bf457006 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -124,7 +124,6 @@ export default {
             name: 'AccountCard',
             path: ':id',
             component: () => import('src/pages/Account/Card/AccountCard.vue'),
-            redirect: { name: 'AccountSummary' },
             children: [
                 {
                     name: 'AccountSummary',
diff --git a/src/router/modules/agency.js b/src/router/modules/agency.js
index c714865fa..c19536b14 100644
--- a/src/router/modules/agency.js
+++ b/src/router/modules/agency.js
@@ -19,7 +19,6 @@ export default {
             path: '/agency/:id',
             name: 'AgencyCard',
             component: () => import('src/pages/Route/Agency/Card/AgencyCard.vue'),
-            redirect: { name: 'AgencySummary' },
             children: [
                 {
                     name: 'AgencySummary',
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index b58a58e8d..6d06da93e 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -45,7 +45,6 @@ export default {
             name: 'ClaimCard',
             path: ':id',
             component: () => import('src/pages/Claim/Card/ClaimCard.vue'),
-            redirect: { name: 'ClaimSummary' },
             children: [
                 {
                     name: 'ClaimSummary',
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 1b707f1a2..aed6a8435 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -98,7 +98,6 @@ export default {
             name: 'CustomerCard',
             path: ':id',
             component: () => import('src/pages/Customer/Card/CustomerCard.vue'),
-            redirect: { name: 'CustomerSummary' },
             children: [
                 {
                     name: 'CustomerSummary',
diff --git a/src/router/modules/department.js b/src/router/modules/department.js
index 9aab40534..c03079aa0 100644
--- a/src/router/modules/department.js
+++ b/src/router/modules/department.js
@@ -19,7 +19,6 @@ export default {
             name: 'DepartmentCard',
             path: 'department/:id',
             component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
-            redirect: { name: 'DepartmentSummary' },
             children: [
                 {
                     name: 'DepartmentSummary',
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 3add239df..f83e2f217 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -88,7 +88,6 @@ export default {
             name: 'EntryCard',
             path: ':id',
             component: () => import('src/pages/Entry/Card/EntryCard.vue'),
-            redirect: { name: 'EntrySummary' },
             children: [
                 {
                     name: 'EntrySummary',
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 168d64f37..db3627612 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -62,7 +62,6 @@ export default {
             name: 'InvoiceInCard',
             path: ':id',
             component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
-            redirect: { name: 'InvoiceInSummary' },
             beforeEnter: async (to, from, next) => {
                 await setRectificative(to);
                 next();
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 5e83b0859..eb592f59c 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -55,7 +55,6 @@ export default {
             name: 'InvoiceOutCard',
             path: ':id',
             component: () => import('src/pages/InvoiceOut/Card/InvoiceOutCard.vue'),
-            redirect: { name: 'InvoiceOutSummary' },
             children: [
                 {
                     name: 'InvoiceOutSummary',
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 0f810434c..ec56993a4 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -103,7 +103,6 @@ export default {
             name: 'ItemCard',
             path: ':id',
             component: () => import('src/pages/Item/Card/ItemCard.vue'),
-            redirect: { name: 'ItemSummary' },
             children: [
                 {
                     name: 'ItemSummary',
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 1ceecd4cc..102ef92b2 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -19,7 +19,6 @@ export default {
             name: 'ItemTypeCard',
             path: ':id',
             component: () => import('src/pages/Item/ItemType/Card/ItemTypeCard.vue'),
-            redirect: { name: 'ItemTypeSummary' },
             children: [
                 {
                     name: 'ItemTypeSummary',
diff --git a/src/router/modules/mailAlias.js b/src/router/modules/mailAlias.js
index 8e0f8abdc..cc808c08c 100644
--- a/src/router/modules/mailAlias.js
+++ b/src/router/modules/mailAlias.js
@@ -19,7 +19,6 @@ export default {
             name: 'AliasCard',
             path: ':id',
             component: () => import('src/pages/Account/Alias/Card/AliasCard.vue'),
-            redirect: { name: 'AliasSummary' },
             children: [
                 {
                     name: 'AliasSummary',
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index bfa37fce5..98a1ae77f 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -46,7 +46,6 @@ export default {
             name: 'OrderCard',
             path: ':id',
             component: () => import('src/pages/Order/Card/OrderCard.vue'),
-            redirect: { name: 'OrderSummary' },
             children: [
                 {
                     name: 'OrderSummary',
diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
index 51ea200c6..cf57058ad 100644
--- a/src/router/modules/parking.js
+++ b/src/router/modules/parking.js
@@ -19,7 +19,6 @@ export default {
             path: '/parking/:id',
             name: 'ParkingCard',
             component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
-            redirect: { name: 'ParkingSummary' },
             children: [
                 {
                     name: 'ParkingSummary',
diff --git a/src/router/modules/roadmap.js b/src/router/modules/roadmap.js
index 6b2aa6a13..e7a29917e 100644
--- a/src/router/modules/roadmap.js
+++ b/src/router/modules/roadmap.js
@@ -18,7 +18,6 @@ export default {
             name: 'RouteRoadmapCard',
             path: ':id',
             component: () => import('src/pages/Route/Roadmap/RoadmapCard.vue'),
-            redirect: { name: 'RoadmapSummary' },
             children: [
                 {
                     name: 'RoadmapSummary',
diff --git a/src/router/modules/role.js b/src/router/modules/role.js
index 47cd10b18..55f2177eb 100644
--- a/src/router/modules/role.js
+++ b/src/router/modules/role.js
@@ -19,7 +19,6 @@ export default {
             name: 'RoleCard',
             path: ':id',
             component: () => import('src/pages/Account/Role/Card/RoleCard.vue'),
-            redirect: { name: 'RoleSummary' },
             children: [
                 {
                     name: 'RoleSummary',
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 9a7b16df3..63895a547 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -26,7 +26,6 @@ export default {
             path: '/route',
             name: 'RouteMain',
             component: () => import('src/components/common/VnSectionMain.vue'),
-            redirect: { name: 'RouteList' },
             children: [
                 {
                     path: 'list',
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index b7f50a3b6..d8b1797d9 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -60,7 +60,6 @@ export default {
             name: 'ShelvingLayout',
             path: ':id',
             component: () => import('pages/Shelving/Card/ShelvingCard.vue'),
-            redirect: { name: 'ShelvingSummary' },
             children: [
                 {
                     name: 'ShelvingSummary',
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6e407b88b..fb9c0794b 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -90,7 +90,6 @@ export default {
             name: 'TicketCard',
             path: ':id',
             component: () => import('src/pages/Ticket/Card/TicketCard.vue'),
-            redirect: { name: 'TicketSummary' },
             children: [
                 {
                     path: 'summary',
diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js
index 627692be8..26bc144f1 100644
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@@ -54,7 +54,6 @@ export default {
             name: 'TravelCard',
             path: ':id',
             component: () => import('src/pages/Travel/Card/TravelCard.vue'),
-            redirect: { name: 'TravelSummary' },
             children: [
                 {
                     name: 'TravelSummary',
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index d1feff23d..cfdadf79d 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -70,7 +70,6 @@ export default {
             name: 'WorkerCard',
             path: ':id',
             component: () => import('src/pages/Worker/Card/WorkerCard.vue'),
-            redirect: { name: 'WorkerSummary' },
             children: [
                 {
                     name: 'WorkerSummary',
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index 1f27cc76f..32a71115a 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -66,7 +66,6 @@ export default {
             name: 'ZoneCard',
             path: ':id',
             component: () => import('src/pages/Zone/Card/ZoneCard.vue'),
-            redirect: { name: 'ZoneSummary' },
             children: [
                 {
                     name: 'ZoneSummary',
-- 
2.40.1