Merge branch 'datahub-project:master' into master

Author: shirshanka

README.md

@@ -102,11 +102,12 @@ If you're looking to build & modify datahub please take a look at our [Developme
 
 - [datahub-project/datahub](https://github.com/datahub-project/datahub): This repository contains the complete source code for DataHub's metadata model, metadata services, integration connectors and the web application.
 - [acryldata/datahub-actions](https://github.com/acryldata/datahub-actions): DataHub Actions is a framework for responding to changes to your DataHub Metadata Graph in real time.
-- [acryldata/datahub-helm](https://github.com/acryldata/datahub-helm): Repository of helm charts for deploying DataHub on a Kubernetes cluster
-- [acryldata/meta-world](https://github.com/acryldata/meta-world): A repository to store recipes, custom sources, transformations and other things to make your DataHub experience magical
-- [dbt-impact-action](https://github.com/acryldata/dbt-impact-action) : This repository contains a github action for commenting on your PRs with a summary of the impact of changes within a dbt project
-- [datahub-tools](https://github.com/makenotion/datahub-tools) : Additional python tools to interact with the DataHub GraphQL endpoints, built by Notion
-- [business-glossary-sync-action](https://github.com/acryldata/business-glossary-sync-action) : This repository contains a github action that opens PRs to update your business glossary yaml file.
+- [acryldata/datahub-helm](https://github.com/acryldata/datahub-helm): Helm charts for deploying DataHub on a Kubernetes cluster
+- [acryldata/meta-world](https://github.com/acryldata/meta-world): A repository to store recipes, custom sources, transformations and other things to make your DataHub experience magical.
+- [dbt-impact-action](https://github.com/acryldata/dbt-impact-action): A github action for commenting on your PRs with a summary of the impact of changes within a dbt project.
+- [datahub-tools](https://github.com/makenotion/datahub-tools): Additional python tools to interact with the DataHub GraphQL endpoints, built by Notion.
+- [business-glossary-sync-action](https://github.com/acryldata/business-glossary-sync-action): A github action that opens PRs to update your business glossary yaml file.
+- [mcp-server-datahub](https://github.com/acryldata/mcp-server-datahub): A [Model Context Protocol](https://modelcontextprotocol.io/) server implementation for DataHub.
 
 ## Releases
 

datahub-web-react/src/alchemy-components/components/Table/Table.tsx

@@ -51,6 +51,7 @@ export const Table = <T,>({
 }: TableProps<T>) => {
     const [sortColumn, setSortColumn] = useState<string | null>(null);
     const [sortOrder, setSortOrder] = useState<SortingState>(SortingState.ORIGINAL);
+    const [focusedRowIndex, setFocusedRowIndex] = useState<number | null>(null);
 
     const sortedData = getSortedData(columns, data, sortColumn, sortOrder);
     const isRowClickable = !!onRowClick;
@@ -65,6 +66,10 @@ export const Table = <T,>({
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [sortOrder, sortColumn]);
 
+    useEffect(() => {
+        setFocusedRowIndex(null);
+    }, [data]);
+
     if (isLoading) {
         return (
             <LoadingContainer>
@@ -183,6 +188,7 @@ export const Table = <T,>({
                                     key={key}
                                     canExpand={canExpand}
                                     onClick={() => {
+                                        setFocusedRowIndex(index);
                                         if (canExpand) onExpand?.(row); // Handle row expansion
                                         onRowClick?.(row); // Handle row click
                                     }}
@@ -193,8 +199,10 @@ export const Table = <T,>({
                                             currentRefs[index] = el;
                                         }
                                     }}
+                                    isFocused={focusedRowIndex === index}
                                     isRowClickable={isRowClickable}
                                     data-testId={rowDataTestId?.(row)}
+                                    canHover
                                 >
                                     {/* Render each cell in the row */}
 
@@ -241,7 +249,7 @@ export const Table = <T,>({
                                 </TableRow>
                                 {/* Render expanded content if row is expanded */}
                                 {isExpanded && expandable?.expandedRowRender && (
-                                    <TableRow isRowClickable={isRowClickable}>
+                                    <TableRow isRowClickable={isRowClickable} canHover={false}>
                                         <TableCell
                                             colSpan={columns.length + (expandable?.expandIconPosition ? 1 : 0)}
                                             style={{ padding: 0 }}

datahub-web-react/src/alchemy-components/components/Table/components.ts

@@ -53,23 +53,32 @@ export const HeaderContainer = styled.div<{ alignment?: AlignmentOptions }>(({ a
     justifyContent: alignment,
 }));
 
-export const TableRow = styled.tr<{ canExpand?: boolean; isRowClickable?: boolean }>(
-    ({ canExpand, isRowClickable }) => ({
-        background: canExpand ? colors.gray[100] : 'transparent',
-        cursor: isRowClickable ? 'pointer' : 'normal',
-        '&:last-child': {
-            '& td': {
-                borderBottom: 'none',
-            },
+export const TableRow = styled.tr<{
+    canExpand?: boolean;
+    isRowClickable?: boolean;
+    isFocused?: boolean;
+    canHover?: boolean;
+}>(({ canExpand, isRowClickable, isFocused, canHover }) => ({
+    background: canExpand ? colors.gray[100] : 'transparent',
+    ...(isFocused
+        ? {
+              background: `linear-gradient(180deg, rgba(83,63,209,0.04) -3.99%, rgba(112,94,228,0.04) 53.04%, rgba(112,94,228,0.04) 100%)`,
+          }
+        : {}),
+    '&:hover': canHover ? { backgroundColor: colors.gray[1500] } : {},
+    cursor: isRowClickable ? 'pointer' : 'normal',
+    '&:last-child': {
+        '& td': {
+            borderBottom: 'none',
         },
+    },
 
-        '& td:first-child': {
-            fontWeight: typography.fontWeights.bold,
-            color: colors.gray[600],
-            fontSize: '12px',
-        },
-    }),
-);
+    '& td:first-child': {
+        fontWeight: typography.fontWeights.bold,
+        color: colors.gray[600],
+        fontSize: '12px',
+    },
+}));
 
 export const TableCell = styled.td<{
     width?: string;

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

@@ -12,7 +12,7 @@ type TimelineContentProps = {
 };
 
 export default function IncidentActivityContent({ incidentActivities }: TimelineContentProps) {
-    const { action, actor, time } = incidentActivities;
+    const { action, actor, time, message } = incidentActivities;
     const getUserName = useGetUserName();
     const entityRegistry = useEntityRegistryV2();
 
@@ -39,6 +39,7 @@ export default function IncidentActivityContent({ incidentActivities }: Timeline
                     </ActivityStatusText>
                 </Text>
                 <Text style={{ color: colors.gray[1700] }}>{getTimeFromNow(time)}</Text>
+                {message ? <Text style={{ color: colors.gray[1700] }}>{message}</Text> : null}
             </ContentRow>
         </Content>
     );

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

@@ -68,6 +68,7 @@ export const IncidentEditor = ({
         assignees: cachedAssignees,
         linkedAssets: cachedLinkedAssets,
         entity,
+        currentIncident: data,
     });
     const formValues = Form.useWatch([], form);
 

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

@@ -13,6 +13,7 @@ import {
     EntityType,
     IncidentSourceType,
     IncidentState,
+    IncidentType,
 } from '@src/types.generated';
 import { Check, Warning } from '@phosphor-icons/react';
 import { IconLabel } from '@src/alchemy-components/components/IconLabel';
@@ -130,49 +131,27 @@ export const IncidentView = ({ incident }: { incident: IncidentTableRow }) => {
     };
 
     const renderActivities = (() => {
-        // TODO Amit: Move this into a separate utilities file.
-        const { creator, lastUpdated } = incidentActivityActors;
-        const isCreatedAndUpdatedBySameUser = creator === lastUpdated;
-
-        if (isCreatedAndUpdatedBySameUser) {
-            if (incident?.state === IncidentState.Resolved) {
-                return [
-                    {
-                        actor: incidentCreator,
-                        action: INCIDENT_STATE_TO_ACTIVITY.RAISED,
-                        time: incident?.creator?.time,
-                    },
-                    {
-                        actor: incidentResolver,
-                        action: INCIDENT_STATE_TO_ACTIVITY.RESOLVED,
-                        time: incident?.lastUpdated?.time,
-                    },
-                ];
-            }
-
-            if (incident?.state === IncidentState.Active) {
-                return [
-                    {
-                        actor: incidentCreator,
-                        action: INCIDENT_STATE_TO_ACTIVITY.RAISED,
-                        time: incident?.creator?.time,
-                    },
-                ];
-            }
+        const baseActivity = {
+            actor: incidentCreator,
+            action: INCIDENT_STATE_TO_ACTIVITY.RAISED,
+            time: incident?.creator?.time,
+        };
+
+        // Only add the resolved activity if the incident state is Resolved
+        if (incident?.state === IncidentState.Resolved) {
+            return [
+                baseActivity,
+                {
+                    actor: incidentResolver,
+                    action: INCIDENT_STATE_TO_ACTIVITY.RESOLVED,
+                    time: incident?.lastUpdated?.time,
+                    message: incident?.message,
+                },
+            ];
         }
 
-        return [
-            {
-                actor: incidentCreator,
-                action: INCIDENT_STATE_TO_ACTIVITY.RAISED,
-                time: incident?.creator?.time,
-            },
-            {
-                actor: incidentResolver,
-                action: INCIDENT_STATE_TO_ACTIVITY.RESOLVED,
-                time: incident?.lastUpdated?.time,
-            },
-        ];
+        // Otherwise just return the base activity
+        return [baseActivity];
     })();
 
     /** Assertion Related Logic. */
@@ -185,6 +164,10 @@ export const IncidentView = ({ incident }: { incident: IncidentTableRow }) => {
         assertionDescription = getPlainTextDescriptionFromAssertion(assertion.info as AssertionInfo);
     }
 
+    const categoryName = getCapitalizeWord(
+        incident?.type === IncidentType.Custom ? incident.customType : incident.type,
+    );
+
     return (
         <Container>
             <DescriptionSection>
@@ -200,7 +183,7 @@ export const IncidentView = ({ incident }: { incident: IncidentTableRow }) => {
             </DescriptionSection>
             <DetailsSection>
                 <DetailsLabel>Category</DetailsLabel>
-                <CategoryText>{incident?.type && getCapitalizeWord(incident?.type)}</CategoryText>
+                <CategoryText>{categoryName}</CategoryText>
             </DetailsSection>
             <DetailsSection>
                 <DetailsLabel>Priority</DetailsLabel>

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

@@ -62,15 +62,24 @@ export const getCacheIncident = ({
 
         priority: values.priority,
         created: {
-            time: Date.now(),
+            time: values.created || new Date(),
             actor: user?.urn,
         },
         assignees: values.assignees,
     };
     return newIncident;
 };
 
-export const useIncidentHandler = ({ mode, onSubmit, incidentUrn, user, assignees, linkedAssets, entity }) => {
+export const useIncidentHandler = ({
+    mode,
+    onSubmit,
+    incidentUrn,
+    user,
+    assignees,
+    linkedAssets,
+    entity,
+    currentIncident,
+}) => {
     const [raiseIncidentMutation] = useRaiseIncidentMutation();
     const [updateIncidentMutation] = useUpdateIncidentMutation();
     const [form] = Form.useForm();
@@ -184,6 +193,7 @@ export const useIncidentHandler = ({ mode, onSubmit, incidentUrn, user, assignee
                             priority: values.priority || null,
                             assignees,
                             linkedAssets,
+                            created: currentIncident.created,
                         },
                         user,
                         incidentUrn,

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

@@ -150,7 +150,6 @@ export const ActivityStatusText = styled.div`
 export const Header = styled.div`
     display: flex;
     align-items: center;
-    cursor: pointer;
     margin-bottom: 1rem;
 `;
 

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

@@ -46,7 +46,7 @@ export const IncidentFilterContainer: React.FC<IncidentAssigneeAvatarStack> = ({
                 acc[selectedfilter.category].push(selectedfilter.name);
                 return acc;
             },
-            { type: [], stage: [], priority: [], state: [] },
+            { category: [], stage: [], priority: [], state: [] },
         );
 
         handleFilterChange({
@@ -57,14 +57,14 @@ export const IncidentFilterContainer: React.FC<IncidentAssigneeAvatarStack> = ({
 
     const initialSelectedOptions = useMemo(() => {
         const recommendedFilters = originalFilterOptions?.recommendedFilters || [];
-        const { stage, type, priority, state } =
+        const { stage, category, priority, state } =
             selectedFilters.filterCriteria || INCIDENT_DEFAULT_FILTERS.filterCriteria;
 
         const appliedRecommendedFilters = recommendedFilters.filter(
             (item) =>
                 (state.includes(item.name) && item.category === 'state') ||
                 (stage.includes(item.name) && item.category === 'stage') ||
-                (type.includes(item.name) && item.category === 'type') ||
+                (category.includes(item.name) && item.category === 'category') ||
                 (priority.includes(item.name) && item.category === 'priority'),
         );
         return appliedRecommendedFilters?.map((filter) => ({

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

@@ -24,7 +24,7 @@ export const IncidentList = () => {
     const [entity, setEntity] = useState<EntityStagedForIncident>();
     const [visibleIncidents, setVisibleIncidents] = useState<IncidentTable>({
         incidents: [],
-        groupBy: { type: [], priority: [], stage: [], state: [] },
+        groupBy: { category: [], priority: [], stage: [], state: [] },
     });
     const [allIncidentData, setAllIncidentData] = useState<Incident[]>([]);