Merge pull request #716 from City-of-Helsinki/UHF-8535-forced-transla…

…tions

UHF-8535: Forced translations

src/js/react/apps/job-search/query/queries.ts

@@ -20,6 +20,14 @@ const alphabeticallySortTerms = {
   },
 };
 
+const termSubAgg = {
+  unique: {
+    cardinality: {
+      field: `${IndexFields.RECRUITMENT_ID}.keyword`
+    }
+  }
+};
+
 // Base aggregations
 export const AGGREGATIONS = {
   aggs: {
@@ -28,29 +36,41 @@ export const AGGREGATIONS = {
         field: 'task_area_external_id',
         size: 100,
       },
+      aggs: termSubAgg
     },
     employment: {
       terms: {
         field: 'employment_id',
         size: 100,
       },
+      aggs: termSubAgg
     },
     employment_type: {
       terms: {
         field: 'employment_type_id',
         size: 100,
       },
+      aggs: termSubAgg
     },
     employment_search_id: {
       terms: {
         field: 'employment_search_id',
         size: 100,
       },
+      aggs: termSubAgg
     },
   },
   query: {
     bool: {
-      filter: [languageFilter, nodeFilter],
+      filter: [nodeFilter],
+      // Legacy: filter out "forced" translations
+      must: [
+        {
+          term: {
+            [IndexFields.COPIED]: false,
+          },
+        },
+      ],
     },
   },
 };

src/js/react/apps/job-search/store.tsx

@@ -1,14 +1,27 @@
 import { atom } from 'jotai';
 
 import CustomIds from './enum/CustomTermIds';
-import bucketToMap from '@/react/common/helpers/Aggregations';
 import { getLanguageLabel } from './helpers/Language';
 import sortOptions from './helpers/Options';
 import { AGGREGATIONS, EMPLOYMENT_FILTER_OPTIONS, LANGUAGE_OPTIONS, TASK_AREA_OPTIONS } from './query/queries';
 import type OptionType from './types/OptionType';
 import type Result from './types/Result';
 import type Term from './types/Term';
 import type URLParams from './types/URLParams';
+import AggregationItem from './types/AggregationItem';
+
+// Make maps out of bucket responses
+const bucketToMap = (bucket: AggregationItem[]) => {
+  const result = new Map();
+
+  bucket.forEach(item => {
+    if (item?.unique?.value) {
+      result.set(item.key, item.unique.value);
+    }
+  });
+
+  return result;
+};
 
 const getParams = (searchParams: URLSearchParams) => {
   const params: { [k: string]: any } = {};

src/js/react/apps/job-search/types/AggregationItem.ts

@@ -0,0 +1,9 @@
+import { AggregationItem as CommonAggItem } from '@/types/Aggregation';
+
+type AggregationItem = CommonAggItem & {
+  unique?: {
+    value: number;
+  }
+};
+
+export default AggregationItem;