Merge branch 'datahub-project:master' into master

Author: treff7es

datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamEntitiesList.tsx

@@ -1,17 +1,19 @@
 import React from 'react';
 import styled from 'styled-components';
-import { Dataset } from '@src/types.generated';
 import { Divider } from 'antd';
 import { EntityLinkList } from '@src/app/homeV2/reference/sections/EntityLinkList';
+import { GenericEntityProperties } from '@src/app/entity/shared/types';
 import { ANTD_GRAY } from '../../constants';
 
 type Props = {
-    directEntities: Dataset[];
-    indirectEntities: Dataset[];
+    directEntities: GenericEntityProperties[];
+    indirectEntities: GenericEntityProperties[];
     loadMoreDirectEntities: () => void;
     loadMoreIndirectEntities: () => void;
     remainingDirectEntities: number;
     remainingIndirectEntities: number;
+    showHealthIcon?: boolean;
+    showDeprecatedIcon?: boolean;
 };
 
 const Container = styled.div`
@@ -47,6 +49,8 @@ const UpstreamEntitiesList = ({
     loadMoreIndirectEntities,
     remainingDirectEntities,
     remainingIndirectEntities,
+    showHealthIcon,
+    showDeprecatedIcon,
 }: Props) => {
     return (
         <Container>
@@ -63,7 +67,8 @@ const UpstreamEntitiesList = ({
                             showMoreComponent={
                                 <ShowMoreWrapper>{`Show ${remainingDirectEntities} more`}</ShowMoreWrapper>
                             }
-                            showHealthIcon
+                            showHealthIcon={showHealthIcon}
+                            showDeprecatedIcon={showDeprecatedIcon}
                         />
                     </>
                 )}

datahub-web-react/src/app/entityV2/shared/embed/UpstreamHealth/UpstreamHealth.tsx

@@ -3,12 +3,15 @@ import { Divider } from 'antd';
 import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
 import { ErrorRounded } from '@mui/icons-material';
-import { isUnhealthy } from '@src/app/shared/health/healthUtils';
+import { isDeprecated, isUnhealthy } from '@src/app/shared/health/healthUtils';
+import { useEntityRegistry } from '@src/app/useEntityRegistry';
+import { GenericEntityProperties } from '@src/app/entity/shared/types';
 import { useSearchAcrossLineageQuery } from '../../../../../graphql/search.generated';
-import { Dataset, EntityType, FilterOperator, LineageDirection } from '../../../../../types.generated';
+import { FilterOperator, LineageDirection } from '../../../../../types.generated';
 import {
     HAS_ACTIVE_INCIDENTS_FILTER_NAME,
     HAS_FAILING_ASSERTIONS_FILTER_NAME,
+    IS_DEPRECATED_FILTER_NAME,
 } from '../../../../search/utils/constants';
 import { useAppConfig } from '../../../../useAppConfig';
 import { useEntityData } from '../../../../entity/shared/EntityContext';
@@ -49,10 +52,11 @@ const Container = styled.div`
 
 export default function UpstreamHealth() {
     const { entityData } = useEntityData();
+    const entityRegistry = useEntityRegistry();
 
     const [isOpen, setIsOpen] = useState(false);
-    const [directUpstreamEntities, setDirectUpstreamEntities] = useState<Dataset[]>([]);
-    const [indirectUpstreamEntities, setIndirectUpstreamEntities] = useState<Dataset[]>([]);
+    const [directUpstreamEntities, setDirectUpstreamEntities] = useState<GenericEntityProperties[]>([]);
+    const [indirectUpstreamEntities, setIndirectUpstreamEntities] = useState<GenericEntityProperties[]>([]);
 
     const [directUpstreamsDataStart, setDirectUpstreamsDataStart] = useState(0);
     const [indirectUpstreamsDataStart, setIndirectUpstreamsDataStart] = useState(0);
@@ -71,10 +75,13 @@ export default function UpstreamHealth() {
             skip: !lineageEnabled,
             variables: {
                 input: {
+                    searchFlags: {
+                        skipCache: true,
+                    },
                     urn,
                     query: '*',
                     startTimeMillis,
-                    types: [EntityType.Dataset],
+                    types: [],
                     count: DATASET_COUNT,
                     start,
                     direction: LineageDirection.Upstream,
@@ -107,6 +114,20 @@ export default function UpstreamHealth() {
                                 },
                             ],
                         },
+                        {
+                            and: [
+                                {
+                                    field: 'degree',
+                                    condition: FilterOperator.Equal,
+                                    values: degree,
+                                },
+                                {
+                                    field: IS_DEPRECATED_FILTER_NAME,
+                                    condition: FilterOperator.Equal,
+                                    values: ['true'],
+                                },
+                            ],
+                        },
                     ],
                 },
                 includeAssertions: false,
