Dev to main

.platform/schema

@@ -1 +1 @@
-16
+17

conf/cmi/core.entity_form_display.paragraph.contact_card.default.yml

@@ -6,63 +6,52 @@ dependencies:
     - field.field.paragraph.contact_card.field_contact_description
     - field.field.paragraph.contact_card.field_contact_image
     - field.field.paragraph.contact_card.field_contact_image_photographer
+    - field.field.paragraph.contact_card.field_contact_image_reference
     - field.field.paragraph.contact_card.field_contact_name
     - field.field.paragraph.contact_card.field_contact_social_media
     - field.field.paragraph.contact_card.field_contact_social_media_link
     - field.field.paragraph.contact_card.field_contact_title
     - field.field.paragraph.contact_card.field_email
     - field.field.paragraph.contact_card.field_phone_number
-    - image.style.thumbnail
     - paragraphs.paragraphs_type.contact_card
   module:
-    - focal_point
     - link
+    - media_library
     - paragraphs
     - telephone
 _core:
-  default_config_hash: YDSv_lQM9OkDPrZy_gI0k4dUlKswEjQX8YV-v17cgQ8
+  default_config_hash: 9GMOG_QIuNk11PXYGJk8symwR8u84uGQZlRFHhgclTk
 id: paragraph.contact_card.default
 targetEntityType: paragraph
 bundle: contact_card
 mode: default
 content:
   field_contact_description:
     type: string_textarea
-    weight: 6
+    weight: 5
     region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  field_contact_image:
-    type: image_focal_point
+  field_contact_image_reference:
+    type: media_library_widget
     weight: 0
     region: content
     settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-      preview_link: true
-      offsets: '50,50'
-    third_party_settings: {  }
-  field_contact_image_photographer:
-    type: string_textfield
-    weight: 1
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
+      media_types: {  }
     third_party_settings: {  }
   field_contact_name:
     type: string_textfield
-    weight: 2
+    weight: 1
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   field_contact_social_media:
     type: paragraphs
-    weight: 7
+    weight: 6
     region: content
     settings:
       title: Paragraph
@@ -80,35 +69,37 @@ content:
     third_party_settings: {  }
   field_contact_social_media_link:
     type: link_default
-    weight: 8
+    weight: 7
     region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
   field_contact_title:
     type: string_textfield
-    weight: 3
+    weight: 2
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   field_email:
     type: email_default
-    weight: 4
+    weight: 3
     region: content
     settings:
       placeholder: ''
       size: 60
     third_party_settings: {  }
   field_phone_number:
     type: telephone_default
-    weight: 5
+    weight: 4
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
 hidden:
   created: true
+  field_contact_image: true
+  field_contact_image_photographer: true
   status: true

conf/cmi/core.entity_view_display.media.image.square_thumbnail.yml

@@ -0,0 +1,38 @@
+uuid: 0d32e090-076b-4aea-9319-7e5b572b993f
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.media.square_thumbnail
+    - field.field.media.image.field_media_image
+    - field.field.media.image.field_photographer
+    - media.type.image
+    - responsive_image.styles.square_thumbnail
+  module:
+    - responsive_image
+_core:
+  default_config_hash: RsZm5zJoAdk_YebwlWNiBP7_oW9gYi6X-scuL71o2hU
+id: media.image.square_thumbnail
+targetEntityType: media
+bundle: image
+mode: square_thumbnail
+content:
+  field_media_image:
+    type: responsive_image
+    label: hidden
+    settings:
+      responsive_image_style: square_thumbnail
+      image_link: ''
+      image_loading:
+        attribute: eager
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  created: true
+  field_photographer: true
+  langcode: true
+  name: true
+  search_api_excerpt: true
+  thumbnail: true
+  uid: true

conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml

@@ -6,22 +6,23 @@ dependencies:
     - field.field.paragraph.contact_card.field_contact_description
     - field.field.paragraph.contact_card.field_contact_image
     - field.field.paragraph.contact_card.field_contact_image_photographer
+    - field.field.paragraph.contact_card.field_contact_image_reference
     - field.field.paragraph.contact_card.field_contact_name
     - field.field.paragraph.contact_card.field_contact_social_media
     - field.field.paragraph.contact_card.field_contact_social_media_link
     - field.field.paragraph.contact_card.field_contact_title
     - field.field.paragraph.contact_card.field_email
     - field.field.paragraph.contact_card.field_phone_number
     - paragraphs.paragraphs_type.contact_card
