mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor activation logic

Browse source
This commit is contained in:
Mutasem 2022-01-17 20:55:03 +01:00
parent 21d3d40f29
commit 686548cc28
2 changed files with 40 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
packages/editor-ui/src/components/WorkflowActivator.vue
View file

@ -81,12 +81,12 @@ export default mixins(
}
return '#13ce66';
},
isCurrentWorkflowOpen(): boolean {
isCurrentWorkflow(): boolean {
return this.$store.getters['workflowId'] === this.workflowId;
},
disabled(): boolean {
const isNewWorkflow = !this.workflowId;
if (isNewWorkflow || this.isCurrentWorkflowOpen) {
if (isNewWorkflow || this.isCurrentWorkflow) {
return !this.workflowActive && !this.containsTrigger;
}
@ -103,11 +103,7 @@ export default mixins(
},
},
methods: {
async activeChanged (newActiveState: boolean) {
if (this.workflowId === undefined) {
await this.saveCurrentWorkflow();
}
async updateCurrentWorkflow(newActiveState: boolean) {
if (this.nodesIssuesExist === true) {
this.$showMessage({
title: this.$locale.baseText('workflowActivator.showMessage.activeChangedNodesIssuesExistTrue.title'),
@ -117,21 +113,37 @@ export default mixins(
return;
}
// Set that the active state should be changed
let data: IWorkflowDataUpdate = {};
await this.saveCurrentWorkflow({
active: newActiveState,
});
const activeWorkflowId = this.$store.getters.workflowId;
if (newActiveState === true && this.workflowId === activeWorkflowId) {
// Get the current workflow data that it gets saved together with the activation
data = await this.getWorkflowDataToSave();
if (newActiveState && window.localStorage.getItem(LOCAL_STORAGE_ACTIVATION_FLAG) !== 'true') {
this.$store.dispatch('ui/openModal', WORKFLOW_ACTIVE_MODAL_KEY);
}
},
async activateOtherWorkflow(newActiveState: boolean) {
// Set that the active state should be changed
const data: IWorkflowDataUpdate = {};
data.active = newActiveState;
await this.restApi().updateWorkflow(this.workflowId, data);
if (newActiveState === true) {
this.$store.commit('setWorkflowActive', this.workflowId);
} else {
this.$store.commit('setWorkflowInactive', this.workflowId);
}
},
async activeChanged (newActiveState: boolean) {
this.loading = true;
try {
await this.restApi().updateWorkflow(this.workflowId, data);
if (!this.workflowId || this.isCurrentWorkflow) {
await this.updateCurrentWorkflow(newActiveState);
}
else {
await this.activateOtherWorkflow(newActiveState);
}
} catch (error) {
const newStateName = newActiveState === true ? 'activated' : 'deactivated';
this.$showError(
@ -146,26 +158,7 @@ export default mixins(
return;
}
const currentWorkflowId = this.$store.getters.workflowId;
let activationEventName = 'workflow.activeChange';
if (currentWorkflowId === this.workflowId) {
// If the status of the current workflow got changed
// commit it specifically
this.$store.commit('setActive', newActiveState);
activationEventName = 'workflow.activeChangeCurrent';
}
if (newActiveState === true) {
this.$store.commit('setWorkflowActive', this.workflowId);
// Show activation dialog only for current workflow and if user hasn't deactivated it
if (this.isCurrentWorkflowOpen && window.localStorage.getItem(LOCAL_STORAGE_ACTIVATION_FLAG) !== 'true') {
this.$store.dispatch('ui/openModal', WORKFLOW_ACTIVE_MODAL_KEY);
}
} else {
this.$store.commit('setWorkflowInactive', this.workflowId);
}
const activationEventName = (!this.workflowId || this.isCurrentWorkflow) ? 'workflow.activeChangeCurrent' : 'workflow.activeChange';
this.$externalHooks().run(activationEventName, { workflowId: this.workflowId, active: newActiveState });
this.$telemetry.track('User set workflow active status', { workflow_id: this.workflowId, is_active: newActiveState });

27
packages/editor-ui/src/components/mixins/workflowHelpers.ts
View file

@ -437,7 +437,7 @@ export const workflowHelpers = mixins(
return returnData['__xxxxxxx__'];
},
async saveCurrentWorkflow({name, tags}: {name?: string, tags?: string[]} = {}): Promise<boolean> {
async saveCurrentWorkflow({name, tags, active}: {name?: string, tags?: string[], active?: boolean} = {}): Promise<boolean> {
const currentWorkflow = this.$route.params.name;
if (!currentWorkflow) {
return this.saveAsNewWorkflow({name, tags});
@ -457,20 +457,9 @@ export const workflowHelpers = mixins(
workflowDataRequest.tags = tags;
}
// // Check if trigger was removed from active workflow
// let triggerIsRemoved = false;
// if (this.$store.getters.isActive) {
// const triggers = this.$store.getters.workflowTriggerNodes
// .filter((node: INodeUi) => {
// return !node.disabled;
// });
// triggerIsRemoved = triggers.length === 0;
// if (triggerIsRemoved) {
// // Only set active if trigger was removed
// workflowDataRequest.active = false;
// }
// }
if (active !== undefined) {
workflowDataRequest.active = active;
}
const workflowData = await this.restApi().updateWorkflow(currentWorkflow, workflowDataRequest);
@ -491,6 +480,14 @@ export const workflowHelpers = mixins(
this.$store.commit('setWorkflowTagIds', tagIds);
}
this.$store.commit('setActive', workflowData.active);
if (workflowData.active === true) {
this.$store.commit('setWorkflowActive', workflowData.id);
} else {
this.$store.commit('setWorkflowInactive', workflowData.id);
}
this.$store.commit('setStateDirty', false);
this.$store.commit('removeActiveAction', 'workflowSaving');
this.$externalHooks().run('workflow.afterUpdate', { workflowData });