localgovdrupal · finnlewis · Oct 2, 2023 · Sep 5, 2023 · Sep 5, 2023 · Sep 5, 2023
diff --git a/.github/workflows/localgov_microsites.yml b/.github/workflows/localgov_microsites.yml
@@ -6,15 +6,14 @@ name: Test LocalGov Microsites localgovdrupal/localgov_microsites_group drupal-m
 on:
   push:
     branches:
-      - '2.x'
+      - '3.x'
   pull_request:
     branches:
-      - '2.x'
+      - '3.x'
 
 env:
   LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_microsites_group
   LOCALGOV_DRUPAL_PROJECT_PATH: web/modules/contrib/localgov_microsites_group
-  MICROSITES_VERSION: 2.1.x
 
 jobs:
 
@@ -26,9 +25,9 @@ jobs:
       fail-fast: false
       matrix:
         localgov-version:
-          - '2.x'
+          - '3.x'
         drupal-version:
-          - '~9.3'
+          - '~10.0'
         php-version:
           - '8.1'
 
@@ -83,7 +82,7 @@ jobs:
       - name: Create LocalGov Microsites project
         run: |
           composer create-project --stability dev --no-install localgovdrupal/localgov_microsites_project ./html "${{ matrix.localgov-version }}"
-          composer --working-dir=./html require --no-install localgovdrupal/localgov_microsites:${MICROSITES_VERSION}-dev
+          composer --working-dir=./html require --no-install localgovdrupal/localgov_microsites:${{ matrix.localgov-version }}-dev
           composer --working-dir=./html require --no-install drupal/core-recommended:${{ matrix.drupal-version }} drupal/core-composer-scaffold:${{ matrix.drupal-version }} drupal/core-project-message:${{ matrix.drupal-version }} drupal/core-dev:${{ matrix.drupal-version }}
           composer --working-dir=./html install
 
@@ -109,9 +108,9 @@ jobs:
       fail-fast: false
       matrix:
         localgov-version:
-          - '2.x'
+          - '3.x'
         drupal-version:
-          - '~9.3'
+          - '~10.0'
         php-version:
           - '8.1'
 
@@ -144,9 +143,9 @@ jobs:
       fail-fast: false
       matrix:
         localgov-version:
-          - '2.x'
+          - '3.x'
         drupal-version:
-          - '~9.3'
+          - '~10.0'
         php-version:
           - '8.1'
 
@@ -178,9 +177,9 @@ jobs:
       fail-fast: false
       matrix:
         localgov-version:
-          - '2.x'
+          - '3.x'
         drupal-version:
-          - '~9.3'
+          - '~10.0'
         php-version:
           - '8.1'
 

diff --git a/composer.json b/composer.json
@@ -4,28 +4,26 @@
   "type": "drupal-module",
   "license": "GPL-2.0-or-later",
   "require": {
-    "drupal/core": "^9",
     "drupal/domain_path": "^1.2",
     "drupal/field_formatter_class": "^1.5",
     "drupal/ginvite": "4.0.0-alpha1",
-    "drupal/group": "^3.0.0-beta4",
-    "drupal/group_content_menu": "dev-3.0.x#0c85b43d",
+    "drupal/group": "^3.2",
+    "drupal/group_content_menu": "^3.0",
     "drupal/group_permissions": "2.0.0-alpha5",
-    "drupal/group_term": "4.0.0-alpha5",
-    "drupal/groupmedia": "4.0.0-alpha1 ",
+    "drupal/group_term": "^4.0",
+    "drupal/groupmedia": "^4.0.1",
     "drupal/override_node_options": "^2.6",
     "drupal/replicate": "^1.0",
     "drupal/role_delegation": "^1.2",
-    "localgovdrupal/group_webform": "^1.0.0-beta1",
-    "localgovdrupal/localgov_core": "^2.1.0",
-    "localgovdrupal/localgov_forms": "^1.0.0-beta1",
-    "localgovdrupal/localgov_page": "^1.0.0-beta1",
-    "localgovdrupal/localgov_search": "^1.1"
+    "localgovdrupal/group_webform": "^1.0.0-beta2",
+    "localgovdrupal/localgov_core": "^2.12",
+    "localgovdrupal/localgov_forms": "^1.0.0-beta2",
+    "localgovdrupal/localgov_search": "^1.2"
   },
   "require-dev": {
     "localgovdrupal/localgov_news": "^2.1",
-    "localgovdrupal/localgov_directories": "^2.2",
-    "localgovdrupal/localgov_events": "^2.0"
+    "localgovdrupal/localgov_directories": "^3.0@alpha",
+    "localgovdrupal/localgov_events": "^3.0@alpha"
   },
   "suggests": {
     "localgovdrupal/localgov_directories": "For directories content type in microsites",
@@ -42,11 +40,11 @@
           "domain_path_pathauto creates duplicate aliases #3285213": "https://www.drupal.org/files/issues/2022-06-11/domain_path_pathauto-obey-current-domain_id-querying-for-reserved-aliases-3285213.patch",
           "Warning: Undefined array key 'pathauto' #3315752": "https://www.drupal.org/files/issues/2022-10-17/undefined-array-key-pathauto-3265497-2.patch"
       },
