From 7ee03cf132492569a0302b75886d0cdd983841ed Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 9 Feb 2020 23:18:44 -0800
Subject: [PATCH] :zap: Ignore node-credential-issues on disabled nodes

---
 packages/cli/src/WorkflowCredentials.ts       |  2 +-
 packages/editor-ui/src/components/Node.vue    | 10 +----
 .../editor-ui/src/components/NodeSettings.vue | 14 -------
 .../src/components/mixins/nodeHelpers.ts      | 37 +++++++++++++++++++
 packages/editor-ui/src/views/NodeView.vue     | 14 +------
 5 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/packages/cli/src/WorkflowCredentials.ts b/packages/cli/src/WorkflowCredentials.ts
index f46e7661bd..bd02acabf7 100644
--- a/packages/cli/src/WorkflowCredentials.ts
+++ b/packages/cli/src/WorkflowCredentials.ts
@@ -13,7 +13,7 @@ export async function WorkflowCredentials(nodes: INode[]): Promise<IWorkflowCred
 
 	let node, type, name, foundCredentials;
 	for (node of nodes) {
-		if (!node.credentials) {
+		if (node.disabled === true || !node.credentials) {
 			continue;
 		}
 
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index ee3a7b28e7..5576623300 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -171,15 +171,7 @@ export default mixins(nodeBase, workflowHelpers).extend({
 	},
 	methods: {
 		disableNode () {
-			// Toggle disabled flag
-			const updateInformation = {
-				name: this.data.name,
-				properties: {
-					disabled: !this.data.disabled,
-				},
-			};
-
-			this.$store.commit('updateNodeProperties', updateInformation);
+			this.disableNodes([this.data]);
 		},
 		executeNode () {
 			this.$emit('runWorkflow', this.data.name);
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index ca3cfde88d..029b66fd54 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -288,20 +288,6 @@ export default mixins(
 					}
 				}
 			},
-			updateNodeCredentialIssues (node: INodeUi): void {
-				const fullNodeIssues: INodeIssues | null = this.getNodeCredentialIssues(node);
-
-				let newIssues: INodeIssueObjectProperty | null = null;
-				if (fullNodeIssues !== null) {
-					newIssues = fullNodeIssues.credentials!;
-				}
-
-				this.$store.commit('setNodeIssue', {
-					node: node.name,
-					type: 'credentials',
-					value: newIssues,
-				} as INodeIssueData);
-			},
 			credentialSelected (updateInformation: INodeUpdatePropertiesInformation) {
 				// Update the values on the node
 				this.$store.commit('updateNodeProperties', updateInformation);
diff --git a/packages/editor-ui/src/components/mixins/nodeHelpers.ts b/packages/editor-ui/src/components/mixins/nodeHelpers.ts
index a0533b7423..9808898c18 100644
--- a/packages/editor-ui/src/components/mixins/nodeHelpers.ts
+++ b/packages/editor-ui/src/components/mixins/nodeHelpers.ts
@@ -6,6 +6,7 @@ import {
 	INodeParameters,
 	INodeExecutionData,
 	INodeIssues,
+	INodeIssueData,
 	INodeIssueObjectProperty,
 	INodeProperties,
 	INodeTypeDescription,
@@ -121,8 +122,29 @@ export const nodeHelpers = mixins(
 				}
 			},
 
+			// Updates the credential-issues of the node
+			updateNodeCredentialIssues(node: INodeUi): void {
+				const fullNodeIssues: INodeIssues | null = this.getNodeCredentialIssues(node);
+
+				let newIssues: INodeIssueObjectProperty | null = null;
+				if (fullNodeIssues !== null) {
+					newIssues = fullNodeIssues.credentials!;
+				}
+
+				this.$store.commit('setNodeIssue', {
+					node: node.name,
+					type: 'credentials',
+					value: newIssues,
+				} as INodeIssueData);
+			},
+
 			// Returns all the credential-issues of the node
 			getNodeCredentialIssues (node: INodeUi, nodeType?: INodeTypeDescription): INodeIssues | null {
+				if (node.disabled === true) {
+					// Node is disabled
+					return null;
+				}
+
 				if (nodeType === undefined) {
 					nodeType = this.$store.getters.nodeType(node.type);
 				}
@@ -257,5 +279,20 @@ export const nodeHelpers = mixins(
 
 				return returnData;
 			},
+
+			disableNodes(nodes: INodeUi[]) {
+				for (const node of nodes) {
+					// Toggle disabled flag
+					const updateInformation = {
+						name: node.name,
+						properties: {
+							disabled: !node.disabled,
+						},
+					};
+
+					this.$store.commit('updateNodeProperties', updateInformation);
+					this.updateNodeCredentialIssues(node);
+				}
+			},
 		},
 	});
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 4df79a9658..03f1ff28d1 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -547,19 +547,7 @@ export default mixins(
 				if (this.editAllowedCheck() === false) {
 					return;
 				}
-
-				let updateInformation;
-				this.$store.getters.getSelectedNodes.forEach((node: INodeUi) => {
-					// Toggle disabled flag
-					updateInformation = {
-						name: node.name,
-						properties: {
-							disabled: !node.disabled,
-						},
-					};
-
-					this.$store.commit('updateNodeProperties', updateInformation);
-				});
+				this.disableNodes(this.$store.getters.getSelectedNodes);
 			},
 
 			deleteSelectedNodes () {