node-red-contrib-mobius-flow-base 2.5.86-beta.28 → 2.5.86-beta.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/nodes/mobius-discover-object-list.html +266 -6
  2. package/dist/nodes/mobius-get-multi-object.html +265 -6
  3. package/package.json +1 -1
package/dist/nodes/mobius-discover-object-list.html CHANGED
@@ -53,10 +53,29 @@ POSSIBILITY OF SUCH DAMAGE.
53
53
  <option value="array">Array of Items</option>
54
54
  </select>
55
55
  </div>
56
- <div class="form-row node-input-subs-container-row">
56
+ <div id="node-input-subs-container-row" class="form-row node-input-subs-container-row">
57
57
  <label for="node-input-subs-container" style="width:105px;float:left;"><i class="fa fa-bars"></i> Discover</label>
58
58
  <ol id="node-input-subs-container"></ol>
59
59
  </div>
60
+
61
+ <div id="instance-search-row">
62
+ <div class="form-row">
63
+ <label for="instance-search-sid"><i class="fa fa-search"></i> Search</label>
64
+ <input type="text" id="instance-search-hid" style="width:15%;" placeholder="HID">
65
+ <input type="text" id="instance-search-sid" style="width:10%;" placeholder="SID">
66
+ <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
67
+ <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
68
+ <a id="node-search-return" class="searchbutton" style="vertical-align: middle"><i id="node-search-return-icon" class="fa fa-arrow-left"></i></a>
69
+ <a id="node-search-accept" class="searchbutton" style="vertical-align: middle"><i id="node-search-accept-icon" class="fa fa-check"></i></a>
70
+ </div>
71
+ </div>
72
+ <div id="wildcard-alert-row" class="form-row hidden" style="color:#555555" align="center">
73
+ <p>Please note: The selection of wildcard '+'
74
+ means a search for a specific instance or resource
75
+ cannot be performed. As such, enter the
76
+ INS manually.</p>
77
+ </div>
78
+
60
79
  <div class="form-row">
61
80
  <label for="node-input-useRIDValueFiltering" style="width:178px;float:left;"><i class="fa fa-filter"></i> Filter by Resource Value</label>
62
81
  <input type="checkbox" id="node-input-useRIDValueFiltering" style="display: inline-block; width: auto; vertical-align: top;">
@@ -119,6 +138,215 @@ POSSIBILITY OF SUCH DAMAGE.
119
138
  },
