frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix up merge issue on api/nodes

This commit is contained in:
Nick O'Leary 2018-04-19 21:39:44 +01:00
parent 825b0fb22f
commit 2dab1d3e6e
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/js/ui/palette.js
View File

@ -431,7 +431,6 @@ RED.palette = (function() {
} }
}); });
RED.events.on('registry:node-set-disabled', function(nodeSet) { RED.events.on('registry:node-set-disabled', function(nodeSet) {
console.log(nodeSet);
for (var j=0;j<nodeSet.types.length;j++) { for (var j=0;j<nodeSet.types.length;j++) {
hideNodeType(nodeSet.types[j]); hideNodeType(nodeSet.types[j]);
var def = RED.nodes.getType(nodeSet.types[j]); var def = RED.nodes.getType(nodeSet.types[j]);

4
red/runtime-api/flows.js
View File

@ -88,8 +88,8 @@ var api = module.exports = {
apiPromise.then(function(flowId) { apiPromise.then(function(flowId) {
return resolve({rev:flowId}); return resolve({rev:flowId});
}).catch(function(err) { }).catch(function(err) {
log.warn(log._("api.flows.error-"+(deploymentType === 'reload'?'reload':'save'),{message:err.message})); runtime.log.warn(runtime.log._("api.flows.error-"+(deploymentType === 'reload'?'reload':'save'),{message:err.message}));
log.warn(err.stack); runtime.log.warn(err.stack);
return reject(err); return reject(err);
}); });
}); });

67
red/runtime-api/nodes.js
View File

@ -13,13 +13,28 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
**/ **/
"use strict"
/** /**
* @namespace RED.nodes * @namespace RED.nodes
*/ */
var runtime; var runtime;
function putNode(node, enabled) {
var info;
var promise;
if (!node.err && node.enabled === enabled) {
promise = Promise.resolve(node);
} else {
if (enabled) {
promise = runtime.nodes.enableNode(node.id);
} else {
promise = runtime.nodes.disableNode(node.id);
}
}
return promise;
}
var api = module.exports = { var api = module.exports = {
init: function(_runtime) { init: function(_runtime) {
runtime = _runtime; runtime = _runtime;
@ -37,7 +52,7 @@ var api = module.exports = {
getNodeInfo: function(opts) { getNodeInfo: function(opts) {
return new Promise(function(resolve,reject) { return new Promise(function(resolve,reject) {
var id = opts.id; var id = opts.id;
var result = redNodes.getNodeInfo(id); var result = runtime.nodes.getNodeInfo(id);
if (result) { if (result) {
runtime.log.audit({event: "nodes.info.get",id:id}); runtime.log.audit({event: "nodes.info.get",id:id});
delete result.loaded; delete result.loaded;
@ -117,13 +132,12 @@ var api = module.exports = {
*/ */
getModuleInfo: function(opts) { getModuleInfo: function(opts) {
return new Promise(function(resolve,reject) { return new Promise(function(resolve,reject) {
var module = opts.module; var result = runtime.nodes.getModuleInfo(opts.module);
var result = redNodes.getModuleInfo(module);
if (result) { if (result) {
runtime.log.audit({event: "nodes.module.get",id:id}); runtime.log.audit({event: "nodes.module.get",id:opts.module});
return resolve(result); return resolve(result);
} else { } else {
runtime.log.audit({event: "nodes.module.get",id:id,error:"not_found"}); runtime.log.audit({event: "nodes.module.get",id:opts.module,error:"not_found"});
var err = new Error(); var err = new Error();
err.code = "not_found"; err.code = "not_found";
err.status = 404; err.status = 404;
@ -145,7 +159,7 @@ var api = module.exports = {
return new Promise(function(resolve,reject) { return new Promise(function(resolve,reject) {
if (!runtime.settings.available()) { if (!runtime.settings.available()) {
runtime.log.audit({event: "nodes.install",error:"settings_unavailable"}); runtime.log.audit({event: "nodes.install",error:"settings_unavailable"});
let err = new Error("Settings unavailable"); var err = new Error("Settings unavailable");
err.code = "settings_unavailable"; err.code = "settings_unavailable";
err.status = 400; err.status = 400;
return reject(err); return reject(err);
@ -155,14 +169,14 @@ var api = module.exports = {
if (existingModule) { if (existingModule) {
if (!opts.version || existingModule.version === opts.version) { if (!opts.version || existingModule.version === opts.version) {
runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_already_loaded"}); runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_already_loaded"});
let err = new Error("Module already loaded"); var err = new Error("Module already loaded");
err.code = "module_already_loaded"; err.code = "module_already_loaded";
err.status = 400; err.status = 400;
return reject(err); return reject(err);
} }
if (!module.local) { if (!existingModule.local) {
runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_not_local"}); runtime.log.audit({event: "nodes.install",module:opts.module, version:opts.version, error:"module_not_local"});
let err = new Error("Module not locally installed"); var err = new Error("Module not locally installed");
err.code = "module_not_local"; err.code = "module_not_local";
err.status = 400; err.status = 400;
return reject(err); return reject(err);
@ -187,7 +201,7 @@ var api = module.exports = {
}) })
} else { } else {
runtime.log.audit({event: "nodes.install",module:opts.module,error:"invalid_request"}); runtime.log.audit({event: "nodes.install",module:opts.module,error:"invalid_request"});
let err = new Error("Invalid request"); var err = new Error("Invalid request");
err.code = "invalid_request"; err.code = "invalid_request";
err.status = 400; err.status = 400;
return reject(err); return reject(err);
@ -207,7 +221,7 @@ var api = module.exports = {
return new Promise(function(resolve,reject) { return new Promise(function(resolve,reject) {
if (!runtime.settings.available()) { if (!runtime.settings.available()) {
runtime.log.audit({event: "nodes.install",error:"settings_unavailable"}); runtime.log.audit({event: "nodes.install",error:"settings_unavailable"});
let err = new Error("Settings unavailable"); var err = new Error("Settings unavailable");
err.code = "settings_unavailable"; err.code = "settings_unavailable";
err.status = 400; err.status = 400;
return reject(err); return reject(err);
@ -229,10 +243,10 @@ var api = module.exports = {
runtime.log.audit({event: "nodes.remove",module:opts.module,error:err.code||"unexpected_error",message:err.toString()}); runtime.log.audit({event: "nodes.remove",module:opts.module,error:err.code||"unexpected_error",message:err.toString()});
return reject(err); return reject(err);
}) })
} catch(err) { } catch(error) {
runtime.log.audit({event: "nodes.remove",module:opts.module,error:err.code||"unexpected_error",message:err.toString()}); runtime.log.audit({event: "nodes.remove",module:opts.module,error:error.code||"unexpected_error",message:error.toString()});
err.status = 400; error.status = 400;
return reject(err); return reject(error);
} }
}); });
}, },
@ -247,16 +261,16 @@ var api = module.exports = {
* @memberof RED.nodes * @memberof RED.nodes
*/ */
setModuleState: function(opts) { setModuleState: function(opts) {
var mod = opts.module;
return new Promise(function(resolve,reject) { return new Promise(function(resolve,reject) {
if (!runtime.settings.available()) { if (!runtime.settings.available()) {
runtime.log.audit({event: "nodes.module.set",error:"settings_unavailable"}); runtime.log.audit({event: "nodes.module.set",error:"settings_unavailable"});
let err = new Error("Settings unavailable"); var err = new Error("Settings unavailable");
err.code = "settings_unavailable"; err.code = "settings_unavailable";
err.status = 400; err.status = 400;
return reject(err); return reject(err);
} }
try { try {
var mod = opts.module;
var module = runtime.nodes.getModuleInfo(mod); var module = runtime.nodes.getModuleInfo(mod);
if (!module) { if (!module) {
runtime.log.audit({event: "nodes.module.set",module:mod,error:"not_found"}); runtime.log.audit({event: "nodes.module.set",module:mod,error:"not_found"});
@ -277,10 +291,10 @@ var api = module.exports = {
err.status = 400; err.status = 400;
return reject(err); return reject(err);
}); });
} catch(err) { } catch(error) {
runtime.log.audit({event: "nodes.module.set",module:mod,enabled:opts.enabled,error:err.code||"unexpected_error",message:err.toString()}); runtime.log.audit({event: "nodes.module.set",module:mod,enabled:opts.enabled,error:error.code||"unexpected_error",message:error.toString()});
err.status = 400; error.status = 400;
return reject(err); return reject(error);
} }
}); });
}, },
@ -298,7 +312,7 @@ var api = module.exports = {
return new Promise(function(resolve,reject) { return new Promise(function(resolve,reject) {
if (!runtime.settings.available()) { if (!runtime.settings.available()) {
runtime.log.audit({event: "nodes.info.set",error:"settings_unavailable"}); runtime.log.audit({event: "nodes.info.set",error:"settings_unavailable"});
let err = new Error("Settings unavailable"); var err = new Error("Settings unavailable");
err.code = "settings_unavailable"; err.code = "settings_unavailable";
err.status = 400; err.status = 400;
return reject(err); return reject(err);
@ -325,9 +339,10 @@ var api = module.exports = {
return reject(err); return reject(err);
}); });
} }
} catch(err) { } catch(error) {
runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:err.code||"unexpected_error",message:err.toString()}); runtime.log.audit({event: "nodes.info.set",id:id,enabled:enabled,error:error.code||"unexpected_error",message:error.toString()});
res.status(400).json({error:err.code||"unexpected_error", message:err.toString()}); error.status = 400;
return reject(error);
} }
}); });
}, },