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

Dev to main
City-of-Helsinki · Feb 25, 2025 · fa3fa35 · fa3fa35
2 parents d46ef1d + 7a88103
commit fa3fa35
Show file tree

Hide file tree

Showing 44 changed files with 5,569 additions and 4,401 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-15
+16
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.media.remote_video.default.yml b/conf/cmi/core.entity_form_display.media.remote_video.default.yml
@@ -9,7 +9,7 @@ dependencies:
     - media
     - path
 _core:
-  default_config_hash: FN_7OPWqgokIHgMrwLZXn0pfYKRkMW78u-Z6D3rTo9k
+  default_config_hash: QZM7c0oisNmohFKNSqp_g5gzx8yzeSjVdgn6wpDg_vM
 id: media.remote_video.default
 targetEntityType: media
 bundle: remote_video

diff --git a/conf/cmi/core.entity_form_display.media.remote_video.media_library.yml b/conf/cmi/core.entity_form_display.media.remote_video.media_library.yml
@@ -7,7 +7,7 @@ dependencies:
     - field.field.media.remote_video.field_media_oembed_video
     - media.type.remote_video
 _core:
-  default_config_hash: O0TdkPmc3nTDrkrcep7kWKCzCZmGyOtNyB6uWj2G0l0
+  default_config_hash: mJfTw0zr7khgf6MfSZkJp32tuNhpOrjQuRDQN7ggVBE
 id: media.remote_video.media_library
 targetEntityType: media
 bundle: remote_video

diff --git a/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml
@@ -18,7 +18,7 @@ dependencies:
     - select2
     - text
 _core:
-  default_config_hash: dZwlyUF3NrPYw3C78NA0FM0m7EBnAdTWaLWhAs-jtXo
+  default_config_hash: pnw2o1LfSEYf_VAVfl_hQcc74gjXVo8kA5bkJd94LrI
 id: paragraph.event_list.default
 targetEntityType: paragraph
 bundle: event_list

diff --git a/conf/cmi/core.entity_view_display.media.remote_video.default.yml b/conf/cmi/core.entity_view_display.media.remote_video.default.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - media
 _core:
-  default_config_hash: dUxoKGWIJDMbtiZW4sgmwLmEVar2De504oi1Bu210n0
+  default_config_hash: ywWEZZCy12l3zdRvU4FRTAPVuRpImwJVixaPwpHD3PY
 id: media.remote_video.default
 targetEntityType: media
 bundle: remote_video

diff --git a/conf/cmi/core.entity_view_display.media.remote_video.media_library.yml b/conf/cmi/core.entity_view_display.media.remote_video.media_library.yml
@@ -10,7 +10,7 @@ dependencies:
   module:
     - image
 _core:
-  default_config_hash: pvWt3Oy22dvvswAwQ7QqttbawaKjqN-l7F_4oC_HRgk
+  default_config_hash: EJiV7oe8qtC1lgLmRWpjmZXXoDo_0oqTZwr59PZz41Q
 id: media.remote_video.media_library
 targetEntityType: media
 bundle: remote_video

diff --git a/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml
@@ -17,7 +17,7 @@ dependencies:
     - options
     - text
 _core:
-  default_config_hash: klW1qrhnmScBqsz4kDhFjtI4wmrMjLZynRsx9475Egs
+  default_config_hash: YnAuXvpkTYS5kEYQPdVPJ3400B-7iL51-1nhoLiTy8s
 id: paragraph.event_list.default
 targetEntityType: paragraph
 bundle: event_list

diff --git a/conf/cmi/field.field.media.remote_video.field_media_oembed_video.yml b/conf/cmi/field.field.media.remote_video.field_media_oembed_video.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.media.field_media_oembed_video
     - media.type.remote_video
 _core:
-  default_config_hash: gsTz9gl5rCIDMnCfeJlc_74KjmQ1C6PNS4R6-L9fg7g
+  default_config_hash: 9oZx8raiN5-rUCCCI9VNMuXMvBKZ9FN6hmoLlCN1wUg
 id: media.remote_video.field_media_oembed_video
 field_name: field_media_oembed_video
 entity_type: media

diff --git a/conf/cmi/field.field.paragraph.event_list.field_api_url.yml b/conf/cmi/field.field.paragraph.event_list.field_api_url.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - link
 _core:
-  default_config_hash: qFl3v-buWHh5wpZVM1bBbrLFD8prLGRuI8-zz1PX_sA
+  default_config_hash: iu_ijINfFkuA8LnCHUfd53-5MWlkBcT6Xn8Q7dHkT0Q
 id: paragraph.event_list.field_api_url
 field_name: field_api_url
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_count.yml b/conf/cmi/field.field.paragraph.event_list.field_event_count.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - options
 _core:
-  default_config_hash: 6AMaHxUxptC9tDiCGTiCpFWXBHfR4tUUSdMY9Q5BD6Q
+  default_config_hash: 6ZRfnOpoHHMzg8wtXXTrUIt_yAj8oUHhAnjDqjFNJio
 id: paragraph.event_list.field_event_count
 field_name: field_event_count
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml b/conf/cmi/field.field.paragraph.event_list.field_event_list_description.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: oPuSy256H3spbbctja0gZ-kBYwVQNKt-K6vBYmtoJlo
+  default_config_hash: jdCFrFZ9Q2C0UtVOJ3alvYHUKcK5gg9lu78o8gCr_XU
 id: paragraph.event_list.field_event_list_description
 field_name: field_event_list_description
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_list_title.yml b/conf/cmi/field.field.paragraph.event_list.field_event_list_title.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.paragraph.field_event_list_title
     - paragraphs.paragraphs_type.event_list
 _core:
-  default_config_hash: YtZI3MFPiwRz3HS_ODT2W5QE2B2zp66zUg_lkae9g04
+  default_config_hash: '-iLVURM2P3q8VXUavzrrFropCMLgHGusZqAfpCD_NBM'
 id: paragraph.event_list.field_event_list_title
 field_name: field_event_list_title
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_location.yml b/conf/cmi/field.field.paragraph.event_list.field_event_location.yml
@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_event_location
     - paragraphs.paragraphs_type.event_list
 _core:
-  default_config_hash: DSXkHRCUYDva2angAe8mEVxY95-9mh8B_oOd_9i-1I0
+  default_config_hash: 13KIFMm3tOwizoAK5jPdkaQMBM5Q0VVQGzRhZXowlPA
 id: paragraph.event_list.field_event_location
 field_name: field_event_location
 entity_type: paragraph
 bundle: event_list
 label: 'Event location'
-description: 'Show "event location" filter. Do not use at the same time with the "Remote events" filter. The API URL field should include all location IDs, otherwise this list will display all active locations.'
+description: 'Show "event location" filter. The API URL field should include all location IDs, otherwise this list will display all active locations.'
 required: false
 translatable: false
 default_value:

diff --git a/conf/cmi/field.field.paragraph.event_list.field_event_time.yml b/conf/cmi/field.field.paragraph.event_list.field_event_time.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.paragraph.field_event_time
     - paragraphs.paragraphs_type.event_list
 _core:
-  default_config_hash: w4dBFRcLBALwVLbGirmkj4Hjs08twZZqv8I9E7aVBtc
+  default_config_hash: MX5qaMRdxJ9hwIQSWpkSGNuNTWoB6giB3AbcPFrO6mo
 id: paragraph.event_list.field_event_time
 field_name: field_event_time
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.event_list.field_free_events.yml b/conf/cmi/field.field.paragraph.event_list.field_free_events.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.paragraph.field_free_events
     - paragraphs.paragraphs_type.event_list
 _core:
-  default_config_hash: 43RWM8pRAJy3tpuEGjFEy4ghMhQoCznir0O2015s_hc
+  default_config_hash: mgInhC-NE4y1eqxy0kzfr8i9MVqO7C4dCcU03Dh8SJw
 id: paragraph.event_list.field_free_events
 field_name: field_free_events
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.event_list.field_remote_events.yml b/conf/cmi/field.field.paragraph.event_list.field_remote_events.yml
@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_remote_events
     - paragraphs.paragraphs_type.event_list
 _core:
-  default_config_hash: FDxBxbAJWFx6CgcYVHtJc0CDYvMvy04Xqib_pWDlUhA
+  default_config_hash: wz7a1ma56v-vMw8QiUY3AxztYVoDF6xKj0aO_yA0d_4
 id: paragraph.event_list.field_remote_events
 field_name: field_remote_events
 entity_type: paragraph
 bundle: event_list
 label: 'Remote events'
-description: 'Show "list only remote events" filter. Do not use at the same time with the "Event location" filter.'
+description: 'Show "list only remote events" filter.'
 required: false
 translatable: false
 default_value:

diff --git a/conf/cmi/field.storage.paragraph.field_api_url.yml b/conf/cmi/field.storage.paragraph.field_api_url.yml
@@ -6,7 +6,7 @@ dependencies:
     - link
     - paragraphs
 _core:
