chore: Fixes & clean-up after merge

packages/admin-ui/src/lib/core/src/data/providers/customer-data.service.ts

@@ -1,3 +1,4 @@
+import { LogicalOperator } from '../../common/generated-types';
 import * as Codegen from '../../common/generated-types';
 import {
     ADD_CUSTOMERS_TO_GROUP,
@@ -10,8 +11,8 @@ import {
     DELETE_CUSTOMER_GROUP,
     DELETE_CUSTOMER_NOTE,
     GET_CUSTOMER,
-    GET_CUSTOMER_GROUP_WITH_CUSTOMERS,
     GET_CUSTOMER_GROUPS,
+    GET_CUSTOMER_GROUP_WITH_CUSTOMERS,
     GET_CUSTOMER_HISTORY,
     GET_CUSTOMER_LIST,
     REMOVE_CUSTOMERS_FROM_GROUP,

packages/admin-ui/src/lib/core/src/data/providers/order-data.service.ts

@@ -4,33 +4,33 @@ import {
     ADD_MANUAL_PAYMENT_TO_ORDER,
     ADD_NOTE_TO_ORDER,
     ADJUST_DRAFT_ORDER_LINE,
+    APPLY_COUPON_CODE_TO_DRAFT_ORDER,
     CANCEL_ORDER,
     CANCEL_PAYMENT,
     CREATE_DRAFT_ORDER,
     CREATE_FULFILLMENT,
+    DELETE_DRAFT_ORDER,
     DELETE_ORDER_NOTE,
+    DRAFT_ORDER_ELIGIBLE_SHIPPING_METHODS,
     GET_ORDER,
     GET_ORDERS_LIST,
     GET_ORDER_HISTORY,
     GET_ORDER_SUMMARY,
     MODIFY_ORDER,
     REFUND_ORDER,
+    REMOVE_COUPON_CODE_FROM_DRAFT_ORDER,
     REMOVE_DRAFT_ORDER_LINE,
     SETTLE_PAYMENT,
     SETTLE_REFUND,
+    SET_BILLING_ADDRESS_FOR_DRAFT_ORDER,
     SET_CUSTOMER_FOR_DRAFT_ORDER,
+    SET_DRAFT_ORDER_SHIPPING_METHOD,
+    SET_SHIPPING_ADDRESS_FOR_DRAFT_ORDER,
     TRANSITION_FULFILLMENT_TO_STATE,
     TRANSITION_ORDER_TO_STATE,
     TRANSITION_PAYMENT_TO_STATE,
     UPDATE_ORDER_CUSTOM_FIELDS,
     UPDATE_ORDER_NOTE,
-    SET_SHIPPING_ADDRESS_FOR_DRAFT_ORDER,
-    SET_BILLING_ADDRESS_FOR_DRAFT_ORDER,
-    APPLY_COUPON_CODE_TO_DRAFT_ORDER,
-    REMOVE_COUPON_CODE_FROM_DRAFT_ORDER,
-    DRAFT_ORDER_ELIGIBLE_SHIPPING_METHODS,
-    SET_DRAFT_ORDER_SHIPPING_METHOD,
-    DELETE_DRAFT_ORDER,
 } from '../definitions/order-definitions';
 
 import { BaseDataService } from './base-data.service';
@@ -214,20 +214,20 @@ export class OrderDataService {
     }
 
     deleteDraftOrder(orderId: string) {
-        return this.baseDataService.mutate<Codegen.DeleteDraftOrderMutation, DeleteDraftOrderMutationVariables>(
+        return this.baseDataService.mutate<Codegen.DeleteDraftOrderMutation, Codegen.DeleteDraftOrderMutationVariables>(
             DELETE_DRAFT_ORDER,
             { orderId },
         );
     }
 
-    addItemToDraftOrder(orderId: string, input: AddItemToDraftOrderInput) {
-        return this.baseDataService.mutate<Codegen.AddItemToDraftOrderMutation, AddItemToDraftOrderMutationVariables>(
+    addItemToDraftOrder(orderId: string, input: Codegen.AddItemToDraftOrderInput) {
+        return this.baseDataService.mutate<Codegen.AddItemToDraftOrderMutation, Codegen.AddItemToDraftOrderMutationVariables>(
             ADD_ITEM_TO_DRAFT_ORDER,
             { orderId, input },
         );
     }
 
-    adjustDraftOrderLine(orderId: string, input: AdjustDraftOrderLineInput) {
+    adjustDraftOrderLine(orderId: string, input: Codegen.AdjustDraftOrderLineInput) {
         return this.baseDataService.mutate<
             Codegen.AdjustDraftOrderLineMutation,
             Codegen.AdjustDraftOrderLineMutationVariables
@@ -243,7 +243,7 @@ export class OrderDataService {
 
     setCustomerForDraftOrder(
         orderId: string,
-        { customerId, input }: { customerId?: string; input?: CreateCustomerInput },
+        { customerId, input }: { customerId?: string; input?: Codegen.CreateCustomerInput },
     ) {
         return this.baseDataService.mutate<
             Codegen.SetCustomerForDraftOrderMutation,
@@ -251,14 +251,14 @@ export class OrderDataService {
         >(SET_CUSTOMER_FOR_DRAFT_ORDER, { orderId, customerId, input });
     }
 
-    setDraftOrderShippingAddress(orderId: string, input: CreateAddressInput) {
+    setDraftOrderShippingAddress(orderId: string, input: Codegen.CreateAddressInput) {
         return this.baseDataService.mutate<
             Codegen.SetDraftOrderShippingAddressMutation,
             Codegen.SetDraftOrderShippingAddressMutationVariables
         >(SET_SHIPPING_ADDRESS_FOR_DRAFT_ORDER, { orderId, input });
     }
 
-    setDraftOrderBillingAddress(orderId: string, input: CreateAddressInput) {
+    setDraftOrderBillingAddress(orderId: string, input: Codegen.CreateAddressInput) {
         return this.baseDataService.mutate<
             Codegen.SetDraftOrderBillingAddressMutation,
             Codegen.SetDraftOrderBillingAddressMutationVariables

packages/admin-ui/src/lib/core/src/public_api.ts

@@ -156,6 +156,8 @@ export * from './shared/components/pagination-controls/pagination-controls.compo
 export * from './shared/components/product-multi-selector-dialog/product-multi-selector-dialog.component';
 export * from './shared/components/product-search-input/product-search-input.component';
 export * from './shared/components/product-variant-selector/product-variant-selector.component';
+export * from './shared/components/radio-card/radio-card-fieldset.component';
+export * from './shared/components/radio-card/radio-card.component';
 export * from './shared/components/rich-text-editor/external-image-dialog/external-image-dialog.component';
 export * from './shared/components/rich-text-editor/link-dialog/link-dialog.component';
 export * from './shared/components/rich-text-editor/prosemirror/context-menu/context-menu.component';

packages/admin-ui/src/lib/order/src/components/draft-order-detail/draft-order-detail.component.ts

@@ -11,12 +11,13 @@ import {
     ModalService,
     NotificationService,
     Order,
-    OrderDetail,
+    OrderDetailFragment,
     ServerConfigService,
 } from '@vendure/admin-ui/core';
-import { OrderTransitionService } from '@vendure/admin-ui/order';
 import { combineLatest, Observable, Subject } from 'rxjs';
 import { switchMap, take } from 'rxjs/operators';
+
+import { OrderTransitionService } from '../../providers/order-transition.service';
 import { SelectAddressDialogComponent } from '../select-address-dialog/select-address-dialog.component';
 import { SelectCustomerDialogComponent } from '../select-customer-dialog/select-customer-dialog.component';
 import { SelectShippingMethodDialogComponent } from '../select-shipping-method-dialog/select-shipping-method-dialog.component';
@@ -28,7 +29,7 @@ import { SelectShippingMethodDialogComponent } from '../select-shipping-method-d
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DraftOrderDetailComponent
-    extends BaseDetailComponent<OrderDetail.Fragment>
+    extends BaseDetailComponent<OrderDetailFragment>
     implements OnInit, OnDestroy
 {
     detailForm = new FormGroup({});
@@ -228,7 +229,7 @@ export class DraftOrderDetailComponent
         return typeof input === 'object' && !!input.id;
     }
 
-    protected setFormValues(entity: Order.Fragment): void {
+    protected setFormValues(entity: OrderDetailFragment): void {
         // empty
     }
 }

packages/admin-ui/src/lib/order/src/components/draft-order-variant-selector/draft-order-variant-selector.component.html

@@ -1,9 +1,9 @@
 <div class="card">
     <div class="card-block">
         <h4 class="card-title">{{ 'order.add-item-to-order' | translate }}</h4>
-        <vdr-product-selector
+        <vdr-product-variant-selector
             (productSelected)="selectedVariantId$.next($event.productVariantId)"
-        ></vdr-product-selector>
+        ></vdr-product-variant-selector>
     </div>
     <div class="card-block" *ngIf="selectedVariant$ | async as selectedVariant">
         <div class="variant-details">

packages/admin-ui/src/lib/order/src/components/draft-order-variant-selector/draft-order-variant-selector.component.ts

@@ -1,13 +1,6 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import {
-    CurrencyCode,
-    CustomFieldConfig,
-    DataService,
-    GetProductVariant,
-    GetProductVariantQuery,
-    ProductSelectorSearchQuery,
-} from '@vendure/admin-ui/core';
+import { CurrencyCode, CustomFieldConfig, DataService, GetProductVariantQuery } from '@vendure/admin-ui/core';
 import { Observable, Subject } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
@@ -23,7 +16,7 @@ export class DraftOrderVariantSelectorComponent implements OnInit {
     @Output() addItem = new EventEmitter<{ productVariantId: string; quantity: number; customFields: any }>();
     customFieldsFormGroup = new FormGroup({});
     selectedVariant$: Observable<GetProductVariantQuery['productVariant']>;
-    selectedVariantId$ = new Subject<string>();
+    selectedVariantId$ = new Subject<string | undefined>();
     quantity = 1;
     constructor(private dataService: DataService) {}
 

packages/admin-ui/src/lib/order/src/public_api.ts

@@ -1,6 +1,9 @@
 // This file was generated by the build-public-api.ts script
 export * from './components/add-manual-payment-dialog/add-manual-payment-dialog.component';
 export * from './components/cancel-order-dialog/cancel-order-dialog.component';
+export * from './components/coupon-code-selector/coupon-code-selector.component';
+export * from './components/draft-order-detail/draft-order-detail.component';
+export * from './components/draft-order-variant-selector/draft-order-variant-selector.component';
 export * from './components/fulfill-order-dialog/fulfill-order-dialog.component';
 export * from './components/fulfillment-card/fulfillment-card.component';
 export * from './components/fulfillment-detail/fulfillment-detail.component';
@@ -27,9 +30,14 @@ export * from './components/payment-detail/payment-detail.component';
 export * from './components/payment-state-label/payment-state-label.component';
 export * from './components/refund-order-dialog/refund-order-dialog.component';
 export * from './components/refund-state-label/refund-state-label.component';
+export * from './components/select-address-dialog/select-address-dialog.component';
+export * from './components/select-address-dialog/select-address-dialog.graphql';
+export * from './components/select-customer-dialog/select-customer-dialog.component';
+export * from './components/select-shipping-method-dialog/select-shipping-method-dialog.component';
 export * from './components/settle-refund-dialog/settle-refund-dialog.component';
 export * from './components/simple-item-list/simple-item-list.component';
 export * from './order.module';
 export * from './order.routes';
 export * from './providers/order-transition.service';
 export * from './providers/routing/order-resolver';
+export * from './providers/routing/order.guard';

packages/core/e2e/draft-order.e2e-spec.ts

@@ -1,5 +1,5 @@
 /* tslint:disable:no-non-null-assertion */
-import { mergeConfig, orderPercentageDiscount } from '@vendure/core';
+import { DefaultLogger, mergeConfig, orderPercentageDiscount } from '@vendure/core';
 import { createErrorResultGuard, createTestEnvironment, ErrorResultGuard } from '@vendure/testing';
 import gql from 'graphql-tag';
 import path from 'path';
@@ -22,6 +22,7 @@ import { GET_ACTIVE_CUSTOMER_ORDERS } from './graphql/shop-definitions';
 describe('Draft Orders resolver', () => {
     const { server, adminClient, shopClient } = createTestEnvironment(
         mergeConfig(testConfig(), {
+            logger: new DefaultLogger(),
             paymentOptions: {
                 paymentMethodHandlers: [singleStageRefundablePaymentMethod],
             },

packages/core/src/service/services/order.service.ts

@@ -321,7 +321,7 @@ export class OrderService {
                 channelId: ctx.channelId,
                 ctx,
             })
-            .andWhere('order.state != "Draft"')
+            .andWhere('order.state != :draftState', { draftState: 'Draft' })
             .andWhere('order.customer.id = :customerId', { customerId })
             .getManyAndCount()
             .then(([items, totalItems]) => {