Skip to content

Commit a16c50d

Browse files
committed
fix yarn lint
1 parent d761f6c commit a16c50d

File tree

2 files changed

+43
-37
lines changed

2 files changed

+43
-37
lines changed

datahub-web-react/src/app/entity/dataProcessInstance/DataProcessInstanceEntity.tsx

+29-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1+
import React from 'react';
12
import { ApiOutlined } from '@ant-design/icons';
2-
import { DataJob, DataProcessInstance, EntityType, OwnershipType, SearchResult } from '../../../types.generated';
3+
import {
4+
DataProcessInstance,
5+
Entity as GeneratedEntity,
6+
EntityType,
7+
OwnershipType,
8+
SearchResult,
9+
} from '../../../types.generated';
310
import { Preview } from './preview/Preview';
411
import { Entity, EntityCapabilityType, IconStyleType, PreviewType } from '../Entity';
512
import { EntityProfile } from '../shared/containers/profile/EntityProfile';
@@ -18,24 +25,30 @@ import DataProductSection from '../shared/containers/profile/sidebar/DataProduct
1825
import { getDataProduct } from '../shared/utils';
1926
// import SummaryTab from './profile/DataProcessInstaceSummary';
2027

21-
const getProcessPlatformName = (data?: DataProcessInstance): string => {
22-
return (
23-
data?.dataPlatformInstance?.platform?.properties?.displayName ||
24-
capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name) ||
25-
''
26-
);
27-
};
28+
// const getProcessPlatformName = (data?: DataProcessInstance): string => {
29+
// return (
30+
// data?.dataPlatformInstance?.platform?.properties?.displayName ||
31+
// capitalizeFirstLetterOnly(data?.dataPlatformInstance?.platform?.name) ||
32+
// ''
33+
// );
34+
// };
2835

29-
const getParentEntities = (data: DataProcessInstance): Entity<DataJob>[] => {
36+
const getParentEntities = (data: DataProcessInstance): GeneratedEntity[] => {
3037
const parentEntity = data?.relationships?.relationships?.find(
3138
(rel) => rel.type === 'InstanceOf' && rel.entity?.type === EntityType.DataJob,
3239
);
3340

34-
const containerEntity = data?.container?.entity;
41+
if (!parentEntity?.entity) return [];
3542

36-
return parentEntity ? [parentEntity.entity as Entity<DataJob>] : []; // TODO: HACK
43+
// Convert to GeneratedEntity
44+
return [
45+
{
46+
type: parentEntity.entity.type,
47+
urn: (parentEntity.entity as any).urn, // Make sure urn exists
48+
relationships: (parentEntity.entity as any).relationships,
49+
},
50+
];
3751
};
38-
3952
/**
4053
* Definition of the DataHub DataProcessInstance entity.
4154
*/
@@ -204,9 +217,9 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
204217
parentContainers={data.parentContainers}
205218
parentEntities={parentEntities}
206219
container={data.container || undefined}
207-
duration={data?.state[0]?.durationMillis}
208-
status={data?.state[0]?.result?.resultType}
209-
startTime={data?.state[0]?.timestampMillis}
220+
// duration={data?.state?.[0]?.durationMillis}
221+
// status={data?.state?.[0]?.result?.resultType}
222+
// startTime={data?.state?.[0]?.timestampMillis}
210223
// health={data.health}
211224
/>
212225
);
@@ -248,4 +261,4 @@ export class DataProcessInstanceEntity implements Entity<DataProcessInstance> {
248261
EntityCapabilityType.DATA_PRODUCTS,
249262
]);
250263
};
251-
}
264+
}

datahub-web-react/src/app/entity/dataProcessInstance/preview/Preview.tsx

+14-21
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import React from 'react';
2-
import styled from 'styled-components';
3-
import { Typography } from 'antd';
42
import {
53
DataProduct,
64
Deprecation,
75
Domain,
8-
Entity,
6+
Entity as GeneratedEntity,
97
EntityPath,
108
EntityType,
119
GlobalTags,
@@ -18,11 +16,6 @@ import {
1816
import DefaultPreviewCard from '../../../preview/DefaultPreviewCard';
1917
import { useEntityRegistry } from '../../../useEntityRegistry';
2018
import { IconStyleType } from '../../Entity';
21-
import { ANTD_GRAY } from '../../shared/constants';
22-
23-
const StatText = styled(Typography.Text)`
24-
color: ${ANTD_GRAY[8]};
25-
`;
2619

2720
export const Preview = ({
2821
urn,
@@ -46,18 +39,18 @@ export const Preview = ({
4639
health,
4740
parentEntities,
4841
parentContainers,
49-
duration,
50-
status,
51-
startTime,
52-
}: {
42+
}: // duration,
43+
// status,
44+
// startTime,
45+
{
5346
urn: string;
5447
name: string;
5548
subType?: string | null;
5649
description?: string | null;
5750
platformName?: string;
5851
platformLogo?: string | null;
5952
platformInstanceId?: string;
60-
container?: Container | null;
53+
container?: Container;
6154
owners?: Array<Owner> | null;
6255
domain?: Domain | null;
6356
dataProduct?: DataProduct | null;
@@ -69,11 +62,11 @@ export const Preview = ({
6962
degree?: number;
7063
paths?: EntityPath[];
7164
health?: Health[] | null;
72-
parentEntities?: Entity[] | null;
65+
parentEntities?: Array<GeneratedEntity> | null;
7366
parentContainers?: ParentContainersResult | null;
74-
duration?: number | null;
75-
status?: string | null;
76-
startTime?: number | null;
67+
// duration?: number | null;
68+
// status?: string | null;
69+
// startTime?: number | null;
7770
}): JSX.Element => {
7871
const entityRegistry = useEntityRegistry();
7972
return (
@@ -102,9 +95,9 @@ export const Preview = ({
10295
paths={paths}
10396
health={health || undefined}
10497
parentEntities={parentEntities}
105-
duration={duration}
106-
status={status}
107-
startTime={startTime}
98+
// duration={duration}
99+
// status={status}
100+
// startTime={startTime}
108101
/>
109102
);
110-
};
103+
};

0 commit comments

Comments
 (0)