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

rpnykanen · web-flow · commit 738744e1770d · 2025-08-19T15:35:00.000+03:00
Dev to main
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/image.style.1.5_1298w_866h_LQ.yml b/conf/cmi/image.style.1.5_1298w_866h_LQ.yml
diff --git a/conf/cmi/image.style.1.5_176w_118h.yml b/conf/cmi/image.style.1.5_176w_118h.yml
@@ -0,0 +1,19 @@
+uuid: a42c945a-8640-4a87-baf8-560d211efa0f
+langcode: en
+status: true
+dependencies:
+  module:
+    - focal_point
+_core:
+  default_config_hash: ZVEVxy6mMnDmBPpXUPzAEvst6WnolZrY_kLHdNr_RZY
+name: 1.5_176w_118h
+label: 1.5_176w_118h
+effects:
+  f5409958-6a3b-4ddd-b188-5c172473c0eb:
+    uuid: f5409958-6a3b-4ddd-b188-5c172473c0eb
+    id: focal_point_scale_and_crop
+    weight: 1
+    data:
+      width: 176
+      height: 118
+      crop_type: focal_point
diff --git a/conf/cmi/image.style.1.5_220w_147h.yml b/conf/cmi/image.style.1.5_220w_147h.yml
@@ -0,0 +1,19 @@
+uuid: 75d5783c-060c-4762-9221-340db13886a3
+langcode: en
+status: true
+dependencies:
+  module:
+    - focal_point
+_core:
+  default_config_hash: Q90ddqpq7bLa09AT-99QvFuuY3IoLNIAgL7bQo6tuZM
+name: 1.5_220w_147h
+label: 1.5_220w_147h
+effects:
+  9ed55afd-660f-4c5b-a5f7-535ee60cc562:
+    uuid: 9ed55afd-660f-4c5b-a5f7-535ee60cc562
+    id: focal_point_scale_and_crop
+    weight: 1
+    data:
+      width: 220
+      height: 147
+      crop_type: focal_point
diff --git a/conf/cmi/image.style.1.5_304w_203h.yml b/conf/cmi/image.style.1.5_304w_203h.yml
@@ -0,0 +1,19 @@
+uuid: 938bf06d-e6b5-4bf0-9ff0-5d4b9727bc30
+langcode: en
+status: true
+dependencies:
+  module:
+    - focal_point
+_core:
+  default_config_hash: KdqciPiJrNDs7-3pxPuiCSEUku9C3if5MuYEXx7g1IU
+name: 1.5_304w_203h
+label: 1.5_304w_203h
+effects:
+  d0a10a90-1fb0-4fac-92d6-002cd101c480:
+    uuid: d0a10a90-1fb0-4fac-92d6-002cd101c480
+    id: focal_point_scale_and_crop
+    weight: 1
+    data:
+      width: 304
+      height: 203
+      crop_type: focal_point
diff --git a/conf/cmi/image.style.1.5_352w_236h_LQ.yml b/conf/cmi/image.style.1.5_352w_236h_LQ.yml
@@ -0,0 +1,26 @@
+uuid: 19c4ccaa-d94f-4591-8308-6e267f507254
+langcode: en
+status: true
+dependencies:
+  module:
+    - focal_point
+    - image_style_quality
+_core:
+  default_config_hash: zEUk55qSGDRCKi0g9s_ErIKT7lyvgMonYFTxI2nU0UQ
+name: 1.5_352w_236h_LQ
+label: 1.5_352w_236h_LQ
+effects:
+  79253509-4c85-4ce6-a29f-1af95a942779:
+    uuid: 79253509-4c85-4ce6-a29f-1af95a942779
+    id: focal_point_scale_and_crop
+    weight: 1
+    data:
+      width: 352
+      height: 236
+      crop_type: focal_point
+  5fadec91-be4d-4835-9849-65694aab2989:
+    uuid: 5fadec91-be4d-4835-9849-65694aab2989
+    id: image_style_quality
+    weight: 2
+    data:
+      quality: 65
diff --git a/conf/cmi/image.style.1.5_440w_294h_LQ.yml b/conf/cmi/image.style.1.5_440w_294h_LQ.yml
@@ -0,0 +1,26 @@
+uuid: 79033cfe-50d5-48eb-8f01-9444132b69bc
+langcode: en
+status: true
+dependencies:
+  module:
+    - focal_point
+    - image_style_quality
+_core:
+  default_config_hash: W-DmDH3-NW8ube6eMovIQjsqXXY4VKqr5cjaxBKwqn8
+name: 1.5_440w_294h_LQ
+label: 1.5_440w_294h_LQ
+effects:
+  40dbd2b7-095f-4e7f-a1ee-7b144d20c5cb:
+    uuid: 40dbd2b7-095f-4e7f-a1ee-7b144d20c5cb
+    id: focal_point_scale_and_crop
+    weight: 1
+    data:
+      width: 440
+      height: 294
+      crop_type: focal_point
+  dc04179c-eb81-44a2-953f-a177b1a0fef9:
+    uuid: dc04179c-eb81-44a2-953f-a177b1a0fef9
+    id: image_style_quality
+    weight: 2
+    data:
+      quality: 65
diff --git a/conf/cmi/image.style.1.5_608w_406w_LQ.yml b/conf/cmi/image.style.1.5_608w_406w_LQ.yml
@@ -0,0 +1,26 @@
+uuid: 698d0dfa-3050-46fd-bea7-9cc16f400a07
+langcode: en
+status: true
+dependencies:
+  module:
+    - focal_point
+    - image_style_quality
+_core:
+  default_config_hash: OiI6VEAtYyncTnwGKuvYrP32bIE76Tb3HY7kliZitro
+name: 1.5_608w_406w_LQ
+label: 1.5_608w_406w_LQ
+effects:
+  2c04a69b-2033-4206-b69b-59c27046b7cb:
+    uuid: 2c04a69b-2033-4206-b69b-59c27046b7cb
+    id: focal_point_scale_and_crop
+    weight: 1
+    data:
+      width: 608
+      height: 406
+      crop_type: focal_point
+  4385541c-3c92-4e1d-a696-83791cf21cc4:
+    uuid: 4385541c-3c92-4e1d-a696-83791cf21cc4
+    id: image_style_quality
+    weight: 2
+    data:
+      quality: 65
diff --git a/conf/cmi/image.style.1.5_649w_433h.yml b/conf/cmi/image.style.1.5_649w_433h.yml
diff --git a/conf/cmi/language/ru/views.view.paragraphs_library.yml b/conf/cmi/language/ru/views.view.paragraphs_library.yml
@@ -36,7 +36,7 @@ display:
           separator: ', '
         count:
           label: Использовано