-  default_config_hash: 15a2QmfffR33UXmxDvkHEN7LpCrI4xTdCDyDJ-pna5I
+  default_config_hash: KDIQEDpYGnTG0nUTkH6QTeUfYW14xFHvF_91omY5l6M
 id: paragraph.field_api_url
 field_name: field_api_url
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_event_count.yml b/conf/cmi/field.storage.paragraph.field_event_count.yml
@@ -6,7 +6,7 @@ dependencies:
     - options
     - paragraphs
 _core:
-  default_config_hash: hBBiCFVuAo4fqyN3hPC1a3bTN4NTlur6kQQWxerTJWo
+  default_config_hash: 8eoJE7Yn9wMCjz6RImVsPPHJLeXX1vx6E5Wc0_n-KHU
 id: paragraph.field_event_count
 field_name: field_event_count
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_event_list_description.yml b/conf/cmi/field.storage.paragraph.field_event_list_description.yml
@@ -6,7 +6,7 @@ dependencies:
     - paragraphs
     - text
 _core:
-  default_config_hash: O1iPiA9_ifYbXRj2_Yf1s6fiFDHiaxqs71MDvuzheMQ
+  default_config_hash: AuF7n6Boo2ZqTb2fYPorDvEJsCdHJrEAwfKWAXQxWRU
 id: paragraph.field_event_list_description
 field_name: field_event_list_description
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_event_list_title.yml b/conf/cmi/field.storage.paragraph.field_event_list_title.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - paragraphs
 _core:
-  default_config_hash: OwiT8ZGCn9OBU10vF7-dKTnGU2rJoyIxzXaQqYubNtQ
+  default_config_hash: xFDaCnbcljVeHrYg7sb6ogdH4eEBkU4N4Ygsm-esnis
 id: paragraph.field_event_list_title
 field_name: field_event_list_title
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_event_location.yml b/conf/cmi/field.storage.paragraph.field_event_location.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - paragraphs
 _core:
-  default_config_hash: 9QFvQBbGdxgnHfEbMcWzk_rKsyyO1Ru3Z-rbibJxXyc
+  default_config_hash: J1VOnsSZ0Mx5Fu42BQyA4sNU1CcEEpuuTCivs4Wdrbw
 id: paragraph.field_event_location
 field_name: field_event_location
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_event_time.yml b/conf/cmi/field.storage.paragraph.field_event_time.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - paragraphs
 _core:
-  default_config_hash: 9uolLTKIUim2fFfw-TdKiTsGrbGqMm39Hm6Th550A8Y
+  default_config_hash: sfTAwbWMXlnpxputIzVfP7y3visjf8BXp2sKYimliK4
 id: paragraph.field_event_time
 field_name: field_event_time
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_free_events.yml b/conf/cmi/field.storage.paragraph.field_free_events.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - paragraphs
 _core:
-  default_config_hash: hPJQzln2lCxDafr1ScV1qrmPk0VLFLWnpa3D6OE_Ic4
+  default_config_hash: 4N0SWGH6VNQu1RSGzABfoje8Cb7W_8EVsmYBSvLXDgM
 id: paragraph.field_free_events
 field_name: field_free_events
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_remote_events.yml b/conf/cmi/field.storage.paragraph.field_remote_events.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - paragraphs
 _core:
-  default_config_hash: 6cFoYiYWY2E057QJBuHDjkuiifNRl-Bqkt9Zr9c1Zvc
+  default_config_hash: JItHeYFMi_OXf3qirC2E7HfzxbfveNYV3iTZ89B_52w
 id: paragraph.field_remote_events
 field_name: field_remote_events
 entity_type: paragraph

diff --git a/conf/cmi/language.content_settings.media.remote_video.yml b/conf/cmi/language.content_settings.media.remote_video.yml
@@ -10,7 +10,7 @@ third_party_settings:
   content_translation:
     enabled: true
 _core:
-  default_config_hash: W7YfIhAOIwvyPQmKlhuh5d94_oZSSsj83AYQaegVafs
+  default_config_hash: Q5BqNYNYz_8-zkQpFht4wnY52Mb06tG2jQOZiC_Kntc
 id: media.remote_video
 target_entity_type_id: media
 target_bundle: remote_video

diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_event_location.yml
@@ -1,5 +1,5 @@
 label: Tapahtumapaikka
-description: 'Näytä "tapahtumapaikka" -suodatin. Älä käytä yhtä aikaa "Etätapahtumat" -suodattimen kanssa. Tapahtumapaikat pitää valita tapahtumakalenterista ennen kuin kopioit linkin.'
+description: 'Näytä "tapahtumapaikka" -suodatin.Tapahtumapaikat pitää valita tapahtumakalenterista ennen kuin kopioit linkin.'
 settings:
   on_label: Kyllä
   off_label: Ei
