fix: missing reference to process scala read script of tag in mqtt #1533

frangoteam · Dec 19, 2024 · 632e372 · 632e372
1 parent c2bd4b8
commit 632e372
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/client/dist/index.html b/client/dist/index.html
@@ -45,6 +45,6 @@
             </div>
         </div>
     </app-root>
-<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.7a152691747f6f8c.js" type="module"></script>
+<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.f674e57ffaa5b80c.js" type="module"></script>
 
 </body></html>
diff --git a/client/dist/main.7a152691747f6f8c.js → client/dist/main.f674e57ffaa5b80c.js b/client/dist/main.7a152691747f6f8c.js → client/dist/main.f674e57ffaa5b80c.js
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuxa",
-  "version": "1.2.3-2090",
+  "version": "1.2.3-2091",
   "keywords": [],
   "author": "frangoteam <[email protected]>",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",

diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuxa-server",
-  "version": "1.2.3-2090",
+  "version": "1.2.3-2091",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",
   "main": "main.js",
   "scripts": {

diff --git a/server/runtime/devices/ethernetip/index.js b/server/runtime/devices/ethernetip/index.js
@@ -297,7 +297,7 @@ function EthernetIPclient(_data, _logger, _events, _runtime) {
                 var id = itemsMap[key].id;
                 var valueChanged = itemsMap[key].value !== vars[key];
                 itemsMap[key].rawValue = vars[key];
-                itemsMap[key].value = await deviceUtils.tagValueCompose(vars[key], varsValue[id] ? varsValue[id].value : null, itemsMap[key]);
+                itemsMap[key].value = await deviceUtils.tagValueCompose(vars[key], varsValue[id] ? varsValue[id].value : null, itemsMap[key], runtime);
                 varsValue[id] = { id: id, value: itemsMap[key].value, type: itemsMap[key].type, daq: itemsMap[key].daq, changed: valueChanged, timestamp: timestamp };
                 if (this.addDaq && deviceUtils.tagDaqToSave(varsValue[id], timestamp)) {
                     changed[id] = varsValue[id];

diff --git a/server/runtime/devices/httprequest/index.js b/server/runtime/devices/httprequest/index.js
@@ -304,7 +304,7 @@ function HTTPclient(_data, _logger, _events, _runtime) {
                     requestItemsMap[id] = [reqdata[i]];
                     reqdata[i].changed = varsValue[id] && reqdata[i].value !== varsValue[id].value;
                     if (!utils.isNullOrUndefined(reqdata[i].value)) {
-                        reqdata[i].value = await deviceUtils.tagValueCompose(reqdata[i].value, varsValue[id] ? varsValue[id].value : null, data.tags[id]);
+                        reqdata[i].value = await deviceUtils.tagValueCompose(reqdata[i].value, varsValue[id] ? varsValue[id].value : null, data.tags[id], runtime);
                         reqdata[i].timestamp = timestamp;
                         if (this.addDaq && deviceUtils.tagDaqToSave(reqdata[i], timestamp)) {
                             changed[id] = reqdata[i];

diff --git a/server/runtime/devices/mqtt/index.js b/server/runtime/devices/mqtt/index.js
@@ -466,7 +466,7 @@ function MQTTclient(_data, _logger, _events, _runtime) {
         var result = {};
         for (var id in data.tags) {
             if (!utils.isNullOrUndefined(data.tags[id].rawValue)) {
-                data.tags[id].value = await deviceUtils.tagValueCompose(data.tags[id].rawValue, varsValue[id] ? varsValue[id].value : null, data.tags[id]);
+                data.tags[id].value = await deviceUtils.tagValueCompose(data.tags[id].rawValue, varsValue[id] ? varsValue[id].value : null, data.tags[id], runtime);
                 if (this.addDaq && deviceUtils.tagDaqToSave(data.tags[id], timestamp)) {
                     result[id] = data.tags[id];
                 }