Enhance/#6738 - Create new SetupFormGA4 component
#6808
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Size Change: +1.5 kB (0%) Total Size: 1.23 MB
ℹ️ View Unchanged
|
tofumatt
requested changes
Apr 4, 2023
| const onChange = useCallback( () => { | ||
| setValues( FORM_SETUP, { enableUA: ! isUAEnabled } ); | ||
|
|
||
| trackEvent( `${ viewContext }_analytics`, 'enable_ua' ); |
There was a problem hiding this comment.
I don't see this event mentioned anywhere in the issue's ACs or IB, and it isn't in the list of Custom Analytics Events for Site Kit either. Was this discussion elsewhere (in Slack or something)? I just want to make sure we have the okay from @marrrmarrr to add this event to the plugin 🙂
Suggested change
| trackEvent( `${ viewContext }_analytics`, 'enable_ua' ); | |
| trackEvent( `${ viewContext }_analytics`, 'enable_ua' ); |
There was a problem hiding this comment.
You're right. It's not mentioned anywhere. I added it. I will remove it. We can add it later if we need an event 👍
| checked={ isUAEnabled } | ||
| onClick={ onChange } | ||
| hideLabel={ false } | ||
| disabled={ false } |
There was a problem hiding this comment.
Do we explicitly need to set disabled to false? That seems a bit odd is all—I don't see that anywhere else in the codebase 😅
There was a problem hiding this comment.
Good catch. Removed it 👍
| @@ -1,7 +1,7 @@ | |||
| /** | |||
| * Analytics GA4 Setup form. | |||
| * | |||
| * Site Kit by Google, Copyright 2021 Google LLC | |||
| * Site Kit by Google, Copyright 2023 Google LLC | |||
There was a problem hiding this comment.
Suggested change
| * Site Kit by Google, Copyright 2023 Google LLC | |
| * Site Kit by Google, Copyright 2021 Google LLC |
This file is from 2021, let's leave this alone. The copyright year for the file should be when it was first created.
| @@ -1,7 +1,7 @@ | |||
| /** | |||
| * SetupFormGA4 component stories. | |||
| * | |||
| * Site Kit by Google, Copyright 2021 Google LLC | |||
| * Site Kit by Google, Copyright 2023 Google LLC | |||
There was a problem hiding this comment.
Suggested change
| * Site Kit by Google, Copyright 2023 Google LLC | |
| * Site Kit by Google, Copyright 2021 Google LLC |
Same here, let's leave this as-it-was.
| @@ -0,0 +1,131 @@ | |||
| /** | |||
| * Analytics GA4 Setup form Legacy. | |||
There was a problem hiding this comment.
Suggested change
| * Analytics GA4 Setup form Legacy. | |
| * Analytics GA4 Setup form (legacy version, supports UA setup). |
Comment on lines
140
to
144
| // If `ga4Reporting` AND `enableUA` are both enabled, we need to reset the | ||
| // property and profile IDs to ensure that the UA settings are not saved. | ||
| if ( ga4ReportingEnabled && ! isUAEnabled ) { | ||
| dispatch( MODULES_ANALYTICS ).resetPropertyAndProfileIDs(); | ||
| } |
There was a problem hiding this comment.
The code comment here mentions GA4 and "Enable UA" both being enabled, but the code here is checking for GA4 Reporting being enabled and UA being disabled. 🤔
I think the code logic is right, just the comment needs to be updated?
There was a problem hiding this comment.
Correct. Updated it.
| // Do not require selecting a property or profile if `ga4Reporting` is enabled. | ||
| // Therefore, only validate these if `ga4Reporting` is not enabled. | ||
| if ( ! isFeatureEnabled( 'ga4Reporting' ) ) { | ||
| // Therefore, only validate these if `ga4Reporting` is not enabled OR `enableUA` is enabled. |
There was a problem hiding this comment.
Suggested change
| // Therefore, only validate these if `ga4Reporting` is not enabled OR `enableUA` is enabled. | |
| // Only validate UA settings if `ga4Reporting` is not enabled OR `enableUA` is enabled. |
assets/js/modules/analytics/components/common/EnableUniversalAnalytics.js
Show resolved
Hide resolved
tofumatt
approved these changes
Apr 4, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Addresses issue:
SetupFormGA4component #6738Relevant technical choices
SetupFormGA4component as it requires more effort. In addition, writing basic tests is not possible without providing proper mocks for theanalyticsandanalytics-4modules.PR Author Checklist
Do not alter or remove anything below. The following sections will be managed by moderators only.
Code Reviewer Checklist
Merge Reviewer Checklist