SearchPage: pass Topbar props

src/containers/SearchPage/SearchPage.js

@@ -7,6 +7,7 @@ import config from '../../config';
 import { parse, stringify } from '../../util/urlHelpers';
 import * as propTypes from '../../util/propTypes';
 import { getListingsById } from '../../ducks/marketplaceData.duck';
+import { logout, authenticationInProgress } from '../../ducks/Auth.duck';
 import { manageDisableScrolling, isScrollingDisabled } from '../../ducks/UI.duck';
 import { PageLayout, SearchResultsPanel, Topbar } from '../../components';
 import { searchListings } from './SearchPage.duck';
@@ -22,9 +23,16 @@ const pickSearchParamsOnly = params => {
 
 export const SearchPageComponent = props => {
   const {
+    authInProgress,
+    currentUser,
+    currentUserHasListings,
     history,
+    isAuthenticated,
     listings,
     location,
+    notificationCount,
+    onLogout,
+    onManageDisableScrolling,
     pagination,
     scrollingDisabled,
     searchInProgress,
@@ -88,7 +96,17 @@ export const SearchPageComponent = props => {
 
   return (
     <PageLayout title={`Search page: ${tab}`} scrollingDisabled={scrollingDisabled}>
-      <Topbar history={history} location={location} />
+      <Topbar
+        isAuthenticated={isAuthenticated}
+        authInProgress={authInProgress}
+        currentUser={currentUser}
+        currentUserHasListings={currentUserHasListings}
+        notificationCount={notificationCount}
+        history={history}
+        location={location}
+        onLogout={onLogout}
+        onManageDisableScrolling={onManageDisableScrolling}
+      />
       <div className={css.searchResultSummary}>
         {searchListingsError ? searchError : null}
         {listingsAreLoaded && totalItems > 0 ? resultsFound : null}
@@ -111,22 +129,31 @@ export const SearchPageComponent = props => {
 };
 
 SearchPageComponent.defaultProps = {
-  tab: 'listings',
+  currentUser: null,
   listings: [],
+  notificationCount: 0,
   pagination: null,
-  searchParams: {},
   searchListingsError: null,
+  searchParams: {},
+  tab: 'listings',
 };
 
-const { array, bool, func, instanceOf, oneOf, object, shape, string } = PropTypes;
+const { array, bool, func, instanceOf, number, oneOf, object, shape, string } = PropTypes;
 
 SearchPageComponent.propTypes = {
+  authInProgress: bool.isRequired,
+  currentUser: propTypes.currentUser,
+  currentUserHasListings: bool.isRequired,
+  isAuthenticated: bool.isRequired,
   listings: array,
+  notificationCount: number,
+  onLogout: func.isRequired,
+  onManageDisableScrolling: func.isRequired,
   pagination: propTypes.pagination,
   scrollingDisabled: bool.isRequired,
-  searchParams: object,
   searchInProgress: bool.isRequired,
   searchListingsError: instanceOf(Error),
+  searchParams: object,
   tab: oneOf(['filters', 'listings', 'map']).isRequired,
 
   // from withRouter
@@ -146,6 +173,12 @@ const mapStateToProps = state => {
     searchListingsError,
     searchParams,
   } = state.SearchPage;
+  const { isAuthenticated } = state.Auth;
+  const {
+    currentUser,
+    currentUserHasListings,
+    currentUserNotificationCount: notificationCount,
+  } = state.user;
   return {
     listings: getListingsById(state, currentPageResultIds),
     pagination,
@@ -153,10 +186,16 @@ const mapStateToProps = state => {
     searchListingsError,
     searchParams,
     scrollingDisabled: isScrollingDisabled(state),
+    isAuthenticated,
+    authInProgress: authenticationInProgress(state),
+    currentUser,
+    currentUserHasListings,
+    notificationCount,
   };
 };
 
 const mapDispatchToProps = dispatch => ({
+  onLogout: historyPush => dispatch(logout(historyPush)),
   onManageDisableScrolling: (componentId, disableScrolling) =>
     dispatch(manageDisableScrolling(componentId, disableScrolling)),
 });

src/containers/SearchPage/SearchPage.test.js

@@ -14,6 +14,7 @@ import reducer, {
 } from './SearchPage.duck';
 
 const { LatLng } = types;
+const noop = () => null;
 
 describe('SearchPageComponent', () => {
   it('matches snapshot', () => {
@@ -31,6 +32,11 @@ describe('SearchPageComponent', () => {
       tab: 'listings',
       scrollingDisabled: false,
       searchInProgress: false,
+      authInProgress: false,
+      currentUserHasListings: false,
+      isAuthenticated: false,
+      onLogout: noop,
+      onManageDisableScrolling: noop,
     };
     const tree = renderShallow(<SearchPageComponent {...props} />);
     expect(tree).toMatchSnapshot();

src/containers/SearchPage/__snapshots__/SearchPage.test.js.snap

@@ -3,16 +3,23 @@ exports[`SearchPageComponent matches snapshot 1`] = `
   scrollingDisabled={false}
   title="Search page: listings">
   <Topbar
+    authInProgress={false}
+    currentUser={null}
+    currentUserHasListings={false}
     history={
       Object {
         "push": [Function],
       }
     }
+    isAuthenticated={false}
     location={
       Object {
         "search": "",
       }
-    } />
+    }
+    notificationCount={0}
+    onLogout={[Function]}
+    onManageDisableScrolling={[Function]} />
   <div>
     <h2>
       <FormattedMessage