From 7c90ec1c72cda145bdf0e88bcb45a9714a70dc9d Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Wed, 4 Nov 2020 13:54:37 +0100 Subject: [PATCH] Fix types --- .../components/CategoryBackground/CategoryBackground.tsx | 4 ++-- src/categories/components/CategoryCreatePage/form.tsx | 1 - src/categories/views/CategoryCreate.tsx | 5 +++-- src/categories/views/CategoryDetails.tsx | 6 +++--- src/collections/components/CollectionCreatePage/form.tsx | 1 - src/collections/views/CollectionDetails.tsx | 9 +++------ src/pages/views/PageDetails.tsx | 9 ++++----- .../components/ProductCreatePage/ProductCreatePage.tsx | 1 - src/products/utils/data.ts | 2 -- 9 files changed, 15 insertions(+), 23 deletions(-) diff --git a/src/categories/components/CategoryBackground/CategoryBackground.tsx b/src/categories/components/CategoryBackground/CategoryBackground.tsx index b801afa95..29e4a93f4 100644 --- a/src/categories/components/CategoryBackground/CategoryBackground.tsx +++ b/src/categories/components/CategoryBackground/CategoryBackground.tsx @@ -13,7 +13,7 @@ import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; import { CategoryDetails_category_backgroundImage } from "../../types/CategoryDetails"; -import { FormData } from "../CategoryUpdatePage"; +import { CategoryUpdateData } from "../CategoryUpdatePage/form"; const useStyles = makeStyles( theme => ({ @@ -42,7 +42,7 @@ const useStyles = makeStyles( ); export interface CategoryBackgroundProps { - data: FormData; + data: CategoryUpdateData; image: CategoryDetails_category_backgroundImage; onChange: (event: React.ChangeEvent) => void; onImageDelete: () => void; diff --git a/src/categories/components/CategoryCreatePage/form.tsx b/src/categories/components/CategoryCreatePage/form.tsx index 0393a005a..8572efc91 100644 --- a/src/categories/components/CategoryCreatePage/form.tsx +++ b/src/categories/components/CategoryCreatePage/form.tsx @@ -3,7 +3,6 @@ import { MetadataFormData } from "@saleor/components/Metadata"; import { RichTextEditorChange } from "@saleor/components/RichTextEditor"; import useForm, { FormChange } from "@saleor/hooks/useForm"; import handleFormSubmit from "@saleor/utils/handlers/handleFormSubmit"; -import getMetadata from "@saleor/utils/metadata/getMetadata"; import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import useRichText from "@saleor/utils/richText/useRichText"; import React from "react"; diff --git a/src/categories/views/CategoryCreate.tsx b/src/categories/views/CategoryCreate.tsx index 761b12e20..c31329714 100644 --- a/src/categories/views/CategoryCreate.tsx +++ b/src/categories/views/CategoryCreate.tsx @@ -9,7 +9,8 @@ import { import React from "react"; import { useIntl } from "react-intl"; -import CategoryCreatePage, { FormData } from "../components/CategoryCreatePage"; +import CategoryCreatePage from "../components/CategoryCreatePage"; +import { CategoryCreateData } from "../components/CategoryCreatePage/form"; import { useCategoryCreateMutation } from "../mutations"; import { CategoryCreate } from "../types/CategoryCreate"; import { categoryListUrl, categoryUrl } from "../urls"; @@ -43,7 +44,7 @@ export const CategoryCreateView: React.FC = ({ onCompleted: handleSuccess }); - const handleCreate = async (formData: FormData) => { + const handleCreate = async (formData: CategoryCreateData) => { const result = await createCategory({ variables: { input: { diff --git a/src/categories/views/CategoryDetails.tsx b/src/categories/views/CategoryDetails.tsx index cd52af91c..5efdaafd6 100644 --- a/src/categories/views/CategoryDetails.tsx +++ b/src/categories/views/CategoryDetails.tsx @@ -27,9 +27,9 @@ import { productAddUrl, productUrl } from "../../products/urls"; import { CategoryInput } from "../../types/globalTypes"; import { CategoryPageTab, - CategoryUpdatePage, - FormData + CategoryUpdatePage } from "../components/CategoryUpdatePage/CategoryUpdatePage"; +import { CategoryUpdateData } from "../components/CategoryUpdatePage/form"; import { useCategoryBulkDeleteMutation, useCategoryDeleteMutation, @@ -175,7 +175,7 @@ export const CategoryDetails: React.FC = ({ params ); - const handleUpdate = async (formData: FormData) => { + const handleUpdate = async (formData: CategoryUpdateData) => { const result = await updateCategory({ variables: { id, diff --git a/src/collections/components/CollectionCreatePage/form.tsx b/src/collections/components/CollectionCreatePage/form.tsx index 4a49c03cf..9cf38191b 100644 --- a/src/collections/components/CollectionCreatePage/form.tsx +++ b/src/collections/components/CollectionCreatePage/form.tsx @@ -3,7 +3,6 @@ import { MetadataFormData } from "@saleor/components/Metadata"; import { RichTextEditorChange } from "@saleor/components/RichTextEditor"; import useForm, { FormChange } from "@saleor/hooks/useForm"; import handleFormSubmit from "@saleor/utils/handlers/handleFormSubmit"; -import getMetadata from "@saleor/utils/metadata/getMetadata"; import useMetadataChangeTrigger from "@saleor/utils/metadata/useMetadataChangeTrigger"; import useRichText from "@saleor/utils/richText/useRichText"; import React from "react"; diff --git a/src/collections/views/CollectionDetails.tsx b/src/collections/views/CollectionDetails.tsx index e1e5a0af5..d9c886825 100644 --- a/src/collections/views/CollectionDetails.tsx +++ b/src/collections/views/CollectionDetails.tsx @@ -25,9 +25,8 @@ import { FormattedMessage, useIntl } from "react-intl"; import { getMutationState, maybe } from "../../misc"; import { productUrl } from "../../products/urls"; import { CollectionInput } from "../../types/globalTypes"; -import CollectionDetailsPage, { - CollectionDetailsPageFormData -} from "../components/CollectionDetailsPage/CollectionDetailsPage"; +import CollectionDetailsPage from "../components/CollectionDetailsPage/CollectionDetailsPage"; +import { CollectionUpdateData } from "../components/CollectionDetailsPage/form"; import { useCollectionAssignProductMutation, useCollectionRemoveMutation, @@ -168,9 +167,7 @@ export const CollectionDetails: React.FC = ({ return ; } - const handleUpdate = async ( - formData: CollectionDetailsPageFormData - ) => { + const handleUpdate = async (formData: CollectionUpdateData) => { const input: CollectionInput = { backgroundImageAlt: formData.backgroundImageAlt, descriptionJson: JSON.stringify(formData.description), diff --git a/src/pages/views/PageDetails.tsx b/src/pages/views/PageDetails.tsx index 7b159d7de..d4fed8722 100644 --- a/src/pages/views/PageDetails.tsx +++ b/src/pages/views/PageDetails.tsx @@ -14,9 +14,8 @@ import { FormattedMessage, useIntl } from "react-intl"; import { getStringOrPlaceholder, maybe } from "../../misc"; import { PageInput } from "../../types/globalTypes"; -import PageDetailsPage, { - PageDetailsPageFormData -} from "../components/PageDetailsPage"; +import PageDetailsPage from "../components/PageDetailsPage"; +import { PageData } from "../components/PageDetailsPage/form"; import { TypedPageRemove, TypedPageUpdate } from "../mutations"; import { TypedPageDetailsQuery } from "../queries"; import { PageRemove } from "../types/PageRemove"; @@ -27,7 +26,7 @@ export interface PageDetailsProps { params: PageUrlQueryParams; } -const createPageInput = (data: PageDetailsPageFormData): PageInput => ({ +const createPageInput = (data: PageData): PageInput => ({ contentJson: JSON.stringify(data.content), isPublished: data.isPublished, publicationDate: data.publicationDate, @@ -63,7 +62,7 @@ export const PageDetails: React.FC = ({ id, params }) => { {(pageUpdate, pageUpdateOpts) => ( {pageDetails => { - const handleUpdate = async (data: PageDetailsPageFormData) => { + const handleUpdate = async (data: PageData) => { const result = await pageUpdate({ variables: { id, diff --git a/src/products/components/ProductCreatePage/ProductCreatePage.tsx b/src/products/components/ProductCreatePage/ProductCreatePage.tsx index b288068b4..66bc08146 100644 --- a/src/products/components/ProductCreatePage/ProductCreatePage.tsx +++ b/src/products/components/ProductCreatePage/ProductCreatePage.tsx @@ -19,7 +19,6 @@ import { SearchCategories_search_edges_node } from "@saleor/searches/types/Searc import { SearchCollections_search_edges_node } from "@saleor/searches/types/SearchCollections"; import { SearchProductTypes_search_edges_node } from "@saleor/searches/types/SearchProductTypes"; import { SearchWarehouses_search_edges_node } from "@saleor/searches/types/SearchWarehouses"; -import { ContentState, convertToRaw } from "draft-js"; import React from "react"; import { useIntl } from "react-intl"; diff --git a/src/products/utils/data.ts b/src/products/utils/data.ts index f48043e1e..6bc8bc719 100644 --- a/src/products/utils/data.ts +++ b/src/products/utils/data.ts @@ -1,4 +1,3 @@ -import { OutputData } from "@editorjs/editorjs"; import { MetadataFormData } from "@saleor/components/Metadata/types"; import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; @@ -13,7 +12,6 @@ import { import { SearchProductTypes_search_edges_node_productAttributes } from "@saleor/searches/types/SearchProductTypes"; import { StockInput } from "@saleor/types/globalTypes"; import { mapMetadataItemToInput } from "@saleor/utils/maps"; -import { RawDraftContentState } from "draft-js"; import { ProductAttributeInput } from "../components/ProductAttributes"; import { ProductStockInput } from "../components/ProductStocks";