saleor · maarcingebala · Jan 14, 2020 · Jan 13, 2020 · Jan 14, 2020 · Jan 14, 2020
diff --git a/apollo.config.js b/apollo.config.js
@@ -2,7 +2,9 @@ module.exports = {
   client: {
     service: {
       name: "saleor",
-      url: "http://localhost:8000/graphql/"
-    }
-  }
+      url: "http://localhost:8000/graphql/",
+      includes: ["./**/*.js", "./**/*.ts"],
+      excludes: ["**/__tests__/**/*"],
+    },
+  },
 };
diff --git a/package.json b/package.json
@@ -153,7 +153,7 @@
     "node": ">=10.0.0 <11"
   },
   "scripts": {
-    "test": "jest --config .jest/config.json",
+    "test": "jest --runInBand --config .jest/config.json",
     "start": "cross-env NODE_ENV=develop webpack-dev-server --history-api-fallback --watch --port 3000 --mode development --hotOnly",
     "start:worker": "npm run start -- --service-worker",
     "build": "webpack -p",

diff --git a/src/@next/components/organisms/ProductVariantPicker/ProductVariantPicker.tsx b/src/@next/components/organisms/ProductVariantPicker/ProductVariantPicker.tsx
@@ -28,9 +28,9 @@ export const ProductVariantPicker: React.FC<IProps> = ({
         const productVariantAttributeId = productVariantAttribute.attribute.id;
 
         if (
-          productVariantAttribute.value &&
+          productVariantAttribute.values[0] &&
           productVariantsAttributesSelectedValues[productVariantAttributeId] &&
-          productVariantAttribute.value.id ===
+          productVariantAttribute.values[0]!.id ===
             productVariantsAttributesSelectedValues[productVariantAttributeId]!
               .id
         ) {

diff --git a/src/@next/components/organisms/ProductVariantPicker/fixtures.ts b/src/@next/components/organisms/ProductVariantPicker/fixtures.ts
@@ -49,12 +49,14 @@ export const productVariants: ProductDetails_product_variants[] = [
           name: "Material",
           __typename: "Attribute",
         },
-        value: {
-          id: "QXR0cmlidXRlVmFsdWU6ODI=",
-          name: "cotton",
-          value: "cotton",
-          __typename: "AttributeValue",
-        },
+        values: [
+          {
+            id: "QXR0cmlidXRlVmFsdWU6ODI=",
+            name: "cotton",
+            value: "cotton",
+            __typename: "AttributeValue",
+          },
+        ],
         __typename: "SelectedAttribute",
       },
       {
@@ -63,12 +65,14 @@ export const productVariants: ProductDetails_product_variants[] = [
           name: "Color",
           __typename: "Attribute",
         },
-        value: {
-          id: "QXR0cmlidXRlVmFsdWU6ODM=",
-          name: "yellow",
-          value: "yellow",
-          __typename: "AttributeValue",
-        },
+        values: [
+          {
+            id: "QXR0cmlidXRlVmFsdWU6ODM=",
+            name: "yellow",
+            value: "yellow",
+            __typename: "AttributeValue",
+          },
+        ],
         __typename: "SelectedAttribute",
       },
       {
@@ -77,12 +81,14 @@ export const productVariants: ProductDetails_product_variants[] = [
           name: "Size",
           __typename: "Attribute",
         },
-        value: {
-          id: "QXR0cmlidXRlVmFsdWU6NDc=",
-          name: "1l",
-          value: "1l",
-          __typename: "AttributeValue",
-        },
+        values: [
+          {
+            id: "QXR0cmlidXRlVmFsdWU6NDc=",
+            name: "1l",
+            value: "1l",
+            __typename: "AttributeValue",
+          },
+        ],
         __typename: "SelectedAttribute",
       },
     ],
@@ -135,12 +141,14 @@ export const productVariants: ProductDetails_product_variants[] = [
           name: "Material",
           __typename: "Attribute",
         },
-        value: {
-          id: "QXR0cmlidXRlVmFsdWU6ODY=",
-          name: "wool",
-          value: "wool",
-          __typename: "AttributeValue",
-        },
+        values: [
+          {
+            id: "QXR0cmlidXRlVmFsdWU6ODY=",
+            name: "wool",
+            value: "wool",
+            __typename: "AttributeValue",
+          },
+        ],
         __typename: "SelectedAttribute",
       },
       {
@@ -149,12 +157,14 @@ export const productVariants: ProductDetails_product_variants[] = [
           name: "Color",
           __typename: "Attribute",
         },
-        value: {
-          id: "QXR0cmlidXRlVmFsdWU6ODQ=",
-          name: "red",
-          value: "red",
-          __typename: "AttributeValue",
-        },
+        values: [
+          {
+            id: "QXR0cmlidXRlVmFsdWU6ODQ=",
+            name: "red",
+            value: "red",
+            __typename: "AttributeValue",
+          },
+        ],
         __typename: "SelectedAttribute",
       },
       {
@@ -163,12 +173,14 @@ export const productVariants: ProductDetails_product_variants[] = [
           name: "Size",
           __typename: "Attribute",
         },
-        value: {
-          id: "QXR0cmlidXRlVmFsdWU6NDg=",
-          name: "2l",
-          value: "2l",
-          __typename: "AttributeValue",
-        },
+        values: [
+          {
+            id: "QXR0cmlidXRlVmFsdWU6NDg=",
+            name: "2l",
+            value: "2l",
+            __typename: "AttributeValue",
+          },
+        ],
         __typename: "SelectedAttribute",
       },
     ],
