From 4ac8ea2df7bc3b65d6c8208ac8eadcfca6051248 Mon Sep 17 00:00:00 2001 From: Loan Laux Date: Wed, 28 Apr 2021 22:18:54 +0400 Subject: [PATCH] overall clean up Signed-off-by: Loan Laux --- .../product/get-all-products.ts | 3 +-- .../utils/mutations/add-cart-items.ts | 2 +- .../associate-customer-with-checkout.ts | 18 ------------------ .../utils/mutations/create-cart.ts | 2 +- .../utils/mutations/reconcile-carts.ts | 2 +- .../utils/mutations/remove-cart-items.ts | 2 +- .../mutations/update-cart-items-quantity.ts | 2 +- .../queries/account-cart-by-account-id.ts | 2 +- .../utils/queries/get-anonymous-cart.ts | 2 +- ...get-checkout-query.ts => get-cart-query.ts} | 4 ++-- .../reactioncommerce/utils/queries/index.ts | 2 +- 11 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 framework/reactioncommerce/utils/mutations/associate-customer-with-checkout.ts rename framework/reactioncommerce/utils/queries/{get-checkout-query.ts => get-cart-query.ts} (98%) diff --git a/framework/reactioncommerce/product/get-all-products.ts b/framework/reactioncommerce/product/get-all-products.ts index 49405ebe9..f620ddda3 100644 --- a/framework/reactioncommerce/product/get-all-products.ts +++ b/framework/reactioncommerce/product/get-all-products.ts @@ -1,8 +1,7 @@ import { GraphQLFetcherResult } from '@commerce/api' import { getConfig, ReactionCommerceConfig } from '../api' import { CatalogItemEdge } from '../schema' -import { catalogItemsQuery } from '../utils/queries' -import { normalizeProduct } from '../utils/normalize' +import { catalogItemsQuery, normalizeProduct } from '../utils' import { Product } from '@commerce/types' type Variables = { diff --git a/framework/reactioncommerce/utils/mutations/add-cart-items.ts b/framework/reactioncommerce/utils/mutations/add-cart-items.ts index f1e20d392..d8ed1acc1 100644 --- a/framework/reactioncommerce/utils/mutations/add-cart-items.ts +++ b/framework/reactioncommerce/utils/mutations/add-cart-items.ts @@ -2,7 +2,7 @@ import { cartPayloadFragment, incorrectPriceFailureDetailsFragment, minOrderQuantityFailureDetailsFragment, -} from '@framework/utils/queries/get-checkout-query' +} from '@framework/utils/queries/get-cart-query' const addCartItemsMutation = ` mutation addCartItemsMutation($input: AddCartItemsInput!) { diff --git a/framework/reactioncommerce/utils/mutations/associate-customer-with-checkout.ts b/framework/reactioncommerce/utils/mutations/associate-customer-with-checkout.ts deleted file mode 100644 index 6b1350e05..000000000 --- a/framework/reactioncommerce/utils/mutations/associate-customer-with-checkout.ts +++ /dev/null @@ -1,18 +0,0 @@ -const associateCustomerWithCheckoutMutation = /* GraphQl */ ` -mutation associateCustomerWithCheckout($checkoutId: ID!, $customerAccessToken: String!) { - checkoutCustomerAssociateV2(checkoutId: $checkoutId, customerAccessToken: $customerAccessToken) { - checkout { - id - } - checkoutUserErrors { - code - field - message - } - customer { - id - } - } - } -` -export default associateCustomerWithCheckoutMutation diff --git a/framework/reactioncommerce/utils/mutations/create-cart.ts b/framework/reactioncommerce/utils/mutations/create-cart.ts index 0ae2a91a8..dc76c3008 100644 --- a/framework/reactioncommerce/utils/mutations/create-cart.ts +++ b/framework/reactioncommerce/utils/mutations/create-cart.ts @@ -2,7 +2,7 @@ import { cartPayloadFragment, incorrectPriceFailureDetailsFragment, minOrderQuantityFailureDetailsFragment, -} from '@framework/utils/queries/get-checkout-query' +} from '@framework/utils/queries/get-cart-query' const createCartMutation = /* GraphQL */ ` mutation createCartMutation($input: CreateCartInput!) { diff --git a/framework/reactioncommerce/utils/mutations/reconcile-carts.ts b/framework/reactioncommerce/utils/mutations/reconcile-carts.ts index 07d65d7de..b5fcae90f 100644 --- a/framework/reactioncommerce/utils/mutations/reconcile-carts.ts +++ b/framework/reactioncommerce/utils/mutations/reconcile-carts.ts @@ -1,4 +1,4 @@ -import { cartPayloadFragment } from '@framework/utils/queries/get-checkout-query' +import { cartPayloadFragment } from '@framework/utils/queries/get-cart-query' const reconcileCartsMutation = ` mutation reconcileCartsMutation($input: ReconcileCartsInput!) { diff --git a/framework/reactioncommerce/utils/mutations/remove-cart-items.ts b/framework/reactioncommerce/utils/mutations/remove-cart-items.ts index dfca9181f..83564ddc5 100644 --- a/framework/reactioncommerce/utils/mutations/remove-cart-items.ts +++ b/framework/reactioncommerce/utils/mutations/remove-cart-items.ts @@ -1,4 +1,4 @@ -import { cartPayloadFragment } from '@framework/utils/queries/get-checkout-query' +import { cartPayloadFragment } from '@framework/utils/queries/get-cart-query' const updateCartItemsQuantityMutation = ` mutation removeCartItemsMutation($input: RemoveCartItemsInput!) { diff --git a/framework/reactioncommerce/utils/mutations/update-cart-items-quantity.ts b/framework/reactioncommerce/utils/mutations/update-cart-items-quantity.ts index c2db7b1fe..df7cdfda7 100644 --- a/framework/reactioncommerce/utils/mutations/update-cart-items-quantity.ts +++ b/framework/reactioncommerce/utils/mutations/update-cart-items-quantity.ts @@ -1,4 +1,4 @@ -import { cartPayloadFragment } from '@framework/utils/queries/get-checkout-query' +import { cartPayloadFragment } from '@framework/utils/queries/get-cart-query' const updateCartItemsQuantityMutation = ` mutation UpdateCartItemsQuantity($updateCartItemsQuantityInput: UpdateCartItemsQuantityInput!) { diff --git a/framework/reactioncommerce/utils/queries/account-cart-by-account-id.ts b/framework/reactioncommerce/utils/queries/account-cart-by-account-id.ts index 3e245b569..f8fcbab7e 100644 --- a/framework/reactioncommerce/utils/queries/account-cart-by-account-id.ts +++ b/framework/reactioncommerce/utils/queries/account-cart-by-account-id.ts @@ -1,4 +1,4 @@ -import { cartQueryFragment } from '@framework/utils/queries/get-checkout-query' +import { cartQueryFragment } from '@framework/utils/queries/get-cart-query' const accountCartByAccountIdQuery = ` query accountCartByAccountIdQuery($accountId: ID!, $shopId: ID!, $itemsAfterCursor: ConnectionCursor) { diff --git a/framework/reactioncommerce/utils/queries/get-anonymous-cart.ts b/framework/reactioncommerce/utils/queries/get-anonymous-cart.ts index b92130dd3..dc2c433c7 100644 --- a/framework/reactioncommerce/utils/queries/get-anonymous-cart.ts +++ b/framework/reactioncommerce/utils/queries/get-anonymous-cart.ts @@ -1,4 +1,4 @@ -import { cartQueryFragment } from '../queries/get-checkout-query' +import { cartQueryFragment } from './get-cart-query' export const getAnomymousCart = ` query anonymousCartByCartIdQuery($cartId: ID!, $cartToken: String!, $itemsAfterCursor: ConnectionCursor) { diff --git a/framework/reactioncommerce/utils/queries/get-checkout-query.ts b/framework/reactioncommerce/utils/queries/get-cart-query.ts similarity index 98% rename from framework/reactioncommerce/utils/queries/get-checkout-query.ts rename to framework/reactioncommerce/utils/queries/get-cart-query.ts index f601a35e9..bae98d0b0 100644 --- a/framework/reactioncommerce/utils/queries/get-checkout-query.ts +++ b/framework/reactioncommerce/utils/queries/get-cart-query.ts @@ -221,7 +221,7 @@ export const minOrderQuantityFailureDetailsFragment = ` quantity ` -const getCheckoutQuery = /* GraphQL */ ` +const getCartQuery = /* GraphQL */ ` query($checkoutId: ID!) { node(id: $checkoutId) { ... on Checkout { @@ -238,4 +238,4 @@ export const cartQueryFragment = ` } ` -export default getCheckoutQuery +export default getCartQuery diff --git a/framework/reactioncommerce/utils/queries/index.ts b/framework/reactioncommerce/utils/queries/index.ts index 857648471..a484027e1 100644 --- a/framework/reactioncommerce/utils/queries/index.ts +++ b/framework/reactioncommerce/utils/queries/index.ts @@ -4,7 +4,7 @@ export { default as catalogItemsQuery } from './catalog-items-query' export { default as getAllProductsPathtsQuery } from './get-all-products-paths-query' export { default as getAllProductVendors } from './get-all-product-vendors-query' export { default as getCollectionProductsQuery } from './get-collection-products-query' -export { default as getCheckoutQuery } from './get-checkout-query' +export { default as getCartQuery } from './get-cart-query' export { default as getAllPagesQuery } from './get-all-pages-query' export { default as getPageQuery } from './get-page-query' export { default as viewerQuery } from './viewer-query'