Skip to content
Merged
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* eslint-disable import/no-extraneous-dependencies, ordered-imports/ordered-imports */
import {
act,
fireEvent,
screen,
render,
RenderResult,
} from '@testing-library/react'

import {
Expand Down Expand Up @@ -47,7 +50,9 @@ jest.mock('~/libs/ui', () => ({
IconOutline: {
SearchIcon: () => false,
},
InputCheckbox: () => false,
InputCheckbox: (props: { checked: boolean; label: string; onClick: () => void }) => (
<input aria-label={props.label} checked={props.checked} onChange={props.onClick} type='checkbox' />
),
}), {
virtual: true,
})
Expand All @@ -64,6 +69,28 @@ describe('ProjectsFilter', () => {
searchBillingAccountsMock.mockResolvedValue([])
})

it('toggles My Projects while retaining search and status filters', () => {
const onFiltersChange = jest.fn()
const filters: { keyword: string; status: 'active' } = { keyword: 'client', status: 'active' }
const { rerender }: RenderResult = render(
<ProjectsFilter filters={filters} isManager onFiltersChange={onFiltersChange} projects={[]} />,
)
fireEvent.click(screen.getByRole('checkbox', { name: 'My Projects' }))
expect(onFiltersChange)
.toHaveBeenLastCalledWith({ ...filters, memberOnly: true })
rerender(
<ProjectsFilter
filters={{ ...filters, memberOnly: true }}
isManager
onFiltersChange={onFiltersChange}
projects={[]}
/>,
)
fireEvent.click(screen.getByRole('checkbox', { name: 'My Projects' }))
expect(onFiltersChange)
.toHaveBeenLastCalledWith({ ...filters, memberOnly: false })
})

it('includes matching billing accounts from visible project rows for project managers', async () => {
render(
<ProjectsFilter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,11 @@ export const ProjectsFilter: FC<ProjectsFilterProps> = (props: ProjectsFilterPro

const noopCheckboxChange = (() => undefined) as (event: Event) => void

/**
* Toggles membership filtering while preserving the other project filters.
* @returns Nothing; notifies the listing through onFiltersChange.
* @throws Does not throw.
*/
function handleOnlyMyProjectsToggle(): void {
updateFilters({
memberOnly: !filters.memberOnly,
Expand Down Expand Up @@ -434,7 +439,7 @@ export const ProjectsFilter: FC<ProjectsFilterProps> = (props: ProjectsFilterPro
<InputCheckbox
checked={!!filters.memberOnly}
name='project-member-only'
label='Only My Projects'
label='My Projects'
onChange={noopCheckboxChange}
onClick={handleOnlyMyProjectsToggle}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,14 @@ jest.mock('../../../lib/hooks', () => ({
useFetchProjectsList: jest.fn(),
}))
jest.mock('../../../lib/constants', () => ({
PROJECT_ROLES: jest.requireActual('../../../lib/constants/project-roles.constants').PROJECT_ROLES,
PROJECTS_PAGE_SIZE: 10,
}))
jest.mock('../../../lib/utils', () => ({
checkCanEditProjectDetails:
jest.requireActual('../../../lib/utils/permissions.utils').checkCanEditProjectDetails,
checkCanManageProject: jest.requireActual('../../../lib/utils/permissions.utils').checkCanManageProject,
checkTalentManager: jest.requireActual('../../../lib/utils/permissions.utils').checkTalentManager,
}))

const mockedUseFetchProjectsList = useFetchProjectsList as jest.Mock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
import {
checkCanEditProjectDetails,
checkCanManageProject,
checkTalentManager,
} from '../../../lib/utils'
import styles from '../../../lib/components/ProjectsListPage/ProjectsListPage.module.scss'

Expand Down Expand Up @@ -115,6 +116,11 @@ function renderProjectsContent(params: RenderProjectsContentParams): JSX.Element
)
}

/**
* Lists visible Work projects with paging and a membership filter for managers and TMs.
* @returns Project list; My Projects sends memberOnly and resets pagination.
* @throws Does not throw; request errors are displayed with a retry action.
*/
export const ProjectsListPage: FC = () => {
const {
isManager,
Expand Down Expand Up @@ -209,7 +215,7 @@ export const ProjectsListPage: FC = () => {
<ProjectsFilter
filters={filters}
onFiltersChange={handleFiltersChange}
isManager={isManager}
isManager={isManager || checkTalentManager(userRoles)}
projects={projectsResult.projects}
/>

Expand Down
Loading