node-red-contrib-mobius-flow-base 2.5.86-beta.43 → 2.5.86-beta.44

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

@@ -41,10 +41,29 @@ POSSIBILITY OF SUCH DAMAGE.
       <option value="object">Object - Resource PVs, URIs and Names</option>
     </select>
   </div>
-  <div class="form-row node-input-resources-container-row">
+  <div id="node-input-resources-container-row" class="form-row node-input-resources-container-row">
     <label for="node-input-resources-container"><i class="fa fa-bars"></i> Resources</label>
       <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-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>
 </script>
 
 <script type="text/javascript">
@@ -82,6 +101,266 @@ POSSIBILITY OF SUCH DAMAGE.
         resource.find(".node-input-resource-comment").width(newWidth - 270);
       }
 
+      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();
+        $("#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();
+      });
+
+      // *** END MOBSEARCH *** //
+
       /** Create the subs container and populate it */
       $('#node-input-resources-container').css('min-height', '300px').css('min-width', '450px').editableList ({
         addButton: "add",
@@ -100,13 +379,38 @@ POSSIBILITY OF SUCH DAMAGE.
 
           var row = $('<div>URI</div>').appendTo(container);
           var uriField = $('<input/>',{class: "node-input-resource-uri", type: "text", style: "width: 200px; margin-left: 5px; text-align: left;"}).appendTo(row);
+          
+          // *** MOBSEARCH *** //
+          var searchField = $('<a class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
+          // *** END MOBSEARCH *** //
+          
           row.append('&nbsp;&nbsp;-&nbsp;');
-          var commentField = $('<input/>',{class: "node-input-resource-comment", type: "text", style: "margin-left: 5px; text-align: left;"}).appendTo(row);
+          var commentField = $('<input/>',{class: "node-input-resource-comment", type: "text", style: "width: 120px; margin-left: 5px; text-align: left;"}).appendTo(row);
 
           // Populate the new stat
           uriField.val(resource.uri);
           commentField.val(resource.comment);
-          resizeResource(container);
+          // resizeResource(container);
+
+          // *** MOBSEARCH *** //
+
+          if (!node.resources[i]) {
+            node.resources[i] = {uri: '', comment: ''}
+          }
+
+          searchField.click(function () {
+            globalSubscriptionIndex = 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();
+
+          });
+          // *** END MOBSEARCH *** //
         },
         resizeItem: resizeResource
       });
@@ -115,7 +419,24 @@ POSSIBILITY OF SUCH DAMAGE.
       if (!node.resources) {
         node.resources = [resource = {uri: '', comment: ''}];
       }
-      // Populate list with all saved filters
+
+      // *** 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);
+        }
+      }
+
+      // *** END MOBSEARCH *** //
+
       for (let i = 0; i < node.resources.length; i++) {
         let resource = node.resources[i];
         $("#node-input-resources-container").editableList('addItem', resource);

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

@@ -82,7 +82,8 @@ POSSIBILITY OF SUCH DAMAGE.
     defaults: {
       name: {value:""},
       detailedOutput: {value:false},
-      resource: {value:"", required:true, validate:function(v) {
+      resource: {value:"", validate:function(v) {
+        if(v === '') { return true; }
         let parts = v.split('/');
         for(let lp = 0; lp < parts.length; lp++) {
           if(parts[lp] === null || parts[lp] === '') { return false;}

package/package.json

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