dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI:Refactoring

Browse Source
This commit is contained in:
Artem Dzhereleiko 2024-07-22 15:04:58 +03:00
parent a19577928f
commit fc80bda9d9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui-ngx/src/app/core/http/entity.service.ts
View File

@ -756,9 +756,6 @@ export class EntityService {
} }
} }
if (allowedEntityTypes && allowedEntityTypes.length) { if (allowedEntityTypes && allowedEntityTypes.length) {
if (allowedEntityTypes.includes(AliasEntityType.CURRENT_RULE_NODE)) {
entityTypes.push(AliasEntityType.CURRENT_RULE_NODE);
}
for (let index = entityTypes.length - 1; index >= 0; index--) { for (let index = entityTypes.length - 1; index >= 0; index--) {
if (allowedEntityTypes.indexOf(entityTypes[index]) === -1) { if (allowedEntityTypes.indexOf(entityTypes[index]) === -1) {
entityTypes.splice(index, 1); entityTypes.splice(index, 1);

3
ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts
View File

@ -93,6 +93,9 @@ export class EntityTypeSelectComponent implements ControlValueAccessor, OnInit,
this.entityTypes = this.filterAllowedEntityTypes this.entityTypes = this.filterAllowedEntityTypes
? this.entityService.prepareAllowedEntityTypesList(this.allowedEntityTypes, this.useAliasEntityTypes) ? this.entityService.prepareAllowedEntityTypesList(this.allowedEntityTypes, this.useAliasEntityTypes)
: this.allowedEntityTypes; : this.allowedEntityTypes;
if (this.allowedEntityTypes?.length && this.allowedEntityTypes.includes(AliasEntityType.CURRENT_RULE_NODE)) {
this.entityTypes.push(AliasEntityType.CURRENT_RULE_NODE);
}
this.entityTypeFormGroup.get('entityType').valueChanges.subscribe( this.entityTypeFormGroup.get('entityType').valueChanges.subscribe(
(value) => { (value) => {
let modelValue; let modelValue;