Răsfoiți Sursa

fix(admin-ui): Remove references to obsolete languageCode arguments

Relates to #128
Michael Bromley 6 ani în urmă
părinte
comite
1e810680f8

+ 33 - 48
admin-ui/src/app/common/generated-types.ts

@@ -206,6 +206,7 @@ export type Channel = Node & {
 
 export type Collection = Node & {
   __typename?: 'Collection',
+  isPrivate: Scalars['Boolean'],
   id: Scalars['ID'],
   createdAt: Scalars['DateTime'],
   updatedAt: Scalars['DateTime'],
@@ -221,7 +222,6 @@ export type Collection = Node & {
   filters: Array<ConfigurableOperation>,
   translations: Array<CollectionTranslation>,
   productVariants: ProductVariantList,
-  isPrivate: Scalars['Boolean'],
   customFields?: Maybe<Scalars['JSON']>,
 };
 
@@ -237,13 +237,13 @@ export type CollectionBreadcrumb = {
 };
 
 export type CollectionFilterParameter = {
+  isPrivate?: Maybe<BooleanOperators>,
   createdAt?: Maybe<DateOperators>,
   updatedAt?: Maybe<DateOperators>,
   languageCode?: Maybe<StringOperators>,
   name?: Maybe<StringOperators>,
   position?: Maybe<NumberOperators>,
   description?: Maybe<StringOperators>,
-  isPrivate?: Maybe<BooleanOperators>,
 };
 
 export type CollectionList = PaginatedList & {
@@ -1009,6 +1009,7 @@ export enum DeletionResult {
 
 export type Facet = Node & {
   __typename?: 'Facet',
+  isPrivate: Scalars['Boolean'],
   id: Scalars['ID'],
   createdAt: Scalars['DateTime'],
   updatedAt: Scalars['DateTime'],
@@ -1017,17 +1018,16 @@ export type Facet = Node & {
   code: Scalars['String'],
   values: Array<FacetValue>,
   translations: Array<FacetTranslation>,
-  isPrivate: Scalars['Boolean'],
   customFields?: Maybe<Scalars['JSON']>,
 };
 
 export type FacetFilterParameter = {
+  isPrivate?: Maybe<BooleanOperators>,
   createdAt?: Maybe<DateOperators>,
   updatedAt?: Maybe<DateOperators>,
   languageCode?: Maybe<StringOperators>,
   name?: Maybe<StringOperators>,
   code?: Maybe<StringOperators>,
-  isPrivate?: Maybe<BooleanOperators>,
 };
 
 export type FacetList = PaginatedList & {
@@ -1700,7 +1700,6 @@ export type Mutation = {
   addNoteToOrder: Order,
   /** Update an existing PaymentMethod */
   updatePaymentMethod: PaymentMethod,
-  reindex: JobInfo,
   /** Create a new ProductOptionGroup */
   createProductOptionGroup: ProductOptionGroup,
   /** Update an existing ProductOptionGroup */
@@ -1709,6 +1708,7 @@ export type Mutation = {
   createProductOption: ProductOption,
   /** Create a new ProductOption within a ProductOptionGroup */
   updateProductOption: ProductOption,
+  reindex: JobInfo,
   /** Create a new Product */
   createProduct: Product,
   /** Update an existing Product */
@@ -2365,6 +2365,7 @@ export type PriceRange = {
 
 export type Product = Node & {
   __typename?: 'Product',
+  enabled: Scalars['Boolean'],
   id: Scalars['ID'],
   createdAt: Scalars['DateTime'],
   updatedAt: Scalars['DateTime'],
@@ -2379,18 +2380,17 @@ export type Product = Node & {
   facetValues: Array<FacetValue>,
   translations: Array<ProductTranslation>,
   collections: Array<Collection>,
-  enabled: Scalars['Boolean'],
   customFields?: Maybe<Scalars['JSON']>,
 };
 
 export type ProductFilterParameter = {
+  enabled?: Maybe<BooleanOperators>,
   createdAt?: Maybe<DateOperators>,
   updatedAt?: Maybe<DateOperators>,
   languageCode?: Maybe<StringOperators>,
   name?: Maybe<StringOperators>,
   slug?: Maybe<StringOperators>,
   description?: Maybe<StringOperators>,
-  enabled?: Maybe<BooleanOperators>,
 };
 
 export type ProductList = PaginatedList & {
@@ -2495,6 +2495,10 @@ export type ProductTranslationInput = {
 
 export type ProductVariant = Node & {
   __typename?: 'ProductVariant',
+  enabled: Scalars['Boolean'],
+  stockOnHand: Scalars['Int'],
+  trackInventory: Scalars['Boolean'],
+  stockMovements: StockMovementList,
   id: Scalars['ID'],
   productId: Scalars['ID'],
   createdAt: Scalars['DateTime'],
@@ -2513,10 +2517,6 @@ export type ProductVariant = Node & {
   options: Array<ProductOption>,
   facetValues: Array<FacetValue>,
   translations: Array<ProductVariantTranslation>,
-  enabled: Scalars['Boolean'],
-  stockOnHand: Scalars['Int'],
-  trackInventory: Scalars['Boolean'],
-  stockMovements: StockMovementList,
   customFields?: Maybe<Scalars['JSON']>,
 };
 
@@ -2526,6 +2526,9 @@ export type ProductVariantStockMovementsArgs = {
 };
 
 export type ProductVariantFilterParameter = {
+  enabled?: Maybe<BooleanOperators>,
+  stockOnHand?: Maybe<NumberOperators>,
+  trackInventory?: Maybe<BooleanOperators>,
   createdAt?: Maybe<DateOperators>,
   updatedAt?: Maybe<DateOperators>,
   languageCode?: Maybe<StringOperators>,
@@ -2535,9 +2538,6 @@ export type ProductVariantFilterParameter = {
   currencyCode?: Maybe<StringOperators>,
   priceIncludesTax?: Maybe<BooleanOperators>,
   priceWithTax?: Maybe<NumberOperators>,
-  enabled?: Maybe<BooleanOperators>,
-  stockOnHand?: Maybe<NumberOperators>,
-  trackInventory?: Maybe<BooleanOperators>,
 };
 
 export type ProductVariantList = PaginatedList & {
@@ -2554,6 +2554,7 @@ export type ProductVariantListOptions = {
 };
 
 export type ProductVariantSortParameter = {
+  stockOnHand?: Maybe<SortOrder>,
   id?: Maybe<SortOrder>,
   productId?: Maybe<SortOrder>,
   createdAt?: Maybe<SortOrder>,
@@ -2562,7 +2563,6 @@ export type ProductVariantSortParameter = {
   name?: Maybe<SortOrder>,
   price?: Maybe<SortOrder>,
   priceWithTax?: Maybe<SortOrder>,
-  stockOnHand?: Maybe<SortOrder>,
 };
 
 export type ProductVariantTranslation = {
@@ -2647,9 +2647,9 @@ export type Query = {
   orders: OrderList,
   paymentMethods: PaymentMethodList,
   paymentMethod?: Maybe<PaymentMethod>,
-  search: SearchResponse,
   productOptionGroups: Array<ProductOptionGroup>,
   productOptionGroup?: Maybe<ProductOptionGroup>,
+  search: SearchResponse,
   products: ProductList,
   /** Get a Product either by id or slug. If neither id nor slug is speicified, an error will result. */
   product?: Maybe<Product>,
@@ -2700,14 +2700,12 @@ export type QueryChannelArgs = {
 
 
 export type QueryCollectionsArgs = {
-  languageCode?: Maybe<LanguageCode>,
   options?: Maybe<CollectionListOptions>
 };
 
 
 export type QueryCollectionArgs = {
-  id: Scalars['ID'],
-  languageCode?: Maybe<LanguageCode>
+  id: Scalars['ID']
 };
 
 
@@ -2737,14 +2735,12 @@ export type QueryCustomerArgs = {
 
 
 export type QueryFacetsArgs = {
-  languageCode?: Maybe<LanguageCode>,
   options?: Maybe<FacetListOptions>
 };
 
 
 export type QueryFacetArgs = {
-  id: Scalars['ID'],
-  languageCode?: Maybe<LanguageCode>
+  id: Scalars['ID']
 };
 
 
@@ -2778,33 +2774,29 @@ export type QueryPaymentMethodArgs = {
 };
 
 
-export type QuerySearchArgs = {
-  input: SearchInput
-};
-
-
 export type QueryProductOptionGroupsArgs = {
-  languageCode?: Maybe<LanguageCode>,
   filterTerm?: Maybe<Scalars['String']>
 };
 
 
 export type QueryProductOptionGroupArgs = {
-  id: Scalars['ID'],
-  languageCode?: Maybe<LanguageCode>
+  id: Scalars['ID']
+};
+
+
+export type QuerySearchArgs = {
+  input: SearchInput
 };
 
 
 export type QueryProductsArgs = {
-  languageCode?: Maybe<LanguageCode>,
   options?: Maybe<ProductListOptions>
 };
 
 
 export type QueryProductArgs = {
   id?: Maybe<Scalars['ID']>,
-  slug?: Maybe<Scalars['String']>,
-  languageCode?: Maybe<LanguageCode>
+  slug?: Maybe<Scalars['String']>
 };
 
 
@@ -2970,6 +2962,7 @@ export type SearchResponse = {
 
 export type SearchResult = {
   __typename?: 'SearchResult',
+  enabled: Scalars['Boolean'],
   sku: Scalars['String'],
   slug: Scalars['String'],
   productId: Scalars['ID'],
@@ -2988,7 +2981,6 @@ export type SearchResult = {
   collectionIds: Array<Scalars['String']>,
   /** A relevence score for the result. Differs between database implementations */
   score: Scalars['Float'],
-  enabled: Scalars['Boolean'],
 };
 
 /** The price of a search result product, either as a range or as a single price */
@@ -3533,16 +3525,14 @@ export type GetCollectionFiltersQuery = ({ __typename?: 'Query' } & { collection
 export type CollectionFragment = ({ __typename?: 'Collection' } & Pick<Collection, 'id' | 'name' | 'description' | 'isPrivate' | 'languageCode'> & { featuredAsset: Maybe<({ __typename?: 'Asset' } & AssetFragment)>, assets: Array<({ __typename?: 'Asset' } & AssetFragment)>, filters: Array<({ __typename?: 'ConfigurableOperation' } & ConfigurableOperationFragment)>, translations: Array<({ __typename?: 'CollectionTranslation' } & Pick<CollectionTranslation, 'id' | 'languageCode' | 'name' | 'description'>)>, parent: Maybe<({ __typename?: 'Collection' } & Pick<Collection, 'id' | 'name'>)>, children: Maybe<Array<({ __typename?: 'Collection' } & Pick<Collection, 'id' | 'name'>)>> });
 
 export type GetCollectionListQueryVariables = {
-  options?: Maybe<CollectionListOptions>,
-  languageCode?: Maybe<LanguageCode>
+  options?: Maybe<CollectionListOptions>
 };
 
 
 export type GetCollectionListQuery = ({ __typename?: 'Query' } & { collections: ({ __typename?: 'CollectionList' } & Pick<CollectionList, 'totalItems'> & { items: Array<({ __typename?: 'Collection' } & Pick<Collection, 'id' | 'name' | 'description' | 'isPrivate'> & { featuredAsset: Maybe<({ __typename?: 'Asset' } & AssetFragment)>, parent: Maybe<({ __typename?: 'Collection' } & Pick<Collection, 'id'>)> })> }) });
 
 export type GetCollectionQueryVariables = {
-  id: Scalars['ID'],
-  languageCode?: Maybe<LanguageCode>
+  id: Scalars['ID']
 };
 
 
@@ -3682,16 +3672,14 @@ export type DeleteFacetValuesMutationVariables = {
 export type DeleteFacetValuesMutation = ({ __typename?: 'Mutation' } & { deleteFacetValues: Array<({ __typename?: 'DeletionResponse' } & Pick<DeletionResponse, 'result' | 'message'>)> });
 
 export type GetFacetListQueryVariables = {
-  options?: Maybe<FacetListOptions>,
-  languageCode?: Maybe<LanguageCode>
+  options?: Maybe<FacetListOptions>
 };
 
 
 export type GetFacetListQuery = ({ __typename?: 'Query' } & { facets: ({ __typename?: 'FacetList' } & Pick<FacetList, 'totalItems'> & { items: Array<({ __typename?: 'Facet' } & FacetWithValuesFragment)> }) });
 
 export type GetFacetWithValuesQueryVariables = {
-  id: Scalars['ID'],
-  languageCode?: Maybe<LanguageCode>
+  id: Scalars['ID']
 };
 
 
@@ -3840,24 +3828,21 @@ export type RemoveOptionGroupFromProductMutationVariables = {
 export type RemoveOptionGroupFromProductMutation = ({ __typename?: 'Mutation' } & { removeOptionGroupFromProduct: ({ __typename?: 'Product' } & Pick<Product, 'id'> & { optionGroups: Array<({ __typename?: 'ProductOptionGroup' } & Pick<ProductOptionGroup, 'id' | 'code'> & { options: Array<({ __typename?: 'ProductOption' } & Pick<ProductOption, 'id' | 'code'>)> })> }) });
 
 export type GetProductWithVariantsQueryVariables = {
-  id: Scalars['ID'],
-  languageCode?: Maybe<LanguageCode>
+  id: Scalars['ID']
 };
 
 
 export type GetProductWithVariantsQuery = ({ __typename?: 'Query' } & { product: Maybe<({ __typename?: 'Product' } & ProductWithVariantsFragment)> });
 
 export type GetProductListQueryVariables = {
-  options?: Maybe<ProductListOptions>,
-  languageCode?: Maybe<LanguageCode>
+  options?: Maybe<ProductListOptions>
 };
 
 
 export type GetProductListQuery = ({ __typename?: 'Query' } & { products: ({ __typename?: 'ProductList' } & Pick<ProductList, 'totalItems'> & { items: Array<({ __typename?: 'Product' } & Pick<Product, 'id' | 'enabled' | 'languageCode' | 'name' | 'slug'> & { featuredAsset: Maybe<({ __typename?: 'Asset' } & Pick<Asset, 'id' | 'preview'>)> })> }) });
 
 export type GetProductOptionGroupsQueryVariables = {
-  filterTerm?: Maybe<Scalars['String']>,
-  languageCode?: Maybe<LanguageCode>
+  filterTerm?: Maybe<Scalars['String']>
 };
 
 

+ 18 - 18
admin-ui/src/app/common/introspection-result.ts

@@ -95,24 +95,6 @@ const result: IntrospectionResultData = {
                     {
                         name: 'ProductVariant',
                     },
-                    {
-                        name: 'TaxRate',
-                    },
-                    {
-                        name: 'TaxCategory',
-                    },
-                    {
-                        name: 'CustomerGroup',
-                    },
-                    {
-                        name: 'ProductOption',
-                    },
-                    {
-                        name: 'FacetValue',
-                    },
-                    {
-                        name: 'Facet',
-                    },
                     {
                         name: 'StockAdjustment',
                     },
@@ -155,6 +137,24 @@ const result: IntrospectionResultData = {
                     {
                         name: 'Return',
                     },
+                    {
+                        name: 'TaxRate',
+                    },
+                    {
+                        name: 'TaxCategory',
+                    },
+                    {
+                        name: 'CustomerGroup',
+                    },
+                    {
+                        name: 'ProductOption',
+                    },
+                    {
+                        name: 'FacetValue',
+                    },
+                    {
+                        name: 'Facet',
+                    },
                     {
                         name: 'PaymentMethod',
                     },

+ 4 - 4
admin-ui/src/app/data/definitions/collection-definitions.ts

@@ -48,8 +48,8 @@ export const COLLECTION_FRAGMENT = gql`
 `;
 
 export const GET_COLLECTION_LIST = gql`
-    query GetCollectionList($options: CollectionListOptions, $languageCode: LanguageCode) {
-        collections(languageCode: $languageCode, options: $options) {
+    query GetCollectionList($options: CollectionListOptions) {
+        collections(options: $options) {
             items {
                 id
                 name
@@ -69,8 +69,8 @@ export const GET_COLLECTION_LIST = gql`
 `;
 
 export const GET_COLLECTION = gql`
-    query GetCollection($id: ID!, $languageCode: LanguageCode) {
-        collection(id: $id, languageCode: $languageCode) {
+    query GetCollection($id: ID!) {
+        collection(id: $id) {
             ...Collection
         }
     }

+ 4 - 4
admin-ui/src/app/data/definitions/facet-definitions.ts

@@ -93,8 +93,8 @@ export const DELETE_FACET_VALUES = gql`
 `;
 
 export const GET_FACET_LIST = gql`
-    query GetFacetList($options: FacetListOptions, $languageCode: LanguageCode) {
-        facets(languageCode: $languageCode, options: $options) {
+    query GetFacetList($options: FacetListOptions) {
+        facets(options: $options) {
             items {
                 ...FacetWithValues
             }
@@ -105,8 +105,8 @@ export const GET_FACET_LIST = gql`
 `;
 
 export const GET_FACET_WITH_VALUES = gql`
-    query GetFacetWithValues($id: ID!, $languageCode: LanguageCode) {
-        facet(id: $id, languageCode: $languageCode) {
+    query GetFacetWithValues($id: ID!) {
+        facet(id: $id) {
             ...FacetWithValues
         }
     }

+ 6 - 6
admin-ui/src/app/data/definitions/product-definitions.ts

@@ -222,8 +222,8 @@ export const REMOVE_OPTION_GROUP_FROM_PRODUCT = gql`
 `;
 
 export const GET_PRODUCT_WITH_VARIANTS = gql`
-    query GetProductWithVariants($id: ID!, $languageCode: LanguageCode) {
-        product(languageCode: $languageCode, id: $id) {
+    query GetProductWithVariants($id: ID!) {
+        product(id: $id) {
             ...ProductWithVariants
         }
     }
@@ -231,8 +231,8 @@ export const GET_PRODUCT_WITH_VARIANTS = gql`
 `;
 
 export const GET_PRODUCT_LIST = gql`
-    query GetProductList($options: ProductListOptions, $languageCode: LanguageCode) {
-        products(languageCode: $languageCode, options: $options) {
+    query GetProductList($options: ProductListOptions) {
+        products(options: $options) {
             items {
                 id
                 enabled
@@ -250,8 +250,8 @@ export const GET_PRODUCT_LIST = gql`
 `;
 
 export const GET_PRODUCT_OPTION_GROUPS = gql`
-    query GetProductOptionGroups($filterTerm: String, $languageCode: LanguageCode) {
-        productOptionGroups(filterTerm: $filterTerm, languageCode: $languageCode) {
+    query GetProductOptionGroups($filterTerm: String) {
+        productOptionGroups(filterTerm: $filterTerm) {
             id
             languageCode
             code

+ 0 - 2
admin-ui/src/app/data/providers/collection-data.service.ts

@@ -45,7 +45,6 @@ export class CollectionDataService {
                     take,
                     skip,
                 },
-                languageCode: getDefaultLanguage(),
             },
         );
     }
@@ -53,7 +52,6 @@ export class CollectionDataService {
     getCollection(id: string) {
         return this.baseDataService.query<GetCollection.Query, GetCollection.Variables>(GET_COLLECTION, {
             id,
-            languageCode: getDefaultLanguage(),
         });
     }
 

+ 0 - 2
admin-ui/src/app/data/providers/facet-data.service.ts

@@ -37,7 +37,6 @@ export class FacetDataService {
                 take,
                 skip,
             },
-            languageCode: getDefaultLanguage(),
         });
     }
 
@@ -46,7 +45,6 @@ export class FacetDataService {
             GET_FACET_WITH_VALUES,
             {
                 id,
-                languageCode: getDefaultLanguage(),
             },
         );
     }

+ 0 - 3
admin-ui/src/app/data/providers/product-data.service.ts

@@ -73,7 +73,6 @@ export class ProductDataService {
                 take,
                 skip,
             },
-            languageCode: getDefaultLanguage(),
         });
     }
 
@@ -82,7 +81,6 @@ export class ProductDataService {
             GET_PRODUCT_WITH_VARIANTS,
             {
                 id,
-                languageCode: getDefaultLanguage(),
             },
         );
     }
@@ -207,7 +205,6 @@ export class ProductDataService {
             GET_PRODUCT_OPTION_GROUPS,
             {
                 filterTerm,
-                languageCode: getDefaultLanguage(),
             },
         );
     }