node-red-contrib-mobius-flow-base 3.0.0-beta.17 → 3.0.0-beta.18

package/dist/engine-websocket.js

@@ -62,6 +62,7 @@ function handleWebSocketMessage(message) {
     const callbacks = registeredCallbacks
         .filter((cb) => cb.topic === message.topic)
         .map((cb) => cb.callback);
+    message.payload.timestamp = message.timestamp;
     callbacks.forEach((cb) => cb(message.payload));
 }
 const reconnect = () => {

package/dist/nodes/common/mobsearch.js

@@ -208,7 +208,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
       `mdiscover?mobius=${mobiusSrvc}&uri=${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`,
       (response) => {
         resList = response.data[0].resources;
-        ress = ['#'];
+        ress = opts.removeWildcards ? [] : ['#'];
         for (let j = 0; j < resList.length; j++) {
           ress.push(`${resList[j].rid} - ${resList[j].name}`);
         }
@@ -234,7 +234,8 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
    * @param {string} pid - The chosen PID
    */
   function insSearch(objects, pid) {
-    let inss = ['#', '+'];
+    $('#instance-search-rid').removeAttr("disabled");
+    let inss = opts.removeWildcards ? [] : ['#', '+'];
     for (let i = 0; i < objects.length; i++) {
       if (objects[i].pid === pid) {
         const name = objects[i].resources[1].pv;
@@ -256,6 +257,9 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
             $('#instance-search-ins').val($('#instance-search-ins').val().substring(0, 4));
           }
           searchObject.ins = $('#instance-search-ins').val();
+          if (searchObject.ins === '#') {
+            $('#instance-search-rid').attr("disabled", "disabled");
+          }
         },
       })
       .autocomplete('search', '');
@@ -266,8 +270,10 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
    * @param {object} objects - Response from call to Mobius, list of mobius objects
    */
   function pidsSearch(objects) {
+    $('#instance-search-ins').removeAttr("disabled");
+    $('#instance-search-rid').removeAttr("disabled");
     searchObject.objects = objects;
-    let pids = ['#', '+'];
+    let pids = opts.removeWildcards ? [] : ['#', '+'];
     for (let i = 0; i < objects.length; i++) {
       pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
     }
@@ -283,6 +289,10 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
             $('#instance-search-pid').val($('#instance-search-pid').val().substring(0, 4));
           }
           searchObject.pid = $('#instance-search-pid').val();
+          if (searchObject.pid === '#') {
+            $('#instance-search-ins').attr("disabled", "disabled");
+            $('#instance-search-rid').attr("disabled", "disabled");
+          }
         },
       })
       .autocomplete('search', '');
