From e00bc83f1b2abc11693edcce7014d585b22982e7 Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Wed, 10 Jul 2019 18:06:26 +0200 Subject: [PATCH] :art: Rename setting "saveManualRuns" to "saveManualExecutions" --- packages/cli/config/default.ts | 2 +- packages/cli/src/Interfaces.ts | 2 +- packages/cli/src/Server.ts | 10 +++++----- .../cli/src/WorkflowExecuteAdditionalData.ts | 8 ++++---- packages/editor-ui/src/Interface.ts | 4 ++-- .../src/components/WorkflowSettings.vue | 18 +++++++++--------- packages/editor-ui/src/store.ts | 10 +++++----- packages/editor-ui/src/views/NodeView.vue | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/cli/config/default.ts b/packages/cli/config/default.ts index e88d43d25c..a2f9f6840c 100644 --- a/packages/cli/config/default.ts +++ b/packages/cli/config/default.ts @@ -27,7 +27,7 @@ module.exports = { // are normally only for testing and debugging. This setting can // also be overwritten on a per workflow basis in the workflow settings // in the editor. - saveManualRuns: false, + saveManualExecutions: false, }, nodes: { diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts index d15424daed..9c8dd08ffc 100644 --- a/packages/cli/src/Interfaces.ts +++ b/packages/cli/src/Interfaces.ts @@ -189,7 +189,7 @@ export interface IN8nConfigNodes { export interface IN8nUISettings { endpointWebhook: string; endpointWebhookTest: string; - saveManualRuns: boolean; + saveManualExecutions: boolean; timezone: string; urlBaseWebhook: string; } diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts index 38ac064a53..a990e2f432 100644 --- a/packages/cli/src/Server.ts +++ b/packages/cli/src/Server.ts @@ -73,7 +73,7 @@ class App { testWebhooks: TestWebhooks.TestWebhooks; endpointWebhook: string; endpointWebhookTest: string; - saveManualRuns: boolean; + saveManualExecutions: boolean; timezone: string; activeExecutionsInstance: ActiveExecutions.ActiveExecutions; push: Push.Push; @@ -83,7 +83,7 @@ class App { this.endpointWebhook = config.get('urls.endpointWebhook') as string; this.endpointWebhookTest = config.get('urls.endpointWebhookTest') as string; - this.saveManualRuns = config.get('executions.saveManualRuns') as boolean; + this.saveManualExecutions = config.get('executions.saveManualExecutions') as boolean; this.timezone = config.get('timezone') as string; this.config(); @@ -271,9 +271,9 @@ class App { // Do not save the default timezone delete newWorkflowData.settings.timezone; } - if (newWorkflowData.settings.saveManualRuns === 'DEFAULT') { + if (newWorkflowData.settings.saveManualExecutions === 'DEFAULT') { // Do not save when default got set - delete newWorkflowData.settings.saveManualRuns; + delete newWorkflowData.settings.saveManualExecutions; } } @@ -900,7 +900,7 @@ class App { return { endpointWebhook: this.endpointWebhook, endpointWebhookTest: this.endpointWebhookTest, - saveManualRuns: this.saveManualRuns, + saveManualExecutions: this.saveManualExecutions, timezone: this.timezone, urlBaseWebhook: WebhookHelpers.getWebhookBaseUrl(), }; diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts index dae0880df6..24d99a4b67 100644 --- a/packages/cli/src/WorkflowExecuteAdditionalData.ts +++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts @@ -120,13 +120,13 @@ const hooks = (mode: WorkflowExecuteMode, workflowData: IWorkflowBase, workflowI const workflowSavePromise = WorkflowHelpers.saveStaticData(workflowInstance); - let saveManualRuns = config.get('executions.saveManualRuns') as boolean; - if (workflowInstance.settings !== undefined && workflowInstance.settings.saveManualRuns !== undefined) { + let saveManualExecutions = config.get('executions.saveManualExecutions') as boolean; + if (workflowInstance.settings !== undefined && workflowInstance.settings.saveManualExecutions !== undefined) { // Apply to workflow override - saveManualRuns = workflowInstance.settings.saveManualRuns as boolean; + saveManualExecutions = workflowInstance.settings.saveManualExecutions as boolean; } - if (mode === 'manual' && saveManualRuns === false) { + if (mode === 'manual' && saveManualExecutions === false) { if (workflowSavePromise !== undefined) { // If workflow had to be saved wait till it is done await workflowSavePromise; diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts index df9118d796..9cbc514081 100644 --- a/packages/editor-ui/src/Interface.ts +++ b/packages/editor-ui/src/Interface.ts @@ -358,13 +358,13 @@ export interface IPushDataTestWebhook { export interface IN8nUISettings { endpointWebhook: string; endpointWebhookTest: string; - saveManualRuns: boolean; + saveManualExecutions: boolean; timezone: string; urlBaseWebhook: string; } export interface IWorkflowSettings extends IWorkflowSettingsWorkflow { errorWorkflow?: string; - saveManualRuns?: boolean; + saveManualExecutions?: boolean; timezone?: string; } diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue index 2bf5b4fdca..329c1a138e 100644 --- a/packages/editor-ui/src/components/WorkflowSettings.vue +++ b/packages/editor-ui/src/components/WorkflowSettings.vue @@ -42,14 +42,14 @@ - Save Manual Runs: + Save Manual Executions: -
+
- + To function correctly that workflow has to contain an "Error Trigger" node!', timezone: 'The timezone in which the workflow should run. Gets for example used by "Cron" node.', - saveManualRuns: 'If data data of executions should be saved when started manually from the editor.', + saveManualExecutions: 'If data data of executions should be saved when started manually from the editor.', }, defaultValues: { timezone: 'America/New_York', - saveManualRuns: false, + saveManualExecutions: false, }, saveManualOptions: [] as Array<{ key: string | boolean, value: string }>, timezones: [] as Array<{ key: string, value: string }>, @@ -128,7 +128,7 @@ export default mixins( this.saveManualOptions.length = 0; this.saveManualOptions.push({ key: 'DEFAULT', - value: 'Use default - ' + (this.defaultValues.saveManualRuns === true ? 'Yes' : 'No'), + value: 'Use default - ' + (this.defaultValues.saveManualExecutions === true ? 'Yes' : 'No'), }); this.saveManualOptions.push({ key: true, @@ -196,7 +196,7 @@ export default mixins( return; } - this.defaultValues.saveManualRuns = this.$store.getters.saveManualRuns; + this.defaultValues.saveManualExecutions = this.$store.getters.saveManualExecutions; this.defaultValues.timezone = this.$store.getters.timezone; this.isLoading = true; @@ -216,8 +216,8 @@ export default mixins( if (workflowSettings.timezone === undefined) { workflowSettings.timezone = 'DEFAULT'; } - if (workflowSettings.saveManualRuns === undefined) { - workflowSettings.saveManualRuns = 'DEFAULT'; + if (workflowSettings.saveManualExecutions === undefined) { + workflowSettings.saveManualExecutions = 'DEFAULT'; } Vue.set(this, 'workflowSettings', workflowSettings); diff --git a/packages/editor-ui/src/store.ts b/packages/editor-ui/src/store.ts index 11d6a99edd..848bf8535f 100644 --- a/packages/editor-ui/src/store.ts +++ b/packages/editor-ui/src/store.ts @@ -46,7 +46,7 @@ export const store = new Vuex.Store({ executingNode: '' as string | null, executionWaitingForWebhook: false, pushConnectionActive: false, - saveManualRuns: false, + saveManualExecutions: false, timezone: 'America/New_York', workflowExecutionData: null as IExecutionResponse | null, lastSelectedNode: null as string | null, @@ -458,8 +458,8 @@ export const store = new Vuex.Store({ Vue.set(state, 'endpointWebhookTest', endpointWebhookTest); }, - setSaveManualRuns (state, saveManualRuns: boolean) { - Vue.set(state, 'saveManualRuns', saveManualRuns); + setSaveManualExecutions (state, saveManualExecutions: boolean) { + Vue.set(state, 'saveManualExecutions', saveManualExecutions); }, setTimezone (state, timezone: string) { Vue.set(state, 'timezone', timezone); @@ -551,8 +551,8 @@ export const store = new Vuex.Store({ return `${state.urlBaseWebhook}${state.endpointWebhookTest}`; }, - saveManualRuns: (state): boolean => { - return state.saveManualRuns; + saveManualExecutions: (state): boolean => { + return state.saveManualExecutions; }, timezone: (state): string => { return state.timezone; diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue index 08f902807b..d177ade81f 100644 --- a/packages/editor-ui/src/views/NodeView.vue +++ b/packages/editor-ui/src/views/NodeView.vue @@ -1677,7 +1677,7 @@ export default mixins( this.$store.commit('setUrlBaseWebhook', settings.urlBaseWebhook); this.$store.commit('setEndpointWebhook', settings.endpointWebhook); this.$store.commit('setEndpointWebhookTest', settings.endpointWebhookTest); - this.$store.commit('setSaveManualRuns', settings.saveManualRuns); + this.$store.commit('setSaveManualExecutions', settings.saveManualExecutions); this.$store.commit('setTimezone', settings.timezone); }, async loadNodeTypes (): Promise {