diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx index 4f51f924..907a0b58 100644 --- a/src/pages/Home/Home.tsx +++ b/src/pages/Home/Home.tsx @@ -11,7 +11,7 @@ import { IFilterFormProps } from './components/Filter/types'; const initialFilterData: IFilterFormProps = { search: '', - priority: null, + priority: [], supplyCategoryIds: [], supplyIds: [], shelterStatus: [], diff --git a/src/pages/Home/components/Filter/Filter.tsx b/src/pages/Home/components/Filter/Filter.tsx index 59caf9eb..b4d5045e 100644 --- a/src/pages/Home/components/Filter/Filter.tsx +++ b/src/pages/Home/components/Filter/Filter.tsx @@ -19,7 +19,6 @@ import { import { IFilterFormikProps, IFilterProps, - ISelectField, ShelterAvailabilityStatus, } from './types'; import { priorityOptions } from '@/lib/utils'; @@ -66,12 +65,10 @@ const Filter = (props: IFilterProps) => { { initialValues: { cities: data.cities ?? [], - priority: data.priority - ? { - label: priorityOpts[data.priority], - value: data.priority, - } - : null, + priority: data.priority.map((p: string) => ({ + label: priorityOpts[Number(p) as SupplyPriority], + value: p, + })), search: data.search, shelterStatus: data.shelterStatus.map((s) => ({ label: ShelterAvailabilityStatusMapped[s], @@ -103,7 +100,7 @@ const Filter = (props: IFilterProps) => { cities, } = values; onSubmit({ - priority: priority?.value ? +priority.value : null, + priority: priority.map((p) => p.value).join(), search, shelterStatus: shelterStatus.map((s) => s.value), supplyCategoryIds: supplyCategories.map((s) => s.value), @@ -111,8 +108,7 @@ const Filter = (props: IFilterProps) => { cities, }); }, - } - ); + }); const supplyOptions = useMemo(() => { return supplies @@ -187,20 +183,14 @@ const Filter = (props: IFilterProps) => {