node-red-contrib-mobius-flow-base 2.5.86-beta.51 → 2.5.86-beta.55

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 (7) hide show
  1. package/dist/nodes/common/mobsearch.js +133 -56
  2. package/dist/nodes/mobius-get-multi-resource.html +6 -276
  3. package/dist/nodes/mobius-get-multi-resource.js +19 -11
  4. package/dist/nodes/mobius-get-object.html +8 -241
  5. package/dist/nodes/mobius-get-object.js +8 -0
  6. package/dist/nodes/mobius-get-resource.html +1 -1
  7. package/package.json +1 -1
package/dist/nodes/common/mobsearch.js CHANGED
@@ -1,13 +1,28 @@
1
- function getMobsearch() {
2
- document.getElementById('mobsearch').innerHTML += `
3
- <div id="instance-search-row">
4
- <div class="form-row">
5
- <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</label>
1
+ function getMobsearch(mobiusSrvc, level, listed, fieldName, list) {
2
+ //level dependent html
3
+ let rows =
4
+ level === 'rid'
5
+ ? `
6
6
  <input type="text" id="instance-search-hid" style="width:13%;" placeholder="HID">
7
7
  <input type="text" id="instance-search-sid" style="width:8%;" placeholder="SID">
8
8
  <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
9
9
  <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
10
10
  <input type="text" id="instance-search-rid" style="width:8%;" placeholder="RID">
11
+ `
12
+ : `
13
+ <input type="text" id="instance-search-hid" style="width:15%;" placeholder="HID">
14
+ <input type="text" id="instance-search-sid" style="width:10%;" placeholder="SID">
15
+ <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
16
+ <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
17
+ `;
18
+ let alertMsg = level === 'rid' ? `and/or RID ` : ``;
19
+
20
+ //Add new html
21
+ document.getElementById('mobsearch').innerHTML += `
22
+ <div id="instance-search-row">
23
+ <div class="form-row">
24
+ <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</label>
25
+ ${rows}
11
26
  <a id="node-search-return" class="searchbutton" style="vertical-align: middle"><i id="node-search-return-icon" class="fa fa-arrow-left"></i></a>
12
27
  <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>
13
28
  </div>
@@ -16,13 +31,17 @@ function getMobsearch() {
16
31
  <p>Please note: The selection of wildcard '+'
17
32
  means a search for a specific instance or resource
18
33
  cannot be performed. As such, enter the
19
- INS and/or RID manually.</p>
34
+ INS ${alertMsg}manually.</p>
20
35
  </div>
21
- `; //Add html
22
- document.getElementById('input-row').innerHTML += `
23
- <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
24
36
  `;
25
37
 
38
+ if (!listed) {
39
+ //Add search button
40
+ document.getElementById('input-row').innerHTML += `
41
+ <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
42
+ `;
43
+ }
44
+
26
45
  //Inital setup
27
46
  $('#instance-search-row').hide();
28
47
  $('#wildcard-alert-row').hide();
@@ -31,14 +50,29 @@ function getMobsearch() {
31
50
  $('#instance-search-hid').val(response);
32
51
  });
33
52
  let readyToAccept = false;
34
- let searchObject = {
35
- hid: $('#instance-search-hid').val(),
36
- sid: $('#instance-search-sid').val(),
37
- pid: $('#instance-search-pid').val(),
38
- ins: $('#instance-search-ins').val(),
39
- rid: $('#instance-search-rid').val(),
40
- objects: [],
41
- };
53
+
54
+ let searchObject = {};
55
+ if (listed) {
56
+ searchObject = {
57
+ hid: '',
58
+ sid: '',
59
+ pid: '',
60
+ ins: '',
61
+ rid: '',
62
+ objects: [],
63
+ };
64
+ } else {
65
+ searchObject = {
66
+ hid: $('#instance-search-hid').val(),
67
+ sid: $('#instance-search-sid').val(),
68
+ pid: $('#instance-search-pid').val(),
69
+ ins: $('#instance-search-ins').val(),
70
+ rid: $('#instance-search-rid').val(),
71
+ objects: [],
72
+ };
73
+ }
74
+
75
+ //End init setup
42
76
 
43
77
  //Function to search for RIDs
44
78
  function ridSearch(objects, ins) {
@@ -184,11 +218,19 @@ function getMobsearch() {
184
218
  //Finish a search
185
219
  function finishSearch() {
186
220
  $('#wildcard-alert-row').hide();
187
- let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`;
221
+ let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`;
222
+ if (level === 'rid') {
223
+ uri = uri + `/${searchObject.rid}`;
224
+ }
188
225
  if (uri.includes('#')) {
189
226
  uri = uri.substring(0, uri.indexOf('#') + 1);
190
227
  }
191
- $('#node-input-resource').val(uri);
228
+ if (listed) {
229
+ list[globalIndex].uri = uri;
230
+ updateList();
231
+ } else {
232
+ $(`#${fieldName}`).val(uri);
233
+ }
192
234
  $('#node-search-accept').css('color', '#CCCCCC');
193
235
  readyToAccept = false;
194
236
  $('#node-search-return').addClass('disabled');
@@ -200,22 +242,40 @@ function getMobsearch() {
200
242
 
201
243
  //Function to update if accept button is grade out and functions based on conditions of fields
202
244
  function acceptCheck() {
203
- if (
204
- ($('#instance-search-hid').val() !== '' &&
205
- $('#instance-search-sid').val() !== '' &&
206
- $('#instance-search-pid').val() !== '' &&
207
- $('#instance-search-ins').val() !== '' &&
208
- $('#instance-search-rid').val() !== '') ||
209
- $('#instance-search-sid').val() === '#' ||
210
- $('#instance-search-pid').val() === '#' ||
211
- $('#instance-search-ins').val() === '#' ||
212
- $('#instance-search-rid').val() === '#'
213
- ) {
214
- $('#node-search-accept').css('color', '#555555');
215
- readyToAccept = true;
245
+ if (level === 'rid') {
246
+ if (
247
+ ($('#instance-search-hid').val() !== '' &&
248
+ $('#instance-search-sid').val() !== '' &&
249
+ $('#instance-search-pid').val() !== '' &&
250
+ $('#instance-search-ins').val() !== '' &&
251
+ $('#instance-search-rid').val() !== '') ||
252
+ $('#instance-search-sid').val() === '#' ||
253
+ $('#instance-search-pid').val() === '#' ||
254
+ $('#instance-search-ins').val() === '#' ||
255
+ $('#instance-search-rid').val() === '#'
256
+ ) {
257
+ $('#node-search-accept').css('color', '#555555');
258
+ readyToAccept = true;
259
+ } else {
260
+ $('#node-search-accept').css('color', '#CCCCCC');
261
+ readyToAccept = false;
262
+ }
216
263
  } else {
217
- $('#node-search-accept').css('color', '#CCCCCC');
218
- readyToAccept = false;
264
+ if (
265
+ ($('#instance-search-hid').val() !== '' &&
266
+ $('#instance-search-sid').val() !== '' &&
267
+ $('#instance-search-pid').val() !== '' &&
268
+ $('#instance-search-ins').val() !== '') ||
269
+ $('#instance-search-sid').val() === '#' ||
270
+ $('#instance-search-pid').val() === '#' ||
271
+ $('#instance-search-ins').val() === '#'
272
+ ) {
273
+ $('#node-search-accept').css('color', '#555555');
274
+ readyToAccept = true;
275
+ } else {
276
+ $('#node-search-accept').css('color', '#CCCCCC');
277
+ readyToAccept = false;
278
+ }
219
279
  }
220
280
  if (
221
281
  $('#instance-search-sid').val() !== '+' &&
@@ -234,7 +294,9 @@ function getMobsearch() {
234
294
  $('#instance-search-sid').val('');
235
295
  $('#instance-search-pid').val('');
236
296
  $('#instance-search-ins').val('');
237
- $('#instance-search-rid').val('');
297
+ if (level === 'rid') {
298
+ $('#instance-search-rid').val('');
299
+ }
238
300
  $('#node-lookup-instance').addClass('disabled');
239
301
  $('#node-search-return').removeClass('disabled');
240
302
  $('#node-search-accept').removeClass('disabled');
@@ -247,39 +309,50 @@ function getMobsearch() {
247
309
  $('#instance-search-ins').val('');
248
310
  searchObject.pid = '';
249
311
  searchObject.ins = '';
250
- searchObject.rid = '';
312
+ if (level === 'rid') {
313
+ searchObject.rid = '';
314
+ }
251
315
  searchObject.objects = [];
252
316
  startSearch();
253
317
  });
254
318
  $('#instance-search-pid').click(function () {
255
319
  //PID field clicked
256
320
  $('#instance-search-ins').val('');
257
- $('#instance-search-rid').val('');
321
+
258
322
  searchObject.ins = '';
259
- searchObject.rid = '';
323
+
324
+ if (level === 'rid') {
325
+ $('#instance-search-rid').val('');
326
+ searchObject.rid = '';
327
+ }
260
328
  if (searchObject.sid !== '') {
261
329
  pidsSearch(searchObject.objects);
262
330
  }
263
331
  });
264
332
  $('#instance-search-ins').click(function () {
265
333
  //INS field clicked
266
- $('#instance-search-rid').val('');
267
- searchObject.rid = '';
334
+ if (level === 'rid') {
335
+ $('#instance-search-rid').val('');
336
+ searchObject.rid = '';
337
+ }
268
338
  if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
269
339
  insSearch(searchObject.objects, searchObject.pid);
270
340
  }
271
341
  });
272
- $('#instance-search-rid').click(function () {
273
- //RID clicked
274
- if (
275
- searchObject.ins !== '' &&
276
- searchObject.ins !== '+' &&
277
- searchObject.pid !== '+' &&
278
- searchObject.sid !== '+'
279
- ) {
280
- ridSearch(searchObject.objects, searchObject.ins);
281
- }
282
- });
342
+
343
+ if (level === 'rid') {
344
+ $('#instance-search-rid').click(function () {
345
+ //RID clicked
346
+ if (
347
+ searchObject.ins !== '' &&
348
+ searchObject.ins !== '+' &&
349
+ searchObject.pid !== '+' &&
350
+ searchObject.sid !== '+'
351
+ ) {
352
+ ridSearch(searchObject.objects, searchObject.ins);
353
+ }
354
+ });
355
+ }
283
356
  $('#node-search-return').click(function () {
284
357
  //Return/Back button clicked
285
358
  $('#node-search-return').addClass('disabled');
@@ -301,7 +374,9 @@ function getMobsearch() {
301
374
  $('#instance-search-sid').val('');
302
375
  $('#instance-search-pid').val('');
303
376
  $('#instance-search-ins').val('');
304
- $('#instance-search-rid').val('');
377
+ if (level === 'rid') {
378
+ $('#instance-search-rid').val('');
379
+ }
305
380
  });
306
381
  $('#instance-search-sid').change(function () {
307
382
  searchObject.sid = $('#instance-search-sid').val();
@@ -315,8 +390,10 @@ function getMobsearch() {
315
390
  searchObject.ins = $('#instance-search-ins').val();
316
391
  acceptCheck();
317
392
  });
318
- $('#instance-search-rid').change(function () {
319
- searchObject.rid = $('#instance-search-rid').val();
320
- acceptCheck();
321
- });
393
+ if (level === 'rid') {
394
+ $('#instance-search-rid').change(function () {
395
+ searchObject.rid = $('#instance-search-rid').val();
396
+ acceptCheck();
397
+ });
398
+ }
322
399
  }
package/dist/nodes/mobius-get-multi-resource.html CHANGED
@@ -46,26 +46,11 @@ POSSIBILITY OF SUCH DAMAGE.
46
46
  <ol id="node-input-resources-container"></ol>
47
47
  </div>
48
48
 
49
- <div id="instance-search-row">
50
- <div class="form-row">
51
- <label for="instance-search-sid"><i class="fa fa-search"></i> Search</label>
52
- <input type="text" id="instance-search-hid" style="width:13%;" placeholder="HID">
53
- <input type="text" id="instance-search-sid" style="width:8%;" placeholder="SID">
54
- <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
55
- <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
56
- <input type="text" id="instance-search-rid" style="width:8%;" placeholder="RID">
57
- <a id="node-search-return" class="searchbutton" style="vertical-align: middle"><i id="node-search-return-icon" class="fa fa-arrow-left"></i></a>
58
- <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>
59
- </div>
60
- </div>
61
- <div id="wildcard-alert-row" class="form-row hidden" style="color:#555555" align="center">
62
- <p>Please note: The selection of wildcard '+'
63
- means a search for a specific instance or resource
64
- cannot be performed. As such, enter the
65
- INS and/or RID manually.</p>
66
- </div>
49
+ <div id="mobsearch"></div>
67
50
  </script>
68
51
 
52
+ <script src="common/mobsearch.js"></script>
53
+
69
54
  <script type="text/javascript">
70
55
  RED.nodes.registerType('mobius get multi-resource', {
71
56
  category: 'mobius',
@@ -102,264 +87,9 @@ POSSIBILITY OF SUCH DAMAGE.
102
87
  }
103
88
 
104
89
  let mobiusSrvc = $("#node-input-connection").val();
90
+ let globalIndex = 0;
105
91
 
106
- // *** MOBSEARCH *** //
107
-
108
- $("#instance-search-row").hide();
109
- $("#wildcard-alert-row").hide();
110
- $("#node-search-return").addClass('disabled');
111
- $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
112
- $("#instance-search-hid").val(response);
113
- })
114
-
115
- let globalSubscriptionIndex = 0;
116
-
117
- let searchObject = {
118
- hid: '',
119
- sid: '',
120
- pid: '',
121
- ins: '',
122
- rid: '',
123
- objects: []
124
- }
125
-
126
- //Function to search for RIDs
127
- function ridSearch (objects, ins) {
128
- $.getJSON(`mdiscover?mobius=${mobiusSrvc}&uri=${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`, (response) => {
129
- resList = response.value[0].resources
130
- ress = ['#'];
131
- for (let j = 0; j < resList.length; j++) {
132
- ress.push(`${resList[j].rid} - ${resList[j].name}`)
133
- }
134
- $("#instance-search-rid").autocomplete({
135
- source: ress,
136
- minLength: 0,
137
- close: function (event, ui) {
138
- acceptCheck();
139
- $("#instance-search-rid").autocomplete('destroy');
140
- $("#instance-search-rid").val($("#instance-search-rid").val().substring(0, 2));
141
- searchObject.rid = $("#instance-search-rid").val();
142
- }
143
- }).autocomplete('search', '');
144
- })
145
- }
146
-
147
- //Function to search for INSs
148
- function insSearch (objects, pid) {
149
- let inss = ['#', '+'];
150
- for (let i = 0; i < objects.length; i++) {
151
- if (objects[i].pid === pid) {
152
- const name = objects[i].resources[1].pv;
153
- if (name === '') {
154
- inss.push(objects[i].ins);
155
- } else {
156
- inss.push(`${objects[i].ins} - ${name}`);
157
- }
158
- }
159
- }
160
- $("#instance-search-ins").autocomplete({
161
- source: inss,
162
- minLength: 0,
163
- close: function (event, ui) {
164
- acceptCheck();
165
- $("#instance-search-ins").autocomplete('destroy');
166
- if ($("#instance-search-ins").val().length > 4) {
167
- $("#instance-search-ins").val($("#instance-search-ins").val().substring(0, 4))
168
- }
169
- searchObject.ins = $("#instance-search-ins").val();
170
- }
171
- }).autocomplete('search', '');
172
- }
173
-
174
- //Function to search for PIDs
175
- function pidsSearch(objects) {
176
- searchObject.objects = objects;
177
- let pids = ['#', '+'];
178
- for (let i = 0; i < objects.length; i++) {
179
- pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
180
- }
181
- pids = [...new Set(pids)];
182
- $("#instance-search-pid").autocomplete({
183
- source: pids,
184
- minLength: 0,
185
- close: function (event, ui) {
186
- acceptCheck();
187
- $("#instance-search-pid").autocomplete('destroy');
188
- if ($("#instance-search-pid").val().length > 4) {
189
- $("#instance-search-pid").val($("#instance-search-pid").val().substring(0, 4))
190
- }
191
- searchObject.pid = $("#instance-search-pid").val();
192
- }
193
- }).autocomplete('search', '');
194
- }
195
-
196
- //Function to search for SIDs, and then fetch child objects based on selection
197
- function serviceSearch(response) {
198
- let services = ['#', '+'];
199
- for (let i = 0; i < response.length; i++) {
200
- if (response[i].sid !== '009') {
201
- services.push(`${response[i].sid} - ${response[i].name}`);
202
- }
203
- }
204
- $("#instance-search-sid").autocomplete({
205
- source: services,
206
- minLength: 0,
207
- close: function (event, ui) {
208
- acceptCheck();
209
- $("#instance-search-sid").autocomplete('destroy');
210
- if ($("#instance-search-sid").val().length > 3) {
211
- $("#instance-search-sid").val($("#instance-search-sid").val().substring(0, 3))
212
- }
213
- searchObject.sid = $("#instance-search-sid").val();
214
- if (searchObject.sid === '+') {
215
- for (let i = 2; i < services.length; i++) {
216
- $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[i].substring(0, 3)}`, (objects) => {
217
- searchObject.objects = searchObject.objects.concat(objects);
218
- })
219
- }
220
- } else {
221
- $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`, (objects) => {
222
- searchObject.objects = objects;
223
- })
224
- }
225
- }
226
- }).autocomplete('search', '');
227
- }
228
-
229
- //Start a new search
230
- function startSearch() {
231
- $("#wildcard-alert-row").hide();
232
- $("#instance-search-sid").val('');
233
- $("#instance-search-pid").val('');
234
- $("#instance-search-ins").val('');
235
- searchObject.hid = $("#instance-search-hid").val()
236
- searchObject.sid = '';
237
- searchObject.pid = '';
238
- searchObject.ins = '';
239
- if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
240
- $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
241
- .fail((err) => {
242
- console.log('Some kind of html failure message on service discovery');
243
- });
244
- }
245
- }
246
-
247
- //Finish a search
248
- function finishSearch() {
249
- $("#wildcard-alert-row").hide();
250
- let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`
251
- if (uri.includes('#')) {
252
- uri = uri.substring(0,uri.indexOf('#') + 1)
253
- }
254
- node.resources[globalSubscriptionIndex].uri = uri;
255
- updateList()
256
- $("#node-search-accept").css('color', '#CCCCCC');
257
- readyToAccept = false;
258
- $("#node-search-return").addClass('disabled');
259
- $("#node-search-accept").addClass('disabled');
260
- $("#node-lookup-instance").removeClass('disabled');
261
- $("#instance-search-row").hide();
262
- $('#node-input-resources-container-row').show();
263
- }
264
-
265
- //Function to update if accept button is grade out and functions based on conditions of fields
266
- function acceptCheck() {
267
- if (($("#instance-search-hid").val() !== '' && $("#instance-search-sid").val() !== '' && $("#instance-search-pid").val() !== '' && $("#instance-search-ins").val() !== '' && $("#instance-search-rid").val() !== '') ||
268
- $("#instance-search-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").val() === '#' || $("#instance-search-rid").val() === '#') {
269
- $("#node-search-accept").css('color', '#555555');
270
- readyToAccept = true;
271
- } else {
272
- $("#node-search-accept").css('color', '#CCCCCC');
273
- readyToAccept = false;
274
- }
275
- if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+' && $("#instance-search-ins").val() !== '+') {
276
- $("#wildcard-alert-row").hide();
277
- } else {
278
- $("#wildcard-alert-row").show();
279
- }
280
- }
281
-
282
- // Respond to clicks
283
- $("#node-lookup-instance").click(function () { //When search button is clicked
284
- $("#instance-search-sid").val('');
285
- $("#instance-search-pid").val('');
286
- $("#instance-search-ins").val('');
287
- $("#instance-search-rid").val('');
288
- $("#node-lookup-instance").addClass('disabled');
289
- $("#node-search-return").removeClass('disabled');
290
- $("#node-search-accept").removeClass('disabled');
291
- $("#instance-row").hide();
292
- $("#instance-search-row").show();
293
- });
294
- $("#instance-search-sid").click(function () { //SID field clicked
295
- $("#instance-search-pid").val('')
296
- $("#instance-search-ins").val('')
297
- searchObject.pid = '';
298
- searchObject.ins = '';
299
- searchObject.rid = '';
300
- searchObject.objects = [];
301
- startSearch();
302
- })
303
- $("#instance-search-pid").click(function () { //PID field clicked
304
- $("#instance-search-ins").val('')
305
- $("#instance-search-rid").val('')
306
- searchObject.ins = '';
307
- searchObject.rid = '';
308
- if (searchObject.sid !== '') {
309
- pidsSearch(searchObject.objects);
310
- }
311
- })
312
- $("#instance-search-ins").click(function () { //INS field clicked
313
- $("#instance-search-rid").val('')
314
- searchObject.rid = '';
315
- if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
316
- insSearch(searchObject.objects, searchObject.pid);
317
- }
318
- })
319
- $("#instance-search-rid").click(function () { //RID clicked
320
- if (searchObject.ins !== '' && searchObject.ins !== '+' && searchObject.pid !== '+' && searchObject.sid !== '+') {
321
- ridSearch(searchObject.objects, searchObject.ins);
322
- }
323
- });
324
- $("#node-search-return").click(function () { //Return/Back button clicked
325
- $("#node-search-return").addClass('disabled');
326
- $("#node-search-accept").addClass('disabled');
327
- $("#node-lookup-instance").removeClass('disabled');
328
- $("#instance-search-row").hide();
329
- $("#instance-row").show();
330
- });
331
- $("#node-search-accept").click(function () { //Accept button clicked
332
- if (readyToAccept) {
333
- finishSearch();
334
- }
335
- });
336
-
337
- // Respond to search field changes
338
- $("#instance-search-hid").change(function () {
339
- acceptCheck();
340
- $("#instance-search-sid").val('');
341
- $("#instance-search-pid").val('');
342
- $("#instance-search-ins").val('');
343
- $("#instance-search-rid").val('');
344
- });
345
- $("#instance-search-sid").change(function () {
346
- searchObject.sid = $("#instance-search-sid").val()
347
- acceptCheck();
348
- });
349
- $("#instance-search-pid").change(function () {
350
- searchObject.pid = $("#instance-search-pid").val()
351
- acceptCheck();
352
- });
353
- $("#instance-search-ins").change(function () {
354
- searchObject.ins = $("#instance-search-ins").val()
355
- acceptCheck();
356
- });
357
- $("#instance-search-rid").change(function () {
358
- searchObject.rid = $("#instance-search-rid").val()
359
- acceptCheck();
360
- });
361
-
362
- // *** END MOBSEARCH *** //
92
+ getMobsearch(mobiusSrvc, 'rid', true, null, node.resources)
363
93
 
364
94
  /** Create the subs container and populate it */
365
95
  $('#node-input-resources-container').css('min-height', '300px').css('min-width', '450px').editableList ({
@@ -399,7 +129,7 @@ POSSIBILITY OF SUCH DAMAGE.
399
129
  }
400
130
 
401
131
  searchField.click(function () {
402
- globalSubscriptionIndex = i;
132
+ globalIndex = i;
403
133
  $('#node-input-resources-container-row').hide();
404
134
  $("#instance-search-sid").val('');
405
135
  $("#instance-search-pid").val('');
package/dist/nodes/mobius-get-multi-resource.js CHANGED
@@ -28,7 +28,7 @@
28
28
  'use strict';
29
29
 
30
30
  module.exports = function (RED) {
31
- function MobiusFlowNode (n) {
31
+ function MobiusFlowNode(n) {
32
32
  RED.nodes.createNode(this, n);
33
33
  this.resources = n.resources;
34
34
  this.sendFormat = n.send;
@@ -39,7 +39,7 @@ module.exports = function (RED) {
39
39
  node.status({
40
40
  fill: 'red',
41
41
  shape: 'ring',
42
- text: 'Disconnected'
42
+ text: 'Disconnected',
43
43
  });
44
44
 
45
45
  node.serviceConn.register(node);
@@ -48,7 +48,7 @@ module.exports = function (RED) {
48
48
  node.status({
49
49
  fill: 'green',
50
50
  shape: 'ring',
51
- text: 'Busy'
51
+ text: 'Busy',
52
52
  });
53
53
 
54
54
  for (const resource of node.resources) {
@@ -56,7 +56,7 @@ module.exports = function (RED) {
56
56
  node.status({
57
57
  fill: 'yellow',
58
58
  shape: 'dot',
59
- text: 'URIs not Valid'
59
+ text: 'URIs not Valid',
60
60
  });
61
61
  if (done) {
62
62
  return done();
@@ -72,23 +72,23 @@ module.exports = function (RED) {
72
72
  node.status({
73
73
  fill: 'green',
74
74
  shape: 'dot',
75
- text: 'Done'
75
+ text: 'Done',
76
76
  });
77
77
  if (node.sendFormat === 'array') {
78
- node.send({topic: msg.topic, payload: values});
78
+ node.send({ topic: msg.topic, payload: values });
79
79
  } else {
80
80
  let payload = values.reduce((obj, item) => {
81
81
  obj[item.uri] = { pv: item.pv, name: item.name };
82
82
  return obj;
83
83
  }, {});
84
- node.send({topic: msg.topic, payload: payload});
84
+ node.send({ topic: msg.topic, payload: payload });
85
85
  }
86
86
  })
87
87
  .catch((err) => {
88
88
  node.status({
89
89
  fill: 'yellow',
90
90
  shape: 'dot',
91
- text: 'Error: ' + JSON.stringify(err.code)
91
+ text: 'Error: ' + JSON.stringify(err.code),
92
92
  });
93
93
  node.error('Mobius error reading resource ' + JSON.stringify(err));
94
94
  })
@@ -107,7 +107,7 @@ module.exports = function (RED) {
107
107
  }
108
108
  }
109
109
 
110
- function validateResourceURI (uri) {
110
+ function validateResourceURI(uri) {
111
111
  let parts = uri.split('/');
112
112
  for (let lp = 0; lp < parts.length; lp++) {
113
113
  if (parts[lp] === null || parts[lp] === '') {
@@ -120,7 +120,7 @@ module.exports = function (RED) {
120
120
  return false;
121
121
  }
122
122
 
123
- function readResource (node, uri) {
123
+ function readResource(node, uri) {
124
124
  return new Promise((resolve, reject) => {
125
125
  node.serviceConn.readResource(uri, (err, response) => {
126
126
  if (err) {
@@ -129,7 +129,7 @@ module.exports = function (RED) {
129
129
  if (node.sendFormat === 'array') {
130
130
  resolve(response.value.pv);
131
131
  } else {
132
- resolve({uri: uri, pv: response.value.pv, name: response.value.name});
132
+ resolve({ uri: uri, pv: response.value.pv, name: response.value.name });
133
133
  }
134
134
  }
135
135
  });
@@ -137,4 +137,12 @@ module.exports = function (RED) {
137
137
  }
138
138
 
139
139
  RED.nodes.registerType('mobius get multi-resource', MobiusFlowNode);
140
+
141
+ RED.httpAdmin.get('/common/*', function (req, res) {
142
+ var options = {
143
+ root: __dirname + '/common/',
144
+ dotfiles: 'deny',
145
+ };
146
+ res.sendFile(req.params[0], options);
147
+ });
140
148
  };
package/dist/nodes/mobius-get-object.html CHANGED
@@ -30,30 +30,16 @@ POSSIBILITY OF SUCH DAMAGE.
30
30
  <input type="text" id="node-input-connection">
31
31
  </div>
32
32
  <hr>
33
+
33
34
  <div id="instance-row">
34
- <div class="form-row">
35
+ <div class="form-row" id="input-row">
35
36
  <label for="node-input-instance"><i class="fa fa-tasks"></i> URI</label>
36
37
  <input type="text" id="node-input-instance" style="width:61%;" placeholder="HID/SID/PID/INS (optional name)">
37
- <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
38
- </div>
39
- </div>
40
- <div id="instance-search-row">
41
- <div class="form-row">
42
- <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</label>
43
- <input type="text" id="instance-search-hid" style="width:15%;" placeholder="HID">
44
- <input type="text" id="instance-search-sid" style="width:10%;" placeholder="SID">
45
- <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
46
- <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
47
- <a id="node-search-return" class="searchbutton" style="vertical-align: middle"><i id="node-search-return-icon" class="fa fa-arrow-left"></i></a>
48
- <a id="node-search-accept" class="searchbutton" style="vertical-align: middle"><i id="node-search-accept-icon" class="fa fa-check"></i></a>
49
38
  </div>
50
39
  </div>
51
- <div id="wildcard-alert-row" class="form-row hidden" style="color:#555555" align="center">
52
- <p>Please note: The selection of wildcard '+'
53
- means a search for a specific instance or resource
54
- cannot be performed. As such, enter the
55
- INS manually.</p>
56
- </div>
40
+
41
+ <div id="mobsearch"></div>
42
+
57
43
  <div class="form-row">
58
44
  <label for="node-input-format"><i class="fa fa-bars"></i> Format</label>
59
45
  <select type="text" id="node-input-format" style="display: inline-block; width: auto; vertical-align: center;">
@@ -73,6 +59,8 @@ POSSIBILITY OF SUCH DAMAGE.
73
59
  </div>
74
60
  </script>
75
61
 
62
+ <script src="common/mobsearch.js"></script>
63
+
76
64
  <script type="text/javascript">
77
65
  RED.nodes.registerType('mobius get object',{
78
66
  category: 'mobius',
@@ -118,228 +106,7 @@ POSSIBILITY OF SUCH DAMAGE.
118
106
  var node = this;
119
107
  let mobiusSrvc = $("#node-input-connection").val();
120
108
 
121
-
122
- // *** MOBSEARCH *** //
123
-
124
- $("#instance-search-row").hide();
125
-
126
- $("#node-search-return").addClass('disabled');
127
-
128
- //Inital setup
129
- $("#instance-search-row").hide();
130
- $("#wildcard-alert-row").hide();
131
- $("#node-search-return").addClass('disabled');
132
- $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
133
- $("#instance-search-hid").val(response);
134
- })
135
- let readyToAccept = false;
136
- let searchObject = {
137
- hid: $("#instance-search-hid").val(),
138
- sid: $("#instance-search-sid").val(),
139
- pid: $("#instance-search-pid").val(),
140
- ins: $("#instance-search-ins").val(),
141
- objects: []
142
- }
143
-
144
- //Function to search for INSs
145
- function insSearch (objects, pid) {
146
- let inss = ['#'];
147
- for (let i = 0; i < objects.length; i++) {
148
- if (objects[i].pid === pid) {
149
- const name = objects[i].resources[1].pv;
150
- if (name === '') {
151
- inss.push(objects[i].ins);
152
- } else {
153
- inss.push(`${objects[i].ins} - ${name}`);
154
- }
155
- }
156
- }
157
- $("#instance-search-ins").autocomplete({
158
- source: inss,
159
- minLength: 0,
160
- close: function (event, ui) {
161
- acceptCheck();
162
- $("#instance-search-ins").autocomplete('destroy');
163
- if ($("#instance-search-ins").val().length > 4) {
164
- $("#instance-search-ins").val($("#instance-search-ins").val().substring(0, 4))
165
- }
166
- searchObject.ins = $("#instance-search-ins").val();
167
- }
168
- }).autocomplete('search', '');
169
- }
170
-
171
- //Function to search for PIDs
172
- function pidsSearch(objects) {
173
- searchObject.objects = objects;
174
- let pids = ['#', '+'];
175
- for (let i = 0; i < objects.length; i++) {
176
- pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
177
- }
178
- pids = [...new Set(pids)];
179
- $("#instance-search-pid").autocomplete({
180
- source: pids,
181
- minLength: 0,
182
- close: function (event, ui) {
183
- acceptCheck();
184
- $("#instance-search-pid").autocomplete('destroy');
185
- if ($("#instance-search-pid").val().length > 4) {
186
- $("#instance-search-pid").val($("#instance-search-pid").val().substring(0, 4))
187
- }
188
- searchObject.pid = $("#instance-search-pid").val();
189
- }
190
- }).autocomplete('search', '');
191
- }
192
-
193
- //Function to search for SIDs, and then fetch child objects based on selection
194
- function serviceSearch(response) {
195
- let services = ['#', '+'];
196
- for (let i = 0; i < response.length; i++) {
197
- if (response[i].sid !== '009') {
198
- services.push(`${response[i].sid} - ${response[i].name}`);
199
- }
200
- }
201
- $("#instance-search-sid").autocomplete({
202
- source: services,
203
- minLength: 0,
204
- close: function (event, ui) {
205
- acceptCheck();
206
- $("#instance-search-sid").autocomplete('destroy');
207
- if ($("#instance-search-sid").val().length > 3) {
208
- $("#instance-search-sid").val($("#instance-search-sid").val().substring(0, 3))
209
- }
210
- searchObject.sid = $("#instance-search-sid").val();
211
- if (searchObject.sid === '+') {
212
- for (let i = 2; i < services.length; i++) {
213
- $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[i].substring(0, 3)}`, (objects) => {
214
- searchObject.objects = searchObject.objects.concat(objects);
215
- })
216
- }
217
- } else {
218
- $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`, (objects) => {
219
- searchObject.objects = objects;
220
- })
221
- }
222
- }
223
- }).autocomplete('search', '');
224
- }
225
-
226
- //Start a new search
227
- function startSearch() {
228
- $("#wildcard-alert-row").hide();
229
- $("#instance-search-sid").val('');
230
- $("#instance-search-pid").val('');
231
- $("#instance-search-ins").val('');
232
- searchObject.hid = $("#instance-search-hid").val()
233
- searchObject.sid = '';
234
- searchObject.pid = '';
235
- searchObject.ins = '';
236
- if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
237
- $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
238
- .fail((err) => {
239
- console.log('Some kind of html failure message on service discovery');
240
- });
241
- }
242
- }
243
-
244
- //Finish a search
245
- function finishSearch() {
246
- $("#wildcard-alert-row").hide();
247
- let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`
248
- if (uri.includes('#')) {
249
- uri = uri.substring(0,uri.indexOf('#') + 1)
250
- }
251
- $("#node-input-instance").val(uri);
252
- $("#node-search-accept").css('color', '#CCCCCC');
253
- readyToAccept = false;
254
- $("#node-search-return").addClass('disabled');
255
- $("#node-search-accept").addClass('disabled');
256
- $("#node-lookup-instance").removeClass('disabled');
257
- $("#instance-search-row").hide();
258
- $("#instance-row").show();
259
- }
260
-
261
- //Function to update if accept button is grade out and functions based on conditions of fields
262
- function acceptCheck() {
263
- if (($("#instance-search-hid").val() !== '' && $("#instance-search-sid").val() !== '' && $("#instance-search-pid").val() !== '' && $("#instance-search-ins").val() !== '') ||
264
- $("#instance-search-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").val() === '#') {
265
- $("#node-search-accept").css('color', '#555555');
266
- readyToAccept = true;
267
- } else {
268
- $("#node-search-accept").css('color', '#CCCCCC');
269
- readyToAccept = false;
270
- }
271
- if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+') {
272
- $("#wildcard-alert-row").hide();
273
- } else {
274
- $("#wildcard-alert-row").show();
275
- }
276
- }
277
-
278
- // Respond to clicks
279
- $("#node-lookup-instance").click(function () { //When search button is clicked
280
- $("#instance-search-sid").val('');
281
- $("#instance-search-pid").val('');
282
- $("#instance-search-ins").val('');
283
- $("#node-lookup-instance").addClass('disabled');
284
- $("#node-search-return").removeClass('disabled');
285
- $("#node-search-accept").removeClass('disabled');
286
- $("#instance-row").hide();
287
- $("#instance-search-row").show();
288
- });
289
- $("#instance-search-sid").click(function () { //SID field clicked
290
- $("#instance-search-pid").val('')
291
- $("#instance-search-ins").val('')
292
- searchObject.pid = '';
293
- searchObject.ins = '';
294
- searchObject.objects = [];
295
- startSearch();
296
- })
297
- $("#instance-search-pid").click(function () { //PID field clicked
298
- $("#instance-search-ins").val('')
299
- searchObject.ins = '';
300
- if (searchObject.sid !== '') {
301
- pidsSearch(searchObject.objects);
302
- }
303
- })
304
- $("#instance-search-ins").click(function () { //INS field clicked
305
- if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
306
- insSearch(searchObject.objects, searchObject.pid);
307
- }
308
- })
309
- $("#node-search-return").click(function () { //Return/Back button clicked
310
- $("#node-search-return").addClass('disabled');
311
- $("#node-search-accept").addClass('disabled');
312
- $("#node-lookup-instance").removeClass('disabled');
313
- $("#instance-search-row").hide();
314
- $("#instance-row").show();
315
- });
316
- $("#node-search-accept").click(function () { //Accept button clicked
317
- if (readyToAccept) {
318
- finishSearch();
319
- }
320
- });
321
-
322
- // Respond to search field changes
323
- $("#instance-search-hid").change(function () {
324
- acceptCheck();
325
- $("#instance-search-sid").val('');
326
- $("#instance-search-pid").val('');
327
- $("#instance-search-ins").val('');
328
- });
329
- $("#instance-search-sid").change(function () {
330
- searchObject.sid = $("#instance-search-sid").val()
331
- acceptCheck();
332
- });
333
- $("#instance-search-pid").change(function () {
334
- searchObject.pid = $("#instance-search-pid").val()
335
- acceptCheck();
336
- });
337
- $("#instance-search-ins").change(function () {
338
- searchObject.ins = $("#instance-search-ins").val()
339
- acceptCheck();
340
- });
341
-
342
- // *** MOBSEARCH *** //
109
+ getMobsearch(mobiusSrvc, 'ins', 'node-input-instance')
343
110
  },
