diff --git a/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx b/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx index 58fe962edc..73f3ddbd15 100644 --- a/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx +++ b/datahub-web-react/src/app/ingest/source/IngestedAssets.tsx @@ -78,7 +78,7 @@ export default function IngestedAssets({ id, executionResult }: Props) { // First thing to do is to search for all assets with the id as the run id! // Execute search const { data, loading, error } = useGetSearchResultsForMultipleQuery({ - skip: totalEntitiesIngested === null || entitiesIngestedByTypeFromReport === null, + skip: typeof totalEntitiesIngested === 'number' && !!entitiesIngestedByTypeFromReport?.length, variables: { input: { query: '*', diff --git a/datahub-web-react/src/app/ingest/source/__tests__/tests_utils.test.tsx b/datahub-web-react/src/app/ingest/source/__tests__/tests_utils.test.tsx index dfb0531a33..379d0f09e6 100644 --- a/datahub-web-react/src/app/ingest/source/__tests__/tests_utils.test.tsx +++ b/datahub-web-react/src/app/ingest/source/__tests__/tests_utils.test.tsx @@ -91,7 +91,7 @@ describe('getEntitiesIngestedByType', () => { }; const result = getEntitiesIngestedByType(mockExecutionRequestResult(structuredReport)); - expect(result).toEqual([]); + expect(result).toBeNull(); }); test('handles aspects with non-numeric values', () => { diff --git a/datahub-web-react/src/app/ingest/source/utils.ts b/datahub-web-react/src/app/ingest/source/utils.ts index 20ec4cd730..0054a41809 100644 --- a/datahub-web-react/src/app/ingest/source/utils.ts +++ b/datahub-web-react/src/app/ingest/source/utils.ts @@ -352,6 +352,10 @@ export const getEntitiesIngestedByType = (result: Partial ({ count, displayName: entityName, diff --git a/datahub-web-react/src/app/ingestV2/source/IngestedAssets.tsx b/datahub-web-react/src/app/ingestV2/source/IngestedAssets.tsx index 8307bf7a79..877e974898 100644 --- a/datahub-web-react/src/app/ingestV2/source/IngestedAssets.tsx +++ b/datahub-web-react/src/app/ingestV2/source/IngestedAssets.tsx @@ -78,7 +78,7 @@ export default function IngestedAssets({ id, executionResult }: Props) { // First thing to do is to search for all assets with the id as the run id! // Execute search const { data, loading, error } = useGetSearchResultsForMultipleQuery({ - skip: totalEntitiesIngested === null || entitiesIngestedByTypeFromReport === null, + skip: typeof totalEntitiesIngested === 'number' && !!entitiesIngestedByTypeFromReport?.length, variables: { input: { query: '*', diff --git a/datahub-web-react/src/app/ingestV2/source/__tests__/tests_utils.test.tsx b/datahub-web-react/src/app/ingestV2/source/__tests__/tests_utils.test.tsx index 06323f8b26..90e73402ff 100644 --- a/datahub-web-react/src/app/ingestV2/source/__tests__/tests_utils.test.tsx +++ b/datahub-web-react/src/app/ingestV2/source/__tests__/tests_utils.test.tsx @@ -91,7 +91,7 @@ describe('getEntitiesIngestedByType', () => { }; const result = getEntitiesIngestedByType(mockExecutionRequestResult(structuredReport)); - expect(result).toEqual([]); + expect(result).toBeNull(); }); test('handles aspects with non-numeric values', () => { diff --git a/datahub-web-react/src/app/ingestV2/source/utils.ts b/datahub-web-react/src/app/ingestV2/source/utils.ts index 04728727d2..0e0a2a341d 100644 --- a/datahub-web-react/src/app/ingestV2/source/utils.ts +++ b/datahub-web-react/src/app/ingestV2/source/utils.ts @@ -343,6 +343,10 @@ export const getEntitiesIngestedByType = (result: Partial ({ count, displayName: entityName,