Enhancement/9846 fpm setup banner error handling #9969
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
|
Build files for b48a6ce have been deleted. |
|
Size Change: +1.12 kB (+0.06%) Total Size: 1.99 MB
ℹ️ View Unchanged
|
19 tasks
hussain-t
requested changes
Jan 10, 2025
| @@ -247,6 +247,47 @@ describe( 'FirstPartyModeSetupBanner', () => { | |||
| } ); | |||
| } ); | |||
|
|
|||
| it( 'should display the error when CTA is clicked', async () => { | |||
There was a problem hiding this comment.
Let's make it more descriptive
Suggested change
| it( 'should display the error when CTA is clicked', async () => { | |
| should display the error message when the CTA button is clicked and the request fails |
| @@ -33,13 +33,16 @@ import { CORE_NOTIFICATIONS } from '../../datastore/constants'; | |||
| import { CORE_LOCATION } from '../../../datastore/location/constants'; | |||
| import useNotificationEvents from '../../hooks/useNotificationEvents'; | |||
| import { SpinnerButton } from 'googlesitekit-components'; | |||
| import { CORE_SITE } from '../../../datastore/site/constants'; | |||
There was a problem hiding this comment.
Let's move it below CORE_LOCATION
| @@ -0,0 +1,53 @@ | |||
| /** | |||
| * Site Kit by Google, Copyright 2024 Google LLC | |||
There was a problem hiding this comment.
Suggested change
| * Site Kit by Google, Copyright 2024 Google LLC | |
| * Site Kit by Google, Copyright 2025 Google LLC |
Comment on lines
52
to
66
| Default.args = { | ||
| setupRegistry: () => { | ||
| fetchMock.post( | ||
| new RegExp( '^/google-site-kit/v1/core/site/data/fpm-settings' ), | ||
| { | ||
| body: JSON.stringify( { | ||
| isEnabled: true, | ||
| isFPMHealthy: true, | ||
| isScriptAccessEnabled: true, | ||
| } ), | ||
| status: 200, | ||
| } | ||
| ); | ||
| }, | ||
| }; |
There was a problem hiding this comment.
This is unnecessary. We can remove it.
Suggested change
| Default.args = { | |
| setupRegistry: () => { | |
| fetchMock.post( | |
| new RegExp( '^/google-site-kit/v1/core/site/data/fpm-settings' ), | |
| { | |
| body: JSON.stringify( { | |
| isEnabled: true, | |
| isFPMHealthy: true, | |
| isScriptAccessEnabled: true, | |
| } ), | |
| status: 200, | |
| } | |
| ); | |
| }, | |
| }; |
Comment on lines
73
to
85
| fetchMock.post( | ||
| new RegExp( '^/google-site-kit/v1/core/site/data/fpm-settings' ), | ||
| { | ||
| body: JSON.stringify( { | ||
| code: 'test_error', | ||
| message: 'Test Error', | ||
| data: { | ||
| reason: 'test_reason', | ||
| }, | ||
| } ), | ||
| status: 500, | ||
| } | ||
| ); |
There was a problem hiding this comment.
This fetchMock is unnecessary since we are mocking the error using receiveError below.
Suggested change
| fetchMock.post( | |
| new RegExp( '^/google-site-kit/v1/core/site/data/fpm-settings' ), | |
| { | |
| body: JSON.stringify( { | |
| code: 'test_error', | |
| message: 'Test Error', | |
| data: { | |
| reason: 'test_reason', | |
| }, | |
| } ), | |
| status: 500, | |
| } | |
| ); |
|
|
||
| export default { | ||
| title: 'Modules/FirstPartyMode/Dashboard/FirstPartyModeSetupBanner', | ||
| decorators: [ | ||
| ( Story ) => { | ||
| ( Story, { args } ) => { | ||
| fetchMock.restore(); |
There was a problem hiding this comment.
We can remove this.
Suggested change
| fetchMock.restore(); |
hussain-t
deleted the
enhancement/9846-fpm-setup-banner-error-handling
branch
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
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