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

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.
@@ -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 for="node-input-priority"><i class="fa fa-exclamation-triangle"></i> Priority</label>
38
63
  <input type="text" id="node-input-priority" placeholder="Priotity to clear">
@@ -90,6 +115,266 @@ POSSIBILITY OF SUCH DAMAGE.
90
115
  labelStyle: function() {
91
116
  return this.name ? "node_label_italic":"";
92
117
  },
118
+ oneditprepare: function () {
119
+ var node = this;
120
+ let mobiusSrvc = $("#node-input-connection").val();
121
+
122
+ // *** MOBSEARCH *** //
123
+
124
+ //Inital setup
125
+ $("#instance-search-row").hide();
126
+ $("#wildcard-alert-row").hide();
127
+ $("#node-search-return").addClass('disabled');
128
+ $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
129
+ $("#instance-search-hid").val(response);
130
+ })
131
+ let readyToAccept = false;
132
+ let searchObject = {
133
+ hid: $("#instance-search-hid").val(),
134
+ sid: $("#instance-search-sid").val(),
135
+ pid: $("#instance-search-pid").val(),
136
+ ins: $("#instance-search-ins").val(),
137
+ rid: $("#instance-search-rid").val(),
138
+ objects: []
139
+ }
140
+
141
+ //Function to search for RIDs
142
+ function ridSearch (objects, ins) {
143
+ $.getJSON(`mdiscover?mobius=${mobiusSrvc}&uri=${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`, (response) => {
144
+ resList = response.value[0].resources
145
+ ress = ['#'];
146
+ for (let j = 0; j < resList.length; j++) {
147
+ ress.push(`${resList[j].rid} - ${resList[j].name}`)
148
+ }
149
+ $("#instance-search-rid").autocomplete({
150
+ source: ress,
151
+ minLength: 0,
152
+ close: function (event, ui) {
153
+ acceptCheck();
154
+ $("#instance-search-rid").autocomplete('destroy');
155
+ $("#instance-search-rid").val($("#instance-search-rid").val().substring(0, 2));
156
+ searchObject.rid = $("#instance-search-rid").val();
157
+ }
158
+ }).autocomplete('search', '');
159
+ })
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
+ if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
255
+ $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch)
256
+ .fail((err) => {
257
+ console.log('Some kind of html failure message on service discovery');
258
+ });
259
+ }
260
+ }
261
+
262
+ //Finish a search
263
+ function finishSearch() {
264
+ $("#wildcard-alert-row").hide();
265
+ let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`
266
+ if (uri.includes('#')) {
267
+ uri = uri.substring(0,uri.indexOf('#') + 1)
268
+ }
269
+ $("#node-input-resource").val(uri);
270
+ $("#node-search-accept").css('color', '#CCCCCC');
271
+ readyToAccept = false;
272
+ $("#node-search-return").addClass('disabled');
273
+ $("#node-search-accept").addClass('disabled');
274
+ $("#node-lookup-instance").removeClass('disabled');
275
+ $("#instance-search-row").hide();
276
+ $("#instance-row").show();
277
+ }
278
+
279
+ //Function to update if accept button is grade out and functions based on conditions of fields
280
+ function acceptCheck() {
281
+ if (($("#instance-search-hid").val() !== '' && $("#instance-search-sid").val() !== '' && $("#instance-search-pid").val() !== '' && $("#instance-search-ins").val() !== '' && $("#instance-search-rid").val() !== '') ||
282
+ $("#instance-search-sid").val() === '#' || $("#instance-search-pid").val() === '#' || $("#instance-search-ins").val() === '#' || $("#instance-search-rid").val() === '#') {
283
+ $("#node-search-accept").css('color', '#555555');
284
+ readyToAccept = true;
285
+ } else {
286
+ $("#node-search-accept").css('color', '#CCCCCC');
287
+ readyToAccept = false;
288
+ }
289
+ if ($("#instance-search-sid").val() !== '+' && $("#instance-search-pid").val() !== '+' && $("#instance-search-ins").val() !== '+') {
290
+ $("#wildcard-alert-row").hide();
291
+ } else {
292
+ $("#wildcard-alert-row").show();
293
+ }
294
+ }
295
+
296
+ // Respond to clicks
297
+ $("#node-lookup-instance").click(function () { //When search button is clicked
298
+ $("#instance-search-sid").val('');
299
+ $("#instance-search-pid").val('');
300
+ $("#instance-search-ins").val('');
301
+ $("#instance-search-rid").val('');
302
+ $("#node-lookup-instance").addClass('disabled');
303
+ $("#node-search-return").removeClass('disabled');
304
+ $("#node-search-accept").removeClass('disabled');
305
+ $("#instance-row").hide();
306
+ $("#instance-search-row").show();
307
+ });
308
+ $("#instance-search-sid").click(function () { //SID field clicked
309
+ $("#instance-search-pid").val('')
310
+ $("#instance-search-ins").val('')
311
+ searchObject.pid = '';
312
+ searchObject.ins = '';
313
+ searchObject.rid = '';
314
+ searchObject.objects = [];
315
+ startSearch();
316
+ })
317
+ $("#instance-search-pid").click(function () { //PID field clicked
318
+ $("#instance-search-ins").val('')
319
+ $("#instance-search-rid").val('')
320
+ searchObject.ins = '';
321
+ searchObject.rid = '';
322
+ if (searchObject.sid !== '') {
323
+ pidsSearch(searchObject.objects);
324
+ }
325
+ })
326
+ $("#instance-search-ins").click(function () { //INS field clicked
327
+ $("#instance-search-rid").val('')
328
+ searchObject.rid = '';
329
+ if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
330
+ insSearch(searchObject.objects, searchObject.pid);
331
+ }
332
+ })
333
+ $("#instance-search-rid").click(function () { //RID clicked
334
+ if (searchObject.ins !== '' && searchObject.ins !== '+' && searchObject.pid !== '+' && searchObject.sid !== '+') {
335
+ ridSearch(searchObject.objects, searchObject.ins);
336
+ }
337
+ });
338
+ $("#node-search-return").click(function () { //Return/Back button clicked
339
+ $("#node-search-return").addClass('disabled');
340
+ $("#node-search-accept").addClass('disabled');
341
+ $("#node-lookup-instance").removeClass('disabled');
342
+ $("#instance-search-row").hide();
343
+ $("#instance-row").show();
344
+ });
345
+ $("#node-search-accept").click(function () { //Accept button clicked
346
+ if (readyToAccept) {
347
+ finishSearch();
348
+ }
349
+ });
350
+
351
+ // Respond to search field changes
352
+ $("#instance-search-hid").change(function () {
353
+ acceptCheck();
354
+ $("#instance-search-sid").val('');
355
+ $("#instance-search-pid").val('');
356
+ $("#instance-search-ins").val('');
357
+ $("#instance-search-rid").val('');
358
+ });
359
+ $("#instance-search-sid").change(function () {
360
+ searchObject.sid = $("#instance-search-sid").val()
361
+ acceptCheck();
362
+ });
363
+ $("#instance-search-pid").change(function () {
364
+ searchObject.pid = $("#instance-search-pid").val()
365
+ acceptCheck();
366
+ });
367
+ $("#instance-search-ins").change(function () {
368
+ searchObject.ins = $("#instance-search-ins").val()
369
+ acceptCheck();
370
+ });
371
+ $("#instance-search-rid").change(function () {
372
+ searchObject.rid = $("#instance-search-rid").val()
373
+ acceptCheck();
374
+ });
375
+
376
+ // *** MOBSEARCH *** //
377
+ },
93
378
  oneditsave: function() {
94
379
  if($("#node-input-detailedOutput").prop('checked')) {
95
380
  this.outputs = 4;
@@ -41,10 +41,29 @@ POSSIBILITY OF SUCH DAMAGE.
41
41
  <option value="object">Object - Resource PVs, URIs and Names</option>
42
42
  </select>
43
43
  </div>
44
- <div class="form-row node-input-resources-container-row">
44
+ <div id="node-input-resources-container-row" class="form-row node-input-resources-container-row">
45
45
  <label for="node-input-resources-container"><i class="fa fa-bars"></i> Resources</label>
46
46
  <ol id="node-input-resources-container"></ol>
47
47
  </div>
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>
48
67
  </script>
49
68
 
50
69
  <script type="text/javascript">
@@ -82,6 +101,266 @@ POSSIBILITY OF SUCH DAMAGE.
82
101
  resource.find(".node-input-resource-comment").width(newWidth - 270);
83
102
  }
84
103
 
104
+ let mobiusSrvc = $("#node-input-connection").val();
105
+
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 *** //
363
+
85
364
  /** Create the subs container and populate it */
86
365
  $('#node-input-resources-container').css('min-height', '300px').css('min-width', '450px').editableList ({
87
366
  addButton: "add",
@@ -99,14 +378,39 @@ POSSIBILITY OF SUCH DAMAGE.
99
378
  }
100
379
 
101
380
  var row = $('<div>URI</div>').appendTo(container);
102
- var uriField = $('<input/>',{class: "node-input-resource-uri", type: "text", style: "width: 200px; margin-left: 5px; text-align: left;"}).appendTo(row);
381
+ var uriField = $('<input/>',{class: "node-input-resource-uri", type: "text", style: "width: 190px; margin-left: 5px; text-align: left;"}).appendTo(row);
382
+
383
+ // *** MOBSEARCH *** //
384
+ var searchField = $('<a class="searchbutton" style="vertical-align: middle"><i id="node-lookup-instance-icon" class="fa fa-search"></i></a>').appendTo(row);
385
+ // *** END MOBSEARCH *** //
386
+
103
387
  row.append('&nbsp;&nbsp;-&nbsp;');
104
- var commentField = $('<input/>',{class: "node-input-resource-comment", type: "text", style: "margin-left: 5px; text-align: left;"}).appendTo(row);
388
+ var commentField = $('<input/>',{class: "node-input-resource-comment", type: "text", style: "width: 110px; margin-left: 5px; text-align: left;"}).appendTo(row);
105
389
 
106
390
  // Populate the new stat
107
391
  uriField.val(resource.uri);
108
392
  commentField.val(resource.comment);
109
- resizeResource(container);
393
+ // resizeResource(container);
394
+
395
+ // *** MOBSEARCH *** //
396
+
397
+ if (!node.resources[i]) {
398
+ node.resources[i] = {uri: '', comment: ''}
399
+ }
400
+
401
+ searchField.click(function () {
402
+ globalSubscriptionIndex = i;
403
+ $('#node-input-resources-container-row').hide();
404
+ $("#instance-search-sid").val('');
405
+ $("#instance-search-pid").val('');
406
+ $("#instance-search-ins").val('');
407
+ $("#instance-search-rid").val('');
408
+ $("#node-search-return").removeClass('disabled');
409
+ $("#node-search-accept").removeClass('disabled');
410
+ $("#instance-search-row").show();
411
+
412
+ });
413
+ // *** END MOBSEARCH *** //
110
414
  },
111
415
  resizeItem: resizeResource
112
416
  });
@@ -115,19 +419,36 @@ POSSIBILITY OF SUCH DAMAGE.
115
419
  if (!node.resources) {
116
420
  node.resources = [resource = {uri: '', comment: ''}];
117
421
  }
118
- // Populate list with all saved filters
422
+
423
+ // *** MOBSEARCH *** //
424
+
425
+ function updateList() {
426
+ $("#node-input-resources-container").editableList('items').each(function (i) {
427
+ let resource = $(this);
428
+ let comment = resource.find(".node-input-resource-comment").val();
429
+ node.resources[i].comment = comment;
430
+ })
431
+ $("#node-input-resources-container").editableList('empty');
432
+ for (let i = 0; i < node.resources.length; i++) {
433
+ let resource = node.resources[i];
434
+ $("#node-input-resources-container").editableList('addItem', resource);
435
+ }
436
+ }
437
+
438
+ // *** END MOBSEARCH *** //
439
+
119
440
  for (let i = 0; i < node.resources.length; i++) {
120
441
  let resource = node.resources[i];
121
442
  $("#node-input-resources-container").editableList('addItem', resource);
122
443
  }
123
444
  },
124
445
  oneditresize(size) {
125
- var rows = $("#dialog-form>div:not(.node-input-resources-container-row)");
446
+ var rows = $("#dialog-form>div:not(.node-input-resources-container)");
126
447
  var height = size.height;
127
448
  for (var i=0; i<rows.size(); i++) {
128
449
  height -= $(rows[i]).outerHeight(true);
129
450
  }
130
- var editorRow = $("#dialog-form>div.node-input-resources-container-row");
451
+ var editorRow = $("#dialog-form>div.node-input-resources-container");
131
452
  height -= 4 * ((parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom"))));
132
453
 
133
454
  $("#node-input-resources-container").editableList('height',height);
@@ -29,12 +29,7 @@ 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 id="instance-message-row" class="form-row hidden" style="color:#ff0000" align="center">
33
- <p>To select a configured object from a drop-down list, <br/>
34
- please create a MOBiUS connection, deploy the flow, and <br />
35
- ensure that the node-red-connector service is running. <br />
36
- Click the Confirm Deploy button if asked.</p>
37
- </div>
32
+ <hr>
38
33
  <div id="instance-row">
39
34
  <div class="form-row">
40
35
  <label for="node-input-instance"><i class="fa fa-tasks"></i> URI</label>
@@ -123,23 +118,12 @@ POSSIBILITY OF SUCH DAMAGE.
123
118
  var node = this;
124
119
  let mobiusSrvc = $("#node-input-connection").val();
125
120
 
126
- $("#instance-search-row").hide();
127
121
 
128
- function doesMobiusServiceExist() {
129
- let srvc = $("#node-input-mobius").val();
130
- if (srvc === '_ADD_') {
131
- $("#node-lookup-instance").hide();
132
- $("#instance-message-row").show();
133
- } else {
134
- $("#instance-message-row").hide();
135
- $("#node-lookup-instance").show();
136
- }
137
- }
138
- doesMobiusServiceExist();
122
+ // *** MOBSEARCH *** //
139
123
 
140
- $("#node-search-return").addClass('disabled');
124
+ $("#instance-search-row").hide();
141
125
 
142
- // *** MOBSEARCH *** //
126
+ $("#node-search-return").addClass('disabled');
143
127
 
144
128
  //Inital setup
145
129
  $("#instance-search-row").hide();
@@ -31,12 +31,6 @@ POSSIBILITY OF SUCH DAMAGE.
31
31
  </div>
32
32
 
33
33
  <hr>
34
- <div id="instance-message-row" class="form-row hidden" style="color:#ff0000" align="center">
35
- <p>To select a configured object from a drop-down list, <br/>
36
- please create a MOBiUS connection, deploy the flow, and <br />
37
- ensure that the node-red-connector service is running. <br />
38
- Click the Confirm Deploy button if asked.</p>
39
- </div>
40
34
 
41
35
  <div id="instance-row">
42
36
  <div class="form-row">
@@ -120,19 +114,6 @@ POSSIBILITY OF SUCH DAMAGE.
120
114
  var node = this;
121
115
  let mobiusSrvc = $("#node-input-connection").val();
122
116
 
123
- function doesMobiusServiceExist() {
124
- let srvc = $("#node-input-mobius").val();
125
- if (srvc === '_ADD_') {
126
- $("#node-lookup-instance").hide();
127
- $("#instance-message-row").show();
128
- } else {
129
- $("#instance-message-row").hide();
130
- $("#node-lookup-instance").show();
131
- }
132
- }
133
- doesMobiusServiceExist();
134
-
135
-
136
117
  // *** MOBSEARCH *** //
137
118
 
138
119
  //Inital setup
@@ -31,12 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
31
31
  </div>
32
32
 
33
33
  <hr>
34
- <div id="instance-message-row" class="form-row hidden" style="color:#ff0000" align="center">
35
- <p>To select a configured object from a drop-down list, <br/>
36
- please create a MOBiUS connection, deploy the flow, and <br />
37
- ensure that the node-red-connector service is running. <br />
38
- Click the Confirm Deploy button if asked.</p>
39
- </div>
34
+
40
35
  <div id="instance-row">
41
36
  <div class="form-row">
42
37
  <label for="node-input-instance"><i class="fa fa-tasks"></i> URI</label>
@@ -136,18 +131,6 @@ POSSIBILITY OF SUCH DAMAGE.
136
131
 
137
132
  $("#instance-search-row").hide();
138
133
 
139
- function doesMobiusServiceExist() {
140
- let srvc = $("#node-input-mobius").val();
141
- if (srvc === '_ADD_') {
142
- $("#node-lookup-instance").hide();
143
- $("#instance-message-row").show();
144
- } else {
145
- $("#instance-message-row").hide();
146
- $("#node-lookup-instance").show();
147
- }
148
- }
149
- doesMobiusServiceExist();
150
-
151
134
  $("#node-search-return").addClass('disabled');
152
135
 
153
136
  // *** MOBSEARCH *** //
@@ -31,12 +31,6 @@ POSSIBILITY OF SUCH DAMAGE.
31
31
  </div>
32
32
 
33
33
  <hr>
34
- <div id="instance-message-row" class="form-row hidden" style="color:#ff0000" align="center">
35
- <p>To select a configured object from a drop-down list, <br/>
36
- please create a MOBiUS connection, deploy the flow, and <br />
37
- ensure that the node-red-connector service is running. <br />
38
- Click the Confirm Deploy button if asked.</p>
39
- </div>
40
34
 
41
35
  <div id="instance-row">
42
36
  <div class="form-row">
@@ -82,7 +76,8 @@ POSSIBILITY OF SUCH DAMAGE.
82
76
  defaults: {
83
77
  name: {value:""},
84
78
  detailedOutput: {value:false},
85
- resource: {value:"", required:true, validate:function(v) {
79
+ resource: {value:"", validate:function(v) {
80
+ if(v === '') { return true; }
86
81
  let parts = v.split('/');
87
82
  for(let lp = 0; lp < parts.length; lp++) {
88
83
  if(parts[lp] === null || parts[lp] === '') { return false;}
@@ -119,19 +114,6 @@ POSSIBILITY OF SUCH DAMAGE.
119
114
  var node = this;
120
115
  let mobiusSrvc = $("#node-input-connection").val();
121
116
 
122
- function doesMobiusServiceExist() {
123
- let srvc = $("#node-input-mobius").val();
124
- if (srvc === '_ADD_') {
125
- $("#node-lookup-instance").hide();
126
- $("#instance-message-row").show();
127
- } else {
128
- $("#instance-message-row").hide();
129
- $("#node-lookup-instance").show();
130
- }
131
- }
132
- doesMobiusServiceExist();
133
-
134
-
135
117
  // *** MOBSEARCH *** //
136
118
 
137
119
  //Inital setup
@@ -31,12 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
31
31
  </div>
32
32
 
33
33
  <hr>
34
- <div id="instance-message-row" class="form-row hidden" style="color:#ff0000" align="center">
35
- <p>To select a configured object from a drop-down list, <br/>
36
- please create a MOBiUS connection, deploy the flow, and <br />
37
- ensure that the node-red-connector service is running. <br />
38
- Click the Confirm Deploy button if asked.</p>
39
- </div>
34
+
40
35
  <div id="instance-row">
41
36
  <div class="form-row">
42
37
  <label for="node-input-instance"><i class="fa fa-tasks"></i> URI</label>
@@ -117,18 +112,6 @@ POSSIBILITY OF SUCH DAMAGE.
117
112
 
118
113
  $("#instance-search-row").hide();
119
114
 
120
- function doesMobiusServiceExist() {
121
- let srvc = $("#node-input-mobius").val();
122
- if (srvc === '_ADD_') {
123
- $("#node-lookup-instance").hide();
124
- $("#instance-message-row").show();
125
- } else {
126
- $("#instance-message-row").hide();
127
- $("#node-lookup-instance").show();
128
- }
129
- }
130
- doesMobiusServiceExist();
131
-
132
115
  $("#node-search-return").addClass('disabled');
133
116
 
134
117
  // *** MOBSEARCH *** //
@@ -31,12 +31,6 @@ POSSIBILITY OF SUCH DAMAGE.
31
31
  </div>
32
32
 
33
33
  <hr>
34
- <div id="instance-message-row" class="form-row hidden" style="color:#ff0000" align="center">
35
- <p>To select a configured object from a drop-down list, <br/>
36
- please create a MOBiUS connection, deploy the flow, and <br />
37
- ensure that the node-red-connector service is running. <br />
38
- Click the Confirm Deploy button if asked.</p>
39
- </div>
40
34
 
41
35
  <div id="instance-row">
42
36
  <div class="form-row">
@@ -125,19 +119,6 @@ POSSIBILITY OF SUCH DAMAGE.
125
119
  var node = this;
126
120
  let mobiusSrvc = $("#node-input-connection").val();
127
121
 
128
- function doesMobiusServiceExist() {
129
- let srvc = $("#node-input-mobius").val();
130
- if (srvc === '_ADD_') {
131
- $("#node-lookup-instance").hide();
132
- $("#instance-message-row").show();
133
- } else {
134
- $("#instance-message-row").hide();
135
- $("#node-lookup-instance").show();
136
- }
137
- }
138
- doesMobiusServiceExist();
139
-
140
-
141
122
  // *** MOBSEARCH *** //
142
123
 
143
124
  //Inital setup
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.43",
3
+ "version": "2.5.86-beta.48",
4
4
  "description": "Node-RED base nodes for Mobius Flow",
5
5
  "main": "index.js",
6
6
  "types": "dist/index.d.ts",