node-red-contrib-mobius-flow-base 3.0.1 → 3.1.1

package/dist/nodes/common/mobsearch.js

@@ -42,19 +42,23 @@
 initMobsearch = {
   // Standard mobsearch to rid level
   toRid: (mobiusSrvc, opts) => {
-    getMobsearch(mobiusSrvc, true, false, opts);
+    getMobsearch(mobiusSrvc, 'rid', false, opts);
   },
   // Standard mobsearch to ins level
   toIns: (mobiusSrvc, opts) => {
-    getMobsearch(mobiusSrvc, false, false, opts);
+    getMobsearch(mobiusSrvc, 'ins', false, opts);
+  },
+  // Standard mobsearch to sid level
+  toSid: (mobiusSrvc, opts) => {
+    getMobsearch(mobiusSrvc, 'sid', false, opts);
   },
   // Mobsearch to rid level, for nodes using editable list
   toRid_listed: (mobiusSrvc, opts) => {
-    getMobsearch(mobiusSrvc, true, true, opts);
+    getMobsearch(mobiusSrvc, 'rid', true, opts);
   },
   // Mobsearch to ins level, for nodes using editable list
   toIns_listed: (mobiusSrvc, opts) => {
-    getMobsearch(mobiusSrvc, false, true, opts);
+    getMobsearch(mobiusSrvc, 'ins', true, opts);
   },
 };
 
