Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(instances): search only by visible attrs

Browse Source
This commit is contained in:
Sérgio Ramos 2018-02-28 12:26:40 +00:00 committed by Sérgio Ramos
parent ce232b7d6a
commit 577df6d187
4 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/my-joy-instances/src/containers/instances/list.js
View File

@ -197,7 +197,7 @@ export default compose(
}));
const index = new Fuse(instances, {
keys: instances.length ? Object.keys(instances[0]) : ['name']
keys: ['id', 'name', 'status', 'created']
});
return {

24
packages/my-joy-instances/src/containers/instances/metadata.js
View File

@ -10,6 +10,7 @@ import find from 'lodash.find';
import get from 'lodash.get';
import intercept from 'apr-intercept';
import remcalc from 'remcalc';
import Fuse from 'fuse.js';
import {
ViewContainer,
@ -170,7 +171,8 @@ export default compose(
({ name = '' }) => name !== 'user-script'
);
const metadata = values.map(({ name, value }) => ({
const metadata = values.map(({ id, name, value }) => ({
id,
form: METADATA_FORM_KEY(name),
initialValues: {
name,
@ -178,7 +180,12 @@ export default compose(
}
}));
const index = new Fuse(values, {
keys: ['name', 'value']
});
return {
index,
metadata,
instance,
loading,
@ -188,16 +195,25 @@ export default compose(
}
}),
connect(
({ values }, { metadata, ownProps }) => ({
({ values, form }, { metadata, index, ownProps }) => {
// get search value
const filter = get(form, `${MENU_FORM_NAME}.values.filter`, false);
// if user is searching something, get items that match that query
const filtered = filter
? index.search(filter).map(({ id }) => find(metadata, ['id', id]))
: metadata;
return {
...ownProps,
addOpen: get(values, 'add-metadata-open', false),
metadata: metadata.map(({ form, ...metadata }) => ({
metadata: filtered.map(({ form, ...metadata }) => ({
...metadata,
form,
expanded: get(values, `${form}-expanded`, false),
removing: get(values, `${form}-removing`, false)
}))
}),
};
},
(dispatch, ownProps) => {
const {
instance,

2
packages/my-joy-instances/src/containers/instances/snapshots.js
View File

@ -182,7 +182,7 @@ export default compose(
const snapshots = get(instance, 'snapshots', []);
const index = new Fuse(snapshots, {
keys: snapshots.length ? Object.keys(snapshots[0]) : ['name']
keys: ['name', 'status', 'created']
});
return {

2
packages/my-joy-instances/src/containers/instances/tags.js
View File

@ -164,7 +164,7 @@ export default compose(
);
const index = new Fuse(tags, {
keys: tags.length ? Object.keys(tags[0]) : ['name']
keys: ['name', 'value']
});
return {