From a398e302c73d9d2a9904829cb40a582aa51d462d Mon Sep 17 00:00:00 2001 From: masumulu28 Date: Mon, 27 Mar 2023 21:53:31 +0300 Subject: [PATCH] visible list filtered & tree-utils updated --- .../packages/core/src/lib/services/routes.service.ts | 2 +- npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts index c7acce3aee..27a01beecf 100644 --- a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts @@ -197,7 +197,7 @@ export abstract class AbstractNavTreeService @Injectable({ providedIn: 'root' }) export class RoutesService extends AbstractNavTreeService { get groupedVisible(): RouteGroup[] | undefined { - return this.createGroupedTree(this.visible); + return this.createGroupedTree(this.visible.filter(f => f.path || f.children?.length > 0)); } get groupedVisible$(): Observable[] | undefined> { diff --git a/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts index 6e1261d823..0195a81112 100644 --- a/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts +++ b/npm/ng-packs/packages/core/src/lib/utils/tree-utils.ts @@ -1,3 +1,5 @@ +import { isArray } from './common-utils'; + /* eslint-disable @typescript-eslint/ban-types */ export class BaseTreeNode { children: TreeNode[] = []; @@ -77,8 +79,8 @@ export function createTreeNodeFilterCreator( export function createGroupMap( list: TreeNode[], othersGroupKey: string, -): Map[]> | undefined { - if (!list || !Array.isArray(list) || !list.some(node => Boolean(node.group))) return undefined; +) { + if (!isArray(list) || !list.some(node => Boolean(node.group))) return undefined; const mapGroup = new Map[]>();