fix(field-trip): refactor trip status icon

this does not resolve entirely ibi-group/trimet-mod-otp#302 (a backend change is also needed), but
it does DRY things out a bit and make things a bit easier to follow

re ibi-group/trimet-mod-otp#302

Author: landonreed

lib/components/admin/field-trip-list.js

@@ -10,6 +10,7 @@ import Loading from '../narrative/loading'
 import {getVisibleRequests, TABS} from '../../util/call-taker'
 import {FETCH_STATUS} from '../../util/constants'
 
+import FieldTripStatusIcon from './field-trip-status-icon'
 import {FieldTripRecordButton, WindowHeader} from './styled'
 import DraggableWindow from './draggable-window'
 
@@ -186,10 +187,6 @@ class FieldTripRequestRecord extends Component {
     onClick(request)
   }
 
-  _getStatusIcon = (status) => status
-    ? <Icon className='text-success' type='check' />
-    : <Icon className='text-warning' type='exclamation-circle' />
-
   render () {
     const {active, request} = this.props
     const style = {
@@ -223,10 +220,10 @@ class FieldTripRequestRecord extends Component {
           </span>
           <span style={{display: 'inline-block', width: '50%'}}>
             <span style={{marginLeft: '10px'}}>
-              {this._getStatusIcon(outboundTripStatus)} Outbound
+              <FieldTripStatusIcon status={outboundTripStatus} /> Outbound
             </span>
             <span style={{marginLeft: '10px'}}>
-              {this._getStatusIcon(inboundTripStatus)} Inbound
+              <FieldTripStatusIcon status={inboundTripStatus} /> Inbound
             </span>
           </span>
           <span style={{display: 'block', fontSize: '.9em'}}>

lib/components/admin/trip-status.js

@@ -5,9 +5,9 @@ import { connect } from 'react-redux'
 
 import * as fieldTripActions from '../../actions/field-trip'
 import * as formActions from '../../actions/form'
-import Icon from '../narrative/icon'
 import { getTripFromRequest } from '../../util/call-taker'
 
+import FieldTripStatusIcon from './field-trip-status-icon'
 import {
   Bold,
   Button,
@@ -47,13 +47,11 @@ class TripStatus extends Component {
     viewRequestTripItineraries(request, outbound)
   }
 
-  _renderStatusIcon = () => this.props.status
-    ? <Icon className='text-success' type='check' />
-    : <Icon className='text-warning' type='exclamation-circle' />
+  _tripIsPlanned = () => this.props.status && this.props.trip
 
   _renderTripStatus = () => {
-    const { status, trip } = this.props
-    if (!status || !trip) {
+    const { trip } = this.props
+    if (!this._tripIsPlanned()) {
       return (
         <Para>
           No itineraries planned! Click Plan to plan trip.
@@ -92,7 +90,7 @@ class TripStatus extends Component {
     return (
       <Full>
         <Header>
-          {this._renderStatusIcon()}
+          <FieldTripStatusIcon status={this._tripIsPlanned()} />
           {outbound ? 'Outbound' : 'Inbound'} trip
           <Button bsSize='xs' onClick={this._onPlanTrip}>Plan</Button>
           <Button