diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ToutesLesFichesAction/MenuFiltresToutesLesFichesAction.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ToutesLesFichesAction/MenuFiltresToutesLesFichesAction.tsx index dfdab92c8b..24c8eae1e0 100644 --- a/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ToutesLesFichesAction/MenuFiltresToutesLesFichesAction.tsx +++ b/app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ToutesLesFichesAction/MenuFiltresToutesLesFichesAction.tsx @@ -25,7 +25,7 @@ import { SelectOption, } from '@/ui'; import { useRef } from 'react'; -import LibreTagsDropdown from '../../../../../ui/dropdownLists/LibreTagsDropdown/LibreTagsDropdown'; +import TagsSuiviPersoDropdown from '../../../../../ui/dropdownLists/TagsSuiviPersoDropdown/TagsSuiviPersoDropdown'; type Props = { filters: Filtre; @@ -110,14 +110,16 @@ const MenuFiltresToutesLesFichesAction = ({ filters, setFilters }: Props) => { /> - - + { + onChange={({ libresTag }) => { const { libreTagsIds, ...rest } = filters; setFilters({ ...rest, - ...(tags ? { libreTagsIds: tags.map((t) => t.id) } : {}), + ...(libresTag + ? { libreTagsIds: libresTag.map((t) => t.id) } + : {}), }); }} /> diff --git a/app.territoiresentransitions.react/src/ui/dropdownLists/LibreTagsDropdown/LibreTagsDropdown.tsx b/app.territoiresentransitions.react/src/ui/dropdownLists/LibreTagsDropdown/LibreTagsDropdown.tsx deleted file mode 100644 index b87b1a3c43..0000000000 --- a/app.territoiresentransitions.react/src/ui/dropdownLists/LibreTagsDropdown/LibreTagsDropdown.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { Tag } from '@/backend/collectivites'; -import { SelectMultipleProps } from '@/ui'; -import SelectTags from '../tags/SelectTags'; -import { useLibreTagsListe } from './useLibreTagsListe'; - -type LibreTagsDropdownProps = Omit< - SelectMultipleProps, - 'values' | 'onChange' | 'options' -> & { - values?: number[]; - onChange: ({ tags, selectedTag }: { tags: Tag[]; selectedTag: Tag }) => void; - disabledOptionsIds?: number[]; -}; - -const LibreTagsDropdown = (props: LibreTagsDropdownProps) => { - const { data, refetch } = useLibreTagsListe(); - - return ( - { - props.onChange({ - tags: values, - selectedTag: selectedValue, - }); - }} - /> - ); -}; - -export default LibreTagsDropdown; diff --git a/app.territoiresentransitions.react/src/ui/dropdownLists/LibreTagsDropdown/useLibreTagsListe.ts b/app.territoiresentransitions.react/src/ui/dropdownLists/LibreTagsDropdown/useLibreTagsListe.ts deleted file mode 100644 index 1f0a80999a..0000000000 --- a/app.territoiresentransitions.react/src/ui/dropdownLists/LibreTagsDropdown/useLibreTagsListe.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { supabaseClient } from '@/app/core-logic/api/supabase'; -import { useCollectiviteId } from '@/app/core-logic/hooks/params'; -import { Tag } from '@/backend/collectivites'; -import { useQuery } from 'react-query'; -import { objectToCamel } from 'ts-case-convert'; - -export const useLibreTagsListe = () => { - const collectiviteId = useCollectiviteId()!; - - return useQuery(['libre_tags', collectiviteId], async () => { - const { error, data } = await supabaseClient - .from('libre_tag') - .select() - .eq('collectivite_id', collectiviteId) - .order('nom'); - - if (error) throw new Error(error.message); - - return objectToCamel(data) as Tag[]; - }); -};