node-red-contrib-mobius-flow-base 2.5.86-beta.52 → 2.5.86-beta.53

package/dist/nodes/common/mobsearch.js

@@ -1,13 +1,28 @@
-function getMobsearch(mobiusSrvc) {
-  document.getElementById('mobsearch').innerHTML += `
-  <div id="instance-search-row">
-    <div class="form-row">
-      <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</label>
+function getMobsearch(mobiusSrvc, level, fieldName) {
+  //level dependent html
+  let rows =
+    level === 'rid'
+      ? `
       <input type="text" id="instance-search-hid" style="width:13%;" placeholder="HID">
       <input type="text" id="instance-search-sid" style="width:8%;" placeholder="SID">
       <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
       <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
       <input type="text" id="instance-search-rid" style="width:8%;" placeholder="RID">
+      `
+      : `
+      <input type="text" id="instance-search-hid" style="width:15%;" placeholder="HID">
+      <input type="text" id="instance-search-sid" style="width:10%;" placeholder="SID">
+      <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
+      <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
+      `;
+  let alertMsg = level === 'rid' ? `and/or RID ` : ``;
+
+  //Add new html
+  document.getElementById('mobsearch').innerHTML += `
+  <div id="instance-search-row">
+    <div class="form-row">
+      <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</label>
+      ${rows}
       <a id="node-search-return" class="searchbutton" style="vertical-align: middle"><i id="node-search-return-icon" class="fa fa-arrow-left"></i></a>
       <a id="node-search-accept" class="searchbutton" style="vertical-align: middle; color: #CCCCCC"><i id="node-search-accept-icon" class="fa fa-check"></i></a>
     </div>
@@ -16,9 +31,11 @@ function getMobsearch(mobiusSrvc) {
   <p>Please note: The selection of wildcard '+'
     means a search for a specific instance or resource
     cannot be performed. As such, enter the 
-    INS and/or RID manually.</p>
+    INS ${alertMsg}manually.</p>
   </div>
-  `; //Add html
+  `;
+
+  //Add search button
   document.getElementById('input-row').innerHTML += `
   <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
   `;
@@ -31,14 +48,17 @@ function getMobsearch(mobiusSrvc) {
     $('#instance-search-hid').val(response);
   });
   let readyToAccept = false;
+
   let searchObject = {
     hid: $('#instance-search-hid').val(),
     sid: $('#instance-search-sid').val(),
     pid: $('#instance-search-pid').val(),
     ins: $('#instance-search-ins').val(),
-    rid: $('#instance-search-rid').val(),
     objects: [],
   };
+  if (level === 'rid') {
+    searchObject.rid = $('#instance-search-rid').val();
+  }
 
   //Function to search for RIDs
   function ridSearch(objects, ins) {
@@ -184,11 +204,16 @@ function getMobsearch(mobiusSrvc) {
   //Finish a search
   function finishSearch() {
     $('#wildcard-alert-row').hide();
-    let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`;
+    if (level === 'rid') {
+      let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`;
+    } else {
+      let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`;
+    }
+
     if (uri.includes('#')) {
       uri = uri.substring(0, uri.indexOf('#') + 1);
     }
-    $('#node-input-resource').val(uri);
+    $(`#${fieldName}`).val(uri);
     $('#node-search-accept').css('color', '#CCCCCC');
     readyToAccept = false;
     $('#node-search-return').addClass('disabled');
@@ -200,22 +225,40 @@ function getMobsearch(mobiusSrvc) {
 
   //Function to update if accept button is grade out and functions based on conditions of fields
   function acceptCheck() {
-    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() === '#'
-    ) {
-      $('#node-search-accept').css('color', '#555555');
-      readyToAccept = true;
+    if (level === 'rid') {
+      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() === '#'
+      ) {
+        $('#node-search-accept').css('color', '#555555');
+        readyToAccept = true;
+      } else {
+        $('#node-search-accept').css('color', '#CCCCCC');
+        readyToAccept = false;
+      }
     } else {
-      $('#node-search-accept').css('color', '#CCCCCC');
-      readyToAccept = false;
+      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() === '#'
+      ) {
+        $('#node-search-accept').css('color', '#555555');
+        readyToAccept = true;
+      } else {
+        $('#node-search-accept').css('color', '#CCCCCC');
+        readyToAccept = false;
+      }
     }
     if (
       $('#instance-search-sid').val() !== '+' &&
@@ -234,7 +277,9 @@ function getMobsearch(mobiusSrvc) {
     $('#instance-search-sid').val('');
     $('#instance-search-pid').val('');
     $('#instance-search-ins').val('');
-    $('#instance-search-rid').val('');
+    if (level === 'rid') {
+      $('#instance-search-rid').val('');
+    }
     $('#node-lookup-instance').addClass('disabled');
     $('#node-search-return').removeClass('disabled');
     $('#node-search-accept').removeClass('disabled');
@@ -247,39 +292,50 @@ function getMobsearch(mobiusSrvc) {
     $('#instance-search-ins').val('');
     searchObject.pid = '';
     searchObject.ins = '';
-    searchObject.rid = '';
+    if (level === 'rid') {
+      searchObject.rid = '';
+    }
     searchObject.objects = [];
     startSearch();
   });
   $('#instance-search-pid').click(function () {
     //PID field clicked
     $('#instance-search-ins').val('');
-    $('#instance-search-rid').val('');
+
     searchObject.ins = '';
-    searchObject.rid = '';
+
+    if (level === 'rid') {
+      $('#instance-search-rid').val('');
+      searchObject.rid = '';
+    }
     if (searchObject.sid !== '') {
       pidsSearch(searchObject.objects);
     }
   });
   $('#instance-search-ins').click(function () {
     //INS field clicked
-    $('#instance-search-rid').val('');
-    searchObject.rid = '';
+    if (level === 'rid') {
+      $('#instance-search-rid').val('');
+      searchObject.rid = '';
+    }
     if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
       insSearch(searchObject.objects, searchObject.pid);
     }
   });
-  $('#instance-search-rid').click(function () {
-    //RID clicked
-    if (
-      searchObject.ins !== '' &&
-      searchObject.ins !== '+' &&
-      searchObject.pid !== '+' &&
-      searchObject.sid !== '+'
-    ) {
-      ridSearch(searchObject.objects, searchObject.ins);
-    }
-  });
+
+  if (level === 'rid') {
+    $('#instance-search-rid').click(function () {
+      //RID clicked
+      if (
+        searchObject.ins !== '' &&
+        searchObject.ins !== '+' &&
+        searchObject.pid !== '+' &&
+        searchObject.sid !== '+'
+      ) {
+        ridSearch(searchObject.objects, searchObject.ins);
+      }
+    });
+  }
   $('#node-search-return').click(function () {
     //Return/Back button clicked
     $('#node-search-return').addClass('disabled');
@@ -301,7 +357,9 @@ function getMobsearch(mobiusSrvc) {
     $('#instance-search-sid').val('');
     $('#instance-search-pid').val('');
     $('#instance-search-ins').val('');
-    $('#instance-search-rid').val('');
+    if (level === 'rid') {
+      $('#instance-search-rid').val('');
+    }
   });
   $('#instance-search-sid').change(function () {
     searchObject.sid = $('#instance-search-sid').val();
@@ -315,8 +373,10 @@ function getMobsearch(mobiusSrvc) {
     searchObject.ins = $('#instance-search-ins').val();
     acceptCheck();
   });
-  $('#instance-search-rid').change(function () {
-    searchObject.rid = $('#instance-search-rid').val();
-    acceptCheck();
-  });
+  if (level === 'rid') {
+    $('#instance-search-rid').change(function () {
+      searchObject.rid = $('#instance-search-rid').val();
+      acceptCheck();
+    });
+  }
 }

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

@@ -98,7 +98,7 @@ POSSIBILITY OF SUCH DAMAGE.
     oneditprepare: function () {
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
-      getMobsearch(mobiusSrvc);
+      getMobsearch(mobiusSrvc, 'rid', 'node-input-resource');
     },
     oneditsave: function() {
       if($("#node-input-detailedOutput").prop('checked')) {

package/package.json

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