From 27a740ed6b6c62b5561d1b0841670abb666fc809 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Mon, 27 Apr 2020 16:26:57 +0200
Subject: [PATCH] Fix warehouse selection

---
 .../components/OrderFulfillment/OrderFulfillment.tsx |  4 ++--
 .../OrderFulfillmentCancelDialog.tsx                 |  9 +++++----
 src/orders/views/OrderDetails/index.tsx              | 12 ++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/orders/components/OrderFulfillment/OrderFulfillment.tsx b/src/orders/components/OrderFulfillment/OrderFulfillment.tsx
index 435cf5b59..73d1d0ddf 100644
--- a/src/orders/components/OrderFulfillment/OrderFulfillment.tsx
+++ b/src/orders/components/OrderFulfillment/OrderFulfillment.tsx
@@ -116,8 +116,8 @@ const OrderFulfillment: React.FC<OrderFulfillmentProps> = props => {
                       )
                     : intl.formatMessage(
                         {
-                          defaultMessage: "Fulfilled ({quantity})",
-                          description: "section header"
+                          defaultMessage: "Cancelled ({quantity})",
+                          description: "cancelled fulfillment, section header"
                         },
                         {
                           quantity
diff --git a/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx b/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx
index 4c24797ee..653b865b1 100644
--- a/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx
+++ b/src/orders/components/OrderFulfillmentCancelDialog/OrderFulfillmentCancelDialog.tsx
@@ -21,7 +21,7 @@ import SingleAutocompleteSelectField from "@saleor/components/SingleAutocomplete
 import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler";
 
 export interface OrderFulfillmentCancelDialogFormData {
-  warehouse: string;
+  warehouseId: string;
 }
 
 const useStyles = makeStyles(
@@ -77,7 +77,7 @@ const OrderFulfillmentCancelDialog: React.FC<OrderFulfillmentCancelDialogProps>
       fullWidth
       maxWidth="sm"
     >
-      <Form initial={{ warehouse: null }} onSubmit={onConfirm}>
+      <Form initial={{ warehouseId: null }} onSubmit={onConfirm}>
         {({ change, data: formData, submit }) => {
           const handleChange = createSingleAutocompleteSelectHandler(
             change,
@@ -104,8 +104,8 @@ const OrderFulfillmentCancelDialog: React.FC<OrderFulfillmentCancelDialogProps>
                       defaultMessage: "Select Warehouse",
                       description: "select warehouse to restock items"
                     })}
-                    name="warehouse"
-                    value={formData.warehouse}
+                    name="warehouseId"
+                    value={formData.warehouseId}
                     onChange={handleChange}
                   />
                 </div>
@@ -125,6 +125,7 @@ const OrderFulfillmentCancelDialog: React.FC<OrderFulfillmentCancelDialogProps>
                   <FormattedMessage {...buttonMessages.back} />
                 </Button>
                 <ConfirmButton
+                  disabled={formData.warehouseId === null}
                   transitionState={confirmButtonState}
                   variant="contained"
                   onClick={submit}
diff --git a/src/orders/views/OrderDetails/index.tsx b/src/orders/views/OrderDetails/index.tsx
index e722b5ac7..928c44239 100644
--- a/src/orders/views/OrderDetails/index.tsx
+++ b/src/orders/views/OrderDetails/index.tsx
@@ -8,6 +8,7 @@ import useUser from "@saleor/hooks/useUser";
 import useCustomerSearch from "@saleor/searches/useCustomerSearch";
 import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers";
 import NotFoundPage from "@saleor/components/NotFoundPage";
+import { useWarehouseList } from "@saleor/warehouses/queries";
 import { customerUrl } from "../../../customers/urls";
 import {
   maybe,
@@ -95,6 +96,12 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
   } = useOrderVariantSearch({
     variables: DEFAULT_INITIAL_SEARCH_DATA
   });
+  const warehouses = useWarehouseList({
+    displayLoader: true,
+    variables: {
+      first: 30
+    }
+  });
   const intl = useIntl();
 
   const [openModal, closeModal] = createDialogActionHandlers<
@@ -339,6 +346,11 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
                               ?.orderFulfillmentCancel.errors || []
                           }
                           open={params.action === "cancel-fulfillment"}
+                          warehouses={
+                            warehouses.data?.warehouses.edges.map(
+                              edge => edge.node
+                            ) || []
+                          }
                           onConfirm={variables =>
                             orderFulfillmentCancel.mutate({
                               id: params.id,