From 7a0c2b7763e7645dab4b34e9c0c28c6ad08740c7 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Thu, 15 May 2025 17:12:17 +0300
Subject: [PATCH] UI: Add to CF - Use message timestamp

---
 .../calculated-field-dialog.component.html    | 13 ++++++++---
 .../calculated-field-dialog.component.scss    |  2 +-
 .../calculated-field-dialog.component.ts      | 22 ++++++++++++++++++-
 .../shared/models/calculated-field.models.ts  | 10 +++++++++
 .../assets/locale/locale.constant-en_US.json  |  4 +++-
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
index 8e9baa6f90..60f33ff005 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html
@@ -160,8 +160,8 @@
             }
           </div>
           @if (fieldFormGroup.get('type').value === CalculatedFieldType.SIMPLE) {
-            <div class="flex items-center gap-3">
-              <mat-form-field class="flex-1" appearance="outline">
+            <div class="flex items-start gap-3">
+              <mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic">
                 <mat-label>
                   {{ (outputFormGroup.get('type').value === OutputType.Timeseries
                     ? 'calculated-fields.timeseries-key'
@@ -181,7 +181,7 @@
                   </mat-error>
                 }
               </mat-form-field>
-              <mat-form-field class="flex-1" appearance="outline">
+              <mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic">
                 <mat-label>{{ 'calculated-fields.decimals-by-default' | translate }}</mat-label>
                 <input matInput type="number" formControlName="decimalsByDefault">
                 @if (outputFormGroup.get('decimalsByDefault').errors && outputFormGroup.get('decimalsByDefault').touched) {
@@ -189,6 +189,13 @@
                 }
               </mat-form-field>
             </div>
+            <div class="tb-form-row" [formGroup]="configFormGroup" *ngIf="outputFormGroup.get('type').value === OutputType.Timeseries">
+              <mat-slide-toggle class="mat-slide" formControlName="preserveMsgTs">
+                <div tb-hint-tooltip-icon="{{ 'calculated-fields.hint.use-message-timestamp' | translate }}" translate>
+                  calculated-fields.use-message-timestamp
+                </div>
+              </mat-slide-toggle>
+            </div>
           }
         </div>
       </ng-container>
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss
index 8bc422eed1..efcd62efd4 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.scss
@@ -45,7 +45,7 @@
       &-key {
         color: #c24c1a;
       }
-      &-time-window, &-values, &-func, &-value, &-ts {
+      &-time-window, &-values, &-func, &-value, &-ts, &-msgTs {
         color: #7214D0;
       }
       &-start-ts, &-end-ts {
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
index 52051aa6f7..4aa4eca425 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
@@ -77,6 +77,7 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
         type: [OutputType.Timeseries],
         decimalsByDefault: [null as number, [Validators.min(0), Validators.max(15), Validators.pattern(digitsRegex)]],
       }),
+      preserveMsgTs: [false]
     }),
   });
 
@@ -204,7 +205,20 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
   }
 
   private toggleScopeByOutputType(type: OutputType): void {
-    this.outputFormGroup.get('scope')[type === OutputType.Attribute? 'enable' : 'disable']({emitEvent: false});
+    if (type === OutputType.Attribute) {
+      this.outputFormGroup.get('scope').enable({emitEvent: false});
+    } else {
+      this.outputFormGroup.get('scope').disable({emitEvent: false});
+    }
+    if (this.fieldFormGroup.get('type').value === CalculatedFieldType.SIMPLE) {
+      if (type === OutputType.Attribute) {
+        this.configFormGroup.get('preserveMsgTs').disable({emitEvent: false});
+      } else {
+        this.configFormGroup.get('preserveMsgTs').enable({emitEvent: false});
+      }
+    } else {
+      this.configFormGroup.get('preserveMsgTs').disable({emitEvent: false});
+    }
   }
 
   private toggleKeyByCalculatedFieldType(type: CalculatedFieldType): void {
@@ -212,8 +226,14 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
       this.outputFormGroup.get('name').enable({emitEvent: false});
       this.configFormGroup.get('expressionSIMPLE').enable({emitEvent: false});
       this.configFormGroup.get('expressionSCRIPT').disable({emitEvent: false});
+      if (this.outputFormGroup.get('type').value === OutputType.Attribute) {
+        this.configFormGroup.get('preserveMsgTs').disable({emitEvent: false});
+      } else {
+        this.configFormGroup.get('preserveMsgTs').enable({emitEvent: false});
+      }
     } else {
       this.outputFormGroup.get('name').disable({emitEvent: false});
+      this.configFormGroup.get('preserveMsgTs').disable({emitEvent: false});
       this.configFormGroup.get('expressionSIMPLE').disable({emitEvent: false});
       this.configFormGroup.get('expressionSCRIPT').enable({emitEvent: false});
     }
diff --git a/ui-ngx/src/app/shared/models/calculated-field.models.ts b/ui-ngx/src/app/shared/models/calculated-field.models.ts
index 9cc9a62da8..6fade1d193 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -525,6 +525,11 @@ export const getCalculatedFieldArgumentsEditorCompleter = (argumentsObj: Record<
           type: '{ [key: string]: object }',
           description: 'Calculated field context arguments.',
           children: {}
+        },
+        msgTs: {
+          meta: 'constant',
+          type: 'number',
+          description: 'Timestamp (ms) of the telemetry message that triggered the calculated field execution.'
         }
       }
     }
@@ -576,6 +581,11 @@ const calculatedFieldArgumentsContextValueHighlightRules: AceHighlightRules = {
       regex: /args/,
       next: 'calculatedFieldCtxArgs'
     },
+    {
+      token: 'tb.calculated-field-msgTs',
+      regex: /msgTs/,
+      next: 'no_regex'
+    },
     endGroupHighlightRule
   ]
 }
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 7484ba5d56..c22714df20 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -1062,6 +1062,7 @@
         "delete-multiple-title": "Are you sure you want to delete { count, plural, =1 {1 calculated field} other {# calculated fields} }?",
         "delete-multiple-text": "Be careful, after the confirmation all selected calculated fields will be removed and all related data will become unrecoverable.",
         "test-with-this-message": "Test with this message",
+        "use-message-timestamp": "Use message timestamp",
         "hint": {
             "arguments-simple-with-rolling": "Simple type calculated field should not contain keys with time series rolling type.",
             "arguments-empty": "Arguments should not be empty.",
@@ -1077,7 +1078,8 @@
             "max-args": "Maximum number of arguments reached.",
             "decimals-range": "Decimals by default should be a number between 0 and 15.",
             "expression": "Default expression demonstrates how to transform a temperature from Fahrenheit to Celsius.",
-            "arguments-entity-not-found": "Argument target entity not found."
+            "arguments-entity-not-found": "Argument target entity not found.",
+            "use-message-timestamp": "If enabled, the calculated value will be persisted using the timestamp of the telemetry that triggered the calculation, instead of the server time."
         }
     },
     "confirm-on-exit": {