Skip to content

Commit 0183933

Browse files
committed
feat: update aggregations for datasets and studies
1 parent 6c3cd38 commit 0183933

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

src/hooks/useLibraryData.ts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ export const buildElasticsearchQuery = (
2525
sort?: SortState,
2626
): ElasticsearchQuery => {
2727
const queryChunks: QueryClause[] = [
28-
{
29-
match: {
30-
_type: 'dataset',
31-
},
32-
},
3328
{
3429
exists: {
3530
field: 'study',
@@ -74,7 +69,7 @@ export const buildElasticsearchQuery = (
7469
bool: {
7570
should: filters.accessManagement.map(term => ({
7671
term: {
77-
accessManagement: term,
72+
'accessManagement.keyword': term,
7873
},
7974
})),
8075
},
@@ -188,22 +183,22 @@ export const buildElasticsearchQuery = (
188183
// Add filter aggregations
189184
access_management: {
190185
terms: {
191-
field: 'accessManagement',
186+
field: 'accessManagement.keyword',
192187
},
193188
},
194189
data_use: {
195190
terms: {
196-
field: 'dataUse.primary.code',
191+
field: 'dataUse.primary.code.keyword',
197192
},
198193
},
199194
data_type: {
200195
terms: {
201-
field: 'study.dataTypes',
196+
field: 'study.dataTypes.keyword',
202197
},
203198
},
204199
dac: {
205200
terms: {
206-
field: 'dac.dacName',
201+
field: 'dac.dacName.keyword',
207202
},
208203
},
209204
},
@@ -233,22 +228,22 @@ export const buildElasticsearchQuery = (
233228
aggs: {
234229
access_management: {
235230
terms: {
236-
field: 'accessManagement',
231+
field: 'accessManagement.keyword',
237232
},
238233
},
239234
data_use: {
240235
terms: {
241-
field: 'dataUse.primary.code',
236+
field: 'dataUse.primary.code.keyword',
242237
},
243238
},
244239
data_type: {
245240
terms: {
246-
field: 'study.dataTypes',
241+
field: 'study.dataTypes.keyword',
247242
},
248243
},
249244
dac: {
250245
terms: {
251-
field: 'dac.dacName',
246+
field: 'dac.dacName.keyword',
252247
},
253248
},
254249
},

0 commit comments

Comments
 (0)