From 4ae7cd81c495fb4e930ce2997c4216bf9073ea4a Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Fri, 24 Mar 2023 12:41:06 +0200
Subject: [PATCH] UI: Move rule chains menu link in top level

---
 ui-ngx/src/app/core/services/menu.service.ts  | 14 ++++++-------
 .../pages/features/features-routing.module.ts |  4 +---
 .../rulechain/rulechain-routing.module.ts     | 20 +------------------
 .../app/shared/models/entity-type.models.ts   |  2 +-
 4 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/ui-ngx/src/app/core/services/menu.service.ts b/ui-ngx/src/app/core/services/menu.service.ts
index 4d8455b8d6..c2c17c0b07 100644
--- a/ui-ngx/src/app/core/services/menu.service.ts
+++ b/ui-ngx/src/app/core/services/menu.service.ts
@@ -374,6 +374,13 @@ export class MenuService {
         type: 'link',
         path: '/customers',
         icon: 'supervisor_account'
+      },
+      {
+        id: guid(),
+        name: 'rulechain.rulechains',
+        type: 'link',
+        path: '/ruleChains',
+        icon: 'settings_ethernet'
       }
     );
     if (authState.edgesSupportEnabled) {
@@ -411,13 +418,6 @@ export class MenuService {
         path: '/features',
         icon: 'construction',
         pages: [
-          {
-            id: guid(),
-            name: 'rulechain.rulechains',
-            type: 'link',
-            path: '/features/ruleChains',
-            icon: 'settings_ethernet'
-          },
           {
             id: guid(),
             name: 'ota-update.ota-updates',
diff --git a/ui-ngx/src/app/modules/home/pages/features/features-routing.module.ts b/ui-ngx/src/app/modules/home/pages/features/features-routing.module.ts
index 4448f8a559..56a0b79318 100644
--- a/ui-ngx/src/app/modules/home/pages/features/features-routing.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/features/features-routing.module.ts
@@ -17,7 +17,6 @@
 import { RouterModule, Routes } from '@angular/router';
 import { Authority } from '@shared/models/authority.enum';
 import { NgModule } from '@angular/core';
-import { ruleChainsRoutes } from '@home/pages/rulechain/rulechain-routing.module';
 import { otaUpdatesRoutes } from '@home/pages/ota-update/ota-update-routing.module';
 import { vcRoutes } from '@home/pages/vc/vc-routing.module';
 
@@ -37,10 +36,9 @@ const routes: Routes = [
         children: [],
         data: {
           auth: [Authority.TENANT_ADMIN],
-          redirectTo: '/features/ruleChains'
+          redirectTo: '/features/otaUpdates'
         }
       },
-      ...ruleChainsRoutes,
       ...otaUpdatesRoutes,
       ...vcRoutes
     ]
diff --git a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts
index ec2148b576..d8a22c67db 100644
--- a/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts
+++ b/ui-ngx/src/app/modules/home/pages/rulechain/rulechain-routing.module.ts
@@ -122,7 +122,7 @@ export const importRuleChainBreadcumbLabelFunction: BreadCrumbLabelFunction<Rule
   return `${translate.instant('rulechain.import')}: ${component.ruleChain.name}`;
 });
 
-export const ruleChainsRoutes: Routes = [
+const routes: Routes = [
   {
     path: 'ruleChains',
     data: {
@@ -189,24 +189,6 @@ export const ruleChainsRoutes: Routes = [
   }
 ];
 
-const routes: Routes = [
-  {
-    path: 'ruleChains',
-    pathMatch: 'full',
-    redirectTo: '/features/ruleChains'
-  },
-  {
-    path: 'ruleChains/:ruleChainId',
-    pathMatch: 'full',
-    redirectTo: '/features/ruleChains/:ruleChainId'
-  },
-  {
-    path: 'ruleChains/ruleChain/import',
-    pathMatch: 'full',
-    redirectTo: '/features/ruleChains/ruleChain/import'
-  }
-];
-
 // @dynamic
 @NgModule({
   imports: [RouterModule.forChild(routes)],
diff --git a/ui-ngx/src/app/shared/models/entity-type.models.ts b/ui-ngx/src/app/shared/models/entity-type.models.ts
index 987384ee50..7e8ec4c18d 100644
--- a/ui-ngx/src/app/shared/models/entity-type.models.ts
+++ b/ui-ngx/src/app/shared/models/entity-type.models.ts
@@ -449,7 +449,7 @@ export const baseDetailsPageByEntityType = new Map<EntityType, string>([
   [EntityType.DEVICE, '/entities/devices'],
   [EntityType.DEVICE_PROFILE, '/profiles/deviceProfiles'],
   [EntityType.ASSET_PROFILE, '/profiles/assetProfiles'],
-  [EntityType.RULE_CHAIN, '/features/ruleChains'],
+  [EntityType.RULE_CHAIN, '/ruleChains'],
   [EntityType.EDGE, '/edgeManagement/instances'],
   [EntityType.ENTITY_VIEW, '/entities/entityViews'],
   [EntityType.TB_RESOURCE, '/resources/resources-library'],