diff --git a/conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml b/conf/cmi/language/fi/field.field.paragraph.event_list.field_remote_events.yml
@@ -1,5 +1,5 @@
 label: Etätapahtumat
-description: 'Näytä "näytä vain etätapahtumat" -suodatin. Älä käytä yhtä aikaa "Tapahtumapaikka" -suodattimen kanssa.'
+description: 'Näytä "näytä vain etätapahtumat" -suodatin.'
 settings:
   on_label: Kyllä
   off_label: Ei
diff --git a/conf/cmi/media.type.remote_video.yml b/conf/cmi/media.type.remote_video.yml
@@ -8,7 +8,7 @@ third_party_settings:
   crop:
     image_field: null
 _core:
-  default_config_hash: UF-QHXTRJj-xxu_veKuafSJNJEu59_YqNURdJlGs9dU
+  default_config_hash: SEAaKGKNlLURAVHdZyi3WdqTEQvElZ6_AKRYGqoXmME
 id: remote_video
 label: 'Remote video embed'
 description: 'Media type for remote media from external sources.'

diff --git a/conf/cmi/oembed_providers.provider.icareus_suite.yml b/conf/cmi/oembed_providers.provider.icareus_suite.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: xqAoab3RpoZ36mhZClLPbQFg4fppDaQIS-spV_33m44
+  default_config_hash: cx73uI3KIlc_zavusNtbn2_vDJwmNJhxgorInBFhRAw
 id: icareus_suite
 label: 'Icareus Suite'
 provider_url: 'https://www.helsinkikanava.fi'
@@ -44,3 +44,11 @@ endpoints:
     formats:
       json: true
       xml: false
+  -
+    schemes:
+      - 'https://players.icareus.com/helsinkikanava/embed/vod/*'
+    url: 'https://suite.icareus.com/api/oembed'
+    discovery: false
+    formats:
+      json: true
+      xml: false
diff --git a/conf/cmi/paragraphs.paragraphs_type.event_list.yml b/conf/cmi/paragraphs.paragraphs_type.event_list.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: v_EuKKX-mxYeU5MvjV5zx7XVS7ZMQcQntpB0VOOfxH0
+  default_config_hash: bZdS9kHu54mP1J9BFvLrJL5LnpgwJmleDG5HQNwvx9M
 id: event_list
 label: Events
 icon_uuid: null

diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml
@@ -8,7 +8,7 @@ dependencies:
     - helfi_tpr
     - user
 _core:
-  default_config_hash: O46G67qV6_G1xzwLExy9VPlecjQCKLaSIOuBoK11V18
+  default_config_hash: nPWw6LpPY3CT9DQwdHOOtIiHmatTZbcX6eSBxtbrq5A
 id: service_units
 label: 'Service units'
 module: views
@@ -94,7 +94,7 @@ display:
         options:
           offset: 0
           pagination_heading_level: h4
-          items_per_page: 8
+          items_per_page: 15
           total_pages: null
           id: 0
           tags:

diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile
@@ -5,17 +5,15 @@ COPY / /var/www/html/
 WORKDIR /var/www/html
 RUN composer install --no-progress --profile --prefer-dist --no-interaction --no-dev --optimize-autoloader
 
-# Copy ALL deploy scripts
+# Copy custom entrypoints.
+# @see https://github.com/City-of-Helsinki/drupal-docker-images/tree/main/openshift/drupal
+RUN mkdir -p /crons /entrypoints /deploy
 COPY docker/openshift/entrypoints/ /entrypoints
-RUN chmod +x /entrypoints/*
+COPY docker/openshift/crons/ /crons
+COPY docker/openshift/deploy /deploy
+RUN chmod +x /entrypoints/* /deploy/* /crons/*
 
 COPY docker/openshift/init.sh /
 
-# Copy cron scripts
-RUN mkdir /crons
-COPY docker/openshift/crons/ /crons
-COPY docker/openshift/cron-entrypoint.sh /usr/local/bin/cron-entrypoint
-RUN chmod +x /crons/* /usr/local/bin/cron-entrypoint
-
 # Copy nginx overrides.
 COPY docker/openshift/custom.locations /etc/nginx/conf.d/custom.locations
diff --git a/docker/openshift/cron-entrypoint.sh b/docker/openshift/cron-entrypoint.sh
diff --git a/docker/openshift/deploy/10-preflight.sh b/docker/openshift/deploy/10-preflight.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+source /init.sh
+
+if [ -f "../docker/openshift/preflight/preflight.php" ]; then
+  echo "Running preflight checks ..."
+  if ! php ../docker/openshift/preflight/preflight.php; then
+    exit 1
+  fi
+fi
+