feat(order): update to support @apollo/client 3 and apollo-angular 2 (#…

…1229)
graycoreio · Jan 20, 2021 · 64a941d · 64a941d
1 parent dc66f8b
commit 64a941d
Show file tree

Hide file tree

Showing 30 changed files with 43 additions and 34 deletions.
diff --git a/libs/order/driver/magento/2.4.0/src/order.service.ts b/libs/order/driver/magento/2.4.0/src/order.service.ts
@@ -1,6 +1,6 @@
+import {Apollo} from 'apollo-angular';
 import { DocumentNode } from 'graphql';
 import { Inject, Injectable } from '@angular/core';
-import { Apollo } from 'apollo-angular';
 
 import { Observable, throwError } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';

diff --git a/libs/order/driver/magento/2.4.0/src/queries/fragments/order-address.ts b/libs/order/driver/magento/2.4.0/src/queries/fragments/order-address.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderAddressFragment = gql`
   fragment orderAddress on GraycoreOrderAddress {

diff --git a/libs/order/driver/magento/2.4.0/src/queries/fragments/order-invoice.ts b/libs/order/driver/magento/2.4.0/src/queries/fragments/order-invoice.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderShipmentItemFragment } from './order-shipment-item';
 import { orderAddressFragment } from './order-address';

diff --git a/libs/order/driver/magento/2.4.0/src/queries/fragments/order-item.ts b/libs/order/driver/magento/2.4.0/src/queries/fragments/order-item.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderItemFragment = gql`
   fragment orderItem on GraycoreOrderItem {

diff --git a/libs/order/driver/magento/2.4.0/src/queries/fragments/order-payment.ts b/libs/order/driver/magento/2.4.0/src/queries/fragments/order-payment.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderPaymentFragment = gql`
   fragment orderPayment on GraycoreOrderPayment {

diff --git a/libs/order/driver/magento/2.4.0/src/queries/fragments/order-shipment-item.ts b/libs/order/driver/magento/2.4.0/src/queries/fragments/order-shipment-item.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderItemFragment } from './order-item';
 

diff --git a/libs/order/driver/magento/2.4.0/src/queries/fragments/order-shipment-tracking.ts b/libs/order/driver/magento/2.4.0/src/queries/fragments/order-shipment-tracking.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderShipmentTrackingFragment = gql`
   fragment orderShipmentTracking on GraycoreOrderShipmentTracking {

diff --git a/libs/order/driver/magento/2.4.0/src/queries/fragments/order-shipment.ts b/libs/order/driver/magento/2.4.0/src/queries/fragments/order-shipment.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderShipmentItemFragment } from './order-shipment-item';
 import { orderShipmentTrackingFragment } from './order-shipment-tracking';

diff --git a/libs/order/driver/magento/2.4.0/src/queries/fragments/order.ts b/libs/order/driver/magento/2.4.0/src/queries/fragments/order.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 import { orderItemFragment } from './order-item';
 import { orderAddressFragment } from './order-address';
 import { orderShipmentFragment } from './order-shipment';

diff --git a/libs/order/driver/magento/2.4.0/src/queries/get-guest-orders.ts b/libs/order/driver/magento/2.4.0/src/queries/get-guest-orders.ts
@@ -1,5 +1,5 @@
+import {gql} from 'apollo-angular';
 import { DocumentNode } from 'graphql';
-import gql from 'graphql-tag';
 
 import { daffBuildFragmentNameSpread, daffBuildFragmentDefinition } from '@daffodil/core/graphql';
 

diff --git a/libs/order/driver/magento/2.4.0/src/validators/get-orders.spec.ts b/libs/order/driver/magento/2.4.0/src/validators/get-orders.spec.ts
@@ -1,4 +1,4 @@
-import { ApolloQueryResult } from 'apollo-client';
+import {ApolloQueryResult} from '@apollo/client/core';
 
 import { DaffOrderInvalidAPIResponseError } from '@daffodil/order/driver';
 import { MagentoGetGuestOrdersResponse } from '@daffodil/order/driver/magento/2.4.0';
@@ -17,7 +17,6 @@ describe('Order | Driver | Magento | 2.4.0 | Validator | GetOrders', () => {
       },
       loading: null,
       networkStatus: null,
-      stale: null
     };
   });
 

