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

UI: Fixed merge additional info after save entity; Fixed updated alarm rules count

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2021-02-23 17:26:38 +02:00 committed by Andrew Shvayka
parent 0f3d1baa3f
commit 7237497946
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/modules/home/components/entity/entity-details-panel.component.ts
View File

@ -280,7 +280,11 @@ export class EntityDetailsPanelComponent extends PageComponent implements OnInit
saveEntity() { saveEntity() {
if (this.detailsForm.valid) { if (this.detailsForm.valid) {
const editingEntity = mergeDeep(this.editingEntity, this.entityComponent.entityFormValue()); const editingEntity = {...this.editingEntity, ...this.entityComponent.entityFormValue()};
if (this.editingEntity.hasOwnProperty('additionalInfo')) {
editingEntity.additionalInfo =
mergeDeep((this.editingEntity as any).additionalInfo, this.entityComponent.entityFormValue()?.additionalInfo);
}
this.entitiesTableConfig.saveEntity(editingEntity).subscribe( this.entitiesTableConfig.saveEntity(editingEntity).subscribe(
(entity) => { (entity) => {
this.entity = entity; this.entity = entity;

2
ui-ngx/src/app/modules/home/pages/device-profile/device-profile-tabs.component.html
View File

@ -42,7 +42,7 @@
</mat-tab> </mat-tab>
<mat-tab *ngIf="entity" #alarmRules="matTab" <mat-tab *ngIf="entity" #alarmRules="matTab"
label="{{'device-profile.alarm-rules-with-count' | translate: label="{{'device-profile.alarm-rules-with-count' | translate:
{count: entity.profileData?.alarms?.length ? entity.profileData.alarms.length : 0} {count: this.detailsForm.get('profileData.alarms').value?.length ? this.detailsForm.get('profileData.alarms').value.length : 0}
}}"> }}">
<div class="mat-padding" [formGroup]="detailsForm" *ngIf="alarmRules.isActive"> <div class="mat-padding" [formGroup]="detailsForm" *ngIf="alarmRules.isActive">
<div formGroupName="profileData"> <div formGroupName="profileData">