Merge 2ee5aac into 971af51

vtex-apps · Jul 3, 2019 · fa7f4c8 · fa7f4c8
2 parents 971af51 + 2ee5aac
commit fa7f4c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed 
+- Issue which would break the query if collections was null.
 
 ## [1.20.1] - 2019-06-27
 

diff --git a/react/Shelf.js b/react/Shelf.js
@@ -101,7 +101,9 @@ const options = {
     ssr: false,
     variables: {
       category,
-      collection,
+      ...(collection != null ? {
+        collection,
+      } : {}),
       specificationFilters: specificationFilters.map(parseFilters),
       orderBy,
       from: 0,