chore: Clean up dev config & generated types

packages/admin-ui/src/lib/core/src/common/generated-types.ts

@@ -1623,13 +1623,11 @@ export type ModifyOrderInput = {
 export type AddItemInput = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
-  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type AdjustOrderLineInput = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
-  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type SurchargeInput = {
@@ -3854,7 +3852,7 @@ export type OrderLine = Node & {
   discounts: Array<Adjustment>;
   taxLines: Array<TaxLine>;
   order: Order;
-  customFields?: Maybe<OrderLineCustomFields>;
+  customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -4599,17 +4597,6 @@ export type HistoryEntrySortParameter = {
   updatedAt?: Maybe<SortOrder>;
 };
 
-export type OrderLineCustomFields = {
-  __typename?: 'OrderLineCustomFields';
-  test?: Maybe<Scalars['String']>;
-  test2?: Maybe<Scalars['String']>;
-};
-
-export type OrderLineCustomFieldsInput = {
-  test?: Maybe<Scalars['String']>;
-  test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
   native?: Maybe<NativeAuthInput>;
 };
@@ -4961,7 +4948,7 @@ export type GetClientStateQuery = { networkStatus: (
     & UserStatusFragment
   ), uiState: (
     { __typename?: 'UiState' }
-    & Pick<UiState, 'language'>
+    & Pick<UiState, 'language' | 'theme'>
   ) };
 
 export type SetActiveChannelMutationVariables = Exact<{

packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts

@@ -1424,13 +1424,11 @@ export type ModifyOrderInput = {
 export type AddItemInput = {
     productVariantId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type AdjustOrderLineInput = {
     orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type SurchargeInput = {
@@ -3607,7 +3605,7 @@ export type OrderLine = Node & {
     discounts: Array<Adjustment>;
     taxLines: Array<TaxLine>;
     order: Order;
-    customFields?: Maybe<OrderLineCustomFields>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -4323,16 +4321,6 @@ export type HistoryEntrySortParameter = {
     updatedAt?: Maybe<SortOrder>;
 };
 
-export type OrderLineCustomFields = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
-export type OrderLineCustomFieldsInput = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
     native?: Maybe<NativeAuthInput>;
 };

packages/common/src/generated-shop-types.ts

@@ -181,7 +181,6 @@ export type Mutation = {
 export type MutationAddItemToOrderArgs = {
     productVariantId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type MutationRemoveOrderLineArgs = {
@@ -191,7 +190,6 @@ export type MutationRemoveOrderLineArgs = {
 export type MutationAdjustOrderLineArgs = {
     orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type MutationApplyCouponCodeArgs = {
@@ -1926,7 +1924,7 @@ export type OrderLine = Node & {
     discounts: Array<Adjustment>;
     taxLines: Array<TaxLine>;
     order: Order;
-    customFields?: Maybe<OrderLineCustomFields>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -2744,17 +2742,6 @@ export type UpdateOrderInput = {
     customFields?: Maybe<Scalars['JSON']>;
 };
 
-export type OrderLineCustomFields = {
-    __typename?: 'OrderLineCustomFields';
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
-export type OrderLineCustomFieldsInput = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
     native?: Maybe<NativeAuthInput>;
 };

packages/common/src/generated-types.ts

@@ -1586,13 +1586,11 @@ export type ModifyOrderInput = {
 export type AddItemInput = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
-  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type AdjustOrderLineInput = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
-  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type SurchargeInput = {
@@ -3816,7 +3814,7 @@ export type OrderLine = Node & {
   discounts: Array<Adjustment>;
   taxLines: Array<TaxLine>;
   order: Order;
-  customFields?: Maybe<OrderLineCustomFields>;
+  customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -4561,17 +4559,6 @@ export type HistoryEntrySortParameter = {
   updatedAt?: Maybe<SortOrder>;
 };
 
-export type OrderLineCustomFields = {
-  __typename?: 'OrderLineCustomFields';
-  test?: Maybe<Scalars['String']>;
-  test2?: Maybe<Scalars['String']>;
-};
-
-export type OrderLineCustomFieldsInput = {
-  test?: Maybe<Scalars['String']>;
-  test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
   native?: Maybe<NativeAuthInput>;
 };

packages/core/e2e/graphql/generated-e2e-admin-types.ts

@@ -1424,13 +1424,11 @@ export type ModifyOrderInput = {
 export type AddItemInput = {
     productVariantId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type AdjustOrderLineInput = {
     orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type SurchargeInput = {
@@ -3607,7 +3605,7 @@ export type OrderLine = Node & {
     discounts: Array<Adjustment>;
     taxLines: Array<TaxLine>;
     order: Order;
-    customFields?: Maybe<OrderLineCustomFields>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -4323,16 +4321,6 @@ export type HistoryEntrySortParameter = {
     updatedAt?: Maybe<SortOrder>;
 };
 
-export type OrderLineCustomFields = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
-export type OrderLineCustomFieldsInput = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
     native?: Maybe<NativeAuthInput>;
 };

packages/core/e2e/graphql/generated-e2e-shop-types.ts

@@ -179,7 +179,6 @@ export type Mutation = {
 export type MutationAddItemToOrderArgs = {
     productVariantId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type MutationRemoveOrderLineArgs = {
@@ -189,7 +188,6 @@ export type MutationRemoveOrderLineArgs = {
 export type MutationAdjustOrderLineArgs = {
     orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type MutationApplyCouponCodeArgs = {
@@ -1868,7 +1866,7 @@ export type OrderLine = Node & {
     discounts: Array<Adjustment>;
     taxLines: Array<TaxLine>;
     order: Order;
-    customFields?: Maybe<OrderLineCustomFields>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -2634,16 +2632,6 @@ export type UpdateOrderInput = {
     customFields?: Maybe<Scalars['JSON']>;
 };
 
-export type OrderLineCustomFields = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
-export type OrderLineCustomFieldsInput = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
     native?: Maybe<NativeAuthInput>;
 };

packages/dev-server/dev-config.ts

@@ -2,51 +2,19 @@
 import { AdminUiPlugin } from '@vendure/admin-ui-plugin';
 import { AssetServerPlugin } from '@vendure/asset-server-plugin';
 import { ADMIN_API_PATH, API_PORT, SHOP_API_PATH } from '@vendure/common/lib/shared-constants';
-import { Order, OrderService, OrderState, TransactionalConnection } from '@vendure/core';
 import {
-    CustomOrderProcess,
     DefaultJobQueuePlugin,
     DefaultLogger,
     DefaultSearchPlugin,
     examplePaymentHandler,
-    FulfillmentHandler,
-    LanguageCode,
-    Logger,
     LogLevel,
     manualFulfillmentHandler,
-    PermissionDefinition,
-    Surcharge,
     VendureConfig,
 } from '@vendure/core';
-import { ElasticsearchPlugin } from '@vendure/elasticsearch-plugin';
 import { defaultEmailHandlers, EmailPlugin } from '@vendure/email-plugin';
 import path from 'path';
 import { ConnectionOptions } from 'typeorm';
 
-let connection: TransactionalConnection;
-let orderService: OrderService;
-const customerValidationProcess: CustomOrderProcess<OrderState> = {
-    // The init method allows us to inject services
-    // and other providers
-    init(injector) {
-        connection = injector.get(TransactionalConnection);
-        orderService = injector.get(OrderService);
-    },
-
-    // The logic for enforcing our validation goes here
-    async onTransitionStart(fromState, toState, data) {
-        if (fromState === 'AddingItems' && toState === 'ArrangingPayment') {
-            const { ctx, order } = data;
-            await orderService.addSurchargeToOrder(ctx, order.id, {
-                description: '3% payment surcharge',
-                sku: 'PAYMENT_SURCHARGE',
-                listPrice: Math.round(order.subTotal * 0.03),
-                listPriceIncludesTax: ctx.channel.pricesIncludeTax,
-            });
-        }
-    },
-};
-
 /**
  * Config settings used during development
  */
@@ -75,9 +43,6 @@ export const devConfig: VendureConfig = {
         requireVerification: true,
         customPermissions: [],
     },
-    orderOptions: {
-        process: [customerValidationProcess],
-    },
     dbConnectionOptions: {
         synchronize: false,
         logging: false,
@@ -87,12 +52,7 @@ export const devConfig: VendureConfig = {
     paymentOptions: {
         paymentMethodHandlers: [examplePaymentHandler],
     },
-    customFields: {
-        OrderLine: [
-            { name: 'test', type: 'string', nullable: true },
-            { name: 'test2', type: 'string', nullable: true },
-        ],
-    },
+    customFields: {},
     logger: new DefaultLogger({ level: LogLevel.Info }),
     importExportOptions: {
         importAssetsDir: path.join(__dirname, 'import-assets'),

packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts

@@ -1424,13 +1424,11 @@ export type ModifyOrderInput = {
 export type AddItemInput = {
     productVariantId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type AdjustOrderLineInput = {
     orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type SurchargeInput = {
@@ -3607,7 +3605,7 @@ export type OrderLine = Node & {
     discounts: Array<Adjustment>;
     taxLines: Array<TaxLine>;
     order: Order;
-    customFields?: Maybe<OrderLineCustomFields>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -4323,16 +4321,6 @@ export type HistoryEntrySortParameter = {
     updatedAt?: Maybe<SortOrder>;
 };
 
-export type OrderLineCustomFields = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
-export type OrderLineCustomFieldsInput = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
     native?: Maybe<NativeAuthInput>;
 };