node-red-contrib-mobius-flow-base 2.5.86-beta.5 → 2.5.86-beta.53

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 (19) hide show
  1. package/dist/nodes/common/mobsearch.js +382 -0
  2. package/dist/nodes/mobius-clear-resource.html +288 -3
  3. package/dist/nodes/mobius-connection.js +30 -1
  4. package/dist/nodes/mobius-discover-object-list.html +272 -3
  5. package/dist/nodes/mobius-flow-inject.html +270 -2
  6. package/dist/nodes/mobius-get-multi-object.html +276 -7
  7. package/dist/nodes/mobius-get-multi-resource.html +328 -7
  8. package/dist/nodes/mobius-get-object.html +254 -5
  9. package/dist/nodes/mobius-get-object.js +13 -10
  10. package/dist/nodes/mobius-get-resource.html +18 -3
  11. package/dist/nodes/mobius-get-resource.js +21 -8
  12. package/dist/nodes/mobius-object-cov.html +256 -5
  13. package/dist/nodes/mobius-object-cov.js +10 -7
  14. package/dist/nodes/mobius-resource-cov.html +290 -4
  15. package/dist/nodes/mobius-set-multi-resource.html +254 -4
  16. package/dist/nodes/mobius-set-multi-resource.js +10 -12
  17. package/dist/nodes/mobius-set-resource.html +288 -3
  18. package/dist/nodes/node-red-ui-discover-devices.js +64 -37
  19. package/package.json +2 -2
package/dist/nodes/mobius-resource-cov.html CHANGED
@@ -29,10 +29,35 @@ POSSIBILITY OF SUCH DAMAGE.
29
29
  <label for="node-input-connection"><i class="fa fa-globe"></i> MOBiUS</label>
30
30
  <input type="text" id="node-input-connection">
31
31
  </div>
32
- <div class="form-row">
33
- <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
34
- <input type="text" id="node-input-resource" placeholder="Resource URI (hid/sid/pid/ins/rid)">
32
+
33
+ <hr>
34
+
35
+ <div id="instance-row">
36
+ <div class="form-row">
37
+ <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
38
+ <input type="text" id="node-input-resource" style="width:61%;" placeholder="HID/SID/PID/INS/RID">
39
+ <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
40
+ </div>
41
+ </div>
42
+ <div id="instance-search-row">
43
+ <div class="form-row">
44
+ <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</label>
45
+ <input type="text" id="instance-search-hid" style="width:13%;" placeholder="HID">
46
+ <input type="text" id="instance-search-sid" style="width:8%;" 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
+ <input type="text" id="instance-search-rid" style="width:8%;" placeholder="RID">
50
+ <a id="node-search-return" class="searchbutton" style="vertical-align: middle"><i id="node-search-return-icon" class="fa fa-arrow-left"></i></a>
51
+ <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>
52
+ </div>
53
+ </div>
54
+ <div id="wildcard-alert-row" class="form-row hidden" style="color:#555555" align="center">
55
+ <p>Please note: The selection of wildcard '+'
56
+ means a search for a specific instance or resource
57
+ cannot be performed. As such, enter the
58
+ INS and/or RID manually.</p>
35
59
  </div>
60
+
36
61
  <div class="form-row">
37
62
  <label>&nbsp;</label>
38
63
  <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
