chore: Tidy up & minor fixes

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

@@ -828,14 +828,9 @@ export type CreateProductOptionInput = {
   translations: Array<ProductOptionGroupTranslationInput>;
 };
 
-export type CreateProductVariantCustomFieldsInput = {
-  gtin?: InputMaybe<Scalars['String']>;
-  weight?: InputMaybe<Scalars['Int']>;
-};
-
 export type CreateProductVariantInput = {
   assetIds?: InputMaybe<Array<Scalars['ID']>>;
-  customFields?: InputMaybe<CreateProductVariantCustomFieldsInput>;
+  customFields?: InputMaybe<Scalars['JSON']>;
   facetValueIds?: InputMaybe<Array<Scalars['ID']>>;
   featuredAssetId?: InputMaybe<Scalars['ID']>;
   optionIds?: InputMaybe<Array<Scalars['ID']>>;
@@ -4565,7 +4560,7 @@ export type ProductVariant = Node & {
   channels: Array<Channel>;
   createdAt: Scalars['DateTime'];
   currencyCode: CurrencyCode;
-  customFields?: Maybe<ProductVariantCustomFields>;
+  customFields?: Maybe<Scalars['JSON']>;
   enabled: Scalars['Boolean'];
   facetValues: Array<FacetValue>;
   featuredAsset?: Maybe<Asset>;
@@ -4599,18 +4594,11 @@ export type ProductVariantStockMovementsArgs = {
   options?: InputMaybe<StockMovementListOptions>;
 };
 
-export type ProductVariantCustomFields = {
-  __typename?: 'ProductVariantCustomFields';
-  gtin?: Maybe<Scalars['String']>;
-  weight?: Maybe<Scalars['Int']>;
-};
-
 export type ProductVariantFilterParameter = {
   createdAt?: InputMaybe<DateOperators>;
   currencyCode?: InputMaybe<StringOperators>;
   enabled?: InputMaybe<BooleanOperators>;
   facetValueId?: InputMaybe<IdOperators>;
-  gtin?: InputMaybe<StringOperators>;
   id?: InputMaybe<IdOperators>;
   languageCode?: InputMaybe<StringOperators>;
   name?: InputMaybe<StringOperators>;
@@ -4625,7 +4613,6 @@ export type ProductVariantFilterParameter = {
   trackInventory?: InputMaybe<StringOperators>;
   updatedAt?: InputMaybe<DateOperators>;
   useGlobalOutOfStockThreshold?: InputMaybe<BooleanOperators>;
-  weight?: InputMaybe<NumberOperators>;
 };
 
 export type ProductVariantList = PaginatedList & {
@@ -4649,7 +4636,6 @@ export type ProductVariantListOptions = {
 
 export type ProductVariantSortParameter = {
   createdAt?: InputMaybe<SortOrder>;
-  gtin?: InputMaybe<SortOrder>;
   id?: InputMaybe<SortOrder>;
   name?: InputMaybe<SortOrder>;
   outOfStockThreshold?: InputMaybe<SortOrder>;
@@ -4661,7 +4647,6 @@ export type ProductVariantSortParameter = {
   stockLevel?: InputMaybe<SortOrder>;
   stockOnHand?: InputMaybe<SortOrder>;
   updatedAt?: InputMaybe<SortOrder>;
-  weight?: InputMaybe<SortOrder>;
 };
 
 export type ProductVariantTranslation = {
@@ -6228,14 +6213,9 @@ export type UpdateProductOptionInput = {
   translations?: InputMaybe<Array<ProductOptionGroupTranslationInput>>;
 };
 
-export type UpdateProductVariantCustomFieldsInput = {
-  gtin?: InputMaybe<Scalars['String']>;
-  weight?: InputMaybe<Scalars['Int']>;
-};
-
 export type UpdateProductVariantInput = {
   assetIds?: InputMaybe<Array<Scalars['ID']>>;
-  customFields?: InputMaybe<UpdateProductVariantCustomFieldsInput>;
+  customFields?: InputMaybe<Scalars['JSON']>;
   enabled?: InputMaybe<Scalars['Boolean']>;
   facetValueIds?: InputMaybe<Array<Scalars['ID']>>;
   featuredAssetId?: InputMaybe<Scalars['ID']>;

packages/common/src/generated-types.ts

@@ -823,14 +823,9 @@ export type CreateProductOptionInput = {
   translations: Array<ProductOptionGroupTranslationInput>;
 };
 
-export type CreateProductVariantCustomFieldsInput = {
-  gtin?: InputMaybe<Scalars['String']>;
-  weight?: InputMaybe<Scalars['Int']>;
-};
-
 export type CreateProductVariantInput = {
   assetIds?: InputMaybe<Array<Scalars['ID']>>;
-  customFields?: InputMaybe<CreateProductVariantCustomFieldsInput>;
+  customFields?: InputMaybe<Scalars['JSON']>;
   facetValueIds?: InputMaybe<Array<Scalars['ID']>>;
   featuredAssetId?: InputMaybe<Scalars['ID']>;
   optionIds?: InputMaybe<Array<Scalars['ID']>>;
@@ -3220,7 +3215,7 @@ export type MutationDeleteShippingMethodArgs = {
 
 
 export type MutationDeleteShippingMethodsArgs = {
-  ids?: InputMaybe<Array<Scalars['ID']>>;
+  ids: Array<Scalars['ID']>;
 };
 
 
@@ -4496,7 +4491,7 @@ export type ProductVariant = Node & {
   channels: Array<Channel>;
   createdAt: Scalars['DateTime'];
   currencyCode: CurrencyCode;
-  customFields?: Maybe<ProductVariantCustomFields>;
+  customFields?: Maybe<Scalars['JSON']>;
   enabled: Scalars['Boolean'];
   facetValues: Array<FacetValue>;
   featuredAsset?: Maybe<Asset>;
@@ -4530,18 +4525,11 @@ export type ProductVariantStockMovementsArgs = {
   options?: InputMaybe<StockMovementListOptions>;
 };
 
-export type ProductVariantCustomFields = {
-  __typename?: 'ProductVariantCustomFields';
-  gtin?: Maybe<Scalars['String']>;
-  weight?: Maybe<Scalars['Int']>;
-};
-
 export type ProductVariantFilterParameter = {
   createdAt?: InputMaybe<DateOperators>;
   currencyCode?: InputMaybe<StringOperators>;
   enabled?: InputMaybe<BooleanOperators>;
   facetValueId?: InputMaybe<IdOperators>;
-  gtin?: InputMaybe<StringOperators>;
   id?: InputMaybe<IdOperators>;
   languageCode?: InputMaybe<StringOperators>;
   name?: InputMaybe<StringOperators>;
@@ -4556,7 +4544,6 @@ export type ProductVariantFilterParameter = {
   trackInventory?: InputMaybe<StringOperators>;
   updatedAt?: InputMaybe<DateOperators>;
   useGlobalOutOfStockThreshold?: InputMaybe<BooleanOperators>;
-  weight?: InputMaybe<NumberOperators>;
 };
 
 export type ProductVariantList = PaginatedList & {
@@ -4580,7 +4567,6 @@ export type ProductVariantListOptions = {
 
 export type ProductVariantSortParameter = {
   createdAt?: InputMaybe<SortOrder>;
-  gtin?: InputMaybe<SortOrder>;
   id?: InputMaybe<SortOrder>;
   name?: InputMaybe<SortOrder>;
   outOfStockThreshold?: InputMaybe<SortOrder>;
@@ -4592,7 +4578,6 @@ export type ProductVariantSortParameter = {
   stockLevel?: InputMaybe<SortOrder>;
   stockOnHand?: InputMaybe<SortOrder>;
   updatedAt?: InputMaybe<SortOrder>;
-  weight?: InputMaybe<SortOrder>;
 };
 
 export type ProductVariantTranslation = {
@@ -6147,14 +6132,9 @@ export type UpdateProductOptionInput = {
   translations?: InputMaybe<Array<ProductOptionGroupTranslationInput>>;
 };
 
-export type UpdateProductVariantCustomFieldsInput = {
-  gtin?: InputMaybe<Scalars['String']>;
-  weight?: InputMaybe<Scalars['Int']>;
-};
-
 export type UpdateProductVariantInput = {
   assetIds?: InputMaybe<Array<Scalars['ID']>>;
-  customFields?: InputMaybe<UpdateProductVariantCustomFieldsInput>;
+  customFields?: InputMaybe<Scalars['JSON']>;
   enabled?: InputMaybe<Scalars['Boolean']>;
   facetValueIds?: InputMaybe<Array<Scalars['ID']>>;
   featuredAssetId?: InputMaybe<Scalars['ID']>;

packages/core/src/api/resolvers/admin/zone.resolver.ts

@@ -20,7 +20,7 @@ import { Allow } from '../../decorators/allow.decorator';
 import { Ctx } from '../../decorators/request-context.decorator';
 import { Transaction } from '../../decorators/transaction.decorator';
 
-@Resolver('Zone')
+@Resolver()
 export class ZoneResolver {
     constructor(private zoneService: ZoneService) {}
 

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

@@ -229,6 +229,7 @@ export class ChannelService {
             ...input,
             defaultCurrencyCode: input.currencyCode,
             availableCurrencyCodes: input.availableCurrencyCodes ?? [input.currencyCode],
+            availableLanguageCodes: input.availableLanguageCodes ?? [input.defaultLanguageCode],
         });
         const defaultLanguageValidationResult = await this.validateDefaultLanguageCode(ctx, input);
         if (isGraphQlErrorResult(defaultLanguageValidationResult)) {

packages/core/src/service/services/facet-value.service.ts

@@ -87,6 +87,7 @@ export class FacetValueService {
     ): Promise<PaginatedList<Translated<FacetValue>>> {
         return this.listQueryBuilder
             .build(FacetValue, options, {
+                ctx,
                 relations: relations ?? ['facet'],
                 channelId: ctx.channelId,
             })

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

@@ -73,7 +73,7 @@ export class ZoneService {
 
     async findAll(ctx: RequestContext, options?: ListQueryOptions<Zone>): Promise<PaginatedList<Zone>> {
         return this.listQueryBuilder
-            .build(Zone, options, { relations: ['members'] })
+            .build(Zone, options, { relations: ['members'], ctx })
             .getManyAndCount()
             .then(([items, totalItems]) => {
                 const translated = items.map((zone, i) => {

scripts/codegen/generate-graphql-types.ts

@@ -10,7 +10,7 @@ import { downloadIntrospectionSchema } from './download-introspection-schema';
 
 const CLIENT_QUERY_FILES = [
     path.join(__dirname, '../../packages/admin-ui/src/lib/core/src/data/definitions/**/*.ts'),
-    path.join(__dirname, '../../packages/admin-ui/src/lib/**/*.graphql.ts'),
+    path.join(__dirname, '../../packages/admin-ui/src/lib/**/*.ts'),
 ];
 
 const specFileToIgnore = [