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

Settings: Add new dropdown for choosing analytics behavior #13567

Merged
merged 33 commits into from
Feb 16, 2024

Conversation

AnuragVasanwala
Copy link
Collaborator

@AnuragVasanwala AnuragVasanwala commented Jan 17, 2024

Summary

This PR add support for flexible Tracking Handler. When SiteKit is installed and active, in WebStories Settings - it will provide a dropdown with options to select:

  • Use SiteKit for analytics (will be selected as default for compatibility with previous version)
  • Use Web Stories for analytics
  • Both
image

User-facing changes

A dropdown has been added to select the analytics tracking handler. The dropdown is only shown if Site Kit analytics module is active.

Dropdown options:

  • Use Site Kit for analytics (default)
  • Use only Web Stories for analytics
  • Use both

Testing Instructions

Scenario 1: Selecting "Use Site Kit for analytics (default)":

  • Web Stories will now use Site Kit for tracking analytics.
  • Ensure that a note appears indicating that the default option has been selected.
  • Verify that the value for the web_stories_ga_tracking_handler option changes to site-kit upon selecting this option.

Scenario 2: Selecting "Use only Web Stories for analytics":

  • Web Stories will now use inbuilt tracking.
  • Ensure that no note appears upon selecting the option.
  • Verify that the value for the web_stories_ga_tracking_handler option changes to web-stories.

Scenario 3: Selecting "Use both":

  • Web Stories will now use both Site Kit and inbuilt tracking.
  • Ensure that no note appears upon selecting the option.
  • Verify that the value for the web_stories_ga_tracking_handler option changes to both.

Reviews

Does this PR have a security-related impact?

No.

Does this PR change what data or activity we track or use?

🤔

Does this PR have a legal-related impact?

No.

Checklist

  • This PR addresses an existing issue and I have linked this PR to it
  • I have tested this code to the best of my abilities
  • I have verified accessibility to the best of my abilities (docs)
  • I have verified i18n and l10n (translation, right-to-left layout) to the best of my abilities
  • This code is covered by automated tests (unit, integration, and/or e2e) to verify it works as intended (docs)
  • I have added documentation where necessary
  • I have added a matching Type: XYZ label to the PR

Fixes #13506

@AnuragVasanwala AnuragVasanwala added Type: Enhancement New feature or improvement of an existing feature Group: Integration Integration with other platforms and plugins Group: WordPress Changes related to WordPress or Gutenberg integration Group: Settings Group: Analytics <amp-analytics> configuration on the frontend Package: WP Dashboard /packages/wp-dashboard labels Jan 17, 2024
@AnuragVasanwala AnuragVasanwala added this to the 1.36.0 milestone Jan 17, 2024
@AnuragVasanwala AnuragVasanwala self-assigned this Jan 17, 2024
Comment on lines 337 to 343
{analyticsHandler === GOOGLE_ANALYTICS_HANDLER_TYPE.SITE_KIT && (
<TextInputHelperText size={TextSize.Small}>
<TranslateWithMarkup>
{TEXT.SITE_KIT_IN_USE}
</TranslateWithMarkup>
</TextInputHelperText>
)}
Copy link
Collaborator

Choose a reason for hiding this comment

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

In our last meeting we discussed always displaying this text.

However, after looking at it again, I think we can simply remove it. It doesn't add any value in this new layout.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think current behaviour seems more clear from user's point of view. Because, note is necessary to convey to the user that Site Kit has enabled Google Analytics and will be used to track analytics.

WDYT 🤔

Option Note
Use Site Kit for analytics (default) Note: Site Kit by Google has already enabled Google Analytics for your Web Stories, all changes to your analytics tracking should occur there.
Use only Web Stories for analytics -
Use both -

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think current behaviour seems more clear from user's point of view. Because, note is necessary to convey to the user that Site Kit has enabled Google Analytics and will be used to track analytics.

The problem is that this note does not convey this at all. The option in the dropdown does.

That's why the text needs updating and why I don't think it makes sense to show this Note only when the first option is chosen. Either always show it (if Site Kit is active), or never show it.

If we want to rephrase it still, it would make more sense to use something like:

If Site Kit is active, it will be used to set up Google Analytics by default. However, you can customize the behavior in case you need more flexibility.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

If Site Kit is active, it will be used to set up Google Analytics by default. However, you can customize the behavior in case you need more flexibility.

Seems to make more sense 👍🏻

Copy link
Collaborator

Choose a reason for hiding this comment

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

@swissspidy I have updated Site Kit note to be displayed regardless of option chosen in the analytics dropdown.

Commit Ref: b86ae3c

Please let me know if anything else needs to be taken care of. Otherwise, the PR is ready for final review.

