Skip to content

Commit e22ab8a

Browse files
DanCunningtonDanCunnington
committed
bluemix credentials as a config node
1 parent 2c08598 commit e22ab8a

2 files changed

Lines changed: 75 additions & 93 deletions

File tree

‎services/retrieve_and_rank/v1.html‎

Lines changed: 63 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,36 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16+
17+
<!-- Service Credentials Configuration Node -->
18+
<script type="text/x-red" data-template-name="watson-retrieve-rank-credentials">
19+
<div class="form-row">
20+
<label for="node-config-input-username"><i class="fa fa-user"></i> Username</label>
21+
<input type="text" id="node-config-input-username" placeholder="Username">
22+
</div>
23+
<div class="form-row">
24+
<label for="node-config-input-password"><i class="fa fa-key"></i> Password</label>
25+
<input type="password" id="node-config-input-password" placeholder="Password">
26+
</div>
27+
</script>
28+
29+
<script type="text/javascript">
30+
(function() {
31+
console.log("hello");
32+
RED.nodes.registerType('watson-retrieve-rank-credentials',{
33+
category: 'config',
34+
defaults: {
35+
username:{value: ""},
36+
password:{value: ""}
37+
},
38+
label: function() {
39+
return 'Retrieve and Rank Credentials';
40+
}
41+
});
42+
})();
43+
</script>
44+
45+
1646
<!-- Create Cluster Node -->
1747
<script type="text/x-red" data-template-name="watson-retrieve-rank-create-cluster">
1848
<div id="credentials-check" class="form-row">
@@ -24,13 +54,9 @@
2454
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
2555
<input type="text" id="node-input-name" placeholder="Name">
2656
</div>
27-
<div class="form-row credentials" style="display: none;">
28-
<label for="node-input-username"><i class="fa fa-user"></i> Username</label>
29-
<input type="text" id="node-input-username" placeholder="Username">
30-
</div>
31-
<div class="form-row credentials" style="display: none;">
32-
<label for="node-input-password"><i class="fa fa-key"></i> Password</label>
33-
<input type="password" id="node-input-password" placeholder="Password">
57+
<div class="form-row">
58+
<label for="node-input-bluemix"><i class="fa fa-user"></i> Service Credentials</label>
59+
<input type="text" id="node-input-servicecreds">
3460
</div>
3561
<div class="form-row clustername">
3662
<label for="node-input-clustername"><i class="fa fa-tag"></i> Cluster Name</label>
@@ -64,13 +90,10 @@
6490
category: 'IBM Watson',
6591
defaults: {
6692
name: {value: ""},
93+
servicecreds: {value: "", type: 'watson-retrieve-rank-credentials'},
6794
clustername: {value: ""},
6895
clustersize: {value: "free"}
6996
},
70-
credentials: {
71-
username: {type:"text"},
72-
password: {type:"password"}
73-
},
7497
color: "rgb(85, 150, 230)",
7598
inputs: 1,
7699
outputs: 1,
@@ -106,13 +129,9 @@
106129
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
107130
<input type="text" id="node-input-name" placeholder="Name">
108131
</div>
109-
<div class="form-row credentials" style="display: none;">
110-
<label for="node-input-username"><i class="fa fa-user"></i> Username</label>
111-
<input type="text" id="node-input-username" placeholder="Username">
112-
</div>
113-
<div class="form-row credentials" style="display: none;">
114-
<label for="node-input-password"><i class="fa fa-key"></i> Password</label>
115-
<input type="password" id="node-input-password" placeholder="Password">
132+
<div class="form-row">
133+
<label for="node-input-bluemix"><i class="fa fa-user"></i> Service Credentials</label>
134+
<input type="text" id="node-input-servicecreds">
116135
</div>
117136
<div class="form-row">
118137
<label for="node-input-mode"><i class="fa fa-question"></i> Mode</label>
@@ -147,6 +166,7 @@
147166
defaults: {
148167
name: {value: ""},
149168
mode: {value: "list"},
169+
servicecreds: {value: "", type: 'watson-retrieve-rank-credentials'},
150170
clusterid: {value: ""}
151171
},
152172
credentials: {
@@ -196,13 +216,9 @@
196216
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
197217
<input type="text" id="node-input-name" placeholder="Name">
198218
</div>
199-
<div class="form-row credentials" style="display: none;">
200-
<label for="node-input-username"><i class="fa fa-user"></i> Username</label>
201-
<input type="text" id="node-input-username" placeholder="Username">
202-
</div>
203-
<div class="form-row credentials" style="display: none;">
204-
<label for="node-input-password"><i class="fa fa-key"></i> Password</label>
205-
<input type="password" id="node-input-password" placeholder="Password">
219+
<div class="form-row">
220+
<label for="node-input-bluemix"><i class="fa fa-user"></i> Service Credentials</label>
221+
<input type="text" id="node-input-servicecreds">
206222
</div>
207223
<div class="form-row mode clusterid">
208224
<label for="node-input-clusterid"><i class="fa fa-tag"></i> Cluster ID</label>
@@ -228,13 +244,10 @@
228244
category: 'IBM Watson',
229245
defaults: {
230246
name: {value: ""},
247+
servicecreds: {value: "", type: 'watson-retrieve-rank-credentials'},
231248
clusterid: {value: "", required: true},
232249
configname: {value: "", required: true}
233250
},
234-
credentials: {
235-
username: {type:"text"},
236-
password: {type:"password"}
237-
},
238251
color: "rgb(85, 150, 230)",
239252
inputs: 1,
240253
outputs: 1,
@@ -270,13 +283,9 @@
270283
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
271284
<input type="text" id="node-input-name" placeholder="Name">
272285
</div>
273-
<div class="form-row credentials" style="display: none;">
274-
<label for="node-input-username"><i class="fa fa-user"></i> Username</label>
275-
<input type="text" id="node-input-username" placeholder="Username">
276-
</div>
277-
<div class="form-row credentials" style="display: none;">
278-
<label for="node-input-password"><i class="fa fa-key"></i> Password</label>
279-
<input type="password" id="node-input-password" placeholder="Password">
286+
<div class="form-row">
287+
<label for="node-input-bluemix"><i class="fa fa-user"></i> Service Credentials</label>
288+
<input type="text" id="node-input-servicecreds">
280289
</div>
281290
<div class="form-row clusterid">
282291
<label for="node-input-clusterid"><i class="fa fa-tag"></i> Cluster ID</label>
@@ -314,15 +323,12 @@
314323
category: 'IBM Watson',
315324
defaults: {
316325
name: {value: ""},
326+
servicecreds: {value: "", type: 'watson-retrieve-rank-credentials'},
317327
clusterid: {value: "", required: true},
318328
mode: {value: "list"},
319329
configname: {value: ""}
320330

321331
},
322-
credentials: {
323-
username: {type:"text"},
324-
password: {type:"password"}
325-
},
326332
color: "rgb(85, 150, 230)",
327333
inputs: 1,
328334
outputs: 1,
@@ -366,13 +372,9 @@
366372
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
367373
<input type="text" id="node-input-name" placeholder="Name">
368374
</div>
369-
<div class="form-row credentials" style="display: none;">
370-
<label for="node-input-username"><i class="fa fa-user"></i> Username</label>
371-
<input type="text" id="node-input-username" placeholder="Username">
372-
</div>
373-
<div class="form-row credentials" style="display: none;">
374-
<label for="node-input-password"><i class="fa fa-key"></i> Password</label>
375-
<input type="password" id="node-input-password" placeholder="Password">
375+
<div class="form-row">
376+
<label for="node-input-bluemix"><i class="fa fa-user"></i> Service Credentials</label>
377+
<input type="text" id="node-input-servicecreds">
376378
</div>
377379
<div class="form-row clusterid">
378380
<label for="node-input-clusterid"><i class="fa fa-tag"></i> Cluster ID</label>
@@ -418,16 +420,13 @@
418420
category: 'IBM Watson',
419421
defaults: {
420422
name: {value: ""},
423+
servicecreds: {value: "", type: 'watson-retrieve-rank-credentials'},
421424
clusterid: {value: "", required: true},
422425
collectionname: {value: "", required: true},
423426
mode: {value: "create"},
424427
configname: {value: ""}
425428

426-
},
427-
credentials: {
428-
username: {type:"text"},
429-
password: {type:"password"}
430-
},
429+
},
431430
color: "rgb(85, 150, 230)",
432431
inputs: 1,
433432
outputs: 1,
@@ -471,13 +470,9 @@
471470
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
472471
<input type="text" id="node-input-name" placeholder="Name">
473472
</div>
474-
<div class="form-row credentials" style="display: none;">
475-
<label for="node-input-username"><i class="fa fa-user"></i> Username</label>
476-
<input type="text" id="node-input-username" placeholder="Username">
477-
</div>
478-
<div class="form-row credentials" style="display: none;">
479-
<label for="node-input-password"><i class="fa fa-key"></i> Password</label>
480-
<input type="password" id="node-input-password" placeholder="Password">
473+
<div class="form-row">
474+
<label for="node-input-bluemix"><i class="fa fa-user"></i> Service Credentials</label>
475+
<input type="text" id="node-input-servicecreds">
481476
</div>
482477
<div class="form-row rankername">
483478
<label for="node-input-rankername"><i class="fa fa-tag"></i> Ranker Name</label>
@@ -501,12 +496,9 @@
501496
category: 'IBM Watson',
502497
defaults: {
503498
name: {value: ""},
499+
servicecreds: {value: "", type: 'watson-retrieve-rank-credentials'},
504500
rankername: {value: ""}
505501
},
506-
credentials: {
507-
username: {type:"text"},
508-
password: {type:"password"}
509-
},
510502
color: "rgb(85, 150, 230)",
511503
inputs: 1,
512504
outputs: 1,
@@ -542,13 +534,9 @@
542534
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
543535
<input type="text" id="node-input-name" placeholder="Name">
544536
</div>
545-
<div class="form-row credentials" style="display: none;">
546-
<label for="node-input-username"><i class="fa fa-user"></i> Username</label>
547-
<input type="text" id="node-input-username" placeholder="Username">
548-
</div>
549-
<div class="form-row credentials" style="display: none;">
550-
<label for="node-input-password"><i class="fa fa-key"></i> Password</label>
551-
<input type="password" id="node-input-password" placeholder="Password">
537+
<div class="form-row">
538+
<label for="node-input-bluemix"><i class="fa fa-user"></i> Service Credentials</label>
539+
<input type="text" id="node-input-servicecreds">
552540
</div>
553541
<div class="form-row">
554542
<label for="node-input-mode"><i class="fa fa-question"></i> Mode</label>
@@ -584,13 +572,10 @@
584572
category: 'IBM Watson',
585573
defaults: {
586574
name: {value: ""},
575+
servicecreds: {value: "", type: 'watson-retrieve-rank-credentials'},
587576
mode: {value: "list"},
588577
rankerid: {value: ""}
589578
},
590-
credentials: {
591-
username: {type:"text"},
592-
password: {type:"password"}
593-
},
594579
color: "rgb(85, 150, 230)",
595580
inputs: 1,
596581
outputs: 1,
@@ -634,13 +619,9 @@
634619
<label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
635620
<input type="text" id="node-input-name" placeholder="Name">
636621
</div>
637-
<div class="form-row credentials" style="display: none;">
638-
<label for="node-input-username"><i class="fa fa-user"></i> Username</label>
639-
<input type="text" id="node-input-username" placeholder="Username">
640-
</div>
641-
<div class="form-row credentials" style="display: none;">
642-
<label for="node-input-password"><i class="fa fa-key"></i> Password</label>
643-
<input type="password" id="node-input-password" placeholder="Password">
622+
<div class="form-row">
623+
<label for="node-input-bluemix"><i class="fa fa-user"></i> Service Credentials</label>
624+
<input type="text" id="node-input-servicecreds">
644625
</div>
645626
<div class="form-row mode clusterid">
646627
<label for="node-input-clusterid"><i class="fa fa-tag"></i> Cluster ID</label>
@@ -683,15 +664,12 @@
683664
category: 'IBM Watson',
684665
defaults: {
685666
name: {value: ""},
667+
servicecreds: {value: "", type: 'watson-retrieve-rank-credentials'},
686668
clusterid: {value: "", required: true},
687669
collectionname: {value: "", required: true},
688670
searchmode: {value: "search-and-rank"},
689671
rankerid: {value: ""}
690672
},
691-
credentials: {
692-
username: {type:"text"},
693-
password: {type:"password"}
694-
},
695673
color: "rgb(85, 150, 230)",
696674
inputs: 1,
697675
outputs: 1,

‎services/retrieve_and_rank/v1.js‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ module.exports = function (RED) {
3636
res.json(service ? {bound_service: true} : null);
3737
});
3838

39+
function serviceCredentialsConfigurationNode(config) {
40+
RED.nodes.createNode(this,config);
41+
this.username = config.username;
42+
this.password = config.password;
43+
}
3944

4045
function createRankerNode(config) {
4146
RED.nodes.createNode(this, config);
@@ -419,12 +424,9 @@ module.exports = function (RED) {
419424
});
420425
}
421426

422-
RED.nodes.registerType('watson-retrieve-rank-create-cluster', createClusterNode, {
423-
credentials: {
424-
username: {type:"text"},
425-
password: {type:"password"}
426-
}
427-
});
427+
RED.nodes.registerType("watson-retrieve-rank-credentials", serviceCredentialsConfigurationNode);
428+
RED.nodes.registerType('watson-retrieve-rank-create-cluster', createClusterNode);
429+
428430
RED.nodes.registerType('watson-retrieve-rank-cluster-settings', clusterSettingsNode, {
429431
credentials: {
430432
username: {type:"text"},
@@ -477,8 +479,10 @@ module.exports = function (RED) {
477479
}
478480

479481
//Check credentials
480-
username = username || node.credentials.username;
481-
password = password || node.credentials.password;
482+
this.credentials = RED.nodes.getNode(config.servicecreds);
483+
console.log(config);
484+
username = username || this.credentials.username;
485+
password = password || this.credentials.password;
482486

483487
if (!username || !password) {
484488
message = 'Missing Concept Insights service credentials';

0 commit comments

Comments
 (0)