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

Enhancement/7251 Restyle AdBlock Warning in Connect Services #8752

Merged

Conversation

jimmymadon
Copy link
Collaborator

Summary

Addresses issue:

Relevant technical choices

The "Get help" link would not have displayed in the ModuleSettingsWarning component. So I modified this component to render the AdBlockerWarning component instead when there is an AdBlocker error. However, the AdBlockerWarning component was duplicated from AdSense to Ads, even though they are very similar with only a slug required. So I have refactored the separate AdBlockerWarning components AdSense and Ads to be one generic component. This way, I can call this generic component within <ModuleSettingsWarning>. This also means that the duplication of the SettingsSetupIncomplete component for the Ads module done in #8634 simply to show the "Get help" link in the modules list could be reverted. The DefaultSettingsSetupIncomplete component renders the <ModuleSettingsWarning> component which now correctly renders the AdBlockerWarning component with the Get help link.

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 24, 2024

Build files for 100cd86 have been deleted.

Copy link

github-actions bot commented May 24, 2024

Size Change: +38 kB (+2.59%)

Total Size: 1.51 MB

Filename Size Change
./dist/assets/css/googlesitekit-admin-css-********************.min.css 54.1 kB -10 B (-0.02%)
./dist/assets/js/33-********************.js 889 B +1 B (+0.11%)
./dist/assets/js/googlesitekit-activation-********************.js 23.9 kB -10 B (-0.04%)
./dist/assets/js/googlesitekit-ad-blocking-recovery-********************.js 58.4 kB +137 B (+0.24%)
./dist/assets/js/googlesitekit-adminbar-********************.js 34.6 kB +40 B (+0.12%)
./dist/assets/js/googlesitekit-api-********************.js 10.1 kB -3 B (-0.03%)
./dist/assets/js/googlesitekit-components-gm2-********************.js 5.88 kB +2 B (+0.03%)
./dist/assets/js/googlesitekit-components-gm3-********************.js 10 kB +1 B (+0.01%)
./dist/assets/js/googlesitekit-data-********************.js 2.18 kB -3 B (-0.14%)
./dist/assets/js/googlesitekit-datastore-forms-********************.js 9.14 kB -2 B (-0.02%)
./dist/assets/js/googlesitekit-datastore-location-********************.js 2.09 kB -1 B (-0.05%)
./dist/assets/js/googlesitekit-datastore-site-********************.js 19.9 kB +9 B (+0.05%)
./dist/assets/js/googlesitekit-datastore-ui-********************.js 10.1 kB +5 B (+0.05%)
./dist/assets/js/googlesitekit-datastore-user-********************.js 25.4 kB -42 B (-0.16%)
./dist/assets/js/googlesitekit-entity-dashboard-********************.js 72.7 kB +371 B (+0.51%)
./dist/assets/js/googlesitekit-main-dashboard-********************.js 116 kB +3.11 kB (+2.75%)
./dist/assets/js/googlesitekit-modules-ads-********************.js 26.9 kB -90 B (-0.33%)
./dist/assets/js/googlesitekit-modules-adsense-********************.js 111 kB +101 B (+0.09%)
./dist/assets/js/googlesitekit-modules-analytics-4-********************.js 129 kB +17.7 kB (+15.96%) ⚠️
./dist/assets/js/googlesitekit-modules-********************.js 22.1 kB +562 B (+2.61%)
./dist/assets/js/googlesitekit-modules-pagespeed-insights-********************.js 22.5 kB +32 B (+0.14%)
./dist/assets/js/googlesitekit-modules-search-console-********************.js 58.2 kB +182 B (+0.31%)
./dist/assets/js/googlesitekit-modules-tagmanager-********************.js 30.4 kB -143 B (-0.47%)
./dist/assets/js/googlesitekit-settings-********************.js 60.9 kB +411 B (+0.68%)
./dist/assets/js/googlesitekit-splash-********************.js 72.4 kB -46 B (-0.06%)
./dist/assets/js/googlesitekit-user-input-********************.js 47.5 kB -47 B (-0.1%)
./dist/assets/js/googlesitekit-vendor-********************.js 317 kB -22 B (-0.01%)
./dist/assets/js/googlesitekit-widgets-********************.js 49.4 kB +15.7 kB (+46.63%) 🚨
./dist/assets/js/googlesitekit-wp-dashboard-********************.js 60 kB -36 B (-0.06%)
ℹ️ View Unchanged
Filename Size
./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/34-********************.js 3.12 kB
./dist/assets/js/analytics-advanced-tracking-********************.js 778 B
./dist/assets/js/contact-form-7-********************.js 646 B
./dist/assets/js/googlesitekit-i18n-********************.js 3.92 kB
./dist/assets/js/googlesitekit-polyfills-********************.js 380 B
./dist/assets/js/mailchimp-********************.js 632 B
./dist/assets/js/optin-monster-********************.js 669 B
./dist/assets/js/popup-maker-********************.js 634 B
./dist/assets/js/runtime-********************.js 1.3 kB
./dist/assets/js/woocommerce-********************.js 655 B
./dist/assets/js/wpforms-********************.js 634 B

compressed-size-action

Copy link
Collaborator

@tofumatt tofumatt left a comment

Choose a reason for hiding this comment

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

Looks good 👍🏻

Just one tiny, minor thing, so I'll commit it then merge 🙂

assets/js/components/notifications/AdBlockerWarning.js Outdated Show resolved Hide resolved
@tofumatt tofumatt merged commit 58d9589 into develop May 27, 2024
18 of 20 checks passed
@tofumatt tofumatt deleted the enhancement/7251-restyle-adblock-warning-connect-services branch May 27, 2024 14:18
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.

2 participants