Move fragments to separate directory to avoid circular imports

CHANGELOG.md

@@ -7,6 +7,9 @@ All notable, unreleased changes to this project will be documented in this file.
 - Add sku column to fulfillment cards - #538 by @dominik-zeglen
 - Migrate product base price to variant prices - #555 by @orzechdev
 - Migrate old notifications to the new ones - #587 by @AlicjaSzu
+- Add background task manager - #574 by @dominik-zeglen
+- Handle task failure and fix task duplication - #588 by @dominik-zeglen
+- Move fragments to separate directory to avoid circular imports - #592 by @dominik-zeglen
 
 ## 2.10.0
 
@@ -57,8 +60,6 @@ All notable, unreleased changes to this project will be documented in this file.
 - Update product stock management to newest design - #515 by @dominik-zeglen
 - Handle untracked products - #523 by @dominik-zeglen
 - Display correct error if there were no graphql errors - #525 by @dominik-zeglen
-- Add background task manager - #574 by @dominik-zeglen
-- Handle task failure and fix task duplication - #588 by @dominik-zeglen
 
 ## 2.0.0
 

src/attributes/components/AttributeDetails/AttributeDetails.tsx

@@ -1,11 +1,11 @@
 import Card from "@material-ui/core/Card";
 import CardContent from "@material-ui/core/CardContent";
 import TextField from "@material-ui/core/TextField";
-import { ProductErrorFragment } from "@saleor/attributes/types/ProductErrorFragment";
 import CardTitle from "@saleor/components/CardTitle";
 import ControlledCheckbox from "@saleor/components/ControlledCheckbox";
 import FormSpacer from "@saleor/components/FormSpacer";
 import SingleSelectField from "@saleor/components/SingleSelectField";
+import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment";
 import { commonMessages } from "@saleor/intl";
 import { AttributeInputTypeEnum } from "@saleor/types/globalTypes";
 import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors";

src/attributes/components/AttributePage/AttributePage.tsx

@@ -1,4 +1,3 @@
-import { ProductErrorFragment } from "@saleor/attributes/types/ProductErrorFragment";
 import AppHeader from "@saleor/components/AppHeader";
 import CardSpacer from "@saleor/components/CardSpacer";
 import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton";
@@ -7,6 +6,11 @@ import Form from "@saleor/components/Form";
 import Grid from "@saleor/components/Grid";
 import PageHeader from "@saleor/components/PageHeader";
 import SaveButtonBar from "@saleor/components/SaveButtonBar";
+import {
+  AttributeDetailsFragment,
+  AttributeDetailsFragment_values
+} from "@saleor/fragments/types/AttributeDetailsFragment";
+import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment";
 import { sectionNames } from "@saleor/intl";
 import { maybe } from "@saleor/misc";
 import { ReorderAction } from "@saleor/types";
@@ -15,10 +19,6 @@ import React from "react";
 import { useIntl } from "react-intl";
 import slugify from "slugify";
 
-import {
-  AttributeDetailsFragment,
-  AttributeDetailsFragment_values
-} from "../../types/AttributeDetailsFragment";
 import AttributeDetails from "../AttributeDetails";
 import AttributeProperties from "../AttributeProperties";
 import AttributeValues from "../AttributeValues";

src/attributes/components/AttributeProperties/AttributeProperties.tsx

@@ -2,12 +2,12 @@ import Card from "@material-ui/core/Card";
 import CardContent from "@material-ui/core/CardContent";
 import TextField from "@material-ui/core/TextField";
 import Typography from "@material-ui/core/Typography";
-import { ProductErrorFragment } from "@saleor/attributes/types/ProductErrorFragment";
 import CardSpacer from "@saleor/components/CardSpacer";
 import CardTitle from "@saleor/components/CardTitle";
 import ControlledCheckbox from "@saleor/components/ControlledCheckbox";
 import FormSpacer from "@saleor/components/FormSpacer";
 import Hr from "@saleor/components/Hr";
+import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment";
 import { commonMessages } from "@saleor/intl";
 import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors";
 import React from "react";

src/attributes/components/AttributeValueEditDialog/AttributeValueEditDialog.tsx

