Skip to content

Commit

Permalink
fix: priorities (#336)
Browse files Browse the repository at this point in the history
- changed name of array of priority to priorities;
- priority field changed from string to array
- removed unused import in home.tsx
  • Loading branch information
fagundesjg authored May 29, 2024
2 parents 697e56b + db217f8 commit 37d7876
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 18 deletions.
24 changes: 15 additions & 9 deletions src/pages/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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: [],
Expand Down Expand Up @@ -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) => {
Expand Down Expand Up @@ -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 (
<div className="flex flex-col h-screen items-center">
Expand Down
15 changes: 8 additions & 7 deletions src/pages/Home/components/Filter/Filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})),
Expand All @@ -92,23 +92,24 @@ const Filter = (props: IFilterProps) => {
}),
onSubmit: (values) => {
const {
priority,
priorities,
search,
shelterStatus,
supplies,
supplyCategories,
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),
supplyIds: supplies.map((s) => s.value),
cities,
});
},
});
}
);

const supplyOptions = useMemo(() => {
return supplies
Expand Down Expand Up @@ -182,15 +183,15 @@ const Filter = (props: IFilterProps) => {
</label>
<Select
placeholder="Selecione"
value={values.priority}
value={values.priorities}
isMulti
options={Object.entries(priorityOpts).map(
([priority, label]) => ({
label,
value: priority,
}),
})
)}
onChange={(v) => setFieldValue('priority', v)}
onChange={(v) => setFieldValue('priorities', v)}
/>
</div>
<div className="flex flex-col gap-1 w-full">
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Home/components/Filter/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface ISelectField<T = string> {

export interface IFilterFormProps {
search: string;
priority: string[];
priorities: string[];
supplyCategoryIds: string[];
supplyIds: string[];
shelterStatus: ShelterAvailabilityStatus[];
Expand All @@ -20,7 +20,7 @@ export interface IFilterSubmittionForm extends Omit<IFilterFormProps, 'priority'

export interface IFilterFormikProps {
search: string;
priority: ISelectField[];
priorities: ISelectField[];
supplyCategories: ISelectField[];
supplies: ISelectField[];
shelterStatus: ISelectField<ShelterAvailabilityStatus>[];
Expand Down

0 comments on commit 37d7876

Please sign in to comment.