From 2bc7d8822700a592aec65e018c1a2ce38f166b95 Mon Sep 17 00:00:00 2001 From: Magdalena Markusik Date: Mon, 19 Oct 2020 12:59:43 +0200 Subject: [PATCH] fix --- .../VisibilityCard/DateVisibilitySelector.tsx | 2 +- .../ProductUpdatePage/ProductUpdatePage.tsx | 6 ++--- src/products/utils/handlers.ts | 23 +++++-------------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/components/VisibilityCard/DateVisibilitySelector.tsx b/src/components/VisibilityCard/DateVisibilitySelector.tsx index dbc6d0681..3c3d912e9 100644 --- a/src/components/VisibilityCard/DateVisibilitySelector.tsx +++ b/src/components/VisibilityCard/DateVisibilitySelector.tsx @@ -28,7 +28,7 @@ const useStyles = makeStyles( marginLeft: theme.spacing(2) } }), - { name: "closeableInputWrapper" } + { name: "DateVisibilitySelector" } ); interface Props { diff --git a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx index a73a7c68a..caaa33ff9 100644 --- a/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx +++ b/src/products/components/ProductUpdatePage/ProductUpdatePage.tsx @@ -189,12 +189,12 @@ export const ProductUpdatePage: React.FC = ({ const getAvailabilityData = ({ availableForPurchase, + isAvailableForPurchase, isPublished, publicationDate }: ProductUpdatePageFormData) => ({ - isAvailableForPurchase: !!availableForPurchase, - isPublished: isPublished || !!publicationDate, - startDate: availableForPurchase || null + isAvailableForPurchase: isAvailableForPurchase || !!availableForPurchase, + isPublished: isPublished || !!publicationDate }); const getStocksData = () => { diff --git a/src/products/utils/handlers.ts b/src/products/utils/handlers.ts index 4571ec244..a4db4acbc 100644 --- a/src/products/utils/handlers.ts +++ b/src/products/utils/handlers.ts @@ -77,23 +77,12 @@ interface ProductAvailabilityArgs { productId: string; } -export function getProductAvailabilityVariables({ +export const getProductAvailabilityVariables = ({ isAvailableForPurchase, availableForPurchase, productId -}: ProductAvailabilityArgs) { - const isAvailable = - availableForPurchase && !isAvailableForPurchase - ? true - : isAvailableForPurchase; - - return { - isAvailable, - productId, - startDate: isAvailableForPurchase - ? null - : availableForPurchase !== "" - ? availableForPurchase - : null - }; -} +}: ProductAvailabilityArgs) => ({ + isAvailable: isAvailableForPurchase, + productId, + startDate: availableForPurchase +});