Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/components/Comparison/Comparison.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,15 @@ export const Comparison = () => {
});
}

setPreviewContent(prev => prev.filter(({ id: prevId }) => prevId !== id));
setPreviewContent(prev => {
const updatedPreviewContent = prev.filter(({ id: prevId }) => prevId !== id);

if (!updatedPreviewContent.length) {
resetFullDisplayComponentType();
}

return updatedPreviewContent;
});
setSelectedInstances(prev => prev.filter(prevId => prevId !== id));
};

Expand Down
8 changes: 6 additions & 2 deletions src/components/SearchControls/SearchControls.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ export const SearchControls: FC<Props> = ({ submitSearch, changeSegment, clearVa
setNavigationState,
resetFacets: resetControls,
setFacetsBySegments,
resetSelectedInstances,
} = useSearchState();
const { isSearchPaneCollapsed, setIsSearchPaneCollapsed, setIsAdvancedSearchOpen } = useUIState();
const { isSearchPaneCollapsed, setIsSearchPaneCollapsed, setIsAdvancedSearchOpen, resetFullDisplayComponentType } =
useUIState();
const { resetPreviewContent } = useInputsState();
const [searchParams, setSearchParams] = useSearchParams();
const [announcementMessage, setAnnouncementMessage] = useState('');
Expand All @@ -72,6 +74,8 @@ export const SearchControls: FC<Props> = ({ submitSearch, changeSegment, clearVa
const onResetButtonClick = () => {
clearValuesAndResetControls();
resetPreviewContent();
resetFullDisplayComponentType();
resetSelectedInstances();
hasSearchParams && setSearchParams({});
hasSearchParams && setNavigationState({});
setAnnouncementMessage(formatMessage({ id: 'ld.aria.filters.reset.announce' }));
Expand All @@ -92,7 +96,7 @@ export const SearchControls: FC<Props> = ({ submitSearch, changeSegment, clearVa
<FormattedMessage id={isVisibleFilters ? 'ld.searchAndFilter' : 'ld.search'} />
</h2>
<Button
className='close-ctl'
className="close-ctl"
onClick={() => setIsSearchPaneCollapsed(true)}
ariaLabel={formatMessage({ id: 'ld.aria.searchPane.close' })}
>
Expand Down
11 changes: 9 additions & 2 deletions src/test/__tests__/components/Comparison.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,24 @@ describe('Comparison', () => {

test('removes an entry', () => {
const { getByTestId } = renderWithState([
...baseMockState,
{
store: useInputsStore,
state: { previewContent: [{ id: 'mockId', title: 'mockTitle' }] },
},
{
store: useSearchStore,
state: { setSelectedInstances },
},
{
store: useUIStore,
state: { resetFullDisplayComponentType },
},
]);

fireEvent.click(getByTestId('remove-comparison-entry-mockId'));

expect(setPreviewContent).toHaveBeenCalled();
expect(setSelectedInstances).toHaveBeenCalled();
expect(resetFullDisplayComponentType).toHaveBeenCalled();
});

test('updates current page when removing last item on last page', () => {
Expand Down
48 changes: 44 additions & 4 deletions src/test/__tests__/components/SearchControls.test.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { render, screen } from '@testing-library/react';
import { fireEvent, render, screen } from '@testing-library/react';
import { useSearchParams } from 'react-router-dom';
import { getMockedImportedConstant } from '@src/test/__mocks__/common/constants/constants.mock';
import { setInitialGlobalState } from '@src/test/__mocks__/store';
import * as FeatureConstants from '@common/constants/feature.constants';
import { SearchControls } from '@components/SearchControls';
import { SearchContext } from '@src/contexts';
import { useSearchStore } from '@src/store';
import { useInputsStore, useSearchStore, useUIStore } from '@src/store';

const setSearchParams = jest.fn();
const mockSearchFiltersComponent = <div data-testid="search-filters" />;
Expand Down Expand Up @@ -50,17 +50,44 @@ describe('SearchControls', () => {
});

describe('Reset button', () => {
const defaultSearchBy = 'testSearchBy';
const mockClearValues = jest.fn();
const mockResetFacets = jest.fn();
const mockSetSearchBy = jest.fn();
const mockResetPreviewContent = jest.fn();
const mockResetFullDisplayComponentType = jest.fn();
const mockResetSelectedInstances = jest.fn();

function renderSearchControls(searchParams: URLSearchParams, queryState: string) {
(useSearchParams as jest.Mock).mockReturnValue([searchParams, setSearchParams]);

setInitialGlobalState([
{
store: useSearchStore,
state: { query: queryState },
state: {
query: queryState,
resetFacets: mockResetFacets,
setSearchBy: mockSetSearchBy,
resetSelectedInstances: mockResetSelectedInstances,
},
},
{
store: useUIStore,
state: {
resetFullDisplayComponentType: mockResetFullDisplayComponentType,
},
},
{
store: useInputsStore,
state: { resetPreviewContent: mockResetPreviewContent },
},
]);

render(<SearchControls submitSearch={jest.fn} clearValues={jest.fn} changeSegment={jest.fn} />);
render(
<SearchContext.Provider value={{ defaultSearchBy } as unknown as SearchParams}>
<SearchControls submitSearch={jest.fn} clearValues={mockClearValues} changeSegment={jest.fn} />
</SearchContext.Provider>,
);
}

test('renders button enabled if "query" search param and "query" state have values', () => {
Expand All @@ -86,5 +113,18 @@ describe('SearchControls', () => {

expect(screen.queryByTestId('id-search-reset-button')).toBeDisabled();
});

test('resets state', () => {
renderSearchControls(new URLSearchParams({ query: 'test query' }), 'test state');

fireEvent.click(screen.getByTestId('id-search-reset-button'));

expect(mockClearValues).toHaveBeenCalled();
expect(mockResetFacets).toHaveBeenCalled();
expect(mockSetSearchBy).toHaveBeenCalledWith(defaultSearchBy);
expect(mockResetPreviewContent).toHaveBeenCalled();
expect(mockResetFullDisplayComponentType).toHaveBeenCalled();
expect(mockResetSelectedInstances).toHaveBeenCalled();
});
});
});
Loading