diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx
index d1105a9f..bc088a7a 100644
--- a/src/pages/Home/Home.tsx
+++ b/src/pages/Home/Home.tsx
@@ -7,11 +7,11 @@ import { BurgerMenu, Footer, Header } from '@/components';
import { useShelters, useThrottle } from '@/hooks';
import { Button } from '@/components/ui/button';
import { Filter, ShelterListView } from './components';
-import { IFilterFormProps, IFilterSubmittionForm } from './components/Filter/types';
+import { IFilterFormProps } from './components/Filter/types';
const initialFilterData: IFilterFormProps = {
search: '',
- priority: [],
+ priorities: [],
supplyCategoryIds: [],
supplyIds: [],
shelterStatus: [],
@@ -55,17 +55,16 @@ const Home = () => {
);
const factorySearchArgs = useCallback((values: IFilterFormProps) => {
- const searchQueryArgs: IFilterSubmittionForm = {
+ const searchQueryArgs = {
search: values.search,
- priority: values.priority.join(),
+ priorities: values.priorities,
supplyCategoryIds: values.supplyCategoryIds,
supplyIds: values.supplyIds,
shelterStatus: values.shelterStatus,
- cities: values.cities
- }
-
+ cities: values.cities,
+ };
return searchQueryArgs;
- }, [])
+ }, []);
const onSubmitFilterForm = useCallback(
(values: IFilterFormProps) => {
@@ -101,7 +100,14 @@ const Home = () => {
},
true
);
- }, [refresh, filterData, shelters.filters, shelters.page, shelters.perPage, factorySearchArgs]);
+ }, [
+ refresh,
+ filterData,
+ shelters.filters,
+ shelters.page,
+ shelters.perPage,
+ factorySearchArgs,
+ ]);
return (
diff --git a/src/pages/Home/components/Filter/Filter.tsx b/src/pages/Home/components/Filter/Filter.tsx
index f71d98b7..d041a5d4 100644
--- a/src/pages/Home/components/Filter/Filter.tsx
+++ b/src/pages/Home/components/Filter/Filter.tsx
@@ -65,7 +65,7 @@ const Filter = (props: IFilterProps) => {
{
initialValues: {
cities: data.cities ?? [],
- priority: data.priority.map((p: string) => ({
+ priorities: data.priorities.map((p: string) => ({
label: priorityOpts[Number(p) as SupplyPriority],
value: p,
})),
@@ -92,7 +92,7 @@ const Filter = (props: IFilterProps) => {
}),
onSubmit: (values) => {
const {
- priority,
+ priorities,
search,
shelterStatus,
supplies,
@@ -100,7 +100,7 @@ const Filter = (props: IFilterProps) => {
cities,
} = values;
onSubmit({
- priority: priority.map((p) => p.value),
+ priorities: priorities.map((p) => p.value),
search,
shelterStatus: shelterStatus.map((s) => s.value),
supplyCategoryIds: supplyCategories.map((s) => s.value),
@@ -108,7 +108,8 @@ const Filter = (props: IFilterProps) => {
cities,
});
},
- });
+ }
+ );
const supplyOptions = useMemo(() => {
return supplies
@@ -182,15 +183,15 @@ const Filter = (props: IFilterProps) => {
diff --git a/src/pages/Home/components/Filter/types.ts b/src/pages/Home/components/Filter/types.ts
index 97f58017..e1e554ee 100644
--- a/src/pages/Home/components/Filter/types.ts
+++ b/src/pages/Home/components/Filter/types.ts
@@ -7,7 +7,7 @@ export interface ISelectField {
export interface IFilterFormProps {
search: string;
- priority: string[];
+ priorities: string[];
supplyCategoryIds: string[];
supplyIds: string[];
shelterStatus: ShelterAvailabilityStatus[];
@@ -20,7 +20,7 @@ export interface IFilterSubmittionForm extends Omit[];