🔀 Merge master

This commit is contained in:
Iván Ovejero 2021-12-01 10:00:11 +01:00
commit 5c2eef2c81
3 changed files with 18 additions and 13 deletions

View file

@ -2016,10 +2016,8 @@ export default mixins(
this.$store.commit('renameNodeSelectedAndExecution', { old: currentName, new: newName }); this.$store.commit('renameNodeSelectedAndExecution', { old: currentName, new: newName });
// Reset all nodes and connections to load the new ones // Reset all nodes and connections to load the new ones
if (this.instance) { this.deleteEveryEndpoint();
// On first load it does not exist
this.instance.deleteEveryEndpoint();
}
this.$store.commit('removeAllConnections'); this.$store.commit('removeAllConnections');
this.$store.commit('removeAllNodes', {setStateDirty: true}); this.$store.commit('removeAllNodes', {setStateDirty: true});
@ -2033,6 +2031,16 @@ export default mixins(
this.deselectAllNodes(); this.deselectAllNodes();
this.nodeSelectedByName(newName); this.nodeSelectedByName(newName);
}, },
deleteEveryEndpoint () {
// Check as it does not exist on first load
if (this.instance) {
const nodes = this.$store.getters.allNodes as INodeUi[];
// @ts-ignore
nodes.forEach((node: INodeUi) => this.instance.destroyDraggable(`${NODE_NAME_PREFIX}${this.$store.getters.getNodeIndex(node.name)}`));
this.instance.deleteEveryEndpoint();
}
},
matchCredentials(node: INodeUi) { matchCredentials(node: INodeUi) {
if (!node.credentials) { if (!node.credentials) {
return; return;
@ -2354,10 +2362,7 @@ export default mixins(
}, },
resetWorkspace () { resetWorkspace () {
// Reset nodes // Reset nodes
if (this.instance) { this.deleteEveryEndpoint();
// On first load it does not exist
this.instance.deleteEveryEndpoint();
}
if (this.executionWaitingForWebhook === true) { if (this.executionWaitingForWebhook === true) {
// Make sure that if there is a waiting test-webhook that // Make sure that if there is a waiting test-webhook that

View file

@ -25,7 +25,7 @@ export class RabbitMQTrigger implements INodeType {
version: 1, version: 1,
description: 'Listens to RabbitMQ messages', description: 'Listens to RabbitMQ messages',
defaults: { defaults: {
name: 'RabbitMQ', name: 'RabbitMQ Trigger',
color: '#ff6600', color: '#ff6600',
}, },
inputs: [], inputs: [],

View file

@ -325,11 +325,11 @@ export const opportunityFields = [
options: [ options: [
{ {
name: 'Business', name: 'Business',
valie: 'Business', value: 'Business',
}, },
{ {
name: 'New Business', name: 'New Business',
valie: 'New Business', value: 'New Business',
}, },
], ],
description: 'Type of opportunity. For example, Existing Business or New Business. Label is Opportunity Type.', description: 'Type of opportunity. For example, Existing Business or New Business. Label is Opportunity Type.',
@ -538,11 +538,11 @@ export const opportunityFields = [
options: [ options: [
{ {
name: 'Business', name: 'Business',
valie: 'Business', value: 'Business',
}, },
{ {
name: 'New Business', name: 'New Business',
valie: 'New Business', value: 'New Business',
}, },
], ],
description: 'Type of opportunity. For example, Existing Business or New Business. Label is Opportunity Type.', description: 'Type of opportunity. For example, Existing Business or New Business. Label is Opportunity Type.',