From c42f95b537b5d392a1f225a521af8955aff33dcc Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 26 Jun 2023 13:00:45 +0300 Subject: [PATCH 01/27] UHF-8615: updated group & group content menu modules --- composer.json | 6 ++-- composer.lock | 98 +++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 82 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index 664a6f1f..674becde 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,8 @@ "drupal/better_exposed_filters": "^6.0", "drupal/core": "^9.4", "drupal/core-composer-scaffold": "^9.4", - "drupal/group": "^1.4", - "drupal/group_content_menu": "^1.1", + "drupal/group": "^2", + "drupal/group_content_menu": "^2", "drupal/hdbt": "^5.0", "drupal/hdbt_admin": "^2.0", "drupal/helfi_azure_fs": "^1.1", @@ -91,7 +91,7 @@ }, "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/2842630": "https://www.drupal.org/files/issues/2022-09-02/group-2842630-40-v2.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" diff --git a/composer.lock b/composer.lock index 299b5afc..fb5dfdff 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "df9a416fe3fd97aebe23ff6ff047288a", + "content-hash": "a63b6eb3750b0936e19fe754a0514188", "packages": [ { "name": "asm89/stack-cors", @@ -3519,6 +3519,58 @@ "issues": "https://www.drupal.org/project/issues/filelog" } }, + { + "name": "drupal/flexible_permissions", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/flexible_permissions.git", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/flexible_permissions-1.0.0.zip", + "reference": "1.0.0", + "shasum": "a48740d2edcb04bb0d750c5d5c41ce8fb9acc332" + }, + "require": { + "drupal/core": "^9.5 || ^10", + "drupal/variationcache": "^1.0" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.0.0", + "datestamp": "1679575763", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Kristiaan Van den Eynde", + "homepage": "https://www.drupal.org/u/kristiaanvandeneynde", + "role": "Maintainer" + }, + { + "name": "Mathias Wächter", + "homepage": "https://www.drupal.org/u/mef", + "role": "Maintainer" + } + ], + "description": "This module allows you to gather, calculate and cache permissions from a myriad of sources", + "homepage": "http://drupal.org/project/flexible_permissions", + "support": { + "source": "https://git.drupalcode.org/project/flexible_permissions", + "issues": "https://drupal.org/project/issues/flexible_permissions" + } + }, { "name": "drupal/flysystem", "version": "2.1.0-rc4", @@ -3823,28 +3875,28 @@ }, { "name": "drupal/group", - "version": "1.4.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/group.git", - "reference": "8.x-1.4" + "reference": "2.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/group-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "385a70f421dc3142c9c91876ac8b35ae3afa107e" + "url": "https://ftp.drupal.org/files/projects/group-2.1.0.zip", + "reference": "2.1.0", + "shasum": "d1cfc7d06b44b776f77629d3c0657617d713dd97" }, "require": { - "drupal/core": "^8.9 || ^9", + "drupal/core": "^9.5 || ^10", "drupal/entity": "^1.2", - "drupal/variationcache": "^1.0" + "drupal/flexible_permissions": "^1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1625063515", + "version": "2.1.0", + "datestamp": "1685092674", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3860,6 +3912,10 @@ "name": "Kristiaan Van den Eynde", "homepage": "https://www.drupal.org/u/kristiaanvandeneynde", "role": "Maintainer" + }, + { + "name": "kristiaanvandeneynde", + "homepage": "https://www.drupal.org/user/1345130" } ], "description": "This module allows you to group users, content and other entities", @@ -3871,27 +3927,27 @@ }, { "name": "drupal/group_content_menu", - "version": "1.1.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/group_content_menu.git", - "reference": "8.x-1.1" + "reference": "2.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/group_content_menu-8.x-1.1.zip", - "reference": "8.x-1.1", - "shasum": "73972de25735e77079712536007193364cda9635" + "url": "https://ftp.drupal.org/files/projects/group_content_menu-2.0.0.zip", + "reference": "2.0.0", + "shasum": "b1e30230e36c8503bec78f57120470352a20c351" }, "require": { - "drupal/core": "^8.6 | ^9.0", - "drupal/group": "^1.0@RC" + "drupal/core": "^9.1 || ^10", + "drupal/group": "^2" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.1", - "datestamp": "1625840906", + "version": "2.0.0", + "datestamp": "1685546648", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3908,6 +3964,10 @@ "homepage": "https://www.drupal.org/u/heddn", "role": "Maintainer" }, + { + "name": "edysmp", + "homepage": "https://www.drupal.org/user/3169323" + }, { "name": "heddn", "homepage": "https://www.drupal.org/user/1463982" From f8aa4e69b66567429bfad54614c274cc29f505fe Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 26 Jun 2023 13:01:37 +0300 Subject: [PATCH 02/27] UHF-8615: first patch is already applied to current version --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 674becde..fde9dc26 100644 --- a/composer.json +++ b/composer.json @@ -91,7 +91,6 @@ }, "patches": { "drupal/group": { - "https://www.drupal.org/project/group/issues/2842630": "https://www.drupal.org/files/issues/2022-09-02/group-2842630-40-v2.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" From 02b27565b12bf225e00840649c5cbaa954139db1 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 26 Jun 2023 13:03:22 +0300 Subject: [PATCH 03/27] UHF-8615: second patch also fixed & applied to current version --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index fde9dc26..a130524a 100644 --- a/composer.json +++ b/composer.json @@ -92,7 +92,6 @@ "patches": { "drupal/group": { "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" }, "drupal/group_content_menu": { From 5fba4b20c6b5b20cc9da5e55da14b7177d5535af Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 26 Jun 2023 13:34:34 +0300 Subject: [PATCH 04/27] UHF-8615: update patch to 2.1.x complient version --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index a130524a..58f367bc 100644 --- a/composer.json +++ b/composer.json @@ -91,8 +91,7 @@ }, "patches": { "drupal/group": { - "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/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" From 356f5ba493efeec9c46f35de7d6c16dc23b2c434 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 26 Jun 2023 15:08:25 +0300 Subject: [PATCH 05/27] UHF-8615: added flexible permissions module required by group module --- composer.json | 1 + composer.lock | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 58f367bc..70ee1a4a 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "drupal/better_exposed_filters": "^6.0", "drupal/core": "^9.4", "drupal/core-composer-scaffold": "^9.4", + "drupal/flexible_permissions": "^1.0", "drupal/group": "^2", "drupal/group_content_menu": "^2", "drupal/hdbt": "^5.0", diff --git a/composer.lock b/composer.lock index fb5dfdff..3f07fe05 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a63b6eb3750b0936e19fe754a0514188", + "content-hash": "513f4a333c341b35914f6f0ce6e72708", "packages": [ { "name": "asm89/stack-cors", From baf9b9220a0639bf6e06f2e235e13a1c5fc317c1 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 26 Jun 2023 15:10:10 +0300 Subject: [PATCH 06/27] UHF-8615: enabled flexible_permissions --- conf/cmi/core.extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 10874e97..b1483240 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -35,6 +35,7 @@ module: file: 0 file_mdm: 0 filter: 0 + flexible_permissions: 0 flysystem: 0 flysystem_azure: 0 focal_point: 0 From 136551a341d4c9ea1f77206578ccdc41bfd00d80 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 26 Jun 2023 15:50:03 +0300 Subject: [PATCH 07/27] UHF-8615: Content enabler plugin was renamed to Group relation plugin --- .../Relation}/GroupTprUnit.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename public/modules/custom/helfi_group/src/Plugin/{GroupContentEnabler => Group/Relation}/GroupTprUnit.php (70%) diff --git a/public/modules/custom/helfi_group/src/Plugin/GroupContentEnabler/GroupTprUnit.php b/public/modules/custom/helfi_group/src/Plugin/Group/Relation/GroupTprUnit.php similarity index 70% rename from public/modules/custom/helfi_group/src/Plugin/GroupContentEnabler/GroupTprUnit.php rename to public/modules/custom/helfi_group/src/Plugin/Group/Relation/GroupTprUnit.php index 824e73f3..d0445d22 100644 --- a/public/modules/custom/helfi_group/src/Plugin/GroupContentEnabler/GroupTprUnit.php +++ b/public/modules/custom/helfi_group/src/Plugin/Group/Relation/GroupTprUnit.php @@ -2,14 +2,14 @@ declare(strict_types = 1); -namespace Drupal\helfi_group\Plugin\GroupContentEnabler; +namespace Drupal\helfi_group\Plugin\Group\Relation; -use Drupal\group\Plugin\GroupContentEnablerBase; +use Drupal\group\Plugin\Group\Relation\GroupRelationBase; /** - * Provides a group content enabler for TPR Units. + * Provides a group relation type for TPR Units. * - * @GroupContentEnabler( + * @GroupRelationType( * id = "group_tpr_unit", * label = @Translation("Group TPR unit"), * description = @Translation("Adds TPR units to groups."), @@ -23,5 +23,5 @@ * } * ) */ -class GroupTprUnit extends GroupContentEnablerBase { +class GroupTprUnit extends GroupRelationBase { } From 1b90a774a4363b8f4f7869b045e44f23c3fcdab5 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Tue, 27 Jun 2023 07:40:08 +0300 Subject: [PATCH 08/27] UHF-8615: use GroupRelationship instead of removed GroupContent class --- .../modules/custom/helfi_group/src/GroupUtility.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/public/modules/custom/helfi_group/src/GroupUtility.php b/public/modules/custom/helfi_group/src/GroupUtility.php index 968eb3b1..8618514e 100644 --- a/public/modules/custom/helfi_group/src/GroupUtility.php +++ b/public/modules/custom/helfi_group/src/GroupUtility.php @@ -6,7 +6,7 @@ use Drupal\Core\Entity\ContentEntityInterface; use Drupal\group\Entity\Group; -use Drupal\group\Entity\GroupContent; +use Drupal\group\Entity\GroupRelationship; /** * Contains helper functions for groups. @@ -23,13 +23,8 @@ class GroupUtility { * The group that contains the node or NULL. */ public static function getGroup(ContentEntityInterface $entity): ?Group { - $groupContents = GroupContent::loadByEntity($entity); - $group = NULL; - foreach ($groupContents as $groupContent) { - $group = $groupContent->getGroup(); - break; - } - return $group; + $groupContents = GroupRelationship::loadByEntity($entity); + return !empty($groupContents) ? reset($groupContents)->getGroup() : NULL; } } From cf366619eddfb01b5c069d7d41d8d62082ef6a95 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Tue, 27 Jun 2023 07:59:06 +0300 Subject: [PATCH 09/27] UHF-8615: added missing return type --- public/modules/custom/helfi_group/src/UnitFormAlter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_group/src/UnitFormAlter.php b/public/modules/custom/helfi_group/src/UnitFormAlter.php index 3b5e5873..bd0b7a26 100644 --- a/public/modules/custom/helfi_group/src/UnitFormAlter.php +++ b/public/modules/custom/helfi_group/src/UnitFormAlter.php @@ -26,7 +26,7 @@ class UnitFormAlter extends NodeFormAlter { * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException */ - public function alter(array &$form, FormStateInterface $form_state) { + public function alter(array &$form, FormStateInterface $form_state): void { $unit = $form_state->getFormObject()->getEntity(); $groups = $this->getEntityGroups($form_state, $unit); From 20aa263ab235dfe046b47779beedf801b13ea643 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Tue, 27 Jun 2023 08:06:56 +0300 Subject: [PATCH 10/27] UHF-8615: comment removed since patch isn't necessary any more --- .../src/EventSubscriber/GroupMenuFilterByLanguage.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/modules/custom/helfi_group/src/EventSubscriber/GroupMenuFilterByLanguage.php b/public/modules/custom/helfi_group/src/EventSubscriber/GroupMenuFilterByLanguage.php index 87c8362a..545e549c 100644 --- a/public/modules/custom/helfi_group/src/EventSubscriber/GroupMenuFilterByLanguage.php +++ b/public/modules/custom/helfi_group/src/EventSubscriber/GroupMenuFilterByLanguage.php @@ -10,8 +10,6 @@ /** * Filters out the untranslated menu links. - * - * @note this requires a patch from #3091246. */ final class GroupMenuFilterByLanguage implements EventSubscriberInterface { From 9a1189d8554cdece87e01c1067fa2ceec2136ced Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Tue, 27 Jun 2023 13:30:01 +0300 Subject: [PATCH 11/27] UHF-8615: fixed group roles. fixed deprecated class & method calls. Fixed wrong callback methods from yml files. proper version number on composer.json --- composer.json | 4 +- composer.lock | 2 +- ...rride.group.upper_secondary_school.uid.yml | 2 +- ...t.group_content_type_5e8b00831189e.uid.yml | 2 +- ...t.group_content_type_8cf71fbe8b0c4.uid.yml | 2 +- ...t.group_content_type_b0ee7f3e08749.uid.yml | 2 +- ...t.group_content_type_c28cd27128f0f.uid.yml | 2 +- ...t.group_content_type_c5fd8986910a1.uid.yml | 2 +- ...t.group_content_type_cb62eb2a38c4f.uid.yml | 2 +- ....role.upper_secondary_school-0b0baeca9.yml | 17 ---- ....role.upper_secondary_school-161bb35a9.yml | 17 ---- ....role.upper_secondary_school-2e5f4db8d.yml | 17 ---- ....role.upper_secondary_school-4200d0219.yml | 17 ---- ....role.upper_secondary_school-6ebf7ed4b.yml | 17 ---- ....role.upper_secondary_school-76495635a.yml | 17 ---- ....role.upper_secondary_school-97a902313.yml | 17 ---- ...roup.role.upper_secondary_school-admin.yml | 6 +- ....role.upper_secondary_school-anonymous.yml | 18 ----- ....role.upper_secondary_school-cc1f1ca69.yml | 17 ---- ....role.upper_secondary_school-ed6e8ed69.yml | 17 ---- ...up.role.upper_secondary_school-i_admin.yml | 15 ++++ ...oup.role.upper_secondary_school-member.yml | 7 +- ...up.role.upper_secondary_school-o_admin.yml | 15 ++++ ...p.role.upper_secondary_school-outsider.yml | 18 ----- conf/cmi/views.view.group_members.yml | 80 +++++++++++++++---- .../Plugin/Group/Relation/GroupTprUnit.php | 4 +- .../custom/helfi_group/src/UnitFormAlter.php | 2 +- 27 files changed, 113 insertions(+), 225 deletions(-) delete mode 100644 conf/cmi/group.role.upper_secondary_school-0b0baeca9.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-161bb35a9.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-2e5f4db8d.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-4200d0219.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-6ebf7ed4b.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-76495635a.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-97a902313.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-anonymous.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-cc1f1ca69.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-ed6e8ed69.yml create mode 100644 conf/cmi/group.role.upper_secondary_school-i_admin.yml create mode 100644 conf/cmi/group.role.upper_secondary_school-o_admin.yml delete mode 100644 conf/cmi/group.role.upper_secondary_school-outsider.yml diff --git a/composer.json b/composer.json index 70ee1a4a..8f5d8c28 100644 --- 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": "^2", - "drupal/group_content_menu": "^2", + "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", diff --git a/composer.lock b/composer.lock index 3f07fe05..53ac6eea 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "513f4a333c341b35914f6f0ce6e72708", + "content-hash": "dc1ad6e3d3ee73d354001baf0d82ae63", "packages": [ { "name": "asm89/stack-cors", 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 index 03e56010..d2ccc42c 100644 --- 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 index 91fc2205..ea44604e 100644 --- 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 index 4aef4ac4..c896add1 100644 --- 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 index a4630f04..01bcd999 100644 --- 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 index f719415d..bae6ade7 100644 --- 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 index f32c8c42..12c88444 100644 --- 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 index c8391a72..af7f7051 100644 --- 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/group.role.upper_secondary_school-0b0baeca9.yml b/conf/cmi/group.role.upper_secondary_school-0b0baeca9.yml deleted file mode 100644 index 70171222..00000000 --- a/conf/cmi/group.role.upper_secondary_school-0b0baeca9.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 0326015a-c353-48b6-8544-e45d8925cdd2 -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school - enforced: - config: - - user.role.editor -id: upper_secondary_school-0b0baeca9 -label: Editor -weight: 4 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: false -permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-161bb35a9.yml b/conf/cmi/group.role.upper_secondary_school-161bb35a9.yml deleted file mode 100644 index 4a30d9e4..00000000 --- a/conf/cmi/group.role.upper_secondary_school-161bb35a9.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: bd88db70-43a4-4eee-a38a-8b7988fa6731 -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school - enforced: - config: - - user.role.school_editor -id: upper_secondary_school-161bb35a9 -label: 'Upper secondary school editor' -weight: 5 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: false -permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-2e5f4db8d.yml b/conf/cmi/group.role.upper_secondary_school-2e5f4db8d.yml deleted file mode 100644 index eec19e5c..00000000 --- a/conf/cmi/group.role.upper_secondary_school-2e5f4db8d.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 4569e698-e7d4-44db-83bc-332f4dcbda0a -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school - enforced: - config: - - user.role.comprehensive_school_editor -id: upper_secondary_school-2e5f4db8d -label: 'Comprehensive school editor' -weight: 7 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: false -permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-4200d0219.yml b/conf/cmi/group.role.upper_secondary_school-4200d0219.yml deleted file mode 100644 index 787129c5..00000000 --- a/conf/cmi/group.role.upper_secondary_school-4200d0219.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 2076184b-79b2-400c-b654-f34f48e6f369 -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school - enforced: - config: - - user.role.admin -id: upper_secondary_school-4200d0219 -label: Administrator -weight: 2 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: false -permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-6ebf7ed4b.yml b/conf/cmi/group.role.upper_secondary_school-6ebf7ed4b.yml deleted file mode 100644 index 3d33f04f..00000000 --- a/conf/cmi/group.role.upper_secondary_school-6ebf7ed4b.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: d4338516-7887-4796-b569-ed46a17167f5 -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school - enforced: - config: - - user.role.playground_editor -id: upper_secondary_school-6ebf7ed4b -label: 'Playground editor' -weight: 6 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: false -permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-76495635a.yml b/conf/cmi/group.role.upper_secondary_school-76495635a.yml deleted file mode 100644 index 6fc2f8d0..00000000 --- a/conf/cmi/group.role.upper_secondary_school-76495635a.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 9e24daf9-1b35-4ce0-a775-aee930cb043b -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school - enforced: - config: - - user.role.content_producer -id: upper_secondary_school-76495635a -label: 'Content producer' -weight: 3 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: false -permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-97a902313.yml b/conf/cmi/group.role.upper_secondary_school-97a902313.yml deleted file mode 100644 index 4570b015..00000000 --- a/conf/cmi/group.role.upper_secondary_school-97a902313.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 81cf1f11-3038-4208-899b-5df33f67ff16 -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school - enforced: - config: - - user.role.read_only -id: upper_secondary_school-97a902313 -label: 'Read only' -weight: 4 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: false -permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-admin.yml b/conf/cmi/group.role.upper_secondary_school-admin.yml index ceb77351..46f0146e 100644 --- a/conf/cmi/group.role.upper_secondary_school-admin.yml +++ b/conf/cmi/group.role.upper_secondary_school-admin.yml @@ -7,10 +7,10 @@ dependencies: id: upper_secondary_school-admin label: 'School admin' weight: 6 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: upper_secondary_school -permissions_ui: true permissions: - 'access group content menu overview' - 'access group_node overview' diff --git a/conf/cmi/group.role.upper_secondary_school-anonymous.yml b/conf/cmi/group.role.upper_secondary_school-anonymous.yml deleted file mode 100644 index 1742387a..00000000 --- a/conf/cmi/group.role.upper_secondary_school-anonymous.yml +++ /dev/null @@ -1,18 +0,0 @@ -uuid: 0786733f-447c-4688-bea4-33d2d5e0f86a -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school -id: upper_secondary_school-anonymous -label: Anonymous -weight: -102 -internal: true -audience: anonymous -group_type: upper_secondary_school -permissions_ui: true -permissions: - - 'view group_node:landing_page entity' - - 'view group_node:news_item entity' - - 'view group_node:page entity' - - 'view group_tpr_unit entity' diff --git a/conf/cmi/group.role.upper_secondary_school-cc1f1ca69.yml b/conf/cmi/group.role.upper_secondary_school-cc1f1ca69.yml deleted file mode 100644 index 506711fe..00000000 --- a/conf/cmi/group.role.upper_secondary_school-cc1f1ca69.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: f93dd132-1381-4505-b95c-d1334f1bdcd9 -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school - enforced: - config: - - user.role.debug_api -id: upper_secondary_school-cc1f1ca69 -label: 'Debug API' -weight: 0 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: false -permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-ed6e8ed69.yml b/conf/cmi/group.role.upper_secondary_school-ed6e8ed69.yml deleted file mode 100644 index 9d3191b8..00000000 --- a/conf/cmi/group.role.upper_secondary_school-ed6e8ed69.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 37709d9c-5b3d-4b76-b32c-28ec480560a1 -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school - enforced: - config: - - user.role.daycare_editor -id: upper_secondary_school-ed6e8ed69 -label: 'Daycare editor' -weight: 8 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: false -permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-i_admin.yml b/conf/cmi/group.role.upper_secondary_school-i_admin.yml new file mode 100644 index 00000000..7acca5da --- /dev/null +++ b/conf/cmi/group.role.upper_secondary_school-i_admin.yml @@ -0,0 +1,15 @@ +uuid: 4541bd25-8f60-440f-b252-5bdc24ecd204 +langcode: en +status: true +dependencies: + config: + - group.type.upper_secondary_school + - user.role.admin +id: upper_secondary_school-i_admin +label: 'Insider admin' +weight: 7 +admin: true +scope: insider +global_role: admin +group_type: upper_secondary_school +permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-member.yml b/conf/cmi/group.role.upper_secondary_school-member.yml index aaf49eef..46877c16 100644 --- a/conf/cmi/group.role.upper_secondary_school-member.yml +++ b/conf/cmi/group.role.upper_secondary_school-member.yml @@ -4,13 +4,14 @@ status: true dependencies: config: - group.type.upper_secondary_school + - user.role.school_editor id: upper_secondary_school-member label: Member weight: -100 -internal: true -audience: member +admin: false +scope: insider +global_role: school_editor group_type: upper_secondary_school -permissions_ui: true permissions: - 'access group content menu overview' - 'access group_node overview' diff --git a/conf/cmi/group.role.upper_secondary_school-o_admin.yml b/conf/cmi/group.role.upper_secondary_school-o_admin.yml new file mode 100644 index 00000000..87219264 --- /dev/null +++ b/conf/cmi/group.role.upper_secondary_school-o_admin.yml @@ -0,0 +1,15 @@ +uuid: c756632f-2294-4a9b-9ff6-f090fa0ca8b0 +langcode: en +status: true +dependencies: + config: + - group.type.upper_secondary_school + - user.role.admin +id: upper_secondary_school-o_admin +label: 'Outsider admin' +weight: 8 +admin: true +scope: outsider +global_role: admin +group_type: upper_secondary_school +permissions: { } diff --git a/conf/cmi/group.role.upper_secondary_school-outsider.yml b/conf/cmi/group.role.upper_secondary_school-outsider.yml deleted file mode 100644 index 5a2551a6..00000000 --- a/conf/cmi/group.role.upper_secondary_school-outsider.yml +++ /dev/null @@ -1,18 +0,0 @@ -uuid: 3f8c9486-6164-4233-a0fb-5a40d63ae16e -langcode: en -status: true -dependencies: - config: - - group.type.upper_secondary_school -id: upper_secondary_school-outsider -label: Outsider -weight: -101 -internal: true -audience: outsider -group_type: upper_secondary_school -permissions_ui: true -permissions: - - 'view group_node:landing_page entity' - - 'view group_node:news_item entity' - - 'view group_node:page entity' - - 'view group_tpr_unit entity' diff --git a/conf/cmi/views.view.group_members.yml b/conf/cmi/views.view.group_members.yml index 5d252824..524f303c 100644 --- a/conf/cmi/views.view.group_members.yml +++ b/conf/cmi/views.view.group_members.yml @@ -1,4 +1,3 @@ -uuid: 96fa930c-3f22-40e3-b666-1d5890af071d langcode: en status: true dependencies: @@ -7,14 +6,12 @@ dependencies: module: - group - user -_core: - default_config_hash: zIcnLmbW8inPRIQdPSVbKPuG2o5G5wHGJED4Jlgb2SY id: group_members label: 'Group members' module: group description: '' tag: '' -base_table: group_content_field_data +base_table: group_relationship_field_data base_field: id display: default: @@ -135,7 +132,7 @@ display: element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true - empty: '
  • <none>
' + empty: None hide_empty: false empty_zero: false hide_alter_empty: true @@ -155,7 +152,7 @@ display: field_api_classes: false changed: id: changed - table: group_content_field_data + table: group_relationship_field_data field: changed relationship: none group_type: group @@ -222,7 +219,7 @@ display: field_api_classes: false created: id: created - table: group_content_field_data + table: group_relationship_field_data field: created relationship: none group_type: group @@ -287,9 +284,62 @@ display: multi_type: separator separator: ', ' field_api_classes: false + view_group_content: + id: view_group_content + table: group_relationship + field: view_group_content + relationship: none + group_type: group + admin_label: 'View member link' + entity_type: group_content + plugin_id: entity_link + label: '' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + text: 'View member' + output_url_as_text: false + absolute: false edit_group_content: id: edit_group_content - table: group_content + table: group_relationship field: edit_group_content relationship: none group_type: group @@ -337,12 +387,10 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - text: 'Edit membership' - output_url_as_text: false - absolute: false + text: 'Edit member' delete_group_content: id: delete_group_content - table: group_content + table: group_relationship field: delete_group_content relationship: none group_type: group @@ -390,9 +438,7 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - text: 'Remove membership' - output_url_as_text: false - absolute: false + text: 'Remove member' dropbutton: id: dropbutton table: views @@ -505,7 +551,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: none group_type: group @@ -636,7 +682,7 @@ display: relationships: gc__user: id: gc__user - table: group_content_field_data + table: group_relationship_field_data field: gc__user relationship: none group_type: group diff --git a/public/modules/custom/helfi_group/src/Plugin/Group/Relation/GroupTprUnit.php b/public/modules/custom/helfi_group/src/Plugin/Group/Relation/GroupTprUnit.php index d0445d22..48b2409d 100644 --- a/public/modules/custom/helfi_group/src/Plugin/Group/Relation/GroupTprUnit.php +++ b/public/modules/custom/helfi_group/src/Plugin/Group/Relation/GroupTprUnit.php @@ -18,8 +18,8 @@ * reference_label = @Translation("Title"), * reference_description = @Translation("The title of the TPR Unit to add to the group"), * handlers = { - * "access" = "Drupal\group\Plugin\GroupContentAccessControlHandler", - * "permission_provider" = "Drupal\group\Plugin\GroupContentPermissionProvider", + * "access" = "Drupal\group\Plugin\Group\RelationHandlerDefault\AccessControl", + * "permission_provider" = "Drupal\group\Plugin\Group\RelationHandlerDefault\PermissionProvider", * } * ) */ diff --git a/public/modules/custom/helfi_group/src/UnitFormAlter.php b/public/modules/custom/helfi_group/src/UnitFormAlter.php index bd0b7a26..45b25a17 100644 --- a/public/modules/custom/helfi_group/src/UnitFormAlter.php +++ b/public/modules/custom/helfi_group/src/UnitFormAlter.php @@ -111,7 +111,7 @@ protected function getEntityGroups(FormStateInterface $formState, ContentEntityI $group_ids = []; foreach ($groupContents as $groupContent) { - /** @var \Drupal\group\Entity\GroupContent $groupContent */ + /** @var \Drupal\group\Entity\GroupRelationship $groupContent */ $group_ids[] = $groupContent->getGroup()->id(); } From 6f7debdcfb3798fcd31ae74819b035984212d129 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 30 Jun 2023 07:56:57 +0300 Subject: [PATCH 12/27] UHF-8615: bug fix, array concat with null causes error --- composer.json | 3 ++- patches/group_menu_content_array_concat_error.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 patches/group_menu_content_array_concat_error.patch diff --git a/composer.json b/composer.json index 8f5d8c28..cdb227eb 100644 --- a/composer.json +++ b/composer.json @@ -95,7 +95,8 @@ "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/patches/group_menu_content_array_concat_error.patch b/patches/group_menu_content_array_concat_error.patch new file mode 100644 index 00000000..d57a399b --- /dev/null +++ b/patches/group_menu_content_array_concat_error.patch @@ -0,0 +1,13 @@ +diff --git a/src/NodeFormAlter.php b/src/NodeFormAlter.php +index e22c063..3e1ffd0 100644 +--- a/src/NodeFormAlter.php ++++ b/src/NodeFormAlter.php +@@ -216,7 +216,7 @@ class NodeFormAlter implements ContainerInjectionInterface { + $group_menu_parent_options = $this->menuParentSelector + ->getParentSelectOptions($defaults['id'], $group_menus); + +- $traditional_menu_parent_options = $form['menu']['link']['menu_parent']['#options']; ++ $traditional_menu_parent_options = $form['menu']['link']['menu_parent']['#options'] ?? []; + $form['menu']['link']['menu_parent']['#options'] = $group_menu_parent_options + $traditional_menu_parent_options; + + if (!empty($has_link_in_group_menus)) { From 9c7f9397e0d68db4ddcdf2b48bdeac5d24cabc12 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 30 Jun 2023 08:22:24 +0300 Subject: [PATCH 13/27] UHF-8615: fix group relationship from view --- conf/cmi/views.view.group_nodes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/cmi/views.view.group_nodes.yml b/conf/cmi/views.view.group_nodes.yml index 4a13d9f5..fd35cb94 100644 --- a/conf/cmi/views.view.group_nodes.yml +++ b/conf/cmi/views.view.group_nodes.yml @@ -504,14 +504,14 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group admin_label: '' entity_type: group_content entity_field: gid - plugin_id: numeric + plugin_id: group_id default_action: 'access denied' exception: value: all From 68edb80ce462efe25fec0b482e3d148a6f2472bc Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 30 Jun 2023 08:32:48 +0300 Subject: [PATCH 14/27] UHF-8615: remove 'view member' button from group members -view --- conf/cmi/views.view.group_members.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/cmi/views.view.group_members.yml b/conf/cmi/views.view.group_members.yml index 524f303c..5abc848c 100644 --- a/conf/cmi/views.view.group_members.yml +++ b/conf/cmi/views.view.group_members.yml @@ -1,3 +1,4 @@ +uuid: 96fa930c-3f22-40e3-b666-1d5890af071d langcode: en status: true dependencies: @@ -490,13 +491,13 @@ display: hide_alter_empty: true destination: true fields: - view_group_content: view_group_content edit_group_content: edit_group_content delete_group_content: delete_group_content name: '0' group_roles: '0' changed: '0' created: '0' + view_group_content: '0' pager: type: full options: From 62ee07c441f0b8189eb7b67db1d4f7a8a525f440 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 30 Jun 2023 12:22:28 +0300 Subject: [PATCH 15/27] UHF-8615: allow people to edit the menus --- conf/cmi/group.role.upper_secondary_school-admin.yml | 1 + conf/cmi/group.role.upper_secondary_school-member.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/cmi/group.role.upper_secondary_school-admin.yml b/conf/cmi/group.role.upper_secondary_school-admin.yml index 46f0146e..1964ece4 100644 --- a/conf/cmi/group.role.upper_secondary_school-admin.yml +++ b/conf/cmi/group.role.upper_secondary_school-admin.yml @@ -42,6 +42,7 @@ permissions: - 'edit group' - 'leave group' - 'manage group_content_menu' + - 'manage group_content_menu menu items' - 'update any group_node:landing_page content' - 'update any group_node:landing_page entity' - 'update any group_node:news_item content' diff --git a/conf/cmi/group.role.upper_secondary_school-member.yml b/conf/cmi/group.role.upper_secondary_school-member.yml index 46877c16..c0c4296d 100644 --- a/conf/cmi/group.role.upper_secondary_school-member.yml +++ b/conf/cmi/group.role.upper_secondary_school-member.yml @@ -36,6 +36,7 @@ permissions: - 'delete own group_tpr_unit content' - 'leave group' - 'manage group_content_menu' + - 'manage group_content_menu menu items' - 'update any group_node:landing_page content' - 'update any group_node:landing_page entity' - 'update any group_node:news_item content' From c1ae6220e8f968ee7c53c32da30f90dca0e76f83 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 30 Jun 2023 12:24:15 +0300 Subject: [PATCH 16/27] UHF-8615: prevent second editor from adding new menus --- conf/cmi/group.role.upper_secondary_school-member.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/cmi/group.role.upper_secondary_school-member.yml b/conf/cmi/group.role.upper_secondary_school-member.yml index c0c4296d..2af6f5f0 100644 --- a/conf/cmi/group.role.upper_secondary_school-member.yml +++ b/conf/cmi/group.role.upper_secondary_school-member.yml @@ -35,7 +35,6 @@ permissions: - 'delete own group_node:page entity' - 'delete own group_tpr_unit content' - 'leave group' - - 'manage group_content_menu' - 'manage group_content_menu menu items' - 'update any group_node:landing_page content' - 'update any group_node:landing_page entity' From 0b5bcfddc045e52f6f779dbe00b020205116afba Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 30 Jun 2023 12:31:33 +0300 Subject: [PATCH 17/27] UHF-8615: allow adding existing config relationship --- conf/cmi/group.role.upper_secondary_school-admin.yml | 1 + conf/cmi/group.role.upper_secondary_school-member.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/cmi/group.role.upper_secondary_school-admin.yml b/conf/cmi/group.role.upper_secondary_school-admin.yml index 1964ece4..f42132bb 100644 --- a/conf/cmi/group.role.upper_secondary_school-admin.yml +++ b/conf/cmi/group.role.upper_secondary_school-admin.yml @@ -19,6 +19,7 @@ permissions: - 'administer members' - 'create group_node:landing_page content' - 'create group_node:landing_page entity' + - 'create group_node:landing_page relationship' - 'create group_node:news_item content' - 'create group_node:news_item entity' - 'create group_node:page content' diff --git a/conf/cmi/group.role.upper_secondary_school-member.yml b/conf/cmi/group.role.upper_secondary_school-member.yml index 2af6f5f0..3479199c 100644 --- a/conf/cmi/group.role.upper_secondary_school-member.yml +++ b/conf/cmi/group.role.upper_secondary_school-member.yml @@ -17,6 +17,7 @@ permissions: - 'access group_node overview' - 'access group_tpr_unit overview' - 'create group_node:landing_page entity' + - 'create group_node:landing_page relationship' - 'create group_node:news_item entity' - 'create group_node:page entity' - 'create group_tpr_unit content' From 42e7b6303e2508a0b05a9cb9bcb7b3e6ae61f9cb Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 30 Jun 2023 12:32:45 +0300 Subject: [PATCH 18/27] UHF-8615: allow adding tpr content --- conf/cmi/group.role.upper_secondary_school-admin.yml | 3 +++ conf/cmi/group.role.upper_secondary_school-member.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/conf/cmi/group.role.upper_secondary_school-admin.yml b/conf/cmi/group.role.upper_secondary_school-admin.yml index f42132bb..95943fea 100644 --- a/conf/cmi/group.role.upper_secondary_school-admin.yml +++ b/conf/cmi/group.role.upper_secondary_school-admin.yml @@ -25,6 +25,7 @@ permissions: - 'create group_node:page content' - 'create group_node:page entity' - 'create group_tpr_unit content' + - 'create group_tpr_unit entity' - 'delete any group_node:landing_page content' - 'delete any group_node:landing_page entity' - 'delete any group_node:news_item content' @@ -32,6 +33,7 @@ permissions: - 'delete any group_node:page content' - 'delete any group_node:page entity' - 'delete any group_tpr_unit content' + - 'delete any group_tpr_unit entity' - 'delete group' - 'delete own group_node:landing_page content' - 'delete own group_node:landing_page entity' @@ -40,6 +42,7 @@ permissions: - 'delete own group_node:page content' - 'delete own group_node:page entity' - 'delete own group_tpr_unit content' + - 'delete own group_tpr_unit entity' - 'edit group' - 'leave group' - 'manage group_content_menu' diff --git a/conf/cmi/group.role.upper_secondary_school-member.yml b/conf/cmi/group.role.upper_secondary_school-member.yml index 3479199c..097d7641 100644 --- a/conf/cmi/group.role.upper_secondary_school-member.yml +++ b/conf/cmi/group.role.upper_secondary_school-member.yml @@ -21,6 +21,7 @@ permissions: - 'create group_node:news_item entity' - 'create group_node:page entity' - 'create group_tpr_unit content' + - 'create group_tpr_unit entity' - 'delete any group_node:landing_page content' - 'delete any group_node:landing_page entity' - 'delete any group_node:news_item content' @@ -28,6 +29,7 @@ permissions: - 'delete any group_node:page content' - 'delete any group_node:page entity' - 'delete any group_tpr_unit content' + - 'delete any group_tpr_unit entity' - 'delete own group_node:landing_page content' - 'delete own group_node:landing_page entity' - 'delete own group_node:news_item content' @@ -35,6 +37,7 @@ permissions: - 'delete own group_node:page content' - 'delete own group_node:page entity' - 'delete own group_tpr_unit content' + - 'delete own group_tpr_unit entity' - 'leave group' - 'manage group_content_menu menu items' - 'update any group_node:landing_page content' From e3ac9a0d0a575a49d8f211c5042b410f8990aa25 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Fri, 30 Jun 2023 13:02:24 +0300 Subject: [PATCH 19/27] UHF-8615: add permissions based on test environment --- .../group.role.upper_secondary_school-admin.yml | 15 +++++++++++++-- .../group.role.upper_secondary_school-member.yml | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/conf/cmi/group.role.upper_secondary_school-admin.yml b/conf/cmi/group.role.upper_secondary_school-admin.yml index 95943fea..86c95f8b 100644 --- a/conf/cmi/group.role.upper_secondary_school-admin.yml +++ b/conf/cmi/group.role.upper_secondary_school-admin.yml @@ -17,23 +17,27 @@ permissions: - 'access group_tpr_unit overview' - 'administer group' - 'administer members' + - 'create group_content_menu:kasko_group_menu content' - 'create group_node:landing_page content' - 'create group_node:landing_page entity' - 'create group_node:landing_page relationship' - 'create group_node:news_item content' - 'create group_node:news_item entity' + - 'create group_node:news_item relationship' - 'create group_node:page content' - 'create group_node:page entity' + - 'create group_node:page relationship' - 'create group_tpr_unit content' - 'create group_tpr_unit entity' + - 'create group_tpr_unit relationship' - 'delete any group_node:landing_page content' - 'delete any group_node:landing_page entity' - 'delete any group_node:news_item content' - 'delete any group_node:news_item entity' - 'delete any group_node:page content' - 'delete any group_node:page entity' + - 'delete any group_node:page relationship' - 'delete any group_tpr_unit content' - - 'delete any group_tpr_unit entity' - 'delete group' - 'delete own group_node:landing_page content' - 'delete own group_node:landing_page entity' @@ -41,8 +45,8 @@ permissions: - 'delete own group_node:news_item entity' - 'delete own group_node:page content' - 'delete own group_node:page entity' + - 'delete own group_node:page relationship' - 'delete own group_tpr_unit content' - - 'delete own group_tpr_unit entity' - 'edit group' - 'leave group' - 'manage group_content_menu' @@ -53,6 +57,7 @@ permissions: - 'update any group_node:news_item entity' - 'update any group_node:page content' - 'update any group_node:page entity' + - 'update any group_node:page relationship' - 'update any group_tpr_unit content' - 'update any group_tpr_unit entity' - 'update own group_membership content' @@ -62,6 +67,7 @@ permissions: - 'update own group_node:news_item entity' - 'update own group_node:page content' - 'update own group_node:page entity' + - 'update own group_node:page relationship' - 'update own group_tpr_unit content' - 'update own group_tpr_unit entity' - 'view any unpublished group' @@ -74,10 +80,15 @@ permissions: - 'view group_node:news_item entity' - 'view group_node:page content' - 'view group_node:page entity' + - 'view group_node:page relationship' - 'view group_tpr_unit content' - 'view group_tpr_unit entity' - 'view latest group version' - 'view own unpublished group' + - 'view own unpublished group_node:landing_page entity' + - 'view own unpublished group_node:news_item entity' + - 'view own unpublished group_node:page entity' + - 'view own unpublished group_tpr_unit entity' - 'view unpublished group_node:landing_page entity' - 'view unpublished group_node:news_item entity' - 'view unpublished group_node:page entity' diff --git a/conf/cmi/group.role.upper_secondary_school-member.yml b/conf/cmi/group.role.upper_secondary_school-member.yml index 097d7641..b4c47847 100644 --- a/conf/cmi/group.role.upper_secondary_school-member.yml +++ b/conf/cmi/group.role.upper_secondary_school-member.yml @@ -16,29 +16,34 @@ permissions: - 'access group content menu overview' - 'access group_node overview' - 'access group_tpr_unit overview' + - 'create group_content_menu:kasko_group_menu content' - 'create group_node:landing_page entity' - 'create group_node:landing_page relationship' - 'create group_node:news_item entity' + - 'create group_node:news_item relationship' - 'create group_node:page entity' + - 'create group_node:page relationship' - 'create group_tpr_unit content' - 'create group_tpr_unit entity' + - 'create group_tpr_unit relationship' - 'delete any group_node:landing_page content' - 'delete any group_node:landing_page entity' - 'delete any group_node:news_item content' - 'delete any group_node:news_item entity' - 'delete any group_node:page content' - 'delete any group_node:page entity' + - 'delete any group_node:page relationship' - 'delete any group_tpr_unit content' - - 'delete any group_tpr_unit entity' - 'delete own group_node:landing_page content' - 'delete own group_node:landing_page entity' - 'delete own group_node:news_item content' - 'delete own group_node:news_item entity' - 'delete own group_node:page content' - 'delete own group_node:page entity' + - 'delete own group_node:page relationship' - 'delete own group_tpr_unit content' - - 'delete own group_tpr_unit entity' - 'leave group' + - 'manage group_content_menu' - 'manage group_content_menu menu items' - 'update any group_node:landing_page content' - 'update any group_node:landing_page entity' @@ -46,6 +51,7 @@ permissions: - 'update any group_node:news_item entity' - 'update any group_node:page content' - 'update any group_node:page entity' + - 'update any group_node:page relationship' - 'update any group_tpr_unit content' - 'update any group_tpr_unit entity' - 'update own group_membership content' @@ -55,6 +61,7 @@ permissions: - 'update own group_node:news_item entity' - 'update own group_node:page content' - 'update own group_node:page entity' + - 'update own group_node:page relationship' - 'update own group_tpr_unit content' - 'update own group_tpr_unit entity' - 'view any unpublished group' @@ -67,10 +74,15 @@ permissions: - 'view group_node:news_item entity' - 'view group_node:page content' - 'view group_node:page entity' + - 'view group_node:page relationship' - 'view group_tpr_unit content' - 'view group_tpr_unit entity' - 'view latest group version' - 'view own unpublished group' + - 'view own unpublished group_node:landing_page entity' + - 'view own unpublished group_node:news_item entity' + - 'view own unpublished group_node:page entity' + - 'view own unpublished group_tpr_unit entity' - 'view unpublished group_node:landing_page entity' - 'view unpublished group_node:news_item entity' - 'view unpublished group_node:page entity' From 03820cb32aa884a0827f1d33e85efcbd8ab153c4 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 30 Jun 2023 13:29:46 +0300 Subject: [PATCH 20/27] UHF-X: Fix config_ignore settings to ignore the calculator settings correctly --- conf/cmi/config_ignore.settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/config_ignore.settings.yml b/conf/cmi/config_ignore.settings.yml index 59496a59..224cb562 100644 --- 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 From a473256a9903bebd78680d1a5086e56e829d6e77 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 30 Jun 2023 16:15:28 +0300 Subject: [PATCH 21/27] UHF-8728: Add missing class for group navigation title link on sidebar navigation --- .../helfi_group/templates/block--group-content-menu.html.twig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/modules/custom/helfi_group/templates/block--group-content-menu.html.twig b/public/modules/custom/helfi_group/templates/block--group-content-menu.html.twig index 0f813430..cb9b79c3 100644 --- a/public/modules/custom/helfi_group/templates/block--group-content-menu.html.twig +++ b/public/modules/custom/helfi_group/templates/block--group-content-menu.html.twig @@ -46,6 +46,9 @@ {% set link_attributes = { 'id': section_menu_title_link, 'aria-current': section_menu_title_current, + 'class': [ + 'sidebar-navigation__title-link', + ], } %} {{ link(link_title, link_url, link_attributes) }} From d5632ae95e2edcc3ecfd8b2ef9c1a3bae808151c Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 3 Jul 2023 09:39:31 +0300 Subject: [PATCH 22/27] UHF-8615: prevent editor from adding menus --- conf/cmi/group.role.upper_secondary_school-admin.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/cmi/group.role.upper_secondary_school-admin.yml b/conf/cmi/group.role.upper_secondary_school-admin.yml index 86c95f8b..21a1d0bd 100644 --- a/conf/cmi/group.role.upper_secondary_school-admin.yml +++ b/conf/cmi/group.role.upper_secondary_school-admin.yml @@ -49,7 +49,6 @@ permissions: - 'delete own group_tpr_unit content' - 'edit group' - 'leave group' - - 'manage group_content_menu' - 'manage group_content_menu menu items' - 'update any group_node:landing_page content' - 'update any group_node:landing_page entity' From fb5877f12ff189c6dc39abbe4f8021e399936bd6 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Tue, 4 Jul 2023 10:17:00 +0300 Subject: [PATCH 23/27] UHF-8615: add outsider roles with proper view permissions --- ...roup.role.upper_secondary_school-admin.yml | 2 +- ....role.upper_secondary_school-anonymous.yml | 23 +++++++++++++++++++ ....role.upper_secondary_school-authentic.yml | 23 +++++++++++++++++++ ...up.role.upper_secondary_school-i_admin.yml | 2 +- ...oup.role.upper_secondary_school-member.yml | 2 +- ...up.role.upper_secondary_school-o_admin.yml | 2 +- 6 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 conf/cmi/group.role.upper_secondary_school-anonymous.yml create mode 100644 conf/cmi/group.role.upper_secondary_school-authentic.yml diff --git a/conf/cmi/group.role.upper_secondary_school-admin.yml b/conf/cmi/group.role.upper_secondary_school-admin.yml index 21a1d0bd..de066020 100644 --- a/conf/cmi/group.role.upper_secondary_school-admin.yml +++ b/conf/cmi/group.role.upper_secondary_school-admin.yml @@ -6,7 +6,7 @@ dependencies: - group.type.upper_secondary_school id: upper_secondary_school-admin label: 'School admin' -weight: 6 +weight: -7 admin: false scope: individual global_role: null diff --git a/conf/cmi/group.role.upper_secondary_school-anonymous.yml b/conf/cmi/group.role.upper_secondary_school-anonymous.yml new file mode 100644 index 00000000..579e68e3 --- /dev/null +++ b/conf/cmi/group.role.upper_secondary_school-anonymous.yml @@ -0,0 +1,23 @@ +uuid: d464efcc-0e0f-42c9-9efa-609099483b3e +langcode: en +status: true +dependencies: + config: + - group.type.upper_secondary_school + - user.role.anonymous +id: upper_secondary_school-anonymous +label: Anonymous +weight: -10 +admin: false +scope: outsider +global_role: anonymous +group_type: upper_secondary_school +permissions: + - 'view group_node:landing_page content' + - 'view group_node:landing_page entity' + - 'view group_node:news_item content' + - 'view group_node:news_item entity' + - 'view group_node:page content' + - 'view group_node:page entity' + - 'view group_tpr_unit content' + - 'view group_tpr_unit entity' diff --git a/conf/cmi/group.role.upper_secondary_school-authentic.yml b/conf/cmi/group.role.upper_secondary_school-authentic.yml new file mode 100644 index 00000000..c50d1a87 --- /dev/null +++ b/conf/cmi/group.role.upper_secondary_school-authentic.yml @@ -0,0 +1,23 @@ +uuid: 6abf7e72-1fa9-4caa-92fd-8f47a91d0916 +langcode: en +status: true +dependencies: + config: + - group.type.upper_secondary_school + - user.role.authenticated +id: upper_secondary_school-authentic +label: Authenticated +weight: -9 +admin: false +scope: outsider +global_role: authenticated +group_type: upper_secondary_school +permissions: + - 'view group_node:landing_page content' + - 'view group_node:landing_page entity' + - 'view group_node:news_item content' + - 'view group_node:news_item entity' + - 'view group_node:page content' + - 'view group_node:page entity' + - 'view group_tpr_unit content' + - 'view group_tpr_unit entity' diff --git a/conf/cmi/group.role.upper_secondary_school-i_admin.yml b/conf/cmi/group.role.upper_secondary_school-i_admin.yml index 7acca5da..64b4ee34 100644 --- a/conf/cmi/group.role.upper_secondary_school-i_admin.yml +++ b/conf/cmi/group.role.upper_secondary_school-i_admin.yml @@ -7,7 +7,7 @@ dependencies: - user.role.admin id: upper_secondary_school-i_admin label: 'Insider admin' -weight: 7 +weight: -6 admin: true scope: insider global_role: admin diff --git a/conf/cmi/group.role.upper_secondary_school-member.yml b/conf/cmi/group.role.upper_secondary_school-member.yml index b4c47847..cf8c03e2 100644 --- a/conf/cmi/group.role.upper_secondary_school-member.yml +++ b/conf/cmi/group.role.upper_secondary_school-member.yml @@ -7,7 +7,7 @@ dependencies: - user.role.school_editor id: upper_secondary_school-member label: Member -weight: -100 +weight: -8 admin: false scope: insider global_role: school_editor diff --git a/conf/cmi/group.role.upper_secondary_school-o_admin.yml b/conf/cmi/group.role.upper_secondary_school-o_admin.yml index 87219264..478cc5f2 100644 --- a/conf/cmi/group.role.upper_secondary_school-o_admin.yml +++ b/conf/cmi/group.role.upper_secondary_school-o_admin.yml @@ -7,7 +7,7 @@ dependencies: - user.role.admin id: upper_secondary_school-o_admin label: 'Outsider admin' -weight: 8 +weight: -5 admin: true scope: outsider global_role: admin From e8978ad2b387fcf796ab0137b6dc28a9ac1c2145 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Wed, 5 Jul 2023 10:49:32 +0300 Subject: [PATCH 24/27] UHF-8619: updated local packages --- composer.json | 3 +- composer.lock | 902 ++++++++++++++++++++++++++------------------------ 2 files changed, 464 insertions(+), 441 deletions(-) diff --git a/composer.json b/composer.json index cdb227eb..4531021d 100644 --- a/composer.json +++ b/composer.json @@ -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": { diff --git a/composer.lock b/composer.lock index db5ae629..3aa9a6e4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dc1ad6e3d3ee73d354001baf0d82ae63", + "content-hash": "c340acefc7e83daba6d02a0a29bb5de0", "packages": [ { "name": "asm89/stack-cors", @@ -316,16 +316,16 @@ }, { "name": "composer/installers", - "version": "v2.1.1", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "af93ba6e52236418f07a278033eba6959ee5b983" + "reference": "c29dc4b93137acb82734f672c37e029dfbd95b35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/af93ba6e52236418f07a278033eba6959ee5b983", - "reference": "af93ba6e52236418f07a278033eba6959ee5b983", + "url": "https://api.github.com/repos/composer/installers/zipball/c29dc4b93137acb82734f672c37e029dfbd95b35", + "reference": "c29dc4b93137acb82734f672c37e029dfbd95b35", "shasum": "" }, "require": { @@ -413,6 +413,7 @@ "magento", "majima", "mako", + "matomo", "mediawiki", "miaoxing", "modulework", @@ -440,7 +441,7 @@ ], "support": { "issues": "https://github.com/composer/installers/issues", - "source": "https://github.com/composer/installers/tree/v2.1.1" + "source": "https://github.com/composer/installers/tree/v2.2.0" }, "funding": [ { @@ -456,7 +457,7 @@ "type": "tidelift" } ], - "time": "2022-04-13T09:13:00+00:00" + "time": "2022-08-20T06:45:11+00:00" }, { "name": "composer/semver", @@ -541,25 +542,25 @@ }, { "name": "consolidation/annotated-command", - "version": "4.8.2", + "version": "4.9.1", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "7f5dd1aafb93a10593ed70f3caa6a0cd5a32f0e3" + "reference": "e01152f698eff4cb5df3ebfe5e097ef335dbd3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/7f5dd1aafb93a10593ed70f3caa6a0cd5a32f0e3", - "reference": "7f5dd1aafb93a10593ed70f3caa6a0cd5a32f0e3", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/e01152f698eff4cb5df3ebfe5e097ef335dbd3c9", + "reference": "e01152f698eff4cb5df3ebfe5e097ef335dbd3c9", "shasum": "" }, "require": { - "consolidation/output-formatters": "^4.1.1", + "consolidation/output-formatters": "^4.3.1", "php": ">=7.1.3", - "psr/log": "^1|^2|^3", - "symfony/console": "^4.4.8|^5|^6", - "symfony/event-dispatcher": "^4.4.8|^5|^6", - "symfony/finder": "^4.4.8|^5|^6" + "psr/log": "^1 || ^2 || ^3", + "symfony/console": "^4.4.8 || ^5 || ^6", + "symfony/event-dispatcher": "^4.4.8 || ^5 || ^6", + "symfony/finder": "^4.4.8 || ^5 || ^6" }, "require-dev": { "composer-runtime-api": "^2.0", @@ -591,9 +592,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.8.2" + "source": "https://github.com/consolidation/annotated-command/tree/4.9.1" }, - "time": "2023-03-11T19:32:28+00:00" + "time": "2023-05-20T04:19:01+00:00" }, { "name": "consolidation/config", @@ -759,16 +760,16 @@ }, { "name": "consolidation/output-formatters", - "version": "4.2.4", + "version": "4.3.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "b377db7e9435c50c4e019c26ec164b547e754ca0" + "reference": "f65524e9ecd2bd0021c4b18710005caaa6dcbd86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/b377db7e9435c50c4e019c26ec164b547e754ca0", - "reference": "b377db7e9435c50c4e019c26ec164b547e754ca0", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/f65524e9ecd2bd0021c4b18710005caaa6dcbd86", + "reference": "f65524e9ecd2bd0021c4b18710005caaa6dcbd86", "shasum": "" }, "require": { @@ -807,9 +808,9 @@ "description": "Format text by applying transformations provided by plug-in formatters.", "support": { "issues": "https://github.com/consolidation/output-formatters/issues", - "source": "https://github.com/consolidation/output-formatters/tree/4.2.4" + "source": "https://github.com/consolidation/output-formatters/tree/4.3.1" }, - "time": "2023-02-24T03:39:10+00:00" + "time": "2023-05-20T03:23:06+00:00" }, { "name": "consolidation/robo", @@ -912,16 +913,16 @@ }, { "name": "consolidation/self-update", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/consolidation/self-update.git", - "reference": "714b09fdf0513f83292874bb12de0566066040c2" + "reference": "972a1016761c9b63314e040836a12795dff6953a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/self-update/zipball/714b09fdf0513f83292874bb12de0566066040c2", - "reference": "714b09fdf0513f83292874bb12de0566066040c2", + "url": "https://api.github.com/repos/consolidation/self-update/zipball/972a1016761c9b63314e040836a12795dff6953a", + "reference": "972a1016761c9b63314e040836a12795dff6953a", "shasum": "" }, "require": { @@ -961,9 +962,9 @@ "description": "Provides a self:update command for Symfony Console applications.", "support": { "issues": "https://github.com/consolidation/self-update/issues", - "source": "https://github.com/consolidation/self-update/tree/2.1.0" + "source": "https://github.com/consolidation/self-update/tree/2.2.0" }, - "time": "2023-02-21T19:33:55+00:00" + "time": "2023-03-18T01:37:41+00:00" }, { "name": "consolidation/site-alias", @@ -1085,16 +1086,16 @@ }, { "name": "cweagans/composer-patches", - "version": "1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/cweagans/composer-patches.git", - "reference": "e9969cfc0796e6dea9b4e52f77f18e1065212871" + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e9969cfc0796e6dea9b4e52f77f18e1065212871", - "reference": "e9969cfc0796e6dea9b4e52f77f18e1065212871", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", "shasum": "" }, "require": { @@ -1127,9 +1128,9 @@ "description": "Provides a way to patch Composer packages.", "support": { "issues": "https://github.com/cweagans/composer-patches/issues", - "source": "https://github.com/cweagans/composer-patches/tree/1.7.2" + "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" }, - "time": "2022-01-25T19:21:20+00:00" + "time": "2022-12-20T22:53:13+00:00" }, { "name": "dflydev/dot-access-data", @@ -1788,30 +1789,30 @@ }, { "name": "drupal/better_exposed_filters", - "version": "6.0.2", + "version": "6.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/better_exposed_filters.git", - "reference": "6.0.2" + "reference": "6.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-6.0.2.zip", - "reference": "6.0.2", - "shasum": "e06e8f88fab14942e4d3f71faaa64a30f136792c" + "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-6.0.3.zip", + "reference": "6.0.3", + "shasum": "b5c20207d7679542bb81955771956c18083e6e0b" }, "require": { "drupal/core": "^9 || ^10", - "drupal/jquery_ui": "^1.4", - "drupal/jquery_ui_datepicker": "^1.2", - "drupal/jquery_ui_slider": "^1.1", + "drupal/jquery_ui": "^1.6", + "drupal/jquery_ui_datepicker": "^2.0", + "drupal/jquery_ui_slider": "^2.0.0", "drupal/jquery_ui_touch_punch": "^1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.2", - "datestamp": "1666017720", + "version": "6.0.3", + "datestamp": "1671541877", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2274,16 +2275,16 @@ }, { "name": "drupal/core-composer-scaffold", - "version": "9.5.0", + "version": "9.5.9", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", - "reference": "df1f779d3f94500f6cc791427aa729e0ba4b2464" + "reference": "08da8e59c6f1bd0b1a58d18f8addc0d937bbacc7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/df1f779d3f94500f6cc791427aa729e0ba4b2464", - "reference": "df1f779d3f94500f6cc791427aa729e0ba4b2464", + "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/08da8e59c6f1bd0b1a58d18f8addc0d937bbacc7", + "reference": "08da8e59c6f1bd0b1a58d18f8addc0d937bbacc7", "shasum": "" }, "require": { @@ -2318,9 +2319,9 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.5.0" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.5.9" }, - "time": "2022-06-19T16:14:18+00:00" + "time": "2023-04-30T16:17:33+00:00" }, { "name": "drupal/crop", @@ -3419,21 +3420,21 @@ }, { "name": "drupal/file_mdm", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/file_mdm.git", - "reference": "8.x-2.5" + "reference": "8.x-2.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/file_mdm-8.x-2.5.zip", - "reference": "8.x-2.5", - "shasum": "391d9902733704274594873aa9b1f6b6ba3bd319" + "url": "https://ftp.drupal.org/files/projects/file_mdm-8.x-2.6.zip", + "reference": "8.x-2.6", + "shasum": "56c7c06107ce6e249b6d644136e6807573efb0e3" }, "require": { "drupal/core": "^9.3 | ^10", - "lsolesen/pel": "^0.9.12", + "fileeye/pel": "^0.9.20", "phenx/php-font-lib": "^0.5.4" }, "require-dev": { @@ -3443,8 +3444,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.5", - "datestamp": "1663668519", + "version": "8.x-2.6", + "datestamp": "1688489716", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3816,26 +3817,26 @@ }, { "name": "drupal/gin_toolbar", - "version": "1.0.0-rc1", + "version": "1.0.0-rc3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin_toolbar.git", - "reference": "8.x-1.0-rc1" + "reference": "8.x-1.0-rc3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc1.zip", - "reference": "8.x-1.0-rc1", - "shasum": "90516f6aa22f4f60f1853bdceb757940f411ec7e" + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc3.zip", + "reference": "8.x-1.0-rc3", + "shasum": "f9ae6c1c086f008a2911eb2ced4740ac5c307faf" }, "require": { - "drupal/core": "^8 || ^9 || ^10" + "drupal/core": "^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc1", - "datestamp": "1669666957", + "version": "8.x-1.0-rc3", + "datestamp": "1688477564", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3985,16 +3986,16 @@ }, { "name": "drupal/hdbt", - "version": "5.4.6", + "version": "5.4.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "373c53356d00862256d9c2044a98d0d6396906f1" + "reference": "23f279fa95516444766b092a9ffbc910230395fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/373c53356d00862256d9c2044a98d0d6396906f1", - "reference": "373c53356d00862256d9c2044a98d0d6396906f1", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/23f279fa95516444766b092a9ffbc910230395fe", + "reference": "23f279fa95516444766b092a9ffbc910230395fe", "shasum": "" }, "require": { @@ -4012,10 +4013,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.4.6", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.4.8", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-06-22T09:31:02+00:00" + "time": "2023-06-30T06:23:42+00:00" }, { "name": "drupal/hdbt_admin", @@ -4146,16 +4147,16 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "1b3db68432b02413162ed05203a5a2ad2a146687" + "reference": "e4b7ddf6834254779cc9ade97177d0524bf4016d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/1b3db68432b02413162ed05203a5a2ad2a146687", - "reference": "1b3db68432b02413162ed05203a5a2ad2a146687", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/e4b7ddf6834254779cc9ade97177d0524bf4016d", + "reference": "e4b7ddf6834254779cc9ade97177d0524bf4016d", "shasum": "" }, "require": { @@ -4166,15 +4167,22 @@ "drupal/coder": "^8.3" }, "type": "drupal-module", + "extra": { + "patches": { + "drupal/flysystem_azure": { + "D10 patch": "https://www.drupal.org/files/issues/2022-06-15/flysystem_azure.1.0.x-dev.rector.patch" + } + } + }, "license": [ "GPL-2.0-or-later" ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.2.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.2.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2023-06-21T11:44:01+00:00" + "time": "2023-06-30T07:10:46+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4238,16 +4246,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.1.4", + "version": "3.1.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "6152bdee5c8712f6f4d81611dceb84a40de099cc" + "reference": "9851169899630c1b9f62a065a7829e6dbca7cc6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6152bdee5c8712f6f4d81611dceb84a40de099cc", - "reference": "6152bdee5c8712f6f4d81611dceb84a40de099cc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9851169899630c1b9f62a065a7829e6dbca7cc6c", + "reference": "9851169899630c1b9f62a065a7829e6dbca7cc6c", "shasum": "" }, "require": { @@ -4350,10 +4358,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.1.4", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.1.8", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-06-26T08:24:01+00:00" + "time": "2023-07-04T06:10:59+00:00" }, { "name": "drupal/helfi_proxy", @@ -4769,27 +4777,27 @@ }, { "name": "drupal/jquery_ui_datepicker", - "version": "1.2.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/jquery_ui_datepicker.git", - "reference": "8.x-1.2" + "reference": "2.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui_datepicker-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "19ffa245970ee4e9d908fa0c5d0761f567e487bb" + "url": "https://ftp.drupal.org/files/projects/jquery_ui_datepicker-2.0.0.zip", + "reference": "2.0.0", + "shasum": "ce40cf8ab400866bffda1ac3f7e4a5ac20bb3ae5" }, "require": { - "drupal/core": "^8 || ^9", - "drupal/jquery_ui": "*" + "drupal/core": "^9.2 || ^10", + "drupal/jquery_ui": "^1.6" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.2", - "datestamp": "1642614454", + "version": "2.0.0", + "datestamp": "1670871494", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4802,9 +4810,8 @@ ], "authors": [ { - "name": "Andrei Ivnitskii", - "homepage": "https://www.drupal.org/u/ivnish", - "role": "Maintainer" + "name": "bnjmnm", + "homepage": "https://www.drupal.org/user/2369194" }, { "name": "ivnish", @@ -4818,6 +4825,14 @@ "name": "lauriii", "homepage": "https://www.drupal.org/user/1078742" }, + { + "name": "nod_", + "homepage": "https://www.drupal.org/user/598310" + }, + { + "name": "phenaproxima", + "homepage": "https://www.drupal.org/user/205645" + }, { "name": "zrpnr", "homepage": "https://www.drupal.org/user/1448368" @@ -4826,8 +4841,7 @@ "description": "Provides jQuery UI Datepicker library.", "homepage": "https://www.drupal.org/project/jquery_ui_datepicker", "support": { - "source": "https://git.drupalcode.org/project/jquery_ui_datepicker", - "issues": "https://www.drupal.org/project/issues/jquery_ui_datepicker" + "source": "https://git.drupalcode.org/project/jquery_ui_datepicker" } }, { @@ -4885,27 +4899,27 @@ }, { "name": "drupal/jquery_ui_slider", - "version": "1.1.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/jquery_ui_slider.git", - "reference": "8.x-1.1" + "reference": "2.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui_slider-8.x-1.1.zip", - "reference": "8.x-1.1", - "shasum": "79b90cf60d45fc33ffdaa84bb2d6563f78a7d3d1" + "url": "https://ftp.drupal.org/files/projects/jquery_ui_slider-2.0.0.zip", + "reference": "2.0.0", + "shasum": "86b7d71e91013cffafb8021dbf8047745ebc5fd6" }, "require": { - "drupal/core": "^8 || ^9", - "drupal/jquery_ui": "*" + "drupal/core": "^9.2 || ^10", + "drupal/jquery_ui": "^1.6" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.1", - "datestamp": "1584107817", + "version": "2.0.0", + "datestamp": "1670871571", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4994,17 +5008,17 @@ }, { "name": "drupal/linkit", - "version": "6.0.0-rc1", + "version": "6.0.0-rc2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.0.0-rc1" + "reference": "6.0.0-rc2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-rc1.zip", - "reference": "6.0.0-rc1", - "shasum": "126069976e2a7d34cc8530c0950c75bd7f1b5d3c" + "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-rc2.zip", + "reference": "6.0.0-rc2", + "shasum": "69274e63d5312594cb3444656c6a0ec3800d0df4" }, "require": { "drupal/core": "^9.4 || ^10.0.0" @@ -5019,8 +5033,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.0-rc1", - "datestamp": "1681070405", + "version": "6.0.0-rc2", + "datestamp": "1688055675", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -5777,31 +5791,32 @@ }, { "name": "drupal/raven", - "version": "4.0.9", + "version": "4.0.16", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "4.0.9" + "reference": "4.0.16" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-4.0.9.zip", - "reference": "4.0.9", - "shasum": "61b48ef830678578c9056f869c1389d5363f7478" + "url": "https://ftp.drupal.org/files/projects/raven-4.0.16.zip", + "reference": "4.0.16", + "shasum": "57cd3d40b7a27736cc3c4ea397d9c4084818f67e" }, "require": { "drupal/core": "^8 || ^9 || ^10", "sentry/sdk": "^3.3" }, "require-dev": { - "drupal/csp": "*", + "drupal/csp": "^1.17", + "drupal/seckit": "^2.0", "drush/drush": "^10.6 || ^11.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.9", - "datestamp": "1669251296", + "version": "4.0.16", + "datestamp": "1684212254", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6309,17 +6324,17 @@ }, { "name": "drupal/siteimprove", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/siteimprove.git", - "reference": "2.0.0" + "reference": "2.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/siteimprove-2.0.0.zip", - "reference": "2.0.0", - "shasum": "b79c37852d835d97c502615aded96a9855e9f493" + "url": "https://ftp.drupal.org/files/projects/siteimprove-2.0.1.zip", + "reference": "2.0.1", + "shasum": "77be7be61880416e9364c414122465254020fb80" }, "require": { "drupal/core": "^9.2 || ^10" @@ -6330,8 +6345,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1671009593", + "version": "2.0.1", + "datestamp": "1687955571", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6490,17 +6505,17 @@ }, { "name": "drupal/stage_file_proxy", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/stage_file_proxy.git", - "reference": "2.0.2" + "reference": "2.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.0.2.zip", - "reference": "2.0.2", - "shasum": "187019fdbb7b805a66068c6ca93d211f439d288b" + "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.0.3.zip", + "reference": "2.0.3", + "shasum": "74833f98bee96a108516bbd1cad3b728b735918c" }, "require": { "drupal/core": "^9 || ^10" @@ -6511,8 +6526,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1670369228", + "version": "2.0.3", + "datestamp": "1688053826", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6574,17 +6589,17 @@ }, { "name": "drupal/token", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/token.git", - "reference": "8.x-1.11" + "reference": "8.x-1.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/token-8.x-1.11.zip", - "reference": "8.x-1.11", - "shasum": "da264b36d1f88eb0c74bf84e18e8789854f98400" + "url": "https://ftp.drupal.org/files/projects/token-8.x-1.12.zip", + "reference": "8.x-1.12", + "shasum": "cefe1b203b793682f74ea43e18d0a814cf768763" }, "require": { "drupal/core": "^9.2 || ^10" @@ -6592,8 +6607,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.11", - "datestamp": "1659471813", + "version": "8.x-1.12", + "datestamp": "1688015262", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6752,26 +6767,26 @@ }, { "name": "drupal/variationcache", - "version": "1.0.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/variationcache.git", - "reference": "8.x-1.0" + "reference": "8.x-1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/variationcache-8.x-1.0.zip", - "reference": "8.x-1.0", - "shasum": "302bcd0bc4d7c12a9d18ad4f531d1c65fdac65b1" + "url": "https://ftp.drupal.org/files/projects/variationcache-8.x-1.3.zip", + "reference": "8.x-1.3", + "shasum": "92d1e4f6c2661498bff777f22246bf27d6a03a71" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9.5 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0", - "datestamp": "1588927568", + "version": "8.x-1.3", + "datestamp": "1679575893", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7105,22 +7120,22 @@ }, { "name": "drush/drush", - "version": "11.5.1", + "version": "11.6.0", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "3138f82baa3b0e29ac935893a444881a7332177d" + "reference": "f301df5dec8d2aacb03d3e01e0ffc6d98e10ae78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/3138f82baa3b0e29ac935893a444881a7332177d", - "reference": "3138f82baa3b0e29ac935893a444881a7332177d", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/f301df5dec8d2aacb03d3e01e0ffc6d98e10ae78", + "reference": "f301df5dec8d2aacb03d3e01e0ffc6d98e10ae78", "shasum": "" }, "require": { "chi-teck/drupal-code-generator": "^2.4", "composer/semver": "^1.4 || ^3", - "consolidation/annotated-command": "^4.7.0", + "consolidation/annotated-command": "^4.8.2", "consolidation/config": "^2", "consolidation/filter-via-dot-access-data": "^2", "consolidation/robo": "^3.0.9 || ^4.0.1", @@ -7238,7 +7253,7 @@ "forum": "http://drupal.stackexchange.com/questions/tagged/drush", "issues": "https://github.com/drush-ops/drush/issues", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/11.5.1" + "source": "https://github.com/drush-ops/drush/tree/11.6.0" }, "funding": [ { @@ -7246,7 +7261,7 @@ "type": "github" } ], - "time": "2023-02-21T02:32:48+00:00" + "time": "2023-06-06T18:46:18+00:00" }, { "name": "egulias/email-validator", @@ -7677,6 +7692,67 @@ }, "time": "2023-02-11T19:58:58+00:00" }, + { + "name": "fileeye/pel", + "version": "0.9.20", + "source": { + "type": "git", + "url": "https://github.com/FileEye/pel.git", + "reference": "1675cbd44e89ff8f01b9576cf32ec1b4a4a67ede" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FileEye/pel/zipball/1675cbd44e89ff8f01b9576cf32ec1b4a4a67ede", + "reference": "1675cbd44e89ff8f01b9576cf32ec1b4a4a67ede", + "shasum": "" + }, + "require": { + "php": ">=7.1.0" + }, + "require-dev": { + "ext-exif": "*", + "ext-gd": "*", + "php-coveralls/php-coveralls": ">2.4", + "phpstan/phpstan": "^1.4", + "squizlabs/php_codesniffer": ">3.5", + "symfony/phpunit-bridge": "^4 || ^5 || ^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "lsolesen\\pel\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0" + ], + "authors": [ + { + "name": "Lars Olesen", + "email": "lars@intraface.dk", + "homepage": "http://intraface.dk", + "role": "Developer" + }, + { + "name": "Martin Geisler", + "email": "martin@geisler.net", + "homepage": "http://geisler.net", + "role": "Developer" + } + ], + "description": "PHP Exif Library. A library for reading and writing Exif headers in JPEG and TIFF images using PHP.", + "homepage": "https://github.com/FileEye/pel", + "keywords": [ + "exif", + "image" + ], + "support": { + "issues": "https://github.com/FileEye/pel/issues", + "source": "https://github.com/FileEye/pel/tree/0.9.20" + }, + "time": "2023-06-20T07:10:35+00:00" + }, { "name": "firebase/php-jwt", "version": "v6.8.0", @@ -7970,29 +8046,33 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.3", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" + "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", - "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6", + "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6", "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.1", + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } @@ -8029,7 +8109,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.3" + "source": "https://github.com/guzzle/promises/tree/2.0.0" }, "funding": [ { @@ -8045,7 +8125,7 @@ "type": "tidelift" } ], - "time": "2023-05-21T12:31:43+00:00" + "time": "2023-05-21T13:50:22+00:00" }, { "name": "guzzlehttp/psr7", @@ -9155,67 +9235,6 @@ }, "time": "2023-04-26T21:27:14+00:00" }, - { - "name": "lsolesen/pel", - "version": "0.9.12", - "source": { - "type": "git", - "url": "https://github.com/pel/pel.git", - "reference": "b95fe29cdacf9d36330da277f10910a13648c84c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pel/pel/zipball/b95fe29cdacf9d36330da277f10910a13648c84c", - "reference": "b95fe29cdacf9d36330da277f10910a13648c84c", - "shasum": "" - }, - "require": { - "php": ">=7.1.0" - }, - "require-dev": { - "ext-exif": "*", - "ext-gd": "*", - "php-coveralls/php-coveralls": ">2.4", - "squizlabs/php_codesniffer": ">3.5", - "symfony/phpunit-bridge": "^4 || ^5" - }, - "type": "library", - "autoload": { - "psr-4": { - "lsolesen\\pel\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0" - ], - "authors": [ - { - "name": "Lars Olesen", - "email": "lars@intraface.dk", - "homepage": "http://intraface.dk", - "role": "Developer" - }, - { - "name": "Martin Geisler", - "email": "martin@geisler.net", - "homepage": "http://geisler.net", - "role": "Developer" - } - ], - "description": "PHP Exif Library. A library for reading and writing Exif headers in JPEG and TIFF images using PHP.", - "homepage": "http://pel.github.com/pel/", - "keywords": [ - "exif", - "image" - ], - "support": { - "issues": "https://github.com/pel/pel/issues", - "source": "https://github.com/pel/pel/tree/0.9.12" - }, - "abandoned": true, - "time": "2022-02-18T13:20:54+00:00" - }, { "name": "makinacorpus/php-lucene", "version": "1.2.1", @@ -9475,16 +9494,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.5", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" + "reference": "19526a33fb561ef417e822e85f08a00db4059c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", - "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", + "reference": "19526a33fb561ef417e822e85f08a00db4059c17", "shasum": "" }, "require": { @@ -9525,9 +9544,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" }, - "time": "2023-05-19T20:20:00+00:00" + "time": "2023-06-25T14:52:30+00:00" }, { "name": "nodespark/des-connector", @@ -9930,26 +9949,25 @@ }, { "name": "php-http/client-common", - "version": "2.6.0", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/php-http/client-common.git", - "reference": "45db684cd4e186dcdc2b9c06b22970fe123796c0" + "reference": "880509727a447474d2a71b7d7fa5d268ddd3db4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/client-common/zipball/45db684cd4e186dcdc2b9c06b22970fe123796c0", - "reference": "45db684cd4e186dcdc2b9c06b22970fe123796c0", + "url": "https://api.github.com/repos/php-http/client-common/zipball/880509727a447474d2a71b7d7fa5d268ddd3db4b", + "reference": "880509727a447474d2a71b7d7fa5d268ddd3db4b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0", "php-http/httplug": "^2.0", "php-http/message": "^1.6", - "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0 || ^2.0", "symfony/options-resolver": "~4.0.15 || ~4.1.9 || ^4.2.1 || ^5.0 || ^6.0", "symfony/polyfill-php80": "^1.17" }, @@ -9959,7 +9977,7 @@ "nyholm/psr7": "^1.2", "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", "phpspec/prophecy": "^1.10.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.3" + "phpunit/phpunit": "^7.5.20 || ^8.5.33 || ^9.6.7" }, "suggest": { "ext-json": "To detect JSON responses with the ContentTypePlugin", @@ -9969,11 +9987,6 @@ "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, "autoload": { "psr-4": { "Http\\Client\\Common\\": "src/" @@ -9999,49 +10012,59 @@ ], "support": { "issues": "https://github.com/php-http/client-common/issues", - "source": "https://github.com/php-http/client-common/tree/2.6.0" + "source": "https://github.com/php-http/client-common/tree/2.7.0" }, - "time": "2022-09-29T09:59:43+00:00" + "time": "2023-05-17T06:46:59+00:00" }, { "name": "php-http/discovery", - "version": "1.14.3", + "version": "1.19.0", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "31d8ee46d0215108df16a8527c7438e96a4d7735" + "reference": "1856a119a0b0ba8da8b5c33c080aa7af8fac25b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/31d8ee46d0215108df16a8527c7438e96a4d7735", - "reference": "31d8ee46d0215108df16a8527c7438e96a4d7735", + "url": "https://api.github.com/repos/php-http/discovery/zipball/1856a119a0b0ba8da8b5c33c080aa7af8fac25b4", + "reference": "1856a119a0b0ba8da8b5c33c080aa7af8fac25b4", "shasum": "" }, "require": { + "composer-plugin-api": "^1.0|^2.0", "php": "^7.1 || ^8.0" }, "conflict": { - "nyholm/psr7": "<1.0" + "nyholm/psr7": "<1.0", + "zendframework/zend-diactoros": "*" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "*", + "psr/http-factory-implementation": "*", + "psr/http-message-implementation": "*" }, "require-dev": { + "composer/composer": "^1.0.2|^2.0", "graham-campbell/phpspec-skip-example-extension": "^5.0", "php-http/httplug": "^1.0 || ^2.0", "php-http/message-factory": "^1.0", - "phpspec/phpspec": "^5.1 || ^6.1" + "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", + "symfony/phpunit-bridge": "^6.2" }, - "suggest": { - "php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories" - }, - "type": "library", + "type": "composer-plugin", "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } + "class": "Http\\Discovery\\Composer\\Plugin", + "plugin-optional": true }, "autoload": { "psr-4": { "Http\\Discovery\\": "src/" - } + }, + "exclude-from-classmap": [ + "src/Composer/Plugin.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -10053,7 +10076,7 @@ "email": "mark.sagikazar@gmail.com" } ], - "description": "Finds installed HTTPlug implementations and PSR-7 message factories", + "description": "Finds and installs PSR-7, PSR-17, PSR-18 and HTTPlug implementations", "homepage": "http://php-http.org", "keywords": [ "adapter", @@ -10062,44 +10085,40 @@ "factory", "http", "message", + "psr17", "psr7" ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.14.3" + "source": "https://github.com/php-http/discovery/tree/1.19.0" }, - "time": "2022-07-11T14:04:40+00:00" + "time": "2023-06-19T08:45:36+00:00" }, { "name": "php-http/httplug", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "f640739f80dfa1152533976e3c112477f69274eb" + "reference": "625ad742c360c8ac580fcc647a1541d29e257f67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/f640739f80dfa1152533976e3c112477f69274eb", - "reference": "f640739f80dfa1152533976e3c112477f69274eb", + "url": "https://api.github.com/repos/php-http/httplug/zipball/625ad742c360c8ac580fcc647a1541d29e257f67", + "reference": "625ad742c360c8ac580fcc647a1541d29e257f67", "shasum": "" }, "require": { "php": "^7.1 || ^8.0", "php-http/promise": "^1.1", "psr/http-client": "^1.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.1", - "phpspec/phpspec": "^5.1 || ^6.0" + "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", + "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, "autoload": { "psr-4": { "Http\\Client\\": "src/" @@ -10128,29 +10147,28 @@ ], "support": { "issues": "https://github.com/php-http/httplug/issues", - "source": "https://github.com/php-http/httplug/tree/2.3.0" + "source": "https://github.com/php-http/httplug/tree/2.4.0" }, - "time": "2022-02-21T09:52:22+00:00" + "time": "2023-04-14T15:10:03+00:00" }, { "name": "php-http/message", - "version": "1.13.0", + "version": "1.16.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361" + "reference": "47a14338bf4ebd67d317bf1144253d7db4ab55fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/7886e647a30a966a1a8d1dad1845b71ca8678361", - "reference": "7886e647a30a966a1a8d1dad1845b71ca8678361", + "url": "https://api.github.com/repos/php-http/message/zipball/47a14338bf4ebd67d317bf1144253d7db4ab55fd", + "reference": "47a14338bf4ebd67d317bf1144253d7db4ab55fd", "shasum": "" }, "require": { "clue/stream-filter": "^1.5", - "php": "^7.1 || ^8.0", - "php-http/message-factory": "^1.0.2", - "psr/http-message": "^1.0" + "php": "^7.2 || ^8.0", + "psr/http-message": "^1.1 || ^2.0" }, "provide": { "php-http/message-factory-implementation": "1.0" @@ -10158,8 +10176,9 @@ "require-dev": { "ergebnis/composer-normalize": "^2.6", "ext-zlib": "*", - "guzzlehttp/psr7": "^1.0", - "laminas/laminas-diactoros": "^2.0", + "guzzlehttp/psr7": "^1.0 || ^2.0", + "laminas/laminas-diactoros": "^2.0 || ^3.0", + "php-http/message-factory": "^1.0.2", "phpspec/phpspec": "^5.1 || ^6.3 || ^7.1", "slim/slim": "^3.0" }, @@ -10170,11 +10189,6 @@ "slim/slim": "Used with Slim Framework PSR-7 implementation" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, "autoload": { "files": [ "src/filters.php" @@ -10202,32 +10216,32 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.13.0" + "source": "https://github.com/php-http/message/tree/1.16.0" }, - "time": "2022-02-11T13:41:14+00:00" + "time": "2023-05-17T06:43:38+00:00" }, { "name": "php-http/message-factory", - "version": "v1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-http/message-factory.git", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1" + "reference": "4d8778e1c7d405cbb471574821c1ff5b68cc8f57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1", + "url": "https://api.github.com/repos/php-http/message-factory/zipball/4d8778e1c7d405cbb471574821c1ff5b68cc8f57", + "reference": "4d8778e1c7d405cbb471574821c1ff5b68cc8f57", "shasum": "" }, "require": { "php": ">=5.4", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -10256,9 +10270,10 @@ ], "support": { "issues": "https://github.com/php-http/message-factory/issues", - "source": "https://github.com/php-http/message-factory/tree/master" + "source": "https://github.com/php-http/message-factory/tree/1.1.0" }, - "time": "2015-12-19T14:08:53+00:00" + "abandoned": "psr/http-factory", + "time": "2023-04-14T14:16:17+00:00" }, { "name": "php-http/promise", @@ -10770,16 +10785,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.13", + "version": "v0.11.18", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "722317c9f5627e588788e340f29b923e58f92f54" + "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/722317c9f5627e588788e340f29b923e58f92f54", - "reference": "722317c9f5627e588788e340f29b923e58f92f54", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", + "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", "shasum": "" }, "require": { @@ -10840,9 +10855,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.13" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.18" }, - "time": "2023-03-21T14:22:44+00:00" + "time": "2023-05-23T02:31:11+00:00" }, { "name": "ralouphie/getallheaders", @@ -11031,21 +11046,21 @@ }, { "name": "sentry/sdk", - "version": "3.3.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php-sdk.git", - "reference": "d0678fc7274dbb03046ed05cb24eb92945bedf8e" + "reference": "cd91b752f07c4bab9fb3b173f81af68a78a78d6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php-sdk/zipball/d0678fc7274dbb03046ed05cb24eb92945bedf8e", - "reference": "d0678fc7274dbb03046ed05cb24eb92945bedf8e", + "url": "https://api.github.com/repos/getsentry/sentry-php-sdk/zipball/cd91b752f07c4bab9fb3b173f81af68a78a78d6d", + "reference": "cd91b752f07c4bab9fb3b173f81af68a78a78d6d", "shasum": "" }, "require": { "http-interop/http-factory-guzzle": "^1.0", - "sentry/sentry": "^3.9", + "sentry/sentry": "^3.19", "symfony/http-client": "^4.3|^5.0|^6.0" }, "type": "metapackage", @@ -11072,7 +11087,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php-sdk/issues", - "source": "https://github.com/getsentry/sentry-php-sdk/tree/3.3.0" + "source": "https://github.com/getsentry/sentry-php-sdk/tree/3.5.0" }, "funding": [ { @@ -11084,36 +11099,36 @@ "type": "custom" } ], - "time": "2022-10-11T09:05:00+00:00" + "time": "2023-06-12T17:50:36+00:00" }, { "name": "sentry/sentry", - "version": "3.12.0", + "version": "3.20.1", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "4902f43640963ed45517fd7c1da7fdd5511bb304" + "reference": "644ad9768c18139a80ac510090fad000d9ffd8a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/4902f43640963ed45517fd7c1da7fdd5511bb304", - "reference": "4902f43640963ed45517fd7c1da7fdd5511bb304", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/644ad9768c18139a80ac510090fad000d9ffd8a4", + "reference": "644ad9768c18139a80ac510090fad000d9ffd8a4", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "guzzlehttp/promises": "^1.4", - "guzzlehttp/psr7": "^1.8.4|^2.1.1", + "guzzlehttp/promises": "^1.5.3|^2.0", "jean85/pretty-package-versions": "^1.5|^2.0.4", "php": "^7.2|^8.0", "php-http/async-client-implementation": "^1.0", "php-http/client-common": "^1.5|^2.0", - "php-http/discovery": "^1.11", + "php-http/discovery": "^1.15", "php-http/httplug": "^1.1|^2.0", "php-http/message": "^1.5", + "php-http/message-factory": "^1.1", "psr/http-factory": "^1.0", - "psr/http-message-implementation": "^1.0", + "psr/http-factory-implementation": "^1.0", "psr/log": "^1.0|^2.0|^3.0", "symfony/options-resolver": "^3.4.43|^4.4.30|^5.0.11|^6.0", "symfony/polyfill-php80": "^1.17" @@ -11124,6 +11139,7 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.19|3.4.*", + "guzzlehttp/psr7": "^1.8.4|^2.1.1", "http-interop/http-factory-guzzle": "^1.0", "monolog/monolog": "^1.6|^2.0|^3.0", "nikic/php-parser": "^4.10.3", @@ -11142,7 +11158,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.12.x-dev" + "dev-master": "3.13.x-dev" } }, "autoload": { @@ -11155,7 +11171,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { @@ -11176,7 +11192,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/3.12.0" + "source": "https://github.com/getsentry/sentry-php/tree/3.20.1" }, "funding": [ { @@ -11188,7 +11204,7 @@ "type": "custom" } ], - "time": "2022-11-22T10:57:08+00:00" + "time": "2023-06-26T11:01:40+00:00" }, { "name": "stack/builder", @@ -11977,16 +11993,16 @@ }, { "name": "symfony/http-client", - "version": "v5.4.20", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "b4d936b657c7952a41e89efd0ddcea51f8c90f34" + "reference": "ccbb572627466f03a3d7aa1b23483787f5969afc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/b4d936b657c7952a41e89efd0ddcea51f8c90f34", - "reference": "b4d936b657c7952a41e89efd0ddcea51f8c90f34", + "url": "https://api.github.com/repos/symfony/http-client/zipball/ccbb572627466f03a3d7aa1b23483787f5969afc", + "reference": "ccbb572627466f03a3d7aa1b23483787f5969afc", "shasum": "" }, "require": { @@ -12012,6 +12028,7 @@ "guzzlehttp/promises": "^1.4", "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", + "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", "symfony/http-kernel": "^4.4.13|^5.1.5|^6.0", @@ -12043,8 +12060,11 @@ ], "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "homepage": "https://symfony.com", + "keywords": [ + "http" + ], "support": { - "source": "https://github.com/symfony/http-client/tree/v5.4.20" + "source": "https://github.com/symfony/http-client/tree/v5.4.25" }, "funding": [ { @@ -12060,7 +12080,7 @@ "type": "tidelift" } ], - "time": "2023-01-25T18:32:18+00:00" + "time": "2023-06-21T14:44:30+00:00" }, { "name": "symfony/http-client-contracts", @@ -12397,21 +12417,21 @@ }, { "name": "symfony/options-resolver", - "version": "v6.0.3", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "51f7006670febe4cbcbae177cbffe93ff833250d" + "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/51f7006670febe4cbcbae177cbffe93ff833250d", - "reference": "51f7006670febe4cbcbae177cbffe93ff833250d", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a10f19f5198d589d5c33333cffe98dc9820332dd", + "reference": "a10f19f5198d589d5c33333cffe98dc9820332dd", "shasum": "" }, "require": { - "php": ">=8.0.2", - "symfony/deprecation-contracts": "^2.1|^3" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" }, "type": "library", "autoload": { @@ -12444,7 +12464,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v6.0.3" + "source": "https://github.com/symfony/options-resolver/tree/v6.3.0" }, "funding": [ { @@ -12460,7 +12480,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2023-05-12T14:21:09+00:00" }, { "name": "symfony/polyfill-ctype", @@ -14744,16 +14764,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.3.1", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b" + "reference": "90d087e988ff194065333d16bc5cf649872d9cdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b", - "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/90d087e988ff194065333d16bc5cf649872d9cdb", + "reference": "90d087e988ff194065333d16bc5cf649872d9cdb", "shasum": "" }, "require": { @@ -14800,7 +14820,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.3.1" + "source": "https://github.com/composer/ca-bundle/tree/1.3.6" }, "funding": [ { @@ -14816,20 +14836,20 @@ "type": "tidelift" } ], - "time": "2021-10-28T20:44:15+00:00" + "time": "2023-06-06T12:02:59+00:00" }, { "name": "composer/composer", - "version": "2.2.11", + "version": "2.2.21", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "2f5bcf0480c13b4fa1ac490aa9344e4402507538" + "reference": "978198befc71de0b18fc1fc5a472c03b184b504a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/2f5bcf0480c13b4fa1ac490aa9344e4402507538", - "reference": "2f5bcf0480c13b4fa1ac490aa9344e4402507538", + "url": "https://api.github.com/repos/composer/composer/zipball/978198befc71de0b18fc1fc5a472c03b184b504a", + "reference": "978198befc71de0b18fc1fc5a472c03b184b504a", "shasum": "" }, "require": { @@ -14899,7 +14919,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", - "source": "https://github.com/composer/composer/tree/2.2.11" + "source": "https://github.com/composer/composer/tree/2.2.21" }, "funding": [ { @@ -14915,7 +14935,7 @@ "type": "tidelift" } ], - "time": "2022-04-01T20:00:52+00:00" + "time": "2023-02-15T12:07:40+00:00" }, { "name": "composer/metadata-minifier", @@ -15059,16 +15079,16 @@ }, { "name": "composer/spdx-licenses", - "version": "1.5.6", + "version": "1.5.7", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "a30d487169d799745ca7280bc90fdfa693536901" + "reference": "c848241796da2abf65837d51dce1fae55a960149" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a30d487169d799745ca7280bc90fdfa693536901", - "reference": "a30d487169d799745ca7280bc90fdfa693536901", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/c848241796da2abf65837d51dce1fae55a960149", + "reference": "c848241796da2abf65837d51dce1fae55a960149", "shasum": "" }, "require": { @@ -15119,7 +15139,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/spdx-licenses/issues", - "source": "https://github.com/composer/spdx-licenses/tree/1.5.6" + "source": "https://github.com/composer/spdx-licenses/tree/1.5.7" }, "funding": [ { @@ -15135,7 +15155,7 @@ "type": "tidelift" } ], - "time": "2021-11-18T10:14:14+00:00" + "time": "2022-05-23T07:37:50+00:00" }, { "name": "composer/xdebug-handler", @@ -15401,28 +15421,28 @@ }, { "name": "drupal/core-dev", - "version": "9.3.22", + "version": "9.5.9", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", - "reference": "d093ec9dd1106069fd01535235dd5797662a61cb" + "reference": "60196e12909624e168c482660c0f5795df67a6d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-dev/zipball/d093ec9dd1106069fd01535235dd5797662a61cb", - "reference": "d093ec9dd1106069fd01535235dd5797662a61cb", + "url": "https://api.github.com/repos/drupal/core-dev/zipball/60196e12909624e168c482660c0f5795df67a6d7", + "reference": "60196e12909624e168c482660c0f5795df67a6d7", "shasum": "" }, "require": { "behat/mink": "^1.8", "behat/mink-selenium2-driver": "^1.4", - "composer/composer": "^2.0.2", + "composer/composer": "^2.2.12", "drupal/coder": "^8.3.10", "easyrdf/easyrdf": "^0.9 || ^1.0", "friends-of-behat/mink-browserkit-driver": "^1.4", "instaclick/php-webdriver": "^1.4.1", "justinrainbow/json-schema": "^5.2", - "mikey179/vfsstream": "^1.6.8", + "mikey179/vfsstream": "^1.6.11", "phpspec/prophecy": "^1.12", "phpunit/phpunit": "^8.5.14 || ^9", "symfony/browser-kit": "^4.4", @@ -15445,9 +15465,9 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/9.3.22" + "source": "https://github.com/drupal/core-dev/tree/9.5.9" }, - "time": "2021-11-30T05:41:29+00:00" + "time": "2022-07-27T00:23:55+00:00" }, { "name": "easyrdf/easyrdf", @@ -15588,16 +15608,16 @@ }, { "name": "instaclick/php-webdriver", - "version": "1.4.11", + "version": "1.4.16", "source": { "type": "git", "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "608e8b20a9072f84cac4f2fddb4420893d69eb83" + "reference": "a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/608e8b20a9072f84cac4f2fddb4420893d69eb83", - "reference": "608e8b20a9072f84cac4f2fddb4420893d69eb83", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606", + "reference": "a39a1f6dc0f4ddd8b2438fa5eb1f67755730d606", "shasum": "" }, "require": { @@ -15605,8 +15625,8 @@ "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "^1.0||^2.0" + "phpunit/phpunit": "^8.5 || ^9.5", + "satooshi/php-coveralls": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -15645,22 +15665,22 @@ ], "support": { "issues": "https://github.com/instaclick/php-webdriver/issues", - "source": "https://github.com/instaclick/php-webdriver/tree/1.4.11" + "source": "https://github.com/instaclick/php-webdriver/tree/1.4.16" }, - "time": "2022-03-30T01:28:33+00:00" + "time": "2022-10-28T13:30:35+00:00" }, { "name": "justinrainbow/json-schema", - "version": "5.2.11", + "version": "5.2.12", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa" + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa", - "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", "shasum": "" }, "require": { @@ -15715,9 +15735,9 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11" + "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" }, - "time": "2021-07-22T09:24:00+00:00" + "time": "2022-04-13T08:02:27+00:00" }, { "name": "mikey179/vfsstream", @@ -16178,16 +16198,16 @@ }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.0.1", + "version": "v2.0.2", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "2d7a9df55f257d2cba9b1d0c0963a54960657177" + "reference": "9f26c224a2fa335f33e6666cc078fbf388255e87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/2d7a9df55f257d2cba9b1d0c0963a54960657177", - "reference": "2d7a9df55f257d2cba9b1d0c0963a54960657177", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/9f26c224a2fa335f33e6666cc078fbf388255e87", + "reference": "9f26c224a2fa335f33e6666cc078fbf388255e87", "shasum": "" }, "require": { @@ -16224,28 +16244,30 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.0.1" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.0.2" }, - "time": "2020-07-09T08:33:42+00:00" + "time": "2023-04-18T11:58:05+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.20.4", + "version": "1.22.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd" + "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd", - "reference": "7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/65c39594fbd8c67abfc68bb323f86447bab79cc0", + "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^1.5", @@ -16269,9 +16291,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.20.4" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.1" }, - "time": "2023-05-02T09:19:37+00:00" + "time": "2023-06-29T20:46:06+00:00" }, { "name": "phpunit/php-code-coverage", @@ -16593,16 +16615,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.8", + "version": "9.6.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", "shasum": "" }, "require": { @@ -16676,7 +16698,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" }, "funding": [ { @@ -16692,7 +16714,7 @@ "type": "tidelift" } ], - "time": "2023-05-11T05:14:45+00:00" + "time": "2023-06-11T06:13:56+00:00" }, { "name": "sebastian/cli-parser", @@ -17660,16 +17682,16 @@ }, { "name": "seld/jsonlint", - "version": "1.9.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "4211420d25eba80712bff236a98960ef68b866b7" + "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7", - "reference": "4211420d25eba80712bff236a98960ef68b866b7", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/594fd6462aad8ecee0b45ca5045acea4776667f1", + "reference": "594fd6462aad8ecee0b45ca5045acea4776667f1", "shasum": "" }, "require": { @@ -17708,7 +17730,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0" + "source": "https://github.com/Seldaek/jsonlint/tree/1.10.0" }, "funding": [ { @@ -17720,20 +17742,20 @@ "type": "tidelift" } ], - "time": "2022-04-01T13:37:23+00:00" + "time": "2023-05-11T13:16:46+00:00" }, { "name": "seld/phar-utils", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/Seldaek/phar-utils.git", - "reference": "9f3452c93ff423469c0d56450431562ca423dcee" + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee", - "reference": "9f3452c93ff423469c0d56450431562ca423dcee", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", + "reference": "ea2f4014f163c1be4c601b9b7bd6af81ba8d701c", "shasum": "" }, "require": { @@ -17766,9 +17788,9 @@ ], "support": { "issues": "https://github.com/Seldaek/phar-utils/issues", - "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0" + "source": "https://github.com/Seldaek/phar-utils/tree/1.2.1" }, - "time": "2021-12-10T11:20:11+00:00" + "time": "2022-08-31T10:31:18+00:00" }, { "name": "sirbrillig/phpcs-variable-analysis", @@ -17830,32 +17852,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.12.1", + "version": "8.13.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7" + "reference": "a13c15e20f2d307a1ca8dec5313ec462a4466470" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7", - "reference": "f69e2524e8770efb9b3e5ac4a0ebc0d54eb446d7", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/a13c15e20f2d307a1ca8dec5313ec462a4466470", + "reference": "a13c15e20f2d307a1ca8dec5313ec462a4466470", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.20.0 <1.21.0", + "phpstan/phpdoc-parser": "^1.22.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.10.15", + "phpstan/phpstan": "1.10.21", "phpstan/phpstan-deprecation-rules": "1.1.3", - "phpstan/phpstan-phpunit": "1.3.11", + "phpstan/phpstan-phpunit": "1.3.13", "phpstan/phpstan-strict-rules": "1.5.1", - "phpunit/phpunit": "7.5.20|8.5.21|9.6.8|10.1.3" + "phpunit/phpunit": "7.5.20|8.5.21|9.6.8|10.2.2" }, "type": "phpcodesniffer-standard", "extra": { @@ -17879,7 +17901,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.12.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.13.1" }, "funding": [ { @@ -17891,7 +17913,7 @@ "type": "tidelift" } ], - "time": "2023-05-15T21:42:25+00:00" + "time": "2023-06-25T12:52:34+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -18164,16 +18186,16 @@ }, { "name": "symfony/lock", - "version": "v4.4.40", + "version": "v4.4.46", "source": { "type": "git", "url": "https://github.com/symfony/lock.git", - "reference": "ec23fb51d9b531f7fcd2279afe5b474e624c2445" + "reference": "8b060dd4e10f05219698ceb3a4ad735b19c1be4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/lock/zipball/ec23fb51d9b531f7fcd2279afe5b474e624c2445", - "reference": "ec23fb51d9b531f7fcd2279afe5b474e624c2445", + "url": "https://api.github.com/repos/symfony/lock/zipball/8b060dd4e10f05219698ceb3a4ad735b19c1be4f", + "reference": "8b060dd4e10f05219698ceb3a4ad735b19c1be4f", "shasum": "" }, "require": { @@ -18182,10 +18204,10 @@ "symfony/polyfill-php80": "^1.16" }, "conflict": { - "doctrine/dbal": "<2.6" + "doctrine/dbal": "<2.7" }, "require-dev": { - "doctrine/dbal": "^2.6|^3.0", + "doctrine/dbal": "^2.7|^3.0", "predis/predis": "~1.0" }, "type": "library", @@ -18222,7 +18244,7 @@ "semaphore" ], "support": { - "source": "https://github.com/symfony/lock/tree/v4.4.40" + "source": "https://github.com/symfony/lock/tree/v4.4.46" }, "funding": [ { @@ -18238,20 +18260,20 @@ "type": "tidelift" } ], - "time": "2022-03-22T11:09:53+00:00" + "time": "2022-09-19T08:41:12+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v5.4.7", + "version": "v5.4.25", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "31977d36f253607e1fc4e1fb54df18bd9f1e4348" + "reference": "ed279c7839967958ee152c32eaa0eaaeac819404" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/31977d36f253607e1fc4e1fb54df18bd9f1e4348", - "reference": "31977d36f253607e1fc4e1fb54df18bd9f1e4348", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/ed279c7839967958ee152c32eaa0eaaeac819404", + "reference": "ed279c7839967958ee152c32eaa0eaaeac819404", "shasum": "" }, "require": { @@ -18305,7 +18327,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.7" + "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.25" }, "funding": [ { @@ -18321,7 +18343,7 @@ "type": "tidelift" } ], - "time": "2022-03-06T11:25:32+00:00" + "time": "2023-06-02T09:36:43+00:00" }, { "name": "theseer/tokenizer", From 63aa85d11c303dd05721fad52f3d19c56c0817c6 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 5 Jul 2023 09:35:28 +0000 Subject: [PATCH 25/27] Update configuration --- composer.lock | 241 +++++++++--------- ...ield_override.node.announcement.status.yml | 24 ++ ...ield_override.node.landing_page.status.yml | 24 ++ ...e.base_field_override.node.page.status.yml | 24 ++ ...form_display.node.announcement.default.yml | 7 +- ...form_display.node.landing_page.default.yml | 4 +- ....entity_form_display.node.page.default.yml | 2 +- ...form_display.tpr_unit.tpr_unit.default.yml | 95 ++++--- ...view_display.node.announcement.default.yml | 4 +- ..._view_display.node.announcement.teaser.yml | 4 +- ...view_display.node.landing_page.default.yml | 2 +- ..._view_display.node.landing_page.teaser.yml | 2 +- ....entity_view_display.node.page.default.yml | 3 +- ...e.entity_view_display.node.page.teaser.yml | 2 +- ...nit.tpr_unit.comprehensive_school_card.yml | 4 + ...view_display.tpr_unit.tpr_unit.default.yml | 4 + ...lay.tpr_unit.tpr_unit.high_school_card.yml | 4 + ...view_display.tpr_unit.tpr_unit.minimal.yml | 4 + ..._view_display.tpr_unit.tpr_unit.teaser.yml | 4 + ...ay.tpr_unit.tpr_unit.teaser_with_image.yml | 4 + ...r_unit.tpr_unit.vocational_school_card.yml | 4 + ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 4 + .../field.field.node.announcement.body.yml | 2 +- ...ement.field_announcement_content_pages.yml | 2 +- ...e.announcement.field_announcement_link.yml | 2 +- ....field.node.landing_page.field_content.yml | 74 ++---- ...field.node.landing_page.field_has_hero.yml | 2 +- ...eld.field.node.landing_page.field_hero.yml | 2 +- ...d.node.landing_page.field_liftup_image.yml | 2 +- .../field.field.node.page.field_content.yml | 77 +----- conf/cmi/field.field.node.page.field_hero.yml | 2 +- .../field.field.node.page.field_lead_in.yml | 2 +- ...eld.field.node.page.field_liftup_image.yml | 2 +- ...ld.field.node.page.field_lower_content.yml | 80 ++---- ....field.node.page.field_sidebar_content.yml | 2 +- ...ld.storage.paragraph.field_hero_design.yml | 2 +- ..._type.group_content_type_5e8b00831189e.yml | 2 - ..._type.group_content_type_8cf71fbe8b0c4.yml | 2 - ..._type.group_content_type_b0ee7f3e08749.yml | 2 - ..._type.group_content_type_c28cd27128f0f.yml | 2 - ..._type.group_content_type_c5fd8986910a1.yml | 2 - ..._type.group_content_type_cb62eb2a38c4f.yml | 2 - .../field.field.node.page.field_has_hero.yml | 2 + .../sv/field.field.node.page.field_hero.yml | 1 + .../field.field.node.page.field_lead_in.yml | 2 + ...eld.field.node.page.field_liftup_image.yml | 2 + ...ld.field.node.page.field_lower_content.yml | 1 + ....field.node.page.field_sidebar_content.yml | 1 + ...ag.metatag_defaults.node__landing_page.yml | 2 +- conf/cmi/node.type.landing_page.yml | 3 +- conf/cmi/node.type.page.yml | 2 +- ...o.pattern.landing_page_content_pattern.yml | 2 +- .../pathauto.pattern.page_content_pattern.yml | 2 +- ...dle_settings.default.node.landing_page.yml | 2 + ...emap.bundle_settings.default.node.page.yml | 2 + 55 files changed, 381 insertions(+), 378 deletions(-) create mode 100644 conf/cmi/core.base_field_override.node.announcement.status.yml create mode 100644 conf/cmi/core.base_field_override.node.landing_page.status.yml create mode 100644 conf/cmi/core.base_field_override.node.page.status.yml create mode 100644 conf/cmi/language/sv/field.field.node.page.field_has_hero.yml create mode 100644 conf/cmi/language/sv/field.field.node.page.field_hero.yml create mode 100644 conf/cmi/language/sv/field.field.node.page.field_lead_in.yml create mode 100644 conf/cmi/language/sv/field.field.node.page.field_liftup_image.yml create mode 100644 conf/cmi/language/sv/field.field.node.page.field_lower_content.yml create mode 100644 conf/cmi/language/sv/field.field.node.page.field_sidebar_content.yml diff --git a/composer.lock b/composer.lock index db5ae629..5d3fba64 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "dc1ad6e3d3ee73d354001baf0d82ae63", + "content-hash": "c340acefc7e83daba6d02a0a29bb5de0", "packages": [ { "name": "asm89/stack-cors", @@ -3419,21 +3419,21 @@ }, { "name": "drupal/file_mdm", - "version": "2.5.0", + "version": "2.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/file_mdm.git", - "reference": "8.x-2.5" + "reference": "8.x-2.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/file_mdm-8.x-2.5.zip", - "reference": "8.x-2.5", - "shasum": "391d9902733704274594873aa9b1f6b6ba3bd319" + "url": "https://ftp.drupal.org/files/projects/file_mdm-8.x-2.6.zip", + "reference": "8.x-2.6", + "shasum": "56c7c06107ce6e249b6d644136e6807573efb0e3" }, "require": { "drupal/core": "^9.3 | ^10", - "lsolesen/pel": "^0.9.12", + "fileeye/pel": "^0.9.20", "phenx/php-font-lib": "^0.5.4" }, "require-dev": { @@ -3443,8 +3443,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.5", - "datestamp": "1663668519", + "version": "8.x-2.6", + "datestamp": "1688489716", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3816,26 +3816,26 @@ }, { "name": "drupal/gin_toolbar", - "version": "1.0.0-rc1", + "version": "1.0.0-rc3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin_toolbar.git", - "reference": "8.x-1.0-rc1" + "reference": "8.x-1.0-rc3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc1.zip", - "reference": "8.x-1.0-rc1", - "shasum": "90516f6aa22f4f60f1853bdceb757940f411ec7e" + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc3.zip", + "reference": "8.x-1.0-rc3", + "shasum": "f9ae6c1c086f008a2911eb2ced4740ac5c307faf" }, "require": { - "drupal/core": "^8 || ^9 || ^10" + "drupal/core": "^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc1", - "datestamp": "1669666957", + "version": "8.x-1.0-rc3", + "datestamp": "1688477564", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3985,16 +3985,16 @@ }, { "name": "drupal/hdbt", - "version": "5.4.6", + "version": "5.4.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "373c53356d00862256d9c2044a98d0d6396906f1" + "reference": "23f279fa95516444766b092a9ffbc910230395fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/373c53356d00862256d9c2044a98d0d6396906f1", - "reference": "373c53356d00862256d9c2044a98d0d6396906f1", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/23f279fa95516444766b092a9ffbc910230395fe", + "reference": "23f279fa95516444766b092a9ffbc910230395fe", "shasum": "" }, "require": { @@ -4012,10 +4012,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.4.6", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.4.8", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-06-22T09:31:02+00:00" + "time": "2023-06-30T06:23:42+00:00" }, { "name": "drupal/hdbt_admin", @@ -4146,16 +4146,16 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "1b3db68432b02413162ed05203a5a2ad2a146687" + "reference": "e4b7ddf6834254779cc9ade97177d0524bf4016d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/1b3db68432b02413162ed05203a5a2ad2a146687", - "reference": "1b3db68432b02413162ed05203a5a2ad2a146687", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/e4b7ddf6834254779cc9ade97177d0524bf4016d", + "reference": "e4b7ddf6834254779cc9ade97177d0524bf4016d", "shasum": "" }, "require": { @@ -4166,15 +4166,22 @@ "drupal/coder": "^8.3" }, "type": "drupal-module", + "extra": { + "patches": { + "drupal/flysystem_azure": { + "D10 patch": "https://www.drupal.org/files/issues/2022-06-15/flysystem_azure.1.0.x-dev.rector.patch" + } + } + }, "license": [ "GPL-2.0-or-later" ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.2.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.2.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2023-06-21T11:44:01+00:00" + "time": "2023-06-30T07:10:46+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4238,16 +4245,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.1.4", + "version": "3.1.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "6152bdee5c8712f6f4d81611dceb84a40de099cc" + "reference": "9851169899630c1b9f62a065a7829e6dbca7cc6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6152bdee5c8712f6f4d81611dceb84a40de099cc", - "reference": "6152bdee5c8712f6f4d81611dceb84a40de099cc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9851169899630c1b9f62a065a7829e6dbca7cc6c", + "reference": "9851169899630c1b9f62a065a7829e6dbca7cc6c", "shasum": "" }, "require": { @@ -4350,10 +4357,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.1.4", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.1.8", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-06-26T08:24:01+00:00" + "time": "2023-07-04T06:10:59+00:00" }, { "name": "drupal/helfi_proxy", @@ -4994,17 +5001,17 @@ }, { "name": "drupal/linkit", - "version": "6.0.0-rc1", + "version": "6.0.0-rc2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.0.0-rc1" + "reference": "6.0.0-rc2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-rc1.zip", - "reference": "6.0.0-rc1", - "shasum": "126069976e2a7d34cc8530c0950c75bd7f1b5d3c" + "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-rc2.zip", + "reference": "6.0.0-rc2", + "shasum": "69274e63d5312594cb3444656c6a0ec3800d0df4" }, "require": { "drupal/core": "^9.4 || ^10.0.0" @@ -5019,8 +5026,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.0-rc1", - "datestamp": "1681070405", + "version": "6.0.0-rc2", + "datestamp": "1688055675", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -6309,17 +6316,17 @@ }, { "name": "drupal/siteimprove", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/siteimprove.git", - "reference": "2.0.0" + "reference": "2.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/siteimprove-2.0.0.zip", - "reference": "2.0.0", - "shasum": "b79c37852d835d97c502615aded96a9855e9f493" + "url": "https://ftp.drupal.org/files/projects/siteimprove-2.0.1.zip", + "reference": "2.0.1", + "shasum": "77be7be61880416e9364c414122465254020fb80" }, "require": { "drupal/core": "^9.2 || ^10" @@ -6330,8 +6337,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1671009593", + "version": "2.0.1", + "datestamp": "1687955571", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6574,17 +6581,17 @@ }, { "name": "drupal/token", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/token.git", - "reference": "8.x-1.11" + "reference": "8.x-1.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/token-8.x-1.11.zip", - "reference": "8.x-1.11", - "shasum": "da264b36d1f88eb0c74bf84e18e8789854f98400" + "url": "https://ftp.drupal.org/files/projects/token-8.x-1.12.zip", + "reference": "8.x-1.12", + "shasum": "cefe1b203b793682f74ea43e18d0a814cf768763" }, "require": { "drupal/core": "^9.2 || ^10" @@ -6592,8 +6599,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.11", - "datestamp": "1659471813", + "version": "8.x-1.12", + "datestamp": "1688015262", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7677,6 +7684,67 @@ }, "time": "2023-02-11T19:58:58+00:00" }, + { + "name": "fileeye/pel", + "version": "0.9.20", + "source": { + "type": "git", + "url": "https://github.com/FileEye/pel.git", + "reference": "1675cbd44e89ff8f01b9576cf32ec1b4a4a67ede" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FileEye/pel/zipball/1675cbd44e89ff8f01b9576cf32ec1b4a4a67ede", + "reference": "1675cbd44e89ff8f01b9576cf32ec1b4a4a67ede", + "shasum": "" + }, + "require": { + "php": ">=7.1.0" + }, + "require-dev": { + "ext-exif": "*", + "ext-gd": "*", + "php-coveralls/php-coveralls": ">2.4", + "phpstan/phpstan": "^1.4", + "squizlabs/php_codesniffer": ">3.5", + "symfony/phpunit-bridge": "^4 || ^5 || ^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "lsolesen\\pel\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0" + ], + "authors": [ + { + "name": "Lars Olesen", + "email": "lars@intraface.dk", + "homepage": "http://intraface.dk", + "role": "Developer" + }, + { + "name": "Martin Geisler", + "email": "martin@geisler.net", + "homepage": "http://geisler.net", + "role": "Developer" + } + ], + "description": "PHP Exif Library. A library for reading and writing Exif headers in JPEG and TIFF images using PHP.", + "homepage": "https://github.com/FileEye/pel", + "keywords": [ + "exif", + "image" + ], + "support": { + "issues": "https://github.com/FileEye/pel/issues", + "source": "https://github.com/FileEye/pel/tree/0.9.20" + }, + "time": "2023-06-20T07:10:35+00:00" + }, { "name": "firebase/php-jwt", "version": "v6.8.0", @@ -9155,67 +9223,6 @@ }, "time": "2023-04-26T21:27:14+00:00" }, - { - "name": "lsolesen/pel", - "version": "0.9.12", - "source": { - "type": "git", - "url": "https://github.com/pel/pel.git", - "reference": "b95fe29cdacf9d36330da277f10910a13648c84c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pel/pel/zipball/b95fe29cdacf9d36330da277f10910a13648c84c", - "reference": "b95fe29cdacf9d36330da277f10910a13648c84c", - "shasum": "" - }, - "require": { - "php": ">=7.1.0" - }, - "require-dev": { - "ext-exif": "*", - "ext-gd": "*", - "php-coveralls/php-coveralls": ">2.4", - "squizlabs/php_codesniffer": ">3.5", - "symfony/phpunit-bridge": "^4 || ^5" - }, - "type": "library", - "autoload": { - "psr-4": { - "lsolesen\\pel\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0" - ], - "authors": [ - { - "name": "Lars Olesen", - "email": "lars@intraface.dk", - "homepage": "http://intraface.dk", - "role": "Developer" - }, - { - "name": "Martin Geisler", - "email": "martin@geisler.net", - "homepage": "http://geisler.net", - "role": "Developer" - } - ], - "description": "PHP Exif Library. A library for reading and writing Exif headers in JPEG and TIFF images using PHP.", - "homepage": "http://pel.github.com/pel/", - "keywords": [ - "exif", - "image" - ], - "support": { - "issues": "https://github.com/pel/pel/issues", - "source": "https://github.com/pel/pel/tree/0.9.12" - }, - "abandoned": true, - "time": "2022-02-18T13:20:54+00:00" - }, { "name": "makinacorpus/php-lucene", "version": "1.2.1", diff --git a/conf/cmi/core.base_field_override.node.announcement.status.yml b/conf/cmi/core.base_field_override.node.announcement.status.yml new file mode 100644 index 00000000..06b31235 --- /dev/null +++ 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 new file mode 100644 index 00000000..06168e8d --- /dev/null +++ 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 new file mode 100644 index 00000000..a9f826b6 --- /dev/null +++ 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 index a0aafdec..19ddbd00 100644 --- 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 @@ -123,9 +126,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 - region: content settings: { } third_party_settings: { } + region: content status: type: boolean_checkbox weight: 9 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 index 1ea8cbf8..289dc2d4 100644 --- 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 @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 - region: content settings: { } third_party_settings: { } + region: content status: type: boolean_checkbox weight: 12 diff --git a/conf/cmi/core.entity_form_display.node.page.default.yml b/conf/cmi/core.entity_form_display.node.page.default.yml index edc2b403..0570f78f 100644 --- 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 index 80c9714a..90893dd1 100644 --- 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 @@ -19,9 +19,8 @@ dependencies: - paragraphs - path - 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,19 +86,19 @@ content: formatter_settings: { } show_description: false third_party_settings: { } - description: + contacts: type: readonly_field_widget - weight: 13 region: content + weight: 36 settings: label: above formatter_type: null formatter_settings: { } show_description: false third_party_settings: { } - email: + description: type: readonly_field_widget - weight: 7 + weight: 13 region: content settings: label: above @@ -107,9 +106,9 @@ content: formatter_settings: { } show_description: false third_party_settings: { } - field_categories: + email: type: readonly_field_widget - weight: 39 + weight: 7 region: content settings: label: above @@ -136,16 +135,6 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } - field_hs_front_page: - type: entity_reference_autocomplete - weight: 29 - region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } field_lower_content: type: paragraphs weight: 28 @@ -172,16 +161,6 @@ content: settings: sidebar: false third_party_settings: { } - field_study_field: - type: select2_entity_reference - weight: 31 - region: content - settings: - width: 100% - autocomplete: false - match_operator: CONTAINS - match_limit: 10 - third_party_settings: { } field_unit_type: type: entity_reference_autocomplete weight: 28 @@ -192,19 +171,22 @@ content: size: 60 placeholder: '' third_party_settings: { } - hide_description: + hide_sidebar_navigation: type: boolean_checkbox - weight: 16 + weight: 29 region: content settings: display_label: true third_party_settings: { } - hide_sidebar_navigation: - type: boolean_checkbox - weight: 29 + highlights: + type: readonly_field_widget region: content + weight: 32 settings: - display_label: true + label: above + formatter_type: null + formatter_settings: { } + show_description: false third_party_settings: { } langcode: type: language_select @@ -223,6 +205,16 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + links: + type: readonly_field_widget + region: content + weight: 35 + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } longitude: type: readonly_field_widget weight: 18 @@ -251,6 +243,26 @@ content: size: 60 placeholder: '' third_party_settings: { } + opening_hours: + type: readonly_field_widget + region: content + weight: 31 + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } + other_info: + type: readonly_field_widget + region: content + weight: 33 + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } path: type: path weight: 11 @@ -284,6 +296,16 @@ content: settings: media_types: { } third_party_settings: { } + price_info: + type: readonly_field_widget + region: content + weight: 34 + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } provided_languages: type: readonly_field_widget weight: 30 @@ -353,5 +375,10 @@ content: third_party_settings: { } hidden: created: true + field_categories: true field_districts: true + field_hs_front_page: true + field_study_field: true + hide_description: true ontologyword_ids: true + show_www: true diff --git a/conf/cmi/core.entity_view_display.node.announcement.default.yml b/conf/cmi/core.entity_view_display.node.announcement.default.yml index cec50ea1..b9d1c2a5 100644 --- a/conf/cmi/core.entity_view_display.node.announcement.default.yml +++ b/conf/cmi/core.entity_view_display.node.announcement.default.yml @@ -7,7 +7,9 @@ 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 @@ -15,7 +17,7 @@ dependencies: - 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 index 72415aaa..8ec0f94d 100644 --- 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 index f8c38755..8c63334f 100644 --- 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 index c7ced39c..30875edc 100644 --- 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 index d0fe7267..95dd9e18 100644 --- 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 diff --git a/conf/cmi/core.entity_view_display.node.page.teaser.yml b/conf/cmi/core.entity_view_display.node.page.teaser.yml index 49335512..165cedd9 100644 --- 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/core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card.yml index 2bd469a5..fdc590cc 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card.yml @@ -88,6 +88,7 @@ hidden: accessibility_www: true address_postal: true call_charge_info: true + contacts: true created: true email: true field_categories: true @@ -102,9 +103,12 @@ hidden: highlights: true langcode: true latitude: true + links: true longitude: true opening_hours: true + other_info: true phone: true + price_info: true search_api_excerpt: true service_map_embed: true services: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index f3845598..c5fc1c9a 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -221,6 +221,7 @@ content: weight: 12 region: content hidden: + contacts: true created: true field_categories: true field_districts: true @@ -230,7 +231,10 @@ hidden: hide_description: true langcode: true latitude: true + links: true longitude: true + other_info: true + price_info: true search_api_excerpt: true show_www: true streetview_entrance_url: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.high_school_card.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.high_school_card.yml index 6c4b76b8..4ddac7f1 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.high_school_card.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.high_school_card.yml @@ -213,6 +213,7 @@ content: weight: 13 region: content hidden: + contacts: true created: true field_categories: true field_districts: true @@ -222,7 +223,10 @@ hidden: highlights: true langcode: true latitude: true + links: true longitude: true + other_info: true + price_info: true provided_languages: true search_api_excerpt: true show_www: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml index 59ae8e76..d1cdfe70 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml @@ -53,6 +53,7 @@ hidden: accessibility_www: true address_postal: true call_charge_info: true + contacts: true created: true description: true email: true @@ -68,11 +69,14 @@ hidden: highlights: true langcode: true latitude: true + links: true longitude: true opening_hours: true + other_info: true phone: true picture_url: true picture_url_override: true + price_info: true provided_languages: true search_api_excerpt: true service_map_embed: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index 33beb572..09092859 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -73,6 +73,7 @@ hidden: accessibility_www: true address_postal: true call_charge_info: true + contacts: true created: true description: true email: true @@ -88,9 +89,12 @@ hidden: highlights: true langcode: true latitude: true + links: true longitude: true opening_hours: true + other_info: true phone: true + price_info: true provided_languages: true search_api_excerpt: true service_map_embed: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml index de50af26..eee3cd53 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml @@ -74,6 +74,7 @@ hidden: accessibility_www: true address_postal: true call_charge_info: true + contacts: true created: true description: true email: true @@ -89,9 +90,12 @@ hidden: highlights: true langcode: true latitude: true + links: true longitude: true name_override: true opening_hours: true + other_info: true + price_info: true provided_languages: true search_api_excerpt: true service_map_embed: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.vocational_school_card.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.vocational_school_card.yml index c2eb842b..4d0fdbb7 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.vocational_school_card.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.vocational_school_card.yml @@ -206,6 +206,7 @@ content: weight: 12 region: content hidden: + contacts: true created: true field_categories: true field_districts: true @@ -216,7 +217,10 @@ hidden: highlights: true langcode: true latitude: true + links: true longitude: true + other_info: true + price_info: true provided_languages: true search_api_excerpt: true show_www: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml index db9c1a69..c3ff833a 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -89,6 +89,7 @@ hidden: accessibility_www: true address_postal: true call_charge_info: true + contacts: true created: true description: true email: true @@ -104,7 +105,10 @@ hidden: highlights: true langcode: true latitude: true + links: true longitude: true + other_info: true + price_info: true provided_languages: true search_api_excerpt: true service_map_embed: true diff --git a/conf/cmi/field.field.node.announcement.body.yml b/conf/cmi/field.field.node.announcement.body.yml index e8a0b1cb..438b1337 100644 --- 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 index 890e8a03..2c1a6f78 100644 --- 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 index 8e7f362e..714a7283 100644 --- 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 index b07c9d7c..b155161d 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -34,7 +34,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 @@ -49,61 +49,46 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: - banner: banner - chart: chart - columns: columns - content_cards: content_cards - content_liftup: content_liftup + after_school_activity_search: after_school_activity_search daycare_search: daycare_search - event_list: event_list - from_library: from_library group_news: group_news group_news_archive: group_news_archive high_school_search: high_school_search - liftup_with_image: liftup_with_image + playground_search: playground_search + school_search: school_search + vocational_school_search: vocational_school_search + columns: columns list_of_links: list_of_links + content_cards: content_cards + content_liftup: content_liftup + banner: banner + liftup_with_image: liftup_with_image + from_library: from_library + chart: chart + remote_video: remote_video map: map news_list: news_list + event_list: event_list phasing: phasing popular_services: popular_services - remote_video: remote_video - school_search: school_search - service_list: service_list - service_list_search: service_list_search target_group_links: target_group_links unit_search: unit_search - vocational_school_search: vocational_school_search - after_school_activity_search: after_school_activity_search - playground_search: playground_search + service_list: service_list + service_list_search: service_list_search negate: 0 target_bundles_drag_drop: - accordion: - weight: 40 - enabled: false - accordion_item: - weight: 41 - enabled: false after_school_activity_search: weight: 0 enabled: true banner: weight: 0 enabled: true - calculator: - weight: 44 - enabled: false chart: weight: 0 enabled: true columns: weight: 0 enabled: true - contact_card: - weight: 47 - enabled: false - contact_card_listing: - weight: 48 - enabled: false content_cards: weight: 0 enabled: true @@ -125,24 +110,15 @@ settings: group_news_archive: weight: 0 enabled: true - hero: - weight: 56 - enabled: false high_school_search: weight: 0 enabled: true - image: - weight: 58 - enabled: false liftup_with_image: weight: 0 enabled: true list_of_links: weight: 0 enabled: true - list_of_links_item: - weight: 61 - enabled: false map: weight: 0 enabled: true @@ -152,15 +128,9 @@ settings: phasing: weight: 0 enabled: true - phasing_item: - weight: 65 - enabled: false playground_search: weight: 0 enabled: true - popular_service_item: - weight: 67 - enabled: false popular_services: weight: 0 enabled: true @@ -176,21 +146,9 @@ settings: service_list_search: weight: 0 enabled: true - sidebar_text: - weight: 72 - enabled: false - social_media_link: - weight: 73 - enabled: false - target_group_link_item: - weight: 74 - enabled: false target_group_links: weight: 0 enabled: true - text: - weight: 76 - enabled: false unit_search: weight: 0 enabled: true diff --git a/conf/cmi/field.field.node.landing_page.field_has_hero.yml b/conf/cmi/field.field.node.landing_page.field_has_hero.yml index dc8a4253..e3a1f7d0 100644 --- a/conf/cmi/field.field.node.landing_page.field_has_hero.yml +++ b/conf/cmi/field.field.node.landing_page.field_has_hero.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.node.field_has_hero - node.type.landing_page _core: - default_config_hash: rT_f5pnvC_sD05FKSnu6t_QWElHLz3MWNzz-knMiCOs + default_config_hash: 9YN8dmUhU-XhgxPRCb4x-ghOzqatFuntD6iIFhL9G3k id: node.landing_page.field_has_hero field_name: field_has_hero 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 index 10441571..eb5ca687 100644 --- 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.landing_page.field_liftup_image.yml b/conf/cmi/field.field.node.landing_page.field_liftup_image.yml index a668181f..b5878417 100644 --- a/conf/cmi/field.field.node.landing_page.field_liftup_image.yml +++ b/conf/cmi/field.field.node.landing_page.field_liftup_image.yml @@ -7,7 +7,7 @@ dependencies: - media.type.image - node.type.landing_page _core: - default_config_hash: 7gvDr4xCmU5LNyQi_3iBorr2RsmHyXI-r1eo1rAs-Gw + default_config_hash: tjssmYxe5qbWn7P7--dg9YMnck83F4dImAQiwIz4eJs id: node.landing_page.field_liftup_image field_name: field_liftup_image 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 index d3798c9f..1c897e8a 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -7,7 +7,6 @@ dependencies: - node.type.page - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner - - paragraphs.paragraphs_type.calculator - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.contact_card_listing @@ -30,7 +29,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 @@ -45,51 +44,41 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: - accordion: accordion - banner: banner - chart: chart + group_news: group_news + high_school_search: high_school_search + vocational_school_search: vocational_school_search + text: text columns: columns + image: image + accordion: accordion + list_of_links: list_of_links contact_card_listing: contact_card_listing content_cards: content_cards content_liftup: content_liftup + banner: banner event_list: event_list - from_library: from_library - group_news: group_news - high_school_search: high_school_search - image: image - list_of_links: list_of_links - map: map news_list: news_list + from_library: from_library phasing: phasing + chart: chart remote_video: remote_video - text: text + map: map unit_search: unit_search - vocational_school_search: vocational_school_search - calculator: calculator service_list_search: service_list_search negate: 0 target_bundles_drag_drop: accordion: weight: 0 enabled: true - accordion_item: - weight: 40 - enabled: false banner: weight: 0 enabled: true - calculator: - weight: 42 - enabled: true chart: weight: 0 enabled: true columns: weight: 0 enabled: true - contact_card: - weight: 45 - enabled: false contact_card_listing: weight: 0 enabled: true @@ -99,9 +88,6 @@ settings: content_liftup: weight: 0 enabled: true - daycare_search: - weight: 49 - enabled: false event_list: weight: 0 enabled: true @@ -111,27 +97,15 @@ settings: group_news: weight: 0 enabled: true - group_news_archive: - weight: 53 - enabled: false - hero: - weight: 54 - enabled: false high_school_search: weight: 0 enabled: true image: weight: 0 enabled: true - liftup_with_image: - weight: 57 - enabled: false list_of_links: weight: 0 enabled: true - list_of_links_item: - weight: 59 - enabled: false map: weight: 0 enabled: true @@ -141,39 +115,12 @@ settings: phasing: weight: 0 enabled: true - phasing_item: - weight: 63 - enabled: false - popular_service_item: - weight: 64 - enabled: false - popular_services: - weight: 65 - enabled: false remote_video: weight: 0 enabled: true - school_search: - weight: 67 - enabled: false - service_list: - weight: 68 - enabled: false service_list_search: weight: 0 enabled: true - sidebar_text: - weight: 70 - enabled: false - social_media_link: - weight: 71 - enabled: false - target_group_link_item: - weight: 72 - enabled: false - target_group_links: - weight: 73 - enabled: false text: weight: 0 enabled: true diff --git a/conf/cmi/field.field.node.page.field_hero.yml b/conf/cmi/field.field.node.page.field_hero.yml index 3ef70ce8..c7e9d23e 100644 --- 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_lead_in.yml b/conf/cmi/field.field.node.page.field_lead_in.yml index 94f097c0..0c00682c 100644 --- a/conf/cmi/field.field.node.page.field_lead_in.yml +++ b/conf/cmi/field.field.node.page.field_lead_in.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.node.field_lead_in - node.type.page _core: - default_config_hash: 6ZtehWQxYInXbd5jF5BanSvmjWk_hfHTwJDRDfyJrPA + default_config_hash: tPwfvL9sS2_dI0nhmfCMypX6JXVe5rARuztaSQ5h6Z8 id: node.page.field_lead_in field_name: field_lead_in entity_type: node diff --git a/conf/cmi/field.field.node.page.field_liftup_image.yml b/conf/cmi/field.field.node.page.field_liftup_image.yml index 64667481..6c72eeec 100644 --- a/conf/cmi/field.field.node.page.field_liftup_image.yml +++ b/conf/cmi/field.field.node.page.field_liftup_image.yml @@ -7,7 +7,7 @@ dependencies: - media.type.image - node.type.page _core: - default_config_hash: F6wBhij8loESl_c6bpPWHJSiCOWOkwkSj4uEiolmzdY + default_config_hash: HnNX7GzhZeJlJrJoD5s1zgpCSG-TT5PEgL9tSbc97Qg id: node.page.field_liftup_image field_name: field_liftup_image 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 index 317a44d1..85371d41 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -8,7 +8,6 @@ dependencies: - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.after_school_activity_search - paragraphs.paragraphs_type.banner - - paragraphs.paragraphs_type.calculator - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.contact_card_listing @@ -33,7 +32,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 @@ -48,57 +47,47 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: - accordion: accordion - banner: banner - chart: chart - columns: columns - contact_card_listing: contact_card_listing - content_cards: content_cards - content_liftup: content_liftup + after_school_activity_search: after_school_activity_search daycare_search: daycare_search - event_list: event_list - from_library: from_library group_news: group_news high_school_search: high_school_search + playground_search: playground_search + vocational_school_search: vocational_school_search + text: text + columns: columns image: image + accordion: accordion list_of_links: list_of_links - map: map + contact_card_listing: contact_card_listing + content_cards: content_cards + content_liftup: content_liftup + banner: banner + event_list: event_list news_list: news_list + from_library: from_library + chart: chart phasing: phasing remote_video: remote_video - text: text + map: map unit_search: unit_search - vocational_school_search: vocational_school_search - after_school_activity_search: after_school_activity_search - calculator: calculator - playground_search: playground_search service_list_search: service_list_search negate: 0 target_bundles_drag_drop: accordion: weight: 0 enabled: true - accordion_item: - weight: 40 - enabled: false after_school_activity_search: weight: 0 enabled: true banner: weight: 0 enabled: true - calculator: - weight: 42 - enabled: true chart: weight: 0 enabled: true columns: weight: 0 enabled: true - contact_card: - weight: 45 - enabled: false contact_card_listing: weight: 0 enabled: true @@ -120,27 +109,15 @@ settings: group_news: weight: 0 enabled: true - group_news_archive: - weight: 53 - enabled: false - hero: - weight: 54 - enabled: false high_school_search: weight: 0 enabled: true image: weight: 0 enabled: true - liftup_with_image: - weight: 57 - enabled: false list_of_links: weight: 0 enabled: true - list_of_links_item: - weight: 59 - enabled: false map: weight: 0 enabled: true @@ -150,42 +127,15 @@ settings: phasing: weight: 0 enabled: true - phasing_item: - weight: 63 - enabled: false playground_search: weight: 0 enabled: true - popular_service_item: - weight: 64 - enabled: false - popular_services: - weight: 65 - enabled: false remote_video: weight: 0 enabled: true - school_search: - weight: 67 - enabled: false - service_list: - weight: 68 - enabled: false service_list_search: weight: 0 enabled: true - sidebar_text: - weight: 70 - enabled: false - social_media_link: - weight: 71 - enabled: false - target_group_link_item: - weight: 72 - enabled: false - target_group_links: - weight: 73 - enabled: false text: weight: 0 enabled: true diff --git a/conf/cmi/field.field.node.page.field_sidebar_content.yml b/conf/cmi/field.field.node.page.field_sidebar_content.yml index 3f34f4f0..11376675 100644 --- 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 index 1c35aa72..acacea6c 100644 --- a/conf/cmi/field.storage.paragraph.field_hero_design.yml +++ b/conf/cmi/field.storage.paragraph.field_hero_design.yml @@ -28,7 +28,7 @@ settings: - value: diagonal label: Diagonal - allowed_values_function: '' + allowed_values_function: helfi_paragraphs_hero_design_allowed_values module: options locked: false cardinality: 1 diff --git a/conf/cmi/group.content_type.group_content_type_5e8b00831189e.yml b/conf/cmi/group.content_type.group_content_type_5e8b00831189e.yml index b9f413ac..84a0c9a0 100644 --- a/conf/cmi/group.content_type.group_content_type_5e8b00831189e.yml +++ b/conf/cmi/group.content_type.group_content_type_5e8b00831189e.yml @@ -8,8 +8,6 @@ dependencies: - helfi_group - helfi_tpr id: group_content_type_5e8b00831189e -label: 'Upper secondary school: Group TPR unit' -description: 'Adds TPR units to groups.' group_type: upper_secondary_school content_plugin: group_tpr_unit plugin_config: diff --git a/conf/cmi/group.content_type.group_content_type_8cf71fbe8b0c4.yml b/conf/cmi/group.content_type.group_content_type_8cf71fbe8b0c4.yml index 02491708..b1e04828 100644 --- a/conf/cmi/group.content_type.group_content_type_8cf71fbe8b0c4.yml +++ b/conf/cmi/group.content_type.group_content_type_8cf71fbe8b0c4.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: group_content_type_8cf71fbe8b0c4 -label: 'Upper secondary school: Group node (News item)' -description: 'Adds News item content to groups both publicly and privately.' group_type: upper_secondary_school content_plugin: 'group_node:news_item' plugin_config: diff --git a/conf/cmi/group.content_type.group_content_type_b0ee7f3e08749.yml b/conf/cmi/group.content_type.group_content_type_b0ee7f3e08749.yml index 0fe70a6d..60e953fd 100644 --- a/conf/cmi/group.content_type.group_content_type_b0ee7f3e08749.yml +++ b/conf/cmi/group.content_type.group_content_type_b0ee7f3e08749.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: group_content_type_b0ee7f3e08749 -label: 'Upper secondary school: Group node (Basic page)' -description: 'Adds Basic page content to groups both publicly and privately.' group_type: upper_secondary_school content_plugin: 'group_node:page' plugin_config: diff --git a/conf/cmi/group.content_type.group_content_type_c28cd27128f0f.yml b/conf/cmi/group.content_type.group_content_type_c28cd27128f0f.yml index d8a1e0c4..a1b66cb8 100644 --- a/conf/cmi/group.content_type.group_content_type_c28cd27128f0f.yml +++ b/conf/cmi/group.content_type.group_content_type_c28cd27128f0f.yml @@ -7,8 +7,6 @@ dependencies: module: - user id: group_content_type_c28cd27128f0f -label: 'Upper secondary school: Group membership' -description: 'Adds users to groups as members.' group_type: upper_secondary_school content_plugin: group_membership plugin_config: diff --git a/conf/cmi/group.content_type.group_content_type_c5fd8986910a1.yml b/conf/cmi/group.content_type.group_content_type_c5fd8986910a1.yml index fcff834f..216aed93 100644 --- a/conf/cmi/group.content_type.group_content_type_c5fd8986910a1.yml +++ b/conf/cmi/group.content_type.group_content_type_c5fd8986910a1.yml @@ -8,8 +8,6 @@ dependencies: module: - group_content_menu id: group_content_type_c5fd8986910a1 -label: 'Upper secondary school: Group menu (Kasko group menu)' -description: 'Adds Kasko group menu menu items to groups.' group_type: upper_secondary_school content_plugin: 'group_content_menu:kasko_group_menu' plugin_config: diff --git a/conf/cmi/group.content_type.group_content_type_cb62eb2a38c4f.yml b/conf/cmi/group.content_type.group_content_type_cb62eb2a38c4f.yml index 5aaf97a4..a5aaaeb6 100644 --- a/conf/cmi/group.content_type.group_content_type_cb62eb2a38c4f.yml +++ b/conf/cmi/group.content_type.group_content_type_cb62eb2a38c4f.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: group_content_type_cb62eb2a38c4f -label: 'Upper secondary school: Group node (Landing page)' -description: 'Adds Landing page content to groups both publicly and privately.' group_type: upper_secondary_school content_plugin: 'group_node:landing_page' plugin_config: diff --git a/conf/cmi/language/sv/field.field.node.page.field_has_hero.yml b/conf/cmi/language/sv/field.field.node.page.field_has_hero.yml new file mode 100644 index 00000000..3f0e071c --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.page.field_has_hero.yml @@ -0,0 +1,2 @@ +label: Hero-block +description: 'Välj om du vill visa hjältelyftelementet på sidan. Om du väljer en hjälte kommer dess titel att användas som huvudtitel på sidan.' diff --git a/conf/cmi/language/sv/field.field.node.page.field_hero.yml b/conf/cmi/language/sv/field.field.node.page.field_hero.yml new file mode 100644 index 00000000..852d6c8a --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.page.field_hero.yml @@ -0,0 +1 @@ +label: Hero-block diff --git a/conf/cmi/language/sv/field.field.node.page.field_lead_in.yml b/conf/cmi/language/sv/field.field.node.page.field_lead_in.yml new file mode 100644 index 00000000..5c1a64ab --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.page.field_lead_in.yml @@ -0,0 +1,2 @@ +label: Leda +description: 'Inlägget är synligt på innehållssidan samt i uttag, sökresultat och delningar i sociala medier.' diff --git a/conf/cmi/language/sv/field.field.node.page.field_liftup_image.yml b/conf/cmi/language/sv/field.field.node.page.field_liftup_image.yml new file mode 100644 index 00000000..3890f9e0 --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.page.field_liftup_image.yml @@ -0,0 +1,2 @@ +label: Lyftbild +description: 'Bilden syns i uttag, sökmotorer och delningar i sociala medier.' diff --git a/conf/cmi/language/sv/field.field.node.page.field_lower_content.yml b/conf/cmi/language/sv/field.field.node.page.field_lower_content.yml new file mode 100644 index 00000000..e30ea4fb --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.page.field_lower_content.yml @@ -0,0 +1 @@ +label: Botteninnehåll diff --git a/conf/cmi/language/sv/field.field.node.page.field_sidebar_content.yml b/conf/cmi/language/sv/field.field.node.page.field_sidebar_content.yml new file mode 100644 index 00000000..4eb0d655 --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.page.field_sidebar_content.yml @@ -0,0 +1 @@ +label: 'Sidofältets innehåll' diff --git a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml index 2201da08..431f7335 100644 --- a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml +++ b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: 4LnWqTxx8bp4ew1DS7XZOmhHzO_B-us0REW1efp3xRk + default_config_hash: KFDRmGwu9d-ua_6WM0B6f7Qz85hnDdZ0VulBDnvmg5Q id: node__landing_page label: 'Content: Landing page' tags: diff --git a/conf/cmi/node.type.landing_page.yml b/conf/cmi/node.type.landing_page.yml index 6d47bab1..2e942bf6 100644 --- a/conf/cmi/node.type.landing_page.yml +++ b/conf/cmi/node.type.landing_page.yml @@ -4,6 +4,7 @@ status: true dependencies: module: - menu_ui + - scheduler third_party_settings: menu_ui: available_menus: @@ -23,7 +24,7 @@ third_party_settings: unpublish_required: false unpublish_revision: false _core: - default_config_hash: ah3vIiRAXEYtaITIDXDkTMxz_d55Eu7rV-nNz1ZknEU + default_config_hash: PfTlYxtl_LoeL3LJeT4Qwnzu5MZq6Rc7R5o3NLTInHU name: 'Landing page' type: landing_page description: 'Content type for the front page of a section or theme. A landing page consists of highlight areas, content listings and links.' diff --git a/conf/cmi/node.type.page.yml b/conf/cmi/node.type.page.yml index e5606f51..56c55aba 100644 --- a/conf/cmi/node.type.page.yml +++ b/conf/cmi/node.type.page.yml @@ -24,7 +24,7 @@ third_party_settings: unpublish_required: false unpublish_revision: false _core: - default_config_hash: 2wtLJzGRPIAAdAGbl6hOGq0wG3zumh1dayzTQvnwU94 + default_config_hash: A1XVcWETFW22MWUdDTxkOE331kBoYUWPQILECfHoBfk name: 'Standard page' type: page description: 'Content type for standard web content.' diff --git a/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml b/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml index d2fca9d3..7778c27b 100644 --- a/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml +++ b/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml @@ -5,7 +5,7 @@ dependencies: module: - node _core: - default_config_hash: Ent8eD7KV9MWP8HWX49gt3gEeXFcn-y7MjVul67jUpE + default_config_hash: JC4p2qHXUeY-wiNBTGDl6RCdOEYxfeMrvQe7tVcJHZY id: landing_page_content_pattern label: 'Landing page content pattern' type: 'canonical_entities:node' diff --git a/conf/cmi/pathauto.pattern.page_content_pattern.yml b/conf/cmi/pathauto.pattern.page_content_pattern.yml index a10bec9c..69eeefb7 100644 --- a/conf/cmi/pathauto.pattern.page_content_pattern.yml +++ b/conf/cmi/pathauto.pattern.page_content_pattern.yml @@ -5,7 +5,7 @@ dependencies: module: - node _core: - default_config_hash: NPeIDcdnIVh4Ouubxz6NcH7ks_z8buKUD0ZmzPACvtE + default_config_hash: YrMS_tpZzY4kqrmIPkRckaFUN3aKZEyHpgADFLI6rBg id: page_content_pattern label: 'Page content pattern' type: 'canonical_entities:node' diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml b/conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml index 8e55877d..6c02b483 100644 --- a/conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml +++ b/conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml @@ -1,3 +1,5 @@ +_core: + default_config_hash: sNJC886eqZSClcuJhMgp-HCspBv4ZIDX6aouwqS7a9E index: true priority: '0.5' changefreq: '' diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml b/conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml index 8e55877d..6c02b483 100644 --- a/conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml +++ b/conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml @@ -1,3 +1,5 @@ +_core: + default_config_hash: sNJC886eqZSClcuJhMgp-HCspBv4ZIDX6aouwqS7a9E index: true priority: '0.5' changefreq: '' From 657162941e615a5a3279d9dfdd6557e994d02694 Mon Sep 17 00:00:00 2001 From: dire <4696381+dire@users.noreply.github.com> Date: Wed, 5 Jul 2023 12:51:42 +0300 Subject: [PATCH 26/27] Reverted unwanted changes. --- ...form_display.tpr_unit.tpr_unit.default.yml | 43 ++++++++-- ....field.node.landing_page.field_content.yml | 72 +++++++++++++---- .../field.field.node.page.field_content.yml | 77 +++++++++++++++--- ...ld.field.node.page.field_lower_content.yml | 80 +++++++++++++++---- 4 files changed, 225 insertions(+), 47 deletions(-) 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 index 90893dd1..546337c2 100644 --- 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 @@ -19,6 +19,7 @@ dependencies: - paragraphs - path - readonly_field_widget + - select2 _core: default_config_hash: cotjiL17Qafj5pirtPax237aflvFs_-3pKHSP6wblrg id: tpr_unit.tpr_unit.default @@ -116,6 +117,16 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + field_categories: + type: readonly_field_widget + weight: 39 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } field_content: type: paragraphs weight: 27 @@ -135,6 +146,16 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } + field_hs_front_page: + type: entity_reference_autocomplete + weight: 29 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } field_lower_content: type: paragraphs weight: 28 @@ -161,6 +182,16 @@ content: settings: sidebar: false third_party_settings: { } + field_study_field: + type: select2_entity_reference + weight: 31 + region: content + settings: + width: 100% + autocomplete: false + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } field_unit_type: type: entity_reference_autocomplete weight: 28 @@ -171,6 +202,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + hide_description: + type: boolean_checkbox + weight: 16 + region: content + settings: + display_label: true + third_party_settings: { } hide_sidebar_navigation: type: boolean_checkbox weight: 29 @@ -375,10 +413,5 @@ content: third_party_settings: { } hidden: created: true - field_categories: true field_districts: true - field_hs_front_page: true - field_study_field: true - hide_description: true ontologyword_ids: true - show_www: true diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index b155161d..555845b3 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -49,46 +49,61 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: - after_school_activity_search: after_school_activity_search + banner: banner + chart: chart + columns: columns + content_cards: content_cards + content_liftup: content_liftup daycare_search: daycare_search + event_list: event_list + from_library: from_library group_news: group_news group_news_archive: group_news_archive high_school_search: high_school_search - playground_search: playground_search - school_search: school_search - vocational_school_search: vocational_school_search - columns: columns - list_of_links: list_of_links - content_cards: content_cards - content_liftup: content_liftup - banner: banner liftup_with_image: liftup_with_image - from_library: from_library - chart: chart - remote_video: remote_video + list_of_links: list_of_links map: map news_list: news_list - event_list: event_list phasing: phasing popular_services: popular_services - target_group_links: target_group_links - unit_search: unit_search + remote_video: remote_video + school_search: school_search service_list: service_list service_list_search: service_list_search + target_group_links: target_group_links + unit_search: unit_search + vocational_school_search: vocational_school_search + after_school_activity_search: after_school_activity_search + playground_search: playground_search negate: 0 target_bundles_drag_drop: + accordion: + weight: 40 + enabled: false + accordion_item: + weight: 41 + enabled: false after_school_activity_search: weight: 0 enabled: true banner: weight: 0 enabled: true + calculator: + weight: 44 + enabled: false chart: weight: 0 enabled: true columns: weight: 0 enabled: true + contact_card: + weight: 47 + enabled: false + contact_card_listing: + weight: 48 + enabled: false content_cards: weight: 0 enabled: true @@ -110,15 +125,24 @@ settings: group_news_archive: weight: 0 enabled: true + hero: + weight: 56 + enabled: false high_school_search: weight: 0 enabled: true + image: + weight: 58 + enabled: false liftup_with_image: weight: 0 enabled: true list_of_links: weight: 0 enabled: true + list_of_links_item: + weight: 61 + enabled: false map: weight: 0 enabled: true @@ -128,9 +152,15 @@ settings: phasing: weight: 0 enabled: true + phasing_item: + weight: 65 + enabled: false playground_search: weight: 0 enabled: true + popular_service_item: + weight: 67 + enabled: false popular_services: weight: 0 enabled: true @@ -146,9 +176,21 @@ settings: service_list_search: weight: 0 enabled: true + sidebar_text: + weight: 72 + enabled: false + social_media_link: + weight: 73 + enabled: false + target_group_link_item: + weight: 74 + enabled: false target_group_links: weight: 0 enabled: true + text: + weight: 76 + enabled: false unit_search: weight: 0 enabled: true diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index 1c897e8a..d3798c9f 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -7,6 +7,7 @@ dependencies: - node.type.page - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner + - paragraphs.paragraphs_type.calculator - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.contact_card_listing @@ -29,7 +30,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: G8uqVofIIeSPJSEW4FPnQrwefO2xMZGnwlbcHrbpZ48 + default_config_hash: QzPUvR7cSwVLlIv2Wkmjn6T9gEZ-WD6hRta4Y-AShcE id: node.page.field_content field_name: field_content entity_type: node @@ -44,41 +45,51 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: - group_news: group_news - high_school_search: high_school_search - vocational_school_search: vocational_school_search - text: text - columns: columns - image: image accordion: accordion - list_of_links: list_of_links + banner: banner + chart: chart + columns: columns contact_card_listing: contact_card_listing content_cards: content_cards content_liftup: content_liftup - banner: banner event_list: event_list - news_list: news_list from_library: from_library + group_news: group_news + high_school_search: high_school_search + image: image + list_of_links: list_of_links + map: map + news_list: news_list phasing: phasing - chart: chart remote_video: remote_video - map: map + text: text unit_search: unit_search + vocational_school_search: vocational_school_search + calculator: calculator service_list_search: service_list_search negate: 0 target_bundles_drag_drop: accordion: weight: 0 enabled: true + accordion_item: + weight: 40 + enabled: false banner: weight: 0 enabled: true + calculator: + weight: 42 + enabled: true chart: weight: 0 enabled: true columns: weight: 0 enabled: true + contact_card: + weight: 45 + enabled: false contact_card_listing: weight: 0 enabled: true @@ -88,6 +99,9 @@ settings: content_liftup: weight: 0 enabled: true + daycare_search: + weight: 49 + enabled: false event_list: weight: 0 enabled: true @@ -97,15 +111,27 @@ settings: group_news: weight: 0 enabled: true + group_news_archive: + weight: 53 + enabled: false + hero: + weight: 54 + enabled: false high_school_search: weight: 0 enabled: true image: weight: 0 enabled: true + liftup_with_image: + weight: 57 + enabled: false list_of_links: weight: 0 enabled: true + list_of_links_item: + weight: 59 + enabled: false map: weight: 0 enabled: true @@ -115,12 +141,39 @@ settings: phasing: weight: 0 enabled: true + phasing_item: + weight: 63 + enabled: false + popular_service_item: + weight: 64 + enabled: false + popular_services: + weight: 65 + enabled: false remote_video: weight: 0 enabled: true + school_search: + weight: 67 + enabled: false + service_list: + weight: 68 + enabled: false service_list_search: weight: 0 enabled: true + sidebar_text: + weight: 70 + enabled: false + social_media_link: + weight: 71 + enabled: false + target_group_link_item: + weight: 72 + enabled: false + target_group_links: + weight: 73 + enabled: false text: weight: 0 enabled: true diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml index 85371d41..317a44d1 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -8,6 +8,7 @@ dependencies: - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.after_school_activity_search - paragraphs.paragraphs_type.banner + - paragraphs.paragraphs_type.calculator - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.contact_card_listing @@ -32,7 +33,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: AejXN443GE3b159k_6fsqDyZ_BHs68SU9wBMY24Ueog + default_config_hash: YD6Rdw1iEhjKEPsmTgUaoyfl5iIRhW7JsotBCZkhRv4 id: node.page.field_lower_content field_name: field_lower_content entity_type: node @@ -47,47 +48,57 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: - after_school_activity_search: after_school_activity_search - daycare_search: daycare_search - group_news: group_news - high_school_search: high_school_search - playground_search: playground_search - vocational_school_search: vocational_school_search - text: text - columns: columns - image: image accordion: accordion - list_of_links: list_of_links + banner: banner + chart: chart + columns: columns contact_card_listing: contact_card_listing content_cards: content_cards content_liftup: content_liftup - banner: banner + daycare_search: daycare_search event_list: event_list - news_list: news_list from_library: from_library - chart: chart + group_news: group_news + high_school_search: high_school_search + image: image + list_of_links: list_of_links + map: map + news_list: news_list phasing: phasing remote_video: remote_video - map: map + text: text unit_search: unit_search + vocational_school_search: vocational_school_search + after_school_activity_search: after_school_activity_search + calculator: calculator + playground_search: playground_search service_list_search: service_list_search negate: 0 target_bundles_drag_drop: accordion: weight: 0 enabled: true + accordion_item: + weight: 40 + enabled: false after_school_activity_search: weight: 0 enabled: true banner: weight: 0 enabled: true + calculator: + weight: 42 + enabled: true chart: weight: 0 enabled: true columns: weight: 0 enabled: true + contact_card: + weight: 45 + enabled: false contact_card_listing: weight: 0 enabled: true @@ -109,15 +120,27 @@ settings: group_news: weight: 0 enabled: true + group_news_archive: + weight: 53 + enabled: false + hero: + weight: 54 + enabled: false high_school_search: weight: 0 enabled: true image: weight: 0 enabled: true + liftup_with_image: + weight: 57 + enabled: false list_of_links: weight: 0 enabled: true + list_of_links_item: + weight: 59 + enabled: false map: weight: 0 enabled: true @@ -127,15 +150,42 @@ settings: phasing: weight: 0 enabled: true + phasing_item: + weight: 63 + enabled: false playground_search: weight: 0 enabled: true + popular_service_item: + weight: 64 + enabled: false + popular_services: + weight: 65 + enabled: false remote_video: weight: 0 enabled: true + school_search: + weight: 67 + enabled: false + service_list: + weight: 68 + enabled: false service_list_search: weight: 0 enabled: true + sidebar_text: + weight: 70 + enabled: false + social_media_link: + weight: 71 + enabled: false + target_group_link_item: + weight: 72 + enabled: false + target_group_links: + weight: 73 + enabled: false text: weight: 0 enabled: true From b5c89e371d6ad643240ceeb93473d1a58cf47a3e Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 12 Jul 2023 05:34:26 +0000 Subject: [PATCH 27/27] Update configuration --- composer.lock | 122 ++++++++++-------- ...form_display.node.announcement.default.yml | 2 +- ...form_display.node.landing_page.default.yml | 2 +- ...form_display.tpr_unit.tpr_unit.default.yml | 12 +- ...cookie_compliance.cookie_category.chat.yml | 4 +- conf/cmi/filter.format.full_html.yml | 4 +- ...cookie_compliance.cookie_category.chat.yml | 2 +- ...cookie_compliance.cookie_category.chat.yml | 2 +- 8 files changed, 81 insertions(+), 69 deletions(-) diff --git a/composer.lock b/composer.lock index 3aa9a6e4..8bef24da 100644 --- a/composer.lock +++ b/composer.lock @@ -2108,16 +2108,16 @@ }, { "name": "drupal/core", - "version": "9.5.9", + "version": "9.5.10", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "c3b194f9056a297f6d72e54056c818843cab9aba" + "reference": "c84bab7403943fbc4ed90ffcdde4460a94642b06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/c3b194f9056a297f6d72e54056c818843cab9aba", - "reference": "c3b194f9056a297f6d72e54056c818843cab9aba", + "url": "https://api.github.com/repos/drupal/core/zipball/c84bab7403943fbc4ed90ffcdde4460a94642b06", + "reference": "c84bab7403943fbc4ed90ffcdde4460a94642b06", "shasum": "" }, "require": { @@ -2269,9 +2269,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.5.9" + "source": "https://github.com/drupal/core/tree/9.5.10" }, - "time": "2023-05-03T13:26:12+00:00" + "time": "2023-07-05T09:26:59+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -2702,7 +2702,7 @@ "homepage": "https://www.drupal.org/user/3094661" }, { - "name": "RenatoG", + "name": "renatog", "homepage": "https://www.drupal.org/user/3326031" }, { @@ -3698,17 +3698,17 @@ }, { "name": "drupal/focal_point", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/focal_point.git", - "reference": "2.0.0" + "reference": "2.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/focal_point-2.0.0.zip", - "reference": "2.0.0", - "shasum": "ff677594c632b4b87aaace39a90a8cdf48ec3ed4" + "url": "https://ftp.drupal.org/files/projects/focal_point-2.0.1.zip", + "reference": "2.0.1", + "shasum": "2af4bb7f305735adbc216de742f0fa02bba6457b" }, "require": { "drupal/core": "^9.3 || ^10", @@ -3722,8 +3722,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1681277837", + "version": "2.0.1", + "datestamp": "1689093654", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3986,16 +3986,16 @@ }, { "name": "drupal/hdbt", - "version": "5.4.8", + "version": "5.4.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "23f279fa95516444766b092a9ffbc910230395fe" + "reference": "e01ee76d87f8d93759f34de45716c72f89282852" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/23f279fa95516444766b092a9ffbc910230395fe", - "reference": "23f279fa95516444766b092a9ffbc910230395fe", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e01ee76d87f8d93759f34de45716c72f89282852", + "reference": "e01ee76d87f8d93759f34de45716c72f89282852", "shasum": "" }, "require": { @@ -4013,23 +4013,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.4.8", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.4.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-06-30T06:23:42+00:00" + "time": "2023-07-12T05:31:39+00:00" }, { "name": "drupal/hdbt_admin", - "version": "2.0.9", + "version": "2.0.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "391983675279b504ef09ea9bb98a28245bd42ed4" + "reference": "e7c3e4a71a4a3cc15302979feca014b4ef3d0155" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/391983675279b504ef09ea9bb98a28245bd42ed4", - "reference": "391983675279b504ef09ea9bb98a28245bd42ed4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/e7c3e4a71a4a3cc15302979feca014b4ef3d0155", + "reference": "e7c3e4a71a4a3cc15302979feca014b4ef3d0155", "shasum": "" }, "require": { @@ -4037,7 +4037,7 @@ "drupal/gin": "3.0.0-rc3" }, "conflict": { - "drupal/helfi_platform_config": "<3.0" + "drupal/helfi_platform_config": "<3.1.12" }, "type": "drupal-theme", "license": [ @@ -4048,10 +4048,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/2.0.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/2.0.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2023-06-08T06:52:48+00:00" + "time": "2023-07-07T14:29:20+00:00" }, { "name": "drupal/health_check", @@ -4105,16 +4105,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.15", + "version": "2.4.16", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "b1782248c7b28101581d42a84763ec029acacb3c" + "reference": "82ee1db1d99eb46a8c3e2ce5b88a0f6df204e383" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/b1782248c7b28101581d42a84763ec029acacb3c", - "reference": "b1782248c7b28101581d42a84763ec029acacb3c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/82ee1db1d99eb46a8c3e2ce5b88a0f6df204e383", + "reference": "82ee1db1d99eb46a8c3e2ce5b88a0f6df204e383", "shasum": "" }, "require": { @@ -4140,10 +4140,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.15", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.16", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-06-21T10:52:50+00:00" + "time": "2023-07-10T06:57:27+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4246,16 +4246,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.1.8", + "version": "3.1.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "9851169899630c1b9f62a065a7829e6dbca7cc6c" + "reference": "eba9800c0b87d8662b649136ed98b8d2b83c2469" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9851169899630c1b9f62a065a7829e6dbca7cc6c", - "reference": "9851169899630c1b9f62a065a7829e6dbca7cc6c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/eba9800c0b87d8662b649136ed98b8d2b83c2469", + "reference": "eba9800c0b87d8662b649136ed98b8d2b83c2469", "shasum": "" }, "require": { @@ -4358,10 +4358,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.1.8", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.1.12", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-07-04T06:10:59+00:00" + "time": "2023-07-07T14:20:32+00:00" }, { "name": "drupal/helfi_proxy", @@ -5008,17 +5008,17 @@ }, { "name": "drupal/linkit", - "version": "6.0.0-rc2", + "version": "6.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.0.0-rc2" + "reference": "6.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-rc2.zip", - "reference": "6.0.0-rc2", - "shasum": "69274e63d5312594cb3444656c6a0ec3800d0df4" + "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0.zip", + "reference": "6.0.0", + "shasum": "3c4143eb797abee04e5af47eb1885a65e6321b51" }, "require": { "drupal/core": "^9.4 || ^10.0.0" @@ -5033,11 +5033,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.0-rc2", - "datestamp": "1688055675", + "version": "6.0.0", + "datestamp": "1688748025", "security-coverage": { - "status": "not-covered", - "message": "RC releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -7064,17 +7064,17 @@ }, { "name": "drupal/views_infinite_scroll", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_infinite_scroll.git", - "reference": "2.0.1" + "reference": "2.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-2.0.1.zip", - "reference": "2.0.1", - "shasum": "c57a2c63f00c53a9ee7e741c7f37df21eb9e76de" + "url": "https://ftp.drupal.org/files/projects/views_infinite_scroll-2.0.2.zip", + "reference": "2.0.2", + "shasum": "8b2b935d1e5d94d7ad068d099512d3b915efb41f" }, "require": { "drupal/core": "^9.2 || ^10" @@ -7082,8 +7082,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.1", - "datestamp": "1664716655", + "version": "2.0.2", + "datestamp": "1689001933", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7095,6 +7095,14 @@ "GPL-2.0-or-later" ], "authors": [ + { + "name": "Anybody", + "homepage": "https://www.drupal.org/user/291091" + }, + { + "name": "Grevil", + "homepage": "https://www.drupal.org/user/3668491" + }, { "name": "Honza Pobořil", "homepage": "https://www.drupal.org/user/123612" @@ -7110,6 +7118,10 @@ { "name": "Sam152", "homepage": "https://www.drupal.org/user/1485048" + }, + { + "name": "thomas.frobieter", + "homepage": "https://www.drupal.org/user/409335" } ], "description": "A pager which allows an infinite scroll effect for views.", diff --git a/conf/cmi/core.entity_form_display.node.announcement.default.yml b/conf/cmi/core.entity_form_display.node.announcement.default.yml index 19ddbd00..f7d866b2 100644 --- a/conf/cmi/core.entity_form_display.node.announcement.default.yml +++ b/conf/cmi/core.entity_form_display.node.announcement.default.yml @@ -126,9 +126,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 + region: content settings: { } third_party_settings: { } - region: content status: type: boolean_checkbox weight: 9 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 index 289dc2d4..8252dbdc 100644 --- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 + region: content settings: { } third_party_settings: { } - region: content status: type: boolean_checkbox weight: 12 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 index 546337c2..e6913e62 100644 --- 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 @@ -89,8 +89,8 @@ content: third_party_settings: { } contacts: type: readonly_field_widget - region: content weight: 36 + region: content settings: label: above formatter_type: null @@ -218,8 +218,8 @@ content: third_party_settings: { } highlights: type: readonly_field_widget - region: content weight: 32 + region: content settings: label: above formatter_type: null @@ -245,8 +245,8 @@ content: third_party_settings: { } links: type: readonly_field_widget - region: content weight: 35 + region: content settings: label: above formatter_type: null @@ -283,8 +283,8 @@ content: third_party_settings: { } opening_hours: type: readonly_field_widget - region: content weight: 31 + region: content settings: label: above formatter_type: null @@ -293,8 +293,8 @@ content: third_party_settings: { } other_info: type: readonly_field_widget - region: content weight: 33 + region: content settings: label: above formatter_type: null @@ -336,8 +336,8 @@ content: third_party_settings: { } price_info: type: readonly_field_widget - region: content weight: 34 + region: content settings: label: above formatter_type: null diff --git a/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/eu_cookie_compliance.cookie_category.chat.yml index 4d67291b..dbeab8c4 100644 --- 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: "

The chats on the hel.fi  website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.  No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.

\r\n\r\n\r\n\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n
NameProviderPurpose of the cookieValidityType
_genesys.widgets.*hel.fiUsed for storing data required by the chat functionality.Session 
__VCAP_ID__coh-chat-app-prod.eu-de.mybluemix.netUsed for storing data required by the chat functionality.SessionThird party
gcReturnSessionId 
\r\n\t\t\tgcAlternativeReturnUrl 
\r\n\t\t\tgcReturnUrl 
\r\n\t\t\tgcLoginButtonState		hel.fiUsed for authentication in the chat.Session\r\n\t\t\t

 

\r\n\t\t\t
leijuke.*hel.fiUsed for storing data required by the chat functionality.Session 
connect.sidhel-thk-botti.kuurahealth.comThe Kuura cookie is used to save necessary data.SessionThird party
\r\n" + value: "

The chats on the hel.fi  website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires.  No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.

\r\n\r\n\r\n\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n
NameProviderPurpose of the cookieValidityType
_genesys.widgets.*hel.fiUsed for storing data required by the chat functionality.Session 
__VCAP_ID__coh-chat-app-prod.eu-de.mybluemix.netUsed for storing data required by the chat functionality.SessionThird party
gcReturnSessionId 
\r\n\t\t\tgcAlternativeReturnUrl 
\r\n\t\t\tgcReturnUrl 
\r\n\t\t\tgcLoginButtonState		hel.fiUsed for authentication in the chat.Session\r\n\t\t\t

 

\r\n\t\t\t
leijuke.*hel.fiUsed for storing data required by the chat functionality.Session 
\r\n" format: full_html checkbox_default_state: unchecked weight: -5 diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml index f0f7c87f..0ff5e274 100644 --- a/conf/cmi/filter.format.full_html.yml +++ b/conf/cmi/filter.format.full_html.yml @@ -7,7 +7,7 @@ dependencies: - helfi_api_base - linkit _core: - default_config_hash: nhRyMD2DLIUZvFqqCGT5FZbfF9HUbPbm_B7Uz8-6E_E + default_config_hash: r40X436d0Agm1ErbO2TcpT46WfZZpxxplT_X72ju3d4 name: HTML format: full_html weight: 0 @@ -24,7 +24,7 @@ filters: status: true weight: -50 settings: - allowed_html: '