From 0b099e882c2d4a869cc1a61095aa7615ffa6602f Mon Sep 17 00:00:00 2001
From: Dawid Tarasiuk <tarasiukdawid@gmail.com>
Date: Mon, 8 Jun 2020 13:47:53 +0200
Subject: [PATCH] Remove base price from product create page

---
 .../ProductCreatePage/ProductCreatePage.tsx   | 13 ---
 .../ProductPricing/ProductPricing.tsx         | 86 -------------------
 .../components/ProductPricing/index.ts        |  2 -
 .../ProductUpdatePage/ProductUpdatePage.tsx   | 10 ---
 src/products/mutations.ts                     |  4 -
 src/products/types/ProductCreate.ts           |  1 -
 src/products/types/SimpleProductUpdate.ts     |  1 -
 src/products/views/ProductCreate.tsx          |  6 +-
 .../stories/products/ProductCreatePage.tsx    |  3 -
 .../stories/products/ProductUpdatePage.tsx    |  1 -
 10 files changed, 1 insertion(+), 126 deletions(-)
 delete mode 100644 src/products/components/ProductPricing/ProductPricing.tsx
 delete mode 100644 src/products/components/ProductPricing/index.ts

diff --git a/src/products/components/ProductCreatePage/ProductCreatePage.tsx b/src/products/components/ProductCreatePage/ProductCreatePage.tsx
index 897a41e40..f07e91605 100644
--- a/src/products/components/ProductCreatePage/ProductCreatePage.tsx
+++ b/src/products/components/ProductCreatePage/ProductCreatePage.tsx
@@ -41,11 +41,9 @@ import ProductAttributes, {
 } from "../ProductAttributes";
 import ProductDetailsForm from "../ProductDetailsForm";
 import ProductOrganization from "../ProductOrganization";
