-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix-filter-out-bytespider-entries-from-sentry
- Loading branch information
Showing
20 changed files
with
841 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| import { QueryClient, QueryClientProvider } from '@tanstack/react-query' | ||
| import { render, screen } from '@testing-library/react' | ||
| import { graphql } from 'msw' | ||
| import { setupServer } from 'msw/node' | ||
| import { MemoryRouter, Route } from 'react-router-dom' | ||
|
|
||
| import { TierNames } from 'services/tier' | ||
| import { useFlags } from 'shared/featureFlags' | ||
|
|
||
| import Header from './Header' | ||
|
|
||
| jest.mock('./HeaderDefault', () => () => 'Default Header') | ||
| jest.mock('./HeaderTeam', () => () => 'Team Header') | ||
| jest.mock('shared/featureFlags') | ||
| const mockedUseFlags = useFlags as jest.Mock<{ multipleTiers: boolean }> | ||
|
|
||
| const queryClient = new QueryClient({ | ||
| defaultOptions: { queries: { retry: false } }, | ||
| }) | ||
| const server = setupServer() | ||
| const wrapper: React.FC<React.PropsWithChildren> = ({ children }) => ( | ||
| <QueryClientProvider client={queryClient}> | ||
| <MemoryRouter initialEntries={['/gh/test-org/test-repo/pull/12']}> | ||
| <Route path="/:provider/:owner/:repo/pull/:pullId">{children}</Route> | ||
| </MemoryRouter> | ||
| </QueryClientProvider> | ||
| ) | ||
|
|
||
| beforeAll(() => { | ||
| server.listen() | ||
| }) | ||
|
|
||
| afterEach(() => { | ||
| queryClient.clear() | ||
| server.resetHandlers() | ||
| }) | ||
|
|
||
| afterAll(() => { | ||
| server.close() | ||
| }) | ||
|
|
||
| interface SetupArgs { | ||
| multipleTiers: boolean | ||
| } | ||
|
|
||
| describe('Header', () => { | ||
| function setup({ multipleTiers = false }: SetupArgs) { | ||
| mockedUseFlags.mockReturnValue({ | ||
| multipleTiers, | ||
| }) | ||
|
|
||
| server.use( | ||
| graphql.query('OwnerTier', (req, res, ctx) => { | ||
| if (multipleTiers) { | ||
| return res( | ||
| ctx.status(200), | ||
| ctx.data({ owner: { plan: { tierName: TierNames.TEAM } } }) | ||
| ) | ||
| } | ||
| return res( | ||
| ctx.status(200), | ||
| ctx.data({ owner: { plan: { tierName: TierNames.PRO } } }) | ||
| ) | ||
| }) | ||
| ) | ||
| } | ||
|
|
||
| describe('when rendered and customer is not team tier', () => { | ||
| beforeEach(() => { | ||
| setup({ multipleTiers: false }) | ||
| }) | ||
|
|
||
| it('renders the default header component', async () => { | ||
| render(<Header />, { wrapper }) | ||
|
|
||
| const defaultHeader = await screen.findByText(/Default Header/) | ||
| expect(defaultHeader).toBeInTheDocument() | ||
|
|
||
| const teamHeader = screen.queryByText(/Team Header/) | ||
| expect(teamHeader).not.toBeInTheDocument() | ||
| }) | ||
| }) | ||
|
|
||
| describe('when rendered and customer has team tier', () => { | ||
| beforeEach(() => { | ||
| setup({ multipleTiers: true }) | ||
| }) | ||
|
|
||
| it('renders the team header component', async () => { | ||
| render(<Header />, { wrapper }) | ||
|
|
||
| const teamHeader = await screen.findByText(/Team Header/) | ||
| expect(teamHeader).toBeInTheDocument() | ||
|
|
||
| const defaultHeader = screen.queryByText(/Default Header/) | ||
| expect(defaultHeader).not.toBeInTheDocument() | ||
| }) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { useParams } from 'react-router-dom' | ||
|
|
||
| import { TierNames, useTier } from 'services/tier' | ||
| import { useFlags } from 'shared/featureFlags' | ||
|
|
||
| import HeaderDefault from './HeaderDefault' | ||
| import HeaderTeam from './HeaderTeam' | ||
|
|
||
| interface URLParams { | ||
| provider: string | ||
| owner: string | ||
| } | ||
|
|
||
| function Header() { | ||
| const { provider, owner } = useParams<URLParams>() | ||
| const { data: tierData } = useTier({ provider, owner }) | ||
| const { multipleTiers } = useFlags({ | ||
| multipleTiers: false, | ||
| }) | ||
|
|
||
| if (multipleTiers && tierData === TierNames.TEAM) { | ||
| return <HeaderTeam /> | ||
| } | ||
|
|
||
| return <HeaderDefault /> | ||
| } | ||
|
|
||
| export default Header |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { default } from './HeaderDefault' |
79 changes: 79 additions & 0 deletions
79
src/pages/PullRequestPage/Header/HeaderTeam/HeaderTeam.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| import cs from 'classnames' | ||
| import capitalize from 'lodash/capitalize' | ||
| import { useParams } from 'react-router-dom' | ||
|
|
||
| import { formatTimeToNow } from 'shared/utils/dates' | ||
| import { getProviderPullURL } from 'shared/utils/provider' | ||
| import A from 'ui/A' | ||
| import CIStatusLabel from 'ui/CIStatus' | ||
| import Icon from 'ui/Icon' | ||
| import TotalsNumber from 'ui/TotalsNumber' | ||
|
|
||
| import { usePullHeadDataTeam } from './hooks' | ||
|
|
||
| import { pullStateToColor } from '../constants' | ||
| import PendoLink from '../PendoLink' | ||
|
|
||
| function HeaderTeam() { | ||
| const { provider, owner, repo, pullId } = useParams() | ||
| const { data } = usePullHeadDataTeam({ provider, owner, repo, pullId }) | ||
|
|
||
| const pull = data?.pull | ||
|
|
||
| return ( | ||
| <div className="flex flex-col justify-between gap-2 border-b border-ds-gray-secondary pb-2 text-xs md:flex-row"> | ||
| <div className="flex flex-row flex-wrap items-center gap-6 divide-x divide-ds-gray-secondary"> | ||
| <div> | ||
| <h1 className="flex items-center gap-2 text-lg font-semibold"> | ||
| {pull?.title} | ||
| <span | ||
| className={cs( | ||
| 'text-white font-bold px-3 py-0.5 text-xs rounded', | ||
| pullStateToColor[pull?.state] | ||
| )} | ||
| > | ||
| {capitalize(pull?.state)} | ||
| </span> | ||
| </h1> | ||
| <p className="flex flex-row items-center gap-2"> | ||
| <span> | ||
| {pull?.updatestamp && formatTimeToNow(pull?.updatestamp)}{' '} | ||
| <span className="bold">{pull?.author?.username}</span> authored{' '} | ||
| {pull?.pullId && ( | ||
| <A | ||
| href={getProviderPullURL({ | ||
| provider, | ||
| owner, | ||
| repo, | ||
| pullId: pull?.pullId, | ||
| })} | ||
| hook="provider-pr-link" | ||
| isExternal={true} | ||
| > | ||
| #{pull?.pullId} | ||
| </A> | ||
| )} | ||
| </span> | ||
| <CIStatusLabel ciPassed={pull?.head?.ciPassed} /> | ||
| <span className="flex items-center"> | ||
| <Icon name="branch" variant="developer" size="sm" /> | ||
| {pull?.head?.branchName} | ||
| </span> | ||
| </p> | ||
| </div> | ||
| <div className="flex flex-col justify-center gap-2 px-6"> | ||
| <h4 className="gap-2 font-mono text-xs text-ds-gray-quinary"> | ||
| Patch Coverage | ||
| </h4> | ||
| <TotalsNumber | ||
| value={pull?.compareWithBase?.patchTotals?.percentCovered} | ||
| plain | ||
| large | ||
| /> | ||
| </div> | ||
| </div> | ||
| <PendoLink /> | ||
| </div> | ||
| ) | ||
| } | ||
| export default HeaderTeam |
Oops, something went wrong.