Merge pull request #778 from City-of-Helsinki/UHF-8948-fix-and-clean-…

…job-search UHF-8948: Fix and clean job search
City-of-Helsinki · Sep 25, 2023 · c811827 · c811827
2 parents bd4ca8c + d02e491
commit c811827
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 41 deletions.
diff --git a/dist/js/district-and-project-search.min.js b/dist/js/district-and-project-search.min.js
diff --git a/dist/js/job-search.min.js b/dist/js/job-search.min.js
diff --git a/dist/js/news-archive.min.js b/dist/js/news-archive.min.js
diff --git a/src/js/react/apps/district-and-project-search/containers/FormContainer.tsx b/src/js/react/apps/district-and-project-search/containers/FormContainer.tsx
@@ -84,9 +84,9 @@ const FormContainer = () => {
             icon={<IconLocation />}
             label={residentialAreaLabel}
             placeholder={Drupal.t('Select area', {}, { context: 'District and project search form label' })}
-            clearButtonAriaLabel={Drupal.t('Clear @label selection', {'@label': residentialAreaLabel}, { context: 'React search clear selection label' })}
-            selectedItemRemoveButtonAriaLabel={Drupal.t('Remove item', {}, { context: 'District and project search remove item aria label' })}
-            toggleButtonAriaLabel={Drupal.t('Open the combobox', {}, { context: 'District and project search open dropdown aria label' })}
+            clearButtonAriaLabel={Drupal.t('Clear @label selection', { '@label': residentialAreaLabel }, { context: 'React search clear selection label' })}
+            selectedItemRemoveButtonAriaLabel={Drupal.t('Remove item', {}, { context: 'React search remove item aria label' })}
+            toggleButtonAriaLabel={Drupal.t('Open the combobox', {}, { context: 'React search open dropdown aria label' })}
             theme={{
               '--focus-outline-color': 'var(--hdbt-color-black)',
               '--multiselect-checkbox-background-selected': 'var(--hdbt-color-black)',
@@ -106,7 +106,7 @@ const FormContainer = () => {
             '--header-line-height': 'var(--lineheight-s)',
           }}
         >
-          <div className='district-project-search-form__filters'>          
+          <div className='district-project-search-form__filters'>
             <Combobox
               multiselect
               id={SearchComponents.THEME}
@@ -116,9 +116,9 @@ const FormContainer = () => {
               onChange={setThemeFilter}
               label={projectThemeLabel}
               placeholder={Drupal.t('All themes', {}, { context: 'District and project search form label' })}
-              clearButtonAriaLabel={Drupal.t('Clear @label selection', {'@label': projectThemeLabel}, { context: 'React search clear selection label' })}
-              selectedItemRemoveButtonAriaLabel={Drupal.t('Remove item', {}, { context: 'District and project search remove item aria label' })}
-              toggleButtonAriaLabel={Drupal.t('Open the combobox', {}, { context: 'District and project search open dropdown aria label' })}
+              clearButtonAriaLabel={Drupal.t('Clear @label selection', { '@label': projectThemeLabel }, { context: 'React search clear selection label' })}
+              selectedItemRemoveButtonAriaLabel={Drupal.t('Remove item', {}, { context: 'React search remove item aria label' })}
+              toggleButtonAriaLabel={Drupal.t('Open the combobox', {}, { context: 'React search open dropdown aria label' })}
               theme={{
                 '--focus-outline-color': 'var(--hdbt-color-black)',
                 '--multiselect-checkbox-background-selected': 'var(--hdbt-color-black)',
@@ -134,9 +134,9 @@ const FormContainer = () => {
               onChange={setPhaseFilter}
               label={projectStageLabel}
               placeholder={Drupal.t('All stages', {}, { context: 'District and project search form label' })}
-              clearButtonAriaLabel={Drupal.t('Clear @label selection', {'@label': projectStageLabel}, { context: 'React search clear selection label' })}
-              selectedItemRemoveButtonAriaLabel={Drupal.t('Remove item', {}, { context: 'District and project search remove item aria label' })}
-              toggleButtonAriaLabel={Drupal.t('Open the combobox', {}, { context: 'District and project search open dropdown aria label' })}
+              clearButtonAriaLabel={Drupal.t('Clear @label selection', { '@label': projectStageLabel }, { context: 'React search clear selection label' })}
+              selectedItemRemoveButtonAriaLabel={Drupal.t('Remove item', {}, { context: 'React search remove item aria label' })}
+              toggleButtonAriaLabel={Drupal.t('Open the combobox', {}, { context: 'React search open dropdown aria label' })}
               theme={{
                 '--focus-outline-color': 'var(--hdbt-color-black)',
                 '--multiselect-checkbox-background-selected': 'var(--hdbt-color-black)',
@@ -152,9 +152,9 @@ const FormContainer = () => {
               onChange={setTypeFilter}
               label={projectTypeLabel}
               placeholder={Drupal.t('All types', {}, { context: 'District and project search form label' })}
-              clearButtonAriaLabel={Drupal.t('Clear @label selection', {'@label': projectTypeLabel}, { context: 'React search clear selection label' })}
-              selectedItemRemoveButtonAriaLabel={Drupal.t('Remove item', {}, { context: 'District and project search remove item aria label' })}
-              toggleButtonAriaLabel={Drupal.t('Open the combobox', {}, { context: 'District and project search open dropdown aria label' })}
+              clearButtonAriaLabel={Drupal.t('Clear @label selection', { '@label': projectTypeLabel }, { context: 'React search clear selection label' })}
+              selectedItemRemoveButtonAriaLabel={Drupal.t('Remove item', {}, { context: 'React search remove item aria label' })}
+              toggleButtonAriaLabel={Drupal.t('Open the combobox', {}, { context: 'React search open dropdown aria label' })}
               theme={{
                 '--focus-outline-color': 'var(--hdbt-color-black)',
                 '--multiselect-checkbox-background-selected': 'var(--hdbt-color-black)',

diff --git a/src/js/react/apps/job-search/components/results/ResultCard.tsx b/src/js/react/apps/job-search/components/results/ResultCard.tsx
@@ -1,10 +1,10 @@
 import { HTMLAttributes } from 'react';
 import { useAtomValue } from 'jotai';
+
 import CardItem from '@/react/common/Card';
+import Result from '@/types/Result';
 import { currentLanguage } from '../../query/queries';
-
 import Job from '../../types/Job';
-import Result from '@/types/Result';
 import { urlAtom } from '../../store';
 
 const getResultCard = ({
@@ -29,21 +29,19 @@ const getResultCard = ({
   const heading = title[0];
   const cardTitle = (
     <>
-      <span {...customAtts}>{heading.charAt(0).toUpperCase() + heading.slice(1)}</span>
-      {field_jobs?.[0] > 1 && <span>{` (${field_jobs} ${Drupal.t('jobs')})`}</span>}
+      <span {...customAtts}>{heading}</span>
+      {field_jobs?.[0] > 1 && <span>{`(${field_jobs} ${Drupal.t('jobs')})`}</span>}
     </>
   );
 
-  const orgName = field_organization_name && field_organization_name.length > 0 && field_organization_name[0] || '';
-
   const getDate = (() => {
     let date: undefined|string;
     let dateObject: undefined|Date;
     const unpublish = unpublish_on?.[0];
 
     if (!unpublish || Number.isNaN(unpublish)) {
       return '-';
-    } 
+    }
 
     try {
       dateObject = new Date(unpublish * 1000);
@@ -62,11 +60,10 @@ const getResultCard = ({
     return date;
   });
 
+  const orgName = field_organization_name && field_organization_name.length > 0 && field_organization_name[0] || '';
   const employmentTags = Array.isArray(field_employment) ? field_employment : [];
   const typeTags = Array.isArray(field_employment_type) ? field_employment_type : [];
-  const tags: any = employmentTags.concat(typeTags).map(tag => ({
-      tag
-    }));
+  const tags: any = employmentTags.concat(typeTags).map(tag => ({ tag }));
 
   return (
     <CardItem

diff --git a/src/js/react/apps/job-search/containers/ResultsContainer.tsx b/src/js/react/apps/job-search/containers/ResultsContainer.tsx
@@ -1,4 +1,5 @@
 import { useAtomValue } from 'jotai';
+
 import SimpleResultsContainer from './SimpleResultsContainer';
 import PromotedResultsContainer from './PromotedResultsContainer';
 import { configurationsAtom } from '../store';

diff --git a/src/js/react/apps/job-search/hooks/useQueryString.tsx b/src/js/react/apps/job-search/hooks/useQueryString.tsx
@@ -1,4 +1,5 @@
 import { useAtomValue } from 'jotai';
+
 import CustomIds from '../enum/CustomTermIds';
 import Global from '../enum/Global';
 import IndexFields from '../enum/IndexFields';
@@ -40,7 +41,7 @@ const useQueryString = (urlParams: URLParams): string => {
           },
           {
             combined_fields: {
-              query: urlParams.keyword.toString(),
+              query: urlParams.keyword.toString().toLowerCase(),
               fields: [
                 `${IndexFields.TITLE}^2`,
                 `${IndexFields.ORGANIZATION}^1.5`,
@@ -51,7 +52,7 @@ const useQueryString = (urlParams: URLParams): string => {
           },
           {
             wildcard: {
-              [`${IndexFields.TITLE}`]: `*${urlParams.keyword.toString()}*`,
+              [`${IndexFields.TITLE}`]: `*${urlParams.keyword.toString().toLowerCase()}*`,
             },
           },
         ],

diff --git a/src/js/react/apps/news-archive/components/Filter.tsx b/src/js/react/apps/news-archive/components/Filter.tsx
@@ -1,5 +1,6 @@
 import { Select } from 'hds-react';
 import { useAtom } from 'jotai';
+
 import OptionType from '@/types/OptionType';
 import { stagedParamsAtom } from '../store';
 import URLParams from '../types/URLParams';
@@ -43,15 +44,15 @@ const Filter = ({label, options, stateKey, ...rest}: FilterProps) =>  {
     <Select
       className='news-form__filter'
       clearable
-      clearButtonAriaLabel={Drupal.t('Clear @label selection', {'@label': label}, { context: 'React search clear selection label' })}
+      clearButtonAriaLabel={Drupal.t('Clear @label selection', { '@label': label }, { context: 'React search clear selection label' })}
       label={label}
       onChange={onChange}
       multiselect
       selectedItemRemoveButtonAriaLabel={Drupal.t(
         'Remove item',
         {},
-        { context: 'Job search remove item aria label' }
-      )}  
+        { context: 'React search remove item aria label' }
+      )}
       options={options}
       value={getValue()}
       {...rest}

diff --git a/src/js/react/common/Card.tsx b/src/js/react/common/Card.tsx
@@ -1,9 +1,9 @@
 import parse from 'html-react-parser';
 
-import Tags from './Tags';
-import Icon from './Icon';
 import type MetadataType from '@/types/MetadataType';
 import type TagType from '@/types/TagType';
+import Tags from './Tags';
+import Icon from './Icon';
 
 const Metarow = ({ icon, label, content} : MetadataType) => (
   <div className="card__meta">

diff --git a/translations/fi.po b/translations/fi.po
@@ -654,10 +654,6 @@ msgctxt "News archive clear selections"
 msgid "Clear selections"
 msgstr "Tyhjennä valinnat"
 
-msgctxt "News archive open dropdown aria label"
-msgid "Open the combobox"
-msgstr "Avaa alasvetovalikko"
-
 msgctxt "News RSS feed subscribe link"
 msgid "Subscribe to all news as RSS feed"
 msgstr "Tilaa kaikkien uutisten RSS-syöte"
@@ -673,6 +669,14 @@ msgctxt "React search clear selection label"
 msgid "Clear @label selection"
 msgstr "Tyhjennä @label valinnat"
 
+msgctxt "React search remove item aria label"
+msgid "Remove item"
+msgstr "Poista valinta"
+
+msgctxt "React search open dropdown aria label"
+msgid "Open the combobox"
+msgstr "Avaa alasvetovalikko"
+
 msgid "Unit homepage"
 msgstr "Toimipisteen kotisivut"
 

diff --git a/translations/sv.po b/translations/sv.po
@@ -647,10 +647,6 @@ msgctxt "News archive clear selections"
 msgid "Clear selections"
 msgstr "Töm urvalet"
 
-msgctxt "News archive open dropdown aria label"
-msgid "Open the combobox"
-msgstr "öppna rullgardinsmenyn"
-
 msgctxt "News RSS feed subscribe link"
 msgid "Subscribe to all news as RSS feed"
 msgstr "Prenumerera på alla nyheter som RSS-flöde"
@@ -666,6 +662,14 @@ msgctxt "React search clear selection label"
 msgid "Clear @label selection"
 msgstr "Rensa alla @label"
 
+msgctxt "React search remove item aria label"
+msgid "Remove item"
+msgstr "Töm valda"
+
+msgctxt "React search open dropdown aria label"
+msgid "Open the combobox"
+msgstr "öppna rullgardinsmenyn"
+
 msgid "Unit homepage"
 msgstr "Enhetens hemsida"