@@ -126,27 +147,33 @@ export default function UpstreamHealth() {
     useEffect(() => {
         if (directUpstreamData?.searchAcrossLineage?.searchResults?.length && !directUpstreamEntities.length) {
             setDirectUpstreamEntities(
-                directUpstreamData.searchAcrossLineage.searchResults.map((result) => result.entity as Dataset),
+                directUpstreamData.searchAcrossLineage.searchResults
+                    .map((result) => entityRegistry.getGenericEntityProperties(result.entity.type, result.entity))
+                    .filter((e) => e !== null) as GenericEntityProperties[],
             );
             setDirectUpstreamsDataTotal(directUpstreamData.searchAcrossLineage.total);
         }
     }, [
         directUpstreamData?.searchAcrossLineage?.searchResults,
         directUpstreamEntities.length,
         directUpstreamData?.searchAcrossLineage?.total,
+        entityRegistry,
     ]);
 
     useEffect(() => {
         if (indirectUpstreamData?.searchAcrossLineage?.searchResults?.length && !indirectUpstreamEntities.length) {
             setIndirectUpstreamEntities(
-                indirectUpstreamData.searchAcrossLineage.searchResults.map((result) => result.entity as Dataset),
+                indirectUpstreamData.searchAcrossLineage.searchResults
+                    .map((result) => entityRegistry.getGenericEntityProperties(result.entity.type, result.entity))
+                    .filter((e) => e !== null) as GenericEntityProperties[],
             );
             setIndirectUpstreamsDataTotal(indirectUpstreamData.searchAcrossLineage.total);
         }
     }, [
         indirectUpstreamData?.searchAcrossLineage?.searchResults,
         indirectUpstreamEntities.length,
         indirectUpstreamData?.searchAcrossLineage?.total,
+        entityRegistry,
     ]);
 
     function loadMoreDirectUpstreamData() {
@@ -160,7 +187,9 @@ export default function UpstreamHealth() {
             if (result.data.searchAcrossLineage?.searchResults) {
                 setDirectUpstreamEntities([
                     ...directUpstreamEntities,
-                    ...result.data.searchAcrossLineage.searchResults.map((r) => r.entity as Dataset),
+                    ...(result.data.searchAcrossLineage.searchResults
+                        .map((r) => entityRegistry.getGenericEntityProperties(r.entity.type, r.entity))
+                        .filter((e) => e !== null) as GenericEntityProperties[]),
                 ]);
             }
         });
@@ -178,15 +207,21 @@ export default function UpstreamHealth() {
             if (result.data.searchAcrossLineage?.searchResults) {
                 setIndirectUpstreamEntities([
                     ...indirectUpstreamEntities,
-                    ...result.data.searchAcrossLineage.searchResults.map((r) => r.entity as Dataset),
+                    ...(result.data.searchAcrossLineage.searchResults
+                        .map((r) => entityRegistry.getGenericEntityProperties(r.entity.type, r.entity))
+                        .filter((e) => e !== null) as GenericEntityProperties[]),
                 ]);
             }
         });
         setIndirectUpstreamsDataStart(newStart);
     }
 