344
111
  oneditsave: function() {
345
112
  if($("#node-input-detailedOutput").prop('checked')) {
package/dist/nodes/mobius-get-object.js CHANGED
@@ -102,4 +102,12 @@ module.exports = function (RED) {
102
102
  }
103
103
 
104
104
  RED.nodes.registerType('mobius get object', MobiusGetObjectNode);
105
+
106
+ RED.httpAdmin.get('/common/*', function (req, res) {
107
+ var options = {
108
+ root: __dirname + '/common/',
109
+ dotfiles: 'deny',
110
+ };
111
+ res.sendFile(req.params[0], options);
112
+ });
105
113
  };
package/dist/nodes/mobius-get-resource.html CHANGED
@@ -98,7 +98,7 @@ POSSIBILITY OF SUCH DAMAGE.
98
98
  oneditprepare: function () {
99
99
  var node = this;
100
100
  let mobiusSrvc = $("#node-input-connection").val();
101
- getMobsearch();
101
+ getMobsearch(mobiusSrvc, 'rid', 'node-input-resource');
102
102
  },
103
103
  oneditsave: function() {
104
104
  if($("#node-input-detailedOutput").prop('checked')) {
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.51",
3
+ "version": "2.5.86-beta.55",
4
4
  "description": "Node-RED base nodes for Mobius Flow",
5
5
  "main": "index.js",
6
6
  "types": "dist/index.d.ts",