diff --git a/.github/workflows/acquia_cms_ci.workflow.yml b/.github/workflows/acquia_cms_ci.workflow.yml index 0e9d91c72..4aca4b6bc 100644 --- a/.github/workflows/acquia_cms_ci.workflow.yml +++ b/.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 diff --git a/composer.lock b/composer.lock index 8f57c4670..4a55c2782 100644 --- a/composer.lock +++ b/composer.lock @@ -2594,9 +2594,10 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_headless", - "reference": "8245e857382cd2bb9662e785cacef4ae455af944" + "reference": "32891b690ca77f8f8021bc1775c54945a10385b8" }, "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", @@ -2789,7 +2790,7 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_search", - "reference": "faafd17dc48f421e1d12d1ec0c76d810f4b85bca" + "reference": "1c79f423c14b34efc2eed155a6cf8bf1404a7347" }, "require": { "cweagans/composer-patches": "^1.7", @@ -2921,7 +2922,7 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_toolbar", - "reference": "d6cd7d13ed41934d7654920ccb8a751972a28be6" + "reference": "be6fe88d08fdf50135d62a79fc3217b69bc6aa6b" }, "require": { "acquia/drupal-environment-detector": "^1.5", @@ -2950,7 +2951,7 @@ "dist": { "type": "path", "url": "./modules/acquia_cms_tour", - "reference": "f4cea1338093f3bd87095843583036f0bf289ecf" + "reference": "2dc8408687738551fc43e34939381eca3d905c56" }, "require": { "drupal/checklistapi": "^2.1" diff --git a/modules/acquia_cms_common/acquia_cms_common.install b/modules/acquia_cms_common/acquia_cms_common.install index a4edc1219..04ac0f7b5 100644 --- a/modules/acquia_cms_common/acquia_cms_common.install +++ b/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', - ]; } /** diff --git a/modules/acquia_cms_common/acquia_cms_common.module b/modules/acquia_cms_common/acquia_cms_common.module index 308ddb835..dfb758bb9 100644 --- a/modules/acquia_cms_common/acquia_cms_common.module +++ b/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. * diff --git a/modules/acquia_cms_headless/acquia_cms_headless.info.yml b/modules/acquia_cms_headless/acquia_cms_headless.info.yml index 927f095da..c3fb91b9f 100644 --- a/modules/acquia_cms_headless/acquia_cms_headless.info.yml +++ b/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 diff --git a/modules/acquia_cms_headless/composer.json b/modules/acquia_cms_headless/composer.json index 749078b69..a1454b938 100644 --- a/modules/acquia_cms_headless/composer.json +++ b/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", diff --git a/modules/acquia_cms_image/acquia_cms_image.install b/modules/acquia_cms_image/acquia_cms_image.install index 8f4b9c462..6ad91889f 100644 --- a/modules/acquia_cms_image/acquia_cms_image.install +++ b/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. */ diff --git a/modules/acquia_cms_image/content/file/Acquia CMS.png b/modules/acquia_cms_image/content/file/Acquia CMS.png deleted file mode 100644 index e079bbacd..000000000 Binary files a/modules/acquia_cms_image/content/file/Acquia CMS.png and /dev/null differ