Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UHF-8650 Config ignore fix #837

Merged
merged 3 commits into from
Oct 31, 2024
Merged

UHF-8650 Config ignore fix #837

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
355dbbd
UHF-8650: Added uninstall hook to remove the module settings file whe…
khalima Oct 31, 2024
1ce5135
UHF-8650: Switched the deprecated config_ignore_settings_alter to con…
khalima Oct 31, 2024
17cabc6
UHF-8650: Revert the alphabetical change.
khalima Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions modules/hdbt_cookie_banner/hdbt_cookie_banner.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,20 @@ function hdbt_cookie_banner_install($is_syncing) : void {
// Grant required permissions.
hdbt_cookie_banner_grant_permissions();
}

/**
* Implements hook_uninstall().
*/
function hdbt_cookie_banner_uninstall(): void {
$config_factory = Drupal::configFactory();

// The configurations to remove.
$configurations = [
'hdbt_cookie_banner.settings',
];

// Remove each installed configuration.
foreach ($configurations as $config) {
$config_factory->getEditable($config)->delete();
}
}
29 changes: 26 additions & 3 deletions modules/hdbt_cookie_banner/hdbt_cookie_banner.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,37 @@

declare(strict_types=1);

use Drupal\config_ignore\ConfigIgnoreConfig;
use Drupal\Core\Language\LanguageInterface;
use Drupal\hdbt_cookie_banner\Form\HdbtCookieBannerForm;

/**
* Implements hook_config_ignore_settings_alter().
* Implements hook_config_ignore_ignored_alter().
*/
function hdbt_cookie_banner_config_ignore_settings_alter(array &$settings): void {
$settings[] = HdbtCookieBannerForm::SETTINGS;
function hdbt_cookie_banner_config_ignore_ignored_alter(ConfigIgnoreConfig $ignored): void {
$settings_to_ignore = [
'site_settings',
'use_custom_settings',
'use_internal_hds_cookie_js',
'hds_cookie_js_override',
];

$settings_to_ignore = array_map(
fn($setting) => HdbtCookieBannerForm::SETTINGS . ':' . $setting,
$settings_to_ignore,
);

// Add the configuration objects to the ignore list, but retain the
// hdbt_cookie_banner.settings.
foreach (['create', 'update', 'delete'] as $operation) {
foreach (['import', 'export'] as $direction) {
$list = array_merge(
$ignored->getList($direction, $operation),
$settings_to_ignore,
);
$ignored->setList($direction, $operation, $list);
}
}
}

/**
Expand Down
Loading