Merge pull request #5212 from volodymyr-babak/dashboard-alias-fix

[Bug] Fixed alias issue due to edgesEnabled changes

Merge pull request #5212 from volodymyr-babak/dashboard-alias-fix
[Bug] Fixed alias issue due to edgesEnabled changes
Igor Kulikov · GitHub
2 parents 99c927e3 60acd6f5
Showing 4 changed files with 26 additions and 21 deletions
ui-ngx/src/app/core/http/entity.service.ts
ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
ui-ngx/src/app/shared/models/alias.models.ts
--- a/ui-ngx/src/app/core/http/entity.service.ts
View file @886016c
+++ b/ui-ngx/src/app/core/http/entity.service.ts
View file @886016c
@@ -43,7 +43,13 @@ import { RuleChainService } from '@core/http/rule-chain.service';
 import { AliasInfo, StateParams, SubscriptionInfo } from '@core/api/widget-api.models';
 import { DataKey, Datasource, DatasourceType, KeyInfo } from '@app/shared/models/widget.models';
 import { UtilsService } from '@core/services/utils.service';
-import { AliasFilterType, EntityAlias, EntityAliasFilter, EntityAliasFilterResult } from '@shared/models/alias.models';
+import {
+  AliasFilterType,
+  edgeAliasFilterTypes,
+  EntityAlias,
+  EntityAliasFilter,
+  EntityAliasFilterResult
+} from '@shared/models/alias.models';
 import {
   EdgeImportEntityData,
   EntitiesKeysByQuery,
@@ -495,7 +501,11 @@ export class EntityService {
   }
   public getAliasFilterTypesByEntityTypes(entityTypes: Array<EntityType | AliasEntityType>): Array<AliasFilterType> {
-    const allAliasFilterTypes: Array<AliasFilterType> = Object.keys(AliasFilterType).map((key) => AliasFilterType[key]);
+    const authState = getCurrentAuthState(this.store);
+    let allAliasFilterTypes: Array<AliasFilterType> = Object.values(AliasFilterType);
+    if (!authState.edgesSupportEnabled) {
+      allAliasFilterTypes = allAliasFilterTypes.filter(aliasFilterType => !edgeAliasFilterTypes.includes(aliasFilterType));
+    }
     if (!entityTypes || !entityTypes.length) {
       return allAliasFilterTypes;
     }
@@ -622,14 +632,14 @@ export class EntityService {
       case Authority.TENANT_ADMIN:
         entityTypes.push(EntityType.DEVICE);
         entityTypes.push(EntityType.ASSET);
-        if (authState.edgesSupportEnabled) {
-          entityTypes.push(EntityType.EDGE);
-        }
         entityTypes.push(EntityType.ENTITY_VIEW);
         entityTypes.push(EntityType.TENANT);
         entityTypes.push(EntityType.CUSTOMER);
         entityTypes.push(EntityType.USER);
         entityTypes.push(EntityType.DASHBOARD);
+        if (authState.edgesSupportEnabled) {
+          entityTypes.push(EntityType.EDGE);
+        }
         if (useAliasEntityTypes) {
           entityTypes.push(AliasEntityType.CURRENT_CUSTOMER);
           entityTypes.push(AliasEntityType.CURRENT_TENANT);
@@ -638,13 +648,13 @@ export class EntityService {
       case Authority.CUSTOMER_USER:
         entityTypes.push(EntityType.DEVICE);
         entityTypes.push(EntityType.ASSET);
-        if (authState.edgesSupportEnabled) {
-          entityTypes.push(EntityType.EDGE);
-        }
         entityTypes.push(EntityType.ENTITY_VIEW);
         entityTypes.push(EntityType.CUSTOMER);
         entityTypes.push(EntityType.USER);
         entityTypes.push(EntityType.DASHBOARD);
+        if (authState.edgesSupportEnabled) {
+          entityTypes.push(EntityType.EDGE);
+        }
         if (useAliasEntityTypes) {
           entityTypes.push(AliasEntityType.CURRENT_CUSTOMER);
         }
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
View file @886016c
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-page.component.ts
View file @886016c
@@ -121,7 +121,6 @@ import {
   DisplayWidgetTypesPanelData
 } from '@home/components/dashboard-page/widget-types-panel.component';
 import { DashboardWidgetSelectComponent } from '@home/components/dashboard-page/dashboard-widget-select.component';
-import { AliasEntityType, EntityType } from '@shared/models/entity-type.models';
 import { MobileService } from '@core/services/mobile.service';
 import {
@@ -193,8 +192,6 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
   isToolbarOpenedAnimate = false;
   isRightLayoutOpened = false;
-  allowedEntityTypes: Array<EntityType | AliasEntityType> = null;
-
   editingWidget: Widget = null;
   editingWidgetLayout: WidgetLayout = null;
   editingWidgetOriginal: Widget = null;
@@ -409,8 +406,6 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
       };
       this.window.parent.postMessage(JSON.stringify(message), '*');
     }
-
-    this.allowedEntityTypes = this.entityService.prepareAllowedEntityTypesList(null, true);
   }
   private reset() {
@@ -658,8 +653,7 @@ export class DashboardPageComponent extends PageComponent implements IDashboardC
       data: {
         entityAliases: deepClone(this.dashboard.configuration.entityAliases),
         widgets: this.dashboardUtils.getWidgetsArray(this.dashboard),
-        isSingleEntityAlias: false,
-        allowedEntityTypes: this.allowedEntityTypes
+        isSingleEntityAlias: false
       }
     }).afterClosed().subscribe((entityAliases) => {
       if (entityAliases) {
--- a/ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
View file @886016c
+++ b/ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
View file @886016c
@@ -45,7 +45,7 @@ import {
 } from '@home/components/alias/entity-aliases-dialog.component';
 import { ItemBufferService, WidgetItem } from '@core/services/item-buffer.service';
 import { FileType, ImportWidgetResult, JSON_TYPE, WidgetsBundleItem, ZIP_TYPE } from './import-export.models';
-import { AliasEntityType, EntityType } from '@shared/models/entity-type.models';
+import { EntityType } from '@shared/models/entity-type.models';
 import { UtilsService } from '@core/services/utils.service';
 import { WidgetService } from '@core/http/widget.service';
 import { NULL_UUID } from '@shared/models/id/has-uuid';
@@ -686,9 +686,6 @@ export class ImportExportService {
   private editMissingAliases(widgets: Array<Widget>, isSingleWidget: boolean,
                              customTitle: string, missingEntityAliases: EntityAliases): Observable<EntityAliases> {
-    const allowedEntityTypes: Array<EntityType | AliasEntityType> =
-      this.entityService.prepareAllowedEntityTypesList(null, true);
-
     return this.dialog.open<EntityAliasesDialogComponent, EntityAliasesDialogData,
       EntityAliases>(EntityAliasesDialogComponent, {
       disableClose: true,
@@ -698,8 +695,7 @@ export class ImportExportService {
         widgets,
         customTitle,
         isSingleWidget,
-        disableAdd: true,
-        allowedEntityTypes
+        disableAdd: true
       }
     }).afterClosed().pipe(
       map((updatedEntityAliases) => {
--- a/ui-ngx/src/app/shared/models/alias.models.ts
View file @886016c
+++ b/ui-ngx/src/app/shared/models/alias.models.ts
View file @886016c
@@ -37,6 +37,11 @@ export enum AliasFilterType {
   entityViewSearchQuery = 'entityViewSearchQuery'
 }
+export const edgeAliasFilterTypes = new Array<string>(
+  AliasFilterType.edgeType,
+  AliasFilterType.edgeSearchQuery
+);
+
 export const aliasFilterTypeTranslationMap = new Map<AliasFilterType, string>(
   [
     [ AliasFilterType.singleEntity, 'alias.filter-type-single-entity' ],