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

Dev to main
City-of-Helsinki · Jul 12, 2023 · 4a9e193 · 4a9e193
2 parents 224529a + 589b54e
commit 4a9e193
Show file tree

Hide file tree

Showing 91 changed files with 988 additions and 798 deletions.
diff --git a/composer.json b/composer.json
@@ -13,8 +13,8 @@
         "drupal/core": "^9.4",
         "drupal/core-composer-scaffold": "^9.4",
         "drupal/flexible_permissions": "^1.0",
-        "drupal/group": "^1.4",
-        "drupal/group_content_menu": "^1.1",
+        "drupal/group": "^2.0",
+        "drupal/group_content_menu": "^2.0",
         "drupal/hdbt": "^5.0",
         "drupal/hdbt_admin": "^2.0",
         "drupal/helfi_azure_fs": "^1.1",
@@ -47,7 +47,8 @@
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "composer/installers": true,
             "cweagans/composer-patches": true,
-            "drupal/core-composer-scaffold": true
+            "drupal/core-composer-scaffold": true,
+            "php-http/discovery": false
         }
     },
     "extra": {
@@ -92,13 +93,11 @@
         },
         "patches": {
             "drupal/group": {
-                "https://www.drupal.org/project/group/issues/2842630": "https://www.drupal.org/files/issues/2019-01-04/2842630-20.patch",
-                "https://www.drupal.org/project/group/issues/2815971": "https://www.drupal.org/files/issues/2021-02-19/2815971-28.patch",
-                "https://www.drupal.org/project/group/issues/3210808": "https://www.drupal.org/files/issues/2021-04-26/uasort-comparison-3210808-2.patch",
-                "https://www.drupal.org/project/group/issues/3036272": "https://www.drupal.org/files/issues/2019-02-27/group_type_language_settings-3036272-2.patch"
+                "https://www.drupal.org/project/group/issues/2815971": "https://www.drupal.org/files/issues/2023-06-13/group-context-2815971-46.patch"
             },
             "drupal/group_content_menu": {
-                "https://www.drupal.org/project/group_content_menu/issues/3209011": "https://www.drupal.org/files/issues/2021-04-21/group_content_menu-active_trail_cache_problem-3209011-10.patch"
+                "https://www.drupal.org/project/group_content_menu/issues/3209011": "https://www.drupal.org/files/issues/2021-04-21/group_content_menu-active_trail_cache_problem-3209011-10.patch",
+                "concat array with null fix": "./patches/group_menu_content_array_concat_error.patch"
             }
         }
     },

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/config_ignore.settings.yml b/conf/cmi/config_ignore.settings.yml
@@ -5,4 +5,4 @@ ignored_config_entities:
   - 'hdbt_admin_tools.site_settings:site_settings'
   - 'easy_breadcrumb.settings:home_segment_title'
   - 'field.storage.paragraph.field_calculator:settings.allowed_values'
-  - helfi_calculator.calculator_settings
+  - helfi_calculator.settings
diff --git a/conf/cmi/core.base_field_override.group.upper_secondary_school.uid.yml b/conf/cmi/core.base_field_override.group.upper_secondary_school.uid.yml
@@ -13,7 +13,7 @@ description: 'The username of the group creator.'
 required: false
 translatable: false
 default_value: {  }
-default_value_callback: 'Drupal\group\Entity\Group::getDefaultEntityOwner'
+default_value_callback: 'Drupal\group\Entity\GroupRelationship::getDefaultEntityOwner'
 settings:
   handler: default
   handler_settings: {  }

diff --git a/conf/cmi/core.base_field_override.group_content.group_content_type_5e8b00831189e.uid.yml b/conf/cmi/core.base_field_override.group_content.group_content_type_5e8b00831189e.uid.yml
@@ -13,7 +13,7 @@ description: 'The username of the group content creator.'
 required: false
 translatable: false
 default_value: {  }
-default_value_callback: 'Drupal\group\Entity\GroupContent::getDefaultEntityOwner'
+default_value_callback: 'Drupal\group\Entity\GroupRelationship::getDefaultEntityOwner'
 settings:
   handler: default
   handler_settings: {  }

