fix: Force include resources to order query

commercelayer · Nov 29, 2021 · 14daa83 · 14daa83
1 parent 11127db
commit 14daa83
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -150,7 +150,6 @@
     "v8-to-istanbul": "^8.1.0"
   },
   "peerDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^17.0.2"
   }
 }
diff --git a/src/components/BillingAddressContainer.tsx b/src/components/BillingAddressContainer.tsx
@@ -32,7 +32,10 @@ const BillingAddressContainer: FunctionComponent<Props> = (props) => {
   const { shipToDifferentAddress, setCloneAddress } = useContext(AddressContext)
   useEffect(() => {
     if (!include?.includes('billing_address')) {
-      addResourceToInclude({ newResource: 'billing_address' })
+      addResourceToInclude({
+        newResource: 'billing_address',
+        resourcesIncluded: include,
+      })
     }
     if (order && config) {
       setBillingCustomerAddressId({
@@ -47,7 +50,7 @@ const BillingAddressContainer: FunctionComponent<Props> = (props) => {
         payload: {},
       })
     }
-  }, [order])
+  }, [order, include])
   const contextValue = {
     ...state,
     setBillingAddress: async (

diff --git a/src/components/BillingAddressForm.tsx b/src/components/BillingAddressForm.tsx
@@ -45,7 +45,10 @@ const BillingAddressForm: FunctionComponent<BillingAddressFormProps> = (
   const ref = useRef<HTMLFormElement>(null)
   useEffect(() => {
     if (!include?.includes('billing_address')) {
-      addResourceToInclude({ newResource: 'billing_address' })
+      addResourceToInclude({
+        newResource: 'billing_address',
+        resourcesIncluded: include,
+      })
     }
     if (!isEmpty(errors)) {
       const formErrors: BaseError[] = []

diff --git a/src/components/CustomerContainer.tsx b/src/components/CustomerContainer.tsx
@@ -39,6 +39,7 @@ const CustomerContainer: FunctionComponent<CustomerContainer> = (props) => {
     ) {
       addResourceToInclude({
         newResource: 'available_customer_payment_sources.payment_source',
+        resourcesIncluded: include,
       })
     }
     if (config.accessToken && isEmpty(state.addresses) && !isGuest) {
@@ -54,7 +55,7 @@ const CustomerContainer: FunctionComponent<CustomerContainer> = (props) => {
     return () => {
       dispatch({ type: 'setCustomerEmail', payload: {} })
     }
-  }, [config.accessToken, order, isGuest])
+  }, [config.accessToken, order, isGuest, include])
   const contextValue = {
     isGuest,
     ...state,

diff --git a/src/components/LineItemsContainer.tsx b/src/components/LineItemsContainer.tsx
@@ -37,6 +37,7 @@ const LineItemsContainer: FunctionComponent<LineItemsContainer> = (props) => {
     if (!include?.includes('line_items.line_item_options.sku_option')) {
       addResourceToInclude({
         newResource: 'line_items.line_item_options.sku_option',
+        resourcesIncluded: include,
       })
     } else if (!isEmpty(order) && order?.line_items) {
       dispatch({

diff --git a/src/components/OrderContainer.tsx b/src/components/OrderContainer.tsx
@@ -48,6 +48,7 @@ const OrderContainer: FunctionComponent<OrderContainerProps> = (props) => {
     setLocalOrder,
     deleteLocalOrder,
   } = useContext(OrderStorageContext)
+  console.log(`children`, state.include)
   useEffect(() => {
     if (config.accessToken) {
       const localOrder = persistKey ? getLocalOrder(persistKey) : orderId

diff --git a/src/components/PaymentMethodsContainer.tsx b/src/components/PaymentMethodsContainer.tsx
@@ -54,6 +54,7 @@ const PaymentMethodsContainer: FunctionComponent<PaymentMethodsContainerProps> =
             'payment_source',
             'payment_method',
           ],
+          resourcesIncluded: include,
         })
       }
 
@@ -68,7 +69,7 @@ const PaymentMethodsContainer: FunctionComponent<PaymentMethodsContainerProps> =
           payload: { paymentSource: order?.payment_source },
         })
       }
-    }, [order, credentials])
+    }, [order, credentials, include])
     const contextValue = useMemo(() => {
       return {
         ...state,

diff --git a/src/components/PlaceOrderContainer.tsx b/src/components/PlaceOrderContainer.tsx
@@ -36,13 +36,22 @@ const PlaceOrderContainer: FunctionComponent<PlaceOrderContainerProps> = (
   const config = useContext(CommerceLayerContext)
   useEffect(() => {
     if (!include?.includes('shipments.shipping_method')) {
-      addResourceToInclude({ newResource: 'shipments.shipping_method' })
+      addResourceToInclude({
+        newResource: 'shipments.shipping_method',
+        resourcesIncluded: include,
+      })
     }
     if (!include?.includes('billing_address')) {
-      addResourceToInclude({ newResource: 'billing_address' })
+      addResourceToInclude({
+        newResource: 'billing_address',
+        resourcesIncluded: include,
+      })
     }
     if (!include?.includes('shipping_address')) {
-      addResourceToInclude({ newResource: 'shipping_address' })
+      addResourceToInclude({
+        newResource: 'shipping_address',
+        resourcesIncluded: include,
+      })
     }
     if (order) {
       placeOrderPermitted({

diff --git a/src/components/ShipmentsContainer.tsx b/src/components/ShipmentsContainer.tsx
@@ -43,13 +43,14 @@ const ShipmentsContainer: FunctionComponent<ShipmentsContainerProps> = (
           'shipments.stock_transfers',
           'shipments.stock_location',
         ],
+        resourcesIncluded: include,
       })
     }
     // TODO: Get shipments
     if (order && !isEmpty(config)) {
       getShipments({ order, dispatch, config })
     }
-  }, [order])
+  }, [order, include])
   const contextValue = {
     ...state,
     setShipmentErrors: (errors: BaseError[]) =>