Browse Source

chore: Update generated types after merge

Michael Bromley 5 years ago
parent
commit
98958d7515

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

@@ -1276,7 +1276,7 @@ export type UpdateGlobalSettingsResult = GlobalSettings | ChannelDefaultLanguage
 /**
  * @description
  * The state of a Job in the JobQueue
- *
+ * 
  * @docsCategory common
  */
 export enum JobState {
@@ -2181,7 +2181,7 @@ export type EmailAddressConflictError = ErrorResult & {
 /**
  * @description
  * ISO 4217 currency code
- *
+ * 
  * @docsCategory common
  */
 export enum CurrencyCode {
@@ -2615,7 +2615,7 @@ export type CustomFieldConfig = StringCustomFieldConfig | LocaleStringCustomFiel
  * region or script modifier (e.g. de_AT). The selection available is based
  * on the [Unicode CLDR summary list](https://unicode-org.github.io/cldr-staging/charts/37/summary/root.html)
  * and includes the major spoken languages of the world and any widely-used variants.
- *
+ * 
  * @docsCategory common
  */
 export enum LanguageCode {
@@ -2940,7 +2940,7 @@ export enum LanguageCode {
  * @description
  * Permissions for administrators and customers. Used to control access to
  * GraphQL resolvers via the {@link Allow} decorator.
- *
+ * 
  * @docsCategory common
  */
 export enum Permission {
@@ -6268,6 +6268,13 @@ export type UpdatePaymentMethodMutation = { updatePaymentMethod: (
 export type GlobalSettingsFragment = (
   { __typename?: 'GlobalSettings' }
   & Pick<GlobalSettings, 'id' | 'availableLanguages' | 'trackInventory' | 'outOfStockThreshold'>
+  & { serverConfig: (
+    { __typename?: 'ServerConfig' }
+    & { orderProcess: Array<(
+      { __typename?: 'OrderProcessState' }
+      & Pick<OrderProcessState, 'name'>
+    )> }
+  ) }
 );
 
 export type GetGlobalSettingsQueryVariables = Exact<{ [key: string]: never; }>;
@@ -8081,6 +8088,8 @@ export namespace UpdatePaymentMethod {
 
 export namespace GlobalSettings {
   export type Fragment = GlobalSettingsFragment;
+  export type ServerConfig = (NonNullable<GlobalSettingsFragment['serverConfig']>);
+  export type OrderProcess = NonNullable<(NonNullable<(NonNullable<GlobalSettingsFragment['serverConfig']>)['orderProcess']>)[number]>;
 }
 
 export namespace GetGlobalSettings {

+ 2 - 2
packages/dev-server/dev-config.ts

@@ -118,8 +118,8 @@ function getDbConfig(): ConnectionOptions {
         default:
             console.log('Using mysql connection');
             return {
-                synchronize: false,
-                type: 'mysql',
+                synchronize: true,
+                type: 'mariadb',
                 host: '127.0.0.1',
                 port: 3306,
                 username: 'root',