frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

enable template config via msg.template for stored or generated templates (#1503)

Browse Source 
* updates to 80-template to allow setting template with msg.template

* updated 80-template_spec test for msg.template support

* fixed 80-template.js test
This commit is contained in:
Ross Cruickshank 2017-12-05 12:24:06 +00:00 committed by Dave Conway-Jones
parent 3988a648d6
commit f21c8154ed
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nodes/core/core/80-template.html
View File

@ -54,6 +54,9 @@
<dl class="message-properties"> <dl class="message-properties">
<dt>msg <span class="property-type">object</span></dt> <dt>msg <span class="property-type">object</span></dt>
<dd>A msg object containing information to populate the template.</dd> <dd>A msg object containing information to populate the template.</dd>
<dt class="optional">template <span class="property-type">string</span></dt>
<dd>A template to be populated from msg.payload. If not configured in the edit panel,
this can be set as a property of msg.</dd>
</dl> </dl>
<h3>Outputs</h3> <h3>Outputs</h3>
<dl class="message-properties"> <dl class="message-properties">

10
nodes/core/core/80-template.js
View File

@ -83,6 +83,16 @@ module.exports = function(RED) {
node.on("input", function(msg) { node.on("input", function(msg) {
try { try {
var value; var value;
/***
* Allow template contents to be defined externally
* through inbound msg.template IFF node.template empty
*/
if (msg.hasOwnProperty("template")) {
if (node.template == "" || node.template === null) {
node.template = msg.template;
}
}
if (node.syntax === "mustache") { if (node.syntax === "mustache") {
if (node.outputFormat === "json") { if (node.outputFormat === "json") {
value = mustache.render(node.template,new NodeContext(msg, node.context(), null, true)); value = mustache.render(node.template,new NodeContext(msg, node.context(), null, true));

33
test/nodes/core/core/80-template_spec.js
View File

@ -37,9 +37,40 @@ describe('template node', function() {
n2.on("input", function(msg) { n2.on("input", function(msg) {
msg.should.have.property('topic', 'bar'); msg.should.have.property('topic', 'bar');
msg.should.have.property('payload', 'payload=foo'); msg.should.have.property('payload', 'payload=foo');
msg.should.have.property('template', '{{payload}}');
done(); done();
}); });
n1.receive({payload:"foo",topic: "bar"}); n1.receive({payload:"foo",topic: "bar", template: "{{payload}}"});
});
});
it('should modify template from msg.template', function(done) {
var flow = [{id:"n1", type:"template", field:"template", template:"",wires:[["n2"]]},{id:"n2",type:"helper"}];
helper.load(templateNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('topic', 'bar');
msg.should.have.property('payload', 'foo');
msg.should.have.property('template', 'payload=foo');
done();
});
n1.receive({payload:"foo", topic: "bar", template: "payload={{payload}}"});
});
});
it('should modify payload from msg.template', function(done) {
var flow = [{id:"n1", type:"template", field:"payload", template:"",wires:[["n2"]]},{id:"n2",type:"helper"}];
helper.load(templateNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('topic', 'bar');
msg.should.have.property('payload', 'topic=bar');
msg.should.have.property('template', 'topic={{topic}}');
done();
});
n1.receive({payload:"foo", topic: "bar", template: "topic={{topic}}"});
}); });
}); });