120
139
  oneditprepare: function () {
121
140
  var node = this;
141
+ let mobiusSrvc = $("#node-input-connection").val();
142
+
143
+ // *** MOBSEARCH *** //
144
+
145
+ $("#instance-search-row").hide();
146
+ $("#wildcard-alert-row").hide();
147
+ $("#node-search-return").addClass('disabled');
148
+ $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
149
+ $("#instance-search-hid").val(response);
150
+ })
151
+
152
+ let globalSubscriptionIndex = 0;
153
+
154
+ let searchObject = {
155
+ hid: '',
156
+ sid: '',
157
+ pid: '',
158
+ ins: '',
159
+ objects: []
160
+ }
161
+
162
+ //Function to search for INSs
163
+ function insSearch (objects, pid) {
164
+ let inss = ['#'];
165
+ for (let i = 0; i < objects.length; i++) {
166
+ if (objects[i].pid === pid) {
167
+ const name = objects[i].resources[1].pv;
168
+ if (name === '') {
169
+ inss.push(objects[i].ins);
170
+ } else {
171
+ inss.push(`${objects[i].ins} - ${name}`);
172
+ }
173
+ }
174
+ }
175
+ $("#instance-search-ins").autocomplete({
176
+ source: inss,
177
+ minLength: 0,
178
+ close: function (event, ui) {
179
+ acceptCheck();
180
+ $("#instance-search-ins").autocomplete('destroy');
181
+ if ($("#instance-search-ins").val().length > 4) {
182
+ $("#instance-search-ins").val($("#instance-search-ins").val().substring(0, 4))
183
+ }
184
+ searchObject.ins = $("#instance-search-ins").val();
185
+ }
186
+ }).autocomplete('search', '');
187
+ }
188
+
189
+ //Function to search for PIDs
190
+ function pidsSearch(objects) {
191
+ searchObject.objects = objects;
192
+ let pids = ['#', '+'];
193
+ for (let i = 0; i < objects.length; i++) {
194
+ pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
195
+ }
196
+ pids = [...new Set(pids)];
197
+ $("#instance-search-pid").autocomplete({
198
+ source: pids,
199
+ minLength: 0,
200
+ close: function (event, ui) {
201
+ acceptCheck();
202
+ $("#instance-search-pid").autocomplete('destroy');
203
+ if ($("#instance-search-pid").val().length > 4) {
204
+ $("#instance-search-pid").val($("#instance-search-pid").val().substring(0, 4))
205
+ }
206
+ searchObject.pid = $("#instance-search-pid").val();
207
+ }
208
+ }).autocomplete('search', '');
209
+ }
210
+
211
+ //Function to search for SIDs, and then fetch child objects based on selection
212
+ function serviceSearch(response) {
213
+ let services = ['#', '+'];
214
+ for (let i = 0; i < response.length; i++) {
215
+ if (response[i].sid !== '009') {
216
+ services.push(`${response[i].sid} - ${response[i].name}`);
217
+ }
218
+ }
219
+ $("#instance-search-sid").autocomplete({
220
+ source: services,
221
+ minLength: 0,
222
+ close: function (event, ui) {
223
+ acceptCheck();
224
+ $("#instance-search-sid").autocomplete('destroy');
225
+ if ($("#instance-search-sid").val().length > 3) {
226
+ $("#instance-search-sid").val($("#instance-search-sid").val().substring(0, 3))
227
+ }
228
+ searchObject.sid = $("#instance-search-sid").val();
229
+ if (searchObject.sid === '+') {
230
+ for (let i = 2; i < services.length; i++) {
231
+ $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[i].substring(0, 3)}`, (objects) => {
232
+ searchObject.objects = searchObject.objects.concat(objects);
233
+ })
234
+ }
235
+ } else {
236
+ $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`, (objects) => {
237
+ searchObject.objects = objects;
238
+ })
239
+ }
240
+ }
241
+ }).autocomplete('search', '');
242
+ }
243
+
244
+ //Start a new search
245
+ function startSearch() {
246
+ $("#wildcard-alert-row").hide();
247
+ $("#instance-search-sid").val('');
248
+ $("#instance-search-pid").val('');
249
+ $("#instance-search-ins").val('');
250
+ searchObject.hid = $("#instance-search-hid").val()
251
+ searchObject.sid = '';
252
+ searchObject.pid = '';
253
+ searchObject.ins = '';
254
+ searchObject.objects = [];
255
+ if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
256
+ $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
257
+ .fail((err) => {
258
+ console.log('Some kind of html failure message on service discovery');
259
+ });
260
+ }
261
+ }
262
+
263
+ //Finish a search
264
+ function finishSearch() {
265
+ $("#wildcard-alert-row").hide();
266
+ let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`
267
+ if (uri.includes('#')) {
268
+ uri = uri.substring(0,uri.indexOf('#') + 1)
269
+ }
270
+ node.subscriptions[globalSubscriptionIndex].uri = uri;
271
+ updateList()
272
+ $("#node-search-accept").css('color', '#CCCCCC');
273
+ readyToAccept = false;
274
+ $("#node-search-return").addClass('disabled');
275
+ $("#node-search-accept").addClass('disabled');
276
+ $("#instance-search-row").hide();
277
+ $('#node-input-subs-container-row').show();
278
+ }
279
+
280
+ //Function to update if accept button is grade out and functions based on conditions of fields
281
+ function acceptCheck() {
282
+ if (($("#instance-search-hid").val() !== '' && $("#instance-search-sid").val() !== '' && $("#instance-search-pid").val() !== '' && $("#instance-search-ins").val() !== '') ||
283
+ $("#instance-search-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").val() === '#') {
284
+ $("#node-search-accept").css('color', '#555555');
285
+ readyToAccept = true;
286
+ } else {
287
+ $("#node-search-accept").css('color', '#CCCCCC');
288
+ readyToAccept = false;
289
+ }
290
+ if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+') {
291
+ $("#wildcard-alert-row").hide();
292
+ } else {
293
+ $("#wildcard-alert-row").show();
294
+ }
295
+ }
296
+
297
+ $("#instance-search-sid").click(function () { //SID field clicked
298
+ $("#instance-search-pid").val('')
299
+ $("#instance-search-ins").val('')
300
+ searchObject.pid = '';
301
+ searchObject.ins = '';
302
+ searchObject.objects = [];
303
+ startSearch();
304
+ })
305
+ $("#instance-search-pid").click(function () { //PID field clicked
306
+ $("#instance-search-ins").val('')
307
+ searchObject.ins = '';
308
+ if (searchObject.sid !== '') {
309
+ pidsSearch(searchObject.objects);
310
+ }
311
+ })
312
+ $("#instance-search-ins").click(function () { //INS field clicked
313
+ if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
314
+ insSearch(searchObject.objects, searchObject.pid);
315
+ }
316
+ })
317
+ $("#node-search-return").click(function () { //Return/Back button clicked
318
+ $("#node-search-return").addClass('disabled');
319
+ $("#node-search-accept").addClass('disabled');
320
+ $("#instance-search-row").hide();
321
+ $('#node-input-subs-container-row').show();
322
+ });
323
+ $("#node-search-accept").click(function () { //Accept button clicked
324
+ if (readyToAccept) {
325
+ finishSearch();
326
+ }
327
+ });
328
+
329
+ // Respond to search field changes
330
+ $("#instance-search-hid").change(function () {
331
+ acceptCheck();
332
+ $("#instance-search-sid").val('');
333
+ $("#instance-search-pid").val('');
334
+ $("#instance-search-ins").val('');
335
+ });
336
+ $("#instance-search-sid").change(function () {
337
+ searchObject.sid = $("#instance-search-sid").val()
338
+ acceptCheck();
339
+ });
340
+ $("#instance-search-pid").change(function () {
341
+ searchObject.pid = $("#instance-search-pid").val()
342
+ acceptCheck();
343
+ });
344
+ $("#instance-search-ins").change(function () {
345
+ searchObject.ins = $("#instance-search-ins").val()
346
+ acceptCheck();
347
+ });
348
+
349
+ // *** END MOBSEARCH *** //
122
350
 
123
351
  /** Create the subs container and populate it */
124
352
  $('#node-input-subs-container').css('min-height', '200px').css('min-width', '345px').editableList ({
@@ -137,7 +365,12 @@ POSSIBILITY OF SUCH DAMAGE.
137
365
  }
138
366
 
139
367
  var row = $('<div>URI</div>').appendTo(container);
140
- var uriField = $('<input/>',{class: "node-input-sub-uri", type: "text", style: "width: 170px; margin-left: 5px; text-align: left;"}).appendTo(row);
368
+ var uriField = $('<input/>',{class: "node-input-sub-uri", type: "text", style: "width: 150px; margin-left: 5px; text-align: left;"}).appendTo(row);
369
+
370
+ // *** MOBSEARCH *** //
371
+ var searchField = $('<a class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
372
+ // *** END MOBSEARCH *** //
373
+
141
374
  var typeField = $('<select/>',{class: "node-input-sub-type", style: "width:auto; margin-left: 5px; text-align: center;"}).appendTo(row);
142
375
  typeField.append($("<option></option>").val('include').text('Include'));
143
376
  typeField.append($("<option></option>").val('exclude').text('Exclude'));
@@ -145,6 +378,25 @@ POSSIBILITY OF SUCH DAMAGE.
145
378
  // Populate the new stat
146
379
  uriField.val(subscription.uri);
147
380
  typeField.val(subscription.type);
381
+
382
+ // *** MOBSEARCH *** //
383
+
384
+ if (!node.subscriptions[i]) {
385
+ node.subscriptions[i] = {uri: '', type: 'include'}
386
+ }
387
+
388
+ searchField.click(function () {
389
+ globalSubscriptionIndex = i;
390
+ $('#node-input-subs-container-row').hide();
391
+ $("#instance-search-sid").val('');
392
+ $("#instance-search-pid").val('');
393
+ $("#instance-search-ins").val('');
394
+ $("#node-search-return").removeClass('disabled');
395
+ $("#node-search-accept").removeClass('disabled');
396
+ $("#instance-search-row").show();
397
+
398
+ });
399
+ // *** END MOBSEARCH *** //
148
400
  }
149
401
  });
150
402
 
@@ -154,11 +406,19 @@ POSSIBILITY OF SUCH DAMAGE.
154
406
  if (!node.subscriptions) {
155
407
  node.subscriptions = [subscription = {uri: '', type: 'include'}];
156
408
  }
157
- // Populate list with all saved filters
158
- for (let i = 0; i < node.subscriptions.length; i++) {
159
- let subscription = node.subscriptions[i];
160
- $("#node-input-subs-container").editableList('addItem', subscription);
409
+
410
+ // *** MOBSEARCH *** //
411
+
412
+ function updateList() {
413
+ $("#node-input-subs-container").editableList('empty');
414
+ for (let i = 0; i < node.subscriptions.length; i++) {
415
+ let subscription = node.subscriptions[i];
416
+ $("#node-input-subs-container").editableList('addItem', subscription);
417
+ }
161
418
  }
419
+ updateList()
420
+
421
+ // *** END MOBSEARCH *** //
162
422
 
163
423
  function showRIDFilterInputs() {
164
424
  if($("#node-input-useRIDValueFiltering").is(':checked')) {
package/dist/nodes/mobius-get-multi-object.html CHANGED
@@ -34,10 +34,28 @@ POSSIBILITY OF SUCH DAMAGE.
34
34
  <label for="node-input-connection"><i class="fa fa-globe"></i> MOBiUS</label>
35
35
  <input type="text" id="node-input-connection">
36
36
  </div>
37
- <div class="form-row node-input-mobjects-container-row">
37
+ <div id="node-input-subs-container-row" class="form-row node-input-mobjects-container-row">
38
38
  <label for="node-input-mobjects-container"><i class="fa fa-bars"></i> Objects</label>
39
39
  <ol id="node-input-mobjects-container"></ol>
40
40
  </div>
41
+
42
+ <div id="instance-search-row">
43
+ <div class="form-row">
44
+ <label for="instance-search-sid"><i class="fa fa-search"></i> Search</label>
45
+ <input type="text" id="instance-search-hid" style="width:15%;" placeholder="HID">
46
+ <input type="text" id="instance-search-sid" style="width:10%;" placeholder="SID">
47
+ <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
48
+ <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
49
+ <a id="node-search-return" class="searchbutton" style="vertical-align: middle"><i id="node-search-return-icon" class="fa fa-arrow-left"></i></a>
50
+ <a id="node-search-accept" class="searchbutton" style="vertical-align: middle"><i id="node-search-accept-icon" class="fa fa-check"></i></a>
51
+ </div>
52
+ </div>
53
+ <div id="wildcard-alert-row" class="form-row hidden" style="color:#555555" align="center">
54
+ <p>Please note: The selection of wildcard '+'
55
+ means a search for a specific instance or resource
56
+ cannot be performed. As such, enter the
57
+ INS manually.</p>
58
+ </div>
41
59
  </script>
42
60
 
43
61
  <script type="text/javascript">
@@ -74,6 +92,216 @@ POSSIBILITY OF SUCH DAMAGE.
74
92
  mobject.find(".node-input-mobject-comment").width(newWidth - 270);
75
93
  }
76
94
 
95
+ let mobiusSrvc = $("#node-input-connection").val();
96
+
97
+ // *** MOBSEARCH *** //
98
+
99
+ $("#instance-search-row").hide();
100
+ $("#wildcard-alert-row").hide();
101
+ $("#node-search-return").addClass('disabled');
102
+ $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
103
+ $("#instance-search-hid").val(response);
104
+ })
105
+
106
+ let globalSubscriptionIndex = 0;
107
+
108
+ let searchObject = {
109
+ hid: '',
110
+ sid: '',
111
+ pid: '',
112
+ ins: '',
113
+ objects: []
114
+ }
115
+
116
+ //Function to search for INSs
117
+ function insSearch (objects, pid) {
118
+ let inss = ['#'];
119
+ for (let i = 0; i < objects.length; i++) {
120
+ if (objects[i].pid === pid) {
121
+ const name = objects[i].resources[1].pv;
122
+ if (name === '') {
123
+ inss.push(objects[i].ins);
124
+ } else {
125
+ inss.push(`${objects[i].ins} - ${name}`);
126
+ }
127
+ }
128
+ }
129
+ $("#instance-search-ins").autocomplete({
130
+ source: inss,
131
+ minLength: 0,
132
+ close: function (event, ui) {
133
+ acceptCheck();
134
+ $("#instance-search-ins").autocomplete('destroy');
135
+ if ($("#instance-search-ins").val().length > 4) {
136
+ $("#instance-search-ins").val($("#instance-search-ins").val().substring(0, 4))
137
+ }
138
+ searchObject.ins = $("#instance-search-ins").val();
139
+ }
140
+ }).autocomplete('search', '');
141
+ }
142
+
143
+ //Function to search for PIDs
144
+ function pidsSearch(objects) {
145
+ searchObject.objects = objects;
146
+ let pids = ['#', '+'];
147
+ for (let i = 0; i < objects.length; i++) {
148
+ pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
149
+ }
150
+ pids = [...new Set(pids)];
151
+ $("#instance-search-pid").autocomplete({
152
+ source: pids,
153
+ minLength: 0,
154
+ close: function (event, ui) {
155
+ acceptCheck();
156
+ $("#instance-search-pid").autocomplete('destroy');
157
+ if ($("#instance-search-pid").val().length > 4) {
158
+ $("#instance-search-pid").val($("#instance-search-pid").val().substring(0, 4))
159
+ }
160
+ searchObject.pid = $("#instance-search-pid").val();
161
+ }
162
+ }).autocomplete('search', '');
163
+ }
164
+
165
+ //Function to search for SIDs, and then fetch child objects based on selection
166
+ function serviceSearch(response) {
167
+ let services = ['#', '+'];
168
+ for (let i = 0; i < response.length; i++) {
169
+ if (response[i].sid !== '009') {
170
+ services.push(`${response[i].sid} - ${response[i].name}`);
171
+ }
172
+ }
173
+ $("#instance-search-sid").autocomplete({
174
+ source: services,
175
+ minLength: 0,
176
+ close: function (event, ui) {
177
+ acceptCheck();
178
+ $("#instance-search-sid").autocomplete('destroy');
179
+ if ($("#instance-search-sid").val().length > 3) {
180
+ $("#instance-search-sid").val($("#instance-search-sid").val().substring(0, 3))
181
+ }
182
+ searchObject.sid = $("#instance-search-sid").val();
183
+ if (searchObject.sid === '+') {
184
+ for (let i = 2; i < services.length; i++) {
185
+ $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[i].substring(0, 3)}`, (objects) => {
186
+ searchObject.objects = searchObject.objects.concat(objects);
187
+ })
188
+ }
189
+ } else {
190
+ $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`, (objects) => {
191
+ searchObject.objects = objects;
192
+ })
193
+ }
194
+ }
195
+ }).autocomplete('search', '');
196
+ }
197
+
198
+ //Start a new search
199
+ function startSearch() {
200
+ $("#wildcard-alert-row").hide();
201
+ $("#instance-search-sid").val('');
202
+ $("#instance-search-pid").val('');
203
+ $("#instance-search-ins").val('');
204
+ searchObject.hid = $("#instance-search-hid").val()
205
+ searchObject.sid = '';
206
+ searchObject.pid = '';
207
+ searchObject.ins = '';
208
+ searchObject.objects = [];
209
+ if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
210
+ $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
211
+ .fail((err) => {
212
+ console.log('Some kind of html failure message on service discovery');
213
+ });
214
+ }
215
+ }
216
+
217
+ //Finish a search
218
+ function finishSearch() {
219
+ $("#wildcard-alert-row").hide();
220
+ let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`
221
+ if (uri.includes('#')) {
222
+ uri = uri.substring(0,uri.indexOf('#') + 1)
223
+ }
224
+ node.mobjects[globalSubscriptionIndex].uri = uri;
225
+ updateList()
226
+ $("#node-search-accept").css('color', '#CCCCCC');
227
+ readyToAccept = false;
228
+ $("#node-search-return").addClass('disabled');
229
+ $("#node-search-accept").addClass('disabled');
230
+ $("#instance-search-row").hide();
231
+ $('#node-input-subs-container-row').show();
232
+ }
233
+
234
+ //Function to update if accept button is grade out and functions based on conditions of fields
235
+ function acceptCheck() {
236
+ if (($("#instance-search-hid").val() !== '' && $("#instance-search-sid").val() !== '' && $("#instance-search-pid").val() !== '' && $("#instance-search-ins").val() !== '') ||
237
+ $("#instance-search-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").val() === '#') {
238
+ $("#node-search-accept").css('color', '#555555');
239
+ readyToAccept = true;
240
+ } else {
241
+ $("#node-search-accept").css('color', '#CCCCCC');
242
+ readyToAccept = false;
243
+ }
244
+ if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+') {
245
+ $("#wildcard-alert-row").hide();
246
+ } else {
247
+ $("#wildcard-alert-row").show();
248
+ }
249
+ }
250
+
251
+ $("#instance-search-sid").click(function () { //SID field clicked
252
+ $("#instance-search-pid").val('')
253
+ $("#instance-search-ins").val('')
254
+ searchObject.pid = '';
255
+ searchObject.ins = '';
256
+ searchObject.objects = [];
257
+ startSearch();
258
+ })
259
+ $("#instance-search-pid").click(function () { //PID field clicked
260
+ $("#instance-search-ins").val('')
261
+ searchObject.ins = '';
262
+ if (searchObject.sid !== '') {
263
+ pidsSearch(searchObject.objects);
264
+ }
265
+ })
266
+ $("#instance-search-ins").click(function () { //INS field clicked
267
+ if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
268
+ insSearch(searchObject.objects, searchObject.pid);
269
+ }
270
+ })
271
+ $("#node-search-return").click(function () { //Return/Back button clicked
272
+ $("#node-search-return").addClass('disabled');
273
+ $("#node-search-accept").addClass('disabled');
274
+ $("#instance-search-row").hide();
275
+ $('#node-input-subs-container-row').show();
276
+ });
277
+ $("#node-search-accept").click(function () { //Accept button clicked
278
+ if (readyToAccept) {
279
+ finishSearch();
280
+ }
281
+ });
282
+
283
+ // Respond to search field changes
284
+ $("#instance-search-hid").change(function () {
285
+ acceptCheck();
286
+ $("#instance-search-sid").val('');
287
+ $("#instance-search-pid").val('');
288
+ $("#instance-search-ins").val('');
289
+ });
290
+ $("#instance-search-sid").change(function () {
291
+ searchObject.sid = $("#instance-search-sid").val()
292
+ acceptCheck();
293
+ });
294
+ $("#instance-search-pid").change(function () {
295
+ searchObject.pid = $("#instance-search-pid").val()
296
+ acceptCheck();
297
+ });
298
+ $("#instance-search-ins").change(function () {
299
+ searchObject.ins = $("#instance-search-ins").val()
300
+ acceptCheck();
301
+ });
302
+
303
+ // *** END MOBSEARCH *** //
304
+
77
305
  /** Create the objects container and populate it */
