fix(editor): Fix workflow activation from the Workflows view (#4549)

🐛 Fixing a bug when activating workflow from workflows view
n8n-io · Nov 8, 2022 · d2bec63 · d2bec63
1 parent 026fb50
commit d2bec63
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
@@ -319,7 +319,7 @@ export interface IWorkflowDb {
 	pinData?: IPinData;
 	sharedWith?: Array<Partial<IUser>>;
 	ownedBy?: Partial<IUser>;
-	hash?: string;
+	hash: string;
 }
 
 // Identical to cli.Interfaces.ts

diff --git a/packages/editor-ui/src/components/WorkflowActivator.vue b/packages/editor-ui/src/components/WorkflowActivator.vue
@@ -94,7 +94,7 @@ export default mixins(
 			},
 			methods: {
 				async activeChanged (newActiveState: boolean) {
-					return this.updateWorkflowActivation(this.workflowId, newActiveState);
+					return await this.updateWorkflowActivation(this.workflowId, newActiveState);
 				},
 				async displayActivationError () {
 					let errorMessage: string;

diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -100,6 +100,7 @@ export default mixins(
 				name: '',
 				sharedWith: [],
 				ownedBy: {} as IUser,
+				hash: '',
 			}),
 		},
 		readonly: {

diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -611,7 +611,7 @@ export default mixins(
 
 			try {
 				const workflow = await this.restApi().updateWorkflow(this.$route.params.name, data);
-				this.workflowsStore.setWorkflowHash(workflow.hash || '');
+				this.workflowsStore.setWorkflowHash(workflow.hash);
 			} catch (error) {
 				this.$showError(
 					error,

diff --git a/packages/editor-ui/src/components/mixins/workflowHelpers.ts b/packages/editor-ui/src/components/mixins/workflowHelpers.ts
@@ -681,15 +681,15 @@ export const workflowHelpers = mixins(
 					data = await this.getWorkflowDataToSave();
 				} else {
 					const { hash } = await this.restApi().getWorkflow(workflowId);
-					data.hash = hash as string;
+					data.hash = hash;
 				}
 
 				if (active !== undefined) {
 					data.active = active;
 				}
 
 				const workflow = await this.restApi().updateWorkflow(workflowId, data);
-				this.workflowsStore.setWorkflowHash(workflow.hash || '');
+				this.workflowsStore.setWorkflowHash(workflow.hash);
 
 				if (isCurrentWorkflow) {
 					this.workflowsStore.setActive(!!workflow.active);
@@ -727,7 +727,7 @@ export const workflowHelpers = mixins(
 					workflowDataRequest.hash = this.workflowsStore.workflowHash;
 
 					const workflowData = await this.restApi().updateWorkflow(currentWorkflow, workflowDataRequest);
-					this.workflowsStore.setWorkflowHash(workflowData.hash || '');
+					this.workflowsStore.setWorkflowHash(workflowData.hash);
 
 					if (name) {
 						this.workflowsStore.setWorkflowName({newName: workflowData.name, setStateDirty:  false});
@@ -794,7 +794,7 @@ export const workflowHelpers = mixins(
 					const workflowData = await this.restApi().createNewWorkflow(workflowDataRequest);
 
 					this.workflowsStore.addWorkflow(workflowData);
-					this.workflowsStore.setWorkflowHash(workflowData.hash || '');
+					this.workflowsStore.setWorkflowHash(workflowData.hash);
 
 					if (openInNewWindow) {
 						const routeData = this.$router.resolve({name: VIEWS.WORKFLOW, params: {name: workflowData.id}});

diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
@@ -287,13 +287,20 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			if (index === -1) {
 				this.activeWorkflows.push(workflowId);
 			}
+			if (this.workflowsById[workflowId]) {
+				this.workflowsById[workflowId].active = true;
+			}
+
 		},
 
 		setWorkflowInactive(workflowId: string): void {
 			const index = this.activeWorkflows.indexOf(workflowId);
 			if (index !== -1) {
 				this.activeWorkflows.splice(index, 1);
 			}
+			if (this.workflowsById[workflowId]) {
+				this.workflowsById[workflowId].active = false;
+			}
 		},
 
 		async fetchActiveWorkflows(): Promise<string[]> {

diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
@@ -813,7 +813,7 @@ export default mixins(
 				this.workflowsStore.setWorkflowName({ newName: data.name, setStateDirty: false });
 				this.workflowsStore.setWorkflowSettings(data.settings || {});
 				this.workflowsStore.setWorkflowPinData(data.pinData || {});
-				this.workflowsStore.setWorkflowHash(data.hash || '');
+				this.workflowsStore.setWorkflowHash(data.hash);
 
 				const tags = (data.tags || []) as ITag[];
 				const tagIds = tags.map((tag) => tag.id);