node-red-contrib-mobius-flow-base 2.5.86-beta.69 → 2.5.86-beta.72

package/dist/nodes/common/mobsearch.js

@@ -3,24 +3,32 @@
  * @param mobiusSrvc - Connection to Mobius
  * @param {object} opts - Options object, field explained below
 
-   OPTS OBJECT (opts.)
-    ALL CASES
-      htmlElementId - The id of the HTML element that mobsearch will inject into
-    NON-LISTED ONLY
-      uriFieldName - The id of the URI HTML field, mobsearch will set the value of this field to be the result
-    LISTED ONLY (Uses editable list)
-      containerRowName - The id of the row containing the HTML container
-      containerName - The id of the HTML container
-      containerSecondFieldName - The id of the secondary field (Not URI field) within HTML container
- 
-  EXAMPLE  OPTS OBJECT - context of getMultiResource
+  OPTS OBJECT (opts.)
+  ALL CASES
+    htmlElementId - The id of the HTML element that mobsearch will inject into
+  NON-LISTED ONLY
+    uriFieldName - The id of the URI HTML field, mobsearch will set the value of this field to be the result
+    inputRowId - The id of the main input, mobsearch will add the search button to this row
+  LISTED ONLY (Uses editable list)
+    list - Array containing current list items in object form
+    containerRowName - The id of the row containing the HTML container
+    containerName - The id of the HTML container
+    containerSecondFieldName - The id of the secondary field (Not URI field) within HTML container
+
+  EXAMPLE OPTS OBJECT - context of getMultiResource (node using editable list)
   opts = {
     htmlElementId: 'mobsearch',
     list: node.resources,
     containerRowName: 'node-input-resources-container-row',
     containerName: 'node-input-resources-container',
     containerSecondFieldName: 'node-input-resources-comment',
-  }
+  };
+  EXAMPLE OPTS OBJECT - context of getResource (standard node, not using editable list)
+  opts = {
+    htmlElementId: 'mobsearch',
+    uriFieldName: 'node-input-resource',
+    inputRowId: 'input-row',
+  };
  * 
  * 
  * 
@@ -51,9 +59,9 @@ if (typeof selectionIndex === undefined) {
 
 /**
  * function to add search button functionality to list rows
- * @param {*} field - The search field within a given list row
- * @param {*} rowIndex - The list row index
- * @param {*} opts - Mobsearch options object
+ * @param {object} field - The search field within a given list row
+ * @param {number} rowIndex - The list row index
+ * @param {object} opts - Mobsearch options object
  */
 function addMobsearchListButton(field, rowIndex, opts) {
   field.click(function () {
@@ -84,6 +92,8 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
     uriFieldValue = $(`#${opts.uriFieldName}`).val();
   }
 
+  console.log(opts.htmlElementId);
+
   // * HTML INJECTION * //
 
   const resourceHtml = `
@@ -125,7 +135,7 @@ function getMobsearch(mobiusSrvc, useRid, listed, opts) {
 
   if (!listed) {
     //Add search button
-    document.getElementById('input-row').innerHTML += `
+    document.getElementById(opts.inputRowId).innerHTML += `
     <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
     `;
   }

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

@@ -33,30 +33,13 @@ POSSIBILITY OF SUCH DAMAGE.
   <hr>
 
   <div id="instance-row">
-    <div class="form-row">
+    <div class="form-row" id="input-row">
       <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
       <input type="text" id="node-input-resource" style="width:61%;" placeholder="HID/SID/PID/INS/RID">
       <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
     </div>
   </div>
-  <div id="instance-search-row">
-    <div class="form-row">
-      <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</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>
 
   <div class="form-row">
     <label for="node-input-priority"><i class="fa fa-exclamation-triangle"></i> Priority</label>
@@ -74,6 +57,8 @@ POSSIBILITY OF SUCH DAMAGE.
   </div>
 </script>
 
+<script src="common/mobsearch.js"></script>
+
 <script type="text/javascript">
   RED.nodes.registerType('mobius clear resource',{
     category: 'mobius',
@@ -119,261 +104,12 @@ POSSIBILITY OF SUCH DAMAGE.
       var node = this;
       let mobiusSrvc = $("#node-input-connection").val();
 
-      // *** MOBSEARCH *** //
-
-      //Inital setup
-      $("#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 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: []
-      }
-
-      //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-input-resource").val(uri);
-        $("#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();
-        $("#instance-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();
-      });
-
-      // *** MOBSEARCH *** //
+      opts = {
+        htmlElementId: 'mobsearch',
+        uriFieldName: 'node-input-resource',
+        inputRowId: 'input-row',
+      };
+      initMobsearch.toRid(mobiusSrvc, opts);
     },
     oneditsave: function() {
       if($("#node-input-detailedOutput").prop('checked')) {

package/dist/nodes/mobius-clear-resource.js

@@ -28,7 +28,7 @@
 'use strict';
 
 module.exports = function (RED) {
-  function MobiusClearResourceNode (n) {
+  function MobiusClearResourceNode(n) {
     RED.nodes.createNode(this, n);
     this.detailedOutput = n.detailedOutput;
     this.resource = n.resource;
@@ -40,7 +40,7 @@ module.exports = function (RED) {
       node.status({
         fill: 'red',
         shape: 'ring',
-        text: 'Disconnected'
+        text: 'Disconnected',
       });
 
       node.on('input', function (msg) {
@@ -57,7 +57,7 @@ module.exports = function (RED) {
           node.status({
             fill: 'green',
             shape: 'ring',
-            text: 'Busy'
+            text: 'Busy',
           });
 
           node.serviceConn.clearResourcePriority(uri, pri, (err, response) => {
@@ -65,29 +65,34 @@ module.exports = function (RED) {
               node.status({
                 fill: 'yellow',
                 shape: 'dot',
-                text: 'Error: ' + JSON.stringify(err.code)
+                text: 'Error: ' + JSON.stringify(err.code),
               });
               node.error('Mobius error clearing resource priority ' + JSON.stringify(err));
               if (node.detailedOutput === true) {
-                node.send([null, null, null, {topic: uri, payload: { error: true, response: err }}]);
+                node.send([
+                  null,
+                  null,
+                  null,
+                  { topic: uri, payload: { error: true, response: err } },
+                ]);
               }
             } else {
               node.status({
                 fill: 'green',
                 shape: 'dot',
-                text: JSON.stringify(response.value.pv)
+                text: JSON.stringify(response.value.pv),
               });
               if (node.detailedOutput === true) {
                 node.send([
                   { topic: uri, payload: response.value.pv },
                   { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
                   { topic: uri, payload: response.value },
-                  { topic: uri, payload: { error: false, response: response } }
+                  { topic: uri, payload: { error: false, response: response } },
                 ]);
               } else {
                 node.send([
                   { topic: uri, payload: response.value.pv },
-                  { topic: uri, payload: { pv: response.value.pv, name: response.value.name } }
+                  { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
                 ]);
               }
             }
@@ -106,4 +111,12 @@ module.exports = function (RED) {
   }
 
   RED.nodes.registerType('mobius clear resource', MobiusClearResourceNode);
+
+  RED.httpAdmin.get('/common/*', function (req, res) {
+    var options = {
+      root: __dirname + '/common/',
+      dotfiles: 'deny',
+    };
+    res.sendFile(req.params[0], options);
+  });
 };