Merge branch 'develop' into release-v3.0.0

aldeed · aldeed · commit 8a5f7c20b389 · 2019-11-06T16:46:08.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v2.9.0
+
+Example Storefront v2.9.0 is a minor update to keep this project in sync with [Reaction v2.9.0](https://github.com/reactioncommerce/reaction) and [reaction-hydra v2.9.0](https://github.com/reactioncommerce/reaction-hydra)
+
 # v2.8.0
 
 Example Storefront v2.8.0 is a minor update to keep this project in sync with [Reaction v2.8.0](https://github.com/reactioncommerce/reaction) and [reaction-hydra v2.8.0](https://github.com/reactioncommerce/reaction-hydra)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "example-storefront",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "description": "The Example Storefront serves as a reference for implementing a web based storefront using the Reaction Commerce GraphQL API.",
   "main": "./src/server.js",
   "keywords": [],
diff --git a/src/components/MediaGallery/MediaGallery.test.js b/src/components/MediaGallery/MediaGallery.test.js
@@ -4,7 +4,6 @@ import MediaGallery from "./MediaGallery";
 
 const mediaItems = [
   {
-    toGrid: 1,
     priority: 0,
     productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
     variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",
@@ -17,7 +16,6 @@ const mediaItems = [
     }
   },
   {
-    toGrid: 1,
     priority: 0,
     productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
     variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",
diff --git a/src/components/MediaGalleryItem/MediaGalleryItem.test.js b/src/components/MediaGalleryItem/MediaGalleryItem.test.js
@@ -3,7 +3,6 @@ import renderer from "react-test-renderer";
 import MediaGalleryItem from "./MediaGalleryItem";
 
 const media = {
-  toGrid: 1,
   priority: 0,
   productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
   variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",
diff --git a/src/components/ProductDetail/__mocks__/productData.mock.js b/src/components/ProductDetail/__mocks__/productData.mock.js
@@ -168,7 +168,6 @@ export default {
   ],
   media: [
     {
-      toGrid: 1,
       priority: 0,
       productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
       variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",
@@ -181,7 +180,6 @@ export default {
       }
     },
     {
-      toGrid: 1,
       priority: 0,
       productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
       variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",
@@ -194,7 +192,6 @@ export default {
       }
     },
     {
-      toGrid: 1,
       priority: 0,
       productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
       variantId: "cmVhY3Rpb24vcHJvZHVjdDpTTXI0cmhERm5ZdkZNdERUWA==",
@@ -207,7 +204,6 @@ export default {
       }
     },
     {
-      toGrid: 1,
       priority: 0,
       productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
       variantId: "cmVhY3Rpb24vcHJvZHVjdDpDSm9SQm05dlJyb3JjOW14Wg==",
@@ -220,7 +216,6 @@ export default {
       }
     },
     {
-      toGrid: 1,
       priority: 2,
       productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
       variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",
@@ -233,7 +228,6 @@ export default {
       }
     },
     {
-      toGrid: 1,
       priority: 3,
       productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
       variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",
@@ -246,7 +240,6 @@ export default {
       }
     },
     {
-      toGrid: 1,
       priority: 4,
       productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
       variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",
@@ -259,7 +252,6 @@ export default {
       }
     },
     {
-      toGrid: 1,
       priority: 5,
       productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
       variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",
diff --git a/src/components/ProductGrid/__mocks__/products.mock.js b/src/components/ProductGrid/__mocks__/products.mock.js
@@ -13,7 +13,6 @@ export default [
         isSoldOut: true,
         isBackorder: false,
         primaryImage: {
-          toGrid: 1,
           priority: 0,
           productId: "cmVhY3Rpb24vcHJvZHVjdDpqbmE5NWthOWFOa015dG14aA==",
           URLs: {
@@ -57,7 +56,6 @@ export default [
         isSoldOut: false,
         isBackorder: false,
         primaryImage: {
-          toGrid: 1,
           priority: 0,
           productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
           URLs: {
diff --git a/src/components/ProductGrid/__snapshots__/ProductGrid.test.js.snap b/src/components/ProductGrid/__snapshots__/ProductGrid.test.js.snap
@@ -279,7 +279,6 @@ Array [
                 },
                 "priority": 0,
                 "productId": "cmVhY3Rpb24vcHJvZHVjdDpqbmE5NWthOWFOa015dG14aA==",
-                "toGrid": 1,
               },
               "slug": "men's-lightweigth-synchilla",
               "title": "Men's Lightweigth Synchilla",
@@ -328,7 +327,6 @@ Details can be added below the image for more specific product information.
                 },
                 "priority": 0,
                 "productId": "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",
-                "toGrid": 1,
               },
               "slug": "example-product",
               "title": "Basic Reaction Product",
diff --git a/src/containers/catalog/catalogItemProduct.gql b/src/containers/catalog/catalogItemProduct.gql
@@ -39,13 +39,11 @@ query catalogItemProductQuery($slugOrId: String!) {
           small
           thumbnail
         }
-        toGrid
         priority
         productId
         variantId
       }
       media {
-        toGrid
         priority
         productId
         variantId
@@ -107,7 +105,6 @@ query catalogItemProductQuery($slugOrId: String!) {
           isSoldOut
           isLowQuantity
           media {
-            toGrid
             priority
             productId
             variantId
@@ -135,14 +132,12 @@ query catalogItemProductQuery($slugOrId: String!) {
               small
               thumbnail
             }
-            toGrid
             priority
             productId
             variantId
           }
         }
         media {
-          toGrid
           priority
           productId
           variantId
@@ -170,7 +165,6 @@ query catalogItemProductQuery($slugOrId: String!) {
             small
             thumbnail
           }
-          toGrid
           priority
           productId
           variantId
diff --git a/src/lib/tracking/utils/getVariantTrackingData.test.js b/src/lib/tracking/utils/getVariantTrackingData.test.js
@@ -37,7 +37,6 @@ const product = {
   },
   media: [
     {
-      toGrid: 1,
       priority: 0,
       productId: "1001",
       variantId: "1002",
@@ -46,7 +45,6 @@ const product = {
       }
     },
     {
-      toGrid: 1,
       priority: 0,
       productId: "1001",
       variantId: "1003",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "example-storefront",`
`3`		`- "version": "2.8.0",`
	`3`	`+ "version": "2.9.0",`
`4`	`4`	`"description": "The Example Storefront serves as a reference for implementing a web based storefront using the Reaction Commerce GraphQL API.",`
`5`	`5`	`"main": "./src/server.js",`
`6`	`6`	`"keywords": [],`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ import MediaGallery from "./MediaGallery";`
`4`	`4`
`5`	`5`	`const mediaItems = [`
`6`	`6`	`{`
`7`		`- toGrid: 1,`
`8`	`7`	`priority: 0,`
`9`	`8`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`10`	`9`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",`
`@@ -17,7 +16,6 @@ const mediaItems = [`
`17`	`16`	`}`
`18`	`17`	`},`
`19`	`18`	`{`
`20`		`- toGrid: 1,`
`21`	`19`	`priority: 0,`
`22`	`20`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`23`	`21`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,6 @@ export default {`
`168`	`168`	`],`
`169`	`169`	`media: [`
`170`	`170`	`{`
`171`		`- toGrid: 1,`
`172`	`171`	`priority: 0,`
`173`	`172`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`174`	`173`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",`
`@@ -181,7 +180,6 @@ export default {`
`181`	`180`	`}`
`182`	`181`	`},`
`183`	`182`	`{`
`184`		`- toGrid: 1,`
`185`	`183`	`priority: 0,`
`186`	`184`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`187`	`185`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",`
`@@ -194,7 +192,6 @@ export default {`
`194`	`192`	`}`
`195`	`193`	`},`
`196`	`194`	`{`
`197`		`- toGrid: 1,`
`198`	`195`	`priority: 0,`
`199`	`196`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`200`	`197`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDpTTXI0cmhERm5ZdkZNdERUWA==",`
`@@ -207,7 +204,6 @@ export default {`
`207`	`204`	`}`
`208`	`205`	`},`
`209`	`206`	`{`
`210`		`- toGrid: 1,`
`211`	`207`	`priority: 0,`
`212`	`208`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`213`	`209`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDpDSm9SQm05dlJyb3JjOW14Wg==",`
`@@ -220,7 +216,6 @@ export default {`
`220`	`216`	`}`
`221`	`217`	`},`
`222`	`218`	`{`
`223`		`- toGrid: 1,`
`224`	`219`	`priority: 2,`
`225`	`220`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`226`	`221`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",`
`@@ -233,7 +228,6 @@ export default {`
`233`	`228`	`}`
`234`	`229`	`},`
`235`	`230`	`{`
`236`		`- toGrid: 1,`
`237`	`231`	`priority: 3,`
`238`	`232`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`239`	`233`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",`
`@@ -246,7 +240,6 @@ export default {`
`246`	`240`	`}`
`247`	`241`	`},`
`248`	`242`	`{`
`249`		`- toGrid: 1,`
`250`	`243`	`priority: 4,`
`251`	`244`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`252`	`245`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",`
`@@ -259,7 +252,6 @@ export default {`
`259`	`252`	`}`
`260`	`253`	`},`
`261`	`254`	`{`
`262`		`- toGrid: 1,`
`263`	`255`	`priority: 5,`
`264`	`256`	`productId: "cmVhY3Rpb24vcHJvZHVjdDpCQ1RNWjZIVHhGU3BwSkVTaw==",`
`265`	`257`	`variantId: "cmVhY3Rpb24vcHJvZHVjdDo2cWlxUHdCa2VKZHRkUWM0Rw==",`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ const product = {`
`37`	`37`	`},`
`38`	`38`	`media: [`
`39`	`39`	`{`
`40`		`- toGrid: 1,`
`41`	`40`	`priority: 0,`
`42`	`41`	`productId: "1001",`
`43`	`42`	`variantId: "1002",`
`@@ -46,7 +45,6 @@ const product = {`
`46`	`45`	`}`
`47`	`46`	`},`
`48`	`47`	`{`
`49`		`- toGrid: 1,`
`50`	`48`	`priority: 0,`
`51`	`49`	`productId: "1001",`
`52`	`50`	`variantId: "1003",`