versacall-dashboards-library-react 2.0.23 → 2.0.26

package/dist/functions/calculateDashboardVariables.js

@@ -70,31 +70,29 @@ function calculateDashboardVariables(variables, dashboardVariables) {
       defaultValue: '0'
     };
 
-    if (variableProcessed.result.type === 'error') {
+    if (dashboardProcessedVariable.type === 'formula') {
+      result.value = "".concat(dashboardProcessedVariable.formula);
+      result.defaultValue = "".concat(dashboardProcessedVariable.defaultValue);
+      result.format = _objectSpread({}, dashboardProcessedVariable.format); // result.numberOfDecimalPlaces = dashboardProcessedVariable.format.numberOfDecimalPlaces; // NOTE: Not necessary as it is part of format...
+
+      result.dependencies = findDependencies(result.value);
+
+      if (result.dependencies.includes(dashboardProcessedVariable.name)) {
+        result.value = result.defaultValue;
+        result.dependencies = [];
+      }
+    } else if (variableProcessed.result.type === 'error') {
       result.value = variableProcessed.result.message;
     } else if (dashboardProcessedVariable.format.type === 'text') {
       result.value = variableProcessed.result.value;
     } else if (dashboardProcessedVariable.format.type === 'number') {
-      if (dashboardProcessedVariable.type === 'formula') {
-        result.value = "".concat(dashboardProcessedVariable.formula);
-        result.defaultValue = "".concat(dashboardProcessedVariable.defaultValue);
-        result.format = _objectSpread({}, dashboardProcessedVariable.format);
-        result.numberOfDecimalPlaces = dashboardProcessedVariable.format.numberOfDecimalPlaces;
-        result.dependencies = findDependencies(result.value);
-
-        if (result.dependencies.includes(dashboardProcessedVariable.name)) {
-          result.value = result.defaultValue;
-          result.dependencies = [];
-        }
-      } else {
-        var theNumber = Number(variableProcessed.result.type === 'vector' ? variableProcessed.result.calculated : variableProcessed.result.value);
+      var theNumber = Number(variableProcessed.result.type === 'vector' ? variableProcessed.result.calculated : variableProcessed.result.value);
 
-        if (!(typeof theNumber === 'number' && theNumber !== Infinity)) {
-          theNumber = 0;
-        }
-
-        result.value = "".concat(theNumber.toFixed(dashboardProcessedVariable.format.numberOfDecimalPlaces));
+      if (!(typeof theNumber === 'number' && theNumber !== Infinity)) {
+        theNumber = 0;
       }
+
+      result.value = "".concat(theNumber.toFixed(dashboardProcessedVariable.format.numberOfDecimalPlaces));
     } else if (dashboardProcessedVariable.format.type === 'timespan') {
       var _theNumber = Number(variableProcessed.result.type === 'vector' ? variableProcessed.result.calculated : variableProcessed.result.value);
 
@@ -129,13 +127,13 @@ function calculateDashboardVariables(variables, dashboardVariables) {
             theNumber = Number(variablesProcessed[i].defaultValue);
           }
 
-          if (variablesProcessed[i].format && variablesProcessed[i].format.type === 'timespan') {
+          if (variablesProcessed[i].format.type === 'timespan') {
             variablesProcessed[i].value = (0, _convertSecondsToElapsedTime.default)(theNumber, 'H:M:S');
           } else {
-            variablesProcessed[i].value = "".concat(theNumber.toFixed(variablesProcessed[i].numberOfDecimalPlaces));
+            variablesProcessed[i].value = "".concat(theNumber.toFixed(variablesProcessed[i].format.numberOfDecimalPlaces));
           }
         } catch (error) {
-          variablesProcessed[i].value = "".concat(Number(variablesProcessed[i].defaultValue).toFixed(variablesProcessed[i].numberOfDecimalPlaces));
+          variablesProcessed[i].value = "".concat(Number(variablesProcessed[i].defaultValue).toFixed(variablesProcessed[i].format.numberOfDecimalPlaces));
         }
       }
     }

package/package.json

@@ -2,10 +2,10 @@
   "versacall": {
     "title": "Versacall Dashboards Library React",
     "applicationType": "react-library",
-    "build": 23
+    "build": 26
   },
   "name": "versacall-dashboards-library-react",
-  "version": "2.0.23",
+  "version": "2.0.26",
   "description": "Versacall Dashboards Library",
   "main": "dist/index.js",
   "module": "dist/index.js",