From ed6262ba9f4d48aeae1c82c0c9fad0a9fd1f9482 Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets <dskarzhynets@thingsboard.io>
Date: Mon, 3 Mar 2025 12:04:51 +0200
Subject: [PATCH] Save attributes strategies: fix UI bugs

---
 .../action/advanced-processing-setting.component.html  |  4 ++--
 .../action/advanced-processing-setting.component.ts    | 10 +++++-----
 .../rule-node/action/attributes-config.component.html  |  2 +-
 .../rule-node/action/attributes-config.model.ts        |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-processing-setting.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-processing-setting.component.html
index 02d8f7be8f..02965fe535 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-processing-setting.component.html
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-processing-setting.component.html
@@ -25,8 +25,8 @@
     formControlName="timeseries"
     title="{{ 'rule-node-config.save-time-series.time-series' | translate }}"
   ></tb-advanced-processing-setting-row>
-  <tb-advanced-processing-setting-row *ngIf="attribute"
-    formControlName="attribute"
+  <tb-advanced-processing-setting-row *ngIf="attributes"
+    formControlName="attributes"
     title="{{ 'rule-node-config.save-attribute.attribute' | translate }}"
   ></tb-advanced-processing-setting-row>
   <tb-advanced-processing-setting-row *ngIf="latest"
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-processing-setting.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-processing-setting.component.ts
index 6d64d7d97f..4946de986a 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-processing-setting.component.ts
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/advanced-processing-setting.component.ts
@@ -50,7 +50,7 @@ export class AdvancedProcessingSettingComponent implements OnInit, ControlValueA
 
   @Input()
   @coerceBoolean()
-  attribute = false;
+  attributes = false;
 
   @Input()
   @coerceBoolean()
@@ -77,13 +77,13 @@ export class AdvancedProcessingSettingComponent implements OnInit, ControlValueA
     if (this.timeseries) {
       this.processingForm.addControl('timeseries', this.fb.control(null, []));
     }
-    if (this.attribute) {
-      this.processingForm.addControl('attribute', this.fb.control(null, []));
+    if (this.attributes) {
+      this.processingForm.addControl('attributes', this.fb.control(null, []));
     }
-    if (this.attribute) {
+    if (this.latest) {
       this.processingForm.addControl('latest', this.fb.control(null, []));
     }
-    if (this.attribute) {
+    if (this.webSockets) {
       this.processingForm.addControl('webSockets', this.fb.control(null, []));
     }
     if (this.calculatedFields) {
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.html
index 766cdde009..0de3f8020f 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.component.html
@@ -53,7 +53,7 @@
       <tb-advanced-processing-settings
         class="mb-4"
         formControlName="advanced"
-        attribute webSockets calculatedFields
+        attributes webSockets calculatedFields
       ></tb-advanced-processing-settings>
     }
   </div>
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.model.ts b/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.model.ts
index 441fe9d816..1f24b69116 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.model.ts
+++ b/ui-ngx/src/app/modules/home/components/rule-node/action/attributes-config.model.ts
@@ -42,7 +42,7 @@ export interface AttributeDeduplicateProcessingStrategy extends BasicProcessingS
 }
 
 export interface AttributeAdvancedProcessingStrategy extends BasicProcessingSettings {
-  attribute: AttributeAdvancedProcessingConfig;
+  attributes: AttributeAdvancedProcessingConfig;
   webSockets: AttributeAdvancedProcessingConfig;
   calculatedFields: AttributeAdvancedProcessingConfig;
 }
@@ -54,7 +54,7 @@ export const defaultAdvancedProcessingConfig: AttributeAdvancedProcessingConfig
 }
 
 export const defaultAttributeAdvancedProcessingStrategy: Omit<AttributeAdvancedProcessingStrategy, 'type'> = {
-  attribute: defaultAdvancedProcessingConfig,
+  attributes: defaultAdvancedProcessingConfig,
   webSockets: defaultAdvancedProcessingConfig,
   calculatedFields: defaultAdvancedProcessingConfig,
 }