diff --git a/frontend/src/component/changeRequest/ChangeRequests/ChangeRequestFilters/ChangeRequestFilters.tsx b/frontend/src/component/changeRequest/ChangeRequests/ChangeRequestFilters/ChangeRequestFilters.tsx index 73e246bf2e..49c0218483 100644 --- a/frontend/src/component/changeRequest/ChangeRequests/ChangeRequestFilters/ChangeRequestFilters.tsx +++ b/frontend/src/component/changeRequest/ChangeRequests/ChangeRequestFilters/ChangeRequestFilters.tsx @@ -12,7 +12,7 @@ export const ChangeRequestFilters: FC = ({ ariaControlTarget, }) => { const updateTableState = (update: Partial) => { - setTableState({ ...tableState, ...update, offset: 0 }); + setTableState({ ...update, offset: 0 }); }; const StyledChip = makeStyledChip(ariaControlTarget); diff --git a/frontend/src/component/changeRequest/ChangeRequests/ChangeRequests.tsx b/frontend/src/component/changeRequest/ChangeRequests/ChangeRequests.tsx index d0d41580b5..a7d3a6a3bd 100644 --- a/frontend/src/component/changeRequest/ChangeRequests/ChangeRequests.tsx +++ b/frontend/src/component/changeRequest/ChangeRequests/ChangeRequests.tsx @@ -23,7 +23,7 @@ import { styles as themeStyles } from 'component/common'; import { ChangeRequestFilters } from './ChangeRequestFilters/ChangeRequestFilters.js'; import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser.js'; import type { IUser } from 'interfaces/user.js'; -import { stateConfig } from './ChangeRequests.types.js'; +import { stateConfig, type TableState } from './ChangeRequests.types.js'; const columnHelper = createColumnHelper(); @@ -57,7 +57,7 @@ const ChangeRequestsInner = ({ user }: { user: IUser }) => { const initialState = shouldApplyDefaults ? defaultTableState(user) : {}; - const [tableState, setTableState] = useQueryParams(stateConfig, { + const [tableState, setTableStateRaw] = useQueryParams(stateConfig, { updateType: 'replaceIn', }); @@ -68,6 +68,13 @@ const ChangeRequestsInner = ({ user }: { user: IUser }) => { } : tableState; + const setTableState = (newState: Partial) => { + setTableStateRaw({ + ...effectiveTableState, + ...newState, + }); + }; + const { changeRequests: data, total,