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

Dev to main
City-of-Helsinki · Aug 9, 2023 · 4863b92 · 4863b92
2 parents 5fd41e3 + e4bf232
commit 4863b92
Show file tree

Hide file tree

Showing 20 changed files with 222 additions and 345 deletions.
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.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.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: {  }

diff --git a/conf/cmi/core.entity_view_display.paragraph.target_group_link_item.default.yml b/conf/cmi/core.entity_view_display.paragraph.target_group_link_item.default.yml
@@ -11,14 +11,14 @@ dependencies:
     - hdbt_admin_tools
     - link
 _core:
-  default_config_hash: i80ANNBaRvZWikQ1vNa_Ib_ogd25z6iAxzCrXayVsTA
+  default_config_hash: 1745o_IHwMytcBjIpfcCeHE1USxqMqdc7HwSLQTjKjs
 id: paragraph.target_group_link_item.default
 targetEntityType: paragraph
 bundle: target_group_link_item
 mode: default
 content:
   field_icon:
-    type: select2_icon_formatter
+    type: select_icon_formatter
     label: hidden
     settings: {  }
     third_party_settings: {  }

diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml
@@ -6,12 +6,12 @@ dependencies:
     - field.storage.paragraph.field_title
     - paragraphs.paragraphs_type.contact_card_listing
 _core:
-  default_config_hash: kdKc_1jRpFFpVgiylfofxe6JZyl5xOjMYEAlvcwPdCU
+  default_config_hash: wVwE7xrXuQ3BymCdqpyrTEoV_pKubFHD709zQ7JDZW4
 id: paragraph.contact_card_listing.field_title
 field_name: field_title
 entity_type: paragraph
 bundle: contact_card_listing
-label: 'Job title'
+label: Title
 description: ''
 required: false
 translatable: false

diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml
@@ -7,10 +7,13 @@ dependencies:
     - paragraphs.paragraphs_type.accordion
     - paragraphs.paragraphs_type.banner
     - paragraphs.paragraphs_type.columns
+    - paragraphs.paragraphs_type.contact_card_listing
     - paragraphs.paragraphs_type.content_cards
+    - paragraphs.paragraphs_type.event_list
     - paragraphs.paragraphs_type.from_library
     - paragraphs.paragraphs_type.image
     - paragraphs.paragraphs_type.list_of_links
+    - paragraphs.paragraphs_type.map
     - paragraphs.paragraphs_type.phasing
     - paragraphs.paragraphs_type.remote_video
     - paragraphs.paragraphs_type.text
@@ -43,6 +46,9 @@ settings:
       from_library: from_library
       remote_video: remote_video
       phasing: phasing
+      contact_card_listing: contact_card_listing
+      map: map
+      event_list: event_list
     negate: 0
     target_bundles_drag_drop:
       accordion:
@@ -54,9 +60,15 @@ settings:
       columns:
         weight: 0
         enabled: true
+      contact_card_listing:
+        weight: 0
+        enabled: true
       content_cards:
         weight: 0
         enabled: true
+      event_list:
+        weight: 0
+        enabled: true
       from_library:
         weight: 0
         enabled: true
@@ -66,6 +78,9 @@ settings:
       list_of_links:
         weight: 0
         enabled: true
+      map:
+        weight: 0
+        enabled: true
       phasing:
         weight: 0
         enabled: true

diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml
@@ -7,15 +7,18 @@ dependencies:
     - paragraphs.paragraphs_type.accordion
     - paragraphs.paragraphs_type.banner
     - paragraphs.paragraphs_type.columns
+    - paragraphs.paragraphs_type.contact_card_listing
     - paragraphs.paragraphs_type.content_cards
     - paragraphs.paragraphs_type.event_list
     - paragraphs.paragraphs_type.from_library
     - paragraphs.paragraphs_type.image
     - paragraphs.paragraphs_type.liftup_with_image
     - paragraphs.paragraphs_type.list_of_links
+    - paragraphs.paragraphs_type.map
     - paragraphs.paragraphs_type.news_list
     - paragraphs.paragraphs_type.phasing
     - paragraphs.paragraphs_type.remote_video
+    - paragraphs.paragraphs_type.text
   module:
     - entity_reference_revisions
     - helfi_tpr
@@ -47,6 +50,9 @@ settings:
       news_list: news_list
       event_list: event_list
       phasing: phasing
+      text: text
+      contact_card_listing: contact_card_listing
+      map: map
     negate: 0
     target_bundles_drag_drop:
       accordion:
@@ -58,6 +64,9 @@ settings:
       columns:
         weight: 0
         enabled: true
+      contact_card_listing:
+        weight: 0
+        enabled: true
       content_cards:
         weight: 0
         enabled: true
@@ -76,6 +85,9 @@ settings:
       list_of_links:
         weight: 0
         enabled: true
+      map:
+        weight: 0
+        enabled: true
       news_list:
         weight: 0
         enabled: true
@@ -85,4 +97,7 @@ settings:
       remote_video:
         weight: 0
         enabled: true
+      text:
+        weight: 0
+        enabled: true
 field_type: entity_reference_revisions
diff --git a/conf/cmi/system.menu.branding-navigation.yml b/conf/cmi/system.menu.branding-navigation.yml
diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml
@@ -6,8 +6,6 @@ dependencies:
     - helfi_tpr
     - user
     - views_bulk_operations
-    - views_bulk_edit
-    - content_lock
 id: tpr_unit_list
 label: 'TPR unit list'
 module: views
@@ -76,6 +74,7 @@ display:
           batch: true
           batch_size: 50
           form_step: true
+          ajax_loader: false
           buttons: false
           action_title: Action
           clear_on_exposed: true

diff --git a/docker/openshift/crons/migrate-hearings.sh b/docker/openshift/crons/migrate-hearings.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "Starting hearings migration: $(date)"
+
+while true
+do
+  drush mim helfi_hearings --reset-threshold 43200 --interval 1800
+  sleep 900
+done