Merge branch 'datahub-project:master' into master

acryldata · Dec 5, 2023 · 585d551 · 585d551
2 parents 438125f + 0d9aa26
commit 585d551
Show file tree

Hide file tree

Showing 154 changed files with 3,014 additions and 2,653 deletions.
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -1174,10 +1174,6 @@ private void configureDatasetResolvers(final RuntimeWiring.Builder builder) {
                 .dataFetcher("testResults", new TestResultsResolver(entityClient))
                 .dataFetcher("aspects", new WeaklyTypedAspectsResolver(entityClient, entityRegistry))
                 .dataFetcher("exists", new EntityExistsResolver(entityService))
-                .dataFetcher("subTypes", new SubTypesResolver(
-                    this.entityClient,
-                    "dataset",
-                    "subTypes"))
                 .dataFetcher("runs", new EntityRunsResolver(entityClient))
                 .dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
                 .dataFetcher("parentContainers", new ParentContainersResolver(entityClient)))
@@ -1433,10 +1429,6 @@ private void configureChartResolvers(final RuntimeWiring.Builder builder) {
             .dataFetcher("statsSummary", new ChartStatsSummaryResolver(this.timeseriesAspectService))
             .dataFetcher("privileges", new EntityPrivilegesResolver(entityClient))
             .dataFetcher("exists", new EntityExistsResolver(entityService))
-            .dataFetcher("subTypes", new SubTypesResolver(
-                this.entityClient,
-                "chart",
-                "subTypes"))
         );
         builder.type("ChartInfo", typeWiring -> typeWiring
             .dataFetcher("inputs", new LoadableTypeBatchResolver<>(datasetType,

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/SubTypesResolver.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/SubTypesResolver.java
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/ChartType.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/ChartType.java
@@ -77,7 +77,8 @@ public class ChartType implements SearchableEntityType<Chart, String>, Browsable
         INPUT_FIELDS_ASPECT_NAME,
         EMBED_ASPECT_NAME,
         DATA_PRODUCTS_ASPECT_NAME,
-        BROWSE_PATHS_V2_ASPECT_NAME
+        BROWSE_PATHS_V2_ASPECT_NAME,
+        SUB_TYPES_ASPECT_NAME
     );
     private static final Set<String> FACET_FIELDS = ImmutableSet.of("access", "queryType", "tool", "type");
 

diff --git a/...phql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartMapper.java b/...phql-core/src/main/java/com/linkedin/datahub/graphql/types/chart/mappers/ChartMapper.java
@@ -11,6 +11,7 @@
 import com.linkedin.common.InstitutionalMemory;
 import com.linkedin.common.Ownership;
 import com.linkedin.common.Status;
+import com.linkedin.common.SubTypes;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.DataMap;
 import com.linkedin.datahub.graphql.generated.AccessLevel;
@@ -34,6 +35,7 @@
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.SubTypesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.SystemMetadataUtils;
 import com.linkedin.datahub.graphql.types.domain.DomainAssociationMapper;
@@ -97,6 +99,8 @@ public Chart apply(@Nonnull final EntityResponse entityResponse) {
             chart.setEmbed(EmbedMapper.map(new Embed(dataMap))));
         mappingHelper.mapToResult(BROWSE_PATHS_V2_ASPECT_NAME, (chart, dataMap) ->
             chart.setBrowsePathV2(BrowsePathsV2Mapper.map(new BrowsePathsV2(dataMap))));
+        mappingHelper.mapToResult(SUB_TYPES_ASPECT_NAME, (dashboard, dataMap) ->
+            dashboard.setSubTypes(SubTypesMapper.map(new SubTypes(dataMap))));
         return mappingHelper.getResult();
     }
 

diff --git a/...-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SubTypesMapper.java b/...-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/SubTypesMapper.java
@@ -0,0 +1,22 @@
+package com.linkedin.datahub.graphql.types.common.mappers;
+
+import com.linkedin.common.SubTypes;
+import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
+import java.util.ArrayList;
+import javax.annotation.Nonnull;
+
+public class SubTypesMapper implements ModelMapper<SubTypes, com.linkedin.datahub.graphql.generated.SubTypes> {
+
+  public static final SubTypesMapper INSTANCE = new SubTypesMapper();
+
+  public static com.linkedin.datahub.graphql.generated.SubTypes map(@Nonnull final SubTypes metadata) {
+    return INSTANCE.apply(metadata);
+  }
+
+  @Override
+  public com.linkedin.datahub.graphql.generated.SubTypes apply(@Nonnull final SubTypes input) {
+    final com.linkedin.datahub.graphql.generated.SubTypes result = new com.linkedin.datahub.graphql.generated.SubTypes();
+    result.setTypeNames(new ArrayList<>(input.getTypeNames()));
+    return result;
+  }
+}
diff --git a/...e/src/main/java/com/linkedin/datahub/graphql/types/container/mappers/ContainerMapper.java b/...e/src/main/java/com/linkedin/datahub/graphql/types/container/mappers/ContainerMapper.java
@@ -21,6 +21,7 @@
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.SubTypesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.SystemMetadataUtils;
 import com.linkedin.datahub.graphql.types.domain.DomainAssociationMapper;
 import com.linkedin.datahub.graphql.types.glossary.mappers.GlossaryTermsMapper;
@@ -97,7 +98,7 @@ public static Container map(final EntityResponse entityResponse) {
 
     final EnvelopedAspect envelopedSubTypes = aspects.get(Constants.SUB_TYPES_ASPECT_NAME);
     if (envelopedSubTypes != null) {
-      result.setSubTypes(mapSubTypes(new SubTypes(envelopedSubTypes.getValue().data())));
+      result.setSubTypes(SubTypesMapper.map(new SubTypes(envelopedSubTypes.getValue().data())));
     }
 
     final EnvelopedAspect envelopedContainer = aspects.get(Constants.CONTAINER_ASPECT_NAME);
@@ -150,12 +151,6 @@ private static com.linkedin.datahub.graphql.generated.ContainerEditablePropertie
     return editableContainerProperties;
   }
 
-  private static com.linkedin.datahub.graphql.generated.SubTypes mapSubTypes(final SubTypes gmsSubTypes) {
-    final com.linkedin.datahub.graphql.generated.SubTypes subTypes = new com.linkedin.datahub.graphql.generated.SubTypes();
-    subTypes.setTypeNames(gmsSubTypes.getTypeNames());
-    return subTypes;
-  }
-
   private static DataPlatform mapPlatform(final DataPlatformInstance platformInstance) {
     // Set dummy platform to be resolved.
     final DataPlatform dummyPlatform = new DataPlatform();

diff --git a/...e/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardMapper.java b/...e/src/main/java/com/linkedin/datahub/graphql/types/dashboard/mappers/DashboardMapper.java
@@ -33,6 +33,7 @@
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.SubTypesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.SystemMetadataUtils;
 import com.linkedin.datahub.graphql.types.domain.DomainAssociationMapper;
@@ -91,7 +92,8 @@ public Dashboard apply(@Nonnull final EntityResponse entityResponse) {
             dataset.setDataPlatformInstance(DataPlatformInstanceAspectMapper.map(new DataPlatformInstance(dataMap))));
         mappingHelper.mapToResult(INPUT_FIELDS_ASPECT_NAME, (dashboard, dataMap) ->
             dashboard.setInputFields(InputFieldsMapper.map(new InputFields(dataMap), entityUrn)));
-        mappingHelper.mapToResult(SUB_TYPES_ASPECT_NAME, this::mapSubTypes);
+      mappingHelper.mapToResult(SUB_TYPES_ASPECT_NAME, (dashboard, dataMap) ->
+            dashboard.setSubTypes(SubTypesMapper.map(new SubTypes(dataMap))));
         mappingHelper.mapToResult(EMBED_ASPECT_NAME, (dashboard, dataMap) ->
             dashboard.setEmbed(EmbedMapper.map(new Embed(dataMap))));
         mappingHelper.mapToResult(BROWSE_PATHS_V2_ASPECT_NAME, (dashboard, dataMap) ->
@@ -204,13 +206,4 @@ private void mapDomains(@Nonnull Dashboard dashboard, @Nonnull DataMap dataMap)
         final Domains domains = new Domains(dataMap);
         dashboard.setDomain(DomainAssociationMapper.map(domains, dashboard.getUrn()));
     }
-
-    private void mapSubTypes(@Nonnull Dashboard dashboard, DataMap dataMap) {
-        SubTypes pegasusSubTypes = new SubTypes(dataMap);
-        if (pegasusSubTypes.hasTypeNames()) {
-              com.linkedin.datahub.graphql.generated.SubTypes subTypes = new com.linkedin.datahub.graphql.generated.SubTypes();
-              subTypes.setTypeNames(pegasusSubTypes.getTypeNames().stream().collect(Collectors.toList()));
-              dashboard.setSubTypes(subTypes);
-        }
-    }
 }
diff --git a/...ub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java b/...ub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/DataJobType.java
@@ -75,7 +75,8 @@ public class DataJobType implements SearchableEntityType<DataJob, String>, Brows
         DEPRECATION_ASPECT_NAME,
         DATA_PLATFORM_INSTANCE_ASPECT_NAME,
         DATA_PRODUCTS_ASPECT_NAME,
-        BROWSE_PATHS_V2_ASPECT_NAME
+        BROWSE_PATHS_V2_ASPECT_NAME,
+        SUB_TYPES_ASPECT_NAME
     );
     private static final Set<String> FACET_FIELDS = ImmutableSet.of("flow");
     private final EntityClient _entityClient;

