From c7d3301c43166ac82a49334697dc2cc7b8060a7c Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Wed, 18 Oct 2017 19:45:12 -0700 Subject: [PATCH] Remove fuse as a dependency --- ui/app/mixins/searchable.js | 24 ++++-------------------- ui/package.json | 11 ++--------- ui/yarn.lock | 4 ---- 3 files changed, 6 insertions(+), 33 deletions(-) diff --git a/ui/app/mixins/searchable.js b/ui/app/mixins/searchable.js index 5633b7e64..99a929eed 100644 --- a/ui/app/mixins/searchable.js +++ b/ui/app/mixins/searchable.js @@ -1,5 +1,4 @@ import Ember from 'ember'; -import Fuse from 'npm:fuse.js'; const { Mixin, computed, get } = Ember; @@ -21,31 +20,16 @@ export default Mixin.create({ listToSearch: computed(() => []), searchProps: null, - fuse: computed('listToSearch.[]', 'searchProps.[]', function() { - return new Fuse(this.get('listToSearch'), { - shouldSort: true, - threshold: 0.6, - location: 0, - distance: 100, - maxPatternLength: 32, - minMatchCharLength: 1, - keys: this.get('searchProps') || [], - getFn(item, key) { - return get(item, key); - }, - }); - }), - - listSearched: computed('fuse', 'searchTerm', function() { - const { fuse, searchTerm } = this.getProperties('fuse', 'searchTerm'); + listSearched: computed('searchTerm', 'listToSearch.[]', 'searchProps.[]', function() { + const searchTerm = this.get('searchTerm'); if (searchTerm && searchTerm.length) { - return regexSearch(searchTerm, fuse); + return regexSearch(searchTerm, this.get('listToSearch'), this.get('searchProps')); } return this.get('listToSearch'); }), }); -function regexSearch(term, { list, options: { keys } }) { +function regexSearch(term, list, keys) { if (term.length) { try { const regex = new RegExp(term, 'i'); diff --git a/ui/package.json b/ui/package.json index 6783735eb..db0671c72 100644 --- a/ui/package.json +++ b/ui/package.json @@ -20,10 +20,7 @@ "prettier --single-quote --trailing-comma es5 --print-width 100 --write", "git add" ], - "ui/app/styles/**/*.*": [ - "prettier --write", - "git add" - ] + "ui/app/styles/**/*.*": ["prettier --write", "git add"] } }, "devDependencies": { @@ -69,7 +66,6 @@ "ember-welcome-page": "^3.0.0", "eslint": "^4.0.0", "flat": "^2.0.1", - "fuse.js": "^3.0.5", "husky": "^0.13.4", "json-formatter-js": "^2.2.0", "lint-staged": "^3.6.1", @@ -81,9 +77,6 @@ }, "private": true, "ember-addon": { - "paths": [ - "lib/bulma", - "lib/calendar" - ] + "paths": ["lib/bulma", "lib/calendar"] } } diff --git a/ui/yarn.lock b/ui/yarn.lock index 63860f892..f00217f07 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -4086,10 +4086,6 @@ functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" -fuse.js@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.0.5.tgz#b58d85878802321de94461654947b93af1086727" - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"