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
14 changes: 6 additions & 8 deletions src/components/pages/search/SearchResults.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,13 @@ import {
createSortByHandler,
createSortDirHandler,
normalizeSearchQueryParams,
deriveSearchType,
} from '../../../helpers/searchHelpers';
import {
setSearchPageAdvanced,
setSearchPageAdvancedLimitBy,
setSearchPageAdvancedSearchTerms,
setSearchPageKeyword,
} from '../../../actions/searchPage';
import { readListItems } from '../../search/searchResultHelpers';

const selectBarPropTypes = {
toggleBar: PropTypes.object,
Expand Down Expand Up @@ -286,15 +284,10 @@ function SearchResults(props) {
const isSidebarOpen = useSelector((state) => isSearchResultSidebarOpen(state));
const display = currentView(props);

// use the list items size to handle the seeded empty result conflicting with errors
const { listType } = deriveSearchType(config, SEARCH_RESULT_PAGE_SEARCH_NAME, searchDescriptor);
const { items } = readListItems(config, listType, searchResults);
const searchResultsSize = items?.size ?? 0;

useEffect(() => {
setPreferredPageSize(props, dispatch);
dispatch(search(config, SEARCH_RESULT_PAGE_SEARCH_NAME, searchDescriptor));
}, [searchDescriptor.toString(), searchResultsSize]);
}, [searchDescriptor.toString()]);

const handlePageSizeChange = createPageSizeChangeHandler({
history,
Expand Down Expand Up @@ -392,11 +385,16 @@ function SearchResults(props) {
searchDisplay = <SearchResultTable searchDescriptor={searchDescriptor} />;
}

const handleBatchInvokeComplete = () => {
dispatch(search(config, SEARCH_RESULT_PAGE_SEARCH_NAME, searchDescriptor));
};

const sidebar = (
<SearchResultSidebar
config={config}
history={history}
isOpen={isSidebarOpen}
onInvokeComplete={handleBatchInvokeComplete}
recordType={searchDescriptor.get('recordType')}
/>
);
Expand Down
7 changes: 7 additions & 0 deletions src/components/search/SearchResultBatchPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const propTypes = {
recordType: PropTypes.string,
selectedItems: PropTypes.instanceOf(Immutable.Map),
invoke: PropTypes.func,
onInvokeComplete: PropTypes.func,
};

export default class SearchResultBatchPanel extends Component {
Expand Down Expand Up @@ -146,6 +147,12 @@ export default class SearchResultBatchPanel extends Component {
if (location) {
history.push(location);
}
} else {
const { onInvokeComplete } = this.props;

if (onInvokeComplete) {
onInvokeComplete();
}
}
});
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/search/SearchResultSidebar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const propTypes = {
history: PropTypes.shape({
push: PropTypes.func,
}),
onInvokeComplete: PropTypes.func,
recordType: PropTypes.string,
isOpen: PropTypes.bool,
};
Expand All @@ -38,6 +39,7 @@ export default function SearchResultSidebar(props) {
const {
config,
history,
onInvokeComplete,
recordType,
isOpen,
} = props;
Expand Down Expand Up @@ -69,6 +71,7 @@ export default function SearchResultSidebar(props) {
color={panelColor}
config={config}
history={history}
onInvokeComplete={onInvokeComplete}
recordType={recordType}
selectedItems={selectedItems}
/>
Expand Down