From a6db73f18930933330226f2ac58e1d7aa889a76c Mon Sep 17 00:00:00 2001 From: AlicjaSzu Date: Thu, 3 Sep 2020 16:07:03 +0200 Subject: [PATCH 1/3] fix typo in AvailabilityCard --- locale/defaultMessages.json | 8 ++++---- src/components/AvailabilityCard/AvailabilityCard.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index 2657186d3..7ec4f91d5 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -1437,10 +1437,6 @@ "context": "product availability", "string": "Available for purchase" }, - "src_dot_components_dot_AvailabilityCard_dot_2936097346": { - "context": "product unavailability", - "string": "Unvailable for purchase" - }, "src_dot_components_dot_AvailabilityCard_dot_2938074852": { "context": "product available for purchase date", "string": "will become available on {date}" @@ -1449,6 +1445,10 @@ "context": "product availability date label", "string": "Set availability date" }, + "src_dot_components_dot_AvailabilityCard_dot_825317195": { + "context": "product unavailability", + "string": "Unavailable for purchase" + }, "src_dot_components_dot_ColumnPicker_dot_1483881697": { "context": "button", "string": "Reset" diff --git a/src/components/AvailabilityCard/AvailabilityCard.tsx b/src/components/AvailabilityCard/AvailabilityCard.tsx index ee1326732..382c4ecea 100644 --- a/src/components/AvailabilityCard/AvailabilityCard.tsx +++ b/src/components/AvailabilityCard/AvailabilityCard.tsx @@ -42,7 +42,7 @@ export const AvailabilityCard: React.FC = props => { description: "product availability date label" }), unavailableLabel: intl.formatMessage({ - defaultMessage: "Unvailable for purchase", + defaultMessage: "Unavailable for purchase", description: "product unavailability" }) }} From 092655c16e4840b67eee68b11be1ed66352f285a Mon Sep 17 00:00:00 2001 From: AlicjaSzu Date: Thu, 3 Sep 2020 16:14:23 +0200 Subject: [PATCH 2/3] fix availability date logic --- src/components/VisibilityCard/VisibilityCard.tsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/VisibilityCard/VisibilityCard.tsx b/src/components/VisibilityCard/VisibilityCard.tsx index 8244c1b7f..4207baff5 100644 --- a/src/components/VisibilityCard/VisibilityCard.tsx +++ b/src/components/VisibilityCard/VisibilityCard.tsx @@ -8,6 +8,7 @@ import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import Hr from "@saleor/components/Hr"; import RadioSwitchField from "@saleor/components/RadioSwitchField"; import useDateLocalize from "@saleor/hooks/useDateLocalize"; +import { ChangeEvent } from "@saleor/hooks/useForm"; import { UserError } from "@saleor/types"; import { getFieldError } from "@saleor/utils/errors"; import classNames from "classnames"; @@ -82,7 +83,7 @@ export interface VisibilityCardProps { errors: UserError[]; disabled?: boolean; messages: Message; - onChange: (event: React.ChangeEvent) => void; + onChange: (event: ChangeEvent) => void; } export const VisibilityCard: React.FC = props => { @@ -236,7 +237,15 @@ export const VisibilityCard: React.FC = props => { } value={isAvailable} - onChange={onChange} + onChange={e => { + const { value } = e.target; + if (!value) { + onChange({ + target: { name: "availableForPurchase", value: null } + }); + } + return onChange(e); + }} /> {!isAvailable && ( <> From 7d5d3698e849054a8f0b9ff4af9e5debbd66ac28 Mon Sep 17 00:00:00 2001 From: AlicjaSzu Date: Thu, 3 Sep 2020 16:19:47 +0200 Subject: [PATCH 3/3] update snapshots --- .../__snapshots__/Stories.test.ts.snap | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index 55ec4630d..cf3c71a1d 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -1549,7 +1549,7 @@ exports[`Storyshots Generics / AvailabilityCard default 1`] = `

- Unvailable for purchase + Unavailable for purchase

@@ -133844,7 +133844,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase

@@ -135003,7 +135003,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase

@@ -136175,7 +136175,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase

@@ -141594,7 +141594,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase

@@ -143596,7 +143596,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase

@@ -146016,7 +146016,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase

@@ -148570,7 +148570,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase

@@ -150831,7 +150831,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase

@@ -154305,7 +154305,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase

@@ -156859,7 +156859,7 @@ Ctrl + K"

- Unvailable for purchase + Unavailable for purchase