@@ -5,11 +5,11 @@ import DialogContent from "@material-ui/core/DialogContent";
 import DialogTitle from "@material-ui/core/DialogTitle";
 import TextField from "@material-ui/core/TextField";
 import { getAttributeValueErrorMessage } from "@saleor/attributes/errors";
-import { ProductErrorFragment } from "@saleor/attributes/types/ProductErrorFragment";
 import ConfirmButton, {
   ConfirmButtonTransitionState
 } from "@saleor/components/ConfirmButton";
 import Form from "@saleor/components/Form";
+import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment";
 import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors";
 import { buttonMessages } from "@saleor/intl";
 import { maybe } from "@saleor/misc";

src/attributes/components/AttributeValues/AttributeValues.tsx

@@ -13,13 +13,12 @@ import {
   SortableTableBody,
   SortableTableRow
 } from "@saleor/components/SortableTable";
+import { AttributeDetailsFragment_values } from "@saleor/fragments/types/AttributeDetailsFragment";
 import { maybe, renderCollection, stopPropagation } from "@saleor/misc";
 import { ReorderAction } from "@saleor/types";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
-import { AttributeDetailsFragment_values } from "../../types/AttributeDetailsFragment";
-
 export interface AttributeValuesProps {
   disabled: boolean;
   values: AttributeDetailsFragment_values[];

src/attributes/errors.ts

@@ -1,9 +1,8 @@
+import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment";
 import { ProductErrorCode } from "@saleor/types/globalTypes";
 import { getProductErrorMessage } from "@saleor/utils/errors";
 import { defineMessages, IntlShape } from "react-intl";
 
-import { ProductErrorFragment } from "./types/ProductErrorFragment";
-
 const messages = defineMessages({
   attributeSlugUnique: {
     defaultMessage: "Attribute with this slug already exists"

src/attributes/fixtures.ts

@@ -1,10 +1,10 @@
+import { AttributeDetailsFragment } from "@saleor/fragments/types/AttributeDetailsFragment";
 import { ProductDetails_product_productType_variantAttributes } from "@saleor/products/types/ProductDetails";
 import {
   AttributeInputTypeEnum,
   AttributeValueType
 } from "@saleor/types/globalTypes";
 
-import { AttributeDetailsFragment } from "./types/AttributeDetailsFragment";
 import { AttributeList_attributes_edges_node } from "./types/AttributeList";
 
 export const attribute: AttributeDetailsFragment = {

src/attributes/mutations.ts

@@ -1,7 +1,8 @@
+import { attributeDetailsFragment } from "@saleor/fragments/attributes";
+import { productErrorFragment } from "@saleor/fragments/errors";
 import { TypedMutation } from "@saleor/mutations";
 import gql from "graphql-tag";
 
-import { attributeDetailsFragment } from "./queries";
 import {
   AttributeBulkDelete,
   AttributeBulkDeleteVariables
@@ -35,13 +36,6 @@ import {
   AttributeValueUpdateVariables
 } from "./types/AttributeValueUpdate";
 
-export const productErrorFragment = gql`
-  fragment ProductErrorFragment on ProductError {
-    code
-    field
-  }
-`;
-
 const attributeBulkDelete = gql`
   ${productErrorFragment}
   mutation AttributeBulkDelete($ids: [ID!]!) {

src/attributes/queries.ts

@@ -1,41 +1,18 @@
+import {
+  attributeDetailsFragment,
+  attributeFragment
+} from "@saleor/fragments/attributes";
+import { pageInfoFragment } from "@saleor/fragments/pageInfo";
 import makeQuery from "@saleor/hooks/makeQuery";
 import gql from "graphql-tag";
 
-import { pageInfoFragment, TypedQuery } from "../queries";
+import { TypedQuery } from "../queries";
 import {
   AttributeDetails,
   AttributeDetailsVariables
 } from "./types/AttributeDetails";
 import { AttributeList, AttributeListVariables } from "./types/AttributeList";
 
-export const attributeFragment = gql`
-  fragment AttributeFragment on Attribute {
-    id
-    name
-    slug
-    visibleInStorefront
-    filterableInDashboard
-    filterableInStorefront
-  }
-`;
-
-export const attributeDetailsFragment = gql`
-  ${attributeFragment}
-  fragment AttributeDetailsFragment on Attribute {
-    ...AttributeFragment
-    availableInGrid
-    inputType
-    storefrontSearchPosition
-    valueRequired
-    values {
-      id
-      name
-      slug
-      type
-    }
-  }
-`;
-
 const attributeDetails = gql`
   ${attributeDetailsFragment}
   query AttributeDetails($id: ID!) {

src/attributes/views/AttributeCreate/AttributeCreate.tsx

@@ -1,4 +1,4 @@
-import { ProductErrorFragment } from "@saleor/attributes/types/ProductErrorFragment";
+import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment";
 import useNavigator from "@saleor/hooks/useNavigator";
 import useNotifier from "@saleor/hooks/useNotifier";
 import { maybe } from "@saleor/misc";

src/auth/AuthProvider.tsx

@@ -1,4 +1,5 @@
 import { DEMO_MODE } from "@saleor/config";
+import { User } from "@saleor/fragments/types/User";
 import useNotifier from "@saleor/hooks/useNotifier";
 import { maybe } from "@saleor/misc";
 import {
@@ -18,7 +19,6 @@ import {
 } from "./mutations";
 import { RefreshToken, RefreshTokenVariables } from "./types/RefreshToken";
 import { TokenAuth, TokenAuthVariables } from "./types/TokenAuth";
-import { User } from "./types/User";
 import { VerifyToken, VerifyTokenVariables } from "./types/VerifyToken";
 import {
   displayDemoMessage,

src/auth/index.tsx

@@ -1,9 +1,9 @@
+import { User } from "@saleor/fragments/types/User";
 import React from "react";
 import { Route, Switch } from "react-router-dom";
 
 import Layout from "./components/Layout";
 import LoginLoading from "./components/LoginLoading";
-import { User } from "./types/User";
 import {
   newPasswordPath,
   passwordResetPath,

src/auth/misc.ts

@@ -1,5 +1,6 @@
+import { User } from "@saleor/fragments/types/User";
+
 import { PermissionEnum } from "../types/globalTypes";
-import { User } from "./types/User";
 
 export const hasPermission = (permission: PermissionEnum, user: User) =>
   user.userPermissions.map(perm => perm.code).includes(permission);

src/auth/mutations.ts

@@ -1,4 +1,5 @@
-import { accountErrorFragment } from "@saleor/customers/mutations";
+import { fragmentUser } from "@saleor/fragments/auth";
+import { accountErrorFragment } from "@saleor/fragments/errors";
 import gql from "graphql-tag";
 
 import { TypedMutation } from "../mutations";
@@ -11,22 +12,6 @@ import { SetPassword, SetPasswordVariables } from "./types/SetPassword";
 import { TokenAuth, TokenAuthVariables } from "./types/TokenAuth";
 import { VerifyToken, VerifyTokenVariables } from "./types/VerifyToken";
 
-export const fragmentUser = gql`
-  fragment User on User {
-    id
-    email
-    firstName
-    lastName
-    userPermissions {
-      code
-      name
-    }
-    avatar {
-      url
-    }
-  }
-`;
-
 export const tokenAuthMutation = gql`
   ${fragmentUser}
   mutation TokenAuth($email: String!, $password: String!) {

src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx

@@ -1,4 +1,3 @@
-import { ProductErrorFragment } from "@saleor/attributes/types/ProductErrorFragment";
 import AppHeader from "@saleor/components/AppHeader";
 import { CardSpacer } from "@saleor/components/CardSpacer";
 import { ConfirmButtonTransitionState } from "@saleor/components/ConfirmButton";
@@ -7,6 +6,7 @@ import Form from "@saleor/components/Form";
 import PageHeader from "@saleor/components/PageHeader";
 import SaveButtonBar from "@saleor/components/SaveButtonBar";
 import SeoForm from "@saleor/components/SeoForm";
+import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment";
 import { sectionNames } from "@saleor/intl";
 import { ContentState, convertToRaw, RawDraftContentState } from "draft-js";
 import React from "react";

src/categories/components/CategoryDetailsForm/CategoryDetailsForm.tsx

@@ -1,10 +1,10 @@
 import Card from "@material-ui/core/Card";
 import CardContent from "@material-ui/core/CardContent";
 import TextField from "@material-ui/core/TextField";
-import { ProductErrorFragment } from "@saleor/attributes/types/ProductErrorFragment";
 import CardTitle from "@saleor/components/CardTitle";
 import FormSpacer from "@saleor/components/FormSpacer";
 import RichTextEditor from "@saleor/components/RichTextEditor";
+import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment";
 import { commonMessages } from "@saleor/intl";
 import { getFormErrors, getProductErrorMessage } from "@saleor/utils/errors";
 import { RawDraftContentState } from "draft-js";

src/categories/components/CategoryList/CategoryList.tsx

@@ -3,14 +3,14 @@ import TableBody from "@material-ui/core/TableBody";
 import TableCell from "@material-ui/core/TableCell";
 import TableFooter from "@material-ui/core/TableFooter";
 import TableRow from "@material-ui/core/TableRow";
-import { CategoryFragment } from "@saleor/categories/types/CategoryFragment";
 import { CategoryListUrlSortField } from "@saleor/categories/urls";
 import Checkbox from "@saleor/components/Checkbox";
 import ResponsiveTable from "@saleor/components/ResponsiveTable";
 import Skeleton from "@saleor/components/Skeleton";
 import TableCellHeader from "@saleor/components/TableCellHeader";
 import TableHead from "@saleor/components/TableHead";
 import TablePagination from "@saleor/components/TablePagination";
+import { CategoryFragment } from "@saleor/fragments/types/CategoryFragment";
 import { maybe, renderCollection } from "@saleor/misc";
 import { ListActions, ListProps, SortPage } from "@saleor/types";
 import { getArrowDirection } from "@saleor/utils/sort";

src/categories/components/CategoryListPage/CategoryListPage.tsx

@@ -1,10 +1,10 @@
 import Button from "@material-ui/core/Button";
 import Card from "@material-ui/core/Card";
-import { CategoryFragment } from "@saleor/categories/types/CategoryFragment";
 import { CategoryListUrlSortField } from "@saleor/categories/urls";
 import Container from "@saleor/components/Container";
 import PageHeader from "@saleor/components/PageHeader";
 import SearchBar from "@saleor/components/SearchBar";
+import { CategoryFragment } from "@saleor/fragments/types/CategoryFragment";
 import { sectionNames } from "@saleor/intl";
 import {
   ListActions,

src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx

@@ -1,6 +1,5 @@
 import Button from "@material-ui/core/Button";
 import Card from "@material-ui/core/Card";
-import { ProductErrorFragment } from "@saleor/attributes/types/ProductErrorFragment";
 import AppHeader from "@saleor/components/AppHeader";
 import { CardSpacer } from "@saleor/components/CardSpacer";
 import CardTitle from "@saleor/components/CardTitle";
@@ -11,6 +10,7 @@ import PageHeader from "@saleor/components/PageHeader";
 import SaveButtonBar from "@saleor/components/SaveButtonBar";
 import SeoForm from "@saleor/components/SeoForm";
 import { Tab, TabContainer } from "@saleor/components/Tab";
+import { ProductErrorFragment } from "@saleor/fragments/types/ProductErrorFragment";
 import { sectionNames } from "@saleor/intl";
 import { RawDraftContentState } from "draft-js";
 import React from "react";

src/categories/fixtures.ts

@@ -1,6 +1,7 @@
+import { CategoryFragment } from "@saleor/fragments/types/CategoryFragment";
+
 import { content } from "../storybook/stories/components/RichTextEditor";
 import { CategoryDetails_category } from "./types/CategoryDetails";
-import { CategoryFragment } from "./types/CategoryFragment";
 
 export const categories: CategoryFragment[] = [
   {

src/categories/mutations.ts

@@ -1,8 +1,8 @@
-import { productErrorFragment } from "@saleor/attributes/mutations";
+import { categoryDetailsFragment } from "@saleor/fragments/categories";
+import { productErrorFragment } from "@saleor/fragments/errors";
 import makeMutation from "@saleor/hooks/makeMutation";
 import gql from "graphql-tag";
 
-import { categoryDetailsFragment } from "./queries";
 import {
   CategoryBulkDelete,
   CategoryBulkDeleteVariables