searchkit · joemcelroy · Dec 20, 2020 · Dec 20, 2020 · Dec 20, 2020 · Dec 20, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-canary.23](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.23) (2020-12-20)
+
+
+### Bug Fixes
+
+* **client:** bug fix for unable to remove filter when range min is 0 ([93bd74e](https://github.com/searchkit/searchkit/commit/93bd74eeda712fb658f2deeb9b5908f087268bd9))
+* **rangeslider:** fix slider when boundaries are not 0-100 ([ee22887](https://github.com/searchkit/searchkit/commit/ee2288780702a6799c2f27b87c2f2721983181ca)), closes [#827](https://github.com/searchkit/searchkit/issues/827)
+* **searchkit/cli:** fix issue with cli not working ([#826](https://github.com/searchkit/searchkit/issues/826)) ([1a9784d](https://github.com/searchkit/searchkit/commit/1a9784d634fe6331b42b0af63a4dbe37a95269f3))
+
+
+### Features
+
+* re-order facets ([1f28f4c](https://github.com/searchkit/searchkit/commit/1f28f4c36c9089fcecc6d45f985d889784796949))
+
+
+
+
+
 # [3.0.0-canary.22](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.22) (2020-12-19)
 
 **Note:** Version bump only for package searchkit

diff --git a/examples/next/pages/api/graphql.js b/examples/next/pages/api/graphql.js
@@ -41,12 +41,6 @@ const searchkitConfig = {
       }
     }),
 
-    new RefinementSelectFacet({
-      field: 'rated',
-      identifier: 'rated',
-      label: 'Rated',
-      multipleSelect: true
-    }),
 
     new DateRangeFacet({
       field: 'released',
@@ -61,6 +55,18 @@ const searchkitConfig = {
       multipleSelect: true
     }),
 
+    new RefinementSelectFacet({
+      field: 'countries.keyword',
+      identifier: 'countries',
+      label: 'Countries',
+      display: 'ComboBoxFacet'
+    }),
+    new RefinementSelectFacet({
+      field: 'rated',
+      identifier: 'rated',
+      label: 'Rated',
+      multipleSelect: true
+    }),
     new RefinementSelectFacet({
       field: 'directors.keyword',
       identifier: 'directors',
@@ -80,13 +86,6 @@ const searchkitConfig = {
       multipleSelect: true
     }),
 
-    new RefinementSelectFacet({
-      field: 'countries.keyword',
-      identifier: 'countries',
-      label: 'Countries',
-      display: 'ComboBoxFacet'
-    }),
-
     new RangeFacet({
       field: 'imdbrating',
       identifier: 'imdbrating',
@@ -96,7 +95,9 @@ const searchkitConfig = {
         max: 10,
         min: 1
       }
-    })
+    }),
+
+
   ]
 }
 

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "3.0.0-canary.22",
+  "version": "3.0.0-canary.23",
   "includeMergedTags": true,
   "command": {
     "publish": {

diff --git a/packages/searchkit-apollo-resolvers/CHANGELOG.md b/packages/searchkit-apollo-resolvers/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-canary.23](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.23) (2020-12-20)
+
+
+### Bug Fixes
+
+* **searchkit/cli:** fix issue with cli not working ([#826](https://github.com/searchkit/searchkit/issues/826)) ([1a9784d](https://github.com/searchkit/searchkit/commit/1a9784d634fe6331b42b0af63a4dbe37a95269f3))
+
+
+
+
+
 # [3.0.0-canary.22](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.22) (2020-12-19)
 
 **Note:** Version bump only for package @searchkit/apollo-resolvers

diff --git a/packages/searchkit-apollo-resolvers/package.json b/packages/searchkit-apollo-resolvers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@searchkit/apollo-resolvers",
-  "version": "3.0.0-canary.22",
+  "version": "3.0.0-canary.23",
   "main": "lib/index.js",
   "author": "Joseph McElroy <phoey1@gmail.com>",
   "license": "Apache-2.0",

diff --git a/packages/searchkit-cli/CHANGELOG.md b/packages/searchkit-cli/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-canary.23](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.23) (2020-12-20)
+
+
+### Bug Fixes
+
+* **searchkit/cli:** fix issue with cli not working ([#826](https://github.com/searchkit/searchkit/issues/826)) ([1a9784d](https://github.com/searchkit/searchkit/commit/1a9784d634fe6331b42b0af63a4dbe37a95269f3))
+
+
+
+
+
 # [3.0.0-canary.22](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.22) (2020-12-19)
 
 **Note:** Version bump only for package @searchkit/cli

diff --git a/packages/searchkit-cli/package.json b/packages/searchkit-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@searchkit/cli",
-  "version": "3.0.0-canary.22",
+  "version": "3.0.0-canary.23",
   "main": "lib/index.js",
   "author": "Joseph McElroy <phoey1@gmail.com>",
   "license": "Apache-2.0",

diff --git a/packages/searchkit-client/CHANGELOG.md b/packages/searchkit-client/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-canary.23](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.23) (2020-12-20)
+
+
+### Bug Fixes
+
+* **client:** bug fix for unable to remove filter when range min is 0 ([93bd74e](https://github.com/searchkit/searchkit/commit/93bd74eeda712fb658f2deeb9b5908f087268bd9))
+* **searchkit/cli:** fix issue with cli not working ([#826](https://github.com/searchkit/searchkit/issues/826)) ([1a9784d](https://github.com/searchkit/searchkit/commit/1a9784d634fe6331b42b0af63a4dbe37a95269f3))
+
+
+
+
+
 # [3.0.0-canary.22](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.22) (2020-12-19)
 
 **Note:** Version bump only for package @searchkit/client

diff --git a/packages/searchkit-client/package.json b/packages/searchkit-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@searchkit/client",
-  "version": "3.0.0-canary.22",
+  "version": "3.0.0-canary.23",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
   "types": "./lib/esm/index.d.ts",

diff --git a/packages/searchkit-client/src/__tests__/searchkit.test.tsx b/packages/searchkit-client/src/__tests__/searchkit.test.tsx
@@ -76,6 +76,14 @@ describe('Searchkit Client', () => {
     ])
   })
 
+  it('should toggle range filters', () => {
+    const api = new SearchkitClient()
+    api.addFilter({ identifier: 'type', min: 0, max: 100 })
+    expect(api.getFilters()).toEqual([{ identifier: 'type', min: 0, max: 100 }])
+    api.toggleFilter({ identifier: 'type', min: 0, max: 100 })
+    expect(api.getFilters()).toEqual([])
+  })
+
   it('should remove multiple filters by id', () => {
     const api = new SearchkitClient()
     api.addFilter({ identifier: 'type', value: 'Movies' })

diff --git a/packages/searchkit-client/src/searchkit.tsx b/packages/searchkit-client/src/searchkit.tsx
@@ -27,9 +27,17 @@ export interface SearchkitClientConfig {
   searchOnLoad?: boolean
 }
 
+const isDefined = (str) => typeof str !== 'undefined' && str !== null
+
 const filterSelector = (filter: Filter) => (f: Filter) => {
   if (filter.identifier !== f.identifier) return false
-  if (filter.min && filter.max && filter.min === f.min && filter.max === f.max) return true
+  if (
+    isDefined(filter.min) &&
+    isDefined(filter.max) &&
+    filter.min === f.min &&
+    filter.max === f.max
+  )
+    return true
   if (
     filter.dateMin &&
     filter.dateMax &&

diff --git a/packages/searchkit-elastic-ui/CHANGELOG.md b/packages/searchkit-elastic-ui/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-canary.23](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.23) (2020-12-20)
+
+
+### Bug Fixes
+
+* **rangeslider:** fix slider when boundaries are not 0-100 ([ee22887](https://github.com/searchkit/searchkit/commit/ee2288780702a6799c2f27b87c2f2721983181ca)), closes [#827](https://github.com/searchkit/searchkit/issues/827)
+* **searchkit/cli:** fix issue with cli not working ([#826](https://github.com/searchkit/searchkit/issues/826)) ([1a9784d](https://github.com/searchkit/searchkit/commit/1a9784d634fe6331b42b0af63a4dbe37a95269f3))
+
+
+
+
+
 # [3.0.0-canary.22](https://github.com/searchkit/searchkit/compare/v3.0.0-canary.19...v3.0.0-canary.22) (2020-12-19)
 
 **Note:** Version bump only for package @searchkit/elastic-ui

diff --git a/packages/searchkit-elastic-ui/package.json b/packages/searchkit-elastic-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@searchkit/elastic-ui",
-  "version": "3.0.0-canary.22",
+  "version": "3.0.0-canary.23",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
   "types": "lib/esm/index.d.ts",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@searchkit/client": "^3.0.0-canary.22",
+    "@searchkit/client": "^3.0.0-canary.23",
     "use-debounce": "^5.0.3"
   },
   "devDependencies": {