Merge pull request #219 from opentripplanner/tripmon-merge-steps

Saved Trips: Remove "wizard" mode

Author: binh-dam-ibigroup

Diff for: lib/components/user/saved-trip-editor.js

@@ -7,31 +7,47 @@ import StackedPaneDisplay from './stacked-pane-display'
  * This component handles editing of an existing trip.
  */
 const SavedTripEditor = ({
+  isCreating,
   monitoredTrip,
   onCancel,
   onComplete,
   onDeleteTrip,
   panes
 }) => {
   if (monitoredTrip) {
-    const paneSequence = [
-      {
-        pane: panes.basics,
-        title: 'Trip overview'
-      },
-      {
-        pane: panes.notifications,
-        title: 'Trip notifications'
-      },
-      {
-        // TODO: Find a better place for this.
-        pane: () => <Button bsStyle='danger' onClick={onDeleteTrip}>Delete Trip</Button>,
-        title: 'Danger zone'
-      }
-    ]
+    let paneSequence
+    if (isCreating) {
+      paneSequence = [
+        {
+          pane: panes.basics,
+          title: 'Trip information'
+        },
+        {
+          pane: panes.notifications,
+          title: 'Trip notifications'
+        }
+      ]
+    } else {
+      paneSequence = [
+        {
+          pane: panes.basics,
+          title: 'Trip overview'
+        },
+        {
+          pane: panes.notifications,
+          title: 'Trip notifications'
+        },
+        {
+          // TODO: Find a better place for this.
+          pane: () => <Button bsStyle='danger' onClick={onDeleteTrip}>Delete Trip</Button>,
+          title: 'Danger zone'
+        }
+      ]
+    }
+
     return (
       <>
-        <h1>{monitoredTrip.tripName}</h1>
+        <h1>{isCreating ? 'Save trip' : monitoredTrip.tripName}</h1>
         <StackedPaneDisplay
           onCancel={onCancel}
           onComplete={onComplete}

Diff for: lib/components/user/saved-trip-screen.js

@@ -6,7 +6,6 @@ import * as uiActions from '../../actions/ui'
 import * as userActions from '../../actions/user'
 import DesktopNav from '../app/desktop-nav'
 import SavedTripEditor from './saved-trip-editor'
-import SavedTripWizard from './saved-trip-wizard'
 import TripBasicsPane from './trip-basics-pane'
 import TripNotificationsPane from './trip-notifications-pane'
 import TripSummaryPane from './trip-summary-pane'
@@ -187,36 +186,22 @@ class SavedTripScreen extends Component {
   }
 
   render () {
-    const { isCreating, monitoredTrips } = this.props
+    const { isCreating } = this.props
     const { monitoredTrip } = this.state
 
-    let content
-    if (isCreating && !hasMaxTripCount(monitoredTrips)) {
-      content = (
-        <SavedTripWizard
-          monitoredTrip={monitoredTrip}
-          onComplete={this._handleSaveNewTrip}
-          panes={this._panes}
-        />
-      )
-    } else {
-      content = (
-        <SavedTripEditor
-          monitoredTrip={monitoredTrip}
-          onCancel={this._goToSavedTrips}
-          onComplete={this._handleSaveTripEdits}
-          onDeleteTrip={this._handleDeleteTrip}
-          panes={this._panes}
-        />
-      )
-    }
-
     return (
       <div className='otp'>
         {/* TODO: Do mobile view. */}
         <DesktopNav />
         <form className='container'>
-          {content}
+          <SavedTripEditor
+            isCreating={isCreating}
+            monitoredTrip={monitoredTrip}
+            onCancel={isCreating ? this._goToTripPlanner : this._goToSavedTrips}
+            onComplete={isCreating ? this._handleSaveNewTrip : this._handleSaveTripEdits}
+            onDeleteTrip={this._handleDeleteTrip}
+            panes={this._panes}
+          />
         </form>
       </div>
     )

Diff for: lib/components/user/saved-trip-wizard.js

@@ -71,13 +71,13 @@ class TripNotificationsPane extends Component {
           </FormGroup>
 
           <Alert bsStyle='warning'>
-            Under construction!
+                    Under construction!
             <FormGroup>
               <ControlLabel>Notify me if:</ControlLabel>
               <Checkbox>A different route or transfer point is recommended</Checkbox>
               <Checkbox>There is an alert for a route or stop that is part of my journey</Checkbox>
 
-              Your arrival or departure time changes by more than:
+                      Your arrival or departure time changes by more than:
               <FormControl componentClass='select' defaultValue={5} placeholder='select'>
                 <option value={5}>5 min. (default)</option>
                 <option value={10}>10 min.</option>