UI: Bug fixes

ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html

@@ -58,6 +58,7 @@
             <tb-entity-type-select appearance="outline"
                                    subscriptSizing="dynamic"
                                    showLabel
+                                   required
                                    label="{{ 'alarm-rule.target-entity-type' | translate }}"
                                    [filterAllowedEntityTypes]="false"
                                    [allowedEntityTypes]="alarmRuleEntityTypeList"
@@ -83,12 +84,14 @@
                                                [entityId]="data.entityId || fieldFormGroup.get('entityId').value"
                                                [tenantId]="data.tenantId"
                                                [ownerId]="data.ownerId"
+                                               [watchKeyChange]="true"
+                                               [disabledAddButton]="!fieldFormGroup.get('entityId.id').value"
                                                [entityName]="data.entityName"/>
         </div>
         <div class="tb-form-panel">
           <div class="tb-form-panel-title">{{ 'alarm-rule.create-conditions' | translate }}</div>
           <div class="flex flex-1 flex-col">
-            <tb-create-cf-alarm-rules formControlName="createRules" [arguments]="arguments">
+            <tb-create-cf-alarm-rules formControlName="createRules" [arguments]="arguments" [value]="data.value">
             </tb-create-cf-alarm-rules>
           </div>
         </div>
@@ -97,7 +100,7 @@
           <div class="flex flex-row items-center justify-start gap-2 pb-2"
                [class.!hidden]="!configFormGroup.get('clearRule').value">
             <div class="clear-alarm-rule flex flex-1 flex-row">
-              <tb-cf-alarm-rule formControlName="clearRule" class="flex-1" [arguments]="arguments">
+              <tb-cf-alarm-rule formControlName="clearRule" class="flex-1" [arguments]="arguments" [value]="data.value" isClearCondition>
               </tb-cf-alarm-rule>
             </div>
             <button mat-icon-button
@@ -117,9 +120,7 @@
             <button mat-stroked-button color="primary"
                     type="button"
                     (click)="addClearAlarmRule()"
-                    matTooltip="{{ 'alarm-rule.add-clear-alarm-rule' | translate }}"
                     matTooltipPosition="above">
-              <mat-icon class="button-icon">add_circle_outline</mat-icon>
               {{ 'alarm-rule.add-clear-alarm-rule' | translate }}
             </button>
           </div>

ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-filter-config.component.ts

@@ -90,7 +90,7 @@ export class AlarmRuleFilterConfigComponent implements OnInit, ControlValueAcces
 
   panelMode = false;
 
-  buttonDisplayValue = this.translate.instant('alarm-rule.alarm-rule-filter');
+  buttonDisplayValue = this.translate.instant('alarm-rule.alarm-rule-filter-title');
 
   alarmRuleFilterConfigForm: FormGroup;
 
@@ -281,6 +281,9 @@ export class AlarmRuleFilterConfigComponent implements OnInit, ControlValueAcces
       if (this.alarmRuleFilterConfig?.name?.length) {
         filterTextParts.push(this.alarmRuleFilterConfig.name.map((type) => this.customTranslate(type)).join(', '));
       }