-    const unhealthyDirectUpstreams = directUpstreamEntities.filter((e) => e.health && isUnhealthy(e.health));
-    const unhealthyIndirectUpstreams = indirectUpstreamEntities.filter((e) => e.health && isUnhealthy(e.health));
+    const unhealthyDirectUpstreams = directUpstreamEntities.filter(
+        (e) => (e.health && isUnhealthy(e.health)) || isDeprecated(e),
+    );
+    const unhealthyIndirectUpstreams = indirectUpstreamEntities.filter(
+        (e) => (e.health && isUnhealthy(e.health)) || isDeprecated(e),
+    );
 
     const hasUnhealthyUpstreams = unhealthyDirectUpstreams.length || unhealthyIndirectUpstreams.length;
 
@@ -216,6 +251,8 @@ export default function UpstreamHealth() {
                             indirectUpstreamsDataTotal - (indirectUpstreamsDataStart + DATASET_COUNT),
                             0,
                         )}
+                        showDeprecatedIcon
+                        showHealthIcon
                     />
                 )}
             </CTAWrapper>

datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer.tsx

@@ -6,7 +6,7 @@ import { Incident } from '@src/types.generated';
 import { IncidentDrawerHeader } from './IncidentDrawerHeader';
 import { IncidentView } from './IncidentView';
 import { IncidentEditor } from './IncidentEditor';
-import { IncidentTableRow } from '../types';
+import { EntityStagedForIncident, IncidentTableRow } from '../types';
 import { IncidentAction } from '../constant';
 
 const modalBodyStyle = { padding: 0, fontFamily: 'Mulish, sans-serif' };
@@ -17,9 +17,10 @@ type IncidentDetailDrawerProps = {
     incident?: IncidentTableRow;
     onCancel?: () => void;
     onSubmit?: (incident?: Incident) => void;
+    entity?: EntityStagedForIncident;
 };
 
