From b2e6baf4e9bb2ec23c1953b39452c16c785875a1 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Fri, 6 Nov 2020 11:54:03 +0100 Subject: [PATCH] Use proper submit return type --- .../CollectionCreatePage/CollectionCreatePage.tsx | 3 ++- src/collections/components/CollectionCreatePage/form.tsx | 6 +++--- .../CollectionDetailsPage/CollectionDetailsPage.tsx | 3 ++- src/pages/components/PageDetailsPage/form.tsx | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/collections/components/CollectionCreatePage/CollectionCreatePage.tsx b/src/collections/components/CollectionCreatePage/CollectionCreatePage.tsx index a54235658..b4fb94166 100644 --- a/src/collections/components/CollectionCreatePage/CollectionCreatePage.tsx +++ b/src/collections/components/CollectionCreatePage/CollectionCreatePage.tsx @@ -10,6 +10,7 @@ import SeoForm from "@saleor/components/SeoForm"; import VisibilityCard from "@saleor/components/VisibilityCard"; import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment"; import useDateLocalize from "@saleor/hooks/useDateLocalize"; +import { SubmitPromise } from "@saleor/hooks/useForm"; import { sectionNames } from "@saleor/intl"; import React from "react"; import { useIntl } from "react-intl"; @@ -23,7 +24,7 @@ export interface CollectionCreatePageProps { errors: ProductErrorFragment[]; saveButtonBarState: ConfirmButtonTransitionState; onBack: () => void; - onSubmit: (data: CollectionCreateData) => Promise; + onSubmit: (data: CollectionCreateData) => SubmitPromise; } const CollectionCreatePage: React.FC = ({ diff --git a/src/collections/components/CollectionCreatePage/form.tsx b/src/collections/components/CollectionCreatePage/form.tsx index 9cf38191b..9857022ee 100644 --- a/src/collections/components/CollectionCreatePage/form.tsx +++ b/src/collections/components/CollectionCreatePage/form.tsx @@ -1,7 +1,7 @@ import { OutputData } from "@editorjs/editorjs"; import { MetadataFormData } from "@saleor/components/Metadata"; import { RichTextEditorChange } from "@saleor/components/RichTextEditor"; -import useForm, { FormChange } from "@saleor/hooks/useForm"; +import useForm, { FormChange, SubmitPromise } from "@saleor/hooks/useForm"; import handleFormSubmit from "@saleor/utils/handlers/handleFormSubmit"; import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import useRichText from "@saleor/utils/richText/useRichText"; @@ -38,11 +38,11 @@ export interface UseCollectionCreateFormResult { export interface CollectionCreateFormProps { children: (props: UseCollectionCreateFormResult) => React.ReactNode; - onSubmit: (data: CollectionCreateData) => Promise; + onSubmit: (data: CollectionCreateData) => SubmitPromise; } function useCollectionCreateForm( - onSubmit: (data: CollectionCreateData) => Promise + onSubmit: (data: CollectionCreateData) => SubmitPromise ): UseCollectionCreateFormResult { const [changed, setChanged] = React.useState(false); const triggerChange = () => setChanged(true); diff --git a/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.tsx b/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.tsx index 4728cec71..34d214dfc 100644 --- a/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.tsx +++ b/src/collections/components/CollectionDetailsPage/CollectionDetailsPage.tsx @@ -13,6 +13,7 @@ import SeoForm from "@saleor/components/SeoForm"; import VisibilityCard from "@saleor/components/VisibilityCard"; import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment"; import useDateLocalize from "@saleor/hooks/useDateLocalize"; +import { SubmitPromise } from "@saleor/hooks/useForm"; import { sectionNames } from "@saleor/intl"; import React from "react"; import { useIntl } from "react-intl"; @@ -35,7 +36,7 @@ export interface CollectionDetailsPageProps extends PageListProps, ListActions { onImageDelete: () => void; onImageUpload: (file: File) => void; onProductUnassign: (id: string, event: React.MouseEvent) => void; - onSubmit: (data: CollectionUpdateData) => Promise; + onSubmit: (data: CollectionUpdateData) => SubmitPromise; } const CollectionDetailsPage: React.FC = ({ diff --git a/src/pages/components/PageDetailsPage/form.tsx b/src/pages/components/PageDetailsPage/form.tsx index 9a035ff18..9a71a2a55 100644 --- a/src/pages/components/PageDetailsPage/form.tsx +++ b/src/pages/components/PageDetailsPage/form.tsx @@ -1,7 +1,7 @@ import { OutputData } from "@editorjs/editorjs"; import { MetadataFormData } from "@saleor/components/Metadata"; import { RichTextEditorChange } from "@saleor/components/RichTextEditor"; -import useForm, { FormChange } from "@saleor/hooks/useForm"; +import useForm, { FormChange, SubmitPromise } from "@saleor/hooks/useForm"; import { PageDetails_page } from "@saleor/pages/types/PageDetails"; import getPublicationData from "@saleor/utils/data/getPublicationData"; import handleFormSubmit from "@saleor/utils/handlers/handleFormSubmit"; @@ -38,12 +38,12 @@ export interface UsePageUpdateFormResult { export interface PageFormProps { children: (props: UsePageUpdateFormResult) => React.ReactNode; page: PageDetails_page; - onSubmit: (data: PageData) => Promise; + onSubmit: (data: PageData) => SubmitPromise; } function usePageForm( page: PageDetails_page, - onSubmit: (data: PageData) => Promise + onSubmit: (data: PageData) => SubmitPromise ): UsePageUpdateFormResult { const [changed, setChanged] = React.useState(false); const triggerChange = () => setChanged(true);