From 6e7576a6598a58166bbbdbafc301f643cf67c5d6 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 28 May 2020 18:19:29 +0100
Subject: [PATCH] Fix issue where gitlab summary tab threw errors in console -
 fixes #4325

---
 .../packages/cloud-foundry/src/cf-entity-generator.ts         | 4 +++-
 .../cloud-foundry/src/shared/data-services/scm/github-scm.ts  | 4 ++++
 .../cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts  | 2 +-
 .../cloud-foundry/src/shared/data-services/scm/scm.ts         | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index 26a24ca124..ce3d6732f3 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -118,6 +118,7 @@ import {
   GitCommitActionBuilders,
   gitCommitActionBuilders,
   GitCommitActionBuildersConfig,
+  GitMeta,
   GitRepoActionBuilders,
   gitRepoActionBuilders,
 } from './entity-action-builders/git-action-builder';
@@ -899,8 +900,9 @@ function generateGitCommitEntity(endpointDefinition: StratosEndpointExtensionDef
     endpoint: endpointDefinition,
     nonJetstreamRequest: true,
     successfulRequestDataMapper: (data, endpointGuid, guid, entityType, endpointType, action) => {
+      const metadata = (action.metadata as GitMeta[])[0];
       return {
-        ...data,
+        ...metadata.scm.convertCommit(metadata.projectName, data),
         guid: action.guid
       };
     },
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
index 476eded13e..5c6180fb38 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
@@ -78,4 +78,8 @@ export class GitHubSCM implements GitSCM {
     );
   }
 
+  public convertCommit(projectName: string, commit: any): GitCommit {
+    return commit;
+  }
+
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
index dacdc76916..0d6b210764 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
@@ -134,7 +134,7 @@ export class GitLabSCM implements GitSCM {
     };
   }
 
-  private convertCommit(projectName: string, commit: any): GitCommit {
+  public convertCommit(projectName: string, commit: any): GitCommit {
     const emailMD5 = Md5.hashStr(commit.author_email);
     const avatarURL = `https://secure.gravatar.com/avatar/${emailMD5}?s=120&d=identicon`;
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts
index 27aab218dd..af4d83f7cc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts
@@ -18,6 +18,7 @@ export interface GitSCM {
   getBranch(httpClient: HttpClient, projectName: string, branchId: string): Observable<GitBranch>;
   getBranches(httpClient: HttpClient, projectName: string): Observable<GitBranch[]>;
   getCommit(httpClient: HttpClient, projectName: string, commitSha: string): Observable<GitCommit>;
+  convertCommit(projectName: string, commit: any): GitCommit
   getCommits(httpClient: HttpClient, projectName: string, commitSha: string): Observable<GitCommit[]>;
   getCloneURL(projectName: string): string;
   getCommitURL(projectName: string, commitSha: string): string;