From 788fb8f45b2616b509b664a48db9d27a3f1460a9 Mon Sep 17 00:00:00 2001
From: David Sanchez <david.sanchez@cabify.com>
Date: Thu, 21 Apr 2022 19:30:49 +0200
Subject: [PATCH] feat(ml): show custom properties for MLFeatureTable in UI
 (#4706)

* feat(ml): show custom properties for MLFeatureTable in UI

* Make assignment conditional

* Fix lint
---
 .../mlmodel/mappers/MLFeatureTablePropertiesMapper.java   | 5 +++++
 datahub-graphql-core/src/main/resources/entity.graphql    | 2 ++
 .../app/entity/mlFeatureTable/MLFeatureTableEntity.tsx    | 5 +++++
 datahub-web-react/src/graphql/fragments.graphql           | 4 ++++
 .../tests/cypress/cypress/integration/ml/feature_table.js | 8 ++++++++
 5 files changed, 24 insertions(+)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLFeatureTablePropertiesMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLFeatureTablePropertiesMapper.java
index bf8dc11a44..578b7d0731 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLFeatureTablePropertiesMapper.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/mlmodel/mappers/MLFeatureTablePropertiesMapper.java
@@ -3,6 +3,7 @@ package com.linkedin.datahub.graphql.types.mlmodel.mappers;
 import com.linkedin.datahub.graphql.generated.MLFeature;
 import com.linkedin.datahub.graphql.generated.MLFeatureTableProperties;
 import com.linkedin.datahub.graphql.generated.MLPrimaryKey;
+import com.linkedin.datahub.graphql.types.common.mappers.StringMapMapper;
 import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
 import lombok.NonNull;
 
@@ -41,6 +42,10 @@ public class MLFeatureTablePropertiesMapper implements ModelMapper<com.linkedin.
                 .collect(Collectors.toList()));
         }
 
+        if (mlFeatureTableProperties.hasCustomProperties()) {
+            result.setCustomProperties(StringMapMapper.map(mlFeatureTableProperties.getCustomProperties()));
+        }
+
         return result;
     }
 }
diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
index 82c14baded..dc87a34e67 100644
--- a/datahub-graphql-core/src/main/resources/entity.graphql
+++ b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -6945,6 +6945,8 @@ description: String
     mlFeatures: [MLFeature]
 
     mlPrimaryKeys: [MLPrimaryKey]
+
+    customProperties: [StringMapEntry!]
 }
 
 type HyperParameterMap {
diff --git a/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx b/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx
index f615aac372..a24b5b79a6 100644
--- a/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx
+++ b/datahub-web-react/src/app/entity/mlFeatureTable/MLFeatureTableEntity.tsx
@@ -14,6 +14,7 @@ import { SidebarTagsSection } from '../shared/containers/profile/sidebar/Sidebar
 import MlFeatureTableFeatures from './profile/features/MlFeatureTableFeatures';
 import Sources from './profile/Sources';
 import { DocumentationTab } from '../shared/tabs/Documentation/DocumentationTab';
+import { PropertiesTab } from '../shared/tabs/Properties/PropertiesTab';
 
 /**
  * Definition of the DataHub MLFeatureTable entity.
@@ -75,6 +76,10 @@ export class MLFeatureTableEntity implements Entity<MlFeatureTable> {
                     name: 'Sources',
                     component: Sources,
                 },
+                {
+                    name: 'Properties',
+                    component: PropertiesTab,
+                },
                 {
                     name: 'Documentation',
                     component: DocumentationTab,
diff --git a/datahub-web-react/src/graphql/fragments.graphql b/datahub-web-react/src/graphql/fragments.graphql
index 0989e18b22..b5e1ddfd62 100644
--- a/datahub-web-react/src/graphql/fragments.graphql
+++ b/datahub-web-react/src/graphql/fragments.graphql
@@ -498,6 +498,10 @@ fragment nonRecursiveMLFeatureTable on MLFeatureTable {
         mlPrimaryKeys {
             ...nonRecursiveMLPrimaryKey
         }
+        customProperties {
+            key
+            value
+        }
     }
     ownership {
         ...ownershipFields
diff --git a/smoke-test/tests/cypress/cypress/integration/ml/feature_table.js b/smoke-test/tests/cypress/cypress/integration/ml/feature_table.js
index c4aa9e3d92..229bc86cf3 100644
--- a/smoke-test/tests/cypress/cypress/integration/ml/feature_table.js
+++ b/smoke-test/tests/cypress/cypress/integration/ml/feature_table.js
@@ -18,6 +18,14 @@ describe('features', () => {
       // feature & primary key sources are visible
       cy.contains('SampleCypressHdfsDataset');
       cy.contains('SampleCypressKafkaDataset');
+
+      // navigate to properties
+      cy.contains('Properties').click();
+
+      // custom properties are visible
+      cy.contains('status');
+      cy.contains('Created');
+
     });
 
     it('can visit feature page', () => {