mirror of https://github.com/node-red/node-red.git
Merge pull request #4983 from node-red/gg-changes-2
Rework saving of credentials to undo historypull/4975/head
commit
a50a37ac26
|
@ -495,11 +495,12 @@ RED.history = (function() {
|
|||
// Reset - Only want to keep the changes
|
||||
inverseEv.changes[i] = {};
|
||||
for (const [key, value] of Object.entries(ev.changes[i])) {
|
||||
inverseEv.changes[i][key] = ev.node.credentials[key];
|
||||
ev.node.credentials[key] = value;
|
||||
if (ev.node._def.credentials[key]?.type === 'password') {
|
||||
ev.node.credentials['has_' + key] = !!value;
|
||||
// Edge case: node.credentials is cleared after a deploy, so we can't
|
||||
// capture values for the inverse event when undoing past a deploy
|
||||
if (ev.node.credentials) {
|
||||
inverseEv.changes[i][key] = ev.node.credentials[key];
|
||||
}
|
||||
ev.node.credentials[key] = value;
|
||||
}
|
||||
} else {
|
||||
ev.node[i] = ev.changes[i];
|
||||
|
|
|
@ -812,6 +812,9 @@ RED.editor = (function() {
|
|||
if (editing_node._def.credentials) {
|
||||
for (const prop in editing_node._def.credentials) {
|
||||
if (Object.prototype.hasOwnProperty.call(editing_node._def.credentials, prop)) {
|
||||
if (editing_node._def.credentials[prop].type === 'password') {
|
||||
oldCreds['has_' + prop] = editing_node.credentials['has_' + prop];
|
||||
}
|
||||
if (prop in editing_node.credentials) {
|
||||
oldCreds[prop] = editing_node.credentials[prop];
|
||||
}
|
||||
|
@ -862,6 +865,7 @@ RED.editor = (function() {
|
|||
continue;
|
||||
}
|
||||
editState.changes.credentials = editState.changes.credentials || {};
|
||||
editState.changes.credentials['has_' + prop] = oldCreds['has_' + prop];
|
||||
editState.changes.credentials[prop] = oldCreds[prop];
|
||||
editState.changed = true;
|
||||
}
|
||||
|
|
|
@ -195,6 +195,7 @@
|
|||
// Like the user sets a value, saves the config,
|
||||
// reopens the config and save the config again
|
||||
} else {
|
||||
changes['has_' + cred] = node.credentials['has_' + cred];
|
||||
changes[cred] = node.credentials[cred];
|
||||
node.credentials[cred] = value;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue