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

Fix consent mode Ads connection status logic #8568

Merged
merged 5 commits into from
Apr 16, 2024

Conversation

nfmohit
Copy link
Collaborator

@nfmohit nfmohit commented Apr 16, 2024

Summary

Addresses issue:

Relevant technical choices

This PR fixes this issue by not requiring both Ads and Analytics modules to be connected for the Ads connection status.

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 Apr 16, 2024

Build files for 125086d have been deleted.

Copy link

github-actions bot commented Apr 16, 2024

Size Change: +14 B (0%)

Total Size: 1.42 MB

Filename Size Change
./dist/assets/js/googlesitekit-activation-********************.js 23.8 kB +2 B (0%)
./dist/assets/js/googlesitekit-ad-blocking-recovery-********************.js 57.3 kB -4 B (0%)
./dist/assets/js/googlesitekit-adminbar-********************.js 34.1 kB -6 B (0%)
./dist/assets/js/googlesitekit-api-********************.js 10.1 kB +4 B (0%)
./dist/assets/js/googlesitekit-components-gm2-********************.js 5.88 kB +1 B (0%)
./dist/assets/js/googlesitekit-datastore-site-********************.js 19.1 kB -33 B (0%)
./dist/assets/js/googlesitekit-entity-dashboard-********************.js 66.7 kB -7 B (0%)
./dist/assets/js/googlesitekit-main-dashboard-********************.js 91.2 kB -2 B (0%)
./dist/assets/js/googlesitekit-modules-********************.js 21.7 kB +16 B (0%)
./dist/assets/js/googlesitekit-modules-ads-********************.js 18.6 kB +45 B (0%)
./dist/assets/js/googlesitekit-modules-adsense-********************.js 111 kB -27 B (0%)
./dist/assets/js/googlesitekit-modules-analytics-4-********************.js 112 kB +34 B (0%)
./dist/assets/js/googlesitekit-modules-pagespeed-insights-********************.js 22.4 kB -1 B (0%)
./dist/assets/js/googlesitekit-modules-search-console-********************.js 57.9 kB -11 B (0%)
./dist/assets/js/googlesitekit-settings-********************.js 59.5 kB +13 B (0%)
./dist/assets/js/googlesitekit-splash-********************.js 71.7 kB -9 B (0%)
./dist/assets/js/googlesitekit-user-input-********************.js 46.8 kB -9 B (0%)
./dist/assets/js/googlesitekit-vendor-********************.js 316 kB +8 B (0%)
./dist/assets/js/googlesitekit-widgets-********************.js 33.3 kB +2 B (0%)
./dist/assets/js/googlesitekit-wp-dashboard-********************.js 60.1 kB -2 B (0%)
ℹ️ View Unchanged
Filename Size
./dist/assets/css/googlesitekit-admin-css-********************.min.css 53.2 kB
./dist/assets/css/googlesitekit-adminbar-css-********************.min.css 11.2 kB
./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 930 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/googlesitekit-components-gm3-********************.js 10 kB
./dist/assets/js/googlesitekit-data-********************.js 2.18 kB
./dist/assets/js/googlesitekit-datastore-forms-********************.js 9.09 kB
./dist/assets/js/googlesitekit-datastore-location-********************.js 2.08 kB
./dist/assets/js/googlesitekit-datastore-ui-********************.js 10 kB
./dist/assets/js/googlesitekit-datastore-user-********************.js 24.3 kB
./dist/assets/js/googlesitekit-i18n-********************.js 3.92 kB
./dist/assets/js/googlesitekit-modules-tagmanager-********************.js 30 kB
./dist/assets/js/googlesitekit-polyfills-********************.js 378 B
./dist/assets/js/runtime-********************.js 1.3 kB

compressed-size-action

@nfmohit
Copy link
Collaborator Author

nfmohit commented Apr 16, 2024

Note to Code Reviewer: Updates to the VRT references were needed because the provideModules utility function automatically sets the Ads module as connected. We'd have to go into each story and make it appear disconnected, which felt a little unnatural, but please let me know if I should do that instead.

@techanvil
Copy link
Collaborator

Note to Code Reviewer: Updates to the VRT references were needed because the provideModules utility function automatically sets the Ads module as connected. We'd have to go into each story and make it appear disconnected, which felt a little unnatural, but please let me know if I should do that instead.

Thanks @nfmohit. Considering how the SettingsCardConsentMode stories have an explicit WithAdsConnected variant, it doesn't seem appropriate to keep Ads connected for the other variants. I've pushed a change to address this myself to save the round trip.

image

@nfmohit
Copy link
Collaborator Author

nfmohit commented Apr 16, 2024

Note to Code Reviewer: Updates to the VRT references were needed because the provideModules utility function automatically sets the Ads module as connected. We'd have to go into each story and make it appear disconnected, which felt a little unnatural, but please let me know if I should do that instead.

Thanks @nfmohit. Considering how the SettingsCardConsentMode stories have an explicit WithAdsConnected variant, it doesn't seem appropriate to keep Ads connected for the other variants. I've pushed a change to address this myself to save the round trip.

image

Sounds fair, thank you @techanvil!

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 techanvil merged commit 12c433c into develop Apr 16, 2024
21 checks passed
@techanvil techanvil deleted the followup/#8365-module-connection branch April 16, 2024 15:53
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.

Update Consent Mode once the Ads Conversion ID setting has been migrated to the Ads module.
2 participants