From 4bd0833eed0df0c694e99abb39ded6d22cc8922e Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 14 Feb 2025 18:39:45 +0200
Subject: [PATCH 1/4] Added Calculated field arguments autocomplete

---
 .../calculated-fields-table-config.ts         | 29 +++++--
 .../calculated-field-dialog.component.html    |  1 +
 .../calculated-field-dialog.component.ts      |  6 ++
 ...ed-field-script-test-dialog.component.html |  1 +
 .../shared/models/calculated-field.models.ts  | 79 +++++++++++++++++++
 5 files changed, 110 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
index e7ad697262..8f967b68ce 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
@@ -36,9 +36,14 @@ import { EntityDebugSettingsPanelComponent } from '@home/components/entity/debug
 import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
 import { catchError, filter, switchMap, tap } from 'rxjs/operators';
 import {
+  ArgumentType,
   CalculatedField,
+  CalculatedFieldArgument,
+  CalculatedFieldEventArguments,
   CalculatedFieldDebugDialogData,
   CalculatedFieldDialogData,
+  CalculatedFieldRollingValueArgumentAutocomplete,
+  CalculatedFieldSingleValueArgumentAutocomplete,
   CalculatedFieldTestScriptDialogData,
 } from '@shared/models/calculated-field.models';
 import {
@@ -48,6 +53,7 @@ import {
 } from './components/public-api';
 import { ImportExportService } from '@shared/import-export/import-export.service';
 import { isObject } from '@core/utils';
+import { TbEditorCompleter } from '@shared/models/ace/completion.models';
 
 export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedField, PageLink> {
 
@@ -58,7 +64,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
   readonly tenantId = getCurrentAuthUser(this.store).tenantId;
   additionalDebugActionConfig = {
     title: this.translate.instant('calculated-fields.see-debug-events'),
-    action: (calculatedField: CalculatedField) => this.openDebugDialog.call(this, calculatedField),
+    action: (calculatedField: CalculatedField) => this.openDebugEventsDialog.call(this, calculatedField),
   };
 
   constructor(private calculatedFieldsService: CalculatedFieldsService,
@@ -122,7 +128,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         name: this.translate.instant('entity-view.events'),
         icon: 'history',
         isEnabled: () => true,
-        onAction: (_, entity) => this.openDebugDialog(entity),
+        onAction: (_, entity) => this.openDebugEventsDialog(entity),
       },
       {
         name: '',
@@ -149,7 +155,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
     const { debugSettings = {}, id } = calculatedField;
     const additionalActionConfig = {
       ...this.additionalDebugActionConfig,
-      action: () => this.openDebugDialog(calculatedField)
+      action: () => this.openDebugEventsDialog(calculatedField)
     };
     const { viewContainerRef } = this.getTable();
     if ($event) {
@@ -211,14 +217,15 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         entityName: this.entityName,
         additionalDebugActionConfig: this.additionalDebugActionConfig,
         getTestScriptDialogFn: this.getTestScriptDialog.bind(this),
-        isDirty
+        isDirty,
+        getArgumentsEditorCompleterFn: this.getArgumentsEditorCompleter,
       },
       enterAnimationDuration: isDirty ? 0 : null,
     })
       .afterClosed();
   }
 
-  private openDebugDialog(calculatedField: CalculatedField): void {
+  private openDebugEventsDialog(calculatedField: CalculatedField): void {
     this.dialog.open<CalculatedFieldDebugDialogComponent, CalculatedFieldDebugDialogData, null>(CalculatedFieldDebugDialogComponent, {
       disableClose: true,
       panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
@@ -267,7 +274,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
     ).subscribe(() => this.updateData());
   }
 
-  private getTestScriptDialog(calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>, openCalculatedFieldEdit = true): Observable<string> {
+  private getTestScriptDialog(calculatedField: CalculatedField, argumentsObj?: CalculatedFieldEventArguments, openCalculatedFieldEdit = true): Observable<string> {
     const resultArguments = Object.keys(calculatedField.configuration.arguments).reduce((acc, key) => {
       acc[key] = isObject(argumentsObj) && argumentsObj.hasOwnProperty(key) ? argumentsObj[key] : '';
       return acc;
@@ -279,6 +286,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         data: {
           arguments: resultArguments,
           expression: calculatedField.configuration.expression,
+          argumentsEditorCompleter: this.getArgumentsEditorCompleter(calculatedField.configuration.arguments),
           openCalculatedFieldEdit
         }
       }).afterClosed()
@@ -291,4 +299,13 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         }),
       );
   }
