Fix typing

twentyhq · martmull · Sep 12, 2024 · Sep 9, 2024 · Sep 9, 2024 · Sep 10, 2024
commit 2e44781656380283a329e3c276e6c3d71e113583
diff --git a/packages/twenty-server/src/modules/workflow/common/types/workflow-step-result.type.ts b/packages/twenty-server/src/modules/workflow/common/types/workflow-step-result.type.ts
@@ -5,6 +5,6 @@ type WorkflowError = {
 };
 
 export type WorkflowStepResult = {
-  data: object | null;
+  data?: object;
   error?: WorkflowError;
 };
diff --git a/...c/modules/workflow/workflow-step-executor/workflow-step-executors/code-action-executor.ts b/...c/modules/workflow/workflow-step-executor/workflow-step-executors/code-action-executor.ts
@@ -40,6 +40,10 @@ export class CodeActionExecutor implements WorkflowStepExecutor {
         payload || {},
       );
 
-    return { data: result.data, ...(result.error && { error: result.error }) };
+    if (result.error) {
+      return { error: result.error };
+    }
+
+    return { data: result.data || {} };
   }
 }
diff --git a/...modules/workflow/workflow-step-executor/workflow-step-executors/system-action-executor.ts b/...modules/workflow/workflow-step-executor/workflow-step-executors/system-action-executor.ts
@@ -18,10 +18,14 @@ export class SystemActionExecutor implements WorkflowStepExecutor {
     step: WorkflowSystemStep;
     payload?: object;
   }): Promise<WorkflowStepResult> {
-    const workflowSystemAction = this.workflowSystemActionFactory.get(
-      step.settings.systemActionType,
-    );
+    try {
+      const workflowSystemAction = this.workflowSystemActionFactory.get(
+        step.settings.systemActionType,
+      );
 
-    return await workflowSystemAction.execute({ step, payload });
+      return await workflowSystemAction.execute({ step, payload });
+    } catch (error) {
+      return { error };
+    }
   }
 }
diff --git a/.../src/modules/workflow/workflow-system-action/workflow-system-actions/send-email-action.ts b/.../src/modules/workflow/workflow-system-action/workflow-system-actions/send-email-action.ts
@@ -63,6 +63,6 @@ export class SendEmailAction implements WorkflowSystemAction {
       html,
     });
 
-    return { data: null };
+    return { data: {} };
   }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
           html,
         });
-        return { data: null };
+        return { data: {} };
       }
     }