-      "drupal/groupmedia": {
-          "Update addPage in groupmediato work with Group 3.x and suppress errors #3325129": "https://git.drupalcode.org/issue/groupmedia-3325129/-/commit/194f7bfa1d51f9a34a00ab4323f5fdf8c82ff48b.patch"
-      },
       "drupal/ginvite": {
           "View schema fix #3324625": "https://www.drupal.org/files/issues/2022-11-30/3324625-2-schema-fix-for-4.0.x.patch"
+      },
+      "drupal/group_permissions": {
+          "Access checking must be explicitly set on entity queries #3368882": "https://www.drupal.org/files/issues/2023-07-11/add_access_check_to_entity_query.patch"
       }
     }
   }

diff --git a/config/install/user.role.microsites_controller.yml b/config/install/user.role.microsites_controller.yml
@@ -11,6 +11,7 @@ dependencies:
     - domain_path
     - group
     - media
+    - role_delegation
     - system
     - toolbar
     - tour
@@ -21,16 +22,14 @@ is_admin: null
 permissions:
   - 'access administration pages'
   - 'access media overview'
+  - 'access microsites overview'
   - 'access toolbar'
   - 'access tour'
   - 'access user profiles'
   - 'administer domains'
   - 'administer media'
   - 'administer users'
-  - 'assign microsites_controller role'
-  - 'assign microsites_trusted_editor role'
   - 'bypass domain group permissions'
-  - 'bypass group access'
   - 'cancel account'
   - 'change own username'
   - 'create document media'
@@ -43,7 +42,6 @@ permissions:
   - 'edit any image media'
   - 'edit any remote_video media'
   - 'edit domain path entity'
-  - 'edit layout paragraphs plugin config'
   - 'edit own document media'
   - 'edit own image media'
   - 'edit own remote_video media'

diff --git a/config/install/user.role.microsites_trusted_editor.yml b/config/install/user.role.microsites_trusted_editor.yml
@@ -9,6 +9,7 @@ dependencies:
     - media
     - system
     - domain_path
+    - layout_paragraphs_permissions
     - localgov_sa11y
     - override_node_options
 id: microsites_trusted_editor

diff --git a/config/optional/views.view.localgov_microsites_overview.yml b/config/optional/views.view.localgov_microsites_overview.yml
@@ -4,6 +4,7 @@ dependencies:
   config:
     - group.type.microsite
     - system.menu.admin
+    - user.role.microsites_controller
   module:
     - group
     - user
@@ -170,7 +171,7 @@ display:
       access:
         type: perm
         options:
-          perm: 'bypass group access'
+          perm: 'access microsites overview'
       cache:
         type: tag
         options: {  }

diff --git a/localgov_microsites_group.info.yml b/localgov_microsites_group.info.yml
@@ -2,7 +2,7 @@ name: LocalGov Microsites Group
 type: module
 description: Group integration for Microsites.
 package: LocalGov Drupal
-core_version_requirement: ^9.3
+core_version_requirement: ^9.3 || ^10
 dependencies:
   # Drupal
   - drupal:image
@@ -23,6 +23,7 @@ dependencies:
   - groupmedia_paragraphs:groupmedia_paragraphs
   - group_permissions:group_permissions
   - group_content_menu:group_content_menu
+  - layout_paragraphs:layout_paragraphs_permissions
   - media_library:media_library
   - override_node_options:override_node_options
   - replicate:replicate

