Skip to content

Commit 1d01289

Browse files
hsheth2hsheth2
authored
Merge branch 'datahub-project:master' into master
2 parents d4cad98 + c791920 commit 1d01289

29 files changed

+839
-209
lines changed

‎datahub-web-react/src/app/entityV2/chart/ChartEntity.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
UnorderedListOutlined,
99
WarningOutlined,
1010
} from '@ant-design/icons';
11+
import { ListBullets, TreeStructure } from '@phosphor-icons/react';
1112
import * as React from 'react';
1213
import { GetChartQuery, useGetChartQuery, useUpdateChartMutation } from '../../../graphql/chart.generated';
1314
import { Chart, EntityType, LineageDirection, SearchResult } from '../../../types.generated';
@@ -244,7 +245,7 @@ export class ChartEntity implements Entity<Chart> {
244245
name: 'Lineage',
245246
component: LineageTab,
246247
description: "View this data asset's upstream and downstream dependencies",
247-
icon: PartitionOutlined,
248+
icon: TreeStructure,
248249
properties: {
249250
actionType: SidebarTitleActionType.LineageExplore,
250251
},
@@ -253,7 +254,7 @@ export class ChartEntity implements Entity<Chart> {
253254
name: 'Properties',
254255
component: PropertiesTab,
255256
description: 'View additional properties about this asset',
256-
icon: UnorderedListOutlined,
257+
icon: ListBullets,
257258
},
258259
];
259260

‎datahub-web-react/src/app/entityV2/container/ContainerEntity.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { AppstoreOutlined, FileOutlined, FolderOutlined, UnorderedListOutlined } from '@ant-design/icons';
1+
import { AppstoreOutlined, FileOutlined, FolderOutlined } from '@ant-design/icons';
2+
import { ListBullets } from '@phosphor-icons/react';
23
import * as React from 'react';
34
import { GetContainerQuery, useGetContainerQuery } from '../../../graphql/container.generated';
45
import { Container, EntityType, SearchResult } from '../../../types.generated';
@@ -112,7 +113,7 @@ export class ContainerEntity implements Entity<Container> {
112113
{
113114
name: 'Properties',
114115
component: PropertiesTab,
115-
icon: UnorderedListOutlined,
116+
icon: ListBullets,
116117
},
117118
]}
118119
sidebarSections={this.getSidebarSections()}
@@ -165,7 +166,7 @@ export class ContainerEntity implements Entity<Container> {
165166
name: 'Properties',
166167
component: PropertiesTab,
167168
description: 'View additional properties about this asset',
168-
icon: UnorderedListOutlined,
169+
icon: ListBullets,
169170
},
170171
];
171172

