From e38e24a78382c40defd30ea27567ee5f22295f3b Mon Sep 17 00:00:00 2001
From: Vesa Luusua <vesa.luusua@gmail.com>
Date: Tue, 10 Oct 2017 20:25:50 +0300
Subject: [PATCH] ListingPage: import routeConfiguration and remove
 context.flattenedRoutes

---
 src/containers/ListingPage/ListingPage.js     | 22 +++++++++++--------
 .../ListingPage/ListingPage.test.js           | 18 ++++++---------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/containers/ListingPage/ListingPage.js b/src/containers/ListingPage/ListingPage.js
index 03a54397..d89f04ab 100644
--- a/src/containers/ListingPage/ListingPage.js
+++ b/src/containers/ListingPage/ListingPage.js
@@ -6,6 +6,7 @@ import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 import classNames from 'classnames';
 import config from '../../config';
+import routeConfiguration from '../../routeConfiguration';
 import * as propTypes from '../../util/propTypes';
 import { types } from '../../util/sdkLoader';
 import { createSlug } from '../../util/urlHelpers';
@@ -88,7 +89,7 @@ export const ActionBar = props => {
   }
 };
 
-const { arrayOf, bool, func, instanceOf, number, object, oneOf, shape, string } = PropTypes;
+const { bool, func, instanceOf, number, object, oneOf, shape, string } = PropTypes;
 
 ActionBar.propTypes = {
   isOwnListing: bool.isRequired,
@@ -114,7 +115,7 @@ export class ListingPageComponent extends Component {
   }
 
   handleSubmit(values) {
-    const { flattenedRoutes, history, getListing, params, useInitialValues } = this.props;
+    const { history, getListing, params, useInitialValues } = this.props;
     const listingId = new UUID(params.id);
     const listing = getListing(listingId);
 
@@ -130,15 +131,16 @@ export class ListingPageComponent extends Component {
       },
     };
 
+    const routes = routeConfiguration();
     // Customize checkout page state with current listing and selected bookingDates
-    const { setInitialValues } = findRouteByRouteName('CheckoutPage', flattenedRoutes);
+    const { setInitialValues } = findRouteByRouteName('CheckoutPage', routes);
     useInitialValues(setInitialValues, initialValues);
 
     // Redirect to CheckoutPage
     history.push(
       createResourceLocatorString(
         'CheckoutPage',
-        flattenedRoutes,
+        routes,
         { id: listing.id.uuid, slug: createSlug(listing.attributes.title) },
         {}
       )
@@ -167,7 +169,6 @@ export class ListingPageComponent extends Component {
       sendVerificationEmailInProgress,
       sendVerificationEmailError,
       onResendVerificationEmail,
-      flattenedRoutes,
     } = this.props;
     const listingId = new UUID(params.id);
     const currentListing = ensureListing(getListing(listingId));
@@ -345,9 +346,13 @@ export class ListingPageComponent extends Component {
       { title, price: formattedPrice, siteTitle }
     );
 
-    const canonicalPath = createResourceLocatorString('ListingPageCanonical', flattenedRoutes, {
-      id: listingId.uuid,
-    });
+    const canonicalPath = createResourceLocatorString(
+      'ListingPageCanonical',
+      routeConfiguration(),
+      {
+        id: listingId.uuid,
+      }
+    );
 
     return (
       <Page
@@ -517,7 +522,6 @@ ListingPageComponent.propTypes = {
     push: func.isRequired,
   }).isRequired,
   location: object.isRequired,
-  flattenedRoutes: arrayOf(propTypes.route).isRequired,
   // from injectIntl
   intl: intlShape.isRequired,
   params: shape({
diff --git a/src/containers/ListingPage/ListingPage.test.js b/src/containers/ListingPage/ListingPage.test.js
index be5d685a..1df487f6 100644
--- a/src/containers/ListingPage/ListingPage.test.js
+++ b/src/containers/ListingPage/ListingPage.test.js
@@ -4,10 +4,15 @@ import { FormattedMessage } from 'react-intl';
 import { types } from '../../util/sdkLoader';
 import { createUser, createCurrentUser, createListing, fakeIntl } from '../../util/test-data';
 import { renderShallow } from '../../util/test-helpers';
-import { ListingPageComponent, ActionBar } from './ListingPage';
 import { addMarketplaceEntities } from '../../ducks/marketplaceData.duck';
 import { showListingRequest, showListingError, showListing } from './ListingPage.duck';
 
+// routeConfiguration needs to be imported before tests for ListingPageComponent can be made.
+// Otherwise, ListingPage itself is not initialized correctly when routeConfiguration is imported
+// (loadData call fails).
+import routeConfiguration from '../../routeConfiguration';
+import { ListingPageComponent, ActionBar } from './ListingPage';
+
 const { UUID } = types;
 const noop = () => null;
 
@@ -16,17 +21,8 @@ describe('ListingPage', () => {
     const currentUser = createCurrentUser('user-2');
     const listing1 = createListing('listing1', {}, { author: createUser('user-1') });
     const getListing = () => listing1;
+
     const props = {
-      flattenedRoutes: [
-        // Fake route since a circular dependency prevents using the
-        // full routeConfiguration here
-        {
-          path: '/l/:id',
-          exact: true,
-          name: 'ListingPageCanonical',
-          component: noop,
-        },
-      ],
       location: { search: '' },
       history: {
         push: () => console.log('HistoryPush called'),