diff --git a/localgov_microsites_group.module b/localgov_microsites_group.module
@@ -463,3 +463,17 @@ function localgov_microsites_group_toolbar() {
     ],
   ];
 }
+
+/**
+ * Implements hook_localgov_microsites_roles_default().
+ */
+function localgov_microsites_group_localgov_microsites_roles_default() {
+  return [
+    'global' => [
+      RolesHelper::MICROSITES_CONTROLLER_ROLE => [
+        'assign microsites_controller role',
+        'assign microsites_trusted_editor role',
+      ],
+    ],
+  ];
+}
diff --git a/localgov_microsites_group.permissions.yml b/localgov_microsites_group.permissions.yml
@@ -0,0 +1,2 @@
+access microsites overview:
+  title: 'Access the Microcistes overview page'
diff --git a/modules/localgov_microsites_blogs/localgov_microsites_blogs.info.yml b/modules/localgov_microsites_blogs/localgov_microsites_blogs.info.yml
@@ -2,7 +2,7 @@ name: Localgov Microsites Blogs
 description: LocalGov Blogs integration with Microsites.
 type: module
 package: LocalGov Drupal
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 dependencies:
   - group:gnode
   - group_term:group_term

diff --git a/...tes_directories/config/optional/block.block.localgov_directories_channel_search_block.yml b/...tes_directories/config/optional/block.block.localgov_directories_channel_search_block.yml
@@ -21,7 +21,7 @@ settings:
     node: '@node.node_route_context:node'
 visibility:
   node_type:
-    id: node_type
+    id: entity_bundle:node
     bundles:
       localgov_directory: localgov_directory
     negate: false

diff --git a/...calgov_microsites_directories/config/optional/block.block.localgov_directories_facets.yml b/...calgov_microsites_directories/config/optional/block.block.localgov_directories_facets.yml
@@ -22,7 +22,7 @@ settings:
   block_id: localgov_directories_facets
 visibility:
   node_type:
-    id: node_type
+    id: entity_bundle:node
     bundles:
       localgov_directory: localgov_directory
     negate: false

diff --git a/modules/localgov_microsites_directories/localgov_microsites_directories.info.yml b/modules/localgov_microsites_directories/localgov_microsites_directories.info.yml
@@ -2,7 +2,7 @@ name: Localgov Microsites Directories
 description: LocalGov Directories integration with Microsites.
 type: module
 package: LocalGov Drupal
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 dependencies:
   - drupal:views
   - localgov_directories:localgov_directories

