From d65d01b3d0260d32ed82656f81c14ed6da70d062 Mon Sep 17 00:00:00 2001
From: calvin <calvin.lee@harness.io>
Date: Wed, 7 Jun 2023 14:44:17 -0600
Subject: [PATCH] feat: [code-288]: fix endpoint and payloads

---
 web/src/pages/Compare/Compare.tsx                  | 14 ++++++++------
 .../RepositoryContent/FileContent/FileContent.tsx  |  2 +-
 .../FileContent/RenameContentHistory.tsx           |  4 ++--
 .../pages/RepositoryCommits/RepositoryCommits.tsx  |  8 ++++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/web/src/pages/Compare/Compare.tsx b/web/src/pages/Compare/Compare.tsx
index 1404b7386..f0366f64b 100644
--- a/web/src/pages/Compare/Compare.tsx
+++ b/web/src/pages/Compare/Compare.tsx
@@ -49,7 +49,9 @@ export default function Compare() {
     error: commitsError,
     refetch,
     response
-  } = useGet<TypesCommit[]>({
+  } = useGet<{
+    commits: TypesCommit[]
+  }>({
     path: `/api/v1/repos/${repoMetadata?.path}/+/commits`,
     queryParams: {
       limit,
@@ -162,10 +164,10 @@ export default function Compare() {
   }, [repoMetadata, sourceGitRef, targetGitRef, getString])
 
   useEffect(() => {
-    if (commits?.length) {
-      setTitle(commits[0].title as string)
+    if (commits?.commits?.length) {
+      setTitle(commits.commits[0].title as string)
     }
-  }, [commits])
+  }, [commits?.commits])
 
   return (
     <Container className={css.main}>
@@ -268,14 +270,14 @@ export default function Compare() {
                     <TabTitleWithCount
                       icon={CodeIcon.Commit}
                       title={getString('commits')}
-                      count={commits?.length || 0}
+                      count={commits?.commits?.length || 0}
                       padding={{ left: 'medium' }}
                     />
                   ),
                   panel: (
                     <Container padding="xlarge">
                       <CommitsView
-                        commits={commits || []}
+                        commits={commits?.commits || []}
                         repoMetadata={repoMetadata}
                         emptyTitle={getString('compareEmptyDiffTitle')}
                         emptyMessage={getString('compareEmptyDiffMessage')}
diff --git a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx
index 8eca005dc..719d0f1c7 100644
--- a/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx
+++ b/web/src/pages/Repository/RepositoryContent/FileContent/FileContent.tsx
@@ -110,7 +110,7 @@ export function FileContent({
 
   const [page, setPage] = usePageIndex()
   const { data: commits, response } = useGet<{ commits: TypesCommit[]; rename_details: RenameDetails[] }>({
-    path: `/api/v1/repos/${repoMetadata?.path}/+/commitsV2`,
+    path: `/api/v1/repos/${repoMetadata?.path}/+/commits`,
     queryParams: {
       limit: LIST_FETCHING_LIMIT,
       page,
diff --git a/web/src/pages/Repository/RepositoryContent/FileContent/RenameContentHistory.tsx b/web/src/pages/Repository/RepositoryContent/FileContent/RenameContentHistory.tsx
index 322226625..33cf3400a 100644
--- a/web/src/pages/Repository/RepositoryContent/FileContent/RenameContentHistory.tsx
+++ b/web/src/pages/Repository/RepositoryContent/FileContent/RenameContentHistory.tsx
@@ -29,7 +29,7 @@ const SingleFileRenameHistory = (props: {
     commits: TypesCommit[]
     rename_details: RenameDetails[]
   }>({
-    path: `/api/v1/repos/${repoMetadata?.path}/+/commitsV2`,
+    path: `/api/v1/repos/${repoMetadata?.path}/+/commits`,
     lazy: true
   })
 
@@ -121,7 +121,7 @@ const AllFilesRenameHistory = (props: {
   const { rename_details, repoMetadata, fileVisibility, setFileVisibility, setActiveTab } = props
   const [page, setPage] = usePageIndex()
   const { response } = useGet<{ commits: TypesCommit[]; rename_details: RenameDetails[] }>({
-    path: `/api/v1/repos/${repoMetadata?.path}/+/commitsV2`,
+    path: `/api/v1/repos/${repoMetadata?.path}/+/commits`,
     lazy: true
   })
 
diff --git a/web/src/pages/RepositoryCommits/RepositoryCommits.tsx b/web/src/pages/RepositoryCommits/RepositoryCommits.tsx
index eabe2ac66..ba745b2dd 100644
--- a/web/src/pages/RepositoryCommits/RepositoryCommits.tsx
+++ b/web/src/pages/RepositoryCommits/RepositoryCommits.tsx
@@ -32,7 +32,7 @@ export default function RepositoryCommits() {
     response,
     error: errorCommits,
     loading: loadingCommits
-  } = useGet<TypesCommit[]>({
+  } = useGet<{ commits: TypesCommit[]}>({
     path: `/api/v1/repos/${repoMetadata?.path}/+/commits`,
     queryParams: {
       limit: LIST_FETCHING_LIMIT,
@@ -55,9 +55,9 @@ export default function RepositoryCommits() {
       />
 
       <PageBody error={getErrorMessage(error || errorCommits)} retryOnError={voidFn(refetch)}>
-        <LoadingSpinner visible={loading || loadingCommits} withBorder={!!commits && loadingCommits} />
+        <LoadingSpinner visible={loading || loadingCommits} withBorder={!!commits?.commits && loadingCommits} />
 
-        {(repoMetadata && !!commits?.length && (
+        {(repoMetadata && !!commits?.commits?.length && (
           <Container padding="xlarge" className={css.resourceContent}>
             <Container className={css.contentHeader}>
               <Layout.Horizontal spacing="medium">
@@ -81,7 +81,7 @@ export default function RepositoryCommits() {
             </Container>
 
             <CommitsView
-              commits={commits}
+              commits={commits?.commits}
               repoMetadata={repoMetadata}
               emptyTitle={getString('noCommits')}
               emptyMessage={getString('noCommitsMessage')}