From 9589317e9750bea3190798c8060deb522ada1e85 Mon Sep 17 00:00:00 2001
From: mpetrov <mpetrov@thingsboard.io>
Date: Tue, 11 Feb 2025 16:25:01 +0200
Subject: [PATCH] preserve edit dialog on test

---
 .../calculated-fields-table-config.ts             | 15 +++++++++------
 .../dialog/calculated-field-dialog.component.ts   |  5 ++++-
 ...lculated-field-script-test-dialog.component.ts |  6 +++---
 .../app/shared/models/calculated-field.models.ts  |  6 +++++-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
index 318ffaca66..966ac5f008 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-fields-table-config.ts
@@ -39,7 +39,7 @@ import {
   CalculatedField,
   CalculatedFieldDebugDialogData,
   CalculatedFieldDialogData,
-  CalculatedFieldTestScriptInputParams,
+  CalculatedFieldTestScriptDialogData,
 } from '@shared/models/calculated-field.models';
 import {
   CalculatedFieldDebugDialogComponent,
@@ -260,21 +260,24 @@ export class CalculatedFieldsTableConfig extends EntityTableConfig<CalculatedFie
     ).subscribe(() => this.updateData());
   }
 
-  private getTestScriptDialog(calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>): Observable<string> {
-    return this.dialog.open<CalculatedFieldScriptTestDialogComponent, CalculatedFieldTestScriptInputParams, string>(CalculatedFieldScriptTestDialogComponent,
+  private getTestScriptDialog(calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>, openCalculatedFieldEdit = true): Observable<string> {
+    return this.dialog.open<CalculatedFieldScriptTestDialogComponent, CalculatedFieldTestScriptDialogData, string>(CalculatedFieldScriptTestDialogComponent,
       {
         disableClose: true,
         panelClass: ['tb-dialog', 'tb-fullscreen-dialog', 'tb-fullscreen-dialog-gt-xs'],
         data: {
           arguments: argumentsObj ?? Object.keys(calculatedField.configuration.arguments).reduce((acc, key) => { acc[key] = ''; return acc; }, {}),
           expression: calculatedField.configuration.expression,
+          openCalculatedFieldEdit
         }
       }).afterClosed()
       .pipe(
         filter(Boolean),
-        tap(expression =>
-          this.editCalculatedField({...calculatedField, configuration: {...calculatedField.configuration, expression } }, true)
-        ),
+        tap(expression => {
+          if (openCalculatedFieldEdit) {
+            this.editCalculatedField({...calculatedField, configuration: {...calculatedField.configuration, expression } }, true)
+          }
+        }),
       );
   }
 }
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
index 04e1b539dd..e75c962268 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.ts
@@ -121,7 +121,10 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
   }
 
   onTestScript(): void {
-    this.data.getTestScriptDialogFn(this.fromGroupValue).subscribe();
+    this.data.getTestScriptDialogFn(this.fromGroupValue, null, false).subscribe(expression => {
+      this.configFormGroup.get('expressionSCRIPT').setValue(expression);
+      this.configFormGroup.get('expressionSCRIPT').markAsDirty();
+    });
   }
 
   private applyDialogData(): void {
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts
index bd19a68045..94ffeeea52 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/test-dialog/calculated-field-script-test-dialog.component.ts
@@ -37,7 +37,7 @@ import { beautifyJs } from '@shared/models/beautify.models';
 import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { filter } from 'rxjs/operators';
-import { CalculatedFieldTestScriptInputParams } from '@shared/models/calculated-field.models';
+import { CalculatedFieldTestScriptDialogData } from '@shared/models/calculated-field.models';
 
 @Component({
   selector: 'tb-calculated-field-script-test-dialog',
@@ -66,7 +66,7 @@ export class CalculatedFieldScriptTestDialogComponent extends DialogComponent<Ca
 
   constructor(protected store: Store<AppState>,
               protected router: Router,
-              @Inject(MAT_DIALOG_DATA) public data: CalculatedFieldTestScriptInputParams,
+              @Inject(MAT_DIALOG_DATA) public data: CalculatedFieldTestScriptDialogData,
               protected dialogRef: MatDialogRef<CalculatedFieldScriptTestDialogComponent, string>,
               private dialog: MatDialog,
               private fb: FormBuilder,
@@ -123,7 +123,7 @@ export class CalculatedFieldScriptTestDialogComponent extends DialogComponent<Ca
               }));
             return NEVER;
           } else {
-            if (onSave) {
+            if (onSave && this.data.openCalculatedFieldEdit) {
               this.dialog.closeAll();
             }
             return of(result.output);
diff --git a/ui-ngx/src/app/shared/models/calculated-field.models.ts b/ui-ngx/src/app/shared/models/calculated-field.models.ts
index 19b53bc91e..9e37523cab 100644
--- a/ui-ngx/src/app/shared/models/calculated-field.models.ts
+++ b/ui-ngx/src/app/shared/models/calculated-field.models.ts
@@ -127,7 +127,7 @@ export interface CalculatedFieldArgumentValue extends CalculatedFieldArgument {
   argumentName: string;
 }
 
-export type CalculatedFieldTestScriptFn = (calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>) => Observable<string>;
+export type CalculatedFieldTestScriptFn = (calculatedField: CalculatedField, argumentsObj?: Record<string, unknown>, closeAllOnSave?: boolean) => Observable<string>;
 
 export interface CalculatedFieldDialogData {
   value?: CalculatedField;
@@ -152,6 +152,10 @@ export interface CalculatedFieldTestScriptInputParams {
   expression: string;
 }
 
+export interface CalculatedFieldTestScriptDialogData extends CalculatedFieldTestScriptInputParams {
+  openCalculatedFieldEdit?: boolean;
+}
+
 export interface ArgumentEntityTypeParams {
   title: string;
   entityType: EntityType