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

Merge 3c67d7b9a7 into 686efc4720

pull/4428/merge
Magdalena Lorentz 2025-03-17 13:05:19 -04:00 committed by GitHub
parent 686efc4720 3c67d7b9a7
commit 6120417e64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/js/red.js vendored
View File

@ -528,7 +528,7 @@ var RED = (function() {
var node = RED.nodes.node(parts[1]);
if (node) {
if (msg.hasOwnProperty("text") && msg.text !== null && /^[@a-zA-Z]/.test(msg.text)) {
msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString(), ...(msg.params || {})});
}
node.status = msg;
node.dirtyStatus = true;

4
packages/node_modules/@node-red/runtime/lib/api/comms.js vendored
View File

@ -51,6 +51,10 @@ function handleStatusEvent(event) {
fill: event.status.fill,
shape: event.status.shape
};
const params = event.status.params;
if(params && typeof params === "object" && !Array.isArray(params)){
status.params = params;
}
publish("status/"+event.id,status,true);
}
}

21
test/unit/@node-red/runtime/lib/api/comms_spec.js
View File

@ -286,6 +286,27 @@ describe("runtime-api/comms", function() {
}).catch(done);
})
it('retains non-blank status message with parameters', function(done) {
eventHandlers['node-status']({
id: "node1234",
status: {
text: "path.to.status.locale",
params: {
myParam0: "test"
}
}
});
messages.should.have.length(0);
comms.addConnection({client: clientConnection}).then(function() {
return comms.subscribe({client: clientConnection, topic: "status/#"}).then(function() {
messages.should.have.length(1);
messages[0].should.have.property("topic","status/node1234");
messages[0].should.have.property("data",{text:"path.to.status.locale", fill: undefined, shape: undefined, params: { myParam0: "test"} });
done();
});
}).catch(done);
});
it('retained messages get cleared',function(done) {
eventHandlers['comms']({
topic: "my-event",