node-red-contrib-mobius-flow-base 2.5.86-beta.92 → 2.5.86-beta.95

package/dist/nodes/mobius-connection.js

@@ -198,7 +198,7 @@ module.exports = function (RED) {
      * @param {number} lastActiveTime - The node's last active time
      * @returns Object containing status text and status colour
      */
-    node.getLastActiveTimeStatus = function (lastActiveTime) {
+    node.buildLastActiveTimeStatus = function (lastActiveTime) {
       let response = {
         text: 'Unknown',
         colour: 'green',
@@ -224,7 +224,11 @@ module.exports = function (RED) {
         response.colour = 'grey';
         response.text = 'Never Active';
       }
-      return response;
+      return {
+        fill: response.text,
+        shape: 'dot',
+        text: response.colour,
+      };
     };
 
     /**
@@ -233,32 +237,34 @@ module.exports = function (RED) {
      */
     node.updateNodeStatus = function (mobiusNode) {
       node.users[mobiusNode.id] = mobiusNode;
-      let statusText = 'Connected';
-      let statusColour = 'green';
-      if (node.users[mobiusNode.id].statusType === 'timeSinceLastActive') {
-        let result = node.getLastActiveTimeStatus(node.users[mobiusNode.id].lastActiveTime);
-        statusText = result.text;
-        statusColour = result.colour;
-      } else {
-        const uri = node.users[mobiusNode.id].latestUri;
-        if (uri !== '') {
-          statusText = node.users[mobiusNode.id].latestUri;
-        }
-      }
-      node.users[mobiusNode.id].status({
-        fill: statusColour,
+      let newStatus = {
+        fill: 'Connected',
         shape: 'dot',
-        text: statusText,
-      });
+        text: 'green',
+      };
+      switch (node.users[mobiusNode.id].statusType) {
+        case 'timeSinceLastActive':
+          newStatus = node.buildLastActiveTimeStatus(node.users[mobiusNode.id].lastActiveTime);
+        case 'lastUri':
+          const uri = node.users[mobiusNode.id].latestUri;
+          if (uri !== '') {
+            newStatus = {
+              fill: uri,
+              shape: 'dot',
+              text: 'green',
+            };
+          }
+      }
+      node.users[mobiusNode.id].status(newStatus);
     };
 
     /**
      * Update a given node's node latest URI record
      * @param  {Object} mobiusNode - The node whos last URI record is to be updated
      */
-    node.updateLatestUri = function (mobiusNode) {
+    node.updateLatestUri = function (mobiusNode, uri) {
       node.users[mobiusNode.id] = mobiusNode;
-      node.users[mobiusNode.id].latestUri = Date.now();
+      node.users[mobiusNode.id].latestUri = uri;
       node.updateNodeStatus(mobiusNode);
     };
 

package/dist/nodes/mobius-object-cov.html

@@ -54,8 +54,8 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
   <hr>
   <div class="form-row">
-    <label for="node-input-statusType"><i class="fa fa-bars"></i> Status Display</label>
-    <select type="text" id="node-input-statusType" style="display: inline-block; width: auto; vertical-align: center;">
+    <label for="node-input-statusType" style="width: 30%;"><i class="fa fa-bars"></i> Status Display</label>
+    <select type="text" id="node-input-statusType" style="width: 200px; display: inline-block; width: auto; vertical-align: center;">
       <option value="timeSinceLastActive">Time since last active</option>
       <option value="lastUri">Last URI</option>
     </select>

package/dist/nodes/mobius-object-cov.js

@@ -40,8 +40,6 @@ module.exports = function (RED) {
     this.statusType = n.statusType;
     var node = this;
 
-    console.log(node.statusType);
-
     if (node.serviceConn) {
       node.status({
         fill: 'red',
@@ -49,7 +47,7 @@ module.exports = function (RED) {
         text: 'Disconnected',
       });
       node.serviceConn.subscribeToObjectCOV(node.object, this.id, (response) => {
-        node.serviceConn.updateLatestUri(node);
+        node.serviceConn.updateLatestUri(node, response.uri);
         node.serviceConn.updateLastActiveTime(node);
         let allResources = _.keyBy(
           response.value.resources,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-mobius-flow-base",
-  "version": "2.5.86-beta.92",
+  "version": "2.5.86-beta.95",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",