From 21b31fb4f2ec876365c9a6db6092281e206ad9ff Mon Sep 17 00:00:00 2001 From: Faisal Ahammad Date: Sun, 19 Jul 2026 22:51:41 +0600 Subject: [PATCH] Rename AnalyticsActivationErrorNotification to InitialSetupErrorNotification The component is shown for any initial setup error, not only Analytics activation, so the new name describes its purpose better. - Rename component and stories file. - Update import, component name, constant, notification ID, and CSS class in SetupUsingProxyWithSignIn/index.js. - Update story usage and test descriptions. - Rename 6 Backstop reference PNGs (pixels unchanged). --- ...InitialSetupErrorNotification.stories.tsx} | 10 ++++---- ....tsx => InitialSetupErrorNotification.tsx} | 18 +++++++------- .../index-setupFlowRefresh.stories.js | 22 ++++++++---------- .../setup/SetupUsingProxyWithSignIn/index.js | 10 ++++---- .../SetupUsingProxyWithSignIn/index.test.js | 2 +- ...pErrorNotification_0_document_0_small.png} | Bin ...ErrorNotification_0_document_1_medium.png} | Bin ...pErrorNotification_0_document_2_large.png} | Bin ...nitial_setup_error_0_document_0_small.png} | Bin ...itial_setup_error_0_document_1_medium.png} | Bin ...nitial_setup_error_0_document_2_large.png} | Bin 11 files changed, 30 insertions(+), 32 deletions(-) rename assets/js/components/setup/SetupUsingProxyWithSignIn/{AnalyticsActivationErrorNotification.stories.tsx => InitialSetupErrorNotification.stories.tsx} (68%) rename assets/js/components/setup/SetupUsingProxyWithSignIn/{AnalyticsActivationErrorNotification.tsx => InitialSetupErrorNotification.tsx} (71%) rename tests/backstop/reference/{google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_0_small.png => google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_0_small.png} (100%) rename tests/backstop/reference/{google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_1_medium.png => google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_1_medium.png} (100%) rename tests/backstop/reference/{google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_2_large.png => google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_2_large.png} (100%) rename tests/backstop/reference/{google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_0_small.png => google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_0_small.png} (100%) rename tests/backstop/reference/{google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_1_medium.png => google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_1_medium.png} (100%) rename tests/backstop/reference/{google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_2_large.png => google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_2_large.png} (100%) diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.stories.tsx b/assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.stories.tsx similarity index 68% rename from assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.stories.tsx rename to assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.stories.tsx index a568863b6fd..0203efec0de 100644 --- a/assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.stories.tsx +++ b/assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.stories.tsx @@ -1,5 +1,5 @@ /** - * AnalyticsActivationErrorNotification component stories. + * InitialSetupErrorNotification component stories. * * Site Kit by Google, Copyright 2026 Google LLC * @@ -20,16 +20,16 @@ * Internal dependencies */ import { Story } from '@/js/types/Story'; -import AnalyticsActivationErrorNotification from './AnalyticsActivationErrorNotification'; +import InitialSetupErrorNotification from './InitialSetupErrorNotification'; function Template() { - return {} } />; + return {} } />; } export const Default = Template.bind( {} ) as Story; -Default.storyName = 'AnalyticsActivationErrorNotification'; +Default.storyName = 'InitialSetupErrorNotification'; Default.scenario = {}; export default { - title: 'Setup/Using Proxy With Sign-in/Components/AnalyticsActivationErrorNotification', + title: 'Setup/Using Proxy With Sign-in/Components/InitialSetupErrorNotification', }; diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.tsx b/assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.tsx similarity index 71% rename from assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.tsx rename to assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.tsx index efb412ab105..e951e9d5033 100644 --- a/assets/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification.tsx +++ b/assets/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification.tsx @@ -1,5 +1,5 @@ /** - * SetupUsingProxyWithSignIn AnalyticsActivationErrorNotification component. + * SetupUsingProxyWithSignIn InitialSetupErrorNotification component. * * Site Kit by Google, Copyright 2026 Google LLC * @@ -32,19 +32,19 @@ import { __ } from '@wordpress/i18n'; import Notice from '@/js/components/Notice'; import { NOTICE_TYPES } from '@/js/components/Notice/constants'; -interface AnalyticsActivationErrorNotificationProps { +interface InitialSetupErrorNotificationProps { onRetry?: () => void; } -export const ANALYTICS_ACTIVATION_ERROR_NOTIFICATION = - 'analytics-activation-error-notification'; +export const INITIAL_SETUP_ERROR_NOTIFICATION = + 'initial-setup-error-notification'; -const AnalyticsActivationErrorNotification: FC< - AnalyticsActivationErrorNotificationProps -> = ( { onRetry }: AnalyticsActivationErrorNotificationProps ) => { +const InitialSetupErrorNotification: FC< + InitialSetupErrorNotificationProps +> = ( { onRetry }: InitialSetupErrorNotificationProps ) => { return ( { provideSiteConnection( registry, { hasConnectedAdmins: false, @@ -362,11 +362,9 @@ AnalyticsActivationError.args = { registry .dispatch( CORE_NOTIFICATIONS ) - .registerNotification( ANALYTICS_ACTIVATION_ERROR_NOTIFICATION, { + .registerNotification( INITIAL_SETUP_ERROR_NOTIFICATION, { Component: () => ( - null } - /> + null } /> ), priority: PRIORITY.ERROR_HIGH, areaSlug: NOTIFICATION_AREAS.SPLASH_CONTENT, @@ -377,11 +375,11 @@ AnalyticsActivationError.args = { }, }; -AnalyticsActivationError.parameters = { +InitialSetupError.parameters = { features: [ 'setupFlowRefresh', 'setupFlowRefreshPhase4' ], }; -AnalyticsActivationError.scenario = {}; +InitialSetupError.scenario = {}; export default { title: 'Setup / Using Proxy With Sign-in and setupFlowRefresh enabled', diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn/index.js b/assets/js/components/setup/SetupUsingProxyWithSignIn/index.js index b2ff4c4a683..44396a21ea1 100644 --- a/assets/js/components/setup/SetupUsingProxyWithSignIn/index.js +++ b/assets/js/components/setup/SetupUsingProxyWithSignIn/index.js @@ -37,9 +37,9 @@ import { ANALYTICS_NOTICE_CHECKBOX, ANALYTICS_NOTICE_FORM_NAME, } from '@/js/components/setup/constants'; -import AnalyticsActivationErrorNotification, { - ANALYTICS_ACTIVATION_ERROR_NOTIFICATION, -} from '@/js/components/setup/SetupUsingProxyWithSignIn/AnalyticsActivationErrorNotification'; +import InitialSetupErrorNotification, { + INITIAL_SETUP_ERROR_NOTIFICATION, +} from '@/js/components/setup/SetupUsingProxyWithSignIn/InitialSetupErrorNotification'; import { setItem } from '@/js/googlesitekit/api/cache'; import { CORE_LOCATION } from '@/js/googlesitekit/datastore/location/constants'; import { CORE_SITE } from '@/js/googlesitekit/datastore/site/constants'; @@ -181,9 +181,9 @@ export default function SetupUsingProxyWithSignIn() { return; } - registerNotification( ANALYTICS_ACTIVATION_ERROR_NOTIFICATION, { + registerNotification( INITIAL_SETUP_ERROR_NOTIFICATION, { Component: () => ( - ), diff --git a/assets/js/components/setup/SetupUsingProxyWithSignIn/index.test.js b/assets/js/components/setup/SetupUsingProxyWithSignIn/index.test.js index 05148338d2a..b8b220c1971 100644 --- a/assets/js/components/setup/SetupUsingProxyWithSignIn/index.test.js +++ b/assets/js/components/setup/SetupUsingProxyWithSignIn/index.test.js @@ -936,7 +936,7 @@ describe( 'SetupUsingProxyWithSignIn', () => { expect( console ).toHaveErrored(); } ); - it( 'should retry plugin setup when the Analytics activation error notification CTA is clicked', async () => { + it( 'should retry plugin setup when the initial setup error notification CTA is clicked', async () => { fetchMock.postOnce( new RegExp( '^/google-site-kit/v1/core/modules/data/activation' diff --git a/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_0_small.png similarity index 100% rename from tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_0_small.png rename to tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_0_small.png diff --git a/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_1_medium.png similarity index 100% rename from tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_1_medium.png rename to tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_1_medium.png diff --git a/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_2_large.png similarity index 100% rename from tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_AnalyticsActivationErrorNotification_AnalyticsActivationErrorNotification_0_document_2_large.png rename to tests/backstop/reference/google-site-kit_Setup_Using_Proxy_With_Sign-in_Components_InitialSetupErrorNotification_InitialSetupErrorNotification_0_document_2_large.png diff --git a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_0_small.png b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_0_small.png similarity index 100% rename from tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_0_small.png rename to tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_0_small.png diff --git a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_1_medium.png b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_1_medium.png similarity index 100% rename from tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_1_medium.png rename to tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_1_medium.png diff --git a/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_2_large.png b/tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_2_large.png similarity index 100% rename from tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Analytics_activation_error_0_document_2_large.png rename to tests/backstop/reference/google-site-kit_Setup___Using_Proxy_With_Sign-in_and_setupFlowRefresh_enabled_Initial_setup_error_0_document_2_large.png