Merge branch 'master' into 3.0

CHANGELOG.md

@@ -17,6 +17,7 @@ All notable, unreleased changes to this project will be documented in this file.
 - Enable incremental server-side regeneration for store pages - #988 by @pitorgrundas
 - Update account mutations with channel slug - #1039 by @orzechdev
 - Update register mutation with channel slug - #1045 by @orzechdev
+- Update queries with new channel API - #1072 by @orzechdev
 
 ## 2.11.0
 

gqlTypes/globalTypes.ts

@@ -285,6 +285,7 @@ export interface AttributeInput {
   slug: string;
   values?: (string | null)[] | null;
   valuesRange?: IntRangeInput | null;
+  boolean?: boolean | null;
 }
 
 export interface IntRangeInput {
@@ -294,7 +295,6 @@ export interface IntRangeInput {
 
 export interface ProductOrder {
   direction: OrderDirection;
-  channel?: string | null;
   attributeId?: string | null;
   field?: ProductOrderField | null;
 }

package.json

@@ -8,7 +8,7 @@
   "browserslist": "last 2 versions",
   "dependencies": {
     "@lhci/cli": "^0.7.0",
-    "@saleor/sdk": "^0.3.0-9",
+    "@saleor/sdk": "^0.3.0-10",
     "@sentry/apm": "^5.15.5",
     "@sentry/browser": "^5.15.5",
     "@stripe/react-stripe-js": "^1.1.2",

src/@next/graphql/queries.ts

@@ -52,8 +52,8 @@ export const shopAttributesQuery = gql`
     $categoryId: ID
   ) {
     attributes(
+      channel: $channel
       filter: {
-        channel: $channel
         inCollection: $collectionId
         inCategory: $categoryId
         filterableInStorefront: true

src/core/utils.ts

@@ -1,8 +1,6 @@
 import { ProductOrder } from "@saleor/sdk";
 import { FetchResult } from "apollo-link";
 
-import { channelSlug } from "@temp/constants";
-
 import {
   AttributeInput,
   OrderDirection,
@@ -64,8 +62,7 @@ export const getValueOrEmpty = <T>(value: T): T | string =>
   value === undefined || value === null ? "" : value;
 
 export const convertSortByFromString = (
-  sortBy: string,
-  channel = channelSlug
+  sortBy: string
 ): ProductOrder | null => {
   if (!sortBy) {
     return null;
@@ -93,7 +90,7 @@ export const convertSortByFromString = (
     default:
       return null;
   }
-  return { field, direction, channel };
+  return { field, direction };
 };
 
 export const maybe = <T>(exp: () => T, d?: T) => {

src/views/Category/queries.ts

@@ -31,7 +31,6 @@ export const useProductsQuery = (
       },
       collections: collectionId ? [collectionId] : [],
       categories: categoryId ? [categoryId] : [],
-      channel: channelSlug,
       attributes: filters.attributes
         ? convertToAttributeScalar(filters.attributes)
         : [],