Merge branch 'main' into rvinnakota/bulk-download

Author: rohitvinnakota-codecov

.github/workflows/ci.yml

@@ -334,6 +334,50 @@ jobs:
           # The head sha aligns with how the sha used in prod builds
           GAZEBO_SHA: ${{ github.event.pull_request.head.sha }}
 
+  overwatch:
+    name: Run Overwatch
+    runs-on: ubuntu-latest
+    needs: install
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Cache node_modules
+        id: cache-node-modules
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-gazebo-node-modules
+        with:
+          path: |
+            node_modules
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache-name }}-
+
+      - name: Install Build Dependencies
+        run: |
+          sudo apt-get update
+          # Install libssl1.1 from Ubuntu 20.04 repositories
+          wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb
+          sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
+
+      - name: Install Overwatch CLI
+        run: |
+          curl -o overwatch-cli https://overwatch.codecov.io/linux/cli
+          chmod +x overwatch-cli
+
+      - name: Run Overwatch CLI
+        run: |
+          ./overwatch-cli \
+            --auth-token ${{ secrets.SENTRY_AUTH_TOKEN }} \
+            --organization-slug codecov \
+            javascript --package-manager yarn
+
   storybook:
     name: Run storybook
     runs-on: ubuntu-latest

docker/start-nginx.sh