-export const IncidentDetailDrawer = ({ mode, onCancel, onSubmit, incident }: IncidentDetailDrawerProps) => {
+export const IncidentDetailDrawer = ({ mode, onCancel, onSubmit, incident, entity }: IncidentDetailDrawerProps) => {
     const [isEditView, setIsEditView] = useState<boolean>(false);
     const showEditor = isEditView || mode === IncidentAction.CREATE;
     const modalClosePopup = () => {
@@ -55,6 +56,7 @@ export const IncidentDetailDrawer = ({ mode, onCancel, onSubmit, incident }: Inc
                     isEditActive={isEditView}
                     setIsEditActive={setIsEditView}
                     data={incident}
+                    platform={entity?.platform}
                 />
                 {showEditor ? (
                     <IncidentEditor
@@ -63,6 +65,7 @@ export const IncidentDetailDrawer = ({ mode, onCancel, onSubmit, incident }: Inc
                         mode={mode}
                         incidentUrn={incident?.urn}
                         onSubmit={onSubmit}
+                        entity={entity}
                     />
                 ) : (
                     <IncidentView incident={incident as IncidentTableRow} />

datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDrawerHeader.tsx

@@ -1,11 +1,20 @@
 import React from 'react';
-import { Link as LinkIcon, PencilSimpleLine, X } from '@phosphor-icons/react';
 import styled from 'styled-components';
+import { Link as LinkIcon, PencilSimpleLine, X } from '@phosphor-icons/react';
 import { Tooltip2 } from '@src/alchemy-components/components/Tooltip2';
+import PlatformIcon from '@src/app/sharedV2/icons/PlatformIcon';
+import { capitalizeFirstLetter } from '@src/app/shared/textUtil';
+import { DataPlatform } from '@src/types.generated';
 import { useIncidentURNCopyLink } from '../hooks';
 import { IncidentAction } from '../constant';
 import { IncidentTableRow } from '../types';
-import { StyledHeader, StyledHeaderActions, StyledTitle } from './styledComponents';
+import {
+    ForPlatformWrapper,
+    StyledHeader,
+    StyledHeaderActions,
+    StyledHeaderTitleContainer,
+    StyledTitle,
+} from './styledComponents';
 
 const EditButton = styled(PencilSimpleLine)`
     :hover {
@@ -31,6 +40,7 @@ type IncidentDrawerHeaderProps = {
     isEditActive: boolean;
     setIsEditActive: React.Dispatch<React.SetStateAction<boolean>>;
     data?: IncidentTableRow;
+    platform?: DataPlatform;
 };
 
 export const IncidentDrawerHeader = ({
@@ -39,11 +49,20 @@ export const IncidentDrawerHeader = ({
     isEditActive,
     setIsEditActive,
     data,
+    platform,
 }: IncidentDrawerHeaderProps) => {
     const handleIncidentLinkCopy = useIncidentURNCopyLink(data ? data?.urn : '');
     return (
         <StyledHeader>
-            <StyledTitle>{mode === IncidentAction.CREATE ? 'Create New Incident' : data?.title}</StyledTitle>
+            <StyledHeaderTitleContainer>
+                <StyledTitle>{mode === IncidentAction.CREATE ? 'Create New Incident' : data?.title}</StyledTitle>
+                {platform && (
+                    <ForPlatformWrapper>
+                        <PlatformIcon platform={platform} size={16} styles={{ marginRight: 4 }} />
+                        {capitalizeFirstLetter(platform.name)}
+                    </ForPlatformWrapper>
+                )}
+            </StyledHeaderTitleContainer>
             <StyledHeaderActions>
                 {mode === IncidentAction.EDIT && isEditActive === false && (
                     <>

datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentEditor.tsx

@@ -36,6 +36,7 @@ export const IncidentEditor = ({
     data,
     onClose,
     mode = IncidentAction.CREATE,
+    entity,
 }: IncidentEditorProps) => {
     const assigneeValues = data?.assignees && getAssigneeWithURN(data.assignees);
     const isFormValid = Boolean(
@@ -63,6 +64,7 @@ export const IncidentEditor = ({
         user,
         assignees: cachedAssignees,
         linkedAssets: cachedLinkedAssets,
+        entity,
     });
     const formValues = Form.useWatch([], form);
 

datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/hooks/useIncidentHandler.ts

@@ -70,7 +70,7 @@ export const getCacheIncident = ({
     return newIncident;
 };
 
-export const useIncidentHandler = ({ mode, onSubmit, incidentUrn, onClose, user, assignees, linkedAssets }) => {
+export const useIncidentHandler = ({ mode, onSubmit, incidentUrn, onClose, user, assignees, linkedAssets, entity }) => {
     const [raiseIncidentMutation] = useRaiseIncidentMutation();
     const [updateIncidentMutation] = useUpdateIncidentMutation();
     const [form] = Form.useForm();
@@ -138,7 +138,7 @@ export const useIncidentHandler = ({ mode, onSubmit, incidentUrn, onClose, user,
             const values = form.getFieldsValue();
             const baseInput = {
                 ...values,
-                resourceUrn: urn,
+                resourceUrn: entity?.urn || urn,
                 status: {
                     stage: values.status,
                     state: values.state || IncidentState.Active,

datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/styledComponents.tsx

@@ -292,6 +292,11 @@ export const StyledHeader = styled.div`
     box-shadow: 0px 0px 6px 0px #5d668b33;
 `;
 
+export const StyledHeaderTitleContainer = styled.div`
+    display: flex;
+    align-items: center;
+`;
+
 export const StyledHeaderActions = styled.div`
     display: flex;
     gap: 20px;
@@ -325,3 +330,13 @@ export const StyledSpinner = styled.div`
     animation: ${spin} 0.8s linear infinite;
     display: inline-block;
 `;
+
+export const ForPlatformWrapper = styled.div`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    font-size: 0.75rem;
+    margin-left: 12px;
+    padding-left: 12px;
+    border-left: 0.5px solid #ddd;
+`;