78
306
  $('#node-input-mobjects-container').css('min-height', '300px').css('min-width', '450px').editableList ({
79
307
  addButton: "add",
@@ -91,14 +319,38 @@ POSSIBILITY OF SUCH DAMAGE.
91
319
  }
92
320
 
93
321
  var row = $('<div>URI</div>').appendTo(container);
94
- var uriField = $('<input/>',{class: "node-input-mobject-uri", type: "text", style: "width: 200px; margin-left: 5px; text-align: left;"}).appendTo(row);
322
+ var uriField = $('<input/>',{class: "node-input-mobject-uri", type: "text", style: "width: 170px; margin-left: 5px; text-align: left;"}).appendTo(row);
95
323
  row.append('&nbsp;&nbsp;-&nbsp;');
324
+
325
+ // *** MOBSEARCH *** //
326
+ var searchField = $('<a class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
327
+ // *** END MOBSEARCH *** //
328
+
96
329
  var commentField = $('<input/>',{class: "node-input-mobject-comment", type: "text", style: "margin-left: 5px; text-align: left;"}).appendTo(row);
97
330
 
98
331
  // Populate the new stat
99
332
  uriField.val(mobject.uri);
100
333
  commentField.val(mobject.comment);
101
334
  resizeObject(container);
335
+
336
+ // *** MOBSEARCH *** //
337
+
338
+ if (!node.mobjects[i]) {
339
+ node.mobjects[i] = {uri: '', comment: ''}
340
+ }
341
+
342
+ searchField.click(function () {
343
+ globalSubscriptionIndex = i;
344
+ $('#node-input-subs-container-row').hide();
345
+ $("#instance-search-sid").val('');
346
+ $("#instance-search-pid").val('');
347
+ $("#instance-search-ins").val('');
348
+ $("#node-search-return").removeClass('disabled');
349
+ $("#node-search-accept").removeClass('disabled');
350
+ $("#instance-search-row").show();
351
+
352
+ });
353
+ // *** END MOBSEARCH *** //
102
354
  },
103
355
  resizeItem: resizeObject
104
356
  });
