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

package/dist/nodes/common/mobsearch.js

@@ -1,4 +1,19 @@
-function getMobsearch(mobiusSrvc, level, fieldName) {
+initMobsearch = {
+  toRid: () => {
+    return 'Hello World';
+  },
+  toIns: () => {
+    return 'Hello World';
+  },
+  toRidList: () => {
+    return 'Hello World';
+  },
+  toInsList: () => {
+    return 'Hello World';
+  },
+};
+
+function getMobsearch(mobiusSrvc, level, listed, fieldName, list, updateList, globalIndex) {
   //level dependent html
   let rows =
     level === 'rid'
@@ -35,10 +50,12 @@ function getMobsearch(mobiusSrvc, level, fieldName) {
   </div>
   `;
 
-  //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>
-  `;
+  if (!listed) {
+    //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>
+    `;
+  }
 
   //Inital setup
   $('#instance-search-row').hide();
@@ -49,17 +66,29 @@ function getMobsearch(mobiusSrvc, level, fieldName) {
   });
   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(),
-    objects: [],
-  };
-  if (level === 'rid') {
-    searchObject.rid = $('#instance-search-rid').val();
+  let searchObject = {};
+  if (listed) {
+    searchObject = {
+      hid: '',
+      sid: '',
+      pid: '',
+      ins: '',
+      rid: '',
+      objects: [],
+    };
+  } else {
+    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: [],
+    };
   }
 
+  //End init setup
+
   //Function to search for RIDs
   function ridSearch(objects, ins) {
     $.getJSON(
@@ -211,7 +240,12 @@ function getMobsearch(mobiusSrvc, level, fieldName) {
     if (uri.includes('#')) {
       uri = uri.substring(0, uri.indexOf('#') + 1);
     }
-    $(`#${fieldName}`).val(uri);
+    if (listed) {
+      list[globalIndex].uri = uri;
+      updateList();
+    } else {
+      $(`#${fieldName}`).val(uri);
+    }
     $('#node-search-accept').css('color', '#CCCCCC');
     readyToAccept = false;
     $('#node-search-return').addClass('disabled');

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

@@ -46,26 +46,11 @@ POSSIBILITY OF SUCH DAMAGE.
       <ol id="node-input-resources-container"></ol>
   </div>
 
-  <div id="instance-search-row">
-    <div class="form-row">
-      <label for="instance-search-sid"><i class="fa fa-search"></i> Search</label>
-      <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">
-      <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>
-  </div>
-  <div id="wildcard-alert-row" class="form-row hidden" style="color:#555555" align="center">
-    <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>
-  </div>
+  <div id="mobsearch"></div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius get multi-resource', {
     category: 'mobius',
@@ -102,264 +87,7 @@ POSSIBILITY OF SUCH DAMAGE.
       }
 
       let mobiusSrvc = $("#node-input-connection").val();
-
-      // *** MOBSEARCH *** //
-
-      $("#instance-search-row").hide();
-      $("#wildcard-alert-row").hide();
-      $("#node-search-return").addClass('disabled');
-      $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
-        $("#instance-search-hid").val(response);
-      })
-
-      let globalSubscriptionIndex = 0;
-
-      let searchObject = {
-        hid: '',
-        sid: '',
-        pid: '',
-        ins: '',
-        rid: '',
-        objects: []
-      }
-
-      //Function to search for RIDs
-      function ridSearch (objects, ins) {
-        $.getJSON(`mdiscover?mobius=${mobiusSrvc}&uri=${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`, (response) => {
-          resList = response.value[0].resources
-          ress = ['#'];
-          for (let j = 0; j < resList.length; j++) {
-            ress.push(`${resList[j].rid} - ${resList[j].name}`)
-          }
-          $("#instance-search-rid").autocomplete({
-            source: ress,
-            minLength: 0,
-            close: function (event, ui) {
-              acceptCheck();
-              $("#instance-search-rid").autocomplete('destroy');
-              $("#instance-search-rid").val($("#instance-search-rid").val().substring(0, 2));
-              searchObject.rid = $("#instance-search-rid").val();
-            }
-          }).autocomplete('search', '');
-        })
-      }
-
-      //Function to search for INSs
-      function insSearch (objects, pid) {
-        let inss = ['#', '+'];
-        for (let i = 0; i < objects.length; i++) {
-          if (objects[i].pid === pid) {
-            const name = objects[i].resources[1].pv;
-            if (name === '') {
-              inss.push(objects[i].ins);
-            } else {
-              inss.push(`${objects[i].ins} - ${name}`);
-            }
-          }
-        }
-        $("#instance-search-ins").autocomplete({
-          source: inss,
-          minLength: 0,
-          close: function (event, ui) {
-            acceptCheck();
-            $("#instance-search-ins").autocomplete('destroy');
-            if ($("#instance-search-ins").val().length > 4) {
-              $("#instance-search-ins").val($("#instance-search-ins").val().substring(0, 4))
-            }
-            searchObject.ins = $("#instance-search-ins").val();
-          }
-        }).autocomplete('search', '');
-      }
-
-      //Function to search for PIDs
-      function pidsSearch(objects) {
-        searchObject.objects = objects;
-        let pids = ['#', '+'];
-        for (let i = 0; i < objects.length; i++) {
-          pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
-        }
-        pids = [...new Set(pids)];
-        $("#instance-search-pid").autocomplete({
-          source: pids,
-          minLength: 0,
-          close: function (event, ui) {
-            acceptCheck();
-            $("#instance-search-pid").autocomplete('destroy');
-            if ($("#instance-search-pid").val().length > 4) {
-              $("#instance-search-pid").val($("#instance-search-pid").val().substring(0, 4))
-            }
-            searchObject.pid = $("#instance-search-pid").val();
-          }
-        }).autocomplete('search', '');
-      }
-
-      //Function to search for SIDs, and then fetch child objects based on selection
-      function serviceSearch(response) {
-        let services = ['#', '+'];
-        for (let i = 0; i < response.length; i++) {
-          if (response[i].sid !== '009') {
-            services.push(`${response[i].sid} - ${response[i].name}`);
-          }
-        }
-        $("#instance-search-sid").autocomplete({
-          source: services,
-          minLength: 0,
-          close: function (event, ui) {
-            acceptCheck();
-            $("#instance-search-sid").autocomplete('destroy');
-            if ($("#instance-search-sid").val().length > 3) {
-              $("#instance-search-sid").val($("#instance-search-sid").val().substring(0, 3))
-            }
-            searchObject.sid = $("#instance-search-sid").val();
-            if (searchObject.sid === '+') {
-              for (let i = 2; i < services.length; i++) {
-                $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[i].substring(0, 3)}`, (objects) => {
-                  searchObject.objects = searchObject.objects.concat(objects);
-                })
-              }
-            } else {
-              $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`, (objects) => {
-                searchObject.objects = objects;
-              })
-            }
-          }
-        }).autocomplete('search', '');
-      }
-
-      //Start a new search
-      function startSearch() {
-        $("#wildcard-alert-row").hide();
-        $("#instance-search-sid").val('');
-        $("#instance-search-pid").val('');
-        $("#instance-search-ins").val('');
-        searchObject.hid = $("#instance-search-hid").val()
-        searchObject.sid = '';
-        searchObject.pid = '';
-        searchObject.ins = '';
-        if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
-          $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
-            .fail((err) => {
-              console.log('Some kind of html failure message on service discovery');
-            });
-        }
-      }
-
-      //Finish a search
-      function finishSearch() {
-        $("#wildcard-alert-row").hide();
-        let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`
-        if (uri.includes('#')) {
-          uri = uri.substring(0,uri.indexOf('#') + 1)
-        }
-        node.resources[globalSubscriptionIndex].uri = uri;
-        updateList()
-        $("#node-search-accept").css('color', '#CCCCCC');
-        readyToAccept = false;
-        $("#node-search-return").addClass('disabled');
-        $("#node-search-accept").addClass('disabled');
-        $("#node-lookup-instance").removeClass('disabled');
-        $("#instance-search-row").hide();
-        $('#node-input-resources-container-row').show();
-      }
-
-      //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;
-        } else {
-          $("#node-search-accept").css('color', '#CCCCCC');
-          readyToAccept = false;
-        }
-        if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+' && $("#instance-search-ins").val() !== '+') {
-          $("#wildcard-alert-row").hide();
-        } else {
-          $("#wildcard-alert-row").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('');
-        $("#instance-search-rid").val('');
-        $("#node-lookup-instance").addClass('disabled');
-        $("#node-search-return").removeClass('disabled');
-        $("#node-search-accept").removeClass('disabled');
-        $("#instance-row").hide();
-        $("#instance-search-row").show();
-      });
-      $("#instance-search-sid").click(function () {     //SID field clicked
-        $("#instance-search-pid").val('')
-        $("#instance-search-ins").val('')
-        searchObject.pid = '';
-        searchObject.ins = '';
-        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 (searchObject.sid !== '') {
-          pidsSearch(searchObject.objects);
-        }
-      })
-      $("#instance-search-ins").click(function () {   //INS field clicked
-        $("#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);
-        }
-      });
-      $("#node-search-return").click(function () {    //Return/Back button clicked
-        $("#node-search-return").addClass('disabled');
-        $("#node-search-accept").addClass('disabled');
-        $("#node-lookup-instance").removeClass('disabled');
-        $("#instance-search-row").hide();
-        $("#instance-row").show();
-      });
-      $("#node-search-accept").click(function () {    //Accept button clicked
-        if (readyToAccept) {
-          finishSearch();
-        }
-      });
-
-      // Respond to search field changes
-      $("#instance-search-hid").change(function () {
-        acceptCheck();
-        $("#instance-search-sid").val('');
-        $("#instance-search-pid").val('');
-        $("#instance-search-ins").val('');
-        $("#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();
-      });
-      $("#instance-search-rid").change(function () {
-        searchObject.rid = $("#instance-search-rid").val()
-        acceptCheck();
-      });
-
-      // *** END MOBSEARCH *** //
+      let globalIndex = 0;
 
       /** Create the subs container and populate it */
       $('#node-input-resources-container').css('min-height', '300px').css('min-width', '450px').editableList ({
@@ -399,7 +127,7 @@ POSSIBILITY OF SUCH DAMAGE.
           }
 
           searchField.click(function () {
-            globalSubscriptionIndex = i;
+            globalIndex = i;
             $('#node-input-resources-container-row').hide();
             $("#instance-search-sid").val('');
             $("#instance-search-pid").val('');
@@ -433,8 +161,11 @@ POSSIBILITY OF SUCH DAMAGE.
           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)
+
       // *** END MOBSEARCH *** //
 
       for (let i = 0; i < node.resources.length; i++) {

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

@@ -28,7 +28,7 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusFlowNode (n) {
+  function MobiusFlowNode(n) {
     RED.nodes.createNode(this, n);
     this.resources = n.resources;
     this.sendFormat = n.send;
@@ -39,7 +39,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.serviceConn.register(node);
@@ -48,7 +48,7 @@ module.exports = function (RED) {
         node.status({
           fill: 'green',
           shape: 'ring',
-          text: 'Busy'
+          text: 'Busy',
         });
 
         for (const resource of node.resources) {
@@ -56,7 +56,7 @@ module.exports = function (RED) {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'URIs not Valid'
+              text: 'URIs not Valid',
             });
             if (done) {
               return done();
@@ -72,23 +72,23 @@ module.exports = function (RED) {
             node.status({
               fill: 'green',
               shape: 'dot',
-              text: 'Done'
+              text: 'Done',
             });
             if (node.sendFormat === 'array') {
-              node.send({topic: msg.topic, payload: values});
+              node.send({ topic: msg.topic, payload: values });
             } else {
               let payload = values.reduce((obj, item) => {
                 obj[item.uri] = { pv: item.pv, name: item.name };
                 return obj;
               }, {});
-              node.send({topic: msg.topic, payload: payload});
+              node.send({ topic: msg.topic, payload: payload });
             }
           })
           .catch((err) => {
             node.status({
               fill: 'yellow',
               shape: 'dot',
-              text: 'Error: ' + JSON.stringify(err.code)
+              text: 'Error: ' + JSON.stringify(err.code),
             });
             node.error('Mobius error reading resource ' + JSON.stringify(err));
           })
@@ -107,7 +107,7 @@ module.exports = function (RED) {
     }
   }
 
-  function validateResourceURI (uri) {
+  function validateResourceURI(uri) {
     let parts = uri.split('/');
     for (let lp = 0; lp < parts.length; lp++) {
       if (parts[lp] === null || parts[lp] === '') {
@@ -120,7 +120,7 @@ module.exports = function (RED) {
     return false;
   }
 
-  function readResource (node, uri) {
+  function readResource(node, uri) {
     return new Promise((resolve, reject) => {
       node.serviceConn.readResource(uri, (err, response) => {
         if (err) {
@@ -129,7 +129,7 @@ module.exports = function (RED) {
           if (node.sendFormat === 'array') {
             resolve(response.value.pv);
           } else {
-            resolve({uri: uri, pv: response.value.pv, name: response.value.name});
+            resolve({ uri: uri, pv: response.value.pv, name: response.value.name });
           }
         }
       });
@@ -137,4 +137,12 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius get multi-resource', MobiusFlowNode);
+
+  RED.httpAdmin.get('/common/*', function (req, res) {
+    var options = {
+      root: __dirname + '/common/',
+      dotfiles: 'deny',
+    };
+    res.sendFile(req.params[0], options);
+  });
 };

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

@@ -38,6 +38,8 @@ POSSIBILITY OF SUCH DAMAGE.
     </div>
   </div>
 
+  <div id="mobsearch"></div>
+
   <div class="form-row">
     <label for="node-input-format"><i class="fa fa-bars"></i> Format</label>
     <select type="text" id="node-input-format" style="display: inline-block; width: auto; vertical-align: center;">
@@ -104,7 +106,7 @@ POSSIBILITY OF SUCH DAMAGE.
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
 
-      getMobsearch(mobiusSrvc, 'ins', 'node-input-instance')
+      getMobsearch(mobiusSrvc, 'ins', false, 'node-input-instance', null, null, null)
     },
     oneditsave: function() {
       if($("#node-input-detailedOutput").prop('checked')) {

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

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