-          format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
+          format_plural_string: !!binary QGNvdW50INC80LXRgdGC0L4DQGNvdW50INC80LXRgdGC0LADQGNvdW50WzJdINC80LXRgdGC
         changed:
           label: Изменение
           separator: ', '
diff --git a/conf/cmi/responsive_image.styles.card.yml b/conf/cmi/responsive_image.styles.card.yml
@@ -4,60 +4,60 @@ status: true
 dependencies:
   config:
     - image.style.1.5_1022w_682h_LQ
-    - image.style.1.5_217w_145h
-    - image.style.1.5_264w_176h
-    - image.style.1.5_341w_227h
-    - image.style.1.5_378w_252h
-    - image.style.1.5_434w_290h_LQ
+    - image.style.1.5_176w_118h
+    - image.style.1.5_220w_147h
+    - image.style.1.5_294w_196h
+    - image.style.1.5_304w_203h
+    - image.style.1.5_352w_236h_LQ
+    - image.style.1.5_440w_294h_LQ
     - image.style.1.5_511w_341h
-    - image.style.1.5_528w_352h_LQ
-    - image.style.1.5_682w_454h_LQ
-    - image.style.1.5_756w_504h_LQ
+    - image.style.1.5_588w_392h_LQ
+    - image.style.1.5_608w_406w_LQ
   module:
     - helfi_image_styles
 _core:
-  default_config_hash: u0jR7GhH08n7-S5LzxH7YAlxGqxtPbAd6xRzwDzdrrw
+  default_config_hash: tyT1S8fxjMXOcF1B1kXsEXtUiW7ircbgv5KdJ9LuK5k
 id: card
 label: Card
 image_style_mappings:
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_378w_252h
+    image_mapping: 1.5_304w_203h
     breakpoint_id: helfi_image_styles.xl
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_756w_504h_LQ
+    image_mapping: 1.5_608w_406w_LQ
     breakpoint_id: helfi_image_styles.xl
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_341w_227h
+    image_mapping: 1.5_294w_196h
     breakpoint_id: helfi_image_styles.l
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_682w_454h_LQ
+    image_mapping: 1.5_588w_392h_LQ
     breakpoint_id: helfi_image_styles.l
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_264w_176h
+    image_mapping: 1.5_220w_147h
     breakpoint_id: helfi_image_styles.m
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_528w_352h_LQ
+    image_mapping: 1.5_440w_294h_LQ
     breakpoint_id: helfi_image_styles.m
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_217w_145h
+    image_mapping: 1.5_176w_118h
     breakpoint_id: helfi_image_styles.s
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_434w_290h_LQ
+    image_mapping: 1.5_352w_236h_LQ
     breakpoint_id: helfi_image_styles.s
     multiplier: 2x
   -
