From 62cf5b80de8d18e3a02b66454694e07bee6a0e87 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Mon, 30 Sep 2019 14:04:18 +0200 Subject: [PATCH] Fix types --- src/productTypes/fixtures.ts | 10 +++++----- .../components/ProductCreatePage/ProductCreatePage.tsx | 6 +++--- .../ProductOrganization/ProductOrganization.tsx | 2 +- src/products/queries.ts | 1 - src/products/utils/data.ts | 4 ++-- src/storybook/stories/products/ProductCreatePage.tsx | 3 +++ 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/productTypes/fixtures.ts b/src/productTypes/fixtures.ts index fe214f7bd..375f1b751 100644 --- a/src/productTypes/fixtures.ts +++ b/src/productTypes/fixtures.ts @@ -1,12 +1,12 @@ import { - ProductCreateData_productTypes_edges_node, - ProductCreateData_productTypes_edges_node_productAttributes -} from "../products/types/ProductCreateData"; + SearchProductTypes_productTypes_edges_node, + SearchProductTypes_productTypes_edges_node_productAttributes +} from "@saleor/containers/SearchProductTypes/types/SearchProductTypes"; import { AttributeInputTypeEnum } from "../types/globalTypes"; import { ProductTypeDetails_productType } from "./types/ProductTypeDetails"; import { ProductTypeList_productTypes_edges_node } from "./types/ProductTypeList"; -export const attributes: ProductCreateData_productTypes_edges_node_productAttributes[] = [ +export const attributes: SearchProductTypes_productTypes_edges_node_productAttributes[] = [ { node: { __typename: "Attribute" as "Attribute", @@ -469,7 +469,7 @@ export const attributes: ProductCreateData_productTypes_edges_node_productAttrib ].map(edge => edge.node); export const productTypes: Array< - ProductCreateData_productTypes_edges_node & + SearchProductTypes_productTypes_edges_node & ProductTypeList_productTypes_edges_node > = [ { diff --git a/src/products/components/ProductCreatePage/ProductCreatePage.tsx b/src/products/components/ProductCreatePage/ProductCreatePage.tsx index b0a60e340..97cbb189a 100644 --- a/src/products/components/ProductCreatePage/ProductCreatePage.tsx +++ b/src/products/components/ProductCreatePage/ProductCreatePage.tsx @@ -15,6 +15,7 @@ import SeoForm from "@saleor/components/SeoForm"; import VisibilityCard from "@saleor/components/VisibilityCard"; import { SearchCategories_categories_edges_node } from "@saleor/containers/SearchCategories/types/SearchCategories"; import { SearchCollections_collections_edges_node } from "@saleor/containers/SearchCollections/types/SearchCollections"; +import { SearchProductTypes_productTypes_edges_node_productAttributes } from "@saleor/containers/SearchProductTypes/types/SearchProductTypes"; import useDateLocalize from "@saleor/hooks/useDateLocalize"; import useFormset from "@saleor/hooks/useFormset"; import useStateFromProps from "@saleor/hooks/useStateFromProps"; @@ -27,7 +28,6 @@ import { import createMultiAutocompleteSelectHandler from "@saleor/utils/handlers/multiAutocompleteSelectChangeHandler"; import createSingleAutocompleteSelectHandler from "@saleor/utils/handlers/singleAutocompleteSelectChangeHandler"; import { UserError } from "../../../types"; -import { ProductCreateData_productTypes_edges_node_productAttributes } from "../../types/ProductCreateData"; import { createAttributeChangeHandler, createAttributeMultiChangeHandler, @@ -71,7 +71,7 @@ interface ProductCreatePageProps { id: string; name: string; hasVariants: boolean; - productAttributes: ProductCreateData_productTypes_edges_node_productAttributes[]; + productAttributes: SearchProductTypes_productTypes_edges_node_productAttributes[]; }>; header: string; saveButtonBarState: ConfirmButtonTransitionState; @@ -141,7 +141,7 @@ export const ProductCreatePage: React.StatelessComponent< hasVariants: false, id: "", name: "", - productAttributes: [] as ProductCreateData_productTypes_edges_node_productAttributes[] + productAttributes: [] }); const categories = getChoices(categoryChoiceList); diff --git a/src/products/components/ProductOrganization/ProductOrganization.tsx b/src/products/components/ProductOrganization/ProductOrganization.tsx index e74bfbc48..21b3932b9 100644 --- a/src/products/components/ProductOrganization/ProductOrganization.tsx +++ b/src/products/components/ProductOrganization/ProductOrganization.tsx @@ -62,7 +62,7 @@ interface ProductOrganizationProps extends WithStyles { productTypes?: SingleAutocompleteChoiceType[]; fetchCategories: (query: string) => void; fetchCollections: (query: string) => void; - fetchProductTypes: (data: string) => void; + fetchProductTypes?: (data: string) => void; onCategoryChange: (event: ChangeEvent) => void; onCollectionChange: (event: ChangeEvent) => void; onProductTypeChange?: (event: ChangeEvent) => void; diff --git a/src/products/queries.ts b/src/products/queries.ts index cbd1244a9..fa60db7cb 100644 --- a/src/products/queries.ts +++ b/src/products/queries.ts @@ -5,7 +5,6 @@ import { AvailableInGridAttributes, AvailableInGridAttributesVariables } from "./types/AvailableInGridAttributes"; -import { ProductCreateData } from "./types/ProductCreateData"; import { ProductDetails, ProductDetailsVariables diff --git a/src/products/utils/data.ts b/src/products/utils/data.ts index 05cc7bad1..56d48658b 100644 --- a/src/products/utils/data.ts +++ b/src/products/utils/data.ts @@ -2,6 +2,7 @@ import { RawDraftContentState } from "draft-js"; import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField"; import { SingleAutocompleteChoiceType } from "@saleor/components/SingleAutocompleteSelectField"; +import { SearchProductTypes_productTypes_edges_node_productAttributes } from "@saleor/containers/SearchProductTypes/types/SearchProductTypes"; import { maybe } from "@saleor/misc"; import { ProductDetails_product, @@ -11,7 +12,6 @@ import { import { UserError } from "@saleor/types"; import { ProductAttributeInput } from "../components/ProductAttributes"; import { VariantAttributeInput } from "../components/ProductVariantAttributes"; -import { ProductCreateData_productTypes_edges_node_productAttributes } from "../types/ProductCreateData"; import { ProductVariant, ProductVariant_attributes_attribute @@ -35,7 +35,7 @@ export interface ProductType { hasVariants: boolean; id: string; name: string; - productAttributes: ProductCreateData_productTypes_edges_node_productAttributes[]; + productAttributes: SearchProductTypes_productTypes_edges_node_productAttributes[]; } export function getAttributeInputFromProduct( diff --git a/src/storybook/stories/products/ProductCreatePage.tsx b/src/storybook/stories/products/ProductCreatePage.tsx index f7706fb9b..d5a2d81fb 100644 --- a/src/storybook/stories/products/ProductCreatePage.tsx +++ b/src/storybook/stories/products/ProductCreatePage.tsx @@ -24,6 +24,7 @@ storiesOf("Views / Products / Create product", module) collections={product.collections} fetchCategories={() => undefined} fetchCollections={() => undefined} + fetchProductTypes={() => undefined} productTypes={productTypes} categories={[product.category]} onAttributesEdit={undefined} @@ -41,6 +42,7 @@ storiesOf("Views / Products / Create product", module) collections={product.collections} fetchCategories={() => undefined} fetchCollections={() => undefined} + fetchProductTypes={() => undefined} productTypes={productTypes} categories={[product.category]} onAttributesEdit={undefined} @@ -60,6 +62,7 @@ storiesOf("Views / Products / Create product", module) collections={product.collections} fetchCategories={() => undefined} fetchCollections={() => undefined} + fetchProductTypes={() => undefined} productTypes={productTypes} categories={[product.category]} onAttributesEdit={undefined}