Merge pull request #1921 from acquia/stage

Merge branch `stage` into `main`

.ddev/config.selenium-standalone-chrome.yaml

@@ -0,0 +1,29 @@
+#ddev-generated
+# Remove the line above if you don't want this file to be overwritten when you run
+# ddev get ddev/ddev-selenium-standalone-chrome
+#
+# This file comes from https://github.com/ddev/ddev-selenium-standalone-chrome
+#
+web_environment:
+  - BROWSERTEST_OUTPUT_DIRECTORY=/tmp
+  - BROWSERTEST_OUTPUT_BASE_URL=${DDEV_PRIMARY_URL}
+  - SIMPLETEST_BASE_URL=http://web
+  - SIMPLETEST_DB=mysql://db:db@db/db
+  # Use disable-dev-shm-usage instead of setting shm_usage
+  # https://developers.google.com/web/tools/puppeteer/troubleshooting#tips
+  # The format of chromeOptions is defined at https://chromedriver.chromium.org/capabilities
+  - MINK_DRIVER_ARGS_WEBDRIVER=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"]
+  # Nightwatch
+  - DRUPAL_TEST_BASE_URL=http://web
+  - DRUPAL_TEST_DB_URL=mysql://db:db@db/db
+  - DRUPAL_TEST_WEBDRIVER_HOSTNAME=selenium-chrome
+  - DRUPAL_TEST_WEBDRIVER_PORT=4444
+  - DRUPAL_TEST_WEBDRIVER_PATH_PREFIX=/wd/hub
+  - DRUPAL_TEST_WEBDRIVER_CHROME_ARGS=--disable-gpu --headless --no-sandbox --disable-dev-shm-usage
+  - DRUPAL_TEST_CHROMEDRIVER_AUTOSTART=false
+  - DRUPAL_NIGHTWATCH_SEARCH_DIRECTORY=../
+  - DRUPAL_NIGHTWATCH_IGNORE_DIRECTORIES=node_modules,vendor,.*,sites/*/files,sites/*/private,sites/simpletest
+  - DRUPAL_NIGHTWATCH_OUTPUT=reports/nightwatch
+  # DTT
+  - DTT_BASE_URL=http://web
+  - DTT_MINK_DRIVER_ARGS=[\"chrome\", {\"browserName\":\"chrome\",\"goog:chromeOptions\":{\"w3c\":false,\"args\":[\"--disable-gpu\",\"--headless\", \"--no-sandbox\", \"--disable-dev-shm-usage\"]}}, \"http://selenium-chrome:4444/wd/hub\"]

.ddev/docker-compose.selenium-chrome.yaml

@@ -0,0 +1,34 @@
+#ddev-generated
+# Remove the line above if you don't want this file to be overwritten when you run
+# ddev get ddev/ddev-selenium-standalone-chrome
+#
+# This file comes from https://github.com/ddev/ddev-selenium-standalone-chrome
+#
+services:
+  selenium-chrome:
+    image: seleniarm/standalone-chromium:4.1.4-20220429
+    container_name: ddev-${DDEV_SITENAME}-selenium-chrome
+    expose:
+      #      The internal noVNC port, which operates over HTTP so it can be exposed
+      #      through the router.
+      - 7900
+    environment:
+      - VIRTUAL_HOST=$DDEV_HOSTNAME
+      - HTTPS_EXPOSE=7900:7900
+      - HTTP_EXPOSE=7910:7900
+      - VNC_NO_PASSWORD=1
+    external_links:
+      - ddev-router:${DDEV_SITENAME}.${DDEV_TLD}
+    # To enable VNC access for traditional VNC clients like macOS "Screen Sharing",
+    # uncomment the following two lines.
+    #ports:
+    #  - "5900:5900"
+    labels:
+      com.ddev.site-name: ${DDEV_SITENAME}
+      com.ddev.approot: $DDEV_APPROOT
+    volumes:
+      - ".:/mnt/ddev_config"
+
+  web:
+    links:
+      - selenium-chrome

.github/workflows/acquia_cms_ci.workflow.yml

@@ -128,8 +128,8 @@ jobs:
       matrix:
         orca-job:
           - INTEGRATED_TEST_ON_LATEST_LTS
-          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
-#          - ISOLATED_TEST_ON_CURRENT
+#          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
+          - ISOLATED_TEST_ON_CURRENT
         acms_job:
           - integrated_php_unit_tests
           - integrated_existing_site_tests
@@ -226,8 +226,8 @@ jobs:
       matrix:
         orca-job:
           - INTEGRATED_TEST_ON_LATEST_LTS
-          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
-#          - ISOLATED_TEST_ON_CURRENT
+#          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
+          - ISOLATED_TEST_ON_CURRENT
         #php-version: [ "8.1" ]
         modules:
           - acquia_cms_article
@@ -325,16 +325,16 @@ jobs:
       matrix:
         orca-job:
           - INTEGRATED_TEST_ON_LATEST_LTS
-          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
-#          - ISOLATED_TEST_ON_CURRENT
+#          - INTEGRATED_TEST_ON_PREVIOUS_MINOR
+          - ISOLATED_TEST_ON_CURRENT
         php-version:
           - 8.1
           - 8.3
         exclude:
-          - php-version: 8.1
-            orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR
 #          - php-version: 8.1
-#            orca-job: ISOLATED_TEST_ON_CURRENT
+#            orca-job: INTEGRATED_TEST_ON_PREVIOUS_MINOR
+          - php-version: 8.1
+            orca-job: ISOLATED_TEST_ON_CURRENT
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 20.x

modules/acquia_cms_common/acquia_cms_common.install

@@ -42,12 +42,11 @@ function acquia_cms_common_install($is_syncing) {
     $config = \Drupal::configFactory()->getEditable('config_ignore.settings');
     $existing_ignore_config = $config->get('ignored_config_entities');
     $new_ignore_config = [
-      'language.entity.*',
       'cohesion_*',
+      'language.entity.*',
     ];
     $updated_ignore_config = array_unique(array_merge($existing_ignore_config, $new_ignore_config));
     $config->set('ignored_config_entities', $updated_ignore_config);
-    $config->set('enable_export_filtering', TRUE);
     $config->save(TRUE);
 
     if ($module_handler->moduleExists('page_cache')) {
@@ -122,10 +121,6 @@ function acquia_cms_common_config_schema_info_alter(&$definitions) {
     $definitions['entity_clone.settings']['mapping']['form_settings']['mapping']['redirect'] = $schemaMapping;
     $definitions['entity_clone.settings']['mapping']['form_settings']['mapping']['search_api_task'] = $schemaMapping;
   }
-  $definitions['config_ignore.settings']['mapping']['enable_export_filtering'] = [
-    'type' => 'boolean',
-    'label' => 'Enable export filtering',
-  ];
 }
 
 /**

modules/acquia_cms_common/acquia_cms_common.module

@@ -424,22 +424,6 @@ function acquia_cms_common_preprocess_maintenance_page(array &$variables) {
   $variables['install_page_logo_path'] = '/' . $acquia_cms_path . '/acquia_cms.png';
 }
 
-/**
- * Implements hook_module_implements_alter().
- */
-function acquia_cms_common_module_implements_alter(array &$implementations, string $hook): void {
-  // Prevent installation of site studio package on module install
-  // during site installation from other modules, this causes issue.
-  if ($hook == 'modules_installed') {
-    // The Site studio configurations should not be imported during config
-    // synchronizations.
-    // @todo revert below condition check, after ACO-2516 is released.
-    if (InstallerKernel::installationAttempted() || \Drupal::service('config.installer')->isSyncing()) {
-      unset($implementations['cohesion_sync']);
-    }
-  }
-}
-
 /**
  * Function to rewrite filtered_html & full_html configurations.
  *

modules/acquia_cms_headless/acquia_cms_headless.info.yml

@@ -4,6 +4,7 @@ type: module
 description: 'Provides functionality for Progressively Decoupled and Purely Headless sites using Node and Next JS.'
 core_version_requirement: ^10 || ^11
 dependencies:
+  - acquia_cms_common:acquia_cms_common
   - acquia_cms_tour:acquia_cms_tour
   - consumers:consumers
   - jsonapi_extras:jsonapi_extras

modules/acquia_cms_headless/composer.json

@@ -4,6 +4,7 @@
     "license": "GPL-2.0-or-later",
     "type": "drupal-module",
     "require": {
+        "drupal/acquia_cms_common": "^1.9 || ^2.1 || ^3.1",
         "drupal/acquia_cms_tour": "^2.1.8",
         "drupal/jsonapi_extras": "^3.26",
         "drupal/jsonapi_menu_items": "^1.2",

modules/acquia_cms_image/acquia_cms_image.install

@@ -6,7 +6,6 @@
  */
 
 use Drupal\acquia_cms_image\SiteLogo;
-use Drupal\Core\Installer\InstallerKernel;
 use Drupal\image\Entity\ImageStyle;
 
 /**
@@ -19,20 +18,6 @@ function acquia_cms_image_install($is_syncing) {
   }
 }
 
-/**
- * Implements hook_module_implements_alter().
- */
-function acquia_cms_image_module_implements_alter(array &$implementations, string $hook) : void {
-  if ($hook === 'modules_installed') {
-    // Unset default_content import during site install,
-    // will do it later post install to avoid any error.
-    // @see acquia_cms_import_default_content install task.
-    if (InstallerKernel::installationAttempted()) {
-      unset($implementations['default_content']);
-    }
-  }
-}
-
 /**
  * Update image style to use 'Focal point scale and crop' effect.
  */