admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-16 17:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): Handle null workflow settings in toSaveSettings (#17972)

Browse Source
This commit is contained in:
Eugene
2025-08-04 17:12:07 +02:00
committed by GitHub
parent 381c146dd4
commit 642e68e345
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/cli/src/execution-lifecycle/__tests__/to-save-settings.test.ts
View File

@@ -153,3 +153,21 @@ describe('execution progress', () => {
expect(_saveSettings.progress).toBe(false);
});
});
describe('null workflow settings', () => {
it('should handle null workflow settings without throwing', () => {
expect(() => toSaveSettings(null)).not.toThrow();
// Should use defaults from config when settings are null
config.set('executions.saveDataOnError', 'all');
config.set('executions.saveDataOnSuccess', 'all');
config.set('executions.saveDataManualExecutions', true);
config.set('executions.saveExecutionProgress', true);
const settingsWithNull = toSaveSettings(null);
expect(settingsWithNull.error).toBe(true);
expect(settingsWithNull.success).toBe(true);
expect(settingsWithNull.manual).toBe(true);
expect(settingsWithNull.progress).toBe(true);
});
});

6
packages/cli/src/execution-lifecycle/to-save-settings.ts
View File

@@ -17,7 +17,9 @@ export type ExecutionSaveSettings = {
* - `manual`: Whether to save successful or failed manual executions.
* - `progress`: Whether to save execution progress, i.e. after each node's execution.
*/
export function toSaveSettings(workflowSettings: IWorkflowSettings = {}): ExecutionSaveSettings {
export function toSaveSettings(
workflowSettings: IWorkflowSettings | null = {},
): ExecutionSaveSettings {
const DEFAULTS = {
ERROR: config.getEnv('executions.saveDataOnError'),
SUCCESS: config.getEnv('executions.saveDataOnSuccess'),
@@ -30,7 +32,7 @@ export function toSaveSettings(workflowSettings: IWorkflowSettings = {}): Execut
saveDataSuccessExecution = DEFAULTS.SUCCESS,
saveManualExecutions = DEFAULTS.MANUAL,
saveExecutionProgress = DEFAULTS.PROGRESS,
} = workflowSettings;
} = workflowSettings ?? {};
return {
error: saveDataErrorExecution === 'DEFAULT' ? DEFAULTS.ERROR : saveDataErrorExecution === 'all',