+
+  private getArgumentsEditorCompleter(argumentsObj: Record<string, CalculatedFieldArgument>): TbEditorCompleter {
+    return new TbEditorCompleter(Object.keys(argumentsObj).reduce((acc, key) => {
+      acc[key] = argumentsObj[key].refEntityKey.type === ArgumentType.Rolling
+        ? CalculatedFieldRollingValueArgumentAutocomplete
+        : CalculatedFieldSingleValueArgumentAutocomplete;
+      return acc;
+    }, {}))
+  }
 }
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 2f707c0a2f..f1e6905aab 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
@@ -99,6 +99,7 @@
               [functionArgs]="functionArgs$ | async"
               [disableUndefinedCheck]="true"
               [scriptLanguage]="ScriptLanguage.TBEL"
+              [editorCompleter]="argumentsEditorCompleter$ | async"
               helpId="calculated-field/expression_fn"
             >
               <button toolbarSuffixButton
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 31f07a1c0d..99ca294641 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
@@ -66,6 +66,12 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
       map(argumentsObj => Object.keys(argumentsObj))
     );
 
+  argumentsEditorCompleter$ = this.configFormGroup.get('arguments').valueChanges
+    .pipe(
+      startWith(this.data.value?.configuration?.arguments ?? {}),
+      map(argumentsObj => this.data.getArgumentsEditorCompleterFn(argumentsObj))
+    );
+
   additionalDebugActionConfig = this.data.value?.id ? {
     ...this.data.additionalDebugActionConfig,
     action: () => this.data.additionalDebugActionConfig.action({ id: this.data.value.id, ...this.fromGroupValue }),
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
index 3d3fe79e4b..3f35ecbc0c 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.html
@@ -40,6 +40,7 @@
               [disableUndefinedCheck]="true"
               [fillHeight]="true"
               [scriptLanguage]="ScriptLanguage.TBEL"
+              [editorCompleter]="data.argumentsEditorCompleter"
               resultType="object"
               helpId="calculated-field/test-expression_fn"
             />
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 9e37523cab..e9ae6f08b8 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -27,6 +27,7 @@ import { AttributeScope } from '@shared/models/telemetry/telemetry.models';
 import { EntityType } from '@shared/models/entity-type.models';
 import { AliasFilterType } from '@shared/models/alias.models';
 import { Observable } from 'rxjs';
+import { TbEditorCompleter } from '@shared/models/ace/completion.models';
 
 export interface CalculatedField extends Omit<BaseData<CalculatedFieldId>, 'label'>, HasVersion, HasTenantId, ExportableEntity<CalculatedFieldId> {
   debugSettings?: EntityDebugSettings;
@@ -129,6 +130,8 @@ export interface CalculatedFieldArgumentValue extends CalculatedFieldArgument {
 
 export type CalculatedFieldTestScriptFn = (calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>, closeAllOnSave?: boolean) => Observable<string>;
 
+export type CalculatedFieldArgumentsEditorCompleterFn = (argumentsObj: Record<string, CalculatedFieldArgument>) => TbEditorCompleter;
+
 export interface CalculatedFieldDialogData {
   value?: CalculatedField;
   buttonTitle: string;
@@ -139,6 +142,7 @@ export interface CalculatedFieldDialogData {
   additionalDebugActionConfig: AdditionalDebugActionConfig<(calculatedField: CalculatedField) => void>;
   getTestScriptDialogFn: CalculatedFieldTestScriptFn;
   isDirty?: boolean;
+  getArgumentsEditorCompleterFn: CalculatedFieldArgumentsEditorCompleterFn;
 }
 
 export interface CalculatedFieldDebugDialogData {
@@ -153,6 +157,7 @@ export interface CalculatedFieldTestScriptInputParams {
 }
 
 export interface CalculatedFieldTestScriptDialogData extends CalculatedFieldTestScriptInputParams {
+  argumentsEditorCompleter: TbEditorCompleter
   openCalculatedFieldEdit?: boolean;
 }
 
@@ -186,3 +191,77 @@ export const getCalculatedFieldCurrentEntityFilter = (entityName: string, entity
       };
   }
 }
+
+export interface CalculatedFieldAttributeArgumentValue<ValueType = unknown> {
+  ts: number;
+  value: ValueType;
+}
+
+export interface CalculatedFieldLatestTelemetryArgumentValue<ValueType = unknown> {
+  ts: number;
+  value: ValueType;
+}
+
+export interface CalculatedFieldRollingTelemetryArgumentValue<ValueType = unknown> {
+  timewindow: { startTs: number; endTs: number; limit: number };
+  values: CalculatedFieldSingleArgumentValue<ValueType>[];
+}
+
+export type CalculatedFieldSingleArgumentValue<ValueType = unknown> = CalculatedFieldAttributeArgumentValue<ValueType> & CalculatedFieldLatestTelemetryArgumentValue<ValueType>;
+
+export type CalculatedFieldArgumentEventValue<ValueType = unknown> = CalculatedFieldAttributeArgumentValue<ValueType> | CalculatedFieldLatestTelemetryArgumentValue<ValueType> | CalculatedFieldRollingTelemetryArgumentValue<ValueType>;
+
+export type CalculatedFieldEventArguments<ValueType = unknown> = Record<string, CalculatedFieldArgumentEventValue<ValueType>>;
+
+export const CalculatedFieldSingleValueArgumentAutocomplete = {
+  meta: 'object',
+  type: '{ ts: number; value: any; }',
+  description: 'Calculated field single value argument.',
+  children: {
+    ts: {
+      meta: 'number',
+      type: 'number',
+      description: 'Time stamp',
+    },
+    value: {
+      meta: 'any',
+      type: 'any',
+      description: 'Value',
+    }
+  },
+};
+
+export const CalculatedFieldRollingValueArgumentAutocomplete = {
+  meta: 'object',
+  type: '{ values: { ts: number; value: any; }[]; timewindow: { startTs: number; endTs: number; limit: number } }; }',
+  description: 'Calculated field rolling value argument.',
+  children: {
+    values: {
+      meta: 'array',
+      type: '{ ts: number; value: any; }[]',
+      description: 'Values array',
+    },
+    timewindow: {
+      meta: 'object',
+      type: '{ startTs: number; endTs: number; limit: number }',
+      description: 'Time window configuration',
+      children: {
+        startTs: {
+          meta: 'number',
+          type: 'number',
+          description: 'Start time stamp',
+        },
+        endTs: {
+          meta: 'number',
+          type: 'number',
+          description: 'End time stamp',
+        },
+        limit: {
+          meta: 'number',
+          type: 'number',
+          description: 'Limit',
+        }
+      }
+    }
+  },
+};

From 0004cdeaf9b5222ef95e53cff4f9f7dea806090e Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 14 Feb 2025 18:50:34 +0200
Subject: [PATCH 2/4] divided ts and attr completers

---
 .../calculated-fields-table-config.ts         | 17 ++++++++++----
 .../shared/components/js-func.component.ts    |  3 +++
 .../shared/models/calculated-field.models.ts  | 22 +++++++++++++++++--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
index 8f967b68ce..1125406484 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
@@ -43,8 +43,9 @@ import {
   CalculatedFieldDebugDialogData,
   CalculatedFieldDialogData,
   CalculatedFieldRollingValueArgumentAutocomplete,
-  CalculatedFieldSingleValueArgumentAutocomplete,
   CalculatedFieldTestScriptDialogData,
+  CalculatedFieldAttributeValueArgumentAutocomplete,
+  CalculatedFieldLatestTelemetryArgumentAutocomplete,
 } from '@shared/models/calculated-field.models';
 import {
   CalculatedFieldDebugDialogComponent,
@@ -302,9 +303,17 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
 
   private getArgumentsEditorCompleter(argumentsObj: Record<string, CalculatedFieldArgument>): TbEditorCompleter {
     return new TbEditorCompleter(Object.keys(argumentsObj).reduce((acc, key) => {
-      acc[key] = argumentsObj[key].refEntityKey.type === ArgumentType.Rolling
-        ? CalculatedFieldRollingValueArgumentAutocomplete
-        : CalculatedFieldSingleValueArgumentAutocomplete;
+      switch (argumentsObj[key].refEntityKey.type) {
+        case ArgumentType.Attribute:
+          acc[key] = CalculatedFieldAttributeValueArgumentAutocomplete;
+          break;
+        case ArgumentType.LatestTelemetry:
+          acc[key] = CalculatedFieldLatestTelemetryArgumentAutocomplete;
+          break;
+        case ArgumentType.Rolling:
+          acc[key] = CalculatedFieldRollingValueArgumentAutocomplete;
+          break;
+      }
       return acc;
     }, {}))
   }
diff --git a/ui-ngx/src/app/shared/components/js-func.component.ts b/ui-ngx/src/app/shared/components/js-func.component.ts
index 57c15a5484..3f5417c2d0 100644
--- a/ui-ngx/src/app/shared/components/js-func.component.ts
+++ b/ui-ngx/src/app/shared/components/js-func.component.ts
@@ -184,6 +184,9 @@ export class JsFuncComponent implements OnInit, OnChanges, OnDestroy, ControlVal
       this.updateFunctionArgsString();
       this.updateFunctionLabel();
     }
+    if (changes.editorCompleter) {
+      this.updateCompleters();
+    }
   }
 
   ngOnInit(): void {
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 e9ae6f08b8..4abc2e8a9e 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -213,10 +213,28 @@ export type CalculatedFieldArgumentEventValue<ValueType = unknown> = CalculatedF
 
 export type CalculatedFieldEventArguments<ValueType = unknown> = Record<string, CalculatedFieldArgumentEventValue<ValueType>>;
 
-export const CalculatedFieldSingleValueArgumentAutocomplete = {
+export const CalculatedFieldLatestTelemetryArgumentAutocomplete = {
   meta: 'object',
   type: '{ ts: number; value: any; }',
-  description: 'Calculated field single value argument.',
+  description: 'Calculated field latest telemetry value argument.',
+  children: {
+    ts: {
+      meta: 'number',
+      type: 'number',
+      description: 'Time stamp',
+    },
+    value: {
+      meta: 'any',
+      type: 'any',
+      description: 'Value',
+    }
+  },
+};
+
+export const CalculatedFieldAttributeValueArgumentAutocomplete = {
+  meta: 'object',
+  type: '{ ts: number; value: any; }',
+  description: 'Calculated field attribute value argument.',
   children: {
     ts: {
       meta: 'number',

From 3bc68e8e21d6275b713709d5390b1662d59ed9a7 Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 14 Feb 2025 19:02:48 +0200
Subject: [PATCH 3/4] getCalculatedFieldArgumentsEditorCompleter to models

---
 .../calculated-fields-table-config.ts         | 26 ++-----------------
 .../calculated-field-dialog.component.ts      |  3 ++-
 .../shared/models/calculated-field.models.ts  | 20 +++++++++++---
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
index 1125406484..3aa5bb5466 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
@@ -36,16 +36,12 @@ import { EntityDebugSettingsPanelComponent } from '@home/components/entity/debug
 import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
 import { catchError, filter, switchMap, tap } from 'rxjs/operators';
 import {
-  ArgumentType,
   CalculatedField,
-  CalculatedFieldArgument,
   CalculatedFieldEventArguments,
   CalculatedFieldDebugDialogData,
   CalculatedFieldDialogData,
-  CalculatedFieldRollingValueArgumentAutocomplete,
   CalculatedFieldTestScriptDialogData,
-  CalculatedFieldAttributeValueArgumentAutocomplete,
-  CalculatedFieldLatestTelemetryArgumentAutocomplete,
+  getCalculatedFieldArgumentsEditorCompleter,
 } from '@shared/models/calculated-field.models';
 import {
   CalculatedFieldDebugDialogComponent,
@@ -219,7 +215,6 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         additionalDebugActionConfig: this.additionalDebugActionConfig,
         getTestScriptDialogFn: this.getTestScriptDialog.bind(this),
         isDirty,
-        getArgumentsEditorCompleterFn: this.getArgumentsEditorCompleter,
       },
       enterAnimationDuration: isDirty ? 0 : null,
     })
@@ -287,7 +282,7 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         data: {
           arguments: resultArguments,
           expression: calculatedField.configuration.expression,
-          argumentsEditorCompleter: this.getArgumentsEditorCompleter(calculatedField.configuration.arguments),
+          argumentsEditorCompleter: getCalculatedFieldArgumentsEditorCompleter(calculatedField.configuration.arguments),
           openCalculatedFieldEdit
         }
       }).afterClosed()
@@ -300,21 +295,4 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
         }),
       );
   }
