Merge pull request #667 from City-of-Helsinki/UHF-12178

khalima · web-flow · commit 5d2fca7f38ad · 2025-11-26T10:56:32.000+02:00
UHF-12178: Latest changes to main
diff --git a/compose.ci.yaml b/compose.ci.yaml
@@ -2,5 +2,5 @@ services:
   app:
     user: "1001:1001"
     environment:
-      SYMFONY_DEPRECATIONS_HELPER: disabled
+      COMPOSER_MIRROR_PATH_REPOS: 1
       BROWSERTEST_OUTPUT_DIRECTORY: /app/results
diff --git a/compose.yaml b/compose.yaml
@@ -6,7 +6,8 @@ services:
     volumes:
       - .:/app:delegated
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     environment:
       WEBROOT: /app/public
       STAGE_FILE_PROXY_ORIGIN: "${STAGE_FILE_PROXY_ORIGIN}"
@@ -57,12 +58,17 @@ services:
       - --max_allowed_packet=512M
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_swedish_ci
+      - --skip-log-bin
     environment:
       MYSQL_DATABASE: drupal
       MYSQL_USER: drupal
       MYSQL_PASSWORD: drupal
       MYSQL_INITDB_SKIP_TZINFO: 1
       MYSQL_RANDOM_ROOT_PASSWORD: 1
+    healthcheck:
+      test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
+      timeout: 1s
+      retries: 30
     volumes:
       - db_volume:/var/lib/mysql
     ports:
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/csp.settings.yml b/conf/cmi/csp.settings.yml
@@ -29,4 +29,4 @@ enforce:
     frame-ancestors:
       base: self
   reporting:
-    plugin: raven
+    plugin: none
diff --git a/conf/cmi/field.field.paragraph.hero.field_hero_title.yml b/conf/cmi/field.field.paragraph.hero.field_hero_title.yml
@@ -6,13 +6,13 @@ dependencies:
     - field.storage.paragraph.field_hero_title
     - paragraphs.paragraphs_type.hero
 _core:
-  default_config_hash: M_9WbyHp-nRmfEt8Xwa1wU-HGs89Sb8wO08PQzhRhdo
+  default_config_hash: UurxQySq270gOUXF1wFOeuAof1ws42Rja6dyEyNlI10
 id: paragraph.hero.field_hero_title
 field_name: field_hero_title
 entity_type: paragraph
 bundle: hero
 label: 'Hero heading'
-description: "If a hero is used on the page, this heading will be used as the page's main heading."
+description: 'The hero title and the page title must be the same. The hero title is used as the page’s metadata title, which appears in search results. The page title is used in the page URL. You can edit the metadata title in the page’s meta settings.'
 required: true
 translatable: false
 default_value: {  }
diff --git a/conf/cmi/imagecache_external.settings.yml b/conf/cmi/imagecache_external.settings.yml
@@ -25,3 +25,7 @@ imagecache_external_allowed_mimetypes:
   - image/webp
   - image/webp;charset=utf-8
 imagecache_external_cron_flush_frequency: 0
+imagecache_external_cron_flush_originals: true
+svg_settings:
+  allowed_tags: {  }
+  allowed_attributes: {  }
diff --git a/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_title.yml b/conf/cmi/language/fi/field.field.paragraph.hero.field_hero_title.yml
@@ -1,2 +1,2 @@
 label: 'Heron otsikko'
-description: 'Heron otsikon ja sivun otsikon pitää olla sama. Herossa käytetään heron otsikkoa mutta metatiedoissa ja URL-osoitteessa sivun otsikkoa.'
+description: 'Heron otsikon ja sivun otsikon pitää olla sama. Heron otsikkoa käytetään sivun metatietojen titlenä, joka näkyy hakutuloksissa. Sivun otsikkoa käytetään sivun URL-osoitteessa. Metatietojen titleä on mahdollista muokata sivun metatunnisteista.'
diff --git a/conf/cmi/language/fi/metatag.metatag_defaults.node.yml b/conf/cmi/language/fi/metatag.metatag_defaults.node.yml
@@ -1,4 +1,4 @@
 label: Sisältö
 tags:
-  title: '[node:title] | [site:page-title-suffix]'
+  title: '[node:display-title] | [site:page-title-suffix]'
   description: '[node:lead-in]'
diff --git a/conf/cmi/language/sv/metatag.metatag_defaults.node.yml b/conf/cmi/language/sv/metatag.metatag_defaults.node.yml
@@ -1,4 +1,4 @@
 label: Innehåll
 tags:
-  title: '[node:title] | [site:page-title-suffix]'
+  title: '[node:display-title] | [site:page-title-suffix]'
   description: '[node:lead-in]'
diff --git a/conf/cmi/metatag.metatag_defaults.node.yml b/conf/cmi/metatag.metatag_defaults.node.yml
@@ -7,14 +7,15 @@ _core:
 id: node
 label: Content
 tags:
-  title: '[node:title] | [site:page-title-suffix]'
+  title: '[node:display-title] | [site:page-title-suffix]'
   description: '[node:lead-in]'
   canonical_url: '[node:url]'
   article_modified_time: '[node:changed:html_datetime]'
   article_published_time: '[node:created:html_datetime]'
-  og_title: '[node:title]'
+  og_title: '[node:display-title]'
   og_updated_time: '[node:changed:html_datetime]'
   og_url: '[current-page:url:absolute]'
   twitter_cards_image: '[node:shareable-image]'
   og_image: '[node:shareable-image]'
   og_description: '[node:lead-in]'
+  twitter_cards_title: '[node:display-title] | [site:page-title-suffix]'
diff --git a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml
@@ -3,8 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: IxbBxQpwTHAosiqZXzMlXTSiLA2-mZs2g4lZ48xwpkA
+  default_config_hash: J8jShGQTBJ698TwyiPjWS6y-zmzSHLi4YX2zF4RQNLw
 id: node__landing_page
 label: 'Content: Landing page'
-tags:
-  description: '[node:field_hero:entity:field_hero_desc]'
+tags: {  }
diff --git a/conf/cmi/search_api.index.embeddings.yml b/conf/cmi/search_api.index.embeddings.yml
@@ -35,14 +35,14 @@ field_settings:
     configuration:
       absolute: false
 datasource_settings:
-  'uuid_entity:node':
+  'entity:node':
     bundles:
-      default: '0'
+      default: false
       selected:
         - landing_page
         - page
     languages:
-      default: '1'
+      default: true
       selected: {  }
 processor_settings:
   add_url: {  }
@@ -57,4 +57,5 @@ options:
   delete_on_fail: true
   index_directly: false
   track_changes_in_references: true
+  helfi_platform_config_multisite: true
 server: etusivu
diff --git a/conf/cmi/search_api.index.hyte.yml b/conf/cmi/search_api.index.hyte.yml
@@ -9,7 +9,7 @@ dependencies:
     - helfi_recommendations
     - helfi_tpr
 _core:
-  default_config_hash: H4ELmk2b4nXnVuXM2qvPGFrHYQtp0dOwCgi5VNo0Mk8
+  default_config_hash: x9qWvsW38Q11ewEpYTHmFUJYX8VTev4MI1KaCuRWLLs
 id: hyte
 name: Hyte
 description: ''
@@ -119,4 +119,5 @@ options:
   delete_on_fail: true
   index_directly: true
   track_changes_in_references: true
+  helfi_platform_config_multisite: true
 server: etusivu
diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile
@@ -1,5 +1,5 @@
 ARG DRUPAL_DOCKER_TAG=8.4
-FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG}
+FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG:-8.4}
 
 COPY / /var/www/html/
 WORKDIR /var/www/html

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`label: 'Heron otsikko'`
`2`		`-description: 'Heron otsikon ja sivun otsikon pitää olla sama. Herossa käytetään heron otsikkoa mutta metatiedoissa ja URL-osoitteessa sivun otsikkoa.'`
	`2`	`+description: 'Heron otsikon ja sivun otsikon pitää olla sama. Heron otsikkoa käytetään sivun metatietojen titlenä, joka näkyy hakutuloksissa. Sivun otsikkoa käytetään sivun URL-osoitteessa. Metatietojen titleä on mahdollista muokata sivun metatunnisteista.'`