Skip to content

Commit dfd66bf

Browse files
committed
fix properties.name mapping
1 parent a1c0125 commit dfd66bf

File tree

10 files changed

+25
-9
lines changed

10 files changed

+25
-9
lines changed

datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,7 @@ private void mapDataProcessProperties(
147147
dataProcessInstanceProperties.getCustomProperties(), entityUrn));
148148
}
149149
if (dataProcessInstanceProperties.hasCreated()) {
150-
com.linkedin.datahub.graphql.generated.AuditStamp created =
151-
AuditStampMapper.map(context, dataProcessInstanceProperties.getCreated());
152-
properties.setCreated(created);
150+
dpi.setCreated(AuditStampMapper.map(context, dataProcessInstanceProperties.getCreated()));
153151
}
154152
dpi.setProperties(properties);
155153
}

datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapper.java

+6
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ public MLModelGroupProperties apply(
4040
result.setCreated(
4141
TimeStampToAuditStampMapper.map(context, mlModelGroupProperties.getCreated()));
4242
}
43+
if (mlModelGroupProperties.getName() != null) {
44+
result.setName(mlModelGroupProperties.getName());
45+
} else {
46+
// backfill name from URN for backwards compatibility
47+
result.setName(entityUrn.getEntityKey().get(1)); // indexed access is safe here
48+
}
4349

4450
if (mlModelGroupProperties.hasLastModified()) {
4551
result.setLastModified(

datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapperTest.java

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ public void testMapMLModelGroupProperties() throws URISyntaxException {
1919
// Set description
2020
input.setDescription("a ml trust model group");
2121

22+
// Set Name
23+
input.setName("ML trust model group");
24+
2225
// Create URN
2326
Urn groupUrn =
2427
Urn.createFromString(
@@ -31,6 +34,7 @@ public void testMapMLModelGroupProperties() throws URISyntaxException {
3134
// Verify mapped properties
3235
assertNotNull(result);
3336
assertEquals(result.getDescription(), "a ml trust model group");
37+
assertEquals(result.getName(), "ML trust model group");
3438

3539
// Verify lineage info is null as in the mock data
3640
assertNotNull(result.getMlModelLineageInfo());

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const Preview = ({
2121
return (
2222
<DefaultPreviewCard
2323
url={entityRegistry.getEntityUrl(EntityType.Mlmodel, model.urn)}
24-
name={model.name || ''}
24+
name={model.properties?.['propertiesName'] || model.name || ''}
2525
urn={model.urn}
2626
description={model.description || ''}
2727
platformInstanceId={model.dataPlatformInstance?.instanceId}

datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export class MLModelGroupEntity implements Entity<MlModelGroup> {
139139
};
140140

141141
displayName = (data: MlModelGroup) => {
142-
return data.name || data.urn;
142+
return data.properties?.name || data.name || data.urn;
143143
};
144144

145145
getGenericEntityProperties = (mlModelGroup: MlModelGroup) => {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const Preview = ({
1919
return (
2020
<DefaultPreviewCard
2121
url={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, group.urn)}
22-
name={group?.name || ''}
22+
name={group?.properties?.['propertiesName'] || group?.name || ''}
2323
urn={group.urn}
2424
platformInstanceId={group.dataPlatformInstance?.instanceId}
2525
description={group?.description || ''}

datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ export default function MLGroupModels() {
8080
dataIndex: 'name',
8181
key: 'name',
8282
width: 300,
83-
render: (name, record) => (
83+
render: (_: any, record) => (
8484
<NameContainer>
85-
<NameLink href={entityRegistry.getEntityUrl(EntityType.Mlmodel, record.urn)}>{name}</NameLink>
85+
<NameLink href={entityRegistry.getEntityUrl(EntityType.Mlmodel, record.urn)}>{record?.properties?.propertiesName || record?.name }</NameLink>
8686
</NameContainer>
8787
),
8888
},

datahub-web-react/src/app/shared/time/timeUtils.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ export function formatDuration(durationMs: number): string {
214214
const seconds = duration.seconds();
215215

216216
if (hours === 0 && minutes === 0) {
217-
return `${seconds}secs`;
217+
return `${seconds} secs`;
218218
}
219219

220220
if (hours === 0) {

datahub-web-react/src/graphql/lineage.graphql

+2
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ fragment lineageNodeProperties on EntityWithRelationships {
272272
removed
273273
}
274274
properties {
275+
propertiesName: name
275276
createdTS: created {
276277
time
277278
actor
@@ -322,6 +323,7 @@ fragment lineageNodeProperties on EntityWithRelationships {
322323
comment
323324
}
324325
properties {
326+
propertiesName: name
325327
createdTS: created {
326328
time
327329
actor

datahub-web-react/src/graphql/search.graphql

+6
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,9 @@ fragment searchResultsWithoutSchemaField on Entity {
886886
...structuredPropertiesFields
887887
}
888888
}
889+
properties {
890+
propertiesName: name
891+
}
889892
}
890893
... on MLModelGroup {
891894
name
@@ -908,6 +911,9 @@ fragment searchResultsWithoutSchemaField on Entity {
908911
...structuredPropertiesFields
909912
}
910913
}
914+
properties {
915+
propertiesName: name
916+
}
911917
}
912918
... on Tag {
913919
name

0 commit comments

Comments
 (0)