@swissspidy swissspidy changed the title ✨ Feat: Support for switching between GA and SK (when SK is installed) Settings: Add new dropdown for choosing analytics behavior Feb 12, 2024
@swissspidy swissspidy marked this pull request as ready for review February 12, 2024 15:26
@swissspidy
Copy link
Collaborator

Marking as ready for review so that I can test this on the QA environment

@googleforcreators-bot
Copy link
Collaborator

googleforcreators-bot commented Feb 12, 2024

Plugin builds for 8b792a2 are ready 🛎️!

Copy link
Contributor

github-actions bot commented Feb 12, 2024

Size Change: +385 B (0%)

Total Size: 2.77 MB

Filename Size Change
assets/js/web-stories-dashboard.js 63.2 kB +385 B (+1%)
ℹ️ View Unchanged
Filename Size
assets/css/web-stories-block-rtl.css 4.61 kB
assets/css/web-stories-block.css 4.64 kB
assets/css/web-stories-carousel-rtl.css 701 B
assets/css/web-stories-carousel.css 701 B
assets/css/web-stories-dashboard-rtl.css 657 B
assets/css/web-stories-dashboard.css 659 B
assets/css/web-stories-editor-rtl.css 769 B
assets/css/web-stories-editor.css 771 B
assets/css/web-stories-embed-rtl.css 653 B
assets/css/web-stories-embed.css 655 B
assets/css/web-stories-list-styles-rtl.css 2.39 kB
assets/css/web-stories-list-styles.css 2.43 kB
assets/css/web-stories-theme-style-twentyeleven-rtl.css 102 B
assets/css/web-stories-theme-style-twentyeleven.css 102 B
assets/css/web-stories-theme-style-twentyfifteen-rtl.css 251 B
assets/css/web-stories-theme-style-twentyfifteen.css 251 B
assets/css/web-stories-theme-style-twentyfourteen-rtl.css 287 B
assets/css/web-stories-theme-style-twentyfourteen.css 287 B
assets/css/web-stories-theme-style-twentyseventeen-rtl.css 288 B
assets/css/web-stories-theme-style-twentyseventeen.css 288 B
assets/css/web-stories-theme-style-twentysixteen-rtl.css 224 B
assets/css/web-stories-theme-style-twentysixteen.css 224 B
assets/css/web-stories-theme-style-twentyten-rtl.css 143 B
assets/css/web-stories-theme-style-twentyten.css 143 B
assets/css/web-stories-theme-style-twentytwelve-rtl.css 256 B
assets/css/web-stories-theme-style-twentytwelve.css 256 B
assets/css/web-stories-theme-style-twentytwenty-rtl.css 86 B
assets/css/web-stories-theme-style-twentytwenty.css 86 B
assets/css/web-stories-theme-style-twentytwentyone-rtl.css 326 B
assets/css/web-stories-theme-style-twentytwentyone.css 326 B
assets/css/web-stories-widget-rtl.css 456 B
assets/css/web-stories-widget.css 456 B
assets/js/2443.js 4.73 kB
assets/js/3244.js 97.5 kB
assets/js/3460.js 217 kB
assets/js/3669.js 38.2 kB
assets/js/3780.js 26.3 kB
assets/js/4422.js 49.1 kB
assets/js/649.js 8.13 kB
assets/js/7357.js 92 B
assets/js/7480.js 12.8 kB
assets/js/chunk-colorthief.js 2.62 kB
assets/js/chunk-ffmpeg.js 5.98 kB
assets/js/chunk-html-to-image.js 4.51 kB
assets/js/chunk-media-gallery.js 6.11 kB
assets/js/chunk-mediainfo.js 96 B
assets/js/chunk-opentype.js 96 B
assets/js/chunk-react-calendar.js 10.8 kB
assets/js/chunk-react-color.js 25.7 kB
assets/js/chunk-selfie-segmentation.js 16.3 kB
assets/js/chunk-web-stories-template-0-metaData.js 546 B
assets/js/chunk-web-stories-template-0.js 11 kB
assets/js/chunk-web-stories-template-1-metaData.js 540 B
assets/js/chunk-web-stories-template-1.js 9.27 kB
assets/js/chunk-web-stories-template-10-metaData.js 532 B
assets/js/chunk-web-stories-template-10.js 7.23 kB
assets/js/chunk-web-stories-template-11-metaData.js 539 B
assets/js/chunk-web-stories-template-11.js 8.87 kB
assets/js/chunk-web-stories-template-12-metaData.js 496 B
assets/js/chunk-web-stories-template-12.js 8.67 kB
assets/js/chunk-web-stories-template-13-metaData.js 525 B
assets/js/chunk-web-stories-template-13.js 6.9 kB
assets/js/chunk-web-stories-template-14-metaData.js 582 B
assets/js/chunk-web-stories-template-14.js 7.26 kB
assets/js/chunk-web-stories-template-15-metaData.js 544 B
assets/js/chunk-web-stories-template-15.js 8.77 kB
assets/js/chunk-web-stories-template-16-metaData.js 588 B
assets/js/chunk-web-stories-template-16.js 10.5 kB
assets/js/chunk-web-stories-template-17-metaData.js 540 B
assets/js/chunk-web-stories-template-17.js 9.05 kB
assets/js/chunk-web-stories-template-18-metaData.js 587 B
assets/js/chunk-web-stories-template-18.js 9.31 kB
assets/js/chunk-web-stories-template-19-metaData.js 501 B
assets/js/chunk-web-stories-template-19.js 9.17 kB
assets/js/chunk-web-stories-template-2-metaData.js 586 B
assets/js/chunk-web-stories-template-2.js 9.02 kB
assets/js/chunk-web-stories-template-20-metaData.js 548 B
assets/js/chunk-web-stories-template-20.js 8.72 kB
assets/js/chunk-web-stories-template-21-metaData.js 536 B
assets/js/chunk-web-stories-template-21.js 9.48 kB
assets/js/chunk-web-stories-template-22-metaData.js 525 B
assets/js/chunk-web-stories-template-22.js 7.44 kB
assets/js/chunk-web-stories-template-23-metaData.js 605 B
assets/js/chunk-web-stories-template-23.js 6.95 kB
assets/js/chunk-web-stories-template-24-metaData.js 517 B
assets/js/chunk-web-stories-template-24.js 11.2 kB
assets/js/chunk-web-stories-template-25-metaData.js 543 B
assets/js/chunk-web-stories-template-25.js 6.79 kB
assets/js/chunk-web-stories-template-26-metaData.js 600 B
assets/js/chunk-web-stories-template-26.js 6.97 kB
assets/js/chunk-web-stories-template-27-metaData.js 542 B
assets/js/chunk-web-stories-template-27.js 7.66 kB
assets/js/chunk-web-stories-template-28-metaData.js 532 B
assets/js/chunk-web-stories-template-28.js 8.76 kB
assets/js/chunk-web-stories-template-29-metaData.js 561 B
assets/js/chunk-web-stories-template-29.js 8.94 kB
assets/js/chunk-web-stories-template-3-metaData.js 539 B
assets/js/chunk-web-stories-template-3.js 8.24 kB
assets/js/chunk-web-stories-template-30-metaData.js 576 B
assets/js/chunk-web-stories-template-30.js 7.43 kB
assets/js/chunk-web-stories-template-31-metaData.js 503 B
assets/js/chunk-web-stories-template-31.js 9.93 kB
assets/js/chunk-web-stories-template-32-metaData.js 552 B
assets/js/chunk-web-stories-template-32.js 12.3 kB
assets/js/chunk-web-stories-template-33-metaData.js 491 B
assets/js/chunk-web-stories-template-33.js 8.9 kB
assets/js/chunk-web-stories-template-34-metaData.js 570 B
assets/js/chunk-web-stories-template-34.js 7.43 kB
assets/js/chunk-web-stories-template-35-metaData.js 565 B
assets/js/chunk-web-stories-template-35.js 8.7 kB
assets/js/chunk-web-stories-template-36-metaData.js 575 B
assets/js/chunk-web-stories-template-36.js 12.1 kB
assets/js/chunk-web-stories-template-37-metaData.js 529 B
assets/js/chunk-web-stories-template-37.js 6.13 kB
assets/js/chunk-web-stories-template-38-metaData.js 572 B
assets/js/chunk-web-stories-template-38.js 7.63 kB
assets/js/chunk-web-stories-template-39-metaData.js 589 B
assets/js/chunk-web-stories-template-39.js 7.79 kB
assets/js/chunk-web-stories-template-4-metaData.js 564 B
assets/js/chunk-web-stories-template-4.js 11.8 kB
assets/js/chunk-web-stories-template-40-metaData.js 556 B
assets/js/chunk-web-stories-template-40.js 9.85 kB
assets/js/chunk-web-stories-template-41-metaData.js 573 B
assets/js/chunk-web-stories-template-41.js 7.45 kB
assets/js/chunk-web-stories-template-42-metaData.js 521 B
assets/js/chunk-web-stories-template-42.js 6.82 kB
assets/js/chunk-web-stories-template-43-metaData.js 557 B
assets/js/chunk-web-stories-template-43.js 8.49 kB
assets/js/chunk-web-stories-template-44-metaData.js 583 B
assets/js/chunk-web-stories-template-44.js 10.8 kB
assets/js/chunk-web-stories-template-45-metaData.js 565 B
assets/js/chunk-web-stories-template-45.js 7.15 kB
assets/js/chunk-web-stories-template-46-metaData.js 531 B
assets/js/chunk-web-stories-template-46.js 5.1 kB
assets/js/chunk-web-stories-template-47-metaData.js 591 B
assets/js/chunk-web-stories-template-47.js 8.97 kB
assets/js/chunk-web-stories-template-48-metaData.js 556 B
assets/js/chunk-web-stories-template-48.js 8.78 kB
assets/js/chunk-web-stories-template-49-metaData.js 518 B
assets/js/chunk-web-stories-template-49.js 8.58 kB
assets/js/chunk-web-stories-template-5-metaData.js 556 B
assets/js/chunk-web-stories-template-5.js 9.53 kB
assets/js/chunk-web-stories-template-50-metaData.js 503 B
assets/js/chunk-web-stories-template-50.js 8.93 kB
assets/js/chunk-web-stories-template-51-metaData.js 526 B
assets/js/chunk-web-stories-template-51.js 10.1 kB
assets/js/chunk-web-stories-template-52-metaData.js 601 B
assets/js/chunk-web-stories-template-52.js 9.97 kB
assets/js/chunk-web-stories-template-53-metaData.js 551 B
assets/js/chunk-web-stories-template-53.js 5.65 kB
assets/js/chunk-web-stories-template-54-metaData.js 547 B
assets/js/chunk-web-stories-template-54.js 7.46 kB
assets/js/chunk-web-stories-template-55-metaData.js 574 B
assets/js/chunk-web-stories-template-55.js 6.95 kB
assets/js/chunk-web-stories-template-56-metaData.js 542 B
assets/js/chunk-web-stories-template-56.js 9.54 kB
assets/js/chunk-web-stories-template-57-metaData.js 528 B
assets/js/chunk-web-stories-template-57.js 14.5 kB
assets/js/chunk-web-stories-template-58-metaData.js 554 B
assets/js/chunk-web-stories-template-58.js 5.43 kB
assets/js/chunk-web-stories-template-59-metaData.js 590 B
assets/js/chunk-web-stories-template-59.js 8.73 kB
assets/js/chunk-web-stories-template-6-metaData.js 568 B
assets/js/chunk-web-stories-template-6.js 6.93 kB
assets/js/chunk-web-stories-template-60-metaData.js 509 B
assets/js/chunk-web-stories-template-60.js 8.94 kB
assets/js/chunk-web-stories-template-7-metaData.js 569 B
assets/js/chunk-web-stories-template-7.js 7.15 kB
assets/js/chunk-web-stories-template-8-metaData.js 569 B
assets/js/chunk-web-stories-template-8.js 8.34 kB
assets/js/chunk-web-stories-template-9-metaData.js 580 B
assets/js/chunk-web-stories-template-9.js 8.25 kB
assets/js/chunk-web-stories-templates.js 581 B
assets/js/chunk-web-stories-textset-0.js 4.59 kB
assets/js/chunk-web-stories-textset-1.js 5.61 kB
assets/js/chunk-web-stories-textset-2.js 6.83 kB
assets/js/chunk-web-stories-textset-3.js 12.8 kB
assets/js/chunk-web-stories-textset-4.js 3.91 kB
assets/js/chunk-web-stories-textset-5.js 5.27 kB
assets/js/chunk-web-stories-textset-6.js 4.99 kB
assets/js/chunk-web-stories-textset-7.js 8.9 kB
assets/js/generateBlurhash.worker.worker.js 1.1 kB
assets/js/web-stories-activation-notice.js 26 kB
assets/js/web-stories-block.js 27.7 kB
assets/js/web-stories-carousel.js 9.89 kB
assets/js/web-stories-editor.js 1.46 MB
assets/js/web-stories-embed.js 20 B
assets/js/web-stories-lightbox.js 7.34 kB
assets/js/web-stories-tinymce-button.js 9.75 kB
assets/js/web-stories-widget.js 559 B

compressed-size-action

@Swanand01 Swanand01 requested a review from swissspidy February 14, 2024 04:53
@swissspidy
Copy link
Collaborator

Minor request, otherwise this looks good:

Right now the measurement ID field is disabled when the "Use Site Kit" option is chosen. I don't think we need this any longer. Let's remove that restriction.

Screenshot 2024-02-15 at 10 57 28

@swissspidy swissspidy merged commit 4353ae9 into main Feb 16, 2024
43 checks passed
@swissspidy swissspidy deleted the feat/13506-flexible-tracking-support branch February 16, 2024 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Group: Analytics <amp-analytics> configuration on the frontend Group: Integration Integration with other platforms and plugins Group: Settings Group: WordPress Changes related to WordPress or Gutenberg integration Package: WP Dashboard /packages/wp-dashboard Type: Enhancement New feature or improvement of an existing feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Analytics: More flexibility for placing tracking code
4 participants