From 5e5594f99ba11460059b6b1fd88766ac94a69d7b Mon Sep 17 00:00:00 2001 From: Richard Davies Date: Tue, 9 Apr 2024 15:56:10 -0700 Subject: [PATCH] PE-526 Upgrade Group module to v2.2.2 (#569) --- .circleci/config.yml | 2 +- .lando.yml | 2 +- composer.json | 13 +- composer.lock | 348 +++++++++++------- .../Controller/GroupMembershipController.php | 9 +- .../views/filter/GroupIsCurrentUserMember.php | 2 +- .../portland_groups.links.task.yml | 4 +- .../portland_groups/portland_groups.module | 37 +- .../PortlandGroupMediaController.php | 42 ++- ...> PortlandGroupRelationshipController.php} | 67 ++-- .../src/Routing/RouteSubscriber.php | 13 +- .../src/Util/PortlandOpenIdConnectUtil.php | 15 +- ...ty_form_display.group.employee.default.yml | 4 +- web/sites/default/config/core.extension.yml | 2 + ...ent_type.employee-group_media-document.yml | 2 - ...ntent_type.employee-group_media-iframe.yml | 2 - ...ontent_type.employee-group_media-image.yml | 2 - ...content_type.employee-group_membership.yml | 2 - ...ntent_type.employee-group_node-contact.yml | 2 - ...tent_type.employee-group_node-contract.yml | 2 - ...content_type.employee-group_node-event.yml | 2 - ....content_type.employee-group_node-news.yml | 2 - ..._type.employee-group_node-notification.yml | 2 - ....content_type.employee-group_node-page.yml | 2 - ...tent_type.employee-group_node-resource.yml | 2 - ..._type.group_content_type_239b9708ace62.yml | 2 - ..._type.group_content_type_806a8587fb787.yml | 2 - ..._type.group_content_type_80cc2ea82cd65.yml | 2 - ..._type.group_content_type_857fcdcbb71b0.yml | 2 - ..._type.group_content_type_c00266c9378ba.yml | 2 - ...tent_type.private-group_media-document.yml | 2 - ...ontent_type.private-group_media-iframe.yml | 2 - ...content_type.private-group_media-image.yml | 2 - ..._type.private-group_media-remote_video.yml | 2 - ....content_type.private-group_membership.yml | 2 - ...ontent_type.private-group_node-contact.yml | 2 - ....content_type.private-group_node-event.yml | 2 - ...p.content_type.private-group_node-news.yml | 2 - ...t_type.private-group_node-notification.yml | 2 - ...p.content_type.private-group_node-page.yml | 2 - ...ntent_type.private-group_node-resource.yml | 2 - .../config/group.role.employee-1ab877bcd.yml | 17 - .../config/group.role.employee-3e5cf4b4d.yml | 17 - .../config/group.role.employee-631a7fe0a.yml | 17 - .../config/group.role.employee-855450a16.yml | 17 - .../config/group.role.employee-a416e6833.yml | 17 - .../config/group.role.employee-admin.yml | 49 ++- .../config/group.role.employee-anonymous.yml | 7 +- .../config/group.role.employee-assigned.yml | 7 +- .../config/group.role.employee-dd1e716cc.yml | 7 +- .../config/group.role.employee-editor.yml | 32 +- .../config/group.role.employee-employee.yml | 7 +- .../config/group.role.employee-following.yml | 7 +- .../config/group.role.employee-member.yml | 8 +- .../config/group.role.employee-outsider.yml | 8 +- .../config/group.role.employee-reviewer.yml | 32 +- ...up.role.employee-site_administrator_in.yml | 15 + ...p.role.employee-site_administrator_out.yml | 15 + .../config/group.role.private-1ab877bcd.yml | 17 - .../config/group.role.private-3e5cf4b4d.yml | 17 - .../config/group.role.private-631a7fe0a.yml | 17 - .../config/group.role.private-855450a16.yml | 17 - .../config/group.role.private-a416e6833.yml | 17 - .../config/group.role.private-admin.yml | 48 ++- .../config/group.role.private-anonymous.yml | 7 +- .../config/group.role.private-assigned.yml | 7 +- .../config/group.role.private-dd1e716cc.yml | 7 +- .../config/group.role.private-editor.yml | 30 +- .../config/group.role.private-employee.yml | 7 +- .../config/group.role.private-member.yml | 8 +- .../config/group.role.private-outsider.yml | 7 +- .../config/group.role.private-reviewer.yml | 31 +- ...oup.role.private-site_administrator_in.yml | 15 + ...up.role.private-site_administrator_out.yml | 15 + .../config/openid_connect.settings.azure.yml | 9 + .../config/search_api.index.full_index.yml | 3 +- .../config/views.view.featured_news.yml | 29 ++ .../config/views.view.group_events.yml | 8 +- .../config/views.view.group_list_views.yml | 2 +- .../default/config/views.view.group_media.yml | 16 +- .../config/views.view.group_members.yml | 30 +- .../default/config/views.view.group_menu.yml | 8 +- .../default/config/views.view.group_nodes.yml | 14 +- .../views.view.manage_group_content.yml | 2 +- .../default/config/views.view.my_content.yml | 8 +- .../default/config/views.view.my_groups.yml | 4 +- .../default/config/views.view.my_media.yml | 8 +- .../config/views.view.notifications.yml | 2 +- 88 files changed, 726 insertions(+), 577 deletions(-) rename web/modules/custom/portland_groups/src/Controller/{PortlandGroupContentController.php => PortlandGroupRelationshipController.php} (54%) delete mode 100644 web/sites/default/config/group.role.employee-1ab877bcd.yml delete mode 100644 web/sites/default/config/group.role.employee-3e5cf4b4d.yml delete mode 100644 web/sites/default/config/group.role.employee-631a7fe0a.yml delete mode 100644 web/sites/default/config/group.role.employee-855450a16.yml delete mode 100644 web/sites/default/config/group.role.employee-a416e6833.yml create mode 100644 web/sites/default/config/group.role.employee-site_administrator_in.yml create mode 100644 web/sites/default/config/group.role.employee-site_administrator_out.yml delete mode 100644 web/sites/default/config/group.role.private-1ab877bcd.yml delete mode 100644 web/sites/default/config/group.role.private-3e5cf4b4d.yml delete mode 100644 web/sites/default/config/group.role.private-631a7fe0a.yml delete mode 100644 web/sites/default/config/group.role.private-855450a16.yml delete mode 100644 web/sites/default/config/group.role.private-a416e6833.yml create mode 100644 web/sites/default/config/group.role.private-site_administrator_in.yml create mode 100644 web/sites/default/config/group.role.private-site_administrator_out.yml create mode 100644 web/sites/default/config/openid_connect.settings.azure.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 4a0b5c5c9..7bf22d7a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -225,7 +225,7 @@ build_and_deploy: &build_and_deploy # Run the equivalent of a drush deploy echo "Rebuilding cache..." - terminus drush $CIRCLE_PROJECT_REPONAME.$PANTHEON_ENV -- cr + terminus drush $CIRCLE_PROJECT_REPONAME.$PANTHEON_ENV -- cr || true echo "Running database updates..." terminus drush $CIRCLE_PROJECT_REPONAME.$PANTHEON_ENV -- updb -y echo "Importing config..." diff --git a/.lando.yml b/.lando.yml index a954c11e1..7479d00b8 100644 --- a/.lando.yml +++ b/.lando.yml @@ -124,7 +124,7 @@ tooling: - appserver: echo "Installing Composer dependencies..." - appserver: composer install -d /app - appserver: echo "Clearing cache..." - - appserver: drush cr -y + - appserver: drush cr -y || true - appserver: echo "Run drush updb -y..." - appserver: drush updb -y - appserver: echo "Run drush cim -y..." diff --git a/composer.json b/composer.json index 0cb2e8e04..bbec9e92e 100644 --- a/composer.json +++ b/composer.json @@ -40,10 +40,11 @@ "drupal/field_group": "^3.1", "drupal/field_permissions": "^1.1", "drupal/field_states_ui": "^3.0", + "drupal/flexible_permissions": "^1.1", "drupal/google_tag": "^1.4", - "drupal/group": "^1.2", + "drupal/group": "^2.2", "drupal/group_notifications": "^1.0@beta", - "drupal/groupmedia": "^2.0", + "drupal/groupmedia": "^3.0", "drupal/image_effects": "^3.2", "drupal/image_widget_crop": "^2.4", "drupal/imagemagick": "^3.3", @@ -218,12 +219,9 @@ "3325538 - Remove extra strings added to the environment title": "https://www.drupal.org/files/issues/2022-12-06/remove_environment_identifier_0.patch" }, "drupal/group": { - "2842630 - Empty page when trying to create group node": "https://www.drupal.org/files/issues/2019-01-04/2842630-20.patch", "3020883 - Use VBO together with group permission": "https://www.drupal.org/files/issues/2020-08-17/3020883-22.patch", - "3256998 - Access to Revisions of Group Content is Broken": "https://www.drupal.org/files/issues/2022-02-09/group-fix-group-revisions-3256998-22_0.patch", - "3210808 - uasort deprecation in PHP 8": "https://www.drupal.org/files/issues/2021-04-26/uasort-comparison-3210808-2.patch", "3029908 - Add revisions tab on groups (Groups have two revisions tabs)": "https://www.drupal.org/files/issues/2023-08-24/groups-have-two-revisions-tabs.patch", - "3336280 - avoid fatal error when group argument to GroupAccessResult:: allowedIfHasGroupPermissions() is NULL": "https://www.drupal.org/files/issues/2023-01-24/group-3336280-3.patch" + "3336280 - avoid fatal error when group argument to GroupAccessResult:: allowedIfHasGroupPermissions() is NULL": "https://git.drupalcode.org/project/group/-/merge_requests/121.patch" }, "drupal/group_notifications": { "3287817 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2022-06-15/group_notifications.1.x-dev.rector.patch" @@ -231,6 +229,9 @@ "drupal/media_entity_download": { "3059830 - Make link title editable / add token support / more options - feature/WCOR-1199": "https://www.drupal.org/files/issues/2022-03-25/3059830-make-link-title-15.patch" }, + "drupal/media_revisions_ui": { + "3428662 - Drupal 10.1: Revisions tab appears twice on media": "https://www.drupal.org/files/issues/2024-03-15/media_duplicate_revision_tabs.patch" + }, "drupal/openid_connect_windows_aad": { "Custom patch to use scope, and 3159055 - Option to use concatenation of givenName and surname instead of default name": "patches/powr2529-openid-connect-windows-aad-4.patch" }, diff --git a/composer.lock b/composer.lock index 7684b96aa..97c586974 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": "907983a58c8dc3cc214866ed56cefb64", + "content-hash": "8711a401e390cc952a8470f6d7eb37b5", "packages": [ { "name": "algolia/places", @@ -82,7 +82,7 @@ "version": "v4.1.0", "source": { "type": "git", - "url": "https://github.com/fengyuanchen/cropper.git", + "url": "git@github.com:fengyuanchen/cropper.git", "reference": "617d9bdb8688cc4edb3b03bc49a04b83c7facbe7" }, "dist": { @@ -1302,16 +1302,16 @@ }, { "name": "doctrine/collections", - "version": "2.1.4", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "72328a11443a0de79967104ad36ba7b30bded134" + "reference": "420480fc085bc65f3c956af13abe8e7546f94813" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/72328a11443a0de79967104ad36ba7b30bded134", - "reference": "72328a11443a0de79967104ad36ba7b30bded134", + "url": "https://api.github.com/repos/doctrine/collections/zipball/420480fc085bc65f3c956af13abe8e7546f94813", + "reference": "420480fc085bc65f3c956af13abe8e7546f94813", "shasum": "" }, "require": { @@ -1323,7 +1323,7 @@ "ext-json": "*", "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^10.5", "vimeo/psalm": "^5.11" }, "type": "library", @@ -1368,7 +1368,7 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/2.1.4" + "source": "https://github.com/doctrine/collections/tree/2.2.1" }, "funding": [ { @@ -1384,7 +1384,7 @@ "type": "tidelift" } ], - "time": "2023-10-03T09:22:33+00:00" + "time": "2024-03-05T22:28:45+00:00" }, { "name": "doctrine/common", @@ -1695,16 +1695,16 @@ }, { "name": "doctrine/persistence", - "version": "3.2.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "63fee8c33bef740db6730eb2a750cd3da6495603" + "reference": "b6fd1f126b13c1f7e7321f7338b14a19116b5de4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/63fee8c33bef740db6730eb2a750cd3da6495603", - "reference": "63fee8c33bef740db6730eb2a750cd3da6495603", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/b6fd1f126b13c1f7e7321f7338b14a19116b5de4", + "reference": "b6fd1f126b13c1f7e7321f7338b14a19116b5de4", "shasum": "" }, "require": { @@ -1773,7 +1773,7 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/3.2.0" + "source": "https://github.com/doctrine/persistence/tree/3.3.1" }, "funding": [ { @@ -1789,7 +1789,7 @@ "type": "tidelift" } ], - "time": "2023-05-17T18:32:04+00:00" + "time": "2024-03-01T19:53:13+00:00" }, { "name": "drupal/add_content_by_bundle", @@ -3314,6 +3314,14 @@ "homepage": "https://www.drupal.org/u/greg-boggs", "role": "Maintainer" }, + { + "name": "diamondsea", + "homepage": "https://www.drupal.org/user/430714" + }, + { + "name": "Greg Boggs", + "homepage": "https://www.drupal.org/user/153069" + }, { "name": "hmartens", "homepage": "https://www.drupal.org/user/622826" @@ -4269,6 +4277,58 @@ "source": "https://git.drupalcode.org/project/file_mdm" } }, + { + "name": "drupal/flexible_permissions", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/flexible_permissions.git", + "reference": "1.1.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/flexible_permissions-1.1.0.zip", + "reference": "1.1.0", + "shasum": "cfda615388131e96a5cf3fce1f24b1c220f91fce" + }, + "require": { + "drupal/core": "^9.5 || ^10", + "drupal/variationcache": "^1.0" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.1.0", + "datestamp": "1697027409", + "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/google_tag", "version": "1.6.0", @@ -4331,28 +4391,28 @@ }, { "name": "drupal/group", - "version": "1.6.0", + "version": "2.2.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/group.git", - "reference": "8.x-1.6" + "reference": "2.2.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/group-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "f9559b6e79db8420f9d13e9d4b2387b3a66fd03b" + "url": "https://ftp.drupal.org/files/projects/group-2.2.2.zip", + "reference": "2.2.2", + "shasum": "5089d715ac1cdcfae994c3c8d2290fe3e5679f99" }, "require": { "drupal/core": "^9.5 || ^10", - "drupal/entity": "^1.4", - "drupal/variationcache": "^1.3" + "drupal/entity": "^1.2", + "drupal/flexible_permissions": "^1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.6", - "datestamp": "1693382492", + "version": "2.2.2", + "datestamp": "1701886934", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4375,7 +4435,7 @@ } ], "description": "This module allows you to group users, content and other entities", - "homepage": "https://drupal.org/project/group", + "homepage": "http://drupal.org/project/group", "support": { "source": "https://git.drupalcode.org/project/group", "issues": "https://drupal.org/project/issues/group" @@ -4440,21 +4500,21 @@ }, { "name": "drupal/groupmedia", - "version": "2.2.0", + "version": "3.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/groupmedia.git", - "reference": "8.x-2.2" + "reference": "3.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/groupmedia-8.x-2.2.zip", - "reference": "8.x-2.2", - "shasum": "b5effa65b97efba070f997f36dfa722bee421d38" + "url": "https://ftp.drupal.org/files/projects/groupmedia-3.0.2.zip", + "reference": "3.0.2", + "shasum": "e604b8c2496fbbfcbfe94247160df5eb88a389d7" }, "require": { "drupal/core": "^9 || ^10", - "drupal/group": "^1.5" + "drupal/group": "^2.0" }, "require-dev": { "drupal/paragraphs": "*", @@ -4463,8 +4523,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.2", - "datestamp": "1694467355", + "version": "3.0.2", + "datestamp": "1694467559", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4473,7 +4533,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "authors": [ { @@ -6758,29 +6818,30 @@ }, { "name": "drupal/quick_node_clone", - "version": "1.16.0", + "version": "1.18.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/quick_node_clone.git", - "reference": "8.x-1.16" + "reference": "8.x-1.18" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/quick_node_clone-8.x-1.16.zip", - "reference": "8.x-1.16", - "shasum": "44cc517788cf2d9613fd2070b1aa9e62627c5e1c" + "url": "https://ftp.drupal.org/files/projects/quick_node_clone-8.x-1.18.zip", + "reference": "8.x-1.18", + "shasum": "ab17077eccb24e5c651fedc5056a50051882a13d" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" }, "require-dev": { + "drupal/group": "^1 || ^2 || ^3", "drupal/paragraphs": "1.x-dev" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.16", - "datestamp": "1678754974", + "version": "8.x-1.18", + "datestamp": "1707833857", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7039,6 +7100,7 @@ }, { "name": "Sohail Lajevardi", + "homepage": "https://www.drupal.org/user/571032", "email": "doxigo@gmail.com", "role": "Maintainer" } @@ -8983,17 +9045,17 @@ }, { "name": "drupal/variationcache", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/variationcache.git", - "reference": "8.x-1.4" + "reference": "8.x-1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/variationcache-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "b9796b1ec71862a5fd84611642783a757045aa98" + "url": "https://ftp.drupal.org/files/projects/variationcache-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "6165baee8c6fe5a7773f3499896e8fb464607a32" }, "require": { "drupal/core": "^9.5 || ^10" @@ -9001,8 +9063,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1701774123", + "version": "8.x-1.5", + "datestamp": "1705485386", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -12933,16 +12995,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -12987,7 +13049,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" }, "funding": [ { @@ -12995,7 +13057,7 @@ "type": "github" } ], - "time": "2023-05-07T05:35:17+00:00" + "time": "2024-03-02T06:30:58+00:00" }, { "name": "signature_pad/signature_pad", @@ -13199,16 +13261,16 @@ }, { "name": "symfony/console", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e" + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", + "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", "shasum": "" }, "require": { @@ -13273,7 +13335,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.3" + "source": "https://github.com/symfony/console/tree/v6.4.4" }, "funding": [ { @@ -13289,20 +13351,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "6871811c5a5c5e180244ddb689746446db02c05b" + "reference": "6236e5e843cb763e9d0f74245678b994afea5363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6871811c5a5c5e180244ddb689746446db02c05b", - "reference": "6871811c5a5c5e180244ddb689746446db02c05b", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6236e5e843cb763e9d0f74245678b994afea5363", + "reference": "6236e5e843cb763e9d0f74245678b994afea5363", "shasum": "" }, "require": { @@ -13354,7 +13416,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.3" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.4" }, "funding": [ { @@ -13370,7 +13432,7 @@ "type": "tidelift" } ], - "time": "2024-01-30T08:32:12+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/deprecation-contracts", @@ -13441,16 +13503,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6" + "reference": "c725219bdf2afc59423c32793d5019d2a904e13a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/6dc3c76a278b77f01d864a6005d640822c6f26a6", - "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/c725219bdf2afc59423c32793d5019d2a904e13a", + "reference": "c725219bdf2afc59423c32793d5019d2a904e13a", "shasum": "" }, "require": { @@ -13496,7 +13558,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.3" + "source": "https://github.com/symfony/error-handler/tree/v6.4.4" }, "funding": [ { @@ -13512,7 +13574,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:40:36+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/event-dispatcher", @@ -13799,16 +13861,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9" + "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5677bdf7cade4619cb17fc9e1e7b31ec392244a9", - "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ebc713bc6e6f4b53f46539fc158be85dfcd77304", + "reference": "ebc713bc6e6f4b53f46539fc158be85dfcd77304", "shasum": "" }, "require": { @@ -13856,7 +13918,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.3" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.4" }, "funding": [ { @@ -13872,20 +13934,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-08T15:01:18+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.3", + "version": "v6.4.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2" + "reference": "f6947cb939d8efee137797382cb4db1af653ef75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9c6ec4e543044f7568a53a76ab1484ecd30637a2", - "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6947cb939d8efee137797382cb4db1af653ef75", + "reference": "f6947cb939d8efee137797382cb4db1af653ef75", "shasum": "" }, "require": { @@ -13934,7 +13996,7 @@ "symfony/process": "^5.4|^6.0|^7.0", "symfony/property-access": "^5.4.5|^6.0.5|^7.0", "symfony/routing": "^5.4|^6.0|^7.0", - "symfony/serializer": "^6.3|^7.0", + "symfony/serializer": "^6.4.4|^7.0.4", "symfony/stopwatch": "^5.4|^6.0|^7.0", "symfony/translation": "^5.4|^6.0|^7.0", "symfony/translation-contracts": "^2.5|^3", @@ -13969,7 +14031,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.3" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.5" }, "funding": [ { @@ -13985,20 +14047,20 @@ "type": "tidelift" } ], - "time": "2024-01-31T07:21:29+00:00" + "time": "2024-03-04T21:00:47+00:00" }, { "name": "symfony/mailer", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "74412c62f88a85a41b61f0b71ab0afcaad6f03ee" + "reference": "791c5d31a8204cf3db0c66faab70282307f4376b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/74412c62f88a85a41b61f0b71ab0afcaad6f03ee", - "reference": "74412c62f88a85a41b61f0b71ab0afcaad6f03ee", + "url": "https://api.github.com/repos/symfony/mailer/zipball/791c5d31a8204cf3db0c66faab70282307f4376b", + "reference": "791c5d31a8204cf3db0c66faab70282307f4376b", "shasum": "" }, "require": { @@ -14049,7 +14111,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.4.3" + "source": "https://github.com/symfony/mailer/tree/v6.4.4" }, "funding": [ { @@ -14065,7 +14127,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:01:07+00:00" + "time": "2024-02-03T21:33:47+00:00" }, { "name": "symfony/mime", @@ -14962,16 +15024,16 @@ }, { "name": "symfony/process", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "31642b0818bfcff85930344ef93193f8c607e0a3" + "reference": "710e27879e9be3395de2b98da3f52a946039f297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/31642b0818bfcff85930344ef93193f8c607e0a3", - "reference": "31642b0818bfcff85930344ef93193f8c607e0a3", + "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", + "reference": "710e27879e9be3395de2b98da3f52a946039f297", "shasum": "" }, "require": { @@ -15003,7 +15065,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.3" + "source": "https://github.com/symfony/process/tree/v6.4.4" }, "funding": [ { @@ -15019,7 +15081,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-20T12:31:00+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -15106,16 +15168,16 @@ }, { "name": "symfony/routing", - "version": "v6.4.3", + "version": "v6.4.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842" + "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/3b2957ad54902f0f544df83e3d58b38d7e8e5842", - "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842", + "url": "https://api.github.com/repos/symfony/routing/zipball/7fe30068e207d9c31c0138501ab40358eb2d49a4", + "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4", "shasum": "" }, "require": { @@ -15169,7 +15231,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.3" + "source": "https://github.com/symfony/routing/tree/v6.4.5" }, "funding": [ { @@ -15185,20 +15247,20 @@ "type": "tidelift" } ], - "time": "2024-01-30T13:55:02+00:00" + "time": "2024-02-27T12:33:30+00:00" }, { "name": "symfony/serializer", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "51a06ee93c4d5ab5b9edaa0635d8b83953e3c14d" + "reference": "88da7f8fe03c5f4c2a69da907f1de03fab2e6872" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/51a06ee93c4d5ab5b9edaa0635d8b83953e3c14d", - "reference": "51a06ee93c4d5ab5b9edaa0635d8b83953e3c14d", + "url": "https://api.github.com/repos/symfony/serializer/zipball/88da7f8fe03c5f4c2a69da907f1de03fab2e6872", + "reference": "88da7f8fe03c5f4c2a69da907f1de03fab2e6872", "shasum": "" }, "require": { @@ -15267,7 +15329,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.4.3" + "source": "https://github.com/symfony/serializer/tree/v6.4.4" }, "funding": [ { @@ -15283,7 +15345,7 @@ "type": "tidelift" } ], - "time": "2024-01-30T08:32:12+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/service-contracts", @@ -15369,16 +15431,16 @@ }, { "name": "symfony/string", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7a14736fb179876575464e4658fce0c304e8c15b" + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7a14736fb179876575464e4658fce0c304e8c15b", - "reference": "7a14736fb179876575464e4658fce0c304e8c15b", + "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", "shasum": "" }, "require": { @@ -15435,7 +15497,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.3" + "source": "https://github.com/symfony/string/tree/v6.4.4" }, "funding": [ { @@ -15451,7 +15513,7 @@ "type": "tidelift" } ], - "time": "2024-01-25T09:26:29+00:00" + "time": "2024-02-01T13:16:41+00:00" }, { "name": "symfony/translation-contracts", @@ -15533,16 +15595,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "9c1d8bb4edce5304fcefca7923741085f1ca5b60" + "reference": "1cf92edc9a94d16275efef949fa6748d11cc8f47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/9c1d8bb4edce5304fcefca7923741085f1ca5b60", - "reference": "9c1d8bb4edce5304fcefca7923741085f1ca5b60", + "url": "https://api.github.com/repos/symfony/validator/zipball/1cf92edc9a94d16275efef949fa6748d11cc8f47", + "reference": "1cf92edc9a94d16275efef949fa6748d11cc8f47", "shasum": "" }, "require": { @@ -15609,7 +15671,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.3" + "source": "https://github.com/symfony/validator/tree/v6.4.4" }, "funding": [ { @@ -15625,20 +15687,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:01:07+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0435a08f69125535336177c29d56af3abc1f69da" + "reference": "b439823f04c98b84d4366c79507e9da6230944b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0435a08f69125535336177c29d56af3abc1f69da", - "reference": "0435a08f69125535336177c29d56af3abc1f69da", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1", + "reference": "b439823f04c98b84d4366c79507e9da6230944b1", "shasum": "" }, "require": { @@ -15694,7 +15756,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.3" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.4" }, "funding": [ { @@ -15710,20 +15772,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:53:30+00:00" + "time": "2024-02-15T11:23:52+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8" + "reference": "0bd342e24aef49fc82a21bd4eedd3e665d177e5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a8c12b5448a5ac685347f5eeb2abf6a571ec16b8", - "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/0bd342e24aef49fc82a21bd4eedd3e665d177e5b", + "reference": "0bd342e24aef49fc82a21bd4eedd3e665d177e5b", "shasum": "" }, "require": { @@ -15769,7 +15831,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.3" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.4" }, "funding": [ { @@ -15785,7 +15847,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-02-26T08:37:45+00:00" }, { "name": "symfony/yaml", @@ -16214,7 +16276,6 @@ "issues": "https://github.com/zendesk/zendesk_api_client_php/issues", "source": "https://github.com/zendesk/zendesk_api_client_php/tree/v2.2.17" }, - "abandoned": true, "time": "2023-07-11T04:06:41+00:00" } ], @@ -16401,6 +16462,7 @@ "drupal/rate": "1.0-alpha1|1.0-alpha2|1.0-alpha3|1.0-alpha4|1.0-alpha5|2.0-alpha1", "drupal/readonlymode": ">=1,<1.0", "drupal/recaptcha_v3": "1.0|1.1|>=1,<1.2", + "drupal/registration_role": "2.0.0|>=2.0,<2.0.1", "drupal/require_login": "1.0|1.1|1.2|1.3|1.4|1.5|1.6|1.7|>=1,<1.8", "drupal/s3fs": "3.0|3.0-alpha0|3.0-alpha1|3.0-alpha2|3.0-alpha3|3.0-alpha4|3.0-alpha5|3.0-alpha6|3.0-alpha7|3.0-alpha8|3.0-alpha9|3.0-alpha10|3.0-alpha11|3.0-alpha12|3.0-alpha13|3.0-alpha14|3.0-alpha15|3.0-alpha16|3.0-alpha17|3.0-beta1|3.0-beta2|3.0-beta3|3.0-beta4|3.0-beta5|3.0-beta6|3.0-beta7|3.0-rc1|3.0-rc2|3.1|>=3,<3.2", "drupal/safedelete": "1.0.0|1.0.0-alpha1|1.0.0-alpha2|1.0.0-alpha3|1.0.1|1.0.2|1.0.3|1.0.4|1.0.5|1.0.7|1.0.8|1.0.9|1.0.10|1.0.11|1.0.12|1.0.13|1.0.14|1.0.15|1.0.16|1.0.17|1.0.18|1.0.19|1.0.20|1.0.21|1.0.22|1.0.23|1.0.24|1.0.25|1.0.26|1.0.27|1.0.28|1.0.29|1.0.30|1.0.31|1.0.32|1.0.33|1.0.34|1.0.35|1.0.36|1.0.38|1.0.39|1.0.40|1.0.41|1.0.42|1.0.43|>=1.0,<1.0.44", @@ -16522,7 +16584,7 @@ "backpack/crud": "<3.4.9", "bacula-web/bacula-web": "<8.0.0.0-RC2-dev", "badaso/core": "<2.7", - "bagisto/bagisto": "<1.3.2", + "bagisto/bagisto": "<2.1", "barrelstrength/sprout-base-email": "<1.2.7", "barrelstrength/sprout-forms": "<3.9", "barryvdh/laravel-translation-manager": "<0.6.2", @@ -16565,7 +16627,7 @@ "codeigniter4/shield": "<1.0.0.0-beta8", "codiad/codiad": "<=2.8.4", "composer/composer": "<1.10.27|>=2,<2.2.23|>=2.3,<2.7", - "concrete5/concrete5": "<9.2.5", + "concrete5/concrete5": "<9.2.7", "concrete5/core": "<8.5.8|>=9,<9.1", "contao-components/mediaelement": ">=2.14.2,<2.21.1", "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4", @@ -16876,7 +16938,7 @@ "phpmyfaq/phpmyfaq": "<3.2.5", "phpoffice/phpexcel": "<1.8", "phpoffice/phpspreadsheet": "<1.16", - "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.34", + "phpseclib/phpseclib": "<2.0.47|>=3,<3.0.36", "phpservermon/phpservermon": "<3.6", "phpsysinfo/phpsysinfo": "<3.4.3", "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", @@ -16894,7 +16956,7 @@ "pixelfed/pixelfed": "<0.11.11", "plotly/plotly.js": "<2.25.2", "pocketmine/bedrock-protocol": "<8.0.2", - "pocketmine/pocketmine-mp": "<=4.23|>=5,<5.3.1", + "pocketmine/pocketmine-mp": "<5.11.2", "pocketmine/raklib": ">=0.14,<0.14.6|>=0.15,<0.15.1", "pressbooks/pressbooks": "<5.18", "prestashop/autoupgrade": ">=4,<4.10.1", @@ -16926,7 +16988,7 @@ "react/http": ">=0.7,<1.9", "really-simple-plugins/complianz-gdpr": "<6.4.2", "redaxo/source": "<=5.15.1", - "remdex/livehelperchat": "<3.99", + "remdex/livehelperchat": "<4.29", "reportico-web/reportico": "<=7.1.21", "rhukster/dom-sanitizer": "<1.0.7", "rmccue/requests": ">=1.6,<1.8", @@ -16943,10 +17005,10 @@ "sfroemken/url_redirect": "<=1.2.1", "sheng/yiicms": "<=1.2", "shopware/core": "<=6.5.7.3", - "shopware/platform": "<=6.5.7.3", + "shopware/platform": "<=6.5.7.3|>=6.5.8,<6.5.8.7-dev", "shopware/production": "<=6.3.5.2", "shopware/shopware": "<=5.7.17", - "shopware/storefront": "<=6.4.8.1", + "shopware/storefront": "<=6.4.8.1|>=6.5.8,<6.5.8.7-dev", "shopxo/shopxo": "<2.2.6", "showdoc/showdoc": "<2.10.4", "silverstripe-australia/advancedreports": ">=1,<=2", @@ -16994,7 +17056,7 @@ "studio-42/elfinder": "<2.1.62", "subhh/libconnect": "<7.0.8|>=8,<8.1", "sukohi/surpass": "<1", - "sulu/sulu": "<1.6.44|>=2,<2.4.16|>=2.5,<2.5.12", + "sulu/sulu": "<1.6.44|>=2,<2.4.17|>=2.5,<2.5.13", "sumocoders/framework-user-bundle": "<1.4", "superbig/craft-audit": "<3.0.2", "swag/paypal": "<5.4.4", @@ -17015,7 +17077,7 @@ "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", - "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3", + "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<5.3.15|>=5.4.3,<5.4.4|>=6.0.3,<6.0.4", "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", "symfony/http-kernel": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", diff --git a/web/modules/custom/employees/src/Controller/GroupMembershipController.php b/web/modules/custom/employees/src/Controller/GroupMembershipController.php index f139ea149..c5611a4a3 100644 --- a/web/modules/custom/employees/src/Controller/GroupMembershipController.php +++ b/web/modules/custom/employees/src/Controller/GroupMembershipController.php @@ -7,6 +7,7 @@ use Drupal\Core\Session\AccountInterface; use Drupal\group\Entity\GroupContent; use Drupal\group\Entity\GroupInterface; +use Drupal\group\Entity\GroupRelationship; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -65,11 +66,13 @@ public static function create(ContainerInterface $container) { */ public function follow(GroupInterface $group) { /** @var \Drupal\group\Plugin\GroupContentEnablerInterface $plugin */ - $plugin = $group->getGroupType()->getContentPlugin('group_membership'); + $plugin_id = 'group_membership'; + $relationship_type_storage = \Drupal::entityTypeManager()->getStorage('group_content_type'); + $group_type_id = $group->getGroupType()->id(); // Pre-populate a group membership with the current user. - $group_content = GroupContent::create([ - 'type' => $plugin->getContentTypeConfigId(), + $group_content = GroupRelationship::create([ + 'type' => $relationship_type_storage->getRelationshipTypeId($group_type_id, $plugin_id), 'gid' => $group->id(), 'entity_id' => $this->currentUser->id(), 'group_roles' => ["employee-following"], diff --git a/web/modules/custom/employees/src/Plugin/views/filter/GroupIsCurrentUserMember.php b/web/modules/custom/employees/src/Plugin/views/filter/GroupIsCurrentUserMember.php index 9d70a481c..9436ceb7b 100644 --- a/web/modules/custom/employees/src/Plugin/views/filter/GroupIsCurrentUserMember.php +++ b/web/modules/custom/employees/src/Plugin/views/filter/GroupIsCurrentUserMember.php @@ -56,7 +56,7 @@ public function query() { $uid = $this->currentUser->id(); $subselect = $this->database - ->select('group_content_field_data', 'gc') + ->select('group_relationship_field_data', 'gc') ->fields('gc', ['type', 'gid', 'entity_id']) ->where("[gc].[gid] = [$query_base_table].[$entity_id_key]") ->condition('type', '%-group_membership', 'LIKE') diff --git a/web/modules/custom/portland_groups/portland_groups.links.task.yml b/web/modules/custom/portland_groups/portland_groups.links.task.yml index 0f7d8c5c5..987bc9e46 100644 --- a/web/modules/custom/portland_groups/portland_groups.links.task.yml +++ b/web/modules/custom/portland_groups/portland_groups.links.task.yml @@ -8,10 +8,10 @@ portland_groups.add_content: title: '+ Add Content' base_route: 'entity.group.canonical' - route_name: 'entity.group_content.group_node_add_page' + route_name: 'entity.group_content.group_node_create_page' weight: 160 portland_groups.add_media: title: '+ Add Media' base_route: 'entity.group.canonical' - route_name: 'entity.group_content.group_media_add_page' + route_name: 'entity.group_content.group_media_create_page' weight: 170 diff --git a/web/modules/custom/portland_groups/portland_groups.module b/web/modules/custom/portland_groups/portland_groups.module index a1b093ef7..c823816cf 100644 --- a/web/modules/custom/portland_groups/portland_groups.module +++ b/web/modules/custom/portland_groups/portland_groups.module @@ -1,11 +1,11 @@ getEntityTypeId(); if ($entity_type == "node") { - $plugin_id = "group_node" . $plugin_id . $entity->bundle(); + $plugin_id = "group_node:" . $entity->bundle(); } else if ($entity_type == "media") { - $plugin_id = "group_media" . $plugin_id . $entity->bundle(); + $plugin_id = "group_media:" . $entity->bundle(); } else { return; } @@ -190,7 +189,7 @@ function _portland_groups_synchronize_entity_group_ownership($entity) { // node was originally in a different group, remove it and reassign $old_group = \Drupal\group\Entity\Group::load($orig_owner_group); if ($old_group) { - $current_node = $old_group->getContent($plugin_id, ['entity_id' => $eid]); + $current_node = $old_group->getRelationshipsByEntity($entity, $plugin_id); if(count($current_node) > 0) { $content = array_values($current_node)[0]; $content->delete(); @@ -206,7 +205,7 @@ function _portland_groups_synchronize_entity_group_ownership($entity) { if ($new_group) { // When the Display In field has a group but there is no group content relationship, // add a group content relationship - $current_node = $new_group->getContent($plugin_id, ['entity_id' => $eid]); + $current_node = $new_group->getRelationshipsByEntity($entity, $plugin_id); if(count($current_node) == 0) { _portland_groups_add_entity_to_group($entity, $new_owner_group, $plugin_id); } @@ -218,7 +217,7 @@ function _portland_groups_synchronize_entity_group_ownership($entity) { } // POWR-2800 One entity added to many different groups, delete all but the first Displayed In group - $group_content_nodes = GroupContent::loadByEntity($entity); + $group_content_nodes = GroupRelationship::loadByEntity($entity); if (count($group_content_nodes) > 1) { foreach($group_content_nodes as $group_content_node) { if($group_content_node->getGroup()->id() != $new_owner_group) { @@ -235,15 +234,16 @@ function _portland_groups_add_entity_to_group($entity, $group_id, $plugin_id) { // make sure entity isn't already in group; the entity may already be assigned to // the group by virtue of having been created in that context. $group = \Drupal\group\Entity\Group::load($group_id); - $current_node = $group->getContent($plugin_id, ['entity_id' => $entity->id()]); + $current_node = $group->getRelationshipsByEntity($entity, $plugin_id); if (!$current_node || count($current_node) < 1) { - $group->addContent($entity, $plugin_id); + $group->addRelationship($entity, $plugin_id); } } /** * Implements hook_inline_entity_form_entity_form_alter(). */ +// TODO: The module name is correct, so this hook will never be called. (It should be portland_groups.) function portland_inline_entity_form_entity_form_alter(&$entity_form, &$form_state) { if ( @@ -263,6 +263,7 @@ function portland_inline_entity_form_entity_form_alter(&$entity_form, &$form_sta /** * Implements hook_form_alter(). */ +// TODO: The module name is correct, so this hook will never be called. (It should be portland_groups.) function portland_form_alter(&$form, &$form_state, $form_id) { // Only set the default field for new Media items @@ -321,7 +322,7 @@ function getGroupIdsByEntity($entity) } $group_ids = []; - $group_contents = GroupContent::loadByEntity($entity); + $group_contents = GroupRelationship::loadByEntity($entity); foreach ($group_contents as $group_content) { $group_ids[] = $group_content->getGroup()->id(); } @@ -404,7 +405,7 @@ function _clean_group_group_path(&$group_group_path) * Implements hook_ENTITY_TYPE_update(). * Add and update group aliases like "/powr/news" when a group is updated. */ -function portland_group_update(GroupInterface $group) +function portland_groups_group_update(GroupInterface $group) { // get group path $group_path = $group->get('field_group_path')->value; @@ -425,17 +426,5 @@ function portland_group_update(GroupInterface $group) $batch['operations'][] = array('Drupal\pathauto\Form\PathautoBulkUpdateForm::batchProcess', ["canonical_entities:group_content", "update"]); $batch['operations'][] = array('Drupal\pathauto\Form\PathautoBulkUpdateForm::batchProcess', ["canonical_entities:media", "update"]); batch_set($batch); - - $gid = $group->id(); - $lang = \Drupal::languageManager()->getCurrentLanguage()->getId(); - - // TODO: manually regenerate URL alias for main group page; pathauto bulk update isn't getting it sometimes - $existing_alias = \Drupal::service('path.alias_storage')->lookupPathAlias("/group/$gid", $lang); - $alias = "/$group_path"; - // if it exists and doesn't match current alias, delete and re-save - if ($existing_alias && $existing_alias != $alias) { - \Drupal::service('path.alias_storage')->delete(['alias' => $existing_alias, 'langcode' => $lang]); - $path = \Drupal::service('path.alias_storage')->save("/group/$gid", $alias, $lang); - } } } diff --git a/web/modules/custom/portland_groups/src/Controller/PortlandGroupMediaController.php b/web/modules/custom/portland_groups/src/Controller/PortlandGroupMediaController.php index 5ec326794..ae0ccb9d6 100644 --- a/web/modules/custom/portland_groups/src/Controller/PortlandGroupMediaController.php +++ b/web/modules/custom/portland_groups/src/Controller/PortlandGroupMediaController.php @@ -6,7 +6,7 @@ use Drupal\Core\Entity\EntityFormBuilderInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Render\RendererInterface; -use Drupal\groupmedia\Controller\GroupMediaController; +use Drupal\group\Entity\Controller\GroupRelationshipController; use Drupal\group\Entity\GroupInterface; use Drupal\group\Plugin\GroupContentEnablerManagerInterface; use Drupal\user\PrivateTempStoreFactory; @@ -19,14 +19,14 @@ /** * Returns responses for 'group_media' GroupContent routes. */ -class PortlandGroupMediaController extends GroupMediaController { +class PortlandGroupMediaController extends GroupRelationshipController { /** * {@inheritdoc} */ - public function addPage(GroupInterface $group, $create_mode = FALSE) { + public function addPage(GroupInterface $group, $create_mode = FALSE, $base_plugin_id = NULL) { - $build = parent::addPage($group, $create_mode); + $build = GroupRelationshipController::addPage($group, $create_mode, $base_plugin_id); // Do not interfere with redirects. if (!is_array($build)) { @@ -35,28 +35,34 @@ public function addPage(GroupInterface $group, $create_mode = FALSE) { // Overwrite the label and description for all of the displayed bundles. $media_storage_handler = $this->entityTypeManager->getStorage('media_type'); - $page_bundles = $this->addPageBundles($group, $create_mode); - // NOTE: ksort is working here, but bundle types are still displayed out of order. - // there must be some other sorting process that occurs after this point. - ksort($page_bundles); + $page_bundles = $this->addPageBundles($group, $create_mode, $base_plugin_id); + + // We want the $build['#bundles'] array to be sorted by bundle label, but it's + // sorted by array index which is the bundle machine name. + // We need to build a new array using the bundle label as the array index. + $new_bundles = []; foreach ($page_bundles as $plugin_id => $bundle_name) { + $pluginID = $bundle_name->getPlugin()->getPluginId(); // Only handle Media types here. Content are handled by PortlanController next door. - if(strpos($plugin_id, 'group_media:') !== 0) continue; - if (!empty($build['#bundles'][$bundle_name])) { - $plugin = $group->getGroupType()->getContentPlugin($plugin_id); - $bundle_label = $media_storage_handler->load($plugin->getEntityBundle())->label(); - $bundle_id = $media_storage_handler->load($plugin->getEntityBundle())->id(); + if(strpos($pluginID, 'group_media:') !== 0) continue; + if (!empty($build['#bundles'][$plugin_id])) { + $plugin = $group->getGroupType()->getPlugin($pluginID); + $plugin_bundle = $plugin->getPluginDefinition()->getEntityBundle(); + $bundle_label = $media_storage_handler->load($plugin_bundle)->label(); + $bundle_id = $media_storage_handler->load($plugin_bundle)->id(); $bundle_desc = \Drupal::config('media.type.' . $bundle_id)->get('description'); - $t_args = ['%node_type' => $bundle_label]; - $new_bundles[$bundle_name] = $build['#bundles'][$bundle_name]; - $new_bundles[$bundle_name]['label'] = $bundle_label; - $new_bundles[$bundle_name]['description'] = $bundle_desc; + $new_bundles[$bundle_label] = $build['#bundles'][$plugin_id]; + $new_bundles[$bundle_label]['label'] = $bundle_label; + $new_bundles[$bundle_label]['description'] = $bundle_desc; // build custom link text; this overrides the link text created in the GroupNodeDeriver - $new_bundles[$bundle_name]['add_link']->setText(t('Add ' . $bundle_label)); + $new_bundles[$bundle_label]['add_link']->setText(t('Add ' . $bundle_label)); } } + // Sort the new array by key (i.e. bundle label) + ksort($new_bundles); + $build['#bundles'] = $new_bundles; return $build; } diff --git a/web/modules/custom/portland_groups/src/Controller/PortlandGroupContentController.php b/web/modules/custom/portland_groups/src/Controller/PortlandGroupRelationshipController.php similarity index 54% rename from web/modules/custom/portland_groups/src/Controller/PortlandGroupContentController.php rename to web/modules/custom/portland_groups/src/Controller/PortlandGroupRelationshipController.php index 02355ad19..167a6ae2b 100644 --- a/web/modules/custom/portland_groups/src/Controller/PortlandGroupContentController.php +++ b/web/modules/custom/portland_groups/src/Controller/PortlandGroupRelationshipController.php @@ -6,12 +6,12 @@ use Drupal\Core\Entity\EntityFormBuilderInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Render\RendererInterface; -use Drupal\group\Entity\Controller\GroupContentController; +use Drupal\group\Entity\Controller\GroupRelationshipController; use Drupal\group\Entity\GroupInterface; use Drupal\group\Plugin\GroupContentEnablerManagerInterface; use Drupal\user\PrivateTempStoreFactory; use Symfony\Component\DependencyInjection\ContainerInterface; -use Drupal\group\Entity\GroupContentType; +use Drupal\group\Entity\GroupRelationshipType; use Drupal\node\Entity\NodeType; use Drupal\media\Entity\MediaType; @@ -20,16 +20,16 @@ use Drupal\Core\Plugin; /** - * Returns responses for 'group_node' GroupContent routes. + * Returns responses for 'group_node' GroupRelationship routes. */ -class PortlandGroupContentController extends GroupContentController { +class PortlandGroupRelationshipController extends GroupRelationshipController { /** * {@inheritdoc} */ - public function addPage(GroupInterface $group, $create_mode = FALSE) { + public function addPage(GroupInterface $group, $create_mode = FALSE, $base_plugin_id = NULL) { - $build = GroupContentController::addPage($group, $create_mode); + $build = GroupRelationshipController::addPage($group, $create_mode, $base_plugin_id); // Do not interfere with redirects. if (!is_array($build)) { @@ -38,13 +38,11 @@ public function addPage(GroupInterface $group, $create_mode = FALSE) { // Overwrite the label and description for all of the displayed bundles. $storage_handler = $this->entityTypeManager->getStorage('node_type'); - $page_bundles = $this->addPageBundles($group, $create_mode); - // NOTE: ksort is working here, but bundle types are still displayed out of order. - // there must be some other sorting process that occurs after this point. - ksort($page_bundles); - // we need the $build['#bundles'] array to be sorted the same as $page_bundles, but it's - // being handed to us sorted by plugin_id, which doens't map well to the bundle machine names. - // we need to build a new array based on the foreach order below. + $page_bundles = $this->addPageBundles($group, $create_mode, $base_plugin_id); + + // We want the $build['#bundles'] array to be sorted by bundle label, but it's + // sorted by array index which is the bundle machine name. + // We need to build a new array using the bundle label as the array index. $new_bundles = []; foreach ($page_bundles as $plugin_id => $bundle_name) { // Don't process Media types. They are handled by PortlanMediaController next door. @@ -52,21 +50,25 @@ public function addPage(GroupInterface $group, $create_mode = FALSE) { unset($build['#bundles'][$bundle_name]); continue; } - if (!empty($build['#bundles'][$bundle_name])) { - $plugin = $group->getGroupType()->getContentPlugin($plugin_id); - $bundle_label = $storage_handler->load($plugin->getEntityBundle())->label(); - $bundle_id = $storage_handler->load($plugin->getEntityBundle())->id(); + if (!empty($build['#bundles'][$plugin_id])) { + $pluginID = $bundle_name->getPlugin()->getPluginId(); + $plugin = $group->getGroupType()->getPlugin($pluginID); + $plugin_bundle = $plugin->getPluginDefinition()->getEntityBundle(); + $bundle_label = $storage_handler->load($plugin_bundle)->label(); + $bundle_id = $storage_handler->load($plugin_bundle)->id(); $bundle_desc = \Drupal::config('node.type.' . $bundle_id)->get('description'); - $t_args = ['%node_type' => $bundle_label]; - $new_bundles[$bundle_name] = $build['#bundles'][$bundle_name]; - $new_bundles[$bundle_name]['label'] = $bundle_label; - $new_bundles[$bundle_name]['description'] = $bundle_desc; + $new_bundles[$bundle_label] = $build['#bundles'][$plugin_id]; + $new_bundles[$bundle_label]['label'] = $bundle_label; + $new_bundles[$bundle_label]['description'] = $bundle_desc; // build custom link text; this overrides the link text created in the GroupNodeDeriver - $new_bundles[$bundle_name]['add_link']->setText(t('Add ' . $bundle_label)); + $new_bundles[$bundle_label]['add_link']->setText(t('Add ' . $bundle_label)); } } + // Sort the new array by key (i.e. bundle label) + ksort($new_bundles); + $build['#bundles'] = $new_bundles; return $build; } @@ -84,17 +86,18 @@ public function addPage(GroupInterface $group, $create_mode = FALSE) { */ public function createFormTitle(GroupInterface $group, $plugin_id) { /** @var \Drupal\group\Plugin\GroupContentEnablerInterface $plugin */ - $plugin = $group->getGroupType()->getContentPlugin($plugin_id); - $entity_type = $plugin->getEntityTypeId(); + $plugin = $group->getGroupType()->getPlugin($plugin_id); + $entity_type = $plugin->getPluginDefinition()->getEntityTypeId(); + $plugin_bundle = $plugin->getPluginDefinition()->getEntityBundle(); switch ($entity_type) { - case "media": - $content_type = MediaType::load($plugin->getEntityBundle()); - break; - case "node": - $content_type = NodeType::load($plugin->getEntityBundle()); - break; - default: - $content_type = "undefined"; + case "media": + $content_type = MediaType::load($plugin_bundle); + break; + case "node": + $content_type = NodeType::load($plugin_bundle); + break; + default: + $content_type = "undefined"; } $return = $this->t('Create @name in @group', ['@name' => $content_type->label(), '@group' => $group->label()]); return $return; diff --git a/web/modules/custom/portland_groups/src/Routing/RouteSubscriber.php b/web/modules/custom/portland_groups/src/Routing/RouteSubscriber.php index 11c362f48..8d4bc0240 100644 --- a/web/modules/custom/portland_groups/src/Routing/RouteSubscriber.php +++ b/web/modules/custom/portland_groups/src/Routing/RouteSubscriber.php @@ -50,15 +50,24 @@ public function __construct( */ protected function alterRoutes(RouteCollection $collection) { // override routes from the Group gnode and groupmedia modules to set our own controller::method + if ($route = $collection->get('entity.group_content.group_node_create_page')) { + $route->setDefault('_controller', '\Drupal\portland_groups\Controller\PortlandGroupRelationshipController::addPage'); + } if ($route = $collection->get('entity.group_content.group_node_add_page')) { - $route->setDefault('_controller', '\Drupal\portland_groups\Controller\PortlandGroupContentController::addPage'); + $route->setDefault('_controller', '\Drupal\portland_groups\Controller\PortlandGroupRelationshipController::addPage'); + } + if ($route = $collection->get('entity.group_content.group_media_create_page')) { + $route->setDefault('_controller', '\Drupal\portland_groups\Controller\PortlandGroupMediaController::addPage'); + $route->setDefault('_title', 'Create media'); } if ($route = $collection->get('entity.group_content.group_media_add_page')) { $route->setDefault('_controller', '\Drupal\portland_groups\Controller\PortlandGroupMediaController::addPage'); + $route->setDefault('_title', 'Relate media'); } + // override group create content route to set our own title callback so we can customize it if ($route = $collection->get('entity.group_content.create_form')) { - $route->setDefault('_title_callback', '\Drupal\portland_groups\Controller\PortlandGroupContentController::createFormTitle'); + $route->setDefault('_title_callback', '\Drupal\portland_groups\Controller\PortlandGroupRelationshipController::createFormTitle'); } } } diff --git a/web/modules/custom/portland_openid_connect/src/Util/PortlandOpenIdConnectUtil.php b/web/modules/custom/portland_openid_connect/src/Util/PortlandOpenIdConnectUtil.php index e48238e0c..53b90d429 100644 --- a/web/modules/custom/portland_openid_connect/src/Util/PortlandOpenIdConnectUtil.php +++ b/web/modules/custom/portland_openid_connect/src/Util/PortlandOpenIdConnectUtil.php @@ -54,9 +54,9 @@ public static function removeEmployeeRoleOnUserFromGroup($account, $group_id) $membership = $group->getMember($account); if (empty($membership)) return; - $roles = $membership->getRoles(); + $roles = $membership->getRoles(FALSE); $has_employee_role = false; - $group_content = $membership->getGroupContent(); + $group_content = $membership->getGroupRelationship(); $group_content->group_roles = []; foreach ($roles as $role) { if ($role->id() === 'employee-employee' || $role->id() === 'private-employee') { @@ -109,8 +109,8 @@ public static function addUserToGroupWithEmployeeRole($account, $group_id) else { // https://drupal.stackexchange.com/questions/232530/programmatically-add-new-role-to-group-member/232646#232646 // Array of Role-name=>Role_entity - $roles = $membership->getRoles(); - $group_content = $membership->getGroupContent(); + $roles = $membership->getRoles(FALSE); + $group_content = $membership->getGroupRelationship(); $has_new_role = false; foreach ($role_id_array as $role_id) { // Check if the user has the new role @@ -160,14 +160,13 @@ public static function updatePrimaryGroupMembershipForUser($account) } if (empty($new_primary_group_ids) && empty($current_primary_group_ids)) return; - // If the primary group is empty, remove all group memberships if (empty($new_primary_group_ids)) { - // Remove user from all current groups + // If the AD primary group is empty, remove employee role from group memberships foreach ($current_primary_group_ids as $current_primary_group_id) { self::removeEmployeeRoleOnUserFromGroup($account, $current_primary_group_id); } } else if (empty($current_primary_group_ids)) { - // Add the Employee role to user in all new groups + // Add the employee role to user in all new groups foreach ($new_primary_group_ids as $new_primary_group_id) { self::addUserToGroupWithEmployeeRole($account, $new_primary_group_id); } @@ -181,7 +180,7 @@ public static function updatePrimaryGroupMembershipForUser($account) foreach ($current_primary_group_ids as $current_primary_group_id) { if (in_array($current_primary_group_id, $new_primary_group_ids)) continue; - // Remove user from the new group + // Remove employee role from the group membership self::removeEmployeeRoleOnUserFromGroup($account, $current_primary_group_id); } } diff --git a/web/sites/default/config/core.entity_form_display.group.employee.default.yml b/web/sites/default/config/core.entity_form_display.group.employee.default.yml index cd4ca35a7..ddb33f6b5 100644 --- a/web/sites/default/config/core.entity_form_display.group.employee.default.yml +++ b/web/sites/default/config/core.entity_form_display.group.employee.default.yml @@ -221,8 +221,8 @@ content: list: '' add: Add field_redirects: - type: string_textfield - weight: 16 + type: text_textfield + weight: 50 region: content settings: size: 60 diff --git a/web/sites/default/config/core.extension.yml b/web/sites/default/config/core.extension.yml index dce633523..3525e4cab 100644 --- a/web/sites/default/config/core.extension.yml +++ b/web/sites/default/config/core.extension.yml @@ -56,9 +56,11 @@ module: file_mdm_exif: 0 file_mdm_font: 0 filter: 0 + flexible_permissions: 0 gnode: 0 google_tag: 0 group: 0 + group_support_revisions: 0 group_views_join_link: 0 groupmedia: 0 help: 0 diff --git a/web/sites/default/config/group.content_type.employee-group_media-document.yml b/web/sites/default/config/group.content_type.employee-group_media-document.yml index 63c7ea0aa..ba56f4329 100644 --- a/web/sites/default/config/group.content_type.employee-group_media-document.yml +++ b/web/sites/default/config/group.content_type.employee-group_media-document.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: employee-group_media-document -label: 'Employee Group: Group media (Document)' -description: 'Adds Document content to groups both publicly and privately.' group_type: employee content_plugin: 'group_media:document' plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_media-iframe.yml b/web/sites/default/config/group.content_type.employee-group_media-iframe.yml index a8dffe39f..73c344e09 100644 --- a/web/sites/default/config/group.content_type.employee-group_media-iframe.yml +++ b/web/sites/default/config/group.content_type.employee-group_media-iframe.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: employee-group_media-iframe -label: 'Open Group: Group media (Iframe Embed)' -description: 'Adds Iframe Embed content to groups both publicly and privately.' group_type: employee content_plugin: 'group_media:iframe' plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_media-image.yml b/web/sites/default/config/group.content_type.employee-group_media-image.yml index a170dc46d..0566fea51 100644 --- a/web/sites/default/config/group.content_type.employee-group_media-image.yml +++ b/web/sites/default/config/group.content_type.employee-group_media-image.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: employee-group_media-image -label: 'Employee Group: Group media (Image)' -description: 'Adds Image content to groups both publicly and privately.' group_type: employee content_plugin: 'group_media:image' plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_membership.yml b/web/sites/default/config/group.content_type.employee-group_membership.yml index 4bc17487d..387da9a93 100644 --- a/web/sites/default/config/group.content_type.employee-group_membership.yml +++ b/web/sites/default/config/group.content_type.employee-group_membership.yml @@ -7,8 +7,6 @@ dependencies: module: - user id: employee-group_membership -label: 'Employee Group: Group membership' -description: 'Adds users to groups as members.' group_type: employee content_plugin: group_membership plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_node-contact.yml b/web/sites/default/config/group.content_type.employee-group_node-contact.yml index e8add1b8d..8695a8904 100644 --- a/web/sites/default/config/group.content_type.employee-group_node-contact.yml +++ b/web/sites/default/config/group.content_type.employee-group_node-contact.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: employee-group_node-contact -label: 'Open Group: Group node (Contact)' -description: 'Adds Contact content to groups both publicly and privately.' group_type: employee content_plugin: 'group_node:contact' plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_node-contract.yml b/web/sites/default/config/group.content_type.employee-group_node-contract.yml index 11cfdc549..28a5b827e 100644 --- a/web/sites/default/config/group.content_type.employee-group_node-contract.yml +++ b/web/sites/default/config/group.content_type.employee-group_node-contract.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: employee-group_node-contract -label: 'Employee Group: Group node (Contract)' -description: 'Adds Contract content to groups both publicly and privately.' group_type: employee content_plugin: 'group_node:contract' plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_node-event.yml b/web/sites/default/config/group.content_type.employee-group_node-event.yml index b94f9fd54..6be1f174b 100644 --- a/web/sites/default/config/group.content_type.employee-group_node-event.yml +++ b/web/sites/default/config/group.content_type.employee-group_node-event.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: employee-group_node-event -label: 'Employee Group: Group node (Event)' -description: 'Adds Event content to groups both publicly and privately.' group_type: employee content_plugin: 'group_node:event' plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_node-news.yml b/web/sites/default/config/group.content_type.employee-group_node-news.yml index 975abbddb..f3cd78c36 100644 --- a/web/sites/default/config/group.content_type.employee-group_node-news.yml +++ b/web/sites/default/config/group.content_type.employee-group_node-news.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: employee-group_node-news -label: 'Employee Group: Group node (News)' -description: 'Adds News content to groups both publicly and privately.' group_type: employee content_plugin: 'group_node:news' plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_node-notification.yml b/web/sites/default/config/group.content_type.employee-group_node-notification.yml index 5107d7106..4d6ae434e 100644 --- a/web/sites/default/config/group.content_type.employee-group_node-notification.yml +++ b/web/sites/default/config/group.content_type.employee-group_node-notification.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: employee-group_node-notification -label: 'Open Group: Group node (Notification)' -description: 'Adds Notification content to groups both publicly and privately.' group_type: employee content_plugin: 'group_node:notification' plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_node-page.yml b/web/sites/default/config/group.content_type.employee-group_node-page.yml index 3d9e98e8c..104cc7e5e 100644 --- a/web/sites/default/config/group.content_type.employee-group_node-page.yml +++ b/web/sites/default/config/group.content_type.employee-group_node-page.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: employee-group_node-page -label: 'Employee Group: Group node (Page)' -description: 'Adds Page content to groups both publicly and privately.' group_type: employee content_plugin: 'group_node:page' plugin_config: diff --git a/web/sites/default/config/group.content_type.employee-group_node-resource.yml b/web/sites/default/config/group.content_type.employee-group_node-resource.yml index cc0a32165..d5f5c71ca 100644 --- a/web/sites/default/config/group.content_type.employee-group_node-resource.yml +++ b/web/sites/default/config/group.content_type.employee-group_node-resource.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: employee-group_node-resource -label: 'Employee Group: Group node (Resource)' -description: 'Adds Resource content to groups both publicly and privately.' group_type: employee content_plugin: 'group_node:resource' plugin_config: diff --git a/web/sites/default/config/group.content_type.group_content_type_239b9708ace62.yml b/web/sites/default/config/group.content_type.group_content_type_239b9708ace62.yml index 95fb40804..625a8c90c 100644 --- a/web/sites/default/config/group.content_type.group_content_type_239b9708ace62.yml +++ b/web/sites/default/config/group.content_type.group_content_type_239b9708ace62.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: group_content_type_239b9708ace62 -label: 'Employee Group: Group media (Video)' -description: 'Adds Video content to groups both publicly and privately.' group_type: employee content_plugin: 'group_media:remote_video' plugin_config: diff --git a/web/sites/default/config/group.content_type.group_content_type_806a8587fb787.yml b/web/sites/default/config/group.content_type.group_content_type_806a8587fb787.yml index 8a0d86e37..089289aac 100644 --- a/web/sites/default/config/group.content_type.group_content_type_806a8587fb787.yml +++ b/web/sites/default/config/group.content_type.group_content_type_806a8587fb787.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: group_content_type_806a8587fb787 -label: 'Restricted Group: Group media (Remote document)' -description: 'Adds Remote document content to groups both publicly and privately.' group_type: private content_plugin: 'group_media:remote_document' plugin_config: diff --git a/web/sites/default/config/group.content_type.group_content_type_80cc2ea82cd65.yml b/web/sites/default/config/group.content_type.group_content_type_80cc2ea82cd65.yml index 35ed600df..a1446d940 100644 --- a/web/sites/default/config/group.content_type.group_content_type_80cc2ea82cd65.yml +++ b/web/sites/default/config/group.content_type.group_content_type_80cc2ea82cd65.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: group_content_type_80cc2ea82cd65 -label: 'Employee Group: Group node (BTS catalog item)' -description: 'Adds BTS catalog item content to groups both publicly and privately.' group_type: employee content_plugin: 'group_node:bts_catalog_item' plugin_config: diff --git a/web/sites/default/config/group.content_type.group_content_type_857fcdcbb71b0.yml b/web/sites/default/config/group.content_type.group_content_type_857fcdcbb71b0.yml index 360f116a5..cfff85b5d 100644 --- a/web/sites/default/config/group.content_type.group_content_type_857fcdcbb71b0.yml +++ b/web/sites/default/config/group.content_type.group_content_type_857fcdcbb71b0.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: group_content_type_857fcdcbb71b0 -label: 'Private Group: Group node (BTS catalog item)' -description: 'Adds BTS catalog item content to groups both publicly and privately.' group_type: private content_plugin: 'group_node:bts_catalog_item' plugin_config: diff --git a/web/sites/default/config/group.content_type.group_content_type_c00266c9378ba.yml b/web/sites/default/config/group.content_type.group_content_type_c00266c9378ba.yml index 12bf0c5b9..14229faab 100644 --- a/web/sites/default/config/group.content_type.group_content_type_c00266c9378ba.yml +++ b/web/sites/default/config/group.content_type.group_content_type_c00266c9378ba.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: group_content_type_c00266c9378ba -label: 'Open Group: Group media (Remote document)' -description: 'Adds Remote document content to groups both publicly and privately.' group_type: employee content_plugin: 'group_media:remote_document' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_media-document.yml b/web/sites/default/config/group.content_type.private-group_media-document.yml index 2be9a4343..1a6374413 100644 --- a/web/sites/default/config/group.content_type.private-group_media-document.yml +++ b/web/sites/default/config/group.content_type.private-group_media-document.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: private-group_media-document -label: 'Private Group: Group media (Document)' -description: 'Adds Document content to groups both publicly and privately.' group_type: private content_plugin: 'group_media:document' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_media-iframe.yml b/web/sites/default/config/group.content_type.private-group_media-iframe.yml index 0f2713e2b..457bff119 100644 --- a/web/sites/default/config/group.content_type.private-group_media-iframe.yml +++ b/web/sites/default/config/group.content_type.private-group_media-iframe.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: private-group_media-iframe -label: 'Restricted Group: Group media (Iframe Embed)' -description: 'Adds Iframe Embed content to groups both publicly and privately.' group_type: private content_plugin: 'group_media:iframe' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_media-image.yml b/web/sites/default/config/group.content_type.private-group_media-image.yml index 8dec57dd3..481d64abf 100644 --- a/web/sites/default/config/group.content_type.private-group_media-image.yml +++ b/web/sites/default/config/group.content_type.private-group_media-image.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: private-group_media-image -label: 'Private Group: Group media (Image)' -description: 'Adds Image content to groups both publicly and privately.' group_type: private content_plugin: 'group_media:image' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_media-remote_video.yml b/web/sites/default/config/group.content_type.private-group_media-remote_video.yml index f82f5e850..af29d0d20 100644 --- a/web/sites/default/config/group.content_type.private-group_media-remote_video.yml +++ b/web/sites/default/config/group.content_type.private-group_media-remote_video.yml @@ -9,8 +9,6 @@ dependencies: - groupmedia - media id: private-group_media-remote_video -label: 'Private Group: Group media (Remote video)' -description: 'Adds Remote video content to groups both publicly and privately.' group_type: private content_plugin: 'group_media:remote_video' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_membership.yml b/web/sites/default/config/group.content_type.private-group_membership.yml index 274063699..ea27f75db 100644 --- a/web/sites/default/config/group.content_type.private-group_membership.yml +++ b/web/sites/default/config/group.content_type.private-group_membership.yml @@ -7,8 +7,6 @@ dependencies: module: - user id: private-group_membership -label: 'Private Group: Group membership' -description: 'Adds users to groups as members.' group_type: private content_plugin: group_membership plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_node-contact.yml b/web/sites/default/config/group.content_type.private-group_node-contact.yml index 40659c9e8..b068f5f33 100644 --- a/web/sites/default/config/group.content_type.private-group_node-contact.yml +++ b/web/sites/default/config/group.content_type.private-group_node-contact.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: private-group_node-contact -label: 'Restricted Group: Group node (Contact)' -description: 'Adds Contact content to groups both publicly and privately.' group_type: private content_plugin: 'group_node:contact' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_node-event.yml b/web/sites/default/config/group.content_type.private-group_node-event.yml index 0a310b34f..c7eb191cd 100644 --- a/web/sites/default/config/group.content_type.private-group_node-event.yml +++ b/web/sites/default/config/group.content_type.private-group_node-event.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: private-group_node-event -label: 'Private Group: Group node (Event)' -description: 'Adds Event content to groups both publicly and privately.' group_type: private content_plugin: 'group_node:event' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_node-news.yml b/web/sites/default/config/group.content_type.private-group_node-news.yml index 1941db08c..0618a5685 100644 --- a/web/sites/default/config/group.content_type.private-group_node-news.yml +++ b/web/sites/default/config/group.content_type.private-group_node-news.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: private-group_node-news -label: 'Private Group: Group node (News)' -description: 'Adds News content to groups both publicly and privately.' group_type: private content_plugin: 'group_node:news' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_node-notification.yml b/web/sites/default/config/group.content_type.private-group_node-notification.yml index 1da65bd69..0d6d7424a 100644 --- a/web/sites/default/config/group.content_type.private-group_node-notification.yml +++ b/web/sites/default/config/group.content_type.private-group_node-notification.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: private-group_node-notification -label: 'Restricted Group: Group node (Notification)' -description: 'Adds Notification content to groups both publicly and privately.' group_type: private content_plugin: 'group_node:notification' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_node-page.yml b/web/sites/default/config/group.content_type.private-group_node-page.yml index e568541f1..329dff745 100644 --- a/web/sites/default/config/group.content_type.private-group_node-page.yml +++ b/web/sites/default/config/group.content_type.private-group_node-page.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: private-group_node-page -label: 'Private Group: Group node (Page)' -description: 'Adds Page content to groups both publicly and privately.' group_type: private content_plugin: 'group_node:page' plugin_config: diff --git a/web/sites/default/config/group.content_type.private-group_node-resource.yml b/web/sites/default/config/group.content_type.private-group_node-resource.yml index 9f30aea2f..11896558c 100644 --- a/web/sites/default/config/group.content_type.private-group_node-resource.yml +++ b/web/sites/default/config/group.content_type.private-group_node-resource.yml @@ -9,8 +9,6 @@ dependencies: - gnode - node id: private-group_node-resource -label: 'Private Group: Group node (Resource)' -description: 'Adds Resource content to groups both publicly and privately.' group_type: private content_plugin: 'group_node:resource' plugin_config: diff --git a/web/sites/default/config/group.role.employee-1ab877bcd.yml b/web/sites/default/config/group.role.employee-1ab877bcd.yml deleted file mode 100644 index 00be6f568..000000000 --- a/web/sites/default/config/group.role.employee-1ab877bcd.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: b9f42175-d143-4db1-856e-43ab16a7cfd4 -langcode: en -status: true -dependencies: - config: - - group.type.employee - enforced: - config: - - user.role.content_lead -id: employee-1ab877bcd -label: 'Content Lead' -weight: -7 -internal: true -audience: outsider -group_type: employee -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.employee-3e5cf4b4d.yml b/web/sites/default/config/group.role.employee-3e5cf4b4d.yml deleted file mode 100644 index b23472cbd..000000000 --- a/web/sites/default/config/group.role.employee-3e5cf4b4d.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: f8a46374-5d12-4931-abe3-4ecc75459576 -langcode: en -status: true -dependencies: - config: - - group.type.employee - enforced: - config: - - user.role.311_support_agent -id: employee-3e5cf4b4d -label: '311 Support Agent' -weight: -4 -internal: true -audience: outsider -group_type: employee -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.employee-631a7fe0a.yml b/web/sites/default/config/group.role.employee-631a7fe0a.yml deleted file mode 100644 index 57c86c5d6..000000000 --- a/web/sites/default/config/group.role.employee-631a7fe0a.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: db73e9e0-34fe-4118-8821-a6cb5e41fdd2 -langcode: en -status: true -dependencies: - config: - - group.type.employee - enforced: - config: - - user.role.311_lead -id: employee-631a7fe0a -label: '311 Lead' -weight: -3 -internal: true -audience: outsider -group_type: employee -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.employee-855450a16.yml b/web/sites/default/config/group.role.employee-855450a16.yml deleted file mode 100644 index 2495af86c..000000000 --- a/web/sites/default/config/group.role.employee-855450a16.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 66fbc858-d1cc-470c-90ce-f05f0d8909f7 -langcode: en -status: true -dependencies: - config: - - group.type.employee - enforced: - config: - - user.role.publisher -id: employee-855450a16 -label: Publisher -weight: -5 -internal: true -audience: outsider -group_type: employee -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.employee-a416e6833.yml b/web/sites/default/config/group.role.employee-a416e6833.yml deleted file mode 100644 index 72013e956..000000000 --- a/web/sites/default/config/group.role.employee-a416e6833.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 8fd2b688-c9a4-4757-9e94-e095e8e710d3 -langcode: en -status: true -dependencies: - config: - - group.type.employee - enforced: - config: - - user.role.administrator -id: employee-a416e6833 -label: 'Site Administrator' -weight: -6 -internal: true -audience: outsider -group_type: employee -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.employee-admin.yml b/web/sites/default/config/group.role.employee-admin.yml index a54069061..457682cfa 100644 --- a/web/sites/default/config/group.role.employee-admin.yml +++ b/web/sites/default/config/group.role.employee-admin.yml @@ -7,10 +7,10 @@ dependencies: id: employee-admin label: Admin weight: -6 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: employee -permissions_ui: true permissions: - 'access group_media overview' - 'access group_node overview' @@ -38,8 +38,10 @@ permissions: - 'delete any group_node:news entity' - 'delete any group_node:notification content' - 'delete any group_node:notification entity' + - 'delete any group_node:notification relationship' - 'delete any group_node:page entity' - 'delete any group_node:resource entity' + - 'delete group_node:notification entity revisions' - 'delete group_node:notification revisions' - 'delete own group_media:document entity' - 'delete own group_media:iframe entity' @@ -53,18 +55,27 @@ permissions: - 'delete own group_node:news entity' - 'delete own group_node:notification content' - 'delete own group_node:notification entity' + - 'delete own group_node:notification relationship' - 'delete own group_node:page entity' - 'delete own group_node:resource entity' - 'edit group' - 'leave group' - 'revert group revisions' + - 'revert group_node:bts_catalog_item entity revisions' - 'revert group_node:bts_catalog_item revisions' + - 'revert group_node:contact entity revisions' - 'revert group_node:contact revisions' + - 'revert group_node:contract entity revisions' - 'revert group_node:contract revisions' + - 'revert group_node:event entity revisions' - 'revert group_node:event revisions' + - 'revert group_node:news entity revisions' - 'revert group_node:news revisions' + - 'revert group_node:notification entity revisions' - 'revert group_node:notification revisions' + - 'revert group_node:page entity revisions' - 'revert group_node:page revisions' + - 'revert group_node:resource entity revisions' - 'revert group_node:resource revisions' - 'update any group_media:document entity' - 'update any group_media:iframe entity' @@ -78,6 +89,7 @@ permissions: - 'update any group_node:news entity' - 'update any group_node:notification content' - 'update any group_node:notification entity' + - 'update any group_node:notification relationship' - 'update any group_node:page entity' - 'update any group_node:resource entity' - 'update own group_media:document entity' @@ -86,6 +98,7 @@ permissions: - 'update own group_media:remote_document entity' - 'update own group_media:remote_video entity' - 'update own group_membership content' + - 'update own group_membership relationship' - 'update own group_node:bts_catalog_item entity' - 'update own group_node:contact entity' - 'update own group_node:contract entity' @@ -93,50 +106,80 @@ permissions: - 'update own group_node:news entity' - 'update own group_node:notification content' - 'update own group_node:notification entity' + - 'update own group_node:notification relationship' - 'update own group_node:page entity' - 'update own group_node:resource entity' + - 'view all group revisions' + - 'view all group_media:document entity revisions' + - 'view all group_media:iframe entity revisions' + - 'view all group_media:image entity revisions' + - 'view all group_media:remote_document entity revisions' + - 'view all group_media:remote_video entity revisions' + - 'view all group_node:bts_catalog_item entity revisions' + - 'view all group_node:contact entity revisions' + - 'view all group_node:contract entity revisions' + - 'view all group_node:event entity revisions' + - 'view all group_node:news entity revisions' + - 'view all group_node:notification entity revisions' + - 'view all group_node:page entity revisions' + - 'view all group_node:resource entity revisions' - 'view any unpublished group' - 'view group' - 'view group revisions' - 'view group_media:document entity' + - 'view group_media:document entity revisions' - 'view group_media:document revision' - 'view group_media:document revisions' - 'view group_media:iframe entity' + - 'view group_media:iframe entity revisions' - 'view group_media:iframe revision' - 'view group_media:iframe revisions' - 'view group_media:image entity' + - 'view group_media:image entity revisions' - 'view group_media:image revision' - 'view group_media:image revisions' - 'view group_media:remote_document entity' + - 'view group_media:remote_document entity revisions' - 'view group_media:remote_document revision' - 'view group_media:remote_document revisions' - 'view group_media:remote_video entity' + - 'view group_media:remote_video entity revisions' - 'view group_media:remote_video revision' - 'view group_media:remote_video revisions' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' + - 'view group_node:bts_catalog_item entity revisions' - 'view group_node:bts_catalog_item revision' - 'view group_node:bts_catalog_item revisions' - 'view group_node:contact entity' + - 'view group_node:contact entity revisions' - 'view group_node:contact revision' - 'view group_node:contact revisions' - 'view group_node:contract entity' + - 'view group_node:contract entity revisions' - 'view group_node:contract revision' - 'view group_node:contract revisions' - 'view group_node:event entity' + - 'view group_node:event entity revisions' - 'view group_node:event revision' - 'view group_node:event revisions' - 'view group_node:news entity' + - 'view group_node:news entity revisions' - 'view group_node:news revision' - 'view group_node:news revisions' - 'view group_node:notification content' - 'view group_node:notification entity' + - 'view group_node:notification entity revisions' + - 'view group_node:notification relationship' - 'view group_node:notification revision' - 'view group_node:notification revisions' - 'view group_node:page entity' + - 'view group_node:page entity revisions' - 'view group_node:page revision' - 'view group_node:page revisions' - 'view group_node:resource entity' + - 'view group_node:resource entity revisions' - 'view group_node:resource revision' - 'view group_node:resource revisions' - 'view latest group version' diff --git a/web/sites/default/config/group.role.employee-anonymous.yml b/web/sites/default/config/group.role.employee-anonymous.yml index 3fb901366..7143f9089 100644 --- a/web/sites/default/config/group.role.employee-anonymous.yml +++ b/web/sites/default/config/group.role.employee-anonymous.yml @@ -4,13 +4,14 @@ status: true dependencies: config: - group.type.employee + - user.role.anonymous id: employee-anonymous label: Anonymous weight: -102 -internal: true -audience: anonymous +admin: false +scope: outsider +global_role: anonymous group_type: employee -permissions_ui: true permissions: - 'view group' - 'view group_media:document entity' diff --git a/web/sites/default/config/group.role.employee-assigned.yml b/web/sites/default/config/group.role.employee-assigned.yml index 4c8c5335f..850b9b6b4 100644 --- a/web/sites/default/config/group.role.employee-assigned.yml +++ b/web/sites/default/config/group.role.employee-assigned.yml @@ -7,10 +7,10 @@ dependencies: id: employee-assigned label: Assigned weight: -9 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: employee -permissions_ui: true permissions: - 'view group' - 'view group_media:document entity' @@ -19,6 +19,7 @@ permissions: - 'view group_media:remote_document entity' - 'view group_media:remote_video entity' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' - 'view group_node:contact entity' - 'view group_node:contract entity' diff --git a/web/sites/default/config/group.role.employee-dd1e716cc.yml b/web/sites/default/config/group.role.employee-dd1e716cc.yml index 4488d92aa..291d2aad4 100644 --- a/web/sites/default/config/group.role.employee-dd1e716cc.yml +++ b/web/sites/default/config/group.role.employee-dd1e716cc.yml @@ -4,16 +4,17 @@ status: true dependencies: config: - group.type.employee + - user.role.bts_catalog enforced: config: - user.role.bts_catalog id: employee-dd1e716cc label: 'BTS Catalog' weight: -4 -internal: true -audience: outsider +admin: false +scope: outsider +global_role: bts_catalog group_type: employee -permissions_ui: false permissions: - 'create group_node:bts_catalog_item entity' - 'delete any group_node:bts_catalog_item entity' diff --git a/web/sites/default/config/group.role.employee-editor.yml b/web/sites/default/config/group.role.employee-editor.yml index e2e89c303..90c7e92ec 100644 --- a/web/sites/default/config/group.role.employee-editor.yml +++ b/web/sites/default/config/group.role.employee-editor.yml @@ -7,10 +7,10 @@ dependencies: id: employee-editor label: Editor weight: -7 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: employee -permissions_ui: true permissions: - 'access group_media overview' - 'access group_node overview' @@ -57,45 +57,71 @@ permissions: - 'update own group_node:news entity' - 'update own group_node:page entity' - 'update own group_node:resource entity' + - 'view all group revisions' + - 'view all group_media:document entity revisions' + - 'view all group_media:iframe entity revisions' + - 'view all group_media:image entity revisions' + - 'view all group_media:remote_document entity revisions' + - 'view all group_media:remote_video entity revisions' + - 'view all group_node:bts_catalog_item entity revisions' + - 'view all group_node:contact entity revisions' + - 'view all group_node:contract entity revisions' + - 'view all group_node:event entity revisions' + - 'view all group_node:news entity revisions' + - 'view all group_node:page entity revisions' + - 'view all group_node:resource entity revisions' - 'view any unpublished group' - 'view group' - 'view group revisions' - 'view group_media:document entity' + - 'view group_media:document entity revisions' - 'view group_media:document revision' - 'view group_media:document revisions' - 'view group_media:iframe entity' + - 'view group_media:iframe entity revisions' - 'view group_media:iframe revision' - 'view group_media:iframe revisions' - 'view group_media:image entity' + - 'view group_media:image entity revisions' - 'view group_media:image revision' - 'view group_media:image revisions' - 'view group_media:remote_document entity' + - 'view group_media:remote_document entity revisions' - 'view group_media:remote_document revision' - 'view group_media:remote_document revisions' - 'view group_media:remote_video entity' + - 'view group_media:remote_video entity revisions' - 'view group_media:remote_video revision' - 'view group_media:remote_video revisions' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' + - 'view group_node:bts_catalog_item entity revisions' - 'view group_node:bts_catalog_item revision' - 'view group_node:bts_catalog_item revisions' - 'view group_node:contact entity' + - 'view group_node:contact entity revisions' - 'view group_node:contact revision' - 'view group_node:contact revisions' - 'view group_node:contract entity' + - 'view group_node:contract entity revisions' - 'view group_node:contract revision' - 'view group_node:contract revisions' - 'view group_node:event entity' + - 'view group_node:event entity revisions' - 'view group_node:event revision' - 'view group_node:event revisions' - 'view group_node:news entity' + - 'view group_node:news entity revisions' - 'view group_node:news revision' - 'view group_node:news revisions' - 'view group_node:notification entity' - 'view group_node:page entity' + - 'view group_node:page entity revisions' - 'view group_node:page revision' - 'view group_node:page revisions' - 'view group_node:resource entity' + - 'view group_node:resource entity revisions' - 'view group_node:resource revision' - 'view group_node:resource revisions' - 'view latest group version' diff --git a/web/sites/default/config/group.role.employee-employee.yml b/web/sites/default/config/group.role.employee-employee.yml index bebb318e7..d5de1a1d7 100644 --- a/web/sites/default/config/group.role.employee-employee.yml +++ b/web/sites/default/config/group.role.employee-employee.yml @@ -7,10 +7,10 @@ dependencies: id: employee-employee label: Employee weight: -8 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: employee -permissions_ui: true permissions: - 'view group' - 'view group_media:document entity' @@ -19,6 +19,7 @@ permissions: - 'view group_media:remote_document entity' - 'view group_media:remote_video entity' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' - 'view group_node:contact entity' - 'view group_node:contract entity' diff --git a/web/sites/default/config/group.role.employee-following.yml b/web/sites/default/config/group.role.employee-following.yml index 648a2f960..31e7d56f2 100644 --- a/web/sites/default/config/group.role.employee-following.yml +++ b/web/sites/default/config/group.role.employee-following.yml @@ -7,10 +7,10 @@ dependencies: id: employee-following label: Following weight: -10 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: employee -permissions_ui: true permissions: - 'leave group' - 'view group' @@ -20,6 +20,7 @@ permissions: - 'view group_media:remote_document entity' - 'view group_media:remote_video entity' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' - 'view group_node:contact entity' - 'view group_node:contract entity' diff --git a/web/sites/default/config/group.role.employee-member.yml b/web/sites/default/config/group.role.employee-member.yml index d629986ca..04a9f3075 100644 --- a/web/sites/default/config/group.role.employee-member.yml +++ b/web/sites/default/config/group.role.employee-member.yml @@ -4,13 +4,14 @@ status: true dependencies: config: - group.type.employee + - user.role.authenticated id: employee-member label: Member weight: -100 -internal: true -audience: member +admin: false +scope: insider +global_role: authenticated group_type: employee -permissions_ui: true permissions: - 'leave group' - 'view group' @@ -20,6 +21,7 @@ permissions: - 'view group_media:remote_document entity' - 'view group_media:remote_video entity' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' - 'view group_node:contact entity' - 'view group_node:contract entity' diff --git a/web/sites/default/config/group.role.employee-outsider.yml b/web/sites/default/config/group.role.employee-outsider.yml index 402e9aa1e..6e8c32198 100644 --- a/web/sites/default/config/group.role.employee-outsider.yml +++ b/web/sites/default/config/group.role.employee-outsider.yml @@ -4,13 +4,14 @@ status: true dependencies: config: - group.type.employee + - user.role.authenticated id: employee-outsider label: Outsider weight: -101 -internal: true -audience: outsider +admin: false +scope: outsider +global_role: authenticated group_type: employee -permissions_ui: true permissions: - 'join group' - 'view group' @@ -20,6 +21,7 @@ permissions: - 'view group_media:remote_document entity' - 'view group_media:remote_video entity' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' - 'view group_node:contact entity' - 'view group_node:contract entity' diff --git a/web/sites/default/config/group.role.employee-reviewer.yml b/web/sites/default/config/group.role.employee-reviewer.yml index 479758edc..87d4ebc2e 100644 --- a/web/sites/default/config/group.role.employee-reviewer.yml +++ b/web/sites/default/config/group.role.employee-reviewer.yml @@ -7,50 +7,76 @@ dependencies: id: employee-reviewer label: Reviewer weight: -2 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: employee -permissions_ui: true permissions: - 'access group_media overview' - 'access group_node overview' + - 'view all group_media:document entity revisions' + - 'view all group_media:iframe entity revisions' + - 'view all group_media:image entity revisions' + - 'view all group_media:remote_document entity revisions' + - 'view all group_media:remote_video entity revisions' + - 'view all group_node:bts_catalog_item entity revisions' + - 'view all group_node:contact entity revisions' + - 'view all group_node:contract entity revisions' + - 'view all group_node:event entity revisions' + - 'view all group_node:news entity revisions' + - 'view all group_node:notification entity revisions' + - 'view all group_node:page entity revisions' + - 'view all group_node:resource entity revisions' - 'view group_media:document entity' + - 'view group_media:document entity revisions' - 'view group_media:document revision' - 'view group_media:document revisions' - 'view group_media:iframe entity' + - 'view group_media:iframe entity revisions' - 'view group_media:iframe revision' - 'view group_media:iframe revisions' - 'view group_media:image entity' + - 'view group_media:image entity revisions' - 'view group_media:image revision' - 'view group_media:image revisions' - 'view group_media:remote_document entity' + - 'view group_media:remote_document entity revisions' - 'view group_media:remote_document revision' - 'view group_media:remote_document revisions' - 'view group_media:remote_video entity' + - 'view group_media:remote_video entity revisions' - 'view group_media:remote_video revision' - 'view group_media:remote_video revisions' - 'view group_node:bts_catalog_item entity' + - 'view group_node:bts_catalog_item entity revisions' - 'view group_node:bts_catalog_item revision' - 'view group_node:bts_catalog_item revisions' - 'view group_node:contact entity' + - 'view group_node:contact entity revisions' - 'view group_node:contact revision' - 'view group_node:contact revisions' - 'view group_node:contract entity' + - 'view group_node:contract entity revisions' - 'view group_node:contract revision' - 'view group_node:contract revisions' - 'view group_node:event entity' + - 'view group_node:event entity revisions' - 'view group_node:event revision' - 'view group_node:event revisions' - 'view group_node:news entity' + - 'view group_node:news entity revisions' - 'view group_node:news revision' - 'view group_node:news revisions' - 'view group_node:notification entity' + - 'view group_node:notification entity revisions' - 'view group_node:notification revision' - 'view group_node:notification revisions' - 'view group_node:page entity' + - 'view group_node:page entity revisions' - 'view group_node:page revision' - 'view group_node:page revisions' - 'view group_node:resource entity' + - 'view group_node:resource entity revisions' - 'view group_node:resource revision' - 'view group_node:resource revisions' - 'view unpublished group_media:document entity' diff --git a/web/sites/default/config/group.role.employee-site_administrator_in.yml b/web/sites/default/config/group.role.employee-site_administrator_in.yml new file mode 100644 index 000000000..23c5da4ce --- /dev/null +++ b/web/sites/default/config/group.role.employee-site_administrator_in.yml @@ -0,0 +1,15 @@ +uuid: 88d66c3d-becd-4731-a18a-1d53a85f3c80 +langcode: en +status: true +dependencies: + config: + - group.type.employee + - user.role.administrator +id: employee-site_administrator_in +label: 'Site Administrator Insider' +weight: 0 +admin: true +scope: insider +global_role: administrator +group_type: employee +permissions: { } diff --git a/web/sites/default/config/group.role.employee-site_administrator_out.yml b/web/sites/default/config/group.role.employee-site_administrator_out.yml new file mode 100644 index 000000000..f2bf71d77 --- /dev/null +++ b/web/sites/default/config/group.role.employee-site_administrator_out.yml @@ -0,0 +1,15 @@ +uuid: 137d5ad5-db9f-42d0-b8c3-2c45cce3f0b3 +langcode: en +status: true +dependencies: + config: + - group.type.employee + - user.role.administrator +id: employee-site_administrator_out +label: 'Site Administrator Outsider' +weight: 1 +admin: true +scope: outsider +global_role: administrator +group_type: employee +permissions: { } diff --git a/web/sites/default/config/group.role.private-1ab877bcd.yml b/web/sites/default/config/group.role.private-1ab877bcd.yml deleted file mode 100644 index 4df0690fe..000000000 --- a/web/sites/default/config/group.role.private-1ab877bcd.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 90debd6f-0edc-4edc-a265-40f8395484b6 -langcode: en -status: true -dependencies: - config: - - group.type.private - enforced: - config: - - user.role.content_lead -id: private-1ab877bcd -label: 'Content Lead' -weight: -7 -internal: true -audience: outsider -group_type: private -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.private-3e5cf4b4d.yml b/web/sites/default/config/group.role.private-3e5cf4b4d.yml deleted file mode 100644 index 7afdfe1df..000000000 --- a/web/sites/default/config/group.role.private-3e5cf4b4d.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: df5977ae-1801-4cc7-96f8-c1212e556639 -langcode: en -status: true -dependencies: - config: - - group.type.private - enforced: - config: - - user.role.311_support_agent -id: private-3e5cf4b4d -label: '311 Support Agent' -weight: -4 -internal: true -audience: outsider -group_type: private -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.private-631a7fe0a.yml b/web/sites/default/config/group.role.private-631a7fe0a.yml deleted file mode 100644 index d0fdd3923..000000000 --- a/web/sites/default/config/group.role.private-631a7fe0a.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: daa9595a-0fd4-4f78-a8cc-a593f0fabbea -langcode: en -status: true -dependencies: - config: - - group.type.private - enforced: - config: - - user.role.311_lead -id: private-631a7fe0a -label: '311 Lead' -weight: -3 -internal: true -audience: outsider -group_type: private -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.private-855450a16.yml b/web/sites/default/config/group.role.private-855450a16.yml deleted file mode 100644 index ada572762..000000000 --- a/web/sites/default/config/group.role.private-855450a16.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: ccd16f26-a25d-4029-9341-fe4190d08ea8 -langcode: en -status: true -dependencies: - config: - - group.type.private - enforced: - config: - - user.role.publisher -id: private-855450a16 -label: Publisher -weight: -5 -internal: true -audience: outsider -group_type: private -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.private-a416e6833.yml b/web/sites/default/config/group.role.private-a416e6833.yml deleted file mode 100644 index 5e2cca9bd..000000000 --- a/web/sites/default/config/group.role.private-a416e6833.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 474a1a90-c157-411d-aafd-ad18b9fd0953 -langcode: en -status: true -dependencies: - config: - - group.type.private - enforced: - config: - - user.role.administrator -id: private-a416e6833 -label: 'Site Administrator' -weight: -6 -internal: true -audience: outsider -group_type: private -permissions_ui: false -permissions: { } diff --git a/web/sites/default/config/group.role.private-admin.yml b/web/sites/default/config/group.role.private-admin.yml index beb764c0e..ae042da37 100644 --- a/web/sites/default/config/group.role.private-admin.yml +++ b/web/sites/default/config/group.role.private-admin.yml @@ -7,10 +7,10 @@ dependencies: id: private-admin label: Admin weight: -6 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: private -permissions_ui: true permissions: - 'access group_media overview' - 'access group_node overview' @@ -37,8 +37,10 @@ permissions: - 'delete any group_node:news entity' - 'delete any group_node:notification content' - 'delete any group_node:notification entity' + - 'delete any group_node:notification relationship' - 'delete any group_node:page entity' - 'delete any group_node:resource entity' + - 'delete group_node:notification entity revisions' - 'delete group_node:notification revisions' - 'delete own group_media:document entity' - 'delete own group_media:iframe entity' @@ -51,22 +53,35 @@ permissions: - 'delete own group_node:news entity' - 'delete own group_node:notification content' - 'delete own group_node:notification entity' + - 'delete own group_node:notification relationship' - 'delete own group_node:page entity' - 'delete own group_node:resource entity' - 'edit group' - 'leave group' - 'revert group revisions' + - 'revert group_media:document entity revisions' - 'revert group_media:document revisions' + - 'revert group_media:iframe entity revisions' - 'revert group_media:iframe revisions' + - 'revert group_media:image entity revisions' - 'revert group_media:image revisions' + - 'revert group_media:remote_document entity revisions' - 'revert group_media:remote_document revisions' + - 'revert group_media:remote_video entity revisions' - 'revert group_media:remote_video revisions' + - 'revert group_node:bts_catalog_item entity revisions' - 'revert group_node:bts_catalog_item revisions' + - 'revert group_node:contact entity revisions' - 'revert group_node:contact revisions' + - 'revert group_node:event entity revisions' - 'revert group_node:event revisions' + - 'revert group_node:news entity revisions' - 'revert group_node:news revisions' + - 'revert group_node:notification entity revisions' - 'revert group_node:notification revisions' + - 'revert group_node:page entity revisions' - 'revert group_node:page revisions' + - 'revert group_node:resource entity revisions' - 'revert group_node:resource revisions' - 'update any group_media:document entity' - 'update any group_media:iframe entity' @@ -79,6 +94,7 @@ permissions: - 'update any group_node:news entity' - 'update any group_node:notification content' - 'update any group_node:notification entity' + - 'update any group_node:notification relationship' - 'update any group_node:page entity' - 'update any group_node:resource entity' - 'update own group_media:document entity' @@ -92,45 +108,71 @@ permissions: - 'update own group_node:news entity' - 'update own group_node:notification content' - 'update own group_node:notification entity' + - 'update own group_node:notification relationship' - 'update own group_node:page entity' - 'update own group_node:resource entity' + - 'view all group revisions' + - 'view all group_media:document entity revisions' + - 'view all group_media:iframe entity revisions' + - 'view all group_media:image entity revisions' + - 'view all group_media:remote_document entity revisions' + - 'view all group_media:remote_video entity revisions' + - 'view all group_node:bts_catalog_item entity revisions' + - 'view all group_node:contact entity revisions' + - 'view all group_node:event entity revisions' + - 'view all group_node:news entity revisions' + - 'view all group_node:notification entity revisions' + - 'view all group_node:page entity revisions' + - 'view all group_node:resource entity revisions' - 'view group' - 'view group revisions' - 'view group_media:document entity' + - 'view group_media:document entity revisions' - 'view group_media:document revision' - 'view group_media:document revisions' - 'view group_media:iframe entity' + - 'view group_media:iframe entity revisions' - 'view group_media:iframe revision' - 'view group_media:iframe revisions' - 'view group_media:image entity' + - 'view group_media:image entity revisions' - 'view group_media:image revision' - 'view group_media:image revisions' - 'view group_media:remote_document entity' + - 'view group_media:remote_document entity revisions' - 'view group_media:remote_document revision' - 'view group_media:remote_document revisions' - 'view group_media:remote_video entity' + - 'view group_media:remote_video entity revisions' - 'view group_media:remote_video revision' - 'view group_media:remote_video revisions' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' + - 'view group_node:bts_catalog_item entity revisions' - 'view group_node:bts_catalog_item revision' - 'view group_node:bts_catalog_item revisions' - 'view group_node:contact entity' + - 'view group_node:contact entity revisions' - 'view group_node:contact revision' - 'view group_node:contact revisions' - 'view group_node:event entity' + - 'view group_node:event entity revisions' - 'view group_node:event revision' - 'view group_node:event revisions' - 'view group_node:news entity' + - 'view group_node:news entity revisions' - 'view group_node:news revision' - 'view group_node:news revisions' - 'view group_node:notification content' - 'view group_node:notification entity' - 'view group_node:notification revisions' - 'view group_node:page entity' + - 'view group_node:page entity revisions' - 'view group_node:page revision' - 'view group_node:page revisions' - 'view group_node:resource entity' + - 'view group_node:resource entity revisions' - 'view group_node:resource revision' - 'view group_node:resource revisions' - 'view latest group version' diff --git a/web/sites/default/config/group.role.private-anonymous.yml b/web/sites/default/config/group.role.private-anonymous.yml index ac86582e3..4bd457ff7 100644 --- a/web/sites/default/config/group.role.private-anonymous.yml +++ b/web/sites/default/config/group.role.private-anonymous.yml @@ -4,11 +4,12 @@ status: true dependencies: config: - group.type.private + - user.role.anonymous id: private-anonymous label: Anonymous weight: -102 -internal: true -audience: anonymous +admin: false +scope: outsider +global_role: anonymous group_type: private -permissions_ui: true permissions: { } diff --git a/web/sites/default/config/group.role.private-assigned.yml b/web/sites/default/config/group.role.private-assigned.yml index 19213c4fc..50e62df27 100644 --- a/web/sites/default/config/group.role.private-assigned.yml +++ b/web/sites/default/config/group.role.private-assigned.yml @@ -7,10 +7,10 @@ dependencies: id: private-assigned label: Assigned weight: -9 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: private -permissions_ui: true permissions: - 'view group' - 'view group_media:document entity' @@ -19,6 +19,7 @@ permissions: - 'view group_media:remote_document entity' - 'view group_media:remote_video entity' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:contact entity' - 'view group_node:event entity' - 'view group_node:news entity' diff --git a/web/sites/default/config/group.role.private-dd1e716cc.yml b/web/sites/default/config/group.role.private-dd1e716cc.yml index d846849c8..afec784aa 100644 --- a/web/sites/default/config/group.role.private-dd1e716cc.yml +++ b/web/sites/default/config/group.role.private-dd1e716cc.yml @@ -4,16 +4,17 @@ status: true dependencies: config: - group.type.private + - user.role.bts_catalog enforced: config: - user.role.bts_catalog id: private-dd1e716cc label: 'BTS Catalog' weight: -4 -internal: true -audience: outsider +admin: false +scope: outsider +global_role: bts_catalog group_type: private -permissions_ui: false permissions: - 'create group_node:bts_catalog_item entity' - 'delete any group_node:bts_catalog_item entity' diff --git a/web/sites/default/config/group.role.private-editor.yml b/web/sites/default/config/group.role.private-editor.yml index 3a77c3615..e1fcb4f17 100644 --- a/web/sites/default/config/group.role.private-editor.yml +++ b/web/sites/default/config/group.role.private-editor.yml @@ -7,10 +7,10 @@ dependencies: id: private-editor label: Editor weight: -7 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: private -permissions_ui: true permissions: - 'access group_media overview' - 'access group_node overview' @@ -57,40 +57,64 @@ permissions: - 'update own group_node:news entity' - 'update own group_node:page entity' - 'update own group_node:resource entity' + - 'view all group revisions' + - 'view all group_media:document entity revisions' + - 'view all group_media:iframe entity revisions' + - 'view all group_media:image entity revisions' + - 'view all group_media:remote_document entity revisions' + - 'view all group_media:remote_video entity revisions' + - 'view all group_node:bts_catalog_item entity revisions' + - 'view all group_node:contact entity revisions' + - 'view all group_node:event entity revisions' + - 'view all group_node:news entity revisions' + - 'view all group_node:page entity revisions' + - 'view all group_node:resource entity revisions' - 'view group' - 'view group revisions' - 'view group_media:document entity' + - 'view group_media:document entity revisions' - 'view group_media:document revision' - 'view group_media:document revisions' - 'view group_media:iframe entity' + - 'view group_media:iframe entity revisions' - 'view group_media:iframe revision' - 'view group_media:iframe revisions' - 'view group_media:image entity' + - 'view group_media:image entity revisions' - 'view group_media:image revision' - 'view group_media:image revisions' - 'view group_media:remote_document entity' + - 'view group_media:remote_document entity revisions' - 'view group_media:remote_document revision' - 'view group_media:remote_document revisions' - 'view group_media:remote_video entity' + - 'view group_media:remote_video entity revisions' - 'view group_media:remote_video revision' - 'view group_media:remote_video revisions' - 'view group_membership content' + - 'view group_membership relationship' + - 'view group_node:bts_catalog_item entity revisions' - 'view group_node:bts_catalog_item revision' - 'view group_node:bts_catalog_item revisions' - 'view group_node:contact entity' + - 'view group_node:contact entity revisions' - 'view group_node:contact revision' - 'view group_node:contact revisions' - 'view group_node:event entity' + - 'view group_node:event entity revisions' - 'view group_node:event revision' - 'view group_node:event revisions' - 'view group_node:news entity' + - 'view group_node:news entity revisions' - 'view group_node:news revision' - 'view group_node:news revisions' - 'view group_node:notification entity' - 'view group_node:page entity' + - 'view group_node:page entity revisions' - 'view group_node:page revision' - 'view group_node:page revisions' - 'view group_node:resource entity' + - 'view group_node:resource entity revisions' - 'view group_node:resource revision' - 'view group_node:resource revisions' - 'view latest group version' diff --git a/web/sites/default/config/group.role.private-employee.yml b/web/sites/default/config/group.role.private-employee.yml index 4d088ac8c..c21f16abc 100644 --- a/web/sites/default/config/group.role.private-employee.yml +++ b/web/sites/default/config/group.role.private-employee.yml @@ -7,10 +7,10 @@ dependencies: id: private-employee label: Employee weight: -8 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: private -permissions_ui: true permissions: - 'view group' - 'view group_media:document entity' @@ -19,6 +19,7 @@ permissions: - 'view group_media:remote_document entity' - 'view group_media:remote_video entity' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:contact entity' - 'view group_node:event entity' - 'view group_node:news entity' diff --git a/web/sites/default/config/group.role.private-member.yml b/web/sites/default/config/group.role.private-member.yml index 6b53dbb89..f0ac7be3c 100644 --- a/web/sites/default/config/group.role.private-member.yml +++ b/web/sites/default/config/group.role.private-member.yml @@ -4,13 +4,14 @@ status: true dependencies: config: - group.type.private + - user.role.authenticated id: private-member label: Member weight: -100 -internal: true -audience: member +admin: false +scope: insider +global_role: authenticated group_type: private -permissions_ui: true permissions: - 'leave group' - 'view group' @@ -20,6 +21,7 @@ permissions: - 'view group_media:remote_document entity' - 'view group_media:remote_video entity' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' - 'view group_node:contact entity' - 'view group_node:event entity' diff --git a/web/sites/default/config/group.role.private-outsider.yml b/web/sites/default/config/group.role.private-outsider.yml index 60502ecfb..fdb3aea78 100644 --- a/web/sites/default/config/group.role.private-outsider.yml +++ b/web/sites/default/config/group.role.private-outsider.yml @@ -4,12 +4,13 @@ status: true dependencies: config: - group.type.private + - user.role.authenticated id: private-outsider label: Outsider weight: -101 -internal: true -audience: outsider +admin: false +scope: outsider +global_role: authenticated group_type: private -permissions_ui: true permissions: - 'view group_media:iframe entity' diff --git a/web/sites/default/config/group.role.private-reviewer.yml b/web/sites/default/config/group.role.private-reviewer.yml index 4e1b46833..319992ea5 100644 --- a/web/sites/default/config/group.role.private-reviewer.yml +++ b/web/sites/default/config/group.role.private-reviewer.yml @@ -7,48 +7,73 @@ dependencies: id: private-reviewer label: Reviewer weight: -1 -internal: false -audience: member +admin: false +scope: individual +global_role: null group_type: private -permissions_ui: true permissions: - 'access group_media overview' - 'access group_node overview' + - 'view all group_media:document entity revisions' + - 'view all group_media:iframe entity revisions' + - 'view all group_media:image entity revisions' + - 'view all group_media:remote_document entity revisions' + - 'view all group_media:remote_video entity revisions' + - 'view all group_node:bts_catalog_item entity revisions' + - 'view all group_node:contact entity revisions' + - 'view all group_node:event entity revisions' + - 'view all group_node:news entity revisions' + - 'view all group_node:notification entity revisions' + - 'view all group_node:page entity revisions' + - 'view all group_node:resource entity revisions' - 'view group_media:document entity' + - 'view group_media:document entity revisions' - 'view group_media:document revision' - 'view group_media:document revisions' - 'view group_media:iframe entity' + - 'view group_media:iframe entity revisions' - 'view group_media:iframe revision' - 'view group_media:iframe revisions' - 'view group_media:image entity' + - 'view group_media:image entity revisions' - 'view group_media:image revision' - 'view group_media:image revisions' - 'view group_media:remote_document entity' + - 'view group_media:remote_document entity revisions' - 'view group_media:remote_document revision' - 'view group_media:remote_document revisions' - 'view group_media:remote_video entity' + - 'view group_media:remote_video entity revisions' - 'view group_media:remote_video revision' - 'view group_media:remote_video revisions' - 'view group_membership content' + - 'view group_membership relationship' - 'view group_node:bts_catalog_item entity' + - 'view group_node:bts_catalog_item entity revisions' - 'view group_node:bts_catalog_item revision' - 'view group_node:bts_catalog_item revisions' - 'view group_node:contact entity' + - 'view group_node:contact entity revisions' - 'view group_node:contact revision' - 'view group_node:contact revisions' - 'view group_node:event entity' + - 'view group_node:event entity revisions' - 'view group_node:event revision' - 'view group_node:event revisions' - 'view group_node:news entity' + - 'view group_node:news entity revisions' - 'view group_node:news revision' - 'view group_node:news revisions' - 'view group_node:notification entity' + - 'view group_node:notification entity revisions' - 'view group_node:notification revision' - 'view group_node:notification revisions' - 'view group_node:page entity' + - 'view group_node:page entity revisions' - 'view group_node:page revision' - 'view group_node:page revisions' - 'view group_node:resource entity' + - 'view group_node:resource entity revisions' - 'view group_node:resource revision' - 'view group_node:resource revisions' - 'view unpublished group_media:document entity' diff --git a/web/sites/default/config/group.role.private-site_administrator_in.yml b/web/sites/default/config/group.role.private-site_administrator_in.yml new file mode 100644 index 000000000..1b5079b51 --- /dev/null +++ b/web/sites/default/config/group.role.private-site_administrator_in.yml @@ -0,0 +1,15 @@ +uuid: 228f8df8-b295-4852-a4ed-e80d9f44f298 +langcode: en +status: true +dependencies: + config: + - group.type.private + - user.role.administrator +id: private-site_administrator_in +label: 'Site Administrator Insider' +weight: 2 +admin: true +scope: insider +global_role: administrator +group_type: private +permissions: { } diff --git a/web/sites/default/config/group.role.private-site_administrator_out.yml b/web/sites/default/config/group.role.private-site_administrator_out.yml new file mode 100644 index 000000000..4ea06c0a9 --- /dev/null +++ b/web/sites/default/config/group.role.private-site_administrator_out.yml @@ -0,0 +1,15 @@ +uuid: 98fbf554-96a3-4ed3-ac40-1f7c59fe1c6f +langcode: en +status: true +dependencies: + config: + - group.type.private + - user.role.administrator +id: private-site_administrator_out +label: 'Site Administrator Outsider' +weight: 3 +admin: true +scope: outsider +global_role: administrator +group_type: private +permissions: { } diff --git a/web/sites/default/config/openid_connect.settings.azure.yml b/web/sites/default/config/openid_connect.settings.azure.yml new file mode 100644 index 000000000..3f073fcac --- /dev/null +++ b/web/sites/default/config/openid_connect.settings.azure.yml @@ -0,0 +1,9 @@ +_core: + default_config_hash: b5Nmh4U49pSzYWhpp-sT_EopsYtYKQ_Jf9xEuvw9ddE +enabled: false +settings: + client_id: null + client_secret: null + authorization_endpoint: 'https://login.microsoftonline.com/common/oauth2/authorize' + token_endpoint: 'https://login.microsoftonline.com/common/oauth2/token' + userinfo_endpoint: 'https://graph.windows.net/me?api-version=1.6' diff --git a/web/sites/default/config/search_api.index.full_index.yml b/web/sites/default/config/search_api.index.full_index.yml index f5c41779e..d3827f00d 100644 --- a/web/sites/default/config/search_api.index.full_index.yml +++ b/web/sites/default/config/search_api.index.full_index.yml @@ -121,8 +121,7 @@ field_settings: type: string configuration: type: union - separator: |+ - + separator: '' fields: - 'entity:media/field_display_in_group' - 'entity:node/field_display_in_group' diff --git a/web/sites/default/config/views.view.featured_news.yml b/web/sites/default/config/views.view.featured_news.yml index b0a8cb257..3ed8616f3 100644 --- a/web/sites/default/config/views.view.featured_news.yml +++ b/web/sites/default/config/views.view.featured_news.yml @@ -169,15 +169,44 @@ display: id: type table: node_field_data field: type + relationship: none + group_type: group + admin_label: '' entity_type: node entity_field: type plugin_id: bundle + operator: in value: news: news group: 1 + exposed: false expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' operator_limit_selection: false operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } field_org_type_target_id: id: field_org_type_target_id table: group__field_org_type diff --git a/web/sites/default/config/views.view.group_events.yml b/web/sites/default/config/views.view.group_events.yml index 2ed27f0ed..689a01257 100644 --- a/web/sites/default/config/views.view.group_events.yml +++ b/web/sites/default/config/views.view.group_events.yml @@ -146,7 +146,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -459,7 +459,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -715,7 +715,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -1485,7 +1485,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group diff --git a/web/sites/default/config/views.view.group_list_views.yml b/web/sites/default/config/views.view.group_list_views.yml index 1b9a3131a..2dd610242 100644 --- a/web/sites/default/config/views.view.group_list_views.yml +++ b/web/sites/default/config/views.view.group_list_views.yml @@ -1720,7 +1720,7 @@ display: 'group_media:remote_video': '0' gc__user: id: gc__user - table: group_content_field_data + table: group_relationship_field_data field: gc__user relationship: group_content_id group_type: group diff --git a/web/sites/default/config/views.view.group_media.yml b/web/sites/default/config/views.view.group_media.yml index e304490c1..284b798ea 100644 --- a/web/sites/default/config/views.view.group_media.yml +++ b/web/sites/default/config/views.view.group_media.yml @@ -437,7 +437,7 @@ display: field_api_classes: false view_group_content: id: view_group_content - table: group_content + table: group_relationship field: view_group_content relationship: group_content group_type: group @@ -490,7 +490,7 @@ display: absolute: false edit_group_content: id: edit_group_content - table: group_content + table: group_relationship field: edit_group_content relationship: group_content group_type: group @@ -541,7 +541,7 @@ display: text: 'Edit relation' delete_group_content: id: delete_group_content - table: group_content + table: group_relationship field: delete_group_content relationship: group_content group_type: group @@ -684,7 +684,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -956,7 +956,7 @@ display: 'group_media:video': '0' gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content entity_type: group_content @@ -1677,7 +1677,7 @@ display: field_api_classes: false view_group_content: id: view_group_content - table: group_content + table: group_relationship field: view_group_content relationship: group_content group_type: group @@ -1730,7 +1730,7 @@ display: absolute: false edit_group_content: id: edit_group_content - table: group_content + table: group_relationship field: edit_group_content relationship: group_content group_type: group @@ -1781,7 +1781,7 @@ display: text: 'Edit relation' delete_group_content: id: delete_group_content - table: group_content + table: group_relationship field: delete_group_content relationship: group_content group_type: group diff --git a/web/sites/default/config/views.view.group_members.yml b/web/sites/default/config/views.view.group_members.yml index 5713f1185..3c8c2abd4 100644 --- a/web/sites/default/config/views.view.group_members.yml +++ b/web/sites/default/config/views.view.group_members.yml @@ -18,7 +18,7 @@ label: 'Group members' module: group description: '' tag: '' -base_table: group_content_field_data +base_table: group_relationship_field_data base_field: id display: default: @@ -212,7 +212,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 @@ -288,7 +288,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 @@ -364,7 +364,7 @@ display: field_api_classes: false view_group_content: id: view_group_content - table: group_content + table: group_relationship field: view_group_content relationship: none group_type: group @@ -417,7 +417,7 @@ display: absolute: false edit_group_content: id: edit_group_content - table: group_content + table: group_relationship field: edit_group_content relationship: none group_type: group @@ -470,7 +470,7 @@ display: absolute: false delete_group_content: id: delete_group_content - table: group_content + table: group_relationship field: delete_group_content relationship: none group_type: group @@ -765,7 +765,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: none group_type: group @@ -1110,7 +1110,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 @@ -1466,7 +1466,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 @@ -1542,7 +1542,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 @@ -1618,7 +1618,7 @@ display: field_api_classes: false view_group_content: id: view_group_content - table: group_content + table: group_relationship field: view_group_content relationship: none group_type: group @@ -1671,7 +1671,7 @@ display: absolute: false edit_group_content: id: edit_group_content - table: group_content + table: group_relationship field: edit_group_content relationship: none group_type: group @@ -1724,7 +1724,7 @@ display: absolute: false delete_group_content: id: delete_group_content - table: group_content + table: group_relationship field: delete_group_content relationship: none group_type: group @@ -2170,7 +2170,7 @@ display: separator: ', ' view_group_content: id: view_group_content - table: group_content + table: group_relationship field: view_group_content relationship: none group_type: group @@ -2510,7 +2510,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: none group_type: group diff --git a/web/sites/default/config/views.view.group_menu.yml b/web/sites/default/config/views.view.group_menu.yml index b536ea077..f02a3016b 100644 --- a/web/sites/default/config/views.view.group_menu.yml +++ b/web/sites/default/config/views.view.group_menu.yml @@ -269,7 +269,7 @@ display: 'group_node:resource': '0' gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -3034,7 +3034,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -3793,7 +3793,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -4538,7 +4538,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group diff --git a/web/sites/default/config/views.view.group_nodes.yml b/web/sites/default/config/views.view.group_nodes.yml index 5cb8cd0d1..b738cf544 100644 --- a/web/sites/default/config/views.view.group_nodes.yml +++ b/web/sites/default/config/views.view.group_nodes.yml @@ -366,7 +366,7 @@ display: field_api_classes: false view_group_content: id: view_group_content - table: group_content + table: group_relationship field: view_group_content relationship: group_content group_type: group @@ -419,7 +419,7 @@ display: absolute: false edit_group_content: id: edit_group_content - table: group_content + table: group_relationship field: edit_group_content relationship: group_content group_type: group @@ -470,7 +470,7 @@ display: text: 'Edit relation' delete_group_content: id: delete_group_content - table: group_content + table: group_relationship field: delete_group_content relationship: group_content group_type: group @@ -677,7 +677,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -1700,7 +1700,7 @@ display: destination: false view_group_content: id: view_group_content - table: group_content + table: group_relationship field: view_group_content relationship: group_content group_type: group @@ -1753,7 +1753,7 @@ display: absolute: false delete_group_content: id: delete_group_content - table: group_content + table: group_relationship field: delete_group_content relationship: group_content group_type: group @@ -1804,7 +1804,7 @@ display: text: 'Delete relation' edit_group_content: id: edit_group_content - table: group_content + table: group_relationship field: edit_group_content relationship: group_content group_type: group diff --git a/web/sites/default/config/views.view.manage_group_content.yml b/web/sites/default/config/views.view.manage_group_content.yml index 30c9a57e2..06b813fcd 100644 --- a/web/sites/default/config/views.view.manage_group_content.yml +++ b/web/sites/default/config/views.view.manage_group_content.yml @@ -803,7 +803,7 @@ display: arguments: gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group diff --git a/web/sites/default/config/views.view.my_content.yml b/web/sites/default/config/views.view.my_content.yml index a44b2402b..0d58eda5a 100644 --- a/web/sites/default/config/views.view.my_content.yml +++ b/web/sites/default/config/views.view.my_content.yml @@ -264,7 +264,7 @@ display: field_api_classes: false gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -1414,7 +1414,7 @@ display: 'group_node:resource': '0' gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -1447,7 +1447,7 @@ display: 'group_media:remote_video': '0' gc__user: id: gc__user - table: group_content_field_data + table: group_relationship_field_data field: gc__user relationship: group_content_id group_type: group @@ -2107,7 +2107,7 @@ display: field_api_classes: false gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group diff --git a/web/sites/default/config/views.view.my_groups.yml b/web/sites/default/config/views.view.my_groups.yml index c4db460c1..4ee345dbd 100644 --- a/web/sites/default/config/views.view.my_groups.yml +++ b/web/sites/default/config/views.view.my_groups.yml @@ -246,7 +246,7 @@ display: options: query_comment: '' disable_sql_rewrite: false - distinct: false + distinct: true replica: false query_tags: { } relationships: @@ -271,7 +271,7 @@ display: 'group_media:remote_video': '0' gc__user: id: gc__user - table: group_content_field_data + table: group_relationship_field_data field: gc__user relationship: group_content_id group_type: group diff --git a/web/sites/default/config/views.view.my_media.yml b/web/sites/default/config/views.view.my_media.yml index 282d9fb9c..d1a8146f8 100644 --- a/web/sites/default/config/views.view.my_media.yml +++ b/web/sites/default/config/views.view.my_media.yml @@ -1197,7 +1197,7 @@ display: 'group_media:remote_video': '0' gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -1230,7 +1230,7 @@ display: 'group_media:remote_video': '0' gc__user: id: gc__user - table: group_content_field_data + table: group_relationship_field_data field: gc__user relationship: group_content_id group_type: group @@ -2443,7 +2443,7 @@ display: 'group_media:remote_video': '0' gid: id: gid - table: group_content_field_data + table: group_relationship_field_data field: gid relationship: group_content group_type: group @@ -2476,7 +2476,7 @@ display: 'group_media:remote_video': '0' gc__user: id: gc__user - table: group_content_field_data + table: group_relationship_field_data field: gc__user relationship: group_content_id group_type: group diff --git a/web/sites/default/config/views.view.notifications.yml b/web/sites/default/config/views.view.notifications.yml index a22b733f3..9f5535cbd 100644 --- a/web/sites/default/config/views.view.notifications.yml +++ b/web/sites/default/config/views.view.notifications.yml @@ -355,7 +355,7 @@ display: 'group_media:remote_video': '0' gc__node: id: gc__node - table: group_content_field_data + table: group_relationship_field_data field: gc__node relationship: group_content_id group_type: group