Merge branch 'datahub-project:master' into fix/docker-use-amd64-arch-…

…when-using-enumlator-on-m1
datahub-project · Aug 20, 2022 · fce6b79 · fce6b79
2 parents 098f1b3 + ad4e285
commit fce6b79
Show file tree

Hide file tree

Showing 43 changed files with 1,425 additions and 552 deletions.
diff --git a/.../src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/SchemaBlameMapper.java b/.../src/main/java/com/linkedin/datahub/graphql/types/timeline/mappers/SchemaBlameMapper.java
@@ -33,13 +33,13 @@
 public class SchemaBlameMapper {
 
   public static GetSchemaBlameResult map(List<ChangeTransaction> changeTransactions, @Nullable String versionCutoff) {
+    GetSchemaBlameResult result = new GetSchemaBlameResult();
     if (changeTransactions.isEmpty()) {
       log.debug("Change transactions are empty");
-      return null;
+      return result;
     }
 
     Map<String, SchemaFieldBlame> schemaBlameMap = new HashMap<>();
-    GetSchemaBlameResult result = new GetSchemaBlameResult();
 
     String latestSemanticVersionString =
         truncateSemanticVersion(changeTransactions.get(changeTransactions.size() - 1).getSemVer());

diff --git a/datahub-graphql-core/src/main/resources/timeline.graphql b/datahub-graphql-core/src/main/resources/timeline.graphql
@@ -71,7 +71,7 @@ type GetSchemaVersionListResult {
     """
     Latest and current semantic version
     """
-    latestVersion: SemanticVersionStruct!
+    latestVersion: SemanticVersionStruct
     """
     Selected semantic version
     """

diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceExecutionList.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceExecutionList.tsx
@@ -13,6 +13,9 @@ import {
     getExecutionRequestStatusDisplayColor,
     getExecutionRequestStatusIcon,
     getExecutionRequestStatusDisplayText,
+    CLI_INGESTION_SOURCE,
+    SCHEDULED_INGESTION_SOURCE,
+    MANUAL_INGESTION_SOURCE,
 } from './utils';
 
 const ListContainer = styled.div`
@@ -160,8 +163,9 @@ export const IngestionSourceExecutionList = ({ urn, lastRefresh, onRefresh }: Pr
             key: 'source',
             render: (source: string) => {
                 return (
-                    (source === 'MANUAL_INGESTION_SOURCE' && 'Manual Execution') ||
-                    (source === 'SCHEDULED_INGESTION_SOURCE' && 'Scheduled Execution') ||
+                    (source === MANUAL_INGESTION_SOURCE && 'Manual Execution') ||
+                    (source === SCHEDULED_INGESTION_SOURCE && 'Scheduled Execution') ||
+                    (source === CLI_INGESTION_SOURCE && 'CLI Execution') ||
                     'N/A'
                 );
             },