fix: display file explorer even when missing base commit (#3050)

codecov · Aug 5, 2024 · d99d8ee · d99d8ee
1 parent 276dee1
commit d99d8ee
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 15 deletions.
diff --git a/src/pages/CommitDetailPage/CommitCoverage/CommitCoverage.jsx b/src/pages/CommitDetailPage/CommitCoverage/CommitCoverage.jsx
@@ -53,13 +53,19 @@ function CommitRoutes() {
   })
 
   const compareTypeName = commitPageData?.commit?.compareWithParent?.__typename
+  const ErrorBannerComponent = <ErrorBanner errorType={compareTypeName} />
   if (
     compareTypeName !== 'Comparison' &&
-    compareTypeName !== 'FirstPullRequest'
+    compareTypeName !== 'FirstPullRequest' &&
+    compareTypeName !== 'MissingBaseCommit'
   ) {
-    return <ErrorBanner errorType={compareTypeName} />
+    return ErrorBannerComponent
   }
 
+  // we still want to show file explorer when missing base commit since the file structure
+  // is still useful info to the user
+  const isMissingBaseCommit = compareTypeName === 'MissingBaseCommit'
+
   const showIndirectChanges = !(overview.private && tierName === TierNames.TEAM)
 
   return (
@@ -74,17 +80,25 @@ function CommitRoutes() {
           <CommitDetailFileExplorer />
         </SentryRoute>
         <SentryRoute path="/:provider/:owner/:repo/commit/:commit/blob/:path+">
-          <CommitDetailFileViewer />
+          {isMissingBaseCommit ? (
+            ErrorBannerComponent
+          ) : (
+            <CommitDetailFileViewer />
+          )}
         </SentryRoute>
         <SentryRoute path="/:provider/:owner/:repo/commit/:commit" exact>
-          <FilesChangedTab />
+          {isMissingBaseCommit ? ErrorBannerComponent : <FilesChangedTab />}
         </SentryRoute>
         {showIndirectChanges && (
           <SentryRoute
             path="/:provider/:owner/:repo/commit/:commit/indirect-changes"
             exact
           >
-            <IndirectChangesTab />
+            {isMissingBaseCommit ? (
+              ErrorBannerComponent
+            ) : (
+              <IndirectChangesTab />
+            )}
           </SentryRoute>
         )}
         <Redirect

diff --git a/src/pages/CommitDetailPage/CommitCoverage/CommitCoverage.spec.jsx b/src/pages/CommitDetailPage/CommitCoverage/CommitCoverage.spec.jsx
@@ -271,7 +271,8 @@ const mockCommitComponentData = {
 }
 
 const mockCommitPageData = (
-  hasCommitPageDataError = false,
+  hasCommitPageMissingCommitDataError = false,
+  hasCommitPageOtherDataError = false,
   hasFirstPR = false
 ) => ({
   owner: {
@@ -284,11 +285,13 @@ const mockCommitPageData = (
       commit: {
         commitid: 'id-1',
         compareWithParent: {
-          __typename: hasCommitPageDataError
+          __typename: hasCommitPageMissingCommitDataError
             ? 'MissingBaseCommit'
-            : hasFirstPR
-              ? 'FirstPullRequest'
-              : 'Comparison',
+            : hasCommitPageOtherDataError
+              ? 'MissingBaseReport'
+              : hasFirstPR
+                ? 'FirstPullRequest'
+                : 'Comparison',
         },
         bundleAnalysisCompareWithParent: {
           __typename: 'BundleAnalysisComparison',
@@ -363,7 +366,8 @@ describe('CommitCoverage', () => {
       tierName = TierNames.PRO,
       hasCommitErrors = false,
       hasErroredUploads = false,
-      hasCommitPageDataError = false,
+      hasCommitPageMissingCommitDataError = false,
+      hasCommitPageOtherDataError = false,
       hasFirstPR = false,
       coverageEnabled = true,
       bundleAnalysisEnabled = true,
@@ -373,7 +377,8 @@ describe('CommitCoverage', () => {
       tierName: TierNames.PRO,
       hasCommitErrors: false,
       hasErroredUploads: false,
-      hasCommitPageDataError: false,
+      hasCommitPageMissingCommitDataError: false,
+      hasCommitPageOtherDataError: false,
       hasFirstPR: false,
       isGithubRateLimited: false,
     }
@@ -434,7 +439,13 @@ describe('CommitCoverage', () => {
       graphql.query('CommitPageData', (req, res, ctx) => {
         return res(
           ctx.status(200),
-          ctx.data(mockCommitPageData(hasCommitPageDataError, hasFirstPR))
+          ctx.data(
+            mockCommitPageData(
+              hasCommitPageMissingCommitDataError,
+              hasCommitPageOtherDataError,
+              hasFirstPR
+            )
+          )
         )
       }),
       graphql.query('GetRepoRateLimitStatus', (req, res, ctx) => {
@@ -667,13 +678,22 @@ describe('CommitCoverage', () => {
   })
 
   describe('commit has errors', () => {
-    it('renders error banner', async () => {
-      const { queryClient } = setup({ hasCommitPageDataError: true })
+    it('renders error banner for missing base commit', async () => {
+      const { queryClient } = setup({
+        hasCommitPageMissingCommitDataError: true,
+      })
       render(<CommitCoverage />, { wrapper: wrapper({ queryClient }) })
 
       const missingBaseCommit = await screen.findByText(/Missing Base Commit/)
       expect(missingBaseCommit).toBeInTheDocument()
     })
+    it('renders error banner', async () => {
+      const { queryClient } = setup({ hasCommitPageOtherDataError: true })
+      render(<CommitCoverage />, { wrapper: wrapper({ queryClient }) })
+
+      const missingBaseCommit = await screen.findByText(/Missing Base Report/)
+      expect(missingBaseCommit).toBeInTheDocument()
+    })
   })
 
   describe('sending metrics', () => {