-
-  private getArgumentsEditorCompleter(argumentsObj: Record<string, CalculatedFieldArgument>): TbEditorCompleter {
-    return new TbEditorCompleter(Object.keys(argumentsObj).reduce((acc, key) => {
-      switch (argumentsObj[key].refEntityKey.type) {
-        case ArgumentType.Attribute:
-          acc[key] = CalculatedFieldAttributeValueArgumentAutocomplete;
-          break;
-        case ArgumentType.LatestTelemetry:
-          acc[key] = CalculatedFieldLatestTelemetryArgumentAutocomplete;
-          break;
-        case ArgumentType.Rolling:
-          acc[key] = CalculatedFieldRollingValueArgumentAutocomplete;
-          break;
-      }
-      return acc;
-    }, {}))
-  }
 }
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 99ca294641..a0e439029d 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
@@ -27,6 +27,7 @@ import {
   CalculatedFieldDialogData,
   CalculatedFieldType,
   CalculatedFieldTypeTranslations,
+  getCalculatedFieldArgumentsEditorCompleter,
   OutputType,
   OutputTypeTranslations
 } from '@shared/models/calculated-field.models';
@@ -69,7 +70,7 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
   argumentsEditorCompleter$ = this.configFormGroup.get('arguments').valueChanges
     .pipe(
       startWith(this.data.value?.configuration?.arguments ?? {}),
-      map(argumentsObj => this.data.getArgumentsEditorCompleterFn(argumentsObj))
+      map(argumentsObj => getCalculatedFieldArgumentsEditorCompleter(argumentsObj))
     );
 
   additionalDebugActionConfig = this.data.value?.id ? {
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 4abc2e8a9e..a718b236bf 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -130,8 +130,6 @@ export interface CalculatedFieldArgumentValue extends CalculatedFieldArgument {
 
 export type CalculatedFieldTestScriptFn = (calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>, closeAllOnSave?: boolean) => Observable<string>;
 
-export type CalculatedFieldArgumentsEditorCompleterFn = (argumentsObj: Record<string, CalculatedFieldArgument>) => TbEditorCompleter;
-
 export interface CalculatedFieldDialogData {
   value?: CalculatedField;
   buttonTitle: string;
@@ -142,7 +140,6 @@ export interface CalculatedFieldDialogData {
   additionalDebugActionConfig: AdditionalDebugActionConfig<(calculatedField: CalculatedField) => void>;
   getTestScriptDialogFn: CalculatedFieldTestScriptFn;
   isDirty?: boolean;
-  getArgumentsEditorCompleterFn: CalculatedFieldArgumentsEditorCompleterFn;
 }
 
 export interface CalculatedFieldDebugDialogData {
@@ -283,3 +280,20 @@ export const CalculatedFieldRollingValueArgumentAutocomplete = {
     }
   },
 };
+
+export const getCalculatedFieldArgumentsEditorCompleter = (argumentsObj: Record<string, CalculatedFieldArgument>): TbEditorCompleter => {
+  return new TbEditorCompleter(Object.keys(argumentsObj).reduce((acc, key) => {
+    switch (argumentsObj[key].refEntityKey.type) {
+      case ArgumentType.Attribute:
+        acc[key] = CalculatedFieldAttributeValueArgumentAutocomplete;
+        break;
+      case ArgumentType.LatestTelemetry:
+        acc[key] = CalculatedFieldLatestTelemetryArgumentAutocomplete;
+        break;
+      case ArgumentType.Rolling:
+        acc[key] = CalculatedFieldRollingValueArgumentAutocomplete;
+        break;
+    }
+    return acc;
+  }, {}))
+}

From 4bd45fe9a9a82d2599171157bddaeeee491f4182 Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Fri, 14 Feb 2025 19:03:22 +0200
Subject: [PATCH 4/4] refactoring

---
 .../calculated-fields/calculated-fields-table-config.ts          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
index 3aa5bb5466..e1aa7c2ee5 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
@@ -50,7 +50,6 @@ import {
 } from './components/public-api';
 import { ImportExportService } from '@shared/import-export/import-export.service';
 import { isObject } from '@core/utils';
-import { TbEditorCompleter } from '@shared/models/ace/completion.models';
 
 export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedField, PageLink> {