UI: Improved alarm rules detail panel/page

ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field-form.service.ts → ui-ngx/src/app/core/services/calculated-field-form.service.ts

@@ -30,7 +30,6 @@ import { isDefined } from '@core/utils';
 import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
 import { CalculatedFieldsTableEntity } from '@home/components/calculated-fields/calculated-fields-table-config';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { EntityType } from '@shared/models/entity-type.models';
 
 @Injectable({ providedIn: 'root' })
 export class CalculatedFieldFormService {
@@ -40,13 +39,32 @@ export class CalculatedFieldFormService {
   buildForm(): FormGroup {
     return this.fb.group({
       name: ['', [Validators.required, Validators.pattern(oneSpaceInsideRegex), Validators.maxLength(255)]],
-      entityId: [{type: EntityType.DEVICE_PROFILE, id: null}, Validators.required],
+      entityId: [null, Validators.required],
       type: [CalculatedFieldType.SIMPLE],
       debugSettings: [],
       configuration: this.fb.control<CalculatedFieldConfiguration>({} as CalculatedFieldConfiguration),
     });
   }
 
+  buildAlarmRuleForm(): FormGroup {
+    return this.fb.group({
+      name: ['', [Validators.required, Validators.pattern(oneSpaceInsideRegex), Validators.maxLength(255)]],
+      entityId: [null, Validators.required],
+      type: [CalculatedFieldType.ALARM],
+      debugSettings: [],
+      configuration: this.fb.group({
+        type: [CalculatedFieldType.ALARM],
+        arguments: this.fb.control({}, Validators.required),
+        propagate: [false],
+        propagateToOwner: [false],
+        propagateToTenant: [false],
+        propagateRelationTypes: [null],
+        createRules: [null, Validators.required],
+        clearRule: [null],
+      }),
+    });
+  }
+
   setupTypeChange(form: FormGroup, destroyRef: DestroyRef, isEditActive?: () => boolean): void {
     form.get('type').valueChanges.pipe(
       pairwise(),

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

@@ -58,31 +58,14 @@
           />
         </div>
         @if (!data.entityId) {
-          <div class="flex flex-row gap-4 xs:flex-col" formGroupName="entityId">
+          <tb-entity-select formControlName="entityId"
-            <tb-entity-type-select #entityTypeSelect
+                            appearance="outline"
-                                   appearance="outline"
+                            required
-                                   subscriptSizing="dynamic"
+                            [filterAllowedEntityTypes]="false"
-                                   class="flex-1"
+                            [allowedEntityTypes]="alarmRuleEntityTypeList"
-                                   showLabel
+                            [defaultEntityType]="EntityType.DEVICE_PROFILE"
-                                   required
+                            (entityChanged)="changeEntity($event)">
-                                   label="{{ 'entity.entity-type' | translate }}"
+          </tb-entity-select>
-                                   [filterAllowedEntityTypes]="false"
-                                   [allowedEntityTypes]="alarmRuleEntityTypeList"
-                                   formControlName="entityType">
-            </tb-entity-type-select>
-            @if (fieldFormGroup.get('entityId.entityType').value) {
-              <tb-entity-autocomplete #entityAutocompleteComponent
-                                      formControlName="id"
-                                      appearance="outline"
-                                      subscriptSizing="dynamic"
-                                      class="flex-1"
-                                      [placeholder]="'action.set' | translate"
-                                      [required]="true"
-                                      [entityType]="fieldFormGroup.get('entityId.entityType').value"
-                                      (entityChanged)="changeEntity($event)"
-              />
-            }
-          </div>
         }
       </div>
       <ng-container formGroupName="configuration">

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

@@ -14,16 +14,15 @@
 /// limitations under the License.
 ///
 
-import { Component, DestroyRef, Inject, ViewChild, ViewEncapsulation } from '@angular/core';
+import { Component, DestroyRef, Inject, ViewEncapsulation } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { FormGroup } from '@angular/forms';
 import { Router } from '@angular/router';
 import { DialogComponent } from '@shared/components/dialog.component';
 import { CalculatedField, CalculatedFieldArgument, CalculatedFieldType } from '@shared/models/calculated-field.models';
-import { oneSpaceInsideRegex } from '@shared/models/regex.constants';
+import { EntityType, entityTypeTranslations } from '@shared/models/entity-type.models';
-import { AliasEntityType, EntityType, entityTypeTranslations } from '@shared/models/entity-type.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ScriptLanguage } from '@shared/models/rule-node.models';
 import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
@@ -39,13 +38,11 @@ import {
 } from "@shared/models/alarm-rule.models";
 import { deepTrim } from "@core/utils";
 import { combineLatest, Observable } from "rxjs";
-import { debounceTime, startWith, switchMap } from "rxjs/operators";
+import { debounceTime, startWith } from "rxjs/operators";
-import { EntityTypeSelectComponent } from "@shared/components/entity/entity-type-select.component";
-import { EntityAutocompleteComponent } from "@shared/components/entity/entity-autocomplete.component";
-import { EntityService } from "@core/http/entity.service";
 import { RelationTypes } from "@shared/models/relation.models";
 import { StringItemsOption } from "@shared/components/string-items-list.component";
 import { BaseData } from "@shared/models/base-data";
+import { CalculatedFieldFormService } from '@core/services/calculated-field-form.service';
 
 export interface AlarmRuleDialogData {
   value?: CalculatedField;
@@ -67,24 +64,7 @@ export interface AlarmRuleDialogData {
 })
 export class AlarmRuleDialogComponent extends DialogComponent<AlarmRuleDialogComponent, CalculatedField> {
 
-  fieldFormGroup = this.fb.group({
+  fieldFormGroup: FormGroup ;
-    name: ['', [Validators.required, Validators.pattern(oneSpaceInsideRegex), Validators.maxLength(255)]],
-    type: [CalculatedFieldType.ALARM],
-    debugSettings: [],
-    entityId: this.fb.group({
-      entityType: this.fb.control<EntityType | AliasEntityType | null>(EntityType.DEVICE_PROFILE, Validators.required),
-      id: [null as null | string, Validators.required],
-    }),
-    configuration: this.fb.group({
-      arguments: this.fb.control({}, Validators.required),
-      propagate: [false],
-      propagateToOwner: [false],
-      propagateToTenant: [false],
-      propagateRelationTypes: [null],
-      createRules: [null, Validators.required],
-      clearRule: [null],
-    }),
-  });
 
   additionalDebugActionConfig = this.data.value?.id ? {
     ...this.data.additionalDebugActionConfig,
@@ -105,18 +85,15 @@ export class AlarmRuleDialogComponent extends DialogComponent<AlarmRuleDialogCom
   disabledArguments = false;
   isLoading = false;
 
-  @ViewChild('entityTypeSelect') entityTypeSelect: EntityTypeSelectComponent;
-  @ViewChild('entityAutocompleteComponent') entityAutocompleteComponent: EntityAutocompleteComponent;
-
   constructor(protected store: Store<AppState>,
               protected router: Router,
               @Inject(MAT_DIALOG_DATA) public data: AlarmRuleDialogData,
               protected dialogRef: MatDialogRef<AlarmRuleDialogComponent, CalculatedField>,
               private calculatedFieldsService: CalculatedFieldsService,
-              private entityService: EntityService,
               private destroyRef: DestroyRef,
-              private fb: FormBuilder) {
+              private cfFormService: CalculatedFieldFormService) {
     super(store, router, dialogRef);
+    this.fieldFormGroup = this.cfFormService.buildAlarmRuleForm();
     this.applyDialogData();
     this.updateRulesValidators();
 
@@ -132,7 +109,7 @@ export class AlarmRuleDialogComponent extends DialogComponent<AlarmRuleDialogCom
 
     if (!this.data.entityId) {
       combineLatest([
-        this.fieldFormGroup.get('entityId.id')!.valueChanges.pipe(startWith(this.fieldFormGroup.get('entityId.id')!.value)),
+        this.fieldFormGroup.get('entityId')!.valueChanges.pipe(startWith(this.fieldFormGroup.get('entityId')!.value)),
         this.fieldFormGroup.get('name')!.valueChanges.pipe(startWith(this.fieldFormGroup.get('name')!.value))
       ]).pipe(
         debounceTime(50),
@@ -196,8 +173,6 @@ export class AlarmRuleDialogComponent extends DialogComponent<AlarmRuleDialogCom
         });
     } else {
       this.fieldFormGroup.get('name').markAsTouched();
-      this.entityTypeSelect?.markAsTouched();
-      this.entityAutocompleteComponent?.markAsTouched();
     }
   }
 
@@ -207,18 +182,13 @@ export class AlarmRuleDialogComponent extends DialogComponent<AlarmRuleDialogCom
   }
 
   onTestScript(expression: string): Observable<string> {
-    const calculatedFieldId = this.data.value?.id?.id;
+    return this.cfFormService.testScript(
-    if (calculatedFieldId) {
+      this.data.value?.id?.id,
-      return this.calculatedFieldsService.getLatestCalculatedFieldDebugEvent(calculatedFieldId, {ignoreLoading: true})
+      this.fromGroupValue,
-        .pipe(
+      this.data.getTestScriptDialogFn,
-          switchMap(event => {
+      this.destroyRef,
-            const args = event?.arguments ? JSON.parse(event.arguments) : null;
+      expression
-            return this.data.getTestScriptDialogFn(this.fromGroupValue, expression, args, false);
+    );
-          }),
-          takeUntilDestroyed(this.destroyRef)
-        )
-    }
-    return this.data.getTestScriptDialogFn(this.fromGroupValue, expression, null, false);
   }
 
   private updateRulesValidators(): void {
@@ -250,5 +220,4 @@ export class AlarmRuleDialogComponent extends DialogComponent<AlarmRuleDialogCom
   changeEntity(entity: BaseData<EntityId>): void {
     this.entityName = entity.name;
   }
-
 }

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

@@ -36,7 +36,7 @@ import { DestroyRef, Renderer2 } from '@angular/core';
 import { EntityDebugSettings } from '@shared/models/entity.models';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
-import { catchError, filter, switchMap, tap } from 'rxjs/operators';
+import { catchError, filter, first, switchMap, tap } from 'rxjs/operators';
 import {
   ArgumentEntityType,
   ArgumentType,
@@ -186,7 +186,8 @@ export class AlarmRulesTableConfig extends EntityTableConfig<AlarmRuleTableEntit
         name: this.translate.instant('entity-view.events'),
         icon: 'mdi:clipboard-text-clock',
         isEnabled: () => true,
-        onAction: ($event, entity) => this.openDebugEventsDialog($event, entity),
+        onAction: ($event, entity) =>
+          this.pageMode ? this.openDebugTab($event, entity) : this.openDebugEventsDialog($event, entity),
       },
       {
         name: '',
@@ -308,6 +309,22 @@ export class AlarmRulesTableConfig extends EntityTableConfig<AlarmRuleTableEntit
       .subscribe();
   }
 
+  private openDebugTab($event: Event, calculatedField: AlarmRuleTableEntity) {
+    const table = this.getTable();
+    if (!table.isDetailsOpen) {
+      table.toggleEntityDetails($event, calculatedField);
+      if (table.entityDetailsPanel.matTabGroup._tabs.length > 1) {
+        table.entityDetailsPanel.matTabGroup.selectedIndex = 1;
+      } else {
+        table.entityDetailsPanel.matTabGroup._tabs.changes.pipe(
+          first()
+        ).subscribe(() => {
+          table.entityDetailsPanel.matTabGroup.selectedIndex = 1;
+        })
+      }
+    }
+  }
+
   private exportAlarmRule($event: Event, calculatedField: AlarmRuleTableEntity): void {
     $event?.stopPropagation();
     this.importExportService.exportCalculatedField(calculatedField.id.id);
@@ -361,7 +378,7 @@ export class AlarmRulesTableConfig extends EntityTableConfig<AlarmRuleTableEntit
     ).subscribe(() => this.updateData());
   }
 
-  private getTestScriptDialog(calculatedField: AlarmRuleTableEntity, expression: string, argumentsObj?: CalculatedFieldEventArguments, openCalculatedFieldEdit = true): Observable<string> {
+  private getTestScriptDialog(calculatedField: AlarmRuleTableEntity, argumentsObj?: CalculatedFieldEventArguments, openCalculatedFieldEdit = true, expression?: string): Observable<string> {
     if (calculatedField.type === CalculatedFieldType.ALARM) {
       const resultArguments = Object.keys(calculatedField.configuration.arguments).reduce((acc, key) => {
         const type = calculatedField.configuration.arguments[key].refEntityKey.type;

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

@@ -65,6 +65,7 @@
       </div>
       <tb-entity-select formControlName="entityId"
                         appearance="outline"
+                        required
                         [filterAllowedEntityTypes]="false"
                         [allowedEntityTypes]="calculatedFieldsEntityTypeList"
                         (entityChanged)="changeEntity($event)">

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

@@ -14,11 +14,11 @@
 /// limitations under the License.
 ///
 
-import { ChangeDetectorRef, Component, DestroyRef, Inject, Input } from '@angular/core';
+import { ChangeDetectorRef, Component, DestroyRef, inject, Inject, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
-import { EntityComponent } from '../../components/entity/entity.component';
+import { EntityComponent } from '@home/components/entity/entity.component';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { EntityType } from '@shared/models/entity-type.models';
 import { TranslateService } from '@ngx-translate/core';
 import {
@@ -28,13 +28,9 @@ import {
   calculatedFieldsEntityTypeList,
   CalculatedFieldType
 } from '@shared/models/calculated-field.models';
-import { oneSpaceInsideRegex } from '@shared/models/regex.constants';
 import { EntityId } from '@shared/models/id/entity-id';
-import { switchMap } from 'rxjs/operators';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { BaseData } from '@shared/models/base-data';
 import { Observable } from 'rxjs';
-import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
 import { getCurrentAuthUser } from '@core/auth/auth.selectors';
 import {
   CalculatedFieldsTableConfig,
@@ -44,6 +40,7 @@ import { TenantId } from '@shared/models/id/tenant-id';
 import { StringItemsOption } from '@shared/components/string-items-list.component';
 import { RelationTypes } from '@shared/models/relation.models';
 import { AlarmRule, AlarmRuleConditionType, AlarmRuleExpressionType } from '@shared/models/alarm-rule.models';
+import { CalculatedFieldFormService } from '@core/services/calculated-field-form.service';
 
 @Component({
   selector: 'tb-alarm-rules',
@@ -58,20 +55,21 @@ export class AlarmRulesComponent extends EntityComponent<CalculatedFieldsTableEn
   @Input()
   entityName: string;
 
-  readonly tenantId = getCurrentAuthUser(this.store).tenantId;
   readonly ownerId = new TenantId(getCurrentAuthUser(this.store).tenantId);
+  readonly tenantId = getCurrentAuthUser(this.store).tenantId;
   readonly EntityType = EntityType;
   readonly calculatedFieldsEntityTypeList = calculatedFieldsEntityTypeList;
   readonly CalculatedFieldType = CalculatedFieldType;
 
+  private cfFormService = inject(CalculatedFieldFormService);
+  private destroyRef = inject(DestroyRef);
+
   constructor(protected store: Store<AppState>,
               protected translate: TranslateService,
               @Inject('entity') protected entityValue: CalculatedFieldInfo,
               @Inject('entitiesTableConfig') protected entitiesTableConfigValue: CalculatedFieldsTableConfig,
               protected fb: FormBuilder,
-              protected cd: ChangeDetectorRef,
+              protected cd: ChangeDetectorRef) {
-              private destroyRef: DestroyRef,
-              private calculatedFieldsService: CalculatedFieldsService) {
     super(store, fb, entityValue, entitiesTableConfigValue, cd);
   }
 
@@ -107,24 +105,8 @@ export class AlarmRulesComponent extends EntityComponent<CalculatedFieldsTableEn
     this.entityName = entity?.name;
   }
 
-  buildForm(entity?: CalculatedFieldInfo): FormGroup {
+  buildForm(_entity?: CalculatedFieldInfo): FormGroup {
-    const form = this.fb.group({
+    return inject(CalculatedFieldFormService).buildAlarmRuleForm();
-      name: ['', [Validators.required, Validators.pattern(oneSpaceInsideRegex), Validators.maxLength(255)]],
-      entityId: [null],
-      type: [CalculatedFieldType.ALARM],
-      debugSettings: [],
-      configuration: this.fb.group({
-        type: [CalculatedFieldType.ALARM],
-        arguments: this.fb.control({}, Validators.required),
-        propagate: [false],
-        propagateToOwner: [false],
-        propagateToTenant: [false],
-        propagateRelationTypes: [null],
-        createRules: [null, Validators.required],
-        clearRule: [null],
-      }),
-    });
-    return form;
   }
 
   updateForm(entity: CalculatedFieldInfo) {
@@ -138,19 +120,13 @@ export class AlarmRulesComponent extends EntityComponent<CalculatedFieldsTableEn
   }
 
   onTestScript(expression?: string): Observable<string> {
-    const calculatedFieldId = this.entity?.id?.id;
+    return this.cfFormService.testScript(
-    if (calculatedFieldId) {
+      this.entity?.id?.id,
-      return this.calculatedFieldsService.getLatestCalculatedFieldDebugEvent(calculatedFieldId, {ignoreLoading: true})
+      this.entityFormValue(),
-        .pipe(
+      this.entitiesTableConfig.getTestScriptDialog.bind(this.entitiesTableConfig),
-          switchMap(event => {
+      this.destroyRef,
-            const args = event?.arguments ? JSON.parse(event.arguments) : null;
+      expression
-            return this.entitiesTableConfig.getTestScriptDialog(this.entityFormValue(), args, false, expression);
+    );
-          }),
-          takeUntilDestroyed(this.destroyRef)
-        )
-    }
-
-    return this.entitiesTableConfig.getTestScriptDialog(this.entityFormValue(), null, false, expression);
   }
 
   updateFormState() {

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

@@ -15,7 +15,7 @@
     limitations under the License.
 
 -->
-<div class="tb-alarm-rule-condition flex flex-col gap-4 min-w-0" [formGroup]="alarmRuleConditionFormGroup">
+<div class="tb-alarm-rule-condition flex min-w-0 flex-col gap-4" [formGroup]="alarmRuleConditionFormGroup">
   <div class="tb-form-row column-xs">
     <div class="min-w-40 xs:min-w-fit">{{ 'alarm-rule.condition' | translate }}</div>
     <button [disabled]="disabled"
@@ -23,7 +23,7 @@
             class="tb-alarm-rule-condition-button"
             mat-stroked-button [color]="conditionSet() && this.filtersArgumentsValid ? 'primary' : 'warn'"
             (click)="openFilterDialog($event)">
-      <div class="flex items-center gap-2 justify-between">
+      <div class="flex items-center justify-between gap-2">
         <tb-alarm-rule-filter-text [alarmRuleExpression]="alarmRuleConditionFormGroup.get('expression').value"
                                    [arguments]="arguments"
                                    [disabled]="disabled"

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

@@ -137,15 +137,19 @@ export class CfAlarmRuleConditionComponent implements ControlValueAccessor, Vali
   writeValue(value: AlarmRuleCondition): void {
     this.modelValue = value;
     this.updateConditionInfo();
-    if (value) {
+    if (value && !this.disabled) {
-      this.onValidatorChange();
+      if (this.validate(this.alarmRuleConditionFormGroup)) {
+        this.onValidatorChange();
+      }
     }
   }
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.arguments) {
-      if (changes.arguments && !changes.arguments.firstChange && this.modelValue) {
+      if (changes.arguments && !changes.arguments.firstChange && this.modelValue && !this.disabled) {
-        this.onValidatorChange();
+        if (this.validate(this.alarmRuleConditionFormGroup)) {
+          this.onValidatorChange();
+        }
       }
     }
   }
@@ -181,7 +185,7 @@ export class CfAlarmRuleConditionComponent implements ControlValueAccessor, Vali
     this.filtersArgumentsValid = this.areFilterAndPredicateArgumentsValid(this.modelValue, this.arguments);
     this.schedulerArgumentsValid = this.isScheduleArgumentValid(this.modelValue, Object.keys(this.arguments));
     this.onValidatorChange = () => {
-      control.updateValueAndValidity({ emitEvent: true });
+      control.updateValueAndValidity({ emitEvent: !this.disabled });
     };
     return this.conditionSet() && this.filtersArgumentsValid && this.schedulerArgumentsValid ? null : {
       alarmRuleCondition: {
@@ -303,7 +307,7 @@ export class CfAlarmRuleConditionComponent implements ControlValueAccessor, Vali
   }
 
   private updateScheduleText() {
-    let schedule = this.modelValue?.schedule;
+    const schedule = this.modelValue?.schedule;
     this.scheduleText = '';
     if (isDefinedAndNotNull(schedule)) {
       if (schedule.dynamicValueArgument) {

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

@@ -114,13 +114,13 @@ export class CreateCfAlarmRulesComponent implements ControlValueAccessor, Valida
         }
         createAlarmRulesControls.push(this.fb.group({
           severity: [severity, Validators.required],
-          alarmRule: [createAlarmRule, Validators.required]
+          alarmRule: {value: [createAlarmRule, Validators.required], disabled: this.disabled}
         }));
       });
     }
     const formArray = this.createAlarmRulesFormGroup.get('createAlarmRules') as FormArray;
-    formArray.clear();
+    formArray.clear({emitEvent: false});
-    createAlarmRulesControls.forEach(c => formArray.push(c));
+    createAlarmRulesControls.forEach(c => formArray.push(c, {emitEvent: false}));
     if (this.disabled) {
       this.createAlarmRulesFormGroup.disable({emitEvent: false});
     } else {

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

@@ -34,16 +34,6 @@
           [class.!hidden]="hideDelete() || isEdit">
     {{ 'action.delete' | translate }}
   </button>
-  <!--  <div class="flex flex-row xs:flex-col">-->
-  <!--    <button mat-raised-button-->
-  <!--            ngxClipboard-->
-  <!--            (cbOnSuccess)="onAssetProfileIdCopied($event)"-->
-  <!--            [cbContent]="entity?.id?.id"-->
-  <!--            [class.!hidden]="isEdit">-->
-  <!--      <mat-icon svgIcon="mdi:clipboard-arrow-left"></mat-icon>-->
-  <!--      <span translate>asset-profile.copyId</span>-->
-  <!--    </button>-->
-  <!--  </div>-->
 </div>
 <div class="mat-padding flex flex-1 flex-col" [formGroup]="entityForm">
   <div class="tb-form-panel no-border no-padding">
@@ -75,6 +65,7 @@
       </div>
       <tb-entity-select formControlName="entityId"
                         appearance="outline"
+                        required
                         [filterAllowedEntityTypes]="false"
                         [allowedEntityTypes]="calculatedFieldsEntityTypeList"
                         (entityChanged)="changeEntity($event)">

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

@@ -38,7 +38,7 @@ import {
   CalculatedFieldsTableEntity
 } from '@home/components/calculated-fields/calculated-fields-table-config';
 import { TenantId } from '@shared/models/id/tenant-id';
-import { CalculatedFieldFormService } from '@home/components/calculated-fields/calculated-field-form.service';
+import { CalculatedFieldFormService } from '@core/services/calculated-field-form.service';
 
 @Component({
   selector: 'tb-calculated-field',
@@ -55,8 +55,8 @@ export class CalculatedFieldComponent extends EntityComponent<CalculatedFieldsTa
 
   disabledConfiguration = false;
 
-  readonly tenantId = getCurrentAuthUser(this.store).tenantId;
   readonly ownerId = new TenantId(getCurrentAuthUser(this.store).tenantId);
+  readonly tenantId = getCurrentAuthUser(this.store).tenantId;
   readonly EntityType = EntityType;
   readonly calculatedFieldsEntityTypeList = calculatedFieldsEntityTypeList;
   readonly CalculatedFieldType = CalculatedFieldType;

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

@@ -58,6 +58,7 @@
         @if (!data.entityId) {
           <tb-entity-select formControlName="entityId"
                             appearance="outline"
+                            required
                             [filterAllowedEntityTypes]="false"
                             [allowedEntityTypes]="calculatedFieldsEntityTypeList"
                             [defaultEntityType]="EntityType.DEVICE_PROFILE"

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

@@ -37,7 +37,7 @@ import { EntityId } from '@shared/models/id/entity-id';
 import { AdditionalDebugActionConfig } from '@home/components/entity/debug/entity-debug-settings.model';
 import { deepTrim } from '@core/utils';
 import { BaseData } from '@shared/models/base-data';
-import { CalculatedFieldFormService } from '@home/components/calculated-fields/calculated-field-form.service';
+import { CalculatedFieldFormService } from '@core/services/calculated-field-form.service';
 import { FormGroup } from '@angular/forms';
 
 export interface CalculatedFieldDialogData {

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

@@ -21,7 +21,11 @@ import { TimeUnit } from "@shared/models/time/time.models";
 import { ComplexOperation, EntityKeyValueType, FilterPredicateType } from "@shared/models/query/query.models";
 import { EntityType } from "@shared/models/entity-type.models";
 import { Observable } from "rxjs";
-import { CalculatedField, CalculatedFieldArgument } from "@shared/models/calculated-field.models";
+import {
+  CalculatedField,
+  CalculatedFieldArgument,
+  CalculatedFieldEventArguments
+} from "@shared/models/calculated-field.models";
 
 export const alarmRuleEntityTypeList = [EntityType.DEVICE, EntityType.ASSET, EntityType.CUSTOMER, EntityType.DEVICE_PROFILE, EntityType.ASSET_PROFILE];
 
@@ -244,7 +248,7 @@ export const alarmRuleDefaultScript =
   '// Triggers when temperature is above 20 degrees\n' +
   'return temperature > 20;'
 
-export type AlarmRuleTestScriptFn = (calculatedField: CalculatedField, expression: string, argumentsObj?: Record<string, unknown>, closeAllOnSave?: boolean) => Observable<string>;
+export type AlarmRuleTestScriptFn = (calculatedField: CalculatedField, argumentsObj?: CalculatedFieldEventArguments, openCalculatedFieldEdit?: boolean, expression?: string) => Observable<string>;
 
 export function checkPredicates(predicates: any[], validSet: Set<string>): boolean {
   for (const predicate of predicates) {