From 0e59cf76ecb4547c6c416bcae5933fdab0ea1b2a Mon Sep 17 00:00:00 2001
From: Ali <83188384+testA113@users.noreply.github.com>
Date: Fri, 8 Dec 2023 12:56:35 +1300
Subject: [PATCH] fix(gitops): correct commit hash link [EE-6346] (#10800)

---
 .../ItemView/EnvironmentsDatatable/columns.tsx           | 9 +++++++--
 .../edge-stacks/ListView/EdgeStacksDatatable/columns.tsx | 5 ++++-
 app/react/portainer/gitops/utils.ts                      | 7 +++++++
 3 files changed, 18 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 094f873f6..c84abe341 100644
--- a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx
+++ b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx
@@ -9,6 +9,7 @@ import UpToDate from '@/assets/ico/icon_up-to-date.svg?c';
 import { isoDateFromTimestamp } from '@/portainer/filters/filters';
 import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
 import { getDashboardRoute } from '@/react/portainer/environments/utils';
+import { cleanGitRepoUrl } from '@/react/portainer/gitops/utils';
 
 import { Button } from '@@/buttons';
 import { Icon } from '@@/Icon';
@@ -187,7 +188,9 @@ function TargetVersionCell({
       {row.original.TargetCommitHash ? (
         <div>
           <a
-            href={`${row.original.GitConfigURL}/commit/${row.original.TargetCommitHash}`}
+            href={`${cleanGitRepoUrl(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={`${cleanGitRepoUrl(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 354b9669a..8167f35f8 100644
--- a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx
+++ b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/columns.tsx
@@ -3,6 +3,7 @@ import _ from 'lodash';
 
 import { isoDateFromTimestamp } from '@/portainer/filters/filters';
 import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
+import { cleanGitRepoUrl } from '@/react/portainer/gitops/utils';
 
 import { buildNameColumn } from '@@/datatables/NameCell';
 import { Link } from '@@/Link';
@@ -151,7 +152,9 @@ export const columns = _.compact([
               <div className="text-center">
                 <a
                   target="_blank"
-                  href={`${item.GitConfig.URL}/commit/${item.GitConfig.ConfigHash}`}
+                  href={`${cleanGitRepoUrl(item.GitConfig.URL)}/commit/${
+                    item.GitConfig.ConfigHash
+                  }`}
                   rel="noreferrer"
                 >
                   {item.GitConfig.ConfigHash.slice(0, 7)}
diff --git a/app/react/portainer/gitops/utils.ts b/app/react/portainer/gitops/utils.ts
index 654dd1755..79f6a1eff 100644
--- a/app/react/portainer/gitops/utils.ts
+++ b/app/react/portainer/gitops/utils.ts
@@ -32,3 +32,10 @@ export function confirmEnableTLSVerify() {
       'Enabling the verification of TLS certificates without ensuring the correct configuration of your Certificate Authority (CA) for self-signed certificates can result in deployment failures.',
   });
 }
+
+export function cleanGitRepoUrl(url: string) {
+  return url
+    .trim() // remove leading and trailing whitespace
+    .replace(/\/$/, '') // if there's a trailing slash, remove it
+    .replace(/\.git$/, ''); // if there's a trailing .git extension, remove it
+}