fix properties.name mapping

datahub-project · Jan 28, 2025 · dfd66bf · dfd66bf
1 parent a1c0125
commit dfd66bf
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 9 deletions.
diff --git a/...com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java b/...com/linkedin/datahub/graphql/types/dataprocessinst/mappers/DataProcessInstanceMapper.java
@@ -147,9 +147,7 @@ private void mapDataProcessProperties(
               dataProcessInstanceProperties.getCustomProperties(), entityUrn));
     }
     if (dataProcessInstanceProperties.hasCreated()) {
-      com.linkedin.datahub.graphql.generated.AuditStamp created =
-          AuditStampMapper.map(context, dataProcessInstanceProperties.getCreated());
-      properties.setCreated(created);
+      dpi.setCreated(AuditStampMapper.map(context, dataProcessInstanceProperties.getCreated()));
     }
     dpi.setProperties(properties);
   }

diff --git a/...java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapper.java b/...java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapper.java
@@ -40,6 +40,12 @@ public MLModelGroupProperties apply(
       result.setCreated(
           TimeStampToAuditStampMapper.map(context, mlModelGroupProperties.getCreated()));
     }
+    if (mlModelGroupProperties.getName() != null) {
+      result.setName(mlModelGroupProperties.getName());
+    } else {
+      // backfill name from URN for backwards compatibility
+      result.setName(entityUrn.getEntityKey().get(1)); // indexed access is safe here
+    }
 
     if (mlModelGroupProperties.hasLastModified()) {
       result.setLastModified(

diff --git a/.../com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapperTest.java b/.../com/linkedin/datahub/graphql/types/mlmodel/mappers/MLModelGroupPropertiesMapperTest.java
@@ -19,6 +19,9 @@ public void testMapMLModelGroupProperties() throws URISyntaxException {
     // Set description
     input.setDescription("a ml trust model group");
 
+    // Set Name
+    input.setName("ML trust model group");
+
     // Create URN
     Urn groupUrn =
         Urn.createFromString(
@@ -31,6 +34,7 @@ public void testMapMLModelGroupProperties() throws URISyntaxException {
     // Verify mapped properties
     assertNotNull(result);
     assertEquals(result.getDescription(), "a ml trust model group");
+    assertEquals(result.getName(), "ML trust model group");
 
     // Verify lineage info is null as in the mock data
     assertNotNull(result.getMlModelLineageInfo());

diff --git a/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlModel/preview/Preview.tsx
@@ -21,7 +21,7 @@ export const Preview = ({
     return (
         <DefaultPreviewCard
             url={entityRegistry.getEntityUrl(EntityType.Mlmodel, model.urn)}
-            name={model.name || ''}
+            name={model.properties?.['propertiesName'] || model.name || ''}
             urn={model.urn}
             description={model.description || ''}
             platformInstanceId={model.dataPlatformInstance?.instanceId}

diff --git a/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx b/datahub-web-react/src/app/entity/mlModelGroup/MLModelGroupEntity.tsx
@@ -139,7 +139,7 @@ export class MLModelGroupEntity implements Entity<MlModelGroup> {
     };
 
     displayName = (data: MlModelGroup) => {
-        return data.name || data.urn;
+        return data.properties?.name || data.name || data.urn;
     };
 
     getGenericEntityProperties = (mlModelGroup: MlModelGroup) => {

diff --git a/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx b/datahub-web-react/src/app/entity/mlModelGroup/preview/Preview.tsx
@@ -19,7 +19,7 @@ export const Preview = ({
     return (
         <DefaultPreviewCard
             url={entityRegistry.getEntityUrl(EntityType.MlmodelGroup, group.urn)}
-            name={group?.name || ''}
+            name={group?.properties?.['propertiesName'] || group?.name || ''}
             urn={group.urn}
             platformInstanceId={group.dataPlatformInstance?.instanceId}
             description={group?.description || ''}

diff --git a/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx b/datahub-web-react/src/app/entity/mlModelGroup/profile/ModelGroupModels.tsx
@@ -80,9 +80,9 @@ export default function MLGroupModels() {
             dataIndex: 'name',
             key: 'name',
             width: 300,
-            render: (name, record) => (
+            render: (_: any, record) => (
                 <NameContainer>
-                    <NameLink href={entityRegistry.getEntityUrl(EntityType.Mlmodel, record.urn)}>{name}</NameLink>
+                    <NameLink href={entityRegistry.getEntityUrl(EntityType.Mlmodel, record.urn)}>{record?.properties?.propertiesName || record?.name }</NameLink>
                 </NameContainer>
             ),
         },

diff --git a/datahub-web-react/src/app/shared/time/timeUtils.tsx b/datahub-web-react/src/app/shared/time/timeUtils.tsx
@@ -214,7 +214,7 @@ export function formatDuration(durationMs: number): string {
     const seconds = duration.seconds();
 
     if (hours === 0 && minutes === 0) {
-        return `${seconds}secs`;
+        return `${seconds} secs`;
     }
 
     if (hours === 0) {

diff --git a/datahub-web-react/src/graphql/lineage.graphql b/datahub-web-react/src/graphql/lineage.graphql
@@ -272,6 +272,7 @@ fragment lineageNodeProperties on EntityWithRelationships {
             removed
         }
         properties {
+            propertiesName: name
             createdTS: created {
                 time
                 actor
@@ -322,6 +323,7 @@ fragment lineageNodeProperties on EntityWithRelationships {
             comment
         }
         properties {
+            propertiesName: name
             createdTS: created {
                 time
                 actor

diff --git a/datahub-web-react/src/graphql/search.graphql b/datahub-web-react/src/graphql/search.graphql
@@ -886,6 +886,9 @@ fragment searchResultsWithoutSchemaField on Entity {
                 ...structuredPropertiesFields
             }
         }
+        properties {
+            propertiesName: name 
+        }
     }
     ... on MLModelGroup {
         name
@@ -908,6 +911,9 @@ fragment searchResultsWithoutSchemaField on Entity {
                 ...structuredPropertiesFields
             }
         }
+        properties {
+            propertiesName: name
+        }
     }
     ... on Tag {
         name