Merge pull request #2764 from vvlladd28/bug/3.0/tooltip

[3.0] Fix tooltip data

@@ -496,7 +496,7 @@ export function padValue(val: any, dec: number): string {
   val = Math.abs(val);
   val = Math.abs(val);
 
 
   if (dec > 0) {
   if (dec > 0) {
-    strVal = val.toFixed(dec).toString()
+    strVal = val.toFixed(dec);
   } else {
   } else {
     strVal = Math.round(val).toString();
     strVal = Math.round(val).toString();
   }
   }

@@ -20,7 +20,7 @@ import { Datasource } from '@app/shared/models/widget.models';
 import _ from 'lodash';
 import _ from 'lodash';
 import { Observable, Observer, of } from 'rxjs';
 import { Observable, Observer, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { map } from 'rxjs/operators';
-import { createLabelFromDatasource, hashCode, padValue } from '@core/utils';
+import { createLabelFromDatasource, hashCode, isNumber, padValue } from '@core/utils';
 
 
 export function createTooltip(target: L.Layer,
 export function createTooltip(target: L.Layer,
     settings: MarkerSettings | PolylineSettings | PolygonSettings,
     settings: MarkerSettings | PolylineSettings | PolygonSettings,
@@ -43,8 +43,9 @@ export function createTooltip(target: L.Layer,
         const actions = document.getElementsByClassName('tb-custom-action');
         const actions = document.getElementsByClassName('tb-custom-action');
         Array.from(actions).forEach(
         Array.from(actions).forEach(
             (element: HTMLElement) => {
             (element: HTMLElement) => {
-                if (element && settings.tooltipAction[element.id]) {
-                    element.addEventListener('click', ($event) => settings.tooltipAction[element.id]($event, datasource));
+                const actionName = element.getAttribute('data-action-name');
+                if (element && settings.tooltipAction[actionName]) {
+                    element.addEventListener('click', ($event) => settings.tooltipAction[actionName]($event, datasource));
                 }
                 }
             });
             });
     });
     });
@@ -111,38 +112,81 @@ export function aspectCache(imageUrl: string): Observable<number> {
 
 
 export type TranslateFunc = (key: string, defaultTranslation?: string) => string;
 export type TranslateFunc = (key: string, defaultTranslation?: string) => string;
 
 
+const varsRegex = /\${([^}]*)}/g;
+const linkActionRegex = /<link-act name=['"]([^['"]*)['"]>([^<]*)<\/link-act>/g;
+const buttonActionRegex = /<button-act name=['"]([^['"]*)['"]>([^<]*)<\/button-act>/g;
+
+function createLinkElement(actionName: string, actionText: string): string {
+  return `<a href="#" class="tb-custom-action" data-action-name=${actionName}>${actionText}</a>`;
+}
+
+function createButtonElement(actionName: string, actionText: string) {
+  return `<button mat-button class="tb-custom-action" data-action-name=${actionName}>${actionText}</button>`;
+}
+
 function parseTemplate(template: string, data: { $datasource?: Datasource, [key: string]: any },
 function parseTemplate(template: string, data: { $datasource?: Datasource, [key: string]: any },
-                              translateFn?: TranslateFunc) {
+                       translateFn?: TranslateFunc) {
   let res = '';
   let res = '';
   try {
   try {
-    if (template.match(/<link-act/g)) {
-      template = template.replace(/<link-act/g, '<a href="#"').replace(/link-act>/g, 'a>')
-        .replace(/name=(['"])(.*?)(['"])/g, `class='tb-custom-action' id='$2'`);
-    }
     if (translateFn) {
     if (translateFn) {
       template = translateFn(template);
       template = translateFn(template);
     }
     }
     template = createLabelFromDatasource(data.$datasource, template);
     template = createLabelFromDatasource(data.$datasource, template);
-    const formatted = template.match(/\${([^}]*):\d*}/g);
-    if (formatted)
-      formatted.forEach(value => {
-        const [variable, digits] = value.replace('${', '').replace('}', '').split(':');
-        data[variable] = padValue(data[variable], +digits);
-        if (data[variable] === 'NaN') data[variable] = '';
-        template = template.replace(value, '${' + variable + '}');
-      });
-    const variables = template.match(/\${.*?}/g);
-    if (variables) {
-      variables.forEach(variable => {
-        variable = variable.replace('${', '').replace('}', '');
-        if (!data[variable])
-          data[variable] = '';
-      })
+
+    let match = varsRegex.exec(template);
+    while (match !== null) {
+      const variable = match[0];
+      let label = match[1];
+      let valDec = 2;
+      const splitValues = label.split(':');
+      if (splitValues.length > 1) {
+        label = splitValues[0];
+        valDec = parseFloat(splitValues[1]);
+      }
+
+      if (label.startsWith('#')) {
+        const keyIndexStr = label.substring(1);
+        const n = Math.floor(Number(keyIndexStr));
+        if (String(n) === keyIndexStr && n >= 0) {
+          label = data.$datasource.dataKeys[n].label;
+        }
+      }
+
+      const value = data[label];
+      let textValue: string;
+      if (isNumber(value)) {
+        textValue = padValue(value, valDec);
+      } else {
+        textValue = value;
+      }
+      template = template.split(variable).join(textValue);
+      match = varsRegex.exec(template);
+    }
+
+    let actionTags: string;
+    let actionText: string;
+    let actionName: string;
+    let action: string;
+
+    match = linkActionRegex.exec(template);
+    while (match !== null) {
+      [actionTags, actionName, actionText] = match;
+      action = createLinkElement(actionName, actionText);
+      template = template.split(actionTags).join(action);
+      match = linkActionRegex.exec(template);
     }
     }
+
+    match = buttonActionRegex.exec(template);
+    while (match !== null) {
+      [actionTags, actionName, actionText] = match;
+      action = createButtonElement(actionName, actionText);
+      template = template.split(actionTags).join(action);
+      match = buttonActionRegex.exec(template);
+    }
+
     const compiled = _.template(template);
     const compiled = _.template(template);
     res = compiled(data);
     res = compiled(data);
-  }
-  catch (ex) {
+  } catch (ex) {
     console.log(ex, template)
     console.log(ex, template)
   }
   }
   return res;
   return res;