Merge pull request #879 from mirumee/refactor/collection-products-query

Update collection products query
saleor · Aug 31, 2020 · 5d0c0c1 · 5d0c0c1
2 parents 2c0e37f + f713349
commit 5d0c0c1
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ All notable, unreleased changes to this project will be documented in this file.
 - Fix product list data overfetching - #855 by @dominik-zeglen
 - Add Adyen payment gateway - #845 by @orzechdev
 - Fix crash on null price range - #875 by @orzechdev
+- Update collection products query - #879 by @orzechdev
 
 ## 2.10.4
 

diff --git a/src/views/Collection/Page.tsx b/src/views/Collection/Page.tsx
@@ -12,7 +12,7 @@ import { getDBIdFromGraphqlId, maybe } from "../../core/utils";
 
 import { FilterSidebar } from "../../@next/components/organisms/FilterSidebar";
 import { Collection_collection } from "./gqlTypes/Collection";
-import { CollectionProducts_products } from "./gqlTypes/CollectionProducts";
+import { CollectionProducts_collection_products } from "./gqlTypes/CollectionProducts";
 
 interface SortItem {
   label: string;
@@ -29,7 +29,7 @@ interface PageProps {
   displayLoader: boolean;
   filters: IFilters;
   hasNextPage: boolean;
-  products: CollectionProducts_products;
+  products: CollectionProducts_collection_products;
   sortOptions: SortOptions;
   clearFilters: () => void;
   onLoadMore: () => void;

diff --git a/src/views/Collection/View.tsx b/src/views/Collection/View.tsx
@@ -168,18 +168,18 @@ export const View: React.FC<ViewProps> = ({ match }) => {
                       (prev, next) => ({
                         ...prev,
                         products: {
-                          ...prev.products,
+                          ...prev.collection.products,
                           edges: [
-                            ...prev.products.edges,
-                            ...next.products.edges,
+                            ...prev.collection.products.edges,
+                            ...next.collection.products.edges,
                           ],
-                          pageInfo: next.products.pageInfo,
+                          pageInfo: next.collection.products.pageInfo,
                         },
                       }),
                       {
                         after:
-                          collectionProductsData.data.products.pageInfo
-                            .endCursor,
+                          collectionProductsData.data.collection.products
+                            .pageInfo.endCursor,
                       }
                     );
                   if (canDisplayFilters) {
@@ -201,14 +201,16 @@ export const View: React.FC<ViewProps> = ({ match }) => {
                           displayLoader={collectionData.loading}
                           hasNextPage={maybe(
                             () =>
-                              collectionProductsData.data.products.pageInfo
-                                .hasNextPage,
+                              collectionProductsData.data.collection.products
+                                .pageInfo.hasNextPage,
                             false
                           )}
                           sortOptions={sortOptions}
                           activeSortOption={filters.sortBy}
                           filters={filters}
-                          products={collectionProductsData.data.products}
+                          products={
+                            collectionProductsData.data.collection.products
+                          }
                           onAttributeFiltersChange={onFiltersChange}
                           onLoadMore={handleLoadMore}
                           activeFilters={

diff --git a/src/views/Collection/gqlTypes/CollectionProducts.ts b/src/views/Collection/gqlTypes/CollectionProducts.ts
@@ -8,7 +8,7 @@ import { AttributeInput, ProductOrder } from "./../../../../gqlTypes/globalTypes
 // GraphQL query operation: CollectionProducts
 // ====================================================
 
-export interface CollectionProducts_products_edges_node_thumbnail {
+export interface CollectionProducts_collection_products_edges_node_thumbnail {
   __typename: "Image";
   /**
    * The URL of the image.
@@ -20,15 +20,15 @@ export interface CollectionProducts_products_edges_node_thumbnail {
   alt: string | null;
 }
 
-export interface CollectionProducts_products_edges_node_thumbnail2x {
+export interface CollectionProducts_collection_products_edges_node_thumbnail2x {
   __typename: "Image";
   /**
    * The URL of the image.
    */
   url: string;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_start_gross {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_start_gross {
   __typename: "Money";
   /**
    * Amount of money.
@@ -40,7 +40,7 @@ export interface CollectionProducts_products_edges_node_pricing_priceRangeUndisc
   currency: string;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_start_net {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_start_net {
   __typename: "Money";
   /**
    * Amount of money.
@@ -52,19 +52,19 @@ export interface CollectionProducts_products_edges_node_pricing_priceRangeUndisc
   currency: string;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_start {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_start {
   __typename: "TaxedMoney";
   /**
    * Amount of money including taxes.
    */
-  gross: CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_start_gross;
+  gross: CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_start_gross;
   /**
    * Amount of money without taxes.
    */
-  net: CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_start_net;
+  net: CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_start_net;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_stop_gross {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_stop_gross {
   __typename: "Money";
   /**
    * Amount of money.
@@ -76,7 +76,7 @@ export interface CollectionProducts_products_edges_node_pricing_priceRangeUndisc
   currency: string;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_stop_net {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_stop_net {
   __typename: "Money";
   /**
    * Amount of money.
@@ -88,31 +88,31 @@ export interface CollectionProducts_products_edges_node_pricing_priceRangeUndisc
   currency: string;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_stop {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_stop {
   __typename: "TaxedMoney";
   /**
    * Amount of money including taxes.
    */
-  gross: CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_stop_gross;
+  gross: CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_stop_gross;
   /**
    * Amount of money without taxes.
    */
-  net: CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_stop_net;
+  net: CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_stop_net;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted {
   __typename: "TaxedMoneyRange";
   /**
    * Lower bound of a price range.
    */
-  start: CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_start | null;
+  start: CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_start | null;
   /**
    * Upper bound of a price range.
    */
-  stop: CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted_stop | null;
+  stop: CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted_stop | null;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRange_start_gross {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRange_start_gross {
   __typename: "Money";
   /**
    * Amount of money.
@@ -124,7 +124,7 @@ export interface CollectionProducts_products_edges_node_pricing_priceRange_start
   currency: string;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRange_start_net {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRange_start_net {
   __typename: "Money";
   /**
    * Amount of money.
@@ -136,19 +136,19 @@ export interface CollectionProducts_products_edges_node_pricing_priceRange_start
   currency: string;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRange_start {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRange_start {
   __typename: "TaxedMoney";
   /**
    * Amount of money including taxes.
    */
-  gross: CollectionProducts_products_edges_node_pricing_priceRange_start_gross;
+  gross: CollectionProducts_collection_products_edges_node_pricing_priceRange_start_gross;
   /**
    * Amount of money without taxes.
    */
-  net: CollectionProducts_products_edges_node_pricing_priceRange_start_net;
+  net: CollectionProducts_collection_products_edges_node_pricing_priceRange_start_net;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRange_stop_gross {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRange_stop_gross {
   __typename: "Money";
   /**
    * Amount of money.
@@ -160,7 +160,7 @@ export interface CollectionProducts_products_edges_node_pricing_priceRange_stop_
   currency: string;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRange_stop_net {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRange_stop_net {
   __typename: "Money";
   /**
    * Amount of money.
@@ -172,31 +172,31 @@ export interface CollectionProducts_products_edges_node_pricing_priceRange_stop_
   currency: string;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRange_stop {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRange_stop {
   __typename: "TaxedMoney";
   /**
    * Amount of money including taxes.
    */
-  gross: CollectionProducts_products_edges_node_pricing_priceRange_stop_gross;
+  gross: CollectionProducts_collection_products_edges_node_pricing_priceRange_stop_gross;
   /**
    * Amount of money without taxes.
    */
-  net: CollectionProducts_products_edges_node_pricing_priceRange_stop_net;
+  net: CollectionProducts_collection_products_edges_node_pricing_priceRange_stop_net;
 }
 
-export interface CollectionProducts_products_edges_node_pricing_priceRange {
+export interface CollectionProducts_collection_products_edges_node_pricing_priceRange {
   __typename: "TaxedMoneyRange";
   /**
    * Lower bound of a price range.
    */
-  start: CollectionProducts_products_edges_node_pricing_priceRange_start | null;
+  start: CollectionProducts_collection_products_edges_node_pricing_priceRange_start | null;
   /**
    * Upper bound of a price range.
    */
-  stop: CollectionProducts_products_edges_node_pricing_priceRange_stop | null;
+  stop: CollectionProducts_collection_products_edges_node_pricing_priceRange_stop | null;
 }
 
-export interface CollectionProducts_products_edges_node_pricing {
+export interface CollectionProducts_collection_products_edges_node_pricing {
   __typename: "ProductPricingInfo";
   /**
    * Whether it is in sale or not.
@@ -205,14 +205,14 @@ export interface CollectionProducts_products_edges_node_pricing {
   /**
    * The undiscounted price range of the product variants.
    */
-  priceRangeUndiscounted: CollectionProducts_products_edges_node_pricing_priceRangeUndiscounted | null;
+  priceRangeUndiscounted: CollectionProducts_collection_products_edges_node_pricing_priceRangeUndiscounted | null;
   /**
    * The discounted price range of the product variants.
    */
-  priceRange: CollectionProducts_products_edges_node_pricing_priceRange | null;
+  priceRange: CollectionProducts_collection_products_edges_node_pricing_priceRange | null;
 }
 
-export interface CollectionProducts_products_edges_node_category {
+export interface CollectionProducts_collection_products_edges_node_category {
   __typename: "Category";
   /**
    * The ID of the object.
@@ -221,7 +221,7 @@ export interface CollectionProducts_products_edges_node_category {
   name: string;
 }
 
-export interface CollectionProducts_products_edges_node {
+export interface CollectionProducts_collection_products_edges_node {
   __typename: "Product";
   /**
    * The ID of the object.
@@ -231,27 +231,27 @@ export interface CollectionProducts_products_edges_node {
   /**
    * The main thumbnail for a product.
    */
-  thumbnail: CollectionProducts_products_edges_node_thumbnail | null;
+  thumbnail: CollectionProducts_collection_products_edges_node_thumbnail | null;
   /**
    * The main thumbnail for a product.
    */
-  thumbnail2x: CollectionProducts_products_edges_node_thumbnail2x | null;
+  thumbnail2x: CollectionProducts_collection_products_edges_node_thumbnail2x | null;
   /**
    * Lists the storefront product's pricing, the current price and discounts, only meant for displaying.
    */
-  pricing: CollectionProducts_products_edges_node_pricing | null;
-  category: CollectionProducts_products_edges_node_category | null;
+  pricing: CollectionProducts_collection_products_edges_node_pricing | null;
+  category: CollectionProducts_collection_products_edges_node_category | null;
 }
 
-export interface CollectionProducts_products_edges {
+export interface CollectionProducts_collection_products_edges {
   __typename: "ProductCountableEdge";
   /**
    * The item at the end of the edge.
    */
-  node: CollectionProducts_products_edges_node;
+  node: CollectionProducts_collection_products_edges_node;
 }
 
-export interface CollectionProducts_products_pageInfo {
+export interface CollectionProducts_collection_products_pageInfo {
   __typename: "PageInfo";
   /**
    * When paginating forwards, the cursor to continue.
@@ -271,24 +271,36 @@ export interface CollectionProducts_products_pageInfo {
   startCursor: string | null;
 }
 
-export interface CollectionProducts_products {
+export interface CollectionProducts_collection_products {
   __typename: "ProductCountableConnection";
   /**
    * A total count of items in the collection.
    */
   totalCount: number | null;
-  edges: CollectionProducts_products_edges[];
+  edges: CollectionProducts_collection_products_edges[];
   /**
    * Pagination data for this connection.
    */
-  pageInfo: CollectionProducts_products_pageInfo;
+  pageInfo: CollectionProducts_collection_products_pageInfo;
+}
+
+export interface CollectionProducts_collection {
+  __typename: "Collection";
+  /**
+   * The ID of the object.
+   */
+  id: string;
+  /**
+   * List of products in this collection.
+   */
+  products: CollectionProducts_collection_products | null;
 }
 
 export interface CollectionProducts {
   /**
-   * List of the shop's products.
+   * Look up a collection by ID.
    */
-  products: CollectionProducts_products | null;
+  collection: CollectionProducts_collection | null;
 }
 
 export interface CollectionProductsVariables {