Fix types

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<any>) => void;
   onImageDelete: () => void;

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";

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<CategoryCreateViewProps> = ({
     onCompleted: handleSuccess
   });
 
-  const handleCreate = async (formData: FormData) => {
+  const handleCreate = async (formData: CategoryCreateData) => {
     const result = await createCategory({
       variables: {
         input: {

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<CategoryDetailsProps> = ({
     params
   );
 
-  const handleUpdate = async (formData: FormData) => {
+  const handleUpdate = async (formData: CategoryUpdateData) => {
     const result = await updateCategory({
       variables: {
         id,

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";

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<CollectionDetailsProps> = ({
           return <NotFoundPage onBack={handleBack} />;
         }
 
-        const handleUpdate = async (
-          formData: CollectionDetailsPageFormData
-        ) => {
+        const handleUpdate = async (formData: CollectionUpdateData) => {
           const input: CollectionInput = {
             backgroundImageAlt: formData.backgroundImageAlt,
             descriptionJson: JSON.stringify(formData.description),

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<PageDetailsProps> = ({ id, params }) => {
           {(pageUpdate, pageUpdateOpts) => (
             <TypedPageDetailsQuery variables={{ id }}>
               {pageDetails => {
-                const handleUpdate = async (data: PageDetailsPageFormData) => {
+                const handleUpdate = async (data: PageData) => {
                   const result = await pageUpdate({
                     variables: {
                       id,

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";
 

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";