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.

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

Include CH in CoMo regions conditionally #8704

Merged
merged 7 commits into from
May 16, 2024

Conversation

nfmohit
Copy link
Collaborator

@nfmohit nfmohit commented May 13, 2024

Summary

Addresses issue:

Relevant technical choices

This PR adds Switzerland (CH) to the list of Consent Mode regions if it is 31 July 2024 or later, OR, if the consentModeSwitzerland feature flag is enabled.

Deviations from IB

It was necessary to express the list of statically defined consent mode regions on the client side as the consent mode settings didn't prove to be very reliable for the regions. Suppose, in a scenario where CoMo was set up earlier and this PR gets merged now, the list of regions in consent mode settings doesn't get updated.

PR Author Checklist

  • My code is tested and passes existing unit tests.
  • My code has an appropriate set of unit tests which all pass.
  • My code is backward-compatible with WordPress 5.2 and PHP 7.4.
  • My code follows the WordPress coding standards.
  • My code has proper inline documentation.
  • I have added a QA Brief on the issue linked above.
  • I have signed the Contributor License Agreement (see https://cla.developers.google.com/).

Do not alter or remove anything below. The following sections will be managed by moderators only.

Code Reviewer Checklist

  • Run the code.
  • Ensure the acceptance criteria are satisfied.
  • Reassess the implementation with the IB.
  • Ensure no unrelated changes are included.
  • Ensure CI checks pass.
  • Check Storybook where applicable.
  • Ensure there is a QA Brief.

Merge Reviewer Checklist

  • Ensure the PR has the correct target branch.
  • Double-check that the PR is okay to be merged.
  • Ensure the corresponding issue has a ZenHub release assigned.
  • Add a changelog message to the issue.

Copy link

github-actions bot commented May 13, 2024

Build files for 90f4f55 have been deleted.

Copy link

github-actions bot commented May 13, 2024

Size Change: +148 B (+0.01%)

Total Size: 1.44 MB

Filename Size Change
./dist/assets/js/googlesitekit-datastore-site-********************.js 19.2 kB +43 B (+0.22%)
./dist/assets/js/googlesitekit-modules-ads-********************.js 26.4 kB +38 B (+0.14%)
./dist/assets/js/googlesitekit-settings-********************.js 59.8 kB +67 B (+0.11%)
ℹ️ View Unchanged
Filename Size
./dist/assets/css/googlesitekit-admin-css-********************.min.css 53.7 kB
./dist/assets/css/googlesitekit-adminbar-css-********************.min.css 11.2 kB
./dist/assets/css/googlesitekit-authorize-application-css-********************.min.css 731 B
./dist/assets/css/googlesitekit-wp-dashboard-css-********************.min.css 7.48 kB
./dist/assets/js/29-********************.js 2.8 kB
./dist/assets/js/30-********************.js 2.28 kB
./dist/assets/js/31-********************.js 3.72 kB
./dist/assets/js/32-********************.js 929 B
./dist/assets/js/33-********************.js 888 B
./dist/assets/js/34-********************.js 3.12 kB
./dist/assets/js/analytics-advanced-tracking-********************.js 778 B
./dist/assets/js/contact-form-7-********************.js 606 B
./dist/assets/js/googlesitekit-activation-********************.js 23.9 kB
./dist/assets/js/googlesitekit-ad-blocking-recovery-********************.js 57.4 kB
./dist/assets/js/googlesitekit-adminbar-********************.js 34.2 kB
./dist/assets/js/googlesitekit-api-********************.js 10.2 kB
./dist/assets/js/googlesitekit-components-gm2-********************.js 5.88 kB
./dist/assets/js/googlesitekit-components-gm3-********************.js 10 kB
./dist/assets/js/googlesitekit-data-********************.js 2.18 kB
./dist/assets/js/googlesitekit-datastore-forms-********************.js 9.13 kB
./dist/assets/js/googlesitekit-datastore-location-********************.js 2.09 kB
./dist/assets/js/googlesitekit-datastore-ui-********************.js 10.1 kB
./dist/assets/js/googlesitekit-datastore-user-********************.js 24.8 kB
./dist/assets/js/googlesitekit-entity-dashboard-********************.js 71.2 kB
./dist/assets/js/googlesitekit-i18n-********************.js 3.92 kB
./dist/assets/js/googlesitekit-main-dashboard-********************.js 96.7 kB
./dist/assets/js/googlesitekit-modules-********************.js 21.7 kB
./dist/assets/js/googlesitekit-modules-adsense-********************.js 110 kB
./dist/assets/js/googlesitekit-modules-analytics-4-********************.js 110 kB
./dist/assets/js/googlesitekit-modules-pagespeed-insights-********************.js 22.4 kB
./dist/assets/js/googlesitekit-modules-search-console-********************.js 58 kB
./dist/assets/js/googlesitekit-modules-tagmanager-********************.js 30.1 kB
./dist/assets/js/googlesitekit-polyfills-********************.js 379 B
./dist/assets/js/googlesitekit-splash-********************.js 71.8 kB
./dist/assets/js/googlesitekit-user-input-********************.js 46.9 kB
./dist/assets/js/googlesitekit-vendor-********************.js 317 kB
./dist/assets/js/googlesitekit-widgets-********************.js 33.4 kB
./dist/assets/js/googlesitekit-wp-dashboard-********************.js 59.8 kB
./dist/assets/js/mailchimp-********************.js 593 B
./dist/assets/js/optin-monster-********************.js 635 B
./dist/assets/js/popup-maker-********************.js 595 B
./dist/assets/js/runtime-********************.js 1.3 kB
./dist/assets/js/woocommerce-********************.js 613 B
./dist/assets/js/wpforms-********************.js 595 B

compressed-size-action

Copy link
Collaborator

@kuasha420 kuasha420 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nfmohit Thank you for the PR. The changes LGTM and the deviation from IB makes sense. I'll approve it and move it over to MR for @techanvil to have a look since he's much more familiar with CoMo. Cheers.

Copy link
Collaborator

@techanvil techanvil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, nice one @nfmohit!

@techanvil
Copy link
Collaborator

techanvil commented May 16, 2024

I approved the PR, but then noticed a merge conflict had appeared so have merged develop and resolved the conflict.

@techanvil techanvil merged commit 4cce042 into develop May 16, 2024
25 checks passed
@techanvil techanvil deleted the enhancement/#8643-como-ch-region branch May 16, 2024 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants