fix(LeftMenu): refs #8197 handle missing children in findRoute and update menu structure
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
Alex Moreno 2025-03-11 10:47:40 +01:00
parent f737148de7
commit 759701fcbe
2 changed files with 7 additions and 22 deletions

View File

@ -77,6 +77,7 @@ watch(
function findMatches(search, item) { function findMatches(search, item) {
const matches = []; const matches = [];
function findRoute(search, item) { function findRoute(search, item) {
if (!item?.children) return;
for (const child of item.children) { for (const child of item.children) {
if (search?.indexOf(child.name) > -1) { if (search?.indexOf(child.name) > -1) {
matches.push(child); matches.push(child);
@ -107,11 +108,7 @@ function getRoutes() {
main: getMainRoutes, main: getMainRoutes,
card: getCardRoutes, card: getCardRoutes,
}; };
try {
handleRoutes[props.source](); handleRoutes[props.source]();
} catch (error) {
throw new Error(`Method is not defined`);
}
} }
function getMainRoutes() { function getMainRoutes() {
const modules = Object.assign([], navigation.getModules().value); const modules = Object.assign([], navigation.getModules().value);
@ -122,7 +119,6 @@ function getMainRoutes() {
); );
if (!moduleDef) continue; if (!moduleDef) continue;
item.children = []; item.children = [];
addChildren(item.module, moduleDef, item.children); addChildren(item.module, moduleDef, item.children);
} }

View File

@ -15,10 +15,7 @@ vi.mock('src/router/modules', () => ({
meta: { meta: {
title: 'customers', title: 'customers',
icon: 'vn:client', icon: 'vn:client',
}, menu: ['CustomerList', 'CustomerCreate'],
menus: {
main: ['CustomerList', 'CustomerCreate'],
card: ['CustomerBasicData'],
}, },
children: [ children: [
{ {
@ -98,7 +95,7 @@ vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
icon: 'vn:client', icon: 'vn:client',
moduleName: 'Customer', moduleName: 'Customer',
keyBinding: 'c', keyBinding: 'c',
menu: 'customer', menu: ['customer'],
}, },
}, },
], ],
@ -260,15 +257,6 @@ describe('Leftmenu as main', () => {
}); });
}); });
it('should handle a single matched route with a menu', () => {
const route = {
matched: [{ meta: { menu: 'customer' } }],
};
const result = vm.betaGetRoutes();
expect(result.meta.menu).toEqual(route.matched[0].meta.menu);
});
it('should get routes for main source', () => { it('should get routes for main source', () => {
vm.props.source = 'main'; vm.props.source = 'main';
vm.getRoutes(); vm.getRoutes();
@ -351,8 +339,9 @@ describe('addChildren', () => {
it('should handle routes with no meta menu', () => { it('should handle routes with no meta menu', () => {
const route = { const route = {
meta: {}, meta: {
menus: {}, menu: [],
},
}; };
const parent = []; const parent = [];