Merge branch 'release/2.x/2.10.0' into 2.x-master

.tugboat/security.settings.php

@@ -6,75 +6,77 @@
  * Modules allow list for GovCMS module_permissions.
  */
 $config['module_permissions.settings']['managed_modules'] = [
-  "bigmenu",
-  "captcha",
-  "ctools_block",
-  "ctools_views",
-  "chosen",
-  "chosen_field",
-  "chosen_lib",
-  "components",
-  "contact_storage",
-  "context",
-  "context_ui",
-  "crop",
-  "search_api_db",
-  "search_api_db_defaults",
-  "datetime",
-  "datetime_range",
-  "dropzonejs",
-  "dropzonejs_eb_widget",
-  "dynamic_entity_reference",
-  "embed",
-  "entity_browser",
-  "entity_browser_entity_form",
-  "entity_class_formatter",
-  "entity_embed",
-  "entity_reference",
-  "entity_reference_display",
-  "entity_reference_revisions",
-  "environment_indicator",
-  "environment_indicator_ui",
-  "facets",
-  "facets_range_widget",
-  "field_group",
-  "file",
-  "focal_point",
-  "govcms_dlm",
-  "basic_auth",
-  "image",
-  "image_captcha",
-  "inline_entity_form",
-  "jquery_ui",
-  "link",
-  "linked_field",
-  "linkit",
-  "mailsystem",
-  "media_entity_file_replace",
-  "menu_block",
-  "menu_trail_by_path",
-  "metatag",
-  "minisite",
-  "options",
-  "paragraphs",
-  "pathauto",
-  "shield",
-  "recaptcha",
-  "redirect",
-  "redirect_404",
-  "redirect_domain",
-  "robotstxt",
-  "scheduled_transitions",
-  "search_api",
-  "search_api_attachments",
-  "search_api_solr",
-  "token",
-  "webform",
-  "webform_access",
-  "webform_attachment",
-  "webform_image_select",
-  "webform_node",
-  "webform_ui",
+  'bigmenu',
+  'captcha',
+  'ctools_block',
+  'ctools_views',
+  'chosen',
+  'chosen_field',
+  'chosen_lib',
+  'components',
+  'contact_storage',
+  'context',
+  'context_ui',
+  'crop',
+  'search_api_db',
+  'search_api_db_defaults',
+  'datetime',
+  'datetime_range',
+  'dropzonejs',
+  'dropzonejs_eb_widget',
+  'dynamic_entity_reference',
+  'embed',
+  'entity_browser',
+  'entity_browser_entity_form',
+  'entity_class_formatter',
+  'entity_embed',
+  'entity_reference',
+  'entity_reference_display',
+  'entity_reference_revisions',
+  'environment_indicator',
+  'environment_indicator_ui',
+  'facets',
+  'facets_range_widget',
+  'field_group',
+  'field_ui',
+  'file',
+  'focal_point',
+  'govcms_dlm',
+  'basic_auth',
+  'image',
+  'image_captcha',
+  'inline_entity_form',
+  'jquery_ui',
+  'link',
+  'linked_field',
+  'linkit',
+  'mailsystem',
+  'media_entity_file_replace',
+  'menu_block',
+  'menu_trail_by_path',
+  'metatag',
+  'minisite',
+  'options',
+  'paragraphs',
+  'pathauto',
+  'shield',
+  'recaptcha',
+  'redirect',
+  'redirect_404',
+  'redirect_domain',
+  'robotstxt',
+  'role_delegation',
+  'scheduled_transitions',
+  'search_api',
+  'search_api_attachments',
+  'search_api_solr',
+  'token',
+  'webform',
+  'webform_access',
+  'webform_attachment',
+  'webform_image_select',
+  'webform_node',
+  'webform_ui',
 ];
 
 /**
@@ -91,4 +93,6 @@
 $config['module_permissions.settings']['permission_blacklist'] = [
   'administer modules',
   'administer permissions',
+  'administer search_api',
+  'assign all roles',
 ];

composer.json

@@ -27,8 +27,8 @@
         "bower-asset/chosen": "1.8.7",
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
-        "drupal/address": "1.9",
-        "drupal/admin_toolbar": "3.0.3",
+        "drupal/address": "1.10.0",
+        "drupal/admin_toolbar": "3.1.0",
         "drupal/adminimal_admin_toolbar": "1.11.0",
         "drupal/adminimal_theme": "1.6.0",
         "drupal/bigmenu": "2.0.0-rc2",
@@ -91,15 +91,16 @@
         "drupal/paragraphs": "1.12",
         "drupal/password_policy": "3.1.0",
         "drupal/pathauto": "1.8.0",
-        "drupal/real_aes": "2.3",
+        "drupal/real_aes": "2.4.0",
         "drupal/recaptcha": "3.0",
         "drupal/redirect": "1.7.0",
         "drupal/rest_menu_items": "3.0.2",
         "drupal/robotstxt": "1.4",
-        "drupal/scheduled_transitions": "2.1.0",
-        "drupal/search_api": "1.21.0",
+        "drupal/role_delegation": "1.1.0",
+        "drupal/scheduled_transitions": "2.2.0",
+        "drupal/search_api": "1.23.0",
         "drupal/search_api_attachments": "9.0.0",
-        "drupal/search_api_solr": "4.2.1",
+        "drupal/search_api_solr": "4.2.7",
         "drupal/seckit": "2.0.0",
         "drupal/shield": "1.5.0",
         "drupal/simple_oauth": "5.2.0",
@@ -170,7 +171,9 @@
         "patches": {
             "drupal/tfa": {
                 "Create Email one-time-code Validation Plugin & related Setup Plugin - https://www.drupal.org/project/tfa/issues/2930541": "https://www.drupal.org/files/issues/2020-10-19/tfa-2930541-22_0.patch",
-                "Users' recovery codes exposed to admin users - https://www.drupal.org/project/tfa/issues/3075304": "https://www.drupal.org/files/issues/2021-01-14/tfa-3075304-15.patch"
+                "Users' recovery codes exposed to admin users - https://www.drupal.org/project/tfa/issues/3075304": "https://www.drupal.org/files/issues/2021-01-14/tfa-3075304-15.patch",
+                "Set upper limit for number of skipped validation": "https://www.drupal.org/files/issues/2022-02-09/3263289-set-upper-limit.patch"
+
             },
             "drupal/twig_tweak": {
                 "sanitize input": "https://www.drupal.org/files/issues/2021-02-03/twig_tweak-token-xss.patch"
@@ -189,6 +192,12 @@
         }
     },
     "config": {
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "drupal/core-composer-scaffold": true,
+            "oomphinc/composer-installers-extender": true
+        },
         "bin-dir": "bin/",
         "sort-packages": true,
         "optimize-autoloader": true

config/install/user.role.govcms_site_administrator.yml

@@ -51,6 +51,9 @@ permissions:
   - 'administer user form display'
   - 'administer users'
   - 'administer views'
+  - 'assign govcms_content_approver role'
+  - 'assign govcms_content_author role'
+  - 'assign govcms_site_administrator role'
   - 'bypass honeypot protection'
   - 'bypass node access'
   - 'configure any layout'

govcms.info.yml

@@ -3,7 +3,7 @@ type: profile
 description: 'A GovCMS Drupal Distribution for government and the public sector in Australia.'
 project: govcms
 core_version_requirement: ^9
-version: '2.8.0'
+version: '2.10.0'
 
 distribution:
   name: GovCMS
@@ -27,7 +27,6 @@ install:
   - options
   - page_cache
   - path
-  - quickedit
   - rdf
   - settings_tray
   - shortcut

govcms.install

@@ -128,3 +128,37 @@ function govcms_install() {
     ])
     ->save(TRUE);
 }
+
+/**
+ * Issue GOVCMSD9-598: Remove the stub modules from the distribution.
+ */
+function govcms_update_9001() {
+  $stub_modules = [
+    'govcms8_default_content',
+    'govcms_content_types',
+    'govcms_blog_article',
+    'govcms_event',
+    'govcms_foi',
+    'govcms_news_and_media',
+    'govcms_standard_page',
+    'govcms_search',
+    'govcms_workflows',
+  ];
+
+  $extension_config = \Drupal::configFactory()->getEditable('core.extension');
+  $module = $extension_config->get('module');
+
+  foreach($stub_modules as $stub_module) {
+    if (isset($module[$stub_module])) {
+      unset($module[$stub_module]);
+    }
+  }
+
+  $extension_config->set('module', $module);
+  $extension_config->save();
+
+  // Remove stub modules from system.schema.
+  foreach($stub_modules as $stub_module) {
+    \Drupal::keyValue('system.schema')->delete($stub_module);
+  }
+}

tests/cy/cypress.json

@@ -4,8 +4,8 @@
     "www.google-analytics.com"
   ],
   "chromeWebSecurity": false,
-  "localEnv": "ahoy",
   "env": {
+    "localEnv": "lagoon",
     "user": {
       "administrator": {
         "username": "administrator",