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

Fix global.get("foo.bar") for functionGlobalContext set values

Browse Source
This commit is contained in:
Nick O'Leary 2018-09-09 11:07:44 +01:00
parent 048f9c0294
commit 0f4d46671f
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
red/runtime/nodes/context/index.js
View File

@ -17,6 +17,7 @@
var clone = require("clone"); var clone = require("clone");
var log = require("../../log"); var log = require("../../log");
var memory = require("./memory"); var memory = require("./memory");
var util = require("../../util");
var settings; var settings;
@ -209,12 +210,12 @@ function createContext(id,seed) {
insertSeedValues = function(keys,values) { insertSeedValues = function(keys,values) {
if (!Array.isArray(keys)) { if (!Array.isArray(keys)) {
if (values[0] === undefined) { if (values[0] === undefined) {
values[0] = seed[keys]; values[0] = util.getObjectProperty(seed,keys);
} }
} else { } else {
for (var i=0;i<keys.length;i++) { for (var i=0;i<keys.length;i++) {
if (values[i] === undefined) { if (values[i] === undefined) {
values[i] = seed[keys[i]]; values[i] = util.getObjectProperty(seed,keys[i]);
} }
} }
} }
@ -258,7 +259,7 @@ function createContext(id,seed) {
if (Array.isArray(key)) { if (Array.isArray(key)) {
insertSeedValues(key,results); insertSeedValues(key,results);
} else if (results === undefined){ } else if (results === undefined){
results = seed[key]; results = util.getObjectProperty(seed,key);
} }
} }
return results; return results;

23
test/red/runtime/nodes/context/index_spec.js
View File

@ -191,15 +191,26 @@ describe('context', function() {
}); });
it('returns functionGlobalContext value if store value undefined', function() { it('returns functionGlobalContext value if store value undefined', function() {
Context.init({functionGlobalContext: {foo:"bar"}}); Context.init({functionGlobalContext: {foo:"bar"}});
Context.load().then(function(){ return Context.load().then(function(){
var context = Context.get("1","flowA"); var context = Context.get("1","flowA");
var v = context.global.get('foo'); var v = context.global.get('foo');
v.should.equal('bar'); v.should.equal('bar');
}); });
}) })
it('returns functionGlobalContext sub-value if store value undefined', function() {
Context.init({functionGlobalContext: {foo:{bar:123}}});
return Context.load().then(function(){
var context = Context.get("1","flowA");
var v = context.global.get('foo.bar');
should.equal(v,123);
});
})
}); });
describe('external context storage',function() { describe('external context storage',function() {
@ -579,16 +590,16 @@ describe('context', function() {
}); });
it('should return multiple functionGlobalContext values if key is an array', function(done) { it('should return multiple functionGlobalContext values if key is an array', function(done) {
var fGC = { "foo1": 456, "foo2": 789 }; var fGC = { "foo1": 456, "foo2": {"bar":789} };
Context.init({contextStorage:memoryStorage, functionGlobalContext:fGC }); Context.init({contextStorage:memoryStorage, functionGlobalContext:fGC });
Context.load().then(function(){ Context.load().then(function(){
var context = Context.get("1","flow"); var context = Context.get("1","flow");
context.global.get(["foo1","foo2","foo3"], "memory", function(err,foo1,foo2,foo3){ context.global.get(["foo1","foo2.bar","foo3"], "memory", function(err,foo1,foo2,foo3){
if (err) { if (err) {
done(err); done(err);
} else { } else {
foo1.should.be.equal(456); should.equal(foo1, 456);
foo2.should.be.equal(789); should.equal(foo2, 789);
should.not.exist(foo3); should.not.exist(foo3);
done(); done();
} }