diff --git a/modules/localgov_microsites_directories/localgov_microsites_directories.module b/modules/localgov_microsites_directories/localgov_microsites_directories.module
@@ -84,7 +84,7 @@ function localgov_microsites_directories_localgov_microsites_roles_default() {
   return [
     'global' => [
       RolesHelper::MICROSITES_CONTROLLER_ROLE => [
-        'access localgov_geo_library entity browser pages',
+        'access geo_entity_library entity browser pages',
         'create directory facets',
         'create geo',
         'delete directory facets',
@@ -94,7 +94,7 @@ function localgov_microsites_directories_localgov_microsites_roles_default() {
         'view directory facets',
       ],
       RolesHelper::MICROSITES_EDITOR_ROLE => [
-        'access localgov_geo_library entity browser pages',
+        'access geo_entity_library entity browser pages',
         'create directory facets',
         'create geo',
         'delete directory facets',

diff --git a/modules/localgov_microsites_events/localgov_microsites_events.info.yml b/modules/localgov_microsites_events/localgov_microsites_events.info.yml
@@ -2,7 +2,7 @@ name: Localgov Microsites Events
 description: LocalGov Events integration with Microsites.
 type: module
 package: LocalGov Drupal
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 dependencies:
   - group:gnode
   - group_term:group_term

diff --git a/modules/localgov_microsites_events/localgov_microsites_events.module b/modules/localgov_microsites_events/localgov_microsites_events.module
@@ -14,13 +14,13 @@ function localgov_microsites_events_localgov_microsites_roles_default() {
   return [
     'global' => [
       RolesHelper::MICROSITES_CONTROLLER_ROLE => [
-        'access localgov_geo_library entity browser pages',
+        'access geo_entity_library entity browser pages',
         'create geo',
         'delete geo',
         'edit geo',
       ],
       RolesHelper::MICROSITES_EDITOR_ROLE => [
-        'access localgov_geo_library entity browser pages',
+        'access geo_entity_library entity browser pages',
         'create geo',
         'delete geo',
         'edit geo',

diff --git a/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.info.yml b/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.info.yml
@@ -2,7 +2,7 @@ name: LocalgGov Microsites Group Term UI
 type: module
 description: Provides a UI for the Group Term module for use with LocalGov Microsites.
 package: LocalGov Drupal
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 dependencies:
   - domain_group:domain_group
   - drupal:taxonomy

diff --git a/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.module b/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.module
@@ -105,6 +105,7 @@ function localgov_microsites_group_term_ui_form_alter(&$form, FormStateInterface
   }
 
   // Add our submit handler.
+  $form['actions']['overview']['#access'] = TRUE;
   $form['actions']['overview']['#submit'][] = 'localgov_microsites_group_term_ui_submit_taxonomy_term_localgov_topic_form';
 }
 

diff --git a/...dules/localgov_microsites_group_term_ui_test/config/install/group.role.default-member.yml b/...dules/localgov_microsites_group_term_ui_test/config/install/group.role.default-member.yml
@@ -3,12 +3,11 @@ status: true
 dependencies:
   config:
     - group.type.default
-    - user.role.authenticated
 id: default-member
 label: Member
 weight: -100
 admin: false
-scope: insider
-global_role: authenticated
+scope: individual
+global_role: null
 group_type: default
 permissions: {  }
diff --git a/...ests/modules/localgov_microsites_group_term_ui_test/config/install/group.type.default.yml b/...ests/modules/localgov_microsites_group_term_ui_test/config/install/group.type.default.yml
@@ -7,4 +7,5 @@ description: ''
 new_revision: true
 creator_membership: true
 creator_wizard: false
-creator_roles: {  }
+creator_roles:
+  - default-admin
diff --git a/...es/localgov_microsites_group_term_ui_test/localgov_microsites_group_term_ui_test.info.yml b/...es/localgov_microsites_group_term_ui_test/localgov_microsites_group_term_ui_test.info.yml
@@ -2,6 +2,6 @@ name: 'LocalGov Microsites Group Term UI test'
 description: 'Support module for LocalGov Microsites Group Term UI tests.'
 package: 'Testing'
 type: 'module'
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^8.8 || ^9 || ^10
 dependencies:
   - localgov_microsites_group:localgov_microsites_group_term_ui
diff --git a/modules/localgov_microsites_group_term_ui/tests/src/Kernel/GroupTermEntityReferenceTest.php b/modules/localgov_microsites_group_term_ui/tests/src/Kernel/GroupTermEntityReferenceTest.php
@@ -41,7 +41,10 @@ protected function setUp(): void {
     $this->installEntitySchema('entity_test');
     $this->installEntitySchema('taxonomy_term');
     $this->installEntitySchema('user');
-    $this->installConfig(['localgov_microsites_group_term_ui_test']);
+    $this->installConfig([
+      'user',
+      'localgov_microsites_group_term_ui_test',
+    ]);
   }
 
   /**

diff --git a/modules/localgov_microsites_group_webform/localgov_microsites_group_webform.info.yml b/modules/localgov_microsites_group_webform/localgov_microsites_group_webform.info.yml
@@ -2,7 +2,7 @@ name: LocalGov Microsites Group Webform
 type: module
 description: Webform integration for Microsites.
 package: LocalGov Drupal
-core_version_requirement: ^9.3
+core_version_requirement: ^9.3 || ^10
 dependencies:
   # Drupal
   - core:inline_form_errors

diff --git a/modules/localgov_microsites_news/localgov_microsites_news.info.yml b/modules/localgov_microsites_news/localgov_microsites_news.info.yml
@@ -2,7 +2,7 @@ name: Localgov Microsites News
 description: LocalGov Newsroom integration with Microsites.
 type: module
 package: LocalGov Drupal
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 dependencies:
   - group:gnode
   - group_term:group_term
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		access microsites overview:
		title: 'Access the Microcistes overview page'
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       // Add our submit handler.
+      $form['actions']['overview']['#access'] = TRUE;
       $form['actions']['overview']['#submit'][] = 'localgov_microsites_group_term_ui_submit_taxonomy_term_localgov_topic_form';
     }
@@ Expand Down @@