Merge pull request #213 from City-of-Helsinki/dev

Dev to main
City-of-Helsinki · Mar 16, 2023 · e5dcd3b · e5dcd3b
2 parents 8c477dc + b10522b
commit e5dcd3b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 18 deletions.
diff --git a/public/modules/custom/helfi_rekry_job_search/assets/main.12eb82b5.js.map b/public/modules/custom/helfi_rekry_job_search/assets/main.12eb82b5.js.map
diff --git a/public/modules/custom/helfi_rekry_job_search/assets/main.ca9620cd.js.map b/public/modules/custom/helfi_rekry_job_search/assets/main.ca9620cd.js.map
diff --git a/public/modules/custom/helfi_rekry_job_search/assets/main.js b/public/modules/custom/helfi_rekry_job_search/assets/main.js
diff --git a/public/modules/custom/helfi_rekry_job_search/js/src/hooks/useQueryString.tsx b/public/modules/custom/helfi_rekry_job_search/js/src/hooks/useQueryString.tsx
@@ -15,14 +15,29 @@ const useQueryString = (urlParams: URLParams): string => {
       bool: {
         should: [
           {
-            match_phrase_prefix: {
+            term: {
               [IndexFields.RECRUITMENT_ID]: urlParams.keyword.toString(),
             },
           },
+          {
+            term: {
+              [IndexFields.RECRUITMENT_ID]: urlParams.keyword.toString().toUpperCase(),
+            },
+          },
           {
             combined_fields: {
               query: urlParams.keyword.toString(),
-              fields: [`${IndexFields.TITLE}^2`, IndexFields.EMPLOYMENT, IndexFields.ORGANIZATION_NAME],
+              fields: [`${IndexFields.TITLE}^2`],
+            },
+          },
+          {
+            term: {
+              [IndexFields.EMPLOYMENT]: urlParams.keyword.toString(),
+            },
+          },
+          {
+            term: {
+              [IndexFields.ORGANIZATION_NAME]: urlParams.keyword.toString(),
             },
           },
           {
@@ -107,7 +122,7 @@ const useQueryString = (urlParams: URLParams): string => {
         urlParams.language
           ? {
               term: {
-                [`${IndexFields.LANGUAGE}.keyword`]: urlParams.language.toString(),
+                [IndexFields.LANGUAGE]: urlParams.language.toString(),
               },
             }
           : languageFilter,

diff --git a/public/modules/custom/helfi_rekry_job_search/js/src/query/queries.ts b/public/modules/custom/helfi_rekry_job_search/js/src/query/queries.ts
@@ -3,7 +3,7 @@ import IndexFields from '../enum/IndexFields';
 
 // Filter by current language
 export const languageFilter = {
-  term: { [`${IndexFields.LANGUAGE}.keyword`]: window.drupalSettings.path.currentLanguage || 'fi' },
+  term: { [`${IndexFields.LANGUAGE}`]: window.drupalSettings.path.currentLanguage || 'fi' },
 };
 
 // Filter out taxonomy terms
@@ -13,7 +13,7 @@ export const nodeFilter = {
 
 // Alphabetical sort for terms
 const alphabeticallySortTerms = {
-  'name.keyword': {
+  name: {
     order: 'asc',
   },
 };
@@ -41,7 +41,7 @@ export const AGGREGATIONS = {
     },
     employment_search_id: {
       terms: {
-        field: 'employment_search_id.keyword',
+        field: 'employment_search_id',
         size: 100,
       },
     },
@@ -58,12 +58,12 @@ export const EMPLOYMENT_FILTER_OPTIONS = {
   query: {
     bool: {
       should: [
-        { term: { 'field_search_id.keyword': CustomIds.FIXED_CONTRACTUAL } },
-        { term: { 'field_search_id.keyword': CustomIds.FIXED_SERVICE } },
-        { term: { 'field_search_id.keyword': CustomIds.PERMANENT_CONTRACTUAL } },
-        { term: { 'field_search_id.keyword': CustomIds.PERMANENT_SERVICE } },
-        { term: { 'field_search_id.keyword': CustomIds.TRAINING } },
-        { term: { 'field_search_id.keyword': CustomIds.ALTERNATION } },
+        { term: { field_search_id: CustomIds.FIXED_CONTRACTUAL } },
+        { term: { field_search_id: CustomIds.FIXED_SERVICE } },
+        { term: { field_search_id: CustomIds.PERMANENT_CONTRACTUAL } },
+        { term: { field_search_id: CustomIds.PERMANENT_SERVICE } },
+        { term: { field_search_id: CustomIds.TRAINING } },
+        { term: { field_search_id: CustomIds.ALTERNATION } },
       ],
       minimum_should_match: 1,
       filter: [languageFilter, { term: { [IndexFields.ENTITY_TYPE]: 'taxonomy_term' } }],
@@ -78,7 +78,7 @@ export const LANGUAGE_OPTIONS = {
   aggs: {
     languages: {
       terms: {
-        field: '_language.keyword',
+        field: '_language',
       },
     },
   },
@@ -103,7 +103,7 @@ export const TASK_AREA_OPTIONS = {
       filter: [
         {
           term: {
-            'vid.keyword': 'task_area',
+            vid: 'task_area',
           },
         },
         {