node-red-contrib-mobius-flow-base 3.0.1-beta.2 → 3.1.0

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/package.json

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