X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/72b6c853b95b1ef3da2a0beca3a31e4838a17896..5430c336b96cbb7c20bffa1cbdb8cffea32fb460:/src/store/search-bar/search-bar-reducer.ts diff --git a/src/store/search-bar/search-bar-reducer.ts b/src/store/search-bar/search-bar-reducer.ts index 46477c1c..5e16c9a0 100644 --- a/src/store/search-bar/search-bar-reducer.ts +++ b/src/store/search-bar/search-bar-reducer.ts @@ -5,11 +5,10 @@ import { getQueryFromAdvancedData, searchBarActions, - SearchBarActions, - setSearchValueFromAdvancedData -} from '~/store/search-bar/search-bar-actions'; -import { GroupContentsResource } from '~/services/groups-service/groups-service'; -import { SearchBarAdvanceFormData } from '~/models/search-bar'; + SearchBarActions +} from 'store/search-bar/search-bar-actions'; +import { GroupContentsResource } from 'services/groups-service/groups-service'; +import { SearchBarAdvancedFormData } from 'models/search-bar'; type SearchResult = GroupContentsResource; export type SearchBarSelectedItem = { @@ -22,7 +21,7 @@ interface SearchBar { open: boolean; searchResults: SearchResult[]; searchValue: string; - savedQueries: SearchBarAdvanceFormData[]; + savedQueries: SearchBarAdvancedFormData[]; recentQueries: string[]; selectedItem: SearchBarSelectedItem; } @@ -48,7 +47,7 @@ const initialState: SearchBar = { const makeSelectedItem = (id: string, query?: string): SearchBarSelectedItem => ({ id, query: query ? query : id }); -const makeQueryList = (recentQueries: string[], savedQueries: SearchBarAdvanceFormData[]) => { +const makeQueryList = (recentQueries: string[], savedQueries: SearchBarAdvancedFormData[]) => { const recentIds = recentQueries.map((q, idx) => makeSelectedItem(`RQ-${idx}-${q}`, q)); const savedIds = savedQueries.map((q, idx) => makeSelectedItem(`SQ-${idx}-${q.queryName}`, getQueryFromAdvancedData(q))); return recentIds.concat(savedIds);