@@ -21,15 +21,15 @@ then
   sed -i "s/${SCHEME_BASE}:\/\/${WEB_BASE}/${SCHEME}:\/\/${CODECOV_BASE_HOST}/g" /var/www/app/gazebo/assets/*.js
   if [[ -n "${GHE_BASE}" ]]; then
     echo "Replacing GHE ${GHE_SCHEME_BASE}://${GHE_BASE}"
-    sed -i -r "s/r\.[a-zA-Z]+\.GHE_URL/\"${GHE_SCHEME_BASE}:\/\/${GHE_BASE}\"/g" /var/www/app/gazebo/assets/*.js
+    sed -i -r "s/[a-zA-Z]+\.GHE_URL/\"${GHE_SCHEME_BASE}:\/\/${GHE_BASE}\"/g" /var/www/app/gazebo/assets/*.js
   fi
   if [[ -n "${GLE_BASE}" ]]; then
     echo "Replacing GLE ${GLE_SCHEME_BASE}://${GLE_BASE}"
-    sed -i -r "s/r\.[a-zA-Z]+\.GLE_URL/\"${GLE_SCHEME_BASE}:\/\/${GLE_BASE}\"/g" /var/www/app/gazebo/assets/*.js
+    sed -i -r "s/[a-zA-Z]+\.GLE_URL/\"${GLE_SCHEME_BASE}:\/\/${GLE_BASE}\"/g" /var/www/app/gazebo/assets/*.js
   fi
   if [[ -n "${BBS_BASE}" ]]; then
     echo "Replacing BBS ${BBS_SCHEME_BASE}://${BBS_BASE}"
-    sed -i -r "s/r\.[a-zA-Z]+\.BBS_URL/\"${BBS_SCHEME_BASE}:\/\/${BBS_BASE}\"/g" /var/www/app/gazebo/assets/*.js
+    sed -i -r "s/[a-zA-Z]+\.BBS_URL/\"${BBS_SCHEME_BASE}:\/\/${BBS_BASE}\"/g" /var/www/app/gazebo/assets/*.js
   fi
 
   export DOLLAR='$'

src/App.tsx

@@ -12,7 +12,7 @@ import BaseLayout from 'layouts/BaseLayout'
 import EnterpriseLoginLayout from 'layouts/EnterpriseLoginLayout'
 import LoginLayout from 'layouts/LoginLayout'
 import { useLocationParams } from 'services/navigation/useLocationParams'
-import { ToastNotificationProvider } from 'services/toastNotification'
+import { ToastNotificationProvider } from 'services/toastNotification/context'
 import { useInternalUser, useUser } from 'services/user'
 import { isProvider } from 'shared/api/helpers'
 import 'ui/Table/Table.css'

src/layouts/BaseLayout/BaseLayout.tsx

@@ -14,7 +14,7 @@ import { RepoBreadcrumbProvider } from 'pages/RepoPage/context'
 import TermsOfService from 'pages/TermsOfService'
 import { useEventContext } from 'services/events/hooks'
 import { useImpersonate } from 'services/impersonate/useImpersonate'
-import { useTracking } from 'services/tracking'
+import { useTracking } from 'services/tracking/useTracking'
 import GlobalBanners from 'shared/GlobalBanners'
 import GlobalTopBanners from 'shared/GlobalTopBanners'
 import LoadingLogo from 'ui/LoadingLogo'

src/layouts/Header/components/GuestHeader/GuestHeader.test.tsx

@@ -1,5 +1,6 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { render, screen } from '@testing-library/react'
+import qs from 'qs'
 import React from 'react'
 import { MemoryRouter, Route } from 'react-router-dom'
 
@@ -47,6 +48,7 @@ describe('GuestHeader', () => {
         expect(link).toHaveAttribute('href', 'https://about.codecov.io')
       })
     })
+
     describe('why test code link', () => {
       it('directs user to what is code coverage page', async () => {
         render(<GuestHeader />, {
@@ -61,6 +63,7 @@ describe('GuestHeader', () => {
         )
       })
     })
+
     describe('Get a demo link', () => {
       it('directs user to demo page', async () => {
         render(<GuestHeader />, {
@@ -72,6 +75,7 @@ describe('GuestHeader', () => {
         expect(link).toHaveAttribute('href', 'https://about.codecov.io/demo')
       })
     })
+
     describe('pricing link', () => {
       it('directs user to pricing page', async () => {
         render(<GuestHeader />, {
@@ -83,17 +87,20 @@ describe('GuestHeader', () => {
         expect(link).toHaveAttribute('href', 'https://about.codecov.io/pricing')
       })
     })
+
     describe('login link', () => {
-      it('directs user to login page', async () => {
+      it('directs user to login page with redirect to path', async () => {
         render(<GuestHeader />, {
           wrapper,
         })
 
+        const queryString = qs.stringify({ to: '/gh' })
         const link = await screen.findByTestId('login-link')
         expect(link).toBeInTheDocument()
-        expect(link).toHaveAttribute('href', '/login')
+        expect(link).toHaveAttribute('href', `/login?${queryString}`)
       })
     })
+
     describe('start trial link', () => {
       it('directs user to start trial page', async () => {
         render(<GuestHeader />, {
@@ -128,18 +135,21 @@ describe('GuestHeader', () => {
       const pricing = screen.queryByText('Pricing')
       expect(pricing).not.toBeInTheDocument()
     })
+
     it('does not render start free trial link', () => {
       render(<GuestHeader />, { wrapper })
 
       const startFreeTrial = screen.queryByText('Start Free Trial')
       expect(startFreeTrial).not.toBeInTheDocument()
     })
-    it('renders a login button', () => {
+
+    it('renders a login button with redirect to path', () => {
       render(<GuestHeader />, { wrapper })
 
+      const queryString = qs.stringify({ to: '/gh' })
       const login = screen.queryByText('Login')
       expect(login).toBeInTheDocument()
-      expect(login).toHaveAttribute('href', '/')
+      expect(login).toHaveAttribute('href', `/?${queryString}`)
     })
   })
 })

src/layouts/Header/components/GuestHeader/GuestHeader.tsx

@@ -1,3 +1,5 @@
+import { useLocation } from 'react-router'
+
 import config from 'config'
 
 import { CodecovIcon } from 'assets/svg/codecov'
@@ -26,6 +28,7 @@ const LogoButton = () => {
 
 function GuestHeader() {
   const isSelfHosted = config.IS_SELF_HOSTED
+  const location = useLocation()
 
   return (
     <div className="border-b">
@@ -69,7 +72,7 @@ function GuestHeader() {
           <ThemeToggle />
           {isSelfHosted ? (
             <Button
-              to={{ pageName: 'login' }}
+              to={{ pageName: 'login', options: { to: location.pathname } }}
               variant="primary"
               activeClassName="hidden"
               exact={true}
@@ -86,7 +89,7 @@ function GuestHeader() {
               className="mx-2 flex items-center justify-between gap-4 md:mx-0"
             >
               <A
-                to={{ pageName: 'login' }}
+                to={{ pageName: 'login', options: { to: location.pathname } }}
                 variant="guestHeader"
                 activeClassName="hidden"
                 isExternal={false}

src/layouts/ToastNotifications/NotificationItem.jsx

@@ -2,7 +2,7 @@ import PropType from 'prop-types'
 import { useCallback, useEffect } from 'react'
 
 import Message from 'old_ui/Message'
-import { notificationPropType } from 'services/toastNotification'
+import { notificationPropType } from 'services/toastNotification/propTypes'
 
 function NotificationItem({ notification, removeNotification }) {
   const close = useCallback(() => {

src/layouts/ToastNotifications/ToastNotifications.jsx

@@ -1,7 +1,7 @@
 import {
   useNotifications,
   useRemoveNotification,
-} from 'services/toastNotification'
+} from 'services/toastNotification/context'
 
 import NotificationItem from './NotificationItem'
 

src/layouts/ToastNotifications/ToastNotifications.test.jsx

@@ -4,7 +4,7 @@ import { vi } from 'vitest'
 import {
   useNotifications,
   useRemoveNotification,
-} from 'services/toastNotification'
+} from 'services/toastNotification/context'
 
 import ToastNotifications from './ToastNotifications'
 
@@ -23,7 +23,7 @@ const notifications = [
   },
 ]
 
-vi.mock('services/toastNotification')
+vi.mock('services/toastNotification/context')
 
 describe('ToastNotifications', () => {
   const removeNotification = vi.fn()

src/layouts/shared/NetworkErrorBoundary/NetworkErrorBoundary.jsx

@@ -2,10 +2,11 @@ import { useQueryClient } from '@tanstack/react-query'
 import cs from 'classnames'
 import PropTypes from 'prop-types'
 import { Component, useEffect } from 'react'
-import { useHistory } from 'react-router-dom'
+import { useHistory, useLocation } from 'react-router-dom'
 
 import config from 'config'
 
+import { useUser } from 'services/user'
 import A from 'ui/A'
 import Button from 'ui/Button'
 
@@ -67,11 +68,11 @@ const graphQLErrorToUI = {
   },
 }
 
-export const NetworkErrorMessage = () => {
+export const DocErrorMessage = ({ capitalize = true }) => {
   if (config.IS_SELF_HOSTED) {
     return (
-      <p className="my-4 px-3 sm:px-0">
-        Please see{' '}
+      <>
+        {capitalize ? 'Please' : 'please'} see{' '}
         <A
           rel="noreferrer"
           className="text-ds-blue-default"
@@ -82,13 +83,13 @@ export const NetworkErrorMessage = () => {
           our docs
         </A>{' '}
         for common support.
-      </p>
+      </>
     )
   }
 
   return (
-    <p className="my-4 px-3 sm:px-0">
-      Check on{' '}
+    <>
+      {capitalize ? 'Check' : 'check'} on{' '}
       <A
         rel="noreferrer"
         className="text-ds-blue-default"
@@ -109,13 +110,40 @@ export const NetworkErrorMessage = () => {
         our docs
       </A>{' '}
       for common support.
+    </>
+  )
+}
+
+DocErrorMessage.propTypes = {
+  capitalize: PropTypes.bool,
+}
+
+export const NetworkErrorMessage = ({ statusCode }) => {
+  if (statusCode === 404) {
+    return (
+      <p className="my-4 max-w-2xl px-3 text-center sm:px-0">
+        To view private repositories ensure you are logged in, you can also{' '}
+        <DocErrorMessage capitalize={false} />
+      </p>
+    )
+  }
+
+  return (
+    <p className="my-4 max-w-2xl px-3 text-center sm:px-0">
+      <DocErrorMessage capitalize={true} />
     </p>
   )
 }
 
-function ResetHandler({ logoutUser = false, reset }) {
+NetworkErrorMessage.propTypes = {
+  statusCode: PropTypes.number,
+}
+
+function ResetHandler({ logoutUser = false, reset, statusCode }) {
   const queryClient = useQueryClient()
   const history = useHistory()
+  const location = useLocation()
+  const { data: user } = useUser()
 
   useEffect(() => {
     let unMounted = false
@@ -148,17 +176,27 @@ function ResetHandler({ logoutUser = false, reset }) {
   }
 
   return (
-    <div className="my-4">
+    <div className="my-4 flex items-center gap-2">
       <Button onClick={logoutUser ? handleSignOut : handleReset}>
         {logoutUser ? 'Return to login' : 'Return to previous page'}
       </Button>
+      {/* if the user is logged in, we don't want to show the login button */}
+      {statusCode === 404 && !user ? (
+        <Button
+          variant="primary"
+          to={{ pageName: 'login', options: { to: location.pathname } }}
+        >
+          Login
+        </Button>
+      ) : null}
     </div>
   )
 }
 
 ResetHandler.propTypes = {
   reset: PropTypes.func,
   logoutUser: PropTypes.bool,
+  statusCode: PropTypes.number,
 }
 
 class NetworkErrorBoundary extends Component {
@@ -211,8 +249,11 @@ class NetworkErrorBoundary extends Component {
           src={illustration}
         />
         <h1 className="mt-6 text-2xl">{title}</h1>
-        <NetworkErrorMessage />
-        <ResetHandler reset={this.resetErrorBoundary} />
+        <NetworkErrorMessage statusCode={this.state.error.status} />
+        <ResetHandler
+          reset={this.resetErrorBoundary}
+          statusCode={this.state.error.status}
+        />
       </article>
     )
   }
@@ -230,13 +271,14 @@ class NetworkErrorBoundary extends Component {
         />
         <h1 className="mt-6 text-2xl">{title}</h1>
         {description ? <p className="mt-2">{description(data)}</p> : null}
-        {showDocs ? <NetworkErrorMessage /> : null}
+        {showDocs ? <NetworkErrorMessage statusCode={status} /> : null}
         <p>
           <strong>Error {status}</strong>
         </p>
         <ResetHandler
           logoutUser={status === 429}
           reset={this.resetErrorBoundary}
+          statusCode={status}
         />
       </article>
     )