diff --git a/...-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapper.java b/...-core/src/main/java/com/linkedin/datahub/graphql/types/datajob/mappers/DataJobMapper.java
@@ -9,6 +9,7 @@
 import com.linkedin.common.InstitutionalMemory;
 import com.linkedin.common.Ownership;
 import com.linkedin.common.Status;
+import com.linkedin.common.SubTypes;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.DataMap;
 import com.linkedin.datahub.graphql.generated.DataFlow;
@@ -27,6 +28,7 @@
 import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.SubTypesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.SystemMetadataUtils;
 import com.linkedin.datahub.graphql.types.domain.DomainAssociationMapper;
 import com.linkedin.datahub.graphql.types.glossary.mappers.GlossaryTermsMapper;
@@ -103,6 +105,8 @@ public DataJob apply(@Nonnull final EntityResponse entityResponse) {
                 result.setDataPlatformInstance(DataPlatformInstanceAspectMapper.map(new DataPlatformInstance(data)));
             } else if (BROWSE_PATHS_V2_ASPECT_NAME.equals(name)) {
                 result.setBrowsePathV2(BrowsePathsV2Mapper.map(new BrowsePathsV2(data)));
+            } else if (SUB_TYPES_ASPECT_NAME.equals(name)) {
+                result.setSubTypes(SubTypesMapper.map(new SubTypes(data)));
             }
         });
 

