fix: Fix route definition for PR compare (#806)

* fix route definition for PR compare * prettier fix
harness · Jan 23, 2025 · 6e69ea5 · 6e69ea5
1 parent 43fba25
commit 6e69ea5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/apps/gitness/src/components-v2/file-content-viewer.tsx b/apps/gitness/src/components-v2/file-content-viewer.tsx
@@ -217,7 +217,9 @@ export default function FileContentViewer({ repoContent }: FileContentViewerProp
           if (!isNewBranch) {
             navigate(`${routes.toRepoFiles({ spaceId, repoId })}${parentPath ? `/~/${parentPath}` : ''}`)
           } else {
-            navigate(`${routes.toPullRequestCompare({ spaceId, repoId })}/${selectedBranchTag.name}...${newBranchName}`)
+            navigate(
+              routes.toPullRequestCompare({ spaceId, repoId, diffRefs: `${selectedBranchTag.name}...${newBranchName}` })
+            )
           }
         }}
         currentBranch={fullGitRef || selectedBranchTag?.name || ''}

diff --git a/apps/gitness/src/components-v2/file-editor.tsx b/apps/gitness/src/components-v2/file-editor.tsx
@@ -171,7 +171,7 @@ export const FileEditor: FC<FileEditorProps> = ({ repoDetails, defaultBranch })
           if (!isNewBranch) {
             navigate(`${routes.toRepoFiles({ spaceId, repoId })}/${fullGitRef}/~/${fileResourcePath}`)
           } else {
-            navigate(`${routes.toPullRequestCompare({ spaceId, repoId })}/${defaultBranch}...${newBranchName}`)
+            navigate(routes.toPullRequestCompare({ spaceId, repoId, diffRefs: `${defaultBranch}...${newBranchName}` }))
           }
         }}
         currentBranch={fullGitRef || selectedBranchTag?.name}

diff --git a/apps/gitness/src/routes.tsx b/apps/gitness/src/routes.tsx
@@ -169,10 +169,15 @@ const repoRoutes: CustomRouteObject[] = [
               { index: true, element: <PullRequestListPage /> },
               {
                 path: 'compare/:diffRefs',
-                element: <CreatePullRequest />,
                 handle: {
+                  breadcrumb: () => <Text>Compare</Text>,
+                  asLink: false,
                   routeName: RouteConstants.toPullRequestCompare
-                }
+                },
+                children: [
+                  { index: true, element: <CreatePullRequest /> },
+                  { path: '*', element: <CreatePullRequest /> }
+                ]
               },
               {
                 path: ':pullRequestId',

diff --git a/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx b/packages/ui/src/views/repo/repo-branch/components/branch-list.tsx
@@ -197,7 +197,7 @@ export const BranchesList: FC<BranchListPageProps> = ({
                       size="xs"
                       asChild
                     >
-                      <Link to={toPullRequest({ pullRequestId: branch.pullRequests[0].number })}>
+                      <Link to={toPullRequest?.({ pullRequestId: branch.pullRequests[0].number }) || ''}>
                         <Icon
                           name={
                             getPrState(
@@ -226,11 +226,11 @@ export const BranchesList: FC<BranchListPageProps> = ({
                     actions={[
                       {
                         title: t('views:repos.newPullReq', 'New pull request'),
-                        to: toPullRequestCompare({ diffRefs: `${defaultBranch}...${branch.name}` })
+                        to: toPullRequestCompare?.({ diffRefs: `${defaultBranch}...${branch.name}` }) || ''
                       },
                       {
                         title: t('views:repos.viewRules', 'View Rules'),
-                        to: toBranchRules()
+                        to: toBranchRules?.()
                       },
                       {
                         isDanger: true,

diff --git a/packages/ui/src/views/repo/repo-branch/repo-branch-list-view.tsx b/packages/ui/src/views/repo/repo-branch/repo-branch-list-view.tsx
@@ -23,12 +23,10 @@ export const RepoBranchListView: FC<RepoBranchListViewProps> = ({
   isCreatingBranch,
   searchQuery,
   setSearchQuery,
-  toPullRequest,
-  toBranchRules,
-  toPullRequestCompare,
   onDeleteBranch,
   searchBranches,
-  setCreateBranchSearchQuery
+  setCreateBranchSearchQuery,
+  ...routingProps
 }) => {
   const { t } = useTranslationStore()
   const { branchList, defaultBranch, xNextPage, xPrevPage, page, setPage } = useRepoBranchesStore()
@@ -107,11 +105,9 @@ export const RepoBranchListView: FC<RepoBranchListViewProps> = ({
           useTranslationStore={useTranslationStore}
           setCreateBranchDialogOpen={setCreateBranchDialogOpen}
           handleResetFiltersAndPages={handleResetFiltersAndPages}
-          toPullRequest={toPullRequest}
-          toBranchRules={toBranchRules}
-          toPullRequestCompare={toPullRequestCompare}
           onDeleteBranch={onDeleteBranch}
           isDirtyList={isDirtyList}
+          {...routingProps}
         />
         {!isLoading && (
           <PaginationComponent

diff --git a/packages/ui/src/views/repo/repo-branch/types.ts b/packages/ui/src/views/repo/repo-branch/types.ts
@@ -39,7 +39,7 @@ export interface BranchProps {
 interface RoutingProps {
   toBranchRules: () => string
   toPullRequestCompare: ({ diffRefs }: { diffRefs: string }) => string
-  toCommitDetails?: ({ sha }: { sha: string }) => string
+  toPullRequest: ({ pullRequestId }: { pullRequestId: number }) => string
 }
 
 export interface BranchListPageProps extends Partial<RoutingProps> {
@@ -49,9 +49,6 @@ export interface BranchListPageProps extends Partial<RoutingProps> {
   useTranslationStore: () => TranslationStore
   setCreateBranchDialogOpen: (isOpen: boolean) => void
   handleResetFiltersAndPages: () => void
-  toPullRequest: ({ pullRequestId }: { pullRequestId: number }) => string
-  toBranchRules: () => string
-  toPullRequestCompare: ({ diffRefs }: { diffRefs: string }) => string
   onDeleteBranch: (branchName: string) => void
   isDirtyList: boolean
 }
@@ -67,9 +64,6 @@ export interface RepoBranchListViewProps extends Partial<RoutingProps> {
   createBranchError?: string
   searchQuery: string | null
   setSearchQuery: (query: string | null) => void
-  toPullRequest: ({ pullRequestId }: { pullRequestId: number }) => string
-  toBranchRules: () => string
-  toPullRequestCompare: ({ diffRefs }: { diffRefs: string }) => string
   onDeleteBranch: (branchName: string) => void
   searchBranches: Branch[]
   setCreateBranchSearchQuery: Dispatch<SetStateAction<string>>