@@ -293,7 +303,10 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
    * @param {object} response - Response from call to Mobius
    */
   function serviceSearch(response) {
-    let services = ['#', '+'];
+    $('#instance-search-pid').removeAttr("disabled");
+    $('#instance-search-ins').removeAttr("disabled");
+    $('#instance-search-rid').removeAttr("disabled");
+    let services = opts.removeWildcards ? [] : ['#', '+'];
     for (let i = 0; i < response.length; i++) {
       if (response[i].sid !== '009') {
         services.push(`${response[i].sid} - ${response[i].name}`);
@@ -310,8 +323,17 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
             $('#instance-search-sid').val($('#instance-search-sid').val().substring(0, 3));
           }
           searchObject.sid = $('#instance-search-sid').val();
+          if (searchObject.sid === '#') {
+            $('#instance-search-pid').attr("disabled", "disabled");
+            $('#instance-search-ins').attr("disabled", "disabled");
+            $('#instance-search-rid').attr("disabled", "disabled");
+            return;
+          };
           if (searchObject.sid === '+') {
             for (let i = 2; i < services.length; i++) {
+              if (services[i].substring(0, 3).length !== 3) {
+                return;
+              }
               $.getJSON(
                 `mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[
                   i
@@ -322,6 +344,9 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
               );
             }
           } else {
+            if (searchObject.sid.length !== 3) {
+              return;
+            }
             $.getJSON(
               `mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`,
               (objects) => {
@@ -355,6 +380,9 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     }
   }
 
+  // Used to temporarily store updated list items
+  let tempList = [];
+
   /**
    * Finish mobsearch, compile full URI and set value in host node
    */
@@ -368,7 +396,9 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
       uri = uri.substring(0, uri.indexOf('#') + 1);
     }
     if (listed) {
-      opts.list[selectionIndex].uri = uri;
+      // opts.list[selectionIndex].uri = uri;
+      tempList = JSON.parse(JSON.stringify(opts.list));
+      tempList[selectionIndex].uri = uri;
       updateList();
     } else {
       $(`#${opts.uriFieldName}`).val(uri);
@@ -398,16 +428,16 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
    * Check state of all field to rid level, change state of accept button accordingly
    */
   function checkFieldsToRid() {
+    const wildcardPass = !opts.removeWildcards && ($('#instance-search-sid').val() === '#' ||
+    $('#instance-search-pid').val() === '#' ||
+    $('#instance-search-ins').val() === '#' ||
+    $('#instance-search-rid').val() === '#')
     if (
       ($('#instance-search-hid').val() !== '' &&
         $('#instance-search-sid').val() !== '' &&
         $('#instance-search-pid').val() !== '' &&
         $('#instance-search-ins').val() !== '' &&
-        $('#instance-search-rid').val() !== '') ||
-      $('#instance-search-sid').val() === '#' ||
-      $('#instance-search-pid').val() === '#' ||
-      $('#instance-search-ins').val() === '#' ||
-      $('#instance-search-rid').val() === '#'
+        $('#instance-search-rid').val() !== '') || wildcardPass
     ) {
       $('#node-search-accept').css('color', '#555555');
       readyToAccept = true;
@@ -421,14 +451,14 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
    * Check state of all field to ins level, change state of accept button accordingly
    */
   function checkFieldsToIns() {
+    const wildcardPass = !opts.removeWildcards && ($('#instance-search-sid').val() === '#' ||
+    $('#instance-search-pid').val() === '#' ||
+    $('#instance-search-ins').val() === '#')
     if (
       ($('#instance-search-hid').val() !== '' &&
         $('#instance-search-sid').val() !== '' &&
         $('#instance-search-pid').val() !== '' &&
-        $('#instance-search-ins').val() !== '') ||
-      $('#instance-search-sid').val() === '#' ||
-      $('#instance-search-pid').val() === '#' ||
-      $('#instance-search-ins').val() === '#'
+        $('#instance-search-ins').val() !== '') || wildcardPass
     ) {
       $('#node-search-accept').css('color', '#555555');
       readyToAccept = true;
@@ -462,11 +492,11 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
       .each(function (i) {
         let item = $(this);
         let secondField = item.find(`.${opts.containerSecondFieldName}`).val();
-        opts.list[i][Object.keys(opts.list[i])[1]] = secondField;
+        tempList[i][Object.keys(tempList[i])[1]] = secondField;
       });
     $(`#${opts.containerName}`).editableList('empty');
-    for (let i = 0; i < opts.list.length; i++) {
-      let item = opts.list[i];
+    for (let i = 0; i < tempList.length; i++) {
+      let item = tempList[i];
       $(`#${opts.containerName}`).editableList('addItem', item);
     }
     $(`#${opts.containerRowName}`).show();
@@ -549,6 +579,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     $('#node-lookup-instance').removeClass('disabled');
     $('#instance-search-row').hide();
     $('#instance-row').show();
+    $(`#${opts.containerRowName}`).show();
   });
   $('#node-search-accept').click(function () {
     //Accept button clicked

package/dist/nodes/mobius-connection.js

@@ -679,7 +679,7 @@ module.exports = function (RED) {
             res.json(response);
           })
           .catch((err) => {
-            RED.log.warn(`Get objects failed - ${err}`);
+            RED.log.warn(`Get objects failed on service ${req.query.sid} ${err ? ` - ${err}` : ''}`);
           });
       }
     });

package/dist/nodes/mobius-flow-inject.html

@@ -135,6 +135,7 @@ POSSIBILITY OF SUCH DAMAGE.
         let subscription = node.subscriptions[i];
         $("#node-input-subs-container").editableList('addItem', subscription);
       }
+
     },
     oneditresize(size) {
       var rows = $("#dialog-form>div:not(.node-input-subs-container-row)");

package/dist/nodes/mobius-flow-inject.js

@@ -112,7 +112,7 @@ module.exports = function (RED) {
     try {
       delete outObject.isFromConfig;
       outObject.timestamp = response.timestamp;
-      outObject.changed = response.changed;
+      outObject.changed = response.additonalInformation.changed;
       outObject.resources = _.keyBy(outObject.resources, 'rid');
     } catch (err) {
       node.error(`Failed to handle injected COV: ${JSON.stringify(outObject)}`);

package/dist/nodes/mobius-set-multi-resource.html

@@ -106,6 +106,7 @@ POSSIBILITY OF SUCH DAMAGE.
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-mobject',
         inputRowId: 'input-row',
+        removeWildcards: true,
       };
       initMobsearch.toIns(mobiusSrvc, opts);
     },

package/dist/nodes/mobius-set-resource.html

@@ -114,6 +114,7 @@ POSSIBILITY OF SUCH DAMAGE.
         htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-resource',
         inputRowId: 'input-row',
+        removeWildcards: true,
       };
       initMobsearch.toRid(mobiusSrvc, opts);
     },

package/package.json

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