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

Dev to main
City-of-Helsinki · Aug 9, 2023 · c5ea948 · c5ea948
2 parents aa2f1b5 + cfdd3cb
commit c5ea948
Show file tree

Hide file tree

Showing 40 changed files with 685 additions and 464 deletions.
diff --git a/.env b/.env
@@ -31,4 +31,4 @@ DRUPAL_SYNC_FILES=no
 HELBIT_CLIENT_ID=
 
 # URL for Elasticsearch (for job search)
-ELASTIC_PROXY_URL=http://localhost:9200
+ELASTIC_PROXY_URL=https://elastic-helfi-rekry.docker.so
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/block.block.brandingnavigation.yml b/conf/cmi/block.block.brandingnavigation.yml
diff --git a/conf/cmi/block.block.hdbt_subtheme_brandingnavigation.yml b/conf/cmi/block.block.hdbt_subtheme_brandingnavigation.yml
diff --git a/conf/cmi/core.entity_form_display.node.job_listing.default.yml b/conf/cmi/core.entity_form_display.node.job_listing.default.yml
@@ -25,6 +25,7 @@ dependencies:
     - field.field.node.job_listing.field_postal_area
     - field.field.node.job_listing.field_postal_code
     - field.field.node.job_listing.field_prevent_publishing
+    - field.field.node.job_listing.field_promoted
     - field.field.node.job_listing.field_publication_ends
     - field.field.node.job_listing.field_publication_starts
     - field.field.node.job_listing.field_recruitment_id
@@ -56,7 +57,7 @@ third_party_settings:
       label: 'Override fields'
       region: content
       parent_name: ''
-      weight: 15
+      weight: 16
       format_type: fieldset
       format_settings:
         classes: ''
@@ -92,15 +93,15 @@ content:
     third_party_settings: {  }
   field_contacts:
     type: text_textarea
-    weight: 32
+    weight: 31
     region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
   field_copied:
     type: boolean_checkbox
-    weight: 45
+    weight: 42
     region: content
     settings:
       display_label: true
@@ -127,7 +128,7 @@ content:
     third_party_settings: {  }
   field_image:
     type: media_library_widget
-    weight: 33
+    weight: 32
     region: content
     settings:
       media_types: {  }
@@ -159,7 +160,7 @@ content:
     third_party_settings: {  }
   field_last_changed_remote:
     type: datetime_default
-    weight: 41
+    weight: 38
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -173,15 +174,15 @@ content:
     third_party_settings: {  }
   field_link_to_presentation:
     type: link_default
-    weight: 42
+    weight: 39
     region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
   field_organization:
     type: entity_reference_autocomplete
-    weight: 35
+    weight: 33
     region: content
     settings:
       match_operator: CONTAINS
@@ -191,7 +192,7 @@ content:
     third_party_settings: {  }
   field_organization_description:
     type: text_textarea
-    weight: 37
+    weight: 34
     region: content
     settings:
       rows: 5
@@ -225,7 +226,7 @@ content:
     third_party_settings: {  }
   field_original_language:
     type: options_select
-    weight: 46
+    weight: 43
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -252,15 +253,22 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
+  field_promoted:
+    type: boolean_checkbox
+    weight: 14
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   field_publication_ends:
     type: datetime_default
-    weight: 44
+    weight: 41
     region: content
     settings: {  }
     third_party_settings: {  }
   field_publication_starts:
     type: datetime_default
-    weight: 43
+    weight: 40
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -274,7 +282,7 @@ content:
     third_party_settings: {  }
   field_recruitment_type:
     type: number
-    weight: 39
+    weight: 36
     region: content
     settings:
       placeholder: ''
@@ -289,15 +297,15 @@ content:
     third_party_settings: {  }
   field_salary_class:
     type: string_textfield
-    weight: 31
+    weight: 30
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   field_task_area:
     type: entity_reference_autocomplete
-    weight: 40
+    weight: 37
     region: content
     settings:
       match_operator: CONTAINS
@@ -307,14 +315,14 @@ content:
     third_party_settings: {  }
   field_video:
     type: media_library_widget
-    weight: 38
+    weight: 35
     region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
   job_description:
     type: text_textarea_with_summary
-    weight: 30
+    weight: 29
     region: content
     settings:
       rows: 9
@@ -380,7 +388,7 @@ content:
     third_party_settings: {  }
   title:
     type: string_textfield
-    weight: 14
+    weight: 15
     region: content
     settings:
       size: 60

diff --git a/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml
@@ -14,7 +14,7 @@ dependencies:
     config:
       - paragraphs.paragraphs_type.accordion_item
 _core:
-  default_config_hash: yh7XBH-ll-xlWjrJde_b840dNBvzoVrP75rXJtZTYnI
+  default_config_hash: 7N37krPnWHQwmRjb9_0yq6TseyB-RZ-qkVpklV7rR98
 id: paragraph.accordion_item.default
 targetEntityType: paragraph
 bundle: accordion_item
@@ -48,7 +48,7 @@ content:
       placeholder: ''
     third_party_settings: {  }
   field_icon:
-    type: select2_icon_widget
+    type: select_icon_widget
     weight: 1
     region: content
     settings: {  }

diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml
@@ -17,7 +17,7 @@ dependencies:
     module:
       - hdbt_admin_tools
 _core:
-  default_config_hash: Vtp2PgsgVx3XvL6wqcXbKUn8j0EMUkSmwv55K092n0M
+  default_config_hash: dW34Ba__f5zlIB6OaYxFRW0itQBA98RdooSTUnqW2RE
 id: paragraph.banner.default
 targetEntityType: paragraph
 bundle: banner
