Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove dark mode feature flag #3237

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions src/layouts/Header/Header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import config from 'config'

import { useImpersonate } from 'services/impersonate'
import { User } from 'services/user'
import { useFlags } from 'shared/featureFlags'

import Header from './Header'

Expand All @@ -33,9 +32,7 @@ vi.mock('src/layouts/Header/components/ThemeToggle', () => ({
}))

vi.mock('services/impersonate')
vi.mock('shared/featureFlags')
const mockedUseImpersonate = useImpersonate as Mock
const mockedUseFlags = useFlags as Mock

const mockUser = {
me: {
Expand Down Expand Up @@ -117,7 +114,6 @@ type SetupArgs = {
describe('Header', () => {
function setup({ user = mockUser }: SetupArgs) {
mockedUseImpersonate.mockReturnValue({ isImpersonating: false })
mockedUseFlags.mockReturnValue({ darkMode: false })
server.use(
graphql.query('CurrentUser', (info) => {
return HttpResponse.json({ data: user })
Expand Down Expand Up @@ -187,21 +183,14 @@ describe('Header', () => {
const userDropdown = await screen.findByText(/User Dropdown/)
expect(userDropdown).toBeInTheDocument()
})
it('has toggle for light/dark mode when flag on', async () => {

it('has toggle for light/dark mode', async () => {
setup({})
mockedUseFlags.mockReturnValue({ darkMode: true })
render(<Header />, { wrapper })

const toggle = await screen.findByText(/Theme Toggle/)
expect(toggle).toBeInTheDocument()
})
it('has no toggle for light/dark mode when flag off', () => {
setup({})
render(<Header />, { wrapper })

const toggle = screen.queryAllByText(/Theme Toggle/)
expect(toggle).toEqual([])
})
})

describe('when on self-hosted', () => {
Expand Down
7 changes: 1 addition & 6 deletions src/layouts/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import config from 'config'

import { useImpersonate } from 'services/impersonate'
import { useUser } from 'services/user'
import { useFlags } from 'shared/featureFlags'

import AdminLink from './components/AdminLink'
import GuestHeader from './components/GuestHeader'
Expand All @@ -18,10 +17,6 @@ function Header() {
const { isImpersonating } = useImpersonate()
const { data: currentUser } = useUser()

const { darkMode } = useFlags({
darkMode: false,
})

return (
<header>
{!currentUser ? <GuestHeader /> : null}
Expand All @@ -44,7 +39,7 @@ function Header() {
</Suspense>
</div>
) : null}
{darkMode ? <ThemeToggle /> : null}
<ThemeToggle />
<HelpDropdown />
<UserDropdown />
</div>
Expand Down
19 changes: 2 additions & 17 deletions src/layouts/Header/components/GuestHeader/GuestHeader.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { cleanup, render, screen } from '@testing-library/react'
import React from 'react'
import { MemoryRouter, Route } from 'react-router-dom'
import { type Mock } from 'vitest'

import config from 'config'

import { useFlags } from 'shared/featureFlags'
import { ThemeContextProvider } from 'shared/ThemeContext'

import GuestHeader from './GuestHeader'

vi.mock('config')
vi.mock('shared/featureFlags')

// silence console errors
console.error = () => {}
Expand All @@ -33,12 +30,6 @@ const wrapper: React.FC<React.PropsWithChildren> = ({ children }) => (
</QueryClientProvider>
)

const mockedUseFlags = useFlags as Mock

beforeEach(() => {
mockedUseFlags.mockReturnValue({ darkMode: false })
})

afterEach(() => {
cleanup()
queryClient.clear()
Expand Down Expand Up @@ -118,19 +109,13 @@ describe('GuestHeader', () => {
)
})
})
it('has toggle for light/dark mode when flag on', async () => {
mockedUseFlags.mockReturnValueOnce({ darkMode: true })

it('has toggle for light/dark mode', async () => {
render(<GuestHeader />, { wrapper })

const toggle = await screen.findByTestId('theme-toggle')
expect(toggle).toBeInTheDocument()
})
it('has no toggle for light/dark mode when flag off', () => {
render(<GuestHeader />, { wrapper })

const toggle = screen.queryAllByTestId('theme-toggle')
expect(toggle).toEqual([])
})
})

describe('self hosted build', () => {
Expand Down
7 changes: 1 addition & 6 deletions src/layouts/Header/components/GuestHeader/GuestHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import config from 'config'

import { CodecovIcon } from 'assets/svg/codecov'
import { useFlags } from 'shared/featureFlags'
import A from 'ui/A'
import Button from 'ui/Button'

Expand All @@ -26,10 +25,6 @@ const LogoButton = () => {
}

function GuestHeader() {
const { darkMode } = useFlags({
darkMode: false,
})

const isSelfHosted = config.IS_SELF_HOSTED

return (
Expand Down Expand Up @@ -71,7 +66,7 @@ function GuestHeader() {
)}
</div>
<div className="flex items-center gap-4 md:mx-4">
{darkMode ? <ThemeToggle /> : null}
<ThemeToggle />
{isSelfHosted ? (
<Button
to={{ pageName: 'login' }}
Expand Down
10 changes: 7 additions & 3 deletions src/layouts/LoginLayout/LoginLayout.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { graphql, HttpResponse } from 'msw2'
import { setupServer } from 'msw2/node'
import { MemoryRouter, Route } from 'react-router-dom'

import { ThemeContextProvider } from 'shared/ThemeContext'

import LoginLayout from './LoginLayout'

const mocks = vi.hoisted(() => ({
Expand All @@ -30,9 +32,11 @@ const wrapper =
): React.FC<React.PropsWithChildren> =>
({ children }) => (
<QueryClientProvider client={queryClient}>
<MemoryRouter initialEntries={[initialEntries]}>
<Route path={path}>{children}</Route>
</MemoryRouter>
<ThemeContextProvider>
<MemoryRouter initialEntries={[initialEntries]}>
<Route path={path}>{children}</Route>
</MemoryRouter>
</ThemeContextProvider>
</QueryClientProvider>
)

Expand Down
Loading