Merge pull request #346 from collectionspace/develop

Develop

Author: spirosdi

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cspace-ui",
-  "version": "10.2.0-rc2.0",
+  "version": "10.2.0-rc3.0",
   "description": "CollectionSpace user interface for browsers",
   "author": "Ray Lee <ray.lee@lyrasis.org>",
   "license": "ECL-2.0",

package.json

@@ -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,
@@ -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,
@@ -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')}
     />
   );

src/components/pages/search/SearchResults.jsx

@@ -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 {
@@ -146,6 +147,12 @@ export default class SearchResultBatchPanel extends Component {
             if (location) {
               history.push(location);
             }
+          } else {
+            const { onInvokeComplete } = this.props;
+
+            if (onInvokeComplete) {
+              onInvokeComplete();
+            }
           }
         });
     }

src/components/search/SearchResultBatchPanel.jsx

@@ -18,6 +18,7 @@ const propTypes = {
   history: PropTypes.shape({
     push: PropTypes.func,
   }),
+  onInvokeComplete: PropTypes.func,
   recordType: PropTypes.string,
   isOpen: PropTypes.bool,
 };
@@ -38,6 +39,7 @@ export default function SearchResultSidebar(props) {
   const {
     config,
     history,
+    onInvokeComplete,
     recordType,
     isOpen,
   } = props;
@@ -69,6 +71,7 @@ export default function SearchResultSidebar(props) {
         color={panelColor}
         config={config}
         history={history}
+        onInvokeComplete={onInvokeComplete}
         recordType={recordType}
         selectedItems={selectedItems}
       />

src/components/search/SearchResultSidebar.jsx

@@ -44,7 +44,7 @@ function SortBy({
 
   const {
     defaultSortBy = 'updatedAt',
-    defaultSortDir = 'desc',
+    defaultSortDirection = 'desc',
   } = sortConfig;
 
   const options = Object.keys(sortConfig)
@@ -59,7 +59,7 @@ function SortBy({
       };
     });
 
-  const [sortBy, sortDir] = sort?.split(' ') ?? [defaultSortBy, defaultSortDir];
+  const [sortBy, sortDir] = sort?.split(' ') ?? [defaultSortBy, defaultSortDirection];
   const inputId = 'sortBy';
   const input = (
     <DropdownMenuInput
@@ -70,7 +70,7 @@ function SortBy({
     />
   );
 
-  const sortDirLabel = sortDir ? intl.formatMessage(messages.descendingLabel)
+  const sortDirLabel = sortDir === 'desc' ? intl.formatMessage(messages.descendingLabel)
     : intl.formatMessage(messages.ascendingLabel);
   const sortDirButton = (
     <Button

src/components/search/SortBy.jsx

@@ -64,6 +64,8 @@ export default (configContext) => {
         sortBy: 'collectionspace_core:updatedAt',
         width: 150,
       },
+      defaultSortBy: 'termDisplayName',
+      defaultSortDirection: 'asc',
     },
   };
 };

src/plugins/recordTypes/chronology/columns.js

@@ -64,6 +64,8 @@ export default (configContext) => {
         sortBy: 'collectionspace_core:updatedAt',
         width: 150,
       },
+      defaultSortBy: 'termDisplayName',
+      defaultSortDirection: 'asc',
     },
   };
 };

src/plugins/recordTypes/citation/columns.js

@@ -64,6 +64,8 @@ export default (configContext) => {
         sortBy: 'collectionspace_core:updatedAt',
         width: 150,
       },
+      defaultSortBy: 'termDisplayName',
+      defaultSortDirection: 'asc',
     },
   };
 };

src/plugins/recordTypes/concept/columns.js

@@ -66,6 +66,8 @@ export default (configContext) => {
         sortBy: 'collectionspace_core:updatedAt',
         width: 150,
       },
+      defaultSortBy: 'termDisplayName',
+      defaultSortDirection: 'asc',
     },
   };
 };