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

Dev to main
City-of-Helsinki · Jul 12, 2023 · bd9b95a · bd9b95a
2 parents 780f444 + 765f204
commit bd9b95a
Show file tree

Hide file tree

Showing 44 changed files with 631 additions and 499 deletions.
diff --git a/composer.json b/composer.json
@@ -65,7 +65,8 @@
             "phpstan/extension-installer": true,
             "composer/installers": true,
             "cweagans/composer-patches": true,
-            "drupal/core-composer-scaffold": true
+            "drupal/core-composer-scaffold": true,
+            "php-http/discovery": false
         }
     },
     "extra": {

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.base_field_override.node.announcement.status.yml b/conf/cmi/core.base_field_override.node.announcement.status.yml
@@ -0,0 +1,24 @@
+uuid: fab98a53-e300-4144-8890-2a89e9c4b588
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.announcement
+_core:
+  default_config_hash: r22i8pbP859SWpdwmCB98aKCb1vHeMgmdBWNOsS_az0
+id: node.announcement.status
+field_name: status
+entity_type: node
+bundle: announcement
+label: Published
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/conf/cmi/core.base_field_override.node.landing_page.status.yml b/conf/cmi/core.base_field_override.node.landing_page.status.yml
@@ -0,0 +1,24 @@
+uuid: ad349e6a-2d73-4bc9-9e6f-912a73785f90
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.landing_page
+_core:
+  default_config_hash: ewmZbuO4KgD36Ka7QA-8tJ9jktJH-jQbTNMrkHfuQRc
+id: node.landing_page.status
+field_name: status
+entity_type: node
+bundle: landing_page
+label: Published
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/conf/cmi/core.base_field_override.node.page.status.yml b/conf/cmi/core.base_field_override.node.page.status.yml
@@ -0,0 +1,24 @@
+uuid: eaf46851-7b56-429d-b212-dccd6417e7f2
+langcode: en
+status: true
+dependencies:
+  config:
+    - node.type.page
+_core:
+  default_config_hash: 0m4p2SiQag8S_hCuiUZt-3xis3qrOuBXCwKH51hF5lo
+id: node.page.status
+field_name: status
+entity_type: node
+bundle: page
+label: Published
+description: ''
+required: false
+translatable: true
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/conf/cmi/core.entity_form_display.node.announcement.default.yml b/conf/cmi/core.entity_form_display.node.announcement.default.yml
@@ -19,15 +19,15 @@ dependencies:
     - select2
     - text
 _core:
-  default_config_hash: zPc8iXjxhkMT4IwqHCVX0cz8mpKHcFCRHY7LvWp3t0c
+  default_config_hash: le2Wzlas0qZ9Bj-o6WlJbHDeisFrucs9F4B3VOK8t_w
 id: node.announcement.default
 targetEntityType: node
 bundle: announcement
 mode: default
 content:
   body:
     type: text_textarea_with_summary
-    weight: 16
+    weight: 15
     region: content
     settings:
       rows: 9
@@ -43,14 +43,14 @@ content:
     third_party_settings: {  }
   field_announcement_all_pages:
     type: boolean_checkbox
-    weight: 14
+    weight: 11
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_announcement_content_pages:
     type: select2_entity_reference
-    weight: 15
+    weight: 12
     region: content
     settings:
       width: 100%
@@ -60,7 +60,7 @@ content:
     third_party_settings: {  }
   field_announcement_link:
     type: link_default
-    weight: 17
+    weight: 16
     region: content
     settings:
       placeholder_url: ''
@@ -78,7 +78,7 @@ content:
     third_party_settings: {  }
   field_announcement_type:
     type: select2
-    weight: 11
+    weight: 10
     region: content
     settings:
       width: 100%
@@ -93,13 +93,6 @@ content:
       match_operator: CONTAINS
       match_limit: 20
     third_party_settings: {  }
-  field_publish_externally:
-    type: boolean_checkbox
-    weight: 13
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 1
@@ -131,7 +124,7 @@ content:
     settings: {  }
     third_party_settings: {  }
   simple_sitemap:
-    weight: 12
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -172,6 +165,7 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
+  field_publish_externally: true
   hide_sidebar_navigation: true
   promote: true
   sticky: true

diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
@@ -18,7 +18,7 @@ dependencies:
     - publication_date
     - scheduler
 _core:
-  default_config_hash: Pd-f3rGttRwDhQat3uCTa7QBK0xZQWgsvcSwr9RPx1A
+  default_config_hash: hhHaoVWPiqGGQ2qDbN-7sawAmvK_BCGWA2vwgIevwq4
 id: node.landing_page.default
 targetEntityType: node
 bundle: landing_page

diff --git a/conf/cmi/core.entity_form_display.node.page.default.yml b/conf/cmi/core.entity_form_display.node.page.default.yml
@@ -21,7 +21,7 @@ dependencies:
     - publication_date
     - scheduler
 _core:
-  default_config_hash: DOmyO7EbPLR4QT_AFZyGKWuDjwDK_6cxtWsqZ0RI3qQ
+  default_config_hash: _RX52hwdyz48o4MBqyRPUVkop-Unt1rcPuPanpQ7ksk
 id: node.page.default
 targetEntityType: node
 bundle: page

diff --git a/conf/cmi/core.entity_view_display.node.announcement.default.yml b/conf/cmi/core.entity_view_display.node.announcement.default.yml
@@ -16,7 +16,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: Tv1OKP-RfuNReu330xrBPpVCw1qH-TU1DG4UhvIu_Dg
+  default_config_hash: IHF-sP4Gq6tdTyWDxQDDEdLbHz3-QzklMNE1QA2mQU0
 id: node.announcement.default
 targetEntityType: node
 bundle: announcement
@@ -48,16 +48,6 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
-  field_publish_externally:
-    type: boolean
-    label: above
-    settings:
-      format: default
-      format_custom_false: ''
-      format_custom_true: ''
-    third_party_settings: {  }
-    weight: 4
-    region: content
   links:
     settings: {  }
     third_party_settings: {  }
@@ -68,6 +58,7 @@ hidden:
   field_announcement_content_pages: true
   field_announcement_service_pages: true
   field_announcement_unit_pages: true
+  field_publish_externally: true
   langcode: true
   published_at: true
   search_api_excerpt: true

diff --git a/conf/cmi/core.entity_view_display.node.announcement.teaser.yml b/conf/cmi/core.entity_view_display.node.announcement.teaser.yml
@@ -15,7 +15,7 @@ dependencies:
     - text
     - user
 _core:
-  default_config_hash: 1Gnt9nwWV8_9Ez-QIrSSnboslJ8ysGJJfO1C4709D7A
+  default_config_hash: FhIJpRvY90w782EYtR2V2Yfppyglwp191xkVdXEEbbM
 id: node.announcement.teaser
 targetEntityType: node
 bundle: announcement

diff --git a/conf/cmi/core.entity_view_display.node.landing_page.default.yml b/conf/cmi/core.entity_view_display.node.landing_page.default.yml
@@ -14,7 +14,7 @@ dependencies:
     - metatag
     - user
 _core:
-  default_config_hash: LuhyhnsQ44RvvqWLYbkgiR7_IFywxuxn3pPaBDaYIgc
+  default_config_hash: k0yB8d9jdIQ1SPK3C2TVyKEfwT05muqbE9tTkdV9fdQ
 id: node.landing_page.default
 targetEntityType: node
 bundle: landing_page

diff --git a/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml b/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml
@@ -13,7 +13,7 @@ dependencies:
   module:
     - user
 _core:
-  default_config_hash: RFefjJBQl6poRfg0xzeEciZDr5a8b93mTvBPo_c5vt8
+  default_config_hash: '-w2hz1ajYKPav1NspjgUWRkxu9iE-8eHNZ1Ix1LKx_M'
 id: node.landing_page.teaser
 targetEntityType: node
 bundle: landing_page

diff --git a/conf/cmi/core.entity_view_display.node.page.default.yml b/conf/cmi/core.entity_view_display.node.page.default.yml
@@ -14,10 +14,11 @@ dependencies:
     - node.type.page
   module:
     - entity_reference_revisions
+    - helfi_platform_config
     - metatag
     - user
 _core:
-  default_config_hash: sNOG6x1EvyaK2gQbe76faZgElkaHmamOzji8jvk_Ce4
+  default_config_hash: piTzY36HSFy5WyKCdZ6BvAOj3JzxAy5Jt6J1KyU4h64
 id: node.page.default
 targetEntityType: node
 bundle: page

diff --git a/conf/cmi/core.entity_view_display.node.page.teaser.yml b/conf/cmi/core.entity_view_display.node.page.teaser.yml
@@ -16,7 +16,7 @@ dependencies:
   module:
     - user
 _core:
-  default_config_hash: vFk4AH5HEcybJhfYNUFCYwD1tyJKnbp3UxnSELgFN8E
+  default_config_hash: cNX3bx6qnz2khBmsfeNeR-4bUFPswL2Eb0w6tRAUzvc
 id: node.page.teaser
 targetEntityType: node
 bundle: page

diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml
@@ -3,11 +3,11 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: inG9i1GTrLzovCmRjKPGESpCL3HWvFWnmnH9NjPk-iU
+  default_config_hash: WJDpNshFBVU0YZ20yZTKw2ZicqN9PwA0xVKU0CQTOak
 id: chat
 label: 'Functional chat cookies'
 description:
-  value: "<p>The chats on the hel.fi&nbsp; website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.&nbsp; No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Name</th>\r\n\t\t\t<th>Provider</th>\r\n\t\t\t<th>Purpose of the cookie</th>\r\n\t\t\t<th>Validity</th>\r\n\t\t\t<th>Type</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_genesys.widgets.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>__VCAP_ID__</td>\r\n\t\t\t<td>coh-chat-app-prod.eu-de.mybluemix.net</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>gcReturnSessionId&nbsp;<br />\r\n\t\t\tgcAlternativeReturnUrl&nbsp;<br />\r\n\t\t\tgcReturnUrl&nbsp;<br />\r\n\t\t\tgcLoginButtonState</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for authentication in the chat.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>\r\n\t\t\t<p>&nbsp;</p>\r\n\t\t\t</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>leijuke.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>connect.sid</td>\r\n\t\t\t<td>hel-thk-botti.kuurahealth.com</td>\r\n\t\t\t<td>The Kuura cookie is used to save necessary data.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
+  value: "<p>The chats on the hel.fi&nbsp; website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.&nbsp; No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.</p>\r\n\r\n<table>\r\n\t<thead>\r\n\t\t<tr>\r\n\t\t\t<th>Name</th>\r\n\t\t\t<th>Provider</th>\r\n\t\t\t<th>Purpose of the cookie</th>\r\n\t\t\t<th>Validity</th>\r\n\t\t\t<th>Type</th>\r\n\t\t</tr>\r\n\t</thead>\r\n\t<tbody>\r\n\t\t<tr>\r\n\t\t\t<td>_genesys.widgets.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>__VCAP_ID__</td>\r\n\t\t\t<td>coh-chat-app-prod.eu-de.mybluemix.net</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>Third party</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>gcReturnSessionId&nbsp;<br />\r\n\t\t\tgcAlternativeReturnUrl&nbsp;<br />\r\n\t\t\tgcReturnUrl&nbsp;<br />\r\n\t\t\tgcLoginButtonState</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for authentication in the chat.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>\r\n\t\t\t<p>&nbsp;</p>\r\n\t\t\t</td>\r\n\t\t</tr>\r\n\t\t<tr>\r\n\t\t\t<td>leijuke.*</td>\r\n\t\t\t<td>hel.fi</td>\r\n\t\t\t<td>Used for storing data required by the chat functionality.</td>\r\n\t\t\t<td>Session</td>\r\n\t\t\t<td>&nbsp;</td>\r\n\t\t</tr>\r\n\t</tbody>\r\n</table>\r\n"
   format: full_html
 checkbox_default_state: unchecked
 weight: -5
diff --git a/conf/cmi/field.field.node.announcement.body.yml b/conf/cmi/field.field.node.announcement.body.yml
@@ -13,7 +13,7 @@ third_party_settings:
     allowed_formats:
       - minimal
 _core:
-  default_config_hash: PW9xsckq2A_loDf0qrLdQrWVa4P3Xbw9nVveHjC8Mt4
+  default_config_hash: HSTIidPRZ7nvH0u914u-3ghCj6hqbgiKqfU-3SHZaUw
 id: node.announcement.body
 field_name: body
 entity_type: node

diff --git a/conf/cmi/field.field.node.announcement.field_announcement_content_pages.yml b/conf/cmi/field.field.node.announcement.field_announcement_content_pages.yml
@@ -8,7 +8,7 @@ dependencies:
     - node.type.landing_page
     - node.type.page
 _core:
-  default_config_hash: UwT_yrGRrynRfR0F0zXFhepRZ13vlW6y5AJEMPmZ8dY
+  default_config_hash: aLsAogLp6kU_alQPMVOkRw2Q6TdLwmqkpfZnfZgUf5k
 id: node.announcement.field_announcement_content_pages
 field_name: field_announcement_content_pages
 entity_type: node

diff --git a/conf/cmi/field.field.node.announcement.field_announcement_link.yml b/conf/cmi/field.field.node.announcement.field_announcement_link.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - link
 _core:
-  default_config_hash: hTX5IXOUaUFXJy_k5Zx9H-dT7vSN4RiB7rTR5nkoK_k
+  default_config_hash: YUs0Svz_ND7z2Uscv_gCYGphNkHbvxzPJtlbAEh2zWc
 id: node.announcement.field_announcement_link
 field_name: field_announcement_link
 entity_type: node

diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -25,7 +25,7 @@ dependencies:
   module:
     - entity_reference_revisions
 _core:
-  default_config_hash: D7s90vFMq6Tjc-ThXp4s3q8tO6lTN1lBPY3e63U8chU
+  default_config_hash: zEXoDFJnyArUOiL2ZrtDuq4YDWKyn6ung9JndPk_Ntg
 id: node.landing_page.field_content
 field_name: field_content
 entity_type: node

diff --git a/conf/cmi/field.field.node.landing_page.field_hero.yml b/conf/cmi/field.field.node.landing_page.field_hero.yml
@@ -9,7 +9,7 @@ dependencies:
   module:
     - entity_reference_revisions
 _core:
-  default_config_hash: hSRMTRVrowbFOgIGWzwwah6BHae-dqokWQu7ahHPJDQ
+  default_config_hash: wqQr5ULFXtP_T3sIZky7GLndZznJR6XMIzyIO-0lmiY
 id: node.landing_page.field_hero
 field_name: field_hero
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml
@@ -23,7 +23,7 @@ dependencies:
   module:
     - entity_reference_revisions
 _core:
-  default_config_hash: QzPUvR7cSwVLlIv2Wkmjn6T9gEZ-WD6hRta4Y-AShcE
+  default_config_hash: G8uqVofIIeSPJSEW4FPnQrwefO2xMZGnwlbcHrbpZ48
 id: node.page.field_content
 field_name: field_content
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_hero.yml b/conf/cmi/field.field.node.page.field_hero.yml
@@ -9,7 +9,7 @@ dependencies:
   module:
     - entity_reference_revisions
 _core:
-  default_config_hash: NaOVa8WmZbEsmaM4pl6uHvFO6Tw-t9IGIQ3XZXUiamA
+  default_config_hash: _JO0VBpDGRU-ye4MgCyh72SJmF6G9ndACtwAfuQJZI8
 id: node.page.field_hero
 field_name: field_hero
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml
@@ -24,7 +24,7 @@ dependencies:
   module:
     - entity_reference_revisions
 _core:
-  default_config_hash: YD6Rdw1iEhjKEPsmTgUaoyfl5iIRhW7JsotBCZkhRv4
+  default_config_hash: AejXN443GE3b159k_6fsqDyZ_BHs68SU9wBMY24Ueog
 id: node.page.field_lower_content
 field_name: field_lower_content
 entity_type: node
@@ -39,6 +39,7 @@ settings:
   handler: 'default:paragraph'
   handler_settings:
     target_bundles:
+      front_page_latest_news: front_page_latest_news
       text: text
       columns: columns
       image: image
@@ -54,7 +55,6 @@ settings:
       phasing: phasing
       remote_video: remote_video
       map: map
-      front_page_latest_news: front_page_latest_news
     negate: 0
     target_bundles_drag_drop:
       accordion:

diff --git a/conf/cmi/field.field.node.page.field_sidebar_content.yml b/conf/cmi/field.field.node.page.field_sidebar_content.yml
@@ -10,7 +10,7 @@ dependencies:
   module:
     - entity_reference_revisions
 _core:
-  default_config_hash: '-2sdnRsAmfJ1mZqVSJo75OE_MtSf4YRZ1tKlPScSU_E'
+  default_config_hash: 056k2o_OzWbDmv_9zA5BNb30RqLImUGCYN6nnYWjqoQ
 id: node.page.field_sidebar_content
 field_name: field_sidebar_content
 entity_type: node

diff --git a/conf/cmi/field.storage.paragraph.field_hero_design.yml b/conf/cmi/field.storage.paragraph.field_hero_design.yml
@@ -31,7 +31,7 @@ settings:
     -
       value: with-search
       label: 'With search'
-  allowed_values_function: ''
+  allowed_values_function: helfi_paragraphs_hero_design_allowed_values
 module: options
 locked: false
 cardinality: 1