diff --git a/libs/order/driver/magento/2.4.0/src/validators/get-orders.ts b/libs/order/driver/magento/2.4.0/src/validators/get-orders.ts
@@ -1,11 +1,11 @@
-import { ApolloQueryResult } from 'apollo-client';
+import {ApolloQueryResult} from '@apollo/client/core';
 
 import { DaffOrderInvalidAPIResponseError } from '@daffodil/order/driver';
 
 import { MagentoGetGuestOrdersResponse } from '../queries/public_api';
 
 export const validateGetOrdersResponse = (response: ApolloQueryResult<MagentoGetGuestOrdersResponse>) => {
-  if (response.data.graycoreGuestOrders.orders) {
+  if (response.data?.graycoreGuestOrders?.orders) {
     if (response.data.graycoreGuestOrders.orders.reduce((acc, order) => acc && !!(
       order.billing_address
         && order.shipping_address

diff --git a/libs/order/driver/magento/2.4.1/src/order.service.ts b/libs/order/driver/magento/2.4.1/src/order.service.ts
@@ -1,6 +1,6 @@
+import {Apollo} from 'apollo-angular';
 import { DocumentNode } from 'graphql';
 import { Inject, Injectable } from '@angular/core';
-import { Apollo } from 'apollo-angular';
 
 import { Observable, throwError } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-address.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-address.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderAddressFragment = gql`
   fragment orderAddress on OrderAddress {

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-item.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-item.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderItemFragment } from './order-item';
 

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-total.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit-total.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderCreditTotalFragment = gql`
   fragment orderCreditTotal on CreditMemoTotal {

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-credit.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderCreditItemFragment } from './order-credit-item';
 import { orderCreditTotalFragment } from './order-credit-total';

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-item.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-item.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderItemFragment } from './order-item';
 

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-total.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice-total.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderInvoiceTotalFragment = gql`
   fragment orderInvoiceTotal on InvoiceTotal {

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-invoice.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderInvoiceItemFragment } from './order-invoice-item';
 import { orderInvoiceTotalFragment } from './order-invoice-total';

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-item.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-item.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 export const orderBundleItemSelectedOptionFragment = gql`
   fragment orderBundleItemSelectedOption on ItemSelectedBundleOption {

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-payment.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-payment.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderPaymentFragment = gql`
   fragment orderPayment on OrderPaymentMethod {

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-item.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-item.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderItemFragment } from './order-item';
 

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-tracking.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment-tracking.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderShipmentTrackingFragment = gql`
   fragment orderShipmentTracking on ShipmentTracking {

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-shipment.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderShipmentItemFragment } from './order-shipment-item';
 import { orderShipmentTrackingFragment } from './order-shipment-tracking';

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order-total.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order-total.ts
@@ -1,4 +1,5 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
+
 
 export const orderTotalFragment = gql`
   fragment orderTotal on OrderTotal {

diff --git a/libs/order/driver/magento/2.4.1/src/queries/fragments/order.ts b/libs/order/driver/magento/2.4.1/src/queries/fragments/order.ts
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import {gql} from 'apollo-angular';
 
 import { orderItemFragment } from './order-item';
 import { orderAddressFragment } from './order-address';

diff --git a/libs/order/driver/magento/2.4.1/src/queries/get-guest-orders.ts b/libs/order/driver/magento/2.4.1/src/queries/get-guest-orders.ts
@@ -1,5 +1,5 @@
+import {gql} from 'apollo-angular';
 import { DocumentNode } from 'graphql';
-import gql from 'graphql-tag';
 
 import { daffBuildFragmentNameSpread, daffBuildFragmentDefinition } from '@daffodil/core/graphql';
 

diff --git a/libs/order/driver/magento/2.4.1/src/validators/get-orders.spec.ts b/libs/order/driver/magento/2.4.1/src/validators/get-orders.spec.ts
@@ -1,4 +1,4 @@
-import { ApolloQueryResult } from 'apollo-client';
+import {ApolloQueryResult} from '@apollo/client/core';
 
 import { DaffOrderInvalidAPIResponseError } from '@daffodil/order/driver';
 import { MagentoGetGuestOrdersResponse } from '@daffodil/order/driver/magento/2.4.1';
@@ -17,7 +17,6 @@ describe('Order | Driver | Magento | 2.4.1 | Validator | GetOrders', () => {
       },
       loading: null,
       networkStatus: null,
-      stale: null
     };
   });
 

diff --git a/libs/order/driver/magento/2.4.1/src/validators/get-orders.ts b/libs/order/driver/magento/2.4.1/src/validators/get-orders.ts
@@ -1,11 +1,11 @@
-import { ApolloQueryResult } from 'apollo-client';
+import {ApolloQueryResult} from '@apollo/client/core';
 
 import { DaffOrderInvalidAPIResponseError } from '@daffodil/order/driver';
 
 import { MagentoGetGuestOrdersResponse } from '../queries/public_api';
 
 export const validateGetOrdersResponse = (response: ApolloQueryResult<MagentoGetGuestOrdersResponse>) => {
-  if (response.data.graycoreGuestOrders.items) {
+  if (response.data?.graycoreGuestOrders?.items) {
     if (response.data.graycoreGuestOrders.items.reduce((acc, order) => acc && !!(
       order.billing_address
         && order.shipping_address