@@ -221,12 +233,14 @@ export const productVariants: ProductDetails_product_variants[] = [
           name: "Material",
           __typename: "Attribute",
         },
-        value: {
-          id: "QXR0cmlidXRlVmFsdWU6ODY=",
-          name: "wool",
-          value: "wool",
-          __typename: "AttributeValue",
-        },
+        values: [
+          {
+            id: "QXR0cmlidXRlVmFsdWU6ODY=",
+            name: "wool",
+            value: "wool",
+            __typename: "AttributeValue",
+          },
+        ],
         __typename: "SelectedAttribute",
       },
       {
@@ -235,12 +249,14 @@ export const productVariants: ProductDetails_product_variants[] = [
           name: "Color",
           __typename: "Attribute",
         },
-        value: {
-          id: "QXR0cmlidXRlVmFsdWU6ODU=",
-          name: "turquoise",
-          value: "turquoise",
-          __typename: "AttributeValue",
-        },
+        values: [
+          {
+            id: "QXR0cmlidXRlVmFsdWU6ODU=",
+            name: "turquoise",
+            value: "turquoise",
+            __typename: "AttributeValue",
+          },
+        ],
         __typename: "SelectedAttribute",
       },
       {
@@ -249,12 +265,14 @@ export const productVariants: ProductDetails_product_variants[] = [
           name: "Size",
           __typename: "Attribute",
         },
-        value: {
-          id: "QXR0cmlidXRlVmFsdWU6NDY=",
-          name: "500ml",
-          value: "500ml",
-          __typename: "AttributeValue",
-        },
+        values: [
+          {
+            id: "QXR0cmlidXRlVmFsdWU6NDY=",
+            name: "500ml",
+            value: "500ml",
+            __typename: "AttributeValue",
+          },
+        ],
         __typename: "SelectedAttribute",
       },
     ],

diff --git a/src/@next/hooks/useProductVariantsAttributes.tsx b/src/@next/hooks/useProductVariantsAttributes.tsx
@@ -24,17 +24,17 @@ export const useProductVariantsAttributes = (
         if (variantsAttributeExists) {
           const variantsAttributeValueExists = variantsAttributes[
             productVariantAttributeId
-          ].values.includes(productVariantAttribute.value!);
+          ].values.includes(productVariantAttribute.values[0]!);
 
           if (!variantsAttributeValueExists) {
             variantsAttributes[productVariantAttributeId].values.push(
-              productVariantAttribute.value!
+              productVariantAttribute.values[0]!
             );
           }
         } else {
           variantsAttributes[productVariantAttributeId] = {
             attribute: productVariantAttribute.attribute,
-            values: [productVariantAttribute.value!],
+            values: [productVariantAttribute.values[0]!],
           };
         }
       });

