Merge branch 'master' into spark-smoke-test-fix

datahub-project · Nov 5, 2022 · aa5a1d8 · aa5a1d8
2 parents 2c22202 + 4c6dd06
commit aa5a1d8
Show file tree

Hide file tree

Showing 19 changed files with 153 additions and 48 deletions.
diff --git a/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaHeader.tsx b/datahub-web-react/src/app/entity/dataset/profile/schema/components/SchemaHeader.tsx
@@ -47,9 +47,19 @@ const RawButton = styled(Button)`
         display: flex;
         margin-right: 10px;
         justify-content: left;
+        align-items: center;
     }
 `;
 
+const RawButtonTitleContainer = styled.span`
+    display: flex;
+    align-items: center;
+`;
+
+const RawButtonTitle = styled(Typography.Text)`
+    margin-left: 6px;
+`;
+
 const KeyButton = styled(Button)<{ $highlighted: boolean }>`
     border-radius: 8px 0px 0px 8px;
     font-weight: ${(props) => (props.$highlighted ? '600' : '400')};
@@ -206,15 +216,15 @@ export default function SchemaHeader({
                     {hasRaw && (
                         <RawButton type="text" onClick={() => setShowRaw(!showRaw)}>
                             {showRaw ? (
-                                <>
-                                    <TableOutlined />
-                                    <Typography.Text>Tabular</Typography.Text>
-                                </>
+                                <RawButtonTitleContainer>
+                                    <TableOutlined style={{ padding: 0, margin: 0 }} />
+                                    <RawButtonTitle>Tabular</RawButtonTitle>
+                                </RawButtonTitleContainer>
                             ) : (
-                                <>
-                                    <FileTextOutlined />
-                                    <Typography.Text>Raw</Typography.Text>
-                                </>
+                                <RawButtonTitleContainer>
+                                    <FileTextOutlined style={{ padding: 0, margin: 0 }} />
+                                    <RawButtonTitle>Raw</RawButtonTitle>
+                                </RawButtonTitleContainer>
                             )}
                         </RawButton>
                     )}

diff --git a/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx b/datahub-web-react/src/app/entity/shared/EntityDropdown/EntityDropdown.tsx
@@ -117,9 +117,11 @@ function EntityDropdown(props: Props) {
     };
 
     const pageUrl = window.location.href;
+    const isGlossaryEntity = entityType === EntityType.GlossaryNode || entityType === EntityType.GlossaryTerm;
     const entityHasChildren = !!entityData?.children?.total;
     const canManageGlossaryEntity = !!entityData?.privileges?.canManageEntity;
     const canCreateGlossaryEntity = !!entityData?.privileges?.canManageChildren;
+    const canDeleteGlossaryEntity = !entityHasChildren && canManageGlossaryEntity;
 
     /**
      * A default path to redirect to if the entity is deleted.
@@ -192,7 +194,7 @@ function EntityDropdown(props: Props) {
                         {menuItems.has(EntityMenuItems.DELETE) && (
                             <StyledMenuItem
                                 key="5"
-                                disabled={entityHasChildren || !canManageGlossaryEntity}
+                                disabled={isGlossaryEntity && !canDeleteGlossaryEntity}
                                 onClick={onDeleteEntity}
                             >
                                 <Tooltip

diff --git a/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx b/datahub-web-react/src/app/entity/shared/tabs/Lineage/ColumnLineageSelect.tsx
@@ -67,9 +67,14 @@ export default function ColumnsLineageSelect({
                     allowClear
                     placeholder="Select column"
                 >
-                    {entityData?.schemaMetadata?.fields.map((field) => (
-                        <Select.Option value={field.fieldPath}>{downgradeV2FieldPath(field.fieldPath)}</Select.Option>
-                    ))}
+                    {entityData?.schemaMetadata?.fields.map((field) => {
+                        const fieldPath = downgradeV2FieldPath(field.fieldPath);
+                        return (
+                            <Select.Option value={field.fieldPath}>
+                                <Tooltip title={fieldPath}>{fieldPath}</Tooltip>
+                            </Select.Option>
+                        );
+                    })}
                 </StyledSelect>
             )}
             <Tooltip title={columnButtonTooltip}>

diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceTableColumns.tsx
@@ -90,7 +90,7 @@ export function TypeColumn(type: string, record: any) {
 export function LastExecutionColumn(time: any) {
     const executionDate = time && new Date(time);
     const localTime = executionDate && `${executionDate.toLocaleDateString()} at ${executionDate.toLocaleTimeString()}`;
-    return <Typography.Text>{localTime || 'N/A'}</Typography.Text>;
+    return <Typography.Text>{localTime || 'None'}</Typography.Text>;
 }
 
 export function ScheduleColumn(schedule: any, record: any) {
@@ -114,10 +114,10 @@ export function LastStatusColumn({ status, record, setFocusExecutionUrn }: LastS
     const color = getExecutionRequestStatusDisplayColor(status);
     return (
         <StatusContainer>
-            {Icon && <Icon style={{ color }} />}
+            {Icon && <Icon style={{ color, fontSize: 14 }} />}
             <StatusButton type="link" onClick={() => setFocusExecutionUrn(record.lastExecUrn)}>
                 <Typography.Text strong style={{ color, marginLeft: 8 }}>
-                    {text || 'N/A'}
+                    {text || 'Pending...'}
                 </Typography.Text>
             </StatusButton>
         </StatusContainer>

diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTable.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTable.tsx
@@ -38,7 +38,7 @@ export default function IngestionExecutionTable({
             dataIndex: 'duration',
             key: 'duration',
             render: (durationMs: number) => {
-                const seconds = (durationMs && `${durationMs / 1000}s`) || 'N/A';
+                const seconds = (durationMs && `${durationMs / 1000}s`) || 'None';
                 return seconds;
             },
         },

diff --git a/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTableColumns.tsx b/datahub-web-react/src/app/ingest/source/executions/IngestionExecutionTableColumns.tsx
@@ -27,7 +27,7 @@ const StatusButton = styled(Button)`
 export function TimeColumn(time: string) {
     const date = time && new Date(time);
     const localTime = date && `${date.toLocaleDateString()} at ${date.toLocaleTimeString()}`;
-    return <Typography.Text>{localTime || 'N/A'}</Typography.Text>;
+    return <Typography.Text>{localTime || 'None'}</Typography.Text>;
 }
 
 interface StatusColumnProps {
@@ -42,10 +42,10 @@ export function StatusColumn({ status, record, setFocusExecutionUrn }: StatusCol
     const color = getExecutionRequestStatusDisplayColor(status);
     return (
         <StatusContainer>
-            {Icon && <Icon style={{ color }} />}
+            {Icon && <Icon style={{ color, fontSize: 14 }} />}
             <StatusButton type="link" onClick={() => setFocusExecutionUrn(record.urn)}>
                 <Typography.Text strong style={{ color, marginLeft: 8 }}>
-                    {text || 'N/A'}
+                    {text || 'Pending...'}
                 </Typography.Text>
             </StatusButton>
         </StatusContainer>

diff --git a/datahub-web-react/src/app/ingest/source/utils.ts b/datahub-web-react/src/app/ingest/source/utils.ts
@@ -61,7 +61,7 @@ export const getExecutionRequestStatusIcon = (status: string) => {
         (status === ROLLED_BACK && WarningOutlined) ||
         (status === ROLLING_BACK && LoadingOutlined) ||
         (status === ROLLBACK_FAILED && CloseCircleOutlined) ||
-        undefined
+        ClockCircleOutlined
     );
 };
 

diff --git a/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx b/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useState } from 'react';
-import { Button, Empty, message, Pagination, Tooltip } from 'antd';
+import { Button, Empty, message, Pagination, Tooltip, Typography } from 'antd';
 import styled from 'styled-components';
 import * as QueryString from 'query-string';
 import { useLocation } from 'react-router';
@@ -16,6 +16,7 @@ import { useBatchAssignRoleMutation } from '../../../graphql/mutations.generated
 import { CorpUser, DataHubRole, DataHubPolicy } from '../../../types.generated';
 import RoleDetailsModal from './RoleDetailsModal';
 import analytics, { EventType } from '../../analytics';
+import { ANTD_GRAY } from '../../entity/shared/constants';
 
 const SourceContainer = styled.div``;
 
@@ -33,6 +34,12 @@ const PageContainer = styled.span`
     width: 100%;
 `;
 
+const ActionsContainer = styled.div`
+    width: 100%;
+    display: flex;
+    justify-content: right;
+`;
+
 const AddUsersButton = styled(Button)`
     margin-right: 16px;
 `;
@@ -137,7 +144,7 @@ export const ManageRoles = () => {
                     <>
                         <RoleName
                             onClick={() => onViewRole(record.role)}
-                            style={{ color: record?.editable ? '#000000' : '#8C8C8C' }}
+                            style={{ color: record?.editable ? '#000000' : ANTD_GRAY[8] }}
                         >
                             {record?.name}
                         </RoleName>
@@ -158,13 +165,15 @@ export const ManageRoles = () => {
             render: (_: any, record: any) => {
                 return (
                     <>
-                        <AvatarsGroup
-                            users={record?.users}
-                            groups={record?.resolvedGroups}
-                            entityRegistry={entityRegistry}
-                            maxCount={3}
-                            size={28}
-                        />
+                        {(record?.users.length && (
+                            <AvatarsGroup
+                                users={record?.users}
+                                groups={record?.resolvedGroups}
+                                entityRegistry={entityRegistry}
+                                maxCount={3}
+                                size={28}
+                            />
+                        )) || <Typography.Text type="secondary">No assigned users</Typography.Text>}
                     </>
                 );
             },
@@ -174,7 +183,7 @@ export const ManageRoles = () => {
             key: 'actions',
             render: (_: any, record: any) => {
                 return (
-                    <>
+                    <ActionsContainer>
                         <Tooltip title={`Assign the ${record.name} role to users`}>
                             <AddUsersButton
                                 onClick={() => {
@@ -185,7 +194,7 @@ export const ManageRoles = () => {
                                 ADD USERS
                             </AddUsersButton>
                         </Tooltip>
-                    </>
+                    </ActionsContainer>
                 );
             },
         },

diff --git a/datahub-web-react/src/app/search/SearchFiltersSection.tsx b/datahub-web-react/src/app/search/SearchFiltersSection.tsx
@@ -31,7 +31,7 @@ const FiltersHeader = styled.div`
     font-weight: 600;
 
     padding-left: 20px;
-    padding-right: 20px;
+    padding-right: 4px;
     padding-bottom: 8px;
 
     width: 100%;

diff --git a/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx b/datahub-web-react/src/app/shared/admin/HeaderLinks.tsx
@@ -10,9 +10,10 @@ import {
     DownOutlined,
 } from '@ant-design/icons';
 import { Link } from 'react-router-dom';
-import { Button, Dropdown, Menu } from 'antd';
+import { Button, Dropdown, Menu, Tooltip } from 'antd';
 import { useAppConfig } from '../../useAppConfig';
 import { useGetAuthenticatedUser } from '../../useGetAuthenticatedUser';
+import { ANTD_GRAY } from '../../entity/shared/constants';
 
 const LinkWrapper = styled.span`
     margin-right: 0px;
@@ -34,6 +35,24 @@ const LinksWrapper = styled.div<{ areLinksHidden?: boolean }>`
 const MenuItem = styled(Menu.Item)`
     font-size: 12px;
     font-weight: bold;
+    max-width: 240px;
+`;
+
+const NavTitleContainer = styled.span`
+    display: flex;
+    align-items: center;
+    justify-content: left;
+    padding: 2px;
+`;
+
+const NavTitleText = styled.span`
+    margin-left: 6px;
+`;
+
+const NavTitleDescription = styled.div`
+    font-size: 12px;
+    font-weight: normal;
+    color: ${ANTD_GRAY[7]};
 `;
 
 interface Props {
@@ -60,7 +79,12 @@ export function HeaderLinks(props: Props) {
                 <LinkWrapper>
                     <Link to="/analytics">
                         <Button type="text">
-                            <BarChartOutlined /> Analytics
+                            <Tooltip title="View DataHub usage analytics">
+                                <NavTitleContainer>
+                                    <BarChartOutlined />
+                                    <NavTitleText>Analytics</NavTitleText>
+                                </NavTitleContainer>
+                            </Tooltip>
                         </Button>
                     </Link>
                 </LinkWrapper>
@@ -69,7 +93,12 @@ export function HeaderLinks(props: Props) {
                 <LinkWrapper>
                     <Link to="/ingestion">
                         <Button type="text">
-                            <ApiOutlined /> Ingestion
+                            <Tooltip title="Connect DataHub to your organization's data sources">
+                                <NavTitleContainer>
+                                    <ApiOutlined />
+                                    <NavTitleText>Ingestion</NavTitleText>
+                                </NavTitleContainer>
+                            </Tooltip>
                         </Button>
                     </Link>
                 </LinkWrapper>
@@ -80,13 +109,21 @@ export function HeaderLinks(props: Props) {
                     <Menu>
                         <MenuItem key="0">
                             <Link to="/glossary">
-                                <BookOutlined style={{ fontSize: '14px', fontWeight: 'bold' }} /> Glossary
+                                <NavTitleContainer>
+                                    <BookOutlined style={{ fontSize: '14px', fontWeight: 'bold' }} />
+                                    <NavTitleText>Glossary</NavTitleText>
+                                </NavTitleContainer>
+                                <NavTitleDescription>View and modify your data dictionary</NavTitleDescription>
                             </Link>
                         </MenuItem>
                         {showDomains && (
                             <MenuItem key="1">
                                 <Link to="/domains">
-                                    <FolderOutlined style={{ fontSize: '14px', fontWeight: 'bold' }} /> Domains
+                                    <NavTitleContainer>
+                                        <FolderOutlined style={{ fontSize: '14px', fontWeight: 'bold' }} />
+                                        <NavTitleText>Domains</NavTitleText>
+                                    </NavTitleContainer>
+                                    <NavTitleDescription>Manage related groups of data assets</NavTitleDescription>
                                 </Link>
                             </MenuItem>
                         )}
@@ -103,7 +140,9 @@ export function HeaderLinks(props: Props) {
                 <LinkWrapper style={{ marginRight: 12 }}>
                     <Link to="/settings">
                         <Button type="text">
-                            <SettingOutlined />
+                            <Tooltip title="Manage your DataHub settings">
+                                <SettingOutlined />
+                            </Tooltip>
                         </Button>
                     </Link>
                 </LinkWrapper>

diff --git a/docker/datahub-ingestion/base.Dockerfile b/docker/datahub-ingestion/base.Dockerfile
@@ -29,6 +29,7 @@ RUN apt-get update && apt-get install -y \
     zip \
     unzip \
     ldap-utils \
+    openjdk-11-jre-headless \
     && curl -L https://github.com/treff7es/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-${DOCKERIZE_ARCH}-$DOCKERIZE_VERSION.tar.gz | tar -C /usr/local/bin -xzv \
     && python -m pip install --upgrade pip wheel setuptools==57.5.0 \
     && curl -Lk -o /root/librdkafka-${LIBRDKAFKA_VERSION}.tar.gz https://github.com/edenhill/librdkafka/archive/v${LIBRDKAFKA_VERSION}.tar.gz \

diff --git a/docs-website/src/pages/_components/Logos/index.js b/docs-website/src/pages/_components/Logos/index.js
@@ -61,6 +61,16 @@ const companiesByIndustry = [
         imageUrl: "/img/logos/companies/zynga.png",
         imageSize: "default",
       },
+      {
+        name: "Hurb",
+        imageUrl: "/img/logos/companies/hurb.png",
+        imageSize: "medium",
+      },
+      {
+        name: "Razer",
+        imageUrl: "/img/logos/companies/razer.jpeg",
+        imageSize: "large",
+      },
     ],
   },
   {

diff --git a/docs-website/static/img/logos/companies/hurb.png b/docs-website/static/img/logos/companies/hurb.png
diff --git a/docs-website/static/img/logos/companies/razer.jpeg b/docs-website/static/img/logos/companies/razer.jpeg
diff --git a/metadata-ingestion/src/datahub/configuration/common.py b/metadata-ingestion/src/datahub/configuration/common.py
@@ -217,3 +217,10 @@ def value(self, string: str) -> List[str]:
 
 class VersionedConfig(ConfigModel):
     version: str = "1"
+
+
+class LineageConfig(ConfigModel):
+    incremental_lineage: bool = Field(
+        default=True,
+        description="When enabled, emits lineage as incremental to existing lineage already in DataHub. When disabled, re-states lineage on each run.",
+    )