From 2f7867bf99948f1f952ad66995fa3b2629e31a98 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Mon, 12 Aug 2019 13:47:38 +0200 Subject: [PATCH] Update imports --- src/misc.ts | 4 ++-- src/productTypes/containers/ProductTypeOperations.tsx | 4 ++-- src/storybook/config.js | 2 +- src/storybook/stories/categories/CategoryUpdatePage.tsx | 2 +- src/storybook/stories/collections/CollectionDetailsPage.tsx | 4 ++-- src/storybook/stories/components/AssignProductDialog.tsx | 2 +- src/storybook/stories/home/HomePage.tsx | 2 +- src/storybook/stories/orders/OrderDetailsPage.tsx | 2 +- src/storybook/stories/orders/OrderDraftPage.tsx | 2 +- src/storybook/stories/orders/OrderFulfillmentDialog.tsx | 2 +- src/storybook/stories/orders/OrderProductAddDialog.tsx | 2 +- src/storybook/stories/products/ProductImagePage.tsx | 2 +- src/storybook/stories/products/ProductListPage.tsx | 2 +- src/storybook/stories/products/ProductUpdatePage.tsx | 2 +- src/storybook/stories/products/ProductVariantCreatePage.tsx | 2 +- .../stories/products/ProductVariantImageSelectDialog.tsx | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/misc.ts b/src/misc.ts index d27eeded2..1cfbf99cb 100644 --- a/src/misc.ts +++ b/src/misc.ts @@ -1,5 +1,5 @@ import moment from "moment-timezone"; -import { MutationFn, MutationResult } from "react-apollo"; +import { MutationFunction, MutationResult } from "react-apollo"; import urlJoin from "url-join"; import { ConfirmButtonTransitionState } from "./components/ConfirmButton/ConfirmButton"; @@ -189,7 +189,7 @@ export function getMutationState( } export function getMutationProviderData( - mutateFn: MutationFn, + mutateFn: MutationFunction, opts: MutationResult ): PartialMutationProviderOutput { return { diff --git a/src/productTypes/containers/ProductTypeOperations.tsx b/src/productTypes/containers/ProductTypeOperations.tsx index 7a7ea2931..66d0d83eb 100644 --- a/src/productTypes/containers/ProductTypeOperations.tsx +++ b/src/productTypes/containers/ProductTypeOperations.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { MutationFn } from "react-apollo"; +import { MutationFunction } from "react-apollo"; import { AttributeTypeEnum, ReorderInput } from "@saleor/types/globalTypes"; import { getMutationProviderData } from "../../misc"; @@ -119,7 +119,7 @@ const ProductTypeOperations: React.StatelessComponent< reorderAttributeMutation, reorderAttributeMutationResult ) => { - const reorderAttributeMutationFn: MutationFn< + const reorderAttributeMutationFn: MutationFunction< ProductTypeAttributeReorder, ProductTypeAttributeReorderVariables > = opts => { diff --git a/src/storybook/config.js b/src/storybook/config.js index 8992c5d70..48c108661 100644 --- a/src/storybook/config.js +++ b/src/storybook/config.js @@ -1,5 +1,5 @@ /* eslint-disable */ -configure = require("@storybook/react").configure; +const { configure } = require("@storybook/react"); function loadStories() { // Components diff --git a/src/storybook/stories/categories/CategoryUpdatePage.tsx b/src/storybook/stories/categories/CategoryUpdatePage.tsx index 802f2e019..86d508e79 100644 --- a/src/storybook/stories/categories/CategoryUpdatePage.tsx +++ b/src/storybook/stories/categories/CategoryUpdatePage.tsx @@ -1,7 +1,7 @@ +import placeholderImage from "@assets/images/placeholder255x255.png"; import { Omit } from "@material-ui/core"; import { storiesOf } from "@storybook/react"; import React from "react"; -import placeholderImage from "../@assets/images/placeholder255x255.png"; import { category as categoryFixture } from "../../../categories/fixtures"; diff --git a/src/storybook/stories/collections/CollectionDetailsPage.tsx b/src/storybook/stories/collections/CollectionDetailsPage.tsx index 61ff9f7d0..de938f440 100644 --- a/src/storybook/stories/collections/CollectionDetailsPage.tsx +++ b/src/storybook/stories/collections/CollectionDetailsPage.tsx @@ -2,14 +2,14 @@ import { Omit } from "@material-ui/core"; import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderCollectionImage from "@assets/images/block1.jpg"; +import placeholderProductImage from "@assets/images/placeholder60x60.png"; import CollectionDetailsPage, { CollectionDetailsPageProps } from "../../../collections/components/CollectionDetailsPage"; import { collection as collectionFixture } from "../../../collections/fixtures"; import { listActionsProps, pageListProps } from "../../../fixtures"; import Decorator from "../../Decorator"; -import placeholderCollectionImage from "../@assets/images/block1.jpg"; -import placeholderProductImage from "../@assets/images/placeholder60x60.png"; const collection = collectionFixture( placeholderCollectionImage, diff --git a/src/storybook/stories/components/AssignProductDialog.tsx b/src/storybook/stories/components/AssignProductDialog.tsx index 644b34b03..8199d736e 100644 --- a/src/storybook/stories/components/AssignProductDialog.tsx +++ b/src/storybook/stories/components/AssignProductDialog.tsx @@ -1,12 +1,12 @@ import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder60x60.png"; import AssignProductDialog, { AssignProductDialogProps } from "@saleor/components/AssignProductDialog"; import { products } from "@saleor/products/fixtures"; import Decorator from "../../Decorator"; -import placeholderImage from "../@assets/images/placeholder60x60.png"; const props: AssignProductDialogProps = { confirmButtonState: "default", diff --git a/src/storybook/stories/home/HomePage.tsx b/src/storybook/stories/home/HomePage.tsx index f863dbb16..e024ced34 100644 --- a/src/storybook/stories/home/HomePage.tsx +++ b/src/storybook/stories/home/HomePage.tsx @@ -2,10 +2,10 @@ import { Omit } from "@material-ui/core"; import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder60x60.png"; import HomePage, { HomePageProps } from "../../../home/components/HomePage"; import { shop as shopFixture } from "../../../home/fixtures"; import Decorator from "../../Decorator"; -import placeholderImage from "../@assets/images/placeholder60x60.png"; const shop = shopFixture(placeholderImage); diff --git a/src/storybook/stories/orders/OrderDetailsPage.tsx b/src/storybook/stories/orders/OrderDetailsPage.tsx index 995a2c273..b9f1ad0dd 100644 --- a/src/storybook/stories/orders/OrderDetailsPage.tsx +++ b/src/storybook/stories/orders/OrderDetailsPage.tsx @@ -2,6 +2,7 @@ import { Omit } from "@material-ui/core"; import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder60x60.png"; import OrderDetailsPage, { OrderDetailsPageProps } from "../../../orders/components/OrderDetailsPage"; @@ -12,7 +13,6 @@ import { PaymentChargeStatusEnum } from "../../../types/globalTypes"; import Decorator from "../../Decorator"; -import placeholderImage from "../@assets/images/placeholder60x60.png"; const order = orderFixture(placeholderImage); diff --git a/src/storybook/stories/orders/OrderDraftPage.tsx b/src/storybook/stories/orders/OrderDraftPage.tsx index bf46b1bb8..db70be0a4 100644 --- a/src/storybook/stories/orders/OrderDraftPage.tsx +++ b/src/storybook/stories/orders/OrderDraftPage.tsx @@ -2,12 +2,12 @@ import { Omit } from "@material-ui/core"; import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder60x60.png"; import OrderDraftPage, { OrderDraftPageProps } from "../../../orders/components/OrderDraftPage"; import { clients, countries, draftOrder } from "../../../orders/fixtures"; import Decorator from "../../Decorator"; -import placeholderImage from "../@assets/images/placeholder60x60.png"; const order = draftOrder(placeholderImage); diff --git a/src/storybook/stories/orders/OrderFulfillmentDialog.tsx b/src/storybook/stories/orders/OrderFulfillmentDialog.tsx index ad5ae3c17..e2b99a0bd 100644 --- a/src/storybook/stories/orders/OrderFulfillmentDialog.tsx +++ b/src/storybook/stories/orders/OrderFulfillmentDialog.tsx @@ -2,12 +2,12 @@ import { Omit } from "@material-ui/core"; import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder60x60.png"; import OrderFulfillmentDialog, { OrderFulfillmentDialogProps } from "../../../orders/components/OrderFulfillmentDialog"; import { order as orderFixture } from "../../../orders/fixtures"; import Decorator from "../../Decorator"; -import placeholderImage from "../@assets/images/placeholder60x60.png"; const order = orderFixture(placeholderImage); diff --git a/src/storybook/stories/orders/OrderProductAddDialog.tsx b/src/storybook/stories/orders/OrderProductAddDialog.tsx index 68abce3d2..d64d7a3ee 100644 --- a/src/storybook/stories/orders/OrderProductAddDialog.tsx +++ b/src/storybook/stories/orders/OrderProductAddDialog.tsx @@ -1,10 +1,10 @@ import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder60x60.png"; import OrderProductAddDialog from "../../../orders/components/OrderProductAddDialog"; import { orderLineSearch } from "../../../orders/fixtures"; import Decorator from "../../Decorator"; -import placeholderImage from "../@assets/images/placeholder60x60.png"; storiesOf("Orders / OrderProductAddDialog", module) .addDecorator(Decorator) diff --git a/src/storybook/stories/products/ProductImagePage.tsx b/src/storybook/stories/products/ProductImagePage.tsx index 0ecc0ff33..4d5a1cd37 100644 --- a/src/storybook/stories/products/ProductImagePage.tsx +++ b/src/storybook/stories/products/ProductImagePage.tsx @@ -1,9 +1,9 @@ import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholder from "@assets/images/placeholder1080x1080.png"; import ProductImagePage from "../../../products/components/ProductImagePage"; import Decorator from "../../Decorator"; -import placeholder from "../@assets/images/placeholder1080x1080.png"; const image = { id: "", url: placeholder, alt: "Lorem ipsum" }; const images = (Array(8) as any) diff --git a/src/storybook/stories/products/ProductListPage.tsx b/src/storybook/stories/products/ProductListPage.tsx index d34d16bfd..1985d778a 100644 --- a/src/storybook/stories/products/ProductListPage.tsx +++ b/src/storybook/stories/products/ProductListPage.tsx @@ -1,6 +1,7 @@ import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder255x255.png"; import { defaultListSettings } from "@saleor/config"; import { ListViews } from "@saleor/types"; import { category as categoryFixture } from "../../../categories/fixtures"; @@ -14,7 +15,6 @@ import ProductListPage, { ProductListPageProps } from "../../../products/components/ProductListPage"; import Decorator from "../../Decorator"; -import placeholderImage from "../@assets/images/placeholder255x255.png"; const products = categoryFixture(placeholderImage).products.edges.map( edge => edge.node diff --git a/src/storybook/stories/products/ProductUpdatePage.tsx b/src/storybook/stories/products/ProductUpdatePage.tsx index d71c34d9c..65b3d591c 100644 --- a/src/storybook/stories/products/ProductUpdatePage.tsx +++ b/src/storybook/stories/products/ProductUpdatePage.tsx @@ -1,6 +1,7 @@ import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder255x255.png"; import { collections } from "@saleor/collections/fixtures"; import { listActionsProps } from "@saleor/fixtures"; import ProductUpdatePage, { @@ -8,7 +9,6 @@ import ProductUpdatePage, { } from "@saleor/products/components/ProductUpdatePage"; import { product as productFixture } from "@saleor/products/fixtures"; import Decorator from "../../Decorator"; -import placeholderImage from "../@assets/images/placeholder255x255.png"; const product = productFixture(placeholderImage); diff --git a/src/storybook/stories/products/ProductVariantCreatePage.tsx b/src/storybook/stories/products/ProductVariantCreatePage.tsx index f2cc38c70..8ae3a670c 100644 --- a/src/storybook/stories/products/ProductVariantCreatePage.tsx +++ b/src/storybook/stories/products/ProductVariantCreatePage.tsx @@ -1,11 +1,11 @@ import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder255x255.png"; import { formError } from "@saleor/storybook/misc"; import ProductVariantCreatePage from "../../../products/components/ProductVariantCreatePage"; import { product as productFixture } from "../../../products/fixtures"; import Decorator from "../../Decorator"; -import placeholderImage from "../@assets/images/placeholder255x255.png"; const product = productFixture(placeholderImage); diff --git a/src/storybook/stories/products/ProductVariantImageSelectDialog.tsx b/src/storybook/stories/products/ProductVariantImageSelectDialog.tsx index 0033fe860..380b801ee 100644 --- a/src/storybook/stories/products/ProductVariantImageSelectDialog.tsx +++ b/src/storybook/stories/products/ProductVariantImageSelectDialog.tsx @@ -1,12 +1,12 @@ import { storiesOf } from "@storybook/react"; import React from "react"; +import placeholderImage from "@assets/images/placeholder255x255.png"; import ProductVariantImageSelectDialog from "../../../products/components/ProductVariantImageSelectDialog"; import { variantImages as variantImagesFixture, variantProductImages as variantProductImagesFixture } from "../../../products/fixtures"; -import placeholderImage from "../@assets/images/placeholder255x255.png"; const variantImages = variantImagesFixture(placeholderImage); const variantProductImages = variantProductImagesFixture(placeholderImage);