node-red-contrib-mobius-flow-base 2.5.86-beta.58 → 2.5.86-beta.61

package/dist/nodes/common/mobsearch.js

@@ -1,22 +1,51 @@
 initMobsearch = {
-  toRid: () => {
-    return 'Hello World';
+  toRid: (mobiusSrvc, opts) => {
+    getMobsearch(mobiusSrvc, true, false, opts);
   },
-  toIns: () => {
-    return 'Hello World';
+  toIns: (mobiusSrvc, opts) => {
+    getMobsearch(mobiusSrvc, false, false, opts);
   },
-  toRidList: () => {
-    return 'Hello World';
+  toRidListed: (mobiusSrvc, opts) => {
+    getMobsearch(mobiusSrvc, true, true, opts);
   },
-  toInsList: () => {
-    return 'Hello World';
+  toInsListed: (mobiusSrvc, opts) => {
+    getMobsearch(mobiusSrvc, false, true, opts);
   },
 };
 
-function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, globalIndex) {
+// RID ONLY
+// opts.uriFieldName
+// opts.selectionIndex
+// opts.containerRowName
+// opts.containerName
+// opts.containerSecondFieldName
+
+let selectionIndex = 0;
+
+function addSearchButton(field, i) {
+  field.click(function () {
+    selectionIndex = i;
+    $('#node-input-resources-container-row').hide();
+    $('#instance-search-sid').val('');
+    $('#instance-search-pid').val('');
+    $('#instance-search-ins').val('');
+    $('#instance-search-rid').val('');
+    $('#node-search-return').removeClass('disabled');
+    $('#node-search-accept').removeClass('disabled');
+    $('#instance-search-row').show();
+  });
+}
+
+function getMobsearch(mobiusSrvc, useRid, listed, opts) {
+  selectionIndex = 0;
+
+  if (useRid) {
+    $(`#${opts.uriFieldName}`).val($(`#${opts.uriFieldName}`).val());
+  }
+
   //level dependent html
   let rows =
-    level === 'rid'
+    useRid === true
       ? `
       <input type="text" id="instance-search-hid" style="width:13%;" placeholder="HID">
       <input type="text" id="instance-search-sid" style="width:8%;" placeholder="SID">
@@ -30,7 +59,7 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
       <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 ` : ``;
+  let alertMsg = useRid === true ? `and/or RID ` : ``;
 
   //Add new html
   document.getElementById('mobsearch').innerHTML += `
@@ -234,17 +263,17 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
   function finishSearch() {
     $('#wildcard-alert-row').hide();
     let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`;
-    if (level === 'rid') {
+    if (useRid) {
       uri = uri + `/${searchObject.rid}`;
     }
     if (uri.includes('#')) {
       uri = uri.substring(0, uri.indexOf('#') + 1);
     }
     if (listed) {
-      list[globalIndex].uri = uri;
+      opts.list[selectionIndex].uri = uri;
       updateList();
     } else {
-      $(`#${fieldName}`).val(uri);
+      $(`#${opts.uriFieldName}`).val(uri);
     }
     $('#node-search-accept').css('color', '#CCCCCC');
     readyToAccept = false;
@@ -257,7 +286,7 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
 
   //Function to update if accept button is grade out and functions based on conditions of fields
   function acceptCheck() {
-    if (level === 'rid') {
+    if (useRid) {
       if (
         ($('#instance-search-hid').val() !== '' &&
           $('#instance-search-sid').val() !== '' &&
@@ -303,13 +332,29 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
     }
   }
 
+  function updateList() {
+    $(`#${opts.containerName}`)
+      .editableList('items')
+      .each(function (i) {
+        let item = $(this);
+        let secondField = item.find(`.${opts.containerSecondFieldName}`).val();
+        opts.list[i][Object.keys(opts.list[i])[1]] = secondField;
+      });
+    $(`#${opts.containerName}`).editableList('empty');
+    for (let i = 0; i < opts.list.length; i++) {
+      let item = opts.list[i];
+      $(`#${opts.containerName}`).editableList('addItem', item);
+    }
+    $(`#${opts.containerRowName}`).show();
+  }
+
   // Respond to clicks
   $('#node-lookup-instance').click(function () {
     //When search button is clicked
     $('#instance-search-sid').val('');
     $('#instance-search-pid').val('');
     $('#instance-search-ins').val('');
-    if (level === 'rid') {
+    if (useRid) {
       $('#instance-search-rid').val('');
     }
     $('#node-lookup-instance').addClass('disabled');
@@ -324,7 +369,7 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
     $('#instance-search-ins').val('');
     searchObject.pid = '';
     searchObject.ins = '';
-    if (level === 'rid') {
+    if (useRid) {
       searchObject.rid = '';
     }
     searchObject.objects = [];
@@ -336,7 +381,7 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
 
     searchObject.ins = '';
 
-    if (level === 'rid') {
+    if (useRid) {
       $('#instance-search-rid').val('');
       searchObject.rid = '';
     }
@@ -346,7 +391,7 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
   });
   $('#instance-search-ins').click(function () {
     //INS field clicked
-    if (level === 'rid') {
+    if (useRid) {
       $('#instance-search-rid').val('');
       searchObject.rid = '';
     }
@@ -355,7 +400,7 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
     }
   });
 
-  if (level === 'rid') {
+  if (useRid) {
     $('#instance-search-rid').click(function () {
       //RID clicked
       if (
@@ -389,7 +434,7 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
     $('#instance-search-sid').val('');
     $('#instance-search-pid').val('');
     $('#instance-search-ins').val('');
-    if (level === 'rid') {
+    if (useRid) {
       $('#instance-search-rid').val('');
     }
   });
@@ -405,7 +450,7 @@ function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, gl
     searchObject.ins = $('#instance-search-ins').val();
     acceptCheck();
   });
-  if (level === 'rid') {
+  if (useRid) {
     $('#instance-search-rid').change(function () {
       searchObject.rid = $('#instance-search-rid').val();
       acceptCheck();

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

@@ -87,7 +87,6 @@ POSSIBILITY OF SUCH DAMAGE.
       }
 
       let mobiusSrvc = $("#node-input-connection").val();
-      let globalIndex = 0;
 
       /** Create the subs container and populate it */
       $('#node-input-resources-container').css('min-height', '300px').css('min-width', '450px').editableList ({
@@ -121,23 +120,10 @@ POSSIBILITY OF SUCH DAMAGE.
           // resizeResource(container);
 
           // *** MOBSEARCH *** //
-
           if (!node.resources[i]) {
             node.resources[i] = {uri: '', comment: ''}
           }
-
-          searchField.click(function () {
-            globalIndex = i;
-            $('#node-input-resources-container-row').hide();
-            $("#instance-search-sid").val('');
-            $("#instance-search-pid").val('');
-            $("#instance-search-ins").val('');
-            $("#instance-search-rid").val('');
-            $("#node-search-return").removeClass('disabled');
-            $("#node-search-accept").removeClass('disabled');
-            $("#instance-search-row").show();
-
-          });
+          addSearchButton(searchField, i)
           // *** END MOBSEARCH *** //
         },
         resizeItem: resizeResource
@@ -150,21 +136,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
       // *** MOBSEARCH *** //
 
-      function updateList() {
-        $("#node-input-resources-container").editableList('items').each(function (i) {
-          let resource = $(this);
-          let comment = resource.find(".node-input-resource-comment").val();
-          node.resources[i].comment = comment;
-        })
-        $("#node-input-resources-container").editableList('empty');
-        for (let i = 0; i < node.resources.length; i++) {
-          let resource = node.resources[i];
-          $("#node-input-resources-container").editableList('addItem', resource);
-        }
-        $('#node-input-resources-container-row').show();
-      }
-
-      getMobsearch(mobiusSrvc, 'rid', true, null, node.resources, updateList, globalIndex)
+      opts = {
+        list: node.resources,
+        containerRowName: 'node-input-resources-container-row',
+        containerName: 'node-input-resources-container',
+        containerSecondFieldName: 'node-input-resources-comment',
+      };
+      initMobsearch.toRidListed(mobiusSrvc, opts);
 
       // *** END MOBSEARCH *** //
 

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

@@ -106,7 +106,10 @@ POSSIBILITY OF SUCH DAMAGE.
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
 
-      getMobsearch(mobiusSrvc, 'ins', false, 'node-input-instance', null, null, null)
+      opts = {
+        uriFieldName: 'node-input-instance '
+      };
+      initMobsearch.toIns(mobiusSrvc, opts);
     },
     oneditsave: function() {
       if($("#node-input-detailedOutput").prop('checked')) {

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

@@ -98,8 +98,10 @@ POSSIBILITY OF SUCH DAMAGE.
     oneditprepare: function () {
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
-      console.log(initMobsearch.toRid());
-      getMobsearch(mobiusSrvc, 'rid', false, 'node-input-resource', null, null, null);
+      opts = {
+        uriFieldName: 'node-input-resource'
+      };
+      initMobsearch.toRid(mobiusSrvc, opts);
     },
     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.58",
+  "version": "2.5.86-beta.61",
   "description": "Node-RED base nodes for Mobius Flow",
   "main": "index.js",
   "types": "dist/index.d.ts",