@@ -60,7 +60,7 @@ content:
       placeholder: ''
     third_party_settings: {  }
   field_icon:
-    type: select2_icon_widget
+    type: select_icon_widget
     weight: 2
     region: content
     settings: {  }

diff --git a/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml b/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml
@@ -10,14 +10,14 @@ dependencies:
     - hdbt_admin_tools
     - link
 _core:
-  default_config_hash: aWojfz5AeLM97eeoyKxUlJpYkuG2X8qLl2KOaczBukY
+  default_config_hash: BzfvGsHIC_c0aNhpt5fjgtz76eqpJy7Q8UpK7Rdebso
 id: paragraph.social_media_link.default
 targetEntityType: paragraph
 bundle: social_media_link
 mode: default
 content:
   field_icon:
-    type: select2_icon_widget
+    type: select_icon_widget
     weight: 0
     region: content
     settings: {  }

diff --git a/conf/cmi/core.entity_form_display.paragraph.target_group_link_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.target_group_link_item.default.yml
@@ -11,14 +11,14 @@ dependencies:
     - hdbt_admin_tools
     - link
 _core:
-  default_config_hash: cpCXVwI1APCEyCe60tVNc9f4sPZwzq21qnKbSvJrAlw
+  default_config_hash: KD89aqMiKmJcWgPj05TsKprgmY9BzDTWPZG6_b5-V9g
 id: paragraph.target_group_link_item.default
 targetEntityType: paragraph
 bundle: target_group_link_item
 mode: default
 content:
   field_icon:
-    type: select2_icon_widget
+    type: select_icon_widget
     weight: 0
     region: content
     settings: {  }

diff --git a/conf/cmi/core.entity_view_display.node.job_listing.default.yml b/conf/cmi/core.entity_view_display.node.job_listing.default.yml
@@ -25,6 +25,7 @@ dependencies:
     - field.field.node.job_listing.field_postal_area
     - field.field.node.job_listing.field_postal_code
     - field.field.node.job_listing.field_prevent_publishing
+    - field.field.node.job_listing.field_promoted
     - field.field.node.job_listing.field_publication_ends
     - field.field.node.job_listing.field_publication_starts
     - field.field.node.job_listing.field_recruitment_id
@@ -247,6 +248,7 @@ hidden:
   field_last_changed_remote: true
   field_original_language: true
   field_prevent_publishing: true
+  field_promoted: true
   field_recruitment_type: true
   field_task_area: true
   langcode: true

diff --git a/conf/cmi/core.entity_view_display.node.job_listing.teaser.yml b/conf/cmi/core.entity_view_display.node.job_listing.teaser.yml
@@ -26,6 +26,7 @@ dependencies:
     - field.field.node.job_listing.field_postal_area
     - field.field.node.job_listing.field_postal_code
     - field.field.node.job_listing.field_prevent_publishing
+    - field.field.node.job_listing.field_promoted
     - field.field.node.job_listing.field_publication_ends
     - field.field.node.job_listing.field_publication_starts
     - field.field.node.job_listing.field_recruitment_id
@@ -92,6 +93,7 @@ hidden:
   field_postal_area: true
   field_postal_code: true
   field_prevent_publishing: true
+  field_promoted: true
   field_publication_ends: true
   field_publication_starts: true
   field_recruitment_id: true

diff --git a/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml b/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml
@@ -11,7 +11,7 @@ dependencies:
     - entity_reference_revisions
     - hdbt_admin_tools
 _core:
-  default_config_hash: 1lhqYKB1uMovDeTbUM2yc6qoZDYVsY8Rb9cWZMPqO0k
+  default_config_hash: WvxeLovAeRn181zqTY9mqQlEUH2qKUDh3w1g2KROZoA
 id: paragraph.accordion_item.default
 targetEntityType: paragraph
 bundle: accordion_item
@@ -35,7 +35,7 @@ content:
     weight: 0
     region: content
   field_icon:
-    type: select2_icon_formatter
+    type: select_icon_formatter
     label: hidden
     settings: {  }
     third_party_settings: {  }

diff --git a/conf/cmi/core.entity_view_display.paragraph.banner.default.yml b/conf/cmi/core.entity_view_display.paragraph.banner.default.yml
@@ -16,7 +16,7 @@ dependencies:
     - options
     - text
 _core:
-  default_config_hash: P09yzz4rYAbV5vNALDXDbgpMXPO7jOGMbmig6Q3VgLA
+  default_config_hash: 81G-zzBxYIt-u9L4g2zVuH0NP_i72wAOboZ0Fy7mA70
 id: paragraph.banner.default
 targetEntityType: paragraph
 bundle: banner
@@ -64,7 +64,7 @@ content:
     weight: 0
     region: content
   field_icon:
-    type: select2_icon_formatter
+    type: select_icon_formatter
     label: hidden
     settings: {  }
     third_party_settings: {  }

diff --git a/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml b/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml
@@ -10,14 +10,14 @@ dependencies:
     - hdbt_admin_tools
     - link
 _core:
-  default_config_hash: WtJ8D0kqvYryjBD0kBTGg0SOQkCyGq7qF-uD4W_3z9g
+  default_config_hash: 3cRI5TbNqV68nkWG4yIl_I6iqqYeWmdA_XtlHEkRIgE
 id: paragraph.social_media_link.default
 targetEntityType: paragraph
 bundle: social_media_link
 mode: default
 content:
   field_icon:
-    type: select2_icon_formatter
+    type: select_icon_formatter
     label: hidden
     settings: {  }
     third_party_settings: {  }