diff --git a/packages/backend/src/helpers/delay-as-milliseconds.ts b/packages/backend/src/helpers/delay-as-milliseconds.ts index 3b791a95..8f60dd03 100644 --- a/packages/backend/src/helpers/delay-as-milliseconds.ts +++ b/packages/backend/src/helpers/delay-as-milliseconds.ts @@ -4,18 +4,18 @@ import delayForAsMilliseconds, { } from './delay-for-as-milliseconds'; import delayUntilAsMilliseconds from './delay-until-as-milliseconds'; -const delayAsMilliseconds = (step: Step) => { +const delayAsMilliseconds = (eventKey: Step["key"], computedParameters: Step["parameters"]) => { let delayDuration = 0; - if (step.key === 'delayFor') { - const { delayForUnit, delayForValue } = step.parameters; + if (eventKey === 'delayFor') { + const { delayForUnit, delayForValue } = computedParameters; delayDuration = delayForAsMilliseconds( delayForUnit as TDelayForUnit, Number(delayForValue) ); - } else if (step.key === 'delayUntil') { - const { delayUntil } = step.parameters; + } else if (eventKey === 'delayUntil') { + const { delayUntil } = computedParameters; delayDuration = delayUntilAsMilliseconds(delayUntil as string); } diff --git a/packages/backend/src/services/action.ts b/packages/backend/src/services/action.ts index 962b2ece..39fd3987 100644 --- a/packages/backend/src/services/action.ts +++ b/packages/backend/src/services/action.ts @@ -65,5 +65,5 @@ export const processAction = async (options: ProcessActionOptions) => { errorDetails: $.actionOutput.error ? $.actionOutput.error : null, }); - return { flowId, stepId, executionId, executionStep }; + return { flowId, stepId, executionId, executionStep, computedParameters }; }; diff --git a/packages/backend/src/workers/action.ts b/packages/backend/src/workers/action.ts index cf16d42a..40c2e6c8 100644 --- a/packages/backend/src/workers/action.ts +++ b/packages/backend/src/workers/action.ts @@ -21,7 +21,7 @@ const DEFAULT_DELAY_DURATION = 0; export const worker = new Worker( 'action', async (job) => { - const { stepId, flowId, executionId } = await processAction( + const { stepId, flowId, executionId, computedParameters } = await processAction( job.data as JobData ); @@ -45,7 +45,7 @@ export const worker = new Worker( }; if (step.appKey === 'delay') { - jobOptions.delay = delayAsMilliseconds(step); + jobOptions.delay = delayAsMilliseconds(step.key, computedParameters); } await actionQueue.add(jobName, jobPayload, jobOptions);