[PWA-595] GraphQL Build Warning (magento#2421)

* Rename checkout fragments and restructure Cart operations * Rename cart fragments Co-authored-by: Devagouda <[email protected]>
saphaljha · May 26, 2020 · e69419d · e69419d
1 parent ec0b9ca
commit e69419d
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 60 deletions.
diff --git a/packages/venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingForm.js b/packages/venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingForm.js
@@ -14,8 +14,8 @@ import Region from '../../../Region';
 import TextInput from '../../../TextInput';
 import { CartPageFragment } from '../../cartPageFragments.gql';
 import defaultClasses from './shippingForm.css';
-import { GET_SHIPPING_METHODS } from './shippingMethods';
-import { ShippingMethodsFragment } from './shippingMethodsFragments';
+import { GET_SHIPPING_METHODS } from './shippingMethods.gql';
+import { ShippingMethodsCartFragment } from './shippingMethodsFragments.gql';
 
 const ShippingForm = props => {
     const { hasMethods, selectedShippingFields, setIsCartUpdating } = props;
@@ -99,12 +99,12 @@ export const SET_SHIPPING_ADDRESS_MUTATION = gql`
             cart {
                 id
                 ...CartPageFragment
-                ...ShippingMethodsFragment
+                ...ShippingMethodsCartFragment
                 ...ShippingInformationFragment
             }
         }
     }
     ${CartPageFragment}
-    ${ShippingMethodsFragment}
+    ${ShippingMethodsCartFragment}
     ${ShippingInformationFragment}
 `;
diff --git a/.../venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingMethods.gql.js b/.../venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingMethods.gql.js
@@ -0,0 +1,20 @@
+import gql from 'graphql-tag';
+
+import { ShippingMethodsCartFragment } from './shippingMethodsFragments.gql';
+
+export const GET_SHIPPING_METHODS = gql`
+    query GetShippingMethods($cartId: String!) {
+        cart(cart_id: $cartId) @connection(key: "Cart") {
+            id
+            ...ShippingMethodsCartFragment
+        }
+    }
+    ${ShippingMethodsCartFragment}
+`;
+
+export default {
+    mutations: {},
+    queries: {
+        getShippingMethodsQuery: GET_SHIPPING_METHODS
+    }
+};
diff --git a/...ages/venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingMethods.js b/...ages/venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingMethods.js
@@ -1,13 +1,12 @@
 import React, { Fragment } from 'react';
-import gql from 'graphql-tag';
 import { Form } from 'informed';
 import { useShippingMethods } from '@magento/peregrine/lib/talons/CartPage/PriceAdjustments/ShippingMethods/useShippingMethods';
 
 import { mergeClasses } from '../../../../classify';
 import Button from '../../../Button';
 import ShippingForm from './shippingForm';
 import defaultClasses from './shippingMethods.css';
-import { ShippingMethodsFragment } from './shippingMethodsFragments';
+import ShippingMethodsOperations from './shippingMethods.gql';
 import ShippingRadios from './shippingRadios';
 
 const ShippingMethods = props => {
@@ -19,11 +18,7 @@ const ShippingMethods = props => {
         selectedShippingMethod,
         shippingMethods,
         showForm
-    } = useShippingMethods({
-        queries: {
-            getShippingMethodsQuery: GET_SHIPPING_METHODS
-        }
-    });
+    } = useShippingMethods({ ...ShippingMethodsOperations });
 
     const classes = mergeClasses(defaultClasses, props.classes);
 
@@ -74,13 +69,3 @@ const ShippingMethods = props => {
 };
 
 export default ShippingMethods;
-
-export const GET_SHIPPING_METHODS = gql`
-    query GetShippingMethods($cartId: String!) {
-        cart(cart_id: $cartId) @connection(key: "Cart") {
-            id
-            ...ShippingMethodsFragment
-        }
-    }
-    ${ShippingMethodsFragment}
-`;
diff --git a/...ippingMethods/shippingMethodsFragments.js → ...ngMethods/shippingMethodsFragments.gql.js b/...ippingMethods/shippingMethodsFragments.js → ...ngMethods/shippingMethodsFragments.gql.js
@@ -6,8 +6,8 @@ import gql from 'graphql-tag';
  * It is intentionally not included in the CartPageFragment. Make sure you are
  * conscious about the side effects when including it in queries and mutations.
  */
-export const AvailableShippingMethodsFragment = gql`
-    fragment AvailableShippingMethodsFragment on Cart {
+export const AvailableShippingMethodsCartFragment = gql`
+    fragment AvailableShippingMethodsCartFragment on Cart {
         id
         shipping_addresses {
             available_shipping_methods {
@@ -25,8 +25,8 @@ export const AvailableShippingMethodsFragment = gql`
     }
 `;
 
-export const SelectedShippingMethodFragment = gql`
-    fragment SelectedShippingMethodFragment on Cart {
+export const SelectedShippingMethodCartFragment = gql`
+    fragment SelectedShippingMethodCartFragment on Cart {
         id
         shipping_addresses {
             selected_shipping_method {
@@ -37,11 +37,11 @@ export const SelectedShippingMethodFragment = gql`
     }
 `;
 
-export const ShippingMethodsFragment = gql`
-    fragment ShippingMethodsFragment on Cart {
+export const ShippingMethodsCartFragment = gql`
+    fragment ShippingMethodsCartFragment on Cart {
         id
-        ...AvailableShippingMethodsFragment
-        ...SelectedShippingMethodFragment
+        ...AvailableShippingMethodsCartFragment
+        ...SelectedShippingMethodCartFragment
         shipping_addresses {
             country {
                 code
@@ -52,6 +52,6 @@ export const ShippingMethodsFragment = gql`
             }
         }
     }
-    ${AvailableShippingMethodsFragment}
-    ${SelectedShippingMethodFragment}
+    ${AvailableShippingMethodsCartFragment}
+    ${SelectedShippingMethodCartFragment}
 `;
diff --git a/packages/venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingRadios.js b/packages/venia-ui/lib/components/CartPage/PriceAdjustments/ShippingMethods/shippingRadios.js
@@ -8,7 +8,7 @@ import RadioGroup from '../../../RadioGroup';
 import { CartPageFragment } from '../../cartPageFragments.gql';
 import ShippingRadio from './shippingRadio';
 import defaultClasses from './shippingRadios.css';
-import { SelectedShippingMethodFragment } from './shippingMethodsFragments';
+import { SelectedShippingMethodCartFragment } from './shippingMethodsFragments.gql';
 
 const ShippingRadios = props => {
     const {
@@ -70,15 +70,15 @@ export const SET_SHIPPING_METHOD_MUTATION = gql`
             cart {
                 id
                 ...CartPageFragment
-                ...SelectedShippingMethodFragment
+                ...SelectedShippingMethodCartFragment
                 # Intentionally do not re-fetch available methods because
                 #  a) they are wrong in the mutation response
                 #  b) it is expensive to recalculate.
             }
         }
     }
     ${CartPageFragment}
-    ${SelectedShippingMethodFragment}
+    ${SelectedShippingMethodCartFragment}
 `;
 
 ShippingRadios.propTypes = {

diff --git a/packages/venia-ui/lib/components/CartPage/ProductListing/product.js b/packages/venia-ui/lib/components/CartPage/ProductListing/product.js
@@ -13,7 +13,7 @@ import Icon from '../../Icon';
 import Image from '../../Image';
 import defaultClasses from './product.css';
 import { CartPageFragment } from '../cartPageFragments.gql';
-import { AvailableShippingMethodsFragment } from '../PriceAdjustments/ShippingMethods/shippingMethodsFragments';
+import { AvailableShippingMethodsCartFragment } from '../PriceAdjustments/ShippingMethods/shippingMethodsFragments.gql';
 const IMAGE_SIZE = 100;
 
 const errorIcon = <Icon src={AlertCircleIcon} attrs={{ width: 18 }} />;
@@ -129,12 +129,12 @@ export const REMOVE_ITEM_MUTATION = gql`
             cart {
                 id
                 ...CartPageFragment
-                ...AvailableShippingMethodsFragment
+                ...AvailableShippingMethodsCartFragment
             }
         }
     }
     ${CartPageFragment}
-    ${AvailableShippingMethodsFragment}
+    ${AvailableShippingMethodsCartFragment}
 `;
 
 export const UPDATE_QUANTITY_MUTATION = gql`
@@ -152,10 +152,10 @@ export const UPDATE_QUANTITY_MUTATION = gql`
             cart {
                 id
                 ...CartPageFragment
-                ...AvailableShippingMethodsFragment
+                ...AvailableShippingMethodsCartFragment
             }
         }
     }
     ${CartPageFragment}
-    ${AvailableShippingMethodsFragment}
+    ${AvailableShippingMethodsCartFragment}
 `;
diff --git a/packages/venia-ui/lib/components/CheckoutPage/ShippingInformation/EditForm/editForm.gql.js b/packages/venia-ui/lib/components/CheckoutPage/ShippingInformation/EditForm/editForm.gql.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag';
 
 import { ShippingInformationFragment } from '../shippingInformationFragments.gql';
-import { ShippingMethodsFragment } from '../../ShippingMethod/shippingMethodFragments.gql';
+import { ShippingMethodsCheckoutFragment } from '../../ShippingMethod/shippingMethodFragments.gql';
 
 export const SET_SHIPPING_INFORMATION_MUTATION = gql`
     mutation SetShippingInformation(
@@ -25,12 +25,12 @@ export const SET_SHIPPING_INFORMATION_MUTATION = gql`
             cart {
                 id
                 ...ShippingInformationFragment
-                ...ShippingMethodsFragment
+                ...ShippingMethodsCheckoutFragment
             }
         }
     }
     ${ShippingInformationFragment}
-    ${ShippingMethodsFragment}
+    ${ShippingMethodsCheckoutFragment}
 `;
 
 export default {

diff --git a/packages/venia-ui/lib/components/CheckoutPage/ShippingMethod/shippingMethod.gql.js b/packages/venia-ui/lib/components/CheckoutPage/ShippingMethod/shippingMethod.gql.js
@@ -3,20 +3,20 @@ import gql from 'graphql-tag';
 import { PriceSummaryFragment } from '@magento/venia-ui/lib/components/CartPage/PriceSummary/priceSummaryFragments';
 
 import {
-    AvailableShippingMethodsFragment,
-    SelectedShippingMethodFragment
+    AvailableShippingMethodsCheckoutFragment,
+    SelectedShippingMethodCheckoutFragment
 } from './shippingMethodFragments.gql';
 
 export const GET_SELECTED_AND_AVAILABLE_SHIPPING_METHODS = gql`
     query getSelectedAndAvailableShippingMethods($cartId: String!) {
         cart(cart_id: $cartId) @connection(key: "Cart") {
             id
-            ...AvailableShippingMethodsFragment
-            ...SelectedShippingMethodFragment
+            ...AvailableShippingMethodsCheckoutFragment
+            ...SelectedShippingMethodCheckoutFragment
         }
     }
-    ${AvailableShippingMethodsFragment}
-    ${SelectedShippingMethodFragment}
+    ${AvailableShippingMethodsCheckoutFragment}
+    ${SelectedShippingMethodCheckoutFragment}
 `;
 
 export const SET_SHIPPING_METHOD = gql`
@@ -29,15 +29,15 @@ export const SET_SHIPPING_METHOD = gql`
         ) @connection(key: "setShippingMethodsOnCart") {
             cart {
                 id
-                ...SelectedShippingMethodFragment
+                ...SelectedShippingMethodCheckoutFragment
                 ...PriceSummaryFragment
                 # Intentionally do not re-fetch available methods because
                 #  a) they are wrong in the mutation response
                 #  b) it is expensive to recalculate.
             }
         }
     }
-    ${SelectedShippingMethodFragment}
+    ${SelectedShippingMethodCheckoutFragment}
     ${PriceSummaryFragment}
 `;
 

diff --git a/packages/venia-ui/lib/components/CheckoutPage/ShippingMethod/shippingMethodFragments.gql.js b/packages/venia-ui/lib/components/CheckoutPage/ShippingMethod/shippingMethodFragments.gql.js
@@ -5,8 +5,8 @@ import gql from 'graphql-tag';
  * causes the backend to make remote queries to carriers for real-time data.
  * Make sure you are conscious about the side effects when including it in queries and mutations.
  */
-export const AvailableShippingMethodsFragment = gql`
-    fragment AvailableShippingMethodsFragment on Cart {
+export const AvailableShippingMethodsCheckoutFragment = gql`
+    fragment AvailableShippingMethodsCheckoutFragment on Cart {
         id
         shipping_addresses {
             available_shipping_methods {
@@ -24,8 +24,8 @@ export const AvailableShippingMethodsFragment = gql`
     }
 `;
 
-export const SelectedShippingMethodFragment = gql`
-    fragment SelectedShippingMethodFragment on Cart {
+export const SelectedShippingMethodCheckoutFragment = gql`
+    fragment SelectedShippingMethodCheckoutFragment on Cart {
         id
         shipping_addresses {
             selected_shipping_method {
@@ -41,11 +41,11 @@ export const SelectedShippingMethodFragment = gql`
     }
 `;
 
-export const ShippingMethodsFragment = gql`
-    fragment ShippingMethodsFragment on Cart {
+export const ShippingMethodsCheckoutFragment = gql`
+    fragment ShippingMethodsCheckoutFragment on Cart {
         id
-        ...AvailableShippingMethodsFragment
-        ...SelectedShippingMethodFragment
+        ...AvailableShippingMethodsCheckoutFragment
+        ...SelectedShippingMethodCheckoutFragment
         shipping_addresses {
             country {
                 code
@@ -56,6 +56,6 @@ export const ShippingMethodsFragment = gql`
             }
         }
     }
-    ${AvailableShippingMethodsFragment}
-    ${SelectedShippingMethodFragment}
+    ${AvailableShippingMethodsCheckoutFragment}
+    ${SelectedShippingMethodCheckoutFragment}
 `;