From d8b802694f35fb139337a9adbfd2ff88bad2a136 Mon Sep 17 00:00:00 2001 From: Arthur de Moulins Date: Tue, 3 Sep 2024 10:24:36 +0200 Subject: [PATCH] fixes --- databox/client/src/components/Basket/BasketSwitcher.tsx | 2 +- databox/client/src/components/Basket/BasketsPanel.tsx | 2 +- databox/client/src/components/Basket/CreateBasket.tsx | 2 +- .../client/src/components/Media/Search/ResultProvider.tsx | 4 +++- .../client/src/components/Media/Search/SearchProvider.tsx | 6 +++--- .../src/components/Media/Search/Sorting/EditSortBy.tsx | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/databox/client/src/components/Basket/BasketSwitcher.tsx b/databox/client/src/components/Basket/BasketSwitcher.tsx index 7948e3a04..71d9fbc68 100644 --- a/databox/client/src/components/Basket/BasketSwitcher.tsx +++ b/databox/client/src/components/Basket/BasketSwitcher.tsx @@ -20,12 +20,12 @@ type Props = { export default function BasketSwitcher({ selectionContext, }: Props) { + const {t} = useTranslation(); const current = useBasketStore(state => state.current); const addToCurrent = useBasketStore(state => state.addToCurrent); const loadingCurrent = useBasketStore(state => state.loadingCurrent); const {openModal} = useModals(); const navigateToModal = useNavigateToModal(); - const {t} = useTranslation(); const {selection, itemToAsset, setSelection} = useContext(selectionContext); const hasSelection = selection.length > 0; diff --git a/databox/client/src/components/Basket/BasketsPanel.tsx b/databox/client/src/components/Basket/BasketsPanel.tsx index c686b7447..d480de2dc 100644 --- a/databox/client/src/components/Basket/BasketsPanel.tsx +++ b/databox/client/src/components/Basket/BasketsPanel.tsx @@ -31,6 +31,7 @@ type Props = { }; function BasketsPanel({selected}: Props) { + const {t} = useTranslation(); const baskets = useBasketStore(state => state.baskets); const loading = useBasketStore(state => state.loading); const loadMore = useBasketStore(state => state.loadMore); @@ -38,7 +39,6 @@ function BasketsPanel({selected}: Props) { const load = useBasketStore(state => state.load); const deleteBasket = useBasketStore(state => state.deleteBasket); const {openModal} = useModals(); - const {t} = useTranslation(); const navigateToModal = useNavigateToModal(); const [searchQuery, setSearchQuery] = React.useState(''); diff --git a/databox/client/src/components/Basket/CreateBasket.tsx b/databox/client/src/components/Basket/CreateBasket.tsx index f2d6550fa..a727bd525 100644 --- a/databox/client/src/components/Basket/CreateBasket.tsx +++ b/databox/client/src/components/Basket/CreateBasket.tsx @@ -14,8 +14,8 @@ type Props = { } & StackedModalProps; export default function CreateBasket({modalIndex, open, onCreate}: Props) { - const {closeModal} = useModals(); const {t} = useTranslation(); + const {closeModal} = useModals(); const addBasket = useBasketStore(state => state.addBasket); const usedFormSubmit = useFormSubmit({ diff --git a/databox/client/src/components/Media/Search/ResultProvider.tsx b/databox/client/src/components/Media/Search/ResultProvider.tsx index 9b2b66096..75c5367c7 100644 --- a/databox/client/src/components/Media/Search/ResultProvider.tsx +++ b/databox/client/src/components/Media/Search/ResultProvider.tsx @@ -1,4 +1,5 @@ import {ResultContext} from './ResultContext'; +import {useTranslation} from 'react-i18next'; import {PropsWithChildren, useContext, useEffect, useState} from 'react'; import {ESDebug, GetAssetOptions, getAssets} from '../../../api/asset'; import {Asset} from '../../../types'; @@ -87,6 +88,7 @@ type Props = PropsWithChildren<{}>; export default function ResultProvider({children}: Props) { const searchContext = useContext(SearchContext)!; + const {t} = useTranslation(); const [state, setState] = useState({ pages: [], @@ -105,7 +107,7 @@ export default function ResultProvider({children}: Props) { try { const r = await search( searchContext.query, - getResolvedSortBy(searchContext.sortBy), + getResolvedSortBy(searchContext.sortBy, t), nextUrl, searchContext.attrFilters, { diff --git a/databox/client/src/components/Media/Search/SearchProvider.tsx b/databox/client/src/components/Media/Search/SearchProvider.tsx index 38fed7c91..ef89b6048 100644 --- a/databox/client/src/components/Media/Search/SearchProvider.tsx +++ b/databox/client/src/components/Media/Search/SearchProvider.tsx @@ -10,9 +10,9 @@ import {FilterEntry, Filters, FilterType, SortBy} from './Filter'; import {BuiltInFilter, hashToQuery, queryToHash} from './search'; import useHash from '../../../lib/useHash'; import {useTranslation} from 'react-i18next'; +import type {TFunction} from '@alchemy/i18n'; -export function getResolvedSortBy(sortBy: SortBy[]): SortBy[] { - const {t} = useTranslation(); +export function getResolvedSortBy(sortBy: SortBy[], t: TFunction): SortBy[] { return sortBy.length > 0 ? sortBy : [ @@ -45,7 +45,7 @@ export default function SearchProvider({children}: PropsWithChildren<{}>) { [inputQuery] ); - const resolvedSortBy = getResolvedSortBy(sortBy); + const resolvedSortBy = getResolvedSortBy(sortBy, t); React.useEffect(() => { setInputQuery(query); diff --git a/databox/client/src/components/Media/Search/Sorting/EditSortBy.tsx b/databox/client/src/components/Media/Search/Sorting/EditSortBy.tsx index 393f8c276..1bd3e5996 100644 --- a/databox/client/src/components/Media/Search/Sorting/EditSortBy.tsx +++ b/databox/client/src/components/Media/Search/Sorting/EditSortBy.tsx @@ -56,7 +56,7 @@ export default function EditSortBy({onClose}: Props) { const list = useMemo(() => { const l: TogglableSortBy[] = []; - getResolvedSortBy(sortBy).forEach(s => { + getResolvedSortBy(sortBy, t).forEach(s => { l.push({ ...s, id: s.a,