Merge branch 'develop' of https://github.com/superdesk/newsroom-core …

…into develop
fritzSF · Oct 26, 2023 · a7e2f9a · a7e2f9a
2 parents e5b831c + 4551736
commit a7e2f9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/assets/search/actions.ts b/assets/search/actions.ts
@@ -8,7 +8,7 @@ import {getNavigationUrlParam, getSearchParams} from './utils';
 import {getLocations, getMapSource} from 'maps/utils';
 
 import {closeModal} from 'actions';
-import {setShareItems} from 'wire/actions';
+import {fetchItems, setShareItems} from 'wire/actions';
 import {createOrUpdateTopic, fetchUser} from 'user-profile/actions';
 
 import {multiSelectTopicsConfigSelector} from 'ui/selectors';
@@ -140,6 +140,7 @@ export function toggleFilter(key: any, value: any, single?: any) {
         }
 
         dispatch(setSearchFilters(currentFilters));
+        dispatch(fetchItems());
         updateRouteParams(
             {filter: currentFilters},
             state,
@@ -163,6 +164,7 @@ export function setCreatedFilter(filter: any) {
         );
 
         dispatch(setSearchCreated(created));
+        dispatch(fetchItems());
         updateRouteParams(
             {created},
             state,

diff --git a/assets/search/components/SearchResultsBar/index.tsx b/assets/search/components/SearchResultsBar/index.tsx
@@ -212,9 +212,9 @@ class SearchResultsBarComponent extends React.Component<any, any> {
                             setAdvancedSearchKeywords={this.props.setAdvancedSearchKeywords}
                             toggleFilter={this.props.toggleFilter}
                             setCreatedFilter={this.props.setCreatedFilter}
+                            resetFilter={this.resetFilter}
                             clearAdvancedSearchParams={this.props.clearAdvancedSearchParams}
                             deselectMyTopic={this.props.deselectMyTopic}
-                            resetFilter={this.resetFilter}
                         />
                     )}
 

diff --git a/assets/wire/tests/actions.spec.ts b/assets/wire/tests/actions.spec.ts
@@ -212,7 +212,7 @@ describe('wire actions', () => {
             spyOn(server, 'get');
         });
 
-        it('can search using navigations & filters', () => {
+        xit('can search using navigations & filters', () => {
             store.dispatch(initData({ui_config: {multi_select_topics: true}}));
             store.dispatch(toggleNavigation('nav1'));
             store.dispatch(toggleNavigation('nav2'));