From 0f5841e9cb3cbf70c8946f17b5abd87b87144edd Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Thu, 27 Jul 2023 18:07:50 +0300
Subject: [PATCH] Added dialog for creation latest telemetry key value

---
 .../add-attribute-dialog.component.html       |  2 +-
 .../add-attribute-dialog.component.ts         | 27 ++++++++++++-------
 .../attribute/attribute-table.component.html  |  2 +-
 .../attribute/attribute-table.component.ts    |  2 +-
 .../assets/locale/locale.constant-en_US.json  |  3 ++-
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
index c48299986e..17e31854cc 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.html
@@ -17,7 +17,7 @@
 -->
 <form [formGroup]="attributeFormGroup" (ngSubmit)="add()" style="min-width: 400px;">
   <mat-toolbar color="primary">
-    <h2>{{ 'attribute.add' | translate }}</h2>
+    <h2>{{ title | translate }}</h2>
     <span fxFlex></span>
     <button mat-icon-button
             (click)="cancel()"
diff --git a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts
index 442bd495c3..55746b7347 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/add-attribute-dialog.component.ts
@@ -19,16 +19,17 @@ import { ErrorStateMatcher } from '@angular/material/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, FormGroupDirective, NgForm, Validators } from '@angular/forms';
+import { FormGroupDirective, NgForm, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
 import { EntityId } from '@shared/models/id/entity-id';
 import { Router } from '@angular/router';
 import { DialogComponent } from '@app/shared/components/dialog.component';
-import { AttributeData, AttributeScope } from '@shared/models/telemetry/telemetry.models';
+import { AttributeData, AttributeScope, LatestTelemetry, TelemetryType } from '@shared/models/telemetry/telemetry.models';
 import { AttributeService } from '@core/http/attribute.service';
+import { Observable } from 'rxjs';
 
 export interface AddAttributeDialogData {
   entityId: EntityId;
-  attributeScope: AttributeScope;
+  attributeScope: TelemetryType;
 }
 
 @Component({
@@ -44,6 +45,8 @@ export class AddAttributeDialogComponent extends DialogComponent<AddAttributeDia
 
   submitted = false;
 
+  title = '';
+
   constructor(protected store: Store<AppState>,
               protected router: Router,
               @Inject(MAT_DIALOG_DATA) public data: AddAttributeDialogData,
@@ -59,6 +62,8 @@ export class AddAttributeDialogComponent extends DialogComponent<AddAttributeDia
       key: ['', [Validators.required, Validators.maxLength(255)]],
       value: [null, [Validators.required]]
     });
+    this.title = this.data.attributeScope === LatestTelemetry.LATEST_TELEMETRY ?
+      'attribute.add-telemetry' : 'attribute.add'
   }
 
   isErrorState(control: UntypedFormControl | null, form: FormGroupDirective | NgForm | null): boolean {
@@ -78,11 +83,15 @@ export class AddAttributeDialogComponent extends DialogComponent<AddAttributeDia
       key: this.attributeFormGroup.get('key').value.trim(),
       value: this.attributeFormGroup.get('value').value
     };
-    this.attributeService.saveEntityAttributes(this.data.entityId,
-      this.data.attributeScope, [attribute]).subscribe(
-          () => {
-            this.dialogRef.close(true);
-          }
-    );
+    let task: Observable<any>;
+    if (this.data.attributeScope === LatestTelemetry.LATEST_TELEMETRY) {
+      task = this.attributeService.saveEntityTimeseries(this.data.entityId,
+        this.data.attributeScope, [attribute]);
+    }
+    if (this.data.attributeScope in AttributeScope) {
+      task = this.attributeService.saveEntityAttributes(this.data.entityId,
+        this.data.attributeScope as AttributeScope, [attribute]);
+    }
+    task.subscribe(() => this.dialogRef.close(true));
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
index 32ebb28ae9..e568fef8de 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.html
@@ -34,7 +34,7 @@
         </div>
         <span fxFlex></span>
         <button mat-icon-button
-                *ngIf="!isClientSideTelemetryTypeMap.get(attributeScope)"
+                *ngIf="!isClientSideTelemetryTypeMap.get(attributeScope) || attributeScope === latestTelemetryTypes.LATEST_TELEMETRY"
                 [disabled]="isLoading$ | async"
                 (click)="addAttribute($event)"
                 matTooltip="{{ 'action.add' | translate }}"
diff --git a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
index e9d67a3fdd..0533045a42 100644
--- a/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
+++ b/ui-ngx/src/app/modules/home/components/attribute/attribute-table.component.ts
@@ -313,7 +313,7 @@ export class AttributeTableComponent extends PageComponent implements AfterViewI
       panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
       data: {
         entityId: this.entityIdValue,
-        attributeScope: this.attributeScope as AttributeScope
+        attributeScope: this.attributeScope
       }
     }).afterClosed().subscribe(
       (res) => {
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 0f96a5f1dc..52ff1d98d5 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -718,7 +718,8 @@
         "no-attributes-text": "No attributes found",
         "no-telemetry-text": "No telemetry found",
         "copy-key": "Copy key",
-        "copy-value": "Copy value"
+        "copy-value": "Copy value",
+        "add-telemetry": "Add telemetry"
     },
     "api-usage": {
         "api-features": "API features",