diff --git a/src/@next/hooks/useSelectableProductVariantsAttributeValues.tsx b/src/@next/hooks/useSelectableProductVariantsAttributeValues.tsx
@@ -38,7 +38,7 @@ export const useSelectableProductVariantsAttributeValues = (
             return (
               productVariantAttribute.attribute.id ===
                 selectedValueAttributeId &&
-              productVariantAttribute.value ===
+              productVariantAttribute.values[0] ===
                 productVariantsAttributesSelectedValues[
                   selectedValueAttributeId
                 ]

diff --git a/src/@next/types/IProductVariantsAttributes.ts b/src/@next/types/IProductVariantsAttributes.ts
@@ -1,20 +1,20 @@
 import { ISelectOption } from "@types";
 import {
   ProductDetails_product_variants_attributes_attribute,
-  ProductDetails_product_variants_attributes_value,
+  ProductDetails_product_variants_attributes_values,
 } from "../../@sdk/queries/types/ProductDetails";
 
 export interface IProductVariantsAttribute {
   attribute: ProductDetails_product_variants_attributes_attribute;
-  values: ProductDetails_product_variants_attributes_value[];
+  values: ProductDetails_product_variants_attributes_values[];
 }
 
 export interface IProductVariantsAttributes {
   [key: string]: IProductVariantsAttribute;
 }
 
 export interface IProductVariantsAttributesSelectedValues {
-  [key: string]: ProductDetails_product_variants_attributes_value | null;
+  [key: string]: ProductDetails_product_variants_attributes_values | null;
 }
 
 export interface IProductVariantsAttributesOptionValue extends ISelectOption {

diff --git a/src/@sdk/fragments/products.ts b/src/@sdk/fragments/products.ts
@@ -50,7 +50,7 @@ export const productVariantFragment = gql`
         id
         name
       }
-      value {
+      values {
         id
         name
         value: name

diff --git a/src/@sdk/fragments/types/ProductVariantFields.ts b/src/@sdk/fragments/types/ProductVariantFields.ts
@@ -122,7 +122,7 @@ export interface ProductVariantFields_attributes_attribute {
   name: string | null;
 }
 
-export interface ProductVariantFields_attributes_value {
+export interface ProductVariantFields_attributes_values {
   __typename: "AttributeValue";
   /**
    * The ID of the object.
@@ -145,9 +145,9 @@ export interface ProductVariantFields_attributes {
    */
   attribute: ProductVariantFields_attributes_attribute;
   /**
-   * The value or the first value of an attribute.
+   * Values of an attribute.
    */
-  value: ProductVariantFields_attributes_value | null;
+  values: (ProductVariantFields_attributes_values | null)[];
 }
 
 export interface ProductVariantFields {

diff --git a/src/@sdk/queries/attributes.ts b/src/@sdk/queries/attributes.ts
@@ -2,7 +2,7 @@ import gql from "graphql-tag";
 
 export const attributes = gql`
   query Attributes($id: ID!) {
-    attributes(inCategory: $id, first: 100) {
+    attributes(filter: { inCategory: $id }, first: 100) {
       edges {
         node {
           id

diff --git a/src/@sdk/queries/products.ts b/src/@sdk/queries/products.ts
@@ -32,6 +32,7 @@ export const productPricingFragment = gql`
 
 export const productListDetails = gql`
   ${basicProductFragment}
+  ${productPricingFragment}
   query ProductList(
     $id: ID!
     $attributes: [AttributeInput]
@@ -55,20 +56,7 @@ export const productListDetails = gql`
       edges {
         node {
           ...BasicProductFields
-          price {
-            amount
-            currency
-            localized
-          }
-          pricing {
-            priceRange {
-              start {
-                gross {
-                  localized
-                }
-              }
-            }
-          }
+          ...ProductPricingField
           category {
             id
             name
@@ -115,11 +103,6 @@ export const productDetails = gql`
         id
         url
       }
-      basePrice {
-        amount
-        currency
-        localized
-      }
       attributes {
         ...SelectedAttributeFields
       }
@@ -128,9 +111,7 @@ export const productDetails = gql`
       }
       seoDescription
       seoTitle
-      availability {
-        available
-      }
+      isAvailable
     }
   }
 `;