From 974378c9b5ceb2301d3356548c76f2fe1ee9db05 Mon Sep 17 00:00:00 2001
From: Ali <83188384+testA113@users.noreply.github.com>
Date: Mon, 4 Dec 2023 11:18:15 +1300
Subject: [PATCH] fix(gitops): correct commit hash link [EE-6346] (#10723)

---
 .../ItemView/EnvironmentsDatatable/columns.tsx           | 9 +++++++--
 .../edge-stacks/ListView/EdgeStacksDatatable/columns.tsx | 5 ++++-
 app/react/edge/edge-stacks/utils.ts                      | 5 +++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx
index 358e6274a..fb81e6600 100644
--- a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx
+++ b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx
@@ -15,6 +15,7 @@ import { Icon } from '@@/Icon';
 import { Link } from '@@/Link';
 
 import { DeploymentStatus, EdgeStackStatus, StatusType } from '../../types';
+import { removeTrailingGitExtension } from '../../utils';
 
 import { EnvironmentActions } from './EnvironmentActions';
 import { ActionStatus } from './ActionStatus';
@@ -187,7 +188,9 @@ function TargetVersionCell({
       {row.original.TargetCommitHash ? (
         <div>
           <a
-            href={`${row.original.GitConfigURL}/commit/${row.original.TargetCommitHash}`}
+            href={`${removeTrailingGitExtension(
+              row.original.GitConfigURL
+            )}/commit/${row.original.TargetCommitHash}`}
             target="_blank"
             rel="noreferrer"
           >
@@ -236,7 +239,9 @@ function DeployedVersionCell({
         <div>
           {statusIcon}
           <a
-            href={`${row.original.GitConfigURL}/commit/${row.original.TargetCommitHash}`}
+            href={`${removeTrailingGitExtension(
+              row.original.GitConfigURL
+            )}/commit/${row.original.TargetCommitHash}`}
             target="_blank"
             rel="noreferrer"
           >
diff --git a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx
index 84bdf418d..d4a77d165 100644
--- a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx
+++ b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx
@@ -8,6 +8,7 @@ import { buildNameColumn } from '@@/datatables/buildNameColumn';
 import { Link } from '@@/Link';
 
 import { StatusType } from '../../types';
+import { removeTrailingGitExtension } from '../../utils';
 
 import { EdgeStackStatus } from './EdgeStacksStatus';
 import { DecoratedEdgeStack } from './types';
@@ -146,7 +147,9 @@ export const columns = _.compact([
               <div className="text-center">
                 <a
                   target="_blank"
-                  href={`${item.GitConfig.URL}/commit/${item.GitConfig.ConfigHash}`}
+                  href={`${removeTrailingGitExtension(
+                    item.GitConfig.URL
+                  )}/commit/${item.GitConfig.ConfigHash}`}
                   rel="noreferrer"
                 >
                   {item.GitConfig.ConfigHash.slice(0, 7)}
diff --git a/app/react/edge/edge-stacks/utils.ts b/app/react/edge/edge-stacks/utils.ts
index 82cbfec7b..5c4bedee2 100644
--- a/app/react/edge/edge-stacks/utils.ts
+++ b/app/react/edge/edge-stacks/utils.ts
@@ -19,3 +19,8 @@ export function getValidEditorTypes(
     ? _.intersection(...endpointTypes.map((type) => right[type]))
     : [EditorType.Compose, EditorType.Kubernetes];
 }
+
+export function removeTrailingGitExtension(url: string) {
+  // the url could have the .git extension. Remove it if it does.
+  return url.replace(/\.git$/, '');
+}