Merge branch 'feature/calculated-fields-latest-debug-event' of github.com:maxunbearable/thingsboard into feature/cf-merge-function

ui-ngx/src/app/core/http/calculated-fields.service.ts

@@ -23,6 +23,7 @@ import { CalculatedField, CalculatedFieldTestScriptInputParams } from '@shared/m
 import { PageLink } from '@shared/models/page/page-link';
 import { EntityId } from '@shared/models/id/entity-id';
 import { EntityTestScriptResult } from '@shared/models/entity.models';
+import { CalculatedFieldEventBody } from '@shared/models/event.models';
 
 @Injectable({
   providedIn: 'root'
@@ -53,4 +54,8 @@ export class CalculatedFieldsService {
   public testScript(inputParams: CalculatedFieldTestScriptInputParams, config?: RequestConfig): Observable<EntityTestScriptResult> {
     return this.http.post<EntityTestScriptResult>('/api/calculatedField/testScript', inputParams, defaultHttpOptionsFromConfig(config));
   }
+
+  public getLatestCalculatedFieldDebugEvent(id: string, config?: RequestConfig): Observable<CalculatedFieldEventBody> {
+    return this.http.get<CalculatedFieldEventBody>(`/api/calculatedField/${id}/debug`, defaultHttpOptionsFromConfig(config));
+  }
 }

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

@@ -35,10 +35,11 @@ import {
 import { noLeadTrailSpacesRegex } from '@shared/models/regex.constants';
 import { AttributeScope } from '@shared/models/telemetry/telemetry.models';
 import { EntityType } from '@shared/models/entity-type.models';
-import { map, startWith } from 'rxjs/operators';
+import { map, startWith, switchMap } from 'rxjs/operators';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { ScriptLanguage } from '@shared/models/rule-node.models';
 import { CalculatedFieldsService } from '@core/http/calculated-fields.service';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'tb-calculated-field-dialog',
@@ -136,7 +137,23 @@ export class CalculatedFieldDialogComponent extends DialogComponent<CalculatedFi
   }
 
   onTestScript(): void {
-    this.data.getTestScriptDialogFn(this.fromGroupValue, null, false).subscribe(expression => {
+    const calculatedFieldId = this.data.value?.id?.id;
+    let testScriptDialogResult$: Observable<string>;
+
+    if (calculatedFieldId) {
+      testScriptDialogResult$ = this.calculatedFieldsService.getLatestCalculatedFieldDebugEvent(calculatedFieldId)
+        .pipe(
+          switchMap(event => {
+            const args = event?.arguments ? JSON.parse(event.arguments) : null;
+            return this.data.getTestScriptDialogFn(this.fromGroupValue, args, false);
+          }),
+          takeUntilDestroyed(this.destroyRef)
+        )
+    } else {
+      testScriptDialogResult$ = this.data.getTestScriptDialogFn(this.fromGroupValue, null, false);
+    }
+
+    testScriptDialogResult$.subscribe(expression => {
       this.configFormGroup.get('expressionSCRIPT').setValue(expression);
       this.configFormGroup.get('expressionSCRIPT').markAsDirty();
     });