From 2039c28f71031677d18600513ba4848d6fa5b524 Mon Sep 17 00:00:00 2001 From: Piotr Gawron <p.gawron@atcomp.pl> Date: Wed, 4 Sep 2024 10:45:38 +0200 Subject: [PATCH] autocomplete renamed to autocompleteSearch --- .../FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx | 4 ++-- .../FunctionalArea/TopBar/TopBar.component.test.tsx | 4 ++-- src/redux/autocomplete/autocomplete.selectors.ts | 5 ++++- src/redux/autocomplete/autocomplete.slice.ts | 4 ++-- src/redux/root/root.fixtures.ts | 2 +- src/redux/store.ts | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx index 8ef41e48..b1dda904 100644 --- a/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx +++ b/src/components/FunctionalArea/TopBar/SearchBar/SearchBar.component.tsx @@ -1,4 +1,4 @@ -import { autocompleteSelector } from '@/redux/autocomplete/autocomplete.selectors'; +import { autocompleteSearchSelector } from '@/redux/autocomplete/autocomplete.selectors'; import { currentSelectedSearchElement, searchDrawerOpenSelector, @@ -36,7 +36,7 @@ export const SearchBar = (): JSX.Element => { const isSearchDrawerOpen = useSelector(searchDrawerOpenSelector); const isPerfectMatch = useSelector(perfectMatchSelector); const searchValueState = useSelector(searchValueSelector); - const searchAutocompleteState = useSelector(autocompleteSelector); + const searchAutocompleteState = useSelector(autocompleteSearchSelector); const dispatch = useAppDispatch(); const router = useRouter(); const currentTab = useSelector(currentSelectedSearchElement); diff --git a/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx b/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx index d5428a92..83958538 100644 --- a/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx +++ b/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx @@ -118,7 +118,7 @@ describe('TopBar - component', () => { user: USER_INITIAL_STATE_MOCK, map: initialMapStateFixture, search: SEARCH_STATE_INITIAL_MOCK, - autocomplete: AUTOCOMPLETE_INITIAL_STATE, + autocompleteSearch: AUTOCOMPLETE_INITIAL_STATE, backgrounds: { ...BACKGROUND_INITIAL_STATE_MOCK, data: BACKGROUNDS_MOCK }, }); @@ -135,7 +135,7 @@ describe('TopBar - component', () => { renderComponentWithActionListener({ user: USER_INITIAL_STATE_MOCK, search: SEARCH_STATE_INITIAL_MOCK, - autocomplete: AUTOCOMPLETE_INITIAL_STATE, + autocompleteSearch: AUTOCOMPLETE_INITIAL_STATE, drawer: initialStateFixture, project: { ...PROJECT_STATE_INITIAL_MOCK, diff --git a/src/redux/autocomplete/autocomplete.selectors.ts b/src/redux/autocomplete/autocomplete.selectors.ts index 6d6b97bc..c6f1f6ae 100644 --- a/src/redux/autocomplete/autocomplete.selectors.ts +++ b/src/redux/autocomplete/autocomplete.selectors.ts @@ -1,4 +1,7 @@ import { rootSelector } from '@/redux/root/root.selectors'; import { createSelector } from '@reduxjs/toolkit'; -export const autocompleteSelector = createSelector(rootSelector, state => state.autocomplete); +export const autocompleteSearchSelector = createSelector( + rootSelector, + state => state.autocompleteSearch, +); diff --git a/src/redux/autocomplete/autocomplete.slice.ts b/src/redux/autocomplete/autocomplete.slice.ts index 4cb0f5b1..ab28dbc6 100644 --- a/src/redux/autocomplete/autocomplete.slice.ts +++ b/src/redux/autocomplete/autocomplete.slice.ts @@ -2,7 +2,7 @@ import { createSlice } from '@reduxjs/toolkit'; import { AUTOCOMPLETE_INITIAL_STATE } from '@/redux/autocomplete/autocomplete.constants'; import { getSearchAutocompleteReducer } from '@/redux/autocomplete/autocomplete.reducers'; -export const autocompleteSlice = createSlice({ +export const autocompleteSearchSlice = createSlice({ name: 'autocomplete', initialState: AUTOCOMPLETE_INITIAL_STATE, reducers: {}, @@ -11,4 +11,4 @@ export const autocompleteSlice = createSlice({ }, }); -export default autocompleteSlice.reducer; +export const autocompleteSearchReducer = autocompleteSearchSlice.reducer; diff --git a/src/redux/root/root.fixtures.ts b/src/redux/root/root.fixtures.ts index 3c9189d5..5f116bc5 100644 --- a/src/redux/root/root.fixtures.ts +++ b/src/redux/root/root.fixtures.ts @@ -31,7 +31,7 @@ import { RootState } from '../store'; import { USER_INITIAL_STATE_MOCK } from '../user/user.mock'; export const INITIAL_STORE_STATE_MOCK: RootState = { - autocomplete: AUTOCOMPLETE_INITIAL_STATE, + autocompleteSearch: AUTOCOMPLETE_INITIAL_STATE, search: SEARCH_STATE_INITIAL_MOCK, project: PROJECT_STATE_INITIAL_MOCK, projects: PROJECTS_STATE_INITIAL_MOCK, diff --git a/src/redux/store.ts b/src/redux/store.ts index fedbb126..a5c2daea 100644 --- a/src/redux/store.ts +++ b/src/redux/store.ts @@ -18,7 +18,7 @@ import projectsReducer from '@/redux/projects/projects.slice'; import reactionsReducer from '@/redux/reactions/reactions.slice'; import searchReducer from '@/redux/search/search.slice'; import userReducer from '@/redux/user/user.slice'; -import autocompleteReducer from '@/redux/autocomplete/autocomplete.slice'; +import { autocompleteSearchReducer } from '@/redux/autocomplete/autocomplete.slice'; import { AnyAction, ListenerEffectAPI, @@ -39,7 +39,7 @@ import publicationsReducer from './publications/publications.slice'; import statisticsReducer from './statistics/statistics.slice'; export const reducers = { - autocomplete: autocompleteReducer, + autocompleteSearch: autocompleteSearchReducer, search: searchReducer, project: projectReducer, projects: projectsReducer, -- GitLab