mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests 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
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
// also be overwritten on a per workflow basis in the workflow settings
// in the editor.
saveManualRuns: false,
saveManualExecutions: false,
},
nodes: {

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

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

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

@@ -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(),
};

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

@@ -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;