@@ -107,11 +359,18 @@ POSSIBILITY OF SUCH DAMAGE.
107
359
  if (!node.mobjects) {
108
360
  node.mobjects = [mobject = {uri: '', comment: ''}];
109
361
  }
110
- // Populate list with all saved filters
111
- for (let i = 0; i < node.mobjects.length; i++) {
112
- let mobject = node.mobjects[i];
113
- $("#node-input-mobjects-container").editableList('addItem', mobject);
362
+ // *** MOBSEARCH *** //
363
+
364
+ function updateList() {
365
+ $("#node-input-subs-container").editableList('empty');
366
+ for (let i = 0; i < node.mobjects.length; i++) {
367
+ let mobject = node.mobjects[i];
368
+ $("#node-input-subs-container").editableList('addItem', mobject);
369
+ }
114
370
  }
371
+ updateList()
372
+
373
+ // *** END MOBSEARCH *** //
115
374
  },
116
375
  oneditresize(size) {
117
376
  var rows = $("#dialog-form>div:not(.node-input-mobjects-container-row)");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-red-contrib-mobius-flow-base",
3
- "version": "2.5.86-beta.28",
3
+ "version": "2.5.86-beta.31",
4
4
  "description": "Node-RED base nodes for Mobius Flow",
5
5
  "main": "index.js",
6
6
  "types": "dist/index.d.ts",