diff --git a/...ub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java b/...ub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/DatasetType.java
@@ -86,7 +86,8 @@ public class DatasetType implements SearchableEntityType<Dataset, String>, Brows
         EMBED_ASPECT_NAME,
         DATA_PRODUCTS_ASPECT_NAME,
         BROWSE_PATHS_V2_ASPECT_NAME,
-        ACCESS_DATASET_ASPECT_NAME
+        ACCESS_DATASET_ASPECT_NAME,
+        SUB_TYPES_ASPECT_NAME
     );
 
     private static final Set<String> FACET_FIELDS = ImmutableSet.of("origin", "platform");

diff --git a/...-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java b/...-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetMapper.java
@@ -11,6 +11,7 @@
 import com.linkedin.common.Ownership;
 import com.linkedin.common.Siblings;
 import com.linkedin.common.Status;
+import com.linkedin.common.SubTypes;
 import com.linkedin.common.TimeStamp;
 import com.linkedin.common.urn.Urn;
 import com.linkedin.data.DataMap;
@@ -29,6 +30,7 @@
 import com.linkedin.datahub.graphql.types.common.mappers.SiblingsMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.CustomPropertiesMapper;
+import com.linkedin.datahub.graphql.types.common.mappers.SubTypesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.UpstreamLineagesMapper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.MappingHelper;
 import com.linkedin.datahub.graphql.types.common.mappers.util.SystemMetadataUtils;
@@ -114,6 +116,8 @@ public Dataset apply(@Nonnull final EntityResponse entityResponse) {
             dataset.setBrowsePathV2(BrowsePathsV2Mapper.map(new BrowsePathsV2(dataMap))));
         mappingHelper.mapToResult(ACCESS_DATASET_ASPECT_NAME, ((dataset, dataMap) ->
                 dataset.setAccess(AccessMapper.map(new Access(dataMap), entityUrn))));
+        mappingHelper.mapToResult(SUB_TYPES_ASPECT_NAME, (dashboard, dataMap) ->
+            dashboard.setSubTypes(SubTypesMapper.map(new SubTypes(dataMap))));
         return mappingHelper.getResult();
     }
 

diff --git a/datahub-graphql-core/src/main/resources/entity.graphql b/datahub-graphql-core/src/main/resources/entity.graphql
@@ -5689,6 +5689,11 @@ type DataJob implements EntityWithRelationships & Entity & BrowsableEntity {
     """
     type: EntityType!
 
+    """
+    Sub Types that this entity implements
+    """
+    subTypes: SubTypes
+
     """
     The timestamp for the last time this entity was ingested
     """

diff --git a/datahub-web-react/package.json b/datahub-web-react/package.json
@@ -80,7 +80,7 @@
         "reactour": "1.18.7",
         "remirror": "^2.0.23",
         "sinon": "^11.1.1",
-        "start-server-and-test": "1.12.2",
+        "start-server-and-test": "^2.0.3",
         "styled-components": "^5.2.1",
         "turndown-plugin-gfm": "^1.0.2",
         "typescript": "^4.8.4",
@@ -124,7 +124,7 @@
     },
     "devDependencies": {
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-        "@graphql-codegen/cli": "1.20.0",
+        "@graphql-codegen/cli": "^5.0.0",
         "@graphql-codegen/near-operation-file-preset": "^1.17.13",
         "@graphql-codegen/typescript-operations": "1.17.13",
         "@graphql-codegen/typescript-react-apollo": "2.2.1",