From 10d2a295c72056fed46d1a02ed297246fff96493 Mon Sep 17 00:00:00 2001 From: Jaanus Sellin Date: Fri, 14 Jun 2024 12:26:52 +0300 Subject: [PATCH] feat: menubar is not dependant on query params anymroe (#7399) Previously since query params were changing by global search, and menubar was also altering them, they were conflicting. Menubar does not need query params as state. So using search hook directly. --- frontend/src/component/commandBar/CommandBar.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/src/component/commandBar/CommandBar.tsx b/frontend/src/component/commandBar/CommandBar.tsx index 9f5c1d6ef7..565ba5e304 100644 --- a/frontend/src/component/commandBar/CommandBar.tsx +++ b/frontend/src/component/commandBar/CommandBar.tsx @@ -16,7 +16,6 @@ import { useOnClickOutside } from 'hooks/useOnClickOutside'; import { useOnBlur } from 'hooks/useOnBlur'; import { RecentlyVisited } from './RecentlyVisited/RecentlyVisited'; import { useRecentlyVisited } from 'hooks/useRecentlyVisited'; -import { useGlobalFeatureSearch } from '../feature/FeatureToggleList/useGlobalFeatureSearch'; import { CommandResultGroup, type CommandResultGroupItem, @@ -25,6 +24,7 @@ import { PageSuggestions } from './PageSuggestions'; import { useRoutes } from 'component/layout/MainLayout/NavigationSidebar/useRoutes'; import { useAsyncDebounce } from 'react-table'; import useProjects from 'hooks/api/getters/useProjects/useProjects'; +import { useFeatureSearch } from 'hooks/api/getters/useFeatureSearch/useFeatureSearch'; export const CommandResultsPaper = styled(Paper)(({ theme }) => ({ position: 'absolute', @@ -87,6 +87,7 @@ export const CommandBar = () => { const searchInputRef = useRef(null); const searchContainerRef = useRef(null); const [showSuggestions, setShowSuggestions] = useState(false); + const [searchString, setSearchString] = useState(undefined); const [searchedProjects, setSearchedProjects] = useState< CommandResultGroupItem[] >([]); @@ -114,11 +115,14 @@ export const CommandBar = () => { const [value, setValue] = useState(''); - const { features, setTableState } = useGlobalFeatureSearch(3); + const { features = [] } = useFeatureSearch({ + query: searchString, + limit: '3', + }); const { projects } = useProjects(); const debouncedSetSearchState = useAsyncDebounce((query) => { - setTableState({ query }); + setSearchString(query); const filteredProjects = projects.filter((project) => project.name.toLowerCase().includes(query.toLowerCase()),