From 926fc0a5b07433e2c75f5785dc412c25b5a4ba45 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Sat, 27 Jun 2020 14:26:15 +0300 Subject: [PATCH] refactor: routes service sorting logic --- .../packages/core/src/lib/services/routes.service.ts | 7 ++++++- .../config/src/providers/route.provider.ts | 2 +- .../theme-shared/src/lib/services/nav-items.service.ts | 2 +- 3 files changed, 8 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 2324f09c0b..4a3426dd51 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 @@ -132,7 +132,12 @@ export abstract class AbstractNavTreeService extends Abstract readonly id = 'name'; readonly parentId = 'parentName'; readonly hide = (item: T) => item.invisible || !this.isGranted(item); - readonly sort = (a: T, b: T) => a.order - b.order; + readonly sort = (a: T, b: T) => { + if (!a.order) return 1; + if (!b.order) return -1; + + return a.order - b.order; + }; constructor(protected actions: Actions, protected store: Store) { super(); diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts index badc46ae9a..b0f63eefe7 100644 --- a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts +++ b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts @@ -24,7 +24,7 @@ export function configureRoutes(routes: RoutesService) { parentName: eThemeSharedRouteNames.Administration, requiredPolicy: eSettingManagementPolicyNames.Settings, layout: eLayoutType.application, - order: 6, + order: 100, iconClass: 'fa fa-cog', }, ]); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/nav-items.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/nav-items.service.ts index 95403837fd..874fc4b6e3 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/services/nav-items.service.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/services/nav-items.service.ts @@ -45,5 +45,5 @@ function sortItems(a: NavItem, b: NavItem) { if (!a.order) return 1; if (!b.order) return -1; - return a.order < b.order ? -1 : 1; + return a.order - b.order; }