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

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.
@@ -0,0 +1,322 @@
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>
6
+ <input type="text" id="instance-search-hid" style="width:13%;" placeholder="HID">
7
+ <input type="text" id="instance-search-sid" style="width:8%;" placeholder="SID">
8
+ <input type="text" id="instance-search-pid" style="width:10%;" placeholder="PID">
9
+ <input type="text" id="instance-search-ins" style="width:10%;" placeholder="INS">
10
+ <input type="text" id="instance-search-rid" style="width:8%;" placeholder="RID">
11
+ <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
+ <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
+ </div>
14
+ </div>
15
+ <div id="wildcard-alert-row" class="form-row hidden" style="color:#555555" align="center">
16
+ <p>Please note: The selection of wildcard '+'
17
+ means a search for a specific instance or resource
18
+ cannot be performed. As such, enter the
19
+ INS and/or RID manually.</p>
20
+ </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
+ `;
25
+
26
+ //Inital setup
27
+ $('#instance-search-row').hide();
28
+ $('#wildcard-alert-row').hide();
29
+ $('#node-search-return').addClass('disabled');
30
+ $.getJSON(`mgethid?mobius=${mobiusSrvc}`, function (response) {
31
+ $('#instance-search-hid').val(response);
32
+ });
33
+ 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
+ };
42
+
43
+ //Function to search for RIDs
44
+ function ridSearch(objects, ins) {
45
+ $.getJSON(
46
+ `mdiscover?mobius=${mobiusSrvc}&uri=${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}`,
47
+ (response) => {
48
+ resList = response.value[0].resources;
49
+ ress = ['#'];
50
+ for (let j = 0; j < resList.length; j++) {
51
+ ress.push(`${resList[j].rid} - ${resList[j].name}`);
52
+ }
53
+ $('#instance-search-rid')
54
+ .autocomplete({
55
+ source: ress,
56
+ minLength: 0,
57
+ close: function (event, ui) {
58
+ acceptCheck();
59
+ $('#instance-search-rid').autocomplete('destroy');
60
+ $('#instance-search-rid').val($('#instance-search-rid').val().substring(0, 2));
61
+ searchObject.rid = $('#instance-search-rid').val();
62
+ },
63
+ })
64
+ .autocomplete('search', '');
65
+ }
66
+ );
67
+ }
68
+
69
+ //Function to search for INSs
70
+ function insSearch(objects, pid) {
71
+ let inss = ['#', '+'];
72
+ for (let i = 0; i < objects.length; i++) {
73
+ if (objects[i].pid === pid) {
74
+ const name = objects[i].resources[1].pv;
75
+ if (name === '') {
76
+ inss.push(objects[i].ins);
77
+ } else {
78
+ inss.push(`${objects[i].ins} - ${name}`);
79
+ }
80
+ }
81
+ }
82
+ $('#instance-search-ins')
83
+ .autocomplete({
84
+ source: inss,
85
+ minLength: 0,
86
+ close: function (event, ui) {
87
+ acceptCheck();
88
+ $('#instance-search-ins').autocomplete('destroy');
89
+ if ($('#instance-search-ins').val().length > 4) {
90
+ $('#instance-search-ins').val($('#instance-search-ins').val().substring(0, 4));
91
+ }
92
+ searchObject.ins = $('#instance-search-ins').val();
93
+ },
94
+ })
95
+ .autocomplete('search', '');
96
+ }
97
+
98
+ //Function to search for PIDs
99
+ function pidsSearch(objects) {
100
+ searchObject.objects = objects;
101
+ let pids = ['#', '+'];
102
+ for (let i = 0; i < objects.length; i++) {
103
+ pids.push(`${objects[i].pid} - ${objects[i].profileName}`);
104
+ }
105
+ pids = [...new Set(pids)];
106
+ $('#instance-search-pid')
107
+ .autocomplete({
108
+ source: pids,
109
+ minLength: 0,
110
+ close: function (event, ui) {
111
+ acceptCheck();
112
+ $('#instance-search-pid').autocomplete('destroy');
113
+ if ($('#instance-search-pid').val().length > 4) {
114
+ $('#instance-search-pid').val($('#instance-search-pid').val().substring(0, 4));
115
+ }
116
+ searchObject.pid = $('#instance-search-pid').val();
117
+ },
118
+ })
119
+ .autocomplete('search', '');
120
+ }
121
+
122
+ //Function to search for SIDs, and then fetch child objects based on selection
123
+ function serviceSearch(response) {
124
+ let services = ['#', '+'];
125
+ for (let i = 0; i < response.length; i++) {
126
+ if (response[i].sid !== '009') {
127
+ services.push(`${response[i].sid} - ${response[i].name}`);
128
+ }
129
+ }
130
+ $('#instance-search-sid')
131
+ .autocomplete({
132
+ source: services,
133
+ minLength: 0,
134
+ close: function (event, ui) {
135
+ acceptCheck();
136
+ $('#instance-search-sid').autocomplete('destroy');
137
+ if ($('#instance-search-sid').val().length > 3) {
138
+ $('#instance-search-sid').val($('#instance-search-sid').val().substring(0, 3));
139
+ }
140
+ searchObject.sid = $('#instance-search-sid').val();
141
+ if (searchObject.sid === '+') {
142
+ for (let i = 2; i < services.length; i++) {
143
+ $.getJSON(
144
+ `mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${services[
145
+ i
146
+ ].substring(0, 3)}`,
147
+ (objects) => {
148
+ searchObject.objects = searchObject.objects.concat(objects);
149
+ }
150
+ );
151
+ }
152
+ } else {
153
+ $.getJSON(
154
+ `mgetobjects?mobius=${mobiusSrvc}&hid=${searchObject.hid}&sid=${searchObject.sid}`,
155
+ (objects) => {
156
+ searchObject.objects = objects;
157
+ }
158
+ );
159
+ }
160
+ },
161
+ })
162
+ .autocomplete('search', '');
163
+ }
164
+
165
+ //Start a new search
166
+ function startSearch() {
167
+ $('#wildcard-alert-row').hide();
168
+ $('#instance-search-sid').val('');
169
+ $('#instance-search-pid').val('');
170
+ $('#instance-search-ins').val('');
171
+ searchObject.hid = $('#instance-search-hid').val();
172
+ searchObject.sid = '';
173
+ searchObject.pid = '';
174
+ searchObject.ins = '';
175
+ if (/((^([0-9A-F]){6}$)|^$)/.test(searchObject.hid)) {
176
+ $.getJSON(`mgetservices?mobius=${mobiusSrvc}&hid=${searchObject.hid}`, serviceSearch).fail(
177
+ (err) => {
178
+ console.log('Some kind of html failure message on service discovery');
179
+ }
180
+ );
181
+ }
182
+ }
183
+
184
+ //Finish a search
185
+ function finishSearch() {
186
+ $('#wildcard-alert-row').hide();
187
+ let uri = `${searchObject.hid}/${searchObject.sid}/${searchObject.pid}/${searchObject.ins}/${searchObject.rid}`;
188
+ if (uri.includes('#')) {
189
+ uri = uri.substring(0, uri.indexOf('#') + 1);
190
+ }
191
+ $('#node-input-resource').val(uri);
192
+ $('#node-search-accept').css('color', '#CCCCCC');
193
+ readyToAccept = false;
194
+ $('#node-search-return').addClass('disabled');
195
+ $('#node-search-accept').addClass('disabled');
196
+ $('#node-lookup-instance').removeClass('disabled');
197
+ $('#instance-search-row').hide();
198
+ $('#instance-row').show();
199
+ }
200
+
201
+ //Function to update if accept button is grade out and functions based on conditions of fields
202
+ 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;
216
+ } else {
217
+ $('#node-search-accept').css('color', '#CCCCCC');
218
+ readyToAccept = false;
219
+ }
220
+ if (
221
+ $('#instance-search-sid').val() !== '+' &&
222
+ $('#instance-search-pid').val() !== '+' &&
223
+ $('#instance-search-ins').val() !== '+'
224
+ ) {
225
+ $('#wildcard-alert-row').hide();
226
+ } else {
227
+ $('#wildcard-alert-row').show();
228
+ }
229
+ }
230
+
231
+ // Respond to clicks
232
+ $('#node-lookup-instance').click(function () {
233
+ //When search button is clicked
234
+ $('#instance-search-sid').val('');
235
+ $('#instance-search-pid').val('');
236
+ $('#instance-search-ins').val('');
237
+ $('#instance-search-rid').val('');
238
+ $('#node-lookup-instance').addClass('disabled');
239
+ $('#node-search-return').removeClass('disabled');
240
+ $('#node-search-accept').removeClass('disabled');
241
+ $('#instance-row').hide();
242
+ $('#instance-search-row').show();
243
+ });
244
+ $('#instance-search-sid').click(function () {
245
+ //SID field clicked
246
+ $('#instance-search-pid').val('');
247
+ $('#instance-search-ins').val('');
248
+ searchObject.pid = '';
249
+ searchObject.ins = '';
250
+ searchObject.rid = '';
251
+ searchObject.objects = [];
252
+ startSearch();
253
+ });
254
+ $('#instance-search-pid').click(function () {
255
+ //PID field clicked
256
+ $('#instance-search-ins').val('');
257
+ $('#instance-search-rid').val('');
258
+ searchObject.ins = '';
259
+ searchObject.rid = '';
260
+ if (searchObject.sid !== '') {
261
+ pidsSearch(searchObject.objects);
262
+ }
263
+ });
264
+ $('#instance-search-ins').click(function () {
265
+ //INS field clicked
266
+ $('#instance-search-rid').val('');
267
+ searchObject.rid = '';
268
+ if (searchObject.pid !== '' && searchObject.pid !== '+' && searchObject.sid !== '+') {
269
+ insSearch(searchObject.objects, searchObject.pid);
270
+ }
271
+ });
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
+ });
283
+ $('#node-search-return').click(function () {
284
+ //Return/Back button clicked
285
+ $('#node-search-return').addClass('disabled');
286
+ $('#node-search-accept').addClass('disabled');
287
+ $('#node-lookup-instance').removeClass('disabled');
288
+ $('#instance-search-row').hide();
289
+ $('#instance-row').show();
290
+ });
291
+ $('#node-search-accept').click(function () {
292
+ //Accept button clicked
293
+ if (readyToAccept) {
294
+ finishSearch();
295
+ }
296
+ });
297
+
298
+ // Respond to search field changes
299
+ $('#instance-search-hid').change(function () {
300
+ acceptCheck();
301
+ $('#instance-search-sid').val('');
302
+ $('#instance-search-pid').val('');
303
+ $('#instance-search-ins').val('');
304
+ $('#instance-search-rid').val('');
305
+ });
306
+ $('#instance-search-sid').change(function () {
307
+ searchObject.sid = $('#instance-search-sid').val();
308
+ acceptCheck();
309
+ });
310
+ $('#instance-search-pid').change(function () {
311
+ searchObject.pid = $('#instance-search-pid').val();
312
+ acceptCheck();
313
+ });
314
+ $('#instance-search-ins').change(function () {
315
+ searchObject.ins = $('#instance-search-ins').val();
316
+ acceptCheck();
317
+ });
318
+ $('#instance-search-rid').change(function () {
319
+ searchObject.rid = $('#instance-search-rid').val();
320
+ acceptCheck();
321
+ });
322
+ }
@@ -33,30 +33,13 @@ POSSIBILITY OF SUCH DAMAGE.
33
33
  <hr>
34
34
 
35
35
  <div id="instance-row">
36
- <div class="form-row">
36
+ <div class="form-row" id="input-row">
37
37
  <label for="node-input-resource"><i class="fa fa-tasks"></i> URI</label>
38
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
39
  </div>
41
40
  </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>
59
- </div>
41
+
42
+ <div id="mobsearch"></div>
60
43
 
61
44
  <div class="form-row">
62
45
  <label>&nbsp;</label>
@@ -70,6 +53,8 @@ POSSIBILITY OF SUCH DAMAGE.
70
53
  </div>
71
54
  </script>
72
55
 
56
+ <script src="common/mobsearch.js"></script>
57
+
73
58
  <script type="text/javascript">
74
59
  RED.nodes.registerType('mobius get resource',{
75
60
  category: 'mobius',
@@ -113,262 +98,7 @@ POSSIBILITY OF SUCH DAMAGE.
113
98
  oneditprepare: function () {
114
99
  var node = this;
115
100
  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 *** //
101
+ getMobsearch();
372
102
  },
373
103
  oneditsave: function() {
374
104
  if($("#node-input-detailedOutput").prop('checked')) {
@@ -28,7 +28,7 @@
28
28
  'use strict';
29
29
 
30
30
  module.exports = function (RED) {
31
- function MobiusGetResourceNode (n) {
31
+ function MobiusGetResourceNode(n) {
32
32
  RED.nodes.createNode(this, n);
33
33
  this.detailedOutput = n.detailedOutput;
34
34
  this.resource = n.resource;
@@ -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.on('input', function (msg) {
@@ -51,36 +51,41 @@ module.exports = function (RED) {
51
51
  node.status({
52
52
  fill: 'green',
53
53
  shape: 'ring',
54
- text: 'Busy'
54
+ text: 'Busy',
55
55
  });
56
56
  node.serviceConn.readResource(uri, (err, response) => {
57
57
  if (err) {
58
58
  node.status({
59
59
  fill: 'yellow',
60
60
  shape: 'dot',
61
- text: 'Error: ' + JSON.stringify(err.code)
61
+ text: 'Error: ' + JSON.stringify(err.code),
62
62
  });
63
63
  node.error('Mobius error reading resource ' + JSON.stringify(err));
64
64
  if (node.detailedOutput === true) {
65
- node.send([null, null, null, {topic: uri, payload: {error: true, response: err}}]);
65
+ node.send([
66
+ null,
67
+ null,
68
+ null,
69
+ { topic: uri, payload: { error: true, response: err } },
70
+ ]);
66
71
  }
67
72
  } else {
68
73
  node.status({
69
74
  fill: 'green',
70
75
  shape: 'dot',
71
- text: JSON.stringify(response.value.pv)
76
+ text: JSON.stringify(response.value.pv),
72
77
  });
73
78
  if (node.detailedOutput === true) {
74
79
  node.send([
75
80
  { topic: uri, payload: response.value.pv },
76
81
  { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
77
82
  { topic: uri, payload: response.value },
78
- { topic: uri, payload: { error: false, response: response } }
83
+ { topic: uri, payload: { error: false, response: response } },
79
84
  ]);
80
85
  } else {
81
86
  node.send([
82
87
  { topic: uri, payload: response.value.pv },
83
- { topic: uri, payload: { pv: response.value.pv, name: response.value.name } }
88
+ { topic: uri, payload: { pv: response.value.pv, name: response.value.name } },
84
89
  ]);
85
90
  }
86
91
  }
@@ -98,4 +103,12 @@ module.exports = function (RED) {
98
103
  }
99
104
 
100
105
  RED.nodes.registerType('mobius get resource', MobiusGetResourceNode);
106
+
107
+ RED.httpAdmin.get('/common/*', function (req, res) {
108
+ var options = {
109
+ root: __dirname + '/common/',
110
+ dotfiles: 'deny',
111
+ };
112
+ res.sendFile(req.params[0], options);
113
+ });
101
114
  };
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "node-red-contrib-mobius-flow-base",
3
- "version": "2.5.86-beta.48",
3
+ "version": "2.5.86-beta.51",
4
4
  "description": "Node-RED base nodes for Mobius Flow",
5
5
  "main": "index.js",
6
6
  "types": "dist/index.d.ts",
7
7
  "scripts": {
8
8
  "test": "echo \"Error: no test specified\" && exit 1",
9
- "build": "mkdir -p dist/nodes && cp src/nodes/*.js dist/nodes/ && cp src/nodes/*.html dist/nodes/ && cp -r src/nodes/icons dist/nodes/"
9
+ "build": "mkdir -p dist/nodes && cp src/nodes/*.js dist/nodes/ && cp src/nodes/*.html dist/nodes/ && cp -r src/nodes/icons dist/nodes/ && mkdir -p dist/nodes/common && cp src/nodes/common/*.js dist/nodes/common/"
10
10
  },
11
11
  "repository": "bitbucket:interiorautomation/node-red-contrib-mobius-flow-base",
12
12
  "node-red": {