Final commit

datahub-project · Aug 28, 2023 · df961a9 · df961a9
1 parent 437b787
commit df961a9
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 16 deletions.
diff --git a/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx b/datahub-web-react/src/app/entity/dataset/DatasetEntity.tsx
@@ -317,6 +317,7 @@ export class DatasetEntity implements Entity<Dataset> {
             subtype: entity?.subTypes?.typeNames?.[0] || undefined,
             icon: entity?.platform?.properties?.logoUrl || undefined,
             platform: entity?.platform,
+            health: entity?.health || undefined,
         };
     };
 

diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealth.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { Link } from 'react-router-dom';
 import { Health } from '../../../../../../types.generated';
-import { getHealthSummaryIcon, isUnhealthy } from '../../../../../shared/health/healthUtils';
+import { getHealthSummaryIcon, HealthSummaryIconType, isUnhealthy } from '../../../../../shared/health/healthUtils';
 import { EntityHealthPopover } from './EntityHealthPopover';
 
 const Container = styled.div`
@@ -14,17 +14,19 @@ const Container = styled.div`
 type Props = {
     health: Health[];
     baseUrl: string;
+    fontSize?: number;
+    tooltipPlacement?: any;
 };
 
-export const EntityHealth = ({ health, baseUrl }: Props) => {
+export const EntityHealth = ({ health, baseUrl, fontSize, tooltipPlacement }: Props) => {
     const unhealthy = isUnhealthy(health);
-    const icon = getHealthSummaryIcon(health);
+    const icon = getHealthSummaryIcon(health, HealthSummaryIconType.FILLED, fontSize);
     return (
         <>
             {(unhealthy && (
                 <Link to={`${baseUrl}/Validation`}>
                     <Container>
-                        <EntityHealthPopover health={health} baseUrl={baseUrl}>
+                        <EntityHealthPopover health={health} baseUrl={baseUrl} placement={tooltipPlacement}>
                             {icon}
                         </EntityHealthPopover>
                     </Container>

diff --git a/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthPopover.tsx b/datahub-web-react/src/app/entity/shared/containers/profile/header/EntityHealthPopover.tsx
@@ -50,10 +50,12 @@ type Props = {
     health: Health[];
     baseUrl: string;
     children: React.ReactNode;
+    fontSize?: number;
+    placement?: any;
 };
 
-export const EntityHealthPopover = ({ health, baseUrl, children }: Props) => {
-    const icon = getHealthSummaryIcon(health, HealthSummaryIconType.OUTLINED);
+export const EntityHealthPopover = ({ health, baseUrl, children, fontSize, placement = 'right' }: Props) => {
+    const icon = getHealthSummaryIcon(health, HealthSummaryIconType.OUTLINED, fontSize);
     const message = getHealthSummaryMessage(health);
     return (
         <Popover
@@ -71,7 +73,7 @@ export const EntityHealthPopover = ({ health, baseUrl, children }: Props) => {
                 </>
             }
             color="#262626"
-            placement="right"
+            placement={placement}
             zIndex={10000000}
         >
             {children}

diff --git a/datahub-web-react/src/app/lineage/LineageEntityNode.tsx b/datahub-web-react/src/app/lineage/LineageEntityNode.tsx
@@ -12,7 +12,7 @@ import { getShortenedTitle, nodeHeightFromTitleLength } from './utils/titleUtils
 import { LineageExplorerContext } from './utils/LineageExplorerContext';
 import { useGetEntityLineageLazyQuery } from '../../graphql/lineage.generated';
 import { useIsSeparateSiblingsMode } from '../entity/shared/siblingUtils';
-import { centerX, centerY, iconHeight, iconWidth, iconX, iconY, textX, width } from './constants';
+import { centerX, centerY, iconHeight, iconWidth, iconX, iconY, textX, width, healthX, healthY } from './constants';
 import LineageEntityColumns from './LineageEntityColumns';
 import { convertInputFieldsToSchemaFields } from './utils/columnLineageUtils';
 import ManageLineageMenu from './manage/ManageLineageMenu';
@@ -136,6 +136,11 @@ export default function LineageEntityNode({
         capitalizeFirstLetterOnly(node.data.subtype) ||
         (node.data.type && entityRegistry.getEntityName(node.data.type));
 
+    // Health
+    const { health } = node.data;
+    const baseUrl = node.data.type && node.data.urn && entityRegistry.getEntityUrl(node.data.type, node.data.urn);
+    const hasHealth = (health && baseUrl) || false;
+
     return (
         <PointerGroup data-testid={`node-${node.data.urn}-${direction}`} top={node.x} left={node.y}>
             {unexploredHiddenChildren && (isHovered || isSelected) ? (
@@ -359,6 +364,16 @@ export default function LineageEntityNode({
                             {getShortenedTitle(node.data.name, width)}
                         </UnselectableText>
                     )}
+                    <foreignObject x={healthX} y={healthY} width="20" height="20">
+                        {hasHealth && (
+                            <EntityHealth
+                                health={health as any}
+                                baseUrl={baseUrl as any}
+                                fontSize={20}
+                                tooltipPlacement="left"
+                            />
+                        )}
+                    </foreignObject>
                 </Group>
                 {unexploredHiddenChildren && isHovered ? (
                     <UnselectableText

diff --git a/datahub-web-react/src/app/lineage/constants.ts b/datahub-web-react/src/app/lineage/constants.ts
@@ -20,3 +20,5 @@ export const iconY = -iconHeight / 2;
 export const centerX = -width / 2;
 export const centerY = -height / 2;
 export const textX = iconX + iconWidth + 8;
+export const healthX = -width / 2 + 14;
+export const healthY = -iconHeight / 2 - 8;
diff --git a/datahub-web-react/src/app/lineage/types.ts b/datahub-web-react/src/app/lineage/types.ts
@@ -56,6 +56,7 @@ export type FetchedEntity = {
     schemaMetadata?: SchemaMetadata;
     inputFields?: InputFields;
     canEditLineage?: boolean;
+    health?: Health[];
 };
 
 export type NodeData = {

diff --git a/datahub-web-react/src/app/lineage/utils/constructFetchedNode.ts b/datahub-web-react/src/app/lineage/utils/constructFetchedNode.ts
@@ -67,6 +67,7 @@ export default function constructFetchedNode(
             canEditLineage: fetchedNode.canEditLineage,
             upstreamRelationships: fetchedNode?.upstreamRelationships || [],
             downstreamRelationships: fetchedNode?.downstreamRelationships || [],
+            health: fetchedNode?.health,
         };
 
         // eslint-disable-next-line no-param-reassign

diff --git a/datahub-web-react/src/app/lineage/utils/constructTree.ts b/datahub-web-react/src/app/lineage/utils/constructTree.ts
@@ -100,6 +100,7 @@ export default function constructTree(
         canEditLineage: fetchedEntity?.canEditLineage,
         upstreamRelationships: fetchedEntity?.upstreamRelationships || [],
         downstreamRelationships: fetchedEntity?.downstreamRelationships || [],
+        health: fetchedEntity?.health,
     };
     const lineageConfig = entityRegistry.getLineageVizConfig(entityAndType.type, entityAndType.entity);
     let updatedLineageConfig = { ...lineageConfig };

diff --git a/datahub-web-react/src/app/shared/health/healthUtils.tsx b/datahub-web-react/src/app/shared/health/healthUtils.tsx
@@ -11,13 +11,17 @@ import { HealthStatus, HealthStatusType, Health } from '../../../types.generated
 
 const HEALTH_INDICATOR_COLOR = '#d48806';
 
-const UnhealthyIconFilled = styled(ExclamationCircleTwoTone)`
-    font-size: 16px;
+const UnhealthyIconFilled = styled(ExclamationCircleTwoTone)<{ fontSize: number }>`
+    && {
+        font-size: ${(props) => props.fontSize}px;
+    }
 `;
 
-const UnhealthyIconOutlined = styled(ExclamationCircleOutlined)`
+const UnhealthyIconOutlined = styled(ExclamationCircleOutlined)<{ fontSize: number }>`
     color: ${HEALTH_INDICATOR_COLOR};
-    font-size: 16px;
+    && {
+        font-size: ${(props) => props.fontSize}px;
+    }
 `;
 
 export enum HealthSummaryIconType {
@@ -32,12 +36,16 @@ export const isUnhealthy = (healths: Health[]) => {
     return isFailingAssertions;
 };
 
-export const getHealthSummaryIcon = (healths: Health[], type: HealthSummaryIconType = HealthSummaryIconType.FILLED) => {
+export const getHealthSummaryIcon = (
+    healths: Health[],
+    type: HealthSummaryIconType = HealthSummaryIconType.FILLED,
+    fontSize = 16,
+) => {
     const unhealthy = isUnhealthy(healths);
     return unhealthy
-        ? (type === HealthSummaryIconType.FILLED && <UnhealthyIconFilled twoToneColor={HEALTH_INDICATOR_COLOR} />) || (
-              <UnhealthyIconOutlined />
-          )
+        ? (type === HealthSummaryIconType.FILLED && (
+              <UnhealthyIconFilled twoToneColor={HEALTH_INDICATOR_COLOR} fontSize={fontSize} />
+          )) || <UnhealthyIconOutlined fontSize={fontSize} />
         : undefined;
 };