@@ -51,7 +76,8 @@ POSSIBILITY OF SUCH DAMAGE.
51
76
  defaults: {
52
77
  name: {value:""},
53
78
  detailedOutput: {value:false},
54
- resource: {value:"", required:true, validate:function(v) {
79
+ resource: {value:"", validate:function(v) {
80
+ if(v === '') { return true; }
55
81
  let parts = v.split('/');
56
82
  for(let lp = 0; lp < parts.length; lp++) {
57
83
  if(parts[lp] === null || parts[lp] === '') { return false;}
@@ -84,6 +110,266 @@ POSSIBILITY OF SUCH DAMAGE.
84
110
  labelStyle: function() {
85
111
  return this.name ? "node_label_italic":"";
86
112
  },
113
+ oneditprepare: function () {
114
+ var node = this;
115
+ let mobiusSrvc = $("#node-input-connection").val();
116
+
117
+ // *** MOBSEARCH *** //
118
+
119
+ //Inital setup
120
+ $("#instance-search-row").hide();
121
+ $("#wildcard-alert-row").hide();
122
+ $("#node-search-return").addClass('disabled');
123
+ $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
124
+ $("#instance-search-hid").val(response);
125
+ })
126
+ let readyToAccept = false;
127
+ let searchObject = {
128
+ hid: $("#instance-search-hid").val(),
129
+ sid: $("#instance-search-sid").val(),
130
+ pid: $("#instance-search-pid").val(),
131
+ ins: $("#instance-search-ins").val(),
132
+ rid: $("#instance-search-rid").val(),
133
+ objects: []
134
+ }
135
+
136
+ //Function to search for RIDs
137
+ function ridSearch (objects, ins) {
138
+ $.getJSON(`mdiscover?mobius=${mobiusSrvc}&uri=${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`, (response) => {
139
+ resList = response.value[0].resources
140
+ ress = ['#'];
141
+ for (let j = 0; j < resList.length; j++) {
142
+ ress.push(`${resList[j].rid} - ${resList[j].name}`)
143
+ }
144
+ $("#instance-search-rid").autocomplete({
145
+ source: ress,
146
+ minLength: 0,
147
+ close: function (event, ui) {
148
+ acceptCheck();
149
+ $("#instance-search-rid").autocomplete('destroy');
150
+ $("#instance-search-rid").val($("#instance-search-rid").val().substring(0, 2));
151
+ searchObject.rid = $("#instance-search-rid").val();
152
+ }
153
+ }).autocomplete('search', '');
154
+ })
155
+ }
156
+
157
+ //Function to search for INSs
158
+ function insSearch (objects, pid) {
159
+ let inss = ['#', '+'];
160
+ for (let i = 0; i < objects.length; i++) {
161
+ if (objects[i].pid === pid) {
162
+ const name = objects[i].resources[1].pv;
163
+ if (name === '') {
164
+ inss.push(objects[i].ins);
165
+ } else {
166
+ inss.push(`${objects[i].ins} - ${name}`);
167
+ }
168
+ }
169
+ }
170
+ $("#instance-search-ins").autocomplete({
171
+ source: inss,
172
+ minLength: 0,
173
+ close: function (event, ui) {
174
+ acceptCheck();
175
+ $("#instance-search-ins").autocomplete('destroy');
176
+ if ($("#instance-search-ins").val().length > 4) {
177
+ $("#instance-search-ins").val($("#instance-search-ins").val().substring(0, 4))
178
+ }
179
+ searchObject.ins = $("#instance-search-ins").val();
180
+ }
181
+ }).autocomplete('search', '');
182
+ }
183
+
184
+ //Function to search for PIDs
185
+ function pidsSearch(objects) {
186
+ searchObject.objects = objects;
187
+ let pids = ['#', '+'];
188
+ for (let i = 0; i < objects.length; i++) {
189
+ pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
190
+ }
191
+ pids = [...new Set(pids)];
192
+ $("#instance-search-pid").autocomplete({
193
+ source: pids,
194
+ minLength: 0,
195
+ close: function (event, ui) {
196
+ acceptCheck();
197
+ $("#instance-search-pid").autocomplete('destroy');
198
+ if ($("#instance-search-pid").val().length > 4) {
199
+ $("#instance-search-pid").val($("#instance-search-pid").val().substring(0, 4))
200
+ }
201
+ searchObject.pid = $("#instance-search-pid").val();
202
+ }
203
+ }).autocomplete('search', '');
204
+ }
205
+
206
+ //Function to search for SIDs, and then fetch child objects based on selection
207
+ function serviceSearch(response) {
208
+ let services = ['#', '+'];
209
+ for (let i = 0; i < response.length; i++) {
210
+ if (response[i].sid !== '009') {
211
+ services.push(`${response[i].sid} - ${response[i].name}`);
212
+ }
213
+ }
214
+ $("#instance-search-sid").autocomplete({
215
+ source: services,
216
+ minLength: 0,
217
+ close: function (event, ui) {
218
+ acceptCheck();
219
+ $("#instance-search-sid").autocomplete('destroy');
220
+ if ($("#instance-search-sid").val().length > 3) {
221
+ $("#instance-search-sid").val($("#instance-search-sid").val().substring(0, 3))
222
+ }
223
+ searchObject.sid = $("#instance-search-sid").val();
224
+ if (searchObject.sid === '+') {
225
+ for (let i = 2; i < services.length; i++) {
226
+ $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[i].substring(0, 3)}`, (objects) => {
227
+ searchObject.objects = searchObject.objects.concat(objects);
228
+ })
229
+ }
230
+ } else {
231
+ $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`, (objects) => {
232
+ searchObject.objects = objects;
233
+ })
234
+ }
235
+ }
236
+ }).autocomplete('search', '');
237
+ }
238
+
239
+ //Start a new search
240
+ function startSearch() {
241
+ $("#wildcard-alert-row").hide();
242
+ $("#instance-search-sid").val('');
243
+ $("#instance-search-pid").val('');
244
+ $("#instance-search-ins").val('');
245
+ searchObject.hid = $("#instance-search-hid").val()
246
+ searchObject.sid = '';
247
+ searchObject.pid = '';
248
+ searchObject.ins = '';
249
+ if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
250
+ $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
251
+ .fail((err) => {
252
+ console.log('Some kind of html failure message on service discovery');
253
+ });
254
+ }
255
+ }
256
+
257
+ //Finish a search
258
+ function finishSearch() {
259
+ $("#wildcard-alert-row").hide();
260
+ let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`
261
+ if (uri.includes('#')) {
262
+ uri = uri.substring(0,uri.indexOf('#') + 1)
263
+ }
264
+ $("#node-input-resource").val(uri);
265
+ $("#node-search-accept").css('color', '#CCCCCC');
266
+ readyToAccept = false;
267
+ $("#node-search-return").addClass('disabled');
268
+ $("#node-search-accept").addClass('disabled');
269
+ $("#node-lookup-instance").removeClass('disabled');
270
+ $("#instance-search-row").hide();
271
+ $("#instance-row").show();
272
+ }
273
+
274
+ //Function to update if accept button is grade out and functions based on conditions of fields
275
+ function acceptCheck() {
276
+ if (($("#instance-search-hid").val() !== '' && $("#instance-search-sid").val() !== '' && $("#instance-search-pid").val() !== '' && $("#instance-search-ins").val() !== '' && $("#instance-search-rid").val() !== '') ||
277
+ $("#instance-search-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").val() === '#' || $("#instance-search-rid").val() === '#') {
278
+ $("#node-search-accept").css('color', '#555555');
279
+ readyToAccept = true;
280
+ } else {
281
+ $("#node-search-accept").css('color', '#CCCCCC');
282
+ readyToAccept = false;
283
+ }
284
+ if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+' && $("#instance-search-ins").val() !== '+') {
285
+ $("#wildcard-alert-row").hide();
286
+ } else {
287
+ $("#wildcard-alert-row").show();
288
+ }
289
+ }
290
+
291
+ // Respond to clicks
292
+ $("#node-lookup-instance").click(function () { //When search button is clicked
293
+ $("#instance-search-sid").val('');
294
+ $("#instance-search-pid").val('');
295
+ $("#instance-search-ins").val('');
296
+ $("#instance-search-rid").val('');
297
+ $("#node-lookup-instance").addClass('disabled');
298
+ $("#node-search-return").removeClass('disabled');
299
+ $("#node-search-accept").removeClass('disabled');
300
+ $("#instance-row").hide();
301
+ $("#instance-search-row").show();
302
+ });
303
+ $("#instance-search-sid").click(function () { //SID field clicked
304
+ $("#instance-search-pid").val('')
305
+ $("#instance-search-ins").val('')
306
+ searchObject.pid = '';
307
+ searchObject.ins = '';
308
+ searchObject.rid = '';
309
+ searchObject.objects = [];
310
+ startSearch();
311
+ })
312
+ $("#instance-search-pid").click(function () { //PID field clicked
313
+ $("#instance-search-ins").val('')
314
+ $("#instance-search-rid").val('')
315
+ searchObject.ins = '';
316
+ searchObject.rid = '';
317
+ if (searchObject.sid !== '') {
318
+ pidsSearch(searchObject.objects);
319
+ }
320
+ })
321
+ $("#instance-search-ins").click(function () { //INS field clicked
322
+ $("#instance-search-rid").val('')
323
+ searchObject.rid = '';
324
+ if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
325
+ insSearch(searchObject.objects, searchObject.pid);
326
+ }
327
+ })
328
+ $("#instance-search-rid").click(function () { //RID clicked
329
+ if (searchObject.ins !== '' && searchObject.ins !== '+' && searchObject.pid !== '+' && searchObject.sid !== '+') {
330
+ ridSearch(searchObject.objects, searchObject.ins);
331
+ }
332
+ });
333
+ $("#node-search-return").click(function () { //Return/Back button clicked
334
+ $("#node-search-return").addClass('disabled');
335
+ $("#node-search-accept").addClass('disabled');
336
+ $("#node-lookup-instance").removeClass('disabled');
337
+ $("#instance-search-row").hide();
338
+ $("#instance-row").show();
339
+ });
340
+ $("#node-search-accept").click(function () { //Accept button clicked
341
+ if (readyToAccept) {
342
+ finishSearch();
343
+ }
344
+ });
345
+
346
+ // Respond to search field changes
347
+ $("#instance-search-hid").change(function () {
348
+ acceptCheck();
349
+ $("#instance-search-sid").val('');
350
+ $("#instance-search-pid").val('');
351
+ $("#instance-search-ins").val('');
352
+ $("#instance-search-rid").val('');
353
+ });
354
+ $("#instance-search-sid").change(function () {
355
+ searchObject.sid = $("#instance-search-sid").val()
356
+ acceptCheck();
357
+ });
358
+ $("#instance-search-pid").change(function () {
359
+ searchObject.pid = $("#instance-search-pid").val()
360
+ acceptCheck();
361
+ });
362
+ $("#instance-search-ins").change(function () {
363
+ searchObject.ins = $("#instance-search-ins").val()
364
+ acceptCheck();
365
+ });
366
+ $("#instance-search-rid").change(function () {
367
+ searchObject.rid = $("#instance-search-rid").val()
368
+ acceptCheck();
369
+ });
370
+
371
+ // *** MOBSEARCH *** //
372
+ },
87
373
  oneditsave: function() {
88
374
  if($("#node-input-detailedOutput").prop('checked')) {
89
375
  this.outputs = 4;
package/dist/nodes/mobius-set-multi-resource.html CHANGED
@@ -29,10 +29,34 @@ POSSIBILITY OF SUCH DAMAGE.
29
29
  <label for="node-input-connection"><i class="fa fa-globe"></i> MOBiUS</label>
30
30
  <input type="text" id="node-input-connection">
31
31
  </div>
32
- <div class="form-row">
33
- <label for="node-input-mobject"><i class="fa fa-tasks"></i> URI</label>
34
- <input type="text" id="node-input-mobject" placeholder="Object URI (hid/sid/pid/ins)">
32
+
33
+ <hr>
34
+
35
+ <div id="instance-row">
36
+ <div class="form-row">
37
+ <label for="node-input-instance"><i class="fa fa-tasks"></i> URI</label>
38
+ <input type="text" id="node-input-instance" style="width:61%;" placeholder="HID/SID/PID/INS (optional name)">
39
+ <a id="node-lookup-instance" class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>
40
+ </div>
41
+ </div>
42
+ <div id="instance-search-row">
43
+ <div class="form-row">
44
+ <label for="instance-search-sid"><i class="fa fa-tasks"></i> URI</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>
35
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>
59
+
36
60
  <div class="form-row">
37
61
  <label>&nbsp;</label>
38
62
  <input type="checkbox" id="node-input-detailedOutput" style="display: inline-block; width: auto; vertical-align: top;">
@@ -51,7 +75,7 @@ POSSIBILITY OF SUCH DAMAGE.
51
75
  defaults: {
52
76
  name: {value:""},
53
77
  detailedOutput: {value:false},
54
- mobject: {value: "", validate:function(v) {
78
+ instance: {value: "", validate:function(v) {
55
79
  if(v === '') { return true; }
56
80
  let parts = v.split('/');
57
81
  for(let lp = 0; lp < parts.length; lp++) {
@@ -82,6 +106,232 @@ POSSIBILITY OF SUCH DAMAGE.
82
106
  labelStyle: function() {
83
107
  return this.name ? "node_label_italic":"";
84
108
  },
109
+ oneditprepare: function () {
110
+ var node = this;
111
+ let mobiusSrvc = $("#node-input-connection").val();
112
+
113
+ $("#instance-search-row").hide();
114
+
115
+ $("#node-search-return").addClass('disabled');
116
+
117
+ // *** MOBSEARCH *** //
118
+
119
+ //Inital setup
120
+ $("#instance-search-row").hide();
121
+ $("#wildcard-alert-row").hide();
122
+ $("#node-search-return").addClass('disabled');
123
+ $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
124
+ $("#instance-search-hid").val(response);
125
+ })
126
+ let readyToAccept = false;
127
+ let searchObject = {
128
+ hid: $("#instance-search-hid").val(),
129
+ sid: $("#instance-search-sid").val(),
130
+ pid: $("#instance-search-pid").val(),
131
+ ins: $("#instance-search-ins").val(),
132
+ objects: []
133
+ }
134
+
135
+ //Function to search for INSs
136
+ function insSearch (objects, pid) {
137
+ let inss = ['#'];
138
+ for (let i = 0; i < objects.length; i++) {
139
+ if (objects[i].pid === pid) {
140
+ const name = objects[i].resources[1].pv;
141
+ if (name === '') {
142
+ inss.push(objects[i].ins);
143
+ } else {
144
+ inss.push(`${objects[i].ins} - ${name}`);
145
+ }
146
+ }
147
+ }
148
+ $("#instance-search-ins").autocomplete({
149
+ source: inss,
150
+ minLength: 0,
151
+ close: function (event, ui) {
152
+ acceptCheck();
153
+ $("#instance-search-ins").autocomplete('destroy');
154
+ if ($("#instance-search-ins").val().length > 4) {
155
+ $("#instance-search-ins").val($("#instance-search-ins").val().substring(0, 4))
156
+ }
157
+ searchObject.ins = $("#instance-search-ins").val();
158
+ }
159
+ }).autocomplete('search', '');
160
+ }
161
+
162
+ //Function to search for PIDs
163
+ function pidsSearch(objects) {
164
+ searchObject.objects = objects;
165
+ let pids = ['#', '+'];
166
+ for (let i = 0; i < objects.length; i++) {
167
+ pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
168
+ }
169
+ pids = [...new Set(pids)];
170
+ $("#instance-search-pid").autocomplete({
171
+ source: pids,
172
+ minLength: 0,
173
+ close: function (event, ui) {
174
+ acceptCheck();
175
+ $("#instance-search-pid").autocomplete('destroy');
176
+ if ($("#instance-search-pid").val().length > 4) {
177
+ $("#instance-search-pid").val($("#instance-search-pid").val().substring(0, 4))
178
+ }
179
+ searchObject.pid = $("#instance-search-pid").val();
180
+ }
181
+ }).autocomplete('search', '');
182
+ }
183
+
184
+ //Function to search for SIDs, and then fetch child objects based on selection
185
+ function serviceSearch(response) {
186
+ let services = ['#', '+'];
187
+ for (let i = 0; i < response.length; i++) {
188
+ if (response[i].sid !== '009') {
189
+ services.push(`${response[i].sid} - ${response[i].name}`);
190
+ }
191
+ }
192
+ $("#instance-search-sid").autocomplete({
193
+ source: services,
194
+ minLength: 0,
195
+ close: function (event, ui) {
196
+ acceptCheck();
197
+ $("#instance-search-sid").autocomplete('destroy');
198
+ if ($("#instance-search-sid").val().length > 3) {
199
+ $("#instance-search-sid").val($("#instance-search-sid").val().substring(0, 3))
200
+ }
201
+ searchObject.sid = $("#instance-search-sid").val();
202
+ if (searchObject.sid === '+') {
203
+ for (let i = 2; i < services.length; i++) {
204
+ $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[i].substring(0, 3)}`, (objects) => {
205
+ searchObject.objects = searchObject.objects.concat(objects);
206
+ })
207
+ }
208
+ } else {
209
+ $.getJSON(`mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`, (objects) => {
210
+ searchObject.objects = objects;
211
+ })
212
+ }
213
+ }
214
+ }).autocomplete('search', '');
215
+ }
216
+
217
+ //Start a new search
218
+ function startSearch() {
219
+ $("#wildcard-alert-row").hide();
220
+ $("#instance-search-sid").val('');
221
+ $("#instance-search-pid").val('');
222
+ $("#instance-search-ins").val('');
223
+ searchObject.hid = $("#instance-search-hid").val()
224
+ searchObject.sid = '';
225
+ searchObject.pid = '';
226
+ searchObject.ins = '';
227
+ if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
228
+ $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
229
+ .fail((err) => {
230
+ console.log('Some kind of html failure message on service discovery');
231
+ });
232
+ }
233
+ }
234
+
235
+ //Finish a search
236
+ function finishSearch() {
237
+ $("#wildcard-alert-row").hide();
238
+ let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`
239
+ if (uri.includes('#')) {
240
+ uri = uri.substring(0,uri.indexOf('#') + 1)
241
+ }
242
+ $("#node-input-instance").val(uri);
243
+ $("#node-search-accept").css('color', '#CCCCCC');
244
+ readyToAccept = false;
245
+ $("#node-search-return").addClass('disabled');
246
+ $("#node-search-accept").addClass('disabled');
247
+ $("#node-lookup-instance").removeClass('disabled');
248
+ $("#instance-search-row").hide();
249
+ $("#instance-row").show();
250
+ }
251
+
252
+ //Function to update if accept button is grade out and functions based on conditions of fields
253
+ function acceptCheck() {
254
+ if (($("#instance-search-hid").val() !== '' && $("#instance-search-sid").val() !== '' && $("#instance-search-pid").val() !== '' && $("#instance-search-ins").val() !== '') ||
255
+ $("#instance-search-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").val() === '#') {
256
+ $("#node-search-accept").css('color', '#555555');
257
+ readyToAccept = true;
258
+ } else {
259
+ $("#node-search-accept").css('color', '#CCCCCC');
260
+ readyToAccept = false;
261
+ }
262
+ if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+') {
263
+ $("#wildcard-alert-row").hide();
264
+ } else {
265
+ $("#wildcard-alert-row").show();
266
+ }
267
+ }
268
+
269
+ // Respond to clicks
270
+ $("#node-lookup-instance").click(function () { //When search button is clicked
271
+ $("#instance-search-sid").val('');
272
+ $("#instance-search-pid").val('');
273
+ $("#instance-search-ins").val('');
274
+ $("#node-lookup-instance").addClass('disabled');
275
+ $("#node-search-return").removeClass('disabled');
276
+ $("#node-search-accept").removeClass('disabled');
277
+ $("#instance-row").hide();
278
+ $("#instance-search-row").show();
279
+ });
280
+ $("#instance-search-sid").click(function () { //SID field clicked
281
+ $("#instance-search-pid").val('')
282
+ $("#instance-search-ins").val('')
283
+ searchObject.pid = '';
284
+ searchObject.ins = '';
285
+ searchObject.objects = [];
286
+ startSearch();
287
+ })
288
+ $("#instance-search-pid").click(function () { //PID field clicked
289
+ $("#instance-search-ins").val('')
290
+ searchObject.ins = '';
291
+ if (searchObject.sid !== '') {
292
+ pidsSearch(searchObject.objects);
293
+ }
294
+ })
295
+ $("#instance-search-ins").click(function () { //INS field clicked
296
+ if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
297
+ insSearch(searchObject.objects, searchObject.pid);
298
+ }
299
+ })
300
+ $("#node-search-return").click(function () { //Return/Back button clicked
301
+ $("#node-search-return").addClass('disabled');
302
+ $("#node-search-accept").addClass('disabled');
303
+ $("#node-lookup-instance").removeClass('disabled');
304
+ $("#instance-search-row").hide();
305
+ $("#instance-row").show();
306
+ });
307
+ $("#node-search-accept").click(function () { //Accept button clicked
308
+ if (readyToAccept) {
309
+ finishSearch();
310
+ }
311
+ });
312
+
313
+ // Respond to search field changes
314
+ $("#instance-search-hid").change(function () {
315
+ acceptCheck();
316
+ $("#instance-search-sid").val('');
317
+ $("#instance-search-pid").val('');
318
+ $("#instance-search-ins").val('');
319
+ });
320
+ $("#instance-search-sid").change(function () {
321
+ searchObject.sid = $("#instance-search-sid").val()
322
+ acceptCheck();
323
+ });
324
+ $("#instance-search-pid").change(function () {
325
+ searchObject.pid = $("#instance-search-pid").val()
326
+ acceptCheck();
327
+ });
328
+ $("#instance-search-ins").change(function () {
329
+ searchObject.ins = $("#instance-search-ins").val()
330
+ acceptCheck();
331
+ });
332
+
333
+ // *** MOBSEARCH *** //
334
+ },
85
335
  oneditsave: function() {
86
336
  if($("#node-input-detailedOutput").prop('checked')) {
87
337
  this.outputs = 2;
package/dist/nodes/mobius-set-multi-resource.js CHANGED
@@ -28,10 +28,10 @@
28
28
  'use strict';
29
29
 
30
30
  module.exports = function (RED) {
31
- function MobiusSetMultiResourceNode (n) {
31
+ function MobiusSetMultiResourceNode(n) {
32
32
  RED.nodes.createNode(this, n);
33
33
  this.detailedOutput = n.detailedOutput;
34
- this.mobject = n.mobject;
34
+ this.instance = n.instance;
35
35
  this.serviceConn = RED.nodes.getNode(n.connection);
36
36
  var node = this;
37
37
 
@@ -39,11 +39,11 @@ 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.on('input', function (msg) {
46
- let uri = node.mobject;
46
+ let uri = node.instance;
47
47
  let value = null;
48
48
  if (msg.hasOwnProperty('topic') && require('./validateURI')(msg.topic, 4)) {
49
49
  uri = msg.topic;
@@ -55,7 +55,7 @@ module.exports = function (RED) {
55
55
  node.status({
56
56
  fill: 'green',
57
57
  shape: 'ring',
58
- text: 'Busy'
58
+ text: 'Busy',
59
59
  });
60
60
 
61
61
  node.serviceConn.multiWriteResourceValue(uri, value, (err, response) => {
@@ -63,27 +63,25 @@ module.exports = function (RED) {
63
63
  node.status({
64
64
  fill: 'yellow',
65
65
  shape: 'dot',
66
- text: 'Error: ' + JSON.stringify(err.code)
66
+ text: 'Error: ' + JSON.stringify(err.code),
67
67
  });
68
68
  node.error('Mobius error writing multiple resources ' + JSON.stringify(err));
69
69
  if (node.detailedOutput === true) {
70
- node.send([null, {topic: uri, payload: { error: true, response: err }}]);
70
+ node.send([null, { topic: uri, payload: { error: true, response: err } }]);
71
71
  }
72
72
  } else {
73
73
  node.status({
74
74
  fill: 'green',
75
75
  shape: 'dot',
76
- text: 'OK'
76
+ text: 'OK',
77
77
  });
78
78
  if (node.detailedOutput === true) {
79
79
  node.send([
80
80
  { topic: uri, payload: response.value },
81
- { topic: uri, payload: { error: false, response: response } }
81
+ { topic: uri, payload: { error: false, response: response } },
82
82
  ]);
83
83
  } else {
84
- node.send([
85
- { topic: uri, payload: response.value }
86
- ]);
84
+ node.send([{ topic: uri, payload: response.value }]);
87
85
  }
88
86
  }
89
87
  });