Enhance/#6932 - GA4 dashboard prompt banner notification #7026
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: +2.34 kB (0%) Total Size: 1.31 MB
ℹ️ View Unchanged
|
techanvil
requested changes
May 15, 2023
There was a problem hiding this comment.
Thanks @hussain-t, this is working well in my testing but we should avoid disabling the complexity rule, so I'm sending back your way for a bit of refactoring.
| @@ -84,6 +85,7 @@ async function submitGA4Changes( { select, dispatch } ) { | |||
| return await dispatch( MODULES_ANALYTICS_4 ).submitChanges(); | |||
| } | |||
|
|
|||
| // eslint-disable-next-line complexity | |||
There was a problem hiding this comment.
@hussain-t, I really don't think we should be disabling this rule in any new scenarios. By disabling the rule it means we can keep adding more complexity to this function without any warning or check on it, which is a bit of a step backward.
Please can you instead refactor this function a bit, extracting some of it into new functions if needs be.
| @@ -621,6 +627,132 @@ describe( 'modules/analytics settings', () => { | |||
| } ); | |||
| } ); | |||
|
|
|||
| describe( 'dismiss switch ga4 dashboard view notification', () => { | |||
There was a problem hiding this comment.
We should capitalise the initials in GA4 when using it in a sentence... I'd also make the following minor grammatical tweak:
Suggested change
| describe( 'dismiss switch ga4 dashboard view notification', () => { | |
| describe( 'dismiss the switch to GA4 dashboard view notification', () => { |
| '^/google-site-kit/v1/core/user/data/dismiss-item' | ||
| ); | ||
|
|
||
| it( 'should not dismiss the switch ga4 dashboard view notification if it is a UA dashboard view', async () => { |
There was a problem hiding this comment.
As above:
Suggested change
| it( 'should not dismiss the switch ga4 dashboard view notification if it is a UA dashboard view', async () => { | |
| it( 'should not dismiss the switch to GA4 dashboard view notification when setting the dashboard view to UA', async () => { |
| ).toBe( false ); | ||
| } ); | ||
|
|
||
| it( 'should not dismiss the switch ga4 dashboard view notification if it is already dismissed', async () => { |
There was a problem hiding this comment.
As above:
Suggested change
| it( 'should not dismiss the switch ga4 dashboard view notification if it is already dismissed', async () => { | |
| it( 'should not dismiss the switch to GA4 dashboard view notification if it is already dismissed', async () => { |
| ); | ||
| } ); | ||
|
|
||
| it( 'should dismiss the switch ga4 dashboard view notification if it has not been dismissed yet', async () => { |
There was a problem hiding this comment.
As above:
Suggested change
| it( 'should dismiss the switch ga4 dashboard view notification if it has not been dismissed yet', async () => { | |
| it( 'should dismiss the switch to GA4 dashboard view notification if it has not been dismissed yet when setting the dashboard view to GA4', async () => { |
| await registry | ||
| .dispatch( MODULES_ANALYTICS ) | ||
| .submitChanges(); | ||
|
|
There was a problem hiding this comment.
Seeing as we have to wait for resolvers to run in the successful test case below, we should probably add it here too, to ensure this test isn't giving us a false positive.
Suggested change
| // Wait for resolvers to run. | |
| await waitForDefaultTimeouts(); | |
| await registry | ||
| .dispatch( MODULES_ANALYTICS ) | ||
| .submitChanges(); | ||
|
|
There was a problem hiding this comment.
As above:
Suggested change
| // Wait for resolvers to run. | |
| await waitForDefaultTimeouts(); | |
techanvil
approved these changes
May 16, 2023
There was a problem hiding this comment.
LGTM, nice one @hussain-t & @kuasha420!
Although the E2E test suite is failing, this isn't due to this PR and will be addressed via #7050, so this is good to go.
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:
Relevant technical choices
submitChangesaction to ensure the correct functionality of the changes made.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