+      if (this.alarmRuleFilterConfig?.entityType) {
+        filterTextParts.push(this.translate.instant( entityTypeTranslations.get(this.alarmRuleFilterConfig.entityType).type));
+      }
       if (!filterTextParts.length) {
         this.buttonDisplayValue = this.translate.instant('alarm-rule.alarm-rule-filter-title');
       } else {

ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-table-header.component.ts

@@ -18,7 +18,6 @@ import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { EntityTableHeaderComponent } from '../../components/entity/entity-table-header.component';
-import { AlarmFilterConfig } from '@shared/models/query/query.models';
 import { CalculatedFieldAlarmRule, CalculatedFieldsQuery } from "@shared/models/calculated-field.models";
 import { AlarmRulesTableConfig } from "@home/components/alarm-rules/alarm-rules-table-config";
 

ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules-table-config.ts

@@ -26,7 +26,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { Direction } from '@shared/models/page/sort-order';
 import { MatDialog } from '@angular/material/dialog';
 import { PageLink } from '@shared/models/page/page-link';
-import { Observable, of } from 'rxjs';
+import { EMPTY, Observable, of } from 'rxjs';
 import { PageData } from '@shared/models/page/page-data';
 import { EntityId } from '@shared/models/id/entity-id';
 import { Store } from '@ngrx/store';
@@ -59,6 +59,7 @@ import { AlarmSeverity, alarmSeverityTranslations } from "@shared/models/alarm.m
 import { UtilsService } from "@core/services/utils.service";
 import { deepClone, getEntityDetailsPageURL } from "@core/utils";
 import { AlarmRuleTableHeaderComponent } from "@home/components/alarm-rules/alarm-rule-table-header.component";
+import { ActionNotificationShow } from "@core/notification/notification.actions";
 
 export class AlarmRulesTableConfig extends EntityTableConfig<any> {
 
@@ -223,7 +224,10 @@ export class AlarmRulesTableConfig extends EntityTableConfig<any> {
 
   private copyCalculatedField(calculatedField: CalculatedField, isDirty = false): void {
     const copyCalculatedAlarmRule = deepClone(calculatedField);
-    copyCalculatedAlarmRule.entityId = null;
+    if (this.pageMode) {
+      copyCalculatedAlarmRule.entityId = null;
+    }
+    delete copyCalculatedAlarmRule.id;
     this.getCalculatedAlarmDialog(copyCalculatedAlarmRule, 'action.apply', isDirty)
       .subscribe((res) => {
         if (res) {
@@ -277,6 +281,19 @@ export class AlarmRulesTableConfig extends EntityTableConfig<any> {
     this.importExportService.openCalculatedFieldImportDialog()
       .pipe(
         filter(Boolean),
+        switchMap(calculatedField => {
+          if (calculatedField.type !== CalculatedFieldType.ALARM) {
+            this.store.dispatch(new ActionNotificationShow({
+              message: this.translate.instant('alarm-rule.import-invalid-alarm-rule-type'),
+              type: 'error',
+              verticalPosition: 'top',
+              horizontalPosition: 'left',
+              duration: 5000
+            }));
+            return EMPTY;
+          }
+          return of(calculatedField);
+        }),
         switchMap(calculatedField => this.getCalculatedAlarmDialog(this.updateImportedCalculatedField(calculatedField), 'action.add', true)),
         filter(Boolean),
         switchMap(calculatedField => this.calculatedFieldsService.saveCalculatedField(calculatedField)),
@@ -287,15 +304,7 @@ export class AlarmRulesTableConfig extends EntityTableConfig<any> {
   }
 
   private updateImportedCalculatedField(calculatedField: CalculatedField): CalculatedField {
-    if (calculatedField.type === CalculatedFieldType.GEOFENCING) {
-      calculatedField.configuration.zoneGroups = Object.keys(calculatedField.configuration.zoneGroups).reduce((acc, key) => {
-        const arg = calculatedField.configuration.zoneGroups[key];
-        acc[key] = arg.refEntityId?.entityType === ArgumentEntityType.Tenant
-          ? { ...arg, refEntityId: { id: this.tenantId, entityType: ArgumentEntityType.Tenant } }
-          : arg;
-        return acc;
-      }, {});
-    } else {
+    if (calculatedField.type === CalculatedFieldType.ALARM) {
       calculatedField.configuration.arguments = Object.keys(calculatedField.configuration.arguments).reduce((acc, key) => {
         const arg = calculatedField.configuration.arguments[key];
         acc[key] = arg.refEntityId?.entityType === ArgumentEntityType.Tenant

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.html

@@ -67,9 +67,26 @@
                         [helpPopupStyle]="{ width: '1200px' }"
                         helpId="alarm-rule/expression_fn">
               <div toolbarPrefixButton
-                   class="tb-primary-background tbel-script-lang-chip">{{ 'alarm-rule.expression-type.script' | translate }}
+                   class="tb-primary-background tbel-script-lang-chip">{{ 'alarm-rule.tbel' | translate }}
               </div>
+              <button toolbarSuffixButton
+                      mat-icon-button
+                      matTooltip="{{ 'calculated-fields.test-script-function' | translate }}"
+                      matTooltipPosition="above"
+                      class="tb-mat-32"
+                      [disabled]="!argumentsList.length"
+                      (click)="onTestScript()">
+                <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+              </button>
             </tb-js-func>
+            <div>
+              <button mat-button mat-raised-button color="primary"
+                      type="button"
+                      (click)="onTestScript()"
+                      [disabled]="!argumentsList.length">
+                {{ 'calculated-fields.test-script-function' | translate }}
+              </button>
+            </div>
           </div>
         }
       </div>

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition-dialog.component.ts

@@ -14,8 +14,8 @@
 /// limitations under the License.
 ///
 
-import { Component, Inject } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { Component, DestroyRef, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { FormBuilder, Validators } from '@angular/forms';
@@ -28,21 +28,34 @@ import {
   AlarmRuleCondition,
   AlarmRuleConditionType,
   AlarmRuleConditionTypeTranslationMap,
+  alarmRuleDefaultScript,
   AlarmRuleExpressionType
 } from "@shared/models/alarm-rule.models";
 import {
+  ArgumentType,
+  CalculatedField,
   CalculatedFieldArgument,
+  CalculatedFieldEventArguments,
   getCalculatedFieldArgumentsEditorCompleter,
   getCalculatedFieldArgumentsHighlights
 } from "@shared/models/calculated-field.models";
 import { TbEditorCompleter } from "@shared/models/ace/completion.models";
 import { AceHighlightRules } from "@shared/models/ace/ace.models";
 import { ComplexOperation, complexOperationTranslationMap } from "@shared/models/query/query.models";
+import { Observable } from "rxjs";
+import { filter, switchMap, tap } from "rxjs/operators";
+import { isObject } from "@core/utils";
+import {
+  CalculatedFieldScriptTestDialogComponent,
+  CalculatedFieldTestScriptDialogData
+} from "@home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component";
+import { CalculatedFieldsService } from "@core/http/calculated-fields.service";
 
 export interface CfAlarmRuleConditionDialogData {
   readonly: boolean;
   condition: AlarmRuleCondition;
   arguments?: Record<string, CalculatedFieldArgument>;
+  value?: CalculatedField;
 }
 
 @Component({
@@ -106,7 +119,10 @@ export class CfAlarmRuleConditionDialogComponent extends DialogComponent<CfAlarm
               protected router: Router,
               @Inject(MAT_DIALOG_DATA) public data: CfAlarmRuleConditionDialogData,
               public dialogRef: MatDialogRef<CfAlarmRuleConditionDialogComponent, AlarmRuleCondition>,
-              private fb: FormBuilder) {
+              private fb: FormBuilder,
+              private calculatedFieldsService: CalculatedFieldsService,
+              private destroyRef: DestroyRef,
+              private dialog: MatDialog) {
     super(store, router, dialogRef);
 
     this.functionArgs = ['ctx', ...Object.keys(this.data.arguments)];
@@ -117,7 +133,7 @@ export class CfAlarmRuleConditionDialogComponent extends DialogComponent<CfAlarm
     this.conditionFormGroup.patchValue({
       expression: {
         type: this.condition?.expression?.type ?? AlarmRuleExpressionType.SIMPLE,
-        expression: this.condition?.expression?.expression ?? null,
+        expression: this.condition?.expression?.expression ?? alarmRuleDefaultScript,
         filters: this.condition?.expression?.filters ?? [],
         operation: this.condition?.expression?.operation ?? ComplexOperation.AND
       },
@@ -223,4 +239,51 @@ export class CfAlarmRuleConditionDialogComponent extends DialogComponent<CfAlarm
     this.dialogRef.close(this.conditionFormGroup.value as AlarmRuleCondition);
   }
 
+  onTestScript() {
+    this.testScript().subscribe(
+      (expression) => {
+        this.conditionFormGroup.get('expression.expression').setValue(expression);
+        this.conditionFormGroup.get('expression.expression').markAsDirty();
+      })
+  }
+
+  testScript(): Observable<string> {
+    if (this.data.value?.id?.id) {
+      return this.calculatedFieldsService.getLatestCalculatedFieldDebugEvent(this.data.value?.id?.id, {ignoreLoading: true})
+        .pipe(
+          switchMap(event => {
+            const args = event?.arguments ? JSON.parse(event.arguments) : null;
+            return this.getTestScriptDialog(this.arguments, this.conditionFormGroup.get('expression.expression').value, args);
+          }),
+          takeUntilDestroyed(this.destroyRef)
+        )
+    }
+    return this.getTestScriptDialog(this.arguments, this.conditionFormGroup.get('expression.expression').value, null);
+  }
+
+  getTestScriptDialog(argumentsList: Record<string, CalculatedFieldArgument>, expression: string, argumentsObj?: CalculatedFieldEventArguments): Observable<string> {
+    const resultArguments = Object.keys(argumentsList).reduce((acc, key) => {
+      const type = argumentsList[key].refEntityKey.type;
+      acc[key] = isObject(argumentsObj) && argumentsObj.hasOwnProperty(key)
+        ? {...argumentsObj[key], type}
+        : type === ArgumentType.Rolling ? {values: [], type} : {value: '', type, ts: new Date().getTime()};
+      return acc;
+    }, {});
+    return this.dialog.open<CalculatedFieldScriptTestDialogComponent, CalculatedFieldTestScriptDialogData, string>(CalculatedFieldScriptTestDialogComponent,
+      {
+        disableClose: true,
+        panelClass: ['tb-dialog', 'tb-fullscreen-dialog', 'tb-fullscreen-dialog-gt-xs'],
+        data: {
+          arguments: resultArguments,
+          expression: expression,
+          argumentsEditorCompleter: getCalculatedFieldArgumentsEditorCompleter(argumentsList),
+          argumentsHighlightRules: getCalculatedFieldArgumentsHighlights(argumentsList)
+        }
+      }).afterClosed()
+      .pipe(
+        filter(Boolean),
+        tap(expression => expression)
+      );
+  }
+
 }

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition.component.html

@@ -30,7 +30,7 @@
                                    [nowrap]="true"
                                    [specText]="specText"
                                    required
-                                   addFilterPrompt="{{'alarm-rule.enter-alarm-rule-condition-prompt' | translate}}">
+                                   addFilterPrompt="{{ (isClearCondition ? 'alarm-rule.enter-alarm-rule-clear-condition-prompt' :'alarm-rule.enter-alarm-rule-condition-prompt') | translate }}">
         </tb-alarm-rule-filter-text>
         <mat-icon [color]="conditionSet() ? 'primary' : 'warn'" class="tb-mat-20 tb-alarm-rule-schedule-edit-icon">{{ conditionSet() ? 'edit' : 'add' }}</mat-icon>
       </div>

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule-condition.component.ts

@@ -21,8 +21,7 @@ import {
   NG_VALIDATORS,
   NG_VALUE_ACCESSOR,
   UntypedFormControl,
-  Validator,
-  Validators
+  Validator
 } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { deepClone, isDefinedAndNotNull } from '@core/utils';
@@ -44,7 +43,7 @@ import {
   AlarmRuleSchedule,
   AlarmRuleScheduleType
 } from "@shared/models/alarm-rule.models";
-import { CalculatedFieldArgument } from "@shared/models/calculated-field.models";
+import { CalculatedField, CalculatedFieldArgument } from "@shared/models/calculated-field.models";
 import {
   AlarmRuleScheduleDialogData,
   CfAlarmScheduleDialogComponent
@@ -81,6 +80,13 @@ export class CfAlarmRuleConditionComponent implements ControlValueAccessor, Vali
   @Input()
   arguments: Record<string, CalculatedFieldArgument>;
 
+  @Input()
+  @coerceBoolean()
+  isClearCondition = false;
+
+  @Input()
+  value: CalculatedField;
+
   alarmRuleConditionFormGroup = this.fb.group({
     type: ['SIMPLE'],
     expression: [{type: AlarmRuleExpressionType.SIMPLE}],
@@ -118,10 +124,8 @@ export class CfAlarmRuleConditionComponent implements ControlValueAccessor, Vali
   }
 
   writeValue(value: AlarmRuleCondition): void {
-    if (value) {
-      this.modelValue = value;
-      this.updateConditionInfo();
-    }
+    this.modelValue = value;
+    this.updateConditionInfo();
   }
 
   public conditionSet() {
@@ -147,7 +151,8 @@ export class CfAlarmRuleConditionComponent implements ControlValueAccessor, Vali
       data: {
         readonly: this.disabled,
         condition: this.disabled ? this.modelValue : deepClone(this.modelValue),
-        arguments: this.arguments
+        arguments: this.arguments,
+        value: this.value,
       }
     }).afterClosed().subscribe((result) => {
       if (result) {

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.html

@@ -16,7 +16,7 @@
 
 -->
 <div class="tb-form-panel no-border no-padding" [formGroup]="alarmRuleFormGroup">
-  <tb-cf-alarm-rule-condition formControlName="condition" [arguments]="arguments" [required]="required">
+  <tb-cf-alarm-rule-condition formControlName="condition" [arguments]="arguments" [required]="required" [value]="value" [isClearCondition]="isClearCondition">
   </tb-cf-alarm-rule-condition>
   @if (!disabled || alarmRuleFormGroup.get('alarmDetails').value) {
     <div class="tb-form-row space-between column-xs">

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.scss

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 :host {
+  width: 100%;
   .tb-alarm-rule-details, .tb-alarm-rule-dashboard {
     padding: 4px;
     &.title {

ui-ngx/src/app/modules/home/components/alarm-rules/cf-alarm-rule.component.ts

@@ -28,7 +28,7 @@ import { isDefinedAndNotNull } from '@core/utils';
 import { DashboardId } from '@shared/models/id/dashboard-id';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { AlarmRule, AlarmRuleCondition } from "@shared/models/alarm-rule.models";
-import { CalculatedFieldArgument } from "@shared/models/calculated-field.models";
+import { CalculatedField, CalculatedFieldArgument } from "@shared/models/calculated-field.models";
 import {
   AlarmRuleDetailsDialogComponent,
   AlarmRuleDetailsDialogData
@@ -65,6 +65,13 @@ export class CfAlarmRuleComponent implements ControlValueAccessor, OnInit, Valid
   @Input()
   arguments: Record<string, CalculatedFieldArgument>;
 
+  @Input()
+  @coerceBoolean()
+  isClearCondition = false;
+
+  @Input()
+  value: CalculatedField;
+
   private modelValue: AlarmRule;
 
   alarmRuleFormGroup = this.fb.group({

ui-ngx/src/app/modules/home/components/alarm-rules/create-cf-alarm-rules.component.html

@@ -34,7 +34,7 @@
             </mat-select>
           </mat-form-field>
         </div>
-        <tb-cf-alarm-rule formControlName="alarmRule" [arguments]="arguments" required class="flex-1">
+        <tb-cf-alarm-rule formControlName="alarmRule" [arguments]="arguments" [value]="value" required class="flex-1">
         </tb-cf-alarm-rule>
       </div>
       <button *ngIf="!disabled"
@@ -58,7 +58,6 @@
             [disabled]="createAlarmRulesFormArray().controls.length > 4"
             type="button"
             (click)="addCreateAlarmRule()"
-            matTooltip="{{ 'alarm-rule.add-create-alarm-rule' | translate }}"
             matTooltipPosition="above">
       {{ 'alarm-rule.add-create-alarm-rule' | translate }}
     </button>

ui-ngx/src/app/modules/home/components/alarm-rules/create-cf-alarm-rules.component.ts

@@ -29,7 +29,7 @@ import {
 } from '@angular/forms';
 import { AlarmSeverity, alarmSeverityTranslations } from '@shared/models/alarm.models';
 import { AlarmRule } from "@shared/models/alarm-rule.models";
-import { CalculatedFieldArgument } from "@shared/models/calculated-field.models";
+import { CalculatedField, CalculatedFieldArgument } from "@shared/models/calculated-field.models";
 import { AlarmSeverityNotificationColors } from "@shared/models/notification.models";
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { coerceBoolean } from "@shared/decorators/coercion";
@@ -60,6 +60,8 @@ export class CreateCfAlarmRulesComponent implements ControlValueAccessor, Valida
   @Input()
   arguments: Record<string, CalculatedFieldArgument>;
 
+  @Input()
+  value: CalculatedField;
 
   alarmSeverities = Object.keys(AlarmSeverity);
   alarmSeverityEnum = AlarmSeverity;

ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-dialog.component.html

@@ -67,7 +67,10 @@
 
       <section class="tb-form-panel">
         <div class="flex flex-row items-center justify-between">
-          <div class="tb-form-panel-title">{{ 'alarm-rule.filter' | translate }}</div>
+          <div class="tb-form-panel-title"
+               tb-hint-tooltip-icon="{{ filterFormGroup.get('valueType').value === entityKeyValueTypeEnum.DATE_TIME ? ('alarm-rule.date-time-hint' | translate) : '' }}">
+            {{ 'alarm-rule.filter' | translate }}
+          </div>
           <tb-toggle-select formControlName="operation"
                             selectMediaBreakpoint="xs">
             <tb-toggle-option [value]="ComplexOperation.AND">{{ complexOperationTranslationMap.get(ComplexOperation.AND) | translate }}</tb-toggle-option>

ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-list.component.html

@@ -72,7 +72,6 @@
 <button mat-button mat-raised-button color="primary"
         (click)="addFilter()"
         type="button"
-        matTooltip="{{ 'alarm-rule.add-filter' | translate }}"
         matTooltipPosition="above">
   {{ 'alarm-rule.add-filter' | translate }}
 </button>

ui-ngx/src/app/modules/home/components/alarm-rules/filter/alarm-rule-filter-predicate-list.component.html

@@ -70,7 +70,6 @@
             [class.!hidden]="disabled"
             (click)="addPredicate(false)"
             type="button"
-            matTooltip="{{ 'filter.add-filter' | translate }}"
             matTooltipPosition="above">
       {{ 'action.add' | translate }}
     </button>
@@ -78,7 +77,6 @@
             [class.!hidden]="disabled"
             (click)="addPredicate(true)"
             type="button"
-            matTooltip="{{ 'filter.add-complex-filter' | translate }}"
             matTooltipPosition="above">
       {{ 'filter.add-complex' | translate }}
     </button>

ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts

@@ -24,7 +24,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { Direction } from '@shared/models/page/sort-order';
 import { MatDialog } from '@angular/material/dialog';
 import { PageLink } from '@shared/models/page/page-link';
-import { Observable, of } from 'rxjs';
+import { EMPTY, Observable, of } from 'rxjs';
 import { PageData } from '@shared/models/page/page-data';
 import { EntityId } from '@shared/models/id/entity-id';
 import { Store } from '@ngrx/store';
@@ -60,6 +60,7 @@ import { isObject } from '@core/utils';
 import { EntityDebugSettingsService } from '@home/components/entity/debug/entity-debug-settings.service';
 import { DatePipe } from '@angular/common';
 import { UtilsService } from "@core/services/utils.service";
+import { ActionNotificationShow } from "@core/notification/notification.actions";
 
 export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedField> {
 
@@ -256,6 +257,19 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
     this.importExportService.openCalculatedFieldImportDialog()
       .pipe(
         filter(Boolean),
+        switchMap(calculatedField => {
+          if (calculatedField.type === CalculatedFieldType.ALARM) {
+            this.store.dispatch(new ActionNotificationShow({
+              message: this.translate.instant('calculated-fields.hint.import-invalid-calculated-field-type'),
+              type: 'error',
+              verticalPosition: 'top',
+              horizontalPosition: 'left',
+              duration: 5000
+            }));
+            return EMPTY;
+          }
+          return of(calculatedField);
+        }),
         switchMap(calculatedField => this.getCalculatedFieldDialog(this.updateImportedCalculatedField(calculatedField), 'action.add', true)),
         filter(Boolean),
         switchMap(calculatedField => this.calculatedFieldsService.saveCalculatedField(calculatedField)),

ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.html

@@ -24,15 +24,8 @@
       </div>
     }
     <div class="tb-form-panel no-border no-padding">
-      @if (!isOutputKey) {
-        <ng-container *ngTemplateOutlet="argumentNameTemplate; context: {
-          label: 'calculated-fields.argument-name',
-          required: 'calculated-fields.hint.argument-name-required',
-          duplicate: 'calculated-fields.hint.argument-name-duplicate',
-          pattern: 'calculated-fields.hint.argument-name-pattern',
-          maxlength: 'calculated-fields.hint.argument-name-max-length',
-          forbidden: 'calculated-fields.hint.argument-name-forbidden'
-        }"></ng-container>
+      @if (!watchKeyChange) {
+        <ng-container *ngTemplateOutlet="argumentNameTemplate; context: argumentNameContext"></ng-container>
       }
       <ng-container>
         @if (!hiddenEntityTypes) {
@@ -105,7 +98,7 @@
                 <ng-container [ngTemplateOutlet]="timeseriesKeyAutocomplete"/>
               }
               <ng-template #timeseriesKeyAutocomplete>
-                <tb-entity-key-autocomplete class="flex-1" formControlName="key" [dataKeyType]="DataKeyType.timeseries" [entityFilter]="entityFilter"/>
+                <tb-entity-key-autocomplete class="flex-1" formControlName="key" [dataKeyType]="DataKeyType.timeseries" [entityFilter]="entityFilter" [enableAutocomplete]="!enableAutocomplete"/>
               </ng-template>
             </div>
           } @else {
@@ -132,6 +125,7 @@
               <tb-entity-key-autocomplete
                 formControlName="key"
                 class="flex-1"
+                [enableAutocomplete]="!enableAutocomplete"
                 [dataKeyType]="DataKeyType.attribute"
                 [entityFilter]="entityFilter"
                 [keyScopeType]="argumentFormGroup.get('refEntityKey').get('scope').value"
@@ -140,15 +134,8 @@
           }
         }
       </ng-container>
-      @if (isOutputKey) {
-        <ng-container *ngTemplateOutlet="argumentNameTemplate; context: {
-          label: 'calculated-fields.output-key',
-          required: 'calculated-fields.hint.output-key-required',
-          duplicate: 'calculated-fields.hint.output-key-duplicate',
-          pattern: 'calculated-fields.hint.output-key-pattern',
-          maxlength: 'calculated-fields.hint.output-key-max-length',
-          forbidden: 'calculated-fields.hint.output-key-forbidden'
-        }"></ng-container>
+      @if (watchKeyChange) {
+        <ng-container *ngTemplateOutlet="argumentNameTemplate; context: argumentNameContext"></ng-container>
       }
       @if (refEntityKeyFormGroup.get('type').value !== ArgumentType.Rolling) {
         @if (!hiddenDefaultValue) {

ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts

@@ -72,6 +72,7 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit, AfterViewI
   @Input() isScript: boolean;
   @Input() usedArgumentNames: string[];
   @Input() isOutputKey = false;
+  @Input() watchKeyChange = false;
   @Input() hiddenEntityTypes = false;
   @Input() hiddenEntityKeyTypes = false;
   @Input() hiddenDefaultValue = false;
@@ -107,6 +108,17 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit, AfterViewI
   entityFilter: EntityFilter;
   entityNameSubject = new BehaviorSubject<string>(null);
 
+  enableAutocomplete = false;
+
+  argumentNameContext = {
+    label: 'calculated-fields.argument-name',
+    required: 'calculated-fields.hint.argument-name-required',
+    duplicate: 'calculated-fields.hint.argument-name-duplicate',
+    pattern: 'calculated-fields.hint.argument-name-pattern',
+    maxlength: 'calculated-fields.hint.argument-name-max-length',
+    forbidden: 'calculated-fields.hint.argument-name-forbidden'
+  }
+
   readonly ArgumentEntityTypeTranslations = ArgumentEntityTypeTranslations;
   readonly ArgumentType = ArgumentType;
   readonly DataKeyType = DataKeyType;
@@ -155,7 +167,20 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit, AfterViewI
     this.toggleByEntityKeyType(this.argument.refEntityKey?.type);
     this.setInitialEntityKeyType();
     this.setInitialEntityType();
-    this.setWatchKeyChange();
+    if (this.watchKeyChange) {
+      this.setWatchKeyChange();
+    }
+
+    if (this.isOutputKey) {
+      this.argumentNameContext = {
+        label: 'calculated-fields.output-key',
+        required: 'calculated-fields.hint.output-key-required',
+        duplicate: 'calculated-fields.hint.output-key-duplicate',
+        pattern: 'calculated-fields.hint.output-key-pattern',
+        maxlength: 'calculated-fields.hint.output-key-max-length',
+        forbidden: 'calculated-fields.hint.output-key-forbidden'
+      }
+    }
 
     if (this.defaultValueRequired) {
       this.argumentFormGroup.get('defaultValue').addValidators(Validators.required);
@@ -202,6 +227,7 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit, AfterViewI
   private updatedArgumentType(): void {
     let argumentType = ArgumentEntityType.Current;
     if (this.argument.refDynamicSourceConfiguration?.type === ArgumentEntityType.Owner) {
+      this.enableAutocomplete = (this.entityId.entityType === EntityType.DEVICE_PROFILE || this.entityId.entityType === EntityType.ASSET_PROFILE);
       argumentType = ArgumentEntityType.Owner;
     } else if (this.argument.refEntityId?.entityType) {
       argumentType = this.argument.refEntityId.entityType;
@@ -270,6 +296,7 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit, AfterViewI
       .pipe(distinctUntilChanged(), takeUntilDestroyed())
       .subscribe(type => {
         this.argumentFormGroup.get('refEntityId').setValue(null);
+        this.enableAutocomplete = (this.entityId.entityType === EntityType.DEVICE_PROFILE || this.entityId.entityType === EntityType.ASSET_PROFILE) && type === ArgumentEntityType.Owner;
         this.updatedRefEntityIdState(type);
         if (!this.enableAttributeScopeSelection) {
           this.refEntityKeyFormGroup.get('scope').setValue(AttributeScope.SERVER_SCOPE);
@@ -299,15 +326,13 @@ export class CalculatedFieldArgumentPanelComponent implements OnInit, AfterViewI
   }
 
   private setWatchKeyChange(): void {
-    if (this.isOutputKey) {
-      this.refEntityKeyFormGroup.get('key').valueChanges.pipe(
-        takeUntilDestroyed(this.destroyRef)
-      ).subscribe((key) => {
-        if (this.argumentFormGroup.get('argumentName').pristine) {
-          this.argumentFormGroup.get('argumentName').setValue(key);
-        }
-      });
-    }
+    this.refEntityKeyFormGroup.get('key').valueChanges.pipe(
+      takeUntilDestroyed(this.destroyRef)
+    ).subscribe((key) => {
+      if (this.argumentFormGroup.get('argumentName').pristine) {
+        this.argumentFormGroup.get('argumentName').setValue(key);
+      }
+    });
   }
 
   private updatedRefEntityIdState(type: ArgumentEntityType, emitEvent = true): void {

ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-arguments-table.component.html

@@ -120,10 +120,10 @@
       <mat-row *matRowDef="let argument; columns: displayColumns"></mat-row>
     </table>
     <div [class.!hidden]="(dataSource.isEmpty() | async) === false"
-         class="tb-prompt flex flex-1 items-end justify-center">
+         class="tb-prompt flex flex-1 items-end justify-center min-h-14">
       {{ 'calculated-fields.no-arguments' | translate }}
     </div>
-    @if (errorText) {
+    @if (errorText || (dataSource.isEmpty() | async)) {
       <tb-error noMargin [error]="errorText | translate" class="flex h-9 items-center pl-3"/>
     }
   </div>
@@ -134,7 +134,7 @@
       color="primary"
       #button
       (click)="manageArgument($event, button)"
-      [disabled]="maxArgumentsPerCF > 0 && argumentsFormArray.length >= maxArgumentsPerCF"
+      [disabled]="maxArgumentsPerCF > 0 && argumentsFormArray.length >= maxArgumentsPerCF || disabledAddButton"
     >
       {{ 'calculated-fields.add-argument' | translate }}
     </button>

ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-arguments-table.component.ts

@@ -87,6 +87,8 @@ export class CalculatedFieldArgumentsTableComponent implements ControlValueAcces
   @Input() entityName: string;
   @Input() ownerId: EntityId;
   @Input() isScript: boolean;
+  @Input() disabledAddButton = false;
+  @Input() watchKeyChange = false;
 
   @ViewChild(MatSort, { static: true }) sort: MatSort;
 
@@ -181,6 +183,7 @@ export class CalculatedFieldArgumentsTableComponent implements ControlValueAcces
         tenantId: this.tenantId,
         entityName: this.entityName,
         ownerId: this.ownerId,
+        watchKeyChange: this.watchKeyChange,
         usedArgumentNames: this.argumentsFormArray.value.map(({ argumentName }) => argumentName).filter(name => name !== argument.argumentName),
       };
       this.popoverComponent = this.popoverService.displayPopover({

ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/propagate-arguments-table.component.ts

@@ -94,6 +94,7 @@ export class PropagateArgumentsTableComponent extends CalculatedFieldArgumentsTa
       this.panelAdditionalCtx = {
         argumentEntityTypes: [ArgumentEntityType.Current],
         isOutputKey: true,
+        watchKeyChange: true,
         forbiddenNames: [...FORBIDDEN_NAMES, 'propagationCtx'],
       };
     }

ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html

@@ -88,6 +88,7 @@
                                                      [entityId]="data.entityId"
                                                      [entityName]="data.entityName"
                                                      [tenantId]="data.tenantId"
+                                                     [calculatedFieldId]="data.value?.id?.id"
           ></tb-related-entities-aggregation-component>
         }
         @case (CalculatedFieldType.ENTITY_AGGREGATION) {

ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html

@@ -176,7 +176,7 @@
       </div>
     </ng-container>
     <ng-container>
-      @if (entityFilter.singleEntity?.id || entityType === ArgumentEntityType.RelationQuery || entityType === ArgumentEntityType.Current) {
+      @if (entityFilter.singleEntity?.id || entityType === ArgumentEntityType.RelationQuery || entityType === ArgumentEntityType.Current || entityType === ArgumentEntityType.Owner) {
         <div class="tb-form-row">
           <div class="fixed-title-width tb-required" tb-hint-tooltip-icon="{{'calculated-fields.hint.perimeter-attribute-key' | translate}}">
             {{ 'calculated-fields.perimeter-attribute-key' | translate }}
@@ -204,6 +204,7 @@
             </mat-form-field>
           } @else {
             <tb-entity-key-autocomplete class="flex-1" formControlName="perimeterKeyName"
+                                        [enableAutocomplete]="!enableAutocomplete"
                                         [dataKeyType]="DataKeyType.attribute" [entityFilter]="entityFilter"
                                         [keyScopeType]="AttributeScope.SERVER_SCOPE"/>
           }

ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.ts

@@ -97,6 +97,8 @@ export class CalculatedFieldGeofencingZoneGroupsPanelComponent implements OnInit
   entityFilter: EntityFilter;
   entityNameSubject = new BehaviorSubject<string>(null);
 
+  enableAutocomplete = false;
+
   readonly ArgumentEntityType = ArgumentEntityType;
   readonly argumentEntityTypes = Object.values(ArgumentEntityType) as ArgumentEntityType[];
   readonly ArgumentEntityTypeTranslations = ArgumentEntityTypeTranslations;
@@ -151,6 +153,8 @@ export class CalculatedFieldGeofencingZoneGroupsPanelComponent implements OnInit
     } else {
       this.addKey();
     }
+    this.enableAutocomplete = (this.entityId.entityType === EntityType.DEVICE_PROFILE || this.entityId.entityType === EntityType.ASSET_PROFILE) &&
+      this.refEntityIdFormGroup.get('entityType').value === ArgumentEntityType.Owner;
     this.validateDirectionAndRelationType(this.zone?.createRelationsWithMatchedZones);
     this.validateRefDynamicSourceConfiguration(this.zone?.refEntityId?.entityType || this.zone?.refDynamicSourceConfiguration?.type);
 
@@ -265,18 +269,17 @@ export class CalculatedFieldGeofencingZoneGroupsPanelComponent implements OnInit
     )
       .pipe(debounceTime(50), takeUntilDestroyed())
       .subscribe(() => this.updateEntityFilter(this.entityType));
-
-    this.refEntityIdFormGroup.get('id').valueChanges.pipe(distinctUntilChanged(), takeUntilDestroyed()).subscribe(() => this.geofencingFormGroup.get('perimeterKeyName').reset(''));
   }
 
   private observeEntityTypeChanges(): void {
     this.refEntityIdFormGroup.get('entityType').valueChanges
       .pipe(distinctUntilChanged(), takeUntilDestroyed())
       .subscribe(type => {
+        this.enableAutocomplete = (this.entityId.entityType === EntityType.DEVICE_PROFILE || this.entityId.entityType === EntityType.ASSET_PROFILE) && type === ArgumentEntityType.Owner;
         this.geofencingFormGroup.get('refEntityId').get('id').setValue(null);
-        const isEntityWithId = type !== ArgumentEntityType.Tenant && type !== ArgumentEntityType.Current && type !== ArgumentEntityType.RelationQuery;
-        this.geofencingFormGroup.get('refEntityId')
-          .get('id')[isEntityWithId ? 'enable' : 'disable']();
+        this.geofencingFormGroup.get('perimeterKeyName').reset('');
+        const isEntityWithId = !!type && ![ArgumentEntityType.Tenant, ArgumentEntityType.Current, ArgumentEntityType.Owner].includes(type);
+        this.geofencingFormGroup.get('refEntityId').get('id')[isEntityWithId ? 'enable' : 'disable']();
         if (!isEntityWithId) {
           this.entityNameSubject.next(null);
         }

ui-ngx/src/app/modules/home/components/calculated-fields/components/metrics/calculated-field-metrics-panel.component.html

@@ -27,7 +27,7 @@
           <mat-icon matSuffix
                     matTooltipPosition="above"
                     matTooltipClass="tb-error-tooltip"
-                    [matTooltip]="'calculated-fields.hint.name-required' | translate"
+                    [matTooltip]="'calculated-fields.metrics.metric-name-required' | translate"
                     class="tb-error">
             warning
           </mat-icon>
@@ -35,7 +35,7 @@
           <mat-icon matSuffix
                     matTooltipPosition="above"
                     matTooltipClass="tb-error-tooltip"
-                    [matTooltip]="'calculated-fields.hint.name-duplicate' | translate"
+                    [matTooltip]="'calculated-fields.metrics.metric-name-duplicate' | translate"
                     class="tb-error">
             warning
           </mat-icon>
@@ -43,7 +43,7 @@
           <mat-icon matSuffix
                     matTooltipPosition="above"
                     matTooltipClass="tb-error-tooltip"
-                    [matTooltip]="'calculated-fields.hint.name-pattern' | translate"
+                    [matTooltip]="'calculated-fields.metrics.metric-name-pattern' | translate"
                     class="tb-error">
             warning
           </mat-icon>
@@ -51,7 +51,7 @@
           <mat-icon matSuffix
                     matTooltipPosition="above"
                     matTooltipClass="tb-error-tooltip"
-                    [matTooltip]="'calculated-fields.hint.name-max-length' | translate"
+                    [matTooltip]="'calculated-fields.metrics.metric-name-max-length' | translate"
                     class="tb-error">
             warning
           </mat-icon>
@@ -59,7 +59,7 @@
           <mat-icon matSuffix
                     matTooltipPosition="above"
                     matTooltipClass="tb-error-tooltip"
-                    [matTooltip]="'calculated-fields.hint.name-forbidden' | translate"
+                    [matTooltip]="'calculated-fields.metrics.metric-name-forbidden' | translate"
                     class="tb-error">
             warning
           </mat-icon>
@@ -105,7 +105,24 @@
               <div toolbarPrefixButton
                    class="tb-primary-background tbel-script-lang-chip">{{ 'api-usage.tbel' | translate }}
               </div>
+              <button toolbarSuffixButton
+                      mat-icon-button
+                      matTooltip="{{ 'calculated-fields.test-script-function' | translate }}"
+                      matTooltipPosition="above"
+                      class="tb-mat-32"
+                      [disabled]="!argumentsList.length"
+                      (click)="onTestScript('filter')">
+                <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+              </button>
             </tb-js-func>
+            <div>
+              <button mat-button mat-raised-button color="primary"
+                      type="button"
+                      (click)="onTestScript('filter')"
+                      [disabled]="!argumentsList.length">
+                {{ 'calculated-fields.test-script-function' | translate }}
+              </button>
+            </div>
           </ng-template>
         </mat-expansion-panel>
       </div>
@@ -128,7 +145,7 @@
           <div class="fixed-title-width tb-required">{{ 'calculated-fields.argument-name' | translate }}</div>
           <mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic">
             <mat-select formControlName="key" placeholder="{{ 'action.set' | translate }}">
-              @for (argument of arguments; track argument) {
+              @for (argument of argumentsList; track argument) {
                 <mat-option [value]="argument">{{ argument }}</mat-option>
               }
             </mat-select>
@@ -146,7 +163,7 @@
       } @else {
         <tb-js-func required
                     formControlName="function"
-                    functionName="filter"
+                    functionName="map"
                     [functionArgs]="functionArgs"
                     [disableUndefinedCheck]="true"
                     [scriptLanguage]="ScriptLanguage.TBEL"
@@ -157,7 +174,24 @@
           <div toolbarPrefixButton
                class="tb-primary-background tbel-script-lang-chip">{{ 'api-usage.tbel' | translate }}
           </div>
+          <button toolbarSuffixButton
+                  mat-icon-button
+                  matTooltip="{{ 'calculated-fields.test-script-function' | translate }}"
+                  matTooltipPosition="above"
+                  class="tb-mat-32"
+                  [disabled]="!argumentsList.length"
+                  (click)="onTestScript('input.function')">
+            <mat-icon class="material-icons" color="primary">bug_report</mat-icon>
+          </button>
         </tb-js-func>
+        <div>
+          <button mat-button mat-raised-button color="primary"
+                  type="button"
+                  (click)="onTestScript('input.function')"
+                  [disabled]="!argumentsList.length">
+            {{ 'calculated-fields.test-script-function' | translate }}
+          </button>
+        </div>
       }
     </ng-container>
     @if (simpleMode) {

ui-ngx/src/app/modules/home/components/calculated-fields/components/metrics/calculated-field-metrics-panel.component.ts

@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
 
-import { Component, Input, OnInit, output } from '@angular/core';
+import { Component, DestroyRef, Input, OnInit, output } from '@angular/core';
 import { TbPopoverComponent } from '@shared/components/popover.component';
 import { FormBuilder, Validators } from '@angular/forms';
 import { charsWithNumRegex } from '@shared/models/regex.constants';
@@ -23,9 +23,14 @@ import {
   AggFunctionTranslations,
   AggInputType,
   AggInputTypeTranslations,
+  ArgumentType,
   CalculatedFieldAggMetricValue,
+  CalculatedFieldArgument,
+  CalculatedFieldEventArguments,
   FORBIDDEN_NAMES,
   forbiddenNamesValidator,
+  getCalculatedFieldArgumentsEditorCompleter,
+  getCalculatedFieldArgumentsHighlights,
   uniqueNameValidator
 } from '@shared/models/calculated-field.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -33,6 +38,15 @@ import { EntityFilter } from '@shared/models/query/query.models';
 import { ScriptLanguage } from '@shared/models/rule-node.models';
 import { TbEditorCompleter } from '@shared/models/ace/completion.models';
 import { AceHighlightRules } from '@shared/models/ace/ace.models';
+import { MatDialog } from "@angular/material/dialog";
+import { Observable } from "rxjs";
+import { isObject } from "@core/utils";
+import {
+  CalculatedFieldScriptTestDialogComponent,
+  CalculatedFieldTestScriptDialogData
+} from "@home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component";
+import { filter, switchMap, tap } from "rxjs/operators";
+import { CalculatedFieldsService } from "@core/http/calculated-fields.service";
 
 interface CalculatedFieldAggMetricValuePanel extends CalculatedFieldAggMetricValue {
   allowFilter: boolean;
@@ -48,13 +62,15 @@ export class CalculatedFieldMetricsPanelComponent implements OnInit {
   @Input() buttonTitle: string;
   @Input() metric: CalculatedFieldAggMetricValue;
   @Input() usedNames: string[];
-  @Input() arguments: Array<string>;
+  @Input() arguments: Record<string, CalculatedFieldArgument>;
   @Input() simpleMode: boolean;
   @Input() editorCompleter: TbEditorCompleter;
   @Input() highlightRules: AceHighlightRules;
+  @Input() calculatedFieldId: string;
 
   metricDataApplied = output<CalculatedFieldAggMetricValue>();
   filterExpanded = false;
+  argumentsList: Array<string>
   functionArgs: Array<string>
 
   metricForm = this.fb.group({
@@ -81,7 +97,10 @@ export class CalculatedFieldMetricsPanelComponent implements OnInit {
 
   constructor(
     private fb: FormBuilder,
-    private popover: TbPopoverComponent<CalculatedFieldMetricsPanelComponent>
+    private popover: TbPopoverComponent<CalculatedFieldMetricsPanelComponent>,
+    private dialog: MatDialog,
+    private calculatedFieldsService: CalculatedFieldsService,
+    private destroyRef: DestroyRef
   ) {
     this.observeFilterAllowChange();
     this.observeInputTypeChange();
@@ -100,7 +119,8 @@ export class CalculatedFieldMetricsPanelComponent implements OnInit {
     this.validateInputTypeFilter(data.input?.type ?? AggInputType.key);
     this.validateInputKey();
 
-    this.functionArgs = ['ctx', ...this.arguments];
+    this.argumentsList = Object.keys(this.arguments);
+    this.functionArgs = ['ctx', ...this.argumentsList];
   }
 
   saveMetric(): void {
@@ -158,9 +178,55 @@ export class CalculatedFieldMetricsPanelComponent implements OnInit {
   }
 
   private validateInputKey() {
-    if (this.metric.input?.type === AggInputType.key && !this.arguments.includes(this.metric.input.key)) {
+    if (this.metric.input?.type === AggInputType.key && !Object.keys(this.arguments).includes(this.metric.input.key)) {
       this.metricForm.get('input.key').setValue(null);
       this.metricForm.get('input.key').markAsTouched();
     }
   }
+
+  onTestScript(scriptFunc: 'filter' | 'input.function') {
+    this.testScript(scriptFunc).subscribe(expression => {
+      this.metricForm.get(scriptFunc).setValue(expression);
+      this.metricForm.get(scriptFunc).markAsDirty();
+    });
+  }
+
+  testScript(scriptFunc: 'filter' | 'input.function'): Observable<string> {
+    if (this.calculatedFieldId) {
+      return this.calculatedFieldsService.getLatestCalculatedFieldDebugEvent(this.calculatedFieldId, {ignoreLoading: true})
+        .pipe(
+          switchMap(event => {
+            const args = event?.arguments ? JSON.parse(event.arguments) : null;
+            return this.getTestScriptDialog(this.arguments, this.metricForm.get(scriptFunc).value, args);
+          }),
+          takeUntilDestroyed(this.destroyRef)
+        )
+    }
+    return this.getTestScriptDialog(this.arguments, this.metricForm.get(scriptFunc).value, null);
+  }
+
+  getTestScriptDialog(argumentsList: Record<string, CalculatedFieldArgument>, expression: string, argumentsObj?: CalculatedFieldEventArguments): Observable<string> {
+    const resultArguments = Object.keys(argumentsList).reduce((acc, key) => {
+      const type = argumentsList[key].refEntityKey.type;
+      acc[key] = isObject(argumentsObj) && argumentsObj.hasOwnProperty(key)
+        ? {...argumentsObj[key], type}
+        : type === ArgumentType.Rolling ? {values: [], type} : {value: '', type, ts: new Date().getTime()};
+      return acc;
+    }, {});
+    return this.dialog.open<CalculatedFieldScriptTestDialogComponent, CalculatedFieldTestScriptDialogData, string>(CalculatedFieldScriptTestDialogComponent,
+      {
+        disableClose: true,
+        panelClass: ['tb-dialog', 'tb-fullscreen-dialog', 'tb-fullscreen-dialog-gt-xs'],
+        data: {
+          arguments: resultArguments,
+          expression: expression,
+          argumentsEditorCompleter: getCalculatedFieldArgumentsEditorCompleter(argumentsList),
+          argumentsHighlightRules: getCalculatedFieldArgumentsHighlights(argumentsList)
+        }
+      }).afterClosed()
+      .pipe(
+        filter(Boolean),
+        tap(expression => expression)
+      );
+  }
 }

ui-ngx/src/app/modules/home/components/calculated-fields/components/metrics/calculated-field-metrics-table.component.ts

@@ -40,6 +40,7 @@ import {
   AggInputTypeTranslations,
   CalculatedFieldAggMetric,
   CalculatedFieldAggMetricValue,
+  CalculatedFieldArgument,
 } from '@shared/models/calculated-field.models';
 import { MatButton } from '@angular/material/button';
 import { TbPopoverService } from '@shared/components/popover.service';
@@ -76,10 +77,11 @@ import { AceHighlightRules } from '@shared/models/ace/ace.models';
 })
 export class CalculatedFieldMetricsTableComponent implements OnInit, ControlValueAccessor, Validator, AfterViewInit {
 
-  @Input() arguments: Array<string>;
+  @Input() arguments: Record<string, CalculatedFieldArgument>;
   @Input() editorCompleter: TbEditorCompleter;
   @Input() highlightRules: AceHighlightRules;
   @Input({transform: booleanAttribute}) simpleMode: boolean = false;
+  @Input() calculatedFieldId: string;
 
   @ViewChild(MatSort, { static: true }) sort: MatSort;
 
@@ -166,6 +168,7 @@ export class CalculatedFieldMetricsTableComponent implements OnInit, ControlValu
         editorCompleter: this.editorCompleter,
         highlightRules: this.highlightRules,
         simpleMode: this.simpleMode,
+        calculatedFieldId: this.calculatedFieldId
       };
       this.popoverComponent = this.popoverService.displayPopover({
         trigger,

ui-ngx/src/app/modules/home/components/calculated-fields/components/related-entities-aggregation-configuration/related-entities-aggregation-component.component.html

@@ -55,6 +55,7 @@
       {{ 'calculated-fields.metrics.metrics' | translate }}
     </div>
     <tb-calculated-field-metrics-table formControlName="metrics"
+                                       [calculatedFieldId]="calculatedFieldId"
                                        [arguments]="arguments$ | async"
                                        [highlightRules]="argumentsHighlightRules$ | async"
                                        [editorCompleter]="argumentsEditorCompleter$ | async"

ui-ngx/src/app/modules/home/components/calculated-fields/components/related-entities-aggregation-configuration/related-entities-aggregation-component.component.ts

@@ -73,6 +73,8 @@ export class RelatedEntitiesAggregationComponentComponent implements ControlValu
   @Input({required: true})
   entityName: string;
 
+  @Input() calculatedFieldId: string;
+
   readonly ScriptLanguage = ScriptLanguage;
   readonly CalculatedFieldType = CalculatedFieldType;
   readonly OutputType = OutputType;
@@ -93,7 +95,7 @@ export class RelatedEntitiesAggregationComponentComponent implements ControlValu
   });
 
   arguments$ = this.relatedAggregationConfiguration.get('arguments').valueChanges.pipe(
-    map(argumentsObj => Object.keys(argumentsObj))
+    map(argumentsObj => argumentsObj)
   );
 
   argumentsEditorCompleter$ = this.relatedAggregationConfiguration.get('arguments').valueChanges.pipe(

ui-ngx/src/app/modules/home/pages/asset/asset-tabs.component.html

@@ -33,11 +33,11 @@
   </mat-tab>
   @if (authUser.authority === authorities.TENANT_ADMIN) {
     <mat-tab label="{{ 'entity.type-calculated-fields' | translate }}" #calculatedFieldsTab="matTab">
-      <tb-calculated-fields-table [active]="calculatedFieldsTab.isActive" [entityId]="entity.id" [ownerId]="entity.tenantId"/>
+      <tb-calculated-fields-table [active]="calculatedFieldsTab.isActive" [entityId]="entity.id" [ownerId]="ownerId"/>
     </mat-tab>
     <mat-tab #alarmRules="matTab"
              label="{{'alarm-rule.alarm-rules' | translate }}">
-      <tb-alarm-rules-table [active]="alarmRules.isActive" [entityId]="entity.id" [entityName]="entity.name" [ownerId]="entity.tenantId"></tb-alarm-rules-table>
+      <tb-alarm-rules-table [active]="alarmRules.isActive" [entityId]="entity.id" [entityName]="entity.name" [ownerId]="ownerId"></tb-alarm-rules-table>
     </mat-tab>
   }
   <mat-tab label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab">

ui-ngx/src/app/modules/home/pages/asset/asset-tabs.component.ts

@@ -19,6 +19,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { EntityTabsComponent } from '../../components/entity/entity-tabs.component';
 import { AssetInfo } from '@app/shared/models/asset.models';
+import { EntityId } from "@shared/models/id/entity-id";
 
 @Component({
   selector: 'tb-asset-tabs',
@@ -27,6 +28,8 @@ import { AssetInfo } from '@app/shared/models/asset.models';
 })
 export class AssetTabsComponent extends EntityTabsComponent<AssetInfo> {
 
+  ownerId: EntityId;
+
   constructor(protected store: Store<AppState>) {
     super(store);
   }
@@ -35,4 +38,9 @@ export class AssetTabsComponent extends EntityTabsComponent<AssetInfo> {
     super.ngOnInit();
   }
 
+  protected setEntity(entity: AssetInfo) {
+    this.ownerId = entity.customerId.id !== this.nullUid ? entity.customerId : entity.tenantId;
+    super.setEntity(entity);
+  }
+
 }

ui-ngx/src/app/modules/home/pages/device/device-tabs.component.html

@@ -33,10 +33,10 @@
   </mat-tab>
   @if (authUser.authority === authorities.TENANT_ADMIN) {
     <mat-tab label="{{ 'entity.type-calculated-fields' | translate }}" #calculatedFieldsTab="matTab">
-      <tb-calculated-fields-table [active]="calculatedFieldsTab.isActive" [entityId]="entity.id" [ownerId]="entity.tenantId"/>
+      <tb-calculated-fields-table [active]="calculatedFieldsTab.isActive" [entityId]="entity.id" [ownerId]="ownerId"/>
     </mat-tab>
     <mat-tab #calculatedFieldsAlarmRules="matTab" label="{{'alarm-rule.alarm-rules-tab' | translate }}">
-      <tb-alarm-rules-table [active]="calculatedFieldsAlarmRules.isActive" [entityId]="entity.id" [entityName]="entity.name" [ownerId]="entity.tenantId"></tb-alarm-rules-table>
+      <tb-alarm-rules-table [active]="calculatedFieldsAlarmRules.isActive" [entityId]="entity.id" [entityName]="entity.name" [ownerId]="ownerId"></tb-alarm-rules-table>
     </mat-tab>
   }
   <mat-tab label="{{ 'alarm.alarms' | translate }}" #alarmsTab="matTab">

ui-ngx/src/app/modules/home/pages/device/device-tabs.component.ts

@@ -19,6 +19,7 @@ import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { DeviceInfo } from '@shared/models/device.models';
 import { EntityTabsComponent } from '../../components/entity/entity-tabs.component';
+import { EntityId } from "@shared/models/id/entity-id";
 
 @Component({
   selector: 'tb-device-tabs',
@@ -27,6 +28,8 @@ import { EntityTabsComponent } from '../../components/entity/entity-tabs.compone
 })
 export class DeviceTabsComponent extends EntityTabsComponent<DeviceInfo> {
 
+  ownerId: EntityId;
+
   constructor(protected store: Store<AppState>) {
     super(store);
   }
@@ -35,4 +38,9 @@ export class DeviceTabsComponent extends EntityTabsComponent<DeviceInfo> {
     super.ngOnInit();
   }
 
+  protected setEntity(entity: DeviceInfo) {
+    this.ownerId = entity.customerId.id !== this.nullUid ? entity.customerId : entity.tenantId;
+    super.setEntity(entity);
+  }
+
 }

ui-ngx/src/app/shared/components/entity/entity-key-autocomplete.component.html

@@ -43,7 +43,7 @@
     @for (key of filteredKeys$ | async; track key) {
       <mat-option [value]="key"><span [innerHTML]="key | highlight: searchText"></span></mat-option>
     } @empty {
-      @if (!this.keyControl.value) {
+      @if (!this.keyControl.value && enableAutocomplete) {
         <mat-option [value]="''">{{ 'entity.no-keys-found' | translate }}</mat-option>
       }
     }

ui-ngx/src/app/shared/components/entity/entity-key-autocomplete.component.ts

@@ -66,6 +66,7 @@ export class EntityKeyAutocompleteComponent implements ControlValueAccessor, Val
 
   @Input() placeholder = this.translate.instant('action.set');
   @Input() requiredText = this.translate.instant('common.hint.key-required');
+  @Input() enableAutocomplete = true;
 
   entityFilter = input.required<EntityFilter>();
   dataKeyType = input.required<DataKeyType>();
@@ -81,12 +82,18 @@ export class EntityKeyAutocompleteComponent implements ControlValueAccessor, Val
   keys$ = this.keyInputSubject.asObservable()
     .pipe(
       switchMap(() => {
+        if (!this.enableAutocomplete) {
+          return of([] as string[]);
+        }
         return this.cachedResult ? of(this.cachedResult) : this.entityService.findEntityKeysByQuery({
           pageLink: { page: 0, pageSize: 100 },
           entityFilter: this.entityFilter(),
         }, this.dataKeyType() === DataKeyType.attribute, this.dataKeyType() === DataKeyType.timeseries, this.keyScopeType(), {ignoreLoading: true});
       }),
       map(result => {
+        if (Array.isArray(result)) {
+          return result;
+        }
         this.cachedResult = result;
         switch (this.dataKeyType()) {
           case DataKeyType.attribute:

ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts

@@ -204,7 +204,7 @@ export class EntitySubTypeListComponent implements ControlValueAccessor, OnInit,
       case EntityType.CALCULATED_FIELD:
         this.placeholder = this.required ? this.translate.instant('alarm.enter-alarm-rule-type')
           : this.translate.instant('alarm-rule.any-type');
-        this.secondaryPlaceholder = '+' + this.translate.instant('alarm-rule.alarm-rule');
+        this.secondaryPlaceholder = '+' + this.translate.instant('alarm-rule.alarm-type');
         this.noSubtypesMathingText = 'alarm-rule.no-alarm-rule-types-matching';
         this.subtypeListEmptyText = 'alarm-rule.alarm-rule-type-list-empty';
         break;

ui-ngx/src/app/shared/models/alarm-rule.models.ts

@@ -157,3 +157,7 @@ export interface AlarmRuleFilterConfig {
   entityType?: EntityType;
   entities?: Array<string>;
 }
+
+export const alarmRuleDefaultScript =
+  '// Sample expression for an alarm rule: triggers when temperature is above 20 degree\n' +
+  'return temperature > 20;'

ui-ngx/src/app/shared/models/calculated-field.models.ts

@@ -65,11 +65,18 @@ export interface CalculatedFieldAlarmRule extends BaseCalculatedField {
   configuration: CalculatedFieldAlarmRuleConfiguration;
 }
 
+export interface CalculatedFieldRelatedEntityAggregation extends BaseCalculatedField {
+  type: CalculatedFieldType.RELATED_ENTITIES_AGGREGATION;
+  configuration: CalculatedFieldRelatedAggregationConfiguration;
+}
+
+
 export type CalculatedField =
   | CalculatedFieldSimple
   | CalculatedFieldScript
   | CalculatedFieldGeofencing
   | CalculatedFieldPropagation
+  | CalculatedFieldRelatedEntityAggregation
   | CalculatedFieldAlarmRule;
 
 export enum CalculatedFieldType {

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -805,7 +805,7 @@
         "idCopiedMessage": "Asset Id has been copied to clipboard",
         "select-asset": "Select asset",
         "no-assets-matching": "No assets matching '{{entity}}' were found.",
-        "asset-required": "Asset is required",
+        "asset-required": "Asset is required.",
         "name-starts-with": "Asset name expression",
         "help-text": "Use '%' according to need: '%asset_name_contains%', '%asset_name_ends', 'asset_starts_with'.",
         "import": "Import assets",
@@ -1214,12 +1214,17 @@
         "copy-output-key": "Copy output key",
         "aggregation-path-related-entities": "Aggregation path to related entities",
         "deduplication-interval": "Deduplication interval",
-        "deduplication-interval-min": "Deduplication interval should be at least {{ sec }} second.",
+        "deduplication-interval-min": "Deduplication interval should be at least {{ sec }} seconds.",
         "deduplication-interval-required": "Deduplication interval is required.",
         "metrics": {
             "metrics": "Metrics",
             "metrics-empty": "At least one metric must be configured.",
             "metric-name": "Metric name",
+            "metric-name-required": "Metric name is required.",
+            "metric-name-pattern": "Metric name is invalid.",
+            "metric-name-duplicate": "Metric name with such name already exists.",
+            "metric-name-max-length": "Metric name should be less than 256 characters.",
+            "metric-name-forbidden": "Metric name is reserved and cannot be used.",
             "copy-metric-name": "Copy metric name",
             "aggregation": "Aggregation",
             "aggregation-type": {
@@ -1305,7 +1310,7 @@
             "arguments-propagate-arguments-with-rolling": "'Time series rolling' type is incompatible with 'Arguments only' propagation.",
             "arguments-propagate-argument-entity-type": "Entity type is incompatible with 'Arguments only' propagation.",
             "arguments-propagate-argument-must-current-entity": "At least one argument must be configured with the 'Current entity' source entity type.",
-            "arguments-empty": "Arguments should not be empty.",
+            "arguments-empty": "At least one argument should be specified.",
             "expression-required": "Expression is required.",
             "expression-invalid": "Expression is invalid",
             "expression-max-length": "Expression length should be less than 255 characters.",
@@ -1345,13 +1350,14 @@
             "max-geofencing-zone": "Maximum number of geofencing zones reached.",
             "zone-group-refresh-interval": "Defines how often zone groups configured via related entities are refreshed.",
             "zone-group-refresh-interval-required": "Zone groups refresh interval is required.",
-            "zone-group-refresh-interval-min": "Zone group refresh interval should be at least {{ min }} second.",
+            "zone-group-refresh-interval-min": "Zone group refresh interval should be at least {{ min }} seconds.",
             "propagation-path-related-entities": "Defines a direct, single-level path to a related entity based on the selected direction and relation type.",
             "data-propagate": "Defines the data to be propagated from the arguments configured below. 'Arguments only' uses the retrieved data directly, while 'Expression result' calculates a new value from that data.",
             "aggregation-path-related-entities": "Defines a single-level aggregation path via direct relations with parent or child entities based on direction and relation type. Only relations between device, asset, customer, and tenant entities are supported.",
             "arguments-aggregation": "Defines input parameters used for filtering and aggregation.",
             "setting-arguments-aggregation": "Data will be fetched from related entities configured in aggregation path.",
-            "metrics": "Defines metrics aggregated based on the configured arguments."
+            "metrics": "Defines metrics aggregated based on the configured arguments.",
+            "import-invalid-calculated-field-type": "Unable to import calculated field: Invalid calculated field type."
         }
     },
     "alarm-rule": {
@@ -1405,6 +1411,7 @@
         "value-type": "Value type",
         "general": "General",
         "filter": "Filter",
+        "date-time-hint": "The argument must be in epoch milliseconds. Example: 1698839340000 equals 2023-11-01 12:49:00 UTC.",
         "operation": "Operation",
         "value-source": "Value source",
         "value": "Value",
@@ -1441,6 +1448,7 @@
         "schedule-time-from": "From",
         "schedule-time-to": "To",
         "schedule-days-of-week-required": "At least one day of week should be selected.",
+        "tbel": "TBEL",
         "expression-type": {
             "simple": "Simple",
             "script": "Script"
@@ -1463,13 +1471,14 @@
         "alarm-rule-mobile-dashboard-hint": "Used by mobile application as an alarm details dashboard",
         "alarm-rule-no-mobile-dashboard": "No dashboard selected",
         "alarm-rule-condition": "Alarm rule condition",
-        "enter-alarm-rule-condition-prompt": "Please add alarm rule condition",
+        "enter-alarm-rule-condition-prompt": "Add alarm rule creating condition",
+        "enter-alarm-rule-clear-condition-prompt": "Add alarm rule clearing condition",
         "edit-alarm-rule-condition": "Edit alarm rule condition",
         "condition-type": "Condition type",
         "select-alarm-severity": "Select alarm severity",
-        "add-create-alarm-rule-prompt": "Please add create alarm rule",
-        "add-create-alarm-rule": "Add create condition",
-        "add-clear-alarm-rule": "Add clear condition",
+        "add-create-alarm-rule-prompt": "At least one creation condition should be specified",
+        "add-create-alarm-rule": "Add creation condition",
+        "add-clear-alarm-rule": "Add clearing condition",
         "condition-duration": "Condition duration",
         "condition-duration-value": "Duration value",
         "condition-duration-time-unit": "Time unit",
@@ -1481,9 +1490,9 @@
         "condition-repeating-value-range": "Count of events should be in a range from 1 to 2147483647.",
         "condition-repeating-value-pattern": "Count of events should be integers.",
         "condition-repeating-value-required": "Count of events is required.",
-        "create-conditions": "Create conditions",
-        "clear-condition": "Clear condition",
-        "no-clear-alarm-rule": "No clear condition configured",
+        "create-conditions": "Creation conditions",
+        "clear-condition": "Clearing condition",
+        "no-clear-alarm-rule": "Clearing condition not configured",
         "advanced-settings": "Advanced settings",
         "propagate-alarm": "Propagate alarm to related entities",
         "alarm-rule-relation-types-list": "Relation types",
@@ -1497,7 +1506,8 @@
         "no-alarm-rule-types-matching": "No alarm rule types matching '{{entitySubtype}}' were found.",
         "alarm-rule-type-list-empty": "No alarm rule types selected.",
         "alarm-rule-type-list": "Alarm rule type list",
-        "alarm-rule-entity-list": "Entity list"
+        "alarm-rule-entity-list": "Entity list",
+        "import-invalid-alarm-rule-type": "Unable to import alarm rule: Invalid alarm rule type."
     },
     "ai-models": {
         "ai-models": "AI models",
@@ -1708,7 +1718,7 @@
         "idCopiedMessage": "Customer Id has been copied to clipboard",
         "select-customer": "Select customer",
         "no-customers-matching": "No customers matching '{{entity}}' were found.",
-        "customer-required": "Customer is required",
+        "customer-required": "Customer is required.",
         "select-default-customer": "Select default customer",
         "default-customer": "Default customer",
         "default-customer-required": "Default customer is required in order to debug dashboard on Tenant level",