Commit 1b9552033b50d3415f7748c9baa47efd5b986f9a
1 parent
7a9ca169
Fixed UI on Edge's tab Attributes with blocked Client Attributes
Showing
3 changed files
with
8 additions
and
5 deletions
@@ -250,7 +250,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI | @@ -250,7 +250,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI | ||
250 | 250 | ||
251 | resetSortAndFilter(update: boolean = true) { | 251 | resetSortAndFilter(update: boolean = true) { |
252 | const entityType = this.entityIdValue.entityType; | 252 | const entityType = this.entityIdValue.entityType; |
253 | - if (entityType === EntityType.DEVICE || entityType === EntityType.ENTITY_VIEW) { | 253 | + if (entityType === EntityType.DEVICE || entityType === EntityType.ENTITY_VIEW || entityType === EntityType.EDGE) { |
254 | this.attributeScopes = Object.keys(AttributeScope); | 254 | this.attributeScopes = Object.keys(AttributeScope); |
255 | this.attributeScopeSelectionReadonly = false; | 255 | this.attributeScopeSelectionReadonly = false; |
256 | } else { | 256 | } else { |
@@ -32,10 +32,10 @@ import { EntityTableConfig } from "@home/models/entity/entities-table-config.mod | @@ -32,10 +32,10 @@ import { EntityTableConfig } from "@home/models/entity/entities-table-config.mod | ||
32 | templateUrl: './edge.component.html', | 32 | templateUrl: './edge.component.html', |
33 | styleUrls: ['./edge.component.scss'] | 33 | styleUrls: ['./edge.component.scss'] |
34 | }) | 34 | }) |
35 | - | ||
36 | -export class EdgeComponent extends EntityComponent<EdgeInfo>{ | 35 | +export class EdgeComponent extends EntityComponent<EdgeInfo> { |
37 | 36 | ||
38 | entityType = EntityType; | 37 | entityType = EntityType; |
38 | + | ||
39 | edgeScope: 'tenant' | 'customer' | 'customer_user'; | 39 | edgeScope: 'tenant' | 'customer' | 'customer_user'; |
40 | 40 | ||
41 | constructor(protected store: Store<AppState>, | 41 | constructor(protected store: Store<AppState>, |
@@ -138,5 +138,4 @@ export class EdgeComponent extends EntityComponent<EdgeInfo>{ | @@ -138,5 +138,4 @@ export class EdgeComponent extends EntityComponent<EdgeInfo>{ | ||
138 | } | 138 | } |
139 | return str.concat(this.generateSecret(length - str.length)); | 139 | return str.concat(this.generateSecret(length - str.length)); |
140 | } | 140 | } |
141 | - | ||
142 | } | 141 | } |
@@ -1100,7 +1100,11 @@ | @@ -1100,7 +1100,11 @@ | ||
1100 | "details": "Entity details", | 1100 | "details": "Entity details", |
1101 | "no-entities-prompt": "No entities found", | 1101 | "no-entities-prompt": "No entities found", |
1102 | "no-data": "No data to display", | 1102 | "no-data": "No data to display", |
1103 | - "columns-to-display": "Columns to Display" | 1103 | + "columns-to-display": "Columns to Display", |
1104 | + "type-edge": "Edge", | ||
1105 | + "type-edges": "Edges", | ||
1106 | + "list-of-edges": "{ count, plural, 1 {One edge} other {List of # edges} }", | ||
1107 | + "edge-name-starts-with": "Edges whose names start with '{{prefix}}'" | ||
1104 | }, | 1108 | }, |
1105 | "entity-field": { | 1109 | "entity-field": { |
1106 | "created-time": "Created time", | 1110 | "created-time": "Created time", |