diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.html index 1c8de300d3..369d6fa180 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-object-list.component.html @@ -22,7 +22,7 @@ [selectable]="!disabled" [removable]="!disabled" (removed)="remove(objectLwm2m)"> - {{objectLwm2m.name}} <{{objectLwm2m.keyId}}> + {{objectLwm2m.name}} #{{objectLwm2m.keyId}} close - +
- {{ 'device-profile.lwm2m.instance' | translate }} <{{instances.get('id').value}}> + {{ 'device-profile.lwm2m.instance' | translate }} #{{instances.get('id').value}}
`; + return `${this.translate.instant('device-profile.lwm2m.instance')} #${instance.id}`; } disableObserveInstance = (instance: AbstractControl): boolean => { diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.html index ecb8214f52..8d9030d89c 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.html @@ -38,7 +38,7 @@ *ngFor="let resourceLwM2M of resourcesFormArray.controls; let $index = index; trackBy: trackByParams">
- <{{resourceLwM2M.get('id').value}}> {{resourceLwM2M.get('name').value}} + #{{resourceLwM2M.get('id').value}} {{resourceLwM2M.get('name').value}}
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.scss b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.scss index 424a05db49..4fa8f6fe02 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.scss +++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.scss @@ -18,6 +18,10 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + + .name { + font-weight: 500; + } } .checkbox-column-title { diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.ts b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.ts index bca6d927d9..7e5136804b 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.ts +++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.ts @@ -105,6 +105,8 @@ export class Lwm2mObserveAttrTelemetryResourcesComponent implements ControlValue this.resourcesFormGroup.disable({emitEvent: false}); } else { this.resourcesFormArray.controls.forEach(resource => { + resource.get('id').enable({emitEvent: false}); + resource.get('name').enable({emitEvent: false}); resource.get('keyName').enable({emitEvent: false}); resource.get('attribute').enable({emitEvent: false}); resource.get('telemetry').enable({onlySelf: true}); @@ -124,7 +126,7 @@ export class Lwm2mObserveAttrTelemetryResourcesComponent implements ControlValue } getNameResourceLwm2m(resourceLwM2M: ResourceLwM2M): string { - return `<${resourceLwM2M.id}> ${resourceLwM2M.name}`; + return `#${resourceLwM2M.id} ${resourceLwM2M.name}`; } private updatedResources(resources: ResourceLwM2M[]): void { diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component.html index 6fc379a56c..9fae435055 100644 --- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component.html @@ -22,7 +22,7 @@ [formGroupName]="$index"> - {{ objectLwM2M.get('name').value}} <{{ objectLwM2M.get('id').value}}> + {{ objectLwM2M.get('name').value}} #{{ objectLwM2M.get('keyId').value}} { - return `${objectLwM2M.name} <${objectLwM2M.id}>`; + return `${objectLwM2M.name} #${objectLwM2M.keyId}`; } } diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index bf6b576952..5e8864f233 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -1233,7 +1233,7 @@ "instances-input": "Input Instance Id value", "instances-input-holder": "Input Instance number...", "instance": "Instance", - "resource-label": " Resource name", + "resource-label": "#ID Resource name", "observe-label": "Observe", "attribute-label": "Attribute", "telemetry-label": "Telemetry",