fix(web): repair portal earnings chart, dead header search, bare 404 #32
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,30 @@ | ||
| import { describe, it, expect } from 'vitest'; | ||
| import { render, screen } from '@testing-library/react'; | ||
| import NotFound from './not-found'; | ||
| import AdminNotFound from './(admin)/not-found'; | ||
|
|
||
| describe('NotFound (root)', () => { | ||
| it('shows branded 404 content', () => { | ||
| render(<NotFound />); | ||
| expect(screen.getByText('404')).toBeInTheDocument(); | ||
| expect(screen.getByText('Page not found')).toBeInTheDocument(); | ||
| // Brand mark is present so a logged-out 404 still looks on-brand. | ||
| expect(screen.getByText('ContractorOS')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('routes the primary action to "/" so it is safe in any auth state', () => { | ||
| render(<NotFound />); | ||
| const cta = screen.getByRole('link', { name: /back to home/i }); | ||
| expect(cta).toHaveAttribute('href', '/'); | ||
| }); | ||
| }); | ||
|
|
||
| describe('AdminNotFound', () => { | ||
| it('renders inside the admin shell and links back to the dashboard', () => { | ||
| render(<AdminNotFound />); | ||
| expect(screen.getByText('404')).toBeInTheDocument(); | ||
| expect( | ||
| screen.getByRole('link', { name: /go to dashboard/i }), | ||
| ).toHaveAttribute('href', '/dashboard'); | ||
| }); | ||
| }); |
This file contains hidden or 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 hidden or 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,56 @@ | ||
| import { describe, it, expect, vi, beforeEach } from 'vitest'; | ||
| import { render, screen } from '@testing-library/react'; | ||
|
|
||
| let mockPathname = '/dashboard'; | ||
|
|
||
| vi.mock('next/navigation', () => ({ | ||
| usePathname: () => mockPathname, | ||
| useRouter: () => ({ push: vi.fn(), back: vi.fn(), replace: vi.fn() }), | ||
| })); | ||
|
|
||
| vi.mock('@/hooks/use-auth', () => ({ | ||
| useAuth: () => ({ | ||
| user: { firstName: 'Sarah', lastName: 'Chen', email: 'sarah@acme.test' }, | ||
| isLoading: false, | ||
| login: vi.fn(), | ||
| logout: vi.fn(), | ||
| }), | ||
| })); | ||
|
|
||
| // The notification dropdown fetches over the network on mount; stub it so the | ||
| // Header renders in isolation. | ||
| vi.mock('@/components/notifications/notification-dropdown', () => ({ | ||
| NotificationDropdown: () => null, | ||
| })); | ||
|
|
||
| import { Header } from './header'; | ||
|
|
||
| describe('Header', () => { | ||
| beforeEach(() => { | ||
| mockPathname = '/dashboard'; | ||
| }); | ||
|
|
||
| it('renders the search control as an accessible link to the contractor directory on admin routes', () => { | ||
| mockPathname = '/dashboard'; | ||
| render(<Header />); | ||
|
|
||
| const search = screen.getByRole('link', { name: /search contractors/i }); | ||
| expect(search).toHaveAttribute('href', '/contractors'); | ||
| }); | ||
|
|
||
| it('scopes the search control to invoices inside the contractor portal', () => { | ||
| mockPathname = '/portal/dashboard'; | ||
| render(<Header />); | ||
|
|
||
| const search = screen.getByRole('link', { name: /search invoices/i }); | ||
| expect(search).toHaveAttribute('href', '/portal/invoices'); | ||
| }); | ||
|
|
||
| it('exposes an accessible name on the mobile navigation toggle', () => { | ||
| render(<Header onMenuToggle={vi.fn()} />); | ||
|
|
||
| expect( | ||
| screen.getByRole('button', { name: /open navigation menu/i }), | ||
| ).toBeInTheDocument(); | ||
| }); | ||
| }); |
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -66,14 +66,20 @@ interface HeaderProps { | |
|
|
||
| export function Header({ onMenuToggle }: HeaderProps) { | ||
| const breadcrumbs = useBreadcrumbs(); | ||
| const pathname = usePathname(); | ||
| const isPortal = pathname.startsWith('/portal'); | ||
| const searchHref = isPortal ? '/portal/invoices' : '/contractors'; | ||
| const searchLabel = isPortal ? 'Search invoices' : 'Search contractors'; | ||
|
|
||
| return ( | ||
| <header className="sticky top-0 z-20 flex h-14 items-center justify-between bg-slate-50 px-4 sm:px-6 lg:px-8"> | ||
| {/* Left: Hamburger + Breadcrumbs */} | ||
| <div className="flex min-w-0 flex-1 items-center gap-2"> | ||
| {onMenuToggle && ( | ||
| <button | ||
| type="button" | ||
| onClick={onMenuToggle} | ||
| aria-label="Open navigation menu" | ||
| className="shrink-0 rounded-lg p-2 text-slate-500 transition-colors hover:bg-white/60 hover:text-slate-700 lg:hidden" | ||
| > | ||
| <Menu className="h-5 w-5" /> | ||
|
|
@@ -102,9 +108,14 @@ export function Header({ onMenuToggle }: HeaderProps) { | |
|
|
||
| {/* Right: Action icons */} | ||
| <div className="flex shrink-0 items-center gap-1"> | ||
| <Link | ||
| href={searchHref} | ||
| aria-label={searchLabel} | ||
| title={searchLabel} | ||
| className="rounded-lg p-2 text-slate-400 transition-colors hover:bg-white/60 hover:text-slate-600" | ||
| > | ||
| <Search className="h-[18px] w-[18px]" /> | ||
| </Link> | ||
| <NotificationDropdown /> | ||
| <UserMenu /> | ||
| </div> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The use of
toFixed(0)rounds currency values to the nearest thousand, which can be misleading for financial data (e.g., $1,500 would be displayed as $2k). Consider usingtoFixed(1)and removing the trailing zero to provide better precision while keeping the labels concise.