@@ -71,4 +71,4 @@ image_style_mappings:
     breakpoint_id: helfi_image_styles.xs
     multiplier: 2x
 breakpoint_group: helfi_image_styles
-fallback_image_style: 1.5_378w_252h
+fallback_image_style: 1.5_304w_203h
diff --git a/conf/cmi/responsive_image.styles.liftup_left_right.yml b/conf/cmi/responsive_image.styles.liftup_left_right.yml
@@ -4,19 +4,19 @@ status: true
 dependencies:
   config:
     - image.style.1.5_1011w_674h
-    - image.style.1.5_1022w_682h_LQ
-    - image.style.1.5_1200w_800h_LQ
-    - image.style.1.5_1298w_866h_LQ
+    - image.style.1.5_1120w_746h_LQ
+    - image.style.1.5_1183w_789h
+    - image.style.1.5_1470w_980h_LQ
     - image.style.1.5_1726w_1152h_LQ
     - image.style.1.5_2022w_1348h_LQ
-    - image.style.1.5_511w_341h
-    - image.style.1.5_600w_400h
-    - image.style.1.5_649w_433h
+    - image.style.1.5_2366w_1578h_LQ
+    - image.style.1.5_560w_373h
+    - image.style.1.5_735w_490h
     - image.style.1.5_863w_576h
   module:
     - helfi_image_styles
 _core:
-  default_config_hash: 5tEd-yvxl-DMt_Sq4YfnYOt00gvTrUIkB2KrYO2_SQQ
+  default_config_hash: ZLqwSHVmZdWTF3DGj7pyo4F6FROSfKeYm3wBcNLVNjg
 id: liftup_left_right
 label: 'Liftup Left/Right'
 image_style_mappings:
@@ -32,42 +32,42 @@ image_style_mappings:
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_863w_576h
+    image_mapping: 1.5_1183w_789h
     breakpoint_id: helfi_image_styles.l
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_1726w_1152h_LQ
+    image_mapping: 1.5_2366w_1578h_LQ
     breakpoint_id: helfi_image_styles.l
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_649w_433h
+    image_mapping: 1.5_863w_576h
     breakpoint_id: helfi_image_styles.m
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_1298w_866h_LQ
+    image_mapping: 1.5_1726w_1152h_LQ
     breakpoint_id: helfi_image_styles.m
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_600w_400h
+    image_mapping: 1.5_735w_490h
     breakpoint_id: helfi_image_styles.s
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_1200w_800h_LQ
+    image_mapping: 1.5_1470w_980h_LQ
     breakpoint_id: helfi_image_styles.s
     multiplier: 2x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_511w_341h
+    image_mapping: 1.5_560w_373h
     breakpoint_id: helfi_image_styles.xs
     multiplier: 1x
   -
     image_mapping_type: image_style
-    image_mapping: 1.5_1022w_682h_LQ
+    image_mapping: 1.5_1120w_746h_LQ
     breakpoint_id: helfi_image_styles.xs
     multiplier: 2x
 breakpoint_group: helfi_image_styles
diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile
@@ -7,10 +7,11 @@ RUN composer install --no-progress --profile --prefer-dist --no-interaction --no
 
 # Copy custom entrypoints.
 # @see https://github.com/City-of-Helsinki/drupal-docker-images/tree/main/openshift/drupal
-RUN mkdir -p /crons /entrypoints /deploy
+RUN mkdir -p /crons /entrypoints /hooks/deploy /hooks/db-replace
 COPY docker/openshift/entrypoints/ /entrypoints
 COPY docker/openshift/crons/ /crons
-COPY docker/openshift/deploy /deploy
-RUN chmod +x /entrypoints/* /deploy/* /crons/*
+COPY docker/openshift/deploy /hooks/deploy
+COPY docker/openshift/post-db-replace /hooks/db-replace
+RUN chmod +x /entrypoints/* /hooks/deploy/* /crons/* /hooks/db-replace/*
 
 COPY docker/openshift/init.sh /
diff --git a/docker/openshift/post-db-replace/10-prepare.sh b/docker/openshift/post-db-replace/10-prepare.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Run drush deploy after the database has been replaced.
+drush deploy
diff --git a/docker/openshift/post-db-replace/50-sanitize.sh b/docker/openshift/post-db-replace/50-sanitize.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ ! -z "$NO_OBFUSCATE_DATA" ]; then
+    echo "NO_OBFUSCATE_DATA is set. Skipping the step."
+    return
+fi
+
+# Obfuscate user data
+drush sql:sanitize
diff --git a/docker/openshift/post-db-replace/90-translations.sh b/docker/openshift/post-db-replace/90-translations.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+drush locale-check
+drush locale-update
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
