You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This shouldn't be merged until a release that's after July 31st, 2024.
Once July 31st, 2024 has passed, the EU user consent policy will apply to Switzerland and the conditionality for including it introduced via #8643 should be removed (i.e. the date / feature flag check).
See the PR for the issue, #8704, for code-level details. Any code relating to the change which is no longer needed should be removed.
Do not alter or remove anything below. The following sections will be managed by moderators only.
Acceptance criteria
Switzerland (country code CH) should always be included in the list of "consent mode regions" in Site Kit, without a feature flag or date condition.
The consentModeSwitzerland feature flag should be removed.
Implementation Brief
Remove the consentModeSwitzerland feature flag from feature-flags.json.
In includes/Core/Consent_Mode/Regions.php, add 'CH' to the array EU_USER_CONSENT_POLICY and remove the condition completely in get_regions:- this function should now simply return EU_USER_CONSENT_POLICY.
Update assets/js/components/consent-mode/ConfirmDisableConsentModeDialog.js, removing the two conditions on 'CH' being included in the list of regions. The copy for both the Ads connected and not connected states should mention Switzerland:
When the Ads module is not connected the subtitle copy should be: Disabling consent mode may affect your ability in the European Economic Area, the UK and Switzerland to:
When the Ads module is connected the subtitle copy should be: Disabling consent mode may affect your ability to track these in the European Economic Area, the UK and Switzerland:
Test Coverage
Remove use requirement of the feature flag in assets/js/components/consent-mode/ConfirmDisableConsentModeDialog.test.js, in the should display appropriate subtitle with Ads connected and Switzerland included in list of consent mode regions test.
Update the tests assets/js/components/consent-mode/ConfirmDisableConsentModeDialog.test.js. Only two tests should be required:
should display appropriate subtitle with Ads not connected
should display appropriate subtitle with Ads connected
Switzerland should always be included in the subtitle copy.
Also remove the requirement for the feature flag in these tests.
In tests/e2e/specs/front-end/consent-mode.test.js, remove the test includes Switzerland (CH) in the list of regions when the consentModeSwitzerland feature flag is enabled.
QA Brief
Test disabling consent mode with both the ads module enabled and disabled:
When the Ads module is not connected the subtitle copy should be: Disabling consent mode may affect your ability in the European Economic Area, the UK and Switzerland to:
When the Ads module is connected the subtitle copy should be: Disabling consent mode may affect your ability to track these in the European Economic Area, the UK and Switzerland:
Changelog entry
The text was updated successfully, but these errors were encountered:
Moving this to the backlog, but since we don't have sprints/releases as far ahead as August, just leaving the title in here for now. Please don't work on this for awhile 😅
This shouldn't be merged until a release that's after July 31st, 2024. I've added a note to the issue, but it's not worth reviewing this in case it will have merge conflicts in a few months.
For now this can stay in CR, but it will might need a bit more time in execution to clear up potential merge conflicts that come up over the next few months 😅
Feature Description
This shouldn't be merged until a release that's after July 31st, 2024.
Once July 31st, 2024 has passed, the EU user consent policy will apply to Switzerland and the conditionality for including it introduced via #8643 should be removed (i.e. the date / feature flag check).
See the PR for the issue, #8704, for code-level details. Any code relating to the change which is no longer needed should be removed.
Do not alter or remove anything below. The following sections will be managed by moderators only.
Acceptance criteria
CH
) should always be included in the list of "consent mode regions" in Site Kit, without a feature flag or date condition.consentModeSwitzerland
feature flag should be removed.Implementation Brief
consentModeSwitzerland
feature flag fromfeature-flags.json
.includes/Core/Consent_Mode/Regions.php
, add'CH'
to the arrayEU_USER_CONSENT_POLICY
and remove the condition completely inget_regions
:- this function should now simply returnEU_USER_CONSENT_POLICY
.assets/js/components/consent-mode/ConfirmDisableConsentModeDialog.js
, removing the two conditions on'CH'
being included in the list of regions. The copy for both the Ads connected and not connected states should mention Switzerland:Disabling consent mode may affect your ability in the European Economic Area, the UK and Switzerland to:
Disabling consent mode may affect your ability to track these in the European Economic Area, the UK and Switzerland:
Test Coverage
assets/js/components/consent-mode/ConfirmDisableConsentModeDialog.test.js
, in theshould display appropriate subtitle with Ads connected and Switzerland included in list of consent mode regions
test.assets/js/components/consent-mode/ConfirmDisableConsentModeDialog.test.js
. Only two tests should be required:should display appropriate subtitle with Ads not connected
should display appropriate subtitle with Ads connected
tests/e2e/specs/front-end/consent-mode.test.js
, remove the testincludes Switzerland (CH) in the list of regions when the consentModeSwitzerland feature flag is enabled
.QA Brief
Disabling consent mode may affect your ability in the European Economic Area, the UK and Switzerland to:
Disabling consent mode may affect your ability to track these in the European Economic Area, the UK and Switzerland:
Changelog entry
The text was updated successfully, but these errors were encountered: