status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Fuzzy and Regex searching (#9424) 

Moves search things around to match an interface that can be switched in and out of fuzzy searching using fuse.js. We add both fuzzy searching and regex based searching to the codebase here, but it is not yet compiled in.
This commit is contained in:
John Cowen 2020-12-18 10:38:15 +00:00 committed by GitHub
parent 9ca4e431f6
commit 99f102705d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 639 additions and 501 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
ui/packages/consul-ui/app/components/data-collection/index.js
View File

@ -1,6 +1,7 @@
import Component from '@glimmer/component';
import { inject as service } from '@ember/service';
import { computed, get, action } from '@ember/object';
import { computed, action } from '@ember/object';
import { alias } from '@ember/object/computed';
import { tracked } from '@glimmer/tracking';
import { sort } from '@ember/object/computed';
import { defineProperty } from '@ember/object';
@ -12,30 +13,48 @@ export default class DataCollectionComponent extends Component {
@tracked term = '';
@alias('searchService.searchables') searchableMap;
get type() {
return this.args.type;
}
get searchMethod() {
return this.args.searchable || 'exact';
}
get searchProperties() {
return this.args.filters.searchproperties;
}
@computed('term', 'args.search')
get searchTerm() {
return this.term || this.args.search || '';
}
@action
search(term) {
this.term = term;
return this.items;
@computed('type', 'searchMethod', 'filtered', 'searchProperties')
get searchable() {
const Searchable =
typeof this.searchMethod === 'string'
? this.searchableMap[this.searchMethod]
: this.args.searchable;
return new Searchable(this.filtered, {
finders: Object.fromEntries(
Object.entries(this.searchService.predicate(this.type)).filter(([key, value]) => {
return typeof this.searchProperties === 'undefined'
? true
: this.searchProperties.includes(key);
})
),
});
}
@computed('args{items,.items.content}')
get content() {
// TODO: Temporary little hack to ensure we detect DataSource proxy
// objects but not any other special Ember Proxy object like ember-data
// things. Remove this once we no longer need the Proxies
if (this.args.items.dispatchEvent === 'function') {
return this.args.items.content;
@computed('type', 'args.sort')
get comparator() {
if (typeof this.args.sort === 'undefined') {
return [];
}
return this.args.items;
return this.sort.comparator(this.type)(this.args.sort);
}
@computed('comparator', 'searched')
@ -51,36 +70,42 @@ export default class DataCollectionComponent extends Component {
return this.sorted;
}
@computed('type', 'filtered', 'args.filters.searchproperties', 'searchTerm')
@computed('searchTerm', 'searchable', 'filtered')
get searched() {
if (this.searchTerm === '') {
return this.filtered;
}
const predicate = this.searchService.predicate(this.type);
const options = {};
if (typeof get(this, 'args.filters.searchproperties') !== 'undefined') {
options.properties = this.args.filters.searchproperties;
}
return this.filtered.filter(predicate(this.searchTerm, options));
return this.searchable.search(this.searchTerm);
}
@computed('type', 'content', 'args.filters')
get filtered() {
// if we don't filter, return a copy of the content so we end up with what
// filter will return when filtering ED recordsets
if (typeof this.args.filters === 'undefined') {
return this.content;
return this.content.slice();
}
const predicate = this.filter.predicate(this.type);
if (typeof predicate === 'undefined') {
return this.content;
return this.content.slice();
}
return this.content.filter(predicate(this.args.filters));
}
@computed('type', 'args.sort')
get comparator() {
if (typeof this.args.sort === 'undefined') {
return [];
@computed('args.{items.[],items.content.[]}')
get content() {
// TODO: Temporary little hack to ensure we detect DataSource proxy
// objects but not any other special Ember Proxy object like ember-data
// things. Remove this once we no longer need the Proxies
if (this.args.items.dispatchEvent === 'function') {
return this.args.items.content;
}
return this.sort.comparator(this.type)(this.args.sort);
return this.args.items;
}
@action
search(term) {
this.term = term;
return this.items;
}
}

4
ui/packages/consul-ui/app/search/predicates/acl.js
View File

@ -1,4 +1,4 @@
export default {
ID: (item, value) => item.ID.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Name: (item, value) => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1,
ID: item => item.ID,
Name: item => item.Name,
};

35
ui/packages/consul-ui/app/search/predicates/health-check.js
View File

@ -2,31 +2,12 @@ const asArray = function(arr) {
return Array.isArray(arr) ? arr : arr.toArray();
};
export default {
Name: (item, value) => {
return item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1;
},
Node: (item, value) => {
return item.Node.toLowerCase().indexOf(value.toLowerCase()) !== -1;
},
Service: (item, value) => {
const lower = value.toLowerCase();
return (
item.ServiceName.toLowerCase().indexOf(lower) !== -1 ||
item.ServiceID.toLowerCase().indexOf(lower) !== -1
);
},
CheckID: (item, value) => (item.CheckID || '').toLowerCase().indexOf(value.toLowerCase()) !== -1,
Notes: (item, value) =>
item.Notes.toString()
.toLowerCase()
.indexOf(value.toLowerCase()) !== -1,
Output: (item, value) =>
item.Output.toString()
.toLowerCase()
.indexOf(value.toLowerCase()) !== -1,
ServiceTags: (item, value) => {
return asArray(item.ServiceTags || []).some(
item => item.toLowerCase().indexOf(value.toLowerCase()) !== -1
);
},
Name: (item, value) => item.Name,
Node: (item, value) => item.Node,
Service: (item, value) => item.ServiceName,
CheckID: (item, value) => item.CheckID || '',
ID: (item, value) => item.Service.ID || '',
Notes: (item, value) => item.Notes,
Output: (item, value) => item.Output,
ServiceTags: (item, value) => asArray(item.ServiceTags || []),
};

12
ui/packages/consul-ui/app/search/predicates/intention.js
View File

@ -1,9 +1,7 @@
const allLabel = 'All Services (*)'.toLowerCase();
const allLabel = 'All Services (*)';
export default {
SourceName: (item, value) =>
item.SourceName.toLowerCase().indexOf(value.toLowerCase()) !== -1 ||
(item.SourceName === '*' && allLabel.indexOf(value.toLowerCase()) !== -1),
DestinationName: (item, value) =>
item.DestinationName.toLowerCase().indexOf(value.toLowerCase()) !== -1 ||
(item.DestinationName === '*' && allLabel.indexOf(value.toLowerCase()) !== -1),
SourceName: item =>
[item.SourceName, item.SourceName === '*' ? allLabel : undefined].filter(Boolean),
DestinationName: item =>
[item.DestinationName, item.DestinationName === '*' ? allLabel : undefined].filter(Boolean),
};

5
ui/packages/consul-ui/app/search/predicates/kv.js
View File

@ -1,9 +1,8 @@
import rightTrim from 'consul-ui/utils/right-trim';
export default {
Key: (item, value) =>
Key: item =>
rightTrim(item.Key.toLowerCase())
.split('/')
.filter(item => Boolean(item))
.pop()
.indexOf(value.toLowerCase()) !== -1,
.pop(),
};

9
ui/packages/consul-ui/app/search/predicates/node.js
View File

@ -1,8 +1,5 @@
export default {
Node: (item, value) => item.Node.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Address: (item, value) => item.Address.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Meta: (item, value) =>
Object.entries(item.Meta || {}).some(entry =>
entry.some(item => item.toLowerCase().indexOf(value.toLowerCase()) !== -1)
),
Node: item => item.Node,
Address: item => item.Address,
Meta: item => Object.entries(item.Meta || {}).reduce((prev, entry) => prev.concat(entry), []),
};

12
ui/packages/consul-ui/app/search/predicates/nspace.js
View File

@ -1,16 +1,12 @@
export default {
Name: (item, value) => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Description: (item, value) => item.Description.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Name: (item, value) => item.Name,
Description: (item, value) => item.Description,
Role: (item, value) => {
const acls = item.ACLs || {};
return (acls.RoleDefaults || []).some(
item => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1
);
return (acls.RoleDefaults || []).map(item => item.Name);
},
Policy: (item, value) => {
const acls = item.ACLs || {};
return (acls.PolicyDefaults || []).some(
item => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1
);
return (acls.PolicyDefaults || []).map(item => item.Name);
},
};

4
ui/packages/consul-ui/app/search/predicates/policy.js
View File

@ -1,4 +1,4 @@
export default {
Name: (item, value) => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Description: (item, value) => item.Description.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Name: item => item.Name,
Description: item => item.Description,
};

19
ui/packages/consul-ui/app/search/predicates/role.js
View File

@ -1,17 +1,10 @@
export default {
Name: (item, value) => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Description: (item, value) => item.Description.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Name: (item, value) => item.Name,
Description: (item, value) => item.Description,
Policy: (item, value) => {
return (
(item.Policies || []).some(
item => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1
) ||
(item.ServiceIdentities || []).some(
item => item.ServiceName.toLowerCase().indexOf(value.toLowerCase()) !== -1
) ||
(item.NodeIdentities || []).some(
item => item.NodeName.toLowerCase().indexOf(value.toLowerCase()) !== -1
)
);
return (item.Policies || [])
.map(item => item.Name)
.concat((item.ServiceIdentities || []).map(item => item.ServiceName))
.concat((item.NodeIdentities || []).map(item => item.NodeName));
},
};

31
ui/packages/consul-ui/app/search/predicates/service-instance.js
View File

@ -1,24 +1,11 @@
export default {
Name: (item, value) => {
return item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1;
},
Tags: (item, value) =>
(item.Service.Tags || []).some(item => item.toLowerCase().indexOf(value.toLowerCase()) !== -1),
ID: (item, value) => (item.Service.ID || '').toLowerCase().indexOf(value.toLowerCase()) !== -1,
Address: (item, value) =>
item.Address.toString()
.toLowerCase()
.indexOf(value.toLowerCase()) !== -1,
Port: (item, value) =>
item.Service.Port.toString()
.toLowerCase()
.indexOf(value.toLowerCase()) !== -1,
['Service.Meta']: (item, value) =>
Object.entries(item.Meta || item.Service.Meta || {}).some(entry =>
entry.some(item => item.toLowerCase().indexOf(value.toLowerCase()) !== -1)
),
['Node.Meta']: (item, value) =>
Object.entries(item.Node.Meta || {}).some(entry =>
entry.some(item => item.toLowerCase().indexOf(value.toLowerCase()) !== -1)
),
Name: item => item.Name,
Tags: item => item.Service.Tags || [],
ID: (item, value) => item.Service.ID || '',
Address: item => item.Address || '',
Port: item => (item.Service.Port || '').toString(),
['Service.Meta']: item =>
Object.entries(item.Service.Meta || {}).reduce((prev, entry) => prev.concat(entry), []),
['Node.Meta']: item =>
Object.entries(item.Node.Meta || {}).reduce((prev, entry) => prev.concat(entry), []),
};

4
ui/packages/consul-ui/app/search/predicates/service.js
View File

@ -1,4 +1,4 @@
export default {
Name: (item, value) => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Tags: (item, value) => (item.Tags || []).some(item => item.toLowerCase().indexOf(value.toLowerCase()) !== -1)
Name: item => item.Name,
Tags: item => item.Tags || [],
};

24
ui/packages/consul-ui/app/search/predicates/token.js
View File

@ -1,20 +1,12 @@
export default {
Name: (item, value) => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Description: (item, value) => item.Description.toLowerCase().indexOf(value.toLowerCase()) !== -1,
AccessorID: (item, value) => item.AccessorID.toLowerCase().indexOf(value.toLowerCase()) !== -1,
Role: (item, value) =>
(item.Roles || []).some(item => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1),
Name: (item, value) => item.Name,
Description: (item, value) => item.Description,
AccessorID: (item, value) => item.AccessorID,
Role: (item, value) => (item.Roles || []).map(item => item.Name),
Policy: (item, value) => {
return (
(item.Policies || []).some(
item => item.Name.toLowerCase().indexOf(value.toLowerCase()) !== -1
) ||
(item.ServiceIdentities || []).some(
item => item.ServiceName.toLowerCase().indexOf(value.toLowerCase()) !== -1
) ||
(item.NodeIdentities || []).some(
item => item.NodeName.toLowerCase().indexOf(value.toLowerCase()) !== -1
)
);
return (item.Policies || [])
.map(item => item.Name)
.concat((item.ServiceIdentities || []).map(item => item.ServiceName))
.concat((item.NodeIdentities || []).map(item => item.NodeName));
},
};

48
ui/packages/consul-ui/app/services/search.js
View File

@ -1,5 +1,6 @@
import Service from '@ember/service';
import setHelpers from 'mnemonist/set';
import ExactSearch from 'consul-ui/utils/search/exact';
import intention from 'consul-ui/search/predicates/intention';
import upstreamInstance from 'consul-ui/search/predicates/upstream-instance';
@ -14,36 +15,27 @@ import role from 'consul-ui/search/predicates/role';
import policy from 'consul-ui/search/predicates/policy';
import nspace from 'consul-ui/search/predicates/nspace';
export const search = spec => {
let possible = Object.keys(spec);
return (term, options = {}) => {
const actual = [
...setHelpers.intersection(new Set(possible), new Set(options.properties || possible)),
];
return item => {
return (
typeof actual.find(key => {
return spec[key](item, term);
}) !== 'undefined'
);
};
};
};
const predicates = {
intention: search(intention),
service: search(service),
['service-instance']: search(serviceInstance),
['upstream-instance']: search(upstreamInstance),
['health-check']: search(healthCheck),
node: search(node),
kv: search(kv),
acl: search(acl),
token: search(token),
role: search(role),
policy: search(policy),
nspace: search(nspace),
intention: intention,
service: service,
['service-instance']: serviceInstance,
['upstream-instance']: upstreamInstance,
['health-check']: healthCheck,
node: node,
kv: kv,
acl: acl,
token: token,
role: role,
policy: policy,
nspace: nspace,
};
export default class SearchService extends Service {
searchables = {
exact: ExactSearch,
// regex: RegExpSearch,
// fuzzy: FuzzySearch,
};
predicate(name) {
return predicates[name];
}

12
ui/packages/consul-ui/app/utils/search/exact.js Normal file
View File

@ -0,0 +1,12 @@
import PredicateSearch from './predicate';
export default class ExactSearch extends PredicateSearch {
predicate(s) {
s = s.toLowerCase();
return (item = '') =>
item
.toString()
.toLowerCase()
.indexOf(s) !== -1;
}
}

20
ui/packages/consul-ui/app/utils/search/fuzzy.js Normal file
View File

@ -0,0 +1,20 @@
import Fuse from 'fuse.js';
export default class FuzzySearch {
constructor(items, options) {
this.fuse = new Fuse(items, {
includeMatches: true,
shouldSort: false, // use our own sorting for the moment
threshold: 0.4,
keys: Object.keys(options.finders) || [],
getFn(item, key) {
return (options.finders[key[0]](item) || []).toString();
},
});
}
search(s) {
return this.fuse.search(s).map(item => item.item);
}
}

22
ui/packages/consul-ui/app/utils/search/predicate.js Normal file
View File

@ -0,0 +1,22 @@
export default class PredicateSearch {
constructor(items, options) {
this.items = items;
this.options = options;
}
search(s) {
const predicate = this.predicate(s);
// Test the value of each key for each object against the regex
// All that match are returned.
return this.items.filter(item => {
return Object.entries(this.options.finders).some(([key, finder]) => {
const val = finder(item);
if (Array.isArray(val)) {
return val.some(predicate);
} else {
return predicate(val);
}
});
});
}
}

15
ui/packages/consul-ui/app/utils/search/regexp.js Normal file
View File

@ -0,0 +1,15 @@
import PredicateSearch from './predicate';
export default class RegExpSearch extends PredicateSearch {
predicate(s) {
let regex;
try {
regex = new RegExp(s, 'i');
} catch (e) {
// Return a predicate that excludes everything; most likely due to an
// eager search of an incomplete regex
return () => false;
}
return item => regex.test(item);
}
}

24
ui/packages/consul-ui/tests/unit/search/predicates/acl-test.js
View File

@ -1,11 +1,12 @@
import predicates from 'consul-ui/search/predicates/acl';
import { search as create } from 'consul-ui/services/search';
import { module, test } from 'qunit';
import ExactSearch from 'consul-ui/utils/search/exact';
import predicates from 'consul-ui/search/predicates/acl';
module('Unit | Search | Predicate | acl', function() {
const search = create(predicates);
test('items are found by properties', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
ID: 'HIT-id',
Name: 'name',
@ -18,16 +19,25 @@ module('Unit | Search | Predicate | acl', function() {
ID: 'id',
Name: 'name-HIT',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 2);
});
test('items are not found', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
ID: 'id',
Name: 'name',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
});

46
ui/packages/consul-ui/tests/unit/search/predicates/intention-test.js
View File

@ -1,11 +1,12 @@
import predicates from 'consul-ui/search/predicates/intention';
import { search as create } from 'consul-ui/services/search';
import { module, test } from 'qunit';
import ExactSearch from 'consul-ui/utils/search/exact';
import predicates from 'consul-ui/search/predicates/intention';
module('Unit | Search | Predicate | intention', function() {
const search = create(predicates);
test('items are found by properties', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
SourceName: 'Hit',
DestinationName: 'destination',
@ -18,20 +19,30 @@ module('Unit | Search | Predicate | intention', function() {
SourceName: 'source',
DestinationName: 'hiT',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 2);
});
test('items are not found', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
SourceName: 'source',
DestinationName: 'destination',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
test('items are found by *', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
SourceName: '*',
DestinationName: 'destination',
@ -40,12 +51,16 @@ module('Unit | Search | Predicate | intention', function() {
SourceName: 'source',
DestinationName: '*',
},
].filter(search('*'));
],
{
finders: predicates,
}
).search('*');
assert.equal(actual.length, 2);
});
test("* items are found by searching anything in 'All Services (*)'", function(assert) {
['All Services (*)', 'SerVices', '(*)', '*', 'vIces', 'lL Ser'].forEach(term => {
const actual = [
const actual = new ExactSearch(
[
{
SourceName: '*',
DestinationName: 'destination',
@ -54,8 +69,13 @@ module('Unit | Search | Predicate | intention', function() {
SourceName: 'source',
DestinationName: '*',
},
].filter(search(term));
assert.equal(actual.length, 2);
],
{
finders: predicates,
}
);
['All Services (*)', 'SerVices', '(*)', '*', 'vIces', 'lL Ser'].forEach(term => {
assert.equal(actual.search(term).length, 2);
});
});
});

24
ui/packages/consul-ui/tests/unit/search/predicates/kv-test.js
View File

@ -1,11 +1,12 @@
import predicates from 'consul-ui/search/predicates/kv';
import { search as create } from 'consul-ui/services/search';
import { module, test } from 'qunit';
import ExactSearch from 'consul-ui/utils/search/exact';
import predicates from 'consul-ui/search/predicates/kv';
module('Unit | Search | Predicate | kv', function() {
const search = create(predicates);
test('items are found by properties', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Key: 'HIT-here',
},
@ -18,15 +19,24 @@ module('Unit | Search | Predicate | kv', function() {
{
Key: 'really/long/path/HIT-here',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 3);
});
test('items are not found', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Key: 'key',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
});

42
ui/packages/consul-ui/tests/unit/search/predicates/node-test.js
View File

@ -1,11 +1,12 @@
import predicates from 'consul-ui/search/predicates/node';
import { search as create } from 'consul-ui/services/search';
import { module, test } from 'qunit';
import ExactSearch from 'consul-ui/utils/search/exact';
import predicates from 'consul-ui/search/predicates/node';
module('Unit | Search | Predicate | node', function() {
const search = create(predicates);
test('items are found by name', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Node: 'node-HIT',
Address: '10.0.0.0',
@ -14,34 +15,53 @@ module('Unit | Search | Predicate | node', function() {
Node: 'node',
Address: '10.0.0.0',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 1);
});
test('items are found by IP address', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Node: 'node-HIT',
Address: '10.0.0.0',
},
].filter(search('10'));
],
{
finders: predicates,
}
).search('10');
assert.equal(actual.length, 1);
});
test('items are not found by name', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Node: 'name',
Address: '10.0.0.0',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
test('items are not found by IP address', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Node: 'name',
Address: '10.0.0.0',
},
].filter(search('9'));
],
{
finders: predicates,
}
).search('9');
assert.equal(actual.length, 0);
});
});

24
ui/packages/consul-ui/tests/unit/search/predicates/policy-test.js
View File

@ -1,11 +1,12 @@
import predicates from 'consul-ui/search/predicates/policy';
import { search as create } from 'consul-ui/services/search';
import { module, test } from 'qunit';
import ExactSearch from 'consul-ui/utils/search/exact';
import predicates from 'consul-ui/search/predicates/policy';
module('Unit | Search | Predicate | policy', function() {
const search = create(predicates);
test('items are found by properties', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Name: 'name-HIT',
Description: 'description',
@ -14,16 +15,25 @@ module('Unit | Search | Predicate | policy', function() {
Name: 'name',
Description: 'desc-HIT-ription',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 2);
});
test('items are not found', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Name: 'name',
Description: 'description',
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
});

33
ui/packages/consul-ui/tests/unit/search/predicates/role-test.js
View File

@ -1,11 +1,12 @@
import predicates from 'consul-ui/search/predicates/role';
import { search as create } from 'consul-ui/services/search';
import { module, test } from 'qunit';
import ExactSearch from 'consul-ui/utils/search/exact';
import predicates from 'consul-ui/search/predicates/role';
module('Unit | Search | Predicate | role', function() {
const search = create(predicates);
test('items are found by properties', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Name: 'name-HIT',
Description: 'description',
@ -29,11 +30,16 @@ module('Unit | Search | Predicate | role', function() {
{ ServiceName: 'service-identity-HIT' },
],
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 4);
});
test('items are not found', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Name: 'name',
Description: 'description',
@ -50,11 +56,16 @@ module('Unit | Search | Predicate | role', function() {
Description: 'description',
ServiceIdenitities: [{ ServiceName: 'si' }, { ServiceName: 'si-second' }],
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
test('arraylike things can be empty', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
Name: 'name',
Description: 'description',
@ -72,7 +83,11 @@ module('Unit | Search | Predicate | role', function() {
Policies: [],
ServiceIdentities: [],
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
});

41
ui/packages/consul-ui/tests/unit/search/predicates/service-test.js
View File

@ -1,10 +1,11 @@
import { search } from 'consul-ui/services/search';
import spec from 'consul-ui/search/predicates/service';
import { module, test } from 'qunit';
module('Unit | Search | Filter | service', function() {
const predicate = search(spec);
import ExactSearch from 'consul-ui/utils/search/exact';
import predicates from 'consul-ui/search/predicates/service';
module('Unit | Search | Predicate | service', function() {
test('items are found by properties', function(assert) {
const actual = new ExactSearch(
[
{
Name: 'name-HIT',
@ -14,12 +15,15 @@ module('Unit | Search | Filter | service', function() {
Name: 'name',
Tags: ['tag', 'tag-withHiT'],
},
].forEach(function(item) {
const actual = predicate('hit')(item);
assert.ok(actual);
});
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 2);
});
test('items are not found', function(assert) {
const actual = new ExactSearch(
[
{
Name: 'name',
@ -28,12 +32,15 @@ module('Unit | Search | Filter | service', function() {
Name: 'name',
Tags: ['one', 'two'],
},
].forEach(function(item) {
const actual = predicate('hit')(item);
assert.notOk(actual);
});
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
test('tags can be empty', function(assert) {
const actual = new ExactSearch(
[
{
Name: 'name',
@ -46,9 +53,11 @@ module('Unit | Search | Filter | service', function() {
Name: 'name',
Tags: [],
},
].forEach(function(item) {
const actual = predicate('hit')(item);
assert.notOk(actual);
});
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
});

35
ui/packages/consul-ui/tests/unit/search/predicates/token-test.js
View File

@ -1,11 +1,12 @@
import predicates from 'consul-ui/search/predicates/token';
import { search as create } from 'consul-ui/services/search';
import { module, test } from 'qunit';
module('Unit | Search | Filter | token', function() {
const search = create(predicates);
import ExactSearch from 'consul-ui/utils/search/exact';
import predicates from 'consul-ui/search/predicates/token';
module('Unit | Search | Predicate | token', function() {
test('items are found by properties', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
AccessorID: 'id',
Name: 'name',
@ -57,11 +58,16 @@ module('Unit | Search | Filter | token', function() {
Description: 'description',
NodeIdentities: [{ NodeName: 'node-identity' }, { NodeName: 'node-identity-HIT' }],
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 7);
});
test('items are not found', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
AccessorID: 'id',
Name: 'name',
@ -92,11 +98,16 @@ module('Unit | Search | Filter | token', function() {
Description: 'description',
NodeIdentities: [{ NodeName: 'si' }, { NodeName: 'si-second' }],
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
test('arraylike things can be empty', function(assert) {
const actual = [
const actual = new ExactSearch(
[
{
AccessorID: 'id',
Name: 'name',
@ -120,7 +131,11 @@ module('Unit | Search | Filter | token', function() {
ServiceIdentities: [],
NodeIdentities: [],
},
].filter(search('hit'));
],
{
finders: predicates,
}
).search('hit');
assert.equal(actual.length, 0);
});
});