feat(api): change control dto structure (#5900)

novuhq · Jul 1, 2024 · 3e776cd · 3e776cd
1 parent 30df5d4
commit 3e776cd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/apps/api/src/app/events/e2e/bridge-trigger.e2e-ee.ts b/apps/api/src/app/events/e2e/bridge-trigger.e2e-ee.ts
@@ -667,7 +667,7 @@ contexts.forEach((context: Context) => {
         await saveControlVariables(session, workflowId, stepId, { variables: { name: 'stored_control_name' } });
       }
 
-      const controls = { controls: { step: [{ stepId: stepId, name: 'stored_control_name' }] } };
+      const controls = { controls: { step: { [stepId]: { name: 'stored_control_name' } } } };
       await triggerEvent(session, workflowId, subscriber, controls, bridge);
       await session.awaitRunningJobs();
 

diff --git a/apps/worker/src/app/workflow/usecases/subscriber-job-bound/subscriber-job-bound.usecase.ts b/apps/worker/src/app/workflow/usecases/subscriber-job-bound/subscriber-job-bound.usecase.ts
@@ -162,9 +162,7 @@ export class SubscriberJobBound {
       ...bridgeWorkflow,
       type: 'ECHO',
       steps: bridgeWorkflow.steps.map((step) => {
-        const stepControlVariables = command.payload.controls?.[ControlVariablesLevelEnum.STEP_CONTROLS].find(
-          (control) => control.stepId === step.stepId
-        );
+        const stepControlVariables = command.payload.controls?.[ControlVariablesLevelEnum.STEP_CONTROLS]?.[step.stepId];
 
         return {
           ...step,

diff --git a/libs/shared/src/dto/controls/controls.dto.ts b/libs/shared/src/dto/controls/controls.dto.ts
@@ -1,4 +1,8 @@
 import { ControlVariablesLevelEnum } from '../../types';
 
-export type ControlsDto = Record<ControlVariablesLevelEnum, Control[]>;
-type Control = { stepId: string } & Record<string, unknown>;
+export type ControlsDto = {
+  [K in ControlVariablesLevelEnum]?: StepControl;
+};
+type StepControl = Record<stepId, Data>;
+type stepId = string;
+type Data = Record<string, unknown>;