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

package/dist/nodes/mobius-discover-object-list.html

@@ -410,16 +410,25 @@ POSSIBILITY OF SUCH DAMAGE.
       // *** MOBSEARCH *** //
 
       function updateList() {
+        $("#node-input-subs-container").editableList('items').each(function (i) {
+          let sub = $(this);
+          let type = sub.find(".node-input-sub-type").val();
+          node.subscriptions[i].type = type;
+        })
         $("#node-input-subs-container").editableList('empty');
         for (let i = 0; i < node.subscriptions.length; i++) {
           let subscription = node.subscriptions[i];
           $("#node-input-subs-container").editableList('addItem', subscription);
         }
       }
-      updateList()
 
       // *** END MOBSEARCH *** //
 
+      for (let i = 0; i < node.subscriptions.length; i++) {
+        let subscription = node.subscriptions[i];
+        $("#node-input-subs-container").editableList('addItem', subscription);
+      }
+
       function showRIDFilterInputs() {
         if($("#node-input-useRIDValueFiltering").is(':checked')) {
           $("#use-rid-filter-row").show();

package/dist/nodes/mobius-flow-inject.html

@@ -34,10 +34,28 @@ POSSIBILITY OF SUCH DAMAGE.
     <label for="node-input-connection"><i class="fa fa-globe"></i> MOBiUS</label>
     <input type="text" id="node-input-connection">
   </div>
-  <div class="form-row node-input-subs-container-row">
+  <div id="node-input-subs-container-row" class="form-row node-input-subs-container-row">
     <label for="node-input-subs-container"><i class="fa fa-bars"></i> Subscriptions</label>
       <ol id="node-input-subs-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:15%;" placeholder="HID">
+      <input type="text" id="instance-search-sid" style="width:10%;" 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">
+      <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"><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 manually.</p>
+  </div>
 </script>
 
 <script type="text/javascript">
@@ -67,6 +85,215 @@ POSSIBILITY OF SUCH DAMAGE.
     },
     oneditprepare: function () {
       var node = this;
+      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: '',
+        objects: []
+      }
+
+      //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 = '';
+        searchObject.objects = [];
+        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}`
+        if (uri.includes('#')) {
+          uri = uri.substring(0,uri.indexOf('#') + 1)
+        }
+        node.subscriptions[globalSubscriptionIndex].uri = uri;
+        updateList()
+        $("#node-search-accept").css('color', '#CCCCCC');
+        readyToAccept = false;
+        $("#node-search-return").addClass('disabled');
+        $("#node-search-accept").addClass('disabled');
+        $("#instance-search-row").hide();
+        $('#node-input-subs-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-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").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() !== '+') {
+          $("#wildcard-alert-row").hide();
+        } else {
+          $("#wildcard-alert-row").show();
+        }
+      }
+
+      $("#instance-search-sid").click(function () {     //SID field clicked
+        $("#instance-search-pid").val('')
+        $("#instance-search-ins").val('')
+        searchObject.pid = '';
+        searchObject.ins = '';
+        searchObject.objects = [];
+        startSearch();
+      })
+      $("#instance-search-pid").click(function () {    //PID field clicked
+        $("#instance-search-ins").val('')
+        searchObject.ins = '';
+        if (searchObject.sid !== '') {
+          pidsSearch(searchObject.objects);
+        }
+      })
+      $("#instance-search-ins").click(function () {   //INS field clicked
+        if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
+          insSearch(searchObject.objects, searchObject.pid);
+        }
+      })
+      $("#node-search-return").click(function () {    //Return/Back button clicked
+        $("#node-search-return").addClass('disabled');
+        $("#node-search-accept").addClass('disabled');
+        $("#instance-search-row").hide();
+        $('#node-input-subs-container-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-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();
+      });
+
+      // *** END MOBSEARCH *** //
 
       /** Create the subs container and populate it */
       $('#node-input-subs-container').css('min-height', '300px').css('min-width', '450px').editableList ({
@@ -86,6 +313,11 @@ POSSIBILITY OF SUCH DAMAGE.
 
           var row = $('<div>URI</div>').appendTo(container);
           var uriField = $('<input/>',{class: "node-input-sub-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 *** //
+          
           var typeField = $('<select/>',{class: "node-input-sub-type", style: "width:auto; margin-left: 5px; text-align: center;"}).appendTo(row);
           typeField.append($("<option></option>").val('include').text('Include'));
           typeField.append($("<option></option>").val('exclude').text('Exclude'));
@@ -93,6 +325,25 @@ POSSIBILITY OF SUCH DAMAGE.
           // Populate the new stat
           uriField.val(subscription.uri);
           typeField.val(subscription.type);
+
+          // *** MOBSEARCH *** //
+
+          if (!node.subscriptions[i]) {
+            node.subscriptions[i] = {uri: '', type: 'include'}
+          }
+
+          searchField.click(function () {
+            globalSubscriptionIndex = i;
+            $('#node-input-subs-container-row').hide();
+            $("#instance-search-sid").val('');
+            $("#instance-search-pid").val('');
+            $("#instance-search-ins").val('');
+            $("#node-search-return").removeClass('disabled');
+            $("#node-search-accept").removeClass('disabled');
+            $("#instance-search-row").show();
+
+          });
+          // *** END MOBSEARCH *** //
         }
       });
 
@@ -100,7 +351,24 @@ POSSIBILITY OF SUCH DAMAGE.
       if (!node.subscriptions) {
         node.subscriptions = [subscription = {uri: '', type: 'include'}];
       }
-      // Populate list with all saved filters
+
+      // *** MOBSEARCH *** //
+
+      function updateList() {
+        $("#node-input-subs-container").editableList('items').each(function (i) {
+          let sub = $(this);
+          let type = sub.find(".node-input-sub-type").val();
+          node.subscriptions[i].type = type;
+        })
+        $("#node-input-subs-container").editableList('empty');
+        for (let i = 0; i < node.subscriptions.length; i++) {
+          let subscription = node.subscriptions[i];
+          $("#node-input-subs-container").editableList('addItem', subscription);
+        }
+      }
+
+      // *** END MOBSEARCH *** //
+
       for (let i = 0; i < node.subscriptions.length; i++) {
         let subscription = node.subscriptions[i];
         $("#node-input-subs-container").editableList('addItem', subscription);

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

@@ -319,7 +319,7 @@ POSSIBILITY OF SUCH DAMAGE.
           }
 
           var row = $('<div>URI</div>').appendTo(container);
-          var uriField = $('<input/>',{class: "node-input-mobject-uri", type: "text", style: "width: 150px; margin-left: 5px; text-align: left;"}).appendTo(row);
+          var uriField = $('<input/>',{class: "node-input-mobject-uri", type: "text", style: "width: 180px; 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);
@@ -327,7 +327,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
           row.append('&nbsp;&nbsp;-&nbsp;');
 
-          var commentField = $('<input/>',{class: "node-input-mobject-comment", type: "text", style: "width: 150px; margin-left: 5px; text-align: left;"}).appendTo(row);
+          var commentField = $('<input/>',{class: "node-input-mobject-comment", type: "text", style: "width: 120px; margin-left: 5px; text-align: left;"}).appendTo(row);
 
           // Populate the new stat
           uriField.val(mobject.uri);
@@ -365,9 +365,8 @@ POSSIBILITY OF SUCH DAMAGE.
       function updateList() {
         $("#node-input-mobjects-container").editableList('items').each(function (i) {
           let mobject = $(this);
-          let uri = mobject.find(".node-input-mobject-uri").val();
           let comment = mobject.find(".node-input-mobject-comment").val();
-          console.log(comment);
+          node.mobjects[i].comment = comment;
         })
         $("#node-input-mobjects-container").editableList('empty');
         for (let i = 0; i < node.mobjects.length; i++) {
@@ -375,13 +374,13 @@ POSSIBILITY OF SUCH DAMAGE.
           $("#node-input-mobjects-container").editableList('addItem', mobject);
         }
       }
-      
+
+      // *** END MOBSEARCH *** //
+
       for (let i = 0; i < node.mobjects.length; i++) {
         let mobject = node.mobjects[i];
         $("#node-input-mobjects-container").editableList('addItem', mobject);
       }
-
-      // *** END MOBSEARCH *** //
     },
     oneditresize(size) {
       var rows = $("#dialog-form>div:not(.node-input-mobjects-container)");