diff --git a/conf/cmi/core.base_field_override.group_content.group_content_type_8cf71fbe8b0c4.uid.yml b/conf/cmi/core.base_field_override.group_content.group_content_type_8cf71fbe8b0c4.uid.yml
@@ -13,7 +13,7 @@ description: 'The username of the group content creator.'
 required: false
 translatable: false
 default_value: {  }
-default_value_callback: 'Drupal\group\Entity\GroupContent::getDefaultEntityOwner'
+default_value_callback: 'Drupal\group\Entity\GroupRelationship::getDefaultEntityOwner'
 settings:
   handler: default
   handler_settings: {  }

diff --git a/conf/cmi/core.base_field_override.group_content.group_content_type_b0ee7f3e08749.uid.yml b/conf/cmi/core.base_field_override.group_content.group_content_type_b0ee7f3e08749.uid.yml
@@ -13,7 +13,7 @@ description: 'The username of the group content creator.'
 required: false
 translatable: false
 default_value: {  }
-default_value_callback: 'Drupal\group\Entity\GroupContent::getDefaultEntityOwner'
+default_value_callback: 'Drupal\group\Entity\GroupRelationship::getDefaultEntityOwner'
 settings:
   handler: default
   handler_settings: {  }

diff --git a/conf/cmi/core.base_field_override.group_content.group_content_type_c28cd27128f0f.uid.yml b/conf/cmi/core.base_field_override.group_content.group_content_type_c28cd27128f0f.uid.yml
@@ -13,7 +13,7 @@ description: 'The username of the group content creator.'
 required: false
 translatable: false
 default_value: {  }
-default_value_callback: 'Drupal\group\Entity\GroupContent::getDefaultEntityOwner'
+default_value_callback: 'Drupal\group\Entity\GroupRelationship::getDefaultEntityOwner'
 settings:
   handler: default
   handler_settings: {  }

diff --git a/conf/cmi/core.base_field_override.group_content.group_content_type_c5fd8986910a1.uid.yml b/conf/cmi/core.base_field_override.group_content.group_content_type_c5fd8986910a1.uid.yml
@@ -13,7 +13,7 @@ description: 'The username of the group content creator.'
 required: false
 translatable: false
 default_value: {  }
-default_value_callback: 'Drupal\group\Entity\GroupContent::getDefaultEntityOwner'
+default_value_callback: 'Drupal\group\Entity\GroupRelationship::getDefaultEntityOwner'
 settings:
   handler: default
   handler_settings: {  }

diff --git a/conf/cmi/core.base_field_override.group_content.group_content_type_cb62eb2a38c4f.uid.yml b/conf/cmi/core.base_field_override.group_content.group_content_type_cb62eb2a38c4f.uid.yml
@@ -13,7 +13,7 @@ description: 'The username of the group content creator.'
 required: false
 translatable: false
 default_value: {  }
-default_value_callback: 'Drupal\group\Entity\GroupContent::getDefaultEntityOwner'
+default_value_callback: 'Drupal\group\Entity\GroupRelationship::getDefaultEntityOwner'
 settings:
   handler: default
   handler_settings: {  }

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: 8a690988-3b8c-43cb-bfc6-eaa2adff9349
+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: 0d04fcfb-3745-40ed-96b6-b8385feb00e0
+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: 11fa8cd1-3040-4fc2-bffa-83405bfb727b
+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
@@ -7,17 +7,20 @@ dependencies:
     - field.field.node.announcement.field_announcement_all_pages
     - field.field.node.announcement.field_announcement_content_pages
     - field.field.node.announcement.field_announcement_link
+    - field.field.node.announcement.field_announcement_service_pages
     - field.field.node.announcement.field_announcement_type
+    - field.field.node.announcement.field_announcement_unit_pages
     - node.type.announcement
   module:
     - hdbt_admin_tools
     - link
     - path
+    - publication_date
     - scheduler
     - select2
     - text
 _core:
-  default_config_hash: 3ZB5EfLIfBjGMLdV-iwrrnqbcJ6VVLq5bv7jCaZT0Dg
+  default_config_hash: le2Wzlas0qZ9Bj-o6WlJbHDeisFrucs9F4B3VOK8t_w
 id: node.announcement.default
 targetEntityType: node
 bundle: announcement

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: 2UzmhcoLdP813geh94iPT1sXBgLAMVxYuUQcmTqnl5M
+  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: ovxh0W5mFYp8gQbwRzU26jMLwUerrg8oJT-enNnUxe4
+  default_config_hash: _RX52hwdyz48o4MBqyRPUVkop-Unt1rcPuPanpQ7ksk
 id: node.page.default
 targetEntityType: node
 bundle: page

diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -21,7 +21,7 @@ dependencies:
     - readonly_field_widget
     - select2
 _core:
-  default_config_hash: g-ZdiLH0rHr8Mv6vni5A3v5v2UQGRdwiwPxs88WA93E
+  default_config_hash: cotjiL17Qafj5pirtPax237aflvFs_-3pKHSP6wblrg
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
@@ -87,6 +87,16 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  contacts:
+    type: readonly_field_widget
+    weight: 36
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   description:
     type: readonly_field_widget
     weight: 13
@@ -206,6 +216,16 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
+  highlights:
+    type: readonly_field_widget
+    weight: 32
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 0
@@ -223,6 +243,16 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  links:
+    type: readonly_field_widget
+    weight: 35
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   longitude:
     type: readonly_field_widget
     weight: 18
@@ -251,6 +281,26 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  opening_hours:
+    type: readonly_field_widget
+    weight: 31
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
+  other_info:
+    type: readonly_field_widget
+    weight: 33
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   path:
     type: path
     weight: 11
@@ -284,6 +334,16 @@ content:
     settings:
       media_types: {  }
     third_party_settings: {  }
+  price_info:
+    type: readonly_field_widget
+    weight: 34
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   provided_languages:
     type: readonly_field_widget
     weight: 30

diff --git a/conf/cmi/core.entity_view_display.node.announcement.default.yml b/conf/cmi/core.entity_view_display.node.announcement.default.yml
@@ -7,15 +7,17 @@ dependencies:
     - field.field.node.announcement.field_announcement_all_pages
     - field.field.node.announcement.field_announcement_content_pages
     - field.field.node.announcement.field_announcement_link
+    - field.field.node.announcement.field_announcement_service_pages
     - field.field.node.announcement.field_announcement_type
+    - field.field.node.announcement.field_announcement_unit_pages
     - node.type.announcement
   module:
     - link
     - options
     - text
     - user
 _core:
-  default_config_hash: d9dGJc2qp1Rc1GeEJBPEm5UIpxhfL0k-12i1h94wvKo
+  default_config_hash: IHF-sP4Gq6tdTyWDxQDDEdLbHz3-QzklMNE1QA2mQU0
 id: node.announcement.default
 targetEntityType: node
 bundle: announcement

diff --git a/conf/cmi/core.entity_view_display.node.announcement.teaser.yml b/conf/cmi/core.entity_view_display.node.announcement.teaser.yml
@@ -8,13 +8,15 @@ dependencies:
     - field.field.node.announcement.field_announcement_all_pages
     - field.field.node.announcement.field_announcement_content_pages
     - field.field.node.announcement.field_announcement_link
+    - field.field.node.announcement.field_announcement_service_pages
     - field.field.node.announcement.field_announcement_type
+    - field.field.node.announcement.field_announcement_unit_pages
     - node.type.announcement
   module:
     - text
     - user
 _core:
-  default_config_hash: irxGtRZIWWQOQfoHbOaVX274Rk3qzwV1vV7Nrbrt9eo
+  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: _whE_YF_9QlEb5ZkysxHqzGeW--5cRtFFJTZHRRMsE8
+  default_config_hash: piTzY36HSFy5WyKCdZ6BvAOj3JzxAy5Jt6J1KyU4h64
 id: node.page.default
 targetEntityType: node
 bundle: page