‎datahub-web-react/src/app/entityV2/dashboard/DashboardEntity.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
UnorderedListOutlined,
1010
WarningOutlined,
1111
} from '@ant-design/icons';
12+
import { ListBullets, TreeStructure } from '@phosphor-icons/react';
1213
import * as React from 'react';
1314
import {
1415
GetDashboardQuery,
@@ -242,7 +243,7 @@ export class DashboardEntity implements Entity<Dashboard> {
242243
name: 'Lineage',
243244
component: LineageTab,
244245
description: "View this data asset's upstream and downstream dependencies",
245-
icon: PartitionOutlined,
246+
icon: TreeStructure,
246247
properties: {
247248
defaultDirection: LineageDirection.Upstream,
248249
actionType: SidebarTitleActionType.LineageExplore,
@@ -252,7 +253,7 @@ export class DashboardEntity implements Entity<Dashboard> {
252253
name: 'Properties',
253254
component: PropertiesTab,
254255
description: 'View additional properties about this asset',
255-
icon: UnorderedListOutlined,
256+
icon: ListBullets,
256257
},
257258
];
258259

‎datahub-web-react/src/app/entityV2/dataFlow/DataFlowEntity.tsx

+7-12
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
import {
2-
ConsoleSqlOutlined,
3-
FileOutlined,
4-
ShareAltOutlined,
5-
UnorderedListOutlined,
6-
WarningOutlined,
7-
} from '@ant-design/icons';
1+
import { ShareAltOutlined } from '@ant-design/icons';
2+
import { ListBullets, FileText, Share, WarningCircle } from '@phosphor-icons/react';
83
import * as React from 'react';
94
import { useGetDataFlowQuery, useUpdateDataFlowMutation } from '../../../graphql/dataFlow.generated';
105
import { DataFlow, EntityType, SearchResult } from '../../../types.generated';
@@ -98,19 +93,19 @@ export class DataFlowEntity implements Entity<DataFlow> {
9893
{
9994
name: 'Documentation',
10095
component: DocumentationTab,
101-
icon: FileOutlined,
96+
icon: FileText,
10297
},
10398
{
10499
name: 'Tasks',
105100
component: DataFlowJobsTab,
106-
icon: ConsoleSqlOutlined,
101+
icon: Share,
107102
properties: {
108103
urn,
109104
},
110105
},
111106
{
112107
name: 'Incidents',
113-
icon: WarningOutlined,
108+
icon: WarningCircle,
114109
component: IncidentTab,
115110
getDynamicName: (_, dataFlow, loading) => {
116111
const activeIncidentCount = dataFlow?.dataFlow?.activeIncidents?.total;
@@ -120,7 +115,7 @@ export class DataFlowEntity implements Entity<DataFlow> {
120115
{
121116
name: 'Properties',
122117
component: PropertiesTab,
123-
icon: UnorderedListOutlined,
118+
icon: ListBullets,
124119
},
125120
]}
126121
sidebarSections={this.getSidebarSections()}
@@ -166,7 +161,7 @@ export class DataFlowEntity implements Entity<DataFlow> {
166161
name: 'Properties',
167162
component: PropertiesTab,
168163
description: 'View additional properties about this asset',
169-
icon: UnorderedListOutlined,
164+
icon: ListBullets,
170165
},
171166
];
172167

‎datahub-web-react/src/app/entityV2/dataJob/DataJobEntity.tsx

+10-17
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
import {
2-
ConsoleSqlOutlined,
3-
FileOutlined,
4-
PartitionOutlined,
5-
ShareAltOutlined,
6-
SyncOutlined,
7-
UnorderedListOutlined,
8-
WarningOutlined,
9-
} from '@ant-design/icons';
1+
import { ConsoleSqlOutlined } from '@ant-design/icons';
2+
import { ListBullets, TreeStructure, FileText, Share, ArrowsClockwise, WarningCircle } from '@phosphor-icons/react';
103
import * as React from 'react';
114
import { GetDataJobQuery, useGetDataJobQuery, useUpdateDataJobMutation } from '../../../graphql/dataJob.generated';
125
import { DataJob, EntityType, SearchResult } from '../../../types.generated';
@@ -116,35 +109,35 @@ export class DataJobEntity implements Entity<DataJob> {
116109
{
117110
name: 'Documentation',
118111
component: DocumentationTab,
119-
icon: FileOutlined,
112+
icon: FileText,
120113
},
121114
{
122115
name: 'Pipeline',
123116
component: DataJobFlowTab,
124-
icon: ShareAltOutlined,
117+
icon: Share,
125118
},
126119
{
127120
name: 'Lineage',
128121
component: LineageTab,
129-
icon: PartitionOutlined,
122+
icon: TreeStructure,
130123
},
131124
{
132125
name: 'Properties',
133126
component: PropertiesTab,
134-
icon: UnorderedListOutlined,
127+
icon: ListBullets,
135128
},
136129
{
137130
name: 'Runs',
138131
component: RunsTab,
139-
icon: SyncOutlined,
132+
icon: ArrowsClockwise,
140133
display: {
141134
visible: (_, _1) => true,
142135
enabled: (_, dataJob: GetDataJobQuery) => (dataJob?.dataJob?.runs?.total || 0) !== 0,
143136
},
144137
},
145138
{
146139
name: 'Incidents',
147-
icon: WarningOutlined,
140+
icon: WarningCircle,
148141
component: IncidentTab,
149142
getDynamicName: (_, dataJob, loading) => {
150143
const activeIncidentCount = dataJob?.dataJob?.activeIncidents?.total;
@@ -180,7 +173,7 @@ export class DataJobEntity implements Entity<DataJob> {
180173
name: 'Lineage',
181174
component: LineageTab,
182175
description: "View this data asset's upstream and downstream dependencies",
183-
icon: PartitionOutlined,
176+
icon: TreeStructure,
184177
properties: {
185178
actionType: SidebarTitleActionType.LineageExplore,
186179
},
@@ -189,7 +182,7 @@ export class DataJobEntity implements Entity<DataJob> {
189182
name: 'Properties',
190183
component: PropertiesTab,
191184
description: 'View additional properties about this asset',
192-
icon: UnorderedListOutlined,
185+
icon: ListBullets,
193186
},
194187
];
195188

‎datahub-web-react/src/app/entityV2/dataProduct/DataProductEntity.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
ReadOutlined,
66
UnorderedListOutlined,
77
} from '@ant-design/icons';
8+
import { ListBullets } from '@phosphor-icons/react';
89
import * as React from 'react';
910
import { useGetDataProductQuery } from '../../../graphql/dataProduct.generated';
1011
import { GetDatasetQuery } from '../../../graphql/dataset.generated';
@@ -178,7 +179,7 @@ export class DataProductEntity implements Entity<DataProduct> {
178179
name: 'Properties',
179180
component: PropertiesTab,
180181
description: 'View additional properties about this asset',
181-
icon: UnorderedListOutlined,
182+
icon: ListBullets,
182183
},
183184
];
184185

‎datahub-web-react/src/app/entityV2/dataset/DatasetEntity.tsx

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
import { DBT_URN } from '@app/ingest/source/builder/constants';
1515
import ViewComfyOutlinedIcon from '@mui/icons-material/ViewComfyOutlined';
1616
import { GovernanceTab } from '@src/app/entity/shared/tabs/Dataset/Governance/GovernanceTab';
17+
import { ListBullets, TreeStructure, Columns } from '@phosphor-icons/react';
1718
import * as React from 'react';
1819
import { GetDatasetQuery, useGetDatasetQuery, useUpdateDatasetMutation } from '../../../graphql/dataset.generated';
1920
import GovernMenuIcon from '../../../images/governMenuIcon.svg?react';
@@ -300,7 +301,7 @@ export class DatasetEntity implements Entity<Dataset> {
300301
name: 'Lineage',
301302
component: LineageTab,
302303
description: "View this data asset's upstream and downstream dependencies",
303-
icon: PartitionOutlined,
304+
icon: TreeStructure,
304305
properties: {
305306
actionType: SidebarTitleActionType.LineageExplore,
306307
},
@@ -309,7 +310,7 @@ export class DatasetEntity implements Entity<Dataset> {
309310
name: 'Columns',
310311
component: SchemaTab,
311312
description: "View this data asset's columns",
312-
icon: LayoutOutlined,
313+
icon: Columns,
313314
properties: {
314315
fullHeight: true,
315316
},
@@ -318,7 +319,7 @@ export class DatasetEntity implements Entity<Dataset> {
318319
name: 'Properties',
319320
component: PropertiesTab,
320321
description: 'View additional properties about this asset',
321-
icon: UnorderedListOutlined,
322+
icon: ListBullets,
322323
},
323324
];
324325

‎datahub-web-react/src/app/entityV2/domain/DomainEntity.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { AppstoreOutlined, FileDoneOutlined, FileOutlined, UnorderedListOutlined } from '@ant-design/icons';
2+
import { ListBullets } from '@phosphor-icons/react';
23
import * as React from 'react';
34
import { useGetDomainQuery } from '../../../graphql/domain.generated';
45
import { Domain, EntityType, SearchResult } from '../../../types.generated';
@@ -171,7 +172,7 @@ export class DomainEntity implements Entity<Domain> {
171172
name: 'Properties',
172173
component: PropertiesTab,
173174
description: 'View additional properties about this asset',
174-
icon: UnorderedListOutlined,
175+
icon: ListBullets,
175176
},
176177
];
177178

‎datahub-web-react/src/app/entityV2/group/GroupProfile.tsx

+4-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Col } from 'antd';
33
import { matchPath } from 'react-router';
44
import { useLocation } from 'react-router-dom';
55
import styled from 'styled-components/macro';
6-
import { ReadOutlined } from '@ant-design/icons';
6+
import { BookOpen } from '@phosphor-icons/react';
77
import colors from '@src/alchemy-components/theme/foundations/colors';
88
import { PageRoutes } from '../../../conf/Global';
99
import { useGetGroupQuery } from '../../../graphql/group.generated';
@@ -66,11 +66,6 @@ type Props = {
6666
urn: string;
6767
};
6868

69-
const defaultTabDisplayConfig = {
70-
visible: (_, _1) => true,
71-
enabled: (_, _1) => true,
72-
};
73-
7469
/**
7570
* Responsible for reading & writing groups.
7671
*
@@ -91,10 +86,11 @@ export default function GroupProfile({ urn }: Props) {
9186
const finalTabs = [
9287
{
9388
name: 'About',
94-
icon: ReadOutlined,
89+
icon: BookOpen,
9590
component: EntitySidebarSectionsTab,
9691
display: {
97-
...defaultTabDisplayConfig,
92+
visible: () => true,
93+
enabled: () => true,
9894
},
9995
},
10096
];

‎datahub-web-react/src/app/entityV2/mlFeature/MLFeatureEntity.tsx

+16-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DotChartOutlined, PartitionOutlined, UnorderedListOutlined, WarningOutlined } from '@ant-design/icons';
1+
import { ListBullets, TreeStructure, ChartScatter, WarningCircle, FileText, Infinity } from '@phosphor-icons/react';
22
import { IncidentTab } from '@app/entity/shared/tabs/Incident/IncidentTab';
33
import TabNameWithCount from '@app/entityV2/shared/tabs/Entity/TabNameWithCount';
44
import * as React from 'react';
@@ -41,22 +41,27 @@ export class MLFeatureEntity implements Entity<MlFeature> {
4141

4242
icon = (fontSize?: number, styleType?: IconStyleType, color?: string) => {
4343
if (styleType === IconStyleType.TAB_VIEW) {
44-
return <DotChartOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} />;
44+
return <ChartScatter className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color }} weight="regular" />;
4545
}
4646

4747
if (styleType === IconStyleType.HIGHLIGHT) {
4848
return (
49-
<DotChartOutlined className={TYPE_ICON_CLASS_NAME} style={{ fontSize, color: color || '#9633b9' }} />
49+
<ChartScatter
50+
className={TYPE_ICON_CLASS_NAME}
51+
style={{ fontSize, color: color || '#9633b9' }}
52+
weight="regular"
53+
/>
5054
);
5155
}
5256

5357
return (
54-
<DotChartOutlined
58+
<ChartScatter
5559
className={TYPE_ICON_CLASS_NAME}
5660
style={{
5761
fontSize,
5862
color: color || '#BFBFBF',
5963
}}
64+
weight="regular"
6065
/>
6166
);
6267
};
@@ -98,22 +103,26 @@ export class MLFeatureEntity implements Entity<MlFeature> {
98103
{
99104
name: 'Feature Tables',
100105
component: FeatureTableTab,
106+
icon: Infinity,
101107
},
102108
{
103109
name: 'Documentation',
104110
component: DocumentationTab,
111+
icon: FileText,
105112
},
106113
{
107114
name: 'Lineage',
108115
component: LineageTab,
116+
icon: TreeStructure,
109117
},
110118
{
111119
name: 'Properties',
112120
component: PropertiesTab,
121+
icon: ListBullets,
113122
},
114123
{
115124
name: 'Incidents',
116-
icon: WarningOutlined,
125+
icon: WarningCircle,
117126
component: IncidentTab,
118127
getDynamicName: (_, mlFeature, loading) => {
119128
const activeIncidentCount = mlFeature?.mlFeature?.activeIncidents?.total;
@@ -164,7 +173,7 @@ export class MLFeatureEntity implements Entity<MlFeature> {
164173
name: 'Lineage',
165174
component: LineageTab,
166175
description: "View this data asset's upstream and downstream dependencies",
167-
icon: PartitionOutlined,
176+
icon: TreeStructure,
168177
properties: {
169178
actionType: SidebarTitleActionType.LineageExplore,
170179
},
@@ -173,7 +182,7 @@ export class MLFeatureEntity implements Entity<MlFeature> {
173182
name: 'Properties',
174183
component: PropertiesTab,
175184
description: 'View additional properties about this asset',
176-
icon: UnorderedListOutlined,
185+
icon: ListBullets,
177186
},
178187
];
179188

0 commit comments

Comments
 (0)