From dd1bd61a2e8dca6112ad95d639d9fba472ba9f3a Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 10 Jan 2025 11:12:38 +0100 Subject: [PATCH 1/2] do not show duplicate associations in overview --- app/services/mu-search.js | 6 +++++- app/services/query-builder.js | 12 +++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/services/mu-search.js b/app/services/mu-search.js index da81049..5647792 100644 --- a/app/services/mu-search.js +++ b/app/services/mu-search.js @@ -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) { @@ -17,6 +17,10 @@ export default class MuSearchService extends Service { }); } + if (collapseUuids) { + params.push(`collapse_uuids=${collapseUuids}`); + } + if (sort) { const sortParams = sort .split(',') diff --git a/app/services/query-builder.js b/app/services/query-builder.js index d172f15..6cb2df4 100644 --- a/app/services/query-builder.js +++ b/app/services/query-builder.js @@ -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; @@ -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; }; From 54f31bb660086ec298224cda99513420ba38feda Mon Sep 17 00:00:00 2001 From: Boris De Vloed Date: Fri, 10 Jan 2025 12:24:44 +0100 Subject: [PATCH 2/2] release 1.2.2 --- package-lock.json | 6 +++--- package.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d410fc..0a5f865 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "frontend-verenigingen-loket", - "version": "1.2.1", + "version": "1.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "frontend-verenigingen-loket", - "version": "1.2.1", + "version": "1.2.2", "license": "MIT", "devDependencies": { "@appuniversum/ember-appuniversum": "^3.5.0", @@ -35813,4 +35813,4 @@ } } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index db16b40..a85f765 100644 --- a/package.json +++ b/package.json @@ -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", @@ -96,4 +96,4 @@ "ember": { "edition": "octane" } -} +} \ No newline at end of file