node-red-contrib-mobius-flow-base 2.5.86-beta.59 → 2.5.86-beta.62

package/dist/nodes/common/mobsearch.js

@@ -5,22 +5,47 @@ initMobsearch = {
   toIns: (mobiusSrvc, opts) => {
     getMobsearch(mobiusSrvc, false, false, opts);
   },
-  toRidListed: (mobiusSrvc, opts) => {
+  toRid_listed: (mobiusSrvc, opts) => {
     getMobsearch(mobiusSrvc, true, true, opts);
   },
-  toInsListed: (mobiusSrvc, opts) => {
+  toIns_listed: (mobiusSrvc, opts) => {
     getMobsearch(mobiusSrvc, false, true, opts);
   },
 };
 
 // RID ONLY
+// opts.htmlElementId
 // opts.uriFieldName
 // opts.selectionIndex
 // opts.containerRowName
 // opts.containerName
 // opts.containerSecondFieldName
 
+if (selectionIndex === undefined) {
+  let selectionIndex = 0;
+}
+
+function addMobsearchListButton(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 =
     useRid === true
@@ -40,7 +65,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
   let alertMsg = useRid === true ? `and/or RID ` : ``;
 
   //Add new html
-  document.getElementById('mobsearch').innerHTML += `
+  document.getElementById(opts.htmlElementId).innerHTML += `
   <div id="instance-search-row">
     <div class="form-row">
       <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</label>
@@ -248,7 +273,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
       uri = uri.substring(0, uri.indexOf('#') + 1);
     }
     if (listed) {
-      opts.list[opts.selectionIndex].uri = uri;
+      opts.list[selectionIndex].uri = uri;
       updateList();
     } else {
       $(`#${opts.uriFieldName}`).val(uri);
@@ -314,14 +339,14 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     $(`#${opts.containerName}`)
       .editableList('items')
       .each(function (i) {
-        let resource = $(this);
-        let comment = resource.find(`.${opts.containerSecondFieldName}`).val();
-        node.resources[i].comment = comment;
+        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 < node.resources.length; i++) {
-      let resource = node.resources[i];
-      $(`#${opts.containerName}`).editableList('addItem', resource);
+    for (let i = 0; i < opts.list.length; i++) {
+      let item = opts.list[i];
+      $(`#${opts.containerName}`).editableList('addItem', item);
     }
     $(`#${opts.containerRowName}`).show();
   }

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();
-
-          });
+          addMobsearchListButton(searchField, i)
           // *** END MOBSEARCH *** //
         },
         resizeItem: resizeResource
@@ -151,12 +137,13 @@ POSSIBILITY OF SUCH DAMAGE.
       // *** MOBSEARCH *** //
 
       opts = {
-        selectionIndex: globalIndex,
+        htmlElementId: 'mobsearch',
+        list: node.resources,
         containerRowName: 'node-input-resources-container-row',
         containerName: 'node-input-resources-container',
         containerSecondFieldName: 'node-input-resources-comment',
       };
-      initMobsearch.toRidListed(mobiusSrvc, opts);
+      initMobsearch.toRid_listed(mobiusSrvc, opts);
 
       // *** END MOBSEARCH *** //
 

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

@@ -107,6 +107,7 @@ POSSIBILITY OF SUCH DAMAGE.
       let mobiusSrvc = $("#node-input-connection").val();
 
       opts = {
+        htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-instance '
       };
       initMobsearch.toIns(mobiusSrvc, opts);

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

@@ -99,6 +99,7 @@ POSSIBILITY OF SUCH DAMAGE.
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
       opts = {
+        htmlElementId: 'mobsearch',
         uriFieldName: 'node-input-resource'
       };
       initMobsearch.toRid(mobiusSrvc, opts);

package/package.json

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