Merge branch 'datahub-project:master' into master

anshbansal · web-flow · commit 87894662d10b · 2025-03-28T12:33:50.000+05:30
diff --git a/datahub-web-react/package.json b/datahub-web-react/package.json
@@ -145,7 +145,7 @@
         "@storybook/react-vite": "^8.1.11",
         "@storybook/test": "^8.1.11",
         "@storybook/theming": "^8.1.11",
-        "@stylistic/eslint-plugin-js": "^4.2.0",
+        "@stylistic/eslint-plugin-js": "^3.1.0",
         "@types/graphql": "^14.5.0",
         "@types/query-string": "^6.3.0",
         "@types/styled-components": "^5.1.7",
diff --git a/datahub-web-react/src/alchemy-components/components/Button/Button.tsx b/datahub-web-react/src/alchemy-components/components/Button/Button.tsx
@@ -30,6 +30,8 @@ export const Button = ({
     isDisabled = buttonDefaults.isDisabled,
     isActive = buttonDefaults.isActive,
     children,
+    iconSource,
+    iconColor,
     ...props
 }: ButtonProps) => {
     const styleProps = {
@@ -52,9 +54,13 @@ export const Button = ({
 
     return (
         <ButtonBase {...styleProps} {...props}>
-            {icon && iconPosition === 'left' && <Icon icon={icon} size={iconSize || size} />}
+            {icon && iconPosition === 'left' && (
+                <Icon icon={icon} color={iconColor} size={iconSize || size} source={iconSource} />
+            )}
             {!isCircle && children}
-            {icon && iconPosition === 'right' && <Icon icon={icon} size={iconSize || size} />}
+            {icon && iconPosition === 'right' && (
+                <Icon icon={icon} color={iconColor} size={iconSize || size} source={iconSource} />
+            )}
         </ButtonBase>
     );
 };
diff --git a/datahub-web-react/src/alchemy-components/components/Button/types.ts b/datahub-web-react/src/alchemy-components/components/Button/types.ts
@@ -2,6 +2,7 @@ import { ButtonHTMLAttributes } from 'react';
 
 import type { IconNames } from '@components';
 import type { SizeOptions, ColorOptions, FontSizeOptions } from '@components/theme/config';
+import { IconSource } from '../Icon/types';
 
 export type ButtonVariant = 'filled' | 'outline' | 'text';
 
@@ -21,6 +22,8 @@ export interface ButtonProps
         Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'color'> {
     icon?: IconNames;
     iconSize?: FontSizeOptions;
+    iconSource?: IconSource;
+    iconColor?: ColorOptions;
 }
 
 export type ButtonStyleProps = Omit<ButtonPropsDefaults, 'iconPosition'>;
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDetailDrawer.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 
 import { Drawer, Modal } from 'antd';
 import ClickOutside from '@src/app/shared/ClickOutside';
-import { Incident } from '@src/types.generated';
+import { EntityPrivileges, Incident } from '@src/types.generated';
 import { IncidentDrawerHeader } from './IncidentDrawerHeader';
 import { IncidentView } from './IncidentView';
 import { IncidentEditor } from './IncidentEditor';
@@ -18,9 +18,17 @@ type IncidentDetailDrawerProps = {
     onCancel?: () => void;
     onSubmit?: (incident?: Incident) => void;
     entity?: EntityStagedForIncident;
+    privileges?: EntityPrivileges;
 };
 
-export const IncidentDetailDrawer = ({ mode, onCancel, onSubmit, incident, entity }: IncidentDetailDrawerProps) => {
+export const IncidentDetailDrawer = ({
+    mode,
+    onCancel,
+    onSubmit,
+    incident,
+    entity,
+    privileges,
+}: IncidentDetailDrawerProps) => {
     const [isEditView, setIsEditView] = useState<boolean>(false);
     const showEditor = isEditView || mode === IncidentAction.CREATE;
     const modalClosePopup = () => {
@@ -57,6 +65,7 @@ export const IncidentDetailDrawer = ({ mode, onCancel, onSubmit, incident, entit
                     setIsEditActive={setIsEditView}
                     data={incident}
                     platform={entity?.platform}
+                    privileges={privileges}
                 />
                 {showEditor ? (
                     <IncidentEditor
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDrawerHeader.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentDrawerHeader.tsx
@@ -1,12 +1,11 @@
 import React from 'react';
-import styled from 'styled-components';
-import { Link as LinkIcon, PencilSimpleLine, X } from '@phosphor-icons/react';
+import { Button } from '@src/alchemy-components';
 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 { DataPlatform, EntityPrivileges } from '@src/types.generated';
 import { useIncidentURNCopyLink } from '../hooks';
-import { IncidentAction } from '../constant';
+import { IncidentAction, noPermissionsMessage } from '../constant';
 import { IncidentTableRow } from '../types';
 import {
     ForPlatformWrapper,
@@ -16,31 +15,14 @@ import {
     StyledTitle,
 } from './styledComponents';
 
-const EditButton = styled(PencilSimpleLine)`
-    :hover {
-        cursor: pointer;
-    }
-`;
-
-const CloseButton = styled(X)`
-    :hover {
-        cursor: pointer;
-    }
-`;
-
-const LinkButton = styled(LinkIcon)`
-    :hover {
-        cursor: pointer;
-    }
-`;
-
 type IncidentDrawerHeaderProps = {
     mode: IncidentAction;
     onClose?: () => void;
     isEditActive: boolean;
     setIsEditActive: React.Dispatch<React.SetStateAction<boolean>>;
     data?: IncidentTableRow;
     platform?: DataPlatform;
+    privileges?: EntityPrivileges;
 };
 
 export const IncidentDrawerHeader = ({
@@ -50,12 +32,18 @@ export const IncidentDrawerHeader = ({
     setIsEditActive,
     data,
     platform,
+    privileges,
 }: IncidentDrawerHeaderProps) => {
     const handleIncidentLinkCopy = useIncidentURNCopyLink(data ? data?.urn : '');
+
+    const canEditIncidents = privileges?.canEditIncidents || false;
+
     return (
         <StyledHeader>
             <StyledHeaderTitleContainer>
-                <StyledTitle>{mode === IncidentAction.CREATE ? 'Create New Incident' : data?.title}</StyledTitle>
+                <StyledTitle data-testid="drawer-header-title">
+                    {mode === IncidentAction.CREATE ? 'Create New Incident' : data?.title}
+                </StyledTitle>
                 {platform && (
                     <ForPlatformWrapper>
                         <PlatformIcon platform={platform} size={16} styles={{ marginRight: 4 }} />
@@ -66,19 +54,41 @@ export const IncidentDrawerHeader = ({
             <StyledHeaderActions>
                 {mode === IncidentAction.EDIT && isEditActive === false && (
                     <>
-                        <Tooltip2 title="Edit Incident">
-                            <EditButton
-                                size={20}
-                                onClick={() => setIsEditActive(!isEditActive)}
-                                data-testid="edit-incident-icon"
-                            />
+                        <Tooltip2 title={canEditIncidents ? 'Edit Incident' : noPermissionsMessage}>
+                            <span>
+                                <Button
+                                    icon="PencilSimpleLine"
+                                    variant="text"
+                                    iconColor="gray"
+                                    iconSource="phosphor"
+                                    onClick={() => setIsEditActive(!isEditActive)}
+                                    disabled={!canEditIncidents}
+                                    data-testid="edit-incident-icon"
+                                    size="xl"
+                                />
+                            </span>
                         </Tooltip2>
                         <Tooltip2 title="Copy Link">
-                            <LinkButton size={20} onClick={handleIncidentLinkCopy} />
+                            <Button
+                                icon="Link"
+                                variant="text"
+                                iconColor="gray"
+                                iconSource="phosphor"
+                                onClick={handleIncidentLinkCopy}
+                                size="xl"
+                            />
                         </Tooltip2>
                     </>
                 )}
-                <CloseButton size={20} onClick={() => onClose?.()} data-testid="incident-drawer-close-button" />
+                <Button
+                    icon="X"
+                    variant="text"
+                    iconColor="gray"
+                    iconSource="phosphor"
+                    onClick={() => onClose?.()}
+                    data-testid="incident-drawer-close-button"
+                    size="xl"
+                />
             </StyledHeaderActions>
         </StyledHeader>
     );
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentList.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentList.tsx
@@ -88,6 +88,7 @@ export const IncidentList = () => {
                     refetch={() => {
                         refetch();
                     }}
+                    privileges={privileges}
                 />
             );
         }
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListTable.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentListTable.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { useEntityData } from '@src/app/entity/shared/EntityContext';
 import { Table } from '@src/alchemy-components';
 import { SortingState } from '@src/alchemy-components/components/Table/types';
+import { EntityPrivileges } from '@src/types.generated';
 import { IncidentDetailDrawer } from './AcrylComponents/IncidentDetailDrawer';
 import { IncidentListFilter, IncidentTable, IncidentTableRow } from './types';
 import { useIncidentsTableColumns, useOpenIncidentDetailModal } from './hooks';
@@ -15,9 +16,10 @@ type Props = {
     incidentData: IncidentTable;
     filter: IncidentListFilter;
     refetch: () => void;
+    privileges?: EntityPrivileges;
 };
 
-export const IncidentListTable = ({ incidentData, filter, refetch }: Props) => {
+export const IncidentListTable = ({ incidentData, filter, refetch, privileges }: Props) => {
     const { entityData } = useEntityData();
     const { groupBy } = filter;
 
@@ -29,7 +31,7 @@ export const IncidentListTable = ({ incidentData, filter, refetch }: Props) => {
     );
 
     // get columns data from the custom hooks
-    const incidentsTableCols = useIncidentsTableColumns();
+    const incidentsTableCols = useIncidentsTableColumns(privileges);
     const [sortedOptions, setSortedOptions] = useState<{ sortColumn: string; sortOrder: SortingState }>({
         sortColumn: '',
         sortOrder: SortingState.ORIGINAL,
@@ -138,6 +140,7 @@ export const IncidentListTable = ({ incidentData, filter, refetch }: Props) => {
                     urn={focusIncidentUrn}
                     mode={IncidentAction.EDIT}
                     incident={focusIncidentData}
+                    privileges={privileges}
                     onCancel={() => setFocusIncidentUrn(null)}
                     onSubmit={() => {
                         setTimeout(() => {
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolveButton.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/IncidentResolveButton.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import { CorpUser, IncidentState } from '@src/types.generated';
+import { Tooltip } from 'antd';
+import { CorpUser, EntityPrivileges, IncidentState } from '@src/types.generated';
 import { Button, colors, Pill, Popover } from '@src/alchemy-components';
 import { useGetEntitiesLazyQuery } from '@src/graphql/entity.generated';
 import { Check } from '@phosphor-icons/react';
@@ -12,6 +13,7 @@ import { IncidentTableRow } from './types';
 import { IncidentResolutionPopup } from './IncidentResolutionPopup';
 import { LoadingWrapper } from './AcrylComponents/styledComponents';
 import { ResolvedSection } from './ResolvedSection';
+import { noPermissionsMessage } from './constant';
 
 const ME = 'Me';
 
@@ -26,7 +28,15 @@ const ResolveButton = styled(Button)`
     padding: 0px;
 `;
 
-export const IncidentResolveButton = ({ incident }: { incident: IncidentTableRow }) => {
+export const IncidentResolveButton = ({
+    incident,
+    privileges,
+}: {
+    incident: IncidentTableRow;
+    privileges?: EntityPrivileges;
+}) => {
+    const canEditIncidents = privileges?.canEditIncidents || false;
+
     const me = useUserContext();
     const [showResolvePopup, setShowResolvePopup] = useState(false);
     const [incidentResolver, setIncidentResolver] = useState<CorpUser | any>(null);
@@ -113,9 +123,11 @@ export const IncidentResolveButton = ({ incident }: { incident: IncidentTableRow
             data-testid="incident-resolve-button-container"
         >
             {incident?.state === IncidentState.Active ? (
-                <ResolveButton variant="text" onClick={handleShowPopup}>
-                    Resolve
-                </ResolveButton>
+                <Tooltip showArrow={false} title={!canEditIncidents ? noPermissionsMessage : null}>
+                    <ResolveButton disabled={!canEditIncidents} variant="text" onClick={handleShowPopup}>
+                        Resolve
+                    </ResolveButton>
+                </Tooltip>
             ) : (
                 showPopoverWithResolver
             )}
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/constant.ts b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/constant.ts
@@ -220,3 +220,5 @@ export const STAGE_ORDER = [
 export const STATE_ORDER = [INCIDENT_STATE_NAME_MAP.ACTIVE, INCIDENT_STATE_NAME_MAP.RESOLVED];
 
 export const MAX_VISIBLE_ASSIGNEE = 5;
+
+export const noPermissionsMessage = 'You do not have permission to edit incidents for this asset.';
diff --git a/datahub-web-react/src/app/entityV2/shared/tabs/Incident/hooks.tsx b/datahub-web-react/src/app/entityV2/shared/tabs/Incident/hooks.tsx
@@ -8,14 +8,14 @@ import { IncidentPriorityLabel } from '@src/alchemy-components/components/Incide
 import { getCapitalizeWord } from '@src/alchemy-components/components/IncidentStagePill/utils';
 import { AlignmentOptions } from '@src/alchemy-components/theme/config';
 import { useEntityRegistryV2 } from '@src/app/useEntityRegistry';
-import { CorpUser } from '@src/types.generated';
+import { CorpUser, EntityPrivileges } from '@src/types.generated';
 import { getQueryParams } from '../Dataset/Validations/assertionUtils';
 import { getAssigneeNamesWithAvatarUrl, getLinkedAssetsCount } from './utils';
 import { IncidentResolveButton } from './IncidentResolveButton';
 import { IncidentAssigneeAvatarStack } from './IncidentAssigneeAvatarStack';
 import { CategoryType } from './styledComponents';
 
-export const useIncidentsTableColumns = () => {
+export const useIncidentsTableColumns = (privileges?: EntityPrivileges) => {
     return useMemo(() => {
         const columns = [
             {
@@ -107,13 +107,13 @@ export const useIncidentsTableColumns = () => {
                 key: 'actions',
                 width: '15%',
                 render: (record) => {
-                    return !record.groupName && <IncidentResolveButton incident={record} />;
+                    return !record.groupName && <IncidentResolveButton incident={record} privileges={privileges} />;
                 },
                 alignment: 'right' as AlignmentOptions,
             },
         ];
         return columns;
-    }, []);
+    }, [privileges]);
 };
 
 export const useIncidentURNCopyLink = (Urn: string) => {
diff --git a/datahub-web-react/yarn.lock b/datahub-web-react/yarn.lock
@@ -3792,10 +3792,10 @@
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-8.4.7.tgz#c308f6a883999bd35e87826738ab8a76515932b5"
   integrity sha512-99rgLEjf7iwfSEmdqlHkSG3AyLcK0sfExcr0jnc6rLiAkBhzuIsvcHjjUwkR210SOCgXqBPW0ZA6uhnuyppHLw==
 
-"@stylistic/eslint-plugin-js@^4.2.0":
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-4.2.0.tgz#30536fd35dd6aba08c1e234fe37bf66831c6e989"
-  integrity sha512-MiJr6wvyzMYl/wElmj8Jns8zH7Q1w8XoVtm+WM6yDaTrfxryMyb8n0CMxt82fo42RoLIfxAEtM6tmQVxqhk0/A==
+"@stylistic/eslint-plugin-js@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@stylistic/eslint-plugin-js/-/eslint-plugin-js-3.1.0.tgz#b36292b09bd810ea1b34e0720512f137335ef745"
+  integrity sha512-lQktsOiCr8S6StG29C5fzXYxLOD6ID1rp4j6TRS+E/qY1xd59Fm7dy5qm9UauJIEoSTlYx6yGsCHYh5UkgXPyg==
   dependencies:
     eslint-visitor-keys "^4.2.0"
     espree "^10.3.0"
diff --git a/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py b/metadata-ingestion-modules/airflow-plugin/src/datahub_airflow_plugin/datahub_listener.py
@@ -642,7 +642,7 @@ def on_dag_start(self, dag_run: "DagRun") -> None:
         if dag.dag_id == _DATAHUB_CLEANUP_DAG:
             assert self.graph
 
-            logger.debug("Initiating the cleanup of obsselete data from datahub")
+            logger.debug("Initiating the cleanup of obsolete data from datahub")
 
             # get all ingested dataflow and datajob
             ingested_dataflow_urns = list(
diff --git a/metadata-ingestion/setup.cfg b/metadata-ingestion/setup.cfg
@@ -74,6 +74,8 @@ filterwarnings =
     ignore::datahub.configuration.pydantic_migration_helpers.PydanticDeprecatedSince20
     ignore::datahub.configuration.common.ConfigurationWarning
     ignore:The new datahub SDK:datahub.errors.ExperimentalWarning
+    # We should not be unexpectedly seeing API tracing warnings.
+    error::datahub.errors.APITracingWarning
 
 [coverage:run]
 # Because of some quirks in the way setup.cfg, coverage.py, pytest-cov,
diff --git a/metadata-ingestion/src/datahub/emitter/mce_builder.py b/metadata-ingestion/src/datahub/emitter/mce_builder.py
@@ -125,9 +125,7 @@ def parse_ts_millis(ts: Optional[float]) -> Optional[datetime]:
 
 
 def make_data_platform_urn(platform: str) -> str:
-    if platform.startswith("urn:li:dataPlatform:"):
-        return platform
-    return DataPlatformUrn.create_from_id(platform).urn()
+    return DataPlatformUrn(platform).urn()
 
 
 def make_dataset_urn(platform: str, name: str, env: str = DEFAULT_ENV) -> str:
diff --git a/metadata-ingestion/src/datahub/emitter/response_helper.py b/metadata-ingestion/src/datahub/emitter/response_helper.py
diff --git a/metadata-ingestion/src/datahub/emitter/rest_emitter.py b/metadata-ingestion/src/datahub/emitter/rest_emitter.py
diff --git a/metadata-ingestion/src/datahub/errors.py b/metadata-ingestion/src/datahub/errors.py
diff --git a/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py b/metadata-ingestion/src/datahub/ingestion/source/powerbi/rest_api_wrapper/powerbi_api.py
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage_v2.py b/metadata-ingestion/src/datahub/ingestion/source/redshift/lineage_v2.py
diff --git a/metadata-ingestion/tests/unit/datahub/emitter/test_response_helper.py b/metadata-ingestion/tests/unit/datahub/emitter/test_response_helper.py
diff --git a/metadata-ingestion/tests/unit/sdk/test_rest_emitter.py b/metadata-ingestion/tests/unit/sdk/test_rest_emitter.py

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ export const IncidentList = () => {`
`88`	`88`	`refetch={() => {`
`89`	`89`	`refetch();`
`90`	`90`	`}}`
	`91`	`+ privileges={privileges}`
`91`	`92`	`/>`
`92`	`93`	`);`
`93`	`94`	`}`