From 7f747fcf1a771b66027d165029918cac50878ab5 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Wed, 12 Jan 2022 19:15:38 +0200
Subject: [PATCH] UI: Fix cycle dependency

---
 ui-ngx/src/app/core/utils.ts                    |  3 +--
 ui-ngx/src/app/shared/models/constants.ts       | 17 -----------------
 .../src/app/shared/models/entity-type.models.ts | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/ui-ngx/src/app/core/utils.ts b/ui-ngx/src/app/core/utils.ts
index c09488a593..5d5c534cd4 100644
--- a/ui-ngx/src/app/core/utils.ts
+++ b/ui-ngx/src/app/core/utils.ts
@@ -22,8 +22,7 @@ import { EntityId } from '@shared/models/id/entity-id';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
 import { BreadCrumbLabelFunction } from '@shared/components/breadcrumb';
 import { EntityDetailsPageComponent } from '@home/components/entity/entity-details-page.component';
-import { baseDetailsPageByEntityType } from '@shared/models/constants';
-import { EntityType } from '@shared/models/entity-type.models';
+import { EntityType, baseDetailsPageByEntityType } from '@shared/models/entity-type.models';
 
 const varsRegex = /\${([^}]*)}/g;
 
diff --git a/ui-ngx/src/app/shared/models/constants.ts b/ui-ngx/src/app/shared/models/constants.ts
index 7fea5aef0f..e90e496f4d 100644
--- a/ui-ngx/src/app/shared/models/constants.ts
+++ b/ui-ngx/src/app/shared/models/constants.ts
@@ -16,7 +16,6 @@
 
 import { InjectionToken } from '@angular/core';
 import { IModulesMap } from '@modules/common/modules-map.models';
-import { AliasEntityType, EntityType } from '@shared/models/entity-type.models';
 
 export const Constants = {
   serverErrorCode: {
@@ -138,22 +137,6 @@ export const HelpLinks = {
   }
 };
 
-export const baseDetailsPageByEntityType = new Map<EntityType, string>([
-  [EntityType.TENANT, '/tenants'],
-  [EntityType.TENANT_PROFILE, '/tenantProfiles'],
-  [EntityType.CUSTOMER, '/customers'],
-  [EntityType.USER, '/users'],
-  [EntityType.DASHBOARD, '/dashboards'],
-  [EntityType.ASSET, '/assets'],
-  [EntityType.DEVICE, '/devices'],
-  [EntityType.DEVICE_PROFILE, '/deviceProfiles'],
-  [EntityType.RULE_CHAIN, '/ruleChains'],
-  [EntityType.EDGE, '/edgeInstances'],
-  [EntityType.ENTITY_VIEW, '/entityViews'],
-  [EntityType.TB_RESOURCE, '/settings/resources-library'],
-  [EntityType.OTA_PACKAGE, '/otaUpdates']
-]);
-
 export interface ValueTypeData {
   name: string;
   icon: string;
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 1d54b29fa9..1e84e02db4 100644
--- a/ui-ngx/src/app/shared/models/entity-type.models.ts
+++ b/ui-ngx/src/app/shared/models/entity-type.models.ts
@@ -399,6 +399,22 @@ export const entityTypeResources = new Map<EntityType, EntityTypeResource<BaseDa
   ]
 );
 
+export const baseDetailsPageByEntityType = new Map<EntityType, string>([
+  [EntityType.TENANT, '/tenants'],
+  [EntityType.TENANT_PROFILE, '/tenantProfiles'],
+  [EntityType.CUSTOMER, '/customers'],
+  [EntityType.USER, '/users'],
+  [EntityType.DASHBOARD, '/dashboards'],
+  [EntityType.ASSET, '/assets'],
+  [EntityType.DEVICE, '/devices'],
+  [EntityType.DEVICE_PROFILE, '/deviceProfiles'],
+  [EntityType.RULE_CHAIN, '/ruleChains'],
+  [EntityType.EDGE, '/edgeInstances'],
+  [EntityType.ENTITY_VIEW, '/entityViews'],
+  [EntityType.TB_RESOURCE, '/settings/resources-library'],
+  [EntityType.OTA_PACKAGE, '/otaUpdates']
+]);
+
 export interface EntitySubtype {
   tenantId: TenantId;
   entityType: EntityType;