Skip to content

Commit

Permalink
Merge pull request #68 from lblod/development
Browse files Browse the repository at this point in the history
Release 1.2.2
  • Loading branch information
bdevloed authored Jan 10, 2025
2 parents dee3922 + 54f31bb commit ac7dfbd
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 7 deletions.
6 changes: 5 additions & 1 deletion app/services/mu-search.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Service from '@ember/service';
export default class MuSearchService extends Service {
async search(request) {
const { index, page, size, sort, filters } = request;
const { index, page, size, sort, filters, collapseUuids } = request;
try {
const params = [];
if (size) {
Expand All @@ -17,6 +17,10 @@ export default class MuSearchService extends Service {
});
}

if (collapseUuids) {
params.push(`collapse_uuids=${collapseUuids}`);
}

if (sort) {
const sortParams = sort
.split(',')
Expand Down
12 changes: 11 additions & 1 deletion app/services/query-builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ export default class QueryBuilderService extends Service {
});
}

export const associationsQuery = ({ index, page, params, size }) => {
export const associationsQuery = ({
index,
page,
params,
size,
distinct = true,
}) => {
const request = {};
const search = params.search;
request.index = index;
Expand Down Expand Up @@ -163,6 +169,10 @@ export const associationsQuery = ({ index, page, params, size }) => {
request.size = size;
request.sort = params.sort || '-createdOn';

if (distinct) {
request.collapseUuids = 't';
}

request.filters = filters;
return request;
};
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frontend-verenigingen-loket",
"version": "1.2.1",
"version": "1.2.2",
"private": true,
"description": "Small description for frontend-verenigingen-loket goes here",
"repository": "github:lblod/frontend-verenigingen-loket",
Expand Down Expand Up @@ -96,4 +96,4 @@
"ember": {
"edition": "octane"
}
}
}

0 comments on commit ac7dfbd

Please sign in to comment.