From 35c3759ed8536b9d8f5a25fe8f3ab3b2a9e08d90 Mon Sep 17 00:00:00 2001
From: Adrien de Peretti <adrien.deperetti@gmail.com>
Date: Fri, 19 Jul 2024 10:46:55 +0200
Subject: [PATCH] fix: workflow 'when' should return T or undefined instead of
 Partial<T> (#8195)

* fix: workflow 'when' should return T or undefined instead of Partial<T>

* fix when usage
---
 .../src/order/workflows/claim/claim-request-item-return.ts  | 6 +++---
 .../workflows/exchange/exchange-request-item-return.ts      | 6 +++---
 packages/core/workflows-sdk/src/utils/composer/when.ts      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/core/core-flows/src/order/workflows/claim/claim-request-item-return.ts b/packages/core/core-flows/src/order/workflows/claim/claim-request-item-return.ts
index f78144ff62..fefdd51677 100644
--- a/packages/core/core-flows/src/order/workflows/claim/claim-request-item-return.ts
+++ b/packages/core/core-flows/src/order/workflows/claim/claim-request-item-return.ts
@@ -7,11 +7,11 @@ import {
 } from "@medusajs/types"
 import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils"
 import {
-  WorkflowData,
   createStep,
   createWorkflow,
   transform,
   when,
+  WorkflowData,
 } from "@medusajs/workflows-sdk"
 import { useRemoteQueryStep } from "../../../common"
 import { createOrderChangeActionsStep } from "../../steps/create-order-change-actions"
@@ -88,7 +88,7 @@ export const orderClaimRequestItemReturnWorkflow = createWorkflow(
     const orderReturn: ReturnDTO = transform(
       { createdReturn, existingOrderReturn, orderClaim },
       ({ createdReturn, existingOrderReturn, orderClaim }) => {
-        return existingOrderReturn ?? (createdReturn[0] as ReturnDTO)
+        return existingOrderReturn ?? (createdReturn?.[0] as ReturnDTO)
       }
     )
 
@@ -130,7 +130,7 @@ export const orderClaimRequestItemReturnWorkflow = createWorkflow(
       const createdReturnId = transform(
         { createdReturn },
         ({ createdReturn }) => {
-          return createdReturn[0]!.id
+          return createdReturn?.[0]!.id
         }
       )
       updateOrderClaimsStep([
diff --git a/packages/core/core-flows/src/order/workflows/exchange/exchange-request-item-return.ts b/packages/core/core-flows/src/order/workflows/exchange/exchange-request-item-return.ts
index e79f385dcb..bb4b0ef1fb 100644
--- a/packages/core/core-flows/src/order/workflows/exchange/exchange-request-item-return.ts
+++ b/packages/core/core-flows/src/order/workflows/exchange/exchange-request-item-return.ts
@@ -7,11 +7,11 @@ import {
 } from "@medusajs/types"
 import { ChangeActionType, OrderChangeStatus } from "@medusajs/utils"
 import {
-  WorkflowData,
   createStep,
   createWorkflow,
   transform,
   when,
+  WorkflowData,
 } from "@medusajs/workflows-sdk"
 import { useRemoteQueryStep } from "../../../common"
 import { createOrderChangeActionsStep } from "../../steps/create-order-change-actions"
@@ -89,7 +89,7 @@ export const orderExchangeRequestItemReturnWorkflow = createWorkflow(
     const orderReturn: ReturnDTO = transform(
       { createdReturn, existingOrderReturn, orderExchange },
       ({ createdReturn, existingOrderReturn, orderExchange }) => {
-        return existingOrderReturn ?? (createdReturn[0] as ReturnDTO)
+        return existingOrderReturn ?? (createdReturn?.[0] as ReturnDTO)
       }
     )
 
@@ -128,7 +128,7 @@ export const orderExchangeRequestItemReturnWorkflow = createWorkflow(
       const createdReturnId = transform(
         { createdReturn },
         ({ createdReturn }) => {
-          return createdReturn[0]!.id
+          return createdReturn?.[0]!.id
         }
       )
       updateOrderExchangesStep([
diff --git a/packages/core/workflows-sdk/src/utils/composer/when.ts b/packages/core/workflows-sdk/src/utils/composer/when.ts
index 2f398576a4..771f73f99d 100644
--- a/packages/core/workflows-sdk/src/utils/composer/when.ts
+++ b/packages/core/workflows-sdk/src/utils/composer/when.ts
@@ -13,7 +13,7 @@ type ConditionFunction<T extends object | WorkflowData> = (
 type ThenFunc = <ThenResolver extends () => any>(
   resolver: ThenResolver
 ) => ReturnType<ThenResolver> extends WorkflowData<infer ReturnedWorkflowData>
-  ? Partial<WorkflowData<ReturnedWorkflowData>>
+  ? WorkflowData<ReturnedWorkflowData> | undefined
   : ReturnType<ThenResolver>
 
 export function when<T extends object | WorkflowData, Then extends Function>(