@@ -96,11 +100,11 @@ function addMobsearchListButton(mobiusSrvc, field, rowIndex, opts) {
 /**
  *
  * @param mobiusSrvc - Connection to Mobius
- * @param {boolean} useRid - Flag for Mobsearch to include rid field
+ * @param {boolean} level - Flag for Mobsearch to include rid field
  * @param {boolean} listed - Flag for Mobsearch work with nodes using editableLists
  * @param {object} opts - Mobsearhc options object
  */
-function getMobsearch(mobiusSrvc, useRid, listed, opts) {
+function getMobsearch(mobiusSrvc, level, listed, opts) {
   selectionIndex = 0;
   // Get current state of input field
   let uriFieldValue = '';
@@ -125,9 +129,24 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
     `;
 
+  const serviceHtml = `
+    <input type="text" id="instance-search-hid" style="width:15%;" placeholder="HID">
+    <input type="text" id="instance-search-sid" style="width:10%;" placeholder="SID">
+    `;
+
   //set level dependent html
-  let rows = useRid === true ? resourceHtml : instanceHtml;
-  let alertMsg = useRid === true ? `and/or RID ` : ``;
+  switch (level) {
+    case 'sid':
+      rows = serviceHtml;
+      break;
+    case 'ins':
+      rows = instanceHtml;
+      break;
+    case 'rid':
+      rows = resourceHtml;
+      break;
+  }
+  let alertMsg = level === 'rid' ? `and/or RID ` : ``;
 
   //Inject new html
   document.getElementById(opts.htmlElementId).innerHTML += `
@@ -316,11 +335,15 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     $('#instance-search-pid').removeAttr('disabled');
     $('#instance-search-ins').removeAttr('disabled');
     $('#instance-search-rid').removeAttr('disabled');
-    let services = opts.removeWildcards ? [] : ['#', '+'];
+    let services = opts.removeWildcards
+      ? []
+      : level === 'sid'
+      ? ['#']
+      : ['#', '+'];
     for (let i = 0; i < response.length; i++) {
       if (response[i].sid !== '009') {
         if (opts.filterSpids) {
-          if (opts.filterSpids.includes(response[i].sid)) {
+          if (opts.filterSpids.includes(response[i].spid)) {
             services.push(`${response[i].sid} - ${response[i].name}`);
           }
         } else {
@@ -407,9 +430,15 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
    */
   function finishSearch() {
     $('#wildcard-alert-row').hide();
-    let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`;
-    if (useRid) {
-      uri = uri + `/${searchObject.rid}`;
+    let uri = `${searchObject.hid}/${searchObject.sid}`;
+    switch (level) {
+      case 'ins':
+        uri = uri + `/${searchObject.pid}/${searchObject.ins}`;
+        break;
+      case 'rid':
+        uri =
+          uri + `/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`;
+        break;
     }
     if (uri.includes('#')) {
       uri = uri.substring(0, uri.indexOf('#') + 1);
@@ -442,14 +471,35 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
    * Update if accept button is grade out and functional, based on conditions of fields
    */
   function acceptCheck() {
-    if (useRid) {
-      checkFieldsToRid();
-    } else {
-      checkFieldsToIns();
+    switch (level) {
+      case 'sid':
+        checkFieldsToSid();
+        break;
+      case 'ins':
+        checkFieldsToIns();
+        break;
+      case 'rid':
+        checkFieldsToRid();
+        break;
     }
     checkWildcards();
   }
 
+  function checkFieldsToSid() {
+    const wildcardPass =
+      !opts.removeWildcards && $('#instance-search-sid').val() === '#';
+    if (
+      $('#instance-search-hid').val() !== '' &&
+      $('#instance-search-sid').val() !== ''
+    ) {
+      $('#node-search-accept').css('color', '#555555');
+      readyToAccept = true;
+    } else {
+      $('#node-search-accept').css('color', '#CCCCCC');
+      readyToAccept = false;
+    }
+  }
+
   /**
    * Check state of all field to rid level, change state of accept button accordingly
    */
@@ -541,11 +591,15 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
   $(`#${opts.searchButtonId}`).click(function () {
     if (mobConnected) {
       //When search button is clicked
-      $('#instance-search-sid').val('');
-      $('#instance-search-pid').val('');
-      $('#instance-search-ins').val('');
-      if (useRid) {
-        $('#instance-search-rid').val('');
+      if (level === 'sid' || level === 'ins' || level === 'rid') {
+        $('#instance-search-sid').val('');
+        if (level === 'ins' || level === 'rid') {
+          $('#instance-search-pid').val('');
+          $('#instance-search-ins').val('');
+          if (level === 'rid') {
+            $('#instance-search-rid').val('');
+          }
+        }
       }
       $(`#${opts.searchButtonId}`).addClass('disabled');
       $('#node-search-return').removeClass('disabled');
@@ -561,7 +615,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     $('#instance-search-ins').val('');
     searchObject.pid = '';
     searchObject.ins = '';
-    if (useRid) {
+    if (level === 'rid') {
       searchObject.rid = '';
     }
     searchObject.objects = [];
@@ -573,7 +627,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
 
     searchObject.ins = '';
 
-    if (useRid) {
+    if (level === 'rid') {
       $('#instance-search-rid').val('');
       searchObject.rid = '';
     }
@@ -583,7 +637,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
   });
   $('#instance-search-ins').click(function () {
     //INS field clicked
-    if (useRid) {
+    if (level === 'rid') {
       $('#instance-search-rid').val('');
       searchObject.rid = '';
     }
@@ -596,7 +650,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     }
   });
 
-  if (useRid) {
+  if (level === 'rid') {
     $('#instance-search-rid').click(function () {
       //RID clicked
       if (
@@ -632,34 +686,40 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
 
   $('#instance-search-hid').change(function () {
     acceptCheck();
-    $('#instance-search-sid').val('');
-    $('#instance-search-pid').val('');
-    $('#instance-search-ins').val('');
-    if (useRid) {
-      $('#instance-search-rid').val('');
+    if (level === 'sid' || level === 'ins' || level === 'rid') {
+      $('#instance-search-sid').val('');
+    }
+    if (level === 'ins' || level === 'rid') {
+      $('#instance-search-pid').val('');
+      $('#instance-search-ins').val('');
+      if (level === 'rid') {
+        $('#instance-search-rid').val('');
+      }
     }
   });
 
-  $('#instance-search-sid').change(function () {
-    searchObject.sid = $('#instance-search-sid').val();
-    acceptCheck();
-  });
-
-  $('#instance-search-pid').change(function () {
-    searchObject.pid = $('#instance-search-pid').val();
-    acceptCheck();
-  });
-
-  $('#instance-search-ins').change(function () {
-    searchObject.ins = $('#instance-search-ins').val();
-    acceptCheck();
-  });
+  if (level === 'sid' || level === 'ins' || level === 'rid') {
+    $('#instance-search-sid').change(function () {
+      searchObject.sid = $('#instance-search-sid').val();
+      acceptCheck();
+    });
+  }
+  if (level === 'ins' || level === 'rid') {
+    $('#instance-search-pid').change(function () {
+      searchObject.pid = $('#instance-search-pid').val();
+      acceptCheck();
+    });
 
-  if (useRid) {
-    $('#instance-search-rid').change(function () {
-      searchObject.rid = $('#instance-search-rid').val();
+    $('#instance-search-ins').change(function () {
+      searchObject.ins = $('#instance-search-ins').val();
       acceptCheck();
     });
+    if (level === 'rid') {
+      $('#instance-search-rid').change(function () {
+        searchObject.rid = $('#instance-search-rid').val();
+        acceptCheck();
+      });
+    }
   }
 
   // * END CHANGE RESPONSE * //

package/dist/nodes/mobius-discover-object-list.html

@@ -24,7 +24,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<script type="text/x-red" data-template-name="mobius discover object list">
+<script
+  type="text/x-red"
+  data-template-name="mobius discover object list"
+>
   <div class="form-row">
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
     <input type="text" id="node-input-name" placeholder="Name">
@@ -138,7 +141,7 @@ POSSIBILITY OF SUCH DAMAGE.
     },
     oneditprepare: function () {
       var node = this;
-      let mobiusSrvc = $("#node-input-connection").val();
+      let mobiusSrvc = $('#node-input-connection').val();
 
       /** Create the subs container and populate it */
       $('#node-input-subs-container')
@@ -167,15 +170,21 @@ POSSIBILITY OF SUCH DAMAGE.
             }).appendTo(row);
 
             // *** MOBSEARCH *** //
-            var searchField = $('<a class="searchbutton" style="margin-left: 5px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
+            var searchField = $(
+              '<a class="searchbutton" style="margin-left: 5px; vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>'
+            ).appendTo(row);
             // *** END MOBSEARCH *** //
 
             var typeField = $('<select/>', {
               class: 'node-input-sub-type',
               style: 'width:auto; margin-left: 5px; text-align: center;',
             }).appendTo(row);
-            typeField.append($('<option></option>').val('include').text('Include'));
-            typeField.append($('<option></option>').val('exclude').text('Exclude'));
+            typeField.append(
+              $('<option></option>').val('include').text('Include')
+            );
+            typeField.append(
+              $('<option></option>').val('exclude').text('Exclude')
+            );
 
             // Populate the new stat
             uriField.val(subscription.uri);
@@ -184,10 +193,10 @@ POSSIBILITY OF SUCH DAMAGE.
             // *** MOBSEARCH *** //
 
             if (!node.subscriptions[i]) {
-              node.subscriptions[i] = {uri: '', type: 'include'}
+              node.subscriptions[i] = { uri: '', type: 'include' };
             }
 
-            addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts)
+            addMobsearchListButton(mobiusSrvc, searchField, i, mobsearchOpts);
             // *** END MOBSEARCH *** //
           },
         });
@@ -198,7 +207,7 @@ POSSIBILITY OF SUCH DAMAGE.
       if (!node.subscriptions) {
         node.subscriptions = [(subscription = { uri: '', type: 'include' })];
       }
-      
+
       // *** MOBSEARCH *** //
 
       mobsearchOpts = {
@@ -244,7 +253,9 @@ POSSIBILITY OF SUCH DAMAGE.
       }
       var editorRow = $('#dialog-form>div.node-input-subs-container-row');
       height -=
-        4 * (parseInt(editorRow.css('marginTop')) + parseInt(editorRow.css('marginBottom')));
+        4 *
+        (parseInt(editorRow.css('marginTop')) +
+          parseInt(editorRow.css('marginBottom')));
 
       $('#node-input-subs-container').editableList('height', height);
     },
@@ -270,7 +281,10 @@ POSSIBILITY OF SUCH DAMAGE.
   });
 </script>
 
-<script type="text/x-red" data-help-name="mobius discover object list">
+<script
+  type="text/x-red"
+  data-help-name="mobius discover object list"
+>
     <p>Discover MOBiUS objects and return a filtered list of objects or URIs.</p>
 
     <h3>Configuration Page</h3>

package/dist/nodes/mobius-discover-object-list.js

@@ -126,7 +126,11 @@ module.exports = function (RED) {
         let objectList = [];
         try {
           const hid = node.hid === '' ? node.serviceConn.hubId : node.hid;
-          const profiles = await discoverProfiles(node.serviceConn, hid, node.subscriptions);
+          const profiles = await discoverProfiles(
+            node.serviceConn,
+            hid,
+            node.subscriptions
+          );
 
           for await (let entry of profiles.entries()) {
             let discoverParams = {};
@@ -150,15 +154,28 @@ module.exports = function (RED) {
               };
             }
             try {
-              let objects = await filterObjectsByRIDValue(node.serviceConn, discoverParams);
+              let objects = await filterObjectsByRIDValue(
+                node.serviceConn,
+                discoverParams
+              );
               for (let lp = 0; lp < objects.value.length; lp++) {
                 objects.value[lp][
                   'uri'
                 ] = `${serviceURI}/${objects.value[lp].pid}/${objects.value[lp].ins}`;
-                objectList.push(objects.value[lp]);
+                if (
+                  isIncluded(
+                    `${objects.value[lp]['uri']}`,
+                    node.subscriptions
+                  ) &&
+                  !isExcluded(`${objects.value[lp]['uri']}`, node.subscriptions)
+                ) {
+                  objectList.push(objects.value[lp]);
+                }
               }
             } catch (err) {
-              node.warn(`Discover object failed for service (${serviceURI}) - ${err.message}`);
+              node.warn(
+                `Discover object failed for service (${serviceURI}) - ${err.message}`
+              );
             }
           }
 
@@ -185,10 +202,7 @@ module.exports = function (RED) {
             let profiles = await discover(serviceConn, `${hid}/${sid}`);
             let pids = [];
             for (const pid of profiles.data) {
-              if (
-                isIncluded(`${hid}/${sid}/${pid}/#`, subscriptions) &&
-                !isExcluded(`${hid}/${sid}/${pid}/#`, subscriptions)
-              ) {
+              if (isIncluded(`${hid}/${sid}/${pid}/#`, subscriptions)) {
                 pids.push(pid);
               }
             }
@@ -198,7 +212,9 @@ module.exports = function (RED) {
           }
         } else {
           RED.log.warn(
-            `Failed to discover objects for service ${service.id.split('/')[1]} as it is offline.`
+            `Failed to discover objects for service ${
+              service.id.split('/')[1]
+            } as it is offline.`
           );
         }
       }
@@ -240,7 +256,10 @@ module.exports = function (RED) {
   function isIncluded(uri, subscriptions) {
     let include = false;
     for (const subscription of subscriptions) {
-      if (subscription.type === 'include' && validateSubscription(subscription.uri)) {
+      if (
+        subscription.type === 'include' &&
+        validateSubscription(subscription.uri)
+      ) {
         if (matchTopic(subscription.uri, uri)) {
           include = true;
         }
@@ -252,7 +271,10 @@ module.exports = function (RED) {
   function isExcluded(uri, subscriptions) {
     let exclude = false;
     for (const subscription of subscriptions) {
-      if (subscription.type === 'exclude' && validateSubscription(subscription.uri)) {
+      if (
+        subscription.type === 'exclude' &&
+        validateSubscription(subscription.uri)
+      ) {
         if (matchTopic(subscription.uri, uri)) {
           exclude = true;
         }
@@ -280,12 +302,23 @@ module.exports = function (RED) {
   function matchTopic(filter, topic) {
     const filterArray = filter.split('/');
     const topicArray = topic.split('/');
-    const length = filterArray.length < topicArray.length ? filterArray.length : topicArray.length;
+    const length =
+      filterArray.length < topicArray.length
+        ? filterArray.length
+        : topicArray.length;
 
     for (let i = 0; i < length; ++i) {
       const left = filterArray[i];
       const right = topicArray[i];
-      if (!(left === right || left === '+' || left === '#' || right === '+' || right === '#')) {
+      if (
+        !(
+          left === right ||
+          left === '+' ||
+          left === '#' ||
+          right === '+' ||
+          right === '#'
+        )
+      ) {
         return false;
       }
     }

package/package.json

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