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

Dev to main

conf/cmi/search_api.index.job_listings.yml

@@ -3,21 +3,21 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.node.field_original_language
-    - field.storage.node.field_task_area
-    - field.storage.taxonomy_term.field_external_id
-    - field.storage.node.field_copied
-    - field.storage.node.field_employment_type
     - field.storage.node.field_employment
     - field.storage.taxonomy_term.field_search_id
+    - field.storage.node.field_employment_type
+    - field.storage.node.field_copied
+    - field.storage.taxonomy_term.field_external_id
     - field.storage.node.field_job_duration
-    - field.storage.node.field_publication_starts
-    - field.storage.node.field_organization_name
-    - field.storage.node.field_organization
     - field.storage.node.field_jobs
+    - field.storage.node.field_organization
+    - field.storage.node.field_organization_name
+    - field.storage.node.field_original_language
     - field.storage.node.field_postal_area
+    - field.storage.node.field_publication_starts
     - field.storage.node.field_recruitment_id
     - field.storage.node.field_recruitment_type
+    - field.storage.node.field_task_area
     - search_api.server.elastic_rekry
   module:
     - taxonomy
@@ -76,7 +76,7 @@ field_settings:
     label: 'Employment » Taxonomy term » Name'
     datasource_id: 'entity:node'
     property_path: 'field_employment:entity:name'
-    type: string
+    type: text
     dependencies:
       config:
         - field.storage.node.field_employment
@@ -130,7 +130,7 @@ field_settings:
     label: 'Organization name'
     datasource_id: 'entity:node'
     property_path: field_organization_name
-    type: string
+    type: text
     dependencies:
       config:
         - field.storage.node.field_organization_name
@@ -162,7 +162,7 @@ field_settings:
     label: 'Recruitment ID'
     datasource_id: 'entity:node'
     property_path: field_recruitment_id
-    type: string
+    type: text
     dependencies:
       config:
         - field.storage.node.field_recruitment_id
@@ -314,6 +314,7 @@ processor_settings:
       - employment_search_id
       - field_organization_name
       - field_postal_area
+      - field_recruitment_id
       - field_search_id
       - langcode
       - title

public/modules/custom/helfi_rekry_content/helfi_rekry_content.module

@@ -215,14 +215,25 @@ function helfi_rekry_content_preprocess_field(&$variables) {
 
   // Expose original language to field templates.
   $variables['original_language'] = $originalLanguage;
+  $inlineFields = [
+    'title',
+    'field_salary',
+    'field_job_duration',
+    'field_address',
+  ];
+
+  // Use span instead of div for inline fields.
+  if (isset($variables['field_name']) && in_array($variables['field_name'], $inlineFields)) {
+    $variables['original_language_inline'] = TRUE;
+  }
 
   // Expose original language as an attribute for these fields.
   $wrappedFields = [
     'field_salary_class',
     'field_organization_name',
   ];
 
-  if ($variables['field_name'] && in_array($variables['field_name'], $wrappedFields)) {
+  if (isset($variables['field_name']) && in_array($variables['field_name'], $wrappedFields)) {
     foreach ($variables['items'] as $item) {
       $item['attributes']->setAttribute('lang', 'fi');
     }

public/modules/custom/helfi_rekry_job_search/helfi_rekry_job_search.module

@@ -46,11 +46,11 @@ function helfi_rekry_job_search_page_attachments_alter(array &$attachments) {
   ]);
 
   $term = reset($term);
-  if ($term->hasTranslation($langcode)) {
+  if ($term && $term->hasTranslation($langcode)) {
     $term = $term->getTranslation($langcode);
   }
 
-  if ($term->hasField('field_meta_description') && !$term->get('field_meta_description')->isEmpty()) {
+  if ($term && $term->hasField('field_meta_description') && !$term->get('field_meta_description')->isEmpty()) {
     $description = [
       '#tag' => 'meta',
       '#attributes' => [

public/modules/custom/helfi_rekry_job_search/js/src/components/results/ResultCard.tsx

@@ -24,12 +24,12 @@ const ResultCard = ({
 
   let heading = title[0];
 
+  let jobs_amount = null;
   if (field_jobs[0] > 1) {
-    heading += ` (${field_jobs} ${Drupal.t('jobs')})`;
+    jobs_amount = ` (${field_jobs} ${Drupal.t('jobs')})`;
   }
 
   const customAtts: HTMLAttributes<HTMLHeadingElement | HTMLDivElement> = {};
-
   if (field_copied?.length && field_original_language?.length) {
     customAtts.lang = field_original_language[0];
   }
@@ -41,9 +41,10 @@ const ResultCard = ({
 
   return (
     <div role='article' className='node--type-job-listing node--view-mode-teaser'>
-      <h3 className='job-listing__title' {...customAtts}>
+      <h3 className='job-listing__title'>
         <a href={url[0]} rel='bookmark'>
-          {heading.charAt(0).toUpperCase() + heading.slice(1)}
+          <span {...customAtts}>{heading.charAt(0).toUpperCase() + heading.slice(1)}</span>
+          {jobs_amount && <span>{jobs_amount}</span>}
         </a>
       </h3>
       <section
@@ -87,7 +88,9 @@ const ResultCard = ({
           <span className='hel-icon hel-icon--calendar ' aria-hidden='true'></span>
           {Drupal.t('Employment contract')}
         </span>
-        <span className='job-listing__metadata__content'>{field_job_duration || '-'}</span>
+        <span className='job-listing__metadata__content' {...customAtts}>
+          {field_job_duration || '-'}
+        </span>
       </div>
       <span className='hel-icon hel-icon--arrow-right' aria-hidden='true'></span>
     </div>