mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 21:07:28 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎨 Rename setting "saveManualRuns" to "saveManualExecutions"

Browse source
This commit is contained in:
Jan Oberhauser 2019-07-10 18:06:26 +02:00
parent a56f477833
commit e00bc83f1b
8 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/config/default.ts
View file

@ -27,7 +27,7 @@ module.exports = {
// are normally only for testing and debugging. This setting can // are normally only for testing and debugging. This setting can
// also be overwritten on a per workflow basis in the workflow settings // also be overwritten on a per workflow basis in the workflow settings
// in the editor. // in the editor.
saveManualRuns: false, saveManualExecutions: false,
}, },
nodes: { nodes: {

2
packages/cli/src/Interfaces.ts
View file

@ -189,7 +189,7 @@ export interface IN8nConfigNodes {
export interface IN8nUISettings { export interface IN8nUISettings {
endpointWebhook: string; endpointWebhook: string;
endpointWebhookTest: string; endpointWebhookTest: string;
saveManualRuns: boolean; saveManualExecutions: boolean;
timezone: string; timezone: string;
urlBaseWebhook: string; urlBaseWebhook: string;
} }

10
packages/cli/src/Server.ts
View file

@ -73,7 +73,7 @@ class App {
testWebhooks: TestWebhooks.TestWebhooks; testWebhooks: TestWebhooks.TestWebhooks;
endpointWebhook: string; endpointWebhook: string;
endpointWebhookTest: string; endpointWebhookTest: string;
saveManualRuns: boolean; saveManualExecutions: boolean;
timezone: string; timezone: string;
activeExecutionsInstance: ActiveExecutions.ActiveExecutions; activeExecutionsInstance: ActiveExecutions.ActiveExecutions;
push: Push.Push; push: Push.Push;
@ -83,7 +83,7 @@ class App {
this.endpointWebhook = config.get('urls.endpointWebhook') as string; this.endpointWebhook = config.get('urls.endpointWebhook') as string;
this.endpointWebhookTest = config.get('urls.endpointWebhookTest') 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.timezone = config.get('timezone') as string;
this.config(); this.config();
@ -271,9 +271,9 @@ class App {
// Do not save the default timezone // Do not save the default timezone
delete newWorkflowData.settings.timezone; delete newWorkflowData.settings.timezone;
} }
if (newWorkflowData.settings.saveManualRuns === 'DEFAULT') { if (newWorkflowData.settings.saveManualExecutions === 'DEFAULT') {
// Do not save when default got set // Do not save when default got set
delete newWorkflowData.settings.saveManualRuns; delete newWorkflowData.settings.saveManualExecutions;
} }
} }
@ -900,7 +900,7 @@ class App {
return { return {
endpointWebhook: this.endpointWebhook, endpointWebhook: this.endpointWebhook,
endpointWebhookTest: this.endpointWebhookTest, endpointWebhookTest: this.endpointWebhookTest,
saveManualRuns: this.saveManualRuns, saveManualExecutions: this.saveManualExecutions,
timezone: this.timezone, timezone: this.timezone,
urlBaseWebhook: WebhookHelpers.getWebhookBaseUrl(), urlBaseWebhook: WebhookHelpers.getWebhookBaseUrl(),
}; };

8
packages/cli/src/WorkflowExecuteAdditionalData.ts
View file

@ -120,13 +120,13 @@ const hooks = (mode: WorkflowExecuteMode, workflowData: IWorkflowBase, workflowI
const workflowSavePromise = WorkflowHelpers.saveStaticData(workflowInstance); const workflowSavePromise = WorkflowHelpers.saveStaticData(workflowInstance);
let saveManualRuns = config.get('executions.saveManualRuns') as boolean; let saveManualExecutions = config.get('executions.saveManualExecutions') as boolean;
if (workflowInstance.settings !== undefined && workflowInstance.settings.saveManualRuns !== undefined) { if (workflowInstance.settings !== undefined && workflowInstance.settings.saveManualExecutions !== undefined) {
// Apply to workflow override // 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 (workflowSavePromise !== undefined) {
// If workflow had to be saved wait till it is done // If workflow had to be saved wait till it is done
await workflowSavePromise; await workflowSavePromise;

4
packages/editor-ui/src/Interface.ts
View file

@ -358,13 +358,13 @@ export interface IPushDataTestWebhook {
export interface IN8nUISettings { export interface IN8nUISettings {
endpointWebhook: string; endpointWebhook: string;
endpointWebhookTest: string; endpointWebhookTest: string;
saveManualRuns: boolean; saveManualExecutions: boolean;
timezone: string; timezone: string;
urlBaseWebhook: string; urlBaseWebhook: string;
} }
export interface IWorkflowSettings extends IWorkflowSettingsWorkflow { export interface IWorkflowSettings extends IWorkflowSettingsWorkflow {
errorWorkflow?: string; errorWorkflow?: string;
saveManualRuns?: boolean; saveManualExecutions?: boolean;
timezone?: string; timezone?: string;
} }

18
packages/editor-ui/src/components/WorkflowSettings.vue
View file

@ -42,14 +42,14 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10" class="setting-name"> <el-col :span="10" class="setting-name">
Save Manual Runs: Save Manual Executions:
<el-tooltip class="setting-info" placement="top" effect="light"> <el-tooltip class="setting-info" placement="top" effect="light">
<div slot="content" v-html="helpTexts.saveManualRuns"></div> <div slot="content" v-html="helpTexts.saveManualExecutions"></div>
<font-awesome-icon icon="question-circle" /> <font-awesome-icon icon="question-circle" />
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col :span="14" class="ignore-key-press"> <el-col :span="14" class="ignore-key-press">
<el-select v-model="workflowSettings.saveManualRuns" placeholder="Select Option" size="small" filterable> <el-select v-model="workflowSettings.saveManualExecutions" placeholder="Select Option" size="small" filterable>
<el-option <el-option
v-for="option of saveManualOptions" v-for="option of saveManualOptions"
:key="option.key" :key="option.key"
@ -98,11 +98,11 @@ export default mixins(
helpTexts: { helpTexts: {
errorWorkflow: 'The workflow to run in case the current one fails.<br />To function correctly that workflow has to contain an "Error Trigger" node!', errorWorkflow: 'The workflow to run in case the current one fails.<br />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.', 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: { defaultValues: {
timezone: 'America/New_York', timezone: 'America/New_York',
saveManualRuns: false, saveManualExecutions: false,
}, },
saveManualOptions: [] as Array<{ key: string | boolean, value: string }>, saveManualOptions: [] as Array<{ key: string | boolean, value: string }>,
timezones: [] as Array<{ key: string, value: string }>, timezones: [] as Array<{ key: string, value: string }>,
@ -128,7 +128,7 @@ export default mixins(
this.saveManualOptions.length = 0; this.saveManualOptions.length = 0;
this.saveManualOptions.push({ this.saveManualOptions.push({
key: 'DEFAULT', key: 'DEFAULT',
value: 'Use default - ' + (this.defaultValues.saveManualRuns === true ? 'Yes' : 'No'), value: 'Use default - ' + (this.defaultValues.saveManualExecutions === true ? 'Yes' : 'No'),
}); });
this.saveManualOptions.push({ this.saveManualOptions.push({
key: true, key: true,
@ -196,7 +196,7 @@ export default mixins(
return; return;
} }
this.defaultValues.saveManualRuns = this.$store.getters.saveManualRuns; this.defaultValues.saveManualExecutions = this.$store.getters.saveManualExecutions;
this.defaultValues.timezone = this.$store.getters.timezone; this.defaultValues.timezone = this.$store.getters.timezone;
this.isLoading = true; this.isLoading = true;
@ -216,8 +216,8 @@ export default mixins(
if (workflowSettings.timezone === undefined) { if (workflowSettings.timezone === undefined) {
workflowSettings.timezone = 'DEFAULT'; workflowSettings.timezone = 'DEFAULT';
} }
if (workflowSettings.saveManualRuns === undefined) { if (workflowSettings.saveManualExecutions === undefined) {
workflowSettings.saveManualRuns = 'DEFAULT'; workflowSettings.saveManualExecutions = 'DEFAULT';
} }
Vue.set(this, 'workflowSettings', workflowSettings); Vue.set(this, 'workflowSettings', workflowSettings);

10
packages/editor-ui/src/store.ts
View file

@ -46,7 +46,7 @@ export const store = new Vuex.Store({
executingNode: '' as string | null, executingNode: '' as string | null,
executionWaitingForWebhook: false, executionWaitingForWebhook: false,
pushConnectionActive: false, pushConnectionActive: false,
saveManualRuns: false, saveManualExecutions: false,
timezone: 'America/New_York', timezone: 'America/New_York',
workflowExecutionData: null as IExecutionResponse | null, workflowExecutionData: null as IExecutionResponse | null,
lastSelectedNode: null as string | null, lastSelectedNode: null as string | null,
@ -458,8 +458,8 @@ export const store = new Vuex.Store({
Vue.set(state, 'endpointWebhookTest', endpointWebhookTest); Vue.set(state, 'endpointWebhookTest', endpointWebhookTest);
}, },
setSaveManualRuns (state, saveManualRuns: boolean) { setSaveManualExecutions (state, saveManualExecutions: boolean) {
Vue.set(state, 'saveManualRuns', saveManualRuns); Vue.set(state, 'saveManualExecutions', saveManualExecutions);
}, },
setTimezone (state, timezone: string) { setTimezone (state, timezone: string) {
Vue.set(state, 'timezone', timezone); Vue.set(state, 'timezone', timezone);
@ -551,8 +551,8 @@ export const store = new Vuex.Store({
return `${state.urlBaseWebhook}${state.endpointWebhookTest}`; return `${state.urlBaseWebhook}${state.endpointWebhookTest}`;
}, },
saveManualRuns: (state): boolean => { saveManualExecutions: (state): boolean => {
return state.saveManualRuns; return state.saveManualExecutions;
}, },
timezone: (state): string => { timezone: (state): string => {
return state.timezone; return state.timezone;

2
packages/editor-ui/src/views/NodeView.vue
View file

@ -1677,7 +1677,7 @@ export default mixins(
this.$store.commit('setUrlBaseWebhook', settings.urlBaseWebhook); this.$store.commit('setUrlBaseWebhook', settings.urlBaseWebhook);
this.$store.commit('setEndpointWebhook', settings.endpointWebhook); this.$store.commit('setEndpointWebhook', settings.endpointWebhook);
this.$store.commit('setEndpointWebhookTest', settings.endpointWebhookTest); this.$store.commit('setEndpointWebhookTest', settings.endpointWebhookTest);
this.$store.commit('setSaveManualRuns', settings.saveManualRuns); this.$store.commit('setSaveManualExecutions', settings.saveManualExecutions);
this.$store.commit('setTimezone', settings.timezone); this.$store.commit('setTimezone', settings.timezone);
}, },
async loadNodeTypes (): Promise<void> { async loadNodeTypes (): Promise<void> {