fix: frontend script getTag value

frangoteam · Mar 13, 2024 · 266841d · 266841d
1 parent 17466c1
commit 266841d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 6 deletions.
diff --git a/client/src/app/_services/project.service.ts b/client/src/app/_services/project.service.ts
@@ -1,6 +1,6 @@
 
 import { Injectable, Output, EventEmitter } from '@angular/core';
-import { Observable, Subject } from 'rxjs';
+import { Observable, Subject, firstValueFrom } from 'rxjs';
 
 import { environment } from '../../environments/environment';
 import { ProjectData, ProjectDataCmdType, UploadFile } from '../_models/project';
@@ -858,6 +858,11 @@ export class ProjectService {
     }
     //#endregion
 
+    async getTagsValues(tagsIds: string[]): Promise<any[]> {
+        let values = await firstValueFrom(this.storage.getTagsValues(tagsIds));
+        return values;
+    }
+
     /**
      * Set Project data and save resource to backend
      * Used from open and upload JSON Project file

diff --git a/client/src/app/_services/rcgi/resclient.service.ts b/client/src/app/_services/rcgi/resclient.service.ts
@@ -162,6 +162,12 @@ export class ResClientService implements ResourceStorageService {
         });
     }
 
+    getTagsValues(query: string[]): Observable<any> {
+        return new Observable((observer) => {
+            observer.error('Not supported!');
+        });
+    }
+
     heartbeat(activity: boolean): Observable<any> {
         return new Observable(observer => {
             observer.error('Not supported!');

diff --git a/client/src/app/_services/rcgi/resdemo.service.ts b/client/src/app/_services/rcgi/resdemo.service.ts
@@ -106,6 +106,12 @@ export class ResDemoService implements ResourceStorageService {
         });
     }
 
+    getTagsValues(query: string[]): Observable<any> {
+        return new Observable((observer) => {
+            observer.error('Not supported!');
+        });
+    }
+
     heartbeat(activity: boolean): Observable<any> {
         return new Observable(observer => {
             observer.error('Not supported!');

diff --git a/client/src/app/_services/rcgi/resource-storage.service.ts b/client/src/app/_services/rcgi/resource-storage.service.ts
@@ -46,6 +46,8 @@ export abstract class ResourceStorageService {
 
     public abstract downloadFile(fileName: string, type: CommanType): Observable<Blob>;
 
+    public abstract getTagsValues(query: string[]): Observable<any>;
+
     public static defileProject(source: ProjectData): ProjectData {
         if (!source) {return source;}
         let destination = JSON.parse(JSON.stringify(source));

diff --git a/client/src/app/_services/rcgi/reswebapi.service.ts b/client/src/app/_services/rcgi/reswebapi.service.ts
@@ -117,6 +117,12 @@ export class ResWebApiService implements ResourceStorageService {
         return this.http.get<any>(this.endPointConfig + '/api/daq', { headers: header, params });
     }
 
+    getTagsValues(tagsIds: string[]): Observable<any> {
+        let header = new HttpHeaders({ 'Content-Type': 'application/json' });
+        let params = { ids: JSON.stringify(tagsIds) };
+        return this.http.get<any>(this.endPointConfig + '/api/getTagValue', { headers: header, params });
+    }
+
     heartbeat(activity: boolean): Observable<any> {
         let header = new HttpHeaders({ 'Content-Type': 'application/json' });
         return this.http.post<any>(this.endPointConfig + '/api/heartbeat', { headers: header, params: activity });

diff --git a/client/src/app/_services/script.service.ts b/client/src/app/_services/script.service.ts
@@ -7,6 +7,7 @@ import { environment } from '../../environments/environment';
 import { Script, ScriptMode } from '../_models/script';
 import { ProjectService } from './project.service';
 import { HmiService, ScriptCommandEnum, ScriptCommandMessage } from './hmi.service';
+import { Utils } from '../_helpers/utils';
 
 @Injectable({
     providedIn: 'root'
@@ -41,7 +42,8 @@ export class ScriptService {
                     console.warn('TODO: Script with mode CLIENT not work with parameters.');
                 }
                 try {
-                    const result = eval(this.addSysFunctions(script.code));
+                    const asyncScript = `(async () => { ${this.addSysFunctions(script.code)} })();`;
+                    const result = eval(asyncScript);
                     observer.next(result);
                 } catch (err) {
                     console.error(err);
@@ -56,23 +58,29 @@ export class ScriptService {
             console.warn('TODO: Script with mode CLIENT not work with parameters.');
         }
         try {
-            eval(this.addSysFunctions(script.code));
+            const asyncScript = `(async () => { ${this.addSysFunctions(script.code)} })();`;
+            eval(asyncScript);
         } catch (err) {
             console.error(err);
         }
     }
 
     private addSysFunctions(scriptCode: string): string {
-        let code = scriptCode.replace(/\$getTag\(/g, 'this.$getTag(');
+        let code = scriptCode.replace(/\$getTag\(/g, 'await this.$getTag(');
         code = code.replace(/\$setTag\(/g, 'this.$setTag(');
         code = code.replace(/\$getTagId\(/g, 'this.$getTagId(');
         code = code.replace(/\$setView\(/g, 'this.$setView(');
         code = code.replace(/\$enableDevice\(/g, 'this.$enableDevice(');
         return code;
     }
 
-    public $getTag(id: string) {
-        return this.projectService.getTagFromId(id)?.value;
+    public async $getTag(id: string) {
+        let tag = this.projectService.getTagFromId(id);
+        if (!Utils.isNullOrUndefined(tag?.value)) {
+            return tag.value;
+        }
+        let values = await this.projectService.getTagsValues([id]);
+        return values[0]?.value;
     }
 
     public $setTag(id: string, value: any) {