-    - responsive_image.styles.contact_card
+    - responsive_image.styles.square_thumbnail
   module:
     - entity_reference_revisions
     - helfi_paragraphs_contact_card_listing
     - helfi_platform_config
     - responsive_image
     - telephone
 _core:
-  default_config_hash: g7mshBIsAGSEoG6m0KX2GLEN58sv4MnWAEXk68dClQ8
+  default_config_hash: o3L_0VvwTNVLSBxb2Oqb8lmF6DAt6aBFZsubJMhB4Ro
 id: paragraph.contact_card.default
 targetEntityType: paragraph
 bundle: contact_card
@@ -38,7 +39,7 @@ content:
     type: responsive_image
     label: hidden
     settings:
-      responsive_image_style: contact_card
+      responsive_image_style: square_thumbnail
       image_link: ''
       image_loading:
         attribute: eager
@@ -53,6 +54,15 @@ content:
     third_party_settings: {  }
     weight: 7
     region: content
+  field_contact_image_reference:
+    type: entity_reference_entity_view
+    label: hidden
+    settings:
+      view_mode: square_thumbnail
+      link: false
+    third_party_settings: {  }
+    weight: 8
+    region: content
   field_contact_name:
     type: string
     label: hidden

conf/cmi/core.entity_view_mode.media.square_thumbnail.yml

@@ -0,0 +1,13 @@
+uuid: 2230c2a0-8d52-4106-b17f-b0d571ef449e
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+_core:
+  default_config_hash: rPsJ5Ec4QDJMHnhUR-cbm0ob-Czf3pezHYMRqvfsxhs
+id: media.square_thumbnail
+label: 'Square thumbnail'
+description: ''
+targetEntityType: media
+cache: true

conf/cmi/field.field.paragraph.contact_card.field_contact_image.yml

@@ -8,12 +8,12 @@ dependencies:
   module:
     - image
 _core:
-  default_config_hash: OwkKC_jXvLDFDw1_kbW7VDJmW4Y5tKbQlyx1NsWhczQ
+  default_config_hash: z7o3DViDIVEV8koDILWo4zFKtBOfeJjRD8Tp7D3rdLQ
 id: paragraph.contact_card.field_contact_image
 field_name: field_contact_image
 entity_type: paragraph
 bundle: contact_card
-label: Image
+label: 'DEPRECATED Image'
 description: 'Use a square image for the best result. Portrait and landscape images will be cropped to a square, the focal point can be selected with the image upload.'
 required: false
 translatable: false

conf/cmi/field.field.paragraph.contact_card.field_contact_image_reference.yml

@@ -0,0 +1,31 @@
+uuid: e3388822-df3f-48b3-91ff-22a054752779
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.paragraph.field_contact_image_reference
+    - media.type.image
+    - paragraphs.paragraphs_type.contact_card
+_core:
+  default_config_hash: EEQkH4zH78mSzLWclQGhspMbw-MkvrSnB0fV0FdUZeM
+id: paragraph.contact_card.field_contact_image_reference
+field_name: field_contact_image_reference
+entity_type: paragraph
+bundle: contact_card
+label: 'Contact image'
+description: 'Use a square image for the best result. Portrait and landscape images will be cropped to a square, the focal point can be selected with the image upload.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:media'
+  handler_settings:
+    target_bundles:
+      image: image
+    sort:
+      field: _none
+      direction: ASC
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference

conf/cmi/field.storage.paragraph.field_contact_image_reference.yml

@@ -0,0 +1,22 @@
+uuid: bf481f31-99eb-479a-8ef0-5a15b06d4ae0
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - paragraphs
+_core:
+  default_config_hash: VXOPtoCLD607Y8tIEd6kwhF0UA-P394wPNsafhJJ5wc
+id: paragraph.field_contact_image_reference
+field_name: field_contact_image_reference
+entity_type: paragraph
+type: entity_reference
+settings:
+  target_type: media
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

conf/cmi/field.storage.paragraph.field_email.yml

@@ -5,15 +5,15 @@ dependencies:
   module:
     - paragraphs
 _core:
-  default_config_hash: 76XUNX8CNC1fRG7IdYnWrq_0iMEDAaTYC7d-ruvQS9w
+  default_config_hash: OrsbTLUgyO-Kgr1QPjJ_8KPoLkOnhAtzXOtKANOOZ0A
 id: paragraph.field_email
 field_name: field_email
 entity_type: paragraph
 type: email
 settings: {  }
 module: core
 locked: false
-cardinality: 1
+cardinality: -1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false

conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image.yml

@@ -1,2 +1,2 @@
 label: Kuva
-description: 'Vaaka- ja pystykuvat rajataan neliöiksi. Rajatun kuvan keskipisteen voi valita kuvan latauksen yhteydessä. '
+description: 'VANHENTUNUT Vaaka- ja pystykuvat rajataan neliöiksi. Rajatun kuvan keskipisteen voi valita kuvan latauksen yhteydessä. '

conf/cmi/language/fi/field.field.paragraph.contact_card.field_contact_image_reference.yml

@@ -0,0 +1,2 @@
+label: Kuva
+description: 'Vaaka- ja pystykuvat rajataan neliöiksi. Rajatun kuvan keskipisteen voi valita kuvan latauksen yhteydessä. '

conf/cmi/language/sv/field.field.paragraph.contact_card.field_contact_image_reference.yml

@@ -0,0 +1 @@
+label: Bild

conf/cmi/responsive_image.styles.square_thumbnail.yml

@@ -0,0 +1,26 @@
+uuid: cc481cd1-3694-4473-9722-d143aa720531
+langcode: en
+status: true
+dependencies:
+  config:
+    - image.style.1_250w_250h
+    - image.style.1_500w_500h_LQ
+  module:
+    - helfi_image_styles
+_core:
+  default_config_hash: VuYuUIx2tfZff1D0We2JgZQtqyDoiSj7C6gjfLDaJZQ
+id: square_thumbnail
+label: 'Square thumbnail'
+image_style_mappings:
+  -
+    image_mapping_type: image_style
+    image_mapping: 1_250w_250h
+    breakpoint_id: helfi_image_styles.xs
+    multiplier: 1x
+  -
+    image_mapping_type: image_style
+    image_mapping: 1_500w_500h_LQ
+    breakpoint_id: helfi_image_styles.xs
+    multiplier: 2x
+breakpoint_group: helfi_image_styles
+fallback_image_style: 1_250w_250h

conf/cmi/user.role.anonymous.yml

@@ -17,6 +17,7 @@ weight: 0
 is_admin: false
 permissions:
   - 'access content'
+  - 'access debug api'
   - 'send javascript errors to sentry'
   - 'view helfi_announcements external entity'
   - 'view helfi_news external entity'

docker/openshift/Dockerfile

@@ -14,6 +14,3 @@ COPY docker/openshift/deploy /deploy
 RUN chmod +x /entrypoints/* /deploy/* /crons/*
 
 COPY docker/openshift/init.sh /
-
-# Copy nginx overrides.
-COPY docker/openshift/custom.locations /etc/nginx/conf.d/custom.locations

docker/openshift/preflight/preflight.php

@@ -67,6 +67,14 @@ function environment_variable_isset(array $items) : bool {
   'all.preflight.php',
 ];
 
+$private_files_folder = getenv('DRUPAL_FILES_PRIVATE');
+
+// Make sure private files folder is outside webroot unless explicitly
+// configured so.
+if (!$private_files_folder && is_dir('/var/www/html/public/sites/default/files/private')) {
+  preflight_failed('sites/default/files/private folder found.');
+}
+
 // Allow additional custom checks to be added.
 // Create a 'all.preflight.php' file for checks that need to be run
 // on all environments and '{env}.preflight.php' for environment-specific

public/sites/default/settings.php

@@ -110,7 +110,7 @@ function drupal_get_env(string|array $variables) : mixed {
 
 $settings['config_sync_directory'] = '../conf/cmi';
 $settings['file_public_path'] = getenv('DRUPAL_FILES_PUBLIC') ?: 'sites/default/files';
-$settings['file_private_path'] = getenv('DRUPAL_FILES_PRIVATE');
+$settings['file_private_path'] = getenv('DRUPAL_FILES_PRIVATE') ?: '/private_files';
 $settings['file_temp_path'] = getenv('DRUPAL_TMP_PATH') ?: '/tmp';
 
 if ($reverse_proxy_address = getenv('DRUPAL_REVERSE_PROXY_ADDRESS')) {