From 40afe3a82fcd8f2788bd06c4878aa97f5500cd52 Mon Sep 17 00:00:00 2001 From: sumitappt Date: Tue, 5 Mar 2024 20:26:24 +0530 Subject: [PATCH 1/2] OBS-564 | Fix typescript errors for tests in OSS --- .../__tests__/timeSeriesChart.test.tsx | 9 +-- .../dataset/profile/__tests__/Schema.test.tsx | 70 ++++++++++++++++--- .../preview/__tests__/Preview.test.tsx | 2 + .../__tests__/GlossaryTermHeader.test.tsx | 6 +- .../profile/__tests__/EntityProfile.test.tsx | 20 +++--- .../shared/entityForm/__tests__/Form.test.tsx | 12 ++++ .../__tests__/AccessManagement.test.ts | 6 ++ .../__tests__/DocumentationTab.test.tsx | 12 +++- .../Entity/__tests__/DataJobFlowTab.test.tsx | 2 + .../lineage/__tests__/LineageEdges.test.tsx | 2 +- .../lineage/__tests__/LineageTree.test.tsx | 8 +-- .../__tests__/adjustVXTreeLayout.test.tsx | 16 ++--- .../__tests__/constructFetchedNode.test.tsx | 4 +- .../lineage/__tests__/constructTree.test.ts | 26 +++---- datahub-web-react/src/app/lineage/types.ts | 4 +- .../tags/__tests__/TagTermGroup.test.tsx | 20 +++--- 16 files changed, 152 insertions(+), 67 deletions(-) diff --git a/datahub-web-react/src/app/analyticsDashboard/components/__tests__/timeSeriesChart.test.tsx b/datahub-web-react/src/app/analyticsDashboard/components/__tests__/timeSeriesChart.test.tsx index c6f458301707d..eadbb60959a0b 100644 --- a/datahub-web-react/src/app/analyticsDashboard/components/__tests__/timeSeriesChart.test.tsx +++ b/datahub-web-react/src/app/analyticsDashboard/components/__tests__/timeSeriesChart.test.tsx @@ -1,9 +1,10 @@ +import { DateInterval, TimeSeriesChart } from '../../../../types.generated'; import { computeLines } from '../TimeSeriesChart'; describe('timeSeriesChart', () => { describe('computeLines', () => { it('compute lines works works correctly for weekly case', () => { - const chartData = { + const chartData: TimeSeriesChart = { title: 'Weekly Active Users', lines: [ { @@ -15,7 +16,7 @@ describe('timeSeriesChart', () => { start: '1672012800000', end: '1677369600000', }, - interval: 'WEEK', + interval: DateInterval.Week, }; const result = computeLines(chartData, true); expect(result[0]).toEqual({ @@ -35,7 +36,7 @@ describe('timeSeriesChart', () => { }); it('compute lines works works correctly for monthly case', () => { - const chartData = { + const chartData:TimeSeriesChart = { title: 'Weekly Active Users', lines: [ { @@ -51,7 +52,7 @@ describe('timeSeriesChart', () => { start: '1648771200000', end: '1680307199999', }, - interval: 'MONTH', + interval: DateInterval.Month, }; const result = computeLines(chartData, true); expect(result[0]).toEqual({ diff --git a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx index 24ced88ed689c..2cb155d43d302 100644 --- a/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx +++ b/datahub-web-react/src/app/entity/dataset/profile/__tests__/Schema.test.tsx @@ -13,11 +13,11 @@ import { mocks } from '../../../../../Mocks'; import { SchemaTab } from '../../../shared/tabs/Dataset/Schema/SchemaTab'; import EntityContext from '../../../shared/EntityContext'; import { EntityType, SchemaMetadata } from '../../../../../types.generated'; -import { SchemaRow } from'../../../shared/tabs/Dataset/Schema/components/SchemaRow'; +import { SchemaRow } from '../../../shared/tabs/Dataset/Schema/components/SchemaRow'; vi.mock('virtualizedtableforantd4', async () => { return { - ...await vi.importActual('virtualizedtableforantd4'), + ...(await vi.importActual('virtualizedtableforantd4')), useVT: () => [{ body: { row: SchemaRow } }, vi.fn()], }; }); @@ -38,6 +38,9 @@ describe('Schema', () => { updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > @@ -60,13 +63,18 @@ describe('Schema', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, schemaMetadata: sampleSchema as SchemaMetadata, }, baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > @@ -97,13 +105,18 @@ describe('Schema', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, schemaMetadata: sampleSchemaWithTags as SchemaMetadata, }, baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > @@ -124,13 +137,18 @@ describe('Schema', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, schemaMetadata: sampleSchemaWithTags as SchemaMetadata, }, baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > @@ -150,13 +168,18 @@ describe('Schema', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, schemaMetadata: sampleSchemaWithTags as SchemaMetadata, }, baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > @@ -176,13 +199,18 @@ describe('Schema', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, schemaMetadata: sampleSchemaWithPkFk as SchemaMetadata, }, baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > @@ -202,13 +230,18 @@ describe('Schema', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, schemaMetadata: sampleSchemaWithPkFk as SchemaMetadata, }, baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > @@ -234,13 +267,18 @@ describe('Schema', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, schemaMetadata: sampleSchemaWithKeyValueFields as SchemaMetadata, }, baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > @@ -273,13 +311,18 @@ describe('Schema', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, schemaMetadata: sampleSchemaWithoutFields as SchemaMetadata, }, baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > @@ -325,7 +368,9 @@ describe('Schema', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, schemaMetadata: sampleSchema as SchemaMetadata, }, baseEntity: { @@ -337,6 +382,9 @@ describe('Schema', () => { updateEntity: vi.fn(), routeToTab: vi.fn(), refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > diff --git a/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx b/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx index 35b8675c71b7a..90aa0238c1cb4 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/preview/__tests__/Preview.test.tsx @@ -4,6 +4,7 @@ import React from 'react'; import { mocks } from '../../../../../Mocks'; import TestPageContainer from '../../../../../utils/test-utils/TestPageContainer'; import { Preview } from '../Preview'; +import { PreviewType } from '../../../Entity'; describe('Preview', () => { it('renders', () => { @@ -15,6 +16,7 @@ describe('Preview', () => { name="name" description="definition" owners={null} + previewType={PreviewType.PREVIEW} /> , diff --git a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx b/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx index 192e66285e609..0dfc088143baf 100644 --- a/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx +++ b/datahub-web-react/src/app/entity/glossaryTerm/profile/__tests__/GlossaryTermHeader.test.tsx @@ -7,7 +7,7 @@ import GlossaryTermHeader from '../GlossaryTermHeader'; const glossaryTermHeaderData = { definition: 'this is sample definition', - termSource: 'termSource', + sourceUrl: 'sourceUrl', sourceRef: 'Source ref', fqdn: 'fqdn', }; @@ -19,9 +19,9 @@ describe('Glossary Term Header', () => { , diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx index e2f5207b92f1e..67bca00a7c086 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx @@ -51,8 +51,8 @@ describe('EntityProfile', () => { display: { visible: (_, _1) => true, enabled: (_, dataset: GetDatasetQuery) => - (dataset?.dataset?.upstreamLineage?.entities?.length || 0) > 0 || - (dataset?.dataset?.downstreamLineage?.entities?.length || 0) > 0, + ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 || + ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0, }, }, { @@ -136,8 +136,8 @@ describe('EntityProfile', () => { display: { visible: (_, _1) => true, enabled: (_, dataset: GetDatasetQuery) => - (dataset?.dataset?.upstreamLineage?.entities?.length || 0) > 0 || - (dataset?.dataset?.downstreamLineage?.entities?.length || 0) > 0, + ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 || + ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0, }, }, { @@ -220,8 +220,8 @@ describe('EntityProfile', () => { display: { visible: (_, _1) => true, enabled: (_, dataset: GetDatasetQuery) => - (dataset?.dataset?.upstreamLineage?.entities?.length || 0) > 0 || - (dataset?.dataset?.downstreamLineage?.entities?.length || 0) > 0, + ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 || + ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0, }, }, { @@ -317,8 +317,8 @@ describe('EntityProfile', () => { display: { visible: (_, _1) => true, enabled: (_, dataset: GetDatasetQuery) => - (dataset?.dataset?.upstreamLineage?.entities?.length || 0) > 0 || - (dataset?.dataset?.downstreamLineage?.entities?.length || 0) > 0, + ((dataset?.dataset as any).upstreamLineage?.entities?.length || 0) > 0 || + ((dataset?.dataset as any).downstreamLineage?.entities?.length || 0) > 0, }, }, { @@ -401,8 +401,8 @@ describe('EntityProfile', () => { display: { visible: (_, _1) => true, enabled: (_, dataset: GetDatasetQuery) => - (dataset?.dataset?.upstreamLineage?.entities?.length || 0) > 0 || - (dataset?.dataset?.downstreamLineage?.entities?.length || 0) > 0, + ((dataset?.dataset as any)?.upstreamLineage?.entities?.length || 0) > 0 || + ((dataset?.dataset as any)?.downstreamLineage?.entities?.length || 0) > 0, }, }, { diff --git a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx index d1e458d37bd5e..750ef71acbd12 100644 --- a/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx +++ b/datahub-web-react/src/app/entity/shared/entityForm/__tests__/Form.test.tsx @@ -29,6 +29,12 @@ describe('Form', () => { urn: '', entityType: EntityType.Dataset, entityData: mockEntityDataWithFieldPrompts, + baseEntity: {}, + routeToTab: vi.fn(), + refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} >
@@ -50,6 +56,12 @@ describe('Form', () => { urn: '', entityType: EntityType.Dataset, entityData: mockEntityData, + baseEntity: {}, + routeToTab: vi.fn(), + refetch: vi.fn(), + loading: true, + lineage: undefined, + dataNotCombinedWithSiblings: null, }} > diff --git a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts index 53c7b483d9428..38770fb16b5df 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts +++ b/datahub-web-react/src/app/entity/shared/tabs/Dataset/AccessManagement/__tests__/AccessManagement.test.ts @@ -80,6 +80,8 @@ describe('handleAccessRoles', () => { createTags: true, manageGlobalViews: true, manageOwnershipTypes: true, + manageGlobalAnnouncements: true, + manageTokens: true, __typename: 'PlatformPrivileges', }, __typename: 'AuthenticatedUser', @@ -155,6 +157,8 @@ describe('handleAccessRoles', () => { createTags: true, manageGlobalViews: true, manageOwnershipTypes: true, + manageGlobalAnnouncements: true, + manageTokens: true, __typename: 'PlatformPrivileges', }, __typename: 'AuthenticatedUser', @@ -246,6 +250,8 @@ describe('handleAccessRoles', () => { createTags: true, manageGlobalViews: true, manageOwnershipTypes: true, + manageGlobalAnnouncements: true, + manageTokens: true, __typename: 'PlatformPrivileges', }, __typename: 'AuthenticatedUser', diff --git a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx index 5d74f6c0389b5..054331721df36 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Documentation/__tests__/DocumentationTab.test.tsx @@ -25,6 +25,10 @@ describe('SchemaDescriptionField', () => { baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), + loading: true, + lineage: undefined, + refetch: vi.fn(), + dataNotCombinedWithSiblings: null, }} > @@ -44,7 +48,9 @@ describe('SchemaDescriptionField', () => { urn: 'urn:li:dataset:123', entityType: EntityType.Dataset, entityData: { - description: 'This is a description', + properties: { + description: 'This is a description', + }, editableProperties: { description: 'Edited description', }, @@ -52,6 +58,10 @@ describe('SchemaDescriptionField', () => { baseEntity: {}, updateEntity: vi.fn(), routeToTab: vi.fn(), + loading: true, + lineage: undefined, + refetch: vi.fn(), + dataNotCombinedWithSiblings: null, }} > diff --git a/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx b/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx index a89d8ede19705..765e9e98232c2 100644 --- a/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx +++ b/datahub-web-react/src/app/entity/shared/tabs/Entity/__tests__/DataJobFlowTab.test.tsx @@ -27,6 +27,8 @@ describe('DataJobFlowTab', () => { routeToTab: vi.fn(), refetch: vi.fn(), lineage: undefined, + loading: true, + dataNotCombinedWithSiblings: null, }} > diff --git a/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx b/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx index 971a39842091f..93d80b91f5223 100644 --- a/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/LineageEdges.test.tsx @@ -63,7 +63,7 @@ describe('LineageEdges', () => { expect(queryByTestId('empty-lineage')).not.toBeInTheDocument(); expect(entityItems).toHaveLength(1); - expect(getByText(dataset4WithLineage.downstream.relationships[0].entity.properties.name)).toBeInTheDocument(); + expect(getByText(dataset4WithLineage.downstream.relationships[0]!.entity!.properties!.name!)).toBeInTheDocument(); }); it('should remove entities from the displayed list if the urn is in entitiesToRemove', async () => { diff --git a/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx b/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx index f6304dc59990e..0852a8a32dbfa 100644 --- a/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/LineageTree.test.tsx @@ -9,7 +9,7 @@ import { dataset6WithLineage, mocks, } from '../../../Mocks'; -import { Direction, FetchedEntities } from '../types'; +import { Direction, EntityAndType, FetchedEntities } from '../types'; import constructTree from '../utils/constructTree'; import LineageTree from '../LineageTree'; import extendAsyncEntities from '../utils/extendAsyncEntities'; @@ -47,7 +47,7 @@ describe('LineageTree', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity, type: EntityType.Dataset } as EntityAndType, entry.fullyFetched, ), {} as FetchedEntities, @@ -78,7 +78,7 @@ describe('LineageTree', () => { scaleXMax={2} scaleYMin={1 / 8} scaleYMax={2} - transformMatrix={initialTransform} + initialTransformMatrix={initialTransform} > {(zoom) => ( @@ -90,13 +90,13 @@ describe('LineageTree', () => { onLineageExpand={vi.fn()} canvasHeight={yMax} margin={margin} - direction={Direction.Upstream} setIsDraggingNode={vi.fn()} draggedNodes={{}} setDraggedNodes={vi.fn()} onEntityCenter={vi.fn()} setHoveredEntity={vi.fn()} fetchedEntities={mockFetchedEntities} + setUpdatedLineages={vi.fn()} /> )} diff --git a/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx b/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx index 27d8d72d2375b..ffcc7433426a0 100644 --- a/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/adjustVXTreeLayout.test.tsx @@ -14,9 +14,9 @@ import { import constructTree from '../utils/constructTree'; import extendAsyncEntities from '../utils/extendAsyncEntities'; import adjustVXTreeLayout from '../utils/adjustVXTreeLayout'; -import { NodeData, Direction, FetchedEntities } from '../types'; +import { NodeData, Direction, FetchedEntities, EntityAndType } from '../types'; import { getTestEntityRegistry } from '../../../utils/test-utils/TestPageContainer'; -import { EntityType } from '../../../types.generated'; +import { Dataset, Entity, EntityType } from '../../../types.generated'; const testEntityRegistry = getTestEntityRegistry(); @@ -34,7 +34,7 @@ describe('adjustVXTreeLayout', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity, type: EntityType.Dataset } as EntityAndType, entry.fullyFetched, ), {} as FetchedEntities, @@ -85,7 +85,7 @@ describe('adjustVXTreeLayout', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity, type: EntityType.Dataset } as EntityAndType, entry.fullyFetched, ), {} as FetchedEntities, @@ -141,7 +141,7 @@ describe('adjustVXTreeLayout', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity, type: EntityType.Dataset } as EntityAndType, entry.fullyFetched, ), {} as FetchedEntities, @@ -149,7 +149,7 @@ describe('adjustVXTreeLayout', () => { const upstreamData = hierarchy( constructTree( - { entity: dataset7WithSelfReferentialLineage, type: EntityType.Dataset }, + { entity: dataset7WithSelfReferentialLineage as Entity, type: EntityType.Dataset } as EntityAndType, mockFetchedEntities, Direction.Upstream, testEntityRegistry, @@ -186,7 +186,7 @@ describe('adjustVXTreeLayout', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity as Dataset, type: EntityType.Dataset }, entry.fullyFetched, ), {} as FetchedEntities, @@ -231,7 +231,7 @@ describe('adjustVXTreeLayout', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity as Dataset, type: EntityType.Dataset }, entry.fullyFetched, ), {} as FetchedEntities, diff --git a/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx b/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx index b3520c3047c2f..6ddc0dc3981a2 100644 --- a/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx +++ b/datahub-web-react/src/app/lineage/__tests__/constructFetchedNode.test.tsx @@ -1,5 +1,5 @@ import { dataset1, dataset2, dataJob1, dataset1FetchedEntity, dataset2FetchedEntity } from '../../../Mocks'; -import { EntityType } from '../../../types.generated'; +import { Entity, EntityType } from '../../../types.generated'; import { Direction, EntityAndType, FetchedEntity } from '../types'; import { shouldIncludeChildEntity } from '../utils/constructFetchedNode'; @@ -55,7 +55,7 @@ describe('shouldIncludeChildEntity', () => { it('should return true if the parent has a datajob child that is not a child of the dataset child', () => { const updatedDataset1FetchedEntity = { ...dataset1FetchedEntity, - downstreamChildren: [{ type: EntityType.Dataset, entity: dataset2 }], + downstreamChildren: [{ type: EntityType.Dataset, entity: dataset2 as Entity }], } as FetchedEntity; const shouldBeIncluded = shouldIncludeChildEntity( diff --git a/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts b/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts index 93f00311f79dd..3e2743b563908 100644 --- a/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts +++ b/datahub-web-react/src/app/lineage/__tests__/constructTree.test.ts @@ -10,9 +10,9 @@ import { dataFlow1, dataset1, } from '../../../Mocks'; -import { DataPlatform, EntityType, RelationshipDirection } from '../../../types.generated'; +import { DataPlatform, Dataset, Entity, EntityType, RelationshipDirection } from '../../../types.generated'; import { getTestEntityRegistry } from '../../../utils/test-utils/TestPageContainer'; -import { Direction, FetchedEntities, UpdatedLineages } from '../types'; +import { Direction, EntityAndType, FetchedEntities, UpdatedLineages } from '../types'; import constructTree from '../utils/constructTree'; import extendAsyncEntities from '../utils/extendAsyncEntities'; @@ -58,7 +58,7 @@ describe('constructTree', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity as Dataset, type: EntityType.Dataset }, entry.fullyFetched, ), {} as FetchedEntities, @@ -66,7 +66,7 @@ describe('constructTree', () => { expect( constructTree( - { entity: dataset6WithLineage, type: EntityType.Dataset }, + { entity: dataset6WithLineage as Dataset, type: EntityType.Dataset }, mockFetchedEntities, Direction.Downstream, testEntityRegistry, @@ -110,7 +110,7 @@ describe('constructTree', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity as Dataset, type: EntityType.Dataset }, entry.fullyFetched, ), {} as FetchedEntities, @@ -118,7 +118,7 @@ describe('constructTree', () => { expect( constructTree( - { entity: dataset6WithLineage, type: EntityType.Dataset }, + { entity: dataset6WithLineage as Dataset, type: EntityType.Dataset }, mockFetchedEntities, Direction.Upstream, testEntityRegistry, @@ -163,7 +163,7 @@ describe('constructTree', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity as Dataset, type: EntityType.Dataset }, entry.fullyFetched, ), {} as FetchedEntities, @@ -258,7 +258,7 @@ describe('constructTree', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity as Dataset, type: EntityType.Dataset }, entry.fullyFetched, ), {} as FetchedEntities, @@ -289,7 +289,7 @@ describe('constructTree', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity as Entity, type: EntityType.Dataset } as EntityAndType, entry.fullyFetched, ), {} as FetchedEntities, @@ -376,14 +376,14 @@ describe('constructTree', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: entry.entity.type }, + { entity: entry.entity as Dataset, type: entry.entity.type as EntityType } as EntityAndType, entry.fullyFetched, ), {} as FetchedEntities, ); expect( constructTree( - { entity: updatedDataset6WithLineage, type: EntityType.Dataset }, + { entity: updatedDataset6WithLineage as Dataset, type: EntityType.Dataset }, mockFetchedEntities, Direction.Upstream, testEntityRegistry, @@ -431,7 +431,7 @@ describe('constructTree', () => { {}, acc, testEntityRegistry, - { entity: entry.entity, type: EntityType.Dataset }, + { entity: entry.entity as Dataset, type: EntityType.Dataset }, entry.fullyFetched, ), {} as FetchedEntities, @@ -447,7 +447,7 @@ describe('constructTree', () => { expect( constructTree( - { entity: dataset6WithLineage, type: EntityType.Dataset }, + { entity: dataset6WithLineage as Dataset, type: EntityType.Dataset }, mockFetchedEntities, Direction.Upstream, testEntityRegistry, diff --git a/datahub-web-react/src/app/lineage/types.ts b/datahub-web-react/src/app/lineage/types.ts index 38393c0ae48a4..b4d73d0c9185e 100644 --- a/datahub-web-react/src/app/lineage/types.ts +++ b/datahub-web-react/src/app/lineage/types.ts @@ -57,7 +57,7 @@ export type FetchedEntity = { schemaMetadata?: SchemaMetadata; inputFields?: InputFields; canEditLineage?: boolean; - health?: Health[]; + health?: Maybe; }; export type NodeData = { @@ -81,7 +81,7 @@ export type NodeData = { canEditLineage?: boolean; upstreamRelationships?: Array; downstreamRelationships?: Array; - health?: Health[]; + health?: Maybe; }; export type VizNode = { diff --git a/datahub-web-react/src/app/shared/tags/__tests__/TagTermGroup.test.tsx b/datahub-web-react/src/app/shared/tags/__tests__/TagTermGroup.test.tsx index d6c1cac734e2d..8d9f92b281c59 100644 --- a/datahub-web-react/src/app/shared/tags/__tests__/TagTermGroup.test.tsx +++ b/datahub-web-react/src/app/shared/tags/__tests__/TagTermGroup.test.tsx @@ -4,7 +4,7 @@ import { MockedProvider } from '@apollo/client/testing'; import TagTermGroup from '../TagTermGroup'; import TestPageContainer from '../../../../utils/test-utils/TestPageContainer'; -import { EntityType, GlossaryTerms } from '../../../../types.generated'; +import { EntityType, GlobalTags, GlossaryTerms } from '../../../../types.generated'; import { mocks } from '../../../../Mocks'; const legacyTag = { @@ -50,7 +50,7 @@ describe('TagTermGroup', () => { const { getByText, getByLabelText, queryAllByLabelText, queryByText } = render( - + , ); @@ -72,7 +72,7 @@ describe('TagTermGroup', () => { const { getByText, queryByLabelText, queryByText } = render( - + , ); @@ -85,7 +85,11 @@ describe('TagTermGroup', () => { const { getByText, queryByText, queryAllByLabelText } = render( - + , ); @@ -102,8 +106,8 @@ describe('TagTermGroup', () => { @@ -124,8 +128,8 @@ describe('TagTermGroup', () => { From 9b35b313feaf644136e84d941cb2febdef3bef3e Mon Sep 17 00:00:00 2001 From: Andrew Sikowitz Date: Tue, 5 Mar 2024 16:09:37 -0800 Subject: [PATCH 2/2] fix test --- .../containers/profile/__tests__/EntityProfile.test.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx index 67bca00a7c086..68429e25cf955 100644 --- a/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx +++ b/datahub-web-react/src/app/entity/shared/containers/profile/__tests__/EntityProfile.test.tsx @@ -314,12 +314,6 @@ describe('EntityProfile', () => { { name: 'Lineage', component: LineageTab, - display: { - visible: (_, _1) => true, - enabled: (_, dataset: GetDatasetQuery) => - ((dataset?.dataset as any).upstreamLineage?.entities?.length || 0) > 0 || - ((dataset?.dataset as any).downstreamLineage?.entities?.length || 0) > 0, - }, }, { name: 'Queries',