-import ProductPricing from "../ProductPricing";
 import ProductStocks, { ProductStockInput } from "../ProductStocks";
 
 interface FormData {
-  basePrice: number;
   publicationDate: string;
   category: string;
   collections: string[];
@@ -69,7 +67,6 @@ interface ProductCreatePageProps {
   errors: ProductErrorFragment[];
   collections: SearchCollections_search_edges_node[];
   categories: SearchCategories_search_edges_node[];
-  currency: string;
   disabled: boolean;
   fetchMoreCategories: FetchMoreProps;
   fetchMoreCollections: FetchMoreProps;
@@ -91,7 +88,6 @@ interface ProductCreatePageProps {
 }
 
 export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
-  currency,
   disabled,
   categories: categoryChoiceList,
   collections: collectionChoiceList,
@@ -130,7 +126,6 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
     convertToRaw(ContentState.createFromText(""))
   );
   const initialData: FormData = {
-    basePrice: 0,
     category: "",
     chargeTaxes: false,
     collections: [],
@@ -232,14 +227,6 @@ export const ProductCreatePage: React.FC<ProductCreatePageProps> = ({
                   />
                 )}
                 <CardSpacer />
-                <ProductPricing
-                  currency={currency}
-                  data={data}
-                  disabled={disabled}
-                  errors={errors}
-                  onChange={change}
-                />
-                <CardSpacer />
                 {!!productType && !productType.hasVariants && (
                   <>
                     <ProductStocks
diff --git a/src/products/components/ProductPricing/ProductPricing.tsx b/src/products/components/ProductPricing/ProductPricing.tsx
deleted file mode 100644
index c7e7ee5ed..000000000
--- a/src/products/components/ProductPricing/ProductPricing.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import Card from "@material-ui/core/Card";
-import CardContent from "@material-ui/core/CardContent";
-import { makeStyles } from "@material-ui/core/styles";
-import { ProductErrorFragment } from "@saleor/attributes/types/ProductErrorFragment";
-import CardTitle from "@saleor/components/CardTitle";
-import ControlledCheckbox from "@saleor/components/ControlledCheckbox";
-import PriceField from "@saleor/components/PriceField";
-import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors";
-import React from "react";
-import { useIntl } from "react-intl";
-
-const useStyles = makeStyles(
-  theme => ({
-    root: {
-      display: "grid",
-      gridColumnGap: theme.spacing(2),
-      gridTemplateColumns: "1fr 1fr"
-    }
-  }),
-  { name: "ProductPricing" }
-);
-
-interface ProductPricingProps {
-  currency?: string;
-  data: {
-    chargeTaxes: boolean;
-    basePrice: number;
-  };
-  disabled: boolean;
-  errors: ProductErrorFragment[];
-  onChange: (event: React.ChangeEvent<any>) => void;
-}
-
-const ProductPricing: React.FC<ProductPricingProps> = props => {
-  const { currency, data, disabled, errors, onChange } = props;
-
-  const classes = useStyles(props);
-  const intl = useIntl();
-
-  const formErrors = getFormErrors(["basePrice"], errors);
-
-  return (
-    <Card>
-      <CardTitle
-        title={intl.formatMessage({
-          defaultMessage: "Pricing",
-          description: "product pricing"
-        })}
-      >
-        <ControlledCheckbox
-          name="chargeTaxes"
-          label={intl.formatMessage({
-            defaultMessage: "Charge taxes for this item"
-          })}
-          checked={data.chargeTaxes}
-          onChange={onChange}
-          disabled={disabled}
-        />
-      </CardTitle>
-      <CardContent>
-        <div className={classes.root}>
-          <PriceField
-            disabled={disabled}
-            label={intl.formatMessage({
-              defaultMessage: "Price",
-              description: "product price"
-            })}
-            error={!!formErrors.basePrice}
-            hint={getProductErrorMessage(formErrors.basePrice, intl)}
-            name="basePrice"
-            value={data.basePrice}
-            currencySymbol={currency}
-            onChange={onChange}
-            InputProps={{
-              inputProps: {
-                min: 0
-              }
-            }}
-          />
-        </div>
-      </CardContent>
-    </Card>
-  );
-};
-ProductPricing.displayName = "ProductPricing";
-export default ProductPricing;
diff --git a/src/products/components/ProductPricing/index.ts b/src/products/components/ProductPricing/index.ts
deleted file mode 100644
index 4a41ac8e5..000000000
--- a/src/products/components/ProductPricing/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default } from "./ProductPricing";
-export * from "./ProductPricing";
diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
index fb8b8d7ca..a97951bb6 100644
--- a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
+++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx
@@ -47,7 +47,6 @@ import ProductAttributes, { ProductAttributeInput } from "../ProductAttributes";
 import ProductDetailsForm from "../ProductDetailsForm";
 import ProductImages from "../ProductImages";
 import ProductOrganization from "../ProductOrganization";
-import ProductPricing from "../ProductPricing";
 import ProductStocks, { ProductStockInput } from "../ProductStocks";
 import ProductVariants from "../ProductVariants";
 
@@ -159,7 +158,6 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
 
   const categories = getChoices(categoryChoiceList);
   const collections = getChoices(collectionChoiceList);
-  const currency = maybe(() => product.basePrice.currency);
   const hasVariants = maybe(() => product.productType.hasVariants, false);
 
   const handleSubmit = (data: ProductUpdatePageFormData) => {
@@ -246,14 +244,6 @@ export const ProductUpdatePage: React.FC<ProductUpdatePageProps> = ({
                     />
                   )}
                   <CardSpacer />
-                  <ProductPricing
-                    currency={currency}
-                    data={data}
-                    disabled={disabled}
-                    errors={errors}
-                    onChange={change}
-                  />
-                  <CardSpacer />
                   {hasVariants ? (
                     <ProductVariants
                       disabled={disabled}
diff --git a/src/products/mutations.ts b/src/products/mutations.ts
index 419149b76..36655db70 100644
--- a/src/products/mutations.ts
+++ b/src/products/mutations.ts
@@ -198,7 +198,6 @@ export const simpleProductUpdateMutation = gql`
     $descriptionJson: JSONString
     $isPublished: Boolean!
     $name: String
-    $basePrice: Decimal
     $productVariantId: ID!
     $productVariantInput: ProductVariantInput!
     $seo: SeoInput
@@ -217,7 +216,6 @@ export const simpleProductUpdateMutation = gql`
         descriptionJson: $descriptionJson
         isPublished: $isPublished
         name: $name
-        basePrice: $basePrice
         seo: $seo
       }
     ) {
@@ -288,7 +286,6 @@ export const productCreateMutation = gql`
     $descriptionJson: JSONString
     $isPublished: Boolean!
     $name: String!
-    $basePrice: Decimal
     $productType: ID!
     $sku: String
     $seo: SeoInput
@@ -305,7 +302,6 @@ export const productCreateMutation = gql`
         descriptionJson: $descriptionJson
         isPublished: $isPublished
         name: $name
-        basePrice: $basePrice
         productType: $productType
         sku: $sku
         seo: $seo
diff --git a/src/products/types/ProductCreate.ts b/src/products/types/ProductCreate.ts
index d757729d0..d624081d5 100644
--- a/src/products/types/ProductCreate.ts
+++ b/src/products/types/ProductCreate.ts
@@ -222,7 +222,6 @@ export interface ProductCreateVariables {
   descriptionJson?: any | null;
   isPublished: boolean;
   name: string;
-  basePrice?: any | null;
   productType: string;
   sku?: string | null;
   seo?: SeoInput | null;
diff --git a/src/products/types/SimpleProductUpdate.ts b/src/products/types/SimpleProductUpdate.ts
index 7e4d34600..860e6c6a5 100644
--- a/src/products/types/SimpleProductUpdate.ts
+++ b/src/products/types/SimpleProductUpdate.ts
@@ -721,7 +721,6 @@ export interface SimpleProductUpdateVariables {
   descriptionJson?: any | null;
   isPublished: boolean;
   name?: string | null;
-  basePrice?: any | null;
   productVariantId: string;
   productVariantInput: ProductVariantInput;
   seo?: SeoInput | null;
diff --git a/src/products/views/ProductCreate.tsx b/src/products/views/ProductCreate.tsx
index f7f56ab0d..b1197e4e7 100644
--- a/src/products/views/ProductCreate.tsx
+++ b/src/products/views/ProductCreate.tsx
@@ -2,7 +2,6 @@ import { WindowTitle } from "@saleor/components/WindowTitle";
 import { DEFAULT_INITIAL_SEARCH_DATA } from "@saleor/config";
 import useNavigator from "@saleor/hooks/useNavigator";
 import useNotifier from "@saleor/hooks/useNotifier";
-import useShop from "@saleor/hooks/useShop";
 import useCategorySearch from "@saleor/searches/useCategorySearch";
 import useCollectionSearch from "@saleor/searches/useCollectionSearch";
 import useProductTypeSearch from "@saleor/searches/useProductTypeSearch";
@@ -10,7 +9,7 @@ import { useWarehouseList } from "@saleor/warehouses/queries";
 import React from "react";
 import { useIntl } from "react-intl";
 
-import { decimal, maybe } from "../../misc";
+import { maybe } from "../../misc";
 import ProductCreatePage, {
   ProductCreatePageSubmitData
 } from "../components/ProductCreatePage";
@@ -21,7 +20,6 @@ import { productListUrl, productUrl } from "../urls";
 export const ProductCreateView: React.FC = () => {
   const navigate = useNavigator();
   const notify = useNotifier();
-  const shop = useShop();
   const intl = useIntl();
   const {
     loadMore: loadMoreCategories,
@@ -74,7 +72,6 @@ export const ProductCreateView: React.FC = () => {
                 id: attribute.id,
                 values: attribute.value
               })),
-              basePrice: decimal(formData.basePrice),
               category: formData.category,
               chargeTaxes: formData.chargeTaxes,
               collections: formData.collections,
@@ -109,7 +106,6 @@ export const ProductCreateView: React.FC = () => {
               })}
             />
             <ProductCreatePage
-              currency={maybe(() => shop.defaultCurrency)}
               categories={maybe(
                 () => searchCategoryOpts.data.search.edges,
                 []
diff --git a/src/storybook/stories/products/ProductCreatePage.tsx b/src/storybook/stories/products/ProductCreatePage.tsx
index 9aaa25526..e387cb31e 100644
--- a/src/storybook/stories/products/ProductCreatePage.tsx
+++ b/src/storybook/stories/products/ProductCreatePage.tsx
@@ -17,7 +17,6 @@ storiesOf("Views / Products / Create product", module)
   .addDecorator(Decorator)
   .add("default", () => (
     <ProductCreatePage
-      currency="USD"
       disabled={false}
       errors={[]}
       header="Add product"
@@ -38,7 +37,6 @@ storiesOf("Views / Products / Create product", module)
   ))
   .add("When loading", () => (
     <ProductCreatePage
-      currency="USD"
       disabled={true}
       errors={[]}
       header="Add product"
@@ -59,7 +57,6 @@ storiesOf("Views / Products / Create product", module)
   ))
   .add("form errors", () => (
     <ProductCreatePage
-      currency="USD"
       disabled={false}
       errors={(["name", "productType", "category", "sku"] as Array<
         keyof ProductCreatePageSubmitData
diff --git a/src/storybook/stories/products/ProductUpdatePage.tsx b/src/storybook/stories/products/ProductUpdatePage.tsx
index aec849dd5..c13ad0942 100644
--- a/src/storybook/stories/products/ProductUpdatePage.tsx
+++ b/src/storybook/stories/products/ProductUpdatePage.tsx
@@ -112,7 +112,6 @@ storiesOf("Views / Products / Product edit", module)
     <ProductUpdatePage
       {...props}
       errors={([
-        "basePrice",
         "category",
         "chargeTaxes",
         "collections",