Browse Source

Fixed UI on Edge's tab Attributes with blocked Client Attributes

pull/3811/head
Artem Babak 6 years ago
parent
commit
1b9552033b
  1. 2
      ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
  2. 5
      ui-ngx/src/app/modules/home/pages/edge/edge.component.ts
  3. 6
      ui-ngx/src/assets/locale/locale.constant-en_US.json

2
ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts

@ -250,7 +250,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
resetSortAndFilter(update: boolean = true) { resetSortAndFilter(update: boolean = true) {
const entityType = this.entityIdValue.entityType; const entityType = this.entityIdValue.entityType;
if (entityType === EntityType.DEVICE || entityType === EntityType.ENTITY_VIEW) { if (entityType === EntityType.DEVICE || entityType === EntityType.ENTITY_VIEW || entityType === EntityType.EDGE) {
this.attributeScopes = Object.keys(AttributeScope); this.attributeScopes = Object.keys(AttributeScope);
this.attributeScopeSelectionReadonly = false; this.attributeScopeSelectionReadonly = false;
} else { } else {

5
ui-ngx/src/app/modules/home/pages/edge/edge.component.ts

@ -32,10 +32,10 @@ import { EntityTableConfig } from "@home/models/entity/entities-table-config.mod
templateUrl: './edge.component.html', templateUrl: './edge.component.html',
styleUrls: ['./edge.component.scss'] styleUrls: ['./edge.component.scss']
}) })
export class EdgeComponent extends EntityComponent<EdgeInfo> {
export class EdgeComponent extends EntityComponent<EdgeInfo>{
entityType = EntityType; entityType = EntityType;
edgeScope: 'tenant' | 'customer' | 'customer_user'; edgeScope: 'tenant' | 'customer' | 'customer_user';
constructor(protected store: Store<AppState>, constructor(protected store: Store<AppState>,
@ -138,5 +138,4 @@ export class EdgeComponent extends EntityComponent<EdgeInfo>{
} }
return str.concat(this.generateSecret(length - str.length)); return str.concat(this.generateSecret(length - str.length));
} }
} }

6
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -1100,7 +1100,11 @@
"details": "Entity details", "details": "Entity details",
"no-entities-prompt": "No entities found", "no-entities-prompt": "No entities found",
"no-data": "No data to display", "no-data": "No data to display",
"columns-to-display": "Columns to Display" "columns-to-display": "Columns to Display",
"type-edge": "Edge",
"type-edges": "Edges",
"list-of-edges": "{ count, plural, 1 {One edge} other {List of # edges} }",
"edge-name-starts-with": "Edges whose names start with '{{prefix}}'"
}, },
"entity-field": { "entity-field": {
"created-time": "Created time", "created-time": "Created time",

Loading…
Cancel
Save