diff --git a/src/frontend/src/components/calendar/OrderCalendar.tsx b/src/frontend/src/components/calendar/OrderCalendar.tsx index 36923e48e2..0f468a7041 100644 --- a/src/frontend/src/components/calendar/OrderCalendar.tsx +++ b/src/frontend/src/components/calendar/OrderCalendar.tsx @@ -47,12 +47,14 @@ export default function OrderCalendar({ role, params, filters, + initialFilters, tooltip }: { model: ModelType; role: UserRoles; params: Record; filters?: TableFilter[]; + initialFilters?: TableFilter[]; tooltip?: (event: EventContentArg) => React.ReactNode; }) { const navigate = useNavigate(); @@ -94,7 +96,8 @@ export default function OrderCalendar({ const calendarState = useCalendar({ endpoint: modelInfo.api_endpoint, name: model.toString(), - queryParams: params + queryParams: params, + initialFilters: initialFilters }); // Build the events diff --git a/src/frontend/src/hooks/UseCalendar.tsx b/src/frontend/src/hooks/UseCalendar.tsx index 2f7ec5b226..ec1d32c7ab 100644 --- a/src/frontend/src/hooks/UseCalendar.tsx +++ b/src/frontend/src/hooks/UseCalendar.tsx @@ -2,7 +2,7 @@ import type FullCalendar from '@fullcalendar/react'; import type { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; import useFilterSet from '@lib/hooks/UseFilterSet'; -import type { FilterSetState } from '@lib/types/Filters'; +import type { FilterSetState, TableFilter } from '@lib/types/Filters'; import type { UseModalReturn } from '@lib/types/Modals'; import type { DateValue } from '@mantine/dates'; import { type UseQueryResult, useQuery } from '@tanstack/react-query'; @@ -54,15 +54,17 @@ export type CalendarState = { export default function useCalendar({ name, endpoint, - queryParams + queryParams, + initialFilters }: { name: string; endpoint: ApiEndpoints; queryParams?: any; + initialFilters?: TableFilter[]; }): CalendarState { const ref = useRef(null as any); - const filterSet = useFilterSet(`calendar-${name}`); + const filterSet = useFilterSet(`calendar-${name}`, initialFilters); const [searchTerm, setSearchTerm] = useState(''); diff --git a/src/frontend/src/pages/build/BuildIndex.tsx b/src/frontend/src/pages/build/BuildIndex.tsx index f52441923d..43456c6138 100644 --- a/src/frontend/src/pages/build/BuildIndex.tsx +++ b/src/frontend/src/pages/build/BuildIndex.tsx @@ -48,8 +48,9 @@ function BuildOrderCalendar() { ); diff --git a/src/frontend/src/pages/purchasing/PurchasingIndex.tsx b/src/frontend/src/pages/purchasing/PurchasingIndex.tsx index bdaa271c0e..8e8887144e 100644 --- a/src/frontend/src/pages/purchasing/PurchasingIndex.tsx +++ b/src/frontend/src/pages/purchasing/PurchasingIndex.tsx @@ -51,8 +51,9 @@ function PurchaseOrderCalendar() { ); diff --git a/src/frontend/src/pages/sales/SalesIndex.tsx b/src/frontend/src/pages/sales/SalesIndex.tsx index 0f1c0879b0..447229a747 100644 --- a/src/frontend/src/pages/sales/SalesIndex.tsx +++ b/src/frontend/src/pages/sales/SalesIndex.tsx @@ -49,8 +49,9 @@ function SalesOrderCalendar() { ); @@ -73,8 +74,9 @@ const ReturnOrderCalendar = () => { ); diff --git a/src/frontend/src/pages/stock/LocationDetail.tsx b/src/frontend/src/pages/stock/LocationDetail.tsx index eef0eb6e0b..5fbab60d46 100644 --- a/src/frontend/src/pages/stock/LocationDetail.tsx +++ b/src/frontend/src/pages/stock/LocationDetail.tsx @@ -70,8 +70,9 @@ function TransferOrderCalendar() { ); }