diff --git a/assets/js/googlesitekit/modules/create-gathering-data-store.js b/assets/js/googlesitekit/modules/create-gathering-data-store.js index 976f44098c2..59fbf29653d 100644 --- a/assets/js/googlesitekit/modules/create-gathering-data-store.js +++ b/assets/js/googlesitekit/modules/create-gathering-data-store.js @@ -27,9 +27,6 @@ import invariant from 'invariant'; import API from 'googlesitekit-api'; import Data from 'googlesitekit-data'; import { createFetchStore } from '../data/create-fetch-store'; -import { actions as errorStoreActions } from '../data/create-error-store'; - -const { receiveError } = errorStoreActions; const { createRegistryControl } = Data; @@ -184,14 +181,6 @@ export const createGatheringDataStore = ( yield actions.receiveIsGatheringData( ! dataAvailability ); - if ( dataAvailability === null ) { - yield receiveError( - { message: 'Unable to determine gathering data state.' }, - 'isGatheringData', - [] - ); - } - if ( dataAvailability ) { yield fetchSaveDataAvailableStateStore.actions.fetchSaveDataAvailableState(); } diff --git a/assets/js/googlesitekit/modules/create-gathering-data-store.test.js b/assets/js/googlesitekit/modules/create-gathering-data-store.test.js index 3a23ea2330f..d0c4761f38b 100644 --- a/assets/js/googlesitekit/modules/create-gathering-data-store.test.js +++ b/assets/js/googlesitekit/modules/create-gathering-data-store.test.js @@ -309,7 +309,7 @@ describe( 'createGatheringDataStore', () => { ); } ); - it( 'should set gathering data state and dispatch an error when selectDataAvailability returns NULL', async () => { + it( 'should set gathering data state to TRUE when selectDataAvailability returns NULL', async () => { selectDataAvailability.mockReturnValue( null ); registry.registerStore( @@ -336,15 +336,6 @@ describe( 'createGatheringDataStore', () => { expect( registry.select( STORE_NAME ).isGatheringData() ).toBe( true ); - - const error = registry - .select( STORE_NAME ) - .getErrorForSelector( 'isGatheringData' ); - - expect( error ).not.toBeUndefined(); - expect( error.message ).toBe( - 'Unable to determine gathering data state.' - ); } ); } ); } ); diff --git a/assets/js/modules/analytics-4/datastore/report.js b/assets/js/modules/analytics-4/datastore/report.js index 96297555342..ee66aae0d00 100644 --- a/assets/js/modules/analytics-4/datastore/report.js +++ b/assets/js/modules/analytics-4/datastore/report.js @@ -50,14 +50,14 @@ import { createGatheringDataStore } from '../../../googlesitekit/modules/create- const { createRegistrySelector } = Data; /** - * Returns report args for the zero data report. + * Returns report args for a sample report. * * @since 1.107.0 * * @param {Function} select The select function of the registry. * @return {Object} Report args. */ -const getZeroDataReportArgs = ( select ) => { +const getSampleReportArgs = ( select ) => { const { startDate, endDate } = select( CORE_USER ).getDateRangeDates( { offsetDays: DATE_RANGE_OFFSET, } ); @@ -153,7 +153,7 @@ const gatheringDataStore = createGatheringDataStore( 'analytics-4', { // eslint-disable-next-line @wordpress/no-unused-vars-before-return const hasZeroData = select( MODULES_ANALYTICS_4 ).hasZeroData(); - const args = getZeroDataReportArgs( select ); + const args = getSampleReportArgs( select ); const hasResolvedReport = select( MODULES_ANALYTICS_4 @@ -362,7 +362,7 @@ const baseSelectors = { * @return {boolean|undefined} Returns `true` if the report is zero, otherwise `false`. Returns `undefined` while resolving. */ hasZeroData: createRegistrySelector( ( select ) => () => { - const args = getZeroDataReportArgs( select ); + const args = getSampleReportArgs( select ); // Disable reason: select needs to be called here or it will never run. // eslint-disable-next-line @wordpress/no-unused-vars-before-return diff --git a/assets/js/modules/analytics-4/datastore/report.test.js b/assets/js/modules/analytics-4/datastore/report.test.js index a1ae452fe9e..689e9e4da3d 100644 --- a/assets/js/modules/analytics-4/datastore/report.test.js +++ b/assets/js/modules/analytics-4/datastore/report.test.js @@ -269,15 +269,6 @@ describe( 'modules/analytics-4 report', () => { // Wait for resolvers to run. await waitForTimeouts( 30 ); - const error = registry - .select( MODULES_ANALYTICS_4 ) - .getErrorForSelector( 'isGatheringData' ); - - expect( error ).not.toBeUndefined(); - expect( error.message ).toBe( - 'Unable to determine gathering data state.' - ); - expect( isGatheringData() ).toBe( true ); expect( console ).toHaveErrored(); expect( fetchMock ).not.toHaveFetched( dataAvailableRegexp ); diff --git a/assets/js/modules/analytics/datastore/report.js b/assets/js/modules/analytics/datastore/report.js index 8d607cbb5af..ed338a25932 100644 --- a/assets/js/modules/analytics/datastore/report.js +++ b/assets/js/modules/analytics/datastore/report.js @@ -55,14 +55,14 @@ import { createGatheringDataStore } from '../../../googlesitekit/modules/create- const { createRegistrySelector } = Data; /** - * Returns report args for the zero data report. + * Returns report args for a sample report. * * @since 1.107.0 * * @param {Function} select The select function of the registry. * @return {Object} Report args. */ -const getZeroDataReportArgs = ( select ) => { +const getSampleReportArgs = ( select ) => { const { startDate, endDate } = select( CORE_USER ).getDateRangeDates( { offsetDays: DATE_RANGE_OFFSET, } ); @@ -154,7 +154,7 @@ const gatheringDataStore = createGatheringDataStore( 'analytics', { dataAvailable: global._googlesitekitModulesData?.[ 'data_available_analytics' ], selectDataAvailability: createRegistrySelector( ( select ) => () => { - const args = getZeroDataReportArgs( select ); + const args = getSampleReportArgs( select ); // Disable reason: select needs to be called here or it will never run. // eslint-disable-next-line @wordpress/no-unused-vars-before-return @@ -366,7 +366,7 @@ const baseSelectors = { return true; } - const args = getZeroDataReportArgs( select ); + const args = getSampleReportArgs( select ); // Disable reason: select needs to be called here or it will never run. // eslint-disable-next-line @wordpress/no-unused-vars-before-return diff --git a/assets/js/modules/analytics/datastore/report.test.js b/assets/js/modules/analytics/datastore/report.test.js index e8057ed645a..ad4441b8579 100644 --- a/assets/js/modules/analytics/datastore/report.test.js +++ b/assets/js/modules/analytics/datastore/report.test.js @@ -385,15 +385,6 @@ describe( 'modules/analytics report', () => { // Wait for resolvers to run. await waitForTimeouts( 30 ); - const error = registry - .select( MODULES_ANALYTICS ) - .getErrorForSelector( 'isGatheringData' ); - - expect( error ).not.toBeUndefined(); - expect( error.message ).toBe( - 'Unable to determine gathering data state.' - ); - expect( console ).toHaveErroredWith( ...consoleError ); expect( isGatheringData() ).toBe( true ); expect( fetchMock ).not.toHaveFetched( dataAvailableRegexp ); diff --git a/assets/js/modules/search-console/datastore/report.js b/assets/js/modules/search-console/datastore/report.js index fcdbce60b66..c1c373c95e5 100644 --- a/assets/js/modules/search-console/datastore/report.js +++ b/assets/js/modules/search-console/datastore/report.js @@ -41,14 +41,14 @@ import { createGatheringDataStore } from '../../../googlesitekit/modules/create- const { createRegistrySelector } = Data; /** - * Returns report args for the zero data report. + * Returns report args for a sample report. * * @since 1.107.0 * * @param {Function} select The select function of the registry. * @return {Object} Report args. */ -const getZeroDataReportArgs = ( select ) => { +const getSampleReportArgs = ( select ) => { const url = select( CORE_SITE ).getCurrentEntityURL(); const { compareStartDate: startDate, endDate } = select( CORE_USER @@ -118,7 +118,7 @@ const gatheringDataStore = createGatheringDataStore( 'search-console', { dataAvailable: global._googlesitekitModulesData?.[ 'data_available_search-console' ], selectDataAvailability: createRegistrySelector( ( select ) => () => { - const reportArgs = getZeroDataReportArgs( select ); + const reportArgs = getSampleReportArgs( select ); // Disable reason: select needs to be called here or it will never run. // eslint-disable-next-line @wordpress/no-unused-vars-before-return const report = select( MODULES_SEARCH_CONSOLE ).getReport( reportArgs ); @@ -211,7 +211,7 @@ const baseSelectors = { return true; } - const args = getZeroDataReportArgs( select ); + const args = getSampleReportArgs( select ); // Disable reason: select needs to be called here or it will never run. // eslint-disable-next-line @wordpress/no-unused-vars-before-return diff --git a/assets/js/modules/search-console/datastore/report.test.js b/assets/js/modules/search-console/datastore/report.test.js index 9e031f42819..6c8bd8364a7 100644 --- a/assets/js/modules/search-console/datastore/report.test.js +++ b/assets/js/modules/search-console/datastore/report.test.js @@ -199,15 +199,6 @@ describe( 'modules/search-console report', () => { // Wait for resolvers to run. await waitForTimeouts( 30 ); - const error = registry - .select( MODULES_SEARCH_CONSOLE ) - .getErrorForSelector( 'isGatheringData' ); - - expect( error ).not.toBeUndefined(); - expect( error.message ).toBe( - 'Unable to determine gathering data state.' - ); - expect( console ).toHaveErroredWith( ...consoleError ); expect( isGatheringData() ).toBe( true ); expect( fetchMock ).not.toHaveFetched( dataAvailableRegexp );