Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3222 spread custom fields api optimization #3283

Merged
merged 8 commits into from
Aug 31, 2020
Merged

3222 spread custom fields api optimization #3283

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
760b56d
Use preloaded data in index datasets API controller action
entantoencuanto Aug 4, 2020
d52c046
Adapt gobierto_data front filters to new API response
entantoencuanto Aug 4, 2020
af6ea1f
Use preloaded data in index and show action investments projects API …
entantoencuanto Aug 5, 2020
8df8c67
Adapt obtaining of phases to new API response
entantoencuanto Aug 5, 2020
951f560
Adapt investments home filters to new API response
entantoencuanto Aug 5, 2020
680787a
Avoid too complex subqueries on filtered relations
entantoencuanto Aug 5, 2020
0e37978
Update app/javascript/gobierto_investments/webapp/mixins/common.js
entantoencuanto Aug 6, 2020
29a7f5a
Remove unnecessary parenthesis
entantoencuanto Aug 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adapt investments home filters to new API response
  • Loading branch information
@entantoencuanto
entantoencuanto committed Aug 5, 2020
commit 951f5601e4dcac10a365126f2f1887665c365b96
7 changes: 4 additions & 3 deletions app/javascript/gobierto_investments/webapp/containers/home/Home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export default {
this.filters.splice(index, 1, filter); // To detect array mutations

const checkboxFilterFn = attrs =>
attrs[key].find(d => checkboxesSelected.get(+d.id));
attrs[key] && this.convertToArrayOfIds(attrs[key]).find(d => checkboxesSelected.get(+d));

const callback = size ? checkboxFilterFn : undefined;
this.filterItems(callback, key);
Expand Down Expand Up @@ -374,8 +374,9 @@ export default {
// Get the items based on these new active filters
const __items__ = this.applyFiltersCallbacks(__activeFilters__);

return __items__.filter(({ attributes }) =>
attributes[key].map(g => g.id).includes(id)
return __items__.filter(({ attributes }) =>(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may get rid of the wrapping parenthesis, in the filter condition

this.convertToArrayOfIds(attributes[key]).includes(id)
)
).length;
};
const { key, options = [] } = filter;
Expand Down