From 3d8398fd21549991a40be919bf77606d2afb8b43 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 4 Nov 2019 18:02:00 -0500
Subject: [PATCH 001/553] Trialing some things for the feed comparison.

---
 .../version/FeedVersionNavigator.js           | 20 +++++++++++
 .../components/version/FeedVersionTabs.js     | 35 ++++++++++++++-----
 .../components/version/FeedVersionViewer.js   |  2 ++
 3 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 8bac17fc9..643d3b42b 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -149,7 +149,10 @@ export default class FeedVersionNavigator extends Component<Props, State> {
       versionSection
     } = this.props
     const {feedVersions: versions} = feedSource
+    const comparedVersionIndex = feedVersionIndex - 1;
+
     if (!versions) return null
+    const nothingToCompare = (versions.length < 2);
 
     if (typeof feedVersionIndex === 'undefined') return null
     const version = hasVersions && versions[feedVersionIndex - 1]
@@ -211,7 +214,22 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                     onClick={this._incrementVersion}>
                     <Glyphicon glyph='arrow-right' />
                   </Button>
+
+                  {/* Previous Version Selector Dropdown */}
+
+                  <DropdownButton
+                    href='#'
+                    id='prevVersionSelector'
+                    title={comparedVersionIndex > 0 ? `Comparing to: ${this.messages('version')} ${comparedVersionIndex}` : `<This is the first feed version>`}
+                    disabled={comparedVersionIndex == 0}
+                    >
+                    {versions.map((version, k) => {
+                      k = k + 1
+                      return <MenuItem key={k} eventKey={k} disabled={k >= feedVersionIndex}>{k}. {version.name}</MenuItem>
+                    })}
+                  </DropdownButton>
                 </ButtonGroup>
+
               }
               <ButtonToolbar className='pull-right'>
                 <ButtonGroup>
@@ -295,6 +313,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
               exportVersionShapes={exportVersionShapes}
               feedSource={feedSource}
               feedVersionIndex={feedVersionIndex}
+              comparedVersionIndex={comparedVersionIndex}
               fetchGTFSEntities={fetchGTFSEntities}
               fetchValidationErrors={fetchValidationErrors}
               gtfs={gtfs}
@@ -311,6 +330,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
               renameFeedVersion={renameFeedVersion}
               user={user}
               version={this.props.version}
+              comparedVersion={versions[comparedVersionIndex - 1]}
               versionSection={versionSection || null}
               versions={versions} />
           </Col>
diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 29c1d8df8..54f2b9a75 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -2,7 +2,7 @@
 
 import moment from 'moment'
 import React, {Component} from 'react'
-import {Row, Col, Tabs, Tab, ListGroupItem} from 'react-bootstrap'
+import {Row, Col, Tabs, Tab, ListGroupItem, Label, Badge} from 'react-bootstrap'
 import numeral from 'numeral'
 
 import {getComponentMessages, isModuleEnabled} from '../../../common/util/config'
@@ -20,11 +20,13 @@ import type {FeedVersion} from '../../../types'
 
 type Props = {
   feedVersionIndex: number,
+  comparedVersionIndex: number,
   isochroneBand: any,
   onChangeIsochroneBand: number => void,
   selectTab: string => void,
   tab: string,
-  version: FeedVersion
+  version: FeedVersion,
+  comparedVersion: FeedVersion
 }
 
 export default class FeedVersionTabs extends Component<Props> {
@@ -69,10 +71,12 @@ export default class FeedVersionTabs extends Component<Props> {
   render () {
     const {
       feedVersionIndex,
+      comparedVersionIndex,
       isochroneBand,
       onChangeIsochroneBand,
       tab,
-      version
+      version,
+      comparedVersion
     } = this.props
     const tableOptions = {
       striped: true,
@@ -87,7 +91,7 @@ export default class FeedVersionTabs extends Component<Props> {
     const timeTableOptions = {...tableOptions}
     // Add default page zie for timetable options
     timeTableOptions.options = {...timeTableOptions.options, sizePerPage: 50}
-    const countFields = ['agencyCount', 'routeCount', 'stopCount', 'tripCount', 'stopTimesCount']
+    const countFields = ['agencyCount', 'routeCount', 'stopCount', 'tripCount', 'stopTimesCount', 'errorCount']
     const daysActive = moment(version.validationSummary.endDate)
       .diff(moment(version.validationSummary.startDate), 'days')
     return (
@@ -101,16 +105,31 @@ export default class FeedVersionTabs extends Component<Props> {
           unmountOnExit>
           <Tab eventKey={'feed'} title='Summary'>
             <Row>
-              {countFields.map(c => (
+              {countFields.map(c => {
+                const summary = version.validationSummary;
+                const diff = comparedVersion ? (summary[c] - comparedVersion.validationSummary[c]) : 0;
+
+                return (
                 <Col xs={2} className='text-center' key={c}>
                   <p
-                    title={`${version.validationSummary[c]}`}
+                    title={`${summary[c]}` /* do we need this? */ }
                     style={{marginBottom: '0px', fontSize: '200%'}}>
-                    {numeral(version.validationSummary[c]).format('0 a')}
+                    {numeral(summary[c]).format('0a ')}
+
+                    {comparedVersion ?
+                      <Label
+                        style={{fontSize: '40%'}}
+                        bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'warning' : 'default')}
+                        title={`Compared to Version ${comparedVersionIndex}`}>
+                        {diff == 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))}
+                        { /*&#x2197;+{summary[c] - comparedVersion.validationSummary[c]*/}
+                      </Label>
+                       : null}
                   </p>
                   <p style={{marginBottom: '0px'}}>{this.messages(c)}</p>
                 </Col>
-              ))}
+              );
+            })}
               <Col xs={2} className='text-center'>
                 <p
                   title={daysActive}
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 7ecc1613e..d28148716 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -31,6 +31,7 @@ export type Props = {
   feedSource: Feed,
   feedSource: Feed,
   feedVersionIndex: number,
+  comparedVersionIndex: number,
   fetchGTFSEntities: typeof versionsActions.fetchGTFSEntities,
   fetchValidationErrors: typeof versionsActions.fetchValidationErrors,
   gtfs: GtfsState,
@@ -47,6 +48,7 @@ export type Props = {
   renameFeedVersion: typeof versionsActions.renameFeedVersion,
   user: ManagerUserState,
   version: FeedVersion,
+  comparedVersion: FeedVersion,
   versionSection: ?string,
   versions: Array<FeedVersion>
 }

From d566f98a852838c7544d809254e52b9543d13a8e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 26 Nov 2019 10:28:49 -0500
Subject: [PATCH 002/553] feat(Select compared version): User can pick another
 (older) feed version to compare stats to the se

---
 lib/gtfs/reducers/filter.js                   |  6 +++
 lib/manager/actions/versions.js               | 22 ++++++++
 .../version/FeedVersionNavigator.js           | 23 ++++++--
 .../components/version/FeedVersionTabs.js     | 52 ++++++++++---------
 .../components/version/FeedVersionViewer.js   |  4 +-
 .../containers/ActiveFeedVersionNavigator.js  | 13 ++++-
 lib/types/reducers.js                         |  1 +
 7 files changed, 87 insertions(+), 34 deletions(-)

diff --git a/lib/gtfs/reducers/filter.js b/lib/gtfs/reducers/filter.js
index 8ffb6547e..ea56269ee 100644
--- a/lib/gtfs/reducers/filter.js
+++ b/lib/gtfs/reducers/filter.js
@@ -8,6 +8,7 @@ import type {FilterState} from '../../types/reducers'
 
 export const defaultState = {
   activeFeeds: {},
+  comparedVersion: null,
   dateTimeFilter: {
     date: moment().format('YYYYMMDD'),
     from: 0, // 12 AM
@@ -50,11 +51,16 @@ const gtfsFilter = (state: FilterState = defaultState, action: Action): FilterSt
       })
     case 'SET_ACTIVE_FEEDVERSION':
       return update(state, {
+        comparedVersion: {$set: action.payload ? action.payload.previousVersionId : null},
         showAllRoutesOnMap: {$set: false},
         patternFilter: {$set: null},
         routeFilter: {$set: null},
         version: {$set: action.payload ? action.payload.id : null}
       })
+    case 'SET_COMPARED_FEEDVERSION':
+      return update(state, {
+        comparedVersion: {$set: action.payload ? action.payload.id : null}
+      })
     case 'UPDATE_GTFS_MAP_STATE':
       return update(state, {map: {$set: action.payload}})
     case 'UPDATE_GTFS_PERMISSION_FILTER':
diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index c1969ba2c..0e1542cf6 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -115,6 +115,17 @@ export function setActiveVersion (version: FeedVersion) {
     }
   }
 }
+// setComparedVersion used in components
+export const settingComparedVersion = createAction(
+  'SET_COMPARED_FEEDVERSION',
+  (payload: FeedVersion) => payload
+)
+export function setComparedVersion (version: FeedVersion) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    // Dispatch action to set value in reducer.
+    dispatch(settingComparedVersion(version))
+  }
+}
 const uploadingFeed = createVoidPayloadAction('UPLOADING_FEED')
 
 export type VersionActions = ActionType<typeof deletingFeedVersion> |
@@ -613,6 +624,17 @@ export function setVersionIndex (
   }
 }
 
+export function setComparedVersionIndex (
+  feed: Feed,
+  index: number
+) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    if (feed.feedVersions) {
+      dispatch(setComparedVersion(feed.feedVersions[index - 1]))
+    }
+  }
+}
+
 /**
  * Starts the export shapes server job for a particular feed version.
  *
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 643d3b42b..c7faf8650 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -24,6 +24,7 @@ import type {FeedVersion, GtfsPlusValidation, Note} from '../../../types'
 import type {GtfsState, ManagerUserState} from '../../../types/reducers'
 
 type Props = ContainerProps & {
+  comparedVersionIndex: number,
   createDeploymentFromFeedSource: typeof deploymentActions.createDeploymentFromFeedSource,
   deleteFeedVersion: typeof versionsActions.deleteFeedVersion,
   downloadFeedViaToken: typeof versionsActions.downloadFeedViaToken,
@@ -42,6 +43,7 @@ type Props = ContainerProps & {
   publishFeedVersion: typeof versionsActions.publishFeedVersion,
   renameFeedVersion: typeof versionsActions.renameFeedVersion,
   runFetchFeed: typeof feedsActions.runFetchFeed,
+  setComparedVersionIndex: typeof versionsActions.setComparedVersionIndex,
   setVersionIndex: typeof versionsActions.setVersionIndex,
   sortedVersions: Array<FeedVersion>,
   uploadFeed: typeof versionsActions.uploadFeed,
@@ -121,12 +123,19 @@ export default class FeedVersionNavigator extends Component<Props, State> {
     }
   }
 
+  _onSelectComparedVersion = (index: number) => {
+    if (index !== this.props.comparedVersionIndex) {
+      this.props.setComparedVersionIndex(this.props.feedSource, index)
+    }
+  }
+
   render () {
     const versionTitleStyle = {
       fontSize: '24px',
       fontWeight: 'bold'
     }
     const {
+      comparedVersionIndex,
       deleteDisabled,
       deleteFeedVersion,
       disabled,
@@ -149,10 +158,8 @@ export default class FeedVersionNavigator extends Component<Props, State> {
       versionSection
     } = this.props
     const {feedVersions: versions} = feedSource
-    const comparedVersionIndex = feedVersionIndex - 1;
 
     if (!versions) return null
-    const nothingToCompare = (versions.length < 2);
 
     if (typeof feedVersionIndex === 'undefined') return null
     const version = hasVersions && versions[feedVersionIndex - 1]
@@ -221,11 +228,17 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                     href='#'
                     id='prevVersionSelector'
                     title={comparedVersionIndex > 0 ? `Comparing to: ${this.messages('version')} ${comparedVersionIndex}` : `<This is the first feed version>`}
-                    disabled={comparedVersionIndex == 0}
-                    >
+                    disabled={comparedVersionIndex === 0}
+                    onSelect={this._onSelectComparedVersion}>
                     {versions.map((version, k) => {
                       k = k + 1
-                      return <MenuItem key={k} eventKey={k} disabled={k >= feedVersionIndex}>{k}. {version.name}</MenuItem>
+                      if (k >= feedVersionIndex) {
+                        return (
+                          <MenuItem key={k} disabled eventKey={null}>
+                            {k}. (Cannot compare with self or more recent)
+                          </MenuItem>
+                        )
+                      } else return <MenuItem key={k} eventKey={k}>{k}. {version.name}</MenuItem>
                     })}
                   </DropdownButton>
                 </ButtonGroup>
diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 54f2b9a75..86a094a2d 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -2,7 +2,7 @@
 
 import moment from 'moment'
 import React, {Component} from 'react'
-import {Row, Col, Tabs, Tab, ListGroupItem, Label, Badge} from 'react-bootstrap'
+import {Row, Col, Tabs, Tab, ListGroupItem, Label} from 'react-bootstrap'
 import numeral from 'numeral'
 
 import {getComponentMessages, isModuleEnabled} from '../../../common/util/config'
@@ -19,14 +19,14 @@ import type {Element} from 'react'
 import type {FeedVersion} from '../../../types'
 
 type Props = {
-  feedVersionIndex: number,
+  comparedVersion: FeedVersion,
   comparedVersionIndex: number,
+  feedVersionIndex: number,
   isochroneBand: any,
   onChangeIsochroneBand: number => void,
   selectTab: string => void,
   tab: string,
-  version: FeedVersion,
-  comparedVersion: FeedVersion
+  version: FeedVersion
 }
 
 export default class FeedVersionTabs extends Component<Props> {
@@ -106,30 +106,32 @@ export default class FeedVersionTabs extends Component<Props> {
           <Tab eventKey={'feed'} title='Summary'>
             <Row>
               {countFields.map(c => {
-                const summary = version.validationSummary;
-                const diff = comparedVersion ? (summary[c] - comparedVersion.validationSummary[c]) : 0;
+                const summary = version.validationSummary
+                const diff = comparedVersion ? (summary[c] - comparedVersion.validationSummary[c]) : 0
 
                 return (
-                <Col xs={2} className='text-center' key={c}>
-                  <p
-                    title={`${summary[c]}` /* do we need this? */ }
-                    style={{marginBottom: '0px', fontSize: '200%'}}>
-                    {numeral(summary[c]).format('0a ')}
+                  <Col xs={2} className='text-center' key={c}>
+                    <div
+                      title={`${summary[c]}` /* do we need this? */}
+                      style={{marginBottom: '0px', fontSize: '200%'}}>
+                      {numeral(summary[c]).format('0a')}
+                      {comparedVersion
+                        ? <sup style={{width: 0, display: 'inline-block'}}>
+                          <Label
+                            style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
+                            bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'warning' : 'default')}
+                            title={`Compared to Version ${comparedVersionIndex}`}>
+                            {diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))}
+                          </Label>
+                        </sup>
+                        : null}
 
-                    {comparedVersion ?
-                      <Label
-                        style={{fontSize: '40%'}}
-                        bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'warning' : 'default')}
-                        title={`Compared to Version ${comparedVersionIndex}`}>
-                        {diff == 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))}
-                        { /*&#x2197;+{summary[c] - comparedVersion.validationSummary[c]*/}
-                      </Label>
-                       : null}
-                  </p>
-                  <p style={{marginBottom: '0px'}}>{this.messages(c)}</p>
-                </Col>
-              );
-            })}
+                    </div>
+
+                    <p style={{marginBottom: '0px'}}>{this.messages(c)}</p>
+                  </Col>
+                )
+              })}
               <Col xs={2} className='text-center'>
                 <p
                   title={daysActive}
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index d28148716..0be858220 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -22,6 +22,8 @@ import type {Feed, FeedVersion, GtfsPlusValidation, Note, Project} from '../../.
 import type {GtfsState, ManagerUserState} from '../../../types/reducers'
 
 export type Props = {
+  comparedVersion: FeedVersion,
+  comparedVersionIndex: number,
   deleteDisabled: ?boolean,
   deleteFeedVersion: typeof versionsActions.deleteFeedVersion,
   downloadFeedViaToken: typeof versionsActions.downloadFeedViaToken,
@@ -31,7 +33,6 @@ export type Props = {
   feedSource: Feed,
   feedSource: Feed,
   feedVersionIndex: number,
-  comparedVersionIndex: number,
   fetchGTFSEntities: typeof versionsActions.fetchGTFSEntities,
   fetchValidationErrors: typeof versionsActions.fetchValidationErrors,
   gtfs: GtfsState,
@@ -48,7 +49,6 @@ export type Props = {
   renameFeedVersion: typeof versionsActions.renameFeedVersion,
   user: ManagerUserState,
   version: FeedVersion,
-  comparedVersion: FeedVersion,
   versionSection: ?string,
   versions: Array<FeedVersion>
 }
diff --git a/lib/manager/containers/ActiveFeedVersionNavigator.js b/lib/manager/containers/ActiveFeedVersionNavigator.js
index 1f5ff2ac1..cd07b4819 100644
--- a/lib/manager/containers/ActiveFeedVersionNavigator.js
+++ b/lib/manager/containers/ActiveFeedVersionNavigator.js
@@ -15,6 +15,7 @@ import {
   mergeVersions,
   publishFeedVersion,
   renameFeedVersion,
+  setComparedVersionIndex,
   setVersionIndex,
   uploadFeed
 } from '../actions/versions'
@@ -39,7 +40,7 @@ export type Props = {
 }
 
 const mapStateToProps = (state: AppState, ownProps: Props) => {
-  let feedVersionIndex
+  let feedVersionIndex, comparedVersionIndex
   const {routeParams, feedSource} = ownProps
   const {feedVersions} = feedSource
   const {feedVersionIndex: fvi, subpage} = routeParams
@@ -63,7 +64,7 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
     ? feedVersions.sort(versionsLastUpdatedComparator)
     : []
 
-  let version
+  let version, comparedVersion
 
   if (
     hasVersions &&
@@ -72,15 +73,22 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
     feedVersions.length >= feedVersionIndex
   ) {
     version = sortedVersions[feedVersionIndex - 1]
+
+    if (gtfs.filter.comparedVersion) {
+      comparedVersionIndex = sortedVersions.findIndex(feedVer => feedVer.id === gtfs.filter.comparedVersion) + 1
+      comparedVersion = sortedVersions[comparedVersionIndex - 1]
+    }
   }
   return {
     gtfs,
     hasVersions,
     feedVersionIndex,
+    comparedVersionIndex,
     gtfsPlusValidation: state.gtfsplus.validation,
     sortedVersions,
     user: state.user,
     version,
+    comparedVersion,
     versionIndexDoesNotExist,
     versionSection: subpage
   }
@@ -101,6 +109,7 @@ const mapDispatchToProps = {
   publishFeedVersion,
   renameFeedVersion,
   runFetchFeed,
+  setComparedVersionIndex,
   setVersionIndex,
   uploadFeed
 }
diff --git a/lib/types/reducers.js b/lib/types/reducers.js
index ee4828290..aad63eb90 100644
--- a/lib/types/reducers.js
+++ b/lib/types/reducers.js
@@ -281,6 +281,7 @@ export type DateTimeFilter = {
 
 export type FilterState = {
   activeFeeds: any,
+  comparedVersion: any,
   dateTimeFilter: DateTimeFilter,
   loadedFeeds: Array<any>,
   map: MapFilter,

From fde413bdba9aefd12c9a260345e7210e47da4600 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 10 Dec 2019 14:34:17 -0500
Subject: [PATCH 003/553] improvement(Validation stats): Move validation stats
 comparison from summary to validation link on t

---
 .../components/version/FeedVersionTabs.js     |  6 +-
 .../components/version/FeedVersionViewer.js   | 33 +++++++--
 yarn.lock                                     | 71 +++++++++++++++++--
 3 files changed, 96 insertions(+), 14 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 86a094a2d..4f51ff18c 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -91,7 +91,7 @@ export default class FeedVersionTabs extends Component<Props> {
     const timeTableOptions = {...tableOptions}
     // Add default page zie for timetable options
     timeTableOptions.options = {...timeTableOptions.options, sizePerPage: 50}
-    const countFields = ['agencyCount', 'routeCount', 'stopCount', 'tripCount', 'stopTimesCount', 'errorCount']
+    const countFields = ['agencyCount', 'routeCount', 'stopCount', 'tripCount', 'stopTimesCount' /*, 'errorCount'*/]
     const daysActive = moment(version.validationSummary.endDate)
       .diff(moment(version.validationSummary.startDate), 'days')
     return (
@@ -119,9 +119,9 @@ export default class FeedVersionTabs extends Component<Props> {
                         ? <sup style={{width: 0, display: 'inline-block'}}>
                           <Label
                             style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
-                            bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'warning' : 'default')}
+                            bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'danger' : 'default')}
                             title={`Compared to Version ${comparedVersionIndex}`}>
-                            {diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))}
+                            {diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a')) /* refactor */}
                           </Label>
                         </sup>
                         : null}
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 0be858220..fb2a6f123 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -4,6 +4,7 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import { Row, Col, Panel, Label, Glyphicon, ListGroup, ListGroupItem } from 'react-bootstrap'
 import { LinkContainer } from 'react-router-bootstrap'
+import numeral from 'numeral'
 
 import * as plusActions from '../../../gtfsplus/actions/gtfsplus'
 import * as versionsActions from '../../actions/versions'
@@ -63,6 +64,7 @@ export default class FeedVersionViewer extends Component<Props> {
       newNotePosted,
       notesRequested,
       version,
+      comparedVersion,
       versions,
       versionSection,
       user
@@ -91,6 +93,7 @@ export default class FeedVersionViewer extends Component<Props> {
         <Col xs={12} sm={3}>
           <VersionSectionSelector
             version={version}
+            comparedVersion={comparedVersion}
             gtfsPlusValidation={this.props.gtfsPlusValidation}
             feedVersionIndex={feedVersionIndex}
             versionSection={versionSection} />
@@ -128,11 +131,12 @@ type SelectorProps = {
   feedVersionIndex: number,
   gtfsPlusValidation: GtfsPlusValidation,
   version: FeedVersion,
+  comparedVersion: FeedVersion,
   versionSection: ?string
 }
 
 class VersionSectionSelector extends Component<SelectorProps> {
-  _renderIssuesLabel (version) {
+  _renderIssuesLabel (version, comparedVersion) {
     const tableFatalExceptions = getTableFatalExceptions(version)
     const {validationSummary, feedLoadResult} = version
     const hasCriticalError = validationSummary.loadStatus !== 'SUCCESS' ||
@@ -146,11 +150,26 @@ class VersionSectionSelector extends Component<SelectorProps> {
     const text = hasCriticalError
       ? 'critical error'
       : validationSummary.errorCount
+    const diff = comparedVersion 
+      ? validationSummary.errorCount - comparedVersion.validationSummary.errorCount
+      : 0
+    const diffColor = diff > 0 ? 'danger' : (diff < 0 ? 'success' : 'default')
+    const diffText = comparedVersion 
+      ? diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))
+      : ''
     return (
-      <Label bsStyle={color}>
-        {text}
-      </Label>
-    )
+      <span>
+        <Label bsStyle={color}>
+          {text}
+        </Label>
+        {comparedVersion 
+          ? <Label bsStyle={diffColor} style={{paddingLeft: '0.2em', paddingRight: '0.2em'}}>
+            {diffText}
+            </Label>
+          : ''
+        }
+      </span>
+  )
   }
 
   _getGtfsPlusIssueCount = (gtfsPlusValidation: GtfsPlusValidation) => {
@@ -177,7 +196,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
   }
 
   render () {
-    const { version } = this.props
+    const { version, comparedVersion } = this.props
     return (
       <Panel>
         <ListGroup fill>
@@ -190,7 +209,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
             to={`/feed/${version.feedSource.id}/version/${this.props.feedVersionIndex}/issues`}
             active={this.props.versionSection === 'issues'}>
             <ListGroupItem>
-              <Icon type='exclamation-triangle' /> Validation issues {this._renderIssuesLabel(version)}
+              <Icon type='exclamation-triangle' /> Validation issues {this._renderIssuesLabel(version, comparedVersion)}
             </ListGroupItem>
           </LinkContainer>
           {isModuleEnabled('gtfsplus')
diff --git a/yarn.lock b/yarn.lock
index 05a99cee5..773d58143 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6045,6 +6045,13 @@ hoist-non-react-statics@^3.1.0:
   dependencies:
     react-is "^16.3.2"
 
+hoist-non-react-statics@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
+  integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
+  dependencies:
+    react-is "^16.7.0"
+
 homedir-polyfill@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
@@ -6195,7 +6202,19 @@ iconv-lite@0.4.8:
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.8.tgz#c6019a7595f2cefca702eab694a010bcd9298d20"
   integrity sha1-xgGadZXyzvynAuq2lKAQvNkpjSA=
 
-idtoken-verifier@^1.0.1, idtoken-verifier@^1.1.0, idtoken-verifier@^1.2.0:
+idtoken-verifier@^1.0.1, idtoken-verifier@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/idtoken-verifier/-/idtoken-verifier-1.4.1.tgz#032d7720fdd091830d22f694eb94b5f6644b0d3b"
+  integrity sha512-BoJc00Gj37hrNlx7NYmd8uJFvvC9/FiWDKugDluP4JmgOGT/AfNlPfnRmi9fHEEqSatnIIr3WTyf0dlhHfSHnA==
+  dependencies:
+    base64-js "^1.2.0"
+    crypto-js "^3.1.9-1"
+    jsbn "^0.1.0"
+    promise-polyfill "^8.1.3"
+    unfetch "^4.1.0"
+    url-join "^1.1.0"
+
+idtoken-verifier@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/idtoken-verifier/-/idtoken-verifier-1.2.0.tgz#4654f1f07ab7a803fc9b1b8b36057e2a87ad8b09"
   integrity sha512-8jmmFHwdPz8L73zGNAXHHOV9yXNC+Z0TUBN5rafpoaFaLFltlIFr1JkQa3FYAETP23eSsulVw0sBiwrE8jqbUg==
@@ -10742,6 +10761,11 @@ promise-inflight@^1.0.1, promise-inflight@~1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+promise-polyfill@^8.1.3:
+  version "8.1.3"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116"
+  integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==
+
 promise-retry@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
@@ -11273,6 +11297,11 @@ react-is@^16.3.2, react-is@^16.6.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0"
   integrity sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA==
 
+react-is@^16.7.0:
+  version "16.11.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz#b85dfecd48ad1ce469ff558a882ca8e8313928fa"
+  integrity sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw==
+
 react-is@^16.8.1, react-is@^16.8.4:
   version "16.8.6"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
@@ -11325,7 +11354,20 @@ react-pure-render@^1.0.2:
   resolved "https://registry.yarnpkg.com/react-pure-render/-/react-pure-render-1.0.2.tgz#9d8a928c7f2c37513c2d064e57b3e3c356e9fabb"
   integrity sha1-nYqSjH8sN1E8LQZOV7Pjw1bp+rs=
 
-react-redux@^5.0.2, react-redux@^5.0.3:
+react-redux@^5.0.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.2.tgz#b19cf9e21d694422727bf798e934a916c4080f57"
+  integrity sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
+    hoist-non-react-statics "^3.3.0"
+    invariant "^2.2.4"
+    loose-envify "^1.1.0"
+    prop-types "^15.6.1"
+    react-is "^16.6.0"
+    react-lifecycles-compat "^3.0.0"
+
+react-redux@^5.0.3:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.1.tgz#88e368682c7fa80e34e055cd7ac56f5936b0f52f"
   integrity sha512-LE7Ned+cv5qe7tMV5BPYkGQ5Lpg8gzgItK07c67yHvJ8t0iaD9kPFPAli/mYkiyJYrs2pJgExR2ZgsGqlrOApg==
@@ -11719,7 +11761,18 @@ reduce-reducers@^0.4.3:
   resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.4.3.tgz#8e052618801cd8fc2714b4915adaa8937eb6d66c"
   integrity sha512-+CNMnI8QhgVMtAt54uQs3kUxC3Sybpa7Y63HR14uGLgI9/QR5ggHvpxwhGGe3wmx5V91YwqQIblN9k5lspAmGw==
 
-redux-actions@^2.0.2, redux-actions@^2.2.1:
+redux-actions@^2.0.2:
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.6.5.tgz#bdca548768ee99832a63910c276def85e821a27e"
+  integrity sha512-pFhEcWFTYNk7DhQgxMGnbsB1H2glqhQJRQrtPb96kD3hWiZRzXHwwmFPswg6V2MjraXRXWNmuP9P84tvdLAJmw==
+  dependencies:
+    invariant "^2.2.4"
+    just-curry-it "^3.1.0"
+    loose-envify "^1.4.0"
+    reduce-reducers "^0.4.3"
+    to-camel-case "^1.0.0"
+
+redux-actions@^2.2.1:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.6.4.tgz#e1d9d7d987d274071b0134b707365d3e25ba3b26"
   integrity sha512-Gho+gnsvyR5h0pApoMdHLYssVEu4I0DNqyC91u43Xy/BvLrEddEMtukLF8oL3WXUy7DjxqKOKZHKmpKyN6hxlQ==
@@ -13734,6 +13787,11 @@ underscore@~1.7.0:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
   integrity sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=
 
+unfetch@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db"
+  integrity sha512-crP/n3eAPUJxZXM9T80/yv0YhkTEx2K1D3h7D1AJM6fzsWZrxdyRuLN0JH/dkZh1LNH8LxCnBzoPFCPbb2iGpg==
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -14159,7 +14217,12 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
-winchan@^0.2.0, winchan@^0.2.1:
+winchan@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/winchan/-/winchan-0.2.2.tgz#6766917b88e5e1cb75f455ffc7cc13f51e5c834e"
+  integrity sha512-pvN+IFAbRP74n/6mc6phNyCH8oVkzXsto4KCHPJ2AScniAnA1AmeLI03I2BzjePpaClGSI4GUMowzsD3qz5PRQ==
+
+winchan@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/winchan/-/winchan-0.2.1.tgz#19b334e49f7c07c0849f921f405fad87dfc8a1da"
   integrity sha512-QrG9q+ObfmZBxScv0HSCqFm/owcgyR5Sgpiy1NlCZPpFXhbsmNHhTiLWoogItdBUi0fnU7Io/5ABEqRta5/6Dw==

From 0fdd8e648cc8fcc3e5b80cc8bf60d957b4329709 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 28 Jan 2020 14:56:12 -0500
Subject: [PATCH 004/553] fix: Remove instances of BsLabel in
 FeedVersionViewer; bump react-bootstrap to 0.33.

---
 .../components/version/FeedVersionViewer.js   |   6 +-
 package.json                                  |   2 +-
 yarn.lock                                     | 121 +++++++++++++-----
 3 files changed, 92 insertions(+), 37 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 3ab1061bb..fb2a6f123 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -2,7 +2,7 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import { Row, Col, Panel, Label as BsLabel, Glyphicon, ListGroup, ListGroupItem } from 'react-bootstrap'
+import { Row, Col, Panel, Label, Glyphicon, ListGroup, ListGroupItem } from 'react-bootstrap'
 import { LinkContainer } from 'react-router-bootstrap'
 import numeral from 'numeral'
 
@@ -192,7 +192,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : <Icon type='check' />
     return issueCount === null
       ? <span><Loading small inline /></span>
-      : <span><BsLabel bsStyle={color}>{text}</BsLabel></span>
+      : <span><Label bsStyle={color}>{text}</Label></span>
   }
 
   render () {
@@ -227,7 +227,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
             active={this.props.versionSection === 'comments'}>
             <ListGroupItem>
               <Glyphicon glyph='comment' /> Version comments{' '}
-              <BsLabel>{version.noteCount}</BsLabel>
+              <Label>{version.noteCount}</Label>
             </ListGroupItem>
           </LinkContainer>
         </ListGroup>
diff --git a/package.json b/package.json
index 83fe450ba..a262684f0 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "react": "^15.4.1",
     "react-addons-shallow-compare": "^15.4.1",
     "react-addons-update": "^15.4.1",
-    "react-bootstrap": "^0.30.0-rc.2",
+    "react-bootstrap": "^0.33",
     "react-bootstrap-datetimepicker": "^0.0.22",
     "react-bootstrap-table": "https://github.com/conveyal/react-bootstrap-table.git",
     "react-color": "^2.3.4",
diff --git a/yarn.lock b/yarn.lock
index f65d7f3a5..7b6115e57 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -721,6 +721,14 @@
     "@babel/plugin-transform-react-jsx-self" "^7.0.0"
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
+"@babel/runtime-corejs2@^7.0.0":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.8.3.tgz#b62a61e0c41a90d2d91181fda6de21cecd3a9734"
+  integrity sha512-yxJXBKdIogkfF+wgeJrvU7Afp5ugBi92NzSgNPWWKVoQAlixH3gwMP6yYYr7SV1Dbc0HmNw7WUJkV5ksvtQuHg==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.2"
+
 "@babel/runtime-corejs2@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.5.5.tgz#c3214c08ef20341af4187f1c9fbdc357fbec96b2"
@@ -750,6 +758,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.6.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
+  integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
@@ -1336,11 +1351,24 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.8.tgz#e5d71173c95533be9842b2c798978f095f912aab"
   integrity sha512-szA3x/3miL90ZJxUCzx9haNbK5/zmPieGraZEe4WI+3srN0eGLiT22NXeMHmyhNEopn+IrxqMc7wdVwvPl8meg==
 
+"@types/prop-types@*":
+  version "15.7.3"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
+  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
+
 "@types/q@^1.5.1":
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
+"@types/react@^16.9.11":
+  version "16.9.19"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.19.tgz#c842aa83ea490007d29938146ff2e4d9e4360c40"
+  integrity sha512-LJV97//H+zqKWMms0kvxaKYJDG05U2TtQB3chRLF8MPNs+MQh/H1aGlyDUxjaHvu08EAGerdX2z4LTBc7ns77A==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^2.2.0"
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -3805,6 +3833,11 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
+csstype@^2.2.0:
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.8.tgz#0fb6fc2417ffd2816a418c9336da74d7f07db431"
+  integrity sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA==
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -4183,7 +4216,7 @@ dom-helpers@3.2.1:
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
   integrity sha1-MgPgf+0he9H0JLAZc1WC/Deyglo=
 
-"dom-helpers@^2.4.0 || ^3.0.0", dom-helpers@^3.2.0, dom-helpers@^3.3.1, dom-helpers@^3.4.0:
+"dom-helpers@^2.4.0 || ^3.0.0", dom-helpers@^3.2.0, dom-helpers@^3.2.1, dom-helpers@^3.3.1, dom-helpers@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
   integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
@@ -7563,7 +7596,7 @@ jwt-decode@^2.1.0:
   resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-2.2.0.tgz#7d86bd56679f58ce6a84704a657dd392bba81a79"
   integrity sha1-fYa9VmefWM5qhHBKZX3TkruoGnk=
 
-keycode@^2.1.2:
+keycode@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
   integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
@@ -10789,6 +10822,14 @@ promzard@^0.3.0:
   dependencies:
     read "1"
 
+prop-types-extra@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz#58c3b74cbfbb95d304625975aa2f0848329a010b"
+  integrity sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==
+  dependencies:
+    react-is "^16.3.2"
+    warning "^4.0.0"
+
 prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
@@ -11175,20 +11216,22 @@ react-bootstrap-datetimepicker@^0.0.22:
     classnames "^2.1.2"
     react-modal "^1.4.0"
 
-react-bootstrap@^0.30.0-rc.2:
-  version "0.30.10"
-  resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-0.30.10.tgz#dbba6909595f2af4d91937db0f96ec8c2df2d1a8"
-  integrity sha1-27ppCVlfKvTZGTfbD5bsjC3y0ag=
+react-bootstrap@^0.33:
+  version "0.33.1"
+  resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-0.33.1.tgz#e072592aa143b9792526281272eca754bc9a4940"
+  integrity sha512-qWTRravSds87P8WC82tETy2yIso8qDqlIm0czsrduCaYAFtHuyLu0XDbUlfLXeRzqgwm5sRk2wRaTNoiVkk/YQ==
   dependencies:
-    babel-runtime "^6.11.6"
+    "@babel/runtime-corejs2" "^7.0.0"
     classnames "^2.2.5"
     dom-helpers "^3.2.0"
-    invariant "^2.2.1"
-    keycode "^2.1.2"
-    prop-types "^15.5.6"
-    react-overlays "^0.6.12"
+    invariant "^2.2.4"
+    keycode "^2.2.0"
+    prop-types "^15.6.1"
+    prop-types-extra "^1.0.1"
+    react-overlays "^0.9.0"
     react-prop-types "^0.4.0"
-    uncontrollable "^4.0.1"
+    react-transition-group "^2.0.0"
+    uncontrollable "^7.0.2"
     warning "^3.0.0"
 
 react-color@^2.3.4:
@@ -11301,14 +11344,16 @@ react-modal@^1.4.0:
     prop-types "^15.5.7"
     react-dom-factories "^1.0.0"
 
-react-overlays@^0.6.12:
-  version "0.6.12"
-  resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.6.12.tgz#a079c750cc429d7db4c7474a95b4b54033e255c3"
-  integrity sha1-oHnHUMxCnX20x0dKlbS1QDPiVcM=
+react-overlays@^0.9.0:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.9.1.tgz#d4702bfe5b5e9335b676ff5a940253771fdeed12"
+  integrity sha512-b0asy/zHtRd0i2+2/uNxe3YVprF3bRT1guyr791DORjCzE/HSBMog+ul83CdtKQ1kZ+pLnxWCu5W3BMysFhHdQ==
   dependencies:
     classnames "^2.2.5"
-    dom-helpers "^3.2.0"
-    react-prop-types "^0.4.0"
+    dom-helpers "^3.2.1"
+    prop-types "^15.5.10"
+    prop-types-extra "^1.0.1"
+    react-transition-group "^2.2.1"
     warning "^3.0.0"
 
 react-prop-types@^0.4.0:
@@ -11398,22 +11443,22 @@ react-toggle@^3.0.0:
   dependencies:
     classnames "^2.2.5"
 
-react-transition-group@^2.2.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.1.tgz#67fbd8d30ebb1c57a149d554dbb82eabefa61f0d"
-  integrity sha512-8x/CxUL9SjYFmUdzsBPTgtKeCxt7QArjNSte0wwiLtF/Ix/o1nWNJooNy5o9XbHIKS31pz7J5VF2l41TwlvbHQ==
+react-transition-group@^2.0.0, react-transition-group@^2.6.1:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
+  integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
   dependencies:
-    dom-helpers "^3.3.1"
+    dom-helpers "^3.4.0"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
 
-react-transition-group@^2.6.1:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
-  integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
+react-transition-group@^2.2.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.1.tgz#67fbd8d30ebb1c57a149d554dbb82eabefa61f0d"
+  integrity sha512-8x/CxUL9SjYFmUdzsBPTgtKeCxt7QArjNSte0wwiLtF/Ix/o1nWNJooNy5o9XbHIKS31pz7J5VF2l41TwlvbHQ==
   dependencies:
-    dom-helpers "^3.4.0"
+    dom-helpers "^3.3.1"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
@@ -13736,12 +13781,15 @@ umd@^3.0.0:
   resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf"
   integrity sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==
 
-uncontrollable@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-4.1.0.tgz#e0358291252e1865222d90939b19f2f49f81c1a9"
-  integrity sha1-4DWCkSUuGGUiLZCTmxny9J+Bwak=
+uncontrollable@^7.0.2:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.1.1.tgz#f67fed3ef93637126571809746323a9db815d556"
+  integrity sha512-EcPYhot3uWTS3w00R32R2+vS8Vr53tttrvMj/yA1uYRhf8hbTG2GyugGqWDY0qIskxn0uTTojVd6wPYW9ZEf8Q==
   dependencies:
-    invariant "^2.1.0"
+    "@babel/runtime" "^7.6.3"
+    "@types/react" "^16.9.11"
+    invariant "^2.2.4"
+    react-lifecycles-compat "^3.0.4"
 
 undeclared-identifiers@^1.1.2:
   version "1.1.3"
@@ -14071,6 +14119,13 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
+warning@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
+  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
+  dependencies:
+    loose-envify "^1.0.0"
+
 watchify-middleware@^1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/watchify-middleware/-/watchify-middleware-1.8.2.tgz#be84fd318049cc281f0a1da274410f9ba45a7c1e"

From b7c0c50e142885f447506b3712edd58d4c3751e9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 28 Jan 2020 15:42:43 -0500
Subject: [PATCH 005/553] fix: Fix issues from PR lint.

---
 .../components/version/FeedVersionViewer.js   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index fb2a6f123..533c65abd 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -128,10 +128,10 @@ export default class FeedVersionViewer extends Component<Props> {
 }
 
 type SelectorProps = {
+  comparedVersion: FeedVersion,
   feedVersionIndex: number,
   gtfsPlusValidation: GtfsPlusValidation,
   version: FeedVersion,
-  comparedVersion: FeedVersion,
   versionSection: ?string
 }
 
@@ -150,26 +150,26 @@ class VersionSectionSelector extends Component<SelectorProps> {
     const text = hasCriticalError
       ? 'critical error'
       : validationSummary.errorCount
-    const diff = comparedVersion 
+    const diff = comparedVersion
       ? validationSummary.errorCount - comparedVersion.validationSummary.errorCount
       : 0
     const diffColor = diff > 0 ? 'danger' : (diff < 0 ? 'success' : 'default')
-    const diffText = comparedVersion 
+    const diffText = comparedVersion
       ? diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))
       : ''
     return (
       <span>
-        <Label bsStyle={color}>
+        <Label bsStyle={color} htmlFor>
           {text}
         </Label>
-        {comparedVersion 
-          ? <Label bsStyle={diffColor} style={{paddingLeft: '0.2em', paddingRight: '0.2em'}}>
+        {comparedVersion
+          ? <Label bsStyle={diffColor} style={{paddingLeft: '0.2em', paddingRight: '0.2em'}} htmlFor>
             {diffText}
-            </Label>
+          </Label>
           : ''
         }
       </span>
-  )
+    )
   }
 
   _getGtfsPlusIssueCount = (gtfsPlusValidation: GtfsPlusValidation) => {
@@ -192,7 +192,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : <Icon type='check' />
     return issueCount === null
       ? <span><Loading small inline /></span>
-      : <span><Label bsStyle={color}>{text}</Label></span>
+      : <span><Label bsStyle={color} htmlFor>{text}</Label></span>
   }
 
   render () {
@@ -227,7 +227,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
             active={this.props.versionSection === 'comments'}>
             <ListGroupItem>
               <Glyphicon glyph='comment' /> Version comments{' '}
-              <Label>{version.noteCount}</Label>
+              <Label htmlFor>{version.noteCount}</Label>
             </ListGroupItem>
           </LinkContainer>
         </ListGroup>

From 03b77bb360abe0c0441b54e1d2e6eeca337ad8f7 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 28 Jan 2020 17:50:51 -0500
Subject: [PATCH 006/553] fix(FeedVersionTabs): Fix github lint checks

---
 lib/manager/components/version/FeedVersionTabs.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 4f51ff18c..8af4650ca 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -91,7 +91,7 @@ export default class FeedVersionTabs extends Component<Props> {
     const timeTableOptions = {...tableOptions}
     // Add default page zie for timetable options
     timeTableOptions.options = {...timeTableOptions.options, sizePerPage: 50}
-    const countFields = ['agencyCount', 'routeCount', 'stopCount', 'tripCount', 'stopTimesCount' /*, 'errorCount'*/]
+    const countFields = ['agencyCount', 'routeCount', 'stopCount', 'tripCount', 'stopTimesCount']
     const daysActive = moment(version.validationSummary.endDate)
       .diff(moment(version.validationSummary.startDate), 'days')
     return (
@@ -118,6 +118,7 @@ export default class FeedVersionTabs extends Component<Props> {
                       {comparedVersion
                         ? <sup style={{width: 0, display: 'inline-block'}}>
                           <Label
+                            htmlFor
                             style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
                             bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'danger' : 'default')}
                             title={`Compared to Version ${comparedVersionIndex}`}>

From 0ad48329825beb45792ff7bd9b5671eb6bd23e24 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 30 Mar 2020 09:50:19 -0400
Subject: [PATCH 007/553] test(snapshots): Update snapshots.

---
 .../__snapshots__/DeploymentsPanel.js.snap    | 1914 ++++----
 .../__snapshots__/FeedSourceTable.js.snap     | 4001 ++++++-----------
 2 files changed, 2230 insertions(+), 3685 deletions(-)

diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index 6550d87d1..34f670c19 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -468,11 +468,14 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               keyboard={true}
               manager={
                 ModalManager {
+                  "add": [Function],
                   "containers": Array [],
                   "data": Array [],
                   "handleContainerOverflow": true,
                   "hideSiblingNodes": true,
+                  "isTopModal": [Function],
                   "modals": Array [],
+                  "remove": [Function],
                 }
               }
               onHide={[Function]}
@@ -484,23 +487,26 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                 autoFocus={true}
                 backdrop={true}
                 backdropClassName="modal-backdrop"
-                backdropTransitionTimeout={150}
+                backdropTransition={[Function]}
                 containerClassName="modal-open"
-                dialogTransitionTimeout={300}
                 enforceFocus={true}
                 keyboard={true}
                 manager={
                   ModalManager {
+                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
+                    "isTopModal": [Function],
                     "modals": Array [],
+                    "remove": [Function],
                   }
                 }
                 onEntering={[Function]}
                 onExited={[Function]}
                 onHide={[Function]}
+                onMouseUp={[Function]}
                 renderBackdrop={[Function]}
                 restoreFocus={true}
                 show={false}
@@ -736,10 +742,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                 updateDeployment={[Function]}
                 updateProject={[Function]}
               >
-                <Panel
-                  bsClass="panel"
-                  bsStyle="default"
-                  defaultExpanded={false}
+                <Uncontrolled(Panel)
                   header={
                     <Row
                       bsClass="row"
@@ -782,144 +785,196 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     </Row>
                   }
                 >
-                  <div
-                    className="panel panel-default"
-                  >
-                    <div
-                      className="panel-heading"
-                    >
+                  <Panel
+                    bsClass="panel"
+                    bsStyle="default"
+                    header={
                       <Row
                         bsClass="row"
-                        className="panel-title"
                         componentClass="div"
                       >
-                        <div
-                          className="panel-title row"
+                        <Col
+                          bsClass="col"
+                          componentClass="div"
+                          xs={4}
+                        >
+                          <FormControl
+                            bsClass="form-control"
+                            componentClass="input"
+                            onChange={[Function]}
+                            placeholder="Search for deployments"
+                          />
+                        </Col>
+                        <Col
+                          bsClass="col"
+                          componentClass="div"
+                          xs={8}
+                        >
+                          <Button
+                            active={false}
+                            block={false}
+                            bsClass="btn"
+                            bsStyle="success"
+                            className="pull-right"
+                            disabled={false}
+                            onClick={[Function]}
+                          >
+                            <Glyphicon
+                              bsClass="glyphicon"
+                              glyph="plus"
+                            />
+                             
+                            New Deployment
+                          </Button>
+                        </Col>
+                      </Row>
+                    }
+                    onToggle={[Function]}
+                  >
+                    <div
+                      className="panel panel-default"
+                      header={
+                        <Row
+                          bsClass="row"
+                          componentClass="div"
                         >
                           <Col
                             bsClass="col"
                             componentClass="div"
                             xs={4}
                           >
-                            <div
-                              className="col-xs-4"
-                            >
-                              <FormControl
-                                bsClass="form-control"
-                                componentClass="input"
-                                onChange={[Function]}
-                                placeholder="Search for deployments"
-                              >
-                                <input
-                                  className="form-control"
-                                  onChange={[Function]}
-                                  placeholder="Search for deployments"
-                                />
-                              </FormControl>
-                            </div>
+                            <FormControl
+                              bsClass="form-control"
+                              componentClass="input"
+                              onChange={[Function]}
+                              placeholder="Search for deployments"
+                            />
                           </Col>
                           <Col
                             bsClass="col"
                             componentClass="div"
                             xs={8}
                           >
-                            <div
-                              className="col-xs-8"
+                            <Button
+                              active={false}
+                              block={false}
+                              bsClass="btn"
+                              bsStyle="success"
+                              className="pull-right"
+                              disabled={false}
+                              onClick={[Function]}
                             >
-                              <Button
-                                active={false}
-                                block={false}
-                                bsClass="btn"
-                                bsStyle="success"
-                                className="pull-right"
-                                disabled={false}
-                                onClick={[Function]}
-                              >
-                                <button
-                                  className="pull-right btn btn-success"
-                                  disabled={false}
-                                  onClick={[Function]}
-                                  type="button"
-                                >
-                                  <Glyphicon
-                                    bsClass="glyphicon"
-                                    glyph="plus"
-                                  >
-                                    <span
-                                      className="glyphicon glyphicon-plus"
-                                    />
-                                  </Glyphicon>
-                                   
-                                  New Deployment
-                                </button>
-                              </Button>
-                            </div>
+                              <Glyphicon
+                                bsClass="glyphicon"
+                                glyph="plus"
+                              />
+                               
+                              New Deployment
+                            </Button>
                           </Col>
-                        </div>
-                      </Row>
-                    </div>
-                    <Table
-                      bordered={false}
-                      bsClass="table"
-                      condensed={false}
-                      hover={true}
-                      key=".0"
-                      responsive={false}
-                      striped={true}
+                        </Row>
+                      }
                     >
-                      <table
-                        className="table table-striped table-hover"
+                      <Table
+                        bordered={false}
+                        bsClass="table"
+                        condensed={false}
+                        fill={true}
+                        hover={true}
+                        responsive={false}
+                        striped={true}
                       >
-                        <thead>
-                          <tr>
-                            <th
-                              className="col-md-4"
-                            >
-                              Name
-                            </th>
-                            <th>
-                              Created
-                            </th>
-                            <th>
-                              Last deployed
-                            </th>
-                            <th>
-                              Deployed to
-                            </th>
-                            <th>
-                              # of feeds
-                            </th>
-                            <th>
-                              Test?
-                            </th>
-                            <th />
-                          </tr>
-                        </thead>
-                        <tbody>
-                          <DeploymentListItem
-                            createDeployment={[Function]}
-                            deleteDeployment={[Function]}
-                            deployment={
-                              Object {
-                                "customBuildConfig": null,
-                                "customRouterConfig": null,
-                                "dateCreated": 1553292345720,
-                                "deployJobSummaries": Array [],
-                                "deployedTo": null,
-                                "ec2Instances": Array [],
-                                "feedSourceId": null,
-                                "feedVersions": Array [
-                                  Object {
-                                    "feedSource": Object {
-                                      "dateCreated": 1536195264564,
-                                      "deployable": false,
-                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                      "externalProperties": Object {},
-                                      "id": "mock-feed-with-version-id",
-                                      "isPublic": false,
-                                      "lastFetched": 1543389038810,
-                                      "lastUpdated": 1543389038810,
-                                      "latestValidation": Object {
+                        <table
+                          className="table table-striped table-hover"
+                          fill={true}
+                        >
+                          <thead>
+                            <tr>
+                              <th
+                                className="col-md-4"
+                              >
+                                Name
+                              </th>
+                              <th>
+                                Created
+                              </th>
+                              <th>
+                                Last deployed
+                              </th>
+                              <th>
+                                Deployed to
+                              </th>
+                              <th>
+                                # of feeds
+                              </th>
+                              <th>
+                                Test?
+                              </th>
+                              <th />
+                            </tr>
+                          </thead>
+                          <tbody>
+                            <DeploymentListItem
+                              createDeployment={[Function]}
+                              deleteDeployment={[Function]}
+                              deployment={
+                                Object {
+                                  "customBuildConfig": null,
+                                  "customRouterConfig": null,
+                                  "dateCreated": 1553292345720,
+                                  "deployJobSummaries": Array [],
+                                  "deployedTo": null,
+                                  "ec2Instances": Array [],
+                                  "feedSourceId": null,
+                                  "feedVersions": Array [
+                                    Object {
+                                      "feedSource": Object {
+                                        "dateCreated": 1536195264564,
+                                        "deployable": false,
+                                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                        "externalProperties": Object {},
+                                        "id": "mock-feed-with-version-id",
+                                        "isPublic": false,
+                                        "lastFetched": 1543389038810,
+                                        "lastUpdated": 1543389038810,
+                                        "latestValidation": Object {
+                                          "agencies": null,
+                                          "agencyCount": 1,
+                                          "avgDailyRevenueTime": 0,
+                                          "bounds": Object {
+                                            "east": -76.481211,
+                                            "north": 39.0486949672717,
+                                            "south": 38.92884,
+                                            "west": -76.5673055566884,
+                                          },
+                                          "endDate": "20190801",
+                                          "errorCount": 78,
+                                          "feedVersionId": "mock-feed-version-id",
+                                          "loadFailureReason": null,
+                                          "loadStatus": "SUCCESS",
+                                          "routeCount": 10,
+                                          "startDate": "20180801",
+                                          "stopCount": 237,
+                                          "stopTimesCount": 11170,
+                                          "tripCount": 415,
+                                        },
+                                        "latestVersionId": "mock-feed-version-id",
+                                        "name": "test feed with a version",
+                                        "noteCount": 0,
+                                        "organizationId": null,
+                                        "projectId": "mock-project-id",
+                                        "publishedVersionId": null,
+                                        "retrievalMethod": "MANUALLY_UPLOADED",
+                                        "s3Url": null,
+                                        "snapshotVersion": null,
+                                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                        "user": null,
+                                      },
+                                      "id": "mock-feed-version-id",
+                                      "nextVersionId": null,
+                                      "previousVersionId": null,
+                                      "updated": 1543389038810,
+                                      "validationResult": Object {
                                         "agencies": null,
                                         "agencyCount": 1,
                                         "avgDailyRevenueTime": 0,
@@ -940,57 +995,144 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                         "stopTimesCount": 11170,
                                         "tripCount": 415,
                                       },
-                                      "latestVersionId": "mock-feed-version-id",
-                                      "name": "test feed with a version",
-                                      "noteCount": 0,
-                                      "organizationId": null,
-                                      "projectId": "mock-project-id",
-                                      "publishedVersionId": null,
-                                      "retrievalMethod": "MANUALLY_UPLOADED",
-                                      "s3Url": null,
-                                      "snapshotVersion": null,
-                                      "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                      "user": null,
+                                      "version": 1,
+                                    },
+                                  ],
+                                  "id": "mock-deployment-id-0",
+                                  "invalidFeedSources": Array [],
+                                  "lastDeployed": null,
+                                  "lastUpdated": 1553292345726,
+                                  "latest": null,
+                                  "name": "mock-deployment",
+                                  "organizationId": null,
+                                  "osmFileId": null,
+                                  "otpCommit": null,
+                                  "otpVersion": null,
+                                  "project": Object {
+                                    "autoFetchFeeds": true,
+                                    "autoFetchHour": 0,
+                                    "autoFetchMinute": 0,
+                                    "bounds": null,
+                                    "buildConfig": Object {
+                                      "fares": null,
+                                      "fetchElevationUS": null,
+                                      "stationTransfers": null,
+                                      "subwayAccessTime": null,
                                     },
-                                    "id": "mock-feed-version-id",
-                                    "nextVersionId": null,
-                                    "previousVersionId": null,
-                                    "updated": 1543389038810,
-                                    "validationResult": Object {
-                                      "agencies": null,
-                                      "agencyCount": 1,
-                                      "avgDailyRevenueTime": 0,
-                                      "bounds": Object {
-                                        "east": -76.481211,
-                                        "north": 39.0486949672717,
-                                        "south": 38.92884,
-                                        "west": -76.5673055566884,
+                                    "dateCreated": 1526305321824,
+                                    "defaultTimeZone": null,
+                                    "deployments": Array [
+                                      [Circular],
+                                      Object {
+                                        "customBuildConfig": null,
+                                        "customRouterConfig": null,
+                                        "dateCreated": 1553292345720,
+                                        "deployJobSummaries": Array [],
+                                        "deployedTo": null,
+                                        "ec2Instances": Array [],
+                                        "feedSourceId": null,
+                                        "feedVersions": Array [],
+                                        "id": "mock-deployment-id-1",
+                                        "invalidFeedSources": Array [],
+                                        "lastDeployed": null,
+                                        "lastUpdated": 1553292345726,
+                                        "latest": null,
+                                        "name": "mock-deployment",
+                                        "organizationId": null,
+                                        "osmFileId": null,
+                                        "otpCommit": null,
+                                        "otpVersion": null,
+                                        "project": [Circular],
+                                        "projectBounds": Object {
+                                          "east": 0,
+                                          "north": 0,
+                                          "south": 0,
+                                          "west": 0,
+                                        },
+                                        "r5": false,
+                                        "r5Version": null,
+                                        "routerId": null,
+                                        "user": null,
                                       },
-                                      "endDate": "20190801",
-                                      "errorCount": 78,
-                                      "feedVersionId": "mock-feed-version-id",
-                                      "loadFailureReason": null,
-                                      "loadStatus": "SUCCESS",
-                                      "routeCount": 10,
-                                      "startDate": "20180801",
-                                      "stopCount": 237,
-                                      "stopTimesCount": 11170,
-                                      "tripCount": 415,
+                                    ],
+                                    "feedSources": Array [
+                                      Object {
+                                        "dateCreated": 1536195264564,
+                                        "deployable": false,
+                                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                        "externalProperties": Object {},
+                                        "id": "mock-feed-with-version-id",
+                                        "isPublic": false,
+                                        "lastFetched": 1543389038810,
+                                        "lastUpdated": 1543389038810,
+                                        "latestValidation": Object {
+                                          "agencies": null,
+                                          "agencyCount": 1,
+                                          "avgDailyRevenueTime": 0,
+                                          "bounds": Object {
+                                            "east": -76.481211,
+                                            "north": 39.0486949672717,
+                                            "south": 38.92884,
+                                            "west": -76.5673055566884,
+                                          },
+                                          "endDate": "20190801",
+                                          "errorCount": 78,
+                                          "feedVersionId": "mock-feed-version-id",
+                                          "loadFailureReason": null,
+                                          "loadStatus": "SUCCESS",
+                                          "routeCount": 10,
+                                          "startDate": "20180801",
+                                          "stopCount": 237,
+                                          "stopTimesCount": 11170,
+                                          "tripCount": 415,
+                                        },
+                                        "latestVersionId": "mock-feed-version-id",
+                                        "name": "test feed with a version",
+                                        "noteCount": 0,
+                                        "organizationId": null,
+                                        "projectId": "mock-project-id",
+                                        "publishedVersionId": null,
+                                        "retrievalMethod": "MANUALLY_UPLOADED",
+                                        "s3Url": null,
+                                        "snapshotVersion": null,
+                                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                        "user": null,
+                                      },
+                                    ],
+                                    "id": "mock-project-with-deployments-id",
+                                    "lastUpdated": 1553236399556,
+                                    "name": "mock-project-with-deployments",
+                                    "organizationId": null,
+                                    "otpServers": Array [],
+                                    "pinnedDeploymentId": "mock-deployment-id-0",
+                                    "routerConfig": Object {
+                                      "carDropoffTime": null,
+                                      "numItineraries": null,
+                                      "requestLogFile": null,
+                                      "stairsReluctance": null,
+                                      "updaters": null,
+                                      "walkSpeed": null,
                                     },
-                                    "version": 1,
+                                    "useCustomOsmBounds": false,
+                                    "user": null,
+                                  },
+                                  "projectBounds": Object {
+                                    "east": 0,
+                                    "north": 0,
+                                    "south": 0,
+                                    "west": 0,
                                   },
-                                ],
-                                "id": "mock-deployment-id-0",
-                                "invalidFeedSources": Array [],
-                                "lastDeployed": null,
-                                "lastUpdated": 1553292345726,
-                                "latest": null,
-                                "name": "mock-deployment",
-                                "organizationId": null,
-                                "osmFileId": null,
-                                "otpCommit": null,
-                                "otpVersion": null,
-                                "project": Object {
+                                  "r5": false,
+                                  "r5Version": null,
+                                  "routerId": null,
+                                  "user": null,
+                                }
+                              }
+                              fetchProjectDeployments={[Function]}
+                              fetchProjectFeeds={[Function]}
+                              key="mock-deployment-id-0"
+                              project={
+                                Object {
                                   "autoFetchFeeds": true,
                                   "autoFetchHour": 0,
                                   "autoFetchMinute": 0,
@@ -1004,7 +1146,108 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                   "dateCreated": 1526305321824,
                                   "defaultTimeZone": null,
                                   "deployments": Array [
-                                    [Circular],
+                                    Object {
+                                      "customBuildConfig": null,
+                                      "customRouterConfig": null,
+                                      "dateCreated": 1553292345720,
+                                      "deployJobSummaries": Array [],
+                                      "deployedTo": null,
+                                      "ec2Instances": Array [],
+                                      "feedSourceId": null,
+                                      "feedVersions": Array [
+                                        Object {
+                                          "feedSource": Object {
+                                            "dateCreated": 1536195264564,
+                                            "deployable": false,
+                                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                            "externalProperties": Object {},
+                                            "id": "mock-feed-with-version-id",
+                                            "isPublic": false,
+                                            "lastFetched": 1543389038810,
+                                            "lastUpdated": 1543389038810,
+                                            "latestValidation": Object {
+                                              "agencies": null,
+                                              "agencyCount": 1,
+                                              "avgDailyRevenueTime": 0,
+                                              "bounds": Object {
+                                                "east": -76.481211,
+                                                "north": 39.0486949672717,
+                                                "south": 38.92884,
+                                                "west": -76.5673055566884,
+                                              },
+                                              "endDate": "20190801",
+                                              "errorCount": 78,
+                                              "feedVersionId": "mock-feed-version-id",
+                                              "loadFailureReason": null,
+                                              "loadStatus": "SUCCESS",
+                                              "routeCount": 10,
+                                              "startDate": "20180801",
+                                              "stopCount": 237,
+                                              "stopTimesCount": 11170,
+                                              "tripCount": 415,
+                                            },
+                                            "latestVersionId": "mock-feed-version-id",
+                                            "name": "test feed with a version",
+                                            "noteCount": 0,
+                                            "organizationId": null,
+                                            "projectId": "mock-project-id",
+                                            "publishedVersionId": null,
+                                            "retrievalMethod": "MANUALLY_UPLOADED",
+                                            "s3Url": null,
+                                            "snapshotVersion": null,
+                                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                            "user": null,
+                                          },
+                                          "id": "mock-feed-version-id",
+                                          "nextVersionId": null,
+                                          "previousVersionId": null,
+                                          "updated": 1543389038810,
+                                          "validationResult": Object {
+                                            "agencies": null,
+                                            "agencyCount": 1,
+                                            "avgDailyRevenueTime": 0,
+                                            "bounds": Object {
+                                              "east": -76.481211,
+                                              "north": 39.0486949672717,
+                                              "south": 38.92884,
+                                              "west": -76.5673055566884,
+                                            },
+                                            "endDate": "20190801",
+                                            "errorCount": 78,
+                                            "feedVersionId": "mock-feed-version-id",
+                                            "loadFailureReason": null,
+                                            "loadStatus": "SUCCESS",
+                                            "routeCount": 10,
+                                            "startDate": "20180801",
+                                            "stopCount": 237,
+                                            "stopTimesCount": 11170,
+                                            "tripCount": 415,
+                                          },
+                                          "version": 1,
+                                        },
+                                      ],
+                                      "id": "mock-deployment-id-0",
+                                      "invalidFeedSources": Array [],
+                                      "lastDeployed": null,
+                                      "lastUpdated": 1553292345726,
+                                      "latest": null,
+                                      "name": "mock-deployment",
+                                      "organizationId": null,
+                                      "osmFileId": null,
+                                      "otpCommit": null,
+                                      "otpVersion": null,
+                                      "project": [Circular],
+                                      "projectBounds": Object {
+                                        "east": 0,
+                                        "north": 0,
+                                        "south": 0,
+                                        "west": 0,
+                                      },
+                                      "r5": false,
+                                      "r5Version": null,
+                                      "routerId": null,
+                                      "user": null,
+                                    },
                                     Object {
                                       "customBuildConfig": null,
                                       "customRouterConfig": null,
@@ -1097,94 +1340,326 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                   },
                                   "useCustomOsmBounds": false,
                                   "user": null,
-                                },
-                                "projectBounds": Object {
-                                  "east": 0,
-                                  "north": 0,
-                                  "south": 0,
-                                  "west": 0,
-                                },
-                                "r5": false,
-                                "r5Version": null,
-                                "routerId": null,
-                                "user": null,
+                                }
                               }
-                            }
-                            fetchProjectDeployments={[Function]}
-                            fetchProjectFeeds={[Function]}
-                            key="mock-deployment-id-0"
-                            project={
-                              Object {
-                                "autoFetchFeeds": true,
-                                "autoFetchHour": 0,
-                                "autoFetchMinute": 0,
-                                "bounds": null,
-                                "buildConfig": Object {
-                                  "fares": null,
-                                  "fetchElevationUS": null,
-                                  "stationTransfers": null,
-                                  "subwayAccessTime": null,
-                                },
-                                "dateCreated": 1526305321824,
-                                "defaultTimeZone": null,
-                                "deployments": Array [
-                                  Object {
-                                    "customBuildConfig": null,
-                                    "customRouterConfig": null,
-                                    "dateCreated": 1553292345720,
-                                    "deployJobSummaries": Array [],
-                                    "deployedTo": null,
-                                    "ec2Instances": Array [],
-                                    "feedSourceId": null,
-                                    "feedVersions": Array [
+                              saveDeployment={[Function]}
+                              updateDeployment={[Function]}
+                              updateProject={[Function]}
+                            >
+                              <tr
+                                className="pinned-deployment"
+                              >
+                                <td>
+                                  <EditableTextField
+                                    isEditing={false}
+                                    link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
+                                    onChange={[Function]}
+                                    rejectEmptyValue={true}
+                                    style={Object {}}
+                                    type="text"
+                                    value="mock-deployment"
+                                  >
+                                    <div
+                                      style={Object {}}
+                                    >
+                                      <span>
+                                        <span
+                                          title="mock-deployment"
+                                        >
+                                          <Link
+                                            onlyActiveOnIndex={false}
+                                            style={Object {}}
+                                            to="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
+                                          >
+                                            <a
+                                              onClick={[Function]}
+                                              style={Object {}}
+                                            >
+                                              mock-deployment
+                                            </a>
+                                          </Link>
+                                        </span>
+                                        <Button
+                                          active={false}
+                                          block={false}
+                                          bsClass="btn"
+                                          bsStyle="link"
+                                          data-test-id="editable-text-field-edit-button"
+                                          disabled={false}
+                                          onClick={[Function]}
+                                        >
+                                          <button
+                                            className="btn btn-link"
+                                            data-test-id="editable-text-field-edit-button"
+                                            disabled={false}
+                                            onClick={[Function]}
+                                            type="button"
+                                          >
+                                            <Icon
+                                              type="pencil"
+                                            >
+                                              <i
+                                                className="fa fa-pencil fa-fw "
+                                              />
+                                            </Icon>
+                                          </button>
+                                        </Button>
+                                      </span>
+                                    </div>
+                                  </EditableTextField>
+                                </td>
+                                <td>
+                                  <span
+                                    title="Mar 22nd 2019, 3:05pm"
+                                  >
+                                     
+                                    2 months ago
+                                  </span>
+                                </td>
+                                <td>
+                                  <span
+                                    className="deployment-na"
+                                  >
+                                    N/A
+                                  </span>
+                                </td>
+                                <td>
+                                  <span
+                                    className="deployment-na"
+                                  >
+                                    N/A
+                                  </span>
+                                </td>
+                                <td>
+                                  <span>
+                                    1
+                                  </span>
+                                </td>
+                                <td>
+                                  <span
+                                    className="deployment-na"
+                                  >
+                                    N/A
+                                  </span>
+                                </td>
+                                <td>
+                                  <ButtonGroup
+                                    block={false}
+                                    bsClass="btn-group"
+                                    className="pull-right"
+                                    justified={false}
+                                    vertical={false}
+                                  >
+                                    <div
+                                      className="pull-right btn-group"
+                                    >
+                                      <Button
+                                        active={false}
+                                        block={false}
+                                        bsClass="btn"
+                                        bsSize="xsmall"
+                                        bsStyle="info"
+                                        disabled={false}
+                                        onClick={[Function]}
+                                      >
+                                        <button
+                                          className="btn btn-xs btn-info"
+                                          disabled={false}
+                                          onClick={[Function]}
+                                          type="button"
+                                        >
+                                          <Glyphicon
+                                            bsClass="glyphicon"
+                                            glyph="pushpin"
+                                          >
+                                            <span
+                                              className="glyphicon glyphicon-pushpin"
+                                            />
+                                          </Glyphicon>
+                                        </button>
+                                      </Button>
+                                      <Button
+                                        active={false}
+                                        block={false}
+                                        bsClass="btn"
+                                        bsSize="xsmall"
+                                        bsStyle="danger"
+                                        disabled={false}
+                                        onClick={[Function]}
+                                      >
+                                        <button
+                                          className="btn btn-xs btn-danger"
+                                          disabled={false}
+                                          onClick={[Function]}
+                                          type="button"
+                                        >
+                                          <Glyphicon
+                                            bsClass="glyphicon"
+                                            glyph="remove"
+                                          >
+                                            <span
+                                              className="glyphicon glyphicon-remove"
+                                            />
+                                          </Glyphicon>
+                                        </button>
+                                      </Button>
+                                    </div>
+                                  </ButtonGroup>
+                                </td>
+                              </tr>
+                            </DeploymentListItem>
+                            <DeploymentListItem
+                              createDeployment={[Function]}
+                              deleteDeployment={[Function]}
+                              deployment={
+                                Object {
+                                  "customBuildConfig": null,
+                                  "customRouterConfig": null,
+                                  "dateCreated": 1553292345720,
+                                  "deployJobSummaries": Array [],
+                                  "deployedTo": null,
+                                  "ec2Instances": Array [],
+                                  "feedSourceId": null,
+                                  "feedVersions": Array [],
+                                  "id": "mock-deployment-id-1",
+                                  "invalidFeedSources": Array [],
+                                  "lastDeployed": null,
+                                  "lastUpdated": 1553292345726,
+                                  "latest": null,
+                                  "name": "mock-deployment",
+                                  "organizationId": null,
+                                  "osmFileId": null,
+                                  "otpCommit": null,
+                                  "otpVersion": null,
+                                  "project": Object {
+                                    "autoFetchFeeds": true,
+                                    "autoFetchHour": 0,
+                                    "autoFetchMinute": 0,
+                                    "bounds": null,
+                                    "buildConfig": Object {
+                                      "fares": null,
+                                      "fetchElevationUS": null,
+                                      "stationTransfers": null,
+                                      "subwayAccessTime": null,
+                                    },
+                                    "dateCreated": 1526305321824,
+                                    "defaultTimeZone": null,
+                                    "deployments": Array [
                                       Object {
-                                        "feedSource": Object {
-                                          "dateCreated": 1536195264564,
-                                          "deployable": false,
-                                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                          "externalProperties": Object {},
-                                          "id": "mock-feed-with-version-id",
-                                          "isPublic": false,
-                                          "lastFetched": 1543389038810,
-                                          "lastUpdated": 1543389038810,
-                                          "latestValidation": Object {
-                                            "agencies": null,
-                                            "agencyCount": 1,
-                                            "avgDailyRevenueTime": 0,
-                                            "bounds": Object {
-                                              "east": -76.481211,
-                                              "north": 39.0486949672717,
-                                              "south": 38.92884,
-                                              "west": -76.5673055566884,
+                                        "customBuildConfig": null,
+                                        "customRouterConfig": null,
+                                        "dateCreated": 1553292345720,
+                                        "deployJobSummaries": Array [],
+                                        "deployedTo": null,
+                                        "ec2Instances": Array [],
+                                        "feedSourceId": null,
+                                        "feedVersions": Array [
+                                          Object {
+                                            "feedSource": Object {
+                                              "dateCreated": 1536195264564,
+                                              "deployable": false,
+                                              "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                              "externalProperties": Object {},
+                                              "id": "mock-feed-with-version-id",
+                                              "isPublic": false,
+                                              "lastFetched": 1543389038810,
+                                              "lastUpdated": 1543389038810,
+                                              "latestValidation": Object {
+                                                "agencies": null,
+                                                "agencyCount": 1,
+                                                "avgDailyRevenueTime": 0,
+                                                "bounds": Object {
+                                                  "east": -76.481211,
+                                                  "north": 39.0486949672717,
+                                                  "south": 38.92884,
+                                                  "west": -76.5673055566884,
+                                                },
+                                                "endDate": "20190801",
+                                                "errorCount": 78,
+                                                "feedVersionId": "mock-feed-version-id",
+                                                "loadFailureReason": null,
+                                                "loadStatus": "SUCCESS",
+                                                "routeCount": 10,
+                                                "startDate": "20180801",
+                                                "stopCount": 237,
+                                                "stopTimesCount": 11170,
+                                                "tripCount": 415,
+                                              },
+                                              "latestVersionId": "mock-feed-version-id",
+                                              "name": "test feed with a version",
+                                              "noteCount": 0,
+                                              "organizationId": null,
+                                              "projectId": "mock-project-id",
+                                              "publishedVersionId": null,
+                                              "retrievalMethod": "MANUALLY_UPLOADED",
+                                              "s3Url": null,
+                                              "snapshotVersion": null,
+                                              "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                              "user": null,
                                             },
-                                            "endDate": "20190801",
-                                            "errorCount": 78,
-                                            "feedVersionId": "mock-feed-version-id",
-                                            "loadFailureReason": null,
-                                            "loadStatus": "SUCCESS",
-                                            "routeCount": 10,
-                                            "startDate": "20180801",
-                                            "stopCount": 237,
-                                            "stopTimesCount": 11170,
-                                            "tripCount": 415,
+                                            "id": "mock-feed-version-id",
+                                            "nextVersionId": null,
+                                            "previousVersionId": null,
+                                            "updated": 1543389038810,
+                                            "validationResult": Object {
+                                              "agencies": null,
+                                              "agencyCount": 1,
+                                              "avgDailyRevenueTime": 0,
+                                              "bounds": Object {
+                                                "east": -76.481211,
+                                                "north": 39.0486949672717,
+                                                "south": 38.92884,
+                                                "west": -76.5673055566884,
+                                              },
+                                              "endDate": "20190801",
+                                              "errorCount": 78,
+                                              "feedVersionId": "mock-feed-version-id",
+                                              "loadFailureReason": null,
+                                              "loadStatus": "SUCCESS",
+                                              "routeCount": 10,
+                                              "startDate": "20180801",
+                                              "stopCount": 237,
+                                              "stopTimesCount": 11170,
+                                              "tripCount": 415,
+                                            },
+                                            "version": 1,
                                           },
-                                          "latestVersionId": "mock-feed-version-id",
-                                          "name": "test feed with a version",
-                                          "noteCount": 0,
-                                          "organizationId": null,
-                                          "projectId": "mock-project-id",
-                                          "publishedVersionId": null,
-                                          "retrievalMethod": "MANUALLY_UPLOADED",
-                                          "s3Url": null,
-                                          "snapshotVersion": null,
-                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                          "user": null,
+                                        ],
+                                        "id": "mock-deployment-id-0",
+                                        "invalidFeedSources": Array [],
+                                        "lastDeployed": null,
+                                        "lastUpdated": 1553292345726,
+                                        "latest": null,
+                                        "name": "mock-deployment",
+                                        "organizationId": null,
+                                        "osmFileId": null,
+                                        "otpCommit": null,
+                                        "otpVersion": null,
+                                        "project": [Circular],
+                                        "projectBounds": Object {
+                                          "east": 0,
+                                          "north": 0,
+                                          "south": 0,
+                                          "west": 0,
                                         },
-                                        "id": "mock-feed-version-id",
-                                        "nextVersionId": null,
-                                        "previousVersionId": null,
-                                        "updated": 1543389038810,
-                                        "validationResult": Object {
+                                        "r5": false,
+                                        "r5Version": null,
+                                        "routerId": null,
+                                        "user": null,
+                                      },
+                                      [Circular],
+                                    ],
+                                    "feedSources": Array [
+                                      Object {
+                                        "dateCreated": 1536195264564,
+                                        "deployable": false,
+                                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                        "externalProperties": Object {},
+                                        "id": "mock-feed-with-version-id",
+                                        "isPublic": false,
+                                        "lastFetched": 1543389038810,
+                                        "lastUpdated": 1543389038810,
+                                        "latestValidation": Object {
                                           "agencies": null,
                                           "agencyCount": 1,
                                           "avgDailyRevenueTime": 0,
@@ -1205,315 +1680,53 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                           "stopTimesCount": 11170,
                                           "tripCount": 415,
                                         },
-                                        "version": 1,
+                                        "latestVersionId": "mock-feed-version-id",
+                                        "name": "test feed with a version",
+                                        "noteCount": 0,
+                                        "organizationId": null,
+                                        "projectId": "mock-project-id",
+                                        "publishedVersionId": null,
+                                        "retrievalMethod": "MANUALLY_UPLOADED",
+                                        "s3Url": null,
+                                        "snapshotVersion": null,
+                                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                        "user": null,
                                       },
                                     ],
-                                    "id": "mock-deployment-id-0",
-                                    "invalidFeedSources": Array [],
-                                    "lastDeployed": null,
-                                    "lastUpdated": 1553292345726,
-                                    "latest": null,
-                                    "name": "mock-deployment",
+                                    "id": "mock-project-with-deployments-id",
+                                    "lastUpdated": 1553236399556,
+                                    "name": "mock-project-with-deployments",
                                     "organizationId": null,
-                                    "osmFileId": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "project": [Circular],
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
+                                    "otpServers": Array [],
+                                    "pinnedDeploymentId": "mock-deployment-id-0",
+                                    "routerConfig": Object {
+                                      "carDropoffTime": null,
+                                      "numItineraries": null,
+                                      "requestLogFile": null,
+                                      "stairsReluctance": null,
+                                      "updaters": null,
+                                      "walkSpeed": null,
                                     },
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
+                                    "useCustomOsmBounds": false,
                                     "user": null,
                                   },
-                                  Object {
-                                    "customBuildConfig": null,
-                                    "customRouterConfig": null,
-                                    "dateCreated": 1553292345720,
-                                    "deployJobSummaries": Array [],
-                                    "deployedTo": null,
-                                    "ec2Instances": Array [],
-                                    "feedSourceId": null,
-                                    "feedVersions": Array [],
-                                    "id": "mock-deployment-id-1",
-                                    "invalidFeedSources": Array [],
-                                    "lastDeployed": null,
-                                    "lastUpdated": 1553292345726,
-                                    "latest": null,
-                                    "name": "mock-deployment",
-                                    "organizationId": null,
-                                    "osmFileId": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "project": [Circular],
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
-                                    },
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
-                                    "user": null,
+                                  "projectBounds": Object {
+                                    "east": 0,
+                                    "north": 0,
+                                    "south": 0,
+                                    "west": 0,
                                   },
-                                ],
-                                "feedSources": Array [
-                                  Object {
-                                    "dateCreated": 1536195264564,
-                                    "deployable": false,
-                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                    "externalProperties": Object {},
-                                    "id": "mock-feed-with-version-id",
-                                    "isPublic": false,
-                                    "lastFetched": 1543389038810,
-                                    "lastUpdated": 1543389038810,
-                                    "latestValidation": Object {
-                                      "agencies": null,
-                                      "agencyCount": 1,
-                                      "avgDailyRevenueTime": 0,
-                                      "bounds": Object {
-                                        "east": -76.481211,
-                                        "north": 39.0486949672717,
-                                        "south": 38.92884,
-                                        "west": -76.5673055566884,
-                                      },
-                                      "endDate": "20190801",
-                                      "errorCount": 78,
-                                      "feedVersionId": "mock-feed-version-id",
-                                      "loadFailureReason": null,
-                                      "loadStatus": "SUCCESS",
-                                      "routeCount": 10,
-                                      "startDate": "20180801",
-                                      "stopCount": 237,
-                                      "stopTimesCount": 11170,
-                                      "tripCount": 415,
-                                    },
-                                    "latestVersionId": "mock-feed-version-id",
-                                    "name": "test feed with a version",
-                                    "noteCount": 0,
-                                    "organizationId": null,
-                                    "projectId": "mock-project-id",
-                                    "publishedVersionId": null,
-                                    "retrievalMethod": "MANUALLY_UPLOADED",
-                                    "s3Url": null,
-                                    "snapshotVersion": null,
-                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                    "user": null,
-                                  },
-                                ],
-                                "id": "mock-project-with-deployments-id",
-                                "lastUpdated": 1553236399556,
-                                "name": "mock-project-with-deployments",
-                                "organizationId": null,
-                                "otpServers": Array [],
-                                "pinnedDeploymentId": "mock-deployment-id-0",
-                                "routerConfig": Object {
-                                  "carDropoffTime": null,
-                                  "numItineraries": null,
-                                  "requestLogFile": null,
-                                  "stairsReluctance": null,
-                                  "updaters": null,
-                                  "walkSpeed": null,
-                                },
-                                "useCustomOsmBounds": false,
-                                "user": null,
+                                  "r5": false,
+                                  "r5Version": null,
+                                  "routerId": null,
+                                  "user": null,
+                                }
                               }
-                            }
-                            saveDeployment={[Function]}
-                            updateDeployment={[Function]}
-                            updateProject={[Function]}
-                          >
-                            <tr
-                              className="pinned-deployment"
-                            >
-                              <td>
-                                <EditableTextField
-                                  isEditing={false}
-                                  link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
-                                  onChange={[Function]}
-                                  rejectEmptyValue={true}
-                                  style={Object {}}
-                                  type="text"
-                                  value="mock-deployment"
-                                >
-                                  <div
-                                    style={Object {}}
-                                  >
-                                    <span>
-                                      <span
-                                        title="mock-deployment"
-                                      >
-                                        <Link
-                                          onlyActiveOnIndex={false}
-                                          style={Object {}}
-                                          to="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
-                                        >
-                                          <a
-                                            onClick={[Function]}
-                                            style={Object {}}
-                                          >
-                                            mock-deployment
-                                          </a>
-                                        </Link>
-                                      </span>
-                                      <Button
-                                        active={false}
-                                        block={false}
-                                        bsClass="btn"
-                                        bsStyle="link"
-                                        data-test-id="editable-text-field-edit-button"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                      >
-                                        <button
-                                          className="btn btn-link"
-                                          data-test-id="editable-text-field-edit-button"
-                                          disabled={false}
-                                          onClick={[Function]}
-                                          type="button"
-                                        >
-                                          <Icon
-                                            type="pencil"
-                                          >
-                                            <i
-                                              className="fa fa-pencil fa-fw "
-                                            />
-                                          </Icon>
-                                        </button>
-                                      </Button>
-                                    </span>
-                                  </div>
-                                </EditableTextField>
-                              </td>
-                              <td>
-                                <span
-                                  title="Mar 22nd 2019, 3:05pm"
-                                >
-                                   
-                                  2 months ago
-                                </span>
-                              </td>
-                              <td>
-                                <span
-                                  className="deployment-na"
-                                >
-                                  N/A
-                                </span>
-                              </td>
-                              <td>
-                                <span
-                                  className="deployment-na"
-                                >
-                                  N/A
-                                </span>
-                              </td>
-                              <td>
-                                <span>
-                                  1
-                                </span>
-                              </td>
-                              <td>
-                                <span
-                                  className="deployment-na"
-                                >
-                                  N/A
-                                </span>
-                              </td>
-                              <td>
-                                <ButtonGroup
-                                  block={false}
-                                  bsClass="btn-group"
-                                  className="pull-right"
-                                  justified={false}
-                                  vertical={false}
-                                >
-                                  <div
-                                    className="pull-right btn-group"
-                                  >
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="info"
-                                      disabled={false}
-                                      onClick={[Function]}
-                                    >
-                                      <button
-                                        className="btn btn-xs btn-info"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                        type="button"
-                                      >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="pushpin"
-                                        >
-                                          <span
-                                            className="glyphicon glyphicon-pushpin"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="danger"
-                                      disabled={false}
-                                      onClick={[Function]}
-                                    >
-                                      <button
-                                        className="btn btn-xs btn-danger"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                        type="button"
-                                      >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="remove"
-                                        >
-                                          <span
-                                            className="glyphicon glyphicon-remove"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                  </div>
-                                </ButtonGroup>
-                              </td>
-                            </tr>
-                          </DeploymentListItem>
-                          <DeploymentListItem
-                            createDeployment={[Function]}
-                            deleteDeployment={[Function]}
-                            deployment={
-                              Object {
-                                "customBuildConfig": null,
-                                "customRouterConfig": null,
-                                "dateCreated": 1553292345720,
-                                "deployJobSummaries": Array [],
-                                "deployedTo": null,
-                                "ec2Instances": Array [],
-                                "feedSourceId": null,
-                                "feedVersions": Array [],
-                                "id": "mock-deployment-id-1",
-                                "invalidFeedSources": Array [],
-                                "lastDeployed": null,
-                                "lastUpdated": 1553292345726,
-                                "latest": null,
-                                "name": "mock-deployment",
-                                "organizationId": null,
-                                "osmFileId": null,
-                                "otpCommit": null,
-                                "otpVersion": null,
-                                "project": Object {
+                              fetchProjectDeployments={[Function]}
+                              fetchProjectFeeds={[Function]}
+                              key="mock-deployment-id-1"
+                              project={
+                                Object {
                                   "autoFetchFeeds": true,
                                   "autoFetchHour": 0,
                                   "autoFetchMinute": 0,
@@ -1629,7 +1842,37 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "routerId": null,
                                       "user": null,
                                     },
-                                    [Circular],
+                                    Object {
+                                      "customBuildConfig": null,
+                                      "customRouterConfig": null,
+                                      "dateCreated": 1553292345720,
+                                      "deployJobSummaries": Array [],
+                                      "deployedTo": null,
+                                      "ec2Instances": Array [],
+                                      "feedSourceId": null,
+                                      "feedVersions": Array [],
+                                      "id": "mock-deployment-id-1",
+                                      "invalidFeedSources": Array [],
+                                      "lastDeployed": null,
+                                      "lastUpdated": 1553292345726,
+                                      "latest": null,
+                                      "name": "mock-deployment",
+                                      "organizationId": null,
+                                      "osmFileId": null,
+                                      "otpCommit": null,
+                                      "otpVersion": null,
+                                      "project": [Circular],
+                                      "projectBounds": Object {
+                                        "east": 0,
+                                        "north": 0,
+                                        "south": 0,
+                                        "west": 0,
+                                      },
+                                      "r5": false,
+                                      "r5Version": null,
+                                      "routerId": null,
+                                      "user": null,
+                                    },
                                   ],
                                   "feedSources": Array [
                                     Object {
@@ -1691,404 +1934,180 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                   },
                                   "useCustomOsmBounds": false,
                                   "user": null,
-                                },
-                                "projectBounds": Object {
-                                  "east": 0,
-                                  "north": 0,
-                                  "south": 0,
-                                  "west": 0,
-                                },
-                                "r5": false,
-                                "r5Version": null,
-                                "routerId": null,
-                                "user": null,
+                                }
                               }
-                            }
-                            fetchProjectDeployments={[Function]}
-                            fetchProjectFeeds={[Function]}
-                            key="mock-deployment-id-1"
-                            project={
-                              Object {
-                                "autoFetchFeeds": true,
-                                "autoFetchHour": 0,
-                                "autoFetchMinute": 0,
-                                "bounds": null,
-                                "buildConfig": Object {
-                                  "fares": null,
-                                  "fetchElevationUS": null,
-                                  "stationTransfers": null,
-                                  "subwayAccessTime": null,
-                                },
-                                "dateCreated": 1526305321824,
-                                "defaultTimeZone": null,
-                                "deployments": Array [
-                                  Object {
-                                    "customBuildConfig": null,
-                                    "customRouterConfig": null,
-                                    "dateCreated": 1553292345720,
-                                    "deployJobSummaries": Array [],
-                                    "deployedTo": null,
-                                    "ec2Instances": Array [],
-                                    "feedSourceId": null,
-                                    "feedVersions": Array [
-                                      Object {
-                                        "feedSource": Object {
-                                          "dateCreated": 1536195264564,
-                                          "deployable": false,
-                                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                          "externalProperties": Object {},
-                                          "id": "mock-feed-with-version-id",
-                                          "isPublic": false,
-                                          "lastFetched": 1543389038810,
-                                          "lastUpdated": 1543389038810,
-                                          "latestValidation": Object {
-                                            "agencies": null,
-                                            "agencyCount": 1,
-                                            "avgDailyRevenueTime": 0,
-                                            "bounds": Object {
-                                              "east": -76.481211,
-                                              "north": 39.0486949672717,
-                                              "south": 38.92884,
-                                              "west": -76.5673055566884,
-                                            },
-                                            "endDate": "20190801",
-                                            "errorCount": 78,
-                                            "feedVersionId": "mock-feed-version-id",
-                                            "loadFailureReason": null,
-                                            "loadStatus": "SUCCESS",
-                                            "routeCount": 10,
-                                            "startDate": "20180801",
-                                            "stopCount": 237,
-                                            "stopTimesCount": 11170,
-                                            "tripCount": 415,
-                                          },
-                                          "latestVersionId": "mock-feed-version-id",
-                                          "name": "test feed with a version",
-                                          "noteCount": 0,
-                                          "organizationId": null,
-                                          "projectId": "mock-project-id",
-                                          "publishedVersionId": null,
-                                          "retrievalMethod": "MANUALLY_UPLOADED",
-                                          "s3Url": null,
-                                          "snapshotVersion": null,
-                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                          "user": null,
-                                        },
-                                        "id": "mock-feed-version-id",
-                                        "nextVersionId": null,
-                                        "previousVersionId": null,
-                                        "updated": 1543389038810,
-                                        "validationResult": Object {
-                                          "agencies": null,
-                                          "agencyCount": 1,
-                                          "avgDailyRevenueTime": 0,
-                                          "bounds": Object {
-                                            "east": -76.481211,
-                                            "north": 39.0486949672717,
-                                            "south": 38.92884,
-                                            "west": -76.5673055566884,
-                                          },
-                                          "endDate": "20190801",
-                                          "errorCount": 78,
-                                          "feedVersionId": "mock-feed-version-id",
-                                          "loadFailureReason": null,
-                                          "loadStatus": "SUCCESS",
-                                          "routeCount": 10,
-                                          "startDate": "20180801",
-                                          "stopCount": 237,
-                                          "stopTimesCount": 11170,
-                                          "tripCount": 415,
-                                        },
-                                        "version": 1,
-                                      },
-                                    ],
-                                    "id": "mock-deployment-id-0",
-                                    "invalidFeedSources": Array [],
-                                    "lastDeployed": null,
-                                    "lastUpdated": 1553292345726,
-                                    "latest": null,
-                                    "name": "mock-deployment",
-                                    "organizationId": null,
-                                    "osmFileId": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "project": [Circular],
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
-                                    },
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
-                                    "user": null,
-                                  },
-                                  Object {
-                                    "customBuildConfig": null,
-                                    "customRouterConfig": null,
-                                    "dateCreated": 1553292345720,
-                                    "deployJobSummaries": Array [],
-                                    "deployedTo": null,
-                                    "ec2Instances": Array [],
-                                    "feedSourceId": null,
-                                    "feedVersions": Array [],
-                                    "id": "mock-deployment-id-1",
-                                    "invalidFeedSources": Array [],
-                                    "lastDeployed": null,
-                                    "lastUpdated": 1553292345726,
-                                    "latest": null,
-                                    "name": "mock-deployment",
-                                    "organizationId": null,
-                                    "osmFileId": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "project": [Circular],
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
-                                    },
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
-                                    "user": null,
-                                  },
-                                ],
-                                "feedSources": Array [
-                                  Object {
-                                    "dateCreated": 1536195264564,
-                                    "deployable": false,
-                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                    "externalProperties": Object {},
-                                    "id": "mock-feed-with-version-id",
-                                    "isPublic": false,
-                                    "lastFetched": 1543389038810,
-                                    "lastUpdated": 1543389038810,
-                                    "latestValidation": Object {
-                                      "agencies": null,
-                                      "agencyCount": 1,
-                                      "avgDailyRevenueTime": 0,
-                                      "bounds": Object {
-                                        "east": -76.481211,
-                                        "north": 39.0486949672717,
-                                        "south": 38.92884,
-                                        "west": -76.5673055566884,
-                                      },
-                                      "endDate": "20190801",
-                                      "errorCount": 78,
-                                      "feedVersionId": "mock-feed-version-id",
-                                      "loadFailureReason": null,
-                                      "loadStatus": "SUCCESS",
-                                      "routeCount": 10,
-                                      "startDate": "20180801",
-                                      "stopCount": 237,
-                                      "stopTimesCount": 11170,
-                                      "tripCount": 415,
-                                    },
-                                    "latestVersionId": "mock-feed-version-id",
-                                    "name": "test feed with a version",
-                                    "noteCount": 0,
-                                    "organizationId": null,
-                                    "projectId": "mock-project-id",
-                                    "publishedVersionId": null,
-                                    "retrievalMethod": "MANUALLY_UPLOADED",
-                                    "s3Url": null,
-                                    "snapshotVersion": null,
-                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                    "user": null,
-                                  },
-                                ],
-                                "id": "mock-project-with-deployments-id",
-                                "lastUpdated": 1553236399556,
-                                "name": "mock-project-with-deployments",
-                                "organizationId": null,
-                                "otpServers": Array [],
-                                "pinnedDeploymentId": "mock-deployment-id-0",
-                                "routerConfig": Object {
-                                  "carDropoffTime": null,
-                                  "numItineraries": null,
-                                  "requestLogFile": null,
-                                  "stairsReluctance": null,
-                                  "updaters": null,
-                                  "walkSpeed": null,
-                                },
-                                "useCustomOsmBounds": false,
-                                "user": null,
-                              }
-                            }
-                            saveDeployment={[Function]}
-                            updateDeployment={[Function]}
-                            updateProject={[Function]}
-                          >
-                            <tr
-                              className=""
+                              saveDeployment={[Function]}
+                              updateDeployment={[Function]}
+                              updateProject={[Function]}
                             >
-                              <td>
-                                <EditableTextField
-                                  isEditing={false}
-                                  link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-1"
-                                  onChange={[Function]}
-                                  rejectEmptyValue={true}
-                                  style={Object {}}
-                                  type="text"
-                                  value="mock-deployment"
-                                >
-                                  <div
+                              <tr
+                                className=""
+                              >
+                                <td>
+                                  <EditableTextField
+                                    isEditing={false}
+                                    link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-1"
+                                    onChange={[Function]}
+                                    rejectEmptyValue={true}
                                     style={Object {}}
+                                    type="text"
+                                    value="mock-deployment"
                                   >
-                                    <span>
-                                      <span
-                                        title="mock-deployment"
-                                      >
-                                        <Link
-                                          onlyActiveOnIndex={false}
-                                          style={Object {}}
-                                          to="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-1"
+                                    <div
+                                      style={Object {}}
+                                    >
+                                      <span>
+                                        <span
+                                          title="mock-deployment"
                                         >
-                                          <a
-                                            onClick={[Function]}
+                                          <Link
+                                            onlyActiveOnIndex={false}
                                             style={Object {}}
+                                            to="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-1"
                                           >
-                                            mock-deployment
-                                          </a>
-                                        </Link>
+                                            <a
+                                              onClick={[Function]}
+                                              style={Object {}}
+                                            >
+                                              mock-deployment
+                                            </a>
+                                          </Link>
+                                        </span>
+                                        <Button
+                                          active={false}
+                                          block={false}
+                                          bsClass="btn"
+                                          bsStyle="link"
+                                          data-test-id="editable-text-field-edit-button"
+                                          disabled={false}
+                                          onClick={[Function]}
+                                        >
+                                          <button
+                                            className="btn btn-link"
+                                            data-test-id="editable-text-field-edit-button"
+                                            disabled={false}
+                                            onClick={[Function]}
+                                            type="button"
+                                          >
+                                            <Icon
+                                              type="pencil"
+                                            >
+                                              <i
+                                                className="fa fa-pencil fa-fw "
+                                              />
+                                            </Icon>
+                                          </button>
+                                        </Button>
                                       </span>
+                                    </div>
+                                  </EditableTextField>
+                                </td>
+                                <td>
+                                  <span
+                                    title="Mar 22nd 2019, 3:05pm"
+                                  >
+                                     
+                                    2 months ago
+                                  </span>
+                                </td>
+                                <td>
+                                  <span
+                                    className="deployment-na"
+                                  >
+                                    N/A
+                                  </span>
+                                </td>
+                                <td>
+                                  <span
+                                    className="deployment-na"
+                                  >
+                                    N/A
+                                  </span>
+                                </td>
+                                <td>
+                                  <span>
+                                    0
+                                  </span>
+                                </td>
+                                <td>
+                                  <span
+                                    className="deployment-na"
+                                  >
+                                    N/A
+                                  </span>
+                                </td>
+                                <td>
+                                  <ButtonGroup
+                                    block={false}
+                                    bsClass="btn-group"
+                                    className="pull-right"
+                                    justified={false}
+                                    vertical={false}
+                                  >
+                                    <div
+                                      className="pull-right btn-group"
+                                    >
                                       <Button
                                         active={false}
                                         block={false}
                                         bsClass="btn"
-                                        bsStyle="link"
-                                        data-test-id="editable-text-field-edit-button"
+                                        bsSize="xsmall"
+                                        bsStyle="warning"
                                         disabled={false}
                                         onClick={[Function]}
                                       >
                                         <button
-                                          className="btn btn-link"
-                                          data-test-id="editable-text-field-edit-button"
+                                          className="btn btn-xs btn-warning"
                                           disabled={false}
                                           onClick={[Function]}
                                           type="button"
                                         >
-                                          <Icon
-                                            type="pencil"
+                                          <Glyphicon
+                                            bsClass="glyphicon"
+                                            glyph="pushpin"
                                           >
-                                            <i
-                                              className="fa fa-pencil fa-fw "
+                                            <span
+                                              className="glyphicon glyphicon-pushpin"
                                             />
-                                          </Icon>
+                                          </Glyphicon>
                                         </button>
                                       </Button>
-                                    </span>
-                                  </div>
-                                </EditableTextField>
-                              </td>
-                              <td>
-                                <span
-                                  title="Mar 22nd 2019, 3:05pm"
-                                >
-                                   
-                                  2 months ago
-                                </span>
-                              </td>
-                              <td>
-                                <span
-                                  className="deployment-na"
-                                >
-                                  N/A
-                                </span>
-                              </td>
-                              <td>
-                                <span
-                                  className="deployment-na"
-                                >
-                                  N/A
-                                </span>
-                              </td>
-                              <td>
-                                <span>
-                                  0
-                                </span>
-                              </td>
-                              <td>
-                                <span
-                                  className="deployment-na"
-                                >
-                                  N/A
-                                </span>
-                              </td>
-                              <td>
-                                <ButtonGroup
-                                  block={false}
-                                  bsClass="btn-group"
-                                  className="pull-right"
-                                  justified={false}
-                                  vertical={false}
-                                >
-                                  <div
-                                    className="pull-right btn-group"
-                                  >
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="warning"
-                                      disabled={false}
-                                      onClick={[Function]}
-                                    >
-                                      <button
-                                        className="btn btn-xs btn-warning"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                        type="button"
-                                      >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="pushpin"
-                                        >
-                                          <span
-                                            className="glyphicon glyphicon-pushpin"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="danger"
-                                      disabled={false}
-                                      onClick={[Function]}
-                                    >
-                                      <button
-                                        className="btn btn-xs btn-danger"
+                                      <Button
+                                        active={false}
+                                        block={false}
+                                        bsClass="btn"
+                                        bsSize="xsmall"
+                                        bsStyle="danger"
                                         disabled={false}
                                         onClick={[Function]}
-                                        type="button"
                                       >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="remove"
+                                        <button
+                                          className="btn btn-xs btn-danger"
+                                          disabled={false}
+                                          onClick={[Function]}
+                                          type="button"
                                         >
-                                          <span
-                                            className="glyphicon glyphicon-remove"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                  </div>
-                                </ButtonGroup>
-                              </td>
-                            </tr>
-                          </DeploymentListItem>
-                        </tbody>
-                      </table>
-                    </Table>
-                  </div>
-                </Panel>
+                                          <Glyphicon
+                                            bsClass="glyphicon"
+                                            glyph="remove"
+                                          >
+                                            <span
+                                              className="glyphicon glyphicon-remove"
+                                            />
+                                          </Glyphicon>
+                                        </button>
+                                      </Button>
+                                    </div>
+                                  </ButtonGroup>
+                                </td>
+                              </tr>
+                            </DeploymentListItem>
+                          </tbody>
+                        </table>
+                      </Table>
+                    </div>
+                  </Panel>
+                </Uncontrolled(Panel)>
               </DeploymentsList>
             </div>
           </Col>
@@ -2100,40 +2119,36 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             <div
               className="col-xs-3"
             >
-              <Panel
-                bsClass="panel"
-                bsStyle="default"
-                defaultExpanded={false}
+              <Uncontrolled(Panel)
                 header={
                   <h3>
                     Deploying feeds to OTP
                   </h3>
                 }
               >
-                <div
-                  className="panel panel-default"
-                >
-                  <div
-                    className="panel-heading"
-                  >
-                    <h3
-                      className="panel-title"
-                    >
+                <Panel
+                  bsClass="panel"
+                  bsStyle="default"
+                  header={
+                    <h3>
                       Deploying feeds to OTP
                     </h3>
-                  </div>
+                  }
+                  onToggle={[Function]}
+                >
                   <div
-                    className="panel-body"
-                    key="0"
+                    className="panel panel-default"
+                    header={
+                      <h3>
+                        Deploying feeds to OTP
+                      </h3>
+                    }
                   >
-                    <p
-                      key=".0"
-                    >
+                    <p>
                       A collection of feeds can be deployed to OpenTripPlanner (OTP) instances that have been defined in the organization settings.
                     </p>
                     <LinkContainer
                       action="push"
-                      key=".1"
                       onlyActiveOnIndex={false}
                       to="/project/mock-project-with-deployments-id/settings/deployment"
                     >
@@ -2166,7 +2181,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     </LinkContainer>
                     <LinkContainer
                       action="push"
-                      key=".2"
                       onlyActiveOnIndex={false}
                       to="/admin/servers"
                     >
@@ -2198,8 +2212,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       </Button>
                     </LinkContainer>
                   </div>
-                </div>
-              </Panel>
+                </Panel>
+              </Uncontrolled(Panel)>
             </div>
           </Col>
         </div>
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 7c199416c..87dd84c51 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -547,10 +547,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
         }
       }
     >
-      <Panel
-        bsClass="panel"
-        bsStyle="default"
-        defaultExpanded={false}
+      <Uncontrolled(Panel)
         header={
           <Connect(ProjectFeedListToolbar)
             onNewFeedSourceClick={[Function]}
@@ -737,14 +734,11 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
           />
         }
       >
-        <div
-          className="panel panel-default"
-        >
-          <div
-            className="panel-heading"
-          >
+        <Panel
+          bsClass="panel"
+          bsStyle="default"
+          header={
             <Connect(ProjectFeedListToolbar)
-              className="panel-title"
               onNewFeedSourceClick={[Function]}
               project={
                 Object {
@@ -926,36 +920,15 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   "user": null,
                 }
               }
-            >
-              <ProjectFeedListToolbar
-                calculateFeedSourceTableComparisonColumn={[Function]}
-                className="panel-title"
-                downloadFeedForProject={[Function]}
-                fetchFeedsForProject={[Function]}
-                filter={
-                  Object {
-                    "feedSourceTableComparisonColumn": "DEPLOYED",
-                    "feedSourceTableFilterCountStrategy": "LATEST",
-                    "filter": null,
-                    "searchText": null,
-                  }
-                }
-                filterCounts={
-                  Object {
-                    "active": 1,
-                    "all": 1,
-                    "expired": 0,
-                    "expiring": 0,
-                    "future": 0,
-                  }
-                }
+            />
+          }
+          onToggle={[Function]}
+        >
+          <div
+            className="panel panel-default"
+            header={
+              <Connect(ProjectFeedListToolbar)
                 onNewFeedSourceClick={[Function]}
-                possibleComparisons={
-                  Array [
-                    "LATEST",
-                    "DEPLOYED",
-                  ]
-                }
                 project={
                   Object {
                     "autoFetchFeeds": true,
@@ -1136,1823 +1109,114 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "user": null,
                   }
                 }
-                projectEditDisabled={false}
-                setFeedSort={[Function]}
-                setFeedSourceTableFilterCountStrategy={[Function]}
-                setVisibilityFilter={[Function]}
-                setVisibilitySearchText={[Function]}
-                sort="alphabetically-asc"
-                thirdPartySync={[Function]}
-                user={
-                  Object {
-                    "isCheckingLogin": false,
-                    "permissions": UserPermissions {
-                      "appPermissionLookup": Object {
-                        "administer-application": Object {
-                          "type": "administer-application",
-                        },
-                      },
-                      "orgPermissionLookup": Object {},
-                      "organizationLookup": Object {},
-                      "projectLookup": Object {},
-                    },
-                    "profile": Object {
-                      "app_metadata": Object {
-                        "datatools": Array [
-                          Object {
-                            "client_id": "mock-client-id",
-                            "organizations": Array [],
-                            "permissions": Array [
-                              Object {
-                                "type": "administer-application",
-                              },
-                            ],
-                            "projects": Array [],
-                            "subscriptions": Array [],
-                          },
-                        ],
-                      },
-                      "clientID": "mock-client-id",
-                      "created_at": "2016-03-04T18:59:22.569Z",
-                      "email": "mock-user@conveyal.com",
-                      "email_verified": true,
-                      "identities": Array [
-                        Object {
-                          "connection": "Username-Password-Authentication",
-                          "isSocial": false,
-                          "provider": "auth0",
-                          "user_id": "12345",
-                        },
-                      ],
-                      "jti": "gibberish",
-                      "last_password_reset": "2017-07-13T13:58:01.021Z",
-                      "name": "mock-user@conveyal.com",
-                      "nickname": "mock-user",
-                      "persistent": Object {},
-                      "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
-                      "sub": "auth0|12345",
-                      "updated_at": "2019-03-21T19:05:30.180Z",
-                      "user_id": "auth0|12345",
-                      "user_metadata": Object {
-                        "datatools": Array [
-                          Object {
-                            "client_id": "mock-client-id",
-                            "editor": Object {
-                              "map_id": "mapbox.streets",
-                            },
-                            "hideTutorial": true,
-                            "sidebarExpanded": false,
-                          },
-                        ],
-                        "lang": "en",
-                      },
-                    },
-                    "recentActivity": null,
-                    "redirectOnSuccess": null,
-                    "subscriptions": UserSubscriptions {
-                      "subscriptionLookup": Object {},
-                    },
-                    "token": "mock-token",
-                  }
-                }
+              />
+            }
+          >
+            <ListGroup
+              bsClass="list-group"
+              fill={true}
+            >
+              <div
+                className="list-group"
+                fill={true}
               >
-                <Row
-                  bsClass="row"
-                  componentClass="div"
+                <table
+                  className="feed-source-table"
                 >
-                  <div
-                    className="row"
-                  >
-                    <Col
-                      bsClass="col"
-                      componentClass="div"
-                      style={
-                        Object {
-                          "marginTop": 25,
-                        }
-                      }
-                      xs={4}
-                    >
-                      <div
-                        className="col-xs-4"
-                        style={
-                          Object {
-                            "marginTop": 25,
-                          }
-                        }
+                  <thead>
+                    <tr>
+                      <th />
+                      <th
+                        className="comparison-column top-row"
                       >
-                        <Form
-                          bsClass="form"
-                          componentClass="form"
-                          horizontal={false}
-                          inline={true}
-                          style={
-                            Object {
-                              "display": "inline",
-                            }
-                          }
-                        >
-                          <form
-                            className="form-inline"
-                            style={
-                              Object {
-                                "display": "inline",
-                              }
-                            }
+                        <h4>
+                          Deployed Version
+                        </h4>
+                      </th>
+                      <th
+                        className="feed-version-column top-row"
+                        colSpan={3}
+                      >
+                        <h4>
+                          Latest Version
+                        </h4>
+                      </th>
+                      <th />
+                    </tr>
+                    <tr>
+                      <th>
+                        <h4>
+                          <Icon
+                            type="info-circle"
                           >
-                            <FormGroup
-                              bsClass="form-group"
-                              className="feed-source-toolbar-formgroup"
-                              controlId="formControlsSelect"
-                            >
-                              <div
-                                className="feed-source-toolbar-formgroup form-group"
-                              >
-                                <FormControl
-                                  bsClass="form-control"
-                                  componentClass="input"
-                                  onChange={[Function]}
-                                  placeholder="Search by name"
-                                >
-                                  <input
-                                    className="form-control"
-                                    id="formControlsSelect"
-                                    onChange={[Function]}
-                                    placeholder="Search by name"
-                                  />
-                                </FormControl>
-                              </div>
-                            </FormGroup>
-                          </form>
-                        </Form>
-                        <DropdownButton
-                          id="project-feedsource-table-sort-button"
-                          style={
-                            Object {
-                              "marginLeft": 20,
-                            }
-                          }
-                          title="Sort By"
-                        >
-                          <Uncontrolled(Dropdown)
-                            id="project-feedsource-table-sort-button"
+                            <i
+                              className="fa fa-info-circle fa-fw "
+                            />
+                          </Icon>
+                          Feed Info
+                        </h4>
+                      </th>
+                      <th
+                        className="comparison-column"
+                      >
+                        <h4>
+                          <Icon
+                            type="heartbeat"
                           >
-                            <Dropdown
-                              bsClass="dropdown"
-                              componentClass={[Function]}
-                              id="project-feedsource-table-sort-button"
-                              onToggle={[Function]}
-                            >
-                              <ButtonGroup
-                                block={false}
-                                bsClass="btn-group"
-                                className="dropdown"
-                                justified={false}
-                                vertical={false}
-                              >
-                                <div
-                                  className="dropdown btn-group"
-                                >
-                                  <DropdownToggle
-                                    bsClass="dropdown-toggle"
-                                    bsRole="toggle"
-                                    id="project-feedsource-table-sort-button"
-                                    key=".0"
-                                    onClick={[Function]}
-                                    onKeyDown={[Function]}
-                                    open={false}
-                                    style={
-                                      Object {
-                                        "marginLeft": 20,
-                                      }
-                                    }
-                                    useAnchor={false}
-                                  >
-                                    <Button
-                                      active={false}
-                                      aria-expanded={false}
-                                      aria-haspopup={true}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsStyle="default"
-                                      className="dropdown-toggle"
-                                      disabled={false}
-                                      id="project-feedsource-table-sort-button"
-                                      onClick={[Function]}
-                                      onKeyDown={[Function]}
-                                      role="button"
-                                      style={
-                                        Object {
-                                          "marginLeft": 20,
-                                        }
-                                      }
-                                    >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        className="dropdown-toggle btn btn-default"
-                                        disabled={false}
-                                        id="project-feedsource-table-sort-button"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        role="button"
-                                        style={
-                                          Object {
-                                            "marginLeft": 20,
-                                          }
-                                        }
-                                        type="button"
-                                      >
-                                        Sort By
-                                         
-                                        <span
-                                          className="caret"
-                                        />
-                                      </button>
-                                    </Button>
-                                  </DropdownToggle>
-                                  <DropdownMenu
-                                    bsClass="dropdown-menu"
-                                    bsRole="menu"
-                                    key=".1"
-                                    labelledBy="project-feedsource-table-sort-button"
-                                    onClose={[Function]}
-                                    onSelect={[Function]}
-                                    pullRight={false}
-                                  >
-                                    <RootCloseWrapper
-                                      disabled={true}
-                                      event="click"
-                                      onRootClose={[Function]}
-                                    >
-                                      <ul
-                                        aria-labelledby="project-feedsource-table-sort-button"
-                                        className="dropdown-menu"
-                                        role="menu"
-                                      >
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={true}
-                                          key=".$sort-header-note"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="dropdown-header"
-                                            onKeyDown={[Function]}
-                                            role="heading"
-                                          >
-                                            Note: sorting only available on latest version data
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={true}
-                                          key=".$feed-sort-alphabetically-header"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="dropdown-header"
-                                            onKeyDown={[Function]}
-                                            role="heading"
-                                          >
-                                            Alphabetically
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-alphabetically-asc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                A-Z
-                                                <Icon
-                                                  style={
-                                                    Object {
-                                                      "marginLeft": 6,
-                                                    }
-                                                  }
-                                                  type="check"
-                                                >
-                                                  <i
-                                                    className="fa fa-check fa-fw "
-                                                    style={
-                                                      Object {
-                                                        "marginLeft": 6,
-                                                      }
-                                                    }
-                                                  />
-                                                </Icon>
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-alphabetically-desc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                Z-A
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={true}
-                                          header={false}
-                                          key=".$feed-sort-alphabetically-divider"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="divider"
-                                            onKeyDown={[Function]}
-                                            role="separator"
-                                          />
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={true}
-                                          key=".$feed-sort-endDate-header"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="dropdown-header"
-                                            onKeyDown={[Function]}
-                                            role="heading"
-                                          >
-                                            Expiration Date
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-endDate-asc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                Earliest-Latest
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-endDate-desc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                Latest-Earliest
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={true}
-                                          header={false}
-                                          key=".$feed-sort-endDate-divider"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="divider"
-                                            onKeyDown={[Function]}
-                                            role="separator"
-                                          />
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={true}
-                                          key=".$feed-sort-startDate-header"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="dropdown-header"
-                                            onKeyDown={[Function]}
-                                            role="heading"
-                                          >
-                                            Start Date
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-startDate-asc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                Earliest-Latest
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-startDate-desc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                Latest-Earliest
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={true}
-                                          header={false}
-                                          key=".$feed-sort-startDate-divider"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="divider"
-                                            onKeyDown={[Function]}
-                                            role="separator"
-                                          />
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={true}
-                                          key=".$feed-sort-lastUpdated-header"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="dropdown-header"
-                                            onKeyDown={[Function]}
-                                            role="heading"
-                                          >
-                                            Last Update
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-lastUpdated-asc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                Stale-Recent
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-lastUpdated-desc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                Recent-Stale
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={true}
-                                          header={false}
-                                          key=".$feed-sort-lastUpdated-divider"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="divider"
-                                            onKeyDown={[Function]}
-                                            role="separator"
-                                          />
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={true}
-                                          key=".$feed-sort-numErrors-header"
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className="dropdown-header"
-                                            onKeyDown={[Function]}
-                                            role="heading"
-                                          >
-                                            Number of Issues
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-numErrors-asc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                Least-Most
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$feed-sort-numErrors-desc"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                Most-Least
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                      </ul>
-                                    </RootCloseWrapper>
-                                  </DropdownMenu>
-                                </div>
-                              </ButtonGroup>
-                            </Dropdown>
-                          </Uncontrolled(Dropdown)>
-                        </DropdownButton>
-                      </div>
-                    </Col>
-                    <Col
-                      bsClass="col"
-                      componentClass="div"
-                      xs={6}
-                    >
-                      <div
-                        className="col-xs-6"
+                            <i
+                              className="fa fa-heartbeat fa-fw "
+                            />
+                          </Icon>
+                          Status
+                        </h4>
+                      </th>
+                      <th
+                        className="feed-version-column"
                       >
-                        <FormGroup
-                          bsClass="form-group"
-                          id="feedFilterToolbarControl"
-                        >
-                          <div
-                            className="form-group"
-                            id="feedFilterToolbarControl"
+                        <h4>
+                          <Icon
+                            type="heartbeat"
                           >
-                            <ControlLabel
-                              bsClass="control-label"
-                              srOnly={false}
-                              style={
-                                Object {
-                                  "display": "block",
-                                }
-                              }
-                            >
-                              <label
-                                className="control-label"
-                                style={
-                                  Object {
-                                    "display": "block",
-                                  }
-                                }
-                              >
-                                Filter feed sources on
-                                <select
-                                  onChange={[Function]}
-                                  style={
-                                    Object {
-                                      "marginLeft": 5,
-                                      "marginRight": 5,
-                                    }
-                                  }
-                                  value="LATEST"
-                                >
-                                  <option
-                                    key="LATEST"
-                                    value="LATEST"
-                                  >
-                                    Latest
-                                  </option>
-                                  <option
-                                    key="DEPLOYED"
-                                    value="DEPLOYED"
-                                  >
-                                    Deployed
-                                  </option>
-                                </select>
-                                version
-                              </label>
-                            </ControlLabel>
-                            <ButtonGroup
-                              block={false}
-                              bsClass="btn-group"
-                              justified={false}
-                              vertical={false}
-                            >
-                              <div
-                                className="btn-group"
-                              >
-                                <OptionButton
-                                  active={true}
-                                  className="active"
-                                  key="all"
-                                  onClick={[Function]}
-                                  value="all"
-                                >
-                                  <Button
-                                    active={true}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className="active"
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="all"
-                                  >
-                                    <SafeAnchor
-                                      className="active btn btn-default active"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="all"
-                                    >
-                                      <a
-                                        className="active btn btn-default active"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="all"
-                                      >
-                                        All
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            1
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                                <OptionButton
-                                  active={false}
-                                  className=""
-                                  key="active"
-                                  onClick={[Function]}
-                                  value="active"
-                                >
-                                  <Button
-                                    active={false}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className=""
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="active"
-                                  >
-                                    <SafeAnchor
-                                      className="btn btn-default"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="active"
-                                    >
-                                      <a
-                                        className="btn btn-default"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="active"
-                                      >
-                                        Active
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            1
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                                <OptionButton
-                                  active={false}
-                                  className=""
-                                  key="expiring"
-                                  onClick={[Function]}
-                                  value="expiring"
-                                >
-                                  <Button
-                                    active={false}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className=""
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="expiring"
-                                  >
-                                    <SafeAnchor
-                                      className="btn btn-default"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="expiring"
-                                    >
-                                      <a
-                                        className="btn btn-default"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="expiring"
-                                      >
-                                        Expiring
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            0
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                                <OptionButton
-                                  active={false}
-                                  className=""
-                                  key="expired"
-                                  onClick={[Function]}
-                                  value="expired"
-                                >
-                                  <Button
-                                    active={false}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className=""
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="expired"
-                                  >
-                                    <SafeAnchor
-                                      className="btn btn-default"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="expired"
-                                    >
-                                      <a
-                                        className="btn btn-default"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="expired"
-                                      >
-                                        Expired
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            0
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                                <OptionButton
-                                  active={false}
-                                  className=""
-                                  key="future"
-                                  onClick={[Function]}
-                                  value="future"
-                                >
-                                  <Button
-                                    active={false}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className=""
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="future"
-                                  >
-                                    <SafeAnchor
-                                      className="btn btn-default"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="future"
-                                    >
-                                      <a
-                                        className="btn btn-default"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="future"
-                                      >
-                                        Future
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            0
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                              </div>
-                            </ButtonGroup>
-                          </div>
-                        </FormGroup>
-                      </div>
-                    </Col>
-                    <Col
-                      bsClass="col"
-                      componentClass="div"
-                      style={
-                        Object {
-                          "marginTop": 25,
-                        }
-                      }
-                      xs={2}
-                    >
-                      <div
-                        className="col-xs-2"
-                        style={
-                          Object {
-                            "marginTop": 25,
-                          }
-                        }
-                      >
-                        <DropdownButton
-                          bsStyle="primary"
-                          data-test-id="project-header-action-dropdown-button"
-                          id="project-header-actions"
-                          style={
-                            Object {
-                              "marginLeft": 20,
-                            }
-                          }
-                          title="Actions"
-                        >
-                          <Uncontrolled(Dropdown)
-                            bsStyle="primary"
-                            id="project-header-actions"
-                          >
-                            <Dropdown
-                              bsClass="dropdown"
-                              bsStyle="primary"
-                              componentClass={[Function]}
-                              id="project-header-actions"
-                              onToggle={[Function]}
-                            >
-                              <ButtonGroup
-                                block={false}
-                                bsClass="btn-group"
-                                bsStyle="primary"
-                                className="dropdown"
-                                justified={false}
-                                vertical={false}
-                              >
-                                <div
-                                  className="dropdown btn-group btn-group-primary"
-                                >
-                                  <DropdownToggle
-                                    bsClass="dropdown-toggle"
-                                    bsRole="toggle"
-                                    bsStyle="primary"
-                                    data-test-id="project-header-action-dropdown-button"
-                                    id="project-header-actions"
-                                    key=".0"
-                                    onClick={[Function]}
-                                    onKeyDown={[Function]}
-                                    open={false}
-                                    style={
-                                      Object {
-                                        "marginLeft": 20,
-                                      }
-                                    }
-                                    useAnchor={false}
-                                  >
-                                    <Button
-                                      active={false}
-                                      aria-expanded={false}
-                                      aria-haspopup={true}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsStyle="primary"
-                                      className="dropdown-toggle"
-                                      data-test-id="project-header-action-dropdown-button"
-                                      disabled={false}
-                                      id="project-header-actions"
-                                      onClick={[Function]}
-                                      onKeyDown={[Function]}
-                                      role="button"
-                                      style={
-                                        Object {
-                                          "marginLeft": 20,
-                                        }
-                                      }
-                                    >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        className="dropdown-toggle btn btn-primary"
-                                        data-test-id="project-header-action-dropdown-button"
-                                        disabled={false}
-                                        id="project-header-actions"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        role="button"
-                                        style={
-                                          Object {
-                                            "marginLeft": 20,
-                                          }
-                                        }
-                                        type="button"
-                                      >
-                                        Actions
-                                         
-                                        <span
-                                          className="caret"
-                                        />
-                                      </button>
-                                    </Button>
-                                  </DropdownToggle>
-                                  <DropdownMenu
-                                    bsClass="dropdown-menu"
-                                    bsRole="menu"
-                                    key=".1"
-                                    labelledBy="project-header-actions"
-                                    onClose={[Function]}
-                                    onSelect={[Function]}
-                                    pullRight={false}
-                                  >
-                                    <RootCloseWrapper
-                                      disabled={true}
-                                      event="click"
-                                      onRootClose={[Function]}
-                                    >
-                                      <ul
-                                        aria-labelledby="project-header-actions"
-                                        className="dropdown-menu"
-                                        role="menu"
-                                      >
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          data-test-id="project-header-create-new-feed-source-button"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$create-feedsource-button"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              data-test-id="project-header-create-new-feed-source-button"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                data-test-id="project-header-create-new-feed-source-button"
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                <Glyphicon
-                                                  bsClass="glyphicon"
-                                                  glyph="plus"
-                                                >
-                                                  <span
-                                                    className="glyphicon glyphicon-plus"
-                                                  />
-                                                </Glyphicon>
-                                                 
-                                                New
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$update-feeds-button"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                <Icon
-                                                  type="cloud-download"
-                                                >
-                                                  <i
-                                                    className="fa fa-cloud-download fa-fw "
-                                                  />
-                                                </Icon>
-                                                 
-                                                Fetch all
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$merge-feeds-button"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                <Glyphicon
-                                                  bsClass="glyphicon"
-                                                  glyph="download"
-                                                >
-                                                  <span
-                                                    className="glyphicon glyphicon-download"
-                                                  />
-                                                </Glyphicon>
-                                                 
-                                                Merge all
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$csv-download-button"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                <Icon
-                                                  type="table"
-                                                >
-                                                  <i
-                                                    className="fa fa-table fa-fw "
-                                                  />
-                                                </Icon>
-                                                 
-                                                Download Summary as CSV
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                      </ul>
-                                    </RootCloseWrapper>
-                                  </DropdownMenu>
-                                </div>
-                              </ButtonGroup>
-                            </Dropdown>
-                          </Uncontrolled(Dropdown)>
-                        </DropdownButton>
-                      </div>
-                    </Col>
-                  </div>
-                </Row>
-              </ProjectFeedListToolbar>
-            </Connect(ProjectFeedListToolbar)>
-          </div>
-          <ListGroup
-            bsClass="list-group"
-            key=".0"
-          >
-            <div
-              className="list-group"
-            >
-              <table
-                className="feed-source-table"
-              >
-                <thead>
-                  <tr>
-                    <th />
-                    <th
-                      className="comparison-column top-row"
-                    >
-                      <h4>
-                        Deployed Version
-                      </h4>
-                    </th>
-                    <th
-                      className="feed-version-column top-row"
-                      colSpan={3}
-                    >
-                      <h4>
-                        Latest Version
-                      </h4>
-                    </th>
-                    <th />
-                  </tr>
-                  <tr>
-                    <th>
-                      <h4>
-                        <Icon
-                          type="info-circle"
-                        >
-                          <i
-                            className="fa fa-info-circle fa-fw "
-                          />
-                        </Icon>
-                        Feed Info
-                      </h4>
-                    </th>
-                    <th
-                      className="comparison-column"
-                    >
-                      <h4>
-                        <Icon
-                          type="heartbeat"
-                        >
-                          <i
-                            className="fa fa-heartbeat fa-fw "
-                          />
-                        </Icon>
-                        Status
-                      </h4>
-                    </th>
-                    <th
-                      className="feed-version-column"
-                    >
-                      <h4>
-                        <Icon
-                          type="heartbeat"
-                        >
-                          <i
-                            className="fa fa-heartbeat fa-fw "
-                          />
-                        </Icon>
-                        Status
-                      </h4>
-                    </th>
-                    <th
-                      className="feed-version-column"
-                    >
-                      <h4>
-                        <Icon
-                          type="calendar-check-o"
-                        >
-                          <i
-                            className="fa fa-calendar-check-o fa-fw "
-                          />
-                        </Icon>
-                        Dates Valid
-                      </h4>
-                    </th>
-                    <th
-                      className="feed-version-column"
-                    >
-                      <h4>
-                        <Icon
-                          type="exclamation-triangle"
-                        >
-                          <i
-                            className="fa fa-exclamation-triangle fa-fw "
-                          />
-                        </Icon>
-                        Issues
-                      </h4>
-                    </th>
-                    <th />
-                  </tr>
-                </thead>
-                <tbody>
-                  <Connect(FeedSourceTableRow)
-                    feedSource={
-                      Object {
-                        "dateCreated": 1536195264564,
-                        "deployable": false,
-                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                        "externalProperties": Object {},
-                        "id": "mock-feed-with-version-id",
-                        "isPublic": false,
-                        "lastFetched": 1543389038810,
-                        "lastUpdated": 1543389038810,
-                        "latestValidation": Object {
-                          "agencies": null,
-                          "agencyCount": 1,
-                          "avgDailyRevenueTime": 0,
-                          "bounds": Object {
-                            "east": -76.481211,
-                            "north": 39.0486949672717,
-                            "south": 38.92884,
-                            "west": -76.5673055566884,
-                          },
-                          "endDate": "20190801",
-                          "errorCount": 78,
-                          "feedVersionId": "mock-feed-version-id",
-                          "loadFailureReason": null,
-                          "loadStatus": "SUCCESS",
-                          "routeCount": 10,
-                          "startDate": "20180801",
-                          "stopCount": 237,
-                          "stopTimesCount": 11170,
-                          "tripCount": 415,
-                        },
-                        "latestVersionId": "mock-feed-version-id",
-                        "name": "test feed with a version",
-                        "noteCount": 0,
-                        "organizationId": null,
-                        "projectId": "mock-project-id",
-                        "publishedVersionId": null,
-                        "retrievalMethod": "MANUALLY_UPLOADED",
-                        "s3Url": null,
-                        "snapshotVersion": null,
-                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                        "user": null,
-                      }
-                    }
-                    key="mock-feed-with-version-id"
-                    project={
-                      Object {
-                        "autoFetchFeeds": true,
-                        "autoFetchHour": 0,
-                        "autoFetchMinute": 0,
-                        "bounds": null,
-                        "buildConfig": Object {
-                          "fares": null,
-                          "fetchElevationUS": null,
-                          "stationTransfers": null,
-                          "subwayAccessTime": null,
-                        },
-                        "dateCreated": 1526305321824,
-                        "defaultTimeZone": null,
-                        "deployments": Array [
-                          Object {
-                            "customBuildConfig": null,
-                            "customRouterConfig": null,
-                            "dateCreated": 1553292345720,
-                            "deployJobSummaries": Array [],
-                            "deployedTo": null,
-                            "ec2Instances": Array [],
-                            "feedSourceId": null,
-                            "feedVersions": Array [
-                              Object {
-                                "feedSource": Object {
-                                  "dateCreated": 1536195264564,
-                                  "deployable": false,
-                                  "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                  "externalProperties": Object {},
-                                  "id": "mock-feed-with-version-id",
-                                  "isPublic": false,
-                                  "lastFetched": 1543389038810,
-                                  "lastUpdated": 1543389038810,
-                                  "latestValidation": Object {
-                                    "agencies": null,
-                                    "agencyCount": 1,
-                                    "avgDailyRevenueTime": 0,
-                                    "bounds": Object {
-                                      "east": -76.481211,
-                                      "north": 39.0486949672717,
-                                      "south": 38.92884,
-                                      "west": -76.5673055566884,
-                                    },
-                                    "endDate": "20190801",
-                                    "errorCount": 78,
-                                    "feedVersionId": "mock-feed-version-id",
-                                    "loadFailureReason": null,
-                                    "loadStatus": "SUCCESS",
-                                    "routeCount": 10,
-                                    "startDate": "20180801",
-                                    "stopCount": 237,
-                                    "stopTimesCount": 11170,
-                                    "tripCount": 415,
-                                  },
-                                  "latestVersionId": "mock-feed-version-id",
-                                  "name": "test feed with a version",
-                                  "noteCount": 0,
-                                  "organizationId": null,
-                                  "projectId": "mock-project-id",
-                                  "publishedVersionId": null,
-                                  "retrievalMethod": "MANUALLY_UPLOADED",
-                                  "s3Url": null,
-                                  "snapshotVersion": null,
-                                  "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                  "user": null,
-                                },
-                                "id": "mock-feed-version-id",
-                                "nextVersionId": null,
-                                "previousVersionId": null,
-                                "updated": 1543389038810,
-                                "validationResult": Object {
-                                  "agencies": null,
-                                  "agencyCount": 1,
-                                  "avgDailyRevenueTime": 0,
-                                  "bounds": Object {
-                                    "east": -76.481211,
-                                    "north": 39.0486949672717,
-                                    "south": 38.92884,
-                                    "west": -76.5673055566884,
-                                  },
-                                  "endDate": "20190801",
-                                  "errorCount": 78,
-                                  "feedVersionId": "mock-feed-version-id",
-                                  "loadFailureReason": null,
-                                  "loadStatus": "SUCCESS",
-                                  "routeCount": 10,
-                                  "startDate": "20180801",
-                                  "stopCount": 237,
-                                  "stopTimesCount": 11170,
-                                  "tripCount": 415,
-                                },
-                                "version": 1,
-                              },
-                            ],
-                            "id": "mock-deployment-id-0",
-                            "invalidFeedSources": Array [],
-                            "lastDeployed": null,
-                            "lastUpdated": 1553292345726,
-                            "latest": null,
-                            "name": "mock-deployment",
-                            "organizationId": null,
-                            "osmFileId": null,
-                            "otpCommit": null,
-                            "otpVersion": null,
-                            "project": [Circular],
-                            "projectBounds": Object {
-                              "east": 0,
-                              "north": 0,
-                              "south": 0,
-                              "west": 0,
-                            },
-                            "r5": false,
-                            "r5Version": null,
-                            "routerId": null,
-                            "user": null,
-                          },
-                        ],
-                        "feedSources": Array [
-                          Object {
-                            "dateCreated": 1536195264564,
-                            "deployable": false,
-                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                            "externalProperties": Object {},
-                            "id": "mock-feed-with-version-id",
-                            "isPublic": false,
-                            "lastFetched": 1543389038810,
-                            "lastUpdated": 1543389038810,
-                            "latestValidation": Object {
-                              "agencies": null,
-                              "agencyCount": 1,
-                              "avgDailyRevenueTime": 0,
-                              "bounds": Object {
-                                "east": -76.481211,
-                                "north": 39.0486949672717,
-                                "south": 38.92884,
-                                "west": -76.5673055566884,
-                              },
-                              "endDate": "20190801",
-                              "errorCount": 78,
-                              "feedVersionId": "mock-feed-version-id",
-                              "loadFailureReason": null,
-                              "loadStatus": "SUCCESS",
-                              "routeCount": 10,
-                              "startDate": "20180801",
-                              "stopCount": 237,
-                              "stopTimesCount": 11170,
-                              "tripCount": 415,
-                            },
-                            "latestVersionId": "mock-feed-version-id",
-                            "name": "test feed with a version",
-                            "noteCount": 0,
-                            "organizationId": null,
-                            "projectId": "mock-project-id",
-                            "publishedVersionId": null,
-                            "retrievalMethod": "MANUALLY_UPLOADED",
-                            "s3Url": null,
-                            "snapshotVersion": null,
-                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                            "user": null,
-                          },
-                        ],
-                        "id": "mock-project-with-deployments-id",
-                        "lastUpdated": 1553236399556,
-                        "name": "mock-project-with-deployments",
-                        "organizationId": null,
-                        "otpServers": Array [],
-                        "pinnedDeploymentId": null,
-                        "routerConfig": Object {
-                          "carDropoffTime": null,
-                          "numItineraries": null,
-                          "requestLogFile": null,
-                          "stairsReluctance": null,
-                          "updaters": null,
-                          "walkSpeed": null,
-                        },
-                        "useCustomOsmBounds": false,
-                        "user": null,
-                      }
-                    }
-                  >
-                    <FeedSourceTableRow
-                      comparisonColumn="DEPLOYED"
-                      comparisonValidationSummary={
-                        Object {
-                          "agencies": null,
-                          "agencyCount": 1,
-                          "avgDailyRevenueTime": 0,
-                          "bounds": Object {
-                            "east": -76.481211,
-                            "north": 39.0486949672717,
-                            "south": 38.92884,
-                            "west": -76.5673055566884,
-                          },
-                          "endDate": "20190801",
-                          "errorCount": 78,
-                          "feedVersionId": "mock-feed-version-id",
-                          "loadFailureReason": null,
-                          "loadStatus": "SUCCESS",
-                          "routeCount": 10,
-                          "startDate": "20180801",
-                          "stopCount": 237,
-                          "stopTimesCount": 11170,
-                          "tripCount": 415,
-                        }
-                      }
-                      createDeploymentFromFeedSource={[Function]}
-                      createFeedSource={[Function]}
-                      deleteFeedSource={[Function]}
+                            <i
+                              className="fa fa-heartbeat fa-fw "
+                            />
+                          </Icon>
+                          Status
+                        </h4>
+                      </th>
+                      <th
+                        className="feed-version-column"
+                      >
+                        <h4>
+                          <Icon
+                            type="calendar-check-o"
+                          >
+                            <i
+                              className="fa fa-calendar-check-o fa-fw "
+                            />
+                          </Icon>
+                          Dates Valid
+                        </h4>
+                      </th>
+                      <th
+                        className="feed-version-column"
+                      >
+                        <h4>
+                          <Icon
+                            type="exclamation-triangle"
+                          >
+                            <i
+                              className="fa fa-exclamation-triangle fa-fw "
+                            />
+                          </Icon>
+                          Issues
+                        </h4>
+                      </th>
+                      <th />
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <Connect(FeedSourceTableRow)
                       feedSource={
                         Object {
                           "dateCreated": 1536195264564,
@@ -2997,6 +1261,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "user": null,
                         }
                       }
+                      key="mock-feed-with-version-id"
                       project={
                         Object {
                           "autoFetchFeeds": true,
@@ -3177,91 +1442,198 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "user": null,
                         }
                       }
-                      runFetchFeed={[Function]}
-                      updateFeedSource={[Function]}
-                      uploadFeed={[Function]}
-                      user={
-                        Object {
-                          "isCheckingLogin": false,
-                          "permissions": UserPermissions {
-                            "appPermissionLookup": Object {
-                              "administer-application": Object {
-                                "type": "administer-application",
+                    >
+                      <FeedSourceTableRow
+                        comparisonColumn="DEPLOYED"
+                        comparisonValidationSummary={
+                          Object {
+                            "agencies": null,
+                            "agencyCount": 1,
+                            "avgDailyRevenueTime": 0,
+                            "bounds": Object {
+                              "east": -76.481211,
+                              "north": 39.0486949672717,
+                              "south": 38.92884,
+                              "west": -76.5673055566884,
+                            },
+                            "endDate": "20190801",
+                            "errorCount": 78,
+                            "feedVersionId": "mock-feed-version-id",
+                            "loadFailureReason": null,
+                            "loadStatus": "SUCCESS",
+                            "routeCount": 10,
+                            "startDate": "20180801",
+                            "stopCount": 237,
+                            "stopTimesCount": 11170,
+                            "tripCount": 415,
+                          }
+                        }
+                        createDeploymentFromFeedSource={[Function]}
+                        createFeedSource={[Function]}
+                        deleteFeedSource={[Function]}
+                        feedSource={
+                          Object {
+                            "dateCreated": 1536195264564,
+                            "deployable": false,
+                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                            "externalProperties": Object {},
+                            "id": "mock-feed-with-version-id",
+                            "isPublic": false,
+                            "lastFetched": 1543389038810,
+                            "lastUpdated": 1543389038810,
+                            "latestValidation": Object {
+                              "agencies": null,
+                              "agencyCount": 1,
+                              "avgDailyRevenueTime": 0,
+                              "bounds": Object {
+                                "east": -76.481211,
+                                "north": 39.0486949672717,
+                                "south": 38.92884,
+                                "west": -76.5673055566884,
                               },
+                              "endDate": "20190801",
+                              "errorCount": 78,
+                              "feedVersionId": "mock-feed-version-id",
+                              "loadFailureReason": null,
+                              "loadStatus": "SUCCESS",
+                              "routeCount": 10,
+                              "startDate": "20180801",
+                              "stopCount": 237,
+                              "stopTimesCount": 11170,
+                              "tripCount": 415,
                             },
-                            "orgPermissionLookup": Object {},
-                            "organizationLookup": Object {},
-                            "projectLookup": Object {},
-                          },
-                          "profile": Object {
-                            "app_metadata": Object {
-                              "datatools": Array [
-                                Object {
-                                  "client_id": "mock-client-id",
-                                  "organizations": Array [],
-                                  "permissions": Array [
-                                    Object {
-                                      "type": "administer-application",
-                                    },
-                                  ],
-                                  "projects": Array [],
-                                  "subscriptions": Array [],
-                                },
-                              ],
+                            "latestVersionId": "mock-feed-version-id",
+                            "name": "test feed with a version",
+                            "noteCount": 0,
+                            "organizationId": null,
+                            "projectId": "mock-project-id",
+                            "publishedVersionId": null,
+                            "retrievalMethod": "MANUALLY_UPLOADED",
+                            "s3Url": null,
+                            "snapshotVersion": null,
+                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                            "user": null,
+                          }
+                        }
+                        project={
+                          Object {
+                            "autoFetchFeeds": true,
+                            "autoFetchHour": 0,
+                            "autoFetchMinute": 0,
+                            "bounds": null,
+                            "buildConfig": Object {
+                              "fares": null,
+                              "fetchElevationUS": null,
+                              "stationTransfers": null,
+                              "subwayAccessTime": null,
                             },
-                            "clientID": "mock-client-id",
-                            "created_at": "2016-03-04T18:59:22.569Z",
-                            "email": "mock-user@conveyal.com",
-                            "email_verified": true,
-                            "identities": Array [
+                            "dateCreated": 1526305321824,
+                            "defaultTimeZone": null,
+                            "deployments": Array [
                               Object {
-                                "connection": "Username-Password-Authentication",
-                                "isSocial": false,
-                                "provider": "auth0",
-                                "user_id": "12345",
-                              },
-                            ],
-                            "jti": "gibberish",
-                            "last_password_reset": "2017-07-13T13:58:01.021Z",
-                            "name": "mock-user@conveyal.com",
-                            "nickname": "mock-user",
-                            "persistent": Object {},
-                            "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
-                            "sub": "auth0|12345",
-                            "updated_at": "2019-03-21T19:05:30.180Z",
-                            "user_id": "auth0|12345",
-                            "user_metadata": Object {
-                              "datatools": Array [
-                                Object {
-                                  "client_id": "mock-client-id",
-                                  "editor": Object {
-                                    "map_id": "mapbox.streets",
+                                "customBuildConfig": null,
+                                "customRouterConfig": null,
+                                "dateCreated": 1553292345720,
+                                "deployJobSummaries": Array [],
+                                "deployedTo": null,
+                                "ec2Instances": Array [],
+                                "feedSourceId": null,
+                                "feedVersions": Array [
+                                  Object {
+                                    "feedSource": Object {
+                                      "dateCreated": 1536195264564,
+                                      "deployable": false,
+                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                      "externalProperties": Object {},
+                                      "id": "mock-feed-with-version-id",
+                                      "isPublic": false,
+                                      "lastFetched": 1543389038810,
+                                      "lastUpdated": 1543389038810,
+                                      "latestValidation": Object {
+                                        "agencies": null,
+                                        "agencyCount": 1,
+                                        "avgDailyRevenueTime": 0,
+                                        "bounds": Object {
+                                          "east": -76.481211,
+                                          "north": 39.0486949672717,
+                                          "south": 38.92884,
+                                          "west": -76.5673055566884,
+                                        },
+                                        "endDate": "20190801",
+                                        "errorCount": 78,
+                                        "feedVersionId": "mock-feed-version-id",
+                                        "loadFailureReason": null,
+                                        "loadStatus": "SUCCESS",
+                                        "routeCount": 10,
+                                        "startDate": "20180801",
+                                        "stopCount": 237,
+                                        "stopTimesCount": 11170,
+                                        "tripCount": 415,
+                                      },
+                                      "latestVersionId": "mock-feed-version-id",
+                                      "name": "test feed with a version",
+                                      "noteCount": 0,
+                                      "organizationId": null,
+                                      "projectId": "mock-project-id",
+                                      "publishedVersionId": null,
+                                      "retrievalMethod": "MANUALLY_UPLOADED",
+                                      "s3Url": null,
+                                      "snapshotVersion": null,
+                                      "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                      "user": null,
+                                    },
+                                    "id": "mock-feed-version-id",
+                                    "nextVersionId": null,
+                                    "previousVersionId": null,
+                                    "updated": 1543389038810,
+                                    "validationResult": Object {
+                                      "agencies": null,
+                                      "agencyCount": 1,
+                                      "avgDailyRevenueTime": 0,
+                                      "bounds": Object {
+                                        "east": -76.481211,
+                                        "north": 39.0486949672717,
+                                        "south": 38.92884,
+                                        "west": -76.5673055566884,
+                                      },
+                                      "endDate": "20190801",
+                                      "errorCount": 78,
+                                      "feedVersionId": "mock-feed-version-id",
+                                      "loadFailureReason": null,
+                                      "loadStatus": "SUCCESS",
+                                      "routeCount": 10,
+                                      "startDate": "20180801",
+                                      "stopCount": 237,
+                                      "stopTimesCount": 11170,
+                                      "tripCount": 415,
+                                    },
+                                    "version": 1,
                                   },
-                                  "hideTutorial": true,
-                                  "sidebarExpanded": false,
+                                ],
+                                "id": "mock-deployment-id-0",
+                                "invalidFeedSources": Array [],
+                                "lastDeployed": null,
+                                "lastUpdated": 1553292345726,
+                                "latest": null,
+                                "name": "mock-deployment",
+                                "organizationId": null,
+                                "osmFileId": null,
+                                "otpCommit": null,
+                                "otpVersion": null,
+                                "project": [Circular],
+                                "projectBounds": Object {
+                                  "east": 0,
+                                  "north": 0,
+                                  "south": 0,
+                                  "west": 0,
                                 },
-                              ],
-                              "lang": "en",
-                            },
-                          },
-                          "recentActivity": null,
-                          "redirectOnSuccess": null,
-                          "subscriptions": UserSubscriptions {
-                            "subscriptionLookup": Object {},
-                          },
-                          "token": "mock-token",
-                        }
-                      }
-                    >
-                      <tr
-                        className="feed-source-table-row"
-                        key="mock-feed-with-version-id"
-                      >
-                        <td
-                          className="feed-source-info"
-                        >
-                          <FeedInfo
-                            feedSource={
+                                "r5": false,
+                                "r5Version": null,
+                                "routerId": null,
+                                "user": null,
+                              },
+                            ],
+                            "feedSources": Array [
                               Object {
                                 "dateCreated": 1536195264564,
                                 "deployable": false,
@@ -3303,203 +1675,314 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "snapshotVersion": null,
                                 "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                 "user": null,
-                              }
-                            }
+                              },
+                            ],
+                            "id": "mock-project-with-deployments-id",
+                            "lastUpdated": 1553236399556,
+                            "name": "mock-project-with-deployments",
+                            "organizationId": null,
+                            "otpServers": Array [],
+                            "pinnedDeploymentId": null,
+                            "routerConfig": Object {
+                              "carDropoffTime": null,
+                              "numItineraries": null,
+                              "requestLogFile": null,
+                              "stairsReluctance": null,
+                              "updaters": null,
+                              "walkSpeed": null,
+                            },
+                            "useCustomOsmBounds": false,
+                            "user": null,
+                          }
+                        }
+                        runFetchFeed={[Function]}
+                        updateFeedSource={[Function]}
+                        uploadFeed={[Function]}
+                        user={
+                          Object {
+                            "isCheckingLogin": false,
+                            "permissions": UserPermissions {
+                              "appPermissionLookup": Object {
+                                "administer-application": Object {
+                                  "type": "administer-application",
+                                },
+                              },
+                              "orgPermissionLookup": Object {},
+                              "organizationLookup": Object {},
+                              "projectLookup": Object {},
+                            },
+                            "profile": Object {
+                              "app_metadata": Object {
+                                "datatools": Array [
+                                  Object {
+                                    "client_id": "mock-client-id",
+                                    "organizations": Array [],
+                                    "permissions": Array [
+                                      Object {
+                                        "type": "administer-application",
+                                      },
+                                    ],
+                                    "projects": Array [],
+                                    "subscriptions": Array [],
+                                  },
+                                ],
+                              },
+                              "clientID": "mock-client-id",
+                              "created_at": "2016-03-04T18:59:22.569Z",
+                              "email": "mock-user@conveyal.com",
+                              "email_verified": true,
+                              "identities": Array [
+                                Object {
+                                  "connection": "Username-Password-Authentication",
+                                  "isSocial": false,
+                                  "provider": "auth0",
+                                  "user_id": "12345",
+                                },
+                              ],
+                              "jti": "gibberish",
+                              "last_password_reset": "2017-07-13T13:58:01.021Z",
+                              "name": "mock-user@conveyal.com",
+                              "nickname": "mock-user",
+                              "persistent": Object {},
+                              "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
+                              "sub": "auth0|12345",
+                              "updated_at": "2019-03-21T19:05:30.180Z",
+                              "user_id": "auth0|12345",
+                              "user_metadata": Object {
+                                "datatools": Array [
+                                  Object {
+                                    "client_id": "mock-client-id",
+                                    "editor": Object {
+                                      "map_id": "mapbox.streets",
+                                    },
+                                    "hideTutorial": true,
+                                    "sidebarExpanded": false,
+                                  },
+                                ],
+                                "lang": "en",
+                              },
+                            },
+                            "recentActivity": null,
+                            "redirectOnSuccess": null,
+                            "subscriptions": UserSubscriptions {
+                              "subscriptionLookup": Object {},
+                            },
+                            "token": "mock-token",
+                          }
+                        }
+                      >
+                        <tr
+                          className="feed-source-table-row"
+                          key="mock-feed-with-version-id"
+                        >
+                          <td
+                            className="feed-source-info"
                           >
-                            <div>
-                              <h4>
-                                <Link
-                                  onlyActiveOnIndex={false}
-                                  style={Object {}}
-                                  to="/feed/mock-feed-with-version-id"
-                                >
-                                  <a
-                                    onClick={[Function]}
+                            <FeedInfo
+                              feedSource={
+                                Object {
+                                  "dateCreated": 1536195264564,
+                                  "deployable": false,
+                                  "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                  "externalProperties": Object {},
+                                  "id": "mock-feed-with-version-id",
+                                  "isPublic": false,
+                                  "lastFetched": 1543389038810,
+                                  "lastUpdated": 1543389038810,
+                                  "latestValidation": Object {
+                                    "agencies": null,
+                                    "agencyCount": 1,
+                                    "avgDailyRevenueTime": 0,
+                                    "bounds": Object {
+                                      "east": -76.481211,
+                                      "north": 39.0486949672717,
+                                      "south": 38.92884,
+                                      "west": -76.5673055566884,
+                                    },
+                                    "endDate": "20190801",
+                                    "errorCount": 78,
+                                    "feedVersionId": "mock-feed-version-id",
+                                    "loadFailureReason": null,
+                                    "loadStatus": "SUCCESS",
+                                    "routeCount": 10,
+                                    "startDate": "20180801",
+                                    "stopCount": 237,
+                                    "stopTimesCount": 11170,
+                                    "tripCount": 415,
+                                  },
+                                  "latestVersionId": "mock-feed-version-id",
+                                  "name": "test feed with a version",
+                                  "noteCount": 0,
+                                  "organizationId": null,
+                                  "projectId": "mock-project-id",
+                                  "publishedVersionId": null,
+                                  "retrievalMethod": "MANUALLY_UPLOADED",
+                                  "s3Url": null,
+                                  "snapshotVersion": null,
+                                  "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                  "user": null,
+                                }
+                              }
+                            >
+                              <div>
+                                <h4>
+                                  <Link
+                                    onlyActiveOnIndex={false}
                                     style={Object {}}
+                                    to="/feed/mock-feed-with-version-id"
                                   >
-                                    test feed with a version
-                                  </a>
-                                </Link>
-                              </h4>
-                              <h5>
-                                Last updated Nov 27, 2018
-                              </h5>
-                              <Row
-                                bsClass="row"
-                                componentClass="div"
-                              >
-                                <div
-                                  className="row"
+                                    <a
+                                      onClick={[Function]}
+                                      style={Object {}}
+                                    >
+                                      test feed with a version
+                                    </a>
+                                  </Link>
+                                </h4>
+                                <h5>
+                                  Last updated Nov 27, 2018
+                                </h5>
+                                <Row
+                                  bsClass="row"
+                                  componentClass="div"
                                 >
-                                  <Col
-                                    bsClass="col"
-                                    componentClass="div"
-                                    xs={12}
+                                  <div
+                                    className="row"
                                   >
-                                    <div
-                                      className="col-xs-12"
+                                    <Col
+                                      bsClass="col"
+                                      componentClass="div"
+                                      xs={12}
                                     >
-                                      <Icon
-                                        type="link"
+                                      <div
+                                        className="col-xs-12"
                                       >
-                                        <i
-                                          className="fa fa-link fa-fw "
-                                        />
-                                      </Icon>
-                                      <a
-                                        href="http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip"
-                                        target="_blank"
-                                      >
-                                        http://mdtrip.org/googletransit/Ann...
                                         <Icon
-                                          type="external-link"
+                                          type="link"
                                         >
                                           <i
-                                            className="fa fa-external-link fa-fw "
+                                            className="fa fa-link fa-fw "
                                           />
                                         </Icon>
-                                      </a>
-                                    </div>
-                                  </Col>
-                                  <Col
-                                    bsClass="col"
-                                    componentClass="div"
-                                    xs={6}
-                                  >
-                                    <div
-                                      className="col-xs-6"
-                                    >
-                                      <Icon
-                                        type="lock"
-                                      >
-                                        <i
-                                          className="fa fa-lock fa-fw "
-                                        />
-                                      </Icon>
-                                      Private
-                                    </div>
-                                  </Col>
-                                </div>
-                              </Row>
-                            </div>
-                          </FeedInfo>
-                        </td>
-                        <td
-                          className="comparison-column"
-                        >
-                          <Status
-                            icon="check-circle"
-                            statusSpanClass="status-active"
-                            statusText="Active"
-                            subtext="Valid for another 2 months"
-                            subtextDate="20190801"
-                          >
-                            <div>
-                              <span
-                                className="feed-status status-active"
-                              >
-                                <Icon
-                                  type="check-circle"
-                                >
-                                  <i
-                                    className="fa fa-check-circle fa-fw "
-                                  />
-                                </Icon>
-                                Active
-                              </span>
-                              <div
-                                className="feed-status-subtext"
-                              >
-                                Valid for another 2 months
-                                <br />
-                                (Aug 1, 2019)
-                              </div>
-                            </div>
-                          </Status>
-                        </td>
-                        <td
-                          className="feed-version-column"
-                        >
-                          <Status
-                            icon="check-circle"
-                            statusSpanClass="status-active"
-                            statusText="Same as Deployed"
-                            subtext="Last updated 5 months ago"
-                          >
-                            <div>
-                              <span
-                                className="feed-status status-active"
-                              >
-                                <Icon
-                                  type="check-circle"
-                                >
-                                  <i
-                                    className="fa fa-check-circle fa-fw "
-                                  />
-                                </Icon>
-                                Same as Deployed
-                              </span>
-                              <div
-                                className="feed-status-subtext"
-                              >
-                                Last updated 5 months ago
-                              </div>
-                            </div>
-                          </Status>
-                        </td>
-                        <td
-                          className="feed-version-column"
-                        >
-                          Aug 1, 2018
-                           -
-                          <br />
-                          Aug 1, 2019
-                        </td>
-                        <td
-                          className="feed-version-column"
-                        >
-                          78
-                        </td>
-                        <td>
-                          <FeedActionsDropdown
-                            comparisonColumn="DEPLOYED"
-                            comparisonValidationSummary={
-                              Object {
-                                "agencies": null,
-                                "agencyCount": 1,
-                                "avgDailyRevenueTime": 0,
-                                "bounds": Object {
-                                  "east": -76.481211,
-                                  "north": 39.0486949672717,
-                                  "south": 38.92884,
-                                  "west": -76.5673055566884,
-                                },
-                                "endDate": "20190801",
-                                "errorCount": 78,
-                                "feedVersionId": "mock-feed-version-id",
-                                "loadFailureReason": null,
-                                "loadStatus": "SUCCESS",
-                                "routeCount": 10,
-                                "startDate": "20180801",
-                                "stopCount": 237,
-                                "stopTimesCount": 11170,
-                                "tripCount": 415,
-                              }
-                            }
-                            createDeploymentFromFeedSource={[Function]}
-                            createFeedSource={[Function]}
-                            deleteFeedSource={[Function]}
-                            feedSource={
-                              Object {
-                                "dateCreated": 1536195264564,
-                                "deployable": false,
-                                "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                "externalProperties": Object {},
-                                "id": "mock-feed-with-version-id",
-                                "isPublic": false,
-                                "lastFetched": 1543389038810,
-                                "lastUpdated": 1543389038810,
-                                "latestValidation": Object {
+                                        <a
+                                          href="http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip"
+                                          target="_blank"
+                                        >
+                                          http://mdtrip.org/googletransit/Ann...
+                                          <Icon
+                                            type="external-link"
+                                          >
+                                            <i
+                                              className="fa fa-external-link fa-fw "
+                                            />
+                                          </Icon>
+                                        </a>
+                                      </div>
+                                    </Col>
+                                    <Col
+                                      bsClass="col"
+                                      componentClass="div"
+                                      xs={6}
+                                    >
+                                      <div
+                                        className="col-xs-6"
+                                      >
+                                        <Icon
+                                          type="lock"
+                                        >
+                                          <i
+                                            className="fa fa-lock fa-fw "
+                                          />
+                                        </Icon>
+                                        Private
+                                      </div>
+                                    </Col>
+                                  </div>
+                                </Row>
+                              </div>
+                            </FeedInfo>
+                          </td>
+                          <td
+                            className="comparison-column"
+                          >
+                            <Status
+                              icon="check-circle"
+                              statusSpanClass="status-active"
+                              statusText="Active"
+                              subtext="Valid for another 2 months"
+                              subtextDate="20190801"
+                            >
+                              <div>
+                                <span
+                                  className="feed-status status-active"
+                                >
+                                  <Icon
+                                    type="check-circle"
+                                  >
+                                    <i
+                                      className="fa fa-check-circle fa-fw "
+                                    />
+                                  </Icon>
+                                  Active
+                                </span>
+                                <div
+                                  className="feed-status-subtext"
+                                >
+                                  Valid for another 2 months
+                                  <br />
+                                  (Aug 1, 2019)
+                                </div>
+                              </div>
+                            </Status>
+                          </td>
+                          <td
+                            className="feed-version-column"
+                          >
+                            <Status
+                              icon="check-circle"
+                              statusSpanClass="status-active"
+                              statusText="Same as Deployed"
+                              subtext="Last updated 5 months ago"
+                            >
+                              <div>
+                                <span
+                                  className="feed-status status-active"
+                                >
+                                  <Icon
+                                    type="check-circle"
+                                  >
+                                    <i
+                                      className="fa fa-check-circle fa-fw "
+                                    />
+                                  </Icon>
+                                  Same as Deployed
+                                </span>
+                                <div
+                                  className="feed-status-subtext"
+                                >
+                                  Last updated 5 months ago
+                                </div>
+                              </div>
+                            </Status>
+                          </td>
+                          <td
+                            className="feed-version-column"
+                          >
+                            Aug 1, 2018
+                             -
+                            <br />
+                            Aug 1, 2019
+                          </td>
+                          <td
+                            className="feed-version-column"
+                          >
+                            78
+                          </td>
+                          <td>
+                            <FeedActionsDropdown
+                              comparisonColumn="DEPLOYED"
+                              comparisonValidationSummary={
+                                Object {
                                   "agencies": null,
                                   "agencyCount": 1,
                                   "avgDailyRevenueTime": 0,
@@ -3519,55 +2002,127 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   "stopCount": 237,
                                   "stopTimesCount": 11170,
                                   "tripCount": 415,
-                                },
-                                "latestVersionId": "mock-feed-version-id",
-                                "name": "test feed with a version",
-                                "noteCount": 0,
-                                "organizationId": null,
-                                "projectId": "mock-project-id",
-                                "publishedVersionId": null,
-                                "retrievalMethod": "MANUALLY_UPLOADED",
-                                "s3Url": null,
-                                "snapshotVersion": null,
-                                "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                "user": null,
+                                }
                               }
-                            }
-                            project={
-                              Object {
-                                "autoFetchFeeds": true,
-                                "autoFetchHour": 0,
-                                "autoFetchMinute": 0,
-                                "bounds": null,
-                                "buildConfig": Object {
-                                  "fares": null,
-                                  "fetchElevationUS": null,
-                                  "stationTransfers": null,
-                                  "subwayAccessTime": null,
-                                },
-                                "dateCreated": 1526305321824,
-                                "defaultTimeZone": null,
-                                "deployments": Array [
-                                  Object {
-                                    "customBuildConfig": null,
-                                    "customRouterConfig": null,
-                                    "dateCreated": 1553292345720,
-                                    "deployJobSummaries": Array [],
-                                    "deployedTo": null,
-                                    "ec2Instances": Array [],
-                                    "feedSourceId": null,
-                                    "feedVersions": Array [
-                                      Object {
-                                        "feedSource": Object {
-                                          "dateCreated": 1536195264564,
-                                          "deployable": false,
-                                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                          "externalProperties": Object {},
-                                          "id": "mock-feed-with-version-id",
-                                          "isPublic": false,
-                                          "lastFetched": 1543389038810,
-                                          "lastUpdated": 1543389038810,
-                                          "latestValidation": Object {
+                              createDeploymentFromFeedSource={[Function]}
+                              createFeedSource={[Function]}
+                              deleteFeedSource={[Function]}
+                              feedSource={
+                                Object {
+                                  "dateCreated": 1536195264564,
+                                  "deployable": false,
+                                  "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                  "externalProperties": Object {},
+                                  "id": "mock-feed-with-version-id",
+                                  "isPublic": false,
+                                  "lastFetched": 1543389038810,
+                                  "lastUpdated": 1543389038810,
+                                  "latestValidation": Object {
+                                    "agencies": null,
+                                    "agencyCount": 1,
+                                    "avgDailyRevenueTime": 0,
+                                    "bounds": Object {
+                                      "east": -76.481211,
+                                      "north": 39.0486949672717,
+                                      "south": 38.92884,
+                                      "west": -76.5673055566884,
+                                    },
+                                    "endDate": "20190801",
+                                    "errorCount": 78,
+                                    "feedVersionId": "mock-feed-version-id",
+                                    "loadFailureReason": null,
+                                    "loadStatus": "SUCCESS",
+                                    "routeCount": 10,
+                                    "startDate": "20180801",
+                                    "stopCount": 237,
+                                    "stopTimesCount": 11170,
+                                    "tripCount": 415,
+                                  },
+                                  "latestVersionId": "mock-feed-version-id",
+                                  "name": "test feed with a version",
+                                  "noteCount": 0,
+                                  "organizationId": null,
+                                  "projectId": "mock-project-id",
+                                  "publishedVersionId": null,
+                                  "retrievalMethod": "MANUALLY_UPLOADED",
+                                  "s3Url": null,
+                                  "snapshotVersion": null,
+                                  "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                  "user": null,
+                                }
+                              }
+                              project={
+                                Object {
+                                  "autoFetchFeeds": true,
+                                  "autoFetchHour": 0,
+                                  "autoFetchMinute": 0,
+                                  "bounds": null,
+                                  "buildConfig": Object {
+                                    "fares": null,
+                                    "fetchElevationUS": null,
+                                    "stationTransfers": null,
+                                    "subwayAccessTime": null,
+                                  },
+                                  "dateCreated": 1526305321824,
+                                  "defaultTimeZone": null,
+                                  "deployments": Array [
+                                    Object {
+                                      "customBuildConfig": null,
+                                      "customRouterConfig": null,
+                                      "dateCreated": 1553292345720,
+                                      "deployJobSummaries": Array [],
+                                      "deployedTo": null,
+                                      "ec2Instances": Array [],
+                                      "feedSourceId": null,
+                                      "feedVersions": Array [
+                                        Object {
+                                          "feedSource": Object {
+                                            "dateCreated": 1536195264564,
+                                            "deployable": false,
+                                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                            "externalProperties": Object {},
+                                            "id": "mock-feed-with-version-id",
+                                            "isPublic": false,
+                                            "lastFetched": 1543389038810,
+                                            "lastUpdated": 1543389038810,
+                                            "latestValidation": Object {
+                                              "agencies": null,
+                                              "agencyCount": 1,
+                                              "avgDailyRevenueTime": 0,
+                                              "bounds": Object {
+                                                "east": -76.481211,
+                                                "north": 39.0486949672717,
+                                                "south": 38.92884,
+                                                "west": -76.5673055566884,
+                                              },
+                                              "endDate": "20190801",
+                                              "errorCount": 78,
+                                              "feedVersionId": "mock-feed-version-id",
+                                              "loadFailureReason": null,
+                                              "loadStatus": "SUCCESS",
+                                              "routeCount": 10,
+                                              "startDate": "20180801",
+                                              "stopCount": 237,
+                                              "stopTimesCount": 11170,
+                                              "tripCount": 415,
+                                            },
+                                            "latestVersionId": "mock-feed-version-id",
+                                            "name": "test feed with a version",
+                                            "noteCount": 0,
+                                            "organizationId": null,
+                                            "projectId": "mock-project-id",
+                                            "publishedVersionId": null,
+                                            "retrievalMethod": "MANUALLY_UPLOADED",
+                                            "s3Url": null,
+                                            "snapshotVersion": null,
+                                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                            "user": null,
+                                          },
+                                          "id": "mock-feed-version-id",
+                                          "nextVersionId": null,
+                                          "previousVersionId": null,
+                                          "updated": 1543389038810,
+                                          "validationResult": Object {
                                             "agencies": null,
                                             "agencyCount": 1,
                                             "avgDailyRevenueTime": 0,
@@ -3588,709 +2143,685 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                             "stopTimesCount": 11170,
                                             "tripCount": 415,
                                           },
-                                          "latestVersionId": "mock-feed-version-id",
-                                          "name": "test feed with a version",
-                                          "noteCount": 0,
-                                          "organizationId": null,
-                                          "projectId": "mock-project-id",
-                                          "publishedVersionId": null,
-                                          "retrievalMethod": "MANUALLY_UPLOADED",
-                                          "s3Url": null,
-                                          "snapshotVersion": null,
-                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                          "user": null,
+                                          "version": 1,
                                         },
-                                        "id": "mock-feed-version-id",
-                                        "nextVersionId": null,
-                                        "previousVersionId": null,
-                                        "updated": 1543389038810,
-                                        "validationResult": Object {
-                                          "agencies": null,
-                                          "agencyCount": 1,
-                                          "avgDailyRevenueTime": 0,
-                                          "bounds": Object {
-                                            "east": -76.481211,
-                                            "north": 39.0486949672717,
-                                            "south": 38.92884,
-                                            "west": -76.5673055566884,
-                                          },
-                                          "endDate": "20190801",
-                                          "errorCount": 78,
-                                          "feedVersionId": "mock-feed-version-id",
-                                          "loadFailureReason": null,
-                                          "loadStatus": "SUCCESS",
-                                          "routeCount": 10,
-                                          "startDate": "20180801",
-                                          "stopCount": 237,
-                                          "stopTimesCount": 11170,
-                                          "tripCount": 415,
-                                        },
-                                        "version": 1,
+                                      ],
+                                      "id": "mock-deployment-id-0",
+                                      "invalidFeedSources": Array [],
+                                      "lastDeployed": null,
+                                      "lastUpdated": 1553292345726,
+                                      "latest": null,
+                                      "name": "mock-deployment",
+                                      "organizationId": null,
+                                      "osmFileId": null,
+                                      "otpCommit": null,
+                                      "otpVersion": null,
+                                      "project": [Circular],
+                                      "projectBounds": Object {
+                                        "east": 0,
+                                        "north": 0,
+                                        "south": 0,
+                                        "west": 0,
                                       },
-                                    ],
-                                    "id": "mock-deployment-id-0",
-                                    "invalidFeedSources": Array [],
-                                    "lastDeployed": null,
-                                    "lastUpdated": 1553292345726,
-                                    "latest": null,
-                                    "name": "mock-deployment",
-                                    "organizationId": null,
-                                    "osmFileId": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "project": [Circular],
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
+                                      "r5": false,
+                                      "r5Version": null,
+                                      "routerId": null,
+                                      "user": null,
                                     },
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
-                                    "user": null,
-                                  },
-                                ],
-                                "feedSources": Array [
-                                  Object {
-                                    "dateCreated": 1536195264564,
-                                    "deployable": false,
-                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                    "externalProperties": Object {},
-                                    "id": "mock-feed-with-version-id",
-                                    "isPublic": false,
-                                    "lastFetched": 1543389038810,
-                                    "lastUpdated": 1543389038810,
-                                    "latestValidation": Object {
-                                      "agencies": null,
-                                      "agencyCount": 1,
-                                      "avgDailyRevenueTime": 0,
-                                      "bounds": Object {
-                                        "east": -76.481211,
-                                        "north": 39.0486949672717,
-                                        "south": 38.92884,
-                                        "west": -76.5673055566884,
+                                  ],
+                                  "feedSources": Array [
+                                    Object {
+                                      "dateCreated": 1536195264564,
+                                      "deployable": false,
+                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                      "externalProperties": Object {},
+                                      "id": "mock-feed-with-version-id",
+                                      "isPublic": false,
+                                      "lastFetched": 1543389038810,
+                                      "lastUpdated": 1543389038810,
+                                      "latestValidation": Object {
+                                        "agencies": null,
+                                        "agencyCount": 1,
+                                        "avgDailyRevenueTime": 0,
+                                        "bounds": Object {
+                                          "east": -76.481211,
+                                          "north": 39.0486949672717,
+                                          "south": 38.92884,
+                                          "west": -76.5673055566884,
+                                        },
+                                        "endDate": "20190801",
+                                        "errorCount": 78,
+                                        "feedVersionId": "mock-feed-version-id",
+                                        "loadFailureReason": null,
+                                        "loadStatus": "SUCCESS",
+                                        "routeCount": 10,
+                                        "startDate": "20180801",
+                                        "stopCount": 237,
+                                        "stopTimesCount": 11170,
+                                        "tripCount": 415,
                                       },
-                                      "endDate": "20190801",
-                                      "errorCount": 78,
-                                      "feedVersionId": "mock-feed-version-id",
-                                      "loadFailureReason": null,
-                                      "loadStatus": "SUCCESS",
-                                      "routeCount": 10,
-                                      "startDate": "20180801",
-                                      "stopCount": 237,
-                                      "stopTimesCount": 11170,
-                                      "tripCount": 415,
+                                      "latestVersionId": "mock-feed-version-id",
+                                      "name": "test feed with a version",
+                                      "noteCount": 0,
+                                      "organizationId": null,
+                                      "projectId": "mock-project-id",
+                                      "publishedVersionId": null,
+                                      "retrievalMethod": "MANUALLY_UPLOADED",
+                                      "s3Url": null,
+                                      "snapshotVersion": null,
+                                      "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                      "user": null,
                                     },
-                                    "latestVersionId": "mock-feed-version-id",
-                                    "name": "test feed with a version",
-                                    "noteCount": 0,
-                                    "organizationId": null,
-                                    "projectId": "mock-project-id",
-                                    "publishedVersionId": null,
-                                    "retrievalMethod": "MANUALLY_UPLOADED",
-                                    "s3Url": null,
-                                    "snapshotVersion": null,
-                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                    "user": null,
+                                  ],
+                                  "id": "mock-project-with-deployments-id",
+                                  "lastUpdated": 1553236399556,
+                                  "name": "mock-project-with-deployments",
+                                  "organizationId": null,
+                                  "otpServers": Array [],
+                                  "pinnedDeploymentId": null,
+                                  "routerConfig": Object {
+                                    "carDropoffTime": null,
+                                    "numItineraries": null,
+                                    "requestLogFile": null,
+                                    "stairsReluctance": null,
+                                    "updaters": null,
+                                    "walkSpeed": null,
                                   },
-                                ],
-                                "id": "mock-project-with-deployments-id",
-                                "lastUpdated": 1553236399556,
-                                "name": "mock-project-with-deployments",
-                                "organizationId": null,
-                                "otpServers": Array [],
-                                "pinnedDeploymentId": null,
-                                "routerConfig": Object {
-                                  "carDropoffTime": null,
-                                  "numItineraries": null,
-                                  "requestLogFile": null,
-                                  "stairsReluctance": null,
-                                  "updaters": null,
-                                  "walkSpeed": null,
-                                },
-                                "useCustomOsmBounds": false,
-                                "user": null,
+                                  "useCustomOsmBounds": false,
+                                  "user": null,
+                                }
                               }
-                            }
-                            runFetchFeed={[Function]}
-                            updateFeedSource={[Function]}
-                            uploadFeed={[Function]}
-                            user={
-                              Object {
-                                "isCheckingLogin": false,
-                                "permissions": UserPermissions {
-                                  "appPermissionLookup": Object {
-                                    "administer-application": Object {
-                                      "type": "administer-application",
-                                    },
-                                  },
-                                  "orgPermissionLookup": Object {},
-                                  "organizationLookup": Object {},
-                                  "projectLookup": Object {},
-                                },
-                                "profile": Object {
-                                  "app_metadata": Object {
-                                    "datatools": Array [
-                                      Object {
-                                        "client_id": "mock-client-id",
-                                        "organizations": Array [],
-                                        "permissions": Array [
-                                          Object {
-                                            "type": "administer-application",
-                                          },
-                                        ],
-                                        "projects": Array [],
-                                        "subscriptions": Array [],
+                              runFetchFeed={[Function]}
+                              updateFeedSource={[Function]}
+                              uploadFeed={[Function]}
+                              user={
+                                Object {
+                                  "isCheckingLogin": false,
+                                  "permissions": UserPermissions {
+                                    "appPermissionLookup": Object {
+                                      "administer-application": Object {
+                                        "type": "administer-application",
                                       },
-                                    ],
+                                    },
+                                    "orgPermissionLookup": Object {},
+                                    "organizationLookup": Object {},
+                                    "projectLookup": Object {},
                                   },
-                                  "clientID": "mock-client-id",
-                                  "created_at": "2016-03-04T18:59:22.569Z",
-                                  "email": "mock-user@conveyal.com",
-                                  "email_verified": true,
-                                  "identities": Array [
-                                    Object {
-                                      "connection": "Username-Password-Authentication",
-                                      "isSocial": false,
-                                      "provider": "auth0",
-                                      "user_id": "12345",
+                                  "profile": Object {
+                                    "app_metadata": Object {
+                                      "datatools": Array [
+                                        Object {
+                                          "client_id": "mock-client-id",
+                                          "organizations": Array [],
+                                          "permissions": Array [
+                                            Object {
+                                              "type": "administer-application",
+                                            },
+                                          ],
+                                          "projects": Array [],
+                                          "subscriptions": Array [],
+                                        },
+                                      ],
                                     },
-                                  ],
-                                  "jti": "gibberish",
-                                  "last_password_reset": "2017-07-13T13:58:01.021Z",
-                                  "name": "mock-user@conveyal.com",
-                                  "nickname": "mock-user",
-                                  "persistent": Object {},
-                                  "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
-                                  "sub": "auth0|12345",
-                                  "updated_at": "2019-03-21T19:05:30.180Z",
-                                  "user_id": "auth0|12345",
-                                  "user_metadata": Object {
-                                    "datatools": Array [
+                                    "clientID": "mock-client-id",
+                                    "created_at": "2016-03-04T18:59:22.569Z",
+                                    "email": "mock-user@conveyal.com",
+                                    "email_verified": true,
+                                    "identities": Array [
                                       Object {
-                                        "client_id": "mock-client-id",
-                                        "editor": Object {
-                                          "map_id": "mapbox.streets",
-                                        },
-                                        "hideTutorial": true,
-                                        "sidebarExpanded": false,
+                                        "connection": "Username-Password-Authentication",
+                                        "isSocial": false,
+                                        "provider": "auth0",
+                                        "user_id": "12345",
                                       },
                                     ],
-                                    "lang": "en",
+                                    "jti": "gibberish",
+                                    "last_password_reset": "2017-07-13T13:58:01.021Z",
+                                    "name": "mock-user@conveyal.com",
+                                    "nickname": "mock-user",
+                                    "persistent": Object {},
+                                    "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
+                                    "sub": "auth0|12345",
+                                    "updated_at": "2019-03-21T19:05:30.180Z",
+                                    "user_id": "auth0|12345",
+                                    "user_metadata": Object {
+                                      "datatools": Array [
+                                        Object {
+                                          "client_id": "mock-client-id",
+                                          "editor": Object {
+                                            "map_id": "mapbox.streets",
+                                          },
+                                          "hideTutorial": true,
+                                          "sidebarExpanded": false,
+                                        },
+                                      ],
+                                      "lang": "en",
+                                    },
                                   },
-                                },
-                                "recentActivity": null,
-                                "redirectOnSuccess": null,
-                                "subscriptions": UserSubscriptions {
-                                  "subscriptionLookup": Object {},
-                                },
-                                "token": "mock-token",
+                                  "recentActivity": null,
+                                  "redirectOnSuccess": null,
+                                  "subscriptions": UserSubscriptions {
+                                    "subscriptionLookup": Object {},
+                                  },
+                                  "token": "mock-token",
+                                }
                               }
-                            }
-                          >
-                            <DropdownButton
-                              id="feed-source-action-button-mock-feed-with-version-id"
-                              title="Menu"
                             >
-                              <Uncontrolled(Dropdown)
+                              <DropdownButton
                                 id="feed-source-action-button-mock-feed-with-version-id"
+                                title="Menu"
                               >
-                                <Dropdown
-                                  bsClass="dropdown"
-                                  componentClass={[Function]}
+                                <Uncontrolled(Dropdown)
                                   id="feed-source-action-button-mock-feed-with-version-id"
-                                  onToggle={[Function]}
                                 >
-                                  <ButtonGroup
-                                    block={false}
-                                    bsClass="btn-group"
-                                    className="dropdown"
-                                    justified={false}
-                                    vertical={false}
+                                  <Dropdown
+                                    bsClass="dropdown"
+                                    componentClass={[Function]}
+                                    id="feed-source-action-button-mock-feed-with-version-id"
+                                    onToggle={[Function]}
                                   >
-                                    <div
-                                      className="dropdown btn-group"
+                                    <ButtonGroup
+                                      block={false}
+                                      bsClass="btn-group"
+                                      className="dropdown"
+                                      justified={false}
+                                      vertical={false}
                                     >
-                                      <DropdownToggle
-                                        bsClass="dropdown-toggle"
-                                        bsRole="toggle"
-                                        id="feed-source-action-button-mock-feed-with-version-id"
-                                        key=".0"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        open={false}
-                                        useAnchor={false}
+                                      <div
+                                        className="dropdown btn-group"
                                       >
-                                        <Button
-                                          active={false}
-                                          aria-expanded={false}
-                                          aria-haspopup={true}
-                                          block={false}
-                                          bsClass="btn"
-                                          bsStyle="default"
-                                          className="dropdown-toggle"
-                                          disabled={false}
+                                        <DropdownToggle
+                                          bsClass="dropdown-toggle"
+                                          bsRole="toggle"
                                           id="feed-source-action-button-mock-feed-with-version-id"
+                                          key=".0"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
-                                          role="button"
+                                          open={false}
+                                          useAnchor={false}
                                         >
-                                          <button
+                                          <Button
+                                            active={false}
                                             aria-expanded={false}
                                             aria-haspopup={true}
-                                            className="dropdown-toggle btn btn-default"
+                                            block={false}
+                                            bsClass="btn"
+                                            bsStyle="default"
+                                            className="dropdown-toggle"
                                             disabled={false}
                                             id="feed-source-action-button-mock-feed-with-version-id"
                                             onClick={[Function]}
                                             onKeyDown={[Function]}
                                             role="button"
-                                            type="button"
                                           >
-                                            Menu
-                                             
-                                            <span
-                                              className="caret"
-                                            />
-                                          </button>
-                                        </Button>
-                                      </DropdownToggle>
-                                      <DropdownMenu
-                                        bsClass="dropdown-menu"
-                                        bsRole="menu"
-                                        key=".1"
-                                        labelledBy="feed-source-action-button-mock-feed-with-version-id"
-                                        onClose={[Function]}
-                                        onSelect={[Function]}
-                                        pullRight={false}
-                                      >
-                                        <RootCloseWrapper
-                                          disabled={true}
-                                          event="click"
-                                          onRootClose={[Function]}
+                                            <button
+                                              aria-expanded={false}
+                                              aria-haspopup={true}
+                                              className="dropdown-toggle btn btn-default"
+                                              disabled={false}
+                                              id="feed-source-action-button-mock-feed-with-version-id"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="button"
+                                              type="button"
+                                            >
+                                              Menu
+                                               
+                                              <span
+                                                className="caret"
+                                              />
+                                            </button>
+                                          </Button>
+                                        </DropdownToggle>
+                                        <DropdownMenu
+                                          bsClass="dropdown-menu"
+                                          bsRole="menu"
+                                          key=".1"
+                                          labelledBy="feed-source-action-button-mock-feed-with-version-id"
+                                          onClose={[Function]}
+                                          onSelect={[Function]}
+                                          pullRight={false}
                                         >
-                                          <ul
-                                            aria-labelledby="feed-source-action-button-mock-feed-with-version-id"
-                                            className="dropdown-menu"
-                                            role="menu"
+                                          <RootCloseWrapper
+                                            disabled={true}
+                                            event="click"
+                                            onRootClose={[Function]}
                                           >
-                                            <ConfirmModal
-                                              body="Are you sure you want to delete the feed source test feed with a version?"
-                                              key=".0"
-                                              onConfirm={[Function]}
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                              title="Delete Feed Source?"
+                                            <ul
+                                              aria-labelledby="feed-source-action-button-mock-feed-with-version-id"
+                                              className="dropdown-menu"
+                                              role="menu"
                                             >
-                                              <Modal
-                                                animation={true}
-                                                autoFocus={true}
-                                                backdrop={true}
-                                                bsClass="modal"
-                                                dialogComponentClass={[Function]}
-                                                enforceFocus={true}
-                                                keyboard={true}
-                                                manager={
-                                                  ModalManager {
-                                                    "containers": Array [],
-                                                    "data": Array [],
-                                                    "handleContainerOverflow": true,
-                                                    "hideSiblingNodes": true,
-                                                    "modals": Array [],
-                                                  }
-                                                }
-                                                onHide={[Function]}
-                                                renderBackdrop={[Function]}
-                                                restoreFocus={true}
-                                                show={false}
+                                              <ConfirmModal
+                                                body="Are you sure you want to delete the feed source test feed with a version?"
+                                                key=".0"
+                                                onConfirm={[Function]}
+                                                onKeyDown={[Function]}
+                                                onSelect={[Function]}
+                                                title="Delete Feed Source?"
                                               >
                                                 <Modal
+                                                  animation={true}
                                                   autoFocus={true}
                                                   backdrop={true}
-                                                  backdropClassName="modal-backdrop"
-                                                  backdropTransitionTimeout={150}
-                                                  containerClassName="modal-open"
-                                                  dialogTransitionTimeout={300}
+                                                  bsClass="modal"
+                                                  dialogComponentClass={[Function]}
                                                   enforceFocus={true}
                                                   keyboard={true}
                                                   manager={
                                                     ModalManager {
+                                                      "add": [Function],
                                                       "containers": Array [],
                                                       "data": Array [],
                                                       "handleContainerOverflow": true,
                                                       "hideSiblingNodes": true,
+                                                      "isTopModal": [Function],
                                                       "modals": Array [],
+                                                      "remove": [Function],
                                                     }
                                                   }
-                                                  onEntering={[Function]}
-                                                  onExited={[Function]}
                                                   onHide={[Function]}
                                                   renderBackdrop={[Function]}
                                                   restoreFocus={true}
                                                   show={false}
-                                                  transition={[Function]}
-                                                />
-                                              </Modal>
-                                            </ConfirmModal>
-                                            <SelectFileModal
-                                              body="Select a GTFS feed to upload:"
-                                              errorMessage="Uploaded file must be a valid zip file (.zip)."
-                                              key=".1"
-                                              onConfirm={[Function]}
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                              title="Upload Feed"
-                                            >
-                                              <Modal
-                                                animation={true}
-                                                autoFocus={true}
-                                                backdrop={true}
-                                                bsClass="modal"
-                                                dialogComponentClass={[Function]}
-                                                enforceFocus={true}
-                                                keyboard={true}
-                                                manager={
-                                                  ModalManager {
-                                                    "containers": Array [],
-                                                    "data": Array [],
-                                                    "handleContainerOverflow": true,
-                                                    "hideSiblingNodes": true,
-                                                    "modals": Array [],
-                                                  }
-                                                }
-                                                onHide={[Function]}
-                                                renderBackdrop={[Function]}
-                                                restoreFocus={true}
-                                                show={false}
+                                                >
+                                                  <Modal
+                                                    autoFocus={true}
+                                                    backdrop={true}
+                                                    backdropClassName="modal-backdrop"
+                                                    backdropTransition={[Function]}
+                                                    containerClassName="modal-open"
+                                                    enforceFocus={true}
+                                                    keyboard={true}
+                                                    manager={
+                                                      ModalManager {
+                                                        "add": [Function],
+                                                        "containers": Array [],
+                                                        "data": Array [],
+                                                        "handleContainerOverflow": true,
+                                                        "hideSiblingNodes": true,
+                                                        "isTopModal": [Function],
+                                                        "modals": Array [],
+                                                        "remove": [Function],
+                                                      }
+                                                    }
+                                                    onEntering={[Function]}
+                                                    onExited={[Function]}
+                                                    onHide={[Function]}
+                                                    onMouseUp={[Function]}
+                                                    renderBackdrop={[Function]}
+                                                    restoreFocus={true}
+                                                    show={false}
+                                                    transition={[Function]}
+                                                  />
+                                                </Modal>
+                                              </ConfirmModal>
+                                              <SelectFileModal
+                                                body="Select a GTFS feed to upload:"
+                                                errorMessage="Uploaded file must be a valid zip file (.zip)."
+                                                key=".1"
+                                                onConfirm={[Function]}
+                                                onKeyDown={[Function]}
+                                                onSelect={[Function]}
+                                                title="Upload Feed"
                                               >
                                                 <Modal
+                                                  animation={true}
                                                   autoFocus={true}
                                                   backdrop={true}
-                                                  backdropClassName="modal-backdrop"
-                                                  backdropTransitionTimeout={150}
-                                                  containerClassName="modal-open"
-                                                  dialogTransitionTimeout={300}
+                                                  bsClass="modal"
+                                                  dialogComponentClass={[Function]}
                                                   enforceFocus={true}
                                                   keyboard={true}
                                                   manager={
                                                     ModalManager {
+                                                      "add": [Function],
                                                       "containers": Array [],
                                                       "data": Array [],
                                                       "handleContainerOverflow": true,
                                                       "hideSiblingNodes": true,
+                                                      "isTopModal": [Function],
                                                       "modals": Array [],
+                                                      "remove": [Function],
                                                     }
                                                   }
-                                                  onEntering={[Function]}
-                                                  onExited={[Function]}
                                                   onHide={[Function]}
                                                   renderBackdrop={[Function]}
                                                   restoreFocus={true}
                                                   show={false}
-                                                  transition={[Function]}
-                                                />
-                                              </Modal>
-                                            </SelectFileModal>
-                                            <MenuItem
-                                              bsClass="dropdown"
-                                              disabled={false}
-                                              divider={false}
-                                              header={false}
-                                              key=".2"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                            >
-                                              <li
-                                                className=""
-                                                role="presentation"
+                                                >
+                                                  <Modal
+                                                    autoFocus={true}
+                                                    backdrop={true}
+                                                    backdropClassName="modal-backdrop"
+                                                    backdropTransition={[Function]}
+                                                    containerClassName="modal-open"
+                                                    enforceFocus={true}
+                                                    keyboard={true}
+                                                    manager={
+                                                      ModalManager {
+                                                        "add": [Function],
+                                                        "containers": Array [],
+                                                        "data": Array [],
+                                                        "handleContainerOverflow": true,
+                                                        "hideSiblingNodes": true,
+                                                        "isTopModal": [Function],
+                                                        "modals": Array [],
+                                                        "remove": [Function],
+                                                      }
+                                                    }
+                                                    onEntering={[Function]}
+                                                    onExited={[Function]}
+                                                    onHide={[Function]}
+                                                    onMouseUp={[Function]}
+                                                    renderBackdrop={[Function]}
+                                                    restoreFocus={true}
+                                                    show={false}
+                                                    transition={[Function]}
+                                                  />
+                                                </Modal>
+                                              </SelectFileModal>
+                                              <MenuItem
+                                                bsClass="dropdown"
+                                                disabled={false}
+                                                divider={false}
+                                                header={false}
+                                                key=".2"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                onSelect={[Function]}
                                               >
-                                                <SafeAnchor
-                                                  componentClass="a"
-                                                  onClick={[Function]}
-                                                  onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
+                                                <li
+                                                  className=""
+                                                  role="presentation"
                                                 >
-                                                  <a
-                                                    href="#"
+                                                  <SafeAnchor
+                                                    componentClass="a"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <Glyphicon
-                                                      bsClass="glyphicon"
-                                                      glyph="pencil"
+                                                    <a
+                                                      href="#"
+                                                      onClick={[Function]}
+                                                      onKeyDown={[Function]}
+                                                      role="menuitem"
+                                                      tabIndex="-1"
                                                     >
-                                                      <span
-                                                        className="glyphicon glyphicon-pencil"
-                                                      />
-                                                    </Glyphicon>
-                                                     Open in Editor
-                                                  </a>
-                                                </SafeAnchor>
-                                              </li>
-                                            </MenuItem>
-                                            <MenuItem
-                                              bsClass="dropdown"
-                                              disabled={false}
-                                              divider={false}
-                                              header={false}
-                                              key=".3"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                            >
-                                              <li
-                                                className=""
-                                                role="presentation"
+                                                      <Glyphicon
+                                                        bsClass="glyphicon"
+                                                        glyph="pencil"
+                                                      >
+                                                        <span
+                                                          className="glyphicon glyphicon-pencil"
+                                                        />
+                                                      </Glyphicon>
+                                                       Open in Editor
+                                                    </a>
+                                                  </SafeAnchor>
+                                                </li>
+                                              </MenuItem>
+                                              <MenuItem
+                                                bsClass="dropdown"
+                                                disabled={false}
+                                                divider={false}
+                                                header={false}
+                                                key=".3"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                onSelect={[Function]}
                                               >
-                                                <SafeAnchor
-                                                  componentClass="a"
-                                                  onClick={[Function]}
-                                                  onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
+                                                <li
+                                                  className=""
+                                                  role="presentation"
                                                 >
-                                                  <a
-                                                    href="#"
+                                                  <SafeAnchor
+                                                    componentClass="a"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <Glyphicon
-                                                      bsClass="glyphicon"
-                                                      glyph="refresh"
+                                                    <a
+                                                      href="#"
+                                                      onClick={[Function]}
+                                                      onKeyDown={[Function]}
+                                                      role="menuitem"
+                                                      tabIndex="-1"
                                                     >
-                                                      <span
-                                                        className="glyphicon glyphicon-refresh"
-                                                      />
-                                                    </Glyphicon>
-                                                     Fetch
-                                                  </a>
-                                                </SafeAnchor>
-                                              </li>
-                                            </MenuItem>
-                                            <MenuItem
-                                              bsClass="dropdown"
-                                              disabled={false}
-                                              divider={false}
-                                              header={false}
-                                              key=".4"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                            >
-                                              <li
-                                                className=""
-                                                role="presentation"
+                                                      <Glyphicon
+                                                        bsClass="glyphicon"
+                                                        glyph="refresh"
+                                                      >
+                                                        <span
+                                                          className="glyphicon glyphicon-refresh"
+                                                        />
+                                                      </Glyphicon>
+                                                       Fetch
+                                                    </a>
+                                                  </SafeAnchor>
+                                                </li>
+                                              </MenuItem>
+                                              <MenuItem
+                                                bsClass="dropdown"
+                                                disabled={false}
+                                                divider={false}
+                                                header={false}
+                                                key=".4"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                onSelect={[Function]}
                                               >
-                                                <SafeAnchor
-                                                  componentClass="a"
-                                                  onClick={[Function]}
-                                                  onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
+                                                <li
+                                                  className=""
+                                                  role="presentation"
                                                 >
-                                                  <a
-                                                    href="#"
+                                                  <SafeAnchor
+                                                    componentClass="a"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <Glyphicon
-                                                      bsClass="glyphicon"
-                                                      glyph="upload"
+                                                    <a
+                                                      href="#"
+                                                      onClick={[Function]}
+                                                      onKeyDown={[Function]}
+                                                      role="menuitem"
+                                                      tabIndex="-1"
                                                     >
-                                                      <span
-                                                        className="glyphicon glyphicon-upload"
-                                                      />
-                                                    </Glyphicon>
-                                                     Upload
-                                                  </a>
-                                                </SafeAnchor>
-                                              </li>
-                                            </MenuItem>
-                                            <MenuItem
-                                              bsClass="dropdown"
-                                              disabled={false}
-                                              divider={true}
-                                              header={false}
-                                              key=".5"
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                            >
-                                              <li
-                                                className="divider"
+                                                      <Glyphicon
+                                                        bsClass="glyphicon"
+                                                        glyph="upload"
+                                                      >
+                                                        <span
+                                                          className="glyphicon glyphicon-upload"
+                                                        />
+                                                      </Glyphicon>
+                                                       Upload
+                                                    </a>
+                                                  </SafeAnchor>
+                                                </li>
+                                              </MenuItem>
+                                              <MenuItem
+                                                bsClass="dropdown"
+                                                disabled={false}
+                                                divider={true}
+                                                header={false}
+                                                key=".5"
                                                 onKeyDown={[Function]}
-                                                role="separator"
-                                              />
-                                            </MenuItem>
-                                            <MenuItem
-                                              bsClass="dropdown"
-                                              disabled={true}
-                                              divider={false}
-                                              header={false}
-                                              key=".6"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                              title="Feed source is not deployable. Change in feed source settings."
-                                            >
-                                              <li
-                                                className="disabled"
-                                                role="presentation"
+                                                onSelect={[Function]}
                                               >
-                                                <SafeAnchor
-                                                  componentClass="a"
-                                                  onClick={[Function]}
+                                                <li
+                                                  className="divider"
                                                   onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
-                                                  title="Feed source is not deployable. Change in feed source settings."
+                                                  role="separator"
+                                                />
+                                              </MenuItem>
+                                              <MenuItem
+                                                bsClass="dropdown"
+                                                disabled={true}
+                                                divider={false}
+                                                header={false}
+                                                key=".6"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                onSelect={[Function]}
+                                                title="Feed source is not deployable. Change in feed source settings."
+                                              >
+                                                <li
+                                                  className="disabled"
+                                                  role="presentation"
                                                 >
-                                                  <a
-                                                    href="#"
+                                                  <SafeAnchor
+                                                    componentClass="a"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                     title="Feed source is not deployable. Change in feed source settings."
                                                   >
-                                                    <Glyphicon
-                                                      bsClass="glyphicon"
-                                                      glyph="globe"
+                                                    <a
+                                                      href="#"
+                                                      onClick={[Function]}
+                                                      onKeyDown={[Function]}
+                                                      role="menuitem"
+                                                      tabIndex="-1"
+                                                      title="Feed source is not deployable. Change in feed source settings."
                                                     >
-                                                      <span
-                                                        className="glyphicon glyphicon-globe"
-                                                      />
-                                                    </Glyphicon>
-                                                     Deploy
-                                                  </a>
-                                                </SafeAnchor>
-                                              </li>
-                                            </MenuItem>
-                                            <MenuItem
-                                              bsClass="dropdown"
-                                              disabled={true}
-                                              divider={false}
-                                              header={false}
-                                              key=".8"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                            >
-                                              <li
-                                                className="disabled"
-                                                role="presentation"
+                                                      <Glyphicon
+                                                        bsClass="glyphicon"
+                                                        glyph="globe"
+                                                      >
+                                                        <span
+                                                          className="glyphicon glyphicon-globe"
+                                                        />
+                                                      </Glyphicon>
+                                                       Deploy
+                                                    </a>
+                                                  </SafeAnchor>
+                                                </li>
+                                              </MenuItem>
+                                              <MenuItem
+                                                bsClass="dropdown"
+                                                disabled={true}
+                                                divider={false}
+                                                header={false}
+                                                key=".8"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                onSelect={[Function]}
                                               >
-                                                <SafeAnchor
-                                                  componentClass="a"
-                                                  onClick={[Function]}
-                                                  onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
+                                                <li
+                                                  className="disabled"
+                                                  role="presentation"
                                                 >
-                                                  <a
-                                                    href="#"
+                                                  <SafeAnchor
+                                                    componentClass="a"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <Glyphicon
-                                                      bsClass="glyphicon"
-                                                      glyph="link"
+                                                    <a
+                                                      href="#"
+                                                      onClick={[Function]}
+                                                      onKeyDown={[Function]}
+                                                      role="menuitem"
+                                                      tabIndex="-1"
                                                     >
-                                                      <span
-                                                        className="glyphicon glyphicon-link"
-                                                      />
-                                                    </Glyphicon>
-                                                     View public page
-                                                  </a>
-                                                </SafeAnchor>
-                                              </li>
-                                            </MenuItem>
-                                            <MenuItem
-                                              bsClass="dropdown"
-                                              disabled={false}
-                                              divider={true}
-                                              header={false}
-                                              key=".9"
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                            >
-                                              <li
-                                                className="divider"
+                                                      <Glyphicon
+                                                        bsClass="glyphicon"
+                                                        glyph="link"
+                                                      >
+                                                        <span
+                                                          className="glyphicon glyphicon-link"
+                                                        />
+                                                      </Glyphicon>
+                                                       View public page
+                                                    </a>
+                                                  </SafeAnchor>
+                                                </li>
+                                              </MenuItem>
+                                              <MenuItem
+                                                bsClass="dropdown"
+                                                disabled={false}
+                                                divider={true}
+                                                header={false}
+                                                key=".9"
                                                 onKeyDown={[Function]}
-                                                role="separator"
-                                              />
-                                            </MenuItem>
-                                            <MenuItem
-                                              bsClass="dropdown"
-                                              data-test-id="feed-source-dropdown-delete-feed-source-button"
-                                              disabled={false}
-                                              divider={false}
-                                              header={false}
-                                              key=".a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              onSelect={[Function]}
-                                            >
-                                              <li
-                                                className=""
-                                                role="presentation"
+                                                onSelect={[Function]}
                                               >
-                                                <SafeAnchor
-                                                  componentClass="a"
-                                                  data-test-id="feed-source-dropdown-delete-feed-source-button"
-                                                  onClick={[Function]}
+                                                <li
+                                                  className="divider"
                                                   onKeyDown={[Function]}
-                                                  role="menuitem"
-                                                  tabIndex="-1"
+                                                  role="separator"
+                                                />
+                                              </MenuItem>
+                                              <MenuItem
+                                                bsClass="dropdown"
+                                                data-test-id="feed-source-dropdown-delete-feed-source-button"
+                                                disabled={false}
+                                                divider={false}
+                                                header={false}
+                                                key=".a"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                onSelect={[Function]}
+                                              >
+                                                <li
+                                                  className=""
+                                                  role="presentation"
                                                 >
-                                                  <a
+                                                  <SafeAnchor
+                                                    componentClass="a"
                                                     data-test-id="feed-source-dropdown-delete-feed-source-button"
-                                                    href="#"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <Icon
-                                                      type="trash"
+                                                    <a
+                                                      data-test-id="feed-source-dropdown-delete-feed-source-button"
+                                                      href="#"
+                                                      onClick={[Function]}
+                                                      onKeyDown={[Function]}
+                                                      role="menuitem"
+                                                      tabIndex="-1"
                                                     >
-                                                      <i
-                                                        className="fa fa-trash fa-fw "
-                                                      />
-                                                    </Icon>
-                                                     Delete
-                                                  </a>
-                                                </SafeAnchor>
-                                              </li>
-                                            </MenuItem>
-                                          </ul>
-                                        </RootCloseWrapper>
-                                      </DropdownMenu>
-                                    </div>
-                                  </ButtonGroup>
-                                </Dropdown>
-                              </Uncontrolled(Dropdown)>
-                            </DropdownButton>
-                          </FeedActionsDropdown>
-                        </td>
-                      </tr>
-                    </FeedSourceTableRow>
-                  </Connect(FeedSourceTableRow)>
-                </tbody>
-              </table>
-            </div>
-          </ListGroup>
-        </div>
-      </Panel>
+                                                      <Icon
+                                                        type="trash"
+                                                      >
+                                                        <i
+                                                          className="fa fa-trash fa-fw "
+                                                        />
+                                                      </Icon>
+                                                       Delete
+                                                    </a>
+                                                  </SafeAnchor>
+                                                </li>
+                                              </MenuItem>
+                                            </ul>
+                                          </RootCloseWrapper>
+                                        </DropdownMenu>
+                                      </div>
+                                    </ButtonGroup>
+                                  </Dropdown>
+                                </Uncontrolled(Dropdown)>
+                              </DropdownButton>
+                            </FeedActionsDropdown>
+                          </td>
+                        </tr>
+                      </FeedSourceTableRow>
+                    </Connect(FeedSourceTableRow)>
+                  </tbody>
+                </table>
+              </div>
+            </ListGroup>
+          </div>
+        </Panel>
+      </Uncontrolled(Panel)>
     </FeedSourceTable>
   </Connect(FeedSourceTable)>
 </Provider>

From 32b2d591a498e75db142dd9b699f2decae2906c4 Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Thu, 13 Aug 2020 15:14:47 +0200
Subject: [PATCH 008/553] Update default mapbox map_id

mapbox.streets is not working anymore. So replace is with mapbox/outdoors-v11
---
 configurations/default/env.yml.tmp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configurations/default/env.yml.tmp b/configurations/default/env.yml.tmp
index 86b17dbc1..a78cfeca0 100644
--- a/configurations/default/env.yml.tmp
+++ b/configurations/default/env.yml.tmp
@@ -2,7 +2,7 @@ AUTH0_CLIENT_ID: your-auth0-client-id
 AUTH0_DOMAIN: your-auth0-domain
 BUGSNAG_KEY: optional-bugsnag-key
 MAPBOX_ACCESS_TOKEN: your-mapbox-access-token
-MAPBOX_MAP_ID: mapbox.streets
+MAPBOX_MAP_ID: mapbox/outdoors-v11
 MAPBOX_ATTRIBUTION: <a href="https://www.mapbox.com/about/maps/" target="_blank">&copy; Mapbox &copy; OpenStreetMap</a> <a href="https://www.mapbox.com/map-feedback/" target="_blank">Improve this map</a>
 SLACK_CHANNEL: optional-slack-channel
 SLACK_WEBHOOK: optional-slack-webhook

From 67771852f369d9bc2f02bd4ef9312b9346f61815 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Aug 2020 21:16:27 +0000
Subject: [PATCH 009/553] build(deps): bump auth0-lock from 11.21.0 to 11.26.0

Bumps [auth0-lock](https://github.com/auth0/lock) from 11.21.0 to 11.26.0.
- [Release notes](https://github.com/auth0/lock/releases)
- [Changelog](https://github.com/auth0/lock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/lock/compare/v11.21.0...v11.26.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b6938c584..c03e9bea5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1939,13 +1939,13 @@ attr-accept@^1.0.3:
   dependencies:
     core-js "^2.5.0"
 
-auth0-js@^9.12.2, auth0-js@^9.3.2:
-  version "9.13.2"
-  resolved "https://registry.yarnpkg.com/auth0-js/-/auth0-js-9.13.2.tgz#78ea02d28a0a8c5ee4eb27c229563227071451d0"
-  integrity sha512-gWlf+X3XhCT9JboYpGviflv0pHcaHFPGtkLXiebyJohHDKddiu2rZkezp9kZHEoXqxhtNqgWuuaXkcla5JtnXg==
+auth0-js@^9.13.3, auth0-js@^9.3.2:
+  version "9.13.4"
+  resolved "https://registry.yarnpkg.com/auth0-js/-/auth0-js-9.13.4.tgz#e5238ca8ea45b6f172eb917accf570a8bb9f4d0a"
+  integrity sha512-G7wXTtEUe8OG5UMdcFPoS47odorEZ3WerNyWLLhoGlLqYcPgv0t+B0ECHv/rVLULbpctbSBrRFFYa43/bJV4+Q==
   dependencies:
     base64-js "^1.3.0"
-    idtoken-verifier "^2.0.2"
+    idtoken-verifier "^2.0.3"
     js-cookie "^2.2.0"
     qs "^6.7.0"
     superagent "^3.8.3"
@@ -1953,11 +1953,11 @@ auth0-js@^9.12.2, auth0-js@^9.3.2:
     winchan "^0.2.2"
 
 auth0-lock@^11.3.1:
-  version "11.21.0"
-  resolved "https://registry.yarnpkg.com/auth0-lock/-/auth0-lock-11.21.0.tgz#4fb3e0d59c133cab9af9750935cbb1a144e13eba"
-  integrity sha512-TOie5vUN2V7x7iXwm5xP+sMeK9ZQcTp7PlIJcQbHDveB76sCASv9HM2hDmeeWQpAx1BHfJkvWAg16i2kw5gD8A==
+  version "11.26.0"
+  resolved "https://registry.yarnpkg.com/auth0-lock/-/auth0-lock-11.26.0.tgz#5a4a7c3df47004b710743b178300bfda9235f7ef"
+  integrity sha512-9b40aZkNiSMmASuyyz+lGB66aSfceVORTT+Ae9/Mr0+gFoKG7E6h+dDn52sDVQ2FEedI5zRlfpN4w4G54dK2qA==
   dependencies:
-    auth0-js "^9.12.2"
+    auth0-js "^9.13.3"
     auth0-password-policies "^1.0.2"
     blueimp-md5 "2.3.1"
     immutable "^3.7.3"
@@ -6202,10 +6202,10 @@ iconv-lite@0.4.8:
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.8.tgz#c6019a7595f2cefca702eab694a010bcd9298d20"
   integrity sha1-xgGadZXyzvynAuq2lKAQvNkpjSA=
 
-idtoken-verifier@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/idtoken-verifier/-/idtoken-verifier-2.0.2.tgz#7fd1c64c435abf07e92f137e7ac538a758fdc399"
-  integrity sha512-9UN83SKT9dtN3d7vNz3EMTqoaJi3D02Zg5XMqF6+bLrGL+Akbx4oj4SEWsgXtLF6cy46XrUcVzokFY+SWO+/MA==
+idtoken-verifier@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/idtoken-verifier/-/idtoken-verifier-2.0.3.tgz#b60a933848900c9f684e6296332f62e5f2e79360"
+  integrity sha512-X1izD2ZTMoo+2tw2RKVUvvCSw2B6UOCNMJ0bgHRH758LFTMwBf4JZfCZm61MPBaBW2CIuhkcSnKCZP6jXpSDmw==
   dependencies:
     base64-js "^1.3.0"
     crypto-js "^3.2.1"

From 95a4cb004cd41a811c30ad6281a0bb746dada5b8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 2 Oct 2020 09:58:03 -0400
Subject: [PATCH 010/553] docs(AWS servers): Clarify S3 permissions settings.

---
 docs/user/setting-up-aws-servers.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/user/setting-up-aws-servers.md b/docs/user/setting-up-aws-servers.md
index 2f135ed4c..c36f83b2f 100644
--- a/docs/user/setting-up-aws-servers.md
+++ b/docs/user/setting-up-aws-servers.md
@@ -21,6 +21,7 @@ The OTP user interface is delivered using a plain HTTP file server that does not
 1. From [AWS S3](https://console.aws.amazon.com/s3/home), click `Create Bucket`. Each deployment uses its own bucket.
 2. Specify a name (write down the name for use in Data Tools later).
 3. When specifying options, uncheck `Block All Public Access`.
+Do not grant additional access from the bucket's `Permissions` tab. 
 
 ### Create a CloudFront instance
 

From 9e0277532055af10cc1d4f53a369fe0cc8a18c6a Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Fri, 2 Oct 2020 16:31:57 -0700
Subject: [PATCH 011/553] refactor: lazy-load server data with ec2 instance
 info

---
 lib/admin/actions/admin.js                 | 15 +++++++++++++++
 lib/admin/components/ServerSettings.js     |  8 ++++++++
 lib/admin/reducers/servers.js              | 12 ++++++++++++
 lib/manager/components/CollapsiblePanel.js |  4 ++++
 4 files changed, 39 insertions(+)

diff --git a/lib/admin/actions/admin.js b/lib/admin/actions/admin.js
index 739d1efe5..f256e5000 100644
--- a/lib/admin/actions/admin.js
+++ b/lib/admin/actions/admin.js
@@ -32,6 +32,10 @@ const receiveAllRequests = createAction(
 )
 const fetchingApplicationStatus = createVoidPayloadAction('FETCHING_ALL_JOBS')
 const updatingServer = createAction('UPDATING_SERVER', (payload: OtpServer) => payload)
+const receiveServer = createAction(
+  'RECEIVE_SERVER',
+  (payload: OtpServer) => payload
+)
 const receiveServers = createAction(
   'RECEIVE_SERVERS',
   (payload: Array<OtpServer>) => payload
@@ -147,6 +151,17 @@ export function fetchServers () {
   }
 }
 
+/**
+ * Fetch an OTP/R5 server target.
+ */
+export function fetchServer (serverId: string) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    return dispatch(secureFetch(`${SERVER_URL}/${serverId}`))
+      .then(res => res.json())
+      .then(server => dispatch(receiveServer(server)))
+  }
+}
+
 /**
  * Update or create OTP/R5 server target.
  */
diff --git a/lib/admin/components/ServerSettings.js b/lib/admin/components/ServerSettings.js
index e3e344c6b..523e0e72e 100644
--- a/lib/admin/components/ServerSettings.js
+++ b/lib/admin/components/ServerSettings.js
@@ -36,6 +36,7 @@ import type { AppState, AdminServersState } from '../../types/reducers'
 type ContainerProps = {editDisabled: boolean}
 type Props = ContainerProps & {
   deleteServer: typeof adminActions.deleteServer,
+  fetchServer: typeof adminActions.fetchServer,
   fetchServers: typeof adminActions.fetchServers,
   otpServers: AdminServersState,
   projects: Array<Project>,
@@ -149,6 +150,10 @@ class ServerSettings extends Component<Props, State> {
     }
   }
 
+  _onExpandServer = (index: number) => {
+    this.props.fetchServer(this.state.otpServers[index].id)
+  }
+
   _onSaveServer = (index: number) => this.props.updateServer(this.state.otpServers[index])
 
   _onChange = (evt, stateUpdate = {}, index) => {
@@ -224,6 +229,7 @@ class ServerSettings extends Component<Props, State> {
                   index={index}
                   key={`server-${index}`}
                   onChange={this._getOnChange}
+                  onEnter={this._onExpandServer}
                   onRemove={this._onDeleteServer}
                   onSave={this._onSaveServer}
                   saveDisabled={!this.state.hasEdits}
@@ -377,6 +383,7 @@ const mapStateToProps = (state: AppState, ownProps: ContainerProps) => {
 
 const {
   deleteServer,
+  fetchServer,
   fetchServers,
   terminateEC2Instances,
   updateServer
@@ -386,6 +393,7 @@ const { terminateEC2InstanceForDeployment } = deploymentActions
 
 const mapDispatchToProps = {
   deleteServer,
+  fetchServer,
   fetchServers,
   terminateEC2InstanceForDeployment,
   terminateEC2Instances,
diff --git a/lib/admin/reducers/servers.js b/lib/admin/reducers/servers.js
index cb5f43ed2..225a52e6e 100644
--- a/lib/admin/reducers/servers.js
+++ b/lib/admin/reducers/servers.js
@@ -19,6 +19,18 @@ const servers = (state: AdminServersState = defaultState, action: Action): Admin
         isFetching: { $set: false },
         data: { $set: action.payload }
       })
+    case 'RECEIVE_SERVER':
+      const serverData = action.payload
+      if (state.data) {
+        const serverIdx = state.data.findIndex(
+          server => server.id === serverData.id
+        )
+        return update(state, {
+          isFetching: { $set: false },
+          data: { [serverIdx]: { $set: action.payload } }
+        })
+      }
+      return state
     case 'CREATED_SERVER':
       if (state.data) {
         return update(state, { data: { $push: [action.payload] } })
diff --git a/lib/manager/components/CollapsiblePanel.js b/lib/manager/components/CollapsiblePanel.js
index 58960b782..0d33f15ec 100644
--- a/lib/manager/components/CollapsiblePanel.js
+++ b/lib/manager/components/CollapsiblePanel.js
@@ -20,6 +20,7 @@ type Props = {
   fields: Array<FormProps>,
   index: number,
   onChange: (SyntheticInputEvent<HTMLInputElement>, number) => void,
+  onEnter?: number => void,
   onRemove?: number => void,
   onSave?: number => any,
   saveDisabled: boolean,
@@ -36,6 +37,8 @@ export default class CollapsiblePanel extends Component<Props> {
   _onChange = (evt: SyntheticInputEvent<HTMLInputElement>) =>
     this.props.onChange(evt, this.props.index)
 
+  _onEnter = () => this.props.onEnter && this.props.onEnter(this.props.index)
+
   _onRemove = () => this.props.onRemove && this.props.onRemove(this.props.index)
 
   _onSave = () => this.props.onSave && this.props.onSave(this.props.index)
@@ -80,6 +83,7 @@ export default class CollapsiblePanel extends Component<Props> {
         data-test-id={testId}
         defaultExpanded={defaultExpanded}
         header={<h5 style={{width: '100%', cursor: 'pointer'}}>{title}</h5>}
+        onEnter={this._onEnter}
       >
         <Form>
           {this.renderButtonToolbar()}

From 10455a1b6726bd2658dcd38fded10f3b09c18bc9 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Tue, 6 Oct 2020 15:47:07 -0700
Subject: [PATCH 012/553] refactor: update UI with full server info after
 server update

---
 lib/admin/actions/admin.js     | 2 +-
 lib/manager/reducers/status.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/admin/actions/admin.js b/lib/admin/actions/admin.js
index f256e5000..3ece5ac32 100644
--- a/lib/admin/actions/admin.js
+++ b/lib/admin/actions/admin.js
@@ -173,7 +173,7 @@ export function updateServer (server: OtpServer) {
     dispatch(updatingServer(server))
     dispatch(secureFetch(url, method, server))
       .then(res => res.json())
-      .then(server => dispatch(fetchServers()))
+      .then(server => dispatch(receiveServer(server)))
   }
 }
 
diff --git a/lib/manager/reducers/status.js b/lib/manager/reducers/status.js
index 0aed62439..185988277 100644
--- a/lib/manager/reducers/status.js
+++ b/lib/manager/reducers/status.js
@@ -202,6 +202,7 @@ const config = (state: StatusState = defaultState, action: Action): StatusState
     case 'RECEIVED_RTD_SIGNS':
     case 'RECEIVED_RTD_ALERTS':
     case 'RECEIVE_ORGANIZATIONS':
+    case 'RECEIVE_SERVER':
     case 'RECEIVE_SERVERS':
       return update(state, {message: {$set: null}})
     case 'SET_APP_INFO':

From 06ea784765e75c40a7a7c912ffc00988988a0d27 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 16 Oct 2020 17:23:13 -0400
Subject: [PATCH 013/553] fix(pattern-editor): handle uncaught error and
 improve add stop by name

fix #617
---
 lib/common/components/Loading.js              |   4 +-
 lib/editor/components/MinuteSecondInput.js    |   4 +-
 .../components/VirtualizedEntitySelect.js     |   4 +-
 lib/editor/components/map/AddableStop.js      |  41 ++----
 .../components/map/pattern-debug-lines.js     |  24 ++--
 .../pattern/AddPatternStopDropdown.js         | 123 ++++++++++++++++++
 .../components/pattern/EditShapePanel.js      |  92 ++++++++++++-
 .../components/pattern/PatternStopButtons.js  | 100 ++++++--------
 .../components/pattern/PatternStopsPanel.js   |  42 +++++-
 lib/editor/constants/index.js                 |   2 +
 lib/editor/selectors/index.js                 |  16 ++-
 lib/editor/util/map.js                        |  13 ++
 lib/types/index.js                            |   2 +
 13 files changed, 344 insertions(+), 123 deletions(-)
 create mode 100644 lib/editor/components/pattern/AddPatternStopDropdown.js

diff --git a/lib/common/components/Loading.js b/lib/common/components/Loading.js
index 0eae019f5..f7ffd80c4 100644
--- a/lib/common/components/Loading.js
+++ b/lib/common/components/Loading.js
@@ -4,10 +4,12 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import { Row, Col } from 'react-bootstrap'
 
+import type {Style} from '../../types'
+
 type Props = {
   inline?: boolean,
   small?: boolean,
-  style?: {[string]: string | number}
+  style?: Style
 }
 
 export default class Loading extends Component<Props> {
diff --git a/lib/editor/components/MinuteSecondInput.js b/lib/editor/components/MinuteSecondInput.js
index 29a0d92c3..cd2133a35 100644
--- a/lib/editor/components/MinuteSecondInput.js
+++ b/lib/editor/components/MinuteSecondInput.js
@@ -8,11 +8,13 @@ import {
   convertMMSSStringToSeconds
 } from '../../common/util/date-time'
 
+import type {Style} from '../../types'
+
 type Props = {
   disabled?: boolean,
   onChange: number => void,
   seconds: number,
-  style?: {[string]: string | number}
+  style?: Style
 }
 
 type State = {
diff --git a/lib/editor/components/VirtualizedEntitySelect.js b/lib/editor/components/VirtualizedEntitySelect.js
index ffc388a0b..f72a9558b 100644
--- a/lib/editor/components/VirtualizedEntitySelect.js
+++ b/lib/editor/components/VirtualizedEntitySelect.js
@@ -5,7 +5,7 @@ import VirtualizedSelect from 'react-virtualized-select'
 
 import {getEntityName} from '../util/gtfs'
 
-import type {Entity} from '../../types'
+import type {Entity, Style} from '../../types'
 
 export type EntityOption = {
   entity: Entity,
@@ -20,7 +20,7 @@ type Props = {
   entityKey: string,
   onChange: any => void,
   optionRenderer?: Function,
-  style?: {[string]: number | string},
+  style?: Style,
   value?: any
 }
 
diff --git a/lib/editor/components/map/AddableStop.js b/lib/editor/components/map/AddableStop.js
index f12c927e2..3b7311689 100644
--- a/lib/editor/components/map/AddableStop.js
+++ b/lib/editor/components/map/AddableStop.js
@@ -1,12 +1,11 @@
 // @flow
 
-import Icon from '@conveyal/woonerf/components/icon'
 import { divIcon } from 'leaflet'
 import React, {Component} from 'react'
-import {Button, Dropdown, MenuItem} from 'react-bootstrap'
 import {Marker, Popup} from 'react-leaflet'
 
 import * as stopStrategiesActions from '../../actions/map/stopStrategies'
+import AddPatternStopDropdown from '../pattern/AddPatternStopDropdown'
 
 import type {GtfsStop, Pattern} from '../../../types'
 
@@ -28,6 +27,7 @@ export default class AddableStop extends Component<Props> {
   render () {
     const {
       activePattern,
+      addStopToPattern,
       stop
     } = this.props
     const color = 'blue'
@@ -40,7 +40,6 @@ export default class AddableStop extends Component<Props> {
       className: '',
       iconSize: [24, 24]
     })
-    // TODO: Refactor to share code with PatternStopButtons
     return (
       <Marker
         position={[stop.stop_lat, stop.stop_lon]}
@@ -48,36 +47,12 @@ export default class AddableStop extends Component<Props> {
         <Popup>
           <div style={{minWidth: '180px'}}>
             <h5>{stopName}</h5>
-            <Dropdown
-              id={`add-stop-dropdown`}
-              pullRight
-              onSelect={this._onSelectStop}>
-              <Button
-                bsStyle='success'
-                onClick={this._onClickAddStopToEnd}>
-                <Icon type='plus' /> Add stop
-              </Button>
-              <Dropdown.Toggle
-                bsStyle='success' />
-              <Dropdown.Menu style={{maxHeight: '200px', overflowY: 'scroll'}}>
-                <MenuItem
-                  value={activePattern.patternStops.length}
-                  eventKey={activePattern.patternStops.length}>
-                  Add to end (default)
-                </MenuItem>
-                {activePattern.patternStops && activePattern.patternStops.map((stop, i) => {
-                  const index = activePattern.patternStops.length - i
-                  return (
-                    <MenuItem
-                      value={index - 1}
-                      eventKey={index - 1}
-                      key={i}>
-                      {index === 1 ? 'Add to beginning' : `Insert as stop #${index}`}
-                    </MenuItem>
-                  )
-                })}
-              </Dropdown.Menu>
-            </Dropdown>
+            <AddPatternStopDropdown
+              activePattern={activePattern}
+              addStopToPattern={addStopToPattern}
+              label='Add stop'
+              stop={stop}
+            />
           </div>
         </Popup>
       </Marker>
diff --git a/lib/editor/components/map/pattern-debug-lines.js b/lib/editor/components/map/pattern-debug-lines.js
index 99da76d6c..db0ee930d 100644
--- a/lib/editor/components/map/pattern-debug-lines.js
+++ b/lib/editor/components/map/pattern-debug-lines.js
@@ -5,8 +5,8 @@ import {Polyline} from 'react-leaflet'
 import lineDistance from 'turf-line-distance'
 import lineString from 'turf-linestring'
 
-import {POINT_TYPE} from '../../constants'
-import {isValidPoint} from '../../util/map'
+import {PATTERN_TO_STOP_DISTANCE_THRESHOLD_METERS} from '../../constants'
+import {getStopControlPoints} from '../../util/map'
 
 import type {ControlPoint, GtfsStop, Pattern} from '../../../types'
 import type {EditSettingsState} from '../../../types/reducers'
@@ -20,8 +20,6 @@ type Props = {
   stops: Array<GtfsStop>
 }
 
-const DISTANCE_THRESHOLD = 50
-
 /**
  * This react-leaflet component draws connecting lines between a pattern
  * geometry's anchor points (that are associated with stops) and their
@@ -44,33 +42,33 @@ export default class PatternDebugLines extends PureComponent<Props> {
           // i.e., whether the line should be rendered.
           .map((cp, index) => ({...cp, cpIndex: index}))
           // Filter out the user-added anchors
-          .filter(cp => cp.pointType === POINT_TYPE.STOP)
+          .filter(getStopControlPoints)
           // The remaining number should match the number of stops
           .map((cp, index) => {
             const {cpIndex, point, stopId} = cp
-            if (!isValidPoint(point)) {
-              return null
-            }
+            // If hiding inactive segments (and this control point is not along
+            // a visible segment), do not show debug line.
             if (editSettings.hideInactiveSegments && (cpIndex > patternSegment + 1 || cpIndex < patternSegment - 1)) {
               return null
             }
             const patternStopIsActive = patternStop.index === index
             // Do not render if some other pattern stop is active
-            // $FlowFixMe
-            if ((patternStop.index || patternStop.index === 0) && !patternStopIsActive) {
+            if (typeof patternStop.index === 'number' && !patternStopIsActive) {
               return null
             }
             const {coordinates: cpCoord} = point.geometry
+            // Find stop entity for control point.
             const stop = stops.find(s => s.stop_id === stopId)
             if (!stop) {
-              // console.warn(`Could not find stop for pattern stop index=${index} patternStop#stopId=${stopId}`)
+              // If no stop entity found, do not attempt to draw a line to the
+              // missing stop.
               return null
             }
             const coordinates = [[cpCoord[1], cpCoord[0]], [stop.stop_lat, stop.stop_lon]]
             const distance: number = lineDistance(lineString(coordinates), 'meters')
-            const distanceGreaterThanThreshold = distance > DISTANCE_THRESHOLD
+            const distanceGreaterThanThreshold = distance > PATTERN_TO_STOP_DISTANCE_THRESHOLD_METERS
             if (distanceGreaterThanThreshold) {
-              console.warn(`Distance from pattern stop index=${index} to projected point is greater than ${DISTANCE_THRESHOLD} (${distance}).`)
+              console.warn(`Distance from pattern stop index=${index} to projected point is greater than ${PATTERN_TO_STOP_DISTANCE_THRESHOLD_METERS} (${distance}).`)
             }
             return (
               <Polyline
diff --git a/lib/editor/components/pattern/AddPatternStopDropdown.js b/lib/editor/components/pattern/AddPatternStopDropdown.js
new file mode 100644
index 000000000..808f98193
--- /dev/null
+++ b/lib/editor/components/pattern/AddPatternStopDropdown.js
@@ -0,0 +1,123 @@
+// @flow
+
+import Icon from '@conveyal/woonerf/components/icon'
+import React, {Component} from 'react'
+import { Button, Dropdown, MenuItem } from 'react-bootstrap'
+
+import * as stopStrategiesActions from '../../actions/map/stopStrategies'
+
+import type {GtfsStop, Pattern, PatternStop, Style} from '../../../types'
+
+type Props = {
+  activePattern: Pattern,
+  addStopToPattern: typeof stopStrategiesActions.addStopToPattern,
+  index?: number, // current pattern stop index (if dropdown shown for current pattern stop)
+  label?: string,
+  patternStop?: PatternStop, // optional current pattern stop
+  size?: string,
+  stop: GtfsStop,
+  style?: Style
+}
+
+const DISABLED_MESSAGE = 'Cannot have the same stop appear consecutively in list'
+
+/**
+ * Dropdown button that adds a stop as a new pattern stop to the actively
+ * selected pattern.
+ */
+export default class AddPatternStopDropdown extends Component<Props> {
+  _addStop = (index?: number) => {
+    const {activePattern, addStopToPattern, stop} = this.props
+    addStopToPattern(activePattern, stop, index)
+  }
+
+  _matchesStopAtIndex = (index: number) => {
+    const {activePattern, stop} = this.props
+    const patternStopAtIndex = activePattern.patternStops[index]
+    return patternStopAtIndex && patternStopAtIndex.stopId === stop.stop_id
+  }
+
+  _onAddToEnd = () => this._addStop()
+
+  _onSelectStop = (key: number) => this._addStop(key)
+
+  render () {
+    const {activePattern, index, label, size, style} = this.props
+    const {patternStops} = activePattern
+    const lastIndex = patternStops.length - 1
+    // Check that first/last stop is not already set to this stop.
+    let addToEndDisabled = this._matchesStopAtIndex(lastIndex)
+    let addToBeginningDisabled = this._matchesStopAtIndex(0)
+    // Also, disable end/beginning if the current pattern stop being viewed
+    // occupies one of these positions.
+    if (typeof index === 'number') {
+      addToEndDisabled = addToEndDisabled || index >= lastIndex
+      addToBeginningDisabled = addToBeginningDisabled || index === 0
+    }
+    return (
+      <Dropdown
+        id={`add-stop-dropdown`}
+        pullRight
+        onSelect={this._onSelectStop}
+        style={style}
+      >
+        <Button
+          bsSize={size}
+          bsStyle='success'
+          disabled={addToEndDisabled}
+          title={addToEndDisabled ? DISABLED_MESSAGE : ''}
+          onClick={this._onAddToEnd}>
+          <Icon type='plus' /> {label}
+        </Button>
+        <Dropdown.Toggle
+          bsSize={size}
+          bsStyle='success' />
+        <Dropdown.Menu style={{maxHeight: '200px', overflowY: 'scroll'}}>
+          <MenuItem
+            disabled={addToEndDisabled}
+            title={addToEndDisabled ? DISABLED_MESSAGE : ''}
+            value={activePattern.patternStops.length}
+            eventKey={activePattern.patternStops.length}>
+            Add to end (default)
+          </MenuItem>
+          {activePattern.patternStops && activePattern.patternStops.map((s, i) => {
+            // addIndex is in "reverse" order
+            const addIndex = activePattern.patternStops.length - i
+            let disableAdjacent = false
+            // If showing for current pattern stop, do not allow adding as an
+            // adjacent stop.
+            if (typeof index === 'number') {
+              disableAdjacent = (index >= addIndex - 2 && index < addIndex)
+            }
+            // Disable adding stop to current position or directly before/after
+            // current position
+            const addAtIndexDisabled = disableAdjacent ||
+              this._matchesStopAtIndex(addIndex - 2) ||
+              this._matchesStopAtIndex(addIndex - 1)
+            // Skip MenuItem index is the same as the pattern stop index
+            if (index === addIndex - 1 || addIndex === 1) {
+              return null
+            }
+            return (
+              <MenuItem
+                disabled={addAtIndexDisabled}
+                value={addIndex - 1}
+                title={addAtIndexDisabled ? DISABLED_MESSAGE : ''}
+                key={i}
+                eventKey={addIndex - 1}>
+                {`Insert as stop #${addIndex}`}
+              </MenuItem>
+            )
+          })}
+          <MenuItem
+            disabled={addToBeginningDisabled}
+            title={addToBeginningDisabled ? DISABLED_MESSAGE : ''}
+            value={0}
+            eventKey={0}>
+            Add to beginning
+          </MenuItem>
+        </Dropdown.Menu>
+      </Dropdown>
+    )
+  }
+}
diff --git a/lib/editor/components/pattern/EditShapePanel.js b/lib/editor/components/pattern/EditShapePanel.js
index 2b67a033d..354edb338 100644
--- a/lib/editor/components/pattern/EditShapePanel.js
+++ b/lib/editor/components/pattern/EditShapePanel.js
@@ -2,13 +2,15 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import {Button, ButtonGroup, ButtonToolbar, OverlayTrigger, Tooltip} from 'react-bootstrap'
+import {Alert, Button, ButtonGroup, ButtonToolbar, OverlayTrigger, Tooltip} from 'react-bootstrap'
 import ll from '@conveyal/lonlat'
 import numeral from 'numeral'
+import lineDistance from 'turf-line-distance'
+import lineString from 'turf-linestring'
 
 import * as activeActions from '../../actions/active'
 import * as mapActions from '../../actions/map'
-import {ARROW_MAGENTA} from '../../constants'
+import {ARROW_MAGENTA, PATTERN_TO_STOP_DISTANCE_THRESHOLD_METERS} from '../../constants'
 import * as tripPatternActions from '../../actions/tripPattern'
 import OptionButton from '../../../common/components/OptionButton'
 import EditSettings from './EditSettings'
@@ -17,6 +19,7 @@ import {polyline as getPolyline} from '../../../scenario-editor/utils/valhalla'
 import {
   controlPointsFromSegments,
   generateControlPointsFromPatternStops,
+  getStopControlPoints,
   getPatternDistance
 } from '../../util/map'
 
@@ -139,6 +142,42 @@ export default class EditShapePanel extends Component<Props> {
     })
   }
 
+  /**
+   * Checks the control points for stop control points that are located too far
+   * from the actual stop location. This is used to give instructions to the
+   * user on resolving the issue.
+   */
+  _getPatternStopsWithShapeIssues = () => {
+    const {controlPoints, stops} = this.props
+    return controlPoints
+      .filter(getStopControlPoints)
+      .map((controlPoint, index) => {
+        const {point, stopId} = controlPoint
+        let exceedsThreshold = false
+        const {coordinates: cpCoord} = point.geometry
+        // Find stop entity for control point.
+        const stop = stops.find(s => s.stop_id === stopId)
+        if (!stop) {
+          // If no stop entity found, do not attempt to draw a line to the
+          // missing stop.
+          return {controlPoint, index, stop: null, distance: 0, exceedsThreshold}
+        }
+        const coordinates = [[cpCoord[1], cpCoord[0]], [stop.stop_lat, stop.stop_lon]]
+        const distance: number = lineDistance(lineString(coordinates), 'meters')
+        exceedsThreshold = distance > PATTERN_TO_STOP_DISTANCE_THRESHOLD_METERS
+        return {
+          controlPoint,
+          distance,
+          exceedsThreshold,
+          index,
+          stop
+        }
+      })
+      // TODO: This can be removed if at some point we need to show stops where
+      // the distance threshold is not exceeded.
+      .filter(item => item.exceedsThreshold)
+  }
+
   _beginEditing = () => {
     const {togglePatternEditing} = this.props
     togglePatternEditing()
@@ -188,6 +227,7 @@ export default class EditShapePanel extends Component<Props> {
     const nextSegment = (!patternSegment && patternSegment !== 0)
       ? 0
       : patternSegment + 1
+    const patternStopsWithShapeIssues = this._getPatternStopsWithShapeIssues()
     return (
       <div>
         <h4 className='line'>
@@ -217,6 +257,54 @@ export default class EditShapePanel extends Component<Props> {
             </small>
           }
         </div>
+        {patternStopsWithShapeIssues.length > 0
+          ? <Alert bsStyle='warning' style={{fontSize: 'small'}}>
+            <h4><Icon type='exclamation-triangle' /> Pattern stop snapping issue</h4>
+            <ul className='list-unstyled' style={{marginBottom: '5px'}}>
+              {patternStopsWithShapeIssues
+                .map(item => {
+                  const {distance, index, stop} = item
+                  if (!stop) return null
+                  const roundedDist = Math.round(distance * 100) / 100
+                  return (
+                    <li key={index}>
+                      #{index + 1} {stop.stop_name}{' '}
+                      <span style={{color: 'red'}}>
+                        {roundedDist} m
+                      </span>
+                    </li>
+                  )
+                })
+              }
+            </ul>
+            <p>
+              The stop(s) listed above are located
+              too far (max = {PATTERN_TO_STOP_DISTANCE_THRESHOLD_METERS}{' '}
+              meters) from the pattern shape.
+            </p>
+            <p>
+              This can be resolved by:
+              <ol>
+                <li>
+                  moving the stop itself closer to the street's edge;
+                </li>
+                <li>
+                  changing where the stop is "snapped" to the shape: click{' '}
+                  <strong>Edit pattern geometry</strong>, uncheck{' '}
+                  <strong>Hide stop handles</strong>, and move the stop handle
+                  closer to the stop. Checking <strong>Hide inactive segments</strong>{' '}
+                  can help isolate the problematic stop handle; or
+                </li>
+                <li>
+                  regenerating the shape from existing stops: click{' '}
+                  <strong>From stops</strong>.
+                </li>
+              </ol>
+            </p>
+          </Alert>
+          : null
+        }
+
         {editSettings.editGeometry
           ? <div>
             <ButtonToolbar>
diff --git a/lib/editor/components/pattern/PatternStopButtons.js b/lib/editor/components/pattern/PatternStopButtons.js
index 293fcf14f..3aa939aa2 100644
--- a/lib/editor/components/pattern/PatternStopButtons.js
+++ b/lib/editor/components/pattern/PatternStopButtons.js
@@ -2,13 +2,14 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import { Button, Dropdown, OverlayTrigger, Tooltip, ButtonGroup, MenuItem } from 'react-bootstrap'
+import { Button, OverlayTrigger, Tooltip, ButtonGroup } from 'react-bootstrap'
 
 import * as activeActions from '../../actions/active'
 import * as stopStrategiesActions from '../../actions/map/stopStrategies'
 import * as tripPatternActions from '../../actions/tripPattern'
+import AddPatternStopDropdown from './AddPatternStopDropdown'
 
-import type {Feed, GtfsStop, Pattern, PatternStop} from '../../../types'
+import type {Feed, GtfsStop, Pattern, PatternStop, Style} from '../../../types'
 
 type Props = {
   activePattern: Pattern,
@@ -23,7 +24,7 @@ type Props = {
   setActiveStop: typeof tripPatternActions.setActiveStop,
   size: string,
   stop: GtfsStop,
-  style?: {[string]: number | string},
+  style?: Style,
   updatePatternStops: typeof tripPatternActions.updatePatternStops
 }
 
@@ -44,7 +45,13 @@ export default class PatternStopButtons extends Component<Props> {
 
   _onClickRemove = () => {
     const {activePattern, index, removeStopFromPattern, stop} = this.props
-    removeStopFromPattern(activePattern, stop, index)
+    if (
+      window.confirm(
+        `Are you sure you would like to remove ${stop.stop_name} (${stop.stop_id}) as pattern stop #${index + 1}?`
+      )
+    ) {
+      removeStopFromPattern(activePattern, stop, index)
+    }
   }
 
   _onClickSave = () => this.props.saveActiveGtfsEntity('trippattern')
@@ -55,11 +62,16 @@ export default class PatternStopButtons extends Component<Props> {
   }
 
   render () {
-    const {stop, index, activePattern, patternEdited, style, size} = this.props
-    const {patternStops} = activePattern
-    const lastIndex = patternStops.length - 1
-    const addToEndDisabled = index >= lastIndex || patternStops[lastIndex].stopId === stop.id
-    const addToBeginningDisabled = index === 0 || patternStops[0].stopId === stop.id
+    const {
+      activePattern,
+      addStopToPattern,
+      index,
+      patternEdited,
+      patternStop,
+      size,
+      stop,
+      style
+    } = this.props
     return (
       <ButtonGroup
         className='pull-right'
@@ -74,14 +86,20 @@ export default class PatternStopButtons extends Component<Props> {
           onClick={this._onClickSave}>
           <Icon type='floppy-o' />
         </Button>
-        <OverlayTrigger overlay={<Tooltip id='edit-stop-tooltip'>Edit stop</Tooltip>}>
+        <OverlayTrigger
+          overlay={<Tooltip id='edit-stop-tooltip'>Edit stop</Tooltip>}
+        >
           <Button
             bsSize={size}
             onClick={this._onClickEdit}>
             <Icon type='pencil' />
           </Button>
         </OverlayTrigger>
-        <OverlayTrigger overlay={<Tooltip id='remove-stop-tooltip'>Remove from pattern</Tooltip>}>
+        <OverlayTrigger
+          overlay={
+            <Tooltip id='remove-stop-tooltip'>Remove stop from pattern</Tooltip>
+          }
+        >
           <Button
             bsSize={size}
             bsStyle='danger'
@@ -89,58 +107,14 @@ export default class PatternStopButtons extends Component<Props> {
             <Icon type='trash' />
           </Button>
         </OverlayTrigger>
-        <Dropdown
-          id={`add-stop-dropdown`}
-          pullRight
-          onSelect={this._onSelectStop}>
-          <Button
-            bsSize={size}
-            bsStyle='success'
-            disabled={addToEndDisabled}
-            onClick={this._onAddToEnd}>
-            <Icon type='plus' />
-          </Button>
-          <Dropdown.Toggle
-            bsSize={size}
-            bsStyle='success' />
-          <Dropdown.Menu style={{maxHeight: '200px', overflowY: 'scroll'}}>
-            <MenuItem
-              disabled={addToEndDisabled}
-              value={activePattern.patternStops.length}
-              eventKey={activePattern.patternStops.length}>
-              Add to end (default)
-            </MenuItem>
-            {activePattern.patternStops && activePattern.patternStops.map((s, i) => {
-              // addIndex is in "reverse" order
-              const addIndex = activePattern.patternStops.length - i
-              const addAtIndexDisabled = (index >= addIndex - 2 && index < addIndex) ||
-                (patternStops[addIndex - 2] && patternStops[addIndex - 2].stopId === stop.id) ||
-                (patternStops[addIndex - 1] && patternStops[addIndex - 1].stopId === stop.id)
-                // (patternStops[addIndex + 1] && patternStops[addIndex + 1].stopId === stop.id)
-              // skip MenuItem index is the same as the pattern stop index
-              if (index === addIndex - 1 || addIndex === 1) {
-                return null
-              }
-              // disable adding stop to current position or directly before/after current position
-              return (
-                <MenuItem
-                  disabled={addAtIndexDisabled}
-                  value={addIndex - 1}
-                  title={addAtIndexDisabled ? `Cannot have the same stop appear consecutively in list` : ''}
-                  key={i}
-                  eventKey={addIndex - 1}>
-                  {`Insert as stop #${addIndex}`}
-                </MenuItem>
-              )
-            })}
-            <MenuItem
-              disabled={addToBeginningDisabled}
-              value={0}
-              eventKey={0}>
-              Add to beginning
-            </MenuItem>
-          </Dropdown.Menu>
-        </Dropdown>
+        <AddPatternStopDropdown
+          activePattern={activePattern}
+          addStopToPattern={addStopToPattern}
+          index={index}
+          patternStop={patternStop}
+          size={size}
+          stop={stop}
+        />
       </ButtonGroup>
     )
   }
diff --git a/lib/editor/components/pattern/PatternStopsPanel.js b/lib/editor/components/pattern/PatternStopsPanel.js
index 320fd8f4d..1192ecda8 100644
--- a/lib/editor/components/pattern/PatternStopsPanel.js
+++ b/lib/editor/components/pattern/PatternStopsPanel.js
@@ -8,9 +8,11 @@ import * as activeActions from '../../actions/active'
 import * as mapActions from '../../actions/map'
 import * as stopStrategiesActions from '../../actions/map/stopStrategies'
 import * as tripPatternActions from '../../actions/tripPattern'
+import AddPatternStopDropdown from './AddPatternStopDropdown'
 import NormalizeStopTimesModal from './NormalizeStopTimesModal'
 import PatternStopContainer from './PatternStopContainer'
 import VirtualizedEntitySelect from '../VirtualizedEntitySelect'
+import {getEntityBounds, getEntityName} from '../../util/gtfs'
 
 import type {Pattern, GtfsStop, Feed, ControlPoint, Coordinates} from '../../../types'
 import type {EditorStatus, EditSettingsUndoState, MapState} from '../../../types/reducers'
@@ -34,19 +36,26 @@ type Props = {
   stops: Array<GtfsStop>,
   updateActiveGtfsEntity: typeof activeActions.updateActiveGtfsEntity,
   updateEditSetting: typeof activeActions.updateEditSetting,
+  updateMapSetting: typeof mapActions.updateMapSetting,
   updatePatternGeometry: typeof mapActions.updatePatternGeometry,
   updatePatternStops: typeof tripPatternActions.updatePatternStops
 }
 
-type State = { showNormalizeStopTimesModal: boolean }
+type State = {
+  patternStopCandidate: ?GtfsStop,
+  showNormalizeStopTimesModal: boolean
+ }
 
 export default class PatternStopsPanel extends Component<Props, State> {
   state = {
-    showNormalizeStopTimesModal: false
+    showNormalizeStopTimesModal: false,
+    patternStopCandidate: null
   }
 
   _toggleAddStopsMode = () => {
     const {editSettings, updateEditSetting} = this.props
+    // Clear stop candidate (if defined).
+    this.setState({patternStopCandidate: null})
     updateEditSetting({
       setting: 'addStops',
       value: !editSettings.present.addStops
@@ -58,12 +67,16 @@ export default class PatternStopsPanel extends Component<Props, State> {
 
   _onCloseModal = () => this.setState({showNormalizeStopTimesModal: false})
 
-  _addStopFromSelect = (input: any) => {
+  _selectStop = (input: any) => {
     if (!input) {
+      // Clear stop candidate if input is cleared.
+      this.setState({patternStopCandidate: null})
       return
     }
     const stop: GtfsStop = input.entity
-    return this.props.addStopToPattern(this.props.activePattern, stop)
+    // Zoom to stop candidate
+    this.props.updateMapSetting({bounds: getEntityBounds(stop), target: +stop.id})
+    this.setState({patternStopCandidate: stop})
   }
 
   render () {
@@ -88,6 +101,7 @@ export default class PatternStopsPanel extends Component<Props, State> {
       updatePatternStops
     } = this.props
     const {addStops} = editSettings.present
+    const {patternStopCandidate} = this.state
     const patternHasStops = activePattern.patternStops &&
       activePattern.patternStops.length > 0
     return (
@@ -174,8 +188,24 @@ export default class PatternStopsPanel extends Component<Props, State> {
               <VirtualizedEntitySelect
                 component={'stop'}
                 entities={stops}
-                // $FlowFixMe wrapped action type mismatch?
-                onChange={this._addStopFromSelect} />
+                onChange={this._selectStop} />
+              {patternStopCandidate
+                ? <div style={{
+                  textAlign: 'center',
+                  marginTop: '5px'
+                }}>
+                  <p>{getEntityName(patternStopCandidate)}</p>
+                  <AddPatternStopDropdown
+                    activePattern={activePattern}
+                    block
+                    addStopToPattern={addStopToPattern}
+                    label='Add stop to end'
+                    stop={patternStopCandidate}
+                    style={{marginBotton: '10px'}}
+                  />
+                </div>
+                : null
+              }
               <div style={{marginTop: '5px'}}>
                 <Button
                   bsSize='small'
diff --git a/lib/editor/constants/index.js b/lib/editor/constants/index.js
index ca1a4dd46..ae96ce8d2 100644
--- a/lib/editor/constants/index.js
+++ b/lib/editor/constants/index.js
@@ -17,3 +17,5 @@ export const POINT_TYPE = Object.freeze({
 })
 
 export const ARROW_MAGENTA = '#d50b65'
+
+export const PATTERN_TO_STOP_DISTANCE_THRESHOLD_METERS = 50
diff --git a/lib/editor/selectors/index.js b/lib/editor/selectors/index.js
index 9c9201ce5..a36d3273a 100644
--- a/lib/editor/selectors/index.js
+++ b/lib/editor/selectors/index.js
@@ -247,12 +247,21 @@ export const getControlPoints = createSelector(
           )
         } catch (error) {
           console.warn(`Error adding pattern stops to shapepoints`, error)
+          // FIXME: shapepoints issue?
           result = {shapePoints, patternSegments: [], error}
         }
         patternSegments = result.patternSegments
         // Get control points from shape points result, which will include any
         // projected stops and any pre-existing anchors.
-        controlPoints = getControlPointsFromShapePoints(result.shapePoints)
+        // Note: It's not entirely clear what in addPatternStopsToShapePoints
+        // causes result.shapePoints to sometimes only have one shape point item,
+        // but further investigation may be needed (if surrounding this in a
+        // try/catch is causing issues).
+        try {
+          controlPoints = getControlPointsFromShapePoints(result.shapePoints)
+        } catch (error) {
+          console.warn(error, result)
+        }
         if (controlPoints.length - 1 > patternSegments.length) {
           // There are non-stop control points that need to be added in.
           for (let i = 0; i < controlPoints.length; i++) {
@@ -405,7 +414,10 @@ function addPatternStopsToShapePoints (
     // .map(sp => ({...sp}))
     .filter(sp => sp.pointType === POINT_TYPE.STOP)
   if (patternStops.length !== stopControlPoints.length) {
-    console.warn(`Pattern stops (length=${patternStops.length}) and stop control points (length=${stopControlPoints.length}) mismatch!`, patternStops, oldShapePoints)
+    // Note: It seems to be OK (and expected), when adding a pattern stop that stop
+    // control points length is one less than pattern stops. But log a warning
+    // if the difference is something else.
+    console.warn(`Pattern stops (length=${patternStops.length}) and stop control points (length=${stopControlPoints.length}) mismatch!`, patternStops, stopControlPoints, oldShapePoints)
   }
   const patternLine: GeoJsonLinestring = lineString(coordinatesFromShapePoints(shapePointsCopy))
   const patternLengthInMeters: number = lineDistance(patternLine, 'meters')
diff --git a/lib/editor/util/map.js b/lib/editor/util/map.js
index 0f74465a7..e5408c99f 100644
--- a/lib/editor/util/map.js
+++ b/lib/editor/util/map.js
@@ -103,6 +103,19 @@ export function isValidPoint (point: any) {
   return Boolean(point && point.geometry && point.geometry.coordinates)
 }
 
+/**
+ * Array filter function to filter control points for stop control points with
+ * valid locations.
+ */
+export function getStopControlPoints (controlPoint: ControlPoint, index: number) {
+  const {point, pointType} = controlPoint
+  // Filter out control points that are not for stops.
+  if (pointType !== POINT_TYPE.STOP) return false
+  // And filter out control points that don't contain valid points.
+  if (!isValidPoint(point)) return false
+  return true
+}
+
 export function newControlPoint (
   distance: ?number,
   point: GeoJsonPoint,
diff --git a/lib/types/index.js b/lib/types/index.js
index f7be2fbe5..16898626e 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -71,6 +71,8 @@ export type Bounds = {
   west: number
 }
 
+export type Style = {[string]: string | number}
+
 export type Route = {
   agencyId: string,
   feedId: string,

From f0b83dc9c8710dfe76d720965e7679c8db276b10 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Oct 2020 22:58:35 +0000
Subject: [PATCH 014/553] build(deps): bump object-path from 0.11.4 to 0.11.5

Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.4 to 0.11.5.
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b6938c584..f572d8cde 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9361,9 +9361,9 @@ object-keys@^1.0.11, object-keys@^1.0.12:
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-path@^0.11.1:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.4.tgz#370ae752fbf37de3ea70a861c23bba8915691949"
-  integrity sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=
+  version "0.11.5"
+  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a"
+  integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==
 
 object-visit@^1.0.0:
   version "1.0.1"

From c0257d559ec99cf47a8153831ea5cbf5746abbc3 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 20 Oct 2020 10:22:19 -0400
Subject: [PATCH 015/553] refactor(AddPatternStopDropdown): address PR comments

---
 .../components/map/pattern-debug-lines.js     |  4 +-
 .../pattern/AddPatternStopDropdown.js         | 41 ++++++++++++-------
 .../components/pattern/EditShapePanel.js      |  6 +--
 lib/editor/util/map.js                        |  2 +-
 4 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/lib/editor/components/map/pattern-debug-lines.js b/lib/editor/components/map/pattern-debug-lines.js
index db0ee930d..aa17ccce2 100644
--- a/lib/editor/components/map/pattern-debug-lines.js
+++ b/lib/editor/components/map/pattern-debug-lines.js
@@ -6,7 +6,7 @@ import lineDistance from 'turf-line-distance'
 import lineString from 'turf-linestring'
 
 import {PATTERN_TO_STOP_DISTANCE_THRESHOLD_METERS} from '../../constants'
-import {getStopControlPoints} from '../../util/map'
+import {isValidStopControlPoint} from '../../util/map'
 
 import type {ControlPoint, GtfsStop, Pattern} from '../../../types'
 import type {EditSettingsState} from '../../../types/reducers'
@@ -42,7 +42,7 @@ export default class PatternDebugLines extends PureComponent<Props> {
           // i.e., whether the line should be rendered.
           .map((cp, index) => ({...cp, cpIndex: index}))
           // Filter out the user-added anchors
-          .filter(getStopControlPoints)
+          .filter(isValidStopControlPoint)
           // The remaining number should match the number of stops
           .map((cp, index) => {
             const {cpIndex, point, stopId} = cp
diff --git a/lib/editor/components/pattern/AddPatternStopDropdown.js b/lib/editor/components/pattern/AddPatternStopDropdown.js
index 808f98193..713b676b3 100644
--- a/lib/editor/components/pattern/AddPatternStopDropdown.js
+++ b/lib/editor/components/pattern/AddPatternStopDropdown.js
@@ -81,31 +81,44 @@ export default class AddPatternStopDropdown extends Component<Props> {
             Add to end (default)
           </MenuItem>
           {activePattern.patternStops && activePattern.patternStops.map((s, i) => {
-            // addIndex is in "reverse" order
-            const addIndex = activePattern.patternStops.length - i
+            // addIndex is in "reverse" order. For example:
+            // - 5 pattern stops
+            // - rendering MenuItem 'Insert at stop #4'
+            // - addIndex = 3 = 5 (stops) - 1 (i) - 1
+            // - nextIndex = 4
+            // - previousIndex = 2
+            const addIndex = activePattern.patternStops.length - i - 1
+            const nextIndex = addIndex + 1
+            const previousIndex = addIndex - 1
             let disableAdjacent = false
-            // If showing for current pattern stop, do not allow adding as an
-            // adjacent stop.
+            // If showing the dropdown for the currently selected pattern stop,
+            // do not allow adding as an adjacent stop (a pattern should not
+            // visit the same stop consecutively).
             if (typeof index === 'number') {
-              disableAdjacent = (index >= addIndex - 2 && index < addIndex)
+              disableAdjacent = index > previousIndex && index < nextIndex
             }
-            // Disable adding stop to current position or directly before/after
-            // current position
+            // Disable adding stop to current position or directly before
+            // current position. nextIndex is OK because inserting the stop at
+            // addIndex would move the current stop at addIndex into the
+            // nextIndex position, which would serve as a buffer (and avoid
+            // having the same stop in consecutive positions).
             const addAtIndexDisabled = disableAdjacent ||
-              this._matchesStopAtIndex(addIndex - 2) ||
-              this._matchesStopAtIndex(addIndex - 1)
-            // Skip MenuItem index is the same as the pattern stop index
-            if (index === addIndex - 1 || addIndex === 1) {
+              this._matchesStopAtIndex(previousIndex) ||
+              this._matchesStopAtIndex(addIndex)
+            // Skip MenuItem if index is the same as the currently selected
+            // pattern stop index or it's the zeroth addIndex (Add to
+            // beginning handles this case).
+            if (index === addIndex || addIndex === 0) {
               return null
             }
             return (
               <MenuItem
                 disabled={addAtIndexDisabled}
-                value={addIndex - 1}
+                value={addIndex}
                 title={addAtIndexDisabled ? DISABLED_MESSAGE : ''}
                 key={i}
-                eventKey={addIndex - 1}>
-                {`Insert as stop #${addIndex}`}
+                eventKey={addIndex}>
+                Insert as stop #{addIndex + 1}
               </MenuItem>
             )
           })}
diff --git a/lib/editor/components/pattern/EditShapePanel.js b/lib/editor/components/pattern/EditShapePanel.js
index 354edb338..dc9bf0064 100644
--- a/lib/editor/components/pattern/EditShapePanel.js
+++ b/lib/editor/components/pattern/EditShapePanel.js
@@ -19,8 +19,8 @@ import {polyline as getPolyline} from '../../../scenario-editor/utils/valhalla'
 import {
   controlPointsFromSegments,
   generateControlPointsFromPatternStops,
-  getStopControlPoints,
-  getPatternDistance
+  getPatternDistance,
+  isValidStopControlPoint
 } from '../../util/map'
 
 import type {ControlPoint, LatLng, Pattern, GtfsStop} from '../../../types'
@@ -150,7 +150,7 @@ export default class EditShapePanel extends Component<Props> {
   _getPatternStopsWithShapeIssues = () => {
     const {controlPoints, stops} = this.props
     return controlPoints
-      .filter(getStopControlPoints)
+      .filter(isValidStopControlPoint)
       .map((controlPoint, index) => {
         const {point, stopId} = controlPoint
         let exceedsThreshold = false
diff --git a/lib/editor/util/map.js b/lib/editor/util/map.js
index e5408c99f..6dd7e3636 100644
--- a/lib/editor/util/map.js
+++ b/lib/editor/util/map.js
@@ -107,7 +107,7 @@ export function isValidPoint (point: any) {
  * Array filter function to filter control points for stop control points with
  * valid locations.
  */
-export function getStopControlPoints (controlPoint: ControlPoint, index: number) {
+export function isValidStopControlPoint (controlPoint: ControlPoint) {
   const {point, pointType} = controlPoint
   // Filter out control points that are not for stops.
   if (pointType !== POINT_TYPE.STOP) return false

From af06bba1d13bef317e86f115e34cb9df992ecddb Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 26 Oct 2020 17:18:37 -0400
Subject: [PATCH 016/553] fix(MTC): make SERVICE_WITHOUT_DAYS_OF_WEEK a
 blocking issue

---
 lib/manager/util/version.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/manager/util/version.js b/lib/manager/util/version.js
index 799a2e1a8..ea61a4c3b 100644
--- a/lib/manager/util/version.js
+++ b/lib/manager/util/version.js
@@ -63,11 +63,12 @@ export function versionHasNotBegun (
 // https://github.com/conveyal/gtfs-lib/blob/dev/src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java
 export const BLOCKING_ERROR_TYPES = [
   'ILLEGAL_FIELD_VALUE',
-  'TABLE_IN_SUBDIRECTORY',
-  'WRONG_NUMBER_OF_FIELDS',
   'MISSING_COLUMN',
+  'REFERENTIAL_INTEGRITY',
+  'SERVICE_WITHOUT_DAYS_OF_WEEK',
   'TABLE_MISSING_COLUMN_HEADERS',
-  'REFERENTIAL_INTEGRITY'
+  'TABLE_IN_SUBDIRECTORY',
+  'WRONG_NUMBER_OF_FIELDS'
 ]
 
 export function isErrorBlocking (category: ValidationResultErrorCount) {

From 7a9c2cb4f0db12c19d87fba7f8e1e2f947b2403a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 6 Nov 2020 10:22:16 -0500
Subject: [PATCH 017/553] refactor(FeedVersionViewer): Make code compile again.

---
 .../components/version/FeedVersionViewer.js      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index da101542a..f0d626af7 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -2,7 +2,7 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import { Row, Col, Panel, Label, Glyphicon, ListGroup, ListGroupItem } from 'react-bootstrap'
+import { Row, Col, Panel, Label as BsLabel, Glyphicon, ListGroup, ListGroupItem } from 'react-bootstrap'
 import { LinkContainer } from 'react-router-bootstrap'
 import numeral from 'numeral'
 
@@ -170,13 +170,15 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : ''
     return (
       <span>
-        <Label bsStyle={color} htmlFor>
+        <BsLabel
+          // bsStyle={color}
+        >
           {text}
-        </Label>
+        </BsLabel>
         {comparedVersion
-          ? <Label bsStyle={diffColor} style={{paddingLeft: '0.2em', paddingRight: '0.2em'}} htmlFor>
+          ? <BsLabel bsStyle={diffColor} style={{paddingLeft: '0.2em', paddingRight: '0.2em'}}>
             {diffText}
-          </Label>
+          </BsLabel>
           : ''
         }
         <BsLabel className={`gtfs-error-${highestPriority}-label-solid`}>
@@ -206,7 +208,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : <Icon type='check' />
     return issueCount === null
       ? <span><Loading small inline /></span>
-      : <span><Label bsStyle={color} htmlFor>{text}</Label></span>
+      : <span><BsLabel bsStyle={color}>{text}</BsLabel></span>
   }
 
   render () {
@@ -241,7 +243,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
             active={this.props.versionSection === 'comments'}>
             <ListGroupItem>
               <Glyphicon glyph='comment' /> Version comments{' '}
-              <Label htmlFor>{version.noteCount}</Label>
+              <BsLabel htmlFor>{version.noteCount}</BsLabel>
             </ListGroupItem>
           </LinkContainer>
         </ListGroup>

From 2d8b0e894908b09abff503d1a2e6b86a166d81b9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:31:45 -0500
Subject: [PATCH 018/553] refactor(FeedVersionNavigator): Remove redundant code

---
 lib/manager/actions/versions.js               | 20 ++++----
 .../version/FeedVersionNavigator.js           | 46 ++++++++-----------
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 608c48cca..3ed32a11a 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -100,17 +100,12 @@ export function setActiveVersion (version: FeedVersion) {
     }
   }
 }
-// setComparedVersion used in components
-export const settingComparedVersion = createAction(
+// Sets the compared feed version.
+export const setComparedVersion = createAction(
   'SET_COMPARED_FEEDVERSION',
   (payload: FeedVersion) => payload
 )
-export function setComparedVersion (version: FeedVersion) {
-  return function (dispatch: dispatchFn, getState: getStateFn) {
-    // Dispatch action to set value in reducer.
-    dispatch(settingComparedVersion(version))
-  }
-}
+
 const uploadingFeed = createVoidPayloadAction('UPLOADING_FEED')
 
 export type VersionActions = ActionType<typeof deletingFeedVersion> |
@@ -602,11 +597,18 @@ export function setVersionIndex (
 
 export function setComparedVersionIndex (
   feed: Feed,
-  index: number
+  index: number,
+  push?: boolean = true,
+  isPublic?: boolean
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     if (feed.feedVersions) {
       dispatch(setComparedVersion(feed.feedVersions[index - 1]))
+      if (push) {
+        // browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${index}/compareto/${index}`)
+      }
+    } else {
+      console.warn('No feed versions for feed were found.', feed)
     }
   }
 }
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 1b96338ce..5d5cf5144 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -167,20 +167,20 @@ export default class FeedVersionNavigator extends Component<Props, State> {
       renameFeedVersion,
       sortedVersions,
       user,
-      //version,
+      version,
       versionSection
     } = this.props
-    const {feedVersions: versions} = feedSource
 
-    if (!versions) return null
-
-    if (typeof feedVersionIndex === 'undefined') return null
-    const version = hasVersions && versions[feedVersionIndex - 1]
     const deploymentForVersion =
       version &&
       feedSource.deployments &&
       feedSource.deployments.find(d => d.feedVersions.findIndex(v => v.id === version.id) !== -1)
     const dropdownTitle = `${this.messages('version')} ${feedVersionIndex} ${this.messages('of')} ${sortedVersions.length}`
+
+    const hasManyVersions = sortedVersions.length >= 2
+    const comparedFeedVersion = sortedVersions[comparedVersionIndex - 1]
+    const comparableVersions = sortedVersions.filter(v => v !== version)
+
     return (
       <div>
         <SelectFileModal ref='uploadModal'
@@ -238,25 +238,19 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                     <Glyphicon glyph='arrow-right' />
                   </Button>
 
-                  {/* Previous Version Selector Dropdown */}
-
-                  <DropdownButton
-                    href='#'
-                    id='prevVersionSelector'
-                    title={comparedVersionIndex > 0 ? `Comparing to: ${this.messages('version')} ${comparedVersionIndex}` : `<This is the first feed version>`}
-                    disabled={comparedVersionIndex === 0}
-                    onSelect={this._onSelectComparedVersion}>
-                    {versions.map((version, k) => {
-                      k = k + 1
-                      if (k >= feedVersionIndex) {
-                        return (
-                          <MenuItem key={k} disabled eventKey={null}>
-                            {k}. (Cannot compare with self or more recent)
-                          </MenuItem>
-                        )
-                      } else return <MenuItem key={k} eventKey={k}>{k}. {version.name}</MenuItem>
-                    })}
-                  </DropdownButton>
+                  {/* Show comparison version selector if 2+ versions present and comparing is active. */}
+                  {hasManyVersions && comparedVersionIndex !== null &&
+                    <VersionSelectorDropdown
+                      dropdownProps={{
+                        id: 'prevVersionSelector',
+                        onSelect: this._onSelectComparedVersion
+                      }}
+                      header='Select a comparison version'
+                      title={`Comparing to: ${this.messages('version')} ${comparedVersionIndex}`}
+                      version={comparedFeedVersion}
+                      versions={comparableVersions}
+                    />
+                  }
                 </ButtonGroup>
 
               }
@@ -360,7 +354,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
               renameFeedVersion={renameFeedVersion}
               user={user}
               version={this.props.version}
-              comparedVersion={versions[comparedVersionIndex - 1]}
+              comparedVersion={comparedFeedVersion}
               versionSection={versionSection || null}
               versions={sortedVersions} />
           </Col>

From f58cbc8b7a50e1844617c93566381c6cbd90fabb Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:57:12 -0500
Subject: [PATCH 019/553] refactor(FeedVersionViewer): Tweak issues count diff
 label.

---
 .../version/FeedVersionNavigator.js           |  1 -
 .../components/version/FeedVersionViewer.js   | 39 +++++++++----------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 5d5cf5144..8c34d523d 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -252,7 +252,6 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                     />
                   }
                 </ButtonGroup>
-
               }
               <ButtonToolbar className='pull-right'>
                 <ButtonGroup>
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index f0d626af7..ef7a1b3e6 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -141,7 +141,10 @@ type SelectorProps = {
 }
 
 class VersionSectionSelector extends Component<SelectorProps> {
-  _renderIssuesLabel (version, comparedVersion) {
+  _renderIssuesLabel (
+    version: FeedVersion,
+    comparedVersion: FeedVersion
+  ) {
     const tableFatalExceptions = getTableFatalExceptions(version)
     const {validationResult, validationSummary, feedLoadResult} = version
     const hasCriticalError = validationSummary.loadStatus !== 'SUCCESS' ||
@@ -161,28 +164,24 @@ class VersionSectionSelector extends Component<SelectorProps> {
     const text = hasCriticalError
       ? 'critical error'
       : validationSummary.errorCount
-    const diff = comparedVersion
-      ? validationSummary.errorCount - comparedVersion.validationSummary.errorCount
-      : 0
-    const diffColor = diff > 0 ? 'danger' : (diff < 0 ? 'success' : 'default')
-    const diffText = comparedVersion
-      ? diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))
-      : ''
+
+    let diffLabel
+    if (comparedVersion) {
+      const diff = validationSummary.errorCount - comparedVersion.validationSummary.errorCount
+      const diffColor = diff > 0 ? 'label-danger' : (diff < 0 ? 'label-success' : 'label-default')
+      const diffText = diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))
+
+      diffLabel = (
+        <span className={diffColor} style={{border: '0.5px solid #ccc'}}>
+          {diffText}
+        </span>
+      )
+    }
+
     return (
       <span>
-        <BsLabel
-          // bsStyle={color}
-        >
-          {text}
-        </BsLabel>
-        {comparedVersion
-          ? <BsLabel bsStyle={diffColor} style={{paddingLeft: '0.2em', paddingRight: '0.2em'}}>
-            {diffText}
-          </BsLabel>
-          : ''
-        }
         <BsLabel className={`gtfs-error-${highestPriority}-label-solid`}>
-          {text}
+          {text} {diffLabel}
         </BsLabel>
       </span>
     )

From ffed209f2a92e53ab680b698c72162a99acea721 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 6 Nov 2020 13:45:58 -0500
Subject: [PATCH 020/553] refactor(FeedVersionViewer): Remove unused prop

---
 lib/manager/components/version/FeedVersionNavigator.js | 1 -
 lib/manager/components/version/FeedVersionViewer.js    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 8c34d523d..bba425ceb 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -336,7 +336,6 @@ export default class FeedVersionNavigator extends Component<Props, State> {
               exportVersionShapes={exportVersionShapes}
               feedSource={feedSource}
               feedVersionIndex={feedVersionIndex}
-              comparedVersionIndex={comparedVersionIndex}
               fetchGTFSEntities={fetchGTFSEntities}
               fetchValidationErrors={fetchValidationErrors}
               gtfs={gtfs}
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index ef7a1b3e6..aec5f4f00 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -24,7 +24,6 @@ import type {GtfsState, ManagerUserState} from '../../../types/reducers'
 
 export type Props = {
   comparedVersion: FeedVersion,
-  comparedVersionIndex: number,
   deleteDisabled: ?boolean,
   deleteFeedVersion: typeof versionsActions.deleteFeedVersion,
   downloadFeedViaToken: typeof versionsActions.downloadFeedViaToken,

From 201672477cb67b9f03dafa2200c8c9ddabee3f04 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 6 Nov 2020 15:26:03 -0500
Subject: [PATCH 021/553] refactor(FeedVersionNavigator): Improve logic for
 comparison dropdown.

---
 .../version/FeedVersionNavigator.js           | 60 ++++++++++++-------
 .../version/VersionSelectorDropdown.js        |  2 +-
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index bba425ceb..14f498688 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -18,8 +18,7 @@ import * as gtfsPlusActions from '../../../gtfsplus/actions/gtfsplus'
 import * as deploymentActions from '../../../manager/actions/deployments'
 import DeploymentPreviewButton from '../DeploymentPreviewButton'
 import FeedVersionViewer from './FeedVersionViewer'
-import VersionSelectorDropdown from './VersionSelectorDropdown'
-
+import VersionSelectorDropdown, {DefaultItemFormatter} from './VersionSelectorDropdown'
 import type {Props as ContainerProps} from '../../containers/ActiveFeedVersionNavigator'
 import type {FeedVersion, GtfsPlusValidation, Note} from '../../../types'
 import type {GtfsState, ManagerUserState} from '../../../types/reducers'
@@ -141,6 +140,43 @@ export default class FeedVersionNavigator extends Component<Props, State> {
     }
   }
 
+  /** Show comparison dropdown if there are 2+ versions to compare. */
+  _renderComparisonDropdown = () => {
+    const {
+      comparedVersionIndex,
+      sortedVersions,
+      version
+    } = this.props
+
+    if (sortedVersions.length >= 2) {
+      const comparedFeedVersion = sortedVersions[comparedVersionIndex - 1]
+      const compareTitle = comparedFeedVersion ? `Comparing to Version ${comparedVersionIndex}` : 'Compare'
+
+      // This custom formatter adds and hides the active version in the list to preserve version indexes.
+      const itemFormatter = (itemVersion: FeedVersion, activeVersion: ?FeedVersion) => (
+        itemVersion === version
+          ? <MenuItem key={itemVersion.id} style={{display: 'none'}} />
+          : DefaultItemFormatter(itemVersion, activeVersion)
+      )
+
+      return (
+        <VersionSelectorDropdown
+          dropdownProps={{
+            id: 'prevVersionSelector',
+            onSelect: this._onSelectComparedVersion
+          }}
+          header='Select a version to compare'
+          itemFormatter={itemFormatter}
+          title={compareTitle}
+          version={comparedFeedVersion}
+          versions={sortedVersions}
+        />
+      )
+    }
+
+    return null
+  }
+
   render () {
     const versionTitleStyle = {
       fontSize: '24px',
@@ -177,10 +213,6 @@ export default class FeedVersionNavigator extends Component<Props, State> {
       feedSource.deployments.find(d => d.feedVersions.findIndex(v => v.id === version.id) !== -1)
     const dropdownTitle = `${this.messages('version')} ${feedVersionIndex} ${this.messages('of')} ${sortedVersions.length}`
 
-    const hasManyVersions = sortedVersions.length >= 2
-    const comparedFeedVersion = sortedVersions[comparedVersionIndex - 1]
-    const comparableVersions = sortedVersions.filter(v => v !== version)
-
     return (
       <div>
         <SelectFileModal ref='uploadModal'
@@ -238,19 +270,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                     <Glyphicon glyph='arrow-right' />
                   </Button>
 
-                  {/* Show comparison version selector if 2+ versions present and comparing is active. */}
-                  {hasManyVersions && comparedVersionIndex !== null &&
-                    <VersionSelectorDropdown
-                      dropdownProps={{
-                        id: 'prevVersionSelector',
-                        onSelect: this._onSelectComparedVersion
-                      }}
-                      header='Select a comparison version'
-                      title={`Comparing to: ${this.messages('version')} ${comparedVersionIndex}`}
-                      version={comparedFeedVersion}
-                      versions={comparableVersions}
-                    />
-                  }
+                  {this._renderComparisonDropdown()}
                 </ButtonGroup>
               }
               <ButtonToolbar className='pull-right'>
@@ -352,7 +372,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
               renameFeedVersion={renameFeedVersion}
               user={user}
               version={this.props.version}
-              comparedVersion={comparedFeedVersion}
+              comparedVersion={sortedVersions[comparedVersionIndex - 1]}
               versionSection={versionSection || null}
               versions={sortedVersions} />
           </Col>
diff --git a/lib/manager/components/version/VersionSelectorDropdown.js b/lib/manager/components/version/VersionSelectorDropdown.js
index 048f18eec..5de272237 100644
--- a/lib/manager/components/version/VersionSelectorDropdown.js
+++ b/lib/manager/components/version/VersionSelectorDropdown.js
@@ -18,7 +18,7 @@ type Props = {
   versions: ?Array<FeedVersion>
 }
 
-const DefaultItemFormatter = (version: FeedVersion, activeVersion: ?FeedVersion) => (
+export const DefaultItemFormatter = (version: FeedVersion, activeVersion: ?FeedVersion) => (
   <MenuItem
     key={version.id}
     eventKey={version.version}

From 6db4f048ff32f2dde970602473bbc0fb12bac15c Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 6 Nov 2020 15:59:50 -0500
Subject: [PATCH 022/553] refactor(FeedVersionViewer): Reinstate version number
 prop, make various refactors.

---
 lib/manager/actions/versions.js               |  3 +-
 .../version/FeedVersionNavigator.js           |  3 +-
 .../components/version/FeedVersionTabs.js     |  2 +-
 .../components/version/FeedVersionViewer.js   | 47 +++++++++++--------
 4 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 3ed32a11a..d58c01f29 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -605,7 +605,8 @@ export function setComparedVersionIndex (
     if (feed.feedVersions) {
       dispatch(setComparedVersion(feed.feedVersions[index - 1]))
       if (push) {
-        // browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${index}/compareto/${index}`)
+        // TODO:
+        // browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${activeIndex}/compareto/${index}`)
       }
     } else {
       console.warn('No feed versions for feed were found.', feed)
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 14f498688..907b42125 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -348,6 +348,8 @@ export default class FeedVersionNavigator extends Component<Props, State> {
         <Row>
           <Col xs={12}>
             <FeedVersionViewer
+              comparedVersion={sortedVersions[comparedVersionIndex - 1]}
+              comparedVersionIndex={comparedVersionIndex}
               deleteDisabled={deleteDisabled}
               deleteFeedVersion={deleteFeedVersion}
               downloadFeedViaToken={downloadFeedViaToken}
@@ -372,7 +374,6 @@ export default class FeedVersionNavigator extends Component<Props, State> {
               renameFeedVersion={renameFeedVersion}
               user={user}
               version={this.props.version}
-              comparedVersion={sortedVersions[comparedVersionIndex - 1]}
               versionSection={versionSection || null}
               versions={sortedVersions} />
           </Col>
diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 8af4650ca..2475f619a 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -121,7 +121,7 @@ export default class FeedVersionTabs extends Component<Props> {
                             htmlFor
                             style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
                             bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'danger' : 'default')}
-                            title={`Compared to Version ${comparedVersionIndex}`}>
+                            title={`Difference compared to Version ${comparedVersionIndex}`}>
                             {diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a')) /* refactor */}
                           </Label>
                         </sup>
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index aec5f4f00..cd2e5a458 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -23,7 +23,8 @@ import type {Feed, FeedVersion, GtfsPlusValidation, Note, Project} from '../../.
 import type {GtfsState, ManagerUserState} from '../../../types/reducers'
 
 export type Props = {
-  comparedVersion: FeedVersion,
+  comparedVersion: ?FeedVersion,
+  comparedVersionIndex: ?number,
   deleteDisabled: ?boolean,
   deleteFeedVersion: typeof versionsActions.deleteFeedVersion,
   downloadFeedViaToken: typeof versionsActions.downloadFeedViaToken,
@@ -58,13 +59,14 @@ export default class FeedVersionViewer extends Component<Props> {
 
   render () {
     const {
+      comparedVersion,
+      comparedVersionIndex,
       feedSource,
       feedVersionIndex,
       listView,
       newNotePosted,
       notesRequested,
       version,
-      comparedVersion,
       versions,
       versionSection,
       user
@@ -98,6 +100,7 @@ export default class FeedVersionViewer extends Component<Props> {
           <VersionSectionSelector
             version={version}
             comparedVersion={comparedVersion}
+            comparedVersionIndex={comparedVersionIndex}
             gtfsPlusValidation={this.props.gtfsPlusValidation}
             feedVersionIndex={feedVersionIndex}
             versionSection={versionSection} />
@@ -140,18 +143,18 @@ type SelectorProps = {
 }
 
 class VersionSectionSelector extends Component<SelectorProps> {
-  _renderIssuesLabel (
-    version: FeedVersion,
-    comparedVersion: FeedVersion
-  ) {
+  _renderIssuesLabel = () => {
+    const { version, comparedVersion, comparedVersionIndex } = this.props
+    const { validationResult, validationSummary, feedLoadResult } = version
+
     const tableFatalExceptions = getTableFatalExceptions(version)
-    const {validationResult, validationSummary, feedLoadResult} = version
     const hasCriticalError = validationSummary.loadStatus !== 'SUCCESS' ||
       !feedLoadResult || feedLoadResult.fatalException ||
       tableFatalExceptions.length > 0
-    let highestPriority = 'UNKNOWN'
+
     // Determine the highest priority issue (which will determine the label
     // color).
+    let highestPriority = 'UNKNOWN'
     if (validationResult.error_counts) {
       validationResult.error_counts.forEach(category => {
         const level = errorPriorityLevels[category.priority]
@@ -160,6 +163,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
         }
       })
     }
+
     const text = hasCriticalError
       ? 'critical error'
       : validationSummary.errorCount
@@ -171,7 +175,11 @@ class VersionSectionSelector extends Component<SelectorProps> {
       const diffText = diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))
 
       diffLabel = (
-        <span className={diffColor} style={{border: '0.5px solid #ccc'}}>
+        <span
+          className={diffColor}
+          style={{border: '0.5px solid #ccc'}}
+          title={`Difference compared to Version ${comparedVersionIndex}`}
+        >
           {diffText}
         </span>
       )
@@ -210,26 +218,27 @@ class VersionSectionSelector extends Component<SelectorProps> {
   }
 
   render () {
-    const { version, comparedVersion } = this.props
+    const { feedVersionIndex, version, versionSection } = this.props
+    const versionPath = `/feed/${version.feedSource.id}/version/${feedVersionIndex}`
     return (
       <Panel>
         <ListGroup fill>
           <LinkContainer
-            to={`/feed/${version.feedSource.id}/version/${this.props.feedVersionIndex}`}
-            active={!this.props.versionSection}>
+            to={versionPath}
+            active={!versionSection}>
             <ListGroupItem><Icon type='info-circle' /> Version summary</ListGroupItem>
           </LinkContainer>
           <LinkContainer
-            to={`/feed/${version.feedSource.id}/version/${this.props.feedVersionIndex}/issues`}
-            active={this.props.versionSection === 'issues'}>
+            to={`${versionPath}/issues`}
+            active={versionSection === 'issues'}>
             <ListGroupItem>
-              <Icon type='exclamation-triangle' /> Validation issues {this._renderIssuesLabel(version, comparedVersion)}
+              <Icon type='exclamation-triangle' /> Validation issues {this._renderIssuesLabel()}
             </ListGroupItem>
           </LinkContainer>
           {isModuleEnabled('gtfsplus')
             ? <LinkContainer
-              to={`/feed/${version.feedSource.id}/version/${this.props.feedVersionIndex}/gtfsplus`}
-              active={this.props.versionSection === 'gtfsplus'}>
+              to={`${versionPath}/gtfsplus`}
+              active={versionSection === 'gtfsplus'}>
               <ListGroupItem>
                 <Icon type='plus' /> GTFS+ for this version {this._renderGtfsPlusIssuesLabel(version)}
               </ListGroupItem>
@@ -237,8 +246,8 @@ class VersionSectionSelector extends Component<SelectorProps> {
             : null
           }
           <LinkContainer
-            to={`/feed/${version.feedSource.id}/version/${this.props.feedVersionIndex}/comments`}
-            active={this.props.versionSection === 'comments'}>
+            to={`${versionPath}/comments`}
+            active={versionSection === 'comments'}>
             <ListGroupItem>
               <Glyphicon glyph='comment' /> Version comments{' '}
               <BsLabel htmlFor>{version.noteCount}</BsLabel>

From 8c3fcac8b95f182caec89ddc49fb8045546f08d9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 6 Nov 2020 19:08:28 -0500
Subject: [PATCH 023/553] feat(FeedVersionSpanChart): Add chart to compare feed
 calendar spans.

---
 .../components/version/FeedVersionDetails.js  | 24 +++++-
 .../version/FeedVersionSpanChart.js           | 83 +++++++++++++++++++
 .../components/version/FeedVersionTabs.js     | 20 ++---
 3 files changed, 115 insertions(+), 12 deletions(-)
 create mode 100644 lib/manager/components/version/FeedVersionSpanChart.js

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index 4f8f24980..b437d4c0f 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -19,12 +19,16 @@ import {BLOCKING_ERROR_TYPES} from '../../util/version'
 import VersionDateLabel from './VersionDateLabel'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
+import FeedVersionSpanChart from './FeedVersionSpanChart'
 
 import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
 import type {ManagerUserState} from '../../../types/reducers'
 
 type Props = {
+  comparedVersion: ?FeedVersion,
+  comparedVersionIndex: ?number,
   feedSource: Feed,
+  feedVersionIndex: number,
   gtfsPlusValidation: GtfsPlusValidation,
   mergeVersions: typeof versionsActions.mergeVersions,
   publishFeedVersion: typeof versionsActions.publishFeedVersion,
@@ -84,7 +88,15 @@ export default class FeedVersionDetails extends Component<Props> {
   _onClickPublish = () => this.props.publishFeedVersion(this.props.version)
 
   render () {
-    const {feedSource, gtfsPlusValidation, user, version} = this.props
+    const {
+      comparedVersion,
+      comparedVersionIndex,
+      feedSource,
+      feedVersionIndex,
+      gtfsPlusValidation,
+      user,
+      version
+    } = this.props
     const {validationSummary: summary} = version
     // We must check the version ID against the feed source in props (not the
     // feed source nested underneath version) because this is the only place the
@@ -158,6 +170,16 @@ export default class FeedVersionDetails extends Component<Props> {
           </span>
           {' '}
           <VersionDateLabel version={version} />
+          
+          {comparedVersion && (
+          <FeedVersionSpanChart
+            activeVersion={version}
+            activeVersionIndex={feedVersionIndex}
+            comparedVersion={comparedVersion}
+            comparedVersionIndex={comparedVersionIndex}
+          />
+          )}
+
           {(hasBlockingIssue || hasGtfsPlusBlockingIssue) &&
             isExtensionEnabled('mtc') &&
             <div
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
new file mode 100644
index 000000000..d19ca8599
--- /dev/null
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -0,0 +1,83 @@
+// @flow
+
+import React, { Component } from 'react'
+import { Table } from 'react-bootstrap'
+import moment from 'moment'
+
+import type { FeedVersion } from '../../../types'
+
+type Props = {
+  activeVersion: FeedVersion,
+  activeVersionIndex: number,
+  comparedVersion: FeedVersion,
+  comparedVersionIndex: number
+}
+
+const FeedSpan = ({ relativeLength, relativeOffset, ...props }) => {
+  return (
+    <div {...props} style={{...props.style, height: '1em', position: 'relative'}}>
+      <div className='label-success' style={{height: '100%', left: `${relativeOffset * 100}%`, position: 'absolute', width: `${relativeLength * 100}%`}} />
+    </div>
+  )
+}
+
+export default class TripsChart extends Component<Props> {
+  _renderFeedSpan = () => {
+  }
+
+  render () {
+    const { activeVersion, comparedVersion, comparedVersionIndex } = this.props
+
+    const activeVersionStartDate = moment(activeVersion.validationSummary.startDate)
+    const activeVersionEndDate = moment(activeVersion.validationSummary.endDate)
+    const comparedVersionStartDate = moment(comparedVersion.validationSummary.startDate)
+    const comparedVersionEndDate = moment(comparedVersion.validationSummary.endDate)
+
+    const firstDate = moment.min(activeVersionStartDate, comparedVersionStartDate)
+    const lastDate = moment.max(activeVersionEndDate, comparedVersionEndDate)
+
+    const numDays = lastDate.diff(firstDate, 'days')
+    const activeVersionOffset = activeVersionStartDate.diff(firstDate, 'days')
+    const activeVersionLength = activeVersionEndDate.diff(activeVersionStartDate, 'days')
+    const comparedVersionOffset = comparedVersionStartDate.diff(firstDate, 'days')
+    const comparedVersionLength = comparedVersionEndDate.diff(comparedVersionStartDate, 'days')
+    /*
+    const data = dailyTripCounts
+      .slice(0, maxDaysToShow)
+      .map((count, index) => [firstDate.clone().add(index, 'days'), count])
+    const graphHeight = 30
+    const spacing = 8
+    const leftMargin = 50
+    const rightMargin = 50
+    const bottomMargin = 75
+    const svgWidth = leftMargin + rightMargin + (data.length * spacing)
+    const svgHeight = graphHeight + bottomMargin
+    const maxTrips = Math.max.apply(Math, data.map(d => d[1]))
+    const yAxisMax = getChartMax(maxTrips)
+    const rowHeight = 20
+
+    const yAxisLabels = [
+      `Version ${activeVersionIndex}`,
+      `Version ${comparedVersionIndex}`
+    ]
+*/
+    return (
+      <Table bordered condensed>
+        <tbody>
+          <tr>
+            <td>This version</td>
+            <td>{activeVersion.validationSummary.startDate}</td>
+            <td><FeedSpan relativeLength={activeVersionLength / numDays} relativeOffset={activeVersionOffset / numDays} style={{width: '200px'}} /></td>
+            <td>{activeVersion.validationSummary.endDate}</td>
+          </tr>
+          <tr>
+            <td>Version {comparedVersionIndex}</td>
+            <td>{comparedVersion.validationSummary.startDate}</td>
+            <td><FeedSpan relativeLength={comparedVersionLength / numDays} relativeOffset={comparedVersionOffset / numDays} style={{width: '200px'}} /></td>
+            <td>{comparedVersion.validationSummary.endDate}</td>
+          </tr>
+        </tbody>
+      </Table>
+    )
+  }
+}
diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 2475f619a..2e0e0be03 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -2,7 +2,7 @@
 
 import moment from 'moment'
 import React, {Component} from 'react'
-import {Row, Col, Tabs, Tab, ListGroupItem, Label} from 'react-bootstrap'
+import {Col, Label as BsLabel, ListGroupItem, Row, Tab, Tabs} from 'react-bootstrap'
 import numeral from 'numeral'
 
 import {getComponentMessages, isModuleEnabled} from '../../../common/util/config'
@@ -112,21 +112,19 @@ export default class FeedVersionTabs extends Component<Props> {
                 return (
                   <Col xs={2} className='text-center' key={c}>
                     <div
-                      title={`${summary[c]}` /* do we need this? */}
+                      title={`${summary[c]}`} // FIXME: do we need the title prop?
                       style={{marginBottom: '0px', fontSize: '200%'}}>
                       {numeral(summary[c]).format('0a')}
-                      {comparedVersion
-                        ? <sup style={{width: 0, display: 'inline-block'}}>
-                          <Label
-                            htmlFor
+                      {comparedVersion && (
+                        <sup style={{width: 0, display: 'inline-block'}}>
+                          <BsLabel
                             style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
                             bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'danger' : 'default')}
                             title={`Difference compared to Version ${comparedVersionIndex}`}>
-                            {diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a')) /* refactor */}
-                          </Label>
+                            {diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a')) /* TODO: refactor */}
+                          </BsLabel>
                         </sup>
-                        : null}
-
+                      )}
                     </div>
 
                     <p style={{marginBottom: '0px'}}>{this.messages(c)}</p>
@@ -137,7 +135,7 @@ export default class FeedVersionTabs extends Component<Props> {
                 <p
                   title={daysActive}
                   style={{marginBottom: '0px', fontSize: '200%'}}>
-                  {numeral(daysActive).format('0 a')}
+                  {numeral(daysActive).format('0a')}
                 </p>
                 <p style={{marginBottom: '0px'}}>{this.messages('daysActive')}</p>
               </Col>

From 12ce9da508884161236a0bc9740fad4c3732a13b Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 9 Nov 2020 10:43:15 -0500
Subject: [PATCH 024/553] refactor(FeedVersionSpanChart): Improve layout of
 spans.

---
 .../components/version/FeedVersionDetails.js  | 19 ++---
 .../version/FeedVersionSpanChart.js           | 81 ++++++++++++-------
 2 files changed, 61 insertions(+), 39 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index b437d4c0f..ce3858488 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -170,15 +170,6 @@ export default class FeedVersionDetails extends Component<Props> {
           </span>
           {' '}
           <VersionDateLabel version={version} />
-          
-          {comparedVersion && (
-          <FeedVersionSpanChart
-            activeVersion={version}
-            activeVersionIndex={feedVersionIndex}
-            comparedVersion={comparedVersion}
-            comparedVersionIndex={comparedVersionIndex}
-          />
-          )}
 
           {(hasBlockingIssue || hasGtfsPlusBlockingIssue) &&
             isExtensionEnabled('mtc') &&
@@ -201,6 +192,16 @@ export default class FeedVersionDetails extends Component<Props> {
             </div>
           }
         </h4>
+
+        {comparedVersion && comparedVersionIndex && (
+          <FeedVersionSpanChart
+            activeVersion={version}
+            activeVersionIndex={feedVersionIndex}
+            comparedVersion={comparedVersion}
+            comparedVersionIndex={comparedVersionIndex}
+          />
+        )}
+
         <p>
           {summary && summary.avgDailyRevenueTime
             ? <span>
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index d19ca8599..4bc3bd34c 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -13,14 +13,42 @@ type Props = {
   comparedVersionIndex: number
 }
 
-const FeedSpan = ({ relativeLength, relativeOffset, ...props }) => {
+const dateFormat = 'MMM. DD, YYYY'
+
+const FeedSpan = ({
+  endLabel,
+  relativeLength,
+  relativeOffset,
+  startLabel,
+  widthPixels,
+  ...props
+}) => {
   return (
-    <div {...props} style={{...props.style, height: '1em', position: 'relative'}}>
-      <div className='label-success' style={{height: '100%', left: `${relativeOffset * 100}%`, position: 'absolute', width: `${relativeLength * 100}%`}} />
+    <div {...props} style={{ position: 'relative', width: `${widthPixels}px` }}>
+      <div
+        style={{
+          left: `${relativeOffset * widthPixels / 3}px`,
+          position: 'absolute'
+        }}>
+        <span
+          style={{ display: 'inline-block', textAlign: 'right', width: '8em' }}>{startLabel}</span>
+        <span
+          className='label-default'
+          style={{
+            display: 'inline-block',
+            height: '1em',
+            margin: '0 5px',
+            width: `${relativeLength * widthPixels / 3}px`
+          }}
+        />
+        <span>{endLabel}</span>
+      </div>
     </div>
   )
 }
 
+const noTopPadding = {padding: '0 5px'}
+
 export default class TripsChart extends Component<Props> {
   _renderFeedSpan = () => {
   }
@@ -41,40 +69,33 @@ export default class TripsChart extends Component<Props> {
     const activeVersionLength = activeVersionEndDate.diff(activeVersionStartDate, 'days')
     const comparedVersionOffset = comparedVersionStartDate.diff(firstDate, 'days')
     const comparedVersionLength = comparedVersionEndDate.diff(comparedVersionStartDate, 'days')
-    /*
-    const data = dailyTripCounts
-      .slice(0, maxDaysToShow)
-      .map((count, index) => [firstDate.clone().add(index, 'days'), count])
-    const graphHeight = 30
-    const spacing = 8
-    const leftMargin = 50
-    const rightMargin = 50
-    const bottomMargin = 75
-    const svgWidth = leftMargin + rightMargin + (data.length * spacing)
-    const svgHeight = graphHeight + bottomMargin
-    const maxTrips = Math.max.apply(Math, data.map(d => d[1]))
-    const yAxisMax = getChartMax(maxTrips)
-    const rowHeight = 20
 
-    const yAxisLabels = [
-      `Version ${activeVersionIndex}`,
-      `Version ${comparedVersionIndex}`
-    ]
-*/
     return (
       <Table bordered condensed>
         <tbody>
           <tr>
-            <td>This version</td>
-            <td>{activeVersion.validationSummary.startDate}</td>
-            <td><FeedSpan relativeLength={activeVersionLength / numDays} relativeOffset={activeVersionOffset / numDays} style={{width: '200px'}} /></td>
-            <td>{activeVersion.validationSummary.endDate}</td>
+            <td style={noTopPadding}>This version</td>
+            <td style={noTopPadding}>
+              <FeedSpan
+                endLabel={activeVersionEndDate.format(dateFormat)}
+                relativeLength={activeVersionLength / numDays}
+                relativeOffset={activeVersionOffset / numDays}
+                startLabel={activeVersionStartDate.format(dateFormat)}
+                widthPixels={400}
+              />
+            </td>
           </tr>
           <tr>
-            <td>Version {comparedVersionIndex}</td>
-            <td>{comparedVersion.validationSummary.startDate}</td>
-            <td><FeedSpan relativeLength={comparedVersionLength / numDays} relativeOffset={comparedVersionOffset / numDays} style={{width: '200px'}} /></td>
-            <td>{comparedVersion.validationSummary.endDate}</td>
+            <td style={noTopPadding}>Version {comparedVersionIndex}</td>
+            <td style={noTopPadding}>
+              <FeedSpan
+                endLabel={comparedVersionEndDate.format(dateFormat)}
+                relativeLength={comparedVersionLength / numDays}
+                relativeOffset={comparedVersionOffset / numDays}
+                startLabel={comparedVersionStartDate.format(dateFormat)}
+                widthPixels={400}
+              />
+            </td>
           </tr>
         </tbody>
       </Table>

From 553e5aac64b94bf33ec690e0b1eee8ebfb33b335 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 9 Nov 2020 10:56:33 -0500
Subject: [PATCH 025/553] refactor: Fix flow type

---
 lib/manager/components/version/FeedVersionTabs.js   | 8 ++++----
 lib/manager/components/version/FeedVersionViewer.js | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 2e0e0be03..bc3b3e6e3 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -19,8 +19,8 @@ import type {Element} from 'react'
 import type {FeedVersion} from '../../../types'
 
 type Props = {
-  comparedVersion: FeedVersion,
-  comparedVersionIndex: number,
+  comparedVersion: ?FeedVersion,
+  comparedVersionIndex: ?number,
   feedVersionIndex: number,
   isochroneBand: any,
   onChangeIsochroneBand: number => void,
@@ -115,12 +115,12 @@ export default class FeedVersionTabs extends Component<Props> {
                       title={`${summary[c]}`} // FIXME: do we need the title prop?
                       style={{marginBottom: '0px', fontSize: '200%'}}>
                       {numeral(summary[c]).format('0a')}
-                      {comparedVersion && (
+                      {comparedVersion && comparedVersionIndex && (
                         <sup style={{width: 0, display: 'inline-block'}}>
                           <BsLabel
                             style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
                             bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'danger' : 'default')}
-                            title={`Difference compared to Version ${comparedVersionIndex}`}>
+                            title={`Difference compared to Version ${comparedVersionIndex || 'null'}`}>
                             {diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a')) /* TODO: refactor */}
                           </BsLabel>
                         </sup>
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index cd2e5a458..738ad4672 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -135,7 +135,8 @@ export default class FeedVersionViewer extends Component<Props> {
 }
 
 type SelectorProps = {
-  comparedVersion: FeedVersion,
+  comparedVersion: ?FeedVersion,
+  comparedVersionIndex: ?number,
   feedVersionIndex: number,
   gtfsPlusValidation: GtfsPlusValidation,
   version: FeedVersion,
@@ -169,7 +170,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : validationSummary.errorCount
 
     let diffLabel
-    if (comparedVersion) {
+    if (comparedVersion && comparedVersionIndex) {
       const diff = validationSummary.errorCount - comparedVersion.validationSummary.errorCount
       const diffColor = diff > 0 ? 'label-danger' : (diff < 0 ? 'label-success' : 'label-default')
       const diffText = diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))

From 288d002a984e370af24c1e571ef9a6aab2087527 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 9 Nov 2020 11:23:51 -0500
Subject: [PATCH 026/553] test(snapshots): Update snapshots

---
 .../__snapshots__/ActiveProjectViewer.js.snap | 1807 ++---------------
 .../__snapshots__/DeploymentsPanel.js.snap    | 1195 ++++-------
 .../__snapshots__/FeedSourceTable.js.snap     | 1215 +----------
 3 files changed, 702 insertions(+), 3515 deletions(-)

diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index d494bc823..15b389d07 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -196,11 +196,14 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
               keyboard={true}
               manager={
                 ModalManager {
+                  "add": [Function],
                   "containers": Array [],
                   "data": Array [],
                   "handleContainerOverflow": true,
                   "hideSiblingNodes": true,
+                  "isTopModal": [Function],
                   "modals": Array [],
+                  "remove": [Function],
                 }
               }
               onHide={[Function]}
@@ -212,23 +215,26 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                 autoFocus={true}
                 backdrop={true}
                 backdropClassName="modal-backdrop"
-                backdropTransitionTimeout={150}
+                backdropTransition={[Function]}
                 containerClassName="modal-open"
-                dialogTransitionTimeout={300}
                 enforceFocus={true}
                 keyboard={true}
                 manager={
                   ModalManager {
+                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
+                    "isTopModal": [Function],
                     "modals": Array [],
+                    "remove": [Function],
                   }
                 }
                 onEntering={[Function]}
                 onExited={[Function]}
                 onHide={[Function]}
+                onMouseUp={[Function]}
                 renderBackdrop={[Function]}
                 restoreFocus={true}
                 show={false}
@@ -247,11 +253,14 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
               keyboard={true}
               manager={
                 ModalManager {
+                  "add": [Function],
                   "containers": Array [],
                   "data": Array [],
                   "handleContainerOverflow": true,
                   "hideSiblingNodes": true,
+                  "isTopModal": [Function],
                   "modals": Array [],
+                  "remove": [Function],
                 }
               }
               onHide={[Function]}
@@ -263,23 +272,26 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                 autoFocus={true}
                 backdrop={true}
                 backdropClassName="modal-backdrop"
-                backdropTransitionTimeout={150}
+                backdropTransition={[Function]}
                 containerClassName="modal-open"
-                dialogTransitionTimeout={300}
                 enforceFocus={true}
                 keyboard={true}
                 manager={
                   ModalManager {
+                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
+                    "isTopModal": [Function],
                     "modals": Array [],
+                    "remove": [Function],
                   }
                 }
                 onEntering={[Function]}
                 onExited={[Function]}
                 onHide={[Function]}
+                onMouseUp={[Function]}
                 renderBackdrop={[Function]}
                 restoreFocus={true}
                 show={false}
@@ -298,11 +310,14 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
               keyboard={true}
               manager={
                 ModalManager {
+                  "add": [Function],
                   "containers": Array [],
                   "data": Array [],
                   "handleContainerOverflow": true,
                   "hideSiblingNodes": true,
+                  "isTopModal": [Function],
                   "modals": Array [],
+                  "remove": [Function],
                 }
               }
               onHide={[Function]}
@@ -314,23 +329,26 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                 autoFocus={true}
                 backdrop={true}
                 backdropClassName="modal-backdrop"
-                backdropTransitionTimeout={150}
+                backdropTransition={[Function]}
                 containerClassName="modal-open"
-                dialogTransitionTimeout={300}
                 enforceFocus={true}
                 keyboard={true}
                 manager={
                   ModalManager {
+                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
+                    "isTopModal": [Function],
                     "modals": Array [],
+                    "remove": [Function],
                   }
                 }
                 onEntering={[Function]}
                 onExited={[Function]}
                 onHide={[Function]}
+                onMouseUp={[Function]}
                 renderBackdrop={[Function]}
                 restoreFocus={true}
                 show={false}
@@ -353,11 +371,14 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                 keyboard={true}
                 manager={
                   ModalManager {
+                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
+                    "isTopModal": [Function],
                     "modals": Array [],
+                    "remove": [Function],
                   }
                 }
                 onHide={[Function]}
@@ -369,23 +390,26 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                   autoFocus={true}
                   backdrop={true}
                   backdropClassName="modal-backdrop"
-                  backdropTransitionTimeout={150}
+                  backdropTransition={[Function]}
                   containerClassName="modal-open"
-                  dialogTransitionTimeout={300}
                   enforceFocus={true}
                   keyboard={true}
                   manager={
                     ModalManager {
+                      "add": [Function],
                       "containers": Array [],
                       "data": Array [],
                       "handleContainerOverflow": true,
                       "hideSiblingNodes": true,
+                      "isTopModal": [Function],
                       "modals": Array [],
+                      "remove": [Function],
                     }
                   }
                   onEntering={[Function]}
                   onExited={[Function]}
                   onHide={[Function]}
+                  onMouseUp={[Function]}
                   renderBackdrop={[Function]}
                   restoreFocus={true}
                   show={false}
@@ -1860,18 +1884,18 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                       eventKey="sources"
                                     >
                                       <Fade
+                                        appear={false}
                                         in={true}
                                         mountOnEnter={true}
                                         onEnter={[Function]}
                                         onExited={[Function]}
                                         timeout={300}
-                                        transitionAppear={false}
                                         unmountOnExit={false}
                                       >
                                         <Transition
-                                          className="fade"
-                                          enteredClassName="in"
-                                          enteringClassName="in"
+                                          appear={false}
+                                          enter={true}
+                                          exit={true}
                                           in={true}
                                           mountOnEnter={true}
                                           onEnter={[Function]}
@@ -1881,13 +1905,12 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                           onExited={[Function]}
                                           onExiting={[Function]}
                                           timeout={300}
-                                          transitionAppear={false}
                                           unmountOnExit={false}
                                         >
                                           <div
                                             aria-hidden={false}
                                             aria-labelledby="project-viewer-tabs-tab-sources"
-                                            className="tab-pane active fade in"
+                                            className="fade tab-pane active in"
                                             id="project-viewer-tabs-pane-sources"
                                             role="tabpanel"
                                           >
@@ -2059,10 +2082,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           }
                                                         }
                                                       >
-                                                        <Panel
-                                                          bsClass="panel"
-                                                          bsStyle="default"
-                                                          defaultExpanded={false}
+                                                        <Uncontrolled(Panel)
                                                           header={
                                                             <Connect(ProjectFeedListToolbar)
                                                               onNewFeedSourceClick={[Function]}
@@ -2103,14 +2123,11 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                             />
                                                           }
                                                         >
-                                                          <div
-                                                            className="panel panel-default"
-                                                          >
-                                                            <div
-                                                              className="panel-heading"
-                                                            >
+                                                          <Panel
+                                                            bsClass="panel"
+                                                            bsStyle="default"
+                                                            header={
                                                               <Connect(ProjectFeedListToolbar)
-                                                                className="panel-title"
                                                                 onNewFeedSourceClick={[Function]}
                                                                 project={
                                                                   Object {
@@ -2146,35 +2163,15 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                     "user": null,
                                                                   }
                                                                 }
-                                                              >
-                                                                <ProjectFeedListToolbar
-                                                                  calculateFeedSourceTableComparisonColumn={[Function]}
-                                                                  className="panel-title"
-                                                                  downloadFeedForProject={[Function]}
-                                                                  fetchFeedsForProject={[Function]}
-                                                                  filter={
-                                                                    Object {
-                                                                      "feedSourceTableComparisonColumn": null,
-                                                                      "feedSourceTableFilterCountStrategy": "LATEST",
-                                                                      "filter": null,
-                                                                      "searchText": null,
-                                                                    }
-                                                                  }
-                                                                  filterCounts={
-                                                                    Object {
-                                                                      "active": 0,
-                                                                      "all": 0,
-                                                                      "expired": 0,
-                                                                      "expiring": 0,
-                                                                      "future": 0,
-                                                                    }
-                                                                  }
+                                                              />
+                                                            }
+                                                            onToggle={[Function]}
+                                                          >
+                                                            <div
+                                                              className="panel panel-default"
+                                                              header={
+                                                                <Connect(ProjectFeedListToolbar)
                                                                   onNewFeedSourceClick={[Function]}
-                                                                  possibleComparisons={
-                                                                    Array [
-                                                                      "LATEST",
-                                                                    ]
-                                                                  }
                                                                   project={
                                                                     Object {
                                                                       "autoFetchFeeds": true,
@@ -2209,1501 +2206,60 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                       "user": null,
                                                                     }
                                                                   }
-                                                                  projectEditDisabled={false}
-                                                                  setFeedSort={[Function]}
-                                                                  setFeedSourceTableFilterCountStrategy={[Function]}
-                                                                  setVisibilityFilter={[Function]}
-                                                                  setVisibilitySearchText={[Function]}
-                                                                  sort="alphabetically-asc"
-                                                                  thirdPartySync={[Function]}
-                                                                  user={
-                                                                    Object {
-                                                                      "isCheckingLogin": false,
-                                                                      "permissions": UserPermissions {
-                                                                        "appPermissionLookup": Object {
-                                                                          "administer-application": Object {
-                                                                            "type": "administer-application",
-                                                                          },
-                                                                        },
-                                                                        "orgPermissionLookup": Object {},
-                                                                        "organizationLookup": Object {},
-                                                                        "projectLookup": Object {},
-                                                                      },
-                                                                      "profile": Object {
-                                                                        "app_metadata": Object {
-                                                                          "datatools": Array [
-                                                                            Object {
-                                                                              "client_id": "mock-client-id",
-                                                                              "organizations": Array [],
-                                                                              "permissions": Array [
-                                                                                Object {
-                                                                                  "type": "administer-application",
-                                                                                },
-                                                                              ],
-                                                                              "projects": Array [],
-                                                                              "subscriptions": Array [],
-                                                                            },
-                                                                          ],
-                                                                        },
-                                                                        "clientID": "mock-client-id",
-                                                                        "created_at": "2016-03-04T18:59:22.569Z",
-                                                                        "email": "mock-user@conveyal.com",
-                                                                        "email_verified": true,
-                                                                        "identities": Array [
-                                                                          Object {
-                                                                            "connection": "Username-Password-Authentication",
-                                                                            "isSocial": false,
-                                                                            "provider": "auth0",
-                                                                            "user_id": "12345",
-                                                                          },
-                                                                        ],
-                                                                        "jti": "gibberish",
-                                                                        "last_password_reset": "2017-07-13T13:58:01.021Z",
-                                                                        "name": "mock-user@conveyal.com",
-                                                                        "nickname": "mock-user",
-                                                                        "persistent": Object {},
-                                                                        "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
-                                                                        "sub": "auth0|12345",
-                                                                        "updated_at": "2019-03-21T19:05:30.180Z",
-                                                                        "user_id": "auth0|12345",
-                                                                        "user_metadata": Object {
-                                                                          "datatools": Array [
-                                                                            Object {
-                                                                              "client_id": "mock-client-id",
-                                                                              "editor": Object {
-                                                                                "map_id": "mapbox.streets",
-                                                                              },
-                                                                              "hideTutorial": true,
-                                                                              "sidebarExpanded": false,
-                                                                            },
-                                                                          ],
-                                                                          "lang": "en",
-                                                                        },
-                                                                      },
-                                                                      "recentActivity": null,
-                                                                      "redirectOnSuccess": null,
-                                                                      "subscriptions": UserSubscriptions {
-                                                                        "subscriptionLookup": Object {},
-                                                                      },
-                                                                      "token": "mock-token",
-                                                                    }
-                                                                  }
-                                                                >
-                                                                  <Row
-                                                                    bsClass="row"
-                                                                    componentClass="div"
-                                                                  >
-                                                                    <div
-                                                                      className="row"
-                                                                    >
-                                                                      <Col
-                                                                        bsClass="col"
-                                                                        componentClass="div"
-                                                                        style={
-                                                                          Object {
-                                                                            "marginTop": 25,
-                                                                          }
-                                                                        }
-                                                                        xs={4}
-                                                                      >
-                                                                        <div
-                                                                          className="col-xs-4"
-                                                                          style={
-                                                                            Object {
-                                                                              "marginTop": 25,
-                                                                            }
-                                                                          }
-                                                                        >
-                                                                          <Form
-                                                                            bsClass="form"
-                                                                            componentClass="form"
-                                                                            horizontal={false}
-                                                                            inline={true}
-                                                                            style={
-                                                                              Object {
-                                                                                "display": "inline",
-                                                                              }
-                                                                            }
-                                                                          >
-                                                                            <form
-                                                                              className="form-inline"
-                                                                              style={
-                                                                                Object {
-                                                                                  "display": "inline",
-                                                                                }
-                                                                              }
-                                                                            >
-                                                                              <FormGroup
-                                                                                bsClass="form-group"
-                                                                                className="feed-source-toolbar-formgroup"
-                                                                                controlId="formControlsSelect"
-                                                                              >
-                                                                                <div
-                                                                                  className="feed-source-toolbar-formgroup form-group"
-                                                                                >
-                                                                                  <FormControl
-                                                                                    bsClass="form-control"
-                                                                                    componentClass="input"
-                                                                                    onChange={[Function]}
-                                                                                    placeholder="Search by name"
-                                                                                  >
-                                                                                    <input
-                                                                                      className="form-control"
-                                                                                      id="formControlsSelect"
-                                                                                      onChange={[Function]}
-                                                                                      placeholder="Search by name"
-                                                                                    />
-                                                                                  </FormControl>
-                                                                                </div>
-                                                                              </FormGroup>
-                                                                            </form>
-                                                                          </Form>
-                                                                          <DropdownButton
-                                                                            id="project-feedsource-table-sort-button"
-                                                                            style={
-                                                                              Object {
-                                                                                "marginLeft": 20,
-                                                                              }
-                                                                            }
-                                                                            title="Sort By"
-                                                                          >
-                                                                            <Uncontrolled(Dropdown)
-                                                                              id="project-feedsource-table-sort-button"
-                                                                            >
-                                                                              <Dropdown
-                                                                                bsClass="dropdown"
-                                                                                componentClass={[Function]}
-                                                                                id="project-feedsource-table-sort-button"
-                                                                                onToggle={[Function]}
-                                                                              >
-                                                                                <ButtonGroup
-                                                                                  block={false}
-                                                                                  bsClass="btn-group"
-                                                                                  className="dropdown"
-                                                                                  justified={false}
-                                                                                  vertical={false}
-                                                                                >
-                                                                                  <div
-                                                                                    className="dropdown btn-group"
-                                                                                  >
-                                                                                    <DropdownToggle
-                                                                                      bsClass="dropdown-toggle"
-                                                                                      bsRole="toggle"
-                                                                                      id="project-feedsource-table-sort-button"
-                                                                                      key=".0"
-                                                                                      onClick={[Function]}
-                                                                                      onKeyDown={[Function]}
-                                                                                      open={false}
-                                                                                      style={
-                                                                                        Object {
-                                                                                          "marginLeft": 20,
-                                                                                        }
-                                                                                      }
-                                                                                      useAnchor={false}
-                                                                                    >
-                                                                                      <Button
-                                                                                        active={false}
-                                                                                        aria-expanded={false}
-                                                                                        aria-haspopup={true}
-                                                                                        block={false}
-                                                                                        bsClass="btn"
-                                                                                        bsStyle="default"
-                                                                                        className="dropdown-toggle"
-                                                                                        disabled={false}
-                                                                                        id="project-feedsource-table-sort-button"
-                                                                                        onClick={[Function]}
-                                                                                        onKeyDown={[Function]}
-                                                                                        role="button"
-                                                                                        style={
-                                                                                          Object {
-                                                                                            "marginLeft": 20,
-                                                                                          }
-                                                                                        }
-                                                                                      >
-                                                                                        <button
-                                                                                          aria-expanded={false}
-                                                                                          aria-haspopup={true}
-                                                                                          className="dropdown-toggle btn btn-default"
-                                                                                          disabled={false}
-                                                                                          id="project-feedsource-table-sort-button"
-                                                                                          onClick={[Function]}
-                                                                                          onKeyDown={[Function]}
-                                                                                          role="button"
-                                                                                          style={
-                                                                                            Object {
-                                                                                              "marginLeft": 20,
-                                                                                            }
-                                                                                          }
-                                                                                          type="button"
-                                                                                        >
-                                                                                          Sort By
-                                                                                           
-                                                                                          <span
-                                                                                            className="caret"
-                                                                                          />
-                                                                                        </button>
-                                                                                      </Button>
-                                                                                    </DropdownToggle>
-                                                                                    <DropdownMenu
-                                                                                      bsClass="dropdown-menu"
-                                                                                      bsRole="menu"
-                                                                                      key=".1"
-                                                                                      labelledBy="project-feedsource-table-sort-button"
-                                                                                      onClose={[Function]}
-                                                                                      onSelect={[Function]}
-                                                                                      pullRight={false}
-                                                                                    >
-                                                                                      <RootCloseWrapper
-                                                                                        disabled={true}
-                                                                                        event="click"
-                                                                                        onRootClose={[Function]}
-                                                                                      >
-                                                                                        <ul
-                                                                                          aria-labelledby="project-feedsource-table-sort-button"
-                                                                                          className="dropdown-menu"
-                                                                                          role="menu"
-                                                                                        >
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={true}
-                                                                                            key=".$sort-header-note"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="dropdown-header"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="heading"
-                                                                                            >
-                                                                                              Note: sorting only available on latest version data
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={true}
-                                                                                            key=".$feed-sort-alphabetically-header"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="dropdown-header"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="heading"
-                                                                                            >
-                                                                                              Alphabetically
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-alphabetically-asc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  A-Z
-                                                                                                  <Icon
-                                                                                                    style={
-                                                                                                      Object {
-                                                                                                        "marginLeft": 6,
-                                                                                                      }
-                                                                                                    }
-                                                                                                    type="check"
-                                                                                                  >
-                                                                                                    <i
-                                                                                                      className="fa fa-check fa-fw "
-                                                                                                      style={
-                                                                                                        Object {
-                                                                                                          "marginLeft": 6,
-                                                                                                        }
-                                                                                                      }
-                                                                                                    />
-                                                                                                  </Icon>
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-alphabetically-desc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  Z-A
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={true}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-alphabetically-divider"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="divider"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="separator"
-                                                                                            />
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={true}
-                                                                                            key=".$feed-sort-endDate-header"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="dropdown-header"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="heading"
-                                                                                            >
-                                                                                              Expiration Date
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-endDate-asc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  Earliest-Latest
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-endDate-desc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  Latest-Earliest
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={true}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-endDate-divider"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="divider"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="separator"
-                                                                                            />
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={true}
-                                                                                            key=".$feed-sort-startDate-header"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="dropdown-header"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="heading"
-                                                                                            >
-                                                                                              Start Date
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-startDate-asc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  Earliest-Latest
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-startDate-desc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  Latest-Earliest
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={true}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-startDate-divider"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="divider"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="separator"
-                                                                                            />
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={true}
-                                                                                            key=".$feed-sort-lastUpdated-header"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="dropdown-header"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="heading"
-                                                                                            >
-                                                                                              Last Update
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-lastUpdated-asc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  Stale-Recent
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-lastUpdated-desc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  Recent-Stale
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={true}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-lastUpdated-divider"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="divider"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="separator"
-                                                                                            />
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={true}
-                                                                                            key=".$feed-sort-numErrors-header"
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className="dropdown-header"
-                                                                                              onKeyDown={[Function]}
-                                                                                              role="heading"
-                                                                                            >
-                                                                                              Number of Issues
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-numErrors-asc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  Least-Most
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$feed-sort-numErrors-desc"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  Most-Least
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                        </ul>
-                                                                                      </RootCloseWrapper>
-                                                                                    </DropdownMenu>
-                                                                                  </div>
-                                                                                </ButtonGroup>
-                                                                              </Dropdown>
-                                                                            </Uncontrolled(Dropdown)>
-                                                                          </DropdownButton>
-                                                                        </div>
-                                                                      </Col>
-                                                                      <Col
-                                                                        bsClass="col"
-                                                                        componentClass="div"
-                                                                        xs={6}
-                                                                      >
-                                                                        <div
-                                                                          className="col-xs-6"
-                                                                        >
-                                                                          <FormGroup
-                                                                            bsClass="form-group"
-                                                                            id="feedFilterToolbarControl"
-                                                                          >
-                                                                            <div
-                                                                              className="form-group"
-                                                                              id="feedFilterToolbarControl"
-                                                                            >
-                                                                              <ControlLabel
-                                                                                bsClass="control-label"
-                                                                                srOnly={false}
-                                                                                style={
-                                                                                  Object {
-                                                                                    "display": "block",
-                                                                                  }
-                                                                                }
-                                                                              >
-                                                                                <label
-                                                                                  className="control-label"
-                                                                                  style={
-                                                                                    Object {
-                                                                                      "display": "block",
-                                                                                    }
-                                                                                  }
-                                                                                >
-                                                                                  Filter feed sources on
-                                                                                  <span
-                                                                                    style={
-                                                                                      Object {
-                                                                                        "marginLeft": 5,
-                                                                                        "marginRight": 5,
-                                                                                      }
-                                                                                    }
-                                                                                  >
-                                                                                    Latest
-                                                                                  </span>
-                                                                                  version
-                                                                                </label>
-                                                                              </ControlLabel>
-                                                                              <ButtonGroup
-                                                                                block={false}
-                                                                                bsClass="btn-group"
-                                                                                justified={false}
-                                                                                vertical={false}
-                                                                              >
-                                                                                <div
-                                                                                  className="btn-group"
-                                                                                >
-                                                                                  <OptionButton
-                                                                                    active={true}
-                                                                                    className="active"
-                                                                                    key="all"
-                                                                                    onClick={[Function]}
-                                                                                    value="all"
-                                                                                  >
-                                                                                    <Button
-                                                                                      active={true}
-                                                                                      block={false}
-                                                                                      bsClass="btn"
-                                                                                      bsStyle="default"
-                                                                                      className="active"
-                                                                                      disabled={false}
-                                                                                      href="#"
-                                                                                      onClick={[Function]}
-                                                                                      value="all"
-                                                                                    >
-                                                                                      <SafeAnchor
-                                                                                        className="active btn btn-default active"
-                                                                                        componentClass="a"
-                                                                                        disabled={false}
-                                                                                        href="#"
-                                                                                        onClick={[Function]}
-                                                                                        value="all"
-                                                                                      >
-                                                                                        <a
-                                                                                          className="active btn btn-default active"
-                                                                                          href="#"
-                                                                                          onClick={[Function]}
-                                                                                          role="button"
-                                                                                          value="all"
-                                                                                        >
-                                                                                          All
-                                                                                           
-                                                                                          <Badge
-                                                                                            bsClass="badge"
-                                                                                            pullRight={false}
-                                                                                            style={
-                                                                                              Object {
-                                                                                                "backgroundColor": "#babec0",
-                                                                                              }
-                                                                                            }
-                                                                                          >
-                                                                                            <span
-                                                                                              className="badge"
-                                                                                              style={
-                                                                                                Object {
-                                                                                                  "backgroundColor": "#babec0",
-                                                                                                }
-                                                                                              }
-                                                                                            >
-                                                                                              0
-                                                                                            </span>
-                                                                                          </Badge>
-                                                                                        </a>
-                                                                                      </SafeAnchor>
-                                                                                    </Button>
-                                                                                  </OptionButton>
-                                                                                  <OptionButton
-                                                                                    active={false}
-                                                                                    className=""
-                                                                                    key="active"
-                                                                                    onClick={[Function]}
-                                                                                    value="active"
-                                                                                  >
-                                                                                    <Button
-                                                                                      active={false}
-                                                                                      block={false}
-                                                                                      bsClass="btn"
-                                                                                      bsStyle="default"
-                                                                                      className=""
-                                                                                      disabled={false}
-                                                                                      href="#"
-                                                                                      onClick={[Function]}
-                                                                                      value="active"
-                                                                                    >
-                                                                                      <SafeAnchor
-                                                                                        className="btn btn-default"
-                                                                                        componentClass="a"
-                                                                                        disabled={false}
-                                                                                        href="#"
-                                                                                        onClick={[Function]}
-                                                                                        value="active"
-                                                                                      >
-                                                                                        <a
-                                                                                          className="btn btn-default"
-                                                                                          href="#"
-                                                                                          onClick={[Function]}
-                                                                                          role="button"
-                                                                                          value="active"
-                                                                                        >
-                                                                                          Active
-                                                                                           
-                                                                                          <Badge
-                                                                                            bsClass="badge"
-                                                                                            pullRight={false}
-                                                                                            style={
-                                                                                              Object {
-                                                                                                "backgroundColor": "#babec0",
-                                                                                              }
-                                                                                            }
-                                                                                          >
-                                                                                            <span
-                                                                                              className="badge"
-                                                                                              style={
-                                                                                                Object {
-                                                                                                  "backgroundColor": "#babec0",
-                                                                                                }
-                                                                                              }
-                                                                                            >
-                                                                                              0
-                                                                                            </span>
-                                                                                          </Badge>
-                                                                                        </a>
-                                                                                      </SafeAnchor>
-                                                                                    </Button>
-                                                                                  </OptionButton>
-                                                                                  <OptionButton
-                                                                                    active={false}
-                                                                                    className=""
-                                                                                    key="expiring"
-                                                                                    onClick={[Function]}
-                                                                                    value="expiring"
-                                                                                  >
-                                                                                    <Button
-                                                                                      active={false}
-                                                                                      block={false}
-                                                                                      bsClass="btn"
-                                                                                      bsStyle="default"
-                                                                                      className=""
-                                                                                      disabled={false}
-                                                                                      href="#"
-                                                                                      onClick={[Function]}
-                                                                                      value="expiring"
-                                                                                    >
-                                                                                      <SafeAnchor
-                                                                                        className="btn btn-default"
-                                                                                        componentClass="a"
-                                                                                        disabled={false}
-                                                                                        href="#"
-                                                                                        onClick={[Function]}
-                                                                                        value="expiring"
-                                                                                      >
-                                                                                        <a
-                                                                                          className="btn btn-default"
-                                                                                          href="#"
-                                                                                          onClick={[Function]}
-                                                                                          role="button"
-                                                                                          value="expiring"
-                                                                                        >
-                                                                                          Expiring
-                                                                                           
-                                                                                          <Badge
-                                                                                            bsClass="badge"
-                                                                                            pullRight={false}
-                                                                                            style={
-                                                                                              Object {
-                                                                                                "backgroundColor": "#babec0",
-                                                                                              }
-                                                                                            }
-                                                                                          >
-                                                                                            <span
-                                                                                              className="badge"
-                                                                                              style={
-                                                                                                Object {
-                                                                                                  "backgroundColor": "#babec0",
-                                                                                                }
-                                                                                              }
-                                                                                            >
-                                                                                              0
-                                                                                            </span>
-                                                                                          </Badge>
-                                                                                        </a>
-                                                                                      </SafeAnchor>
-                                                                                    </Button>
-                                                                                  </OptionButton>
-                                                                                  <OptionButton
-                                                                                    active={false}
-                                                                                    className=""
-                                                                                    key="expired"
-                                                                                    onClick={[Function]}
-                                                                                    value="expired"
-                                                                                  >
-                                                                                    <Button
-                                                                                      active={false}
-                                                                                      block={false}
-                                                                                      bsClass="btn"
-                                                                                      bsStyle="default"
-                                                                                      className=""
-                                                                                      disabled={false}
-                                                                                      href="#"
-                                                                                      onClick={[Function]}
-                                                                                      value="expired"
-                                                                                    >
-                                                                                      <SafeAnchor
-                                                                                        className="btn btn-default"
-                                                                                        componentClass="a"
-                                                                                        disabled={false}
-                                                                                        href="#"
-                                                                                        onClick={[Function]}
-                                                                                        value="expired"
-                                                                                      >
-                                                                                        <a
-                                                                                          className="btn btn-default"
-                                                                                          href="#"
-                                                                                          onClick={[Function]}
-                                                                                          role="button"
-                                                                                          value="expired"
-                                                                                        >
-                                                                                          Expired
-                                                                                           
-                                                                                          <Badge
-                                                                                            bsClass="badge"
-                                                                                            pullRight={false}
-                                                                                            style={
-                                                                                              Object {
-                                                                                                "backgroundColor": "#babec0",
-                                                                                              }
-                                                                                            }
-                                                                                          >
-                                                                                            <span
-                                                                                              className="badge"
-                                                                                              style={
-                                                                                                Object {
-                                                                                                  "backgroundColor": "#babec0",
-                                                                                                }
-                                                                                              }
-                                                                                            >
-                                                                                              0
-                                                                                            </span>
-                                                                                          </Badge>
-                                                                                        </a>
-                                                                                      </SafeAnchor>
-                                                                                    </Button>
-                                                                                  </OptionButton>
-                                                                                  <OptionButton
-                                                                                    active={false}
-                                                                                    className=""
-                                                                                    key="future"
-                                                                                    onClick={[Function]}
-                                                                                    value="future"
-                                                                                  >
-                                                                                    <Button
-                                                                                      active={false}
-                                                                                      block={false}
-                                                                                      bsClass="btn"
-                                                                                      bsStyle="default"
-                                                                                      className=""
-                                                                                      disabled={false}
-                                                                                      href="#"
-                                                                                      onClick={[Function]}
-                                                                                      value="future"
-                                                                                    >
-                                                                                      <SafeAnchor
-                                                                                        className="btn btn-default"
-                                                                                        componentClass="a"
-                                                                                        disabled={false}
-                                                                                        href="#"
-                                                                                        onClick={[Function]}
-                                                                                        value="future"
-                                                                                      >
-                                                                                        <a
-                                                                                          className="btn btn-default"
-                                                                                          href="#"
-                                                                                          onClick={[Function]}
-                                                                                          role="button"
-                                                                                          value="future"
-                                                                                        >
-                                                                                          Future
-                                                                                           
-                                                                                          <Badge
-                                                                                            bsClass="badge"
-                                                                                            pullRight={false}
-                                                                                            style={
-                                                                                              Object {
-                                                                                                "backgroundColor": "#babec0",
-                                                                                              }
-                                                                                            }
-                                                                                          >
-                                                                                            <span
-                                                                                              className="badge"
-                                                                                              style={
-                                                                                                Object {
-                                                                                                  "backgroundColor": "#babec0",
-                                                                                                }
-                                                                                              }
-                                                                                            >
-                                                                                              0
-                                                                                            </span>
-                                                                                          </Badge>
-                                                                                        </a>
-                                                                                      </SafeAnchor>
-                                                                                    </Button>
-                                                                                  </OptionButton>
-                                                                                </div>
-                                                                              </ButtonGroup>
-                                                                            </div>
-                                                                          </FormGroup>
-                                                                        </div>
-                                                                      </Col>
-                                                                      <Col
-                                                                        bsClass="col"
-                                                                        componentClass="div"
-                                                                        style={
-                                                                          Object {
-                                                                            "marginTop": 25,
-                                                                          }
-                                                                        }
-                                                                        xs={2}
-                                                                      >
-                                                                        <div
-                                                                          className="col-xs-2"
-                                                                          style={
-                                                                            Object {
-                                                                              "marginTop": 25,
-                                                                            }
-                                                                          }
-                                                                        >
-                                                                          <DropdownButton
-                                                                            bsStyle="primary"
-                                                                            data-test-id="project-header-action-dropdown-button"
-                                                                            id="project-header-actions"
-                                                                            style={
-                                                                              Object {
-                                                                                "marginLeft": 20,
-                                                                              }
-                                                                            }
-                                                                            title="Actions"
-                                                                          >
-                                                                            <Uncontrolled(Dropdown)
-                                                                              bsStyle="primary"
-                                                                              id="project-header-actions"
-                                                                            >
-                                                                              <Dropdown
-                                                                                bsClass="dropdown"
-                                                                                bsStyle="primary"
-                                                                                componentClass={[Function]}
-                                                                                id="project-header-actions"
-                                                                                onToggle={[Function]}
-                                                                              >
-                                                                                <ButtonGroup
-                                                                                  block={false}
-                                                                                  bsClass="btn-group"
-                                                                                  bsStyle="primary"
-                                                                                  className="dropdown"
-                                                                                  justified={false}
-                                                                                  vertical={false}
-                                                                                >
-                                                                                  <div
-                                                                                    className="dropdown btn-group btn-group-primary"
-                                                                                  >
-                                                                                    <DropdownToggle
-                                                                                      bsClass="dropdown-toggle"
-                                                                                      bsRole="toggle"
-                                                                                      bsStyle="primary"
-                                                                                      data-test-id="project-header-action-dropdown-button"
-                                                                                      id="project-header-actions"
-                                                                                      key=".0"
-                                                                                      onClick={[Function]}
-                                                                                      onKeyDown={[Function]}
-                                                                                      open={false}
-                                                                                      style={
-                                                                                        Object {
-                                                                                          "marginLeft": 20,
-                                                                                        }
-                                                                                      }
-                                                                                      useAnchor={false}
-                                                                                    >
-                                                                                      <Button
-                                                                                        active={false}
-                                                                                        aria-expanded={false}
-                                                                                        aria-haspopup={true}
-                                                                                        block={false}
-                                                                                        bsClass="btn"
-                                                                                        bsStyle="primary"
-                                                                                        className="dropdown-toggle"
-                                                                                        data-test-id="project-header-action-dropdown-button"
-                                                                                        disabled={false}
-                                                                                        id="project-header-actions"
-                                                                                        onClick={[Function]}
-                                                                                        onKeyDown={[Function]}
-                                                                                        role="button"
-                                                                                        style={
-                                                                                          Object {
-                                                                                            "marginLeft": 20,
-                                                                                          }
-                                                                                        }
-                                                                                      >
-                                                                                        <button
-                                                                                          aria-expanded={false}
-                                                                                          aria-haspopup={true}
-                                                                                          className="dropdown-toggle btn btn-primary"
-                                                                                          data-test-id="project-header-action-dropdown-button"
-                                                                                          disabled={false}
-                                                                                          id="project-header-actions"
-                                                                                          onClick={[Function]}
-                                                                                          onKeyDown={[Function]}
-                                                                                          role="button"
-                                                                                          style={
-                                                                                            Object {
-                                                                                              "marginLeft": 20,
-                                                                                            }
-                                                                                          }
-                                                                                          type="button"
-                                                                                        >
-                                                                                          Actions
-                                                                                           
-                                                                                          <span
-                                                                                            className="caret"
-                                                                                          />
-                                                                                        </button>
-                                                                                      </Button>
-                                                                                    </DropdownToggle>
-                                                                                    <DropdownMenu
-                                                                                      bsClass="dropdown-menu"
-                                                                                      bsRole="menu"
-                                                                                      key=".1"
-                                                                                      labelledBy="project-header-actions"
-                                                                                      onClose={[Function]}
-                                                                                      onSelect={[Function]}
-                                                                                      pullRight={false}
-                                                                                    >
-                                                                                      <RootCloseWrapper
-                                                                                        disabled={true}
-                                                                                        event="click"
-                                                                                        onRootClose={[Function]}
-                                                                                      >
-                                                                                        <ul
-                                                                                          aria-labelledby="project-header-actions"
-                                                                                          className="dropdown-menu"
-                                                                                          role="menu"
-                                                                                        >
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            data-test-id="project-header-create-new-feed-source-button"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$create-feedsource-button"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                data-test-id="project-header-create-new-feed-source-button"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  data-test-id="project-header-create-new-feed-source-button"
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  <Glyphicon
-                                                                                                    bsClass="glyphicon"
-                                                                                                    glyph="plus"
-                                                                                                  >
-                                                                                                    <span
-                                                                                                      className="glyphicon glyphicon-plus"
-                                                                                                    />
-                                                                                                  </Glyphicon>
-                                                                                                   
-                                                                                                  New
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$update-feeds-button"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  <Icon
-                                                                                                    type="cloud-download"
-                                                                                                  >
-                                                                                                    <i
-                                                                                                      className="fa fa-cloud-download fa-fw "
-                                                                                                    />
-                                                                                                  </Icon>
-                                                                                                   
-                                                                                                  Fetch all
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$merge-feeds-button"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  <Glyphicon
-                                                                                                    bsClass="glyphicon"
-                                                                                                    glyph="download"
-                                                                                                  >
-                                                                                                    <span
-                                                                                                      className="glyphicon glyphicon-download"
-                                                                                                    />
-                                                                                                  </Glyphicon>
-                                                                                                   
-                                                                                                  Merge all
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                          <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
-                                                                                            key=".$csv-download-button"
-                                                                                            onClick={[Function]}
-                                                                                            onKeyDown={[Function]}
-                                                                                            onSelect={[Function]}
-                                                                                          >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
-                                                                                            >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
-                                                                                              >
-                                                                                                <a
-                                                                                                  href="#"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="menuitem"
-                                                                                                  tabIndex="-1"
-                                                                                                >
-                                                                                                  <Icon
-                                                                                                    type="table"
-                                                                                                  >
-                                                                                                    <i
-                                                                                                      className="fa fa-table fa-fw "
-                                                                                                    />
-                                                                                                  </Icon>
-                                                                                                   
-                                                                                                  Download Summary as CSV
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
-                                                                                          </MenuItem>
-                                                                                        </ul>
-                                                                                      </RootCloseWrapper>
-                                                                                    </DropdownMenu>
-                                                                                  </div>
-                                                                                </ButtonGroup>
-                                                                              </Dropdown>
-                                                                            </Uncontrolled(Dropdown)>
-                                                                          </DropdownButton>
-                                                                        </div>
-                                                                      </Col>
-                                                                    </div>
-                                                                  </Row>
-                                                                </ProjectFeedListToolbar>
-                                                              </Connect(ProjectFeedListToolbar)>
-                                                            </div>
-                                                            <ListGroup
-                                                              bsClass="list-group"
-                                                              key=".0"
+                                                                />
+                                                              }
                                                             >
-                                                              <ul
-                                                                className="list-group"
+                                                              <ListGroup
+                                                                bsClass="list-group"
+                                                                fill={true}
                                                               >
-                                                                <ListGroupItem
-                                                                  bsClass="list-group-item"
-                                                                  className="text-center"
-                                                                  key=".0"
-                                                                  listItem={true}
+                                                                <ul
+                                                                  className="list-group"
+                                                                  fill={true}
                                                                 >
-                                                                  <li
-                                                                    className="text-center list-group-item"
+                                                                  <ListGroupItem
+                                                                    bsClass="list-group-item"
+                                                                    className="text-center"
+                                                                    key=".0"
+                                                                    listItem={true}
                                                                   >
-                                                                    <Button
-                                                                      active={false}
-                                                                      block={false}
-                                                                      bsClass="btn"
-                                                                      bsStyle="success"
-                                                                      data-test-id="create-first-feed-source-button"
-                                                                      disabled={false}
-                                                                      onClick={[Function]}
+                                                                    <li
+                                                                      className="text-center list-group-item"
                                                                     >
-                                                                      <button
-                                                                        className="btn btn-success"
+                                                                      <Button
+                                                                        active={false}
+                                                                        block={false}
+                                                                        bsClass="btn"
+                                                                        bsStyle="success"
                                                                         data-test-id="create-first-feed-source-button"
                                                                         disabled={false}
                                                                         onClick={[Function]}
-                                                                        type="button"
                                                                       >
-                                                                        <Icon
-                                                                          type="plus"
+                                                                        <button
+                                                                          className="btn btn-success"
+                                                                          data-test-id="create-first-feed-source-button"
+                                                                          disabled={false}
+                                                                          onClick={[Function]}
+                                                                          type="button"
                                                                         >
-                                                                          <i
-                                                                            className="fa fa-plus fa-fw "
-                                                                          />
-                                                                        </Icon>
-                                                                         
-                                                                        Create first feed source!
-                                                                      </button>
-                                                                    </Button>
-                                                                  </li>
-                                                                </ListGroupItem>
-                                                              </ul>
-                                                            </ListGroup>
-                                                          </div>
-                                                        </Panel>
+                                                                          <Icon
+                                                                            type="plus"
+                                                                          >
+                                                                            <i
+                                                                              className="fa fa-plus fa-fw "
+                                                                            />
+                                                                          </Icon>
+                                                                           
+                                                                          Create first feed source!
+                                                                        </button>
+                                                                      </Button>
+                                                                    </li>
+                                                                  </ListGroupItem>
+                                                                </ul>
+                                                              </ListGroup>
+                                                            </div>
+                                                          </Panel>
+                                                        </Uncontrolled(Panel)>
                                                       </FeedSourceTable>
                                                     </Connect(FeedSourceTable)>
                                                   </div>
@@ -3813,10 +2369,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                         }
                                                       }
                                                     >
-                                                      <Panel
-                                                        bsClass="panel"
-                                                        bsStyle="default"
-                                                        defaultExpanded={false}
+                                                      <Uncontrolled(Panel)
                                                         header={
                                                           <h3>
                                                             mock-project
@@ -3824,95 +2377,103 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           </h3>
                                                         }
                                                       >
-                                                        <div
-                                                          className="panel panel-default"
-                                                        >
-                                                          <div
-                                                            className="panel-heading"
-                                                          >
-                                                            <h3
-                                                              className="panel-title"
-                                                            >
+                                                        <Panel
+                                                          bsClass="panel"
+                                                          bsStyle="default"
+                                                          header={
+                                                            <h3>
                                                               mock-project
                                                                summary
                                                             </h3>
-                                                          </div>
-                                                          <ListGroup
-                                                            bsClass="list-group"
-                                                            key=".0"
+                                                          }
+                                                          onToggle={[Function]}
+                                                        >
+                                                          <div
+                                                            className="panel panel-default"
+                                                            header={
+                                                              <h3>
+                                                                mock-project
+                                                                 summary
+                                                              </h3>
+                                                            }
                                                           >
-                                                            <ul
-                                                              className="list-group"
+                                                            <ListGroup
+                                                              bsClass="list-group"
+                                                              fill={true}
                                                             >
-                                                              <ListGroupItem
-                                                                bsClass="list-group-item"
-                                                                key=".0"
-                                                                listItem={true}
+                                                              <ul
+                                                                className="list-group"
+                                                                fill={true}
                                                               >
-                                                                <li
-                                                                  className="list-group-item"
+                                                                <ListGroupItem
+                                                                  bsClass="list-group-item"
+                                                                  key=".0"
+                                                                  listItem={true}
                                                                 >
-                                                                  Number of feeds: 
-                                                                  0
-                                                                </li>
-                                                              </ListGroupItem>
-                                                              <ListGroupItem
-                                                                bsClass="list-group-item"
-                                                                key=".1"
-                                                                listItem={true}
-                                                              >
-                                                                <li
-                                                                  className="list-group-item"
+                                                                  <li
+                                                                    className="list-group-item"
+                                                                  >
+                                                                    Number of feeds: 
+                                                                    0
+                                                                  </li>
+                                                                </ListGroupItem>
+                                                                <ListGroupItem
+                                                                  bsClass="list-group-item"
+                                                                  key=".1"
+                                                                  listItem={true}
                                                                 >
-                                                                  Total errors: 
-                                                                  0
-                                                                </li>
-                                                              </ListGroupItem>
-                                                              <ListGroupItem
-                                                                bsClass="list-group-item"
-                                                                key=".2"
-                                                                listItem={true}
-                                                              >
-                                                                <li
-                                                                  className="list-group-item"
+                                                                  <li
+                                                                    className="list-group-item"
+                                                                  >
+                                                                    Total errors: 
+                                                                    0
+                                                                  </li>
+                                                                </ListGroupItem>
+                                                                <ListGroupItem
+                                                                  bsClass="list-group-item"
+                                                                  key=".2"
+                                                                  listItem={true}
                                                                 >
-                                                                  Total service:
-                                                                   
-                                                                  0
-                                                                   
-                                                                  hours per weekday
-                                                                </li>
-                                                              </ListGroupItem>
-                                                            </ul>
-                                                          </ListGroup>
-                                                        </div>
-                                                      </Panel>
+                                                                  <li
+                                                                    className="list-group-item"
+                                                                  >
+                                                                    Total service:
+                                                                     
+                                                                    0
+                                                                     
+                                                                    hours per weekday
+                                                                  </li>
+                                                                </ListGroupItem>
+                                                              </ul>
+                                                            </ListGroup>
+                                                          </div>
+                                                        </Panel>
+                                                      </Uncontrolled(Panel)>
                                                     </ProjectSummaryPanel>
-                                                    <Panel
-                                                      bsClass="panel"
-                                                      bsStyle="default"
-                                                      defaultExpanded={false}
+                                                    <Uncontrolled(Panel)
                                                       header={
                                                         <h3>
                                                           What is a feed source?
                                                         </h3>
                                                       }
                                                     >
-                                                      <div
-                                                        className="panel panel-default"
-                                                      >
-                                                        <div
-                                                          className="panel-heading"
-                                                        >
-                                                          <h3
-                                                            className="panel-title"
-                                                          >
+                                                      <Panel
+                                                        bsClass="panel"
+                                                        bsStyle="default"
+                                                        header={
+                                                          <h3>
                                                             What is a feed source?
                                                           </h3>
-                                                        </div>
+                                                        }
+                                                        onToggle={[Function]}
+                                                      >
                                                         <div
-                                                          className="panel-body"
-                                                          key="0"
+                                                          className="panel panel-default"
+                                                          header={
+                                                            <h3>
+                                                              What is a feed source?
+                                                            </h3>
+                                                          }
                                                         >
                                                           A feed source defines the location or upstream source of a
                                                            
@@ -3920,8 +2481,8 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                            
                                                           directly editing or uploading a zip file.
                                                         </div>
-                                                      </div>
-                                                    </Panel>
+                                                      </Panel>
+                                                    </Uncontrolled(Panel)>
                                                   </div>
                                                 </Col>
                                               </div>
@@ -3954,18 +2515,18 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                       eventKey="deployments"
                                     >
                                       <Fade
+                                        appear={false}
                                         in={false}
                                         mountOnEnter={true}
                                         onEnter={[Function]}
                                         onExited={[Function]}
                                         timeout={300}
-                                        transitionAppear={false}
                                         unmountOnExit={false}
                                       >
                                         <Transition
-                                          className="fade"
-                                          enteredClassName="in"
-                                          enteringClassName="in"
+                                          appear={false}
+                                          enter={true}
+                                          exit={true}
                                           in={false}
                                           mountOnEnter={true}
                                           onEnter={[Function]}
@@ -3975,7 +2536,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                           onExited={[Function]}
                                           onExiting={[Function]}
                                           timeout={300}
-                                          transitionAppear={false}
                                           unmountOnExit={false}
                                         />
                                       </Fade>
@@ -4004,18 +2564,18 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                       eventKey="settings"
                                     >
                                       <Fade
+                                        appear={false}
                                         in={false}
                                         mountOnEnter={true}
                                         onEnter={[Function]}
                                         onExited={[Function]}
                                         timeout={300}
-                                        transitionAppear={false}
                                         unmountOnExit={false}
                                       >
                                         <Transition
-                                          className="fade"
-                                          enteredClassName="in"
-                                          enteringClassName="in"
+                                          appear={false}
+                                          enter={true}
+                                          exit={true}
                                           in={false}
                                           mountOnEnter={true}
                                           onEnter={[Function]}
@@ -4025,7 +2585,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                           onExited={[Function]}
                                           onExiting={[Function]}
                                           timeout={300}
-                                          transitionAppear={false}
                                           unmountOnExit={false}
                                         />
                                       </Fade>
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index 8cfbbcf86..2598b8eb0 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -979,6 +979,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                         "retrievalMethod": "MANUALLY_UPLOADED",
                                         "s3Url": null,
                                         "snapshotVersion": null,
+                                        "transformRules": Array [],
                                         "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                         "user": null,
                                       },
@@ -1007,6 +1008,219 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                         "stopTimesCount": 11170,
                                         "tripCount": 415,
                                       },
+                                      "version": 1,
+                                    },
+                                  ],
+                                  "id": "mock-deployment-id-0",
+                                  "invalidFeedSources": Array [],
+                                  "lastDeployed": null,
+                                  "lastUpdated": 1553292345726,
+                                  "latest": null,
+                                  "name": "mock-deployment",
+                                  "organizationId": null,
+                                  "osmExtractUrl": null,
+                                  "otpCommit": null,
+                                  "otpVersion": null,
+                                  "projectBounds": Object {
+                                    "east": 0,
+                                    "north": 0,
+                                    "south": 0,
+                                    "west": 0,
+                                  },
+                                  "projectId": "mock-project-with-deployments-id",
+                                  "r5": false,
+                                  "r5Version": null,
+                                  "routerId": null,
+                                  "skipOsmExtract": false,
+                                  "user": null,
+                                }
+                              }
+                              fetchProjectDeployments={[Function]}
+                              fetchProjectFeeds={[Function]}
+                              key="mock-deployment-id-0"
+                              project={
+                                Object {
+                                  "autoFetchFeeds": true,
+                                  "autoFetchHour": 0,
+                                  "autoFetchMinute": 0,
+                                  "bounds": null,
+                                  "buildConfig": Object {
+                                    "fares": null,
+                                    "fetchElevationUS": null,
+                                    "stationTransfers": null,
+                                    "subwayAccessTime": null,
+                                  },
+                                  "dateCreated": 1526305321824,
+                                  "defaultTimeZone": null,
+                                  "deployments": Array [
+                                    Object {
+                                      "customBuildConfig": null,
+                                      "customRouterConfig": null,
+                                      "dateCreated": 1553292345720,
+                                      "deployJobSummaries": Array [],
+                                      "deployedTo": null,
+                                      "ec2Instances": Array [],
+                                      "feedSourceId": null,
+                                      "feedVersions": Array [
+                                        Object {
+                                          "feedSource": Object {
+                                            "dateCreated": 1536195264564,
+                                            "deployable": false,
+                                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                            "externalProperties": Object {},
+                                            "id": "mock-feed-with-version-id",
+                                            "isPublic": false,
+                                            "lastFetched": 1543389038810,
+                                            "lastUpdated": 1543389038810,
+                                            "latestValidation": Object {
+                                              "agencies": null,
+                                              "agencyCount": 1,
+                                              "avgDailyRevenueTime": 0,
+                                              "bounds": Object {
+                                                "east": -76.481211,
+                                                "north": 39.0486949672717,
+                                                "south": 38.92884,
+                                                "west": -76.5673055566884,
+                                              },
+                                              "endDate": "20190801",
+                                              "errorCount": 78,
+                                              "feedVersionId": "mock-feed-version-id",
+                                              "loadFailureReason": null,
+                                              "loadStatus": "SUCCESS",
+                                              "routeCount": 10,
+                                              "startDate": "20180801",
+                                              "stopCount": 237,
+                                              "stopTimesCount": 11170,
+                                              "tripCount": 415,
+                                            },
+                                            "latestVersionId": "mock-feed-version-id",
+                                            "name": "test feed with a version",
+                                            "noteCount": 0,
+                                            "organizationId": null,
+                                            "projectId": "mock-project-id",
+                                            "publishedVersionId": null,
+                                            "retrievalMethod": "MANUALLY_UPLOADED",
+                                            "s3Url": null,
+                                            "snapshotVersion": null,
+                                            "transformRules": Array [],
+                                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                            "user": null,
+                                          },
+                                          "id": "mock-feed-version-id",
+                                          "nextVersionId": null,
+                                          "previousVersionId": null,
+                                          "updated": 1543389038810,
+                                          "validationResult": Object {
+                                            "agencies": null,
+                                            "agencyCount": 1,
+                                            "avgDailyRevenueTime": 0,
+                                            "bounds": Object {
+                                              "east": -76.481211,
+                                              "north": 39.0486949672717,
+                                              "south": 38.92884,
+                                              "west": -76.5673055566884,
+                                            },
+                                            "endDate": "20190801",
+                                            "errorCount": 78,
+                                            "feedVersionId": "mock-feed-version-id",
+                                            "loadFailureReason": null,
+                                            "loadStatus": "SUCCESS",
+                                            "routeCount": 10,
+                                            "startDate": "20180801",
+                                            "stopCount": 237,
+                                            "stopTimesCount": 11170,
+                                            "tripCount": 415,
+                                          },
+                                          "version": 1,
+                                        },
+                                      ],
+                                      "id": "mock-deployment-id-0",
+                                      "invalidFeedSources": Array [],
+                                      "lastDeployed": null,
+                                      "lastUpdated": 1553292345726,
+                                      "latest": null,
+                                      "name": "mock-deployment",
+                                      "organizationId": null,
+                                      "osmExtractUrl": null,
+                                      "otpCommit": null,
+                                      "otpVersion": null,
+                                      "projectBounds": Object {
+                                        "east": 0,
+                                        "north": 0,
+                                        "south": 0,
+                                        "west": 0,
+                                      },
+                                      "projectId": "mock-project-with-deployments-id",
+                                      "r5": false,
+                                      "r5Version": null,
+                                      "routerId": null,
+                                      "skipOsmExtract": false,
+                                      "user": null,
+                                    },
+                                    Object {
+                                      "customBuildConfig": null,
+                                      "customRouterConfig": null,
+                                      "dateCreated": 1553292345720,
+                                      "deployJobSummaries": Array [],
+                                      "deployedTo": null,
+                                      "ec2Instances": Array [],
+                                      "feedSourceId": null,
+                                      "feedVersions": Array [],
+                                      "id": "mock-deployment-id-1",
+                                      "invalidFeedSources": Array [],
+                                      "lastDeployed": null,
+                                      "lastUpdated": 1553292345726,
+                                      "latest": null,
+                                      "name": "mock-deployment",
+                                      "organizationId": null,
+                                      "osmExtractUrl": null,
+                                      "otpCommit": null,
+                                      "otpVersion": null,
+                                      "projectBounds": Object {
+                                        "east": 0,
+                                        "north": 0,
+                                        "south": 0,
+                                        "west": 0,
+                                      },
+                                      "projectId": "mock-project-with-deployments-id",
+                                      "r5": false,
+                                      "r5Version": null,
+                                      "routerId": null,
+                                      "skipOsmExtract": false,
+                                      "user": null,
+                                    },
+                                  ],
+                                  "feedSources": Array [
+                                    Object {
+                                      "dateCreated": 1536195264564,
+                                      "deployable": false,
+                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                      "externalProperties": Object {},
+                                      "id": "mock-feed-with-version-id",
+                                      "isPublic": false,
+                                      "lastFetched": 1543389038810,
+                                      "lastUpdated": 1543389038810,
+                                      "latestValidation": Object {
+                                        "agencies": null,
+                                        "agencyCount": 1,
+                                        "avgDailyRevenueTime": 0,
+                                        "bounds": Object {
+                                          "east": -76.481211,
+                                          "north": 39.0486949672717,
+                                          "south": 38.92884,
+                                          "west": -76.5673055566884,
+                                        },
+                                        "endDate": "20190801",
+                                        "errorCount": 78,
+                                        "feedVersionId": "mock-feed-version-id",
+                                        "loadFailureReason": null,
+                                        "loadStatus": "SUCCESS",
+                                        "routeCount": 10,
+                                        "startDate": "20180801",
+                                        "stopCount": 237,
+                                        "stopTimesCount": 11170,
+                                        "tripCount": 415,
+                                      },
                                       "latestVersionId": "mock-feed-version-id",
                                       "name": "test feed with a version",
                                       "noteCount": 0,
@@ -1020,132 +1234,24 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                       "user": null,
                                     },
-                                    "dateCreated": 1526305321824,
-                                    "defaultTimeZone": null,
-                                    "deployments": Array [
-                                      [Circular],
-                                      Object {
-                                        "customBuildConfig": null,
-                                        "customRouterConfig": null,
-                                        "dateCreated": 1553292345720,
-                                        "deployJobSummaries": Array [],
-                                        "deployedTo": null,
-                                        "ec2Instances": Array [],
-                                        "feedSourceId": null,
-                                        "feedVersions": Array [],
-                                        "id": "mock-deployment-id-1",
-                                        "invalidFeedSources": Array [],
-                                        "lastDeployed": null,
-                                        "lastUpdated": 1553292345726,
-                                        "latest": null,
-                                        "name": "mock-deployment",
-                                        "organizationId": null,
-                                        "osmFileId": null,
-                                        "otpCommit": null,
-                                        "otpVersion": null,
-                                        "project": [Circular],
-                                        "projectBounds": Object {
-                                          "east": 0,
-                                          "north": 0,
-                                          "south": 0,
-                                          "west": 0,
-                                        },
-                                        "r5": false,
-                                        "r5Version": null,
-                                        "routerId": null,
-                                        "user": null,
-                                      },
-                                    ],
-                                    "feedSources": Array [
-                                      Object {
-                                        "dateCreated": 1536195264564,
-                                        "deployable": false,
-                                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                        "externalProperties": Object {},
-                                        "id": "mock-feed-with-version-id",
-                                        "isPublic": false,
-                                        "lastFetched": 1543389038810,
-                                        "lastUpdated": 1543389038810,
-                                        "latestValidation": Object {
-                                          "agencies": null,
-                                          "agencyCount": 1,
-                                          "avgDailyRevenueTime": 0,
-                                          "bounds": Object {
-                                            "east": -76.481211,
-                                            "north": 39.0486949672717,
-                                            "south": 38.92884,
-                                            "west": -76.5673055566884,
-                                          },
-                                          "endDate": "20190801",
-                                          "errorCount": 78,
-                                          "feedVersionId": "mock-feed-version-id",
-                                          "loadFailureReason": null,
-                                          "loadStatus": "SUCCESS",
-                                          "routeCount": 10,
-                                          "startDate": "20180801",
-                                          "stopCount": 237,
-                                          "stopTimesCount": 11170,
-                                          "tripCount": 415,
-                                        },
-                                        "latestVersionId": "mock-feed-version-id",
-                                        "name": "test feed with a version",
-                                        "noteCount": 0,
-                                        "organizationId": null,
-                                        "projectId": "mock-project-id",
-                                        "publishedVersionId": null,
-                                        "retrievalMethod": "MANUALLY_UPLOADED",
-                                        "s3Url": null,
-                                        "snapshotVersion": null,
-                                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                        "user": null,
-                                      },
-                                    ],
-                                    "id": "mock-project-with-deployments-id",
-                                    "lastUpdated": 1553236399556,
-                                    "name": "mock-project-with-deployments",
-                                    "organizationId": null,
-                                    "otpServers": Array [],
-                                    "pinnedDeploymentId": "mock-deployment-id-0",
-                                    "routerConfig": Object {
-                                      "carDropoffTime": null,
-                                      "numItineraries": null,
-                                      "requestLogFile": null,
-                                      "stairsReluctance": null,
-                                      "updaters": null,
-                                      "walkSpeed": null,
-                                    },
-                                    "useCustomOsmBounds": false,
-                                    "user": null,
-                                  },
-                                  "projectBounds": Object {
-                                    "east": 0,
-                                    "north": 0,
-                                    "south": 0,
-                                    "west": 0,
+                                  ],
+                                  "id": "mock-project-with-deployments-id",
+                                  "lastUpdated": 1553236399556,
+                                  "name": "mock-project-with-deployments",
+                                  "organizationId": null,
+                                  "otpServers": Array [],
+                                  "pinnedDeploymentId": "mock-deployment-id-0",
+                                  "routerConfig": Object {
+                                    "carDropoffTime": null,
+                                    "numItineraries": null,
+                                    "requestLogFile": null,
+                                    "stairsReluctance": null,
+                                    "updaters": null,
+                                    "walkSpeed": null,
                                   },
-                                ],
-                                "id": "mock-deployment-id-0",
-                                "invalidFeedSources": Array [],
-                                "lastDeployed": null,
-                                "lastUpdated": 1553292345726,
-                                "latest": null,
-                                "name": "mock-deployment",
-                                "organizationId": null,
-                                "osmExtractUrl": null,
-                                "otpCommit": null,
-                                "otpVersion": null,
-                                "projectBounds": Object {
-                                  "east": 0,
-                                  "north": 0,
-                                  "south": 0,
-                                  "west": 0,
-                                },
-                                "projectId": "mock-project-with-deployments-id",
-                                "r5": false,
-                                "r5Version": null,
-                                "routerId": null,
-                                "skipOsmExtract": false,
-                                "user": null,
+                                  "useCustomOsmBounds": false,
+                                  "user": null,
+                                }
                               }
                               saveDeployment={[Function]}
                               updateDeployment={[Function]}
@@ -1333,80 +1439,61 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                   "latest": null,
                                   "name": "mock-deployment",
                                   "organizationId": null,
-                                  "osmFileId": null,
+                                  "osmExtractUrl": null,
                                   "otpCommit": null,
                                   "otpVersion": null,
-                                  "project": Object {
-                                    "autoFetchFeeds": true,
-                                    "autoFetchHour": 0,
-                                    "autoFetchMinute": 0,
-                                    "bounds": null,
-                                    "buildConfig": Object {
-                                      "fares": null,
-                                      "fetchElevationUS": null,
-                                      "stationTransfers": null,
-                                      "subwayAccessTime": null,
-                                    },
-                                    "dateCreated": 1526305321824,
-                                    "defaultTimeZone": null,
-                                    "deployments": Array [
-                                      Object {
-                                        "customBuildConfig": null,
-                                        "customRouterConfig": null,
-                                        "dateCreated": 1553292345720,
-                                        "deployJobSummaries": Array [],
-                                        "deployedTo": null,
-                                        "ec2Instances": Array [],
-                                        "feedSourceId": null,
-                                        "feedVersions": Array [
-                                          Object {
-                                            "feedSource": Object {
-                                              "dateCreated": 1536195264564,
-                                              "deployable": false,
-                                              "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                              "externalProperties": Object {},
-                                              "id": "mock-feed-with-version-id",
-                                              "isPublic": false,
-                                              "lastFetched": 1543389038810,
-                                              "lastUpdated": 1543389038810,
-                                              "latestValidation": Object {
-                                                "agencies": null,
-                                                "agencyCount": 1,
-                                                "avgDailyRevenueTime": 0,
-                                                "bounds": Object {
-                                                  "east": -76.481211,
-                                                  "north": 39.0486949672717,
-                                                  "south": 38.92884,
-                                                  "west": -76.5673055566884,
-                                                },
-                                                "endDate": "20190801",
-                                                "errorCount": 78,
-                                                "feedVersionId": "mock-feed-version-id",
-                                                "loadFailureReason": null,
-                                                "loadStatus": "SUCCESS",
-                                                "routeCount": 10,
-                                                "startDate": "20180801",
-                                                "stopCount": 237,
-                                                "stopTimesCount": 11170,
-                                                "tripCount": 415,
-                                              },
-                                              "latestVersionId": "mock-feed-version-id",
-                                              "name": "test feed with a version",
-                                              "noteCount": 0,
-                                              "organizationId": null,
-                                              "projectId": "mock-project-id",
-                                              "publishedVersionId": null,
-                                              "retrievalMethod": "MANUALLY_UPLOADED",
-                                              "s3Url": null,
-                                              "snapshotVersion": null,
-                                              "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                              "user": null,
-                                            },
-                                            "id": "mock-feed-version-id",
-                                            "nextVersionId": null,
-                                            "previousVersionId": null,
-                                            "updated": 1543389038810,
-                                            "validationResult": Object {
+                                  "projectBounds": Object {
+                                    "east": 0,
+                                    "north": 0,
+                                    "south": 0,
+                                    "west": 0,
+                                  },
+                                  "projectId": "mock-project-with-deployments-id",
+                                  "r5": false,
+                                  "r5Version": null,
+                                  "routerId": null,
+                                  "skipOsmExtract": false,
+                                  "user": null,
+                                }
+                              }
+                              fetchProjectDeployments={[Function]}
+                              fetchProjectFeeds={[Function]}
+                              key="mock-deployment-id-1"
+                              project={
+                                Object {
+                                  "autoFetchFeeds": true,
+                                  "autoFetchHour": 0,
+                                  "autoFetchMinute": 0,
+                                  "bounds": null,
+                                  "buildConfig": Object {
+                                    "fares": null,
+                                    "fetchElevationUS": null,
+                                    "stationTransfers": null,
+                                    "subwayAccessTime": null,
+                                  },
+                                  "dateCreated": 1526305321824,
+                                  "defaultTimeZone": null,
+                                  "deployments": Array [
+                                    Object {
+                                      "customBuildConfig": null,
+                                      "customRouterConfig": null,
+                                      "dateCreated": 1553292345720,
+                                      "deployJobSummaries": Array [],
+                                      "deployedTo": null,
+                                      "ec2Instances": Array [],
+                                      "feedSourceId": null,
+                                      "feedVersions": Array [
+                                        Object {
+                                          "feedSource": Object {
+                                            "dateCreated": 1536195264564,
+                                            "deployable": false,
+                                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                            "externalProperties": Object {},
+                                            "id": "mock-feed-with-version-id",
+                                            "isPublic": false,
+                                            "lastFetched": 1543389038810,
+                                            "lastUpdated": 1543389038810,
+                                            "latestValidation": Object {
                                               "agencies": null,
                                               "agencyCount": 1,
                                               "avgDailyRevenueTime": 0,
@@ -1427,429 +1514,24 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                               "stopTimesCount": 11170,
                                               "tripCount": 415,
                                             },
-                                            "version": 1,
+                                            "latestVersionId": "mock-feed-version-id",
+                                            "name": "test feed with a version",
+                                            "noteCount": 0,
+                                            "organizationId": null,
+                                            "projectId": "mock-project-id",
+                                            "publishedVersionId": null,
+                                            "retrievalMethod": "MANUALLY_UPLOADED",
+                                            "s3Url": null,
+                                            "snapshotVersion": null,
+                                            "transformRules": Array [],
+                                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                            "user": null,
                                           },
-                                          "latestVersionId": "mock-feed-version-id",
-                                          "name": "test feed with a version",
-                                          "noteCount": 0,
-                                          "organizationId": null,
-                                          "projectId": "mock-project-id",
-                                          "publishedVersionId": null,
-                                          "retrievalMethod": "MANUALLY_UPLOADED",
-                                          "s3Url": null,
-                                          "snapshotVersion": null,
-                                          "transformRules": Array [],
-                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                          "user": null,
-                                        },
-                                        "r5": false,
-                                        "r5Version": null,
-                                        "routerId": null,
-                                        "user": null,
-                                      },
-                                      [Circular],
-                                    ],
-                                    "feedSources": Array [
-                                      Object {
-                                        "dateCreated": 1536195264564,
-                                        "deployable": false,
-                                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                        "externalProperties": Object {},
-                                        "id": "mock-feed-with-version-id",
-                                        "isPublic": false,
-                                        "lastFetched": 1543389038810,
-                                        "lastUpdated": 1543389038810,
-                                        "latestValidation": Object {
-                                          "agencies": null,
-                                          "agencyCount": 1,
-                                          "avgDailyRevenueTime": 0,
-                                          "bounds": Object {
-                                            "east": -76.481211,
-                                            "north": 39.0486949672717,
-                                            "south": 38.92884,
-                                            "west": -76.5673055566884,
-                                          },
-                                          "endDate": "20190801",
-                                          "errorCount": 78,
-                                          "feedVersionId": "mock-feed-version-id",
-                                          "loadFailureReason": null,
-                                          "loadStatus": "SUCCESS",
-                                          "routeCount": 10,
-                                          "startDate": "20180801",
-                                          "stopCount": 237,
-                                          "stopTimesCount": 11170,
-                                          "tripCount": 415,
-                                        },
-                                        "latestVersionId": "mock-feed-version-id",
-                                        "name": "test feed with a version",
-                                        "noteCount": 0,
-                                        "organizationId": null,
-                                        "projectId": "mock-project-id",
-                                        "publishedVersionId": null,
-                                        "retrievalMethod": "MANUALLY_UPLOADED",
-                                        "s3Url": null,
-                                        "snapshotVersion": null,
-                                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                        "user": null,
-                                      },
-                                    ],
-                                    "id": "mock-project-with-deployments-id",
-                                    "lastUpdated": 1553236399556,
-                                    "name": "mock-project-with-deployments",
-                                    "organizationId": null,
-                                    "osmExtractUrl": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
-                                    },
-                                    "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
-                                    "skipOsmExtract": false,
-                                    "user": null,
-                                  },
-                                  Object {
-                                    "customBuildConfig": null,
-                                    "customRouterConfig": null,
-                                    "dateCreated": 1553292345720,
-                                    "deployJobSummaries": Array [],
-                                    "deployedTo": null,
-                                    "ec2Instances": Array [],
-                                    "feedSourceId": null,
-                                    "feedVersions": Array [],
-                                    "id": "mock-deployment-id-1",
-                                    "invalidFeedSources": Array [],
-                                    "lastDeployed": null,
-                                    "lastUpdated": 1553292345726,
-                                    "latest": null,
-                                    "name": "mock-deployment",
-                                    "organizationId": null,
-                                    "osmExtractUrl": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
-                                    },
-                                    "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
-                                    "skipOsmExtract": false,
-                                    "user": null,
-                                  },
-                                ],
-                                "feedSources": Array [
-                                  Object {
-                                    "dateCreated": 1536195264564,
-                                    "deployable": false,
-                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                    "externalProperties": Object {},
-                                    "id": "mock-feed-with-version-id",
-                                    "isPublic": false,
-                                    "lastFetched": 1543389038810,
-                                    "lastUpdated": 1543389038810,
-                                    "latestValidation": Object {
-                                      "agencies": null,
-                                      "agencyCount": 1,
-                                      "avgDailyRevenueTime": 0,
-                                      "bounds": Object {
-                                        "east": -76.481211,
-                                        "north": 39.0486949672717,
-                                        "south": 38.92884,
-                                        "west": -76.5673055566884,
-                                      },
-                                      "endDate": "20190801",
-                                      "errorCount": 78,
-                                      "feedVersionId": "mock-feed-version-id",
-                                      "loadFailureReason": null,
-                                      "loadStatus": "SUCCESS",
-                                      "routeCount": 10,
-                                      "startDate": "20180801",
-                                      "stopCount": 237,
-                                      "stopTimesCount": 11170,
-                                      "tripCount": 415,
-                                    },
-                                    "latestVersionId": "mock-feed-version-id",
-                                    "name": "test feed with a version",
-                                    "noteCount": 0,
-                                    "organizationId": null,
-                                    "projectId": "mock-project-id",
-                                    "publishedVersionId": null,
-                                    "retrievalMethod": "MANUALLY_UPLOADED",
-                                    "s3Url": null,
-                                    "snapshotVersion": null,
-                                    "transformRules": Array [],
-                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                    "user": null,
-                                  },
-                                ],
-                                "id": "mock-project-with-deployments-id",
-                                "lastUpdated": 1553236399556,
-                                "name": "mock-project-with-deployments",
-                                "organizationId": null,
-                                "otpServers": Array [],
-                                "pinnedDeploymentId": "mock-deployment-id-0",
-                                "routerConfig": Object {
-                                  "carDropoffTime": null,
-                                  "numItineraries": null,
-                                  "requestLogFile": null,
-                                  "stairsReluctance": null,
-                                  "updaters": null,
-                                  "walkSpeed": null,
-                                },
-                                "useCustomOsmBounds": false,
-                                "user": null,
-                              }
-                            }
-                            saveDeployment={[Function]}
-                            updateDeployment={[Function]}
-                            updateProject={[Function]}
-                          >
-                            <tr
-                              className="pinned-deployment"
-                            >
-                              <td>
-                                <EditableTextField
-                                  isEditing={false}
-                                  link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
-                                  onChange={[Function]}
-                                  rejectEmptyValue={true}
-                                  style={Object {}}
-                                  type="text"
-                                  value="mock-deployment"
-                                >
-                                  <div
-                                    style={Object {}}
-                                  >
-                                    <span>
-                                      <span
-                                        title="mock-deployment"
-                                      >
-                                        <Link
-                                          onlyActiveOnIndex={false}
-                                          style={Object {}}
-                                          to="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
-                                        >
-                                          <a
-                                            onClick={[Function]}
-                                            style={Object {}}
-                                          >
-                                            mock-deployment
-                                          </a>
-                                        </Link>
-                                      </span>
-                                      <Button
-                                        active={false}
-                                        block={false}
-                                        bsClass="btn"
-                                        bsStyle="link"
-                                        data-test-id="editable-text-field-edit-button"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                      >
-                                        <button
-                                          className="btn btn-link"
-                                          data-test-id="editable-text-field-edit-button"
-                                          disabled={false}
-                                          onClick={[Function]}
-                                          type="button"
-                                        >
-                                          <Icon
-                                            type="pencil"
-                                          >
-                                            <i
-                                              className="fa fa-pencil fa-fw "
-                                            />
-                                          </Icon>
-                                        </button>
-                                      </Button>
-                                    </span>
-                                  </div>
-                                </EditableTextField>
-                              </td>
-                              <td>
-                                <span
-                                  title="Mar 22nd 2019, 3:05pm"
-                                >
-                                   
-                                  2 months ago
-                                </span>
-                              </td>
-                              <td>
-                                <span
-                                  className="deployment-na"
-                                >
-                                  N/A
-                                </span>
-                              </td>
-                              <td>
-                                <span
-                                  className="deployment-na"
-                                >
-                                  N/A
-                                </span>
-                              </td>
-                              <td>
-                                <span>
-                                  1
-                                </span>
-                              </td>
-                              <td>
-                                <span
-                                  className="deployment-na"
-                                >
-                                  N/A
-                                </span>
-                              </td>
-                              <td>
-                                <ButtonGroup
-                                  block={false}
-                                  bsClass="btn-group"
-                                  className="pull-right"
-                                  justified={false}
-                                  vertical={false}
-                                >
-                                  <div
-                                    className="pull-right btn-group"
-                                  >
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="info"
-                                      disabled={false}
-                                      onClick={[Function]}
-                                    >
-                                      <button
-                                        className="btn btn-xs btn-info"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                        type="button"
-                                      >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="pushpin"
-                                        >
-                                          <span
-                                            className="glyphicon glyphicon-pushpin"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="danger"
-                                      disabled={false}
-                                      onClick={[Function]}
-                                    >
-                                      <button
-                                        className="btn btn-xs btn-danger"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                        type="button"
-                                      >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="remove"
-                                        >
-                                          <span
-                                            className="glyphicon glyphicon-remove"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                  </div>
-                                </ButtonGroup>
-                              </td>
-                            </tr>
-                          </DeploymentListItem>
-                          <DeploymentListItem
-                            createDeployment={[Function]}
-                            deleteDeployment={[Function]}
-                            deployment={
-                              Object {
-                                "customBuildConfig": null,
-                                "customRouterConfig": null,
-                                "dateCreated": 1553292345720,
-                                "deployJobSummaries": Array [],
-                                "deployedTo": null,
-                                "ec2Instances": Array [],
-                                "feedSourceId": null,
-                                "feedVersions": Array [],
-                                "id": "mock-deployment-id-1",
-                                "invalidFeedSources": Array [],
-                                "lastDeployed": null,
-                                "lastUpdated": 1553292345726,
-                                "latest": null,
-                                "name": "mock-deployment",
-                                "organizationId": null,
-                                "osmExtractUrl": null,
-                                "otpCommit": null,
-                                "otpVersion": null,
-                                "projectBounds": Object {
-                                  "east": 0,
-                                  "north": 0,
-                                  "south": 0,
-                                  "west": 0,
-                                },
-                                "projectId": "mock-project-with-deployments-id",
-                                "r5": false,
-                                "r5Version": null,
-                                "routerId": null,
-                                "skipOsmExtract": false,
-                                "user": null,
-                              }
-                            }
-                            fetchProjectDeployments={[Function]}
-                            fetchProjectFeeds={[Function]}
-                            key="mock-deployment-id-1"
-                            project={
-                              Object {
-                                "autoFetchFeeds": true,
-                                "autoFetchHour": 0,
-                                "autoFetchMinute": 0,
-                                "bounds": null,
-                                "buildConfig": Object {
-                                  "fares": null,
-                                  "fetchElevationUS": null,
-                                  "stationTransfers": null,
-                                  "subwayAccessTime": null,
-                                },
-                                "dateCreated": 1526305321824,
-                                "defaultTimeZone": null,
-                                "deployments": Array [
-                                  Object {
-                                    "customBuildConfig": null,
-                                    "customRouterConfig": null,
-                                    "dateCreated": 1553292345720,
-                                    "deployJobSummaries": Array [],
-                                    "deployedTo": null,
-                                    "ec2Instances": Array [],
-                                    "feedSourceId": null,
-                                    "feedVersions": Array [
-                                      Object {
-                                        "feedSource": Object {
-                                          "dateCreated": 1536195264564,
-                                          "deployable": false,
-                                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                          "externalProperties": Object {},
-                                          "id": "mock-feed-with-version-id",
-                                          "isPublic": false,
-                                          "lastFetched": 1543389038810,
-                                          "lastUpdated": 1543389038810,
-                                          "latestValidation": Object {
+                                          "id": "mock-feed-version-id",
+                                          "nextVersionId": null,
+                                          "previousVersionId": null,
+                                          "updated": 1543389038810,
+                                          "validationResult": Object {
                                             "agencies": null,
                                             "agencyCount": 1,
                                             "avgDailyRevenueTime": 0,
@@ -1870,172 +1552,131 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                             "stopTimesCount": 11170,
                                             "tripCount": 415,
                                           },
-                                          "latestVersionId": "mock-feed-version-id",
-                                          "name": "test feed with a version",
-                                          "noteCount": 0,
-                                          "organizationId": null,
-                                          "projectId": "mock-project-id",
-                                          "publishedVersionId": null,
-                                          "retrievalMethod": "MANUALLY_UPLOADED",
-                                          "s3Url": null,
-                                          "snapshotVersion": null,
-                                          "transformRules": Array [],
-                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                          "user": null,
-                                        },
-                                        "id": "mock-feed-version-id",
-                                        "nextVersionId": null,
-                                        "previousVersionId": null,
-                                        "updated": 1543389038810,
-                                        "validationResult": Object {
-                                          "agencies": null,
-                                          "agencyCount": 1,
-                                          "avgDailyRevenueTime": 0,
-                                          "bounds": Object {
-                                            "east": -76.481211,
-                                            "north": 39.0486949672717,
-                                            "south": 38.92884,
-                                            "west": -76.5673055566884,
-                                          },
-                                          "endDate": "20190801",
-                                          "errorCount": 78,
-                                          "feedVersionId": "mock-feed-version-id",
-                                          "loadFailureReason": null,
-                                          "loadStatus": "SUCCESS",
-                                          "routeCount": 10,
-                                          "startDate": "20180801",
-                                          "stopCount": 237,
-                                          "stopTimesCount": 11170,
-                                          "tripCount": 415,
+                                          "version": 1,
                                         },
-                                        "version": 1,
+                                      ],
+                                      "id": "mock-deployment-id-0",
+                                      "invalidFeedSources": Array [],
+                                      "lastDeployed": null,
+                                      "lastUpdated": 1553292345726,
+                                      "latest": null,
+                                      "name": "mock-deployment",
+                                      "organizationId": null,
+                                      "osmExtractUrl": null,
+                                      "otpCommit": null,
+                                      "otpVersion": null,
+                                      "projectBounds": Object {
+                                        "east": 0,
+                                        "north": 0,
+                                        "south": 0,
+                                        "west": 0,
                                       },
-                                    ],
-                                    "id": "mock-deployment-id-0",
-                                    "invalidFeedSources": Array [],
-                                    "lastDeployed": null,
-                                    "lastUpdated": 1553292345726,
-                                    "latest": null,
-                                    "name": "mock-deployment",
-                                    "organizationId": null,
-                                    "osmExtractUrl": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
+                                      "projectId": "mock-project-with-deployments-id",
+                                      "r5": false,
+                                      "r5Version": null,
+                                      "routerId": null,
+                                      "skipOsmExtract": false,
+                                      "user": null,
                                     },
-                                    "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
-                                    "skipOsmExtract": false,
-                                    "user": null,
-                                  },
-                                  Object {
-                                    "customBuildConfig": null,
-                                    "customRouterConfig": null,
-                                    "dateCreated": 1553292345720,
-                                    "deployJobSummaries": Array [],
-                                    "deployedTo": null,
-                                    "ec2Instances": Array [],
-                                    "feedSourceId": null,
-                                    "feedVersions": Array [],
-                                    "id": "mock-deployment-id-1",
-                                    "invalidFeedSources": Array [],
-                                    "lastDeployed": null,
-                                    "lastUpdated": 1553292345726,
-                                    "latest": null,
-                                    "name": "mock-deployment",
-                                    "organizationId": null,
-                                    "osmExtractUrl": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
+                                    Object {
+                                      "customBuildConfig": null,
+                                      "customRouterConfig": null,
+                                      "dateCreated": 1553292345720,
+                                      "deployJobSummaries": Array [],
+                                      "deployedTo": null,
+                                      "ec2Instances": Array [],
+                                      "feedSourceId": null,
+                                      "feedVersions": Array [],
+                                      "id": "mock-deployment-id-1",
+                                      "invalidFeedSources": Array [],
+                                      "lastDeployed": null,
+                                      "lastUpdated": 1553292345726,
+                                      "latest": null,
+                                      "name": "mock-deployment",
+                                      "organizationId": null,
+                                      "osmExtractUrl": null,
+                                      "otpCommit": null,
+                                      "otpVersion": null,
+                                      "projectBounds": Object {
+                                        "east": 0,
+                                        "north": 0,
+                                        "south": 0,
+                                        "west": 0,
+                                      },
+                                      "projectId": "mock-project-with-deployments-id",
+                                      "r5": false,
+                                      "r5Version": null,
+                                      "routerId": null,
+                                      "skipOsmExtract": false,
+                                      "user": null,
                                     },
-                                    "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
-                                    "skipOsmExtract": false,
-                                    "user": null,
-                                  },
-                                ],
-                                "feedSources": Array [
-                                  Object {
-                                    "dateCreated": 1536195264564,
-                                    "deployable": false,
-                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                    "externalProperties": Object {},
-                                    "id": "mock-feed-with-version-id",
-                                    "isPublic": false,
-                                    "lastFetched": 1543389038810,
-                                    "lastUpdated": 1543389038810,
-                                    "latestValidation": Object {
-                                      "agencies": null,
-                                      "agencyCount": 1,
-                                      "avgDailyRevenueTime": 0,
-                                      "bounds": Object {
-                                        "east": -76.481211,
-                                        "north": 39.0486949672717,
-                                        "south": 38.92884,
-                                        "west": -76.5673055566884,
+                                  ],
+                                  "feedSources": Array [
+                                    Object {
+                                      "dateCreated": 1536195264564,
+                                      "deployable": false,
+                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                      "externalProperties": Object {},
+                                      "id": "mock-feed-with-version-id",
+                                      "isPublic": false,
+                                      "lastFetched": 1543389038810,
+                                      "lastUpdated": 1543389038810,
+                                      "latestValidation": Object {
+                                        "agencies": null,
+                                        "agencyCount": 1,
+                                        "avgDailyRevenueTime": 0,
+                                        "bounds": Object {
+                                          "east": -76.481211,
+                                          "north": 39.0486949672717,
+                                          "south": 38.92884,
+                                          "west": -76.5673055566884,
+                                        },
+                                        "endDate": "20190801",
+                                        "errorCount": 78,
+                                        "feedVersionId": "mock-feed-version-id",
+                                        "loadFailureReason": null,
+                                        "loadStatus": "SUCCESS",
+                                        "routeCount": 10,
+                                        "startDate": "20180801",
+                                        "stopCount": 237,
+                                        "stopTimesCount": 11170,
+                                        "tripCount": 415,
                                       },
-                                      "endDate": "20190801",
-                                      "errorCount": 78,
-                                      "feedVersionId": "mock-feed-version-id",
-                                      "loadFailureReason": null,
-                                      "loadStatus": "SUCCESS",
-                                      "routeCount": 10,
-                                      "startDate": "20180801",
-                                      "stopCount": 237,
-                                      "stopTimesCount": 11170,
-                                      "tripCount": 415,
+                                      "latestVersionId": "mock-feed-version-id",
+                                      "name": "test feed with a version",
+                                      "noteCount": 0,
+                                      "organizationId": null,
+                                      "projectId": "mock-project-id",
+                                      "publishedVersionId": null,
+                                      "retrievalMethod": "MANUALLY_UPLOADED",
+                                      "s3Url": null,
+                                      "snapshotVersion": null,
+                                      "transformRules": Array [],
+                                      "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                      "user": null,
                                     },
-                                    "latestVersionId": "mock-feed-version-id",
-                                    "name": "test feed with a version",
-                                    "noteCount": 0,
-                                    "organizationId": null,
-                                    "projectId": "mock-project-id",
-                                    "publishedVersionId": null,
-                                    "retrievalMethod": "MANUALLY_UPLOADED",
-                                    "s3Url": null,
-                                    "snapshotVersion": null,
-                                    "transformRules": Array [],
-                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                    "user": null,
+                                  ],
+                                  "id": "mock-project-with-deployments-id",
+                                  "lastUpdated": 1553236399556,
+                                  "name": "mock-project-with-deployments",
+                                  "organizationId": null,
+                                  "otpServers": Array [],
+                                  "pinnedDeploymentId": "mock-deployment-id-0",
+                                  "routerConfig": Object {
+                                    "carDropoffTime": null,
+                                    "numItineraries": null,
+                                    "requestLogFile": null,
+                                    "stairsReluctance": null,
+                                    "updaters": null,
+                                    "walkSpeed": null,
                                   },
-                                ],
-                                "id": "mock-project-with-deployments-id",
-                                "lastUpdated": 1553236399556,
-                                "name": "mock-project-with-deployments",
-                                "organizationId": null,
-                                "otpServers": Array [],
-                                "pinnedDeploymentId": "mock-deployment-id-0",
-                                "routerConfig": Object {
-                                  "carDropoffTime": null,
-                                  "numItineraries": null,
-                                  "requestLogFile": null,
-                                  "stairsReluctance": null,
-                                  "updaters": null,
-                                  "walkSpeed": null,
-                                },
-                                "useCustomOsmBounds": false,
-                                "user": null,
+                                  "useCustomOsmBounds": false,
+                                  "user": null,
+                                }
                               }
-                            }
-                            saveDeployment={[Function]}
-                            updateDeployment={[Function]}
-                            updateProject={[Function]}
-                          >
-                            <tr
-                              className=""
+                              saveDeployment={[Function]}
+                              updateDeployment={[Function]}
+                              updateProject={[Function]}
                             >
                               <tr
                                 className=""
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 81f79a2e4..8ad7978e7 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -1194,1038 +1194,46 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           <Icon
                             type="heartbeat"
                           >
-                            <ControlLabel
-                              bsClass="control-label"
-                              srOnly={false}
-                              style={
-                                Object {
-                                  "display": "block",
-                                }
-                              }
-                            >
-                              <label
-                                className="control-label"
-                                style={
-                                  Object {
-                                    "display": "block",
-                                  }
-                                }
-                              >
-                                Filter feed sources on
-                                <select
-                                  onChange={[Function]}
-                                  style={
-                                    Object {
-                                      "marginLeft": 5,
-                                      "marginRight": 5,
-                                    }
-                                  }
-                                  value="LATEST"
-                                >
-                                  <option
-                                    key="LATEST"
-                                    value="LATEST"
-                                  >
-                                    Latest
-                                  </option>
-                                  <option
-                                    key="DEPLOYED"
-                                    value="DEPLOYED"
-                                  >
-                                    Deployed
-                                  </option>
-                                </select>
-                                version
-                              </label>
-                            </ControlLabel>
-                            <ButtonGroup
-                              block={false}
-                              bsClass="btn-group"
-                              justified={false}
-                              vertical={false}
-                            >
-                              <div
-                                className="btn-group"
-                              >
-                                <OptionButton
-                                  active={true}
-                                  className="active"
-                                  key="all"
-                                  onClick={[Function]}
-                                  value="all"
-                                >
-                                  <Button
-                                    active={true}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className="active"
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="all"
-                                  >
-                                    <SafeAnchor
-                                      className="active btn btn-default active"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="all"
-                                    >
-                                      <a
-                                        className="active btn btn-default active"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="all"
-                                      >
-                                        All
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            1
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                                <OptionButton
-                                  active={false}
-                                  className=""
-                                  key="active"
-                                  onClick={[Function]}
-                                  value="active"
-                                >
-                                  <Button
-                                    active={false}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className=""
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="active"
-                                  >
-                                    <SafeAnchor
-                                      className="btn btn-default"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="active"
-                                    >
-                                      <a
-                                        className="btn btn-default"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="active"
-                                      >
-                                        Active
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            1
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                                <OptionButton
-                                  active={false}
-                                  className=""
-                                  key="expiring"
-                                  onClick={[Function]}
-                                  value="expiring"
-                                >
-                                  <Button
-                                    active={false}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className=""
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="expiring"
-                                  >
-                                    <SafeAnchor
-                                      className="btn btn-default"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="expiring"
-                                    >
-                                      <a
-                                        className="btn btn-default"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="expiring"
-                                      >
-                                        Expiring
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            0
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                                <OptionButton
-                                  active={false}
-                                  className=""
-                                  key="expired"
-                                  onClick={[Function]}
-                                  value="expired"
-                                >
-                                  <Button
-                                    active={false}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className=""
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="expired"
-                                  >
-                                    <SafeAnchor
-                                      className="btn btn-default"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="expired"
-                                    >
-                                      <a
-                                        className="btn btn-default"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="expired"
-                                      >
-                                        Expired
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            0
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                                <OptionButton
-                                  active={false}
-                                  className=""
-                                  key="future"
-                                  onClick={[Function]}
-                                  value="future"
-                                >
-                                  <Button
-                                    active={false}
-                                    block={false}
-                                    bsClass="btn"
-                                    bsStyle="default"
-                                    className=""
-                                    disabled={false}
-                                    href="#"
-                                    onClick={[Function]}
-                                    value="future"
-                                  >
-                                    <SafeAnchor
-                                      className="btn btn-default"
-                                      componentClass="a"
-                                      disabled={false}
-                                      href="#"
-                                      onClick={[Function]}
-                                      value="future"
-                                    >
-                                      <a
-                                        className="btn btn-default"
-                                        href="#"
-                                        onClick={[Function]}
-                                        role="button"
-                                        value="future"
-                                      >
-                                        Future
-                                         
-                                        <Badge
-                                          bsClass="badge"
-                                          pullRight={false}
-                                          style={
-                                            Object {
-                                              "backgroundColor": "#babec0",
-                                            }
-                                          }
-                                        >
-                                          <span
-                                            className="badge"
-                                            style={
-                                              Object {
-                                                "backgroundColor": "#babec0",
-                                              }
-                                            }
-                                          >
-                                            0
-                                          </span>
-                                        </Badge>
-                                      </a>
-                                    </SafeAnchor>
-                                  </Button>
-                                </OptionButton>
-                              </div>
-                            </ButtonGroup>
-                          </div>
-                        </FormGroup>
-                      </div>
-                    </Col>
-                    <Col
-                      bsClass="col"
-                      componentClass="div"
-                      style={
-                        Object {
-                          "marginTop": 25,
-                        }
-                      }
-                      xs={2}
-                    >
-                      <div
-                        className="col-xs-2"
-                        style={
-                          Object {
-                            "marginTop": 25,
-                          }
-                        }
+                            <i
+                              className="fa fa-heartbeat fa-fw "
+                            />
+                          </Icon>
+                          Status
+                        </h4>
+                      </th>
+                      <th
+                        className="feed-version-column"
                       >
-                        <DropdownButton
-                          bsStyle="primary"
-                          data-test-id="project-header-action-dropdown-button"
-                          id="project-header-actions"
-                          style={
-                            Object {
-                              "marginLeft": 20,
-                            }
-                          }
-                          title="Actions"
-                        >
-                          <Uncontrolled(Dropdown)
-                            bsStyle="primary"
-                            id="project-header-actions"
+                        <h4>
+                          <Icon
+                            type="calendar-check-o"
                           >
-                            <Dropdown
-                              bsClass="dropdown"
-                              bsStyle="primary"
-                              componentClass={[Function]}
-                              id="project-header-actions"
-                              onToggle={[Function]}
-                            >
-                              <ButtonGroup
-                                block={false}
-                                bsClass="btn-group"
-                                bsStyle="primary"
-                                className="dropdown"
-                                justified={false}
-                                vertical={false}
-                              >
-                                <div
-                                  className="dropdown btn-group btn-group-primary"
-                                >
-                                  <DropdownToggle
-                                    bsClass="dropdown-toggle"
-                                    bsRole="toggle"
-                                    bsStyle="primary"
-                                    data-test-id="project-header-action-dropdown-button"
-                                    id="project-header-actions"
-                                    key=".0"
-                                    onClick={[Function]}
-                                    onKeyDown={[Function]}
-                                    open={false}
-                                    style={
-                                      Object {
-                                        "marginLeft": 20,
-                                      }
-                                    }
-                                    useAnchor={false}
-                                  >
-                                    <Button
-                                      active={false}
-                                      aria-expanded={false}
-                                      aria-haspopup={true}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsStyle="primary"
-                                      className="dropdown-toggle"
-                                      data-test-id="project-header-action-dropdown-button"
-                                      disabled={false}
-                                      id="project-header-actions"
-                                      onClick={[Function]}
-                                      onKeyDown={[Function]}
-                                      role="button"
-                                      style={
-                                        Object {
-                                          "marginLeft": 20,
-                                        }
-                                      }
-                                    >
-                                      <button
-                                        aria-expanded={false}
-                                        aria-haspopup={true}
-                                        className="dropdown-toggle btn btn-primary"
-                                        data-test-id="project-header-action-dropdown-button"
-                                        disabled={false}
-                                        id="project-header-actions"
-                                        onClick={[Function]}
-                                        onKeyDown={[Function]}
-                                        role="button"
-                                        style={
-                                          Object {
-                                            "marginLeft": 20,
-                                          }
-                                        }
-                                        type="button"
-                                      >
-                                        Actions
-                                         
-                                        <span
-                                          className="caret"
-                                        />
-                                      </button>
-                                    </Button>
-                                  </DropdownToggle>
-                                  <DropdownMenu
-                                    bsClass="dropdown-menu"
-                                    bsRole="menu"
-                                    key=".1"
-                                    labelledBy="project-header-actions"
-                                    onClose={[Function]}
-                                    onSelect={[Function]}
-                                    pullRight={false}
-                                  >
-                                    <RootCloseWrapper
-                                      disabled={true}
-                                      event="click"
-                                      onRootClose={[Function]}
-                                    >
-                                      <ul
-                                        aria-labelledby="project-header-actions"
-                                        className="dropdown-menu"
-                                        role="menu"
-                                      >
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          data-test-id="project-header-create-new-feed-source-button"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$create-feedsource-button"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              data-test-id="project-header-create-new-feed-source-button"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                data-test-id="project-header-create-new-feed-source-button"
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                <Glyphicon
-                                                  bsClass="glyphicon"
-                                                  glyph="plus"
-                                                >
-                                                  <span
-                                                    className="glyphicon glyphicon-plus"
-                                                  />
-                                                </Glyphicon>
-                                                 
-                                                New
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$update-feeds-button"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                <Icon
-                                                  type="cloud-download"
-                                                >
-                                                  <i
-                                                    className="fa fa-cloud-download fa-fw "
-                                                  />
-                                                </Icon>
-                                                 
-                                                Fetch all
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$merge-feeds-button"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                <Glyphicon
-                                                  bsClass="glyphicon"
-                                                  glyph="download"
-                                                >
-                                                  <span
-                                                    className="glyphicon glyphicon-download"
-                                                  />
-                                                </Glyphicon>
-                                                 
-                                                Merge all
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                        <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
-                                          key=".$csv-download-button"
-                                          onClick={[Function]}
-                                          onKeyDown={[Function]}
-                                          onSelect={[Function]}
-                                        >
-                                          <li
-                                            className=""
-                                            role="presentation"
-                                          >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
-                                            >
-                                              <a
-                                                href="#"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="menuitem"
-                                                tabIndex="-1"
-                                              >
-                                                <Icon
-                                                  type="table"
-                                                >
-                                                  <i
-                                                    className="fa fa-table fa-fw "
-                                                  />
-                                                </Icon>
-                                                 
-                                                Download Summary as CSV
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
-                                        </MenuItem>
-                                      </ul>
-                                    </RootCloseWrapper>
-                                  </DropdownMenu>
-                                </div>
-                              </ButtonGroup>
-                            </Dropdown>
-                          </Uncontrolled(Dropdown)>
-                        </DropdownButton>
-                      </div>
-                    </Col>
-                  </div>
-                </Row>
-              </ProjectFeedListToolbar>
-            </Connect(ProjectFeedListToolbar)>
-          </div>
-          <ListGroup
-            bsClass="list-group"
-            key=".0"
-          >
-            <div
-              className="list-group"
-            >
-              <table
-                className="feed-source-table"
-              >
-                <thead>
-                  <tr>
-                    <th />
-                    <th
-                      className="comparison-column top-row"
-                    >
-                      <h4>
-                        Deployed Version
-                      </h4>
-                    </th>
-                    <th
-                      className="feed-version-column top-row"
-                      colSpan={3}
-                    >
-                      <h4>
-                        Latest Version
-                      </h4>
-                    </th>
-                    <th />
-                  </tr>
-                  <tr>
-                    <th>
-                      <h4>
-                        <Icon
-                          type="info-circle"
-                        >
-                          <i
-                            className="fa fa-info-circle fa-fw "
-                          />
-                        </Icon>
-                        Feed Info
-                      </h4>
-                    </th>
-                    <th
-                      className="comparison-column"
-                    >
-                      <h4>
-                        <Icon
-                          type="heartbeat"
-                        >
-                          <i
-                            className="fa fa-heartbeat fa-fw "
-                          />
-                        </Icon>
-                        Status
-                      </h4>
-                    </th>
-                    <th
-                      className="feed-version-column"
-                    >
-                      <h4>
-                        <Icon
-                          type="heartbeat"
-                        >
-                          <i
-                            className="fa fa-heartbeat fa-fw "
-                          />
-                        </Icon>
-                        Status
-                      </h4>
-                    </th>
-                    <th
-                      className="feed-version-column"
-                    >
-                      <h4>
-                        <Icon
-                          type="calendar-check-o"
-                        >
-                          <i
-                            className="fa fa-calendar-check-o fa-fw "
-                          />
-                        </Icon>
-                        Dates Valid
-                      </h4>
-                    </th>
-                    <th
-                      className="feed-version-column"
-                    >
-                      <h4>
-                        <Icon
-                          type="exclamation-triangle"
-                        >
-                          <i
-                            className="fa fa-exclamation-triangle fa-fw "
-                          />
-                        </Icon>
-                        Issues
-                      </h4>
-                    </th>
-                    <th />
-                  </tr>
-                </thead>
-                <tbody>
-                  <Connect(FeedSourceTableRow)
-                    feedSource={
-                      Object {
-                        "dateCreated": 1536195264564,
-                        "deployable": false,
-                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                        "externalProperties": Object {},
-                        "id": "mock-feed-with-version-id",
-                        "isPublic": false,
-                        "lastFetched": 1543389038810,
-                        "lastUpdated": 1543389038810,
-                        "latestValidation": Object {
-                          "agencies": null,
-                          "agencyCount": 1,
-                          "avgDailyRevenueTime": 0,
-                          "bounds": Object {
-                            "east": -76.481211,
-                            "north": 39.0486949672717,
-                            "south": 38.92884,
-                            "west": -76.5673055566884,
-                          },
-                          "endDate": "20190801",
-                          "errorCount": 78,
-                          "feedVersionId": "mock-feed-version-id",
-                          "loadFailureReason": null,
-                          "loadStatus": "SUCCESS",
-                          "routeCount": 10,
-                          "startDate": "20180801",
-                          "stopCount": 237,
-                          "stopTimesCount": 11170,
-                          "tripCount": 415,
-                        },
-                        "latestVersionId": "mock-feed-version-id",
-                        "name": "test feed with a version",
-                        "noteCount": 0,
-                        "organizationId": null,
-                        "projectId": "mock-project-id",
-                        "publishedVersionId": null,
-                        "retrievalMethod": "MANUALLY_UPLOADED",
-                        "s3Url": null,
-                        "snapshotVersion": null,
-                        "transformRules": Array [],
-                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                        "user": null,
-                      }
-                    }
-                    key="mock-feed-with-version-id"
-                    project={
-                      Object {
-                        "autoFetchFeeds": true,
-                        "autoFetchHour": 0,
-                        "autoFetchMinute": 0,
-                        "bounds": null,
-                        "buildConfig": Object {
-                          "fares": null,
-                          "fetchElevationUS": null,
-                          "stationTransfers": null,
-                          "subwayAccessTime": null,
-                        },
-                        "dateCreated": 1526305321824,
-                        "defaultTimeZone": null,
-                        "deployments": Array [
-                          Object {
-                            "customBuildConfig": null,
-                            "customRouterConfig": null,
-                            "dateCreated": 1553292345720,
-                            "deployJobSummaries": Array [],
-                            "deployedTo": null,
-                            "ec2Instances": Array [],
-                            "feedSourceId": null,
-                            "feedVersions": Array [
-                              Object {
-                                "feedSource": Object {
-                                  "dateCreated": 1536195264564,
-                                  "deployable": false,
-                                  "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                  "externalProperties": Object {},
-                                  "id": "mock-feed-with-version-id",
-                                  "isPublic": false,
-                                  "lastFetched": 1543389038810,
-                                  "lastUpdated": 1543389038810,
-                                  "latestValidation": Object {
-                                    "agencies": null,
-                                    "agencyCount": 1,
-                                    "avgDailyRevenueTime": 0,
-                                    "bounds": Object {
-                                      "east": -76.481211,
-                                      "north": 39.0486949672717,
-                                      "south": 38.92884,
-                                      "west": -76.5673055566884,
-                                    },
-                                    "endDate": "20190801",
-                                    "errorCount": 78,
-                                    "feedVersionId": "mock-feed-version-id",
-                                    "loadFailureReason": null,
-                                    "loadStatus": "SUCCESS",
-                                    "routeCount": 10,
-                                    "startDate": "20180801",
-                                    "stopCount": 237,
-                                    "stopTimesCount": 11170,
-                                    "tripCount": 415,
-                                  },
-                                  "latestVersionId": "mock-feed-version-id",
-                                  "name": "test feed with a version",
-                                  "noteCount": 0,
-                                  "organizationId": null,
-                                  "projectId": "mock-project-id",
-                                  "publishedVersionId": null,
-                                  "retrievalMethod": "MANUALLY_UPLOADED",
-                                  "s3Url": null,
-                                  "snapshotVersion": null,
-                                  "transformRules": Array [],
-                                  "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                  "user": null,
-                                },
-                                "id": "mock-feed-version-id",
-                                "nextVersionId": null,
-                                "previousVersionId": null,
-                                "updated": 1543389038810,
-                                "validationResult": Object {
-                                  "agencies": null,
-                                  "agencyCount": 1,
-                                  "avgDailyRevenueTime": 0,
-                                  "bounds": Object {
-                                    "east": -76.481211,
-                                    "north": 39.0486949672717,
-                                    "south": 38.92884,
-                                    "west": -76.5673055566884,
-                                  },
-                                  "endDate": "20190801",
-                                  "errorCount": 78,
-                                  "feedVersionId": "mock-feed-version-id",
-                                  "loadFailureReason": null,
-                                  "loadStatus": "SUCCESS",
-                                  "routeCount": 10,
-                                  "startDate": "20180801",
-                                  "stopCount": 237,
-                                  "stopTimesCount": 11170,
-                                  "tripCount": 415,
-                                },
-                                "version": 1,
-                              },
-                            ],
-                            "id": "mock-deployment-id-0",
-                            "invalidFeedSources": Array [],
-                            "lastDeployed": null,
-                            "lastUpdated": 1553292345726,
-                            "latest": null,
-                            "name": "mock-deployment",
-                            "organizationId": null,
-                            "osmExtractUrl": null,
-                            "otpCommit": null,
-                            "otpVersion": null,
-                            "projectBounds": Object {
-                              "east": 0,
-                              "north": 0,
-                              "south": 0,
-                              "west": 0,
-                            },
-                            "projectId": "mock-project-with-deployments-id",
-                            "r5": false,
-                            "r5Version": null,
-                            "routerId": null,
-                            "skipOsmExtract": false,
-                            "user": null,
-                          },
-                        ],
-                        "feedSources": Array [
-                          Object {
-                            "dateCreated": 1536195264564,
-                            "deployable": false,
-                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                            "externalProperties": Object {},
-                            "id": "mock-feed-with-version-id",
-                            "isPublic": false,
-                            "lastFetched": 1543389038810,
-                            "lastUpdated": 1543389038810,
-                            "latestValidation": Object {
-                              "agencies": null,
-                              "agencyCount": 1,
-                              "avgDailyRevenueTime": 0,
-                              "bounds": Object {
-                                "east": -76.481211,
-                                "north": 39.0486949672717,
-                                "south": 38.92884,
-                                "west": -76.5673055566884,
-                              },
-                              "endDate": "20190801",
-                              "errorCount": 78,
-                              "feedVersionId": "mock-feed-version-id",
-                              "loadFailureReason": null,
-                              "loadStatus": "SUCCESS",
-                              "routeCount": 10,
-                              "startDate": "20180801",
-                              "stopCount": 237,
-                              "stopTimesCount": 11170,
-                              "tripCount": 415,
-                            },
-                            "latestVersionId": "mock-feed-version-id",
-                            "name": "test feed with a version",
-                            "noteCount": 0,
-                            "organizationId": null,
-                            "projectId": "mock-project-id",
-                            "publishedVersionId": null,
-                            "retrievalMethod": "MANUALLY_UPLOADED",
-                            "s3Url": null,
-                            "snapshotVersion": null,
-                            "transformRules": Array [],
-                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                            "user": null,
-                          },
-                        ],
-                        "id": "mock-project-with-deployments-id",
-                        "lastUpdated": 1553236399556,
-                        "name": "mock-project-with-deployments",
-                        "organizationId": null,
-                        "otpServers": Array [],
-                        "pinnedDeploymentId": null,
-                        "routerConfig": Object {
-                          "carDropoffTime": null,
-                          "numItineraries": null,
-                          "requestLogFile": null,
-                          "stairsReluctance": null,
-                          "updaters": null,
-                          "walkSpeed": null,
-                        },
-                        "useCustomOsmBounds": false,
-                        "user": null,
-                      }
-                    }
-                  >
-                    <FeedSourceTableRow
-                      comparisonColumn="DEPLOYED"
-                      comparisonValidationSummary={
-                        Object {
-                          "agencies": null,
-                          "agencyCount": 1,
-                          "avgDailyRevenueTime": 0,
-                          "bounds": Object {
-                            "east": -76.481211,
-                            "north": 39.0486949672717,
-                            "south": 38.92884,
-                            "west": -76.5673055566884,
-                          },
-                          "endDate": "20190801",
-                          "errorCount": 78,
-                          "feedVersionId": "mock-feed-version-id",
-                          "loadFailureReason": null,
-                          "loadStatus": "SUCCESS",
-                          "routeCount": 10,
-                          "startDate": "20180801",
-                          "stopCount": 237,
-                          "stopTimesCount": 11170,
-                          "tripCount": 415,
-                        }
-                      }
-                      createDeploymentFromFeedSource={[Function]}
-                      createFeedSource={[Function]}
-                      deleteFeedSource={[Function]}
+                            <i
+                              className="fa fa-calendar-check-o fa-fw "
+                            />
+                          </Icon>
+                          Dates Valid
+                        </h4>
+                      </th>
+                      <th
+                        className="feed-version-column"
+                      >
+                        <h4>
+                          <Icon
+                            type="exclamation-triangle"
+                          >
+                            <i
+                              className="fa fa-exclamation-triangle fa-fw "
+                            />
+                          </Icon>
+                          Issues
+                        </h4>
+                      </th>
+                      <th />
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <Connect(FeedSourceTableRow)
                       feedSource={
                         Object {
                           "dateCreated": 1536195264564,
@@ -2524,6 +1532,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "retrievalMethod": "MANUALLY_UPLOADED",
                             "s3Url": null,
                             "snapshotVersion": null,
+                            "transformRules": Array [],
                             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                             "user": null,
                           }
@@ -2592,6 +1601,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       "retrievalMethod": "MANUALLY_UPLOADED",
                                       "s3Url": null,
                                       "snapshotVersion": null,
+                                      "transformRules": Array [],
                                       "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                       "user": null,
                                     },
@@ -2630,19 +1640,20 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "latest": null,
                                 "name": "mock-deployment",
                                 "organizationId": null,
-                                "osmFileId": null,
+                                "osmExtractUrl": null,
                                 "otpCommit": null,
                                 "otpVersion": null,
-                                "project": [Circular],
                                 "projectBounds": Object {
                                   "east": 0,
                                   "north": 0,
                                   "south": 0,
                                   "west": 0,
                                 },
+                                "projectId": "mock-project-with-deployments-id",
                                 "r5": false,
                                 "r5Version": null,
                                 "routerId": null,
+                                "skipOsmExtract": false,
                                 "user": null,
                               },
                             ],
@@ -2833,6 +1844,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   "retrievalMethod": "MANUALLY_UPLOADED",
                                   "s3Url": null,
                                   "snapshotVersion": null,
+                                  "transformRules": Array [],
                                   "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                   "user": null,
                                 }
@@ -3016,19 +2028,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   "stopCount": 237,
                                   "stopTimesCount": 11170,
                                   "tripCount": 415,
-                                },
-                                "latestVersionId": "mock-feed-version-id",
-                                "name": "test feed with a version",
-                                "noteCount": 0,
-                                "organizationId": null,
-                                "projectId": "mock-project-id",
-                                "publishedVersionId": null,
-                                "retrievalMethod": "MANUALLY_UPLOADED",
-                                "s3Url": null,
-                                "snapshotVersion": null,
-                                "transformRules": Array [],
-                                "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                "user": null,
+                                }
                               }
                               createDeploymentFromFeedSource={[Function]}
                               createFeedSource={[Function]}
@@ -3073,6 +2073,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   "retrievalMethod": "MANUALLY_UPLOADED",
                                   "s3Url": null,
                                   "snapshotVersion": null,
+                                  "transformRules": Array [],
                                   "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                   "user": null,
                                 }
@@ -3141,6 +2142,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                             "retrievalMethod": "MANUALLY_UPLOADED",
                                             "s3Url": null,
                                             "snapshotVersion": null,
+                                            "transformRules": Array [],
                                             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                             "user": null,
                                           },
@@ -3169,18 +2171,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                             "stopTimesCount": 11170,
                                             "tripCount": 415,
                                           },
-                                          "latestVersionId": "mock-feed-version-id",
-                                          "name": "test feed with a version",
-                                          "noteCount": 0,
-                                          "organizationId": null,
-                                          "projectId": "mock-project-id",
-                                          "publishedVersionId": null,
-                                          "retrievalMethod": "MANUALLY_UPLOADED",
-                                          "s3Url": null,
-                                          "snapshotVersion": null,
-                                          "transformRules": Array [],
-                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                          "user": null,
+                                          "version": 1,
                                         },
                                       ],
                                       "id": "mock-deployment-id-0",
@@ -3190,60 +2181,53 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       "latest": null,
                                       "name": "mock-deployment",
                                       "organizationId": null,
-                                      "osmFileId": null,
+                                      "osmExtractUrl": null,
                                       "otpCommit": null,
                                       "otpVersion": null,
-                                      "project": [Circular],
                                       "projectBounds": Object {
                                         "east": 0,
                                         "north": 0,
                                         "south": 0,
                                         "west": 0,
                                       },
-                                    ],
-                                    "id": "mock-deployment-id-0",
-                                    "invalidFeedSources": Array [],
-                                    "lastDeployed": null,
-                                    "lastUpdated": 1553292345726,
-                                    "latest": null,
-                                    "name": "mock-deployment",
-                                    "organizationId": null,
-                                    "osmExtractUrl": null,
-                                    "otpCommit": null,
-                                    "otpVersion": null,
-                                    "projectBounds": Object {
-                                      "east": 0,
-                                      "north": 0,
-                                      "south": 0,
-                                      "west": 0,
+                                      "projectId": "mock-project-with-deployments-id",
+                                      "r5": false,
+                                      "r5Version": null,
+                                      "routerId": null,
+                                      "skipOsmExtract": false,
+                                      "user": null,
                                     },
-                                    "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
-                                    "routerId": null,
-                                    "skipOsmExtract": false,
-                                    "user": null,
-                                  },
-                                ],
-                                "feedSources": Array [
-                                  Object {
-                                    "dateCreated": 1536195264564,
-                                    "deployable": false,
-                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                    "externalProperties": Object {},
-                                    "id": "mock-feed-with-version-id",
-                                    "isPublic": false,
-                                    "lastFetched": 1543389038810,
-                                    "lastUpdated": 1543389038810,
-                                    "latestValidation": Object {
-                                      "agencies": null,
-                                      "agencyCount": 1,
-                                      "avgDailyRevenueTime": 0,
-                                      "bounds": Object {
-                                        "east": -76.481211,
-                                        "north": 39.0486949672717,
-                                        "south": 38.92884,
-                                        "west": -76.5673055566884,
+                                  ],
+                                  "feedSources": Array [
+                                    Object {
+                                      "dateCreated": 1536195264564,
+                                      "deployable": false,
+                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                      "externalProperties": Object {},
+                                      "id": "mock-feed-with-version-id",
+                                      "isPublic": false,
+                                      "lastFetched": 1543389038810,
+                                      "lastUpdated": 1543389038810,
+                                      "latestValidation": Object {
+                                        "agencies": null,
+                                        "agencyCount": 1,
+                                        "avgDailyRevenueTime": 0,
+                                        "bounds": Object {
+                                          "east": -76.481211,
+                                          "north": 39.0486949672717,
+                                          "south": 38.92884,
+                                          "west": -76.5673055566884,
+                                        },
+                                        "endDate": "20190801",
+                                        "errorCount": 78,
+                                        "feedVersionId": "mock-feed-version-id",
+                                        "loadFailureReason": null,
+                                        "loadStatus": "SUCCESS",
+                                        "routeCount": 10,
+                                        "startDate": "20180801",
+                                        "stopCount": 237,
+                                        "stopTimesCount": 11170,
+                                        "tripCount": 415,
                                       },
                                       "latestVersionId": "mock-feed-version-id",
                                       "name": "test feed with a version",
@@ -3254,21 +2238,24 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       "retrievalMethod": "MANUALLY_UPLOADED",
                                       "s3Url": null,
                                       "snapshotVersion": null,
+                                      "transformRules": Array [],
                                       "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                       "user": null,
                                     },
-                                    "latestVersionId": "mock-feed-version-id",
-                                    "name": "test feed with a version",
-                                    "noteCount": 0,
-                                    "organizationId": null,
-                                    "projectId": "mock-project-id",
-                                    "publishedVersionId": null,
-                                    "retrievalMethod": "MANUALLY_UPLOADED",
-                                    "s3Url": null,
-                                    "snapshotVersion": null,
-                                    "transformRules": Array [],
-                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                    "user": null,
+                                  ],
+                                  "id": "mock-project-with-deployments-id",
+                                  "lastUpdated": 1553236399556,
+                                  "name": "mock-project-with-deployments",
+                                  "organizationId": null,
+                                  "otpServers": Array [],
+                                  "pinnedDeploymentId": null,
+                                  "routerConfig": Object {
+                                    "carDropoffTime": null,
+                                    "numItineraries": null,
+                                    "requestLogFile": null,
+                                    "stairsReluctance": null,
+                                    "updaters": null,
+                                    "walkSpeed": null,
                                   },
                                   "useCustomOsmBounds": false,
                                   "user": null,

From cace9b30719289837eadcfd4909df818f22b58cd Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 9 Nov 2020 11:42:37 -0500
Subject: [PATCH 027/553] refactor(FeedVersions*): Cleanup code

---
 lib/manager/actions/versions.js                        |  8 ++++----
 lib/manager/components/version/FeedVersionDetails.js   |  4 ----
 lib/manager/components/version/FeedVersionNavigator.js |  1 +
 lib/manager/components/version/FeedVersionSpanChart.js |  1 -
 lib/manager/components/version/FeedVersionViewer.js    | 10 ++++------
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index d58c01f29..983339613 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -604,10 +604,10 @@ export function setComparedVersionIndex (
   return function (dispatch: dispatchFn, getState: getStateFn) {
     if (feed.feedVersions) {
       dispatch(setComparedVersion(feed.feedVersions[index - 1]))
-      if (push) {
-        // TODO:
-        // browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${activeIndex}/compareto/${index}`)
-      }
+      // TODO: add support for URL/browser history, e.g.:
+      // if (push) {
+      //   browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${activeIndex}/compareto/${index}`)
+      // }
     } else {
       console.warn('No feed versions for feed were found.', feed)
     }
diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index ce3858488..6a2d60ab8 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -28,7 +28,6 @@ type Props = {
   comparedVersion: ?FeedVersion,
   comparedVersionIndex: ?number,
   feedSource: Feed,
-  feedVersionIndex: number,
   gtfsPlusValidation: GtfsPlusValidation,
   mergeVersions: typeof versionsActions.mergeVersions,
   publishFeedVersion: typeof versionsActions.publishFeedVersion,
@@ -92,7 +91,6 @@ export default class FeedVersionDetails extends Component<Props> {
       comparedVersion,
       comparedVersionIndex,
       feedSource,
-      feedVersionIndex,
       gtfsPlusValidation,
       user,
       version
@@ -170,7 +168,6 @@ export default class FeedVersionDetails extends Component<Props> {
           </span>
           {' '}
           <VersionDateLabel version={version} />
-
           {(hasBlockingIssue || hasGtfsPlusBlockingIssue) &&
             isExtensionEnabled('mtc') &&
             <div
@@ -196,7 +193,6 @@ export default class FeedVersionDetails extends Component<Props> {
         {comparedVersion && comparedVersionIndex && (
           <FeedVersionSpanChart
             activeVersion={version}
-            activeVersionIndex={feedVersionIndex}
             comparedVersion={comparedVersion}
             comparedVersionIndex={comparedVersionIndex}
           />
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 907b42125..a4d71aa15 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -19,6 +19,7 @@ import * as deploymentActions from '../../../manager/actions/deployments'
 import DeploymentPreviewButton from '../DeploymentPreviewButton'
 import FeedVersionViewer from './FeedVersionViewer'
 import VersionSelectorDropdown, {DefaultItemFormatter} from './VersionSelectorDropdown'
+
 import type {Props as ContainerProps} from '../../containers/ActiveFeedVersionNavigator'
 import type {FeedVersion, GtfsPlusValidation, Note} from '../../../types'
 import type {GtfsState, ManagerUserState} from '../../../types/reducers'
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 4bc3bd34c..2aa334fcb 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -8,7 +8,6 @@ import type { FeedVersion } from '../../../types'
 
 type Props = {
   activeVersion: FeedVersion,
-  activeVersionIndex: number,
   comparedVersion: FeedVersion,
   comparedVersionIndex: number
 }
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 738ad4672..7a2037883 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -187,11 +187,9 @@ class VersionSectionSelector extends Component<SelectorProps> {
     }
 
     return (
-      <span>
-        <BsLabel className={`gtfs-error-${highestPriority}-label-solid`}>
-          {text} {diffLabel}
-        </BsLabel>
-      </span>
+      <BsLabel className={`gtfs-error-${highestPriority}-label-solid`}>
+        {text} {diffLabel}
+      </BsLabel>
     )
   }
 
@@ -251,7 +249,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
             active={versionSection === 'comments'}>
             <ListGroupItem>
               <Glyphicon glyph='comment' /> Version comments{' '}
-              <BsLabel htmlFor>{version.noteCount}</BsLabel>
+              <BsLabel>{version.noteCount}</BsLabel>
             </ListGroupItem>
           </LinkContainer>
         </ListGroup>

From 9fee1f3695bf84e9424fca2e87c41aa134c1ea89 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 9 Nov 2020 11:44:39 -0500
Subject: [PATCH 028/553] chore(deps): Use dev dependencies

---
 package.json |  2 +-
 yarn.lock    | 93 +++++++++++++---------------------------------------
 2 files changed, 24 insertions(+), 71 deletions(-)

diff --git a/package.json b/package.json
index f6a9157e4..d19ea6ab3 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "react": "^15.4.1",
     "react-addons-shallow-compare": "^15.4.1",
     "react-addons-update": "^15.4.1",
-    "react-bootstrap": "^0.33",
+    "react-bootstrap": "^0.30.0-rc.2",
     "react-bootstrap-datetimepicker": "^0.0.22",
     "react-bootstrap-table": "https://github.com/conveyal/react-bootstrap-table.git",
     "react-color": "^2.3.4",
diff --git a/yarn.lock b/yarn.lock
index 1ef28bce2..b6938c584 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -721,14 +721,6 @@
     "@babel/plugin-transform-react-jsx-self" "^7.0.0"
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
-"@babel/runtime-corejs2@^7.0.0":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.8.3.tgz#b62a61e0c41a90d2d91181fda6de21cecd3a9734"
-  integrity sha512-yxJXBKdIogkfF+wgeJrvU7Afp5ugBi92NzSgNPWWKVoQAlixH3gwMP6yYYr7SV1Dbc0HmNw7WUJkV5ksvtQuHg==
-  dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.2"
-
 "@babel/runtime-corejs2@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.5.5.tgz#c3214c08ef20341af4187f1c9fbdc357fbec96b2"
@@ -758,13 +750,6 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.6.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1"
-  integrity sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
 "@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
@@ -1351,24 +1336,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.8.tgz#e5d71173c95533be9842b2c798978f095f912aab"
   integrity sha512-szA3x/3miL90ZJxUCzx9haNbK5/zmPieGraZEe4WI+3srN0eGLiT22NXeMHmyhNEopn+IrxqMc7wdVwvPl8meg==
 
-"@types/prop-types@*":
-  version "15.7.3"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
-  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
-
 "@types/q@^1.5.1":
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
-"@types/react@^16.9.11":
-  version "16.9.19"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.19.tgz#c842aa83ea490007d29938146ff2e4d9e4360c40"
-  integrity sha512-LJV97//H+zqKWMms0kvxaKYJDG05U2TtQB3chRLF8MPNs+MQh/H1aGlyDUxjaHvu08EAGerdX2z4LTBc7ns77A==
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^2.2.0"
-
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -3840,11 +3812,6 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
-csstype@^2.2.0:
-  version "2.6.8"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.8.tgz#0fb6fc2417ffd2816a418c9336da74d7f07db431"
-  integrity sha512-msVS9qTuMT5zwAGCVm4mxfrZ18BNc6Csd0oJAtiFMZ1FAx1CCvy2+5MDmYoix63LM/6NDbNtodCiGYGmFgO0dA==
-
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -7615,7 +7582,7 @@ jwt-decode@^2.1.0:
   resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-2.2.0.tgz#7d86bd56679f58ce6a84704a657dd392bba81a79"
   integrity sha1-fYa9VmefWM5qhHBKZX3TkruoGnk=
 
-keycode@^2.2.0:
+keycode@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
   integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
@@ -11214,22 +11181,20 @@ react-bootstrap-datetimepicker@^0.0.22:
     classnames "^2.1.2"
     react-modal "^1.4.0"
 
-react-bootstrap@^0.33:
-  version "0.33.1"
-  resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-0.33.1.tgz#e072592aa143b9792526281272eca754bc9a4940"
-  integrity sha512-qWTRravSds87P8WC82tETy2yIso8qDqlIm0czsrduCaYAFtHuyLu0XDbUlfLXeRzqgwm5sRk2wRaTNoiVkk/YQ==
+react-bootstrap@^0.30.0-rc.2:
+  version "0.30.10"
+  resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-0.30.10.tgz#dbba6909595f2af4d91937db0f96ec8c2df2d1a8"
+  integrity sha1-27ppCVlfKvTZGTfbD5bsjC3y0ag=
   dependencies:
-    "@babel/runtime-corejs2" "^7.0.0"
+    babel-runtime "^6.11.6"
     classnames "^2.2.5"
     dom-helpers "^3.2.0"
-    invariant "^2.2.4"
-    keycode "^2.2.0"
-    prop-types "^15.6.1"
-    prop-types-extra "^1.0.1"
-    react-overlays "^0.9.0"
+    invariant "^2.2.1"
+    keycode "^2.1.2"
+    prop-types "^15.5.6"
+    react-overlays "^0.6.12"
     react-prop-types "^0.4.0"
-    react-transition-group "^2.0.0"
-    uncontrollable "^7.0.2"
+    uncontrollable "^4.0.1"
     warning "^3.0.0"
 
 react-color@^2.3.4:
@@ -11342,16 +11307,14 @@ react-modal@^1.4.0:
     prop-types "^15.5.7"
     react-dom-factories "^1.0.0"
 
-react-overlays@^0.9.0:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.9.1.tgz#d4702bfe5b5e9335b676ff5a940253771fdeed12"
-  integrity sha512-b0asy/zHtRd0i2+2/uNxe3YVprF3bRT1guyr791DORjCzE/HSBMog+ul83CdtKQ1kZ+pLnxWCu5W3BMysFhHdQ==
+react-overlays@^0.6.12:
+  version "0.6.12"
+  resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.6.12.tgz#a079c750cc429d7db4c7474a95b4b54033e255c3"
+  integrity sha1-oHnHUMxCnX20x0dKlbS1QDPiVcM=
   dependencies:
     classnames "^2.2.5"
-    dom-helpers "^3.2.1"
-    prop-types "^15.5.10"
-    prop-types-extra "^1.0.1"
-    react-transition-group "^2.2.1"
+    dom-helpers "^3.2.0"
+    react-prop-types "^0.4.0"
     warning "^3.0.0"
 
 react-prop-types@^0.4.0:
@@ -11446,7 +11409,7 @@ react-transition-group@^2.2.1, react-transition-group@^2.6.1:
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
   integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
   dependencies:
-    dom-helpers "^3.3.1"
+    dom-helpers "^3.4.0"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"
@@ -13769,15 +13732,12 @@ umd@^3.0.0:
   resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf"
   integrity sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==
 
-uncontrollable@^7.0.2:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.1.1.tgz#f67fed3ef93637126571809746323a9db815d556"
-  integrity sha512-EcPYhot3uWTS3w00R32R2+vS8Vr53tttrvMj/yA1uYRhf8hbTG2GyugGqWDY0qIskxn0uTTojVd6wPYW9ZEf8Q==
+uncontrollable@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-4.1.0.tgz#e0358291252e1865222d90939b19f2f49f81c1a9"
+  integrity sha1-4DWCkSUuGGUiLZCTmxny9J+Bwak=
   dependencies:
-    "@babel/runtime" "^7.6.3"
-    "@types/react" "^16.9.11"
-    invariant "^2.2.4"
-    react-lifecycles-compat "^3.0.4"
+    invariant "^2.1.0"
 
 undeclared-identifiers@^1.1.2:
   version "1.1.3"
@@ -14112,13 +14072,6 @@ warning@^3.0.0:
   dependencies:
     loose-envify "^1.0.0"
 
-warning@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
-  integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==
-  dependencies:
-    loose-envify "^1.0.0"
-
 watchify-middleware@^1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/watchify-middleware/-/watchify-middleware-1.8.2.tgz#be84fd318049cc281f0a1da274410f9ba45a7c1e"

From 97ad860ac3ca643a88bea6ea4794835f140a6853 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 9 Nov 2020 11:52:45 -0500
Subject: [PATCH 029/553] revert: Revert commit 288d002

---
 .../__snapshots__/ActiveProjectViewer.js.snap | 1807 ++++++-
 .../__snapshots__/DeploymentsPanel.js.snap    | 1830 ++++---
 .../__snapshots__/FeedSourceTable.js.snap     | 4395 +++++++++++------
 3 files changed, 5464 insertions(+), 2568 deletions(-)

diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 15b389d07..d494bc823 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -196,14 +196,11 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
               keyboard={true}
               manager={
                 ModalManager {
-                  "add": [Function],
                   "containers": Array [],
                   "data": Array [],
                   "handleContainerOverflow": true,
                   "hideSiblingNodes": true,
-                  "isTopModal": [Function],
                   "modals": Array [],
-                  "remove": [Function],
                 }
               }
               onHide={[Function]}
@@ -215,26 +212,23 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                 autoFocus={true}
                 backdrop={true}
                 backdropClassName="modal-backdrop"
-                backdropTransition={[Function]}
+                backdropTransitionTimeout={150}
                 containerClassName="modal-open"
+                dialogTransitionTimeout={300}
                 enforceFocus={true}
                 keyboard={true}
                 manager={
                   ModalManager {
-                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
-                    "isTopModal": [Function],
                     "modals": Array [],
-                    "remove": [Function],
                   }
                 }
                 onEntering={[Function]}
                 onExited={[Function]}
                 onHide={[Function]}
-                onMouseUp={[Function]}
                 renderBackdrop={[Function]}
                 restoreFocus={true}
                 show={false}
@@ -253,14 +247,11 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
               keyboard={true}
               manager={
                 ModalManager {
-                  "add": [Function],
                   "containers": Array [],
                   "data": Array [],
                   "handleContainerOverflow": true,
                   "hideSiblingNodes": true,
-                  "isTopModal": [Function],
                   "modals": Array [],
-                  "remove": [Function],
                 }
               }
               onHide={[Function]}
@@ -272,26 +263,23 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                 autoFocus={true}
                 backdrop={true}
                 backdropClassName="modal-backdrop"
-                backdropTransition={[Function]}
+                backdropTransitionTimeout={150}
                 containerClassName="modal-open"
+                dialogTransitionTimeout={300}
                 enforceFocus={true}
                 keyboard={true}
                 manager={
                   ModalManager {
-                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
-                    "isTopModal": [Function],
                     "modals": Array [],
-                    "remove": [Function],
                   }
                 }
                 onEntering={[Function]}
                 onExited={[Function]}
                 onHide={[Function]}
-                onMouseUp={[Function]}
                 renderBackdrop={[Function]}
                 restoreFocus={true}
                 show={false}
@@ -310,14 +298,11 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
               keyboard={true}
               manager={
                 ModalManager {
-                  "add": [Function],
                   "containers": Array [],
                   "data": Array [],
                   "handleContainerOverflow": true,
                   "hideSiblingNodes": true,
-                  "isTopModal": [Function],
                   "modals": Array [],
-                  "remove": [Function],
                 }
               }
               onHide={[Function]}
@@ -329,26 +314,23 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                 autoFocus={true}
                 backdrop={true}
                 backdropClassName="modal-backdrop"
-                backdropTransition={[Function]}
+                backdropTransitionTimeout={150}
                 containerClassName="modal-open"
+                dialogTransitionTimeout={300}
                 enforceFocus={true}
                 keyboard={true}
                 manager={
                   ModalManager {
-                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
-                    "isTopModal": [Function],
                     "modals": Array [],
-                    "remove": [Function],
                   }
                 }
                 onEntering={[Function]}
                 onExited={[Function]}
                 onHide={[Function]}
-                onMouseUp={[Function]}
                 renderBackdrop={[Function]}
                 restoreFocus={true}
                 show={false}
@@ -371,14 +353,11 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                 keyboard={true}
                 manager={
                   ModalManager {
-                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
-                    "isTopModal": [Function],
                     "modals": Array [],
-                    "remove": [Function],
                   }
                 }
                 onHide={[Function]}
@@ -390,26 +369,23 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                   autoFocus={true}
                   backdrop={true}
                   backdropClassName="modal-backdrop"
-                  backdropTransition={[Function]}
+                  backdropTransitionTimeout={150}
                   containerClassName="modal-open"
+                  dialogTransitionTimeout={300}
                   enforceFocus={true}
                   keyboard={true}
                   manager={
                     ModalManager {
-                      "add": [Function],
                       "containers": Array [],
                       "data": Array [],
                       "handleContainerOverflow": true,
                       "hideSiblingNodes": true,
-                      "isTopModal": [Function],
                       "modals": Array [],
-                      "remove": [Function],
                     }
                   }
                   onEntering={[Function]}
                   onExited={[Function]}
                   onHide={[Function]}
-                  onMouseUp={[Function]}
                   renderBackdrop={[Function]}
                   restoreFocus={true}
                   show={false}
@@ -1884,18 +1860,18 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                       eventKey="sources"
                                     >
                                       <Fade
-                                        appear={false}
                                         in={true}
                                         mountOnEnter={true}
                                         onEnter={[Function]}
                                         onExited={[Function]}
                                         timeout={300}
+                                        transitionAppear={false}
                                         unmountOnExit={false}
                                       >
                                         <Transition
-                                          appear={false}
-                                          enter={true}
-                                          exit={true}
+                                          className="fade"
+                                          enteredClassName="in"
+                                          enteringClassName="in"
                                           in={true}
                                           mountOnEnter={true}
                                           onEnter={[Function]}
@@ -1905,12 +1881,13 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                           onExited={[Function]}
                                           onExiting={[Function]}
                                           timeout={300}
+                                          transitionAppear={false}
                                           unmountOnExit={false}
                                         >
                                           <div
                                             aria-hidden={false}
                                             aria-labelledby="project-viewer-tabs-tab-sources"
-                                            className="fade tab-pane active in"
+                                            className="tab-pane active fade in"
                                             id="project-viewer-tabs-pane-sources"
                                             role="tabpanel"
                                           >
@@ -2082,7 +2059,10 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           }
                                                         }
                                                       >
-                                                        <Uncontrolled(Panel)
+                                                        <Panel
+                                                          bsClass="panel"
+                                                          bsStyle="default"
+                                                          defaultExpanded={false}
                                                           header={
                                                             <Connect(ProjectFeedListToolbar)
                                                               onNewFeedSourceClick={[Function]}
@@ -2123,11 +2103,14 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                             />
                                                           }
                                                         >
-                                                          <Panel
-                                                            bsClass="panel"
-                                                            bsStyle="default"
-                                                            header={
+                                                          <div
+                                                            className="panel panel-default"
+                                                          >
+                                                            <div
+                                                              className="panel-heading"
+                                                            >
                                                               <Connect(ProjectFeedListToolbar)
+                                                                className="panel-title"
                                                                 onNewFeedSourceClick={[Function]}
                                                                 project={
                                                                   Object {
@@ -2163,15 +2146,35 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                     "user": null,
                                                                   }
                                                                 }
-                                                              />
-                                                            }
-                                                            onToggle={[Function]}
-                                                          >
-                                                            <div
-                                                              className="panel panel-default"
-                                                              header={
-                                                                <Connect(ProjectFeedListToolbar)
+                                                              >
+                                                                <ProjectFeedListToolbar
+                                                                  calculateFeedSourceTableComparisonColumn={[Function]}
+                                                                  className="panel-title"
+                                                                  downloadFeedForProject={[Function]}
+                                                                  fetchFeedsForProject={[Function]}
+                                                                  filter={
+                                                                    Object {
+                                                                      "feedSourceTableComparisonColumn": null,
+                                                                      "feedSourceTableFilterCountStrategy": "LATEST",
+                                                                      "filter": null,
+                                                                      "searchText": null,
+                                                                    }
+                                                                  }
+                                                                  filterCounts={
+                                                                    Object {
+                                                                      "active": 0,
+                                                                      "all": 0,
+                                                                      "expired": 0,
+                                                                      "expiring": 0,
+                                                                      "future": 0,
+                                                                    }
+                                                                  }
                                                                   onNewFeedSourceClick={[Function]}
+                                                                  possibleComparisons={
+                                                                    Array [
+                                                                      "LATEST",
+                                                                    ]
+                                                                  }
                                                                   project={
                                                                     Object {
                                                                       "autoFetchFeeds": true,
@@ -2206,60 +2209,1501 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                       "user": null,
                                                                     }
                                                                   }
-                                                                />
-                                                              }
+                                                                  projectEditDisabled={false}
+                                                                  setFeedSort={[Function]}
+                                                                  setFeedSourceTableFilterCountStrategy={[Function]}
+                                                                  setVisibilityFilter={[Function]}
+                                                                  setVisibilitySearchText={[Function]}
+                                                                  sort="alphabetically-asc"
+                                                                  thirdPartySync={[Function]}
+                                                                  user={
+                                                                    Object {
+                                                                      "isCheckingLogin": false,
+                                                                      "permissions": UserPermissions {
+                                                                        "appPermissionLookup": Object {
+                                                                          "administer-application": Object {
+                                                                            "type": "administer-application",
+                                                                          },
+                                                                        },
+                                                                        "orgPermissionLookup": Object {},
+                                                                        "organizationLookup": Object {},
+                                                                        "projectLookup": Object {},
+                                                                      },
+                                                                      "profile": Object {
+                                                                        "app_metadata": Object {
+                                                                          "datatools": Array [
+                                                                            Object {
+                                                                              "client_id": "mock-client-id",
+                                                                              "organizations": Array [],
+                                                                              "permissions": Array [
+                                                                                Object {
+                                                                                  "type": "administer-application",
+                                                                                },
+                                                                              ],
+                                                                              "projects": Array [],
+                                                                              "subscriptions": Array [],
+                                                                            },
+                                                                          ],
+                                                                        },
+                                                                        "clientID": "mock-client-id",
+                                                                        "created_at": "2016-03-04T18:59:22.569Z",
+                                                                        "email": "mock-user@conveyal.com",
+                                                                        "email_verified": true,
+                                                                        "identities": Array [
+                                                                          Object {
+                                                                            "connection": "Username-Password-Authentication",
+                                                                            "isSocial": false,
+                                                                            "provider": "auth0",
+                                                                            "user_id": "12345",
+                                                                          },
+                                                                        ],
+                                                                        "jti": "gibberish",
+                                                                        "last_password_reset": "2017-07-13T13:58:01.021Z",
+                                                                        "name": "mock-user@conveyal.com",
+                                                                        "nickname": "mock-user",
+                                                                        "persistent": Object {},
+                                                                        "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
+                                                                        "sub": "auth0|12345",
+                                                                        "updated_at": "2019-03-21T19:05:30.180Z",
+                                                                        "user_id": "auth0|12345",
+                                                                        "user_metadata": Object {
+                                                                          "datatools": Array [
+                                                                            Object {
+                                                                              "client_id": "mock-client-id",
+                                                                              "editor": Object {
+                                                                                "map_id": "mapbox.streets",
+                                                                              },
+                                                                              "hideTutorial": true,
+                                                                              "sidebarExpanded": false,
+                                                                            },
+                                                                          ],
+                                                                          "lang": "en",
+                                                                        },
+                                                                      },
+                                                                      "recentActivity": null,
+                                                                      "redirectOnSuccess": null,
+                                                                      "subscriptions": UserSubscriptions {
+                                                                        "subscriptionLookup": Object {},
+                                                                      },
+                                                                      "token": "mock-token",
+                                                                    }
+                                                                  }
+                                                                >
+                                                                  <Row
+                                                                    bsClass="row"
+                                                                    componentClass="div"
+                                                                  >
+                                                                    <div
+                                                                      className="row"
+                                                                    >
+                                                                      <Col
+                                                                        bsClass="col"
+                                                                        componentClass="div"
+                                                                        style={
+                                                                          Object {
+                                                                            "marginTop": 25,
+                                                                          }
+                                                                        }
+                                                                        xs={4}
+                                                                      >
+                                                                        <div
+                                                                          className="col-xs-4"
+                                                                          style={
+                                                                            Object {
+                                                                              "marginTop": 25,
+                                                                            }
+                                                                          }
+                                                                        >
+                                                                          <Form
+                                                                            bsClass="form"
+                                                                            componentClass="form"
+                                                                            horizontal={false}
+                                                                            inline={true}
+                                                                            style={
+                                                                              Object {
+                                                                                "display": "inline",
+                                                                              }
+                                                                            }
+                                                                          >
+                                                                            <form
+                                                                              className="form-inline"
+                                                                              style={
+                                                                                Object {
+                                                                                  "display": "inline",
+                                                                                }
+                                                                              }
+                                                                            >
+                                                                              <FormGroup
+                                                                                bsClass="form-group"
+                                                                                className="feed-source-toolbar-formgroup"
+                                                                                controlId="formControlsSelect"
+                                                                              >
+                                                                                <div
+                                                                                  className="feed-source-toolbar-formgroup form-group"
+                                                                                >
+                                                                                  <FormControl
+                                                                                    bsClass="form-control"
+                                                                                    componentClass="input"
+                                                                                    onChange={[Function]}
+                                                                                    placeholder="Search by name"
+                                                                                  >
+                                                                                    <input
+                                                                                      className="form-control"
+                                                                                      id="formControlsSelect"
+                                                                                      onChange={[Function]}
+                                                                                      placeholder="Search by name"
+                                                                                    />
+                                                                                  </FormControl>
+                                                                                </div>
+                                                                              </FormGroup>
+                                                                            </form>
+                                                                          </Form>
+                                                                          <DropdownButton
+                                                                            id="project-feedsource-table-sort-button"
+                                                                            style={
+                                                                              Object {
+                                                                                "marginLeft": 20,
+                                                                              }
+                                                                            }
+                                                                            title="Sort By"
+                                                                          >
+                                                                            <Uncontrolled(Dropdown)
+                                                                              id="project-feedsource-table-sort-button"
+                                                                            >
+                                                                              <Dropdown
+                                                                                bsClass="dropdown"
+                                                                                componentClass={[Function]}
+                                                                                id="project-feedsource-table-sort-button"
+                                                                                onToggle={[Function]}
+                                                                              >
+                                                                                <ButtonGroup
+                                                                                  block={false}
+                                                                                  bsClass="btn-group"
+                                                                                  className="dropdown"
+                                                                                  justified={false}
+                                                                                  vertical={false}
+                                                                                >
+                                                                                  <div
+                                                                                    className="dropdown btn-group"
+                                                                                  >
+                                                                                    <DropdownToggle
+                                                                                      bsClass="dropdown-toggle"
+                                                                                      bsRole="toggle"
+                                                                                      id="project-feedsource-table-sort-button"
+                                                                                      key=".0"
+                                                                                      onClick={[Function]}
+                                                                                      onKeyDown={[Function]}
+                                                                                      open={false}
+                                                                                      style={
+                                                                                        Object {
+                                                                                          "marginLeft": 20,
+                                                                                        }
+                                                                                      }
+                                                                                      useAnchor={false}
+                                                                                    >
+                                                                                      <Button
+                                                                                        active={false}
+                                                                                        aria-expanded={false}
+                                                                                        aria-haspopup={true}
+                                                                                        block={false}
+                                                                                        bsClass="btn"
+                                                                                        bsStyle="default"
+                                                                                        className="dropdown-toggle"
+                                                                                        disabled={false}
+                                                                                        id="project-feedsource-table-sort-button"
+                                                                                        onClick={[Function]}
+                                                                                        onKeyDown={[Function]}
+                                                                                        role="button"
+                                                                                        style={
+                                                                                          Object {
+                                                                                            "marginLeft": 20,
+                                                                                          }
+                                                                                        }
+                                                                                      >
+                                                                                        <button
+                                                                                          aria-expanded={false}
+                                                                                          aria-haspopup={true}
+                                                                                          className="dropdown-toggle btn btn-default"
+                                                                                          disabled={false}
+                                                                                          id="project-feedsource-table-sort-button"
+                                                                                          onClick={[Function]}
+                                                                                          onKeyDown={[Function]}
+                                                                                          role="button"
+                                                                                          style={
+                                                                                            Object {
+                                                                                              "marginLeft": 20,
+                                                                                            }
+                                                                                          }
+                                                                                          type="button"
+                                                                                        >
+                                                                                          Sort By
+                                                                                           
+                                                                                          <span
+                                                                                            className="caret"
+                                                                                          />
+                                                                                        </button>
+                                                                                      </Button>
+                                                                                    </DropdownToggle>
+                                                                                    <DropdownMenu
+                                                                                      bsClass="dropdown-menu"
+                                                                                      bsRole="menu"
+                                                                                      key=".1"
+                                                                                      labelledBy="project-feedsource-table-sort-button"
+                                                                                      onClose={[Function]}
+                                                                                      onSelect={[Function]}
+                                                                                      pullRight={false}
+                                                                                    >
+                                                                                      <RootCloseWrapper
+                                                                                        disabled={true}
+                                                                                        event="click"
+                                                                                        onRootClose={[Function]}
+                                                                                      >
+                                                                                        <ul
+                                                                                          aria-labelledby="project-feedsource-table-sort-button"
+                                                                                          className="dropdown-menu"
+                                                                                          role="menu"
+                                                                                        >
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={true}
+                                                                                            key=".$sort-header-note"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="dropdown-header"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="heading"
+                                                                                            >
+                                                                                              Note: sorting only available on latest version data
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={true}
+                                                                                            key=".$feed-sort-alphabetically-header"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="dropdown-header"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="heading"
+                                                                                            >
+                                                                                              Alphabetically
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-alphabetically-asc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  A-Z
+                                                                                                  <Icon
+                                                                                                    style={
+                                                                                                      Object {
+                                                                                                        "marginLeft": 6,
+                                                                                                      }
+                                                                                                    }
+                                                                                                    type="check"
+                                                                                                  >
+                                                                                                    <i
+                                                                                                      className="fa fa-check fa-fw "
+                                                                                                      style={
+                                                                                                        Object {
+                                                                                                          "marginLeft": 6,
+                                                                                                        }
+                                                                                                      }
+                                                                                                    />
+                                                                                                  </Icon>
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-alphabetically-desc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  Z-A
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={true}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-alphabetically-divider"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="divider"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="separator"
+                                                                                            />
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={true}
+                                                                                            key=".$feed-sort-endDate-header"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="dropdown-header"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="heading"
+                                                                                            >
+                                                                                              Expiration Date
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-endDate-asc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  Earliest-Latest
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-endDate-desc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  Latest-Earliest
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={true}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-endDate-divider"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="divider"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="separator"
+                                                                                            />
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={true}
+                                                                                            key=".$feed-sort-startDate-header"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="dropdown-header"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="heading"
+                                                                                            >
+                                                                                              Start Date
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-startDate-asc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  Earliest-Latest
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-startDate-desc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  Latest-Earliest
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={true}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-startDate-divider"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="divider"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="separator"
+                                                                                            />
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={true}
+                                                                                            key=".$feed-sort-lastUpdated-header"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="dropdown-header"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="heading"
+                                                                                            >
+                                                                                              Last Update
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-lastUpdated-asc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  Stale-Recent
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-lastUpdated-desc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  Recent-Stale
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={true}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-lastUpdated-divider"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="divider"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="separator"
+                                                                                            />
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={true}
+                                                                                            key=".$feed-sort-numErrors-header"
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className="dropdown-header"
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="heading"
+                                                                                            >
+                                                                                              Number of Issues
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-numErrors-asc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  Least-Most
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$feed-sort-numErrors-desc"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  Most-Least
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                        </ul>
+                                                                                      </RootCloseWrapper>
+                                                                                    </DropdownMenu>
+                                                                                  </div>
+                                                                                </ButtonGroup>
+                                                                              </Dropdown>
+                                                                            </Uncontrolled(Dropdown)>
+                                                                          </DropdownButton>
+                                                                        </div>
+                                                                      </Col>
+                                                                      <Col
+                                                                        bsClass="col"
+                                                                        componentClass="div"
+                                                                        xs={6}
+                                                                      >
+                                                                        <div
+                                                                          className="col-xs-6"
+                                                                        >
+                                                                          <FormGroup
+                                                                            bsClass="form-group"
+                                                                            id="feedFilterToolbarControl"
+                                                                          >
+                                                                            <div
+                                                                              className="form-group"
+                                                                              id="feedFilterToolbarControl"
+                                                                            >
+                                                                              <ControlLabel
+                                                                                bsClass="control-label"
+                                                                                srOnly={false}
+                                                                                style={
+                                                                                  Object {
+                                                                                    "display": "block",
+                                                                                  }
+                                                                                }
+                                                                              >
+                                                                                <label
+                                                                                  className="control-label"
+                                                                                  style={
+                                                                                    Object {
+                                                                                      "display": "block",
+                                                                                    }
+                                                                                  }
+                                                                                >
+                                                                                  Filter feed sources on
+                                                                                  <span
+                                                                                    style={
+                                                                                      Object {
+                                                                                        "marginLeft": 5,
+                                                                                        "marginRight": 5,
+                                                                                      }
+                                                                                    }
+                                                                                  >
+                                                                                    Latest
+                                                                                  </span>
+                                                                                  version
+                                                                                </label>
+                                                                              </ControlLabel>
+                                                                              <ButtonGroup
+                                                                                block={false}
+                                                                                bsClass="btn-group"
+                                                                                justified={false}
+                                                                                vertical={false}
+                                                                              >
+                                                                                <div
+                                                                                  className="btn-group"
+                                                                                >
+                                                                                  <OptionButton
+                                                                                    active={true}
+                                                                                    className="active"
+                                                                                    key="all"
+                                                                                    onClick={[Function]}
+                                                                                    value="all"
+                                                                                  >
+                                                                                    <Button
+                                                                                      active={true}
+                                                                                      block={false}
+                                                                                      bsClass="btn"
+                                                                                      bsStyle="default"
+                                                                                      className="active"
+                                                                                      disabled={false}
+                                                                                      href="#"
+                                                                                      onClick={[Function]}
+                                                                                      value="all"
+                                                                                    >
+                                                                                      <SafeAnchor
+                                                                                        className="active btn btn-default active"
+                                                                                        componentClass="a"
+                                                                                        disabled={false}
+                                                                                        href="#"
+                                                                                        onClick={[Function]}
+                                                                                        value="all"
+                                                                                      >
+                                                                                        <a
+                                                                                          className="active btn btn-default active"
+                                                                                          href="#"
+                                                                                          onClick={[Function]}
+                                                                                          role="button"
+                                                                                          value="all"
+                                                                                        >
+                                                                                          All
+                                                                                           
+                                                                                          <Badge
+                                                                                            bsClass="badge"
+                                                                                            pullRight={false}
+                                                                                            style={
+                                                                                              Object {
+                                                                                                "backgroundColor": "#babec0",
+                                                                                              }
+                                                                                            }
+                                                                                          >
+                                                                                            <span
+                                                                                              className="badge"
+                                                                                              style={
+                                                                                                Object {
+                                                                                                  "backgroundColor": "#babec0",
+                                                                                                }
+                                                                                              }
+                                                                                            >
+                                                                                              0
+                                                                                            </span>
+                                                                                          </Badge>
+                                                                                        </a>
+                                                                                      </SafeAnchor>
+                                                                                    </Button>
+                                                                                  </OptionButton>
+                                                                                  <OptionButton
+                                                                                    active={false}
+                                                                                    className=""
+                                                                                    key="active"
+                                                                                    onClick={[Function]}
+                                                                                    value="active"
+                                                                                  >
+                                                                                    <Button
+                                                                                      active={false}
+                                                                                      block={false}
+                                                                                      bsClass="btn"
+                                                                                      bsStyle="default"
+                                                                                      className=""
+                                                                                      disabled={false}
+                                                                                      href="#"
+                                                                                      onClick={[Function]}
+                                                                                      value="active"
+                                                                                    >
+                                                                                      <SafeAnchor
+                                                                                        className="btn btn-default"
+                                                                                        componentClass="a"
+                                                                                        disabled={false}
+                                                                                        href="#"
+                                                                                        onClick={[Function]}
+                                                                                        value="active"
+                                                                                      >
+                                                                                        <a
+                                                                                          className="btn btn-default"
+                                                                                          href="#"
+                                                                                          onClick={[Function]}
+                                                                                          role="button"
+                                                                                          value="active"
+                                                                                        >
+                                                                                          Active
+                                                                                           
+                                                                                          <Badge
+                                                                                            bsClass="badge"
+                                                                                            pullRight={false}
+                                                                                            style={
+                                                                                              Object {
+                                                                                                "backgroundColor": "#babec0",
+                                                                                              }
+                                                                                            }
+                                                                                          >
+                                                                                            <span
+                                                                                              className="badge"
+                                                                                              style={
+                                                                                                Object {
+                                                                                                  "backgroundColor": "#babec0",
+                                                                                                }
+                                                                                              }
+                                                                                            >
+                                                                                              0
+                                                                                            </span>
+                                                                                          </Badge>
+                                                                                        </a>
+                                                                                      </SafeAnchor>
+                                                                                    </Button>
+                                                                                  </OptionButton>
+                                                                                  <OptionButton
+                                                                                    active={false}
+                                                                                    className=""
+                                                                                    key="expiring"
+                                                                                    onClick={[Function]}
+                                                                                    value="expiring"
+                                                                                  >
+                                                                                    <Button
+                                                                                      active={false}
+                                                                                      block={false}
+                                                                                      bsClass="btn"
+                                                                                      bsStyle="default"
+                                                                                      className=""
+                                                                                      disabled={false}
+                                                                                      href="#"
+                                                                                      onClick={[Function]}
+                                                                                      value="expiring"
+                                                                                    >
+                                                                                      <SafeAnchor
+                                                                                        className="btn btn-default"
+                                                                                        componentClass="a"
+                                                                                        disabled={false}
+                                                                                        href="#"
+                                                                                        onClick={[Function]}
+                                                                                        value="expiring"
+                                                                                      >
+                                                                                        <a
+                                                                                          className="btn btn-default"
+                                                                                          href="#"
+                                                                                          onClick={[Function]}
+                                                                                          role="button"
+                                                                                          value="expiring"
+                                                                                        >
+                                                                                          Expiring
+                                                                                           
+                                                                                          <Badge
+                                                                                            bsClass="badge"
+                                                                                            pullRight={false}
+                                                                                            style={
+                                                                                              Object {
+                                                                                                "backgroundColor": "#babec0",
+                                                                                              }
+                                                                                            }
+                                                                                          >
+                                                                                            <span
+                                                                                              className="badge"
+                                                                                              style={
+                                                                                                Object {
+                                                                                                  "backgroundColor": "#babec0",
+                                                                                                }
+                                                                                              }
+                                                                                            >
+                                                                                              0
+                                                                                            </span>
+                                                                                          </Badge>
+                                                                                        </a>
+                                                                                      </SafeAnchor>
+                                                                                    </Button>
+                                                                                  </OptionButton>
+                                                                                  <OptionButton
+                                                                                    active={false}
+                                                                                    className=""
+                                                                                    key="expired"
+                                                                                    onClick={[Function]}
+                                                                                    value="expired"
+                                                                                  >
+                                                                                    <Button
+                                                                                      active={false}
+                                                                                      block={false}
+                                                                                      bsClass="btn"
+                                                                                      bsStyle="default"
+                                                                                      className=""
+                                                                                      disabled={false}
+                                                                                      href="#"
+                                                                                      onClick={[Function]}
+                                                                                      value="expired"
+                                                                                    >
+                                                                                      <SafeAnchor
+                                                                                        className="btn btn-default"
+                                                                                        componentClass="a"
+                                                                                        disabled={false}
+                                                                                        href="#"
+                                                                                        onClick={[Function]}
+                                                                                        value="expired"
+                                                                                      >
+                                                                                        <a
+                                                                                          className="btn btn-default"
+                                                                                          href="#"
+                                                                                          onClick={[Function]}
+                                                                                          role="button"
+                                                                                          value="expired"
+                                                                                        >
+                                                                                          Expired
+                                                                                           
+                                                                                          <Badge
+                                                                                            bsClass="badge"
+                                                                                            pullRight={false}
+                                                                                            style={
+                                                                                              Object {
+                                                                                                "backgroundColor": "#babec0",
+                                                                                              }
+                                                                                            }
+                                                                                          >
+                                                                                            <span
+                                                                                              className="badge"
+                                                                                              style={
+                                                                                                Object {
+                                                                                                  "backgroundColor": "#babec0",
+                                                                                                }
+                                                                                              }
+                                                                                            >
+                                                                                              0
+                                                                                            </span>
+                                                                                          </Badge>
+                                                                                        </a>
+                                                                                      </SafeAnchor>
+                                                                                    </Button>
+                                                                                  </OptionButton>
+                                                                                  <OptionButton
+                                                                                    active={false}
+                                                                                    className=""
+                                                                                    key="future"
+                                                                                    onClick={[Function]}
+                                                                                    value="future"
+                                                                                  >
+                                                                                    <Button
+                                                                                      active={false}
+                                                                                      block={false}
+                                                                                      bsClass="btn"
+                                                                                      bsStyle="default"
+                                                                                      className=""
+                                                                                      disabled={false}
+                                                                                      href="#"
+                                                                                      onClick={[Function]}
+                                                                                      value="future"
+                                                                                    >
+                                                                                      <SafeAnchor
+                                                                                        className="btn btn-default"
+                                                                                        componentClass="a"
+                                                                                        disabled={false}
+                                                                                        href="#"
+                                                                                        onClick={[Function]}
+                                                                                        value="future"
+                                                                                      >
+                                                                                        <a
+                                                                                          className="btn btn-default"
+                                                                                          href="#"
+                                                                                          onClick={[Function]}
+                                                                                          role="button"
+                                                                                          value="future"
+                                                                                        >
+                                                                                          Future
+                                                                                           
+                                                                                          <Badge
+                                                                                            bsClass="badge"
+                                                                                            pullRight={false}
+                                                                                            style={
+                                                                                              Object {
+                                                                                                "backgroundColor": "#babec0",
+                                                                                              }
+                                                                                            }
+                                                                                          >
+                                                                                            <span
+                                                                                              className="badge"
+                                                                                              style={
+                                                                                                Object {
+                                                                                                  "backgroundColor": "#babec0",
+                                                                                                }
+                                                                                              }
+                                                                                            >
+                                                                                              0
+                                                                                            </span>
+                                                                                          </Badge>
+                                                                                        </a>
+                                                                                      </SafeAnchor>
+                                                                                    </Button>
+                                                                                  </OptionButton>
+                                                                                </div>
+                                                                              </ButtonGroup>
+                                                                            </div>
+                                                                          </FormGroup>
+                                                                        </div>
+                                                                      </Col>
+                                                                      <Col
+                                                                        bsClass="col"
+                                                                        componentClass="div"
+                                                                        style={
+                                                                          Object {
+                                                                            "marginTop": 25,
+                                                                          }
+                                                                        }
+                                                                        xs={2}
+                                                                      >
+                                                                        <div
+                                                                          className="col-xs-2"
+                                                                          style={
+                                                                            Object {
+                                                                              "marginTop": 25,
+                                                                            }
+                                                                          }
+                                                                        >
+                                                                          <DropdownButton
+                                                                            bsStyle="primary"
+                                                                            data-test-id="project-header-action-dropdown-button"
+                                                                            id="project-header-actions"
+                                                                            style={
+                                                                              Object {
+                                                                                "marginLeft": 20,
+                                                                              }
+                                                                            }
+                                                                            title="Actions"
+                                                                          >
+                                                                            <Uncontrolled(Dropdown)
+                                                                              bsStyle="primary"
+                                                                              id="project-header-actions"
+                                                                            >
+                                                                              <Dropdown
+                                                                                bsClass="dropdown"
+                                                                                bsStyle="primary"
+                                                                                componentClass={[Function]}
+                                                                                id="project-header-actions"
+                                                                                onToggle={[Function]}
+                                                                              >
+                                                                                <ButtonGroup
+                                                                                  block={false}
+                                                                                  bsClass="btn-group"
+                                                                                  bsStyle="primary"
+                                                                                  className="dropdown"
+                                                                                  justified={false}
+                                                                                  vertical={false}
+                                                                                >
+                                                                                  <div
+                                                                                    className="dropdown btn-group btn-group-primary"
+                                                                                  >
+                                                                                    <DropdownToggle
+                                                                                      bsClass="dropdown-toggle"
+                                                                                      bsRole="toggle"
+                                                                                      bsStyle="primary"
+                                                                                      data-test-id="project-header-action-dropdown-button"
+                                                                                      id="project-header-actions"
+                                                                                      key=".0"
+                                                                                      onClick={[Function]}
+                                                                                      onKeyDown={[Function]}
+                                                                                      open={false}
+                                                                                      style={
+                                                                                        Object {
+                                                                                          "marginLeft": 20,
+                                                                                        }
+                                                                                      }
+                                                                                      useAnchor={false}
+                                                                                    >
+                                                                                      <Button
+                                                                                        active={false}
+                                                                                        aria-expanded={false}
+                                                                                        aria-haspopup={true}
+                                                                                        block={false}
+                                                                                        bsClass="btn"
+                                                                                        bsStyle="primary"
+                                                                                        className="dropdown-toggle"
+                                                                                        data-test-id="project-header-action-dropdown-button"
+                                                                                        disabled={false}
+                                                                                        id="project-header-actions"
+                                                                                        onClick={[Function]}
+                                                                                        onKeyDown={[Function]}
+                                                                                        role="button"
+                                                                                        style={
+                                                                                          Object {
+                                                                                            "marginLeft": 20,
+                                                                                          }
+                                                                                        }
+                                                                                      >
+                                                                                        <button
+                                                                                          aria-expanded={false}
+                                                                                          aria-haspopup={true}
+                                                                                          className="dropdown-toggle btn btn-primary"
+                                                                                          data-test-id="project-header-action-dropdown-button"
+                                                                                          disabled={false}
+                                                                                          id="project-header-actions"
+                                                                                          onClick={[Function]}
+                                                                                          onKeyDown={[Function]}
+                                                                                          role="button"
+                                                                                          style={
+                                                                                            Object {
+                                                                                              "marginLeft": 20,
+                                                                                            }
+                                                                                          }
+                                                                                          type="button"
+                                                                                        >
+                                                                                          Actions
+                                                                                           
+                                                                                          <span
+                                                                                            className="caret"
+                                                                                          />
+                                                                                        </button>
+                                                                                      </Button>
+                                                                                    </DropdownToggle>
+                                                                                    <DropdownMenu
+                                                                                      bsClass="dropdown-menu"
+                                                                                      bsRole="menu"
+                                                                                      key=".1"
+                                                                                      labelledBy="project-header-actions"
+                                                                                      onClose={[Function]}
+                                                                                      onSelect={[Function]}
+                                                                                      pullRight={false}
+                                                                                    >
+                                                                                      <RootCloseWrapper
+                                                                                        disabled={true}
+                                                                                        event="click"
+                                                                                        onRootClose={[Function]}
+                                                                                      >
+                                                                                        <ul
+                                                                                          aria-labelledby="project-header-actions"
+                                                                                          className="dropdown-menu"
+                                                                                          role="menu"
+                                                                                        >
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            data-test-id="project-header-create-new-feed-source-button"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$create-feedsource-button"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                data-test-id="project-header-create-new-feed-source-button"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  data-test-id="project-header-create-new-feed-source-button"
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  <Glyphicon
+                                                                                                    bsClass="glyphicon"
+                                                                                                    glyph="plus"
+                                                                                                  >
+                                                                                                    <span
+                                                                                                      className="glyphicon glyphicon-plus"
+                                                                                                    />
+                                                                                                  </Glyphicon>
+                                                                                                   
+                                                                                                  New
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$update-feeds-button"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  <Icon
+                                                                                                    type="cloud-download"
+                                                                                                  >
+                                                                                                    <i
+                                                                                                      className="fa fa-cloud-download fa-fw "
+                                                                                                    />
+                                                                                                  </Icon>
+                                                                                                   
+                                                                                                  Fetch all
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$merge-feeds-button"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  <Glyphicon
+                                                                                                    bsClass="glyphicon"
+                                                                                                    glyph="download"
+                                                                                                  >
+                                                                                                    <span
+                                                                                                      className="glyphicon glyphicon-download"
+                                                                                                    />
+                                                                                                  </Glyphicon>
+                                                                                                   
+                                                                                                  Merge all
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                          <MenuItem
+                                                                                            bsClass="dropdown"
+                                                                                            disabled={false}
+                                                                                            divider={false}
+                                                                                            header={false}
+                                                                                            key=".$csv-download-button"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            onSelect={[Function]}
+                                                                                          >
+                                                                                            <li
+                                                                                              className=""
+                                                                                              role="presentation"
+                                                                                            >
+                                                                                              <SafeAnchor
+                                                                                                componentClass="a"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="menuitem"
+                                                                                                tabIndex="-1"
+                                                                                              >
+                                                                                                <a
+                                                                                                  href="#"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="menuitem"
+                                                                                                  tabIndex="-1"
+                                                                                                >
+                                                                                                  <Icon
+                                                                                                    type="table"
+                                                                                                  >
+                                                                                                    <i
+                                                                                                      className="fa fa-table fa-fw "
+                                                                                                    />
+                                                                                                  </Icon>
+                                                                                                   
+                                                                                                  Download Summary as CSV
+                                                                                                </a>
+                                                                                              </SafeAnchor>
+                                                                                            </li>
+                                                                                          </MenuItem>
+                                                                                        </ul>
+                                                                                      </RootCloseWrapper>
+                                                                                    </DropdownMenu>
+                                                                                  </div>
+                                                                                </ButtonGroup>
+                                                                              </Dropdown>
+                                                                            </Uncontrolled(Dropdown)>
+                                                                          </DropdownButton>
+                                                                        </div>
+                                                                      </Col>
+                                                                    </div>
+                                                                  </Row>
+                                                                </ProjectFeedListToolbar>
+                                                              </Connect(ProjectFeedListToolbar)>
+                                                            </div>
+                                                            <ListGroup
+                                                              bsClass="list-group"
+                                                              key=".0"
                                                             >
-                                                              <ListGroup
-                                                                bsClass="list-group"
-                                                                fill={true}
+                                                              <ul
+                                                                className="list-group"
                                                               >
-                                                                <ul
-                                                                  className="list-group"
-                                                                  fill={true}
+                                                                <ListGroupItem
+                                                                  bsClass="list-group-item"
+                                                                  className="text-center"
+                                                                  key=".0"
+                                                                  listItem={true}
                                                                 >
-                                                                  <ListGroupItem
-                                                                    bsClass="list-group-item"
-                                                                    className="text-center"
-                                                                    key=".0"
-                                                                    listItem={true}
+                                                                  <li
+                                                                    className="text-center list-group-item"
                                                                   >
-                                                                    <li
-                                                                      className="text-center list-group-item"
+                                                                    <Button
+                                                                      active={false}
+                                                                      block={false}
+                                                                      bsClass="btn"
+                                                                      bsStyle="success"
+                                                                      data-test-id="create-first-feed-source-button"
+                                                                      disabled={false}
+                                                                      onClick={[Function]}
                                                                     >
-                                                                      <Button
-                                                                        active={false}
-                                                                        block={false}
-                                                                        bsClass="btn"
-                                                                        bsStyle="success"
+                                                                      <button
+                                                                        className="btn btn-success"
                                                                         data-test-id="create-first-feed-source-button"
                                                                         disabled={false}
                                                                         onClick={[Function]}
+                                                                        type="button"
                                                                       >
-                                                                        <button
-                                                                          className="btn btn-success"
-                                                                          data-test-id="create-first-feed-source-button"
-                                                                          disabled={false}
-                                                                          onClick={[Function]}
-                                                                          type="button"
+                                                                        <Icon
+                                                                          type="plus"
                                                                         >
-                                                                          <Icon
-                                                                            type="plus"
-                                                                          >
-                                                                            <i
-                                                                              className="fa fa-plus fa-fw "
-                                                                            />
-                                                                          </Icon>
-                                                                           
-                                                                          Create first feed source!
-                                                                        </button>
-                                                                      </Button>
-                                                                    </li>
-                                                                  </ListGroupItem>
-                                                                </ul>
-                                                              </ListGroup>
-                                                            </div>
-                                                          </Panel>
-                                                        </Uncontrolled(Panel)>
+                                                                          <i
+                                                                            className="fa fa-plus fa-fw "
+                                                                          />
+                                                                        </Icon>
+                                                                         
+                                                                        Create first feed source!
+                                                                      </button>
+                                                                    </Button>
+                                                                  </li>
+                                                                </ListGroupItem>
+                                                              </ul>
+                                                            </ListGroup>
+                                                          </div>
+                                                        </Panel>
                                                       </FeedSourceTable>
                                                     </Connect(FeedSourceTable)>
                                                   </div>
@@ -2369,7 +3813,10 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                         }
                                                       }
                                                     >
-                                                      <Uncontrolled(Panel)
+                                                      <Panel
+                                                        bsClass="panel"
+                                                        bsStyle="default"
+                                                        defaultExpanded={false}
                                                         header={
                                                           <h3>
                                                             mock-project
@@ -2377,103 +3824,95 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           </h3>
                                                         }
                                                       >
-                                                        <Panel
-                                                          bsClass="panel"
-                                                          bsStyle="default"
-                                                          header={
-                                                            <h3>
+                                                        <div
+                                                          className="panel panel-default"
+                                                        >
+                                                          <div
+                                                            className="panel-heading"
+                                                          >
+                                                            <h3
+                                                              className="panel-title"
+                                                            >
                                                               mock-project
                                                                summary
                                                             </h3>
-                                                          }
-                                                          onToggle={[Function]}
-                                                        >
-                                                          <div
-                                                            className="panel panel-default"
-                                                            header={
-                                                              <h3>
-                                                                mock-project
-                                                                 summary
-                                                              </h3>
-                                                            }
+                                                          </div>
+                                                          <ListGroup
+                                                            bsClass="list-group"
+                                                            key=".0"
                                                           >
-                                                            <ListGroup
-                                                              bsClass="list-group"
-                                                              fill={true}
+                                                            <ul
+                                                              className="list-group"
                                                             >
-                                                              <ul
-                                                                className="list-group"
-                                                                fill={true}
+                                                              <ListGroupItem
+                                                                bsClass="list-group-item"
+                                                                key=".0"
+                                                                listItem={true}
                                                               >
-                                                                <ListGroupItem
-                                                                  bsClass="list-group-item"
-                                                                  key=".0"
-                                                                  listItem={true}
+                                                                <li
+                                                                  className="list-group-item"
                                                                 >
-                                                                  <li
-                                                                    className="list-group-item"
-                                                                  >
-                                                                    Number of feeds: 
-                                                                    0
-                                                                  </li>
-                                                                </ListGroupItem>
-                                                                <ListGroupItem
-                                                                  bsClass="list-group-item"
-                                                                  key=".1"
-                                                                  listItem={true}
+                                                                  Number of feeds: 
+                                                                  0
+                                                                </li>
+                                                              </ListGroupItem>
+                                                              <ListGroupItem
+                                                                bsClass="list-group-item"
+                                                                key=".1"
+                                                                listItem={true}
+                                                              >
+                                                                <li
+                                                                  className="list-group-item"
                                                                 >
-                                                                  <li
-                                                                    className="list-group-item"
-                                                                  >
-                                                                    Total errors: 
-                                                                    0
-                                                                  </li>
-                                                                </ListGroupItem>
-                                                                <ListGroupItem
-                                                                  bsClass="list-group-item"
-                                                                  key=".2"
-                                                                  listItem={true}
+                                                                  Total errors: 
+                                                                  0
+                                                                </li>
+                                                              </ListGroupItem>
+                                                              <ListGroupItem
+                                                                bsClass="list-group-item"
+                                                                key=".2"
+                                                                listItem={true}
+                                                              >
+                                                                <li
+                                                                  className="list-group-item"
                                                                 >
-                                                                  <li
-                                                                    className="list-group-item"
-                                                                  >
-                                                                    Total service:
-                                                                     
-                                                                    0
-                                                                     
-                                                                    hours per weekday
-                                                                  </li>
-                                                                </ListGroupItem>
-                                                              </ul>
-                                                            </ListGroup>
-                                                          </div>
-                                                        </Panel>
-                                                      </Uncontrolled(Panel)>
+                                                                  Total service:
+                                                                   
+                                                                  0
+                                                                   
+                                                                  hours per weekday
+                                                                </li>
+                                                              </ListGroupItem>
+                                                            </ul>
+                                                          </ListGroup>
+                                                        </div>
+                                                      </Panel>
                                                     </ProjectSummaryPanel>
-                                                    <Uncontrolled(Panel)
+                                                    <Panel
+                                                      bsClass="panel"
+                                                      bsStyle="default"
+                                                      defaultExpanded={false}
                                                       header={
                                                         <h3>
                                                           What is a feed source?
                                                         </h3>
                                                       }
                                                     >
-                                                      <Panel
-                                                        bsClass="panel"
-                                                        bsStyle="default"
-                                                        header={
-                                                          <h3>
+                                                      <div
+                                                        className="panel panel-default"
+                                                      >
+                                                        <div
+                                                          className="panel-heading"
+                                                        >
+                                                          <h3
+                                                            className="panel-title"
+                                                          >
                                                             What is a feed source?
                                                           </h3>
-                                                        }
-                                                        onToggle={[Function]}
-                                                      >
+                                                        </div>
                                                         <div
-                                                          className="panel panel-default"
-                                                          header={
-                                                            <h3>
-                                                              What is a feed source?
-                                                            </h3>
-                                                          }
+                                                          className="panel-body"
+                                                          key="0"
                                                         >
                                                           A feed source defines the location or upstream source of a
                                                            
@@ -2481,8 +3920,8 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                            
                                                           directly editing or uploading a zip file.
                                                         </div>
-                                                      </Panel>
-                                                    </Uncontrolled(Panel)>
+                                                      </div>
+                                                    </Panel>
                                                   </div>
                                                 </Col>
                                               </div>
@@ -2515,18 +3954,18 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                       eventKey="deployments"
                                     >
                                       <Fade
-                                        appear={false}
                                         in={false}
                                         mountOnEnter={true}
                                         onEnter={[Function]}
                                         onExited={[Function]}
                                         timeout={300}
+                                        transitionAppear={false}
                                         unmountOnExit={false}
                                       >
                                         <Transition
-                                          appear={false}
-                                          enter={true}
-                                          exit={true}
+                                          className="fade"
+                                          enteredClassName="in"
+                                          enteringClassName="in"
                                           in={false}
                                           mountOnEnter={true}
                                           onEnter={[Function]}
@@ -2536,6 +3975,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                           onExited={[Function]}
                                           onExiting={[Function]}
                                           timeout={300}
+                                          transitionAppear={false}
                                           unmountOnExit={false}
                                         />
                                       </Fade>
@@ -2564,18 +4004,18 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                       eventKey="settings"
                                     >
                                       <Fade
-                                        appear={false}
                                         in={false}
                                         mountOnEnter={true}
                                         onEnter={[Function]}
                                         onExited={[Function]}
                                         timeout={300}
+                                        transitionAppear={false}
                                         unmountOnExit={false}
                                       >
                                         <Transition
-                                          appear={false}
-                                          enter={true}
-                                          exit={true}
+                                          className="fade"
+                                          enteredClassName="in"
+                                          enteringClassName="in"
                                           in={false}
                                           mountOnEnter={true}
                                           onEnter={[Function]}
@@ -2585,6 +4025,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                           onExited={[Function]}
                                           onExiting={[Function]}
                                           timeout={300}
+                                          transitionAppear={false}
                                           unmountOnExit={false}
                                         />
                                       </Fade>
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index 2598b8eb0..e48ea83b0 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -476,14 +476,11 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               keyboard={true}
               manager={
                 ModalManager {
-                  "add": [Function],
                   "containers": Array [],
                   "data": Array [],
                   "handleContainerOverflow": true,
                   "hideSiblingNodes": true,
-                  "isTopModal": [Function],
                   "modals": Array [],
-                  "remove": [Function],
                 }
               }
               onHide={[Function]}
@@ -495,26 +492,23 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                 autoFocus={true}
                 backdrop={true}
                 backdropClassName="modal-backdrop"
-                backdropTransition={[Function]}
+                backdropTransitionTimeout={150}
                 containerClassName="modal-open"
+                dialogTransitionTimeout={300}
                 enforceFocus={true}
                 keyboard={true}
                 manager={
                   ModalManager {
-                    "add": [Function],
                     "containers": Array [],
                     "data": Array [],
                     "handleContainerOverflow": true,
                     "hideSiblingNodes": true,
-                    "isTopModal": [Function],
                     "modals": Array [],
-                    "remove": [Function],
                   }
                 }
                 onEntering={[Function]}
                 onExited={[Function]}
                 onHide={[Function]}
-                onMouseUp={[Function]}
                 renderBackdrop={[Function]}
                 restoreFocus={true}
                 show={false}
@@ -754,7 +748,10 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                 updateDeployment={[Function]}
                 updateProject={[Function]}
               >
-                <Uncontrolled(Panel)
+                <Panel
+                  bsClass="panel"
+                  bsStyle="default"
+                  defaultExpanded={false}
                   header={
                     <Row
                       bsClass="row"
@@ -797,197 +794,144 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     </Row>
                   }
                 >
-                  <Panel
-                    bsClass="panel"
-                    bsStyle="default"
-                    header={
+                  <div
+                    className="panel panel-default"
+                  >
+                    <div
+                      className="panel-heading"
+                    >
                       <Row
                         bsClass="row"
+                        className="panel-title"
                         componentClass="div"
                       >
-                        <Col
-                          bsClass="col"
-                          componentClass="div"
-                          xs={4}
-                        >
-                          <FormControl
-                            bsClass="form-control"
-                            componentClass="input"
-                            onChange={[Function]}
-                            placeholder="Search for deployments"
-                          />
-                        </Col>
-                        <Col
-                          bsClass="col"
-                          componentClass="div"
-                          xs={8}
-                        >
-                          <Button
-                            active={false}
-                            block={false}
-                            bsClass="btn"
-                            bsStyle="success"
-                            className="pull-right"
-                            disabled={false}
-                            onClick={[Function]}
-                          >
-                            <Glyphicon
-                              bsClass="glyphicon"
-                              glyph="plus"
-                            />
-                             
-                            New Deployment
-                          </Button>
-                        </Col>
-                      </Row>
-                    }
-                    onToggle={[Function]}
-                  >
-                    <div
-                      className="panel panel-default"
-                      header={
-                        <Row
-                          bsClass="row"
-                          componentClass="div"
+                        <div
+                          className="panel-title row"
                         >
                           <Col
                             bsClass="col"
                             componentClass="div"
                             xs={4}
                           >
-                            <FormControl
-                              bsClass="form-control"
-                              componentClass="input"
-                              onChange={[Function]}
-                              placeholder="Search for deployments"
-                            />
+                            <div
+                              className="col-xs-4"
+                            >
+                              <FormControl
+                                bsClass="form-control"
+                                componentClass="input"
+                                onChange={[Function]}
+                                placeholder="Search for deployments"
+                              >
+                                <input
+                                  className="form-control"
+                                  onChange={[Function]}
+                                  placeholder="Search for deployments"
+                                />
+                              </FormControl>
+                            </div>
                           </Col>
                           <Col
                             bsClass="col"
                             componentClass="div"
                             xs={8}
                           >
-                            <Button
-                              active={false}
-                              block={false}
-                              bsClass="btn"
-                              bsStyle="success"
-                              className="pull-right"
-                              disabled={false}
-                              onClick={[Function]}
+                            <div
+                              className="col-xs-8"
                             >
-                              <Glyphicon
-                                bsClass="glyphicon"
-                                glyph="plus"
-                              />
-                               
-                              New Deployment
-                            </Button>
+                              <Button
+                                active={false}
+                                block={false}
+                                bsClass="btn"
+                                bsStyle="success"
+                                className="pull-right"
+                                disabled={false}
+                                onClick={[Function]}
+                              >
+                                <button
+                                  className="pull-right btn btn-success"
+                                  disabled={false}
+                                  onClick={[Function]}
+                                  type="button"
+                                >
+                                  <Glyphicon
+                                    bsClass="glyphicon"
+                                    glyph="plus"
+                                  >
+                                    <span
+                                      className="glyphicon glyphicon-plus"
+                                    />
+                                  </Glyphicon>
+                                   
+                                  New Deployment
+                                </button>
+                              </Button>
+                            </div>
                           </Col>
-                        </Row>
-                      }
+                        </div>
+                      </Row>
+                    </div>
+                    <Table
+                      bordered={false}
+                      bsClass="table"
+                      condensed={false}
+                      hover={true}
+                      key=".0"
+                      responsive={false}
+                      striped={true}
                     >
-                      <Table
-                        bordered={false}
-                        bsClass="table"
-                        condensed={false}
-                        fill={true}
-                        hover={true}
-                        responsive={false}
-                        striped={true}
+                      <table
+                        className="table table-striped table-hover"
                       >
-                        <table
-                          className="table table-striped table-hover"
-                          fill={true}
-                        >
-                          <thead>
-                            <tr>
-                              <th
-                                className="col-md-4"
-                              >
-                                Name
-                              </th>
-                              <th>
-                                Created
-                              </th>
-                              <th>
-                                Last deployed
-                              </th>
-                              <th>
-                                Deployed to
-                              </th>
-                              <th>
-                                # of feeds
-                              </th>
-                              <th>
-                                Test?
-                              </th>
-                              <th />
-                            </tr>
-                          </thead>
-                          <tbody>
-                            <DeploymentListItem
-                              createDeployment={[Function]}
-                              deleteDeployment={[Function]}
-                              deployment={
-                                Object {
-                                  "customBuildConfig": null,
-                                  "customRouterConfig": null,
-                                  "dateCreated": 1553292345720,
-                                  "deployJobSummaries": Array [],
-                                  "deployedTo": null,
-                                  "ec2Instances": Array [],
-                                  "feedSourceId": null,
-                                  "feedVersions": Array [
-                                    Object {
-                                      "feedSource": Object {
-                                        "dateCreated": 1536195264564,
-                                        "deployable": false,
-                                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                        "externalProperties": Object {},
-                                        "id": "mock-feed-with-version-id",
-                                        "isPublic": false,
-                                        "lastFetched": 1543389038810,
-                                        "lastUpdated": 1543389038810,
-                                        "latestValidation": Object {
-                                          "agencies": null,
-                                          "agencyCount": 1,
-                                          "avgDailyRevenueTime": 0,
-                                          "bounds": Object {
-                                            "east": -76.481211,
-                                            "north": 39.0486949672717,
-                                            "south": 38.92884,
-                                            "west": -76.5673055566884,
-                                          },
-                                          "endDate": "20190801",
-                                          "errorCount": 78,
-                                          "feedVersionId": "mock-feed-version-id",
-                                          "loadFailureReason": null,
-                                          "loadStatus": "SUCCESS",
-                                          "routeCount": 10,
-                                          "startDate": "20180801",
-                                          "stopCount": 237,
-                                          "stopTimesCount": 11170,
-                                          "tripCount": 415,
-                                        },
-                                        "latestVersionId": "mock-feed-version-id",
-                                        "name": "test feed with a version",
-                                        "noteCount": 0,
-                                        "organizationId": null,
-                                        "projectId": "mock-project-id",
-                                        "publishedVersionId": null,
-                                        "retrievalMethod": "MANUALLY_UPLOADED",
-                                        "s3Url": null,
-                                        "snapshotVersion": null,
-                                        "transformRules": Array [],
-                                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                        "user": null,
-                                      },
-                                      "id": "mock-feed-version-id",
-                                      "nextVersionId": null,
-                                      "previousVersionId": null,
-                                      "updated": 1543389038810,
-                                      "validationResult": Object {
+                        <thead>
+                          <tr>
+                            <th
+                              className="col-md-4"
+                            >
+                              Name
+                            </th>
+                            <th>
+                              Created
+                            </th>
+                            <th>
+                              Last deployed
+                            </th>
+                            <th>
+                              Deployed to
+                            </th>
+                            <th>
+                              # of feeds
+                            </th>
+                            <th>
+                              Test?
+                            </th>
+                            <th />
+                          </tr>
+                        </thead>
+                        <tbody>
+                          <DeploymentListItem
+                            createDeployment={[Function]}
+                            deleteDeployment={[Function]}
+                            deployment={
+                              Object {
+                                "customBuildConfig": null,
+                                "customRouterConfig": null,
+                                "dateCreated": 1553292345720,
+                                "deployJobSummaries": Array [],
+                                "deployedTo": null,
+                                "ec2Instances": Array [],
+                                "feedSourceId": null,
+                                "feedVersions": Array [
+                                  Object {
+                                    "feedSource": Object {
+                                      "dateCreated": 1536195264564,
+                                      "deployable": false,
+                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                      "externalProperties": Object {},
+                                      "id": "mock-feed-with-version-id",
+                                      "isPublic": false,
+                                      "lastFetched": 1543389038810,
+                                      "lastUpdated": 1543389038810,
+                                      "latestValidation": Object {
                                         "agencies": null,
                                         "agencyCount": 1,
                                         "avgDailyRevenueTime": 0,
@@ -1008,109 +952,109 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                         "stopTimesCount": 11170,
                                         "tripCount": 415,
                                       },
-                                      "version": 1,
+                                      "latestVersionId": "mock-feed-version-id",
+                                      "name": "test feed with a version",
+                                      "noteCount": 0,
+                                      "organizationId": null,
+                                      "projectId": "mock-project-id",
+                                      "publishedVersionId": null,
+                                      "retrievalMethod": "MANUALLY_UPLOADED",
+                                      "s3Url": null,
+                                      "snapshotVersion": null,
+                                      "transformRules": Array [],
+                                      "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                      "user": null,
                                     },
-                                  ],
-                                  "id": "mock-deployment-id-0",
-                                  "invalidFeedSources": Array [],
-                                  "lastDeployed": null,
-                                  "lastUpdated": 1553292345726,
-                                  "latest": null,
-                                  "name": "mock-deployment",
-                                  "organizationId": null,
-                                  "osmExtractUrl": null,
-                                  "otpCommit": null,
-                                  "otpVersion": null,
-                                  "projectBounds": Object {
-                                    "east": 0,
-                                    "north": 0,
-                                    "south": 0,
-                                    "west": 0,
+                                    "id": "mock-feed-version-id",
+                                    "nextVersionId": null,
+                                    "previousVersionId": null,
+                                    "updated": 1543389038810,
+                                    "validationResult": Object {
+                                      "agencies": null,
+                                      "agencyCount": 1,
+                                      "avgDailyRevenueTime": 0,
+                                      "bounds": Object {
+                                        "east": -76.481211,
+                                        "north": 39.0486949672717,
+                                        "south": 38.92884,
+                                        "west": -76.5673055566884,
+                                      },
+                                      "endDate": "20190801",
+                                      "errorCount": 78,
+                                      "feedVersionId": "mock-feed-version-id",
+                                      "loadFailureReason": null,
+                                      "loadStatus": "SUCCESS",
+                                      "routeCount": 10,
+                                      "startDate": "20180801",
+                                      "stopCount": 237,
+                                      "stopTimesCount": 11170,
+                                      "tripCount": 415,
+                                    },
+                                    "version": 1,
                                   },
-                                  "projectId": "mock-project-with-deployments-id",
-                                  "r5": false,
-                                  "r5Version": null,
-                                  "routerId": null,
-                                  "skipOsmExtract": false,
-                                  "user": null,
-                                }
+                                ],
+                                "id": "mock-deployment-id-0",
+                                "invalidFeedSources": Array [],
+                                "lastDeployed": null,
+                                "lastUpdated": 1553292345726,
+                                "latest": null,
+                                "name": "mock-deployment",
+                                "organizationId": null,
+                                "osmExtractUrl": null,
+                                "otpCommit": null,
+                                "otpVersion": null,
+                                "projectBounds": Object {
+                                  "east": 0,
+                                  "north": 0,
+                                  "south": 0,
+                                  "west": 0,
+                                },
+                                "projectId": "mock-project-with-deployments-id",
+                                "r5": false,
+                                "r5Version": null,
+                                "routerId": null,
+                                "skipOsmExtract": false,
+                                "user": null,
                               }
-                              fetchProjectDeployments={[Function]}
-                              fetchProjectFeeds={[Function]}
-                              key="mock-deployment-id-0"
-                              project={
-                                Object {
-                                  "autoFetchFeeds": true,
-                                  "autoFetchHour": 0,
-                                  "autoFetchMinute": 0,
-                                  "bounds": null,
-                                  "buildConfig": Object {
-                                    "fares": null,
-                                    "fetchElevationUS": null,
-                                    "stationTransfers": null,
-                                    "subwayAccessTime": null,
-                                  },
-                                  "dateCreated": 1526305321824,
-                                  "defaultTimeZone": null,
-                                  "deployments": Array [
-                                    Object {
-                                      "customBuildConfig": null,
-                                      "customRouterConfig": null,
-                                      "dateCreated": 1553292345720,
-                                      "deployJobSummaries": Array [],
-                                      "deployedTo": null,
-                                      "ec2Instances": Array [],
-                                      "feedSourceId": null,
-                                      "feedVersions": Array [
-                                        Object {
-                                          "feedSource": Object {
-                                            "dateCreated": 1536195264564,
-                                            "deployable": false,
-                                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                            "externalProperties": Object {},
-                                            "id": "mock-feed-with-version-id",
-                                            "isPublic": false,
-                                            "lastFetched": 1543389038810,
-                                            "lastUpdated": 1543389038810,
-                                            "latestValidation": Object {
-                                              "agencies": null,
-                                              "agencyCount": 1,
-                                              "avgDailyRevenueTime": 0,
-                                              "bounds": Object {
-                                                "east": -76.481211,
-                                                "north": 39.0486949672717,
-                                                "south": 38.92884,
-                                                "west": -76.5673055566884,
-                                              },
-                                              "endDate": "20190801",
-                                              "errorCount": 78,
-                                              "feedVersionId": "mock-feed-version-id",
-                                              "loadFailureReason": null,
-                                              "loadStatus": "SUCCESS",
-                                              "routeCount": 10,
-                                              "startDate": "20180801",
-                                              "stopCount": 237,
-                                              "stopTimesCount": 11170,
-                                              "tripCount": 415,
-                                            },
-                                            "latestVersionId": "mock-feed-version-id",
-                                            "name": "test feed with a version",
-                                            "noteCount": 0,
-                                            "organizationId": null,
-                                            "projectId": "mock-project-id",
-                                            "publishedVersionId": null,
-                                            "retrievalMethod": "MANUALLY_UPLOADED",
-                                            "s3Url": null,
-                                            "snapshotVersion": null,
-                                            "transformRules": Array [],
-                                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                            "user": null,
-                                          },
-                                          "id": "mock-feed-version-id",
-                                          "nextVersionId": null,
-                                          "previousVersionId": null,
-                                          "updated": 1543389038810,
-                                          "validationResult": Object {
+                            }
+                            fetchProjectDeployments={[Function]}
+                            fetchProjectFeeds={[Function]}
+                            key="mock-deployment-id-0"
+                            project={
+                              Object {
+                                "autoFetchFeeds": true,
+                                "autoFetchHour": 0,
+                                "autoFetchMinute": 0,
+                                "bounds": null,
+                                "buildConfig": Object {
+                                  "fares": null,
+                                  "fetchElevationUS": null,
+                                  "stationTransfers": null,
+                                  "subwayAccessTime": null,
+                                },
+                                "dateCreated": 1526305321824,
+                                "defaultTimeZone": null,
+                                "deployments": Array [
+                                  Object {
+                                    "customBuildConfig": null,
+                                    "customRouterConfig": null,
+                                    "dateCreated": 1553292345720,
+                                    "deployJobSummaries": Array [],
+                                    "deployedTo": null,
+                                    "ec2Instances": Array [],
+                                    "feedSourceId": null,
+                                    "feedVersions": Array [
+                                      Object {
+                                        "feedSource": Object {
+                                          "dateCreated": 1536195264564,
+                                          "deployable": false,
+                                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                          "externalProperties": Object {},
+                                          "id": "mock-feed-with-version-id",
+                                          "isPublic": false,
+                                          "lastFetched": 1543389038810,
+                                          "lastUpdated": 1543389038810,
+                                          "latestValidation": Object {
                                             "agencies": null,
                                             "agencyCount": 1,
                                             "avgDailyRevenueTime": 0,
@@ -1131,407 +1075,407 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                             "stopTimesCount": 11170,
                                             "tripCount": 415,
                                           },
-                                          "version": 1,
+                                          "latestVersionId": "mock-feed-version-id",
+                                          "name": "test feed with a version",
+                                          "noteCount": 0,
+                                          "organizationId": null,
+                                          "projectId": "mock-project-id",
+                                          "publishedVersionId": null,
+                                          "retrievalMethod": "MANUALLY_UPLOADED",
+                                          "s3Url": null,
+                                          "snapshotVersion": null,
+                                          "transformRules": Array [],
+                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                          "user": null,
                                         },
-                                      ],
-                                      "id": "mock-deployment-id-0",
-                                      "invalidFeedSources": Array [],
-                                      "lastDeployed": null,
-                                      "lastUpdated": 1553292345726,
-                                      "latest": null,
-                                      "name": "mock-deployment",
-                                      "organizationId": null,
-                                      "osmExtractUrl": null,
-                                      "otpCommit": null,
-                                      "otpVersion": null,
-                                      "projectBounds": Object {
-                                        "east": 0,
-                                        "north": 0,
-                                        "south": 0,
-                                        "west": 0,
+                                        "id": "mock-feed-version-id",
+                                        "nextVersionId": null,
+                                        "previousVersionId": null,
+                                        "updated": 1543389038810,
+                                        "validationResult": Object {
+                                          "agencies": null,
+                                          "agencyCount": 1,
+                                          "avgDailyRevenueTime": 0,
+                                          "bounds": Object {
+                                            "east": -76.481211,
+                                            "north": 39.0486949672717,
+                                            "south": 38.92884,
+                                            "west": -76.5673055566884,
+                                          },
+                                          "endDate": "20190801",
+                                          "errorCount": 78,
+                                          "feedVersionId": "mock-feed-version-id",
+                                          "loadFailureReason": null,
+                                          "loadStatus": "SUCCESS",
+                                          "routeCount": 10,
+                                          "startDate": "20180801",
+                                          "stopCount": 237,
+                                          "stopTimesCount": 11170,
+                                          "tripCount": 415,
+                                        },
+                                        "version": 1,
                                       },
-                                      "projectId": "mock-project-with-deployments-id",
-                                      "r5": false,
-                                      "r5Version": null,
-                                      "routerId": null,
-                                      "skipOsmExtract": false,
-                                      "user": null,
+                                    ],
+                                    "id": "mock-deployment-id-0",
+                                    "invalidFeedSources": Array [],
+                                    "lastDeployed": null,
+                                    "lastUpdated": 1553292345726,
+                                    "latest": null,
+                                    "name": "mock-deployment",
+                                    "organizationId": null,
+                                    "osmExtractUrl": null,
+                                    "otpCommit": null,
+                                    "otpVersion": null,
+                                    "projectBounds": Object {
+                                      "east": 0,
+                                      "north": 0,
+                                      "south": 0,
+                                      "west": 0,
                                     },
-                                    Object {
-                                      "customBuildConfig": null,
-                                      "customRouterConfig": null,
-                                      "dateCreated": 1553292345720,
-                                      "deployJobSummaries": Array [],
-                                      "deployedTo": null,
-                                      "ec2Instances": Array [],
-                                      "feedSourceId": null,
-                                      "feedVersions": Array [],
-                                      "id": "mock-deployment-id-1",
-                                      "invalidFeedSources": Array [],
-                                      "lastDeployed": null,
-                                      "lastUpdated": 1553292345726,
-                                      "latest": null,
-                                      "name": "mock-deployment",
-                                      "organizationId": null,
-                                      "osmExtractUrl": null,
-                                      "otpCommit": null,
-                                      "otpVersion": null,
-                                      "projectBounds": Object {
-                                        "east": 0,
-                                        "north": 0,
-                                        "south": 0,
-                                        "west": 0,
-                                      },
-                                      "projectId": "mock-project-with-deployments-id",
-                                      "r5": false,
-                                      "r5Version": null,
-                                      "routerId": null,
-                                      "skipOsmExtract": false,
-                                      "user": null,
+                                    "projectId": "mock-project-with-deployments-id",
+                                    "r5": false,
+                                    "r5Version": null,
+                                    "routerId": null,
+                                    "skipOsmExtract": false,
+                                    "user": null,
+                                  },
+                                  Object {
+                                    "customBuildConfig": null,
+                                    "customRouterConfig": null,
+                                    "dateCreated": 1553292345720,
+                                    "deployJobSummaries": Array [],
+                                    "deployedTo": null,
+                                    "ec2Instances": Array [],
+                                    "feedSourceId": null,
+                                    "feedVersions": Array [],
+                                    "id": "mock-deployment-id-1",
+                                    "invalidFeedSources": Array [],
+                                    "lastDeployed": null,
+                                    "lastUpdated": 1553292345726,
+                                    "latest": null,
+                                    "name": "mock-deployment",
+                                    "organizationId": null,
+                                    "osmExtractUrl": null,
+                                    "otpCommit": null,
+                                    "otpVersion": null,
+                                    "projectBounds": Object {
+                                      "east": 0,
+                                      "north": 0,
+                                      "south": 0,
+                                      "west": 0,
                                     },
-                                  ],
-                                  "feedSources": Array [
-                                    Object {
-                                      "dateCreated": 1536195264564,
-                                      "deployable": false,
-                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                      "externalProperties": Object {},
-                                      "id": "mock-feed-with-version-id",
-                                      "isPublic": false,
-                                      "lastFetched": 1543389038810,
-                                      "lastUpdated": 1543389038810,
-                                      "latestValidation": Object {
-                                        "agencies": null,
-                                        "agencyCount": 1,
-                                        "avgDailyRevenueTime": 0,
-                                        "bounds": Object {
-                                          "east": -76.481211,
-                                          "north": 39.0486949672717,
-                                          "south": 38.92884,
-                                          "west": -76.5673055566884,
-                                        },
-                                        "endDate": "20190801",
-                                        "errorCount": 78,
-                                        "feedVersionId": "mock-feed-version-id",
-                                        "loadFailureReason": null,
-                                        "loadStatus": "SUCCESS",
-                                        "routeCount": 10,
-                                        "startDate": "20180801",
-                                        "stopCount": 237,
-                                        "stopTimesCount": 11170,
-                                        "tripCount": 415,
+                                    "projectId": "mock-project-with-deployments-id",
+                                    "r5": false,
+                                    "r5Version": null,
+                                    "routerId": null,
+                                    "skipOsmExtract": false,
+                                    "user": null,
+                                  },
+                                ],
+                                "feedSources": Array [
+                                  Object {
+                                    "dateCreated": 1536195264564,
+                                    "deployable": false,
+                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                    "externalProperties": Object {},
+                                    "id": "mock-feed-with-version-id",
+                                    "isPublic": false,
+                                    "lastFetched": 1543389038810,
+                                    "lastUpdated": 1543389038810,
+                                    "latestValidation": Object {
+                                      "agencies": null,
+                                      "agencyCount": 1,
+                                      "avgDailyRevenueTime": 0,
+                                      "bounds": Object {
+                                        "east": -76.481211,
+                                        "north": 39.0486949672717,
+                                        "south": 38.92884,
+                                        "west": -76.5673055566884,
                                       },
-                                      "latestVersionId": "mock-feed-version-id",
-                                      "name": "test feed with a version",
-                                      "noteCount": 0,
-                                      "organizationId": null,
-                                      "projectId": "mock-project-id",
-                                      "publishedVersionId": null,
-                                      "retrievalMethod": "MANUALLY_UPLOADED",
-                                      "s3Url": null,
-                                      "snapshotVersion": null,
-                                      "transformRules": Array [],
-                                      "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                      "user": null,
+                                      "endDate": "20190801",
+                                      "errorCount": 78,
+                                      "feedVersionId": "mock-feed-version-id",
+                                      "loadFailureReason": null,
+                                      "loadStatus": "SUCCESS",
+                                      "routeCount": 10,
+                                      "startDate": "20180801",
+                                      "stopCount": 237,
+                                      "stopTimesCount": 11170,
+                                      "tripCount": 415,
                                     },
-                                  ],
-                                  "id": "mock-project-with-deployments-id",
-                                  "lastUpdated": 1553236399556,
-                                  "name": "mock-project-with-deployments",
-                                  "organizationId": null,
-                                  "otpServers": Array [],
-                                  "pinnedDeploymentId": "mock-deployment-id-0",
-                                  "routerConfig": Object {
-                                    "carDropoffTime": null,
-                                    "numItineraries": null,
-                                    "requestLogFile": null,
-                                    "stairsReluctance": null,
-                                    "updaters": null,
-                                    "walkSpeed": null,
+                                    "latestVersionId": "mock-feed-version-id",
+                                    "name": "test feed with a version",
+                                    "noteCount": 0,
+                                    "organizationId": null,
+                                    "projectId": "mock-project-id",
+                                    "publishedVersionId": null,
+                                    "retrievalMethod": "MANUALLY_UPLOADED",
+                                    "s3Url": null,
+                                    "snapshotVersion": null,
+                                    "transformRules": Array [],
+                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                    "user": null,
                                   },
-                                  "useCustomOsmBounds": false,
-                                  "user": null,
-                                }
+                                ],
+                                "id": "mock-project-with-deployments-id",
+                                "lastUpdated": 1553236399556,
+                                "name": "mock-project-with-deployments",
+                                "organizationId": null,
+                                "otpServers": Array [],
+                                "pinnedDeploymentId": "mock-deployment-id-0",
+                                "routerConfig": Object {
+                                  "carDropoffTime": null,
+                                  "numItineraries": null,
+                                  "requestLogFile": null,
+                                  "stairsReluctance": null,
+                                  "updaters": null,
+                                  "walkSpeed": null,
+                                },
+                                "useCustomOsmBounds": false,
+                                "user": null,
                               }
-                              saveDeployment={[Function]}
-                              updateDeployment={[Function]}
-                              updateProject={[Function]}
+                            }
+                            saveDeployment={[Function]}
+                            updateDeployment={[Function]}
+                            updateProject={[Function]}
+                          >
+                            <tr
+                              className="pinned-deployment"
                             >
-                              <tr
-                                className="pinned-deployment"
-                              >
-                                <td>
-                                  <EditableTextField
-                                    isEditing={false}
-                                    link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
-                                    onChange={[Function]}
-                                    rejectEmptyValue={true}
+                              <td>
+                                <EditableTextField
+                                  isEditing={false}
+                                  link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
+                                  onChange={[Function]}
+                                  rejectEmptyValue={true}
+                                  style={Object {}}
+                                  type="text"
+                                  value="mock-deployment"
+                                >
+                                  <div
                                     style={Object {}}
-                                    type="text"
-                                    value="mock-deployment"
                                   >
-                                    <div
-                                      style={Object {}}
-                                    >
-                                      <span>
-                                        <span
-                                          title="mock-deployment"
-                                        >
-                                          <Link
-                                            onlyActiveOnIndex={false}
-                                            style={Object {}}
-                                            to="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
-                                          >
-                                            <a
-                                              onClick={[Function]}
-                                              style={Object {}}
-                                            >
-                                              mock-deployment
-                                            </a>
-                                          </Link>
-                                        </span>
-                                        <Button
-                                          active={false}
-                                          block={false}
-                                          bsClass="btn"
-                                          bsStyle="link"
-                                          data-test-id="editable-text-field-edit-button"
-                                          disabled={false}
-                                          onClick={[Function]}
+                                    <span>
+                                      <span
+                                        title="mock-deployment"
+                                      >
+                                        <Link
+                                          onlyActiveOnIndex={false}
+                                          style={Object {}}
+                                          to="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
                                         >
-                                          <button
-                                            className="btn btn-link"
-                                            data-test-id="editable-text-field-edit-button"
-                                            disabled={false}
+                                          <a
                                             onClick={[Function]}
-                                            type="button"
+                                            style={Object {}}
                                           >
-                                            <Icon
-                                              type="pencil"
-                                            >
-                                              <i
-                                                className="fa fa-pencil fa-fw "
-                                              />
-                                            </Icon>
-                                          </button>
-                                        </Button>
+                                            mock-deployment
+                                          </a>
+                                        </Link>
                                       </span>
-                                    </div>
-                                  </EditableTextField>
-                                </td>
-                                <td>
-                                  <span
-                                    title="Mar 22nd 2019, 3:05pm"
-                                  >
-                                     
-                                    2 months ago
-                                  </span>
-                                </td>
-                                <td>
-                                  <span
-                                    className="deployment-na"
-                                  >
-                                    N/A
-                                  </span>
-                                </td>
-                                <td>
-                                  <span
-                                    className="deployment-na"
-                                  >
-                                    N/A
-                                  </span>
-                                </td>
-                                <td>
-                                  <span>
-                                    1
-                                  </span>
-                                </td>
-                                <td>
-                                  <span
-                                    className="deployment-na"
-                                  >
-                                    N/A
-                                  </span>
-                                </td>
-                                <td>
-                                  <ButtonGroup
-                                    block={false}
-                                    bsClass="btn-group"
-                                    className="pull-right"
-                                    justified={false}
-                                    vertical={false}
-                                  >
-                                    <div
-                                      className="pull-right btn-group"
-                                    >
                                       <Button
                                         active={false}
                                         block={false}
                                         bsClass="btn"
-                                        bsSize="xsmall"
-                                        bsStyle="info"
+                                        bsStyle="link"
+                                        data-test-id="editable-text-field-edit-button"
                                         disabled={false}
                                         onClick={[Function]}
                                       >
                                         <button
-                                          className="btn btn-xs btn-info"
+                                          className="btn btn-link"
+                                          data-test-id="editable-text-field-edit-button"
                                           disabled={false}
                                           onClick={[Function]}
                                           type="button"
                                         >
-                                          <Glyphicon
-                                            bsClass="glyphicon"
-                                            glyph="pushpin"
+                                          <Icon
+                                            type="pencil"
                                           >
-                                            <span
-                                              className="glyphicon glyphicon-pushpin"
+                                            <i
+                                              className="fa fa-pencil fa-fw "
                                             />
-                                          </Glyphicon>
+                                          </Icon>
                                         </button>
                                       </Button>
-                                      <Button
-                                        active={false}
-                                        block={false}
-                                        bsClass="btn"
-                                        bsSize="xsmall"
-                                        bsStyle="danger"
+                                    </span>
+                                  </div>
+                                </EditableTextField>
+                              </td>
+                              <td>
+                                <span
+                                  title="Mar 22nd 2019, 3:05pm"
+                                >
+                                   
+                                  2 months ago
+                                </span>
+                              </td>
+                              <td>
+                                <span
+                                  className="deployment-na"
+                                >
+                                  N/A
+                                </span>
+                              </td>
+                              <td>
+                                <span
+                                  className="deployment-na"
+                                >
+                                  N/A
+                                </span>
+                              </td>
+                              <td>
+                                <span>
+                                  1
+                                </span>
+                              </td>
+                              <td>
+                                <span
+                                  className="deployment-na"
+                                >
+                                  N/A
+                                </span>
+                              </td>
+                              <td>
+                                <ButtonGroup
+                                  block={false}
+                                  bsClass="btn-group"
+                                  className="pull-right"
+                                  justified={false}
+                                  vertical={false}
+                                >
+                                  <div
+                                    className="pull-right btn-group"
+                                  >
+                                    <Button
+                                      active={false}
+                                      block={false}
+                                      bsClass="btn"
+                                      bsSize="xsmall"
+                                      bsStyle="info"
+                                      disabled={false}
+                                      onClick={[Function]}
+                                    >
+                                      <button
+                                        className="btn btn-xs btn-info"
                                         disabled={false}
                                         onClick={[Function]}
+                                        type="button"
                                       >
-                                        <button
-                                          className="btn btn-xs btn-danger"
-                                          disabled={false}
-                                          onClick={[Function]}
-                                          type="button"
+                                        <Glyphicon
+                                          bsClass="glyphicon"
+                                          glyph="pushpin"
                                         >
-                                          <Glyphicon
-                                            bsClass="glyphicon"
-                                            glyph="remove"
-                                          >
-                                            <span
-                                              className="glyphicon glyphicon-remove"
-                                            />
-                                          </Glyphicon>
-                                        </button>
-                                      </Button>
-                                    </div>
-                                  </ButtonGroup>
-                                </td>
-                              </tr>
-                            </DeploymentListItem>
-                            <DeploymentListItem
-                              createDeployment={[Function]}
-                              deleteDeployment={[Function]}
-                              deployment={
-                                Object {
-                                  "customBuildConfig": null,
-                                  "customRouterConfig": null,
-                                  "dateCreated": 1553292345720,
-                                  "deployJobSummaries": Array [],
-                                  "deployedTo": null,
-                                  "ec2Instances": Array [],
-                                  "feedSourceId": null,
-                                  "feedVersions": Array [],
-                                  "id": "mock-deployment-id-1",
-                                  "invalidFeedSources": Array [],
-                                  "lastDeployed": null,
-                                  "lastUpdated": 1553292345726,
-                                  "latest": null,
-                                  "name": "mock-deployment",
-                                  "organizationId": null,
-                                  "osmExtractUrl": null,
-                                  "otpCommit": null,
-                                  "otpVersion": null,
-                                  "projectBounds": Object {
-                                    "east": 0,
-                                    "north": 0,
-                                    "south": 0,
-                                    "west": 0,
-                                  },
-                                  "projectId": "mock-project-with-deployments-id",
-                                  "r5": false,
-                                  "r5Version": null,
-                                  "routerId": null,
-                                  "skipOsmExtract": false,
-                                  "user": null,
-                                }
+                                          <span
+                                            className="glyphicon glyphicon-pushpin"
+                                          />
+                                        </Glyphicon>
+                                      </button>
+                                    </Button>
+                                    <Button
+                                      active={false}
+                                      block={false}
+                                      bsClass="btn"
+                                      bsSize="xsmall"
+                                      bsStyle="danger"
+                                      disabled={false}
+                                      onClick={[Function]}
+                                    >
+                                      <button
+                                        className="btn btn-xs btn-danger"
+                                        disabled={false}
+                                        onClick={[Function]}
+                                        type="button"
+                                      >
+                                        <Glyphicon
+                                          bsClass="glyphicon"
+                                          glyph="remove"
+                                        >
+                                          <span
+                                            className="glyphicon glyphicon-remove"
+                                          />
+                                        </Glyphicon>
+                                      </button>
+                                    </Button>
+                                  </div>
+                                </ButtonGroup>
+                              </td>
+                            </tr>
+                          </DeploymentListItem>
+                          <DeploymentListItem
+                            createDeployment={[Function]}
+                            deleteDeployment={[Function]}
+                            deployment={
+                              Object {
+                                "customBuildConfig": null,
+                                "customRouterConfig": null,
+                                "dateCreated": 1553292345720,
+                                "deployJobSummaries": Array [],
+                                "deployedTo": null,
+                                "ec2Instances": Array [],
+                                "feedSourceId": null,
+                                "feedVersions": Array [],
+                                "id": "mock-deployment-id-1",
+                                "invalidFeedSources": Array [],
+                                "lastDeployed": null,
+                                "lastUpdated": 1553292345726,
+                                "latest": null,
+                                "name": "mock-deployment",
+                                "organizationId": null,
+                                "osmExtractUrl": null,
+                                "otpCommit": null,
+                                "otpVersion": null,
+                                "projectBounds": Object {
+                                  "east": 0,
+                                  "north": 0,
+                                  "south": 0,
+                                  "west": 0,
+                                },
+                                "projectId": "mock-project-with-deployments-id",
+                                "r5": false,
+                                "r5Version": null,
+                                "routerId": null,
+                                "skipOsmExtract": false,
+                                "user": null,
                               }
-                              fetchProjectDeployments={[Function]}
-                              fetchProjectFeeds={[Function]}
-                              key="mock-deployment-id-1"
-                              project={
-                                Object {
-                                  "autoFetchFeeds": true,
-                                  "autoFetchHour": 0,
-                                  "autoFetchMinute": 0,
-                                  "bounds": null,
-                                  "buildConfig": Object {
-                                    "fares": null,
-                                    "fetchElevationUS": null,
-                                    "stationTransfers": null,
-                                    "subwayAccessTime": null,
-                                  },
-                                  "dateCreated": 1526305321824,
-                                  "defaultTimeZone": null,
-                                  "deployments": Array [
-                                    Object {
-                                      "customBuildConfig": null,
-                                      "customRouterConfig": null,
-                                      "dateCreated": 1553292345720,
-                                      "deployJobSummaries": Array [],
-                                      "deployedTo": null,
-                                      "ec2Instances": Array [],
-                                      "feedSourceId": null,
-                                      "feedVersions": Array [
-                                        Object {
-                                          "feedSource": Object {
-                                            "dateCreated": 1536195264564,
-                                            "deployable": false,
-                                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                            "externalProperties": Object {},
-                                            "id": "mock-feed-with-version-id",
-                                            "isPublic": false,
-                                            "lastFetched": 1543389038810,
-                                            "lastUpdated": 1543389038810,
-                                            "latestValidation": Object {
-                                              "agencies": null,
-                                              "agencyCount": 1,
-                                              "avgDailyRevenueTime": 0,
-                                              "bounds": Object {
-                                                "east": -76.481211,
-                                                "north": 39.0486949672717,
-                                                "south": 38.92884,
-                                                "west": -76.5673055566884,
-                                              },
-                                              "endDate": "20190801",
-                                              "errorCount": 78,
-                                              "feedVersionId": "mock-feed-version-id",
-                                              "loadFailureReason": null,
-                                              "loadStatus": "SUCCESS",
-                                              "routeCount": 10,
-                                              "startDate": "20180801",
-                                              "stopCount": 237,
-                                              "stopTimesCount": 11170,
-                                              "tripCount": 415,
-                                            },
-                                            "latestVersionId": "mock-feed-version-id",
-                                            "name": "test feed with a version",
-                                            "noteCount": 0,
-                                            "organizationId": null,
-                                            "projectId": "mock-project-id",
-                                            "publishedVersionId": null,
-                                            "retrievalMethod": "MANUALLY_UPLOADED",
-                                            "s3Url": null,
-                                            "snapshotVersion": null,
-                                            "transformRules": Array [],
-                                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                            "user": null,
-                                          },
-                                          "id": "mock-feed-version-id",
-                                          "nextVersionId": null,
-                                          "previousVersionId": null,
-                                          "updated": 1543389038810,
-                                          "validationResult": Object {
+                            }
+                            fetchProjectDeployments={[Function]}
+                            fetchProjectFeeds={[Function]}
+                            key="mock-deployment-id-1"
+                            project={
+                              Object {
+                                "autoFetchFeeds": true,
+                                "autoFetchHour": 0,
+                                "autoFetchMinute": 0,
+                                "bounds": null,
+                                "buildConfig": Object {
+                                  "fares": null,
+                                  "fetchElevationUS": null,
+                                  "stationTransfers": null,
+                                  "subwayAccessTime": null,
+                                },
+                                "dateCreated": 1526305321824,
+                                "defaultTimeZone": null,
+                                "deployments": Array [
+                                  Object {
+                                    "customBuildConfig": null,
+                                    "customRouterConfig": null,
+                                    "dateCreated": 1553292345720,
+                                    "deployJobSummaries": Array [],
+                                    "deployedTo": null,
+                                    "ec2Instances": Array [],
+                                    "feedSourceId": null,
+                                    "feedVersions": Array [
+                                      Object {
+                                        "feedSource": Object {
+                                          "dateCreated": 1536195264564,
+                                          "deployable": false,
+                                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                          "externalProperties": Object {},
+                                          "id": "mock-feed-with-version-id",
+                                          "isPublic": false,
+                                          "lastFetched": 1543389038810,
+                                          "lastUpdated": 1543389038810,
+                                          "latestValidation": Object {
                                             "agencies": null,
                                             "agencyCount": 1,
                                             "avgDailyRevenueTime": 0,
@@ -1552,300 +1496,337 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                             "stopTimesCount": 11170,
                                             "tripCount": 415,
                                           },
-                                          "version": 1,
+                                          "latestVersionId": "mock-feed-version-id",
+                                          "name": "test feed with a version",
+                                          "noteCount": 0,
+                                          "organizationId": null,
+                                          "projectId": "mock-project-id",
+                                          "publishedVersionId": null,
+                                          "retrievalMethod": "MANUALLY_UPLOADED",
+                                          "s3Url": null,
+                                          "snapshotVersion": null,
+                                          "transformRules": Array [],
+                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                          "user": null,
                                         },
-                                      ],
-                                      "id": "mock-deployment-id-0",
-                                      "invalidFeedSources": Array [],
-                                      "lastDeployed": null,
-                                      "lastUpdated": 1553292345726,
-                                      "latest": null,
-                                      "name": "mock-deployment",
-                                      "organizationId": null,
-                                      "osmExtractUrl": null,
-                                      "otpCommit": null,
-                                      "otpVersion": null,
-                                      "projectBounds": Object {
-                                        "east": 0,
-                                        "north": 0,
-                                        "south": 0,
-                                        "west": 0,
+                                        "id": "mock-feed-version-id",
+                                        "nextVersionId": null,
+                                        "previousVersionId": null,
+                                        "updated": 1543389038810,
+                                        "validationResult": Object {
+                                          "agencies": null,
+                                          "agencyCount": 1,
+                                          "avgDailyRevenueTime": 0,
+                                          "bounds": Object {
+                                            "east": -76.481211,
+                                            "north": 39.0486949672717,
+                                            "south": 38.92884,
+                                            "west": -76.5673055566884,
+                                          },
+                                          "endDate": "20190801",
+                                          "errorCount": 78,
+                                          "feedVersionId": "mock-feed-version-id",
+                                          "loadFailureReason": null,
+                                          "loadStatus": "SUCCESS",
+                                          "routeCount": 10,
+                                          "startDate": "20180801",
+                                          "stopCount": 237,
+                                          "stopTimesCount": 11170,
+                                          "tripCount": 415,
+                                        },
+                                        "version": 1,
                                       },
-                                      "projectId": "mock-project-with-deployments-id",
-                                      "r5": false,
-                                      "r5Version": null,
-                                      "routerId": null,
-                                      "skipOsmExtract": false,
-                                      "user": null,
+                                    ],
+                                    "id": "mock-deployment-id-0",
+                                    "invalidFeedSources": Array [],
+                                    "lastDeployed": null,
+                                    "lastUpdated": 1553292345726,
+                                    "latest": null,
+                                    "name": "mock-deployment",
+                                    "organizationId": null,
+                                    "osmExtractUrl": null,
+                                    "otpCommit": null,
+                                    "otpVersion": null,
+                                    "projectBounds": Object {
+                                      "east": 0,
+                                      "north": 0,
+                                      "south": 0,
+                                      "west": 0,
                                     },
-                                    Object {
-                                      "customBuildConfig": null,
-                                      "customRouterConfig": null,
-                                      "dateCreated": 1553292345720,
-                                      "deployJobSummaries": Array [],
-                                      "deployedTo": null,
-                                      "ec2Instances": Array [],
-                                      "feedSourceId": null,
-                                      "feedVersions": Array [],
-                                      "id": "mock-deployment-id-1",
-                                      "invalidFeedSources": Array [],
-                                      "lastDeployed": null,
-                                      "lastUpdated": 1553292345726,
-                                      "latest": null,
-                                      "name": "mock-deployment",
-                                      "organizationId": null,
-                                      "osmExtractUrl": null,
-                                      "otpCommit": null,
-                                      "otpVersion": null,
-                                      "projectBounds": Object {
-                                        "east": 0,
-                                        "north": 0,
-                                        "south": 0,
-                                        "west": 0,
-                                      },
-                                      "projectId": "mock-project-with-deployments-id",
-                                      "r5": false,
-                                      "r5Version": null,
-                                      "routerId": null,
-                                      "skipOsmExtract": false,
-                                      "user": null,
+                                    "projectId": "mock-project-with-deployments-id",
+                                    "r5": false,
+                                    "r5Version": null,
+                                    "routerId": null,
+                                    "skipOsmExtract": false,
+                                    "user": null,
+                                  },
+                                  Object {
+                                    "customBuildConfig": null,
+                                    "customRouterConfig": null,
+                                    "dateCreated": 1553292345720,
+                                    "deployJobSummaries": Array [],
+                                    "deployedTo": null,
+                                    "ec2Instances": Array [],
+                                    "feedSourceId": null,
+                                    "feedVersions": Array [],
+                                    "id": "mock-deployment-id-1",
+                                    "invalidFeedSources": Array [],
+                                    "lastDeployed": null,
+                                    "lastUpdated": 1553292345726,
+                                    "latest": null,
+                                    "name": "mock-deployment",
+                                    "organizationId": null,
+                                    "osmExtractUrl": null,
+                                    "otpCommit": null,
+                                    "otpVersion": null,
+                                    "projectBounds": Object {
+                                      "east": 0,
+                                      "north": 0,
+                                      "south": 0,
+                                      "west": 0,
                                     },
-                                  ],
-                                  "feedSources": Array [
-                                    Object {
-                                      "dateCreated": 1536195264564,
-                                      "deployable": false,
-                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                      "externalProperties": Object {},
-                                      "id": "mock-feed-with-version-id",
-                                      "isPublic": false,
-                                      "lastFetched": 1543389038810,
-                                      "lastUpdated": 1543389038810,
-                                      "latestValidation": Object {
-                                        "agencies": null,
-                                        "agencyCount": 1,
-                                        "avgDailyRevenueTime": 0,
-                                        "bounds": Object {
-                                          "east": -76.481211,
-                                          "north": 39.0486949672717,
-                                          "south": 38.92884,
-                                          "west": -76.5673055566884,
-                                        },
-                                        "endDate": "20190801",
-                                        "errorCount": 78,
-                                        "feedVersionId": "mock-feed-version-id",
-                                        "loadFailureReason": null,
-                                        "loadStatus": "SUCCESS",
-                                        "routeCount": 10,
-                                        "startDate": "20180801",
-                                        "stopCount": 237,
-                                        "stopTimesCount": 11170,
-                                        "tripCount": 415,
+                                    "projectId": "mock-project-with-deployments-id",
+                                    "r5": false,
+                                    "r5Version": null,
+                                    "routerId": null,
+                                    "skipOsmExtract": false,
+                                    "user": null,
+                                  },
+                                ],
+                                "feedSources": Array [
+                                  Object {
+                                    "dateCreated": 1536195264564,
+                                    "deployable": false,
+                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                    "externalProperties": Object {},
+                                    "id": "mock-feed-with-version-id",
+                                    "isPublic": false,
+                                    "lastFetched": 1543389038810,
+                                    "lastUpdated": 1543389038810,
+                                    "latestValidation": Object {
+                                      "agencies": null,
+                                      "agencyCount": 1,
+                                      "avgDailyRevenueTime": 0,
+                                      "bounds": Object {
+                                        "east": -76.481211,
+                                        "north": 39.0486949672717,
+                                        "south": 38.92884,
+                                        "west": -76.5673055566884,
                                       },
-                                      "latestVersionId": "mock-feed-version-id",
-                                      "name": "test feed with a version",
-                                      "noteCount": 0,
-                                      "organizationId": null,
-                                      "projectId": "mock-project-id",
-                                      "publishedVersionId": null,
-                                      "retrievalMethod": "MANUALLY_UPLOADED",
-                                      "s3Url": null,
-                                      "snapshotVersion": null,
-                                      "transformRules": Array [],
-                                      "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                      "user": null,
+                                      "endDate": "20190801",
+                                      "errorCount": 78,
+                                      "feedVersionId": "mock-feed-version-id",
+                                      "loadFailureReason": null,
+                                      "loadStatus": "SUCCESS",
+                                      "routeCount": 10,
+                                      "startDate": "20180801",
+                                      "stopCount": 237,
+                                      "stopTimesCount": 11170,
+                                      "tripCount": 415,
                                     },
-                                  ],
-                                  "id": "mock-project-with-deployments-id",
-                                  "lastUpdated": 1553236399556,
-                                  "name": "mock-project-with-deployments",
-                                  "organizationId": null,
-                                  "otpServers": Array [],
-                                  "pinnedDeploymentId": "mock-deployment-id-0",
-                                  "routerConfig": Object {
-                                    "carDropoffTime": null,
-                                    "numItineraries": null,
-                                    "requestLogFile": null,
-                                    "stairsReluctance": null,
-                                    "updaters": null,
-                                    "walkSpeed": null,
+                                    "latestVersionId": "mock-feed-version-id",
+                                    "name": "test feed with a version",
+                                    "noteCount": 0,
+                                    "organizationId": null,
+                                    "projectId": "mock-project-id",
+                                    "publishedVersionId": null,
+                                    "retrievalMethod": "MANUALLY_UPLOADED",
+                                    "s3Url": null,
+                                    "snapshotVersion": null,
+                                    "transformRules": Array [],
+                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                    "user": null,
                                   },
-                                  "useCustomOsmBounds": false,
-                                  "user": null,
-                                }
+                                ],
+                                "id": "mock-project-with-deployments-id",
+                                "lastUpdated": 1553236399556,
+                                "name": "mock-project-with-deployments",
+                                "organizationId": null,
+                                "otpServers": Array [],
+                                "pinnedDeploymentId": "mock-deployment-id-0",
+                                "routerConfig": Object {
+                                  "carDropoffTime": null,
+                                  "numItineraries": null,
+                                  "requestLogFile": null,
+                                  "stairsReluctance": null,
+                                  "updaters": null,
+                                  "walkSpeed": null,
+                                },
+                                "useCustomOsmBounds": false,
+                                "user": null,
                               }
-                              saveDeployment={[Function]}
-                              updateDeployment={[Function]}
-                              updateProject={[Function]}
+                            }
+                            saveDeployment={[Function]}
+                            updateDeployment={[Function]}
+                            updateProject={[Function]}
+                          >
+                            <tr
+                              className=""
                             >
-                              <tr
-                                className=""
-                              >
-                                <td>
-                                  <EditableTextField
-                                    isEditing={false}
-                                    link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-1"
-                                    onChange={[Function]}
-                                    rejectEmptyValue={true}
+                              <td>
+                                <EditableTextField
+                                  isEditing={false}
+                                  link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-1"
+                                  onChange={[Function]}
+                                  rejectEmptyValue={true}
+                                  style={Object {}}
+                                  type="text"
+                                  value="mock-deployment"
+                                >
+                                  <div
                                     style={Object {}}
-                                    type="text"
-                                    value="mock-deployment"
                                   >
-                                    <div
-                                      style={Object {}}
-                                    >
-                                      <span>
-                                        <span
-                                          title="mock-deployment"
-                                        >
-                                          <Link
-                                            onlyActiveOnIndex={false}
-                                            style={Object {}}
-                                            to="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-1"
-                                          >
-                                            <a
-                                              onClick={[Function]}
-                                              style={Object {}}
-                                            >
-                                              mock-deployment
-                                            </a>
-                                          </Link>
-                                        </span>
-                                        <Button
-                                          active={false}
-                                          block={false}
-                                          bsClass="btn"
-                                          bsStyle="link"
-                                          data-test-id="editable-text-field-edit-button"
-                                          disabled={false}
-                                          onClick={[Function]}
+                                    <span>
+                                      <span
+                                        title="mock-deployment"
+                                      >
+                                        <Link
+                                          onlyActiveOnIndex={false}
+                                          style={Object {}}
+                                          to="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-1"
                                         >
-                                          <button
-                                            className="btn btn-link"
-                                            data-test-id="editable-text-field-edit-button"
-                                            disabled={false}
+                                          <a
                                             onClick={[Function]}
-                                            type="button"
+                                            style={Object {}}
                                           >
-                                            <Icon
-                                              type="pencil"
-                                            >
-                                              <i
-                                                className="fa fa-pencil fa-fw "
-                                              />
-                                            </Icon>
-                                          </button>
-                                        </Button>
+                                            mock-deployment
+                                          </a>
+                                        </Link>
                                       </span>
-                                    </div>
-                                  </EditableTextField>
-                                </td>
-                                <td>
-                                  <span
-                                    title="Mar 22nd 2019, 3:05pm"
-                                  >
-                                     
-                                    2 months ago
-                                  </span>
-                                </td>
-                                <td>
-                                  <span
-                                    className="deployment-na"
-                                  >
-                                    N/A
-                                  </span>
-                                </td>
-                                <td>
-                                  <span
-                                    className="deployment-na"
-                                  >
-                                    N/A
-                                  </span>
-                                </td>
-                                <td>
-                                  <span>
-                                    0
-                                  </span>
-                                </td>
-                                <td>
-                                  <span
-                                    className="deployment-na"
-                                  >
-                                    N/A
-                                  </span>
-                                </td>
-                                <td>
-                                  <ButtonGroup
-                                    block={false}
-                                    bsClass="btn-group"
-                                    className="pull-right"
-                                    justified={false}
-                                    vertical={false}
-                                  >
-                                    <div
-                                      className="pull-right btn-group"
-                                    >
                                       <Button
                                         active={false}
                                         block={false}
                                         bsClass="btn"
-                                        bsSize="xsmall"
-                                        bsStyle="warning"
+                                        bsStyle="link"
+                                        data-test-id="editable-text-field-edit-button"
                                         disabled={false}
                                         onClick={[Function]}
                                       >
                                         <button
-                                          className="btn btn-xs btn-warning"
+                                          className="btn btn-link"
+                                          data-test-id="editable-text-field-edit-button"
                                           disabled={false}
                                           onClick={[Function]}
                                           type="button"
                                         >
-                                          <Glyphicon
-                                            bsClass="glyphicon"
-                                            glyph="pushpin"
+                                          <Icon
+                                            type="pencil"
                                           >
-                                            <span
-                                              className="glyphicon glyphicon-pushpin"
+                                            <i
+                                              className="fa fa-pencil fa-fw "
                                             />
-                                          </Glyphicon>
+                                          </Icon>
                                         </button>
                                       </Button>
-                                      <Button
-                                        active={false}
-                                        block={false}
-                                        bsClass="btn"
-                                        bsSize="xsmall"
-                                        bsStyle="danger"
+                                    </span>
+                                  </div>
+                                </EditableTextField>
+                              </td>
+                              <td>
+                                <span
+                                  title="Mar 22nd 2019, 3:05pm"
+                                >
+                                   
+                                  2 months ago
+                                </span>
+                              </td>
+                              <td>
+                                <span
+                                  className="deployment-na"
+                                >
+                                  N/A
+                                </span>
+                              </td>
+                              <td>
+                                <span
+                                  className="deployment-na"
+                                >
+                                  N/A
+                                </span>
+                              </td>
+                              <td>
+                                <span>
+                                  0
+                                </span>
+                              </td>
+                              <td>
+                                <span
+                                  className="deployment-na"
+                                >
+                                  N/A
+                                </span>
+                              </td>
+                              <td>
+                                <ButtonGroup
+                                  block={false}
+                                  bsClass="btn-group"
+                                  className="pull-right"
+                                  justified={false}
+                                  vertical={false}
+                                >
+                                  <div
+                                    className="pull-right btn-group"
+                                  >
+                                    <Button
+                                      active={false}
+                                      block={false}
+                                      bsClass="btn"
+                                      bsSize="xsmall"
+                                      bsStyle="warning"
+                                      disabled={false}
+                                      onClick={[Function]}
+                                    >
+                                      <button
+                                        className="btn btn-xs btn-warning"
                                         disabled={false}
                                         onClick={[Function]}
+                                        type="button"
                                       >
-                                        <button
-                                          className="btn btn-xs btn-danger"
-                                          disabled={false}
-                                          onClick={[Function]}
-                                          type="button"
+                                        <Glyphicon
+                                          bsClass="glyphicon"
+                                          glyph="pushpin"
                                         >
-                                          <Glyphicon
-                                            bsClass="glyphicon"
-                                            glyph="remove"
-                                          >
-                                            <span
-                                              className="glyphicon glyphicon-remove"
-                                            />
-                                          </Glyphicon>
-                                        </button>
-                                      </Button>
-                                    </div>
-                                  </ButtonGroup>
-                                </td>
-                              </tr>
-                            </DeploymentListItem>
-                          </tbody>
-                        </table>
-                      </Table>
-                    </div>
-                  </Panel>
-                </Uncontrolled(Panel)>
+                                          <span
+                                            className="glyphicon glyphicon-pushpin"
+                                          />
+                                        </Glyphicon>
+                                      </button>
+                                    </Button>
+                                    <Button
+                                      active={false}
+                                      block={false}
+                                      bsClass="btn"
+                                      bsSize="xsmall"
+                                      bsStyle="danger"
+                                      disabled={false}
+                                      onClick={[Function]}
+                                    >
+                                      <button
+                                        className="btn btn-xs btn-danger"
+                                        disabled={false}
+                                        onClick={[Function]}
+                                        type="button"
+                                      >
+                                        <Glyphicon
+                                          bsClass="glyphicon"
+                                          glyph="remove"
+                                        >
+                                          <span
+                                            className="glyphicon glyphicon-remove"
+                                          />
+                                        </Glyphicon>
+                                      </button>
+                                    </Button>
+                                  </div>
+                                </ButtonGroup>
+                              </td>
+                            </tr>
+                          </DeploymentListItem>
+                        </tbody>
+                      </table>
+                    </Table>
+                  </div>
+                </Panel>
               </DeploymentsList>
             </div>
           </Col>
@@ -1857,36 +1838,40 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             <div
               className="col-xs-3"
             >
-              <Uncontrolled(Panel)
+              <Panel
+                bsClass="panel"
+                bsStyle="default"
+                defaultExpanded={false}
                 header={
                   <h3>
                     Deploying feeds to OTP
                   </h3>
                 }
               >
-                <Panel
-                  bsClass="panel"
-                  bsStyle="default"
-                  header={
-                    <h3>
+                <div
+                  className="panel panel-default"
+                >
+                  <div
+                    className="panel-heading"
+                  >
+                    <h3
+                      className="panel-title"
+                    >
                       Deploying feeds to OTP
                     </h3>
-                  }
-                  onToggle={[Function]}
-                >
+                  </div>
                   <div
-                    className="panel panel-default"
-                    header={
-                      <h3>
-                        Deploying feeds to OTP
-                      </h3>
-                    }
+                    className="panel-body"
+                    key="0"
                   >
-                    <p>
+                    <p
+                      key=".0"
+                    >
                       A collection of feeds can be deployed to OpenTripPlanner (OTP) instances that have been defined in the organization settings.
                     </p>
                     <LinkContainer
                       action="push"
+                      key=".1"
                       onlyActiveOnIndex={false}
                       to="/project/mock-project-with-deployments-id/settings/deployment"
                     >
@@ -1919,6 +1904,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     </LinkContainer>
                     <LinkContainer
                       action="push"
+                      key=".2"
                       onlyActiveOnIndex={false}
                       to="/admin/servers"
                     >
@@ -1950,8 +1936,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       </Button>
                     </LinkContainer>
                   </div>
-                </Panel>
-              </Uncontrolled(Panel)>
+                </div>
+              </Panel>
             </div>
           </Col>
         </div>
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 8ad7978e7..ca635b27a 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -555,7 +555,10 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
         }
       }
     >
-      <Uncontrolled(Panel)
+      <Panel
+        bsClass="panel"
+        bsStyle="default"
+        defaultExpanded={false}
         header={
           <Connect(ProjectFeedListToolbar)
             onNewFeedSourceClick={[Function]}
@@ -745,11 +748,14 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
           />
         }
       >
-        <Panel
-          bsClass="panel"
-          bsStyle="default"
-          header={
+        <div
+          className="panel panel-default"
+        >
+          <div
+            className="panel-heading"
+          >
             <Connect(ProjectFeedListToolbar)
+              className="panel-title"
               onNewFeedSourceClick={[Function]}
               project={
                 Object {
@@ -934,15 +940,36 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   "user": null,
                 }
               }
-            />
-          }
-          onToggle={[Function]}
-        >
-          <div
-            className="panel panel-default"
-            header={
-              <Connect(ProjectFeedListToolbar)
+            >
+              <ProjectFeedListToolbar
+                calculateFeedSourceTableComparisonColumn={[Function]}
+                className="panel-title"
+                downloadFeedForProject={[Function]}
+                fetchFeedsForProject={[Function]}
+                filter={
+                  Object {
+                    "feedSourceTableComparisonColumn": "DEPLOYED",
+                    "feedSourceTableFilterCountStrategy": "LATEST",
+                    "filter": null,
+                    "searchText": null,
+                  }
+                }
+                filterCounts={
+                  Object {
+                    "active": 1,
+                    "all": 1,
+                    "expired": 0,
+                    "expiring": 0,
+                    "future": 0,
+                  }
+                }
                 onNewFeedSourceClick={[Function]}
+                possibleComparisons={
+                  Array [
+                    "LATEST",
+                    "DEPLOYED",
+                  ]
+                }
                 project={
                   Object {
                     "autoFetchFeeds": true,
@@ -1126,312 +1153,2024 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "user": null,
                   }
                 }
-              />
-            }
-          >
-            <ListGroup
-              bsClass="list-group"
-              fill={true}
-            >
-              <div
-                className="list-group"
-                fill={true}
-              >
-                <table
-                  className="feed-source-table"
-                >
-                  <thead>
-                    <tr>
-                      <th />
-                      <th
-                        className="comparison-column top-row"
-                      >
-                        <h4>
-                          Deployed Version
-                        </h4>
-                      </th>
-                      <th
-                        className="feed-version-column top-row"
-                        colSpan={3}
-                      >
-                        <h4>
-                          Latest Version
-                        </h4>
-                      </th>
-                      <th />
-                    </tr>
-                    <tr>
-                      <th>
-                        <h4>
-                          <Icon
-                            type="info-circle"
-                          >
-                            <i
-                              className="fa fa-info-circle fa-fw "
-                            />
-                          </Icon>
-                          Feed Info
-                        </h4>
-                      </th>
-                      <th
-                        className="comparison-column"
-                      >
-                        <h4>
-                          <Icon
-                            type="heartbeat"
-                          >
-                            <i
-                              className="fa fa-heartbeat fa-fw "
-                            />
-                          </Icon>
-                          Status
-                        </h4>
-                      </th>
-                      <th
-                        className="feed-version-column"
-                      >
-                        <h4>
-                          <Icon
-                            type="heartbeat"
-                          >
-                            <i
-                              className="fa fa-heartbeat fa-fw "
-                            />
-                          </Icon>
-                          Status
-                        </h4>
-                      </th>
-                      <th
-                        className="feed-version-column"
-                      >
-                        <h4>
-                          <Icon
-                            type="calendar-check-o"
-                          >
-                            <i
-                              className="fa fa-calendar-check-o fa-fw "
-                            />
-                          </Icon>
-                          Dates Valid
-                        </h4>
-                      </th>
-                      <th
-                        className="feed-version-column"
-                      >
-                        <h4>
-                          <Icon
-                            type="exclamation-triangle"
-                          >
-                            <i
-                              className="fa fa-exclamation-triangle fa-fw "
-                            />
-                          </Icon>
-                          Issues
-                        </h4>
-                      </th>
-                      <th />
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <Connect(FeedSourceTableRow)
-                      feedSource={
+                projectEditDisabled={false}
+                setFeedSort={[Function]}
+                setFeedSourceTableFilterCountStrategy={[Function]}
+                setVisibilityFilter={[Function]}
+                setVisibilitySearchText={[Function]}
+                sort="alphabetically-asc"
+                thirdPartySync={[Function]}
+                user={
+                  Object {
+                    "isCheckingLogin": false,
+                    "permissions": UserPermissions {
+                      "appPermissionLookup": Object {
+                        "administer-application": Object {
+                          "type": "administer-application",
+                        },
+                      },
+                      "orgPermissionLookup": Object {},
+                      "organizationLookup": Object {},
+                      "projectLookup": Object {},
+                    },
+                    "profile": Object {
+                      "app_metadata": Object {
+                        "datatools": Array [
+                          Object {
+                            "client_id": "mock-client-id",
+                            "organizations": Array [],
+                            "permissions": Array [
+                              Object {
+                                "type": "administer-application",
+                              },
+                            ],
+                            "projects": Array [],
+                            "subscriptions": Array [],
+                          },
+                        ],
+                      },
+                      "clientID": "mock-client-id",
+                      "created_at": "2016-03-04T18:59:22.569Z",
+                      "email": "mock-user@conveyal.com",
+                      "email_verified": true,
+                      "identities": Array [
                         Object {
-                          "dateCreated": 1536195264564,
-                          "deployable": false,
-                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                          "externalProperties": Object {},
-                          "id": "mock-feed-with-version-id",
-                          "isPublic": false,
-                          "lastFetched": 1543389038810,
-                          "lastUpdated": 1543389038810,
-                          "latestValidation": Object {
-                            "agencies": null,
-                            "agencyCount": 1,
-                            "avgDailyRevenueTime": 0,
-                            "bounds": Object {
-                              "east": -76.481211,
-                              "north": 39.0486949672717,
-                              "south": 38.92884,
-                              "west": -76.5673055566884,
+                          "connection": "Username-Password-Authentication",
+                          "isSocial": false,
+                          "provider": "auth0",
+                          "user_id": "12345",
+                        },
+                      ],
+                      "jti": "gibberish",
+                      "last_password_reset": "2017-07-13T13:58:01.021Z",
+                      "name": "mock-user@conveyal.com",
+                      "nickname": "mock-user",
+                      "persistent": Object {},
+                      "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
+                      "sub": "auth0|12345",
+                      "updated_at": "2019-03-21T19:05:30.180Z",
+                      "user_id": "auth0|12345",
+                      "user_metadata": Object {
+                        "datatools": Array [
+                          Object {
+                            "client_id": "mock-client-id",
+                            "editor": Object {
+                              "map_id": "mapbox.streets",
                             },
-                            "endDate": "20190801",
-                            "errorCount": 78,
-                            "feedVersionId": "mock-feed-version-id",
-                            "loadFailureReason": null,
-                            "loadStatus": "SUCCESS",
-                            "routeCount": 10,
-                            "startDate": "20180801",
-                            "stopCount": 237,
-                            "stopTimesCount": 11170,
-                            "tripCount": 415,
+                            "hideTutorial": true,
+                            "sidebarExpanded": false,
                           },
-                          "latestVersionId": "mock-feed-version-id",
-                          "name": "test feed with a version",
-                          "noteCount": 0,
-                          "organizationId": null,
-                          "projectId": "mock-project-id",
-                          "publishedVersionId": null,
-                          "retrievalMethod": "MANUALLY_UPLOADED",
-                          "s3Url": null,
-                          "snapshotVersion": null,
-                          "transformRules": Array [],
-                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                          "user": null,
+                        ],
+                        "lang": "en",
+                      },
+                    },
+                    "recentActivity": null,
+                    "redirectOnSuccess": null,
+                    "subscriptions": UserSubscriptions {
+                      "subscriptionLookup": Object {},
+                    },
+                    "token": "mock-token",
+                  }
+                }
+              >
+                <Row
+                  bsClass="row"
+                  componentClass="div"
+                >
+                  <div
+                    className="row"
+                  >
+                    <Col
+                      bsClass="col"
+                      componentClass="div"
+                      style={
+                        Object {
+                          "marginTop": 25,
                         }
                       }
-                      key="mock-feed-with-version-id"
-                      project={
-                        Object {
-                          "autoFetchFeeds": true,
-                          "autoFetchHour": 0,
-                          "autoFetchMinute": 0,
-                          "bounds": null,
-                          "buildConfig": Object {
-                            "fares": null,
-                            "fetchElevationUS": null,
-                            "stationTransfers": null,
-                            "subwayAccessTime": null,
-                          },
-                          "dateCreated": 1526305321824,
-                          "defaultTimeZone": null,
-                          "deployments": Array [
+                      xs={4}
+                    >
+                      <div
+                        className="col-xs-4"
+                        style={
+                          Object {
+                            "marginTop": 25,
+                          }
+                        }
+                      >
+                        <Form
+                          bsClass="form"
+                          componentClass="form"
+                          horizontal={false}
+                          inline={true}
+                          style={
                             Object {
-                              "customBuildConfig": null,
-                              "customRouterConfig": null,
-                              "dateCreated": 1553292345720,
-                              "deployJobSummaries": Array [],
-                              "deployedTo": null,
-                              "ec2Instances": Array [],
-                              "feedSourceId": null,
-                              "feedVersions": Array [
-                                Object {
-                                  "feedSource": Object {
-                                    "dateCreated": 1536195264564,
-                                    "deployable": false,
-                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                    "externalProperties": Object {},
-                                    "id": "mock-feed-with-version-id",
-                                    "isPublic": false,
-                                    "lastFetched": 1543389038810,
-                                    "lastUpdated": 1543389038810,
-                                    "latestValidation": Object {
-                                      "agencies": null,
-                                      "agencyCount": 1,
-                                      "avgDailyRevenueTime": 0,
-                                      "bounds": Object {
-                                        "east": -76.481211,
-                                        "north": 39.0486949672717,
-                                        "south": 38.92884,
-                                        "west": -76.5673055566884,
-                                      },
-                                      "endDate": "20190801",
-                                      "errorCount": 78,
-                                      "feedVersionId": "mock-feed-version-id",
-                                      "loadFailureReason": null,
-                                      "loadStatus": "SUCCESS",
-                                      "routeCount": 10,
-                                      "startDate": "20180801",
-                                      "stopCount": 237,
-                                      "stopTimesCount": 11170,
-                                      "tripCount": 415,
-                                    },
-                                    "latestVersionId": "mock-feed-version-id",
-                                    "name": "test feed with a version",
-                                    "noteCount": 0,
-                                    "organizationId": null,
-                                    "projectId": "mock-project-id",
-                                    "publishedVersionId": null,
-                                    "retrievalMethod": "MANUALLY_UPLOADED",
-                                    "s3Url": null,
-                                    "snapshotVersion": null,
-                                    "transformRules": Array [],
-                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                    "user": null,
-                                  },
-                                  "id": "mock-feed-version-id",
-                                  "nextVersionId": null,
-                                  "previousVersionId": null,
-                                  "updated": 1543389038810,
-                                  "validationResult": Object {
-                                    "agencies": null,
-                                    "agencyCount": 1,
-                                    "avgDailyRevenueTime": 0,
-                                    "bounds": Object {
-                                      "east": -76.481211,
-                                      "north": 39.0486949672717,
-                                      "south": 38.92884,
-                                      "west": -76.5673055566884,
-                                    },
-                                    "endDate": "20190801",
-                                    "errorCount": 78,
-                                    "feedVersionId": "mock-feed-version-id",
-                                    "loadFailureReason": null,
-                                    "loadStatus": "SUCCESS",
-                                    "routeCount": 10,
-                                    "startDate": "20180801",
-                                    "stopCount": 237,
-                                    "stopTimesCount": 11170,
-                                    "tripCount": 415,
-                                  },
-                                  "version": 1,
-                                },
-                              ],
-                              "id": "mock-deployment-id-0",
-                              "invalidFeedSources": Array [],
-                              "lastDeployed": null,
-                              "lastUpdated": 1553292345726,
-                              "latest": null,
-                              "name": "mock-deployment",
-                              "organizationId": null,
-                              "osmExtractUrl": null,
-                              "otpCommit": null,
-                              "otpVersion": null,
-                              "projectBounds": Object {
-                                "east": 0,
-                                "north": 0,
-                                "south": 0,
-                                "west": 0,
-                              },
-                              "projectId": "mock-project-with-deployments-id",
-                              "r5": false,
-                              "r5Version": null,
-                              "routerId": null,
-                              "skipOsmExtract": false,
-                              "user": null,
-                            },
-                          ],
-                          "feedSources": Array [
+                              "display": "inline",
+                            }
+                          }
+                        >
+                          <form
+                            className="form-inline"
+                            style={
+                              Object {
+                                "display": "inline",
+                              }
+                            }
+                          >
+                            <FormGroup
+                              bsClass="form-group"
+                              className="feed-source-toolbar-formgroup"
+                              controlId="formControlsSelect"
+                            >
+                              <div
+                                className="feed-source-toolbar-formgroup form-group"
+                              >
+                                <FormControl
+                                  bsClass="form-control"
+                                  componentClass="input"
+                                  onChange={[Function]}
+                                  placeholder="Search by name"
+                                >
+                                  <input
+                                    className="form-control"
+                                    id="formControlsSelect"
+                                    onChange={[Function]}
+                                    placeholder="Search by name"
+                                  />
+                                </FormControl>
+                              </div>
+                            </FormGroup>
+                          </form>
+                        </Form>
+                        <DropdownButton
+                          id="project-feedsource-table-sort-button"
+                          style={
                             Object {
-                              "dateCreated": 1536195264564,
-                              "deployable": false,
-                              "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                              "externalProperties": Object {},
-                              "id": "mock-feed-with-version-id",
-                              "isPublic": false,
-                              "lastFetched": 1543389038810,
-                              "lastUpdated": 1543389038810,
-                              "latestValidation": Object {
-                                "agencies": null,
-                                "agencyCount": 1,
-                                "avgDailyRevenueTime": 0,
-                                "bounds": Object {
-                                  "east": -76.481211,
-                                  "north": 39.0486949672717,
-                                  "south": 38.92884,
-                                  "west": -76.5673055566884,
-                                },
-                                "endDate": "20190801",
-                                "errorCount": 78,
-                                "feedVersionId": "mock-feed-version-id",
-                                "loadFailureReason": null,
-                                "loadStatus": "SUCCESS",
-                                "routeCount": 10,
-                                "startDate": "20180801",
-                                "stopCount": 237,
-                                "stopTimesCount": 11170,
-                                "tripCount": 415,
-                              },
-                              "latestVersionId": "mock-feed-version-id",
+                              "marginLeft": 20,
+                            }
+                          }
+                          title="Sort By"
+                        >
+                          <Uncontrolled(Dropdown)
+                            id="project-feedsource-table-sort-button"
+                          >
+                            <Dropdown
+                              bsClass="dropdown"
+                              componentClass={[Function]}
+                              id="project-feedsource-table-sort-button"
+                              onToggle={[Function]}
+                            >
+                              <ButtonGroup
+                                block={false}
+                                bsClass="btn-group"
+                                className="dropdown"
+                                justified={false}
+                                vertical={false}
+                              >
+                                <div
+                                  className="dropdown btn-group"
+                                >
+                                  <DropdownToggle
+                                    bsClass="dropdown-toggle"
+                                    bsRole="toggle"
+                                    id="project-feedsource-table-sort-button"
+                                    key=".0"
+                                    onClick={[Function]}
+                                    onKeyDown={[Function]}
+                                    open={false}
+                                    style={
+                                      Object {
+                                        "marginLeft": 20,
+                                      }
+                                    }
+                                    useAnchor={false}
+                                  >
+                                    <Button
+                                      active={false}
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
+                                      block={false}
+                                      bsClass="btn"
+                                      bsStyle="default"
+                                      className="dropdown-toggle"
+                                      disabled={false}
+                                      id="project-feedsource-table-sort-button"
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      role="button"
+                                      style={
+                                        Object {
+                                          "marginLeft": 20,
+                                        }
+                                      }
+                                    >
+                                      <button
+                                        aria-expanded={false}
+                                        aria-haspopup={true}
+                                        className="dropdown-toggle btn btn-default"
+                                        disabled={false}
+                                        id="project-feedsource-table-sort-button"
+                                        onClick={[Function]}
+                                        onKeyDown={[Function]}
+                                        role="button"
+                                        style={
+                                          Object {
+                                            "marginLeft": 20,
+                                          }
+                                        }
+                                        type="button"
+                                      >
+                                        Sort By
+                                         
+                                        <span
+                                          className="caret"
+                                        />
+                                      </button>
+                                    </Button>
+                                  </DropdownToggle>
+                                  <DropdownMenu
+                                    bsClass="dropdown-menu"
+                                    bsRole="menu"
+                                    key=".1"
+                                    labelledBy="project-feedsource-table-sort-button"
+                                    onClose={[Function]}
+                                    onSelect={[Function]}
+                                    pullRight={false}
+                                  >
+                                    <RootCloseWrapper
+                                      disabled={true}
+                                      event="click"
+                                      onRootClose={[Function]}
+                                    >
+                                      <ul
+                                        aria-labelledby="project-feedsource-table-sort-button"
+                                        className="dropdown-menu"
+                                        role="menu"
+                                      >
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={true}
+                                          key=".$sort-header-note"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="dropdown-header"
+                                            onKeyDown={[Function]}
+                                            role="heading"
+                                          >
+                                            Note: sorting only available on latest version data
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={true}
+                                          key=".$feed-sort-alphabetically-header"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="dropdown-header"
+                                            onKeyDown={[Function]}
+                                            role="heading"
+                                          >
+                                            Alphabetically
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-alphabetically-asc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                A-Z
+                                                <Icon
+                                                  style={
+                                                    Object {
+                                                      "marginLeft": 6,
+                                                    }
+                                                  }
+                                                  type="check"
+                                                >
+                                                  <i
+                                                    className="fa fa-check fa-fw "
+                                                    style={
+                                                      Object {
+                                                        "marginLeft": 6,
+                                                      }
+                                                    }
+                                                  />
+                                                </Icon>
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-alphabetically-desc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                Z-A
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={true}
+                                          header={false}
+                                          key=".$feed-sort-alphabetically-divider"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="divider"
+                                            onKeyDown={[Function]}
+                                            role="separator"
+                                          />
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={true}
+                                          key=".$feed-sort-endDate-header"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="dropdown-header"
+                                            onKeyDown={[Function]}
+                                            role="heading"
+                                          >
+                                            Expiration Date
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-endDate-asc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                Earliest-Latest
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-endDate-desc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                Latest-Earliest
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={true}
+                                          header={false}
+                                          key=".$feed-sort-endDate-divider"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="divider"
+                                            onKeyDown={[Function]}
+                                            role="separator"
+                                          />
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={true}
+                                          key=".$feed-sort-startDate-header"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="dropdown-header"
+                                            onKeyDown={[Function]}
+                                            role="heading"
+                                          >
+                                            Start Date
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-startDate-asc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                Earliest-Latest
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-startDate-desc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                Latest-Earliest
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={true}
+                                          header={false}
+                                          key=".$feed-sort-startDate-divider"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="divider"
+                                            onKeyDown={[Function]}
+                                            role="separator"
+                                          />
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={true}
+                                          key=".$feed-sort-lastUpdated-header"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="dropdown-header"
+                                            onKeyDown={[Function]}
+                                            role="heading"
+                                          >
+                                            Last Update
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-lastUpdated-asc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                Stale-Recent
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-lastUpdated-desc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                Recent-Stale
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={true}
+                                          header={false}
+                                          key=".$feed-sort-lastUpdated-divider"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="divider"
+                                            onKeyDown={[Function]}
+                                            role="separator"
+                                          />
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={true}
+                                          key=".$feed-sort-numErrors-header"
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className="dropdown-header"
+                                            onKeyDown={[Function]}
+                                            role="heading"
+                                          >
+                                            Number of Issues
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-numErrors-asc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                Least-Most
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$feed-sort-numErrors-desc"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                Most-Least
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                      </ul>
+                                    </RootCloseWrapper>
+                                  </DropdownMenu>
+                                </div>
+                              </ButtonGroup>
+                            </Dropdown>
+                          </Uncontrolled(Dropdown)>
+                        </DropdownButton>
+                      </div>
+                    </Col>
+                    <Col
+                      bsClass="col"
+                      componentClass="div"
+                      xs={6}
+                    >
+                      <div
+                        className="col-xs-6"
+                      >
+                        <FormGroup
+                          bsClass="form-group"
+                          id="feedFilterToolbarControl"
+                        >
+                          <div
+                            className="form-group"
+                            id="feedFilterToolbarControl"
+                          >
+                            <ControlLabel
+                              bsClass="control-label"
+                              srOnly={false}
+                              style={
+                                Object {
+                                  "display": "block",
+                                }
+                              }
+                            >
+                              <label
+                                className="control-label"
+                                style={
+                                  Object {
+                                    "display": "block",
+                                  }
+                                }
+                              >
+                                Filter feed sources on
+                                <select
+                                  onChange={[Function]}
+                                  style={
+                                    Object {
+                                      "marginLeft": 5,
+                                      "marginRight": 5,
+                                    }
+                                  }
+                                  value="LATEST"
+                                >
+                                  <option
+                                    key="LATEST"
+                                    value="LATEST"
+                                  >
+                                    Latest
+                                  </option>
+                                  <option
+                                    key="DEPLOYED"
+                                    value="DEPLOYED"
+                                  >
+                                    Deployed
+                                  </option>
+                                </select>
+                                version
+                              </label>
+                            </ControlLabel>
+                            <ButtonGroup
+                              block={false}
+                              bsClass="btn-group"
+                              justified={false}
+                              vertical={false}
+                            >
+                              <div
+                                className="btn-group"
+                              >
+                                <OptionButton
+                                  active={true}
+                                  className="active"
+                                  key="all"
+                                  onClick={[Function]}
+                                  value="all"
+                                >
+                                  <Button
+                                    active={true}
+                                    block={false}
+                                    bsClass="btn"
+                                    bsStyle="default"
+                                    className="active"
+                                    disabled={false}
+                                    href="#"
+                                    onClick={[Function]}
+                                    value="all"
+                                  >
+                                    <SafeAnchor
+                                      className="active btn btn-default active"
+                                      componentClass="a"
+                                      disabled={false}
+                                      href="#"
+                                      onClick={[Function]}
+                                      value="all"
+                                    >
+                                      <a
+                                        className="active btn btn-default active"
+                                        href="#"
+                                        onClick={[Function]}
+                                        role="button"
+                                        value="all"
+                                      >
+                                        All
+                                         
+                                        <Badge
+                                          bsClass="badge"
+                                          pullRight={false}
+                                          style={
+                                            Object {
+                                              "backgroundColor": "#babec0",
+                                            }
+                                          }
+                                        >
+                                          <span
+                                            className="badge"
+                                            style={
+                                              Object {
+                                                "backgroundColor": "#babec0",
+                                              }
+                                            }
+                                          >
+                                            1
+                                          </span>
+                                        </Badge>
+                                      </a>
+                                    </SafeAnchor>
+                                  </Button>
+                                </OptionButton>
+                                <OptionButton
+                                  active={false}
+                                  className=""
+                                  key="active"
+                                  onClick={[Function]}
+                                  value="active"
+                                >
+                                  <Button
+                                    active={false}
+                                    block={false}
+                                    bsClass="btn"
+                                    bsStyle="default"
+                                    className=""
+                                    disabled={false}
+                                    href="#"
+                                    onClick={[Function]}
+                                    value="active"
+                                  >
+                                    <SafeAnchor
+                                      className="btn btn-default"
+                                      componentClass="a"
+                                      disabled={false}
+                                      href="#"
+                                      onClick={[Function]}
+                                      value="active"
+                                    >
+                                      <a
+                                        className="btn btn-default"
+                                        href="#"
+                                        onClick={[Function]}
+                                        role="button"
+                                        value="active"
+                                      >
+                                        Active
+                                         
+                                        <Badge
+                                          bsClass="badge"
+                                          pullRight={false}
+                                          style={
+                                            Object {
+                                              "backgroundColor": "#babec0",
+                                            }
+                                          }
+                                        >
+                                          <span
+                                            className="badge"
+                                            style={
+                                              Object {
+                                                "backgroundColor": "#babec0",
+                                              }
+                                            }
+                                          >
+                                            1
+                                          </span>
+                                        </Badge>
+                                      </a>
+                                    </SafeAnchor>
+                                  </Button>
+                                </OptionButton>
+                                <OptionButton
+                                  active={false}
+                                  className=""
+                                  key="expiring"
+                                  onClick={[Function]}
+                                  value="expiring"
+                                >
+                                  <Button
+                                    active={false}
+                                    block={false}
+                                    bsClass="btn"
+                                    bsStyle="default"
+                                    className=""
+                                    disabled={false}
+                                    href="#"
+                                    onClick={[Function]}
+                                    value="expiring"
+                                  >
+                                    <SafeAnchor
+                                      className="btn btn-default"
+                                      componentClass="a"
+                                      disabled={false}
+                                      href="#"
+                                      onClick={[Function]}
+                                      value="expiring"
+                                    >
+                                      <a
+                                        className="btn btn-default"
+                                        href="#"
+                                        onClick={[Function]}
+                                        role="button"
+                                        value="expiring"
+                                      >
+                                        Expiring
+                                         
+                                        <Badge
+                                          bsClass="badge"
+                                          pullRight={false}
+                                          style={
+                                            Object {
+                                              "backgroundColor": "#babec0",
+                                            }
+                                          }
+                                        >
+                                          <span
+                                            className="badge"
+                                            style={
+                                              Object {
+                                                "backgroundColor": "#babec0",
+                                              }
+                                            }
+                                          >
+                                            0
+                                          </span>
+                                        </Badge>
+                                      </a>
+                                    </SafeAnchor>
+                                  </Button>
+                                </OptionButton>
+                                <OptionButton
+                                  active={false}
+                                  className=""
+                                  key="expired"
+                                  onClick={[Function]}
+                                  value="expired"
+                                >
+                                  <Button
+                                    active={false}
+                                    block={false}
+                                    bsClass="btn"
+                                    bsStyle="default"
+                                    className=""
+                                    disabled={false}
+                                    href="#"
+                                    onClick={[Function]}
+                                    value="expired"
+                                  >
+                                    <SafeAnchor
+                                      className="btn btn-default"
+                                      componentClass="a"
+                                      disabled={false}
+                                      href="#"
+                                      onClick={[Function]}
+                                      value="expired"
+                                    >
+                                      <a
+                                        className="btn btn-default"
+                                        href="#"
+                                        onClick={[Function]}
+                                        role="button"
+                                        value="expired"
+                                      >
+                                        Expired
+                                         
+                                        <Badge
+                                          bsClass="badge"
+                                          pullRight={false}
+                                          style={
+                                            Object {
+                                              "backgroundColor": "#babec0",
+                                            }
+                                          }
+                                        >
+                                          <span
+                                            className="badge"
+                                            style={
+                                              Object {
+                                                "backgroundColor": "#babec0",
+                                              }
+                                            }
+                                          >
+                                            0
+                                          </span>
+                                        </Badge>
+                                      </a>
+                                    </SafeAnchor>
+                                  </Button>
+                                </OptionButton>
+                                <OptionButton
+                                  active={false}
+                                  className=""
+                                  key="future"
+                                  onClick={[Function]}
+                                  value="future"
+                                >
+                                  <Button
+                                    active={false}
+                                    block={false}
+                                    bsClass="btn"
+                                    bsStyle="default"
+                                    className=""
+                                    disabled={false}
+                                    href="#"
+                                    onClick={[Function]}
+                                    value="future"
+                                  >
+                                    <SafeAnchor
+                                      className="btn btn-default"
+                                      componentClass="a"
+                                      disabled={false}
+                                      href="#"
+                                      onClick={[Function]}
+                                      value="future"
+                                    >
+                                      <a
+                                        className="btn btn-default"
+                                        href="#"
+                                        onClick={[Function]}
+                                        role="button"
+                                        value="future"
+                                      >
+                                        Future
+                                         
+                                        <Badge
+                                          bsClass="badge"
+                                          pullRight={false}
+                                          style={
+                                            Object {
+                                              "backgroundColor": "#babec0",
+                                            }
+                                          }
+                                        >
+                                          <span
+                                            className="badge"
+                                            style={
+                                              Object {
+                                                "backgroundColor": "#babec0",
+                                              }
+                                            }
+                                          >
+                                            0
+                                          </span>
+                                        </Badge>
+                                      </a>
+                                    </SafeAnchor>
+                                  </Button>
+                                </OptionButton>
+                              </div>
+                            </ButtonGroup>
+                          </div>
+                        </FormGroup>
+                      </div>
+                    </Col>
+                    <Col
+                      bsClass="col"
+                      componentClass="div"
+                      style={
+                        Object {
+                          "marginTop": 25,
+                        }
+                      }
+                      xs={2}
+                    >
+                      <div
+                        className="col-xs-2"
+                        style={
+                          Object {
+                            "marginTop": 25,
+                          }
+                        }
+                      >
+                        <DropdownButton
+                          bsStyle="primary"
+                          data-test-id="project-header-action-dropdown-button"
+                          id="project-header-actions"
+                          style={
+                            Object {
+                              "marginLeft": 20,
+                            }
+                          }
+                          title="Actions"
+                        >
+                          <Uncontrolled(Dropdown)
+                            bsStyle="primary"
+                            id="project-header-actions"
+                          >
+                            <Dropdown
+                              bsClass="dropdown"
+                              bsStyle="primary"
+                              componentClass={[Function]}
+                              id="project-header-actions"
+                              onToggle={[Function]}
+                            >
+                              <ButtonGroup
+                                block={false}
+                                bsClass="btn-group"
+                                bsStyle="primary"
+                                className="dropdown"
+                                justified={false}
+                                vertical={false}
+                              >
+                                <div
+                                  className="dropdown btn-group btn-group-primary"
+                                >
+                                  <DropdownToggle
+                                    bsClass="dropdown-toggle"
+                                    bsRole="toggle"
+                                    bsStyle="primary"
+                                    data-test-id="project-header-action-dropdown-button"
+                                    id="project-header-actions"
+                                    key=".0"
+                                    onClick={[Function]}
+                                    onKeyDown={[Function]}
+                                    open={false}
+                                    style={
+                                      Object {
+                                        "marginLeft": 20,
+                                      }
+                                    }
+                                    useAnchor={false}
+                                  >
+                                    <Button
+                                      active={false}
+                                      aria-expanded={false}
+                                      aria-haspopup={true}
+                                      block={false}
+                                      bsClass="btn"
+                                      bsStyle="primary"
+                                      className="dropdown-toggle"
+                                      data-test-id="project-header-action-dropdown-button"
+                                      disabled={false}
+                                      id="project-header-actions"
+                                      onClick={[Function]}
+                                      onKeyDown={[Function]}
+                                      role="button"
+                                      style={
+                                        Object {
+                                          "marginLeft": 20,
+                                        }
+                                      }
+                                    >
+                                      <button
+                                        aria-expanded={false}
+                                        aria-haspopup={true}
+                                        className="dropdown-toggle btn btn-primary"
+                                        data-test-id="project-header-action-dropdown-button"
+                                        disabled={false}
+                                        id="project-header-actions"
+                                        onClick={[Function]}
+                                        onKeyDown={[Function]}
+                                        role="button"
+                                        style={
+                                          Object {
+                                            "marginLeft": 20,
+                                          }
+                                        }
+                                        type="button"
+                                      >
+                                        Actions
+                                         
+                                        <span
+                                          className="caret"
+                                        />
+                                      </button>
+                                    </Button>
+                                  </DropdownToggle>
+                                  <DropdownMenu
+                                    bsClass="dropdown-menu"
+                                    bsRole="menu"
+                                    key=".1"
+                                    labelledBy="project-header-actions"
+                                    onClose={[Function]}
+                                    onSelect={[Function]}
+                                    pullRight={false}
+                                  >
+                                    <RootCloseWrapper
+                                      disabled={true}
+                                      event="click"
+                                      onRootClose={[Function]}
+                                    >
+                                      <ul
+                                        aria-labelledby="project-header-actions"
+                                        className="dropdown-menu"
+                                        role="menu"
+                                      >
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          data-test-id="project-header-create-new-feed-source-button"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$create-feedsource-button"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              data-test-id="project-header-create-new-feed-source-button"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                data-test-id="project-header-create-new-feed-source-button"
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                <Glyphicon
+                                                  bsClass="glyphicon"
+                                                  glyph="plus"
+                                                >
+                                                  <span
+                                                    className="glyphicon glyphicon-plus"
+                                                  />
+                                                </Glyphicon>
+                                                 
+                                                New
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$update-feeds-button"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                <Icon
+                                                  type="cloud-download"
+                                                >
+                                                  <i
+                                                    className="fa fa-cloud-download fa-fw "
+                                                  />
+                                                </Icon>
+                                                 
+                                                Fetch all
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$merge-feeds-button"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                <Glyphicon
+                                                  bsClass="glyphicon"
+                                                  glyph="download"
+                                                >
+                                                  <span
+                                                    className="glyphicon glyphicon-download"
+                                                  />
+                                                </Glyphicon>
+                                                 
+                                                Merge all
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                        <MenuItem
+                                          bsClass="dropdown"
+                                          disabled={false}
+                                          divider={false}
+                                          header={false}
+                                          key=".$csv-download-button"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          onSelect={[Function]}
+                                        >
+                                          <li
+                                            className=""
+                                            role="presentation"
+                                          >
+                                            <SafeAnchor
+                                              componentClass="a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="menuitem"
+                                              tabIndex="-1"
+                                            >
+                                              <a
+                                                href="#"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="menuitem"
+                                                tabIndex="-1"
+                                              >
+                                                <Icon
+                                                  type="table"
+                                                >
+                                                  <i
+                                                    className="fa fa-table fa-fw "
+                                                  />
+                                                </Icon>
+                                                 
+                                                Download Summary as CSV
+                                              </a>
+                                            </SafeAnchor>
+                                          </li>
+                                        </MenuItem>
+                                      </ul>
+                                    </RootCloseWrapper>
+                                  </DropdownMenu>
+                                </div>
+                              </ButtonGroup>
+                            </Dropdown>
+                          </Uncontrolled(Dropdown)>
+                        </DropdownButton>
+                      </div>
+                    </Col>
+                  </div>
+                </Row>
+              </ProjectFeedListToolbar>
+            </Connect(ProjectFeedListToolbar)>
+          </div>
+          <ListGroup
+            bsClass="list-group"
+            key=".0"
+          >
+            <div
+              className="list-group"
+            >
+              <table
+                className="feed-source-table"
+              >
+                <thead>
+                  <tr>
+                    <th />
+                    <th
+                      className="comparison-column top-row"
+                    >
+                      <h4>
+                        Deployed Version
+                      </h4>
+                    </th>
+                    <th
+                      className="feed-version-column top-row"
+                      colSpan={3}
+                    >
+                      <h4>
+                        Latest Version
+                      </h4>
+                    </th>
+                    <th />
+                  </tr>
+                  <tr>
+                    <th>
+                      <h4>
+                        <Icon
+                          type="info-circle"
+                        >
+                          <i
+                            className="fa fa-info-circle fa-fw "
+                          />
+                        </Icon>
+                        Feed Info
+                      </h4>
+                    </th>
+                    <th
+                      className="comparison-column"
+                    >
+                      <h4>
+                        <Icon
+                          type="heartbeat"
+                        >
+                          <i
+                            className="fa fa-heartbeat fa-fw "
+                          />
+                        </Icon>
+                        Status
+                      </h4>
+                    </th>
+                    <th
+                      className="feed-version-column"
+                    >
+                      <h4>
+                        <Icon
+                          type="heartbeat"
+                        >
+                          <i
+                            className="fa fa-heartbeat fa-fw "
+                          />
+                        </Icon>
+                        Status
+                      </h4>
+                    </th>
+                    <th
+                      className="feed-version-column"
+                    >
+                      <h4>
+                        <Icon
+                          type="calendar-check-o"
+                        >
+                          <i
+                            className="fa fa-calendar-check-o fa-fw "
+                          />
+                        </Icon>
+                        Dates Valid
+                      </h4>
+                    </th>
+                    <th
+                      className="feed-version-column"
+                    >
+                      <h4>
+                        <Icon
+                          type="exclamation-triangle"
+                        >
+                          <i
+                            className="fa fa-exclamation-triangle fa-fw "
+                          />
+                        </Icon>
+                        Issues
+                      </h4>
+                    </th>
+                    <th />
+                  </tr>
+                </thead>
+                <tbody>
+                  <Connect(FeedSourceTableRow)
+                    feedSource={
+                      Object {
+                        "dateCreated": 1536195264564,
+                        "deployable": false,
+                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                        "externalProperties": Object {},
+                        "id": "mock-feed-with-version-id",
+                        "isPublic": false,
+                        "lastFetched": 1543389038810,
+                        "lastUpdated": 1543389038810,
+                        "latestValidation": Object {
+                          "agencies": null,
+                          "agencyCount": 1,
+                          "avgDailyRevenueTime": 0,
+                          "bounds": Object {
+                            "east": -76.481211,
+                            "north": 39.0486949672717,
+                            "south": 38.92884,
+                            "west": -76.5673055566884,
+                          },
+                          "endDate": "20190801",
+                          "errorCount": 78,
+                          "feedVersionId": "mock-feed-version-id",
+                          "loadFailureReason": null,
+                          "loadStatus": "SUCCESS",
+                          "routeCount": 10,
+                          "startDate": "20180801",
+                          "stopCount": 237,
+                          "stopTimesCount": 11170,
+                          "tripCount": 415,
+                        },
+                        "latestVersionId": "mock-feed-version-id",
+                        "name": "test feed with a version",
+                        "noteCount": 0,
+                        "organizationId": null,
+                        "projectId": "mock-project-id",
+                        "publishedVersionId": null,
+                        "retrievalMethod": "MANUALLY_UPLOADED",
+                        "s3Url": null,
+                        "snapshotVersion": null,
+                        "transformRules": Array [],
+                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                        "user": null,
+                      }
+                    }
+                    key="mock-feed-with-version-id"
+                    project={
+                      Object {
+                        "autoFetchFeeds": true,
+                        "autoFetchHour": 0,
+                        "autoFetchMinute": 0,
+                        "bounds": null,
+                        "buildConfig": Object {
+                          "fares": null,
+                          "fetchElevationUS": null,
+                          "stationTransfers": null,
+                          "subwayAccessTime": null,
+                        },
+                        "dateCreated": 1526305321824,
+                        "defaultTimeZone": null,
+                        "deployments": Array [
+                          Object {
+                            "customBuildConfig": null,
+                            "customRouterConfig": null,
+                            "dateCreated": 1553292345720,
+                            "deployJobSummaries": Array [],
+                            "deployedTo": null,
+                            "ec2Instances": Array [],
+                            "feedSourceId": null,
+                            "feedVersions": Array [
+                              Object {
+                                "feedSource": Object {
+                                  "dateCreated": 1536195264564,
+                                  "deployable": false,
+                                  "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                  "externalProperties": Object {},
+                                  "id": "mock-feed-with-version-id",
+                                  "isPublic": false,
+                                  "lastFetched": 1543389038810,
+                                  "lastUpdated": 1543389038810,
+                                  "latestValidation": Object {
+                                    "agencies": null,
+                                    "agencyCount": 1,
+                                    "avgDailyRevenueTime": 0,
+                                    "bounds": Object {
+                                      "east": -76.481211,
+                                      "north": 39.0486949672717,
+                                      "south": 38.92884,
+                                      "west": -76.5673055566884,
+                                    },
+                                    "endDate": "20190801",
+                                    "errorCount": 78,
+                                    "feedVersionId": "mock-feed-version-id",
+                                    "loadFailureReason": null,
+                                    "loadStatus": "SUCCESS",
+                                    "routeCount": 10,
+                                    "startDate": "20180801",
+                                    "stopCount": 237,
+                                    "stopTimesCount": 11170,
+                                    "tripCount": 415,
+                                  },
+                                  "latestVersionId": "mock-feed-version-id",
+                                  "name": "test feed with a version",
+                                  "noteCount": 0,
+                                  "organizationId": null,
+                                  "projectId": "mock-project-id",
+                                  "publishedVersionId": null,
+                                  "retrievalMethod": "MANUALLY_UPLOADED",
+                                  "s3Url": null,
+                                  "snapshotVersion": null,
+                                  "transformRules": Array [],
+                                  "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                  "user": null,
+                                },
+                                "id": "mock-feed-version-id",
+                                "nextVersionId": null,
+                                "previousVersionId": null,
+                                "updated": 1543389038810,
+                                "validationResult": Object {
+                                  "agencies": null,
+                                  "agencyCount": 1,
+                                  "avgDailyRevenueTime": 0,
+                                  "bounds": Object {
+                                    "east": -76.481211,
+                                    "north": 39.0486949672717,
+                                    "south": 38.92884,
+                                    "west": -76.5673055566884,
+                                  },
+                                  "endDate": "20190801",
+                                  "errorCount": 78,
+                                  "feedVersionId": "mock-feed-version-id",
+                                  "loadFailureReason": null,
+                                  "loadStatus": "SUCCESS",
+                                  "routeCount": 10,
+                                  "startDate": "20180801",
+                                  "stopCount": 237,
+                                  "stopTimesCount": 11170,
+                                  "tripCount": 415,
+                                },
+                                "version": 1,
+                              },
+                            ],
+                            "id": "mock-deployment-id-0",
+                            "invalidFeedSources": Array [],
+                            "lastDeployed": null,
+                            "lastUpdated": 1553292345726,
+                            "latest": null,
+                            "name": "mock-deployment",
+                            "organizationId": null,
+                            "osmExtractUrl": null,
+                            "otpCommit": null,
+                            "otpVersion": null,
+                            "projectBounds": Object {
+                              "east": 0,
+                              "north": 0,
+                              "south": 0,
+                              "west": 0,
+                            },
+                            "projectId": "mock-project-with-deployments-id",
+                            "r5": false,
+                            "r5Version": null,
+                            "routerId": null,
+                            "skipOsmExtract": false,
+                            "user": null,
+                          },
+                        ],
+                        "feedSources": Array [
+                          Object {
+                            "dateCreated": 1536195264564,
+                            "deployable": false,
+                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                            "externalProperties": Object {},
+                            "id": "mock-feed-with-version-id",
+                            "isPublic": false,
+                            "lastFetched": 1543389038810,
+                            "lastUpdated": 1543389038810,
+                            "latestValidation": Object {
+                              "agencies": null,
+                              "agencyCount": 1,
+                              "avgDailyRevenueTime": 0,
+                              "bounds": Object {
+                                "east": -76.481211,
+                                "north": 39.0486949672717,
+                                "south": 38.92884,
+                                "west": -76.5673055566884,
+                              },
+                              "endDate": "20190801",
+                              "errorCount": 78,
+                              "feedVersionId": "mock-feed-version-id",
+                              "loadFailureReason": null,
+                              "loadStatus": "SUCCESS",
+                              "routeCount": 10,
+                              "startDate": "20180801",
+                              "stopCount": 237,
+                              "stopTimesCount": 11170,
+                              "tripCount": 415,
+                            },
+                            "latestVersionId": "mock-feed-version-id",
+                            "name": "test feed with a version",
+                            "noteCount": 0,
+                            "organizationId": null,
+                            "projectId": "mock-project-id",
+                            "publishedVersionId": null,
+                            "retrievalMethod": "MANUALLY_UPLOADED",
+                            "s3Url": null,
+                            "snapshotVersion": null,
+                            "transformRules": Array [],
+                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                            "user": null,
+                          },
+                        ],
+                        "id": "mock-project-with-deployments-id",
+                        "lastUpdated": 1553236399556,
+                        "name": "mock-project-with-deployments",
+                        "organizationId": null,
+                        "otpServers": Array [],
+                        "pinnedDeploymentId": null,
+                        "routerConfig": Object {
+                          "carDropoffTime": null,
+                          "numItineraries": null,
+                          "requestLogFile": null,
+                          "stairsReluctance": null,
+                          "updaters": null,
+                          "walkSpeed": null,
+                        },
+                        "useCustomOsmBounds": false,
+                        "user": null,
+                      }
+                    }
+                  >
+                    <FeedSourceTableRow
+                      comparisonColumn="DEPLOYED"
+                      comparisonValidationSummary={
+                        Object {
+                          "agencies": null,
+                          "agencyCount": 1,
+                          "avgDailyRevenueTime": 0,
+                          "bounds": Object {
+                            "east": -76.481211,
+                            "north": 39.0486949672717,
+                            "south": 38.92884,
+                            "west": -76.5673055566884,
+                          },
+                          "endDate": "20190801",
+                          "errorCount": 78,
+                          "feedVersionId": "mock-feed-version-id",
+                          "loadFailureReason": null,
+                          "loadStatus": "SUCCESS",
+                          "routeCount": 10,
+                          "startDate": "20180801",
+                          "stopCount": 237,
+                          "stopTimesCount": 11170,
+                          "tripCount": 415,
+                        }
+                      }
+                      createDeploymentFromFeedSource={[Function]}
+                      createFeedSource={[Function]}
+                      deleteFeedSource={[Function]}
+                      feedSource={
+                        Object {
+                          "dateCreated": 1536195264564,
+                          "deployable": false,
+                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                          "externalProperties": Object {},
+                          "id": "mock-feed-with-version-id",
+                          "isPublic": false,
+                          "lastFetched": 1543389038810,
+                          "lastUpdated": 1543389038810,
+                          "latestValidation": Object {
+                            "agencies": null,
+                            "agencyCount": 1,
+                            "avgDailyRevenueTime": 0,
+                            "bounds": Object {
+                              "east": -76.481211,
+                              "north": 39.0486949672717,
+                              "south": 38.92884,
+                              "west": -76.5673055566884,
+                            },
+                            "endDate": "20190801",
+                            "errorCount": 78,
+                            "feedVersionId": "mock-feed-version-id",
+                            "loadFailureReason": null,
+                            "loadStatus": "SUCCESS",
+                            "routeCount": 10,
+                            "startDate": "20180801",
+                            "stopCount": 237,
+                            "stopTimesCount": 11170,
+                            "tripCount": 415,
+                          },
+                          "latestVersionId": "mock-feed-version-id",
+                          "name": "test feed with a version",
+                          "noteCount": 0,
+                          "organizationId": null,
+                          "projectId": "mock-project-id",
+                          "publishedVersionId": null,
+                          "retrievalMethod": "MANUALLY_UPLOADED",
+                          "s3Url": null,
+                          "snapshotVersion": null,
+                          "transformRules": Array [],
+                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                          "user": null,
+                        }
+                      }
+                      project={
+                        Object {
+                          "autoFetchFeeds": true,
+                          "autoFetchHour": 0,
+                          "autoFetchMinute": 0,
+                          "bounds": null,
+                          "buildConfig": Object {
+                            "fares": null,
+                            "fetchElevationUS": null,
+                            "stationTransfers": null,
+                            "subwayAccessTime": null,
+                          },
+                          "dateCreated": 1526305321824,
+                          "defaultTimeZone": null,
+                          "deployments": Array [
+                            Object {
+                              "customBuildConfig": null,
+                              "customRouterConfig": null,
+                              "dateCreated": 1553292345720,
+                              "deployJobSummaries": Array [],
+                              "deployedTo": null,
+                              "ec2Instances": Array [],
+                              "feedSourceId": null,
+                              "feedVersions": Array [
+                                Object {
+                                  "feedSource": Object {
+                                    "dateCreated": 1536195264564,
+                                    "deployable": false,
+                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                    "externalProperties": Object {},
+                                    "id": "mock-feed-with-version-id",
+                                    "isPublic": false,
+                                    "lastFetched": 1543389038810,
+                                    "lastUpdated": 1543389038810,
+                                    "latestValidation": Object {
+                                      "agencies": null,
+                                      "agencyCount": 1,
+                                      "avgDailyRevenueTime": 0,
+                                      "bounds": Object {
+                                        "east": -76.481211,
+                                        "north": 39.0486949672717,
+                                        "south": 38.92884,
+                                        "west": -76.5673055566884,
+                                      },
+                                      "endDate": "20190801",
+                                      "errorCount": 78,
+                                      "feedVersionId": "mock-feed-version-id",
+                                      "loadFailureReason": null,
+                                      "loadStatus": "SUCCESS",
+                                      "routeCount": 10,
+                                      "startDate": "20180801",
+                                      "stopCount": 237,
+                                      "stopTimesCount": 11170,
+                                      "tripCount": 415,
+                                    },
+                                    "latestVersionId": "mock-feed-version-id",
+                                    "name": "test feed with a version",
+                                    "noteCount": 0,
+                                    "organizationId": null,
+                                    "projectId": "mock-project-id",
+                                    "publishedVersionId": null,
+                                    "retrievalMethod": "MANUALLY_UPLOADED",
+                                    "s3Url": null,
+                                    "snapshotVersion": null,
+                                    "transformRules": Array [],
+                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                    "user": null,
+                                  },
+                                  "id": "mock-feed-version-id",
+                                  "nextVersionId": null,
+                                  "previousVersionId": null,
+                                  "updated": 1543389038810,
+                                  "validationResult": Object {
+                                    "agencies": null,
+                                    "agencyCount": 1,
+                                    "avgDailyRevenueTime": 0,
+                                    "bounds": Object {
+                                      "east": -76.481211,
+                                      "north": 39.0486949672717,
+                                      "south": 38.92884,
+                                      "west": -76.5673055566884,
+                                    },
+                                    "endDate": "20190801",
+                                    "errorCount": 78,
+                                    "feedVersionId": "mock-feed-version-id",
+                                    "loadFailureReason": null,
+                                    "loadStatus": "SUCCESS",
+                                    "routeCount": 10,
+                                    "startDate": "20180801",
+                                    "stopCount": 237,
+                                    "stopTimesCount": 11170,
+                                    "tripCount": 415,
+                                  },
+                                  "version": 1,
+                                },
+                              ],
+                              "id": "mock-deployment-id-0",
+                              "invalidFeedSources": Array [],
+                              "lastDeployed": null,
+                              "lastUpdated": 1553292345726,
+                              "latest": null,
+                              "name": "mock-deployment",
+                              "organizationId": null,
+                              "osmExtractUrl": null,
+                              "otpCommit": null,
+                              "otpVersion": null,
+                              "projectBounds": Object {
+                                "east": 0,
+                                "north": 0,
+                                "south": 0,
+                                "west": 0,
+                              },
+                              "projectId": "mock-project-with-deployments-id",
+                              "r5": false,
+                              "r5Version": null,
+                              "routerId": null,
+                              "skipOsmExtract": false,
+                              "user": null,
+                            },
+                          ],
+                          "feedSources": Array [
+                            Object {
+                              "dateCreated": 1536195264564,
+                              "deployable": false,
+                              "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                              "externalProperties": Object {},
+                              "id": "mock-feed-with-version-id",
+                              "isPublic": false,
+                              "lastFetched": 1543389038810,
+                              "lastUpdated": 1543389038810,
+                              "latestValidation": Object {
+                                "agencies": null,
+                                "agencyCount": 1,
+                                "avgDailyRevenueTime": 0,
+                                "bounds": Object {
+                                  "east": -76.481211,
+                                  "north": 39.0486949672717,
+                                  "south": 38.92884,
+                                  "west": -76.5673055566884,
+                                },
+                                "endDate": "20190801",
+                                "errorCount": 78,
+                                "feedVersionId": "mock-feed-version-id",
+                                "loadFailureReason": null,
+                                "loadStatus": "SUCCESS",
+                                "routeCount": 10,
+                                "startDate": "20180801",
+                                "stopCount": 237,
+                                "stopTimesCount": 11170,
+                                "tripCount": 415,
+                              },
+                              "latestVersionId": "mock-feed-version-id",
                               "name": "test feed with a version",
                               "noteCount": 0,
                               "organizationId": null,
@@ -1463,201 +3202,91 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "user": null,
                         }
                       }
-                    >
-                      <FeedSourceTableRow
-                        comparisonColumn="DEPLOYED"
-                        comparisonValidationSummary={
-                          Object {
-                            "agencies": null,
-                            "agencyCount": 1,
-                            "avgDailyRevenueTime": 0,
-                            "bounds": Object {
-                              "east": -76.481211,
-                              "north": 39.0486949672717,
-                              "south": 38.92884,
-                              "west": -76.5673055566884,
-                            },
-                            "endDate": "20190801",
-                            "errorCount": 78,
-                            "feedVersionId": "mock-feed-version-id",
-                            "loadFailureReason": null,
-                            "loadStatus": "SUCCESS",
-                            "routeCount": 10,
-                            "startDate": "20180801",
-                            "stopCount": 237,
-                            "stopTimesCount": 11170,
-                            "tripCount": 415,
-                          }
-                        }
-                        createDeploymentFromFeedSource={[Function]}
-                        createFeedSource={[Function]}
-                        deleteFeedSource={[Function]}
-                        feedSource={
-                          Object {
-                            "dateCreated": 1536195264564,
-                            "deployable": false,
-                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                            "externalProperties": Object {},
-                            "id": "mock-feed-with-version-id",
-                            "isPublic": false,
-                            "lastFetched": 1543389038810,
-                            "lastUpdated": 1543389038810,
-                            "latestValidation": Object {
-                              "agencies": null,
-                              "agencyCount": 1,
-                              "avgDailyRevenueTime": 0,
-                              "bounds": Object {
-                                "east": -76.481211,
-                                "north": 39.0486949672717,
-                                "south": 38.92884,
-                                "west": -76.5673055566884,
+                      runFetchFeed={[Function]}
+                      updateFeedSource={[Function]}
+                      uploadFeed={[Function]}
+                      user={
+                        Object {
+                          "isCheckingLogin": false,
+                          "permissions": UserPermissions {
+                            "appPermissionLookup": Object {
+                              "administer-application": Object {
+                                "type": "administer-application",
                               },
-                              "endDate": "20190801",
-                              "errorCount": 78,
-                              "feedVersionId": "mock-feed-version-id",
-                              "loadFailureReason": null,
-                              "loadStatus": "SUCCESS",
-                              "routeCount": 10,
-                              "startDate": "20180801",
-                              "stopCount": 237,
-                              "stopTimesCount": 11170,
-                              "tripCount": 415,
-                            },
-                            "latestVersionId": "mock-feed-version-id",
-                            "name": "test feed with a version",
-                            "noteCount": 0,
-                            "organizationId": null,
-                            "projectId": "mock-project-id",
-                            "publishedVersionId": null,
-                            "retrievalMethod": "MANUALLY_UPLOADED",
-                            "s3Url": null,
-                            "snapshotVersion": null,
-                            "transformRules": Array [],
-                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                            "user": null,
-                          }
-                        }
-                        project={
-                          Object {
-                            "autoFetchFeeds": true,
-                            "autoFetchHour": 0,
-                            "autoFetchMinute": 0,
-                            "bounds": null,
-                            "buildConfig": Object {
-                              "fares": null,
-                              "fetchElevationUS": null,
-                              "stationTransfers": null,
-                              "subwayAccessTime": null,
                             },
-                            "dateCreated": 1526305321824,
-                            "defaultTimeZone": null,
-                            "deployments": Array [
-                              Object {
-                                "customBuildConfig": null,
-                                "customRouterConfig": null,
-                                "dateCreated": 1553292345720,
-                                "deployJobSummaries": Array [],
-                                "deployedTo": null,
-                                "ec2Instances": Array [],
-                                "feedSourceId": null,
-                                "feedVersions": Array [
-                                  Object {
-                                    "feedSource": Object {
-                                      "dateCreated": 1536195264564,
-                                      "deployable": false,
-                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                      "externalProperties": Object {},
-                                      "id": "mock-feed-with-version-id",
-                                      "isPublic": false,
-                                      "lastFetched": 1543389038810,
-                                      "lastUpdated": 1543389038810,
-                                      "latestValidation": Object {
-                                        "agencies": null,
-                                        "agencyCount": 1,
-                                        "avgDailyRevenueTime": 0,
-                                        "bounds": Object {
-                                          "east": -76.481211,
-                                          "north": 39.0486949672717,
-                                          "south": 38.92884,
-                                          "west": -76.5673055566884,
-                                        },
-                                        "endDate": "20190801",
-                                        "errorCount": 78,
-                                        "feedVersionId": "mock-feed-version-id",
-                                        "loadFailureReason": null,
-                                        "loadStatus": "SUCCESS",
-                                        "routeCount": 10,
-                                        "startDate": "20180801",
-                                        "stopCount": 237,
-                                        "stopTimesCount": 11170,
-                                        "tripCount": 415,
-                                      },
-                                      "latestVersionId": "mock-feed-version-id",
-                                      "name": "test feed with a version",
-                                      "noteCount": 0,
-                                      "organizationId": null,
-                                      "projectId": "mock-project-id",
-                                      "publishedVersionId": null,
-                                      "retrievalMethod": "MANUALLY_UPLOADED",
-                                      "s3Url": null,
-                                      "snapshotVersion": null,
-                                      "transformRules": Array [],
-                                      "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                      "user": null,
-                                    },
-                                    "id": "mock-feed-version-id",
-                                    "nextVersionId": null,
-                                    "previousVersionId": null,
-                                    "updated": 1543389038810,
-                                    "validationResult": Object {
-                                      "agencies": null,
-                                      "agencyCount": 1,
-                                      "avgDailyRevenueTime": 0,
-                                      "bounds": Object {
-                                        "east": -76.481211,
-                                        "north": 39.0486949672717,
-                                        "south": 38.92884,
-                                        "west": -76.5673055566884,
-                                      },
-                                      "endDate": "20190801",
-                                      "errorCount": 78,
-                                      "feedVersionId": "mock-feed-version-id",
-                                      "loadFailureReason": null,
-                                      "loadStatus": "SUCCESS",
-                                      "routeCount": 10,
-                                      "startDate": "20180801",
-                                      "stopCount": 237,
-                                      "stopTimesCount": 11170,
-                                      "tripCount": 415,
+                            "orgPermissionLookup": Object {},
+                            "organizationLookup": Object {},
+                            "projectLookup": Object {},
+                          },
+                          "profile": Object {
+                            "app_metadata": Object {
+                              "datatools": Array [
+                                Object {
+                                  "client_id": "mock-client-id",
+                                  "organizations": Array [],
+                                  "permissions": Array [
+                                    Object {
+                                      "type": "administer-application",
                                     },
-                                    "version": 1,
-                                  },
-                                ],
-                                "id": "mock-deployment-id-0",
-                                "invalidFeedSources": Array [],
-                                "lastDeployed": null,
-                                "lastUpdated": 1553292345726,
-                                "latest": null,
-                                "name": "mock-deployment",
-                                "organizationId": null,
-                                "osmExtractUrl": null,
-                                "otpCommit": null,
-                                "otpVersion": null,
-                                "projectBounds": Object {
-                                  "east": 0,
-                                  "north": 0,
-                                  "south": 0,
-                                  "west": 0,
+                                  ],
+                                  "projects": Array [],
+                                  "subscriptions": Array [],
                                 },
-                                "projectId": "mock-project-with-deployments-id",
-                                "r5": false,
-                                "r5Version": null,
-                                "routerId": null,
-                                "skipOsmExtract": false,
-                                "user": null,
+                              ],
+                            },
+                            "clientID": "mock-client-id",
+                            "created_at": "2016-03-04T18:59:22.569Z",
+                            "email": "mock-user@conveyal.com",
+                            "email_verified": true,
+                            "identities": Array [
+                              Object {
+                                "connection": "Username-Password-Authentication",
+                                "isSocial": false,
+                                "provider": "auth0",
+                                "user_id": "12345",
                               },
                             ],
-                            "feedSources": Array [
+                            "jti": "gibberish",
+                            "last_password_reset": "2017-07-13T13:58:01.021Z",
+                            "name": "mock-user@conveyal.com",
+                            "nickname": "mock-user",
+                            "persistent": Object {},
+                            "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
+                            "sub": "auth0|12345",
+                            "updated_at": "2019-03-21T19:05:30.180Z",
+                            "user_id": "auth0|12345",
+                            "user_metadata": Object {
+                              "datatools": Array [
+                                Object {
+                                  "client_id": "mock-client-id",
+                                  "editor": Object {
+                                    "map_id": "mapbox.streets",
+                                  },
+                                  "hideTutorial": true,
+                                  "sidebarExpanded": false,
+                                },
+                              ],
+                              "lang": "en",
+                            },
+                          },
+                          "recentActivity": null,
+                          "redirectOnSuccess": null,
+                          "subscriptions": UserSubscriptions {
+                            "subscriptionLookup": Object {},
+                          },
+                          "token": "mock-token",
+                        }
+                      }
+                    >
+                      <tr
+                        className="feed-source-table-row"
+                        key="mock-feed-with-version-id"
+                      >
+                        <td
+                          className="feed-source-info"
+                        >
+                          <FeedInfo
+                            feedSource={
                               Object {
                                 "dateCreated": 1536195264564,
                                 "deployable": false,
@@ -1700,315 +3329,203 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "transformRules": Array [],
                                 "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                 "user": null,
-                              },
-                            ],
-                            "id": "mock-project-with-deployments-id",
-                            "lastUpdated": 1553236399556,
-                            "name": "mock-project-with-deployments",
-                            "organizationId": null,
-                            "otpServers": Array [],
-                            "pinnedDeploymentId": null,
-                            "routerConfig": Object {
-                              "carDropoffTime": null,
-                              "numItineraries": null,
-                              "requestLogFile": null,
-                              "stairsReluctance": null,
-                              "updaters": null,
-                              "walkSpeed": null,
-                            },
-                            "useCustomOsmBounds": false,
-                            "user": null,
-                          }
-                        }
-                        runFetchFeed={[Function]}
-                        updateFeedSource={[Function]}
-                        uploadFeed={[Function]}
-                        user={
-                          Object {
-                            "isCheckingLogin": false,
-                            "permissions": UserPermissions {
-                              "appPermissionLookup": Object {
-                                "administer-application": Object {
-                                  "type": "administer-application",
-                                },
-                              },
-                              "orgPermissionLookup": Object {},
-                              "organizationLookup": Object {},
-                              "projectLookup": Object {},
-                            },
-                            "profile": Object {
-                              "app_metadata": Object {
-                                "datatools": Array [
-                                  Object {
-                                    "client_id": "mock-client-id",
-                                    "organizations": Array [],
-                                    "permissions": Array [
-                                      Object {
-                                        "type": "administer-application",
-                                      },
-                                    ],
-                                    "projects": Array [],
-                                    "subscriptions": Array [],
-                                  },
-                                ],
-                              },
-                              "clientID": "mock-client-id",
-                              "created_at": "2016-03-04T18:59:22.569Z",
-                              "email": "mock-user@conveyal.com",
-                              "email_verified": true,
-                              "identities": Array [
-                                Object {
-                                  "connection": "Username-Password-Authentication",
-                                  "isSocial": false,
-                                  "provider": "auth0",
-                                  "user_id": "12345",
-                                },
-                              ],
-                              "jti": "gibberish",
-                              "last_password_reset": "2017-07-13T13:58:01.021Z",
-                              "name": "mock-user@conveyal.com",
-                              "nickname": "mock-user",
-                              "persistent": Object {},
-                              "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
-                              "sub": "auth0|12345",
-                              "updated_at": "2019-03-21T19:05:30.180Z",
-                              "user_id": "auth0|12345",
-                              "user_metadata": Object {
-                                "datatools": Array [
-                                  Object {
-                                    "client_id": "mock-client-id",
-                                    "editor": Object {
-                                      "map_id": "mapbox.streets",
-                                    },
-                                    "hideTutorial": true,
-                                    "sidebarExpanded": false,
-                                  },
-                                ],
-                                "lang": "en",
-                              },
-                            },
-                            "recentActivity": null,
-                            "redirectOnSuccess": null,
-                            "subscriptions": UserSubscriptions {
-                              "subscriptionLookup": Object {},
-                            },
-                            "token": "mock-token",
-                          }
-                        }
-                      >
-                        <tr
-                          className="feed-source-table-row"
-                          key="mock-feed-with-version-id"
-                        >
-                          <td
-                            className="feed-source-info"
-                          >
-                            <FeedInfo
-                              feedSource={
-                                Object {
-                                  "dateCreated": 1536195264564,
-                                  "deployable": false,
-                                  "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                  "externalProperties": Object {},
-                                  "id": "mock-feed-with-version-id",
-                                  "isPublic": false,
-                                  "lastFetched": 1543389038810,
-                                  "lastUpdated": 1543389038810,
-                                  "latestValidation": Object {
-                                    "agencies": null,
-                                    "agencyCount": 1,
-                                    "avgDailyRevenueTime": 0,
-                                    "bounds": Object {
-                                      "east": -76.481211,
-                                      "north": 39.0486949672717,
-                                      "south": 38.92884,
-                                      "west": -76.5673055566884,
-                                    },
-                                    "endDate": "20190801",
-                                    "errorCount": 78,
-                                    "feedVersionId": "mock-feed-version-id",
-                                    "loadFailureReason": null,
-                                    "loadStatus": "SUCCESS",
-                                    "routeCount": 10,
-                                    "startDate": "20180801",
-                                    "stopCount": 237,
-                                    "stopTimesCount": 11170,
-                                    "tripCount": 415,
-                                  },
-                                  "latestVersionId": "mock-feed-version-id",
-                                  "name": "test feed with a version",
-                                  "noteCount": 0,
-                                  "organizationId": null,
-                                  "projectId": "mock-project-id",
-                                  "publishedVersionId": null,
-                                  "retrievalMethod": "MANUALLY_UPLOADED",
-                                  "s3Url": null,
-                                  "snapshotVersion": null,
-                                  "transformRules": Array [],
-                                  "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                  "user": null,
-                                }
                               }
-                            >
-                              <div>
-                                <h4>
-                                  <Link
-                                    onlyActiveOnIndex={false}
+                            }
+                          >
+                            <div>
+                              <h4>
+                                <Link
+                                  onlyActiveOnIndex={false}
+                                  style={Object {}}
+                                  to="/feed/mock-feed-with-version-id"
+                                >
+                                  <a
+                                    onClick={[Function]}
                                     style={Object {}}
-                                    to="/feed/mock-feed-with-version-id"
                                   >
-                                    <a
-                                      onClick={[Function]}
-                                      style={Object {}}
-                                    >
-                                      test feed with a version
-                                    </a>
-                                  </Link>
-                                </h4>
-                                <h5>
-                                  Last updated Nov 27, 2018
-                                </h5>
-                                <Row
-                                  bsClass="row"
-                                  componentClass="div"
+                                    test feed with a version
+                                  </a>
+                                </Link>
+                              </h4>
+                              <h5>
+                                Last updated Nov 27, 2018
+                              </h5>
+                              <Row
+                                bsClass="row"
+                                componentClass="div"
+                              >
+                                <div
+                                  className="row"
                                 >
-                                  <div
-                                    className="row"
+                                  <Col
+                                    bsClass="col"
+                                    componentClass="div"
+                                    xs={12}
                                   >
-                                    <Col
-                                      bsClass="col"
-                                      componentClass="div"
-                                      xs={12}
+                                    <div
+                                      className="col-xs-12"
                                     >
-                                      <div
-                                        className="col-xs-12"
+                                      <Icon
+                                        type="link"
+                                      >
+                                        <i
+                                          className="fa fa-link fa-fw "
+                                        />
+                                      </Icon>
+                                      <a
+                                        href="http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip"
+                                        target="_blank"
                                       >
+                                        http://mdtrip.org/googletransit/Ann...
                                         <Icon
-                                          type="link"
+                                          type="external-link"
                                         >
                                           <i
-                                            className="fa fa-link fa-fw "
+                                            className="fa fa-external-link fa-fw "
                                           />
                                         </Icon>
-                                        <a
-                                          href="http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip"
-                                          target="_blank"
-                                        >
-                                          http://mdtrip.org/googletransit/Ann...
-                                          <Icon
-                                            type="external-link"
-                                          >
-                                            <i
-                                              className="fa fa-external-link fa-fw "
-                                            />
-                                          </Icon>
-                                        </a>
-                                      </div>
-                                    </Col>
-                                    <Col
-                                      bsClass="col"
-                                      componentClass="div"
-                                      xs={6}
+                                      </a>
+                                    </div>
+                                  </Col>
+                                  <Col
+                                    bsClass="col"
+                                    componentClass="div"
+                                    xs={6}
+                                  >
+                                    <div
+                                      className="col-xs-6"
                                     >
-                                      <div
-                                        className="col-xs-6"
+                                      <Icon
+                                        type="lock"
                                       >
-                                        <Icon
-                                          type="lock"
-                                        >
-                                          <i
-                                            className="fa fa-lock fa-fw "
-                                          />
-                                        </Icon>
-                                        Private
-                                      </div>
-                                    </Col>
-                                  </div>
-                                </Row>
-                              </div>
-                            </FeedInfo>
-                          </td>
-                          <td
-                            className="comparison-column"
+                                        <i
+                                          className="fa fa-lock fa-fw "
+                                        />
+                                      </Icon>
+                                      Private
+                                    </div>
+                                  </Col>
+                                </div>
+                              </Row>
+                            </div>
+                          </FeedInfo>
+                        </td>
+                        <td
+                          className="comparison-column"
+                        >
+                          <Status
+                            icon="check-circle"
+                            statusSpanClass="status-active"
+                            statusText="Active"
+                            subtext="Valid for another 2 months"
+                            subtextDate="20190801"
                           >
-                            <Status
-                              icon="check-circle"
-                              statusSpanClass="status-active"
-                              statusText="Active"
-                              subtext="Valid for another 2 months"
-                              subtextDate="20190801"
-                            >
-                              <div>
-                                <span
-                                  className="feed-status status-active"
-                                >
-                                  <Icon
-                                    type="check-circle"
-                                  >
-                                    <i
-                                      className="fa fa-check-circle fa-fw "
-                                    />
-                                  </Icon>
-                                  Active
-                                </span>
-                                <div
-                                  className="feed-status-subtext"
+                            <div>
+                              <span
+                                className="feed-status status-active"
+                              >
+                                <Icon
+                                  type="check-circle"
                                 >
-                                  Valid for another 2 months
-                                  <br />
-                                  (Aug 1, 2019)
-                                </div>
+                                  <i
+                                    className="fa fa-check-circle fa-fw "
+                                  />
+                                </Icon>
+                                Active
+                              </span>
+                              <div
+                                className="feed-status-subtext"
+                              >
+                                Valid for another 2 months
+                                <br />
+                                (Aug 1, 2019)
                               </div>
-                            </Status>
-                          </td>
-                          <td
-                            className="feed-version-column"
+                            </div>
+                          </Status>
+                        </td>
+                        <td
+                          className="feed-version-column"
+                        >
+                          <Status
+                            icon="check-circle"
+                            statusSpanClass="status-active"
+                            statusText="Same as Deployed"
+                            subtext="Last updated 5 months ago"
                           >
-                            <Status
-                              icon="check-circle"
-                              statusSpanClass="status-active"
-                              statusText="Same as Deployed"
-                              subtext="Last updated 5 months ago"
-                            >
-                              <div>
-                                <span
-                                  className="feed-status status-active"
-                                >
-                                  <Icon
-                                    type="check-circle"
-                                  >
-                                    <i
-                                      className="fa fa-check-circle fa-fw "
-                                    />
-                                  </Icon>
-                                  Same as Deployed
-                                </span>
-                                <div
-                                  className="feed-status-subtext"
+                            <div>
+                              <span
+                                className="feed-status status-active"
+                              >
+                                <Icon
+                                  type="check-circle"
                                 >
-                                  Last updated 5 months ago
-                                </div>
+                                  <i
+                                    className="fa fa-check-circle fa-fw "
+                                  />
+                                </Icon>
+                                Same as Deployed
+                              </span>
+                              <div
+                                className="feed-status-subtext"
+                              >
+                                Last updated 5 months ago
                               </div>
-                            </Status>
-                          </td>
-                          <td
-                            className="feed-version-column"
-                          >
-                            Aug 1, 2018
-                             -
-                            <br />
-                            Aug 1, 2019
-                          </td>
-                          <td
-                            className="feed-version-column"
-                          >
-                            78
-                          </td>
-                          <td>
-                            <FeedActionsDropdown
-                              comparisonColumn="DEPLOYED"
-                              comparisonValidationSummary={
-                                Object {
+                            </div>
+                          </Status>
+                        </td>
+                        <td
+                          className="feed-version-column"
+                        >
+                          Aug 1, 2018
+                           -
+                          <br />
+                          Aug 1, 2019
+                        </td>
+                        <td
+                          className="feed-version-column"
+                        >
+                          78
+                        </td>
+                        <td>
+                          <FeedActionsDropdown
+                            comparisonColumn="DEPLOYED"
+                            comparisonValidationSummary={
+                              Object {
+                                "agencies": null,
+                                "agencyCount": 1,
+                                "avgDailyRevenueTime": 0,
+                                "bounds": Object {
+                                  "east": -76.481211,
+                                  "north": 39.0486949672717,
+                                  "south": 38.92884,
+                                  "west": -76.5673055566884,
+                                },
+                                "endDate": "20190801",
+                                "errorCount": 78,
+                                "feedVersionId": "mock-feed-version-id",
+                                "loadFailureReason": null,
+                                "loadStatus": "SUCCESS",
+                                "routeCount": 10,
+                                "startDate": "20180801",
+                                "stopCount": 237,
+                                "stopTimesCount": 11170,
+                                "tripCount": 415,
+                              }
+                            }
+                            createDeploymentFromFeedSource={[Function]}
+                            createFeedSource={[Function]}
+                            deleteFeedSource={[Function]}
+                            feedSource={
+                              Object {
+                                "dateCreated": 1536195264564,
+                                "deployable": false,
+                                "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                "externalProperties": Object {},
+                                "id": "mock-feed-with-version-id",
+                                "isPublic": false,
+                                "lastFetched": 1543389038810,
+                                "lastUpdated": 1543389038810,
+                                "latestValidation": Object {
                                   "agencies": null,
                                   "agencyCount": 1,
                                   "avgDailyRevenueTime": 0,
@@ -2028,129 +3545,56 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   "stopCount": 237,
                                   "stopTimesCount": 11170,
                                   "tripCount": 415,
-                                }
-                              }
-                              createDeploymentFromFeedSource={[Function]}
-                              createFeedSource={[Function]}
-                              deleteFeedSource={[Function]}
-                              feedSource={
-                                Object {
-                                  "dateCreated": 1536195264564,
-                                  "deployable": false,
-                                  "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                  "externalProperties": Object {},
-                                  "id": "mock-feed-with-version-id",
-                                  "isPublic": false,
-                                  "lastFetched": 1543389038810,
-                                  "lastUpdated": 1543389038810,
-                                  "latestValidation": Object {
-                                    "agencies": null,
-                                    "agencyCount": 1,
-                                    "avgDailyRevenueTime": 0,
-                                    "bounds": Object {
-                                      "east": -76.481211,
-                                      "north": 39.0486949672717,
-                                      "south": 38.92884,
-                                      "west": -76.5673055566884,
-                                    },
-                                    "endDate": "20190801",
-                                    "errorCount": 78,
-                                    "feedVersionId": "mock-feed-version-id",
-                                    "loadFailureReason": null,
-                                    "loadStatus": "SUCCESS",
-                                    "routeCount": 10,
-                                    "startDate": "20180801",
-                                    "stopCount": 237,
-                                    "stopTimesCount": 11170,
-                                    "tripCount": 415,
-                                  },
-                                  "latestVersionId": "mock-feed-version-id",
-                                  "name": "test feed with a version",
-                                  "noteCount": 0,
-                                  "organizationId": null,
-                                  "projectId": "mock-project-id",
-                                  "publishedVersionId": null,
-                                  "retrievalMethod": "MANUALLY_UPLOADED",
-                                  "s3Url": null,
-                                  "snapshotVersion": null,
-                                  "transformRules": Array [],
-                                  "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                  "user": null,
-                                }
+                                },
+                                "latestVersionId": "mock-feed-version-id",
+                                "name": "test feed with a version",
+                                "noteCount": 0,
+                                "organizationId": null,
+                                "projectId": "mock-project-id",
+                                "publishedVersionId": null,
+                                "retrievalMethod": "MANUALLY_UPLOADED",
+                                "s3Url": null,
+                                "snapshotVersion": null,
+                                "transformRules": Array [],
+                                "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                "user": null,
                               }
-                              project={
-                                Object {
-                                  "autoFetchFeeds": true,
-                                  "autoFetchHour": 0,
-                                  "autoFetchMinute": 0,
-                                  "bounds": null,
-                                  "buildConfig": Object {
-                                    "fares": null,
-                                    "fetchElevationUS": null,
-                                    "stationTransfers": null,
-                                    "subwayAccessTime": null,
-                                  },
-                                  "dateCreated": 1526305321824,
-                                  "defaultTimeZone": null,
-                                  "deployments": Array [
-                                    Object {
-                                      "customBuildConfig": null,
-                                      "customRouterConfig": null,
-                                      "dateCreated": 1553292345720,
-                                      "deployJobSummaries": Array [],
-                                      "deployedTo": null,
-                                      "ec2Instances": Array [],
-                                      "feedSourceId": null,
-                                      "feedVersions": Array [
-                                        Object {
-                                          "feedSource": Object {
-                                            "dateCreated": 1536195264564,
-                                            "deployable": false,
-                                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                            "externalProperties": Object {},
-                                            "id": "mock-feed-with-version-id",
-                                            "isPublic": false,
-                                            "lastFetched": 1543389038810,
-                                            "lastUpdated": 1543389038810,
-                                            "latestValidation": Object {
-                                              "agencies": null,
-                                              "agencyCount": 1,
-                                              "avgDailyRevenueTime": 0,
-                                              "bounds": Object {
-                                                "east": -76.481211,
-                                                "north": 39.0486949672717,
-                                                "south": 38.92884,
-                                                "west": -76.5673055566884,
-                                              },
-                                              "endDate": "20190801",
-                                              "errorCount": 78,
-                                              "feedVersionId": "mock-feed-version-id",
-                                              "loadFailureReason": null,
-                                              "loadStatus": "SUCCESS",
-                                              "routeCount": 10,
-                                              "startDate": "20180801",
-                                              "stopCount": 237,
-                                              "stopTimesCount": 11170,
-                                              "tripCount": 415,
-                                            },
-                                            "latestVersionId": "mock-feed-version-id",
-                                            "name": "test feed with a version",
-                                            "noteCount": 0,
-                                            "organizationId": null,
-                                            "projectId": "mock-project-id",
-                                            "publishedVersionId": null,
-                                            "retrievalMethod": "MANUALLY_UPLOADED",
-                                            "s3Url": null,
-                                            "snapshotVersion": null,
-                                            "transformRules": Array [],
-                                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                            "user": null,
-                                          },
-                                          "id": "mock-feed-version-id",
-                                          "nextVersionId": null,
-                                          "previousVersionId": null,
-                                          "updated": 1543389038810,
-                                          "validationResult": Object {
+                            }
+                            project={
+                              Object {
+                                "autoFetchFeeds": true,
+                                "autoFetchHour": 0,
+                                "autoFetchMinute": 0,
+                                "bounds": null,
+                                "buildConfig": Object {
+                                  "fares": null,
+                                  "fetchElevationUS": null,
+                                  "stationTransfers": null,
+                                  "subwayAccessTime": null,
+                                },
+                                "dateCreated": 1526305321824,
+                                "defaultTimeZone": null,
+                                "deployments": Array [
+                                  Object {
+                                    "customBuildConfig": null,
+                                    "customRouterConfig": null,
+                                    "dateCreated": 1553292345720,
+                                    "deployJobSummaries": Array [],
+                                    "deployedTo": null,
+                                    "ec2Instances": Array [],
+                                    "feedSourceId": null,
+                                    "feedVersions": Array [
+                                      Object {
+                                        "feedSource": Object {
+                                          "dateCreated": 1536195264564,
+                                          "deployable": false,
+                                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                          "externalProperties": Object {},
+                                          "id": "mock-feed-with-version-id",
+                                          "isPublic": false,
+                                          "lastFetched": 1543389038810,
+                                          "lastUpdated": 1543389038810,
+                                          "latestValidation": Object {
                                             "agencies": null,
                                             "agencyCount": 1,
                                             "avgDailyRevenueTime": 0,
@@ -2171,687 +3615,712 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                             "stopTimesCount": 11170,
                                             "tripCount": 415,
                                           },
-                                          "version": 1,
+                                          "latestVersionId": "mock-feed-version-id",
+                                          "name": "test feed with a version",
+                                          "noteCount": 0,
+                                          "organizationId": null,
+                                          "projectId": "mock-project-id",
+                                          "publishedVersionId": null,
+                                          "retrievalMethod": "MANUALLY_UPLOADED",
+                                          "s3Url": null,
+                                          "snapshotVersion": null,
+                                          "transformRules": Array [],
+                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                          "user": null,
                                         },
-                                      ],
-                                      "id": "mock-deployment-id-0",
-                                      "invalidFeedSources": Array [],
-                                      "lastDeployed": null,
-                                      "lastUpdated": 1553292345726,
-                                      "latest": null,
-                                      "name": "mock-deployment",
-                                      "organizationId": null,
-                                      "osmExtractUrl": null,
-                                      "otpCommit": null,
-                                      "otpVersion": null,
-                                      "projectBounds": Object {
-                                        "east": 0,
-                                        "north": 0,
-                                        "south": 0,
-                                        "west": 0,
-                                      },
-                                      "projectId": "mock-project-with-deployments-id",
-                                      "r5": false,
-                                      "r5Version": null,
-                                      "routerId": null,
-                                      "skipOsmExtract": false,
-                                      "user": null,
-                                    },
-                                  ],
-                                  "feedSources": Array [
-                                    Object {
-                                      "dateCreated": 1536195264564,
-                                      "deployable": false,
-                                      "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
-                                      "externalProperties": Object {},
-                                      "id": "mock-feed-with-version-id",
-                                      "isPublic": false,
-                                      "lastFetched": 1543389038810,
-                                      "lastUpdated": 1543389038810,
-                                      "latestValidation": Object {
-                                        "agencies": null,
-                                        "agencyCount": 1,
-                                        "avgDailyRevenueTime": 0,
-                                        "bounds": Object {
-                                          "east": -76.481211,
-                                          "north": 39.0486949672717,
-                                          "south": 38.92884,
-                                          "west": -76.5673055566884,
+                                        "id": "mock-feed-version-id",
+                                        "nextVersionId": null,
+                                        "previousVersionId": null,
+                                        "updated": 1543389038810,
+                                        "validationResult": Object {
+                                          "agencies": null,
+                                          "agencyCount": 1,
+                                          "avgDailyRevenueTime": 0,
+                                          "bounds": Object {
+                                            "east": -76.481211,
+                                            "north": 39.0486949672717,
+                                            "south": 38.92884,
+                                            "west": -76.5673055566884,
+                                          },
+                                          "endDate": "20190801",
+                                          "errorCount": 78,
+                                          "feedVersionId": "mock-feed-version-id",
+                                          "loadFailureReason": null,
+                                          "loadStatus": "SUCCESS",
+                                          "routeCount": 10,
+                                          "startDate": "20180801",
+                                          "stopCount": 237,
+                                          "stopTimesCount": 11170,
+                                          "tripCount": 415,
                                         },
-                                        "endDate": "20190801",
-                                        "errorCount": 78,
-                                        "feedVersionId": "mock-feed-version-id",
-                                        "loadFailureReason": null,
-                                        "loadStatus": "SUCCESS",
-                                        "routeCount": 10,
-                                        "startDate": "20180801",
-                                        "stopCount": 237,
-                                        "stopTimesCount": 11170,
-                                        "tripCount": 415,
+                                        "version": 1,
                                       },
-                                      "latestVersionId": "mock-feed-version-id",
-                                      "name": "test feed with a version",
-                                      "noteCount": 0,
-                                      "organizationId": null,
-                                      "projectId": "mock-project-id",
-                                      "publishedVersionId": null,
-                                      "retrievalMethod": "MANUALLY_UPLOADED",
-                                      "s3Url": null,
-                                      "snapshotVersion": null,
-                                      "transformRules": Array [],
-                                      "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
-                                      "user": null,
+                                    ],
+                                    "id": "mock-deployment-id-0",
+                                    "invalidFeedSources": Array [],
+                                    "lastDeployed": null,
+                                    "lastUpdated": 1553292345726,
+                                    "latest": null,
+                                    "name": "mock-deployment",
+                                    "organizationId": null,
+                                    "osmExtractUrl": null,
+                                    "otpCommit": null,
+                                    "otpVersion": null,
+                                    "projectBounds": Object {
+                                      "east": 0,
+                                      "north": 0,
+                                      "south": 0,
+                                      "west": 0,
                                     },
-                                  ],
-                                  "id": "mock-project-with-deployments-id",
-                                  "lastUpdated": 1553236399556,
-                                  "name": "mock-project-with-deployments",
-                                  "organizationId": null,
-                                  "otpServers": Array [],
-                                  "pinnedDeploymentId": null,
-                                  "routerConfig": Object {
-                                    "carDropoffTime": null,
-                                    "numItineraries": null,
-                                    "requestLogFile": null,
-                                    "stairsReluctance": null,
-                                    "updaters": null,
-                                    "walkSpeed": null,
+                                    "projectId": "mock-project-with-deployments-id",
+                                    "r5": false,
+                                    "r5Version": null,
+                                    "routerId": null,
+                                    "skipOsmExtract": false,
+                                    "user": null,
                                   },
-                                  "useCustomOsmBounds": false,
-                                  "user": null,
-                                }
-                              }
-                              runFetchFeed={[Function]}
-                              updateFeedSource={[Function]}
-                              uploadFeed={[Function]}
-                              user={
-                                Object {
-                                  "isCheckingLogin": false,
-                                  "permissions": UserPermissions {
-                                    "appPermissionLookup": Object {
-                                      "administer-application": Object {
-                                        "type": "administer-application",
+                                ],
+                                "feedSources": Array [
+                                  Object {
+                                    "dateCreated": 1536195264564,
+                                    "deployable": false,
+                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                    "externalProperties": Object {},
+                                    "id": "mock-feed-with-version-id",
+                                    "isPublic": false,
+                                    "lastFetched": 1543389038810,
+                                    "lastUpdated": 1543389038810,
+                                    "latestValidation": Object {
+                                      "agencies": null,
+                                      "agencyCount": 1,
+                                      "avgDailyRevenueTime": 0,
+                                      "bounds": Object {
+                                        "east": -76.481211,
+                                        "north": 39.0486949672717,
+                                        "south": 38.92884,
+                                        "west": -76.5673055566884,
                                       },
+                                      "endDate": "20190801",
+                                      "errorCount": 78,
+                                      "feedVersionId": "mock-feed-version-id",
+                                      "loadFailureReason": null,
+                                      "loadStatus": "SUCCESS",
+                                      "routeCount": 10,
+                                      "startDate": "20180801",
+                                      "stopCount": 237,
+                                      "stopTimesCount": 11170,
+                                      "tripCount": 415,
                                     },
-                                    "orgPermissionLookup": Object {},
-                                    "organizationLookup": Object {},
-                                    "projectLookup": Object {},
+                                    "latestVersionId": "mock-feed-version-id",
+                                    "name": "test feed with a version",
+                                    "noteCount": 0,
+                                    "organizationId": null,
+                                    "projectId": "mock-project-id",
+                                    "publishedVersionId": null,
+                                    "retrievalMethod": "MANUALLY_UPLOADED",
+                                    "s3Url": null,
+                                    "snapshotVersion": null,
+                                    "transformRules": Array [],
+                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                    "user": null,
                                   },
-                                  "profile": Object {
-                                    "app_metadata": Object {
-                                      "datatools": Array [
-                                        Object {
-                                          "client_id": "mock-client-id",
-                                          "organizations": Array [],
-                                          "permissions": Array [
-                                            Object {
-                                              "type": "administer-application",
-                                            },
-                                          ],
-                                          "projects": Array [],
-                                          "subscriptions": Array [],
-                                        },
-                                      ],
+                                ],
+                                "id": "mock-project-with-deployments-id",
+                                "lastUpdated": 1553236399556,
+                                "name": "mock-project-with-deployments",
+                                "organizationId": null,
+                                "otpServers": Array [],
+                                "pinnedDeploymentId": null,
+                                "routerConfig": Object {
+                                  "carDropoffTime": null,
+                                  "numItineraries": null,
+                                  "requestLogFile": null,
+                                  "stairsReluctance": null,
+                                  "updaters": null,
+                                  "walkSpeed": null,
+                                },
+                                "useCustomOsmBounds": false,
+                                "user": null,
+                              }
+                            }
+                            runFetchFeed={[Function]}
+                            updateFeedSource={[Function]}
+                            uploadFeed={[Function]}
+                            user={
+                              Object {
+                                "isCheckingLogin": false,
+                                "permissions": UserPermissions {
+                                  "appPermissionLookup": Object {
+                                    "administer-application": Object {
+                                      "type": "administer-application",
                                     },
-                                    "clientID": "mock-client-id",
-                                    "created_at": "2016-03-04T18:59:22.569Z",
-                                    "email": "mock-user@conveyal.com",
-                                    "email_verified": true,
-                                    "identities": Array [
+                                  },
+                                  "orgPermissionLookup": Object {},
+                                  "organizationLookup": Object {},
+                                  "projectLookup": Object {},
+                                },
+                                "profile": Object {
+                                  "app_metadata": Object {
+                                    "datatools": Array [
                                       Object {
-                                        "connection": "Username-Password-Authentication",
-                                        "isSocial": false,
-                                        "provider": "auth0",
-                                        "user_id": "12345",
+                                        "client_id": "mock-client-id",
+                                        "organizations": Array [],
+                                        "permissions": Array [
+                                          Object {
+                                            "type": "administer-application",
+                                          },
+                                        ],
+                                        "projects": Array [],
+                                        "subscriptions": Array [],
                                       },
                                     ],
-                                    "jti": "gibberish",
-                                    "last_password_reset": "2017-07-13T13:58:01.021Z",
-                                    "name": "mock-user@conveyal.com",
-                                    "nickname": "mock-user",
-                                    "persistent": Object {},
-                                    "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
-                                    "sub": "auth0|12345",
-                                    "updated_at": "2019-03-21T19:05:30.180Z",
-                                    "user_id": "auth0|12345",
-                                    "user_metadata": Object {
-                                      "datatools": Array [
-                                        Object {
-                                          "client_id": "mock-client-id",
-                                          "editor": Object {
-                                            "map_id": "mapbox.streets",
-                                          },
-                                          "hideTutorial": true,
-                                          "sidebarExpanded": false,
-                                        },
-                                      ],
-                                      "lang": "en",
-                                    },
                                   },
-                                  "recentActivity": null,
-                                  "redirectOnSuccess": null,
-                                  "subscriptions": UserSubscriptions {
-                                    "subscriptionLookup": Object {},
+                                  "clientID": "mock-client-id",
+                                  "created_at": "2016-03-04T18:59:22.569Z",
+                                  "email": "mock-user@conveyal.com",
+                                  "email_verified": true,
+                                  "identities": Array [
+                                    Object {
+                                      "connection": "Username-Password-Authentication",
+                                      "isSocial": false,
+                                      "provider": "auth0",
+                                      "user_id": "12345",
+                                    },
+                                  ],
+                                  "jti": "gibberish",
+                                  "last_password_reset": "2017-07-13T13:58:01.021Z",
+                                  "name": "mock-user@conveyal.com",
+                                  "nickname": "mock-user",
+                                  "persistent": Object {},
+                                  "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
+                                  "sub": "auth0|12345",
+                                  "updated_at": "2019-03-21T19:05:30.180Z",
+                                  "user_id": "auth0|12345",
+                                  "user_metadata": Object {
+                                    "datatools": Array [
+                                      Object {
+                                        "client_id": "mock-client-id",
+                                        "editor": Object {
+                                          "map_id": "mapbox.streets",
+                                        },
+                                        "hideTutorial": true,
+                                        "sidebarExpanded": false,
+                                      },
+                                    ],
+                                    "lang": "en",
                                   },
-                                  "token": "mock-token",
-                                }
+                                },
+                                "recentActivity": null,
+                                "redirectOnSuccess": null,
+                                "subscriptions": UserSubscriptions {
+                                  "subscriptionLookup": Object {},
+                                },
+                                "token": "mock-token",
                               }
+                            }
+                          >
+                            <DropdownButton
+                              id="feed-source-action-button-mock-feed-with-version-id"
+                              title="Menu"
                             >
-                              <DropdownButton
+                              <Uncontrolled(Dropdown)
                                 id="feed-source-action-button-mock-feed-with-version-id"
-                                title="Menu"
                               >
-                                <Uncontrolled(Dropdown)
+                                <Dropdown
+                                  bsClass="dropdown"
+                                  componentClass={[Function]}
                                   id="feed-source-action-button-mock-feed-with-version-id"
+                                  onToggle={[Function]}
                                 >
-                                  <Dropdown
-                                    bsClass="dropdown"
-                                    componentClass={[Function]}
-                                    id="feed-source-action-button-mock-feed-with-version-id"
-                                    onToggle={[Function]}
+                                  <ButtonGroup
+                                    block={false}
+                                    bsClass="btn-group"
+                                    className="dropdown"
+                                    justified={false}
+                                    vertical={false}
                                   >
-                                    <ButtonGroup
-                                      block={false}
-                                      bsClass="btn-group"
-                                      className="dropdown"
-                                      justified={false}
-                                      vertical={false}
+                                    <div
+                                      className="dropdown btn-group"
                                     >
-                                      <div
-                                        className="dropdown btn-group"
+                                      <DropdownToggle
+                                        bsClass="dropdown-toggle"
+                                        bsRole="toggle"
+                                        id="feed-source-action-button-mock-feed-with-version-id"
+                                        key=".0"
+                                        onClick={[Function]}
+                                        onKeyDown={[Function]}
+                                        open={false}
+                                        useAnchor={false}
                                       >
-                                        <DropdownToggle
-                                          bsClass="dropdown-toggle"
-                                          bsRole="toggle"
+                                        <Button
+                                          active={false}
+                                          aria-expanded={false}
+                                          aria-haspopup={true}
+                                          block={false}
+                                          bsClass="btn"
+                                          bsStyle="default"
+                                          className="dropdown-toggle"
+                                          disabled={false}
                                           id="feed-source-action-button-mock-feed-with-version-id"
-                                          key=".0"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
-                                          open={false}
-                                          useAnchor={false}
+                                          role="button"
                                         >
-                                          <Button
-                                            active={false}
+                                          <button
                                             aria-expanded={false}
                                             aria-haspopup={true}
-                                            block={false}
-                                            bsClass="btn"
-                                            bsStyle="default"
-                                            className="dropdown-toggle"
+                                            className="dropdown-toggle btn btn-default"
                                             disabled={false}
                                             id="feed-source-action-button-mock-feed-with-version-id"
                                             onClick={[Function]}
                                             onKeyDown={[Function]}
                                             role="button"
+                                            type="button"
                                           >
-                                            <button
-                                              aria-expanded={false}
-                                              aria-haspopup={true}
-                                              className="dropdown-toggle btn btn-default"
-                                              disabled={false}
-                                              id="feed-source-action-button-mock-feed-with-version-id"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="button"
-                                              type="button"
-                                            >
-                                              Menu
-                                               
-                                              <span
-                                                className="caret"
-                                              />
-                                            </button>
-                                          </Button>
-                                        </DropdownToggle>
-                                        <DropdownMenu
-                                          bsClass="dropdown-menu"
-                                          bsRole="menu"
-                                          key=".1"
-                                          labelledBy="feed-source-action-button-mock-feed-with-version-id"
-                                          onClose={[Function]}
-                                          onSelect={[Function]}
-                                          pullRight={false}
+                                            Menu
+                                             
+                                            <span
+                                              className="caret"
+                                            />
+                                          </button>
+                                        </Button>
+                                      </DropdownToggle>
+                                      <DropdownMenu
+                                        bsClass="dropdown-menu"
+                                        bsRole="menu"
+                                        key=".1"
+                                        labelledBy="feed-source-action-button-mock-feed-with-version-id"
+                                        onClose={[Function]}
+                                        onSelect={[Function]}
+                                        pullRight={false}
+                                      >
+                                        <RootCloseWrapper
+                                          disabled={true}
+                                          event="click"
+                                          onRootClose={[Function]}
                                         >
-                                          <RootCloseWrapper
-                                            disabled={true}
-                                            event="click"
-                                            onRootClose={[Function]}
+                                          <ul
+                                            aria-labelledby="feed-source-action-button-mock-feed-with-version-id"
+                                            className="dropdown-menu"
+                                            role="menu"
                                           >
-                                            <ul
-                                              aria-labelledby="feed-source-action-button-mock-feed-with-version-id"
-                                              className="dropdown-menu"
-                                              role="menu"
+                                            <ConfirmModal
+                                              body="Are you sure you want to delete the feed source test feed with a version?"
+                                              key=".0"
+                                              onConfirm={[Function]}
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                              title="Delete Feed Source?"
                                             >
-                                              <ConfirmModal
-                                                body="Are you sure you want to delete the feed source test feed with a version?"
-                                                key=".0"
-                                                onConfirm={[Function]}
-                                                onKeyDown={[Function]}
-                                                onSelect={[Function]}
-                                                title="Delete Feed Source?"
+                                              <Modal
+                                                animation={true}
+                                                autoFocus={true}
+                                                backdrop={true}
+                                                bsClass="modal"
+                                                dialogComponentClass={[Function]}
+                                                enforceFocus={true}
+                                                keyboard={true}
+                                                manager={
+                                                  ModalManager {
+                                                    "containers": Array [],
+                                                    "data": Array [],
+                                                    "handleContainerOverflow": true,
+                                                    "hideSiblingNodes": true,
+                                                    "modals": Array [],
+                                                  }
+                                                }
+                                                onHide={[Function]}
+                                                renderBackdrop={[Function]}
+                                                restoreFocus={true}
+                                                show={false}
                                               >
                                                 <Modal
-                                                  animation={true}
                                                   autoFocus={true}
                                                   backdrop={true}
-                                                  bsClass="modal"
-                                                  dialogComponentClass={[Function]}
+                                                  backdropClassName="modal-backdrop"
+                                                  backdropTransitionTimeout={150}
+                                                  containerClassName="modal-open"
+                                                  dialogTransitionTimeout={300}
                                                   enforceFocus={true}
                                                   keyboard={true}
                                                   manager={
                                                     ModalManager {
-                                                      "add": [Function],
                                                       "containers": Array [],
                                                       "data": Array [],
                                                       "handleContainerOverflow": true,
                                                       "hideSiblingNodes": true,
-                                                      "isTopModal": [Function],
                                                       "modals": Array [],
-                                                      "remove": [Function],
                                                     }
                                                   }
+                                                  onEntering={[Function]}
+                                                  onExited={[Function]}
                                                   onHide={[Function]}
                                                   renderBackdrop={[Function]}
                                                   restoreFocus={true}
                                                   show={false}
-                                                >
-                                                  <Modal
-                                                    autoFocus={true}
-                                                    backdrop={true}
-                                                    backdropClassName="modal-backdrop"
-                                                    backdropTransition={[Function]}
-                                                    containerClassName="modal-open"
-                                                    enforceFocus={true}
-                                                    keyboard={true}
-                                                    manager={
-                                                      ModalManager {
-                                                        "add": [Function],
-                                                        "containers": Array [],
-                                                        "data": Array [],
-                                                        "handleContainerOverflow": true,
-                                                        "hideSiblingNodes": true,
-                                                        "isTopModal": [Function],
-                                                        "modals": Array [],
-                                                        "remove": [Function],
-                                                      }
-                                                    }
-                                                    onEntering={[Function]}
-                                                    onExited={[Function]}
-                                                    onHide={[Function]}
-                                                    onMouseUp={[Function]}
-                                                    renderBackdrop={[Function]}
-                                                    restoreFocus={true}
-                                                    show={false}
-                                                    transition={[Function]}
-                                                  />
-                                                </Modal>
-                                              </ConfirmModal>
-                                              <SelectFileModal
-                                                body="Select a GTFS feed to upload:"
-                                                errorMessage="Uploaded file must be a valid zip file (.zip)."
-                                                key=".1"
-                                                onConfirm={[Function]}
-                                                onKeyDown={[Function]}
-                                                onSelect={[Function]}
-                                                title="Upload Feed"
+                                                  transition={[Function]}
+                                                />
+                                              </Modal>
+                                            </ConfirmModal>
+                                            <SelectFileModal
+                                              body="Select a GTFS feed to upload:"
+                                              errorMessage="Uploaded file must be a valid zip file (.zip)."
+                                              key=".1"
+                                              onConfirm={[Function]}
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                              title="Upload Feed"
+                                            >
+                                              <Modal
+                                                animation={true}
+                                                autoFocus={true}
+                                                backdrop={true}
+                                                bsClass="modal"
+                                                dialogComponentClass={[Function]}
+                                                enforceFocus={true}
+                                                keyboard={true}
+                                                manager={
+                                                  ModalManager {
+                                                    "containers": Array [],
+                                                    "data": Array [],
+                                                    "handleContainerOverflow": true,
+                                                    "hideSiblingNodes": true,
+                                                    "modals": Array [],
+                                                  }
+                                                }
+                                                onHide={[Function]}
+                                                renderBackdrop={[Function]}
+                                                restoreFocus={true}
+                                                show={false}
                                               >
                                                 <Modal
-                                                  animation={true}
                                                   autoFocus={true}
                                                   backdrop={true}
-                                                  bsClass="modal"
-                                                  dialogComponentClass={[Function]}
+                                                  backdropClassName="modal-backdrop"
+                                                  backdropTransitionTimeout={150}
+                                                  containerClassName="modal-open"
+                                                  dialogTransitionTimeout={300}
                                                   enforceFocus={true}
                                                   keyboard={true}
                                                   manager={
                                                     ModalManager {
-                                                      "add": [Function],
                                                       "containers": Array [],
                                                       "data": Array [],
                                                       "handleContainerOverflow": true,
                                                       "hideSiblingNodes": true,
-                                                      "isTopModal": [Function],
                                                       "modals": Array [],
-                                                      "remove": [Function],
                                                     }
                                                   }
+                                                  onEntering={[Function]}
+                                                  onExited={[Function]}
                                                   onHide={[Function]}
                                                   renderBackdrop={[Function]}
                                                   restoreFocus={true}
                                                   show={false}
-                                                >
-                                                  <Modal
-                                                    autoFocus={true}
-                                                    backdrop={true}
-                                                    backdropClassName="modal-backdrop"
-                                                    backdropTransition={[Function]}
-                                                    containerClassName="modal-open"
-                                                    enforceFocus={true}
-                                                    keyboard={true}
-                                                    manager={
-                                                      ModalManager {
-                                                        "add": [Function],
-                                                        "containers": Array [],
-                                                        "data": Array [],
-                                                        "handleContainerOverflow": true,
-                                                        "hideSiblingNodes": true,
-                                                        "isTopModal": [Function],
-                                                        "modals": Array [],
-                                                        "remove": [Function],
-                                                      }
-                                                    }
-                                                    onEntering={[Function]}
-                                                    onExited={[Function]}
-                                                    onHide={[Function]}
-                                                    onMouseUp={[Function]}
-                                                    renderBackdrop={[Function]}
-                                                    restoreFocus={true}
-                                                    show={false}
-                                                    transition={[Function]}
-                                                  />
-                                                </Modal>
-                                              </SelectFileModal>
-                                              <MenuItem
-                                                bsClass="dropdown"
-                                                disabled={false}
-                                                divider={false}
-                                                header={false}
-                                                key=".2"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                onSelect={[Function]}
+                                                  transition={[Function]}
+                                                />
+                                              </Modal>
+                                            </SelectFileModal>
+                                            <MenuItem
+                                              bsClass="dropdown"
+                                              disabled={false}
+                                              divider={false}
+                                              header={false}
+                                              key=".2"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                            >
+                                              <li
+                                                className=""
+                                                role="presentation"
                                               >
-                                                <li
-                                                  className=""
-                                                  role="presentation"
+                                                <SafeAnchor
+                                                  componentClass="a"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
                                                 >
-                                                  <SafeAnchor
-                                                    componentClass="a"
+                                                  <a
+                                                    href="#"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <a
-                                                      href="#"
-                                                      onClick={[Function]}
-                                                      onKeyDown={[Function]}
-                                                      role="menuitem"
-                                                      tabIndex="-1"
+                                                    <Glyphicon
+                                                      bsClass="glyphicon"
+                                                      glyph="pencil"
                                                     >
-                                                      <Glyphicon
-                                                        bsClass="glyphicon"
-                                                        glyph="pencil"
-                                                      >
-                                                        <span
-                                                          className="glyphicon glyphicon-pencil"
-                                                        />
-                                                      </Glyphicon>
-                                                       Open in Editor
-                                                    </a>
-                                                  </SafeAnchor>
-                                                </li>
-                                              </MenuItem>
-                                              <MenuItem
-                                                bsClass="dropdown"
-                                                disabled={false}
-                                                divider={false}
-                                                header={false}
-                                                key=".3"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                onSelect={[Function]}
+                                                      <span
+                                                        className="glyphicon glyphicon-pencil"
+                                                      />
+                                                    </Glyphicon>
+                                                     Open in Editor
+                                                  </a>
+                                                </SafeAnchor>
+                                              </li>
+                                            </MenuItem>
+                                            <MenuItem
+                                              bsClass="dropdown"
+                                              disabled={false}
+                                              divider={false}
+                                              header={false}
+                                              key=".3"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                            >
+                                              <li
+                                                className=""
+                                                role="presentation"
                                               >
-                                                <li
-                                                  className=""
-                                                  role="presentation"
+                                                <SafeAnchor
+                                                  componentClass="a"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
                                                 >
-                                                  <SafeAnchor
-                                                    componentClass="a"
+                                                  <a
+                                                    href="#"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <a
-                                                      href="#"
-                                                      onClick={[Function]}
-                                                      onKeyDown={[Function]}
-                                                      role="menuitem"
-                                                      tabIndex="-1"
+                                                    <Glyphicon
+                                                      bsClass="glyphicon"
+                                                      glyph="refresh"
                                                     >
-                                                      <Glyphicon
-                                                        bsClass="glyphicon"
-                                                        glyph="refresh"
-                                                      >
-                                                        <span
-                                                          className="glyphicon glyphicon-refresh"
-                                                        />
-                                                      </Glyphicon>
-                                                       Fetch
-                                                    </a>
-                                                  </SafeAnchor>
-                                                </li>
-                                              </MenuItem>
-                                              <MenuItem
-                                                bsClass="dropdown"
-                                                disabled={false}
-                                                divider={false}
-                                                header={false}
-                                                key=".4"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                onSelect={[Function]}
+                                                      <span
+                                                        className="glyphicon glyphicon-refresh"
+                                                      />
+                                                    </Glyphicon>
+                                                     Fetch
+                                                  </a>
+                                                </SafeAnchor>
+                                              </li>
+                                            </MenuItem>
+                                            <MenuItem
+                                              bsClass="dropdown"
+                                              disabled={false}
+                                              divider={false}
+                                              header={false}
+                                              key=".4"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                            >
+                                              <li
+                                                className=""
+                                                role="presentation"
                                               >
-                                                <li
-                                                  className=""
-                                                  role="presentation"
+                                                <SafeAnchor
+                                                  componentClass="a"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
                                                 >
-                                                  <SafeAnchor
-                                                    componentClass="a"
+                                                  <a
+                                                    href="#"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <a
-                                                      href="#"
-                                                      onClick={[Function]}
-                                                      onKeyDown={[Function]}
-                                                      role="menuitem"
-                                                      tabIndex="-1"
+                                                    <Glyphicon
+                                                      bsClass="glyphicon"
+                                                      glyph="upload"
                                                     >
-                                                      <Glyphicon
-                                                        bsClass="glyphicon"
-                                                        glyph="upload"
-                                                      >
-                                                        <span
-                                                          className="glyphicon glyphicon-upload"
-                                                        />
-                                                      </Glyphicon>
-                                                       Upload
-                                                    </a>
-                                                  </SafeAnchor>
-                                                </li>
-                                              </MenuItem>
-                                              <MenuItem
-                                                bsClass="dropdown"
-                                                disabled={false}
-                                                divider={true}
-                                                header={false}
-                                                key=".5"
+                                                      <span
+                                                        className="glyphicon glyphicon-upload"
+                                                      />
+                                                    </Glyphicon>
+                                                     Upload
+                                                  </a>
+                                                </SafeAnchor>
+                                              </li>
+                                            </MenuItem>
+                                            <MenuItem
+                                              bsClass="dropdown"
+                                              disabled={false}
+                                              divider={true}
+                                              header={false}
+                                              key=".5"
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                            >
+                                              <li
+                                                className="divider"
                                                 onKeyDown={[Function]}
-                                                onSelect={[Function]}
+                                                role="separator"
+                                              />
+                                            </MenuItem>
+                                            <MenuItem
+                                              bsClass="dropdown"
+                                              disabled={true}
+                                              divider={false}
+                                              header={false}
+                                              key=".6"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                              title="Feed source is not deployable. Change in feed source settings."
+                                            >
+                                              <li
+                                                className="disabled"
+                                                role="presentation"
                                               >
-                                                <li
-                                                  className="divider"
+                                                <SafeAnchor
+                                                  componentClass="a"
+                                                  onClick={[Function]}
                                                   onKeyDown={[Function]}
-                                                  role="separator"
-                                                />
-                                              </MenuItem>
-                                              <MenuItem
-                                                bsClass="dropdown"
-                                                disabled={true}
-                                                divider={false}
-                                                header={false}
-                                                key=".6"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                onSelect={[Function]}
-                                                title="Feed source is not deployable. Change in feed source settings."
-                                              >
-                                                <li
-                                                  className="disabled"
-                                                  role="presentation"
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                  title="Feed source is not deployable. Change in feed source settings."
                                                 >
-                                                  <SafeAnchor
-                                                    componentClass="a"
+                                                  <a
+                                                    href="#"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                     title="Feed source is not deployable. Change in feed source settings."
                                                   >
-                                                    <a
-                                                      href="#"
-                                                      onClick={[Function]}
-                                                      onKeyDown={[Function]}
-                                                      role="menuitem"
-                                                      tabIndex="-1"
-                                                      title="Feed source is not deployable. Change in feed source settings."
+                                                    <Glyphicon
+                                                      bsClass="glyphicon"
+                                                      glyph="globe"
                                                     >
-                                                      <Glyphicon
-                                                        bsClass="glyphicon"
-                                                        glyph="globe"
-                                                      >
-                                                        <span
-                                                          className="glyphicon glyphicon-globe"
-                                                        />
-                                                      </Glyphicon>
-                                                       Deploy
-                                                    </a>
-                                                  </SafeAnchor>
-                                                </li>
-                                              </MenuItem>
-                                              <MenuItem
-                                                bsClass="dropdown"
-                                                disabled={true}
-                                                divider={false}
-                                                header={false}
-                                                key=".8"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                onSelect={[Function]}
+                                                      <span
+                                                        className="glyphicon glyphicon-globe"
+                                                      />
+                                                    </Glyphicon>
+                                                     Deploy
+                                                  </a>
+                                                </SafeAnchor>
+                                              </li>
+                                            </MenuItem>
+                                            <MenuItem
+                                              bsClass="dropdown"
+                                              disabled={true}
+                                              divider={false}
+                                              header={false}
+                                              key=".8"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                            >
+                                              <li
+                                                className="disabled"
+                                                role="presentation"
                                               >
-                                                <li
-                                                  className="disabled"
-                                                  role="presentation"
+                                                <SafeAnchor
+                                                  componentClass="a"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
                                                 >
-                                                  <SafeAnchor
-                                                    componentClass="a"
+                                                  <a
+                                                    href="#"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <a
-                                                      href="#"
-                                                      onClick={[Function]}
-                                                      onKeyDown={[Function]}
-                                                      role="menuitem"
-                                                      tabIndex="-1"
+                                                    <Glyphicon
+                                                      bsClass="glyphicon"
+                                                      glyph="link"
                                                     >
-                                                      <Glyphicon
-                                                        bsClass="glyphicon"
-                                                        glyph="link"
-                                                      >
-                                                        <span
-                                                          className="glyphicon glyphicon-link"
-                                                        />
-                                                      </Glyphicon>
-                                                       View public page
-                                                    </a>
-                                                  </SafeAnchor>
-                                                </li>
-                                              </MenuItem>
-                                              <MenuItem
-                                                bsClass="dropdown"
-                                                disabled={false}
-                                                divider={true}
-                                                header={false}
-                                                key=".9"
+                                                      <span
+                                                        className="glyphicon glyphicon-link"
+                                                      />
+                                                    </Glyphicon>
+                                                     View public page
+                                                  </a>
+                                                </SafeAnchor>
+                                              </li>
+                                            </MenuItem>
+                                            <MenuItem
+                                              bsClass="dropdown"
+                                              disabled={false}
+                                              divider={true}
+                                              header={false}
+                                              key=".9"
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                            >
+                                              <li
+                                                className="divider"
                                                 onKeyDown={[Function]}
-                                                onSelect={[Function]}
+                                                role="separator"
+                                              />
+                                            </MenuItem>
+                                            <MenuItem
+                                              bsClass="dropdown"
+                                              data-test-id="feed-source-dropdown-delete-feed-source-button"
+                                              disabled={false}
+                                              divider={false}
+                                              header={false}
+                                              key=".a"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                            >
+                                              <li
+                                                className=""
+                                                role="presentation"
                                               >
-                                                <li
-                                                  className="divider"
+                                                <SafeAnchor
+                                                  componentClass="a"
+                                                  data-test-id="feed-source-dropdown-delete-feed-source-button"
+                                                  onClick={[Function]}
                                                   onKeyDown={[Function]}
-                                                  role="separator"
-                                                />
-                                              </MenuItem>
-                                              <MenuItem
-                                                bsClass="dropdown"
-                                                data-test-id="feed-source-dropdown-delete-feed-source-button"
-                                                disabled={false}
-                                                divider={false}
-                                                header={false}
-                                                key=".a"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                onSelect={[Function]}
-                                              >
-                                                <li
-                                                  className=""
-                                                  role="presentation"
+                                                  role="menuitem"
+                                                  tabIndex="-1"
                                                 >
-                                                  <SafeAnchor
-                                                    componentClass="a"
+                                                  <a
                                                     data-test-id="feed-source-dropdown-delete-feed-source-button"
+                                                    href="#"
                                                     onClick={[Function]}
                                                     onKeyDown={[Function]}
                                                     role="menuitem"
                                                     tabIndex="-1"
                                                   >
-                                                    <a
-                                                      data-test-id="feed-source-dropdown-delete-feed-source-button"
-                                                      href="#"
-                                                      onClick={[Function]}
-                                                      onKeyDown={[Function]}
-                                                      role="menuitem"
-                                                      tabIndex="-1"
+                                                    <Icon
+                                                      type="trash"
                                                     >
-                                                      <Icon
-                                                        type="trash"
-                                                      >
-                                                        <i
-                                                          className="fa fa-trash fa-fw "
-                                                        />
-                                                      </Icon>
-                                                       Delete
-                                                    </a>
-                                                  </SafeAnchor>
-                                                </li>
-                                              </MenuItem>
-                                            </ul>
-                                          </RootCloseWrapper>
-                                        </DropdownMenu>
-                                      </div>
-                                    </ButtonGroup>
-                                  </Dropdown>
-                                </Uncontrolled(Dropdown)>
-                              </DropdownButton>
-                            </FeedActionsDropdown>
-                          </td>
-                        </tr>
-                      </FeedSourceTableRow>
-                    </Connect(FeedSourceTableRow)>
-                  </tbody>
-                </table>
-              </div>
-            </ListGroup>
-          </div>
-        </Panel>
-      </Uncontrolled(Panel)>
+                                                      <i
+                                                        className="fa fa-trash fa-fw "
+                                                      />
+                                                    </Icon>
+                                                     Delete
+                                                  </a>
+                                                </SafeAnchor>
+                                              </li>
+                                            </MenuItem>
+                                          </ul>
+                                        </RootCloseWrapper>
+                                      </DropdownMenu>
+                                    </div>
+                                  </ButtonGroup>
+                                </Dropdown>
+                              </Uncontrolled(Dropdown)>
+                            </DropdownButton>
+                          </FeedActionsDropdown>
+                        </td>
+                      </tr>
+                    </FeedSourceTableRow>
+                  </Connect(FeedSourceTableRow)>
+                </tbody>
+              </table>
+            </div>
+          </ListGroup>
+        </div>
+      </Panel>
     </FeedSourceTable>
   </Connect(FeedSourceTable)>
 </Provider>

From 2fcc8e54e7825bd752bb11fb84287027cf6a2d75 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 9 Nov 2020 12:35:39 -0500
Subject: [PATCH 030/553] refactor(FeedVersionSpanChart): Add comment to
 component... rename to proper name.

---
 .../version/FeedVersionSpanChart.js           | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 2aa334fcb..0086f2708 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -14,6 +14,7 @@ type Props = {
 
 const dateFormat = 'MMM. DD, YYYY'
 
+/** Renders the validity span of one feed using the given props. */
 const FeedSpan = ({
   endLabel,
   relativeLength,
@@ -22,22 +23,24 @@ const FeedSpan = ({
   widthPixels,
   ...props
 }) => {
+  // Date labels and validity span occupy a third of the width available.
+  const baseWidth = widthPixels / 3
   return (
     <div {...props} style={{ position: 'relative', width: `${widthPixels}px` }}>
       <div
         style={{
-          left: `${relativeOffset * widthPixels / 3}px`,
+          left: `${relativeOffset * baseWidth}px`,
           position: 'absolute'
         }}>
         <span
-          style={{ display: 'inline-block', textAlign: 'right', width: '8em' }}>{startLabel}</span>
+          style={{ display: 'inline-block', textAlign: 'right', width: `${baseWidth}px` }}>{startLabel}</span>
         <span
           className='label-default'
           style={{
             display: 'inline-block',
             height: '1em',
             margin: '0 5px',
-            width: `${relativeLength * widthPixels / 3}px`
+            width: `${relativeLength * baseWidth}px`
           }}
         />
         <span>{endLabel}</span>
@@ -48,10 +51,12 @@ const FeedSpan = ({
 
 const noTopPadding = {padding: '0 5px'}
 
-export default class TripsChart extends Component<Props> {
-  _renderFeedSpan = () => {
-  }
-
+/**
+ * This component visually displays the validity span of two feed versions
+ * using spans that show an overlap or a gap according to the
+ * validity of the active andf compared feed versions.
+ */
+export default class FeedVersionSpanChart extends Component<Props> {
   render () {
     const { activeVersion, comparedVersion, comparedVersionIndex } = this.props
 

From 0980eb95b14f3ee65bee01b374335dbfeeef0a5c Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 11 Nov 2020 12:59:52 -0500
Subject: [PATCH 031/553] fix(UserRow): show project permissions summary in
 label

fix #622
---
 i18n/english.yml                |  2 ++
 lib/admin/components/UserRow.js | 63 +++++++++++++++++++++++++++++----
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 5d8a0e331..335cbf134 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -773,6 +773,8 @@ components:
     delete: Delete
     deleteConfirm: Are you sure you want to permanently delete this user?
     edit: Edit
+    missingProject: unknown
+    noProjectsFound: No projects
     orgAdmin: Org admin
     save: Save
   UserSettings:
diff --git a/lib/admin/components/UserRow.js b/lib/admin/components/UserRow.js
index 2da862d8e..0933775a2 100644
--- a/lib/admin/components/UserRow.js
+++ b/lib/admin/components/UserRow.js
@@ -3,6 +3,7 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import {Row, Col, Button, Label as BsLabel, Image, ListGroupItem} from 'react-bootstrap'
+import uuidv4 from 'uuid/v4'
 
 import * as adminActions from '../actions/admin'
 import ConfirmModal from '../../common/components/ConfirmModal'
@@ -15,6 +16,9 @@ import UserSettings from './UserSettings'
 import type {UserProfile, Organization, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
+// Generate random value to avoid conflicting with an existing project name/id.
+const MISSING_PROJECT_VALUE = uuidv4()
+
 type Props = {
   creatingUser: ManagerUserState,
   deleteUser: typeof adminActions.deleteUser,
@@ -41,6 +45,57 @@ export default class UserRow extends Component<Props, State> {
     this.toggleExpansion()
   }
 
+  /**
+   * Constructs label indicating user authorization level (e.g., app/org admin)
+   * or listing the projects the user has access to.
+   */
+  _getUserPermissionLabel = (permissions: UserPermissions) => {
+    const {projects} = this.props
+    // Default label to no projects found.
+    let labelText = this.messages('noProjectsFound')
+    let missingProjectCount = 0
+    let labelStyle, title
+    if (permissions.isApplicationAdmin()) {
+      labelStyle = 'danger'
+      labelText = this.messages('appAdmin')
+    } else if (permissions.canAdministerAnOrganization()) {
+      labelStyle = 'warning'
+      labelText = this.messages('orgAdmin')
+    } else {
+      const missingProjectIds = []
+      // Find project names for any projects that exist.
+      const projectNames = Object.keys(permissions.projectLookup)
+        .map(id => {
+          const project = projects.find(p => p.id === id)
+          // Use name of project for label (or track missing project with uuid).
+          // A missing project can occur when the same Auth0 tenant is used for
+          // multiple instances of Data Tools or if a project is deleted (but
+          // the permission is still attached to the user).
+          if (project) return project.name
+          missingProjectCount++
+          missingProjectIds.push(id)
+          return MISSING_PROJECT_VALUE
+        })
+        .filter(name => name)
+      // Store project ids in title if needed on hover.
+      title = `${this.messages('missingProject')}: ${missingProjectIds.join(', ')}`
+      const uniqueProjectNames = Array.from(new Set(projectNames))
+      // Build message based on number of projects.
+      if (uniqueProjectNames.length > 0) {
+        // Use warning label if user has missing projects.
+        labelStyle = missingProjectCount > 0 ? 'warning' : 'info'
+        labelText = uniqueProjectNames
+          // Replace uuid with missing project count message.
+          .map(name => name === MISSING_PROJECT_VALUE
+            ? `${missingProjectCount} ${this.messages('missingProject')}`
+            : name
+          )
+          .join(', ')
+      }
+    }
+    return <BsLabel title={title} bsStyle={labelStyle}>{labelText}</BsLabel>
+  }
+
   save = () => {
     const settings = this.refs.userSettings.getSettings()
     this.props.updateUserData(this.props.user, settings)
@@ -92,12 +147,8 @@ export default class UserRow extends Component<Props, State> {
           <Col xs={8} sm={5} md={6}>
             <h5>
               {user.email}{' '}
-              {permissions.isApplicationAdmin()
-                ? <BsLabel bsStyle='danger'>{this.messages('appAdmin')}</BsLabel>
-                : permissions.canAdministerAnOrganization()
-                  ? <BsLabel bsStyle='warning'>{this.messages('orgAdmin')}</BsLabel>
-                  : null
-              }{' '}
+              {this._getUserPermissionLabel(permissions)}
+              {' '}
               {userOrganization && creatorIsApplicationAdmin
                 ? <BsLabel bsStyle='default'>{userOrganization.name}</BsLabel>
                 : null

From c0a89cbdf469c637afaa83e33500242aab483961 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 11 Nov 2020 13:13:47 -0500
Subject: [PATCH 032/553] refactor(UserRow): only show title for missing
 projects

---
 i18n/english.yml                |  2 +-
 lib/admin/components/UserRow.js | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 335cbf134..7a2d6da5d 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -773,7 +773,7 @@ components:
     delete: Delete
     deleteConfirm: Are you sure you want to permanently delete this user?
     edit: Edit
-    missingProject: unknown
+    missingProject: Unknown project
     noProjectsFound: No projects
     orgAdmin: Org admin
     save: Save
diff --git a/lib/admin/components/UserRow.js b/lib/admin/components/UserRow.js
index 0933775a2..75778eeaa 100644
--- a/lib/admin/components/UserRow.js
+++ b/lib/admin/components/UserRow.js
@@ -77,13 +77,16 @@ export default class UserRow extends Component<Props, State> {
           return MISSING_PROJECT_VALUE
         })
         .filter(name => name)
-      // Store project ids in title if needed on hover.
-      title = `${this.messages('missingProject')}: ${missingProjectIds.join(', ')}`
       const uniqueProjectNames = Array.from(new Set(projectNames))
       // Build message based on number of projects.
       if (uniqueProjectNames.length > 0) {
-        // Use warning label if user has missing projects.
-        labelStyle = missingProjectCount > 0 ? 'warning' : 'info'
+        if (missingProjectCount > 0) {
+          // If any missing project ids, use warning label and show in title.
+          labelStyle = 'warning'
+          title = `${this.messages('missingProject')}: ${missingProjectIds.join(', ')}`
+        } else {
+          labelStyle = 'info'
+        }
         labelText = uniqueProjectNames
           // Replace uuid with missing project count message.
           .map(name => name === MISSING_PROJECT_VALUE

From a1ec79259f8cb06c5f3a22cbf13d20eb50fd4e10 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 11 Nov 2020 13:28:18 -0500
Subject: [PATCH 033/553] refactor(english.yml): change UserRow#missingProject
 to unknown

---
 i18n/english.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 7a2d6da5d..335cbf134 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -773,7 +773,7 @@ components:
     delete: Delete
     deleteConfirm: Are you sure you want to permanently delete this user?
     edit: Edit
-    missingProject: Unknown project
+    missingProject: unknown
     noProjectsFound: No projects
     orgAdmin: Org admin
     save: Save

From 0445e120afda4c6b85efa6d6851c648746944bd2 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 11 Nov 2020 17:13:38 -0500
Subject: [PATCH 034/553] feat(UserList): add users per page selector

works with changes in ibi-group/datatools-server#353
---
 i18n/english.yml                 |  1 +
 lib/admin/actions/admin.js       | 20 ++++++++++-------
 lib/admin/components/UserList.js | 38 +++++++++++++++++++++++++++++++-
 lib/admin/components/UserRow.js  | 17 +++++++++-----
 lib/admin/reducers/users.js      |  6 +++--
 5 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 335cbf134..7de834a81 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -764,6 +764,7 @@ components:
   UserList:
     filterByOrg: Filter by org.
     of: of
+    perPage: Users per page
     search: Search by username
     showing: Showing Users
     title: User Management
diff --git a/lib/admin/actions/admin.js b/lib/admin/actions/admin.js
index 3ece5ac32..493a84349 100644
--- a/lib/admin/actions/admin.js
+++ b/lib/admin/actions/admin.js
@@ -1,6 +1,7 @@
 // @flow
 
 import {createAction, type ActionType} from 'redux-actions'
+import qs from 'qs'
 
 import {createVoidPayloadAction, secureFetch} from '../../common/actions'
 import {setErrorMessage} from '../../manager/actions/status'
@@ -47,6 +48,10 @@ export const setUserPage = createAction(
   'SET_USER_PAGE',
   (payload: number) => payload
 )
+export const setUserPerPage = createAction(
+  'SET_USER_PER_PAGE',
+  (payload: number) => payload
+)
 export const setUserQueryString = createAction(
   'SET_USER_QUERY_STRING',
   (payload: string) => payload
@@ -56,6 +61,7 @@ export type AdminActions = ActionType<typeof createdUser> |
   ActionType<typeof receiveUsers> |
   ActionType<typeof requestingUsers> |
   ActionType<typeof setUserPage> |
+  ActionType<typeof setUserPerPage> |
   ActionType<typeof setUserQueryString> |
   ActionType<typeof deleteServer> |
   ActionType<typeof fetchServers> |
@@ -64,17 +70,15 @@ export type AdminActions = ActionType<typeof createdUser> |
 export function fetchUsers () {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(requestingUsers())
-    const queryString = getState().admin.users.userQueryString
-
+    const {page, perPage, userQueryString: queryString} = getState().admin.users
     let countUrl = '/api/manager/secure/usercount'
-    if (queryString) countUrl += `?queryString=${queryString}`
+    if (queryString) countUrl += `?${qs.stringify({queryString})}`
     const getCount = dispatch(secureFetch(countUrl))
-      .then(response => response.json())
-
-    let usersUrl = `/api/manager/secure/user?page=${getState().admin.users.page}`
-    if (queryString) usersUrl += `&queryString=${queryString}`
+      .then(res => res.json())
+    const params = queryString ? {page, perPage, queryString} : {page, perPage}
+    const usersUrl = `/api/manager/secure/user?${qs.stringify(params)}`
     const getUsers = dispatch(secureFetch(usersUrl))
-      .then(response => response.json())
+      .then(res => res.json())
 
     Promise.all([getCount, getUsers]).then((results) => {
       if (Array.isArray(results[1])) {
diff --git a/lib/admin/components/UserList.js b/lib/admin/components/UserList.js
index bf8c6ecd5..517821807 100644
--- a/lib/admin/components/UserList.js
+++ b/lib/admin/components/UserList.js
@@ -3,7 +3,19 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import {connect} from 'react-redux'
-import {Panel, Row, Col, Button, ButtonGroup, InputGroup, FormControl, ListGroup, ListGroupItem} from 'react-bootstrap'
+import {
+  Panel,
+  Row,
+  Col,
+  Button,
+  ButtonGroup,
+  DropdownButton,
+  InputGroup,
+  FormControl,
+  ListGroup,
+  ListGroupItem,
+  MenuItem
+} from 'react-bootstrap'
 
 import * as adminActions from '../actions/admin'
 import {getComponentMessages} from '../../common/util/config'
@@ -27,6 +39,7 @@ type Props = {
   perPage: number,
   projects: Array<Project>,
   setUserPage: typeof adminActions.setUserPage,
+  setUserPerPage: typeof adminActions.setUserPerPage,
   setUserQueryString: typeof adminActions.setUserQueryString,
   token: string,
   updateUserData: typeof managerUserActions.updateUserData,
@@ -75,6 +88,12 @@ class UserList extends Component<Props, State> {
     fetchUsers()
   }
 
+  _setUserPerPage = (perPage: number) => {
+    const {fetchUsers, setUserPerPage} = this.props
+    setUserPerPage(perPage)
+    fetchUsers()
+  }
+
   _userSearch = () => {
     const {fetchUsers, setUserPage, setUserQueryString} = this.props
     setUserPage(0)
@@ -132,6 +151,21 @@ class UserList extends Component<Props, State> {
               </span>
               : <span style={headerStyle}>(No results to show)</span>
             }
+            <div className='pull-right'>
+              {this.messages('perPage')}{' '}
+              <DropdownButton
+                id='per-page-dropdown'
+                title={perPage}
+                onSelect={this._setUserPerPage}>
+                {// Render users per page options.
+                  [10, 25, 50, 100].map(val =>
+                    <MenuItem key={`option-${val}`} eventKey={val}>
+                      {val} {val === perPage ? <Icon type='check' /> : null}
+                    </MenuItem>
+                  )
+                }
+              </DropdownButton>
+            </div>
           </Col>
         </Row>
         <Panel
@@ -238,6 +272,7 @@ const {
   deleteUser,
   fetchUsers,
   setUserPage,
+  setUserPerPage,
   setUserQueryString
 } = adminActions
 
@@ -247,6 +282,7 @@ const mapDispatchToProps = {
   fetchProjectFeeds,
   fetchUsers,
   setUserPage,
+  setUserPerPage,
   setUserQueryString,
   updateUserData
 }
diff --git a/lib/admin/components/UserRow.js b/lib/admin/components/UserRow.js
index 75778eeaa..29cc51d9c 100644
--- a/lib/admin/components/UserRow.js
+++ b/lib/admin/components/UserRow.js
@@ -45,6 +45,17 @@ export default class UserRow extends Component<Props, State> {
     this.toggleExpansion()
   }
 
+  _getOrgLabel = (permissions: UserPermissions) => {
+    const {creatingUser, organizations} = this.props
+    if (!organizations) return null
+    const userOrganization = organizations.find(o => o.id === permissions.getOrganizationId())
+    const creatorIsApplicationAdmin = creatingUser.permissions &&
+      creatingUser.permissions.isApplicationAdmin()
+    return userOrganization && creatorIsApplicationAdmin
+      ? <BsLabel bsStyle='default'>{userOrganization.name}</BsLabel>
+      : null
+  }
+
   /**
    * Constructs label indicating user authorization level (e.g., app/org admin)
    * or listing the projects the user has access to.
@@ -127,7 +138,6 @@ export default class UserRow extends Component<Props, State> {
     const permissions = new UserPermissions(user.app_metadata && user.app_metadata.datatools)
     const creatorIsApplicationAdmin = creatingUser.permissions &&
       creatingUser.permissions.isApplicationAdmin()
-    const userOrganization = organizations.find(o => o.id === permissions.getOrganizationId())
     const creatorDoesNotHaveOrg = !creatingUser.permissions ||
       // $FlowFixMe
       !creatingUser.permissions.hasOrganization(permissions.getOrganizationId())
@@ -152,10 +162,7 @@ export default class UserRow extends Component<Props, State> {
               {user.email}{' '}
               {this._getUserPermissionLabel(permissions)}
               {' '}
-              {userOrganization && creatorIsApplicationAdmin
-                ? <BsLabel bsStyle='default'>{userOrganization.name}</BsLabel>
-                : null
-              }
+              {this._getOrgLabel(permissions)}
             </h5>
             <small />
           </Col>
diff --git a/lib/admin/reducers/users.js b/lib/admin/reducers/users.js
index af031d6b5..6e12c9eab 100644
--- a/lib/admin/reducers/users.js
+++ b/lib/admin/reducers/users.js
@@ -6,11 +6,11 @@ import type {Action} from '../../types/actions'
 import type {AdminUsersState} from '../../types/reducers'
 
 export const defaultState = {
-  isFetching: false,
   data: null,
-  userCount: 0,
+  isFetching: false,
   page: 0,
   perPage: 10,
+  userCount: 0,
   userQueryString: null
 }
 
@@ -32,6 +32,8 @@ const users = (state: AdminUsersState = defaultState, action: Action): AdminUser
       return state
     case 'SET_USER_PAGE':
       return update(state, {page: { $set: action.payload }})
+    case 'SET_USER_PER_PAGE':
+      return update(state, {perPage: { $set: action.payload }})
     case 'SET_USER_QUERY_STRING':
       return update(state, {userQueryString: { $set: action.payload }})
     default:

From 548508d475e9f753195db42ab58edd170e3d80cc Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 12 Nov 2020 17:14:57 -0500
Subject: [PATCH 035/553] feat(feed-fetch): add feed fetch frequency form
 elements

re ibi-group/datatools-server#346
---
 lib/common/constants/index.js              | 12 ++++
 lib/common/containers/App.js               |  1 +
 lib/manager/components/CreateFeedSource.js | 63 +++++++++++++++++++-
 lib/manager/components/GeneralSettings.js  | 69 +++++++++++++++++++---
 lib/types/index.js                         |  8 ++-
 5 files changed, 143 insertions(+), 10 deletions(-)

diff --git a/lib/common/constants/index.js b/lib/common/constants/index.js
index e862c9363..3eb71f69d 100644
--- a/lib/common/constants/index.js
+++ b/lib/common/constants/index.js
@@ -11,6 +11,18 @@ export const DEFAULT_LOGO = 'https://d2tyb7byn1fef9.cloudfront.net/ibi_group_bla
 export const DEFAULT_LOGO_SMALL = 'https://d2tyb7byn1fef9.cloudfront.net/ibi_group-128x128.png'
 export const DEFAULT_TITLE = 'Data Tools'
 
+export const FETCH_FREQUENCIES = Object.freeze({
+  MINUTES: 'MINUTES',
+  HOURS: 'HOURS',
+  DAYS: 'DAYS'
+})
+
+export const FREQUENCY_INTERVALS = Object.freeze({
+  [FETCH_FREQUENCIES.MINUTES]: [5, 10, 15, 30],
+  [FETCH_FREQUENCIES.HOURS]: [1, 6, 12],
+  [FETCH_FREQUENCIES.DAYS]: [1, 2, 7, 14]
+})
+
 export const RETRIEVAL_METHODS = Object.freeze({
   MANUALLY_UPLOADED: 'MANUALLY_UPLOADED',
   FETCHED_AUTOMATICALLY: 'FETCHED_AUTOMATICALLY',
diff --git a/lib/common/containers/App.js b/lib/common/containers/App.js
index ba7e0ecb5..8767bb297 100644
--- a/lib/common/containers/App.js
+++ b/lib/common/containers/App.js
@@ -23,6 +23,7 @@ import ActiveProjectViewer from '../../manager/containers/ActiveProjectViewer'
 import ActivePublicLandingPage from '../../public/containers/ActivePublicLandingPage'
 import ActiveUserAccount from '../../public/containers/ActiveUserAccount'
 import ActiveUserHomePage from '../../manager/containers/ActiveUserHomePage'
+// import CreateFeedSource from '../../manager/containers/CreateFeedSource'
 import CreateProject from '../../manager/containers/CreateProject'
 import ActiveGtfsPlusEditor from '../../gtfsplus/containers/ActiveGtfsPlusEditor'
 import {logPageView} from '../util/analytics'
diff --git a/lib/manager/components/CreateFeedSource.js b/lib/manager/components/CreateFeedSource.js
index a0b5d0fc9..84b7a66be 100644
--- a/lib/manager/components/CreateFeedSource.js
+++ b/lib/manager/components/CreateFeedSource.js
@@ -1,5 +1,6 @@
 // @flow
 
+import Icon from '@conveyal/woonerf/components/icon'
 import memoize from 'lodash.memoize'
 import React, {Component} from 'react'
 import update from 'react-addons-update'
@@ -8,11 +9,13 @@ import {
   Checkbox,
   Col,
   ControlLabel,
+  DropdownButton,
   FormControl,
   FormGroup,
   HelpBlock,
   ListGroup,
   ListGroupItem,
+  MenuItem,
   Panel,
   Row
 } from 'react-bootstrap'
@@ -20,9 +23,10 @@ import validator from 'validator'
 
 import {createFeedSource} from '../actions/feeds'
 import Loading from '../../common/components/Loading'
+import {FREQUENCY_INTERVALS} from '../../common/constants'
 import {validationState} from '../util'
 
-import type {NewFeed} from '../../types'
+import type {FetchFrequency, NewFeed} from '../../types'
 
 type Props = {
   createFeedSource: typeof createFeedSource,
@@ -71,6 +75,8 @@ export default class CreateFeedSource extends Component<Props, State> {
       model: {
         autoFetchFeed: false,
         deployable: false,
+        fetchFrequency: 'DAYS',
+        fetchInterval: 1,
         name: '',
         projectId: props.projectId,
         url: ''
@@ -93,6 +99,32 @@ export default class CreateFeedSource extends Component<Props, State> {
     }
   )
 
+  _intervalsForFreq = (fetchFrequency: FetchFrequency) => {
+    return FREQUENCY_INTERVALS[fetchFrequency] || FREQUENCY_INTERVALS['DAYS']
+  }
+
+  _onSelectFetchInterval = (fetchInterval: number) => {
+    const updatedState: State = update(this.state, {
+      model: {fetchInterval: {$set: fetchInterval}}
+    })
+    this.setState(updatedState)
+  }
+
+  _onSelectFetchFrequency = (fetchFrequency: FetchFrequency) => {
+    let {fetchInterval} = this.state.model
+    const intervals = this._intervalsForFreq(fetchFrequency)
+    if (intervals.indexOf(fetchInterval) === -1) {
+      fetchInterval = intervals[0]
+    }
+    const updatedState: State = update(this.state, {
+      model: {
+        fetchFrequency: {$set: fetchFrequency},
+        fetchInterval: {$set: fetchInterval}
+      }
+    })
+    this.setState(updatedState)
+  }
+
   _onSave = () => {
     const {model, validation} = this.state
     // Prevent a save if the form has validation issues
@@ -127,6 +159,7 @@ export default class CreateFeedSource extends Component<Props, State> {
   render () {
     const {loading, model, validation} = this.state
     if (loading) return <Loading style={{marginTop: '30px'}} />
+    const intervals = this._intervalsForFreq(model.fetchFrequency)
     return (
       <Row>
         <Col xs={12}>
@@ -196,6 +229,34 @@ export default class CreateFeedSource extends Component<Props, State> {
                     source URL must be specified and project auto fetch must
                     be enabled.)
                   </small>
+                  {model.autoFetchFeed
+                    ? <div>
+                      <span>Fetch feed every</span>
+                      {' '}
+                      <DropdownButton
+                        title={model.fetchInterval}
+                        id='add-transformation-dropdown'
+                        onSelect={this._onSelectFetchInterval}>
+                        {intervals.map(value =>
+                          <MenuItem key={value} eventKey={value}>
+                            {value} {model.fetchInterval === value && <Icon type='check' />}
+                          </MenuItem>)
+                        }
+                      </DropdownButton>
+                      {' '}
+                      <DropdownButton
+                        title={model.fetchFrequency}
+                        id='add-transformation-dropdown'
+                        onSelect={this._onSelectFetchFrequency}>
+                        {Object.keys(FREQUENCY_INTERVALS).map((value) =>
+                          <MenuItem key={value} eventKey={value}>
+                            {value} {model.fetchFrequency === value && <Icon type='check' />}
+                          </MenuItem>)
+                        }
+                      </DropdownButton>
+                    </div>
+                    : null
+                  }
                 </FormGroup>
               </ListGroupItem>
             </ListGroup>
diff --git a/lib/manager/components/GeneralSettings.js b/lib/manager/components/GeneralSettings.js
index 933513a6f..3af9b24e2 100644
--- a/lib/manager/components/GeneralSettings.js
+++ b/lib/manager/components/GeneralSettings.js
@@ -3,21 +3,24 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import {
-  Col,
-  ListGroup,
-  ListGroupItem,
   Button,
-  Panel,
-  FormControl,
-  InputGroup,
+  Checkbox,
+  Col,
   ControlLabel,
+  DropdownButton,
+  FormControl,
   FormGroup,
-  Checkbox
+  InputGroup,
+  ListGroup,
+  ListGroupItem,
+  MenuItem,
+  Panel
 } from 'react-bootstrap'
 
 import * as feedsActions from '../actions/feeds'
+import {FREQUENCY_INTERVALS} from '../../common/constants'
 
-import type {Feed, Project} from '../../types'
+import type {Feed, FetchFrequency, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
 type Props = {
@@ -66,6 +69,25 @@ export default class GeneralSettings extends Component<Props, State> {
     updateFeedSource(feedSource, {retrievalMethod: value})
   }
 
+  _intervalsForFreq = (fetchFrequency: FetchFrequency) => {
+    return FREQUENCY_INTERVALS[fetchFrequency] || FREQUENCY_INTERVALS['DAYS']
+  }
+
+  _onSelectFetchInterval = (fetchInterval: number) => {
+    const {feedSource, updateFeedSource} = this.props
+    updateFeedSource(feedSource, {fetchInterval})
+  }
+
+  _onSelectFetchFrequency = (fetchFrequency: FetchFrequency) => {
+    const {feedSource, updateFeedSource} = this.props
+    let {fetchInterval} = feedSource
+    const intervals = this._intervalsForFreq(fetchFrequency)
+    if (intervals.indexOf(fetchInterval) === -1) {
+      fetchInterval = intervals[0]
+    }
+    updateFeedSource(feedSource, {fetchFrequency, fetchInterval})
+  }
+
   _onTogglePublic = () => {
     const {feedSource, updateFeedSource} = this.props
     updateFeedSource(feedSource, {isPublic: !feedSource.isPublic})
@@ -96,6 +118,9 @@ export default class GeneralSettings extends Component<Props, State> {
       url
     } = this.state
     const autoFetchFeed = feedSource.retrievalMethod === 'FETCHED_AUTOMATICALLY'
+    const fetchFrequency = feedSource.fetchFrequency || 'DAYS'
+    const intervals = this._intervalsForFreq(fetchFrequency)
+    const fetchInterval = feedSource.fetchInterval || intervals[0]
     return (
       <Col xs={7}>
         {/* Settings */}
@@ -168,6 +193,34 @@ export default class GeneralSettings extends Component<Props, State> {
                 </Checkbox>
                 <small>Set this feed source to fetch automatically. (Feed source URL must be specified and project auto fetch must be enabled.)</small>
               </FormGroup>
+              {autoFetchFeed
+                ? <div>
+                  <span>Fetch feed every</span>
+                  {' '}
+                  <DropdownButton
+                    title={fetchInterval}
+                    id='add-transformation-dropdown'
+                    onSelect={this._onSelectFetchInterval}>
+                    {intervals.map(value =>
+                      <MenuItem key={value} eventKey={value}>
+                        {value} {fetchInterval === value && <Icon type='check' />}
+                      </MenuItem>)
+                    }
+                  </DropdownButton>
+                  {' '}
+                  <DropdownButton
+                    title={fetchFrequency}
+                    id='add-transformation-dropdown'
+                    onSelect={this._onSelectFetchFrequency}>
+                    {Object.keys(FREQUENCY_INTERVALS).map((value) =>
+                      <MenuItem key={value} eventKey={value}>
+                        {value} {fetchFrequency === value && <Icon type='check' />}
+                      </MenuItem>)
+                    }
+                  </DropdownButton>
+                </div>
+                : null
+              }
             </ListGroupItem>
           </ListGroup>
         </Panel>
diff --git a/lib/types/index.js b/lib/types/index.js
index 16898626e..d90e92872 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -1,7 +1,7 @@
 // @flow
 
 import {POINT_TYPE} from '../editor/constants'
-import {FEED_TRANSFORMATION_TYPES, RETRIEVAL_METHODS} from '../common/constants'
+import {FEED_TRANSFORMATION_TYPES, FETCH_FREQUENCIES, RETRIEVAL_METHODS} from '../common/constants'
 
 import type UserPermissions from '../common/user/UserPermissions'
 
@@ -289,6 +289,8 @@ export type Snapshot = {
 
 export type RetrievalMethod = $Values<typeof RETRIEVAL_METHODS>
 
+export type FetchFrequency = $Values<typeof FETCH_FREQUENCIES>
+
 export type FeedTransformation = {
   '@type': $Values<typeof FEED_TRANSFORMATION_TYPES>,
   active: boolean,
@@ -314,6 +316,8 @@ export type Feed = {
   editorSnapshots?: Array<Snapshot>,
   externalProperties?: any, // TODO: add more exact type
   feedVersions?: Array<FeedVersion>,
+  fetchFrequency?: FetchFrequency,
+  fetchInterval?: number,
   id: string,
   isCreating?: boolean,
   isPublic: boolean,
@@ -339,6 +343,8 @@ export type Feed = {
 export type NewFeed = {
   autoFetchFeed?: boolean,
   deployable?: boolean,
+  fetchFrequency: FetchFrequency,
+  fetchInterval: number,
   name?: string,
   projectId: string,
   retrievalMethod?: string,

From ceadc859723093a6176733cbfece39d7bdbe5f6b Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 13 Nov 2020 15:15:38 -0500
Subject: [PATCH 036/553] refactor(FeedFetchFrequency): refactor fetch
 selectors into separate component

---
 i18n/english.yml                             |  2 +
 lib/common/containers/App.js                 |  1 -
 lib/manager/components/CreateFeedSource.js   | 42 +++-----------
 lib/manager/components/FeedFetchFrequency.js | 58 ++++++++++++++++++++
 lib/manager/components/GeneralSettings.js    | 45 ++++-----------
 lib/manager/util/index.js                    |  2 +
 6 files changed, 80 insertions(+), 70 deletions(-)
 create mode 100644 lib/manager/components/FeedFetchFrequency.js

diff --git a/i18n/english.yml b/i18n/english.yml
index 335cbf134..a29e72894 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -176,6 +176,8 @@ components:
     snapshot: snapshot
     title: Snapshots
     version: Version
+  FeedFetchFrequency:
+    fetchFeedEvery: Fetch feed every
   FeedInfoPanel:
     uploadShapefile:
       body: 'Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.'
diff --git a/lib/common/containers/App.js b/lib/common/containers/App.js
index 8767bb297..ba7e0ecb5 100644
--- a/lib/common/containers/App.js
+++ b/lib/common/containers/App.js
@@ -23,7 +23,6 @@ import ActiveProjectViewer from '../../manager/containers/ActiveProjectViewer'
 import ActivePublicLandingPage from '../../public/containers/ActivePublicLandingPage'
 import ActiveUserAccount from '../../public/containers/ActiveUserAccount'
 import ActiveUserHomePage from '../../manager/containers/ActiveUserHomePage'
-// import CreateFeedSource from '../../manager/containers/CreateFeedSource'
 import CreateProject from '../../manager/containers/CreateProject'
 import ActiveGtfsPlusEditor from '../../gtfsplus/containers/ActiveGtfsPlusEditor'
 import {logPageView} from '../util/analytics'
diff --git a/lib/manager/components/CreateFeedSource.js b/lib/manager/components/CreateFeedSource.js
index 84b7a66be..6022e6957 100644
--- a/lib/manager/components/CreateFeedSource.js
+++ b/lib/manager/components/CreateFeedSource.js
@@ -1,6 +1,5 @@
 // @flow
 
-import Icon from '@conveyal/woonerf/components/icon'
 import memoize from 'lodash.memoize'
 import React, {Component} from 'react'
 import update from 'react-addons-update'
@@ -9,13 +8,11 @@ import {
   Checkbox,
   Col,
   ControlLabel,
-  DropdownButton,
   FormControl,
   FormGroup,
   HelpBlock,
   ListGroup,
   ListGroupItem,
-  MenuItem,
   Panel,
   Row
 } from 'react-bootstrap'
@@ -24,6 +21,7 @@ import validator from 'validator'
 import {createFeedSource} from '../actions/feeds'
 import Loading from '../../common/components/Loading'
 import {FREQUENCY_INTERVALS} from '../../common/constants'
+import FeedFetchFrequency from './FeedFetchFrequency'
 import {validationState} from '../util'
 
 import type {FetchFrequency, NewFeed} from '../../types'
@@ -99,10 +97,6 @@ export default class CreateFeedSource extends Component<Props, State> {
     }
   )
 
-  _intervalsForFreq = (fetchFrequency: FetchFrequency) => {
-    return FREQUENCY_INTERVALS[fetchFrequency] || FREQUENCY_INTERVALS['DAYS']
-  }
-
   _onSelectFetchInterval = (fetchInterval: number) => {
     const updatedState: State = update(this.state, {
       model: {fetchInterval: {$set: fetchInterval}}
@@ -112,7 +106,7 @@ export default class CreateFeedSource extends Component<Props, State> {
 
   _onSelectFetchFrequency = (fetchFrequency: FetchFrequency) => {
     let {fetchInterval} = this.state.model
-    const intervals = this._intervalsForFreq(fetchFrequency)
+    const intervals = FREQUENCY_INTERVALS[fetchFrequency]
     if (intervals.indexOf(fetchInterval) === -1) {
       fetchInterval = intervals[0]
     }
@@ -159,7 +153,6 @@ export default class CreateFeedSource extends Component<Props, State> {
   render () {
     const {loading, model, validation} = this.state
     if (loading) return <Loading style={{marginTop: '30px'}} />
-    const intervals = this._intervalsForFreq(model.fetchFrequency)
     return (
       <Row>
         <Col xs={12}>
@@ -230,31 +223,12 @@ export default class CreateFeedSource extends Component<Props, State> {
                     be enabled.)
                   </small>
                   {model.autoFetchFeed
-                    ? <div>
-                      <span>Fetch feed every</span>
-                      {' '}
-                      <DropdownButton
-                        title={model.fetchInterval}
-                        id='add-transformation-dropdown'
-                        onSelect={this._onSelectFetchInterval}>
-                        {intervals.map(value =>
-                          <MenuItem key={value} eventKey={value}>
-                            {value} {model.fetchInterval === value && <Icon type='check' />}
-                          </MenuItem>)
-                        }
-                      </DropdownButton>
-                      {' '}
-                      <DropdownButton
-                        title={model.fetchFrequency}
-                        id='add-transformation-dropdown'
-                        onSelect={this._onSelectFetchFrequency}>
-                        {Object.keys(FREQUENCY_INTERVALS).map((value) =>
-                          <MenuItem key={value} eventKey={value}>
-                            {value} {model.fetchFrequency === value && <Icon type='check' />}
-                          </MenuItem>)
-                        }
-                      </DropdownButton>
-                    </div>
+                    ? <FeedFetchFrequency
+                      fetchFrequency={model.fetchFrequency}
+                      fetchInterval={model.fetchInterval}
+                      onSelectFetchFrequency={this._onSelectFetchFrequency}
+                      onSelectFetchInterval={this._onSelectFetchInterval}
+                    />
                     : null
                   }
                 </FormGroup>
diff --git a/lib/manager/components/FeedFetchFrequency.js b/lib/manager/components/FeedFetchFrequency.js
new file mode 100644
index 000000000..5aefca069
--- /dev/null
+++ b/lib/manager/components/FeedFetchFrequency.js
@@ -0,0 +1,58 @@
+// @flow
+import Icon from '@conveyal/woonerf/components/icon'
+import React from 'react'
+import {
+  DropdownButton,
+  MenuItem
+} from 'react-bootstrap'
+
+import {FREQUENCY_INTERVALS} from '../../common/constants'
+import {getComponentMessages} from '../../common/util/config'
+
+import type {FetchFrequency} from '../../types'
+
+type Props = {
+  fetchFrequency?: FetchFrequency,
+  fetchInterval?: number,
+  onSelectFetchFrequency: FetchFrequency => void,
+  onSelectFetchInterval: number => void
+}
+
+const FeedFetchFrequency = (props: Props) => {
+  const {onSelectFetchFrequency, onSelectFetchInterval} = props
+  let {fetchFrequency, fetchInterval} = props
+  // If frequency and interval are not defined, use default of one fetch per day.
+  if (!fetchFrequency) fetchFrequency = 'DAYS'
+  const intervals = FREQUENCY_INTERVALS[fetchFrequency]
+  if (!fetchInterval) fetchInterval = intervals[0]
+  const messages = getComponentMessages('FeedFetchFrequency')
+  return (
+    <div>
+      <span>{messages('fetchFeedEvery')}</span>
+      {' '}
+      <DropdownButton
+        title={fetchInterval}
+        id='add-transformation-dropdown'
+        onSelect={onSelectFetchInterval}>
+        {intervals.map(value =>
+          <MenuItem key={value} eventKey={value}>
+            {value} {fetchInterval === value && <Icon type='check' />}
+          </MenuItem>)
+        }
+      </DropdownButton>
+      {' '}
+      <DropdownButton
+        title={fetchFrequency}
+        id='add-transformation-dropdown'
+        onSelect={onSelectFetchFrequency}>
+        {Object.keys(FREQUENCY_INTERVALS).map((value) =>
+          <MenuItem key={value} eventKey={value}>
+            {value} {fetchFrequency === value && <Icon type='check' />}
+          </MenuItem>)
+        }
+      </DropdownButton>
+    </div>
+  )
+}
+
+export default FeedFetchFrequency
diff --git a/lib/manager/components/GeneralSettings.js b/lib/manager/components/GeneralSettings.js
index 3af9b24e2..e2bf4beb0 100644
--- a/lib/manager/components/GeneralSettings.js
+++ b/lib/manager/components/GeneralSettings.js
@@ -7,18 +7,17 @@ import {
   Checkbox,
   Col,
   ControlLabel,
-  DropdownButton,
   FormControl,
   FormGroup,
   InputGroup,
   ListGroup,
   ListGroupItem,
-  MenuItem,
   Panel
 } from 'react-bootstrap'
 
 import * as feedsActions from '../actions/feeds'
 import {FREQUENCY_INTERVALS} from '../../common/constants'
+import FeedFetchFrequency from './FeedFetchFrequency'
 
 import type {Feed, FetchFrequency, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
@@ -69,10 +68,6 @@ export default class GeneralSettings extends Component<Props, State> {
     updateFeedSource(feedSource, {retrievalMethod: value})
   }
 
-  _intervalsForFreq = (fetchFrequency: FetchFrequency) => {
-    return FREQUENCY_INTERVALS[fetchFrequency] || FREQUENCY_INTERVALS['DAYS']
-  }
-
   _onSelectFetchInterval = (fetchInterval: number) => {
     const {feedSource, updateFeedSource} = this.props
     updateFeedSource(feedSource, {fetchInterval})
@@ -81,7 +76,9 @@ export default class GeneralSettings extends Component<Props, State> {
   _onSelectFetchFrequency = (fetchFrequency: FetchFrequency) => {
     const {feedSource, updateFeedSource} = this.props
     let {fetchInterval} = feedSource
-    const intervals = this._intervalsForFreq(fetchFrequency)
+    const intervals = FREQUENCY_INTERVALS[fetchFrequency]
+    // If the current interval is not in the set for this frequency, overwrite
+    // with the first value from the allowed set.
     if (intervals.indexOf(fetchInterval) === -1) {
       fetchInterval = intervals[0]
     }
@@ -118,9 +115,6 @@ export default class GeneralSettings extends Component<Props, State> {
       url
     } = this.state
     const autoFetchFeed = feedSource.retrievalMethod === 'FETCHED_AUTOMATICALLY'
-    const fetchFrequency = feedSource.fetchFrequency || 'DAYS'
-    const intervals = this._intervalsForFreq(fetchFrequency)
-    const fetchInterval = feedSource.fetchInterval || intervals[0]
     return (
       <Col xs={7}>
         {/* Settings */}
@@ -194,31 +188,12 @@ export default class GeneralSettings extends Component<Props, State> {
                 <small>Set this feed source to fetch automatically. (Feed source URL must be specified and project auto fetch must be enabled.)</small>
               </FormGroup>
               {autoFetchFeed
-                ? <div>
-                  <span>Fetch feed every</span>
-                  {' '}
-                  <DropdownButton
-                    title={fetchInterval}
-                    id='add-transformation-dropdown'
-                    onSelect={this._onSelectFetchInterval}>
-                    {intervals.map(value =>
-                      <MenuItem key={value} eventKey={value}>
-                        {value} {fetchInterval === value && <Icon type='check' />}
-                      </MenuItem>)
-                    }
-                  </DropdownButton>
-                  {' '}
-                  <DropdownButton
-                    title={fetchFrequency}
-                    id='add-transformation-dropdown'
-                    onSelect={this._onSelectFetchFrequency}>
-                    {Object.keys(FREQUENCY_INTERVALS).map((value) =>
-                      <MenuItem key={value} eventKey={value}>
-                        {value} {fetchFrequency === value && <Icon type='check' />}
-                      </MenuItem>)
-                    }
-                  </DropdownButton>
-                </div>
+                ? <FeedFetchFrequency
+                  fetchFrequency={feedSource.fetchFrequency}
+                  fetchInterval={feedSource.fetchInterval}
+                  onSelectFetchFrequency={this._onSelectFetchFrequency}
+                  onSelectFetchInterval={this._onSelectFetchInterval}
+                />
                 : null
               }
             </ListGroupItem>
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index 4a5b89e08..ac5e6c222 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -4,11 +4,13 @@ import moment from 'moment'
 import {get} from 'object-path'
 
 import {getVersionValidationSummaryByFilterStrategy} from './version'
+import {FREQUENCY_INTERVALS} from '../../common/constants'
 
 import type {
   Bounds,
   Feed,
   FeedVersion,
+  FetchFrequency,
   Project,
   ValidationSummary
 } from '../../types'

From bc0eff59ba7387aa53eb080f7d792fcae6093fa8 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 13 Nov 2020 16:01:03 -0500
Subject: [PATCH 037/553] refactor(MenuItem): add wrapper component to handle
 checkmark icon

---
 lib/admin/components/UserList.js              | 12 ++++----
 lib/common/components/MenuItem.js             | 28 +++++++++++++++++++
 .../components/ProjectFeedListToolbar.js      |  7 +++--
 .../version/VersionSelectorDropdown.js        | 14 ++--------
 4 files changed, 41 insertions(+), 20 deletions(-)
 create mode 100644 lib/common/components/MenuItem.js

diff --git a/lib/admin/components/UserList.js b/lib/admin/components/UserList.js
index 517821807..61221a57d 100644
--- a/lib/admin/components/UserList.js
+++ b/lib/admin/components/UserList.js
@@ -4,20 +4,20 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import {connect} from 'react-redux'
 import {
-  Panel,
-  Row,
-  Col,
   Button,
   ButtonGroup,
+  Col,
   DropdownButton,
   InputGroup,
   FormControl,
   ListGroup,
   ListGroupItem,
-  MenuItem
+  Panel,
+  Row
 } from 'react-bootstrap'
 
 import * as adminActions from '../actions/admin'
+import MenuItem from '../../common/components/MenuItem'
 import {getComponentMessages} from '../../common/util/config'
 import CreateUser from './CreateUser'
 import * as feedActions from '../../manager/actions/feeds'
@@ -159,8 +159,8 @@ class UserList extends Component<Props, State> {
                 onSelect={this._setUserPerPage}>
                 {// Render users per page options.
                   [10, 25, 50, 100].map(val =>
-                    <MenuItem key={`option-${val}`} eventKey={val}>
-                      {val} {val === perPage ? <Icon type='check' /> : null}
+                    <MenuItem selected={val === perPage} key={`option-${val}`} eventKey={val}>
+                      {val}
                     </MenuItem>
                   )
                 }
diff --git a/lib/common/components/MenuItem.js b/lib/common/components/MenuItem.js
new file mode 100644
index 000000000..8b6fcd40b
--- /dev/null
+++ b/lib/common/components/MenuItem.js
@@ -0,0 +1,28 @@
+// @flow
+
+import Icon from '@conveyal/woonerf/components/icon'
+import * as React from 'react'
+import {MenuItem as BsMenuItem} from 'react-bootstrap'
+
+/**
+ * Simple wrapper around Bootstrap's menu item to inject a checkmark if the item
+ * is selected.
+ */
+const MenuItem = ({children, selected, ...menuItemProps}: {children: React.Node, selected?: boolean}) => (
+  <BsMenuItem {...menuItemProps}>
+    {selected
+      ? <Icon
+        style={{
+          position: 'absolute',
+          left: '2px',
+          marginTop: '3px'
+        }}
+        type='check'
+      />
+      : null
+    }
+    {children}
+  </BsMenuItem>
+)
+
+export default MenuItem
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index d0b7f0fa0..c357d52a1 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -21,6 +21,7 @@ import {
 
 import * as projectsActions from '../actions/projects'
 import * as visibilityFilterActions from '../actions/visibilityFilter'
+import SelectableMenuItem from '../../common/components/MenuItem'
 import OptionButton from '../../common/components/OptionButton'
 import {getComponentMessages, isExtensionEnabled} from '../../common/util/config'
 import {
@@ -248,13 +249,13 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
   _renderSortOption = (option: FeedSourceTableSortStrategiesWithOrders) => {
     const {sort} = this.props
     return (
-      <MenuItem
+      <SelectableMenuItem
         key={`feed-sort-${option}`}
         onClick={this._onSort(option)}
+        selected={sort === option}
       >
         {this.messages(`sort.${option.replace('-', '.')}`)}
-        {sort === option && <Icon style={{marginLeft: 6}} type='check' />}
-      </MenuItem>
+      </SelectableMenuItem>
     )
   }
 
diff --git a/lib/manager/components/version/VersionSelectorDropdown.js b/lib/manager/components/version/VersionSelectorDropdown.js
index 048f18eec..22a4155f0 100644
--- a/lib/manager/components/version/VersionSelectorDropdown.js
+++ b/lib/manager/components/version/VersionSelectorDropdown.js
@@ -1,9 +1,9 @@
 // @flow
 
-import Icon from '@conveyal/woonerf/components/icon'
 import * as React from 'react'
-import { Dropdown, MenuItem } from 'react-bootstrap'
+import { Dropdown } from 'react-bootstrap'
 
+import MenuItem from '../../../common/components/MenuItem'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
 
 import type { FeedVersion } from '../../../types'
@@ -20,18 +20,10 @@ type Props = {
 
 const DefaultItemFormatter = (version: FeedVersion, activeVersion: ?FeedVersion) => (
   <MenuItem
+    selected={Boolean(activeVersion && version.id === activeVersion.id)}
     key={version.id}
     eventKey={version.version}
   >
-    {activeVersion && version.id === activeVersion.id
-      ? <Icon
-        style={{
-          position: 'absolute',
-          left: '2px',
-          marginTop: '3px'
-        }}
-        type='check' />
-      : null}
     {version.version}. {version.name}{' '}
     <VersionRetrievalBadge version={version} />
   </MenuItem>

From fb199c6d38fdf7e20075d76c6b1d5ed3eebf5d83 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 16 Nov 2020 14:47:15 -0500
Subject: [PATCH 038/553] build(auth0-lock): bump auth0-lock to 11.27.1

---
 package.json |  2 +-
 yarn.lock    | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d19ea6ab3..3e09f1f4a 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "@turf/line-slice-along": "^4.6.0",
     "@turf/nearest-point-on-line": "^5.1.5",
     "auth0-js": "^9.3.2",
-    "auth0-lock": "^11.3.1",
+    "auth0-lock": "^11.27.1",
     "bootstrap": "^3.4.1",
     "bugsnag-js": "^4.7.2",
     "bugsnag-react": "^1.1.1",
diff --git a/yarn.lock b/yarn.lock
index c03e9bea5..a0e395608 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1952,10 +1952,10 @@ auth0-js@^9.13.3, auth0-js@^9.3.2:
     url-join "^4.0.1"
     winchan "^0.2.2"
 
-auth0-lock@^11.3.1:
-  version "11.26.0"
-  resolved "https://registry.yarnpkg.com/auth0-lock/-/auth0-lock-11.26.0.tgz#5a4a7c3df47004b710743b178300bfda9235f7ef"
-  integrity sha512-9b40aZkNiSMmASuyyz+lGB66aSfceVORTT+Ae9/Mr0+gFoKG7E6h+dDn52sDVQ2FEedI5zRlfpN4w4G54dK2qA==
+auth0-lock@^11.27.1:
+  version "11.27.1"
+  resolved "https://registry.yarnpkg.com/auth0-lock/-/auth0-lock-11.27.1.tgz#942301f61561f67caf40894104e8b3dfd8c67876"
+  integrity sha512-qUa6f+rQJgTI3vCw8jDQA6m91TXiTYCQM9FLINyMRFKYvcJ/gIE1E5jMEll84miaAkXVWU8X+1vC7UHiRx8epA==
   dependencies:
     auth0-js "^9.13.3"
     auth0-password-policies "^1.0.2"
@@ -1970,6 +1970,7 @@ auth0-lock@^11.3.1:
     react-transition-group "^2.2.1"
     trim "0.0.1"
     url-join "^1.1.0"
+    validator "^13.1.1"
 
 auth0-password-policies@^1.0.2:
   version "1.0.2"
@@ -14015,6 +14016,11 @@ validator@7.0.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-7.0.0.tgz#c74deb8063512fac35547938e6f0b1504a282fd2"
   integrity sha1-x03rgGNRL6w1VHk45vCxUEooL9I=
 
+validator@^13.1.1:
+  version "13.1.17"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.1.17.tgz#ad677736950adddd3c37209484a6b2e0966579ad"
+  integrity sha512-zL5QBoemJ3jYFb2/j38y7ljhwYGXVLUp8H6W1nVxadnAOvUOytec+L7BHh1oBQ82/TzWXHd+GSaxUWp4lROkLg==
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"

From 129ad7d5f318de4cdc1c0fd45e79546f8c521699 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 16 Nov 2020 16:57:54 -0500
Subject: [PATCH 039/553] test(snapshots): update snaps

---
 .../__snapshots__/ActiveProjectViewer.js.snap | 478 ++++++++++--------
 .../__snapshots__/FeedSourceTable.js.snap     | 478 ++++++++++--------
 2 files changed, 552 insertions(+), 404 deletions(-)

diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index d494bc823..b7839776c 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -2498,87 +2498,105 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                             </li>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-alphabetically-asc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={true}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  A-Z
-                                                                                                  <Icon
-                                                                                                    style={
-                                                                                                      Object {
-                                                                                                        "marginLeft": 6,
-                                                                                                      }
-                                                                                                    }
-                                                                                                    type="check"
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
                                                                                                   >
-                                                                                                    <i
-                                                                                                      className="fa fa-check fa-fw "
+                                                                                                    <Icon
                                                                                                       style={
                                                                                                         Object {
-                                                                                                          "marginLeft": 6,
+                                                                                                          "left": "2px",
+                                                                                                          "marginTop": "3px",
+                                                                                                          "position": "absolute",
                                                                                                         }
                                                                                                       }
-                                                                                                    />
-                                                                                                  </Icon>
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                      type="check"
+                                                                                                    >
+                                                                                                      <i
+                                                                                                        className="fa fa-check fa-fw "
+                                                                                                        style={
+                                                                                                          Object {
+                                                                                                            "left": "2px",
+                                                                                                            "marginTop": "3px",
+                                                                                                            "position": "absolute",
+                                                                                                          }
+                                                                                                        }
+                                                                                                      />
+                                                                                                    </Icon>
+                                                                                                    A-Z
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-alphabetically-desc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={false}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  Z-A
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
+                                                                                                  >
+                                                                                                    Z-A
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                           <MenuItem
                                                                                             bsClass="dropdown"
@@ -2613,70 +2631,84 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                             </li>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-endDate-asc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={false}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  Earliest-Latest
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
+                                                                                                  >
+                                                                                                    Earliest-Latest
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-endDate-desc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={false}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  Latest-Earliest
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
+                                                                                                  >
+                                                                                                    Latest-Earliest
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                           <MenuItem
                                                                                             bsClass="dropdown"
@@ -2711,70 +2743,84 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                             </li>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-startDate-asc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={false}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  Earliest-Latest
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
+                                                                                                  >
+                                                                                                    Earliest-Latest
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-startDate-desc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={false}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  Latest-Earliest
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
+                                                                                                  >
+                                                                                                    Latest-Earliest
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                           <MenuItem
                                                                                             bsClass="dropdown"
@@ -2809,70 +2855,84 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                             </li>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-lastUpdated-asc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={false}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  Stale-Recent
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
+                                                                                                  >
+                                                                                                    Stale-Recent
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-lastUpdated-desc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={false}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  Recent-Stale
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
+                                                                                                  >
+                                                                                                    Recent-Stale
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                           <MenuItem
                                                                                             bsClass="dropdown"
@@ -2907,70 +2967,84 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                             </li>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-numErrors-asc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={false}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  Least-Most
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
+                                                                                                  >
+                                                                                                    Least-Most
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                           <MenuItem
-                                                                                            bsClass="dropdown"
-                                                                                            disabled={false}
-                                                                                            divider={false}
-                                                                                            header={false}
                                                                                             key=".$feed-sort-numErrors-desc"
                                                                                             onClick={[Function]}
                                                                                             onKeyDown={[Function]}
                                                                                             onSelect={[Function]}
+                                                                                            selected={false}
                                                                                           >
-                                                                                            <li
-                                                                                              className=""
-                                                                                              role="presentation"
+                                                                                            <MenuItem
+                                                                                              bsClass="dropdown"
+                                                                                              disabled={false}
+                                                                                              divider={false}
+                                                                                              header={false}
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              onSelect={[Function]}
                                                                                             >
-                                                                                              <SafeAnchor
-                                                                                                componentClass="a"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="menuitem"
-                                                                                                tabIndex="-1"
+                                                                                              <li
+                                                                                                className=""
+                                                                                                role="presentation"
                                                                                               >
-                                                                                                <a
-                                                                                                  href="#"
+                                                                                                <SafeAnchor
+                                                                                                  componentClass="a"
                                                                                                   onClick={[Function]}
                                                                                                   onKeyDown={[Function]}
                                                                                                   role="menuitem"
                                                                                                   tabIndex="-1"
                                                                                                 >
-                                                                                                  Most-Least
-                                                                                                </a>
-                                                                                              </SafeAnchor>
-                                                                                            </li>
+                                                                                                  <a
+                                                                                                    href="#"
+                                                                                                    onClick={[Function]}
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    role="menuitem"
+                                                                                                    tabIndex="-1"
+                                                                                                  >
+                                                                                                    Most-Least
+                                                                                                  </a>
+                                                                                                </SafeAnchor>
+                                                                                              </li>
+                                                                                            </MenuItem>
                                                                                           </MenuItem>
                                                                                         </ul>
                                                                                       </RootCloseWrapper>
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index ca635b27a..163f34121 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -1442,87 +1442,105 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           </li>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-alphabetically-asc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={true}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                A-Z
-                                                <Icon
-                                                  style={
-                                                    Object {
-                                                      "marginLeft": 6,
-                                                    }
-                                                  }
-                                                  type="check"
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
                                                 >
-                                                  <i
-                                                    className="fa fa-check fa-fw "
+                                                  <Icon
                                                     style={
                                                       Object {
-                                                        "marginLeft": 6,
+                                                        "left": "2px",
+                                                        "marginTop": "3px",
+                                                        "position": "absolute",
                                                       }
                                                     }
-                                                  />
-                                                </Icon>
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                    type="check"
+                                                  >
+                                                    <i
+                                                      className="fa fa-check fa-fw "
+                                                      style={
+                                                        Object {
+                                                          "left": "2px",
+                                                          "marginTop": "3px",
+                                                          "position": "absolute",
+                                                        }
+                                                      }
+                                                    />
+                                                  </Icon>
+                                                  A-Z
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-alphabetically-desc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={false}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                Z-A
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                >
+                                                  Z-A
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                         <MenuItem
                                           bsClass="dropdown"
@@ -1557,70 +1575,84 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           </li>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-endDate-asc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={false}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                Earliest-Latest
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                >
+                                                  Earliest-Latest
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-endDate-desc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={false}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                Latest-Earliest
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                >
+                                                  Latest-Earliest
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                         <MenuItem
                                           bsClass="dropdown"
@@ -1655,70 +1687,84 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           </li>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-startDate-asc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={false}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                Earliest-Latest
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                >
+                                                  Earliest-Latest
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-startDate-desc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={false}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                Latest-Earliest
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                >
+                                                  Latest-Earliest
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                         <MenuItem
                                           bsClass="dropdown"
@@ -1753,70 +1799,84 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           </li>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-lastUpdated-asc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={false}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                Stale-Recent
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                >
+                                                  Stale-Recent
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-lastUpdated-desc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={false}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                Recent-Stale
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                >
+                                                  Recent-Stale
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                         <MenuItem
                                           bsClass="dropdown"
@@ -1851,70 +1911,84 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           </li>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-numErrors-asc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={false}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                Least-Most
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                >
+                                                  Least-Most
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                         <MenuItem
-                                          bsClass="dropdown"
-                                          disabled={false}
-                                          divider={false}
-                                          header={false}
                                           key=".$feed-sort-numErrors-desc"
                                           onClick={[Function]}
                                           onKeyDown={[Function]}
                                           onSelect={[Function]}
+                                          selected={false}
                                         >
-                                          <li
-                                            className=""
-                                            role="presentation"
+                                          <MenuItem
+                                            bsClass="dropdown"
+                                            disabled={false}
+                                            divider={false}
+                                            header={false}
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            onSelect={[Function]}
                                           >
-                                            <SafeAnchor
-                                              componentClass="a"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="menuitem"
-                                              tabIndex="-1"
+                                            <li
+                                              className=""
+                                              role="presentation"
                                             >
-                                              <a
-                                                href="#"
+                                              <SafeAnchor
+                                                componentClass="a"
                                                 onClick={[Function]}
                                                 onKeyDown={[Function]}
                                                 role="menuitem"
                                                 tabIndex="-1"
                                               >
-                                                Most-Least
-                                              </a>
-                                            </SafeAnchor>
-                                          </li>
+                                                <a
+                                                  href="#"
+                                                  onClick={[Function]}
+                                                  onKeyDown={[Function]}
+                                                  role="menuitem"
+                                                  tabIndex="-1"
+                                                >
+                                                  Most-Least
+                                                </a>
+                                              </SafeAnchor>
+                                            </li>
+                                          </MenuItem>
                                         </MenuItem>
                                       </ul>
                                     </RootCloseWrapper>

From 30c72de432e7d9dbb14bef817510d7203bb99309 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 16 Nov 2020 17:21:28 -0500
Subject: [PATCH 040/553] refactor: address PR comments

---
 i18n/english.yml                             |  3 ++
 lib/manager/components/FeedFetchFrequency.js | 34 ++++++++++++++------
 lib/manager/util/index.js                    |  2 --
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 8a875aa5a..536449c8f 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -177,7 +177,10 @@ components:
     title: Snapshots
     version: Version
   FeedFetchFrequency:
+    DAYS: days
     fetchFeedEvery: Fetch feed every
+    HOURS: hours
+    MINUTES: minutes
   FeedInfoPanel:
     uploadShapefile:
       body: 'Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.'
diff --git a/lib/manager/components/FeedFetchFrequency.js b/lib/manager/components/FeedFetchFrequency.js
index 5aefca069..9ced368b6 100644
--- a/lib/manager/components/FeedFetchFrequency.js
+++ b/lib/manager/components/FeedFetchFrequency.js
@@ -2,11 +2,11 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import React from 'react'
 import {
-  DropdownButton,
-  MenuItem
+  DropdownButton
 } from 'react-bootstrap'
 
 import {FREQUENCY_INTERVALS} from '../../common/constants'
+import MenuItem from '../../common/components/MenuItem'
 import {getComponentMessages} from '../../common/util/config'
 
 import type {FetchFrequency} from '../../types'
@@ -18,6 +18,11 @@ type Props = {
   onSelectFetchInterval: number => void
 }
 
+/**
+ * Renders a set of dropdown form elements used to set a the auto-fetch
+ * interval/frequency properties for a FeedSource (i.e., how often data tools
+ * should check for an updated GTFS file at the fetch URL).
+ */
 const FeedFetchFrequency = (props: Props) => {
   const {onSelectFetchFrequency, onSelectFetchInterval} = props
   let {fetchFrequency, fetchInterval} = props
@@ -26,28 +31,37 @@ const FeedFetchFrequency = (props: Props) => {
   const intervals = FREQUENCY_INTERVALS[fetchFrequency]
   if (!fetchInterval) fetchInterval = intervals[0]
   const messages = getComponentMessages('FeedFetchFrequency')
+  console.log(Object.keys(FREQUENCY_INTERVALS), messages);
   return (
     <div>
-      <span>{messages('fetchFeedEvery')}</span>
+      {messages('fetchFeedEvery')}
       {' '}
       <DropdownButton
         title={fetchInterval}
-        id='add-transformation-dropdown'
+        id='fetch-interval-dropdown'
         onSelect={onSelectFetchInterval}>
         {intervals.map(value =>
-          <MenuItem key={value} eventKey={value}>
-            {value} {fetchInterval === value && <Icon type='check' />}
+          <MenuItem
+            eventKey={value}
+            key={value}
+            selected={fetchInterval === value}
+          >
+            {value}
           </MenuItem>)
         }
       </DropdownButton>
       {' '}
       <DropdownButton
-        title={fetchFrequency}
-        id='add-transformation-dropdown'
+        title={messages(fetchFrequency)}
+        id='fetch-frequency-dropdown'
         onSelect={onSelectFetchFrequency}>
         {Object.keys(FREQUENCY_INTERVALS).map((value) =>
-          <MenuItem key={value} eventKey={value}>
-            {value} {fetchFrequency === value && <Icon type='check' />}
+          <MenuItem
+            eventKey={value}
+            key={value}
+            selected={fetchFrequency === value}
+          >
+            {messages(value)}
           </MenuItem>)
         }
       </DropdownButton>
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index ac5e6c222..4a5b89e08 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -4,13 +4,11 @@ import moment from 'moment'
 import {get} from 'object-path'
 
 import {getVersionValidationSummaryByFilterStrategy} from './version'
-import {FREQUENCY_INTERVALS} from '../../common/constants'
 
 import type {
   Bounds,
   Feed,
   FeedVersion,
-  FetchFrequency,
   Project,
   ValidationSummary
 } from '../../types'

From 196750f9a02eee12b8bb1f021fce8632be7db654 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 16 Nov 2020 20:11:54 -0500
Subject: [PATCH 041/553] refactor(manager/util/version): Extract delta
 formatting function.

---
 lib/manager/components/version/FeedVersionTabs.js   |  3 ++-
 lib/manager/components/version/FeedVersionViewer.js |  5 ++---
 lib/manager/util/version.js                         | 13 +++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index bc3b3e6e3..2303da244 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -10,6 +10,7 @@ import Patterns from '../reporter/containers/Patterns'
 import Routes from '../reporter/containers/Routes'
 import Stops from '../reporter/containers/Stops'
 import Timetables from '../reporter/containers/Timetables'
+import {formatDelta} from '../../util/version'
 import ServicePerModeChart from '../validation/ServicePerModeChart'
 import TripsChart from '../validation/TripsChart'
 import FeedVersionAccessibility from './FeedVersionAccessibility'
@@ -121,7 +122,7 @@ export default class FeedVersionTabs extends Component<Props> {
                             style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
                             bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'danger' : 'default')}
                             title={`Difference compared to Version ${comparedVersionIndex || 'null'}`}>
-                            {diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a')) /* TODO: refactor */}
+                            {formatDelta(diff)}
                           </BsLabel>
                         </sup>
                       )}
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 7a2037883..e28a394fd 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -15,7 +15,7 @@ import FeedVersionReport from './FeedVersionReport'
 import ActiveGtfsPlusVersionSummary from '../../../gtfsplus/containers/ActiveGtfsPlusVersionSummary'
 import VersionDateLabel from './VersionDateLabel'
 import NotesViewer from '../NotesViewer'
-import {errorPriorityLevels, getTableFatalExceptions} from '../../util/version'
+import {errorPriorityLevels, formatDelta, getTableFatalExceptions} from '../../util/version'
 import GtfsValidationViewer from '../validation/GtfsValidationViewer'
 import VersionButtonToolbar from './VersionButtonToolbar'
 
@@ -173,7 +173,6 @@ class VersionSectionSelector extends Component<SelectorProps> {
     if (comparedVersion && comparedVersionIndex) {
       const diff = validationSummary.errorCount - comparedVersion.validationSummary.errorCount
       const diffColor = diff > 0 ? 'label-danger' : (diff < 0 ? 'label-success' : 'label-default')
-      const diffText = diff === 0 ? '=' : ((diff > 0 ? '+' : '') + numeral(diff).format('0a'))
 
       diffLabel = (
         <span
@@ -181,7 +180,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
           style={{border: '0.5px solid #ccc'}}
           title={`Difference compared to Version ${comparedVersionIndex}`}
         >
-          {diffText}
+          {formatDelta(diff)}
         </span>
       )
     }
diff --git a/lib/manager/util/version.js b/lib/manager/util/version.js
index ea61a4c3b..be4219ecf 100644
--- a/lib/manager/util/version.js
+++ b/lib/manager/util/version.js
@@ -1,6 +1,7 @@
 // @flow
 
 import moment from 'moment'
+import numeral from 'numeral'
 
 import { isExtensionEnabled } from '../../common/util/config'
 
@@ -170,3 +171,15 @@ export function getVersionValidationSummaryByFilterStrategy (
 export const versionsLastUpdatedComparator = (a: FeedVersion, b: FeedVersion) => {
   return a.updated - b.updated
 }
+
+/**
+ * Formats a difference with a leading + sign, or as '=' if the difference is zero,
+ * and converts large numbers into nearest thousands unit (e.g. 25000 => 25k).
+ */
+export function formatDelta (
+  delta: number
+): string {
+  return delta === 0
+    ? '='
+    : ((delta > 0 ? '+' : '') + numeral(delta).format('0a'))
+}

From 08c881ccaf552b503dddbb05ada677e37e3a9272 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 17 Nov 2020 10:42:59 -0500
Subject: [PATCH 042/553] refactor(FeedVersionChart): Address PR comments

---
 .../version/FeedVersionSpanChart.js           | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 0086f2708..a66d8052b 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -14,42 +14,7 @@ type Props = {
 
 const dateFormat = 'MMM. DD, YYYY'
 
-/** Renders the validity span of one feed using the given props. */
-const FeedSpan = ({
-  endLabel,
-  relativeLength,
-  relativeOffset,
-  startLabel,
-  widthPixels,
-  ...props
-}) => {
-  // Date labels and validity span occupy a third of the width available.
-  const baseWidth = widthPixels / 3
-  return (
-    <div {...props} style={{ position: 'relative', width: `${widthPixels}px` }}>
-      <div
-        style={{
-          left: `${relativeOffset * baseWidth}px`,
-          position: 'absolute'
-        }}>
-        <span
-          style={{ display: 'inline-block', textAlign: 'right', width: `${baseWidth}px` }}>{startLabel}</span>
-        <span
-          className='label-default'
-          style={{
-            display: 'inline-block',
-            height: '1em',
-            margin: '0 5px',
-            width: `${relativeLength * baseWidth}px`
-          }}
-        />
-        <span>{endLabel}</span>
-      </div>
-    </div>
-  )
-}
-
-const noTopPadding = {padding: '0 5px'}
+const noTopPadding = { padding: '0 5px' }
 
 /**
  * This component visually displays the validity span of two feed versions
@@ -106,3 +71,34 @@ export default class FeedVersionSpanChart extends Component<Props> {
     )
   }
 }
+
+/** Renders the validity span of one feed using the given props. */
+const FeedSpan = ({
+  endLabel,
+  relativeLength,
+  relativeOffset,
+  startLabel,
+  widthPixels
+}) => {
+  // Date labels and validity span occupy a third of the width available.
+  const baseWidth = widthPixels / 3
+  return (
+    <div style={{position: 'relative', width: `${widthPixels}px`}}>
+      <div style={{left: `${relativeOffset * baseWidth}px`, position: 'absolute'}}>
+        <span style={{display: 'inline-block', textAlign: 'right', width: `${baseWidth}px`}}>
+          {startLabel}
+        </span>
+        <span
+          className='label-default'
+          style={{
+            display: 'inline-block',
+            height: '1em',
+            margin: '0 5px',
+            width: `${relativeLength * baseWidth}px`
+          }}
+        />
+        <span>{endLabel}</span>
+      </div>
+    </div>
+  )
+}

From 5fbbb2e918cdcaa58e793013574d7b7d5d0ae0d6 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 17 Nov 2020 10:52:21 -0500
Subject: [PATCH 043/553] refactor(FeedVersionNavigator): Rename var per PR
 comment.

---
 lib/manager/components/version/FeedVersionViewer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index e28a394fd..a57df3445 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -172,11 +172,11 @@ class VersionSectionSelector extends Component<SelectorProps> {
     let diffLabel
     if (comparedVersion && comparedVersionIndex) {
       const diff = validationSummary.errorCount - comparedVersion.validationSummary.errorCount
-      const diffColor = diff > 0 ? 'label-danger' : (diff < 0 ? 'label-success' : 'label-default')
+      const diffClassName = diff > 0 ? 'label-danger' : (diff < 0 ? 'label-success' : 'label-default')
 
       diffLabel = (
         <span
-          className={diffColor}
+          className={diffClassName}
           style={{border: '0.5px solid #ccc'}}
           title={`Difference compared to Version ${comparedVersionIndex}`}
         >

From 82846d9ddb5e926cafa49887455574b5f604b8ce Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 17 Nov 2020 11:19:01 -0500
Subject: [PATCH 044/553] refactor(FeedVersionViewer): Make tests pass.

---
 lib/manager/components/version/FeedVersionSpanChart.js | 1 +
 lib/manager/components/version/FeedVersionViewer.js    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index a66d8052b..4cf7a08ac 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -9,6 +9,7 @@ import type { FeedVersion } from '../../../types'
 type Props = {
   activeVersion: FeedVersion,
   comparedVersion: FeedVersion,
+  // Used for display only.
   comparedVersionIndex: number
 }
 
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index a57df3445..e3c87775c 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -4,7 +4,6 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import { Row, Col, Panel, Label as BsLabel, Glyphicon, ListGroup, ListGroupItem } from 'react-bootstrap'
 import { LinkContainer } from 'react-router-bootstrap'
-import numeral from 'numeral'
 
 import * as plusActions from '../../../gtfsplus/actions/gtfsplus'
 import * as versionsActions from '../../actions/versions'

From 671fbfd757e894d64dcba6a49d45601c67a73397 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 17 Nov 2020 15:08:25 -0500
Subject: [PATCH 045/553] refactor(FeedFetchFrequency): remove console log

---
 lib/manager/components/FeedFetchFrequency.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/manager/components/FeedFetchFrequency.js b/lib/manager/components/FeedFetchFrequency.js
index 9ced368b6..a09fd5ac6 100644
--- a/lib/manager/components/FeedFetchFrequency.js
+++ b/lib/manager/components/FeedFetchFrequency.js
@@ -1,5 +1,4 @@
 // @flow
-import Icon from '@conveyal/woonerf/components/icon'
 import React from 'react'
 import {
   DropdownButton
@@ -31,7 +30,6 @@ const FeedFetchFrequency = (props: Props) => {
   const intervals = FREQUENCY_INTERVALS[fetchFrequency]
   if (!fetchInterval) fetchInterval = intervals[0]
   const messages = getComponentMessages('FeedFetchFrequency')
-  console.log(Object.keys(FREQUENCY_INTERVALS), messages);
   return (
     <div>
       {messages('fetchFeedEvery')}

From d4a82d0db8ca002810c49d08e8b3ed4bc2c6cc0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Nov 2020 21:57:52 +0000
Subject: [PATCH 046/553] build(deps-dev): bump semantic-release from 15.13.3
 to 17.2.3

Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 15.13.3 to 17.2.3.
- [Release notes](https://github.com/semantic-release/semantic-release/releases)
- [Commits](https://github.com/semantic-release/semantic-release/compare/v15.13.3...v17.2.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |    2 +-
 yarn.lock    | 2436 ++++++++++++++++++++++++++++++++++----------------
 2 files changed, 1653 insertions(+), 785 deletions(-)

diff --git a/package.json b/package.json
index 3e09f1f4a..5ab1b4947 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "react-addons-test-utils": "^15.6.2",
     "redux-mock-store": "^1.5.3",
     "request": "^2.88.0",
-    "semantic-release": "^15.13.3",
+    "semantic-release": "^17.2.3",
     "simple-node-logger": "^0.93.37",
     "slack": "^11.0.1"
   },
diff --git a/yarn.lock b/yarn.lock
index b5586070d..0a150e118 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -829,6 +829,15 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
+"@iarna/cli@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@iarna/cli/-/cli-1.2.0.tgz#0f7af5e851afe895104583c4ca07377a8094d641"
+  integrity sha512-ukITQAqVs2n9HGmn3car/Ir7d3ta650iXhrG7pjr3EWdFmJuuOVWgYsu7ftsSe5VifEFFhjxVuX9+8F7L8hwcA==
+  dependencies:
+    signal-exit "^3.0.2"
+    update-notifier "^2.2.0"
+    yargs "^8.0.2"
+
 "@jest/console@^24.7.1":
   version "24.7.1"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
@@ -975,130 +984,203 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^12.0.9"
 
-"@mrmlnc/readdir-enhanced@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
-  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
   dependencies:
-    call-me-maybe "^1.0.1"
-    glob-to-regexp "^0.3.0"
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@^1.1.2":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
-  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
 
-"@octokit/endpoint@^4.0.0":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-4.1.1.tgz#847075b85157c7bd60d0f23c426b23bed8a232dd"
-  integrity sha512-lfphGC9hglBDiIOU84f1xDUzjWE5j3jGkO3Ng/IpDDVARw760A+/x408JOEpdV20ZUj2GRWdDBC0+HPu5qA5gQ==
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
   dependencies:
-    deepmerge "3.2.0"
-    is-plain-object "^2.0.4"
-    universal-user-agent "^2.0.1"
-    url-template "^2.0.8"
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
 
-"@octokit/request@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-3.0.0.tgz#304a279036b2dc89e7fba7cb30c9e6a9b1f4d2df"
-  integrity sha512-DZqmbm66tq+a9FtcKrn0sjrUpi0UaZ9QPUCxxyk/4CJ2rseTMpAWRf6gCwOSUCzZcx/4XVIsDk+kz5BVdaeenA==
+"@octokit/auth-token@^2.4.0":
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.3.tgz#b868b5f2366533a7e62933eaa1181a8924228cc4"
+  integrity sha512-fdGoOQ3kQJh+hrilc0Plg50xSfaCKOeYN9t6dpJKXN9BxhhfquL0OzoQXg3spLYymL5rm29uPeI3KEXRaZQ9zg==
   dependencies:
-    "@octokit/endpoint" "^4.0.0"
-    deprecation "^1.0.1"
-    is-plain-object "^2.0.4"
-    node-fetch "^2.3.0"
+    "@octokit/types" "^5.0.0"
+
+"@octokit/core@^3.0.0":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.2.1.tgz#9e04df3f4e7f825ac0559327490ce34299140af5"
+  integrity sha512-XfFSDDwv6tclUenS0EmB6iA7u+4aOHBT1Lz4PtQNQQg3hBbNaR/+Uv5URU+egeIuuGAiMRiDyY92G4GBOWOqDA==
+  dependencies:
+    "@octokit/auth-token" "^2.4.0"
+    "@octokit/graphql" "^4.3.1"
+    "@octokit/request" "^5.4.0"
+    "@octokit/types" "^5.0.0"
+    before-after-hook "^2.1.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/endpoint@^6.0.1":
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.9.tgz#c6a772e024202b1bd19ab69f90e0536a2598b13e"
+  integrity sha512-3VPLbcCuqji4IFTclNUtGdp9v7g+nspWdiCUbK3+iPMjJCZ6LEhn1ts626bWLOn0GiDb6j+uqGvPpqLnY7pBgw==
+  dependencies:
+    "@octokit/types" "^5.0.0"
+    is-plain-object "^5.0.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/graphql@^4.3.1":
+  version "4.5.7"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.7.tgz#f4562dcd9e80ea94602068e85aefac19a88f8578"
+  integrity sha512-Gk0AR+DcwIK/lK/GX+OQ99UqtenQhcbrhHHfOYlrCQe17ADnX3EKAOKRsAZ9qZvpi5MuwWm/Nm+9aO2kTDSdyA==
+  dependencies:
+    "@octokit/request" "^5.3.0"
+    "@octokit/types" "^5.0.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/plugin-paginate-rest@^2.2.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.6.0.tgz#03416396e7a227b268c5b827365238f620a9c5c1"
+  integrity sha512-o+O8c1PqsC5++BHXfMZabRRsBIVb34tXPWyQLyp2IXq5MmkxdipS7TXM4Y9ldL1PzY9CTrCsn/lzFFJGM3oRRA==
+  dependencies:
+    "@octokit/types" "^5.5.0"
+
+"@octokit/plugin-request-log@^1.0.0":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz#394d59ec734cd2f122431fbaf05099861ece3c44"
+  integrity sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==
+
+"@octokit/plugin-rest-endpoint-methods@4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.2.1.tgz#8224833a45c3394836dc6e86f1e6c49269a2c350"
+  integrity sha512-QyFr4Bv807Pt1DXZOC5a7L5aFdrwz71UHTYoHVajYV5hsqffWm8FUl9+O7nxRu5PDMtB/IKrhFqTmdBTK5cx+A==
+  dependencies:
+    "@octokit/types" "^5.5.0"
+    deprecation "^2.3.1"
+
+"@octokit/request-error@^2.0.0":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.3.tgz#b51b200052bf483f6fa56c9e7e3aa51ead36ecd8"
+  integrity sha512-GgD5z8Btm301i2zfvJLk/mkhvGCdjQ7wT8xF9ov5noQY8WbKZDH9cOBqXzoeKd1mLr1xH2FwbtGso135zGBgTA==
+  dependencies:
+    "@octokit/types" "^5.0.1"
+    deprecation "^2.0.0"
     once "^1.4.0"
-    universal-user-agent "^2.0.1"
-
-"@octokit/rest@^16.13.1":
-  version "16.25.0"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.25.0.tgz#1111dc2b2058bc77442fd7fbd295dab3991b62bf"
-  integrity sha512-QKIzP0gNYjyIGmY3Gpm3beof0WFwxFR+HhRZ+Wi0fYYhkEUvkJiXqKF56Pf5glzzfhEwOrggfluEld5F/ZxsKw==
-  dependencies:
-    "@octokit/request" "3.0.0"
-    atob-lite "^2.0.0"
-    before-after-hook "^1.4.0"
-    btoa-lite "^1.0.0"
-    deprecation "^1.0.1"
-    lodash.get "^4.4.2"
-    lodash.set "^4.3.2"
-    lodash.uniq "^4.5.0"
-    octokit-pagination-methods "^1.1.0"
+
+"@octokit/request@^5.3.0", "@octokit/request@^5.4.0":
+  version "5.4.10"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.10.tgz#402d2c53768bde12b99348329ba4129746aebb9c"
+  integrity sha512-egA49HkqEORVGDZGav1mh+VD+7uLgOxtn5oODj6guJk0HCy+YBSYapFkSLFgeYj3Fr18ZULKGURkjyhkAChylw==
+  dependencies:
+    "@octokit/endpoint" "^6.0.1"
+    "@octokit/request-error" "^2.0.0"
+    "@octokit/types" "^5.0.0"
+    deprecation "^2.0.0"
+    is-plain-object "^5.0.0"
+    node-fetch "^2.6.1"
     once "^1.4.0"
-    universal-user-agent "^2.0.0"
-    url-template "^2.0.8"
+    universal-user-agent "^6.0.0"
 
-"@semantic-release/commit-analyzer@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@semantic-release/commit-analyzer/-/commit-analyzer-6.1.0.tgz#32bbe3c23da86e23edf072fbb276fa2f383fcb17"
-  integrity sha512-2lb+t6muGenI86mYGpZYOgITx9L3oZYF697tJoqXeQEk0uw0fm+OkkOuDTBA3Oax9ftoNIrCKv9bwgYvxrbM6w==
+"@octokit/rest@^18.0.0":
+  version "18.0.9"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.9.tgz#964d707d914eb34b1787895fdcacff96de47844d"
+  integrity sha512-CC5+cIx974Ygx9lQNfUn7/oXDQ9kqGiKUC6j1A9bAVZZ7aoTF8K6yxu0pQhQrLBwSl92J6Z3iVDhGhGFgISCZg==
+  dependencies:
+    "@octokit/core" "^3.0.0"
+    "@octokit/plugin-paginate-rest" "^2.2.0"
+    "@octokit/plugin-request-log" "^1.0.0"
+    "@octokit/plugin-rest-endpoint-methods" "4.2.1"
+
+"@octokit/types@^5.0.0", "@octokit/types@^5.0.1", "@octokit/types@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b"
+  integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==
+  dependencies:
+    "@types/node" ">= 8"
+
+"@semantic-release/commit-analyzer@^8.0.0":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz#5d2a37cd5a3312da0e3ac05b1ca348bf60b90bca"
+  integrity sha512-5bJma/oB7B4MtwUkZC2Bf7O1MHfi4gWe4mA+MIQ3lsEV0b422Bvl1z5HRpplDnMLHH3EXMoRdEng6Ds5wUqA3A==
   dependencies:
     conventional-changelog-angular "^5.0.0"
     conventional-commits-filter "^2.0.0"
-    conventional-commits-parser "^3.0.0"
+    conventional-commits-parser "^3.0.7"
     debug "^4.0.0"
-    import-from "^2.1.0"
+    import-from "^3.0.0"
     lodash "^4.17.4"
+    micromatch "^4.0.2"
 
 "@semantic-release/error@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@semantic-release/error/-/error-2.2.0.tgz#ee9d5a09c9969eade1ec864776aeda5c5cddbbf0"
   integrity sha512-9Tj/qn+y2j+sjCI3Jd+qseGtHjOAeg7dU2/lVcqIQ9TV3QDaDXDYXcoOHU+7o2Hwh8L8ymL4gfuO7KxDs3q2zg==
 
-"@semantic-release/github@^5.1.0":
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/@semantic-release/github/-/github-5.2.10.tgz#bf325f11685d59b864c8946d7d30fcb749d89e37"
-  integrity sha512-z/UwIxKb+EMiJDIy/57MBzJ80ar5H9GJQRyML/ILQ8dlrPwXs7cTyTvC7AesrF7t1mJZtg3ht9Qf9RdtR/LGzw==
+"@semantic-release/github@^7.0.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@semantic-release/github/-/github-7.2.0.tgz#925f3efd91adabfc4bbe0de24b79fe1a8a38b4e2"
+  integrity sha512-tMRnWiiWb43whRHvbDGXq4DGEbKRi56glDpXDJZit4PIiwDPX7Kx3QzmwRtDOcG+8lcpGjpdPabYZ9NBxoI2mw==
   dependencies:
-    "@octokit/rest" "^16.13.1"
+    "@octokit/rest" "^18.0.0"
     "@semantic-release/error" "^2.2.0"
-    aggregate-error "^2.0.0"
-    bottleneck "^2.0.1"
+    aggregate-error "^3.0.0"
+    bottleneck "^2.18.1"
     debug "^4.0.0"
-    dir-glob "^2.0.0"
-    fs-extra "^7.0.0"
-    globby "^9.0.0"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-    issue-parser "^3.0.0"
+    dir-glob "^3.0.0"
+    fs-extra "^9.0.0"
+    globby "^11.0.0"
+    http-proxy-agent "^4.0.0"
+    https-proxy-agent "^5.0.0"
+    issue-parser "^6.0.0"
     lodash "^4.17.4"
-    mime "^2.0.3"
-    p-filter "^1.0.0"
-    p-retry "^3.0.0"
-    parse-github-url "^1.0.1"
+    mime "^2.4.3"
+    p-filter "^2.0.0"
+    p-retry "^4.0.0"
     url-join "^4.0.0"
 
-"@semantic-release/npm@^5.0.5":
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/@semantic-release/npm/-/npm-5.1.4.tgz#970b62765e6c5d51f94e1c14d3bc1f5a224e2ed0"
-  integrity sha512-YRl8VTVwnRTl/sVRvTXs1ncYcuvuGrqPEXYy+lUK1YRLq25hkrhIdv3Ju0u1zGLqVCA8qRlF3NzWl7pULJXVog==
+"@semantic-release/npm@^7.0.0":
+  version "7.0.8"
+  resolved "https://registry.yarnpkg.com/@semantic-release/npm/-/npm-7.0.8.tgz#228b6327d9e9e9d0adc7bf37b8be3d6fc9744e3e"
+  integrity sha512-8c1TLwKB/xT5E1FNs5l4GFtaNTznHesJk7tw3pGSlVxRqDXa1EZI+DfziZlO58Wk3PpS2ecu661kvBdz9aMgYQ==
   dependencies:
     "@semantic-release/error" "^2.2.0"
-    aggregate-error "^2.0.0"
-    execa "^1.0.0"
-    fs-extra "^7.0.0"
-    lodash "^4.17.4"
+    aggregate-error "^3.0.0"
+    execa "^4.0.0"
+    fs-extra "^9.0.0"
+    lodash "^4.17.15"
     nerf-dart "^1.0.0"
-    normalize-url "^4.0.0"
-    npm "6.5.0"
+    normalize-url "^5.0.0"
+    npm "^6.14.8"
     rc "^1.2.8"
-    read-pkg "^4.0.0"
-    registry-auth-token "^3.3.1"
+    read-pkg "^5.0.0"
+    registry-auth-token "^4.0.0"
+    semver "^7.1.2"
+    tempy "^1.0.0"
 
-"@semantic-release/release-notes-generator@^7.1.2":
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/@semantic-release/release-notes-generator/-/release-notes-generator-7.1.4.tgz#8f4f752c5a8385abdaac1256127cef05988bc2ad"
-  integrity sha512-pWPouZujddgb6t61t9iA9G3yIfp3TeQ7bPbV1ixYSeP6L7gI1+Du82fY/OHfEwyifpymLUQW0XnIKgKct5IMMw==
+"@semantic-release/release-notes-generator@^9.0.0":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@semantic-release/release-notes-generator/-/release-notes-generator-9.0.1.tgz#732d285d103064f2a64f08a32031551ebb4f918b"
+  integrity sha512-bOoTiH6SiiR0x2uywSNR7uZcRDl22IpZhj+Q5Bn0v+98MFtOMhCxFhbrKQjhbYoZw7vps1mvMRmFkp/g6R9cvQ==
   dependencies:
     conventional-changelog-angular "^5.0.0"
     conventional-changelog-writer "^4.0.0"
     conventional-commits-filter "^2.0.0"
     conventional-commits-parser "^3.0.0"
     debug "^4.0.0"
-    get-stream "^4.0.0"
-    import-from "^2.1.0"
-    into-stream "^4.0.0"
+    get-stream "^5.0.0"
+    import-from "^3.0.0"
+    into-stream "^5.0.0"
     lodash "^4.17.4"
+    read-pkg-up "^7.0.0"
+
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
 "@turf/along@^5.1.5":
   version "5.1.5"
@@ -1287,20 +1369,6 @@
   resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
   integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
 
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
-"@types/glob@^7.1.1":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
-  dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1326,21 +1394,41 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
   integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
 
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+"@types/minimist@^1.2.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
+  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
 
 "@types/node@*":
   version "11.13.8"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.8.tgz#e5d71173c95533be9842b2c798978f095f912aab"
   integrity sha512-szA3x/3miL90ZJxUCzx9haNbK5/zmPieGraZEe4WI+3srN0eGLiT22NXeMHmyhNEopn+IrxqMc7wdVwvPl8meg==
 
+"@types/node@>= 8":
+  version "14.14.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz#2127bd81949a95c8b7d3240f3254352d72563aec"
+  integrity sha512-z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA==
+
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
 "@types/q@^1.5.1":
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
+"@types/retry@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
+  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -1378,7 +1466,7 @@
     lodash.unescape "4.0.1"
     semver "5.5.0"
 
-JSONStream@^1.0.3, JSONStream@^1.0.4, JSONStream@^1.3.4:
+JSONStream@^1.0.3, JSONStream@^1.0.4, JSONStream@^1.3.4, JSONStream@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
   integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
@@ -1471,13 +1559,20 @@ add-dom-event-listener@^1.1.0:
   dependencies:
     object-assign "4.x"
 
-agent-base@4, agent-base@^4.1.0, agent-base@^4.3.0:
+agent-base@4, agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
   integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
 agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
@@ -1492,14 +1587,6 @@ agentkeepalive@^3.4.1:
   dependencies:
     humanize-ms "^1.2.1"
 
-aggregate-error@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-2.2.0.tgz#f54b464db18cc77c907ae084451f39134707134a"
-  integrity sha512-E5n+IZkhh22/pFdUvHUU/o9z752lc+7tgHt+FXS/g6BjlbE9249dGmuS/SxIWMPhTljZJkFN+7OXE0+O5+WT8w==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^3.0.0"
-
 aggregate-error@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.0.tgz#5b5a3c95e9095f311c9ab16c19fb4f3527cd3f79"
@@ -1556,11 +1643,18 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.1.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
+ansi-escapes@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  dependencies:
+    type-fest "^0.11.0"
+
 ansi-regex@^0.2.0, ansi-regex@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
@@ -1581,6 +1675,11 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.0.1.tgz#b033f57f93e2d28adeb8bc11138fa13da0fd20a3"
@@ -1603,6 +1702,13 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
 ansicolors@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
@@ -1621,12 +1727,12 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2, aproba@~1.2.0:
+aproba@^1.0.3, aproba@^1.1.1, aproba@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-"aproba@^1.1.2 || 2":
+"aproba@^1.1.2 || 2", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
@@ -1778,17 +1884,10 @@ array-reduce@~0.0.0:
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
   integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
 
-array-union@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array-uniq@^2.1.0:
   version "2.1.0"
@@ -1922,10 +2021,10 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-atob-lite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
-  integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
 atob@^2.1.1:
   version "2.1.2"
@@ -2181,10 +2280,10 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-before-after-hook@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-1.4.0.tgz#2b6bf23dca4f32e628fd2747c10a37c74a4b484d"
-  integrity sha512-l5r9ir56nda3qu14nAXIlyq1MmUSs0meCIaFAh8HwkFwP1F8eToOuS3ah2VAHHcY04jaYD7FpJC5JTXHYRbkzg==
+before-after-hook@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
+  integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
 
 bin-links@^1.1.2:
   version "1.1.2"
@@ -2197,6 +2296,18 @@ bin-links@^1.1.2:
     graceful-fs "^4.1.11"
     write-file-atomic "^2.3.0"
 
+bin-links@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.8.tgz#bd39aadab5dc4bdac222a07df5baf1af745b2228"
+  integrity sha512-KgmVfx+QqggqP9dA3iIc5pA4T1qEEEL+hOhOhNPaUm77OTrJoOXE/C05SJLNJe6m/2wUK7F1tDSou7n5TfCDzQ==
+  dependencies:
+    bluebird "^3.5.3"
+    cmd-shim "^3.0.0"
+    gentle-fs "^2.3.0"
+    graceful-fs "^4.1.15"
+    npm-normalize-package-bin "^1.0.0"
+    write-file-atomic "^2.3.0"
+
 binary-extensions@^1.0.0:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
@@ -2216,18 +2327,16 @@ bl@^3.0.0:
   dependencies:
     readable-stream "^3.0.1"
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
-  dependencies:
-    inherits "~2.0.0"
-
 bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
   integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
 
+bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
 blueimp-md5@2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.3.1.tgz#992a6737733b9da1edd641550dc3acab2e9cfc5a"
@@ -2298,10 +2407,10 @@ bootstrap@^3.4.1:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
   integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
 
-bottleneck@^2.0.1:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/bottleneck/-/bottleneck-2.18.0.tgz#41fa63ae185b65435d789d1700334bc48222dacf"
-  integrity sha512-U1xiBRaokw4yEguzikOl0VrnZp6uekjpmfrh6rKtr1D+/jFjYCL6J83ZXlGtlBDwVdTmJJ+4Lg5FpB3xmLSiyA==
+bottleneck@^2.18.1:
+  version "2.19.5"
+  resolved "https://registry.yarnpkg.com/bottleneck/-/bottleneck-2.19.5.tgz#5df0b90f59fd47656ebe63c78a98419205cadd91"
+  integrity sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==
 
 boxen@^1.2.1:
   version "1.3.0"
@@ -2340,6 +2449,13 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -2517,11 +2633,6 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
-btoa-lite@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
-  integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc=
-
 budo@^11.6.1:
   version "11.6.3"
   resolved "https://registry.yarnpkg.com/budo/-/budo-11.6.3.tgz#146408e1f646b2b30528bef88fb491e3fd34fdf3"
@@ -2612,11 +2723,6 @@ bugsnag-react@^1.1.1:
   resolved "https://registry.yarnpkg.com/bugsnag-react/-/bugsnag-react-1.1.1.tgz#da210c9102acfa427a3cdd00efa8cca785b87ea8"
   integrity sha512-u+aodYDZwlmPMj0kCC+nZiO0Rhw4LaJ8ve1cYzEb5gcToPjuIkOfFIQO4T7QhR96V2Uy6UdVw7e04OEPR4/0wg==
 
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
@@ -2632,10 +2738,10 @@ byline@^5.0.0:
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
   integrity sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE=
 
-byte-size@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.4.tgz#29d381709f41aae0d89c631f1c81aec88cd40b23"
-  integrity sha512-82RPeneC6nqCdSwCX2hZUz3JPOvN5at/nTEw/CMf05Smu3Hrpo9Psb7LjN+k+XndNArG1EY8L4+BM3aTM4BCvw==
+byte-size@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-5.0.1.tgz#4b651039a5ecd96767e71a3d7ed380e48bed4191"
+  integrity sha512-/XuKeqWocKsYa/cBY1YbSJSWWqTi4cFgr9S6OyM7PBaPbr9zvNGwWP33vt0uqGhwDdN+y3yhbXVILEUpnwEWGw==
 
 bytes@1.0.0:
   version "1.0.0"
@@ -2652,41 +2758,23 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
-  dependencies:
-    bluebird "^3.5.1"
-    chownr "^1.0.1"
-    glob "^7.1.2"
-    graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^5.2.4"
-    unique-filename "^1.1.0"
-    y18n "^4.0.0"
-
-cacache@^11.0.1, cacache@^11.0.2, cacache@^11.2.0:
-  version "11.3.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
-  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
+cacache@^12.0.0, cacache@^12.0.2, cacache@^12.0.3:
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
+  integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
   dependencies:
-    bluebird "^3.5.3"
+    bluebird "^3.5.5"
     chownr "^1.1.1"
     figgy-pudding "^3.5.1"
-    glob "^7.1.3"
+    glob "^7.1.4"
     graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
     lru-cache "^5.1.1"
     mississippi "^3.0.0"
     mkdirp "^0.5.1"
     move-concurrently "^1.0.1"
     promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
+    rimraf "^2.6.3"
     ssri "^6.0.1"
     unique-filename "^1.1.1"
     y18n "^4.0.0"
@@ -2716,15 +2804,10 @@ cachedir@2.1.0:
   resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.1.0.tgz#b448c32b44cd9c0cd6ce4c419fa5b3c112c02191"
   integrity sha512-xGBpPqoBvn3unBW7oxgb8aJn42K0m9m1/wyjmazah10Fq7bROGG3kRAE6OIyr3U3PIJUqGuebhCEdMk9OKJG0A==
 
-call-limit@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.0.tgz#6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"
-  integrity sha1-b9YbA/PaQqLNDsK2DwK9DnGZH+o=
-
-call-me-maybe@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
-  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+call-limit@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.1.tgz#ef15f2670db3f1992557e2d965abc459e6e358d4"
+  integrity sha512-5twvci5b9eRBw2wCfPtN0GmlR2/gadZqyFpPhOK6CvMFoFgA+USnZ6Jpu1lhG9h85pQ3Ouil3PfXWRD4EUaRiQ==
 
 caller-callsite@^2.0.0:
   version "2.0.0"
@@ -2768,6 +2851,15 @@ camelcase-keys@^6.0.0:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
+camelcase-keys@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
+  dependencies:
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.1"
+
 camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
@@ -2866,6 +2958,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -2912,22 +3012,17 @@ chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
-
 chownr@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
   integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
 
-chownr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
-  integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
+chownr@^1.1.2, chownr@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
+  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
-ci-info@^1.5.0, ci-info@^1.6.0:
+ci-info@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
   integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
@@ -3004,7 +3099,7 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-table3@^0.5.0:
+cli-table3@^0.5.0, cli-table3@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
   integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
@@ -3053,12 +3148,21 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
+cliui@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
+  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^6.2.0"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-cmd-shim@^2.0.2, cmd-shim@~2.0.2:
+cmd-shim@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
   integrity sha1-b8vamUg6j9FdfTChlspp1oii79s=
@@ -3066,6 +3170,14 @@ cmd-shim@^2.0.2, cmd-shim@~2.0.2:
     graceful-fs "^4.1.2"
     mkdirp "~0.5.0"
 
+cmd-shim@^3.0.0, cmd-shim@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-3.0.3.tgz#2c35238d3df37d98ecdd7d5f6b8dc6b21cadc7cb"
+  integrity sha512-DtGg+0xiFhQIntSBRzL2fRQBnmtAVwXIDo4Qq46HPpObYquxMaZS4sb82U9nH91qJrlosC1wa9gwr0QyL/HypA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    mkdirp "~0.5.0"
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -3100,12 +3212,19 @@ color-convert@^1.9.0, color-convert@^1.9.1:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -3257,7 +3376,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0:
+concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -3384,6 +3503,19 @@ conventional-commits-parser@^3.0.0:
     through2 "^2.0.0"
     trim-off-newlines "^1.0.0"
 
+conventional-commits-parser@^3.0.7:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz#9e261b139ca4b7b29bcebbc54460da36894004ca"
+  integrity sha512-XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ==
+  dependencies:
+    JSONStream "^1.0.4"
+    is-text-path "^1.0.1"
+    lodash "^4.17.15"
+    meow "^8.0.0"
+    split2 "^2.0.0"
+    through2 "^4.0.0"
+    trim-off-newlines "^1.0.0"
+
 convert-source-map@^1.1.0, convert-source-map@^1.4.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
@@ -3482,15 +3614,16 @@ cosmiconfig@^5.0.0:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
-cosmiconfig@^5.0.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
-  integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
+cosmiconfig@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
+  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
   dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.0"
-    parse-json "^4.0.0"
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.7.2"
 
 crc32-stream@^3.0.1:
   version "3.0.1"
@@ -3590,6 +3723,15 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.0:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 crypt@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
@@ -3622,6 +3764,11 @@ crypto-random-string@^1.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
   integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
 
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
+
 css-animation@^1.3.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/css-animation/-/css-animation-1.5.0.tgz#c96b9097a5ef74a7be8480b45cc44e4ec6ca2bf5"
@@ -3898,6 +4045,13 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
+  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.0.1, debug@^3.1.0, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
@@ -3905,13 +4059,6 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
 debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
@@ -3919,12 +4066,12 @@ debug@~2.2.0:
   dependencies:
     ms "0.7.1"
 
-debuglog@^1.0.1:
+debuglog@*, debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
 
-decamelize-keys@^1.0.0:
+decamelize-keys@^1.0.0, decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
   integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
@@ -3974,11 +4121,6 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-deepmerge@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.2.0.tgz#58ef463a57c08d376547f8869fdc5bcee957f44e"
-  integrity sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==
-
 default-gateway@^2.6.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
@@ -4028,6 +4170,20 @@ defined@^1.0.0:
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
   integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
 
+del@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"
+  integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==
+  dependencies:
+    globby "^11.0.1"
+    graceful-fs "^4.2.4"
+    is-glob "^4.0.1"
+    is-path-cwd "^2.2.0"
+    is-path-inside "^3.0.2"
+    p-map "^4.0.0"
+    rimraf "^3.0.2"
+    slash "^3.0.0"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -4048,10 +4204,10 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
-deprecation@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-1.0.1.tgz#2df79b79005752180816b7b6e079cbd80490d711"
-  integrity sha512-ccVHpE72+tcIKaGMql33x5MAjKQIZrk+3x2GbJ7TeraUCZWHoT+KSZpoC+JQFsUBlSTXUrBaGiF0j6zVTepPLg==
+deprecation@^2.0.0, deprecation@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
+  integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
 deps-sort@^2.0.0:
   version "2.0.0"
@@ -4127,12 +4283,12 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-dir-glob@^2.0.0, dir-glob@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
-  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+dir-glob@^3.0.0, dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
-    path-type "^3.0.0"
+    path-type "^4.0.0"
 
 discontinuous-range@1.0.0:
   version "1.0.0"
@@ -4355,6 +4511,11 @@ emoji-regex@^7.0.1, emoji-regex@^7.0.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -4379,13 +4540,18 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-env-ci@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-3.2.0.tgz#982f02a0501ca8c43bf0765c5bd3d83ffb28b23a"
-  integrity sha512-TFjNiDlXrL8/pfHswdvJGEZzJcq3aBPb8Eka83hlGLwuNw9F9BC9S9ETlkfkItLRT9k5JgpGgeP+rL6/3cEbcw==
+env-ci@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/env-ci/-/env-ci-5.0.2.tgz#48b6687f8af8cdf5e31b8fcf2987553d085249d9"
+  integrity sha512-Xc41mKvjouTXD3Oy9AqySz1IeyvJvHZ20Twf5ZLYbNpPPIuCnL/qHCmNlD01LoNy0JTunw9HPYVptD19Ac7Mbw==
   dependencies:
-    execa "^1.0.0"
-    java-properties "^0.2.9"
+    execa "^4.0.0"
+    java-properties "^1.0.0"
+
+env-paths@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
+  integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
 
 envify@^4.1.0:
   version "4.1.0"
@@ -4981,6 +5147,21 @@ execa@^2.0.4:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+execa@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 exenv@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.0.tgz#3835f127abf075bfe082d0aed4484057c78e3c89"
@@ -5151,17 +5332,17 @@ fast-deep-equal@^2.0.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
-fast-glob@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz#a5d5b697ec8deda468d85a74035290a025a95295"
-  integrity sha512-0BvMaZc1k9F+MeWWMe8pL6YltFzZYcJsYU7D4JyDA6PAczaXvxqQQ/z+mDF7/4Mw01DeUc+i3CTKajnkANkV4w==
+fast-glob@^3.1.1:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
   dependencies:
-    "@mrmlnc/readdir-enhanced" "^2.2.1"
-    "@nodelib/fs.stat" "^1.1.2"
-    glob-parent "^3.1.0"
-    is-glob "^4.0.0"
-    merge2 "^1.2.3"
-    micromatch "^3.1.10"
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
@@ -5173,6 +5354,13 @@ fast-levenshtein@~2.0.4:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fastq@^1.6.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947"
+  integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==
+  dependencies:
+    reusify "^1.0.4"
+
 fb-watchman@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
@@ -5200,7 +5388,7 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
-figgy-pudding@^3.0.0, figgy-pudding@^3.1.0, figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
   integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
@@ -5212,6 +5400,13 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -5234,6 +5429,13 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 finalhandler@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
@@ -5441,7 +5643,7 @@ from2@^1.3.0:
     inherits "~2.0.1"
     readable-stream "~1.1.10"
 
-from2@^2.0.3, from2@^2.1.0, from2@^2.1.1:
+from2@^2.0.3, from2@^2.1.0, from2@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
   integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
@@ -5481,6 +5683,16 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
+  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^1.0.0"
+
 fs-minipass@^1.2.5:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
@@ -5520,16 +5732,6 @@ fsevents@^1.2.7:
     nan "^2.12.1"
     node-pre-gyp "^0.12.0"
 
-fstream@^1.0.0, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  integrity sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
 function-bind@^1.0.2, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -5584,7 +5786,7 @@ genfun@^5.0.0:
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
   integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
-gentle-fs@^2.0.0, gentle-fs@^2.0.1:
+gentle-fs@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.0.1.tgz#585cfd612bfc5cd52471fdb42537f016a5ce3687"
   integrity sha512-cEng5+3fuARewXktTEGbwsktcldA+YsnUEaXZwcK/3pjSE1X9ObnTs+/8rYf8s+RnIcQm2D5x3rwpN7Zom8Bew==
@@ -5598,6 +5800,23 @@ gentle-fs@^2.0.0, gentle-fs@^2.0.1:
     read-cmd-shim "^1.0.1"
     slide "^1.1.6"
 
+gentle-fs@^2.3.0, gentle-fs@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.1.tgz#11201bf66c18f930ddca72cf69460bdfa05727b1"
+  integrity sha512-OlwBBwqCFPcjm33rF2BjW+Pr6/ll2741l+xooiwTCeaX2CA1ZuclavyMBe0/KlR21/XGsgY6hzEQZ15BdNa13Q==
+  dependencies:
+    aproba "^1.1.2"
+    chownr "^1.1.2"
+    cmd-shim "^3.0.3"
+    fs-vacuum "^1.2.10"
+    graceful-fs "^4.1.11"
+    iferr "^0.1.5"
+    infer-owner "^1.0.4"
+    mkdirp "^0.5.1"
+    path-is-inside "^1.0.2"
+    read-cmd-shim "^1.0.1"
+    slide "^1.1.6"
+
 geojson-area@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/geojson-area/-/geojson-area-0.2.1.tgz#2537b0982db86309f21d2c428a4257c7a6282cc6"
@@ -5651,7 +5870,7 @@ get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
-get-stream@^4.0.0:
+get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -5725,10 +5944,12 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-to-regexp@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
-  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+glob-parent@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
+  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+  dependencies:
+    is-glob "^4.0.1"
 
 glob@7.0.5:
   version "7.0.5"
@@ -5742,7 +5963,7 @@ glob@7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.3, glob@^7.0.3:
+glob@7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -5777,6 +5998,18 @@ glob@^7.0.0, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@~4.3.0:
   version "4.3.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-4.3.5.tgz#80fbb08ca540f238acce5d11d1e9bc41e75173d3"
@@ -5819,19 +6052,17 @@ globals@^11.1.0, globals@^11.7.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globby@^9.0.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
-  integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==
+globby@^11.0.0, globby@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
+  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
   dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^1.0.2"
-    dir-glob "^2.2.2"
-    fast-glob "^2.2.6"
-    glob "^7.1.3"
-    ignore "^4.0.3"
-    pify "^4.0.1"
-    slash "^2.0.0"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
 
 got@^6.7.1:
   version "6.7.1"
@@ -5860,6 +6091,11 @@ graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
   integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
 
+graceful-fs@^4.2.2, graceful-fs@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
+
 gravatar@^1.5.2:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/gravatar/-/gravatar-1.8.0.tgz#1dd9ce0f6bb625802377233b96796181b39af8ff"
@@ -5899,6 +6135,11 @@ har-validator@~5.1.0:
     ajv "^6.5.5"
     har-schema "^2.0.0"
 
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
 has-ansi@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
@@ -5918,16 +6159,16 @@ has-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
   integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
-  integrity sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
@@ -6052,17 +6293,24 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-hook-std@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/hook-std/-/hook-std-1.2.0.tgz#b37d533ea5f40068fe368cb4d022ee1992588c27"
-  integrity sha512-yntre2dbOAjgQ5yoRykyON0D9T96BfshR8IuiL/r3celeHD8I/76w4qo8m3z99houR4Z678jakV3uXrQdSvW/w==
+hook-std@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hook-std/-/hook-std-2.0.0.tgz#ff9aafdebb6a989a354f729bb6445cf4a3a7077c"
+  integrity sha512-zZ6T5WcuBMIUVh49iPQS9t977t7C0l7OtHrpeMb5uk48JdflRX0NSFvCekfYNmGQETnLq9W/isMyHl69kxGi8g==
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
+hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1, hosted-git-info@^2.8.8:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
-hsl-regex@^1.0.0:
+hosted-git-info@^3.0.0, hosted-git-info@^3.0.6:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c"
+  integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+hsl-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
   integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=
@@ -6142,6 +6390,15 @@ http-proxy-agent@^2.1.0:
     agent-base "4"
     debug "3.1.0"
 
+http-proxy-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -6156,7 +6413,7 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@^2.2.0, https-proxy-agent@^2.2.1:
+https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
   integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
@@ -6172,6 +6429,19 @@ https-proxy-agent@^3.0.0:
     agent-base "^4.3.0"
     debug "^3.1.0"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
 humanize-duration@^3.18.0:
   version "3.18.0"
   resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.18.0.tgz#ba07a945d6d4358b9751fecabe27864bf965afbc"
@@ -6242,7 +6512,7 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^4.0.3, ignore@^4.0.6:
+ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
@@ -6252,6 +6522,11 @@ ignore@^5.0.2, ignore@^5.1.2:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz#e28e584d43ad7e92f96995019cc43b9e1ac49558"
   integrity sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==
 
+ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -6278,12 +6553,20 @@ import-fresh@^3.0.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-from@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
-  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
+import-fresh@^3.1.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
+  integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
   dependencies:
-    resolve-from "^3.0.0"
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+import-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
+  integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
+  dependencies:
+    resolve-from "^5.0.0"
 
 import-lazy@^2.1.0:
   version "2.1.0"
@@ -6298,7 +6581,7 @@ import-local@^2.0.0:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
-imurmurhash@^0.1.4:
+imurmurhash@*, imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -6323,6 +6606,11 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/individual/-/individual-3.0.0.tgz#e7ca4f85f8957b018734f285750dc22ec2f9862d"
   integrity sha1-58pPhfiVewGHNPKFdQ3CLsL5hi0=
 
+infer-owner@^1.0.3, infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
 inflight@^1.0.4, inflight@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -6331,7 +6619,7 @@ inflight@^1.0.4, inflight@~1.0.6:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6460,13 +6748,13 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
-into-stream@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-4.0.0.tgz#ef10ee2ffb6f78af34c93194bbdc36c35f7d8a9d"
-  integrity sha512-i29KNyE5r0Y/UQzcQ0IbZO1MYJ53Jn0EcFRZPj5FzWKYH17kDFEOwuA+3jroymOI06SW1dEDnly9A1CAreC5dg==
+into-stream@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-5.1.1.tgz#f9a20a348a11f3c13face22763f2d02e127f4db8"
+  integrity sha512-krrAJ7McQxGGmvaYbB7Q1mcA+cRwg9Ij2RfWIeVesNBgVDZmzY/Fa4IpZUT3bmdRzMzdf/mzltCG2Dq99IZGBA==
   dependencies:
-    from2 "^2.1.1"
-    p-is-promise "^2.0.0"
+    from2 "^2.3.0"
+    p-is-promise "^3.0.0"
 
 invariant@^2.0.0, invariant@^2.1.0, invariant@^2.2.1, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
@@ -6490,7 +6778,7 @@ ip-regex@^2.1.0:
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
   integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
-ip@^1.1.4, ip@^1.1.5:
+ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
@@ -6556,13 +6844,6 @@ is-buffer@~2.0.3:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
   integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
 
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
-  dependencies:
-    builtin-modules "^1.0.0"
-
 is-callable@^1.1.3, is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
@@ -6582,10 +6863,10 @@ is-ci@^2.0.0:
   dependencies:
     ci-info "^2.0.0"
 
-is-cidr@^2.0.6:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-2.0.7.tgz#0fd4b863c26b2eb2d157ed21060c4f3f8dd356ce"
-  integrity sha512-YfOm5liUO1RoYfFh+lhiGNYtbLzem7IXzFqvfjXh+zLCEuAiznTBlQ2QcMWxsgYeOFmjzljOxJfmZID4/cRBAQ==
+is-cidr@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/is-cidr/-/is-cidr-3.1.1.tgz#e92ef121bdec2782271a77ce487a8b8df3718ab7"
+  integrity sha512-Gx+oErgq1j2jAKCR2Kbq0b3wbH0vQKqZ0wOlHxm0o56nq51Cs/DZA8oz9dMDhbHyHEGgJ86eTeVudtgMMOx3Mw==
   dependencies:
     cidr-regex "^2.0.10"
 
@@ -6601,6 +6882,13 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+is-core-module@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
+  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -6679,6 +6967,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-generator-fn@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
@@ -6691,7 +6984,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
+is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -6723,11 +7016,21 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
+is-path-cwd@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
@@ -6735,6 +7038,11 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
+is-path-inside@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017"
+  integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==
+
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -6747,6 +7055,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-promise@^2.1, is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -6808,7 +7121,7 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.0"
 
-is-text-path@^1.0.0:
+is-text-path@^1.0.0, is-text-path@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
   integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
@@ -6893,10 +7206,10 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-issue-parser@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/issue-parser/-/issue-parser-3.0.1.tgz#ee8dd677fdb5be64541f81fa5e7267baa271a7ee"
-  integrity sha512-5wdT3EE8Kq38x/hJD8QZCJ9scGoOZ5QnzwXyClkviSWTS+xOCE6hJ0qco3H5n5jCsFqpbofZCcMWqlXJzF72VQ==
+issue-parser@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/issue-parser/-/issue-parser-6.0.0.tgz#b1edd06315d4f2044a9755daf85fdafde9b4014a"
+  integrity sha512-zKa/Dxq2lGsBIXQ7CUZWTHfvxPC2ej0KfO7fIPqLlHB9J2hJ7rGhZ5rilhuufylr4RXYPzJUeFjKxz305OsNlA==
   dependencies:
     lodash.capitalize "^4.2.1"
     lodash.escaperegexp "^4.1.2"
@@ -6979,10 +7292,10 @@ istanbul@0.4.x:
     which "^1.1.1"
     wordwrap "^1.0.0"
 
-java-properties@^0.2.9:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-0.2.10.tgz#2551560c25fa1ad94d998218178f233ad9b18f60"
-  integrity sha512-CpKJh9VRNhS+XqZtg1UMejETGEiqwCGDC/uwPEEQwc2nfdbSm73SIE29TplG2gLYuBOOTNDqxzG6A9NtEPLt0w==
+java-properties@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211"
+  integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==
 
 jest-changed-files@^24.8.0:
   version "24.8.0"
@@ -7451,6 +7764,11 @@ json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-bet
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -7492,6 +7810,15 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -7612,6 +7939,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
+kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
 kleur@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
@@ -7693,38 +8025,130 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-libcipm@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/libcipm/-/libcipm-2.0.2.tgz#4f38c2b37acf2ec156936cef1cbf74636568fc7b"
-  integrity sha512-9uZ6/LAflVEijksTRq/RX0e+pGA4mr8tND9Cmk2JMg7j2fFUBrs8PpFX2DOAJR/XoxPzz+5h8bkWmtIYLunKAg==
+libcipm@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/libcipm/-/libcipm-4.0.8.tgz#dcea4919e10dfbce420327e63901613b9141bc89"
+  integrity sha512-IN3hh2yDJQtZZ5paSV4fbvJg4aHxCCg5tcZID/dSVlTuUiWktsgaldVljJv6Z5OUlYspx6xQkbR0efNodnIrOA==
   dependencies:
     bin-links "^1.1.2"
     bluebird "^3.5.1"
+    figgy-pudding "^3.5.1"
     find-npm-prefix "^1.0.2"
     graceful-fs "^4.1.11"
-    lock-verify "^2.0.2"
+    ini "^1.3.5"
+    lock-verify "^2.1.0"
     mkdirp "^0.5.1"
-    npm-lifecycle "^2.0.3"
+    npm-lifecycle "^3.0.0"
     npm-logical-tree "^1.2.1"
     npm-package-arg "^6.1.0"
-    pacote "^8.1.6"
-    protoduck "^5.0.0"
+    pacote "^9.1.0"
     read-package-json "^2.0.13"
     rimraf "^2.6.2"
     worker-farm "^1.6.0"
 
-libnpmhook@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-4.0.1.tgz#63641654de772cbeb96a88527a7fd5456ec3c2d7"
-  integrity sha512-3qqpfqvBD1712WA6iGe0stkG40WwAeoWcujA6BlC0Be1JArQbqwabnEnZ0CRcD05Tf1fPYJYdCbSfcfedEJCOg==
+libnpm@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/libnpm/-/libnpm-3.0.1.tgz#0be11b4c9dd4d1ffd7d95c786e92e55d65be77a2"
+  integrity sha512-d7jU5ZcMiTfBqTUJVZ3xid44fE5ERBm9vBnmhp2ECD2Ls+FNXWxHSkO7gtvrnbLO78gwPdNPz1HpsF3W4rjkBQ==
   dependencies:
-    figgy-pudding "^3.1.0"
-    npm-registry-fetch "^3.0.0"
+    bin-links "^1.1.2"
+    bluebird "^3.5.3"
+    find-npm-prefix "^1.0.2"
+    libnpmaccess "^3.0.2"
+    libnpmconfig "^1.2.1"
+    libnpmhook "^5.0.3"
+    libnpmorg "^1.0.1"
+    libnpmpublish "^1.1.2"
+    libnpmsearch "^2.0.2"
+    libnpmteam "^1.0.2"
+    lock-verify "^2.0.2"
+    npm-lifecycle "^3.0.0"
+    npm-logical-tree "^1.2.1"
+    npm-package-arg "^6.1.0"
+    npm-profile "^4.0.2"
+    npm-registry-fetch "^4.0.0"
+    npmlog "^4.1.2"
+    pacote "^9.5.3"
+    read-package-json "^2.0.13"
+    stringify-package "^1.0.0"
 
-libnpx@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.0.tgz#1bf4a1c9f36081f64935eb014041da10855e3102"
-  integrity sha512-X28coei8/XRCt15cYStbLBph+KGhFra4VQhRBPuH/HHMkC5dxM8v24RVgUsvODKCrUZ0eTgiTqJp6zbl0sskQQ==
+libnpmaccess@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-3.0.2.tgz#8b2d72345ba3bef90d3b4f694edd5c0417f58923"
+  integrity sha512-01512AK7MqByrI2mfC7h5j8N9V4I7MHJuk9buo8Gv+5QgThpOgpjB7sQBDDkeZqRteFb1QM/6YNdHfG7cDvfAQ==
+  dependencies:
+    aproba "^2.0.0"
+    get-stream "^4.0.0"
+    npm-package-arg "^6.1.0"
+    npm-registry-fetch "^4.0.0"
+
+libnpmconfig@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz#c0c2f793a74e67d4825e5039e7a02a0044dfcbc0"
+  integrity sha512-9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    find-up "^3.0.0"
+    ini "^1.3.5"
+
+libnpmhook@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/libnpmhook/-/libnpmhook-5.0.3.tgz#4020c0f5edbf08ebe395325caa5ea01885b928f7"
+  integrity sha512-UdNLMuefVZra/wbnBXECZPefHMGsVDTq5zaM/LgKNE9Keyl5YXQTnGAzEo+nFOpdRqTWI9LYi4ApqF9uVCCtuA==
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.4.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^4.0.0"
+
+libnpmorg@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/libnpmorg/-/libnpmorg-1.0.1.tgz#5d2503f6ceb57f33dbdcc718e6698fea6d5ad087"
+  integrity sha512-0sRUXLh+PLBgZmARvthhYXQAWn0fOsa6T5l3JSe2n9vKG/lCVK4nuG7pDsa7uMq+uTt2epdPK+a2g6btcY11Ww==
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.4.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^4.0.0"
+
+libnpmpublish@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-1.1.3.tgz#e3782796722d79eef1a0a22944c117e0c4ca4280"
+  integrity sha512-/3LsYqVc52cHXBmu26+J8Ed7sLs/hgGVFMH1mwYpL7Qaynb9RenpKqIKu0sJ130FB9PMkpMlWjlbtU8A4m7CQw==
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    lodash.clonedeep "^4.5.0"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-registry-fetch "^4.0.0"
+    semver "^5.5.1"
+    ssri "^6.0.1"
+
+libnpmsearch@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmsearch/-/libnpmsearch-2.0.2.tgz#9a4f059102d38e3dd44085bdbfe5095f2a5044cf"
+  integrity sha512-VTBbV55Q6fRzTdzziYCr64+f8AopQ1YZ+BdPOv16UegIEaE8C0Kch01wo4s3kRTFV64P121WZJwgmBwrq68zYg==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^4.0.0"
+
+libnpmteam@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/libnpmteam/-/libnpmteam-1.0.2.tgz#8b48bcbb6ce70dd8150c950fcbdbf3feb6eec820"
+  integrity sha512-p420vM28Us04NAcg1rzgGW63LMM6rwe+6rtZpfDxCcXxM0zUTLl7nPFEnRF3JfFBF5skF/yuZDUthTsHgde8QA==
+  dependencies:
+    aproba "^2.0.0"
+    figgy-pudding "^3.4.1"
+    get-stream "^4.0.0"
+    npm-registry-fetch "^4.0.0"
+
+libnpx@^10.2.4:
+  version "10.2.4"
+  resolved "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.4.tgz#ef0e3258e29aef2ec7ee3276115e20e67f67d4ee"
+  integrity sha512-BPc0D1cOjBeS8VIBKUu5F80s6njm0wbVt7CsGMrIcJ+SI7pi7V0uVPGpEMH9H5L8csOcclTxAXFE2VAsJXUhfA==
   dependencies:
     dotenv "^5.0.1"
     npm-package-arg "^6.0.0"
@@ -7733,7 +8157,7 @@ libnpx@^10.2.0:
     update-notifier "^2.3.0"
     which "^1.3.0"
     y18n "^4.0.0"
-    yargs "^11.0.0"
+    yargs "^14.2.3"
 
 lie@^3.0.1:
   version "3.3.0"
@@ -7749,6 +8173,11 @@ lie@~3.1.0:
   dependencies:
     immediate "~3.0.5"
 
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -7811,6 +8240,15 @@ lock-verify@^2.0.2:
     npm-package-arg "^6.1.0"
     semver "^5.4.1"
 
+lock-verify@^2.1.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.1.tgz#81107948c51ed16f97b96ff8b60675affb243fc1"
+  integrity sha512-n0Zw2DVupKfZMazy/HIFVNohJ1z8fIoZ77WBnyyBGG6ixw83uJNyrbiJvvHWe1QKkGiBCjj8RCPlymltliqEww==
+  dependencies:
+    "@iarna/cli" "^1.2.0"
+    npm-package-arg "^6.1.0"
+    semver "^5.4.1"
+
 lockfile@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609"
@@ -7823,6 +8261,11 @@ lodash-es@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.14.tgz#12a95a963cc5955683cee3b74e85458954f37ecc"
   integrity sha512-7zchRrGa8UZXjD/4ivUWP1867jDkhzTG2c/uj739utSd7O/pFFdxspCemIFKEEjErbcqRzn8nKnGsi7mvTgRPA==
 
+lodash._baseindexof@*:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
+  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
+
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -7831,12 +8274,29 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
+lodash._bindcallback@*:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
+
+lodash._cacheindexof@*:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
+  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
+
+lodash._createcache@*:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
+  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
+  dependencies:
+    lodash._getnative "^3.0.0"
+
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
 
-lodash._getnative@^3.0.0:
+lodash._getnative@*, lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
   integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
@@ -7861,7 +8321,7 @@ lodash.capitalize@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz#f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9"
   integrity sha1-+CbJtOKoUR2E46yinbBeGk87cqk=
 
-lodash.clonedeep@~4.5.0:
+lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -7896,11 +8356,6 @@ lodash.flattendeep@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
   integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
 
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -7960,10 +8415,10 @@ lodash.once@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
-lodash.set@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
-  integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
+lodash.restparam@*:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
 
 lodash.sortby@^4.7.0:
   version "4.7.0"
@@ -8020,10 +8475,10 @@ lodash@4.17.14:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba"
   integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
 
-lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
 lodash@~3.2.0:
   version "3.2.0"
@@ -8085,7 +8540,7 @@ lru-cache@^2.7.0:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
   integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=
 
-lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+lru-cache@^4.0.1:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -8100,6 +8555,13 @@ lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 lru-queue@0.1:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
@@ -8107,11 +8569,6 @@ lru-queue@0.1:
   dependencies:
     es5-ext "~0.10.2"
 
-macos-release@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.2.0.tgz#ab58d55dd4714f0a05ad4b0e90f4370fef5cdea8"
-  integrity sha512-iV2IDxZaX8dIcM7fG6cI46uNmHUxHE4yN+Z8tKHAW1TBPMZDIKHf/3L+YnOuj/FK9il14UaVdHmiQ1tsi90ltA==
-
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -8127,40 +8584,23 @@ make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-"make-fetch-happen@^2.5.0 || 3 || 4", make-fetch-happen@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz#141497cb878f243ba93136c83d8aba12c216c083"
-  integrity sha512-7R5ivfy9ilRJ1EMKIOziwrns9fGeAD4bAha8EB7BIiBBLHm2KeTUGCrICFt2rbHfzheTLynv50GnNTK1zDTrcQ==
+make-fetch-happen@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz#aa8387104f2687edca01c8687ee45013d02d19bd"
+  integrity sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==
   dependencies:
     agentkeepalive "^3.4.1"
-    cacache "^11.0.1"
+    cacache "^12.0.0"
     http-cache-semantics "^3.8.1"
     http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-    lru-cache "^4.1.2"
+    https-proxy-agent "^2.2.3"
+    lru-cache "^5.1.1"
     mississippi "^3.0.0"
     node-fetch-npm "^2.0.2"
     promise-retry "^1.1.1"
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
-make-fetch-happen@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-3.0.0.tgz#7b661d2372fc4710ab5cc8e1fa3c290eea69a961"
-  integrity sha512-FmWY7gC0mL6Z4N86vE14+m719JKE4H0A+pyiOH18B025gF/C113pyfb4gHDDYP5cqnRMHOz06JGdmffC/SES+w==
-  dependencies:
-    agentkeepalive "^3.4.1"
-    cacache "^10.0.4"
-    http-cache-semantics "^3.8.1"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.0"
-    lru-cache "^4.1.2"
-    mississippi "^3.0.0"
-    node-fetch-npm "^2.0.2"
-    promise-retry "^1.1.1"
-    socks-proxy-agent "^3.0.1"
-    ssri "^5.2.4"
-
 make-plural@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz#f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735"
@@ -8216,22 +8656,22 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-marked-terminal@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-3.2.0.tgz#3fc91d54569332bcf096292af178d82219000474"
-  integrity sha512-Yr1yVS0BbDG55vx7be1D0mdv+jGs9AW563o/Tt/7FTsId2J0yqhrTeXAqq/Q0DyyXltIn6CSxzesQuFqXgafjQ==
+marked-terminal@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/marked-terminal/-/marked-terminal-4.1.0.tgz#01087372d3636dc7cb286475a1d6147187f500e0"
+  integrity sha512-5KllfAOW02WS6hLRQ7cNvGOxvKW1BKuXELH4EtbWfyWgxQhROoMxEvuQ/3fTgkNjledR0J48F4HbapvYp1zWkQ==
   dependencies:
-    ansi-escapes "^3.1.0"
+    ansi-escapes "^4.3.1"
     cardinal "^2.1.1"
-    chalk "^2.4.1"
+    chalk "^4.0.0"
     cli-table "^0.3.1"
-    node-emoji "^1.4.1"
-    supports-hyperlinks "^1.0.1"
+    node-emoji "^1.10.0"
+    supports-hyperlinks "^2.1.0"
 
-marked@^0.6.0:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.6.2.tgz#c574be8b545a8b48641456ca1dbe0e37b6dccc1a"
-  integrity sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==
+marked@^1.0.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.4.tgz#94e99230b03496c9383b1322ac51bc17dd388a1d"
+  integrity sha512-6x5TFGCTKSQBLTZtOburGxCxFEBJEGYVLwCMTBCxzvyuisGcC20UNzDSJhCr/cJ/Kmh6ulfJm10g6WWEAJ3kvg==
 
 mastarm@^5.3.1:
   version "5.3.1"
@@ -8349,10 +8789,10 @@ mdn-data@~1.1.0:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
   integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
 
-meant@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.1.tgz#66044fea2f23230ec806fb515efea29c44d2115d"
-  integrity sha512-UakVLFjKkbbUwNWJ2frVLnnAtbb7D7DsloxRd3s/gDpI8rdv8W5Hp3NaDb+POBI1fQdeussER6NB8vpcRURvlg==
+meant@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/meant/-/meant-1.0.3.tgz#67769af9de1d158773e928ae82c456114903554c"
+  integrity sha512-88ZRGcNxAq4EH38cQ4D85PM57pikCwS8Z99EWHODxN7KBY+UuPiqzRTtZzS8KTXO/ywSWbdjjJST2Hly/EQxLw==
 
 media-typer@0.3.0:
   version "0.3.0"
@@ -8404,6 +8844,23 @@ meow@^4.0.0:
     redent "^2.0.0"
     trim-newlines "^2.0.0"
 
+meow@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-8.0.0.tgz#1aa10ee61046719e334ffdc038bb5069250ec99a"
+  integrity sha512-nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg==
+  dependencies:
+    "@types/minimist" "^1.2.0"
+    camelcase-keys "^6.2.2"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^3.0.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -8421,10 +8878,10 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
-  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 merge@^1.2.1:
   version "1.2.1"
@@ -8479,6 +8936,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 middleware-proxy@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/middleware-proxy/-/middleware-proxy-2.0.5.tgz#4038f309a1ee95afd3d017bc701950df82fd1660"
@@ -8538,6 +9003,11 @@ mime@^2.4.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
   integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
 
+mime@^2.4.3:
+  version "2.4.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
+  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -8548,6 +9018,11 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+min-indent@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -8579,6 +9054,15 @@ minimatch@^2.0.1:
   dependencies:
     brace-expansion "^1.0.0"
 
+minimist-options@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
+
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
@@ -8602,12 +9086,17 @@ minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.3, minipass@^2.3.4, minipass@^2.3.5:
+minipass@^2.2.1, minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
   integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -8615,29 +9104,21 @@ minipass@^2.2.1, minipass@^2.3.3, minipass@^2.3.4, minipass@^2.3.5:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.1, minizlib@^1.2.1:
+minipass@^2.8.6:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
   integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^2.0.1"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -8662,13 +9143,20 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
+mkdirp@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
+  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  dependencies:
+    minimist "^1.2.5"
+
 modify-values@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
@@ -8740,7 +9228,7 @@ ms@2.1.1, ms@^2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@^2.1.1:
+ms@2.1.2, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -8842,7 +9330,7 @@ nock@^9.0.14:
     qs "^6.5.1"
     semver "^5.5.0"
 
-node-emoji@^1.10.0, node-emoji@^1.4.1:
+node-emoji@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da"
   integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==
@@ -8866,28 +9354,27 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-fetch@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.4.0.tgz#125ae2b0c2a75cb3b2ed141bf73e106cfe1f0ca8"
-  integrity sha512-1mt8bw5JQWWTcwUM1FGjFJLFo5lB/jz6zbm+qwdEh2iqYobKS4aHWgz1d+mvho5cqCaShFDF+hnpgraIi/5tqA==
+node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
-node-gyp@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
-  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
+node-gyp@^5.0.2, node-gyp@^5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
+  integrity sha512-WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw==
   dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "^2.87.0"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.2"
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.1.2"
+    request "^2.88.0"
+    rimraf "^2.6.3"
+    semver "^5.7.1"
+    tar "^4.4.12"
+    which "^1.3.1"
 
 node-int64@^0.4.0:
   version "0.4.0"
@@ -8938,14 +9425,14 @@ node-releases@^1.1.25:
   dependencies:
     semver "^5.3.0"
 
-"nopt@2 || 3", nopt@3.x:
+nopt@3.x:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
   dependencies:
     abbrev "1"
 
-nopt@^4.0.1, nopt@~4.0.1:
+nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
   integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
@@ -8953,7 +9440,15 @@ nopt@^4.0.1, nopt@~4.0.1:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, "normalize-package-data@~1.0.1 || ^2.0.0":
+nopt@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
+  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -8963,14 +9458,14 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-package-data@~2.4.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.2.tgz#6b2abd85774e51f7936f1395e45acb905dc849b2"
-  integrity sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==
+normalize-package-data@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a"
+  integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==
   dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
+    hosted-git-info "^3.0.6"
+    resolve "^1.17.0"
+    semver "^7.3.2"
     validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
@@ -8995,15 +9490,15 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-normalize-url@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.3.0.tgz#9c49e10fc1876aeb76dba88bf1b2b5d9fa57b2ee"
-  integrity sha512-0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==
+normalize-url@^5.0.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-5.3.0.tgz#8959b3cdaa295b61592c1f245dded34b117618dd"
+  integrity sha512-9/nOVLYYe/dO/eJeQUNaGUF4m4Z5E7cb9oNTKabH+bNf19mqj60txTcveQxL0GlcWLXCxkOu2/LwL8oW0idIDA==
 
-npm-audit-report@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.2.tgz#303bc78cd9e4c226415076a4f7e528c89fc77018"
-  integrity sha512-abeqS5ONyXNaZJPGAf6TOUMNdSe1Y6cpc9MLBRn+CuUoYbfdca6AxOyXVlfIv9OgKX+cacblbG5w7A6ccwoTPw==
+npm-audit-report@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.3.tgz#8226deeb253b55176ed147592a3995442f2179ed"
+  integrity sha512-8nH/JjsFfAWMvn474HB9mpmMjrnKb1Hx/oTAdjv4PT9iZBvBxiZ+wtDUapHCJwLqYGQVPaAfs+vL5+5k9QndXw==
   dependencies:
     cli-table3 "^0.5.0"
     console-control-strings "^1.1.0"
@@ -9018,21 +9513,21 @@ npm-cache-filename@~1.0.2:
   resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
   integrity sha1-3tMGxbC/yHCp6fr4I7xfKD4FrhE=
 
-npm-install-checks@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.0.tgz#d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"
-  integrity sha1-1K7N/VGlPjcjt7L5Oy7ijjB7wNc=
+npm-install-checks@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.2.tgz#ab2e32ad27baa46720706908e5b14c1852de44d9"
+  integrity sha512-E4kzkyZDIWoin6uT5howP8VDvkM+E8IQDcHAycaAxMbwkqhIg5eEYALnXOl3Hq9MrkdQB/2/g1xwBINXdKSRkg==
   dependencies:
     semver "^2.3.0 || 3.x || 4 || 5"
 
-npm-lifecycle@^2.0.3, npm-lifecycle@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz#1eda2eedb82db929e3a0c50341ab0aad140ed569"
-  integrity sha512-QbBfLlGBKsktwBZLj6AviHC6Q9Y3R/AY4a2PYSIRhSKSS0/CxRyD/PfxEX6tPeOCXQgMSNdwGeECacstgptc+g==
+npm-lifecycle@^3.0.0, npm-lifecycle@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz#9882d3642b8c82c815782a12e6a1bfeed0026309"
+  integrity sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g==
   dependencies:
     byline "^5.0.0"
-    graceful-fs "^4.1.11"
-    node-gyp "^3.8.0"
+    graceful-fs "^4.1.15"
+    node-gyp "^5.0.2"
     resolve-from "^4.0.0"
     slide "^1.1.6"
     uid-number "0.0.6"
@@ -9044,7 +9539,12 @@ npm-logical-tree@^1.2.1:
   resolved "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz#44610141ca24664cad35d1e607176193fd8f5b88"
   integrity sha512-AJI/qxDB2PWI4LG1CYN579AY1vCiNyWfkiquCsJWqntRu/WwimVrC8yXeILBFHDwxfOejxewlmnvW9XXjMlYIg==
 
-"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0", "npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
   integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
@@ -9054,7 +9554,17 @@ npm-logical-tree@^1.2.1:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.10, npm-packlist@^1.1.12:
+npm-package-arg@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
+  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
+  dependencies:
+    hosted-git-info "^2.7.1"
+    osenv "^0.1.5"
+    semver "^5.6.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.12:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
   integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
@@ -9070,6 +9580,15 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
+npm-packlist@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
 npm-path@^2.0.2, npm-path@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
@@ -9077,65 +9596,36 @@ npm-path@^2.0.2, npm-path@^2.0.4:
   dependencies:
     which "^1.2.10"
 
-npm-pick-manifest@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
-  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
+npm-pick-manifest@^3.0.0, npm-pick-manifest@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz#f4d9e5fd4be2153e5f4e5f9b7be8dc419a99abb7"
+  integrity sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==
   dependencies:
     figgy-pudding "^3.5.1"
     npm-package-arg "^6.0.0"
     semver "^5.4.1"
 
-npm-profile@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-3.0.2.tgz#58d568f1b56ef769602fd0aed8c43fa0e0de0f57"
-  integrity sha512-rEJOFR6PbwOvvhGa2YTNOJQKNuc6RovJ6T50xPU7pS9h/zKPNCJ+VHZY2OFXyZvEi+UQYtHRTp8O/YM3tUD20A==
+npm-profile@^4.0.2, npm-profile@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/npm-profile/-/npm-profile-4.0.4.tgz#28ee94390e936df6d084263ee2061336a6a1581b"
+  integrity sha512-Ta8xq8TLMpqssF0H60BXS1A90iMoM6GeKwsmravJ6wYjWwSzcYBTdyWa3DZCYqPutacBMEm7cxiOkiIeCUAHDQ==
   dependencies:
     aproba "^1.1.2 || 2"
-    make-fetch-happen "^2.5.0 || 3 || 4"
-
-npm-registry-client@^8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
-  integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==
-  dependencies:
-    concat-stream "^1.5.2"
-    graceful-fs "^4.1.6"
-    normalize-package-data "~1.0.1 || ^2.0.0"
-    npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
-    once "^1.3.3"
-    request "^2.74.0"
-    retry "^0.10.0"
-    safe-buffer "^5.1.1"
-    semver "2 >=2.2.1 || 3.x || 4 || 5"
-    slide "^1.1.3"
-    ssri "^5.2.4"
-  optionalDependencies:
-    npmlog "2 || ^3.1.0 || ^4.0.0"
-
-npm-registry-fetch@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-1.1.1.tgz#710bc5947d9ee2c549375072dab6d5d17baf2eb2"
-  integrity sha512-ev+zxOXsgAqRsR8Rk+ErjgWOlbrXcqGdme94/VNdjDo1q8TSy10Pp8xgDv/ZmMk2jG/KvGtXUNG4GS3+l6xbDw==
-  dependencies:
-    bluebird "^3.5.1"
-    figgy-pudding "^3.0.0"
-    lru-cache "^4.1.2"
-    make-fetch-happen "^3.0.0"
-    npm-package-arg "^6.0.0"
-    safe-buffer "^5.1.1"
+    figgy-pudding "^3.4.1"
+    npm-registry-fetch "^4.0.0"
 
-npm-registry-fetch@^3.0.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.9.0.tgz#44d841780e2833f06accb34488f8c7450d1a6856"
-  integrity sha512-srwmt8YhNajAoSAaDWndmZgx89lJwIZ1GWxOuckH4Coek4uHv5S+o/l9FLQe/awA+JwTnj4FJHldxhlXdZEBmw==
+npm-registry-fetch@^4.0.0, npm-registry-fetch@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz#57951bf6541e0246b34c9f9a38ab73607c9449d7"
+  integrity sha512-cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ==
   dependencies:
     JSONStream "^1.3.4"
     bluebird "^3.5.1"
     figgy-pudding "^3.4.1"
-    lru-cache "^4.1.3"
-    make-fetch-happen "^4.0.1"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
     npm-package-arg "^6.1.0"
+    safe-buffer "^5.2.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -9151,6 +9641,13 @@ npm-run-path@^3.0.0:
   dependencies:
     path-key "^3.0.0"
 
+npm-run-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
 npm-run@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/npm-run/-/npm-run-5.0.1.tgz#1baea93389b50ae25a32382c8ca322398e50cd16"
@@ -9175,29 +9672,30 @@ npm-which@^3.0.1:
     npm-path "^2.0.2"
     which "^1.2.10"
 
-npm@6.5.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/npm/-/npm-6.5.0.tgz#30ed48d4cd4d17d68ee04a5fcf9fa2ca9167d819"
-  integrity sha512-SPq8zG2Kto+Xrq55E97O14Jla13PmQT5kSnvwBj88BmJZ5Nvw++OmlWfhjkB67pcgP5UEXljEtnGFKZtOgt6MQ==
+npm@^6.14.8:
+  version "6.14.8"
+  resolved "https://registry.yarnpkg.com/npm/-/npm-6.14.8.tgz#64ef754345639bc035982ec3f609353c8539033c"
+  integrity sha512-HBZVBMYs5blsj94GTeQZel7s9odVuuSUHy1+AlZh7rPVux1os2ashvEGLy/STNK7vUjbrCg5Kq9/GXisJgdf6A==
   dependencies:
-    JSONStream "^1.3.4"
+    JSONStream "^1.3.5"
     abbrev "~1.1.1"
     ansicolors "~0.3.2"
     ansistyles "~0.1.3"
-    aproba "~1.2.0"
+    aproba "^2.0.0"
     archy "~1.0.0"
-    bin-links "^1.1.2"
-    bluebird "^3.5.3"
-    byte-size "^4.0.3"
-    cacache "^11.2.0"
-    call-limit "~1.1.0"
-    chownr "~1.0.1"
-    ci-info "^1.6.0"
+    bin-links "^1.1.8"
+    bluebird "^3.5.5"
+    byte-size "^5.0.1"
+    cacache "^12.0.3"
+    call-limit "^1.1.1"
+    chownr "^1.1.4"
+    ci-info "^2.0.0"
     cli-columns "^3.1.2"
-    cli-table3 "^0.5.0"
-    cmd-shim "~2.0.2"
+    cli-table3 "^0.5.1"
+    cmd-shim "^3.0.3"
     columnify "~1.5.4"
     config-chain "^1.1.12"
+    debuglog "*"
     detect-indent "~5.0.0"
     detect-newline "^2.1.0"
     dezalgo "~1.0.3"
@@ -9206,91 +9704,104 @@ npm@6.5.0:
     find-npm-prefix "^1.0.2"
     fs-vacuum "~1.2.10"
     fs-write-stream-atomic "~1.0.10"
-    gentle-fs "^2.0.1"
-    glob "^7.1.3"
-    graceful-fs "^4.1.15"
+    gentle-fs "^2.3.1"
+    glob "^7.1.6"
+    graceful-fs "^4.2.4"
     has-unicode "~2.0.1"
-    hosted-git-info "^2.7.1"
+    hosted-git-info "^2.8.8"
     iferr "^1.0.2"
+    imurmurhash "*"
+    infer-owner "^1.0.4"
     inflight "~1.0.6"
-    inherits "~2.0.3"
+    inherits "^2.0.4"
     ini "^1.3.5"
     init-package-json "^1.10.3"
-    is-cidr "^2.0.6"
+    is-cidr "^3.0.0"
     json-parse-better-errors "^1.0.2"
     lazy-property "~1.0.0"
-    libcipm "^2.0.2"
-    libnpmhook "^4.0.1"
-    libnpx "^10.2.0"
-    lock-verify "^2.0.2"
+    libcipm "^4.0.8"
+    libnpm "^3.0.1"
+    libnpmaccess "^3.0.2"
+    libnpmhook "^5.0.3"
+    libnpmorg "^1.0.1"
+    libnpmsearch "^2.0.2"
+    libnpmteam "^1.0.2"
+    libnpx "^10.2.4"
+    lock-verify "^2.1.0"
     lockfile "^1.0.4"
+    lodash._baseindexof "*"
     lodash._baseuniq "~4.6.0"
+    lodash._bindcallback "*"
+    lodash._cacheindexof "*"
+    lodash._createcache "*"
+    lodash._getnative "*"
     lodash.clonedeep "~4.5.0"
+    lodash.restparam "*"
     lodash.union "~4.6.0"
     lodash.uniq "~4.5.0"
     lodash.without "~4.4.0"
-    lru-cache "^4.1.3"
-    meant "~1.0.1"
+    lru-cache "^5.1.1"
+    meant "^1.0.2"
     mississippi "^3.0.0"
-    mkdirp "~0.5.1"
+    mkdirp "^0.5.5"
     move-concurrently "^1.0.1"
-    node-gyp "^3.8.0"
-    nopt "~4.0.1"
-    normalize-package-data "~2.4.0"
-    npm-audit-report "^1.3.1"
+    node-gyp "^5.1.0"
+    nopt "^4.0.3"
+    normalize-package-data "^2.5.0"
+    npm-audit-report "^1.3.3"
     npm-cache-filename "~1.0.2"
-    npm-install-checks "~3.0.0"
-    npm-lifecycle "^2.1.0"
-    npm-package-arg "^6.1.0"
-    npm-packlist "^1.1.12"
-    npm-pick-manifest "^2.1.0"
-    npm-profile "^3.0.2"
-    npm-registry-client "^8.6.0"
-    npm-registry-fetch "^1.1.0"
+    npm-install-checks "^3.0.2"
+    npm-lifecycle "^3.1.5"
+    npm-package-arg "^6.1.1"
+    npm-packlist "^1.4.8"
+    npm-pick-manifest "^3.0.2"
+    npm-profile "^4.0.4"
+    npm-registry-fetch "^4.0.7"
     npm-user-validate "~1.0.0"
     npmlog "~4.1.2"
     once "~1.4.0"
     opener "^1.5.1"
     osenv "^0.1.5"
-    pacote "^8.1.6"
+    pacote "^9.5.12"
     path-is-inside "~1.0.2"
     promise-inflight "~1.0.1"
     qrcode-terminal "^0.12.0"
-    query-string "^6.1.0"
+    query-string "^6.8.2"
     qw "~1.0.1"
     read "~1.0.7"
-    read-cmd-shim "~1.0.1"
+    read-cmd-shim "^1.0.5"
     read-installed "~4.0.3"
-    read-package-json "^2.0.13"
-    read-package-tree "^5.2.1"
-    readable-stream "^2.3.6"
+    read-package-json "^2.1.1"
+    read-package-tree "^5.3.1"
+    readable-stream "^3.6.0"
+    readdir-scoped-modules "^1.1.0"
     request "^2.88.0"
     retry "^0.12.0"
-    rimraf "~2.6.2"
+    rimraf "^2.7.1"
     safe-buffer "^5.1.2"
-    semver "^5.5.1"
-    sha "~2.0.1"
+    semver "^5.7.1"
+    sha "^3.0.0"
     slide "~1.1.6"
     sorted-object "~2.0.1"
     sorted-union-stream "~2.1.3"
     ssri "^6.0.1"
-    stringify-package "^1.0.0"
-    tar "^4.4.8"
+    stringify-package "^1.0.1"
+    tar "^4.4.13"
     text-table "~0.2.0"
     tiny-relative-date "^1.3.0"
     uid-number "0.0.6"
     umask "~1.1.0"
-    unique-filename "~1.1.0"
+    unique-filename "^1.1.1"
     unpipe "~1.0.0"
     update-notifier "^2.5.0"
-    uuid "^3.3.2"
+    uuid "^3.3.3"
     validate-npm-package-license "^3.0.4"
     validate-npm-package-name "~3.0.0"
     which "^1.3.1"
-    worker-farm "^1.6.0"
-    write-file-atomic "^2.3.0"
+    worker-farm "^1.7.0"
+    write-file-atomic "^2.4.3"
 
-"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.2, npmlog@~4.1.2:
+npmlog@^4.0.2, npmlog@^4.1.2, npmlog@~4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -9438,11 +9949,6 @@ object.values@^1.0.4, object.values@^1.1.0:
     function-bind "^1.1.1"
     has "^1.0.3"
 
-octokit-pagination-methods@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
-  integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
-
 on-finished@^2.3.0, on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -9462,7 +9968,7 @@ on-headers@^1.0.1:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0, once@~1.4.0:
+once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0, once@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -9557,20 +10063,12 @@ os-locale@^3.0.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
-os-name@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
-  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
-  dependencies:
-    macos-release "^2.2.0"
-    windows-release "^3.1.0"
-
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.4, osenv@^0.1.5:
+osenv@^0.1.4, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -9597,12 +10095,17 @@ p-each-series@^1.0.0:
   dependencies:
     p-reduce "^1.0.0"
 
-p-filter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-filter/-/p-filter-1.0.0.tgz#629d317150209c8fd508ba137713ef4bb920e9db"
-  integrity sha1-Yp0xcVAgnI/VCLoTdxPvS7kg6ds=
+p-each-series@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48"
+  integrity sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==
+
+p-filter@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-filter/-/p-filter-2.1.0.tgz#1b1472562ae7a0f742f0f3d3d3718ea66ff9c09c"
+  integrity sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==
   dependencies:
-    p-map "^1.0.0"
+    p-map "^2.0.0"
 
 p-finally@^1.0.0:
   version "1.0.0"
@@ -9619,6 +10122,11 @@ p-is-promise@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
   integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
 
+p-is-promise@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971"
+  integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==
+
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -9654,21 +10162,34 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
-p-map@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+p-map@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+  integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
+
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
 
 p-reduce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
   integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
 
-p-retry@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
-  integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
+p-reduce@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-2.1.0.tgz#09408da49507c6c274faa31f28df334bc712b64a"
+  integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==
+
+p-retry@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.2.0.tgz#ea9066c6b44f23cab4cd42f6147cdbbc6604da5d"
+  integrity sha512-jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA==
   dependencies:
+    "@types/retry" "^0.12.0"
     retry "^0.12.0"
 
 p-try@^1.0.0:
@@ -9691,36 +10212,41 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-pacote@^8.1.6:
-  version "8.1.6"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-8.1.6.tgz#8e647564d38156367e7a9dc47a79ca1ab278d46e"
-  integrity sha512-wTOOfpaAQNEQNtPEx92x9Y9kRWVu45v583XT8x2oEV2xRB74+xdqMZIeGW4uFvAyZdmSBtye+wKdyyLaT8pcmw==
+pacote@^9.1.0, pacote@^9.5.12, pacote@^9.5.3:
+  version "9.5.12"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.5.12.tgz#1e11dd7a8d736bcc36b375a9804d41bb0377bf66"
+  integrity sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==
   dependencies:
-    bluebird "^3.5.1"
-    cacache "^11.0.2"
-    get-stream "^3.0.0"
-    glob "^7.1.2"
-    lru-cache "^4.1.3"
-    make-fetch-happen "^4.0.1"
+    bluebird "^3.5.3"
+    cacache "^12.0.2"
+    chownr "^1.1.2"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    infer-owner "^1.0.4"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^5.0.0"
     minimatch "^3.0.4"
-    minipass "^2.3.3"
+    minipass "^2.3.5"
     mississippi "^3.0.0"
     mkdirp "^0.5.1"
     normalize-package-data "^2.4.0"
+    npm-normalize-package-bin "^1.0.0"
     npm-package-arg "^6.1.0"
-    npm-packlist "^1.1.10"
-    npm-pick-manifest "^2.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^3.0.0"
+    npm-registry-fetch "^4.0.0"
     osenv "^0.1.5"
     promise-inflight "^1.0.1"
     promise-retry "^1.1.1"
-    protoduck "^5.0.0"
+    protoduck "^5.0.1"
     rimraf "^2.6.2"
     safe-buffer "^5.1.2"
-    semver "^5.5.0"
-    ssri "^6.0.0"
-    tar "^4.4.3"
-    unique-filename "^1.1.0"
-    which "^1.3.0"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.10"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
 
 pad-left@^2.0.0:
   version "2.1.0"
@@ -9781,11 +10307,6 @@ parse-asn1@^5.0.0:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-github-url@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-github-url/-/parse-github-url-1.0.2.tgz#242d3b65cbcdda14bb50439e3242acf6971db395"
-  integrity sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==
-
 parse-json@2.2.0, parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@@ -9801,6 +10322,16 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-json@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
+  integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
 parse-ms@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
@@ -9893,6 +10424,11 @@ path-key@^3.0.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
   integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
 
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -9931,6 +10467,11 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
 pathval@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
@@ -9967,6 +10508,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -10828,7 +11374,7 @@ protochain@^1.0.5:
   resolved "https://registry.yarnpkg.com/protochain/-/protochain-1.0.5.tgz#991c407e99de264aadf8f81504b5e7faf7bfa260"
   integrity sha1-mRxAfpneJkqt+PgVBLXn+ve/omA=
 
-protoduck@^5.0.0:
+protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
   integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
@@ -10875,7 +11421,7 @@ public-encrypt@^4.0.0:
     randombytes "^2.0.1"
     safe-buffer "^5.1.2"
 
-pump@^2.0.0, pump@^2.0.1:
+pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
@@ -10962,10 +11508,10 @@ query-string@^4.2.2, query-string@^4.2.3:
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
-query-string@^6.1.0:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.4.2.tgz#8be1dbd105306aebf86022144f575a29d516b713"
-  integrity sha512-DfJqAen17LfLA3rQ+H5S4uXphrF+ANU1lT2ijds4V/Tj4gZxA3gx5/tg1bz7kYCmwna7LyJNCYqO7jNRzo3aLw==
+query-string@^6.8.2:
+  version "6.13.7"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.7.tgz#af53802ff6ed56f3345f92d40a056f93681026ee"
+  integrity sha512-CsGs8ZYb39zu0WLkeOhe0NMePqgYdAuCqxOYKDR5LVCytDZYMGx3Bb+xypvQvPHVPijRXB0HZNFllCzHRe4gEA==
   dependencies:
     decode-uri-component "^0.2.0"
     split-on-first "^1.0.0"
@@ -11480,13 +12026,20 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
-read-cmd-shim@^1.0.1, read-cmd-shim@~1.0.1:
+read-cmd-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
   integrity sha1-LV0Vd4ajfAVdIgd8MsU/gynpHHs=
   dependencies:
     graceful-fs "^4.1.2"
 
+read-cmd-shim@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
+  integrity sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==
+  dependencies:
+    graceful-fs "^4.1.2"
+
 read-installed@~4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
@@ -11520,16 +12073,24 @@ read-only-stream@^2.0.0:
   optionalDependencies:
     graceful-fs "^4.1.2"
 
-read-package-tree@^5.2.1:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.2.2.tgz#4b6a0ef2d943c1ea36a578214c9a7f6b7424f7a8"
-  integrity sha512-rW3XWUUkhdKmN2JKB4FL563YAgtINifso5KShykufR03nJ5loGFlkUMe1g/yxmqX073SoYYTsgXu7XdDinKZuA==
+read-package-json@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
+  integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
+  dependencies:
+    glob "^7.1.1"
+    json-parse-even-better-errors "^2.3.0"
+    normalize-package-data "^2.0.0"
+    npm-normalize-package-bin "^1.0.0"
+
+read-package-tree@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
+  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
   dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    once "^1.3.0"
     read-package-json "^2.0.0"
     readdir-scoped-modules "^1.0.0"
+    util-promisify "^2.1.0"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
@@ -11563,6 +12124,15 @@ read-pkg-up@^4.0.0:
     find-up "^3.0.0"
     read-pkg "^3.0.0"
 
+read-pkg-up@^7.0.0, read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
+  dependencies:
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
+
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -11590,14 +12160,15 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-read-pkg@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
-  integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+read-pkg@^5.0.0, read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
   dependencies:
-    normalize-package-data "^2.3.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
 
 read@1, read@^1.0.4, read@~1.0.1, read@~1.0.7:
   version "1.0.7"
@@ -11628,6 +12199,15 @@ read@1, read@^1.0.4, read@~1.0.1, read@~1.0.7:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readable-stream@3, readable-stream@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.2, readable-stream@~1.0.24, readable-stream@~1.0.26, readable-stream@~1.0.33:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -11679,6 +12259,16 @@ readdir-scoped-modules@^1.0.0:
     graceful-fs "^4.1.2"
     once "^1.3.0"
 
+readdir-scoped-modules@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
+  integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
 readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -11710,6 +12300,14 @@ redent@^2.0.0:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
 
+redent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
+  dependencies:
+    indent-string "^4.0.0"
+    strip-indent "^3.0.0"
+
 redeyed@~2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b"
@@ -11877,7 +12475,7 @@ regexpu-core@^4.5.4:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.1.0"
 
-registry-auth-token@^3.0.1, registry-auth-token@^3.3.1:
+registry-auth-token@^3.0.1:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz#d7446815433f5d5ed6431cd5dca21048f66b397e"
   integrity sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==
@@ -11885,6 +12483,13 @@ registry-auth-token@^3.0.1, registry-auth-token@^3.3.1:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
 
+registry-auth-token@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
+  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
+  dependencies:
+    rc "^1.2.8"
+
 registry-url@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
@@ -12040,6 +12645,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -12064,6 +12674,14 @@ resolve@^1.10.0:
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.17.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
 resp-modifier@^6.0.0:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
@@ -12095,6 +12713,11 @@ retry@^0.12.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 rgb-regex@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
@@ -12115,20 +12738,34 @@ right-pad@^1.0.1:
   resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
   integrity sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=
 
-rimraf@2, rimraf@2.6.3, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@2.6.3, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.6.2, rimraf@~2.6.2:
+rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
+rimraf@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@~2.2.6:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
@@ -12162,6 +12799,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-parallel@^1.1.9:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
+  integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -12186,6 +12828,11 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
 
+safe-buffer@^5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -12223,37 +12870,39 @@ sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-semantic-release@^15.13.3:
-  version "15.13.3"
-  resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-15.13.3.tgz#412720b9c09f39f04df67478fa409a914107e05b"
-  integrity sha512-cax0xPPTtsxHlrty2HxhPql2TTvS74Ni2O8BzwFHxNY/mviVKEhI4OxHzBYJkpVxx1fMVj36+oH7IlP+SJtPNA==
+semantic-release@^17.2.3:
+  version "17.2.3"
+  resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-17.2.3.tgz#11f10b851d4e75b1015b17515c433049b3df994c"
+  integrity sha512-MY1MlowGQrkOR7+leOD8ICkVOC6i1szbwDODdbJ0UdshtMx8Ms0bhpRQmEEliqYKEb5PLv/dqs6zKKuHT7UxTg==
   dependencies:
-    "@semantic-release/commit-analyzer" "^6.1.0"
+    "@semantic-release/commit-analyzer" "^8.0.0"
     "@semantic-release/error" "^2.2.0"
-    "@semantic-release/github" "^5.1.0"
-    "@semantic-release/npm" "^5.0.5"
-    "@semantic-release/release-notes-generator" "^7.1.2"
-    aggregate-error "^2.0.0"
-    cosmiconfig "^5.0.1"
+    "@semantic-release/github" "^7.0.0"
+    "@semantic-release/npm" "^7.0.0"
+    "@semantic-release/release-notes-generator" "^9.0.0"
+    aggregate-error "^3.0.0"
+    cosmiconfig "^6.0.0"
     debug "^4.0.0"
-    env-ci "^3.0.0"
-    execa "^1.0.0"
-    figures "^2.0.0"
+    env-ci "^5.0.0"
+    execa "^4.0.0"
+    figures "^3.0.0"
     find-versions "^3.0.0"
-    get-stream "^4.0.0"
+    get-stream "^5.0.0"
     git-log-parser "^1.2.0"
-    hook-std "^1.1.0"
-    hosted-git-info "^2.7.1"
-    lodash "^4.17.4"
-    marked "^0.6.0"
-    marked-terminal "^3.2.0"
-    p-locate "^3.0.0"
-    p-reduce "^1.0.0"
-    read-pkg-up "^4.0.0"
-    resolve-from "^4.0.0"
-    semver "^5.4.1"
+    hook-std "^2.0.0"
+    hosted-git-info "^3.0.0"
+    lodash "^4.17.15"
+    marked "^1.0.0"
+    marked-terminal "^4.0.0"
+    micromatch "^4.0.2"
+    p-each-series "^2.1.0"
+    p-reduce "^2.0.0"
+    read-pkg-up "^7.0.0"
+    resolve-from "^5.0.0"
+    semver "^7.3.2"
+    semver-diff "^3.1.1"
     signale "^1.2.1"
-    yargs "^12.0.0"
+    yargs "^15.0.1"
 
 semver-diff@^2.0.0:
   version "2.1.0"
@@ -12262,30 +12911,37 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
+semver-diff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
+  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
+  dependencies:
+    semver "^6.3.0"
+
 semver-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
   integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.1:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 semver@5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
   integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
 
-semver@^6.0.0, semver@^6.1.1:
+semver@^6.0.0, semver@^6.1.1, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
+semver@^7.1.2, semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
 send@0.16.2:
   version "0.16.2"
@@ -12390,13 +13046,12 @@ sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-sha@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/sha/-/sha-2.0.1.tgz#6030822fbd2c9823949f8f72ed6411ee5cf25aae"
-  integrity sha1-YDCCL70smCOUn49y7WQR7lzyWq4=
+sha@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/sha/-/sha-3.0.0.tgz#b2f2f90af690c16a3a839a6a6c680ea51fedd1ae"
+  integrity sha512-DOYnM37cNsLNSGIG/zZWch5CKIRNoLdYUQTQlcgkRkoYIUwDYjqDyye16YcDZg/OPdcbUgTKMjc4SY6TB7ZAPw==
   dependencies:
     graceful-fs "^4.1.2"
-    readable-stream "^2.0.2"
 
 shallowequal@^0.2.2:
   version "0.2.2"
@@ -12420,11 +13075,23 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 shell-quote@^1.4.2, shell-quote@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
@@ -12530,6 +13197,11 @@ slash@^2.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
   integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -12539,7 +13211,7 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
-slide@^1.1.3, slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
+slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
   integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
@@ -12549,11 +13221,6 @@ smart-buffer@4.0.2:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
   integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
 
-smart-buffer@^1.0.13:
-  version "1.1.15"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
-  integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=
-
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -12584,14 +13251,6 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-socks-proxy-agent@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz#2eae7cf8e2a82d34565761539a7f9718c5617659"
-  integrity sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA==
-  dependencies:
-    agent-base "^4.1.0"
-    socks "^1.1.10"
-
 socks-proxy-agent@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
@@ -12600,14 +13259,6 @@ socks-proxy-agent@^4.0.0:
     agent-base "~4.2.1"
     socks "~2.3.2"
 
-socks@^1.1.10:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz#5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"
-  integrity sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o=
-  dependencies:
-    ip "^1.1.4"
-    smart-buffer "^1.0.13"
-
 socks@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
@@ -12761,13 +13412,6 @@ sshpk@^1.16.1, sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -12937,6 +13581,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
 string.prototype.matchall@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-3.0.1.tgz#5a9e0b64bcbeb336aa4814820237c2006985646d"
@@ -12999,6 +13652,11 @@ stringify-package@^1.0.0:
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
   integrity sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==
 
+stringify-package@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
+  integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
+
 strip-ansi@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
@@ -13027,6 +13685,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -13054,6 +13719,13 @@ strip-indent@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
   integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
+strip-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
+  dependencies:
+    min-indent "^1.0.0"
+
 strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -13113,7 +13785,7 @@ supports-color@^3.1.0:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^5.0.0, supports-color@^5.3.0:
+supports-color@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
@@ -13127,13 +13799,20 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-hyperlinks@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz#71daedf36cc1060ac5100c351bb3da48c29c0ef7"
-  integrity sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw==
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-hyperlinks@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"
+  integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==
   dependencies:
-    has-flag "^2.0.0"
-    supports-color "^5.0.0"
+    has-flag "^4.0.0"
+    supports-color "^7.0.0"
 
 svgo@^1.0.0:
   version "1.3.0"
@@ -13209,15 +13888,6 @@ tar-stream@~1.1.0:
     readable-stream "~1.0.33"
     xtend "^4.0.0"
 
-tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
 tar@^4:
   version "4.4.10"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
@@ -13231,18 +13901,23 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.3"
 
-tar@^4.4.3, tar@^4.4.8:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
-  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
+tar@^4.4.10, tar@^4.4.12, tar@^4.4.13:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
   dependencies:
     chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.4"
-    minizlib "^1.1.1"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
-    yallist "^3.0.2"
+    yallist "^3.0.3"
+
+temp-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
+  integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==
 
 temp@0.8.3:
   version "0.8.3"
@@ -13252,6 +13927,17 @@ temp@0.8.3:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
+tempy@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/tempy/-/tempy-1.0.0.tgz#4f192b3ee3328a2684d0e3fc5c491425395aab65"
+  integrity sha512-eLXG5B1G0mRPHmgH2WydPl5v4jH35qEn3y/rA/aahKhIa91Pn119SsU7n7v/433gtT9ONzC8ISvNHIh2JSTm0w==
+  dependencies:
+    del "^6.0.0"
+    is-stream "^2.0.0"
+    temp-dir "^2.0.0"
+    type-fest "^0.16.0"
+    unique-string "^2.0.0"
+
 term-color@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/term-color/-/term-color-1.0.1.tgz#38e192553a473e35e41604ff5199846bf8117a3a"
@@ -13350,6 +14036,13 @@ through2@^3.0.1:
   dependencies:
     readable-stream "2 || 3"
 
+through2@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
+  integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
+  dependencies:
+    readable-stream "3"
+
 through2@~0.6.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
@@ -13457,6 +14150,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -13519,6 +14219,11 @@ trim-newlines@^2.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
   integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
+trim-newlines@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
+  integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
+
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
@@ -13676,6 +14381,31 @@ type-detect@^4.0.0, type-detect@^4.0.5:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
+type-fest@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860"
+  integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==
+
+type-fest@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.16, type-is@~1.6.2:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -13809,7 +14539,7 @@ uniqs@^2.0.0:
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
   integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
 
-unique-filename@^1.1.0, unique-filename@^1.1.1, unique-filename@~1.1.0:
+unique-filename@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
@@ -13830,18 +14560,33 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
-universal-user-agent@^2.0.0, universal-user-agent@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.0.3.tgz#9f6f09f9cc33de867bb720d84c08069b14937c6c"
-  integrity sha512-eRHEHhChCBHrZsA4WEhdgiOKgdvgrMIHwnwnqD0r5C6AO8kwKcG7qSku3iXdhvHL3YvsS9ZkSGN8h/hIpoFC8g==
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
   dependencies:
-    os-name "^3.0.0"
+    crypto-random-string "^2.0.0"
+
+universal-user-agent@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz#3381f8503b251c0d9cd21bc1de939ec9df5480ee"
+  integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
 
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
+  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
+
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -13870,7 +14615,7 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
-update-notifier@^2.3.0, update-notifier@^2.5.0:
+update-notifier@^2.2.0, update-notifier@^2.3.0, update-notifier@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
   integrity sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==
@@ -13915,11 +14660,6 @@ url-parse-lax@^1.0.0:
   dependencies:
     prepend-http "^1.0.1"
 
-url-template@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
-  integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE=
-
 url-trim@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/url-trim/-/url-trim-1.0.0.tgz#40057e2f164b88e5daca7269da47e6d1dd837adc"
@@ -13964,6 +14704,13 @@ util-extend@^1.0.1:
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
   integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
 
+util-promisify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
+  integrity sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=
+  dependencies:
+    object.getownpropertydescriptors "^2.0.3"
+
 util.promisify@^1.0.0, util.promisify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
@@ -13996,6 +14743,11 @@ uuid@3.3.2, uuid@^3.1.0, uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
+uuid@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -14170,13 +14922,20 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.1.1, which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
+which@^1.1.1, which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -14201,13 +14960,6 @@ window-size@^0.2.0:
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
   integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=
 
-windows-release@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f"
-  integrity sha512-QTlz2hKLrdqukrsapKsINzqMgOUpQW268eJ0OaOpJN32h272waxR9fkB9VoWRtK7uKHG5EHJcTXQBD8XZVJkFA==
-  dependencies:
-    execa "^1.0.0"
-
 wkt-parser@^1.2.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.2.3.tgz#240fe1dacc816bfe5674b66180041059eaa9a9ba"
@@ -14235,6 +14987,13 @@ worker-farm@^1.6.0:
   dependencies:
     errno "~0.1.7"
 
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -14252,6 +15011,15 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -14275,6 +15043,15 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write-file-atomic@^2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
+  integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.2"
+
 write@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
@@ -14344,6 +15121,16 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yaml@^1.7.2:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
+  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+
 yamljs@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.3.0.tgz#dc060bf267447b39f7304e9b2bfbe8b5a7ddb03b"
@@ -14368,6 +15155,27 @@ yargs-parser@^13.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^15.0.1:
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3"
+  integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs-parser@^20.2.3:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+
 yargs-parser@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-3.2.0.tgz#5081355d19d9d0c8c5d81ada908cb4e6d186664f"
@@ -14376,6 +15184,13 @@ yargs-parser@^3.2.0:
     camelcase "^3.0.0"
     lodash.assign "^4.1.0"
 
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs-parser@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
@@ -14421,7 +15236,7 @@ yargs@^11.0.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
-yargs@^12.0.0, yargs@^12.0.2:
+yargs@^12.0.2:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
   integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
@@ -14455,6 +15270,59 @@ yargs@^13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.1"
 
+yargs@^14.2.3:
+  version "14.2.3"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414"
+  integrity sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==
+  dependencies:
+    cliui "^5.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^15.0.1"
+
+yargs@^15.0.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"
+
+yargs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A=
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"
+
 yauzl@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"

From 1022e00899a56af39e91c9f17c85b216e01e05c7 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 23 Nov 2020 10:10:27 -0500
Subject: [PATCH 047/553] fix(EditorMapLayersControl): remove show routes on
 map

fix ibi-group/datatools-ui#627
---
 .../components/map/EditorMapLayersControl.js  | 52 ++++++++++---------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/lib/editor/components/map/EditorMapLayersControl.js b/lib/editor/components/map/EditorMapLayersControl.js
index dc46fd805..a5178d169 100644
--- a/lib/editor/components/map/EditorMapLayersControl.js
+++ b/lib/editor/components/map/EditorMapLayersControl.js
@@ -28,33 +28,35 @@ type OverlayItem = {component: any, name: string}
 
 export default class EditorMapLayersControl extends Component<Props> {
   render () {
-    const { tripPatterns, stops, user } = this.props
+    const { stops, user } = this.props
     const { BaseLayer, Overlay } = LayersControl
     const OVERLAYS: Array<OverlayItem> = [
-      {
-        name: 'Route alignments',
-        component: (
-          <FeatureGroup>
-            {tripPatterns
-              ? tripPatterns.map((tp) => {
-                if (!tp.latLngs) return null
-                return (
-                  <Polyline
-                    key={tp.id}
-                    positions={tp.latLngs}
-                    weight={2}
-                    color='#888'>
-                    <Tooltip sticky>
-                      <span>{tp.name} ({tp.route_id})</span>
-                    </Tooltip>
-                  </Polyline>
-                )
-              })
-              : null
-            }
-          </FeatureGroup>
-        )
-      },
+      // FIXME: Do not show trip pattern overlay because it can cause out of
+      // memory issues for very large GTFS feeds.
+      // {
+      //   name: 'Route alignments',
+      //   component: (
+      //     <FeatureGroup>
+      //       {tripPatterns
+      //         ? tripPatterns.map((tp) => {
+      //           if (!tp.latLngs) return null
+      //           return (
+      //             <Polyline
+      //               key={tp.id}
+      //               positions={tp.latLngs}
+      //               weight={2}
+      //               color='#888'>
+      //               <Tooltip sticky>
+      //                 <span>{tp.name} ({tp.route_id})</span>
+      //               </Tooltip>
+      //             </Polyline>
+      //           )
+      //         })
+      //         : null
+      //       }
+      //     </FeatureGroup>
+      //   )
+      // },
       {
         name: 'Stop locations',
         component: <StopLayer key='stop-layer' stops={stops} />

From e32b55fec7c30156a19c65a4d4e1e0abaaca86d3 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 23 Nov 2020 13:56:53 -0500
Subject: [PATCH 048/553] refactor(EditorMapLayersControl): remove unused
 imports

---
 lib/editor/components/map/EditorMapLayersControl.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/editor/components/map/EditorMapLayersControl.js b/lib/editor/components/map/EditorMapLayersControl.js
index a5178d169..a9448cf3c 100644
--- a/lib/editor/components/map/EditorMapLayersControl.js
+++ b/lib/editor/components/map/EditorMapLayersControl.js
@@ -3,11 +3,8 @@
 import React, {Component} from 'react'
 import {Browser} from 'leaflet'
 import {
-  TileLayer,
-  FeatureGroup,
   LayersControl,
-  Polyline,
-  Tooltip
+  TileLayer
 } from 'react-leaflet'
 
 import {getUserMetadataProperty} from '../../../common/util/user'

From f004d9562e6c9e4927d0ed60bb38fda578ed9878 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Nov 2020 23:43:07 +0000
Subject: [PATCH 049/553] build(deps): bump highlight.js from 9.15.9 to 9.18.5

Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 9.15.9 to 9.18.5.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/9.18.5/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/9.15.9...9.18.5)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b5586070d..491ab99b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5998,9 +5998,9 @@ hex-color-regex@^1.1.0:
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 highlight.js@^9.7.0:
-  version "9.15.9"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.9.tgz#865257da1dbb4a58c4552d46c4b3854f77f0e6d5"
-  integrity sha512-M0zZvfLr5p0keDMCAhNBp03XJbKBxUx5AfyfufMdFMEP4N/Xj6dh0IqC75ys7BAzceR34NgcvXjupRVaHBPPVQ==
+  version "9.18.5"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
+  integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
 
 history@^3.0.0:
   version "3.3.0"

From 84abb63ec1ee28af8e4605e5340232d2438794cd Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 30 Nov 2020 15:52:18 -0500
Subject: [PATCH 050/553] fix(editor-map): handle new gtfs-lib response for
 encoded polylines

fix #627
---
 lib/editor/actions/tripPattern.js             | 24 +++++++++++--
 .../components/map/EditorMapLayersControl.js  | 19 +++++-----
 lib/editor/containers/ActiveGtfsEditor.js     |  3 +-
 lib/editor/reducers/data.js                   | 35 ++++++++++++-------
 lib/manager/actions/versions.js               |  2 +-
 5 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/lib/editor/actions/tripPattern.js b/lib/editor/actions/tripPattern.js
index 5c174ccfe..6f8fdd7ce 100644
--- a/lib/editor/actions/tripPattern.js
+++ b/lib/editor/actions/tripPattern.js
@@ -5,10 +5,10 @@ import {ActionCreators} from 'redux-undo'
 import {toast} from 'react-toastify'
 
 import {resetActiveGtfsEntity, savedGtfsEntity, updateActiveGtfsEntity, updateEditSetting} from './active'
-import {createVoidPayloadAction, secureFetch} from '../../common/actions'
+import {createVoidPayloadAction, fetchGraphQL, secureFetch} from '../../common/actions'
 import {snakeCaseKeys} from '../../common/util/map-keys'
 import {generateUID} from '../../common/util/util'
-import {fetchGTFSEntities} from '../../manager/actions/versions'
+import {fetchGTFSEntities, receiveGTFSEntities} from '../../manager/actions/versions'
 import {fetchTripCounts} from './trip'
 import {getEditorNamespace} from '../util/gtfs'
 import {resequenceStops, resequenceShapePoints} from '../util/map'
@@ -17,6 +17,7 @@ import {entityIsNew} from '../util/objects'
 import type {ControlPoint, Pattern, PatternStop} from '../../types'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
 
+const fetchingTripPatterns = createVoidPayloadAction('FETCHING_TRIP_PATTERNS')
 const savedTripPattern = createVoidPayloadAction('SAVED_TRIP_PATTERN')
 export const setActivePatternSegment = createAction(
   'SET_ACTIVE_PATTERN_SEGMENT',
@@ -118,8 +119,25 @@ export function togglePatternEditing () {
  */
 export function fetchTripPatterns (feedId: string) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
+    dispatch(fetchingTripPatterns())
     const namespace = getEditorNamespace(feedId, getState())
-    return dispatch(fetchGTFSEntities({namespace, type: 'pattern', editor: true}))
+    const query = `
+query shapesQuery ($namespace: String) {
+  feed(namespace: $namespace) {
+    feed_version
+    feed_info {
+      feed_id
+    }
+    shapes (limit: -1) {
+      shape_id
+      polyline
+    }
+  }
+}
+`
+    const variables = {namespace}
+    return dispatch(fetchGraphQL({query, variables}))
+      .then(data => dispatch(receiveGTFSEntities({namespace, component: 'pattern', data, editor: true, replaceNew: true})))
   }
 }
 
diff --git a/lib/editor/components/map/EditorMapLayersControl.js b/lib/editor/components/map/EditorMapLayersControl.js
index dc46fd805..6c014f881 100644
--- a/lib/editor/components/map/EditorMapLayersControl.js
+++ b/lib/editor/components/map/EditorMapLayersControl.js
@@ -1,13 +1,12 @@
 // @flow
 
-import React, {Component} from 'react'
-import {Browser} from 'leaflet'
+import React, {PureComponent} from 'react'
+import L from 'leaflet'
 import {
   TileLayer,
   FeatureGroup,
   LayersControl,
-  Polyline,
-  Tooltip
+  Polyline
 } from 'react-leaflet'
 
 import {getUserMetadataProperty} from '../../../common/util/user'
@@ -26,8 +25,9 @@ type Props = {
 
 type OverlayItem = {component: any, name: string}
 
-export default class EditorMapLayersControl extends Component<Props> {
+export default class EditorMapLayersControl extends PureComponent<Props> {
   render () {
+    const canvas = L.canvas()
     const { tripPatterns, stops, user } = this.props
     const { BaseLayer, Overlay } = LayersControl
     const OVERLAYS: Array<OverlayItem> = [
@@ -43,11 +43,8 @@ export default class EditorMapLayersControl extends Component<Props> {
                     key={tp.id}
                     positions={tp.latLngs}
                     weight={2}
-                    color='#888'>
-                    <Tooltip sticky>
-                      <span>{tp.name} ({tp.route_id})</span>
-                    </Tooltip>
-                  </Polyline>
+                    renderer={canvas}
+                    color='#888' />
                 )
               })
               : null
@@ -78,7 +75,7 @@ export default class EditorMapLayersControl extends Component<Props> {
             name='Route layer'
             key='route-layer'>
             <TileLayer
-              url={`https://s3.amazonaws.com/datatools-nysdot/tiles/{z}_{x}_{y}${Browser.retina ? '@2x' : ''}.png`} />
+              url={`https://s3.amazonaws.com/datatools-nysdot/tiles/{z}_{x}_{y}${L.Browser.retina ? '@2x' : ''}.png`} />
           </Overlay>
         }
         {OVERLAYS.map((overlay: OverlayItem, i: number) => (
diff --git a/lib/editor/containers/ActiveGtfsEditor.js b/lib/editor/containers/ActiveGtfsEditor.js
index cc025783f..3f7fa77c7 100644
--- a/lib/editor/containers/ActiveGtfsEditor.js
+++ b/lib/editor/containers/ActiveGtfsEditor.js
@@ -65,7 +65,7 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
   const {activeEntityId, subEntityId} = getIdsFromParams(ownProps.routeParams)
   const {data, editSettings: editSettingsState, mapState} = state.editor
   const {present: editSettings} = editSettingsState
-  const {active, tables, status} = data
+  const {active, tables, tripPatterns, status} = data
   // FIXME: entityId is now a non-string line number and somewhere the number is
   // being cast to a string.
   const activeEntity = active.entity && active.entity.id === activeEntityId
@@ -130,6 +130,7 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
     tableData: tables,
     tableView,
     timetableStatus,
+    tripPatterns,
     user,
     validationErrors
   }
diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index 3d45f17e1..bbd2e337e 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -2,6 +2,7 @@
 
 import update from 'react-addons-update'
 import clone from 'lodash/cloneDeep'
+import {decode as decodePolyline} from 'polyline'
 import SortDirection from 'react-virtualized/dist/commonjs/Table/SortDirection'
 
 import {ENTITY} from '../constants'
@@ -22,6 +23,11 @@ const getUpdateEntityKeys = component => component === 'trippattern'
 export const defaultState = {
   active: {},
   lock: {},
+  sort: {
+    key: 'name',
+    direction: SortDirection.ASC
+  },
+  status: {},
   tables: {
     agency: [],
     calendar: [],
@@ -36,11 +42,7 @@ export const defaultState = {
       service_id: []
     }
   },
-  sort: {
-    key: 'name',
-    direction: SortDirection.ASC
-  },
-  status: {}
+  tripPatterns: null
 }
 
 /* eslint-disable complexity */
@@ -51,6 +53,10 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
       return update(state, {active: {$merge: {feedSourceId}}})
     case 'RECEIVE_BASE_GTFS': {
       const feed = clone(action.payload.feed)
+      if (!feed) {
+        console.warn('Could not fetch base GTFS!')
+        return state
+      }
       if (feed.feed_info.length === 0) {
         console.warn(`No feed info found. Adding feed info with null values.`)
         feed.feed_info.push(generateNullProps('feedinfo'))
@@ -223,6 +229,11 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
       if (!tableName) return state
       return update(state, {tables: {[tableName]: {$push: [entity]}}})
     }
+    case 'FETCHING_TRIP_PATTERNS': {
+      // Set value to an empty array to prevent the user from accidentally
+      // triggering multiple fetches.
+      return update(state, {tripPatterns: {$set: []}})
+    }
     case 'RECEIVE_GTFS_ENTITIES': {
       let activePattern
       const {data, editor, component} = action.payload
@@ -235,15 +246,13 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
         // Handle trip patterns to be drawn as overlay layer in editor
         return update(state, {
           tripPatterns: {$set:
-            data.feed.patterns.map(pattern => {
+            data.feed.shapes.map(shape => {
               return {
-                id: pattern.id,
-                name: pattern.name,
-                route_id: pattern.route_id,
-                latLngs: pattern.shape_points
-                  ? (pattern.shape_points.map(sp =>
-                    ({lon: sp.shape_pt_lon, lat: sp.shape_pt_lat})))
-                  : null
+                id: shape.shape_id,
+                // Decode polyline and coords divide by ten (gtfs-lib
+                // simplification level requires this).
+                latLngs: decodePolyline(shape.polyline)
+                  .map(coords => ([coords[0] / 10, coords[1] / 10]))
               }
             })
           }
diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index d5dbf8359..ccfe12835 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -49,7 +49,7 @@ const receiveFeedVersions = createAction(
     versions: Array<FeedVersion>
   }) => payload
 )
-const receiveGTFSEntities = createAction(
+export const receiveGTFSEntities = createAction(
   'RECEIVE_GTFS_ENTITIES',
   (payload: {
     component: string,

From e7c5f4d7e7eedc72f63103b3f5a1bff0f8534285 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 1 Dec 2020 14:38:42 -0500
Subject: [PATCH 051/553] refactor(FeedVersionSpanChart): Extract common date
 logic.

---
 .../version/FeedVersionSpanChart.js           | 101 ++++++++++++------
 1 file changed, 67 insertions(+), 34 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 4cf7a08ac..8ad0739d6 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -1,8 +1,8 @@
 // @flow
 
+import moment from 'moment'
 import React, { Component } from 'react'
 import { Table } from 'react-bootstrap'
-import moment from 'moment'
 
 import type { FeedVersion } from '../../../types'
 
@@ -13,32 +13,72 @@ type Props = {
   comparedVersionIndex: number
 }
 
+// Type used for rendering FeedSpan sub-components.
+type VersionDateRange = {
+  // Number of days for this range
+  days: number,
+  endDate: moment$Moment,
+  // Length and offset should be ratios.
+  length: number,
+  offset: number,
+  startDate: moment$Moment
+}
+
+type VersionDateRanges = {
+  v1Range: VersionDateRange,
+  v2Range: VersionDateRange
+}
+
 const dateFormat = 'MMM. DD, YYYY'
 
 const noTopPadding = { padding: '0 5px' }
 
+function getDateRange (version: FeedVersion): VersionDateRange {
+  const { validationSummary: vs } = version
+  const startDate = moment(vs.startDate)
+  const endDate = moment(vs.endDate)
+
+  return {
+    days: endDate.diff(startDate, 'days'),
+    endDate,
+    length: 0,
+    offset: 0,
+    startDate
+  }
+}
+
 /**
- * This component visually displays the validity span of two feed versions
- * using spans that show an overlap or a gap according to the
- * validity of the active andf compared feed versions.
+ * Obtains the date range objects for the provided feed versions.
  */
-export default class FeedVersionSpanChart extends Component<Props> {
-  render () {
-    const { activeVersion, comparedVersion, comparedVersionIndex } = this.props
+function extractVersionDateRanges (v1: FeedVersion, v2: FeedVersion): VersionDateRanges {
+  const v1Range = getDateRange(v1)
+  const v2Range = getDateRange(v2)
 
-    const activeVersionStartDate = moment(activeVersion.validationSummary.startDate)
-    const activeVersionEndDate = moment(activeVersion.validationSummary.endDate)
-    const comparedVersionStartDate = moment(comparedVersion.validationSummary.startDate)
-    const comparedVersionEndDate = moment(comparedVersion.validationSummary.endDate)
+  const firstDate = moment.min(v1Range.startDate, v2Range.startDate)
+  const lastDate = moment.max(v1Range.endDate, v2Range.endDate)
+  const numDays = lastDate.diff(firstDate, 'days')
 
-    const firstDate = moment.min(activeVersionStartDate, comparedVersionStartDate)
-    const lastDate = moment.max(activeVersionEndDate, comparedVersionEndDate)
+  v1Range.offset = v1Range.startDate.diff(firstDate, 'days') / numDays
+  v1Range.length = v1Range.days / numDays
+  v2Range.offset = v2Range.startDate.diff(firstDate, 'days') / numDays
+  v2Range.length = v2Range.days / numDays
 
-    const numDays = lastDate.diff(firstDate, 'days')
-    const activeVersionOffset = activeVersionStartDate.diff(firstDate, 'days')
-    const activeVersionLength = activeVersionEndDate.diff(activeVersionStartDate, 'days')
-    const comparedVersionOffset = comparedVersionStartDate.diff(firstDate, 'days')
-    const comparedVersionLength = comparedVersionEndDate.diff(comparedVersionStartDate, 'days')
+  return {
+    v1Range,
+    v2Range
+  }
+}
+
+/**
+ * This component renders bars representing the date ranges for which the given feed versions
+ * are valid (e.g., Jan 1 - March 27) and lets the user visualize overlaps or gaps in the validity periods
+ * of the active and compared feed versions.
+ */
+export default class FeedVersionSpanChart extends Component<Props> {
+  render () {
+    const { activeVersion, comparedVersion, comparedVersionIndex } = this.props
+    const { v1Range: activeRange, v2Range: comparedRange } =
+      extractVersionDateRanges(activeVersion, comparedVersion)
 
     return (
       <Table bordered condensed>
@@ -47,10 +87,7 @@ export default class FeedVersionSpanChart extends Component<Props> {
             <td style={noTopPadding}>This version</td>
             <td style={noTopPadding}>
               <FeedSpan
-                endLabel={activeVersionEndDate.format(dateFormat)}
-                relativeLength={activeVersionLength / numDays}
-                relativeOffset={activeVersionOffset / numDays}
-                startLabel={activeVersionStartDate.format(dateFormat)}
+                range={activeRange}
                 widthPixels={400}
               />
             </td>
@@ -59,10 +96,7 @@ export default class FeedVersionSpanChart extends Component<Props> {
             <td style={noTopPadding}>Version {comparedVersionIndex}</td>
             <td style={noTopPadding}>
               <FeedSpan
-                endLabel={comparedVersionEndDate.format(dateFormat)}
-                relativeLength={comparedVersionLength / numDays}
-                relativeOffset={comparedVersionOffset / numDays}
-                startLabel={comparedVersionStartDate.format(dateFormat)}
+                range={comparedRange}
                 widthPixels={400}
               />
             </td>
@@ -75,19 +109,18 @@ export default class FeedVersionSpanChart extends Component<Props> {
 
 /** Renders the validity span of one feed using the given props. */
 const FeedSpan = ({
-  endLabel,
-  relativeLength,
-  relativeOffset,
-  startLabel,
+  range,
   widthPixels
 }) => {
+  const { endDate, length, offset, startDate } = range
   // Date labels and validity span occupy a third of the width available.
   const baseWidth = widthPixels / 3
+
   return (
     <div style={{position: 'relative', width: `${widthPixels}px`}}>
-      <div style={{left: `${relativeOffset * baseWidth}px`, position: 'absolute'}}>
+      <div style={{left: `${offset * baseWidth}px`, position: 'absolute'}}>
         <span style={{display: 'inline-block', textAlign: 'right', width: `${baseWidth}px`}}>
-          {startLabel}
+          {startDate.format(dateFormat)}
         </span>
         <span
           className='label-default'
@@ -95,10 +128,10 @@ const FeedSpan = ({
             display: 'inline-block',
             height: '1em',
             margin: '0 5px',
-            width: `${relativeLength * baseWidth}px`
+            width: `${length * baseWidth}px`
           }}
         />
-        <span>{endLabel}</span>
+        <span>{endDate.format(dateFormat)}</span>
       </div>
     </div>
   )

From 5fa63cd05c6aca8f7775f84b1a17791002cd6fac Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 1 Dec 2020 15:44:21 -0500
Subject: [PATCH 052/553] refactor(FeedVersionTabs): Extract component for
 rendering stat and variation.

---
 .../components/version/FeedVersionTabs.js     | 54 ++++++++++++-------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 2303da244..73feabe2e 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -71,13 +71,14 @@ export default class FeedVersionTabs extends Component<Props> {
 
   render () {
     const {
-      feedVersionIndex,
+      // FIXME: prop drilling.
+      comparedVersion,
       comparedVersionIndex,
+      feedVersionIndex,
       isochroneBand,
       onChangeIsochroneBand,
       tab,
-      version,
-      comparedVersion
+      version
     } = this.props
     const tableOptions = {
       striped: true,
@@ -112,22 +113,12 @@ export default class FeedVersionTabs extends Component<Props> {
 
                 return (
                   <Col xs={2} className='text-center' key={c}>
-                    <div
-                      title={`${summary[c]}`} // FIXME: do we need the title prop?
-                      style={{marginBottom: '0px', fontSize: '200%'}}>
-                      {numeral(summary[c]).format('0a')}
-                      {comparedVersion && comparedVersionIndex && (
-                        <sup style={{width: 0, display: 'inline-block'}}>
-                          <BsLabel
-                            style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
-                            bsStyle={diff > 0 ? 'success' : (diff < 0 ? 'danger' : 'default')}
-                            title={`Difference compared to Version ${comparedVersionIndex || 'null'}`}>
-                            {formatDelta(diff)}
-                          </BsLabel>
-                        </sup>
-                      )}
-                    </div>
-
+                    <StatisticWithVariation
+                      showVariation={comparedVersion && comparedVersionIndex}
+                      title={comparedVersionIndex && `Difference compared to Version ${comparedVersionIndex}`}
+                      value={summary[c]}
+                      variation={diff}
+                    />
                     <p style={{marginBottom: '0px'}}>{this.messages(c)}</p>
                   </Col>
                 )
@@ -186,3 +177,28 @@ export default class FeedVersionTabs extends Component<Props> {
     )
   }
 }
+
+/**
+ * Renders a statistic of a feed version with a small label attached to indicate a variation.
+ */
+const StatisticWithVariation = ({ showVariation, title, value, variation }) => {
+  const bsStyle = variation > 0
+    ? 'success'
+    : (variation < 0 ? 'danger' : 'default')
+
+  return (
+    <span title={`${value}`} style={{ fontSize: '200%' }}>
+      {numeral(value).format('0a')}
+      {showVariation &&
+        // Apply a zero-width to superscript so that `value` above always appears centered.
+        <sup style={{ display: 'inline-block', width: 0 }}>
+          <BsLabel
+            style={{ fontSize: '50%', padding: '0 0.2em 0.1em' }}
+            bsStyle={bsStyle}
+            title={title}>
+            {formatDelta(variation)}
+          </BsLabel>
+        </sup>}
+    </span>
+  )
+}

From 7cc84f723b660a4eeab42e760f8612e7af527463 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 2 Dec 2020 08:38:56 -0500
Subject: [PATCH 053/553] fix(actions/editor.js): request base GTFS with no
 limits on tables

adds agency, calendars, fares to list of tables for which limit is omitted

fix #631
---
 lib/editor/actions/editor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/editor/actions/editor.js b/lib/editor/actions/editor.js
index 35d1a999a..1a837c5c3 100644
--- a/lib/editor/actions/editor.js
+++ b/lib/editor/actions/editor.js
@@ -385,17 +385,17 @@ export function fetchBaseGtfs ({
             default_route_color
             default_route_type
           }
-          agency {
+          agency (limit: -1) {
             id
             agency_id
             agency_name
           }
-          calendar {
+          calendar (limit: -1) {
             id
             service_id
             description
           }
-          fares {
+          fares (limit: -1) {
             id
             fare_id
           }

From 312ef451df27f84f506e19471b3351da4fb495e9 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 2 Dec 2020 09:39:46 -0500
Subject: [PATCH 054/553] refactor(tripPattern.js): address PR comments

---
 lib/editor/actions/editor.js      |  2 +-
 lib/editor/actions/tripPattern.js | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/editor/actions/editor.js b/lib/editor/actions/editor.js
index 35d1a999a..71ad95fad 100644
--- a/lib/editor/actions/editor.js
+++ b/lib/editor/actions/editor.js
@@ -40,7 +40,7 @@ const setEditorCheckIn = createAction(
   'SET_EDITOR_CHECK_IN',
   (payload: LockState) => payload
 )
-const showEditorModal = createVoidPayloadAction('SHOW_EDITOR_MODAL')
+export const showEditorModal = createVoidPayloadAction('SHOW_EDITOR_MODAL')
 
 export type EditorActions = ActionType<typeof createGtfsEntity> |
   ActionType<typeof receiveBaseGtfs> |
diff --git a/lib/editor/actions/tripPattern.js b/lib/editor/actions/tripPattern.js
index 6f8fdd7ce..5c3aa788c 100644
--- a/lib/editor/actions/tripPattern.js
+++ b/lib/editor/actions/tripPattern.js
@@ -8,6 +8,7 @@ import {resetActiveGtfsEntity, savedGtfsEntity, updateActiveGtfsEntity, updateEd
 import {createVoidPayloadAction, fetchGraphQL, secureFetch} from '../../common/actions'
 import {snakeCaseKeys} from '../../common/util/map-keys'
 import {generateUID} from '../../common/util/util'
+import {showEditorModal} from './editor'
 import {fetchGTFSEntities, receiveGTFSEntities} from '../../manager/actions/versions'
 import {fetchTripCounts} from './trip'
 import {getEditorNamespace} from '../util/gtfs'
@@ -128,16 +129,30 @@ query shapesQuery ($namespace: String) {
     feed_info {
       feed_id
     }
-    shapes (limit: -1) {
+    shapes_as_polylines (limit: -1) {
       shape_id
       polyline
     }
   }
 }
 `
+    if (!namespace) {
+      console.error('Cannot fetch GTFS for undefined or null namespace')
+      dispatch(showEditorModal())
+      return
+    }
     const variables = {namespace}
     return dispatch(fetchGraphQL({query, variables}))
-      .then(data => dispatch(receiveGTFSEntities({namespace, component: 'pattern', data, editor: true, replaceNew: true})))
+      .then(data => dispatch(
+        receiveGTFSEntities({
+          namespace,
+          component: 'pattern',
+          data,
+          editor: true,
+          id: null,
+          replaceNew: true
+        })
+      ))
   }
 }
 

From 9a257eaabbeb88e402ca87ffebbb654ab6850f06 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 2 Dec 2020 09:48:36 -0500
Subject: [PATCH 055/553] refactor(reducers/data): fix processing of
 shapes_as_polylines

---
 lib/editor/reducers/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index bbd2e337e..0e5d2dd9c 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -246,7 +246,7 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
         // Handle trip patterns to be drawn as overlay layer in editor
         return update(state, {
           tripPatterns: {$set:
-            data.feed.shapes.map(shape => {
+            data.feed.shapes_as_polylines.map(shape => {
               return {
                 id: shape.shape_id,
                 // Decode polyline and coords divide by ten (gtfs-lib

From 72db542aef23eb06a361e153d548dd308e204961 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 2 Dec 2020 09:52:01 -0500
Subject: [PATCH 056/553] refactor(FeedVersionViewer): Insert comment about
 prop drilling.

---
 lib/manager/containers/ActiveFeedVersionNavigator.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/manager/containers/ActiveFeedVersionNavigator.js b/lib/manager/containers/ActiveFeedVersionNavigator.js
index 248b77a27..1a9462922 100644
--- a/lib/manager/containers/ActiveFeedVersionNavigator.js
+++ b/lib/manager/containers/ActiveFeedVersionNavigator.js
@@ -79,6 +79,7 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
       comparedVersion = sortedVersions[comparedVersionIndex - 1]
     }
   }
+  // FIXME: prop drilling.
   return {
     gtfs,
     hasVersions,

From a90c93f6379e5fda78090a534780670c167ee057 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 2 Dec 2020 10:12:44 -0500
Subject: [PATCH 057/553] test(flow): fix data reducer flow type for trip
 patterns

---
 lib/types/reducers.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/types/reducers.js b/lib/types/reducers.js
index da3fa45ac..274a3897c 100644
--- a/lib/types/reducers.js
+++ b/lib/types/reducers.js
@@ -13,6 +13,7 @@ import type {
   GtfsPlusValidation,
   GtfsRoute,
   GtfsStop,
+  LatLng,
   Organization,
   OtpServer,
   Pattern,
@@ -197,7 +198,11 @@ export type DataState = {
   lock: LockState,
   sort: DataStateSort,
   status: EditorStatus,
-  tables: EditorTables
+  tables: EditorTables,
+  tripPatterns: ?Array<{
+    id: string,
+    latlngs: Array<LatLng>
+  }>
 }
 
 export type EditSettingsState = {

From 7ad691a22e15419d3f170d38a6c2a1574f2c8691 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 2 Dec 2020 14:16:55 -0500
Subject: [PATCH 058/553] refactor(tripPattern.js): remove limit arg on shapes
 query

---
 lib/editor/actions/tripPattern.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/editor/actions/tripPattern.js b/lib/editor/actions/tripPattern.js
index 5c3aa788c..2817ead54 100644
--- a/lib/editor/actions/tripPattern.js
+++ b/lib/editor/actions/tripPattern.js
@@ -129,7 +129,7 @@ query shapesQuery ($namespace: String) {
     feed_info {
       feed_id
     }
-    shapes_as_polylines (limit: -1) {
+    shapes_as_polylines {
       shape_id
       polyline
     }

From 93a7dec276d2a2598a1197f468893f0c24d7fd0f Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 3 Dec 2020 10:17:56 -0500
Subject: [PATCH 059/553] refactor(EditorMapLayersControl): sort props, make
 route layer non-interactive

---
 lib/editor/components/map/EditorMapLayersControl.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/map/EditorMapLayersControl.js b/lib/editor/components/map/EditorMapLayersControl.js
index f9eb4e395..8e83530e6 100644
--- a/lib/editor/components/map/EditorMapLayersControl.js
+++ b/lib/editor/components/map/EditorMapLayersControl.js
@@ -40,11 +40,12 @@ export default class EditorMapLayersControl extends PureComponent<Props> {
                 if (!tp.latLngs) return null
                 return (
                   <Polyline
+                    color='#888'
+                    interactive={false}
                     key={tp.id}
                     positions={tp.latLngs}
-                    weight={2}
                     renderer={canvas}
-                    color='#888' />
+                    weight={2} />
                 )
               })
               : null

From 9d9cd2e91b4a915b0f9b7c0654554eafc8a72635 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 8 Dec 2020 16:42:23 -0500
Subject: [PATCH 060/553] refactor(compare-versions): refactor compare versions
 feature

Added some new components, tweaked layout and styling
---
 lib/manager/actions/versions.js               |   2 +-
 lib/manager/components/version/DeltaStat.js   |  59 ++++++
 .../components/version/FeedVersionDetails.js  |  60 +++---
 .../version/FeedVersionNavigator.js           |  48 +----
 .../version/FeedVersionSpanChart.js           | 173 +++++++++---------
 .../components/version/FeedVersionTabs.js     |  67 ++++---
 .../components/version/FeedVersionViewer.js   |  38 ++--
 .../version/VersionComparisonDropdown.js      |  87 +++++++++
 .../containers/ActiveFeedVersionNavigator.js  |   2 -
 lib/manager/util/version.js                   |   2 +-
 10 files changed, 322 insertions(+), 216 deletions(-)
 create mode 100644 lib/manager/components/version/DeltaStat.js
 create mode 100644 lib/manager/components/version/VersionComparisonDropdown.js

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 983339613..95027a186 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -597,7 +597,7 @@ export function setVersionIndex (
 
 export function setComparedVersionIndex (
   feed: Feed,
-  index: number,
+  index: ?number,
   push?: boolean = true,
   isPublic?: boolean
 ) {
diff --git a/lib/manager/components/version/DeltaStat.js b/lib/manager/components/version/DeltaStat.js
new file mode 100644
index 000000000..becc309c6
--- /dev/null
+++ b/lib/manager/components/version/DeltaStat.js
@@ -0,0 +1,59 @@
+// @flow
+
+import React from 'react'
+import {Label as BsLabel, OverlayTrigger, Tooltip} from 'react-bootstrap'
+
+import {formatDelta} from '../../util/version'
+
+/**
+ * Renders a delta statistic  as a label with tooltip when comparing feed
+ * versions.
+ */
+const DeltaStat = (
+  {
+    comparedVersionIndex,
+    diff,
+    inverse,
+    style
+  }: {
+    comparedVersionIndex: number,
+    diff: number,
+    inverse?: boolean,
+    style: any
+}) => {
+  // Construct the tooltip label and style based on positive/negative diff.
+  let bsStyle = 'default'
+  let comparePhrase = 'No change'
+  let conjunction = 'from'
+  if (diff > 0) {
+    comparePhrase = `${Math.abs(diff)} more`
+    conjunction = 'than'
+    if (inverse) bsStyle = 'danger'
+    else bsStyle = 'success'
+  } else if (diff < 0) {
+    comparePhrase = `${Math.abs(diff)} fewer`
+    conjunction = 'than'
+    if (inverse) bsStyle = 'success'
+    else bsStyle = 'danger'
+  }
+  // Render the label
+  return (
+    <OverlayTrigger
+      placement='bottom'
+      overlay={
+        <Tooltip id='delta-stat'>
+          {comparePhrase} {conjunction} version {comparedVersionIndex}
+        </Tooltip>
+      }
+    >
+      <BsLabel
+        bsStyle={bsStyle}
+        style={style}
+      >
+        {formatDelta(diff)}
+      </BsLabel>
+    </OverlayTrigger>
+  )
+}
+
+export default DeltaStat
diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index 6a2d60ab8..cb3ce3854 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -18,8 +18,8 @@ import {getConfigProperty, isExtensionEnabled} from '../../../common/util/config
 import {BLOCKING_ERROR_TYPES} from '../../util/version'
 import VersionDateLabel from './VersionDateLabel'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
+import VersionComparisonDropdown from './VersionComparisonDropdown'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
-import FeedVersionSpanChart from './FeedVersionSpanChart'
 
 import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
 import type {ManagerUserState} from '../../../types/reducers'
@@ -88,7 +88,6 @@ export default class FeedVersionDetails extends Component<Props> {
 
   render () {
     const {
-      comparedVersion,
       comparedVersionIndex,
       feedSource,
       gtfsPlusValidation,
@@ -120,23 +119,32 @@ export default class FeedVersionDetails extends Component<Props> {
     return (
       <ListGroupItem>
         <h4>
-          {isExtensionEnabled('mtc')
-            ? <ButtonToolbar className='pull-right' style={{marginTop: '-7px'}}>
-              {// Only show merge feeds button if the feed starts in the future.
-                // FIXME: uncomment out the below to prevent merges with non-future feeds.
-                // moment(summary.startDate).isAfter(moment().startOf('day')) &&
-                <VersionSelectorDropdown
-                  dropdownProps={{
-                    id: 'merge-versions-dropdown',
-                    disabled: isMergedServicePeriods,
-                    onSelect: this._handleMergeVersion
-                  }}
-                  title={<span><Icon type='code-fork' /> {mergeButtonLabel}</span>}
-                  itemFormatter={this._mergeItemFormatter}
-                  version={version}
-                  versions={feedSource.feedVersions}
-                />
-              }
+          <ButtonToolbar className='pull-right' style={{marginTop: '-7px'}}>
+            <VersionComparisonDropdown
+              comparedVersionIndex={comparedVersionIndex}
+              feedSource={feedSource}
+              version={version}
+              versions={feedSource.feedVersions}
+             />
+            {/*
+            Only show merge feeds button if the feed starts in the future.
+            FIXME: uncomment out the below to prevent merges with non-future feeds.
+            moment(summary.startDate).isAfter(moment().startOf('day')) &&
+            */}
+            {isExtensionEnabled('mtc') &&
+              <VersionSelectorDropdown
+                dropdownProps={{
+                  id: 'merge-versions-dropdown',
+                  disabled: isMergedServicePeriods,
+                  onSelect: this._handleMergeVersion
+                }}
+                title={<span><Icon type='code-fork' /> {mergeButtonLabel}</span>}
+                itemFormatter={this._mergeItemFormatter}
+                version={version}
+                versions={feedSource.feedVersions}
+              />
+            }
+            {isExtensionEnabled('mtc') &&
               <Button
                 disabled={
                   !gtfsPlusValidation ||
@@ -158,9 +166,8 @@ export default class FeedVersionDetails extends Component<Props> {
                     : <span>Publish to MTC</span>
                 }
               </Button>
-            </ButtonToolbar>
-            : null
-          }
+            }
+          </ButtonToolbar>
           <span data-test-id='feed-version-validity'>
             <Icon type='calendar' />{' '}
             Valid from {moment(summary.startDate).format(dateFormat)}{' '}
@@ -189,15 +196,6 @@ export default class FeedVersionDetails extends Component<Props> {
             </div>
           }
         </h4>
-
-        {comparedVersion && comparedVersionIndex && (
-          <FeedVersionSpanChart
-            activeVersion={version}
-            comparedVersion={comparedVersion}
-            comparedVersionIndex={comparedVersionIndex}
-          />
-        )}
-
         <p>
           {summary && summary.avgDailyRevenueTime
             ? <span>
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index a4d71aa15..c86ec914e 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -18,7 +18,7 @@ import * as gtfsPlusActions from '../../../gtfsplus/actions/gtfsplus'
 import * as deploymentActions from '../../../manager/actions/deployments'
 import DeploymentPreviewButton from '../DeploymentPreviewButton'
 import FeedVersionViewer from './FeedVersionViewer'
-import VersionSelectorDropdown, {DefaultItemFormatter} from './VersionSelectorDropdown'
+import VersionSelectorDropdown from './VersionSelectorDropdown'
 
 import type {Props as ContainerProps} from '../../containers/ActiveFeedVersionNavigator'
 import type {FeedVersion, GtfsPlusValidation, Note} from '../../../types'
@@ -44,7 +44,6 @@ type Props = ContainerProps & {
   publishFeedVersion: typeof versionsActions.publishFeedVersion,
   renameFeedVersion: typeof versionsActions.renameFeedVersion,
   runFetchFeed: typeof feedsActions.runFetchFeed,
-  setComparedVersionIndex: typeof versionsActions.setComparedVersionIndex,
   setVersionIndex: typeof versionsActions.setVersionIndex,
   sortedVersions: Array<FeedVersion>,
   uploadFeed: typeof versionsActions.uploadFeed,
@@ -135,49 +134,6 @@ export default class FeedVersionNavigator extends Component<Props, State> {
     }
   }
 
-  _onSelectComparedVersion = (index: number) => {
-    if (index !== this.props.comparedVersionIndex) {
-      this.props.setComparedVersionIndex(this.props.feedSource, index)
-    }
-  }
-
-  /** Show comparison dropdown if there are 2+ versions to compare. */
-  _renderComparisonDropdown = () => {
-    const {
-      comparedVersionIndex,
-      sortedVersions,
-      version
-    } = this.props
-
-    if (sortedVersions.length >= 2) {
-      const comparedFeedVersion = sortedVersions[comparedVersionIndex - 1]
-      const compareTitle = comparedFeedVersion ? `Comparing to Version ${comparedVersionIndex}` : 'Compare'
-
-      // This custom formatter adds and hides the active version in the list to preserve version indexes.
-      const itemFormatter = (itemVersion: FeedVersion, activeVersion: ?FeedVersion) => (
-        itemVersion === version
-          ? <MenuItem key={itemVersion.id} style={{display: 'none'}} />
-          : DefaultItemFormatter(itemVersion, activeVersion)
-      )
-
-      return (
-        <VersionSelectorDropdown
-          dropdownProps={{
-            id: 'prevVersionSelector',
-            onSelect: this._onSelectComparedVersion
-          }}
-          header='Select a version to compare'
-          itemFormatter={itemFormatter}
-          title={compareTitle}
-          version={comparedFeedVersion}
-          versions={sortedVersions}
-        />
-      )
-    }
-
-    return null
-  }
-
   render () {
     const versionTitleStyle = {
       fontSize: '24px',
@@ -270,8 +226,6 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                     onClick={this._incrementVersion}>
                     <Glyphicon glyph='arrow-right' />
                   </Button>
-
-                  {this._renderComparisonDropdown()}
                 </ButtonGroup>
               }
               <ButtonToolbar className='pull-right'>
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 8ad0739d6..625c4bb42 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -2,71 +2,20 @@
 
 import moment from 'moment'
 import React, { Component } from 'react'
-import { Table } from 'react-bootstrap'
+import { OverlayTrigger, Table, Tooltip } from 'react-bootstrap'
 
 import type { FeedVersion } from '../../../types'
 
 type Props = {
   activeVersion: FeedVersion,
-  comparedVersion: FeedVersion,
-  // Used for display only.
-  comparedVersionIndex: number
-}
-
-// Type used for rendering FeedSpan sub-components.
-type VersionDateRange = {
-  // Number of days for this range
-  days: number,
-  endDate: moment$Moment,
-  // Length and offset should be ratios.
-  length: number,
-  offset: number,
-  startDate: moment$Moment
-}
-
-type VersionDateRanges = {
-  v1Range: VersionDateRange,
-  v2Range: VersionDateRange
+  comparedVersion: FeedVersion
 }
 
 const dateFormat = 'MMM. DD, YYYY'
 
-const noTopPadding = { padding: '0 5px' }
-
-function getDateRange (version: FeedVersion): VersionDateRange {
-  const { validationSummary: vs } = version
-  const startDate = moment(vs.startDate)
-  const endDate = moment(vs.endDate)
-
-  return {
-    days: endDate.diff(startDate, 'days'),
-    endDate,
-    length: 0,
-    offset: 0,
-    startDate
-  }
-}
-
-/**
- * Obtains the date range objects for the provided feed versions.
- */
-function extractVersionDateRanges (v1: FeedVersion, v2: FeedVersion): VersionDateRanges {
-  const v1Range = getDateRange(v1)
-  const v2Range = getDateRange(v2)
-
-  const firstDate = moment.min(v1Range.startDate, v2Range.startDate)
-  const lastDate = moment.max(v1Range.endDate, v2Range.endDate)
-  const numDays = lastDate.diff(firstDate, 'days')
-
-  v1Range.offset = v1Range.startDate.diff(firstDate, 'days') / numDays
-  v1Range.length = v1Range.days / numDays
-  v2Range.offset = v2Range.startDate.diff(firstDate, 'days') / numDays
-  v2Range.length = v2Range.days / numDays
-
-  return {
-    v1Range,
-    v2Range
-  }
+const cellStyle = {
+  border: 'none',
+  padding: '0 5px'
 }
 
 /**
@@ -76,28 +25,59 @@ function extractVersionDateRanges (v1: FeedVersion, v2: FeedVersion): VersionDat
  */
 export default class FeedVersionSpanChart extends Component<Props> {
   render () {
-    const { activeVersion, comparedVersion, comparedVersionIndex } = this.props
-    const { v1Range: activeRange, v2Range: comparedRange } =
-      extractVersionDateRanges(activeVersion, comparedVersion)
+    const { activeVersion, comparedVersion } = this.props
+    // Construct moment objects for the active/compared version start/end dates.
+    const activeStartDate = moment(activeVersion.validationSummary.startDate)
+    const activeEndDate = moment(activeVersion.validationSummary.endDate)
+    const comparedStartDate = moment(comparedVersion.validationSummary.startDate)
+    const comparedEndDate = moment(comparedVersion.validationSummary.endDate)
+
+    const firstDate = moment.min(activeStartDate, comparedStartDate)
+    const lastDate = moment.max(activeEndDate, comparedEndDate)
+
+    const earliestEnd = moment.min(activeEndDate, comparedEndDate)
+    const latestStart = moment.max(activeStartDate, comparedStartDate)
 
     return (
-      <Table bordered condensed>
+      <Table>
         <tbody>
           <tr>
-            <td style={noTopPadding}>This version</td>
-            <td style={noTopPadding}>
+            <td style={{fontWeight: 800, ...cellStyle}}>Version {activeVersion.version} (selected)</td>
+            <td style={{fontWeight: 800, ...cellStyle}}>
               <FeedSpan
-                range={activeRange}
-                widthPixels={400}
+                firstDate={firstDate}
+                lastDate={lastDate}
+                isServiceGap={false}
+                versionStartDate={activeStartDate}
+                versionEndDate={activeEndDate}
               />
             </td>
           </tr>
+          {/* Highlight gap in service if one exists */}
+          {latestStart.diff(earliestEnd, 'days') > 0 &&
+            <tr style={{height: '1em'}}>
+              {/* Cell placeholder to prevent formatting issues */}
+              <td className='text-danger' style={cellStyle}>Gap in service</td>
+              <td style={cellStyle}>
+                <FeedSpan
+                  firstDate={firstDate}
+                  isServiceGap
+                  lastDate={lastDate}
+                  versionStartDate={earliestEnd}
+                  versionEndDate={latestStart}
+                />
+              </td>
+            </tr>
+          }
           <tr>
-            <td style={noTopPadding}>Version {comparedVersionIndex}</td>
-            <td style={noTopPadding}>
+            <td style={cellStyle}>Version {comparedVersion.version}</td>
+            <td style={cellStyle}>
               <FeedSpan
-                range={comparedRange}
-                widthPixels={400}
+                firstDate={firstDate}
+                lastDate={lastDate}
+                isServiceGap={false}
+                versionStartDate={comparedStartDate}
+                versionEndDate={comparedEndDate}
               />
             </td>
           </tr>
@@ -107,31 +87,52 @@ export default class FeedVersionSpanChart extends Component<Props> {
   }
 }
 
+// Width of feed span
+const WIDTH_PIXELS = 400
+
 /** Renders the validity span of one feed using the given props. */
 const FeedSpan = ({
-  range,
-  widthPixels
+  firstDate,
+  lastDate,
+  isServiceGap = false,
+  versionStartDate,
+  versionEndDate
 }) => {
-  const { endDate, length, offset, startDate } = range
+  const totalDays = lastDate.diff(firstDate, 'days')
+  const versionOffset = versionStartDate.diff(firstDate, 'days')
+  const daysActive = versionEndDate.diff(versionStartDate, 'days')
+  const endLabel = versionEndDate.format(dateFormat)
+  const relativeLength = daysActive / totalDays
+  const relativeOffset = versionOffset / totalDays
+  const startLabel = versionStartDate.format(dateFormat)
   // Date labels and validity span occupy a third of the width available.
-  const baseWidth = widthPixels / 3
-
+  const baseWidth = WIDTH_PIXELS / 3
   return (
-    <div style={{position: 'relative', width: `${widthPixels}px`}}>
-      <div style={{left: `${offset * baseWidth}px`, position: 'absolute'}}>
+    <div style={{position: 'relative', width: `${WIDTH_PIXELS}px`}}>
+      <div style={{left: `${relativeOffset * baseWidth}px`, position: 'absolute'}}>
         <span style={{display: 'inline-block', textAlign: 'right', width: `${baseWidth}px`}}>
-          {startDate.format(dateFormat)}
+          {isServiceGap ? null : startLabel}
         </span>
-        <span
-          className='label-default'
-          style={{
-            display: 'inline-block',
-            height: '1em',
-            margin: '0 5px',
-            width: `${length * baseWidth}px`
-          }}
-        />
-        <span>{endDate.format(dateFormat)}</span>
+        <OverlayTrigger
+          placement='bottom'
+          overlay={
+            <Tooltip id={`feed-span`}>
+              {isServiceGap && 'No service for'}{' '}
+              {daysActive} days
+            </Tooltip>
+          }>
+          <span
+            style={{
+              backgroundColor: isServiceGap ? 'red' : 'grey',
+              display: 'inline-block',
+              height: '.75em',
+              margin: '0 5px',
+              width: `${relativeLength * baseWidth}px`,
+              verticalAlign: '0px'
+            }}
+          />
+        </OverlayTrigger>
+        <span>{isServiceGap ? null : endLabel}</span>
       </div>
     </div>
   )
diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 73feabe2e..5839fc185 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -2,18 +2,19 @@
 
 import moment from 'moment'
 import React, {Component} from 'react'
-import {Col, Label as BsLabel, ListGroupItem, Row, Tab, Tabs} from 'react-bootstrap'
+import {Col, ListGroupItem, Row, Tab, Tabs} from 'react-bootstrap'
 import numeral from 'numeral'
 
 import {getComponentMessages, isModuleEnabled} from '../../../common/util/config'
+import DeltaStat from './DeltaStat'
 import Patterns from '../reporter/containers/Patterns'
 import Routes from '../reporter/containers/Routes'
 import Stops from '../reporter/containers/Stops'
 import Timetables from '../reporter/containers/Timetables'
-import {formatDelta} from '../../util/version'
 import ServicePerModeChart from '../validation/ServicePerModeChart'
 import TripsChart from '../validation/TripsChart'
 import FeedVersionAccessibility from './FeedVersionAccessibility'
+import FeedVersionSpanChart from './FeedVersionSpanChart'
 
 import type {Element} from 'react'
 
@@ -110,15 +111,28 @@ export default class FeedVersionTabs extends Component<Props> {
               {countFields.map(c => {
                 const summary = version.validationSummary
                 const diff = comparedVersion ? (summary[c] - comparedVersion.validationSummary[c]) : 0
-
+                const value = summary[c]
                 return (
                   <Col xs={2} className='text-center' key={c}>
-                    <StatisticWithVariation
-                      showVariation={comparedVersion && comparedVersionIndex}
-                      title={comparedVersionIndex && `Difference compared to Version ${comparedVersionIndex}`}
-                      value={summary[c]}
-                      variation={diff}
-                    />
+                    <span title={`${value}`} style={{ fontSize: '200%' }}>
+                      {numeral(value).format('0a')}
+                      {comparedVersion && comparedVersionIndex &&
+                        // Apply a zero-width to superscript so that `value`
+                        // above always appears centered.
+                        <sup
+                          style={{
+                            display: 'inline-block',
+                            marginLeft: '3px',
+                            width: 0
+                          }}
+                        >
+                          <DeltaStat
+                            comparedVersionIndex={comparedVersionIndex}
+                            diff={diff}
+                            style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
+                            type={c} />
+                        </sup>}
+                    </span>
                     <p style={{marginBottom: '0px'}}>{this.messages(c)}</p>
                   </Col>
                 )
@@ -132,6 +146,16 @@ export default class FeedVersionTabs extends Component<Props> {
                 <p style={{marginBottom: '0px'}}>{this.messages('daysActive')}</p>
               </Col>
             </Row>
+            <Row style={{marginTop: '40px'}}>
+              <Col xs={12}>
+                {comparedVersion && comparedVersionIndex && (
+                  <FeedVersionSpanChart
+                    activeVersion={version}
+                    comparedVersion={comparedVersion}
+                  />
+                )}
+              </Col>
+            </Row>
             <div style={{marginTop: '10px'}}>
               <Row>
                 <Col xs={12}>
@@ -177,28 +201,3 @@ export default class FeedVersionTabs extends Component<Props> {
     )
   }
 }
-
-/**
- * Renders a statistic of a feed version with a small label attached to indicate a variation.
- */
-const StatisticWithVariation = ({ showVariation, title, value, variation }) => {
-  const bsStyle = variation > 0
-    ? 'success'
-    : (variation < 0 ? 'danger' : 'default')
-
-  return (
-    <span title={`${value}`} style={{ fontSize: '200%' }}>
-      {numeral(value).format('0a')}
-      {showVariation &&
-        // Apply a zero-width to superscript so that `value` above always appears centered.
-        <sup style={{ display: 'inline-block', width: 0 }}>
-          <BsLabel
-            style={{ fontSize: '50%', padding: '0 0.2em 0.1em' }}
-            bsStyle={bsStyle}
-            title={title}>
-            {formatDelta(variation)}
-          </BsLabel>
-        </sup>}
-    </span>
-  )
-}
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index e3c87775c..6584931e2 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -2,15 +2,26 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import { Row, Col, Panel, Label as BsLabel, Glyphicon, ListGroup, ListGroupItem } from 'react-bootstrap'
+import {
+  Col,
+  Glyphicon,
+  Label
+  as
+  BsLabel,
+  ListGroup,
+  ListGroupItem,
+  Panel,
+  Row
+} from 'react-bootstrap'
 import { LinkContainer } from 'react-router-bootstrap'
 
-import * as plusActions from '../../../gtfsplus/actions/gtfsplus'
 import * as versionsActions from '../../actions/versions'
 import {getComponentMessages, isModuleEnabled} from '../../../common/util/config'
 import Loading from '../../../common/components/Loading'
+import DeltaStat from './DeltaStat'
 import * as snapshotActions from '../../../editor/actions/snapshots'
 import FeedVersionReport from './FeedVersionReport'
+import * as plusActions from '../../../gtfsplus/actions/gtfsplus'
 import ActiveGtfsPlusVersionSummary from '../../../gtfsplus/containers/ActiveGtfsPlusVersionSummary'
 import VersionDateLabel from './VersionDateLabel'
 import NotesViewer from '../NotesViewer'
@@ -171,23 +182,22 @@ class VersionSectionSelector extends Component<SelectorProps> {
     let diffLabel
     if (comparedVersion && comparedVersionIndex) {
       const diff = validationSummary.errorCount - comparedVersion.validationSummary.errorCount
-      const diffClassName = diff > 0 ? 'label-danger' : (diff < 0 ? 'label-success' : 'label-default')
-
       diffLabel = (
-        <span
-          className={diffClassName}
-          style={{border: '0.5px solid #ccc'}}
-          title={`Difference compared to Version ${comparedVersionIndex}`}
-        >
-          {formatDelta(diff)}
-        </span>
+        <DeltaStat
+          comparedVersionIndex={comparedVersionIndex}
+          diff={diff}
+          inverse
+          style={{ marginLeft: '3px' }} />
       )
     }
 
     return (
-      <BsLabel className={`gtfs-error-${highestPriority}-label-solid`}>
-        {text} {diffLabel}
-      </BsLabel>
+      <div style={{display: 'inline'}}>
+        <BsLabel className={`gtfs-error-${highestPriority}-label-solid`}>
+          {text}
+        </BsLabel>
+        {diffLabel}
+      </div>
     )
   }
 
diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
new file mode 100644
index 000000000..2fbba97e3
--- /dev/null
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -0,0 +1,87 @@
+// @flow
+
+import React, {Component} from 'react'
+import {MenuItem} from 'react-bootstrap'
+import {connect} from 'react-redux'
+
+import * as versionsActions from '../../actions/versions'
+import VersionSelectorDropdown, {DefaultItemFormatter} from './VersionSelectorDropdown'
+
+import type {Feed, FeedVersion} from '../../../types'
+import type {AppState} from '../../../types/reducers'
+
+type Props = {
+  comparedVersionIndex?: number,
+  feedSource: Feed,
+  setComparedVersionIndex: typeof versionsActions.setComparedVersionIndex,
+  version: FeedVersion,
+  versions: Array<FeedVersion>
+}
+
+/**
+ * Renders a dropdown selector for choosing a version with which to compare the
+ * active version.
+ */
+class VersionComparisonDropdown extends Component<Props> {
+  _onSelectComparedVersion = (index: number) => {
+    const {comparedVersionIndex, feedSource, setComparedVersionIndex} = this.props
+    if (index !== comparedVersionIndex) {
+      setComparedVersionIndex(feedSource, index)
+    } else {
+      setComparedVersionIndex(feedSource, null)
+    }
+  }
+
+  render () {
+    const {
+      comparedVersionIndex,
+      versions,
+      version
+    } = this.props
+    let title = 'Compare versions'
+    let comparedFeedVersion
+    if (comparedVersionIndex !== null && comparedVersionIndex !== undefined) {
+      comparedFeedVersion = versions[comparedVersionIndex - 1]
+      title = `Comparing to version ${comparedVersionIndex}`
+    }
+
+    // This custom formatter adds and hides the active version in the list to
+    // preserve version indexes.
+    const itemFormatter = (itemVersion: FeedVersion, activeVersion: ?FeedVersion) => (
+      itemVersion === version
+        ? <MenuItem key={itemVersion.id} style={{display: 'none'}} />
+        : DefaultItemFormatter(itemVersion, activeVersion)
+    )
+
+    return (
+      <VersionSelectorDropdown
+        dropdownProps={{
+          id: 'prevVersionSelector',
+          onSelect: this._onSelectComparedVersion
+        }}
+        header={versions.length < 2
+          ? 'Load another version to enable comparison'
+          : 'Select a version to compare with'
+        }
+        itemFormatter={itemFormatter}
+        title={title}
+        version={comparedFeedVersion}
+        versions={versions}
+      />
+    )
+  }
+}
+
+const mapStateToProps = (state: AppState, ownProps: {}) => {
+  return {}
+}
+
+const {
+  setComparedVersionIndex
+} = versionsActions
+
+const mapDispatchToProps = {
+  setComparedVersionIndex
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(VersionComparisonDropdown)
diff --git a/lib/manager/containers/ActiveFeedVersionNavigator.js b/lib/manager/containers/ActiveFeedVersionNavigator.js
index 1a9462922..663f3fca1 100644
--- a/lib/manager/containers/ActiveFeedVersionNavigator.js
+++ b/lib/manager/containers/ActiveFeedVersionNavigator.js
@@ -15,7 +15,6 @@ import {
   mergeVersions,
   publishFeedVersion,
   renameFeedVersion,
-  setComparedVersionIndex,
   setVersionIndex,
   uploadFeed
 } from '../actions/versions'
@@ -110,7 +109,6 @@ const mapDispatchToProps = {
   publishFeedVersion,
   renameFeedVersion,
   runFetchFeed,
-  setComparedVersionIndex,
   setVersionIndex,
   uploadFeed
 }
diff --git a/lib/manager/util/version.js b/lib/manager/util/version.js
index be4219ecf..216edb0b3 100644
--- a/lib/manager/util/version.js
+++ b/lib/manager/util/version.js
@@ -180,6 +180,6 @@ export function formatDelta (
   delta: number
 ): string {
   return delta === 0
-    ? '='
+    ? '—'
     : ((delta > 0 ? '+' : '') + numeral(delta).format('0a'))
 }

From 893b7893a06067bf003d692d91024d76989ca164 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 10 Dec 2020 09:08:12 -0500
Subject: [PATCH 061/553] refactor(graphql-shapes): replace patterns query in
 GtfsMap w/ encoded polys

---
 i18n/english.yml                              |  2 +-
 lib/common/util/gtfs.js                       | 16 +++++++
 lib/editor/actions/tripPattern.js             | 17 +-------
 lib/editor/reducers/data.js                   | 14 ++----
 lib/gtfs/actions/shapes.js                    | 10 ++---
 lib/gtfs/components/GtfsMap.js                | 43 ++++++-------------
 .../components/ShowAllRoutesOnMapFilter.js    | 18 +++++---
 lib/gtfs/util/graphql.js                      | 13 +++---
 8 files changed, 53 insertions(+), 80 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 536449c8f..2d3fccbc7 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -676,7 +676,7 @@ components:
   ShowAllRoutesOnMapFilter:
     fetching: Fetching
     showAllRoutesOnMap: Show all routes
-    tooManyShapeRecords: Too many shapes to display
+    tooManyShapeRecords: large shapes.txt may impact performance
   Sidebar:
     unknown: Unknown
   SnapshotItem:
diff --git a/lib/common/util/gtfs.js b/lib/common/util/gtfs.js
index 456d42223..dec517ea4 100644
--- a/lib/common/util/gtfs.js
+++ b/lib/common/util/gtfs.js
@@ -1,6 +1,9 @@
 // @flow
 
 import moment from 'moment'
+import {decode as decodePolyline} from 'polyline'
+
+type GraphQLShape = {polyline: string, shape_id: string}
 
 /**
  * @param  {number} seconds Seconds after midnight
@@ -36,3 +39,16 @@ export function secondsAfterMidnightToHHMM (seconds: ?(number | string)): string
 export function humanizeSeconds (seconds: number): string {
   return moment.duration(seconds, 'seconds').humanize()
 }
+
+/**
+ * Array map function to decode a GraphQL encoded shape polyline.
+ */
+export function decodeShapePolylines (shape: GraphQLShape) {
+  return {
+    id: shape.shape_id,
+    // Decode polyline and coords divide by ten (gtfs-lib
+    // simplification level requires this).
+    latLngs: decodePolyline(shape.polyline)
+      .map(coords => ([coords[0] / 10, coords[1] / 10]))
+  }
+}
diff --git a/lib/editor/actions/tripPattern.js b/lib/editor/actions/tripPattern.js
index 2817ead54..3234fd522 100644
--- a/lib/editor/actions/tripPattern.js
+++ b/lib/editor/actions/tripPattern.js
@@ -9,6 +9,7 @@ import {createVoidPayloadAction, fetchGraphQL, secureFetch} from '../../common/a
 import {snakeCaseKeys} from '../../common/util/map-keys'
 import {generateUID} from '../../common/util/util'
 import {showEditorModal} from './editor'
+import {shapes} from '../../gtfs/util/graphql'
 import {fetchGTFSEntities, receiveGTFSEntities} from '../../manager/actions/versions'
 import {fetchTripCounts} from './trip'
 import {getEditorNamespace} from '../util/gtfs'
@@ -122,27 +123,13 @@ export function fetchTripPatterns (feedId: string) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(fetchingTripPatterns())
     const namespace = getEditorNamespace(feedId, getState())
-    const query = `
-query shapesQuery ($namespace: String) {
-  feed(namespace: $namespace) {
-    feed_version
-    feed_info {
-      feed_id
-    }
-    shapes_as_polylines {
-      shape_id
-      polyline
-    }
-  }
-}
-`
     if (!namespace) {
       console.error('Cannot fetch GTFS for undefined or null namespace')
       dispatch(showEditorModal())
       return
     }
     const variables = {namespace}
-    return dispatch(fetchGraphQL({query, variables}))
+    return dispatch(fetchGraphQL({query: shapes, variables}))
       .then(data => dispatch(
         receiveGTFSEntities({
           namespace,
diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index 0e5d2dd9c..758e7620a 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -2,11 +2,11 @@
 
 import update from 'react-addons-update'
 import clone from 'lodash/cloneDeep'
-import {decode as decodePolyline} from 'polyline'
 import SortDirection from 'react-virtualized/dist/commonjs/Table/SortDirection'
 
-import {ENTITY} from '../constants'
+import {decodeShapePolylines} from '../../common/util/gtfs'
 import {defaultSorter} from '../../common/util/util'
+import {ENTITY} from '../constants'
 import {generateNullProps, getTableById, getKeyForId} from '../util/gtfs'
 import {getMapToGtfsStrategy, entityIsNew} from '../util/objects'
 import {assignDistancesToPatternStops, constructShapePoints} from '../util/map'
@@ -246,15 +246,7 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
         // Handle trip patterns to be drawn as overlay layer in editor
         return update(state, {
           tripPatterns: {$set:
-            data.feed.shapes_as_polylines.map(shape => {
-              return {
-                id: shape.shape_id,
-                // Decode polyline and coords divide by ten (gtfs-lib
-                // simplification level requires this).
-                latLngs: decodePolyline(shape.polyline)
-                  .map(coords => ([coords[0] / 10, coords[1] / 10]))
-              }
-            })
+            data.feed.shapes_as_polylines.map(decodeShapePolylines)
           }
         })
       }
diff --git a/lib/gtfs/actions/shapes.js b/lib/gtfs/actions/shapes.js
index 0aedff3bf..0dec50877 100644
--- a/lib/gtfs/actions/shapes.js
+++ b/lib/gtfs/actions/shapes.js
@@ -3,6 +3,7 @@
 import {createAction, type ActionType} from 'redux-actions'
 
 import {createVoidPayloadAction, fetchGraphQL} from '../../common/actions'
+import {decodeShapePolylines} from '../../common/util/gtfs'
 import {shapes} from '../../gtfs/util/graphql'
 import {updateRoutesOnMapDisplay} from './filter'
 
@@ -34,13 +35,8 @@ export function toggleShowAllRoutesOnMap (namespace: string) {
       dispatch(fetchingShapes())
       return dispatch(fetchGraphQL({query: shapes, variables: {namespace}}))
         .then(data => {
-          const {patterns} = data.feed
-          const shapes = patterns.map(pattern => {
-            return pattern.shape.map(point => [
-              point.shape_pt_lat,
-              point.shape_pt_lon
-            ])
-          })
+          const {shapes_as_polylines: encodedShapes} = data.feed
+          const shapes = encodedShapes.map(decodeShapePolylines)
           dispatch(receiveShapes(shapes))
         })
     }
diff --git a/lib/gtfs/components/GtfsMap.js b/lib/gtfs/components/GtfsMap.js
index 4940dd965..93b47c0ee 100644
--- a/lib/gtfs/components/GtfsMap.js
+++ b/lib/gtfs/components/GtfsMap.js
@@ -1,8 +1,8 @@
 // @flow
 
-import React, { Component } from 'react'
+import React, { PureComponent } from 'react'
 import { shallowEqual } from 'react-pure-render'
-import { latLngBounds } from 'leaflet'
+import L, { latLngBounds } from 'leaflet'
 import { FeatureGroup, Map, Polyline, Rectangle, TileLayer } from 'react-leaflet'
 
 import * as filterActions from '../actions/filter'
@@ -13,7 +13,7 @@ import PatternGeoJson from './PatternGeoJson'
 import StopMarker from './StopMarker'
 
 import type {Props as ContainerProps} from '../containers/ActiveGtfsMap'
-import type {Bounds, Feed, LatLng, StopWithFeed} from '../../types'
+import type {Bounds, Feed, StopWithFeed} from '../../types'
 import type {DateTimeFilter, MapFilter} from '../../types/reducers'
 
 type Props = ContainerProps & {
@@ -38,28 +38,13 @@ type Props = ContainerProps & {
   updateMapState: typeof filterActions.updateMapState,
 }
 
-type State = {
-  bounds: any,
-  lastClicked?: LatLng,
-  map: any,
-  searchFocus?: any
-}
-
-const DEFAULT_BOUNDS = [[70, 130], [-70, -130]]
+const CANVAS = L.canvas()
 
-export default class GtfsMap extends Component<Props, State> {
+export default class GtfsMap extends PureComponent<Props> {
   static defaultProps = {
     entities: []
   }
 
-  componentWillMount () {
-    this.setState({
-      bounds: this.props.bounds || DEFAULT_BOUNDS,
-      map: {},
-      searchFocus: null
-    })
-  }
-
   componentDidMount () {
     this.resetMap(true)
   }
@@ -90,7 +75,6 @@ export default class GtfsMap extends Component<Props, State> {
       entities,
       feeds,
       height,
-      searchFocus,
       stop,
       width
     } = this.props
@@ -100,9 +84,6 @@ export default class GtfsMap extends Component<Props, State> {
         this._refreshGtfsElements(nextProps.feeds)
       }
     }
-    if (nextProps.searchFocus && nextProps.searchFocus !== searchFocus) {
-      this.setState({searchFocus: nextProps.searchFocus})
-    }
     if (nextProps.stop && !shallowEqual(nextProps.stop, stop)) {
       // handle stop: panning on stop select
       // NOTE: pattern panTo is handled with layerAddHandler and searchFocus
@@ -169,8 +150,7 @@ export default class GtfsMap extends Component<Props, State> {
   }
 
   layerAddHandler = (e: any) => {
-    const {stop, pattern} = this.props
-    const {searchFocus} = this.state
+    const {searchFocus, stop, pattern} = this.props
     // handle pattern panTo and popup open
     if (pattern && pattern.pattern_id === searchFocus) {
       // Wait to call open pop up to ensure that layer has fully materialized
@@ -182,12 +162,10 @@ export default class GtfsMap extends Component<Props, State> {
         // Open popup for pattern if added via a selection from the search
         e.layer.openPopup && e.layer.openPopup()
       }, 100)
-      this.setState({searchFocus: null})
     }
     if (stop && searchFocus === stop.stop_id) {
       // Open popup for stop if added via a selection from the search
       e.layer.openPopup && e.layer.openPopup()
-      this.setState({searchFocus: null})
     }
   }
 
@@ -250,6 +228,7 @@ export default class GtfsMap extends Component<Props, State> {
         {showBounds && versionBoundingBox &&
           <Rectangle
             bounds={versionBoundingBox}
+            interactive={false}
             fillOpacity={0} />
         }
 
@@ -330,9 +309,11 @@ export default class GtfsMap extends Component<Props, State> {
           shapes.data.map((shape, index) =>
             <Polyline
               color='#556c7f'
-              key={index}
-              weight={2}
-              positions={shape} />
+              interactive={false}
+              key={shape.id}
+              positions={shape.latLngs}
+              renderer={CANVAS}
+              weight={2} />
           )}
       </Map>
     )
diff --git a/lib/gtfs/components/ShowAllRoutesOnMapFilter.js b/lib/gtfs/components/ShowAllRoutesOnMapFilter.js
index 58bd8f33d..25cf8b4b6 100644
--- a/lib/gtfs/components/ShowAllRoutesOnMapFilter.js
+++ b/lib/gtfs/components/ShowAllRoutesOnMapFilter.js
@@ -30,23 +30,27 @@ export default class ShowAllRoutesOnMapFilter extends Component<Props> {
       showAllRoutesOnMap,
       version
     } = this.props
-    // Disable if greater than one million records. We don't want to break
-    // Data Tools because of this shapes GraphQL fetch. This is a somewhat
-    // arbitrary limit. It may need to be adjusted...
+    // If there are over a million records, let the user know that UI
+    // performance might suffer (server should be fine). This is a somewhat
+    // arbitrary limit. NL has over 4M shape records.
     const tooManyShapeRecords = version.feedLoadResult.shapes.rowCount > 1000000
     return (
       <Checkbox
         checked={showAllRoutesOnMap}
-        disabled={tooManyShapeRecords || fetchStatus.fetching}
+        disabled={fetchStatus.fetching}
         onChange={this.onChange}
       >
         {fetchStatus.fetching
           ? <span className='text-muted'>
             {this.messages('fetching')} <Icon className='fa-spin' type='refresh' />
           </span>
-          : tooManyShapeRecords
-            ? this.messages('tooManyShapeRecords')
-            : this.messages('showAllRoutesOnMap')}
+          : <span>
+            {this.messages('showAllRoutesOnMap')}
+            {tooManyShapeRecords && !fetchStatus.fetched &&
+              <small>{' '}({this.messages('tooManyShapeRecords')})</small>
+            }
+          </span>
+        }
       </Checkbox>
     )
   }
diff --git a/lib/gtfs/util/graphql.js b/lib/gtfs/util/graphql.js
index 47a5d528d..211d05fdb 100644
--- a/lib/gtfs/util/graphql.js
+++ b/lib/gtfs/util/graphql.js
@@ -194,14 +194,11 @@ query timetablesQuery(
 }`
 
 export const shapes = `
-query shapesQuery($namespace: String) {
-  feed (namespace: $namespace) {
-    patterns(limit: -1) {
-      shape(limit: -1) {
-        shape_pt_lat
-        shape_pt_lon
-        shape_pt_sequence
-      }
+query shapesQuery ($namespace: String) {
+  feed(namespace: $namespace) {
+    shapes_as_polylines {
+      shape_id
+      polyline
     }
   }
 }

From 56a30a9cf3549f5dcf57c78a489f1aa9bc0cc3b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Dec 2020 02:29:50 +0000
Subject: [PATCH 062/553] build(deps): bump ini from 1.3.5 to 1.3.7

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 491ab99b6..35067f15f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6347,9 +6347,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
+  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 
 init-package-json@^1.10.3:
   version "1.10.3"

From a01c96789445d9fb80e21edb89c9b80feb1d4ef8 Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Mon, 4 Jan 2021 14:34:05 +0100
Subject: [PATCH 063/553] Add config var in env.yml

---
 configurations/default/env.yml.tmp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configurations/default/env.yml.tmp b/configurations/default/env.yml.tmp
index a78cfeca0..344cd1527 100644
--- a/configurations/default/env.yml.tmp
+++ b/configurations/default/env.yml.tmp
@@ -7,5 +7,6 @@ MAPBOX_ATTRIBUTION: <a href="https://www.mapbox.com/about/maps/" target="_blank"
 SLACK_CHANNEL: optional-slack-channel
 SLACK_WEBHOOK: optional-slack-webhook
 GRAPH_HOPPER_KEY: your-graph-hopper-key
+GRAPH_HOPPER_URL: https://graphhopper.com/api/1/
 GOOGLE_ANALYTICS_TRACKING_ID: optional-ga-key
 # GRAPH_HOPPER_POINT_LIMIT: 10 # Defaults to 30

From 81e7feabd48d35a95c22134370a41d8e76e3559e Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Mon, 4 Jan 2021 14:43:20 +0100
Subject: [PATCH 064/553] Update valhalla.js to use config var

This updates the valhalla.js file to use the config variable GRAPH_HOPPER_URL and has a fallback if it is not defined.
---
 lib/scenario-editor/utils/valhalla.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/scenario-editor/utils/valhalla.js b/lib/scenario-editor/utils/valhalla.js
index ec48e770c..e106d9a14 100644
--- a/lib/scenario-editor/utils/valhalla.js
+++ b/lib/scenario-editor/utils/valhalla.js
@@ -195,6 +195,7 @@ export async function getSegment (
  * Example URL: https://graphhopper.com/api/1/route?point=49.932707,11.588051&point=50.3404,11.64705&vehicle=car&debug=true&&type=json
  */
 export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopperResponse> {
+  var graphhopper_url
   if (points.length < 2) {
     console.warn('need at least two points to route with graphhopper', points)
     return null
@@ -202,6 +203,13 @@ export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopp
   if (!process.env.GRAPH_HOPPER_KEY) {
     throw new Error('GRAPH_HOPPER_KEY not set')
   }
+  if (process.env.GRAPH_HOPPER_URL) {
+    // If there is a graph_hopper custom url defined then use it
+    graphhopper_url = process.env.GRAPH_HOPPER_URL
+  } else {
+    // The variable is not set the use the external default url
+    graphhopper_url = 'https://graphhopper.com/api/1/' 
+  }
   const params = {
     key: process.env.GRAPH_HOPPER_KEY,
     vehicle: 'car',
@@ -210,6 +218,6 @@ export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopp
   }
   const locations = points.map(p => (`point=${p.lat},${p.lng}`)).join('&')
   return fetch(
-    `https://graphhopper.com/api/1/route?${locations}&${qs.stringify(params)}`
+    `${graphhopper_url}route?${locations}&${qs.stringify(params)}`
   ).then(res => res.json())
 }

From 4f21a1e8d5f75ec3ce72de9f6f041f8560aa8590 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 6 Jan 2021 17:28:43 -0500
Subject: [PATCH 065/553] refactor(FeedVersionSpanChart): Add a 'today'
 indicator.

---
 .../version/FeedVersionSpanChart.js           | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 625c4bb42..ebaa69fa1 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -11,7 +11,8 @@ type Props = {
   comparedVersion: FeedVersion
 }
 
-const dateFormat = 'MMM. DD, YYYY'
+const dateFormat = 'MMM. D, YYYY'
+const todayDateFormat = 'MMM. D'
 
 const cellStyle = {
   border: 'none',
@@ -48,6 +49,7 @@ export default class FeedVersionSpanChart extends Component<Props> {
                 firstDate={firstDate}
                 lastDate={lastDate}
                 isServiceGap={false}
+                showToday
                 versionStartDate={activeStartDate}
                 versionEndDate={activeEndDate}
               />
@@ -63,6 +65,7 @@ export default class FeedVersionSpanChart extends Component<Props> {
                   firstDate={firstDate}
                   isServiceGap
                   lastDate={lastDate}
+                  showToday={false}
                   versionStartDate={earliestEnd}
                   versionEndDate={latestStart}
                 />
@@ -76,6 +79,7 @@ export default class FeedVersionSpanChart extends Component<Props> {
                 firstDate={firstDate}
                 lastDate={lastDate}
                 isServiceGap={false}
+                showToday={false}
                 versionStartDate={comparedStartDate}
                 versionEndDate={comparedEndDate}
               />
@@ -89,12 +93,16 @@ export default class FeedVersionSpanChart extends Component<Props> {
 
 // Width of feed span
 const WIDTH_PIXELS = 400
+// HACK: Set a fixed offset when positioning the 'today' tooltip,
+// since we cannot easily get the width of the 'today' tooltip text.
+const TODAY_OFFSET_PIXELS = 45
 
 /** Renders the validity span of one feed using the given props. */
 const FeedSpan = ({
   firstDate,
   lastDate,
   isServiceGap = false,
+  showToday = false,
   versionStartDate,
   versionEndDate
 }) => {
@@ -105,6 +113,12 @@ const FeedSpan = ({
   const relativeLength = daysActive / totalDays
   const relativeOffset = versionOffset / totalDays
   const startLabel = versionStartDate.format(dateFormat)
+
+  const today = moment()
+  const todayOffset = today.diff(firstDate, 'days')
+  // Show a 'today' arrow/bubble if today is not outside of the entire range.
+  const shouldShowToday = showToday && todayOffset >= 0 && todayOffset <= totalDays
+
   // Date labels and validity span occupy a third of the width available.
   const baseWidth = WIDTH_PIXELS / 3
   return (
@@ -133,6 +147,19 @@ const FeedSpan = ({
           />
         </OverlayTrigger>
         <span>{isServiceGap ? null : endLabel}</span>
+
+        {shouldShowToday && (
+          <Tooltip
+            arrowOffsetLeft={TODAY_OFFSET_PIXELS}
+            className='in'
+            id={`today-tip`}
+            placement={'top'}
+            positionLeft={baseWidth - TODAY_OFFSET_PIXELS + todayOffset / totalDays * baseWidth}
+            positionTop={-25}
+          >
+            {`Today - ${today.format(todayDateFormat)}`}
+          </Tooltip>
+        )}
       </div>
     </div>
   )

From 6e5c2dc9dcac2ac1a520a93d0e29f92bf1be4676 Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Thu, 7 Jan 2021 08:03:00 +0100
Subject: [PATCH 066/553] update changes to env.yml.tmp after review

---
 configurations/default/env.yml.tmp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configurations/default/env.yml.tmp b/configurations/default/env.yml.tmp
index 344cd1527..311da9813 100644
--- a/configurations/default/env.yml.tmp
+++ b/configurations/default/env.yml.tmp
@@ -7,6 +7,6 @@ MAPBOX_ATTRIBUTION: <a href="https://www.mapbox.com/about/maps/" target="_blank"
 SLACK_CHANNEL: optional-slack-channel
 SLACK_WEBHOOK: optional-slack-webhook
 GRAPH_HOPPER_KEY: your-graph-hopper-key
-GRAPH_HOPPER_URL: https://graphhopper.com/api/1/
+# GRAPH_HOPPER_URL: http://localhost:8989/api/
 GOOGLE_ANALYTICS_TRACKING_ID: optional-ga-key
 # GRAPH_HOPPER_POINT_LIMIT: 10 # Defaults to 30

From c750175539b7164ce318a36c9a6f4cde9329e8e3 Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Thu, 7 Jan 2021 08:05:45 +0100
Subject: [PATCH 067/553] update valhalla.js after review

---
 lib/scenario-editor/utils/valhalla.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/scenario-editor/utils/valhalla.js b/lib/scenario-editor/utils/valhalla.js
index e106d9a14..0370bdcee 100644
--- a/lib/scenario-editor/utils/valhalla.js
+++ b/lib/scenario-editor/utils/valhalla.js
@@ -203,13 +203,7 @@ export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopp
   if (!process.env.GRAPH_HOPPER_KEY) {
     throw new Error('GRAPH_HOPPER_KEY not set')
   }
-  if (process.env.GRAPH_HOPPER_URL) {
-    // If there is a graph_hopper custom url defined then use it
-    graphhopper_url = process.env.GRAPH_HOPPER_URL
-  } else {
-    // The variable is not set the use the external default url
-    graphhopper_url = 'https://graphhopper.com/api/1/' 
-  }
+  const GRAPH_HOPPER_URL = process.env.GRAPH_HOPPER_URL || 'https://graphhopper.com/api/1/'
   const params = {
     key: process.env.GRAPH_HOPPER_KEY,
     vehicle: 'car',
@@ -218,6 +212,6 @@ export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopp
   }
   const locations = points.map(p => (`point=${p.lat},${p.lng}`)).join('&')
   return fetch(
-    `${graphhopper_url}route?${locations}&${qs.stringify(params)}`
+    `${GRAPH_HOPPER_URL}route?${locations}&${qs.stringify(params)}`
   ).then(res => res.json())
 }

From 5ee65f458664cac16747d758833dc161c26d95d5 Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Thu, 7 Jan 2021 08:08:57 +0100
Subject: [PATCH 068/553] Update the grapphopper default url based on doc

Based on the doc located here: https://github.com/graphhopper/graphhopper/blob/2.x/docs/web/api-doc.md
---
 configurations/default/env.yml.tmp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configurations/default/env.yml.tmp b/configurations/default/env.yml.tmp
index 311da9813..730569b8b 100644
--- a/configurations/default/env.yml.tmp
+++ b/configurations/default/env.yml.tmp
@@ -7,6 +7,6 @@ MAPBOX_ATTRIBUTION: <a href="https://www.mapbox.com/about/maps/" target="_blank"
 SLACK_CHANNEL: optional-slack-channel
 SLACK_WEBHOOK: optional-slack-webhook
 GRAPH_HOPPER_KEY: your-graph-hopper-key
-# GRAPH_HOPPER_URL: http://localhost:8989/api/
+# GRAPH_HOPPER_URL: http://localhost:8989/
 GOOGLE_ANALYTICS_TRACKING_ID: optional-ga-key
 # GRAPH_HOPPER_POINT_LIMIT: 10 # Defaults to 30

From 315d7581c8461bf560f32555c0e4c873196c3740 Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Thu, 7 Jan 2021 19:09:42 +0100
Subject: [PATCH 069/553] add explination of the config url variable

---
 configurations/default/env.yml.tmp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configurations/default/env.yml.tmp b/configurations/default/env.yml.tmp
index 730569b8b..d05c954af 100644
--- a/configurations/default/env.yml.tmp
+++ b/configurations/default/env.yml.tmp
@@ -7,6 +7,7 @@ MAPBOX_ATTRIBUTION: <a href="https://www.mapbox.com/about/maps/" target="_blank"
 SLACK_CHANNEL: optional-slack-channel
 SLACK_WEBHOOK: optional-slack-webhook
 GRAPH_HOPPER_KEY: your-graph-hopper-key
+# Optional override to use a custom service instead of the graphhopper.com hosted service.
 # GRAPH_HOPPER_URL: http://localhost:8989/
 GOOGLE_ANALYTICS_TRACKING_ID: optional-ga-key
 # GRAPH_HOPPER_POINT_LIMIT: 10 # Defaults to 30

From 64d0ee732877593ba562fdd810fb4fbd3939cf16 Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Thu, 7 Jan 2021 19:12:08 +0100
Subject: [PATCH 070/553] Update valhalla to add info about the url variable

---
 lib/scenario-editor/utils/valhalla.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/scenario-editor/utils/valhalla.js b/lib/scenario-editor/utils/valhalla.js
index 0370bdcee..a6842daac 100644
--- a/lib/scenario-editor/utils/valhalla.js
+++ b/lib/scenario-editor/utils/valhalla.js
@@ -203,6 +203,7 @@ export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopp
   if (!process.env.GRAPH_HOPPER_KEY) {
     throw new Error('GRAPH_HOPPER_KEY not set')
   }
+  // Use custom url if it exists, otherwise default to the hosted service.
   const GRAPH_HOPPER_URL = process.env.GRAPH_HOPPER_URL || 'https://graphhopper.com/api/1/'
   const params = {
     key: process.env.GRAPH_HOPPER_KEY,

From 0724f45dd7638acdd370ebe83bb6d02bdf851e0c Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 20 Jan 2021 15:11:12 -0500
Subject: [PATCH 071/553] refactor(FeedVersionSpanChart): Add date marker, have
 z-index working

---
 .../version/FeedVersionSpanChart.js           | 288 ++++++++++++------
 1 file changed, 196 insertions(+), 92 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index ebaa69fa1..b0fc4ff6d 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -2,7 +2,7 @@
 
 import moment from 'moment'
 import React, { Component } from 'react'
-import { OverlayTrigger, Table, Tooltip } from 'react-bootstrap'
+import { Col, Grid, OverlayTrigger, Row, Tooltip } from 'react-bootstrap'
 
 import type { FeedVersion } from '../../../types'
 
@@ -14,10 +14,11 @@ type Props = {
 const dateFormat = 'MMM. D, YYYY'
 const todayDateFormat = 'MMM. D'
 
-const cellStyle = {
-  border: 'none',
-  padding: '0 5px'
-}
+const BASE_HEIGHT_EM = 1.25
+const HEIGHT_EM = `${BASE_HEIGHT_EM}em`
+const SPAN_MARGIN_PIXELS = 5
+const DATE_LABEL_ZINDEX = 9999
+const TODAY_LABEL_ZINDEX = 9998
 
 /**
  * This component renders bars representing the date ranges for which the given feed versions
@@ -40,53 +41,78 @@ export default class FeedVersionSpanChart extends Component<Props> {
     const latestStart = moment.max(activeStartDate, comparedStartDate)
 
     return (
-      <Table>
-        <tbody>
-          <tr>
-            <td style={{fontWeight: 800, ...cellStyle}}>Version {activeVersion.version} (selected)</td>
-            <td style={{fontWeight: 800, ...cellStyle}}>
-              <FeedSpan
-                firstDate={firstDate}
-                lastDate={lastDate}
-                isServiceGap={false}
-                showToday
-                versionStartDate={activeStartDate}
-                versionEndDate={activeEndDate}
-              />
-            </td>
-          </tr>
-          {/* Highlight gap in service if one exists */}
-          {latestStart.diff(earliestEnd, 'days') > 0 &&
-            <tr style={{height: '1em'}}>
-              {/* Cell placeholder to prevent formatting issues */}
-              <td className='text-danger' style={cellStyle}>Gap in service</td>
-              <td style={cellStyle}>
-                <FeedSpan
-                  firstDate={firstDate}
-                  isServiceGap
-                  lastDate={lastDate}
-                  showToday={false}
-                  versionStartDate={earliestEnd}
-                  versionEndDate={latestStart}
-                />
-              </td>
-            </tr>
-          }
-          <tr>
-            <td style={cellStyle}>Version {comparedVersion.version}</td>
-            <td style={cellStyle}>
+      <Grid>
+        <Row>
+          <Col xs={3}>
+            <div style={{height: HEIGHT_EM}}>Version {activeVersion.version} (selected)</div>
+            {/* Cell placeholder to prevent formatting issues */}
+            {latestStart.diff(earliestEnd, 'days') > 0 && <div className='text-danger' style={{height: HEIGHT_EM}}>Gap in service</div>}
+            <div style={{height: HEIGHT_EM}}>Version {comparedVersion.version}</div>
+          </Col>
+          <Col xs={9} style={{position: 'relative', height: '120px'}}>
+            <FeedStartLabel
+              firstDate={firstDate}
+              lastDate={lastDate}
+              top={0}
+              versionStartDate={activeStartDate}
+            />
+            <FeedEndLabel
+              firstDate={firstDate}
+              lastDate={lastDate}
+              top={0}
+              versionStartDate={activeStartDate}
+              versionEndDate={activeEndDate}
+            />
+            <FeedSpan
+              firstDate={firstDate}
+              lastDate={lastDate}
+              isServiceGap={false}
+              top={0}
+              versionStartDate={activeStartDate}
+              versionEndDate={activeEndDate}
+            />
+
+            {latestStart.diff(earliestEnd, 'days') > 0 &&
               <FeedSpan
                 firstDate={firstDate}
+                isServiceGap
                 lastDate={lastDate}
-                isServiceGap={false}
-                showToday={false}
-                versionStartDate={comparedStartDate}
-                versionEndDate={comparedEndDate}
+                top={`${BASE_HEIGHT_EM}em`}
+                versionStartDate={earliestEnd}
+                versionEndDate={latestStart}
               />
-            </td>
-          </tr>
-        </tbody>
-      </Table>
+            }
+
+            <FeedStartLabel
+              firstDate={firstDate}
+              lastDate={lastDate}
+              top={`${2 * BASE_HEIGHT_EM}em`}
+              versionStartDate={comparedStartDate}
+            />
+            <FeedEndLabel
+              firstDate={firstDate}
+              lastDate={lastDate}
+              top={`${2 * BASE_HEIGHT_EM}em`}
+              versionStartDate={comparedStartDate}
+              versionEndDate={comparedEndDate}
+            />
+            <FeedSpan
+              firstDate={firstDate}
+              lastDate={lastDate}
+              isServiceGap={false}
+              top={`${2 * BASE_HEIGHT_EM}em`}
+              versionStartDate={comparedStartDate}
+              versionEndDate={comparedEndDate}
+            />
+            <TodayMarker
+              firstDate={firstDate}
+              lastDate={lastDate}
+              versionStartDate={activeStartDate}
+              versionEndDate={activeEndDate}
+            />
+          </Col>
+        </Row>
+      </Grid>
     )
   }
 }
@@ -102,65 +128,143 @@ const FeedSpan = ({
   firstDate,
   lastDate,
   isServiceGap = false,
-  showToday = false,
+  top,
   versionStartDate,
   versionEndDate
 }) => {
   const totalDays = lastDate.diff(firstDate, 'days')
   const versionOffset = versionStartDate.diff(firstDate, 'days')
   const daysActive = versionEndDate.diff(versionStartDate, 'days')
-  const endLabel = versionEndDate.format(dateFormat)
   const relativeLength = daysActive / totalDays
   const relativeOffset = versionOffset / totalDays
+
+  // Date labels and validity span occupy a third of the width available.
+  const baseWidth = WIDTH_PIXELS / 3
+
+  return (
+    <OverlayTrigger
+      placement='bottom'
+      overlay={
+        <Tooltip id={`feed-span`}>
+          {isServiceGap && 'No service for'}{' '}
+          {daysActive} days
+        </Tooltip>
+      }>
+      <span
+        style={{
+          height: HEIGHT_EM,
+          left: `${relativeOffset * baseWidth + SPAN_MARGIN_PIXELS + baseWidth}px`,
+          position: 'absolute',
+          top,
+          width: `${relativeLength * baseWidth}px`
+        }}
+      >
+        <span
+          style={{
+            backgroundColor: isServiceGap ? 'red' : 'grey',
+            height: '.75em',
+            position: 'absolute',
+            bottom: '10%',
+            width: '100%'
+          }}
+          title={`${daysActive} days`}
+
+        />
+      </span>
+    </OverlayTrigger>
+  )
+}
+
+/**
+ * Renders a validity span START label (needs to be separate from the span itself for Z order).
+ */
+const FeedStartLabel = ({
+  firstDate,
+  lastDate,
+  top,
+  versionStartDate
+}) => {
+  const totalDays = lastDate.diff(firstDate, 'days')
+  const versionOffset = versionStartDate.diff(firstDate, 'days')
+  const relativeOffset = versionOffset / totalDays
   const startLabel = versionStartDate.format(dateFormat)
 
+  // Date labels and validity span occupy a third of the width available.
+  const baseWidth = WIDTH_PIXELS / 3
+
+  return (
+    <span style={{
+      //display: 'inline-block',
+      left: `${relativeOffset * baseWidth}px`,
+      height: HEIGHT_EM,
+      position: 'absolute',
+      textAlign: 'right',
+      top,
+      width: `${baseWidth}px`,
+      zIndex: DATE_LABEL_ZINDEX
+    }}>
+      {startLabel}
+    </span>
+  )
+}
+
+/**
+ * Renders a validity span END label (needs to be separate from the span itself for Z order).
+ */
+const FeedEndLabel = ({
+  firstDate,
+  lastDate,
+  top,
+  versionStartDate,
+  versionEndDate
+}) => {
+  const totalDays = lastDate.diff(firstDate, 'days')
+  const versionOffset = versionStartDate.diff(firstDate, 'days')
+  const daysActive = versionEndDate.diff(versionStartDate, 'days')
+  const endLabel = versionEndDate.format(dateFormat)
+  const relativeLength = daysActive / totalDays
+  const relativeOffset = versionOffset / totalDays
+
+  // Date labels and validity span occupy a third of the width available.
+  const baseWidth = WIDTH_PIXELS / 3
+
+  return (
+    <span style={{
+      left: `${relativeOffset * baseWidth + SPAN_MARGIN_PIXELS + baseWidth + relativeLength * baseWidth + SPAN_MARGIN_PIXELS}px`,
+      height: HEIGHT_EM,
+      position: 'absolute',
+      top,
+      zIndex: DATE_LABEL_ZINDEX
+    }}>
+      {endLabel}
+    </span>
+  )
+}
+
+/** Renders a marker on today's date (if one of the feeds being compared is valid). */
+const TodayMarker = ({
+  firstDate,
+  lastDate,
+  versionStartDate,
+  versionEndDate
+}) => {
+  const totalDays = lastDate.diff(firstDate, 'days')
+
   const today = moment()
   const todayOffset = today.diff(firstDate, 'days')
-  // Show a 'today' arrow/bubble if today is not outside of the entire range.
-  const shouldShowToday = showToday && todayOffset >= 0 && todayOffset <= totalDays
 
   // Date labels and validity span occupy a third of the width available.
   const baseWidth = WIDTH_PIXELS / 3
   return (
-    <div style={{position: 'relative', width: `${WIDTH_PIXELS}px`}}>
-      <div style={{left: `${relativeOffset * baseWidth}px`, position: 'absolute'}}>
-        <span style={{display: 'inline-block', textAlign: 'right', width: `${baseWidth}px`}}>
-          {isServiceGap ? null : startLabel}
-        </span>
-        <OverlayTrigger
-          placement='bottom'
-          overlay={
-            <Tooltip id={`feed-span`}>
-              {isServiceGap && 'No service for'}{' '}
-              {daysActive} days
-            </Tooltip>
-          }>
-          <span
-            style={{
-              backgroundColor: isServiceGap ? 'red' : 'grey',
-              display: 'inline-block',
-              height: '.75em',
-              margin: '0 5px',
-              width: `${relativeLength * baseWidth}px`,
-              verticalAlign: '0px'
-            }}
-          />
-        </OverlayTrigger>
-        <span>{isServiceGap ? null : endLabel}</span>
-
-        {shouldShowToday && (
-          <Tooltip
-            arrowOffsetLeft={TODAY_OFFSET_PIXELS}
-            className='in'
-            id={`today-tip`}
-            placement={'top'}
-            positionLeft={baseWidth - TODAY_OFFSET_PIXELS + todayOffset / totalDays * baseWidth}
-            positionTop={-25}
-          >
-            {`Today - ${today.format(todayDateFormat)}`}
-          </Tooltip>
-        )}
-      </div>
-    </div>
+    <div style={{
+      backgroundColor: 'yellow',
+      border: '1px solid #bbb',
+      height: `${BASE_HEIGHT_EM * 3}em`,
+      left: `${baseWidth + todayOffset / totalDays * baseWidth}px`,
+      position: 'absolute',
+      top: 0,
+      width: '4px',
+      zIndex: TODAY_LABEL_ZINDEX
+    }} />
   )
 }

From 4c46b9a7b25131ad64fbba78a8bc763ca35ed305 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 21 Jan 2021 15:49:57 -0500
Subject: [PATCH 072/553] refactor(FeedVersionSpanChart): Add back tooltip for
 today marker. Refactor.

---
 .../version/FeedVersionSpanChart.js           | 137 +++++++++---------
 1 file changed, 67 insertions(+), 70 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index b0fc4ff6d..7a4265113 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -11,14 +11,17 @@ type Props = {
   comparedVersion: FeedVersion
 }
 
-const dateFormat = 'MMM. D, YYYY'
-const todayDateFormat = 'MMM. D'
+const DATE_FORMAT = 'MMM. D, YYYY'
+const TODAY_DATE_FORMAT = 'MMM. D'
 
 const BASE_HEIGHT_EM = 1.25
 const HEIGHT_EM = `${BASE_HEIGHT_EM}em`
 const SPAN_MARGIN_PIXELS = 5
+// Render the 'today' marker above the spans (they have default z-index),
+// but underneath the date labels.
+// This is also why we need to split up labels and spans during rendering.
 const DATE_LABEL_ZINDEX = 9999
-const TODAY_LABEL_ZINDEX = 9998
+const TODAY_MARKER_ZINDEX = 9998
 
 /**
  * This component renders bars representing the date ranges for which the given feed versions
@@ -40,39 +43,44 @@ export default class FeedVersionSpanChart extends Component<Props> {
     const earliestEnd = moment.min(activeEndDate, comparedEndDate)
     const latestStart = moment.max(activeStartDate, comparedStartDate)
 
+    const hasGap = latestStart.diff(earliestEnd, 'days') > 0
+
+    // Render the today marker if it is between first and last date.
+    const today = moment()
+    const totalDays = lastDate.diff(firstDate, 'days')
+    const todayOffset = today.diff(firstDate, 'days')
+    const showToday = todayOffset >= 0 && todayOffset < totalDays
+
+    const activeChartProps = {
+      firstDate,
+      lastDate,
+      top: 0,
+      versionEndDate: activeEndDate,
+      versionStartDate: activeStartDate
+    }
+    const comparedChartProps = {
+      firstDate,
+      lastDate,
+      top: `${(hasGap ? 2 : 1) * BASE_HEIGHT_EM}em`,
+      versionEndDate: comparedEndDate,
+      versionStartDate: comparedStartDate
+    }
+
     return (
       <Grid>
         <Row>
           <Col xs={3}>
             <div style={{height: HEIGHT_EM}}>Version {activeVersion.version} (selected)</div>
             {/* Cell placeholder to prevent formatting issues */}
-            {latestStart.diff(earliestEnd, 'days') > 0 && <div className='text-danger' style={{height: HEIGHT_EM}}>Gap in service</div>}
+            {hasGap && <div className='text-danger' style={{height: HEIGHT_EM}}>Gap in service</div>}
             <div style={{height: HEIGHT_EM}}>Version {comparedVersion.version}</div>
           </Col>
           <Col xs={9} style={{position: 'relative', height: '120px'}}>
-            <FeedStartLabel
-              firstDate={firstDate}
-              lastDate={lastDate}
-              top={0}
-              versionStartDate={activeStartDate}
-            />
-            <FeedEndLabel
-              firstDate={firstDate}
-              lastDate={lastDate}
-              top={0}
-              versionStartDate={activeStartDate}
-              versionEndDate={activeEndDate}
-            />
-            <FeedSpan
-              firstDate={firstDate}
-              lastDate={lastDate}
-              isServiceGap={false}
-              top={0}
-              versionStartDate={activeStartDate}
-              versionEndDate={activeEndDate}
-            />
+            <FeedStartLabel {...activeChartProps} />
+            <FeedEndLabel {...activeChartProps} />
+            <FeedSpan {...activeChartProps} isServiceGap={false} />
 
-            {latestStart.diff(earliestEnd, 'days') > 0 &&
+            {hasGap &&
               <FeedSpan
                 firstDate={firstDate}
                 isServiceGap
@@ -83,33 +91,14 @@ export default class FeedVersionSpanChart extends Component<Props> {
               />
             }
 
-            <FeedStartLabel
-              firstDate={firstDate}
-              lastDate={lastDate}
-              top={`${2 * BASE_HEIGHT_EM}em`}
-              versionStartDate={comparedStartDate}
-            />
-            <FeedEndLabel
-              firstDate={firstDate}
-              lastDate={lastDate}
-              top={`${2 * BASE_HEIGHT_EM}em`}
-              versionStartDate={comparedStartDate}
-              versionEndDate={comparedEndDate}
-            />
-            <FeedSpan
-              firstDate={firstDate}
-              lastDate={lastDate}
-              isServiceGap={false}
-              top={`${2 * BASE_HEIGHT_EM}em`}
-              versionStartDate={comparedStartDate}
-              versionEndDate={comparedEndDate}
-            />
-            <TodayMarker
+            <FeedStartLabel {...comparedChartProps} />
+            <FeedEndLabel {...comparedChartProps} />
+            <FeedSpan {...comparedChartProps} isServiceGap={false} />
+
+            {showToday && <TodayMarker
               firstDate={firstDate}
               lastDate={lastDate}
-              versionStartDate={activeStartDate}
-              versionEndDate={activeEndDate}
-            />
+            />}
           </Col>
         </Row>
       </Grid>
@@ -119,9 +108,6 @@ export default class FeedVersionSpanChart extends Component<Props> {
 
 // Width of feed span
 const WIDTH_PIXELS = 400
-// HACK: Set a fixed offset when positioning the 'today' tooltip,
-// since we cannot easily get the width of the 'today' tooltip text.
-const TODAY_OFFSET_PIXELS = 45
 
 /** Renders the validity span of one feed using the given props. */
 const FeedSpan = ({
@@ -187,14 +173,14 @@ const FeedStartLabel = ({
   const totalDays = lastDate.diff(firstDate, 'days')
   const versionOffset = versionStartDate.diff(firstDate, 'days')
   const relativeOffset = versionOffset / totalDays
-  const startLabel = versionStartDate.format(dateFormat)
+  const startLabel = versionStartDate.format(DATE_FORMAT)
 
   // Date labels and validity span occupy a third of the width available.
   const baseWidth = WIDTH_PIXELS / 3
 
   return (
     <span style={{
-      //display: 'inline-block',
+      // display: 'inline-block',
       left: `${relativeOffset * baseWidth}px`,
       height: HEIGHT_EM,
       position: 'absolute',
@@ -221,7 +207,7 @@ const FeedEndLabel = ({
   const totalDays = lastDate.diff(firstDate, 'days')
   const versionOffset = versionStartDate.diff(firstDate, 'days')
   const daysActive = versionEndDate.diff(versionStartDate, 'days')
-  const endLabel = versionEndDate.format(dateFormat)
+  const endLabel = versionEndDate.format(DATE_FORMAT)
   const relativeLength = daysActive / totalDays
   const relativeOffset = versionOffset / totalDays
 
@@ -244,9 +230,7 @@ const FeedEndLabel = ({
 /** Renders a marker on today's date (if one of the feeds being compared is valid). */
 const TodayMarker = ({
   firstDate,
-  lastDate,
-  versionStartDate,
-  versionEndDate
+  lastDate
 }) => {
   const totalDays = lastDate.diff(firstDate, 'days')
 
@@ -255,16 +239,29 @@ const TodayMarker = ({
 
   // Date labels and validity span occupy a third of the width available.
   const baseWidth = WIDTH_PIXELS / 3
+
   return (
-    <div style={{
-      backgroundColor: 'yellow',
-      border: '1px solid #bbb',
-      height: `${BASE_HEIGHT_EM * 3}em`,
-      left: `${baseWidth + todayOffset / totalDays * baseWidth}px`,
-      position: 'absolute',
-      top: 0,
-      width: '4px',
-      zIndex: TODAY_LABEL_ZINDEX
-    }} />
+    <OverlayTrigger
+      overlay={<Tooltip
+        className='in'
+        id={`today-tip`}
+        placement={'top'}
+        positionTop={-25}>
+        {`Today - ${today.format(TODAY_DATE_FORMAT)}`}
+      </Tooltip>}
+      placement='top'>
+      <div
+        style={{
+          backgroundColor: 'yellow',
+          border: '1px solid #bbb',
+          height: `${BASE_HEIGHT_EM * 3}em`,
+          left: `${baseWidth + todayOffset / totalDays * baseWidth}px`,
+          position: 'absolute',
+          top: 0,
+          width: '4px',
+          zIndex: TODAY_MARKER_ZINDEX
+        }}
+      />
+    </OverlayTrigger>
   )
 }

From 59cf1ae85548469df283f892ae5cb8174a7dbf9e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 21 Jan 2021 16:16:45 -0500
Subject: [PATCH 073/553] refactor(FeedVersionNavigator): Move compared ver.
 selector to this component.

---
 .../components/version/FeedVersionDetails.js      |  7 -------
 .../components/version/FeedVersionNavigator.js    | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index cb3ce3854..f973497a8 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -18,7 +18,6 @@ import {getConfigProperty, isExtensionEnabled} from '../../../common/util/config
 import {BLOCKING_ERROR_TYPES} from '../../util/version'
 import VersionDateLabel from './VersionDateLabel'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
-import VersionComparisonDropdown from './VersionComparisonDropdown'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
 
 import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
@@ -120,12 +119,6 @@ export default class FeedVersionDetails extends Component<Props> {
       <ListGroupItem>
         <h4>
           <ButtonToolbar className='pull-right' style={{marginTop: '-7px'}}>
-            <VersionComparisonDropdown
-              comparedVersionIndex={comparedVersionIndex}
-              feedSource={feedSource}
-              version={version}
-              versions={feedSource.feedVersions}
-             />
             {/*
             Only show merge feeds button if the feed starts in the future.
             FIXME: uncomment out the below to prevent merges with non-future feeds.
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index c86ec914e..222895874 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -18,6 +18,7 @@ import * as gtfsPlusActions from '../../../gtfsplus/actions/gtfsplus'
 import * as deploymentActions from '../../../manager/actions/deployments'
 import DeploymentPreviewButton from '../DeploymentPreviewButton'
 import FeedVersionViewer from './FeedVersionViewer'
+import VersionComparisonDropdown from './VersionComparisonDropdown'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
 
 import type {Props as ContainerProps} from '../../containers/ActiveFeedVersionNavigator'
@@ -228,6 +229,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                   </Button>
                 </ButtonGroup>
               }
+
               <ButtonToolbar className='pull-right'>
                 <ButtonGroup>
                   {isModuleEnabled('deployment') && deploymentForVersion
@@ -297,6 +299,19 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                   : null
                 }
               </ButtonToolbar>
+
+              {feedSource.feedVersions &&
+                <ButtonToolbar className='pull-right'>
+                  <ButtonGroup>
+                    <VersionComparisonDropdown
+                      comparedVersionIndex={comparedVersionIndex}
+                      feedSource={feedSource}
+                      version={version}
+                      versions={feedSource.feedVersions}
+                    />
+                  </ButtonGroup>
+                </ButtonToolbar>
+              }
             </ButtonToolbar>
           </Col>
         </Row>

From 03b3652bbb4045bfecf5cd7b590c3fb5fff3ad2e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 21 Jan 2021 17:17:16 -0500
Subject: [PATCH 074/553] refactor(FeedVersionSpanChart): Tighten up date label
 widths.

---
 .../version/FeedVersionSpanChart.js           | 133 ++++++++----------
 1 file changed, 58 insertions(+), 75 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 7a4265113..3c22c609a 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -4,6 +4,7 @@ import moment from 'moment'
 import React, { Component } from 'react'
 import { Col, Grid, OverlayTrigger, Row, Tooltip } from 'react-bootstrap'
 
+import VersionDateLabel from './VersionDateLabel'
 import type { FeedVersion } from '../../../types'
 
 type Props = {
@@ -14,9 +15,12 @@ type Props = {
 const DATE_FORMAT = 'MMM. D, YYYY'
 const TODAY_DATE_FORMAT = 'MMM. D'
 
-const BASE_HEIGHT_EM = 1.25
-const HEIGHT_EM = `${BASE_HEIGHT_EM}em`
-const SPAN_MARGIN_PIXELS = 5
+// Width of feed span bar.
+const BAR_WIDTH_PX = 150
+const DATE_WIDTH_PX = 100
+const HEIGHT_EM = 1.25
+const HEIGHT_PROP = `${HEIGHT_EM}em`
+const SPAN_MARGIN_PX = 5
 // Render the 'today' marker above the spans (they have default z-index),
 // but underneath the date labels.
 // This is also why we need to split up labels and spans during rendering.
@@ -56,49 +60,45 @@ export default class FeedVersionSpanChart extends Component<Props> {
       lastDate,
       top: 0,
       versionEndDate: activeEndDate,
+      versionLabel: <VersionDateLabel version={activeVersion} />,
       versionStartDate: activeStartDate
     }
     const comparedChartProps = {
       firstDate,
       lastDate,
-      top: `${(hasGap ? 2 : 1) * BASE_HEIGHT_EM}em`,
+      top: (`${(hasGap ? 2 : 1) * HEIGHT_EM}em`),
       versionEndDate: comparedEndDate,
+      versionLabel: <VersionDateLabel version={comparedVersion} />,
       versionStartDate: comparedStartDate
     }
 
     return (
-      <Grid>
+      <Grid style={{ width: 'auto' }}>
         <Row>
           <Col xs={3}>
-            <div style={{height: HEIGHT_EM}}>Version {activeVersion.version} (selected)</div>
-            {/* Cell placeholder to prevent formatting issues */}
-            {hasGap && <div className='text-danger' style={{height: HEIGHT_EM}}>Gap in service</div>}
-            <div style={{height: HEIGHT_EM}}>Version {comparedVersion.version}</div>
+            <div style={{ height: HEIGHT_PROP }}>Version {activeVersion.version} (selected)</div>
+            {}
+            {hasGap &&
+            <div className='text-danger' style={{ height: HEIGHT_PROP }}>Gap in service</div>}
+            <div style={{ height: HEIGHT_PROP }}>Version {comparedVersion.version}</div>
           </Col>
-          <Col xs={9} style={{position: 'relative', height: '120px'}}>
+          <Col xs={9} style={{ position: 'relative', height: '120px' }}>
             <FeedStartLabel {...activeChartProps} />
             <FeedEndLabel {...activeChartProps} />
             <FeedSpan {...activeChartProps} isServiceGap={false} />
-
             {hasGap &&
-              <FeedSpan
-                firstDate={firstDate}
-                isServiceGap
-                lastDate={lastDate}
-                top={`${BASE_HEIGHT_EM}em`}
-                versionStartDate={earliestEnd}
-                versionEndDate={latestStart}
-              />
-            }
-
-            <FeedStartLabel {...comparedChartProps} />
-            <FeedEndLabel {...comparedChartProps} />
-            <FeedSpan {...comparedChartProps} isServiceGap={false} />
-
-            {showToday && <TodayMarker
+            <FeedSpan
               firstDate={firstDate}
+              isServiceGap
               lastDate={lastDate}
+              top={`${HEIGHT_EM}em`}
+              versionStartDate={earliestEnd}
+              versionEndDate={latestStart}
             />}
+            <FeedStartLabel {...comparedChartProps} />
+            <FeedEndLabel {...comparedChartProps} />
+            <FeedSpan {...comparedChartProps} isServiceGap={false} />
+            {showToday && <TodayMarker firstDate={firstDate} lastDate={lastDate} />}
           </Col>
         </Row>
       </Grid>
@@ -106,9 +106,6 @@ export default class FeedVersionSpanChart extends Component<Props> {
   }
 }
 
-// Width of feed span
-const WIDTH_PIXELS = 400
-
 /** Renders the validity span of one feed using the given props. */
 const FeedSpan = ({
   firstDate,
@@ -124,27 +121,21 @@ const FeedSpan = ({
   const relativeLength = daysActive / totalDays
   const relativeOffset = versionOffset / totalDays
 
-  // Date labels and validity span occupy a third of the width available.
-  const baseWidth = WIDTH_PIXELS / 3
-
   return (
     <OverlayTrigger
       placement='bottom'
-      overlay={
-        <Tooltip id={`feed-span`}>
-          {isServiceGap && 'No service for'}{' '}
-          {daysActive} days
-        </Tooltip>
-      }>
+      overlay={<Tooltip id={`feed-span`}>
+        {isServiceGap && 'No service for'}{' '}
+        {daysActive} days
+      </Tooltip>}>
       <span
         style={{
-          height: HEIGHT_EM,
-          left: `${relativeOffset * baseWidth + SPAN_MARGIN_PIXELS + baseWidth}px`,
+          height: HEIGHT_PROP,
+          left: `${relativeOffset * BAR_WIDTH_PX + SPAN_MARGIN_PX + DATE_WIDTH_PX}px`,
           position: 'absolute',
           top,
-          width: `${relativeLength * baseWidth}px`
-        }}
-      >
+          width: `${relativeLength * BAR_WIDTH_PX}px`
+        }}>
         <span
           style={{
             backgroundColor: isServiceGap ? 'red' : 'grey',
@@ -154,7 +145,6 @@ const FeedSpan = ({
             width: '100%'
           }}
           title={`${daysActive} days`}
-
         />
       </span>
     </OverlayTrigger>
@@ -175,20 +165,17 @@ const FeedStartLabel = ({
   const relativeOffset = versionOffset / totalDays
   const startLabel = versionStartDate.format(DATE_FORMAT)
 
-  // Date labels and validity span occupy a third of the width available.
-  const baseWidth = WIDTH_PIXELS / 3
-
   return (
-    <span style={{
-      // display: 'inline-block',
-      left: `${relativeOffset * baseWidth}px`,
-      height: HEIGHT_EM,
-      position: 'absolute',
-      textAlign: 'right',
-      top,
-      width: `${baseWidth}px`,
-      zIndex: DATE_LABEL_ZINDEX
-    }}>
+    <span
+      style={{
+        left: `${relativeOffset * BAR_WIDTH_PX}px`,
+        height: HEIGHT_PROP,
+        position: 'absolute',
+        textAlign: 'right',
+        top,
+        width: `${DATE_WIDTH_PX}px`,
+        zIndex: DATE_LABEL_ZINDEX
+      }}>
       {startLabel}
     </span>
   )
@@ -201,8 +188,9 @@ const FeedEndLabel = ({
   firstDate,
   lastDate,
   top,
-  versionStartDate,
-  versionEndDate
+  versionEndDate,
+  versionLabel,
+  versionStartDate
 }) => {
   const totalDays = lastDate.diff(firstDate, 'days')
   const versionOffset = versionStartDate.diff(firstDate, 'days')
@@ -211,18 +199,16 @@ const FeedEndLabel = ({
   const relativeLength = daysActive / totalDays
   const relativeOffset = versionOffset / totalDays
 
-  // Date labels and validity span occupy a third of the width available.
-  const baseWidth = WIDTH_PIXELS / 3
-
   return (
-    <span style={{
-      left: `${relativeOffset * baseWidth + SPAN_MARGIN_PIXELS + baseWidth + relativeLength * baseWidth + SPAN_MARGIN_PIXELS}px`,
-      height: HEIGHT_EM,
-      position: 'absolute',
-      top,
-      zIndex: DATE_LABEL_ZINDEX
-    }}>
-      {endLabel}
+    <span
+      style={{
+        left: `${relativeOffset * BAR_WIDTH_PX + SPAN_MARGIN_PX + DATE_WIDTH_PX + relativeLength * BAR_WIDTH_PX + SPAN_MARGIN_PX}px`,
+        height: HEIGHT_PROP,
+        position: 'absolute',
+        top,
+        zIndex: DATE_LABEL_ZINDEX
+      }}>
+      {endLabel} {versionLabel}
     </span>
   )
 }
@@ -237,9 +223,6 @@ const TodayMarker = ({
   const today = moment()
   const todayOffset = today.diff(firstDate, 'days')
 
-  // Date labels and validity span occupy a third of the width available.
-  const baseWidth = WIDTH_PIXELS / 3
-
   return (
     <OverlayTrigger
       overlay={<Tooltip
@@ -254,8 +237,8 @@ const TodayMarker = ({
         style={{
           backgroundColor: 'yellow',
           border: '1px solid #bbb',
-          height: `${BASE_HEIGHT_EM * 3}em`,
-          left: `${baseWidth + todayOffset / totalDays * baseWidth}px`,
+          height: `${HEIGHT_EM * 3}em`,
+          left: `${DATE_WIDTH_PX + todayOffset / totalDays * BAR_WIDTH_PX}px`,
           position: 'absolute',
           top: 0,
           width: '4px',

From aaf64cf85723dd1be1f4425acaa72a0907f5642c Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 21 Jan 2021 19:38:26 -0500
Subject: [PATCH 075/553] refactor(FeedVersionDetails): Move validity dates to
 this component. Tweak layout.

---
 .../components/version/FeedVersionDetails.js  | 30 +++++-----
 .../version/FeedVersionSpanChart.js           | 57 +++++++++++--------
 .../components/version/FeedVersionTabs.js     | 11 ----
 3 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index f973497a8..17eee46d3 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -1,7 +1,6 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
-import moment from 'moment'
 import React, {Component} from 'react'
 import {
   Button,
@@ -16,10 +15,9 @@ import bboxPoly from 'turf-bbox-polygon'
 import * as versionsActions from '../../actions/versions'
 import {getConfigProperty, isExtensionEnabled} from '../../../common/util/config'
 import {BLOCKING_ERROR_TYPES} from '../../util/version'
-import VersionDateLabel from './VersionDateLabel'
+import FeedVersionSpanChart from './FeedVersionSpanChart'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
-
 import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
 import type {ManagerUserState} from '../../../types/reducers'
 
@@ -34,8 +32,6 @@ type Props = {
   version: FeedVersion
 }
 
-const dateFormat = 'MMM. DD, YYYY'
-
 export default class FeedVersionDetails extends Component<Props> {
   getBoundsArea (bounds: Bounds): number {
     if (!bounds) return 0
@@ -87,6 +83,7 @@ export default class FeedVersionDetails extends Component<Props> {
 
   render () {
     const {
+      comparedVersion,
       comparedVersionIndex,
       feedSource,
       gtfsPlusValidation,
@@ -163,20 +160,16 @@ export default class FeedVersionDetails extends Component<Props> {
           </ButtonToolbar>
           <span data-test-id='feed-version-validity'>
             <Icon type='calendar' />{' '}
-            Valid from {moment(summary.startDate).format(dateFormat)}{' '}
-            to {moment(summary.endDate).format(dateFormat)}
+            Feed validity dates
           </span>
-          {' '}
-          <VersionDateLabel version={version} />
           {(hasBlockingIssue || hasGtfsPlusBlockingIssue) &&
             isExtensionEnabled('mtc') &&
             <div
-              className='text-danger'
+              className='pull-right text-danger'
               style={{
-                position: 'absolute',
-                bottom: '1px',
-                right: '5px',
-                fontSize: 'x-small'
+                clear: 'right',
+                fontSize: 'x-small',
+                marginLeft: '15px'
               }}>
               Cannot publish version because it has a{' '}
               {hasGtfsPlusBlockingIssue ? 'GTFS+ ' : ''}
@@ -189,6 +182,15 @@ export default class FeedVersionDetails extends Component<Props> {
             </div>
           }
         </h4>
+
+        {comparedVersion && comparedVersionIndex && (
+          <FeedVersionSpanChart
+            activeVersion={version}
+            comparedVersion={comparedVersion}
+            style={{clear: 'right'}}
+          />
+        )}
+
         <p>
           {summary && summary.avgDailyRevenueTime
             ? <span>
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 3c22c609a..188dec950 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -2,14 +2,15 @@
 
 import moment from 'moment'
 import React, { Component } from 'react'
-import { Col, Grid, OverlayTrigger, Row, Tooltip } from 'react-bootstrap'
+import { OverlayTrigger, Tooltip } from 'react-bootstrap'
 
 import VersionDateLabel from './VersionDateLabel'
 import type { FeedVersion } from '../../../types'
 
 type Props = {
   activeVersion: FeedVersion,
-  comparedVersion: FeedVersion
+  comparedVersion: FeedVersion,
+  style: any
 }
 
 const DATE_FORMAT = 'MMM. D, YYYY'
@@ -34,7 +35,7 @@ const TODAY_MARKER_ZINDEX = 9998
  */
 export default class FeedVersionSpanChart extends Component<Props> {
   render () {
-    const { activeVersion, comparedVersion } = this.props
+    const { activeVersion, comparedVersion, style } = this.props
     // Construct moment objects for the active/compared version start/end dates.
     const activeStartDate = moment(activeVersion.validationSummary.startDate)
     const activeEndDate = moment(activeVersion.validationSummary.endDate)
@@ -71,22 +72,26 @@ export default class FeedVersionSpanChart extends Component<Props> {
       versionLabel: <VersionDateLabel version={comparedVersion} />,
       versionStartDate: comparedStartDate
     }
+    const versionProps = {
+      height: HEIGHT_PROP,
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      whiteSpace: 'nowrap'
+    }
 
     return (
-      <Grid style={{ width: 'auto' }}>
-        <Row>
-          <Col xs={3}>
-            <div style={{ height: HEIGHT_PROP }}>Version {activeVersion.version} (selected)</div>
-            {}
-            {hasGap &&
+      <div style={{ ...style, display: 'flex' }}>
+        <div>
+          <div style={versionProps}>Version {activeVersion.version} (selected)</div>
+          {hasGap &&
             <div className='text-danger' style={{ height: HEIGHT_PROP }}>Gap in service</div>}
-            <div style={{ height: HEIGHT_PROP }}>Version {comparedVersion.version}</div>
-          </Col>
-          <Col xs={9} style={{ position: 'relative', height: '120px' }}>
-            <FeedStartLabel {...activeChartProps} />
-            <FeedEndLabel {...activeChartProps} />
-            <FeedSpan {...activeChartProps} isServiceGap={false} />
-            {hasGap &&
+          <div style={versionProps}>Version {comparedVersion.version}</div>
+        </div>
+        <div style={{ width: '450px', position: 'relative' }}>
+          <FeedStartLabel {...activeChartProps} />
+          <FeedEndLabel {...activeChartProps} />
+          <FeedSpan {...activeChartProps} isServiceGap={false} />
+          {hasGap &&
             <FeedSpan
               firstDate={firstDate}
               isServiceGap
@@ -95,13 +100,12 @@ export default class FeedVersionSpanChart extends Component<Props> {
               versionStartDate={earliestEnd}
               versionEndDate={latestStart}
             />}
-            <FeedStartLabel {...comparedChartProps} />
-            <FeedEndLabel {...comparedChartProps} />
-            <FeedSpan {...comparedChartProps} isServiceGap={false} />
-            {showToday && <TodayMarker firstDate={firstDate} lastDate={lastDate} />}
-          </Col>
-        </Row>
-      </Grid>
+          <FeedStartLabel {...comparedChartProps} />
+          <FeedEndLabel {...comparedChartProps} />
+          <FeedSpan {...comparedChartProps} isServiceGap={false} />
+          {showToday && <TodayMarker firstDate={firstDate} lastDate={lastDate} />}
+        </div>
+      </div>
     )
   }
 }
@@ -202,10 +206,13 @@ const FeedEndLabel = ({
   return (
     <span
       style={{
-        left: `${relativeOffset * BAR_WIDTH_PX + SPAN_MARGIN_PX + DATE_WIDTH_PX + relativeLength * BAR_WIDTH_PX + SPAN_MARGIN_PX}px`,
         height: HEIGHT_PROP,
+        left: `${relativeOffset * BAR_WIDTH_PX + SPAN_MARGIN_PX + DATE_WIDTH_PX + relativeLength * BAR_WIDTH_PX + SPAN_MARGIN_PX}px`,
+        overflow: 'hidden',
         position: 'absolute',
+        textOverflow: 'ellipsis',
         top,
+        whiteSpace: 'nowrap',
         zIndex: DATE_LABEL_ZINDEX
       }}>
       {endLabel} {versionLabel}
@@ -237,7 +244,7 @@ const TodayMarker = ({
         style={{
           backgroundColor: 'yellow',
           border: '1px solid #bbb',
-          height: `${HEIGHT_EM * 3}em`,
+          bottom: 0,
           left: `${DATE_WIDTH_PX + todayOffset / totalDays * BAR_WIDTH_PX}px`,
           position: 'absolute',
           top: 0,
diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 5839fc185..99305938c 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -14,7 +14,6 @@ import Timetables from '../reporter/containers/Timetables'
 import ServicePerModeChart from '../validation/ServicePerModeChart'
 import TripsChart from '../validation/TripsChart'
 import FeedVersionAccessibility from './FeedVersionAccessibility'
-import FeedVersionSpanChart from './FeedVersionSpanChart'
 
 import type {Element} from 'react'
 
@@ -146,16 +145,6 @@ export default class FeedVersionTabs extends Component<Props> {
                 <p style={{marginBottom: '0px'}}>{this.messages('daysActive')}</p>
               </Col>
             </Row>
-            <Row style={{marginTop: '40px'}}>
-              <Col xs={12}>
-                {comparedVersion && comparedVersionIndex && (
-                  <FeedVersionSpanChart
-                    activeVersion={version}
-                    comparedVersion={comparedVersion}
-                  />
-                )}
-              </Col>
-            </Row>
             <div style={{marginTop: '10px'}}>
               <Row>
                 <Col xs={12}>

From 223d093b6057ddb011f8169abf989b7c454aae15 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 28 Jan 2021 17:49:30 -0500
Subject: [PATCH 076/553] feat(auto-deploy): Add OTP auto-deploy project
 setting

corresponds to changes in ibi-group/datatools-server#361
---
 i18n/english.yml                             |  15 +++
 lib/common/util/permissions.js               |   2 +-
 lib/manager/actions/projects.js              |   9 +-
 lib/manager/components/DeploymentSettings.js | 118 ++++++++++++++-----
 lib/types/index.js                           |   1 +
 package.json                                 |   2 +-
 yarn.lock                                    |  10 +-
 7 files changed, 113 insertions(+), 44 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 2d3fccbc7..21ec1197b 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -57,6 +57,19 @@ components:
     success: Success!
     warning: Warning!
   DeploymentSettings:
+    autoDeploy:
+      description: >
+        Once a pinned deployment has been configured and deployed to a
+        server (at least once), auto-deployment can be enabled so that whenever
+        a new version is processed for an associated feed source, a deployment
+        will be kicked off (assuming there are no critical errors with the new
+        version).
+      label: Enable auto-deploy
+      noPinnedDeployment: None selected
+      pinnedDeploymentHelp: >
+        Tip: Under the Deployments tab, click the thumbtack icon next to the
+        deployment you would like to target for auto-deployments.
+      title: Auto-deployment
     boundsPlaceholder: 'min_lon, min_lat, max_lon, max_lat'
     buildConfig:
       elevationBucket:
@@ -69,6 +82,8 @@ components:
       stationTransfers: Sta. Transfers
       subwayAccessTime: Subway Access Time
       title: Build Config
+    clear: Clear
+    manageServers: Manage deployment servers
     osm:
       bounds: Custom Extract Bounds
       custom: Use Custom Extract Bounds
diff --git a/lib/common/util/permissions.js b/lib/common/util/permissions.js
index 969235f6c..9dd2d4d97 100644
--- a/lib/common/util/permissions.js
+++ b/lib/common/util/permissions.js
@@ -43,7 +43,7 @@ export function checkEntitiesForFeeds (
 
 /**
  * Checks whether it is possible for a user in this application to analyze
- * projet deployments
+ * project deployments
  */
 export function deploymentsEnabledAndAccessAllowedForProject (
   project: ?Project,
diff --git a/lib/manager/actions/projects.js b/lib/manager/actions/projects.js
index a62885cb3..d98fae081 100644
--- a/lib/manager/actions/projects.js
+++ b/lib/manager/actions/projects.js
@@ -4,7 +4,7 @@ import {createAction, type ActionType} from 'redux-actions'
 import {browserHistory} from 'react-router'
 
 import {createVoidPayloadAction, secureFetch} from '../../common/actions'
-import {getConfigProperty} from '../../common/util/config'
+import {getConfigProperty, isModuleEnabled} from '../../common/util/config'
 import {deploymentsEnabledAndAccessAllowedForProject} from '../../common/util/permissions'
 import {fetchProjectDeployments} from './deployments'
 import {fetchProjectFeeds} from './feeds'
@@ -139,15 +139,16 @@ export function deleteProject (project: Project) {
 export function updateProject (
   projectId: string,
   changes: {[string]: any},
-  fetchFeeds: ?boolean = false
+  fetchFeedsAndDeployments: ?boolean = false
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(savingProject())
     const url = `/api/manager/secure/project/${projectId}`
     return dispatch(secureFetch(url, 'put', changes))
       .then((res) => {
-        if (fetchFeeds) {
-          return dispatch(fetchProjectWithFeeds(projectId))
+        if (fetchFeedsAndDeployments) {
+          dispatch(fetchProjectWithFeeds(projectId))
+          isModuleEnabled('deployment') && dispatch(fetchProjectDeployments(projectId))
         } else {
           return dispatch(fetchProject(projectId))
         }
diff --git a/lib/manager/components/DeploymentSettings.js b/lib/manager/components/DeploymentSettings.js
index 61be630f2..bf9be0c5f 100644
--- a/lib/manager/components/DeploymentSettings.js
+++ b/lib/manager/components/DeploymentSettings.js
@@ -1,9 +1,21 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
-import objectPath from 'object-path'
+// $FlowFixMe coalesce method is missing in flow type
+import {coalesce, get, set} from 'object-path'
 import React, {Component} from 'react'
-import {Row, Col, Button, Panel, Glyphicon, Radio, FormGroup, ControlLabel, FormControl} from 'react-bootstrap'
+import {
+  Button,
+  Checkbox,
+  Col,
+  ControlLabel,
+  FormControl,
+  FormGroup,
+  Glyphicon,
+  Panel,
+  Radio,
+  Row
+} from 'react-bootstrap'
 import update from 'react-addons-update'
 import {shallowEqual} from 'react-pure-render'
 import {withRouter} from 'react-router'
@@ -25,6 +37,7 @@ type Props = {
 }
 
 type State = {
+  autoDeploy?: boolean,
   buildConfig: Object,
   routerConfig: Object,
   useCustomOsmBounds?: boolean
@@ -34,27 +47,29 @@ class DeploymentSettings extends Component<Props, State> {
   messages = getComponentMessages('DeploymentSettings')
 
   state = {
-    buildConfig: objectPath.get(this.props, 'project.buildConfig') || {},
-    routerConfig: objectPath.get(this.props, 'project.routerConfig') || {}
+    buildConfig: get(this.props, 'project.buildConfig') || {},
+    routerConfig: get(this.props, 'project.routerConfig') || {}
   }
 
   componentWillReceiveProps (nextProps) {
     if (nextProps.project.lastUpdated !== this.props.project.lastUpdated) {
       // Reset state using project data if it is updated.
       this.setState({
-        buildConfig: objectPath.get(nextProps, 'project.buildConfig') || {},
-        routerConfig: objectPath.get(nextProps, 'project.routerConfig') || {}
+        buildConfig: get(nextProps, 'project.buildConfig') || {},
+        routerConfig: get(nextProps, 'project.routerConfig') || {}
       })
     }
   }
 
   componentDidMount () {
-    // FIXME: This is broken. Check for edits does not always return correct value.
-    // this.props.router.setRouteLeaveHook(this.props.route, () => {
-    //   if (!this._noEdits()) {
-    //     return 'You have unsaved information, are you sure you want to leave this page?'
-    //   }
-    // })
+    // $FlowFixMe react-router 3.x is not available in flow-typed.
+    const {routes, router} = this.props
+    // Check for unsaved edits and warn user if they attempt to navigate away.
+    router.setRouteLeaveHook(routes[0], () => {
+      if (!this._noEdits()) {
+        return 'You have unsaved information, are you sure you want to leave this page?'
+      }
+    })
   }
 
   _clearBuildConfig = () => {
@@ -72,7 +87,7 @@ class DeploymentSettings extends Component<Props, State> {
     if (item) {
       const stateUpdate = {}
       item.effects && item.effects.forEach(e => {
-        objectPath.set(stateUpdate, `${e.key}.$set`, e.value)
+        set(stateUpdate, `${e.key}.$set`, e.value)
       })
       switch (item.type) {
         case 'checkbox':
@@ -96,19 +111,19 @@ class DeploymentSettings extends Component<Props, State> {
 
   _onChangeCheckbox = (evt, stateUpdate = {}, index = null) => {
     const name = index !== null ? evt.target.name.replace('$index', `${index}`) : evt.target.name
-    objectPath.set(stateUpdate, `${name}.$set`, evt.target.checked)
+    set(stateUpdate, `${name}.$set`, evt.target.checked)
     this.setState(update(this.state, stateUpdate))
   }
 
   _onChangeSplit = (evt, stateUpdate = {}, index = null) => {
     const name = index !== null ? evt.target.name.replace('$index', `${index}`) : evt.target.name
-    objectPath.set(stateUpdate, `${name}.$set`, evt.target.value.split(','))
+    set(stateUpdate, `${name}.$set`, evt.target.value.split(','))
     this.setState(update(this.state, stateUpdate))
   }
 
   _onAddUpdater = () => {
     const stateUpdate = {}
-    objectPath.set(stateUpdate,
+    set(stateUpdate,
       `routerConfig.updaters.$${this.state.routerConfig.updaters ? 'push' : 'set'}`,
       [{type: '', url: '', frequencySec: 30, sourceType: '', defaultAgencyId: ''}]
     )
@@ -117,7 +132,7 @@ class DeploymentSettings extends Component<Props, State> {
 
   _onRemoveUpdater = (index) => {
     const stateUpdate = {}
-    objectPath.set(stateUpdate, `routerConfig.updaters.$splice`, [[index, 1]])
+    set(stateUpdate, `routerConfig.updaters.$splice`, [[index, 1]])
     this.setState(update(this.state, stateUpdate))
   }
 
@@ -125,19 +140,19 @@ class DeploymentSettings extends Component<Props, State> {
     const name = index !== null ? evt.target.name.replace('$index', `${index}`) : evt.target.name
     // If value is empty string or undefined, set to null in settings object.
     // Otherwise, certain fields (such as 'fares') would cause issues with OTP.
-    objectPath.set(stateUpdate, `${name}.$set`, evt.target.value || null)
+    set(stateUpdate, `${name}.$set`, evt.target.value || null)
     this.setState(update(this.state, stateUpdate))
   }
 
   _onChangeNumber = (evt, stateUpdate = {}, index = null) => {
     const name = index !== null ? evt.target.name.replace('$index', `${index}`) : evt.target.name
-    objectPath.set(stateUpdate, `${name}.$set`, +evt.target.value)
+    set(stateUpdate, `${name}.$set`, +evt.target.value)
     this.setState(update(this.state, stateUpdate))
   }
 
   _onSelectBool = (evt, stateUpdate = {}, index = null) => {
     const name = index !== null ? evt.target.name.replace('$index', `${index}`) : evt.target.name
-    objectPath.set(stateUpdate, `${name}.$set`, (evt.target.value === 'true'))
+    set(stateUpdate, `${name}.$set`, (evt.target.value === 'true'))
     this.setState(update(this.state, stateUpdate))
   }
 
@@ -149,7 +164,7 @@ class DeploymentSettings extends Component<Props, State> {
           // check for conditional render, e.g. elevationBucket is dependent on fetchElevationUS
           if (f.condition) {
             const {key, value} = f.condition
-            const val = objectPath.get(state, `${key}`)
+            const val = get(state, `${key}`)
             if (val !== value) return false
           }
           return true
@@ -157,7 +172,7 @@ class DeploymentSettings extends Component<Props, State> {
         return (
           <FormInput
             key={`${index}`}
-            value={objectPath.get(state, `${f.name}`)}
+            value={get(state, `${f.name}`)}
             field={f}
             onChange={this._getOnChange}
             data={state}
@@ -166,7 +181,13 @@ class DeploymentSettings extends Component<Props, State> {
       })
   }
 
-  _onSave = (evt) => this.props.updateProject(this.props.project.id, this.state)
+  _onSave = (evt) => this.props.updateProject(this.props.project.id, this.state, true)
+
+  _onToggleAutoDeploy = (evt) => {
+    console.log(evt.target.checked)
+    const stateUpdate = { autoDeploy: { $set: evt.target.checked } }
+    this.setState(update(this.state, stateUpdate))
+  }
 
   _onToggleCustomBounds = (evt) => {
     const stateUpdate = { useCustomOsmBounds: { $set: (evt.target.value === 'true') } }
@@ -189,6 +210,12 @@ class DeploymentSettings extends Component<Props, State> {
     }
   }
 
+  /**
+   * Get value for key from state or, if undefined, default to project property
+   * from props.
+   */
+  _getValue = (key) => coalesce(this.state, [key], this.props.project[key])
+
   /**
    * Determine if deployment settings have been modified by checking that every
    * item in the state matches the original object found in the project object.
@@ -198,22 +225,55 @@ class DeploymentSettings extends Component<Props, State> {
     .every(key => shallowEqual(this.state[key], this.props.project[key]))
 
   render () {
-    const updaters = objectPath.get(this.state, 'routerConfig.updaters') || []
+    const updaters = get(this.state, 'routerConfig.updaters') || []
     const {project, editDisabled} = this.props
+    const {pinnedDeploymentId} = project
+    const pinnedDeployment = pinnedDeploymentId && project.deployments && project.deployments.find(d => d.id === pinnedDeploymentId)
     return (
       <div key={project.lastUpdated} className='deployment-settings-panel'>
         <LinkContainer to={`/admin/servers`} style={{marginBottom: '20px'}}>
           <Button block bsStyle='primary' bsSize='large'>
-            <Icon type='server' /> Manage deployment servers
+            <Icon type='server' /> {this.messages('manageServers')}
           </Button>
         </LinkContainer>
+        {/* Auto-deploy settings */}
+        <Panel header={
+          <h4>
+            <Icon type='rocket' />{' '}
+            {this.messages('autoDeploy.title')}
+          </h4>
+        }>
+          <p>{this.messages('autoDeploy.description')}</p>
+          <p>
+            Pinned Deployment:{' '}
+            {pinnedDeployment
+              ? pinnedDeployment.name
+              : <span className='text-muted'>
+                {this.messages('autoDeploy.noPinnedDeployment')}
+              </span>
+            }
+          </p>
+          {!pinnedDeployment &&
+            <small className='text-danger'>
+              {this.messages('autoDeploy.pinnedDeploymentHelp')}
+            </small>
+          }
+          <Checkbox
+            checked={this._getValue('autoDeploy')}
+            disabled={!pinnedDeployment}
+            name={'autoDeploy'}
+            onChange={this._onToggleAutoDeploy}
+          >
+            {this.messages('autoDeploy.label')}
+          </Checkbox>
+        </Panel>
         {/* Build config settings */}
         <Panel header={
           <h4>
             <Button
               bsSize='xsmall'
               onClick={this._clearBuildConfig}
-              className='pull-right'>Clear
+              className='pull-right'>{this.messages('clear')}
             </Button>
             <Icon type='cog' />{' '}
             {this.messages('buildConfig.title')}
@@ -227,7 +287,7 @@ class DeploymentSettings extends Component<Props, State> {
             <Button
               bsSize='xsmall'
               onClick={this._clearRouterConfig}
-              className='pull-right'>Clear
+              className='pull-right'>{this.messages('clear')}
             </Button>
             <Icon type='cog' />{' '}
             {this.messages('routerConfig.title')}
@@ -278,14 +338,14 @@ class DeploymentSettings extends Component<Props, State> {
           <FormGroup
             onChange={this._onToggleCustomBounds}>
             <Radio
+              checked={!this._getValue('useCustomOsmBounds')}
               name='osm-extract'
-              checked={typeof this.state.useCustomOsmBounds !== 'undefined' ? !this.state.useCustomOsmBounds : !project.useCustomOsmBounds}
               value={false}>
               {this.messages('osm.gtfs')}
             </Radio>
             <Radio
+              checked={this._getValue('useCustomOsmBounds')}
               name='osm-extract'
-              checked={typeof this.state.useCustomOsmBounds !== 'undefined' ? this.state.useCustomOsmBounds : project.useCustomOsmBounds}
               value>
               {this.messages('osm.custom')}
             </Radio>
diff --git a/lib/types/index.js b/lib/types/index.js
index d90e92872..c9548bdd8 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -690,6 +690,7 @@ export type RouterConfig = {
 }
 
 export type Project = {
+  autoDeploy: boolean,
   autoFetchFeeds: boolean,
   autoFetchHour: number,
   autoFetchMinute: number,
diff --git a/package.json b/package.json
index 5ab1b4947..15c7374a9 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "lodash": "^4.17.10",
     "moment": "^2.11.2",
     "numeral": "2.0.4",
-    "object-path": "^0.11.1",
+    "object-path": "^0.11.5",
     "polyline": "^0.2.0",
     "prop-types": "^15.6.0",
     "qs": "^6.2.1",
diff --git a/yarn.lock b/yarn.lock
index 70d434802..47bafbaa8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9695,7 +9695,6 @@ npm@^6.14.8:
     cmd-shim "^3.0.3"
     columnify "~1.5.4"
     config-chain "^1.1.12"
-    debuglog "*"
     detect-indent "~5.0.0"
     detect-newline "^2.1.0"
     dezalgo "~1.0.3"
@@ -9710,7 +9709,6 @@ npm@^6.14.8:
     has-unicode "~2.0.1"
     hosted-git-info "^2.8.8"
     iferr "^1.0.2"
-    imurmurhash "*"
     infer-owner "^1.0.4"
     inflight "~1.0.6"
     inherits "^2.0.4"
@@ -9729,14 +9727,8 @@ npm@^6.14.8:
     libnpx "^10.2.4"
     lock-verify "^2.1.0"
     lockfile "^1.0.4"
-    lodash._baseindexof "*"
     lodash._baseuniq "~4.6.0"
-    lodash._bindcallback "*"
-    lodash._cacheindexof "*"
-    lodash._createcache "*"
-    lodash._getnative "*"
     lodash.clonedeep "~4.5.0"
-    lodash.restparam "*"
     lodash.union "~4.6.0"
     lodash.uniq "~4.5.0"
     lodash.without "~4.4.0"
@@ -9872,7 +9864,7 @@ object-keys@^1.0.11, object-keys@^1.0.12:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-path@^0.11.1:
+object-path@^0.11.5:
   version "0.11.5"
   resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a"
   integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==

From 26fd3f31cefc3d2993a2cdf9e903846ac944a66a Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 28 Jan 2021 17:56:43 -0500
Subject: [PATCH 077/553] refactor(DeploymentSettings.js): remove
 setRouteLeaveHook

---
 lib/manager/components/DeploymentSettings.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lib/manager/components/DeploymentSettings.js b/lib/manager/components/DeploymentSettings.js
index bf9be0c5f..6b92507a6 100644
--- a/lib/manager/components/DeploymentSettings.js
+++ b/lib/manager/components/DeploymentSettings.js
@@ -61,17 +61,6 @@ class DeploymentSettings extends Component<Props, State> {
     }
   }
 
-  componentDidMount () {
-    // $FlowFixMe react-router 3.x is not available in flow-typed.
-    const {routes, router} = this.props
-    // Check for unsaved edits and warn user if they attempt to navigate away.
-    router.setRouteLeaveHook(routes[0], () => {
-      if (!this._noEdits()) {
-        return 'You have unsaved information, are you sure you want to leave this page?'
-      }
-    })
-  }
-
   _clearBuildConfig = () => {
     this.props.updateProject(this.props.project.id, {buildConfig: {}})
   }

From aae8b19b5a273537efa91ee9af76938f9871c1d0 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 29 Jan 2021 12:16:49 -0500
Subject: [PATCH 078/553] refactor(FeedVersionSpan): Remove title prop.

---
 lib/manager/components/version/FeedVersionSpanChart.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 188dec950..aa5b4b6e9 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -148,7 +148,6 @@ const FeedSpan = ({
             bottom: '10%',
             width: '100%'
           }}
-          title={`${daysActive} days`}
         />
       </span>
     </OverlayTrigger>

From 886aa99161744de0b9791756ce993fb0aca4277d Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Mon, 1 Feb 2021 22:16:00 -0800
Subject: [PATCH 079/553] refactor: add OTP 2 checkbox in deployment viewer

---
 lib/manager/components/DeploymentViewer.js | 13 +++++++++++++
 lib/types/index.js                         |  1 +
 2 files changed, 14 insertions(+)

diff --git a/lib/manager/components/DeploymentViewer.js b/lib/manager/components/DeploymentViewer.js
index d77c09a5c..c1735fe2f 100644
--- a/lib/manager/components/DeploymentViewer.js
+++ b/lib/manager/components/DeploymentViewer.js
@@ -209,6 +209,11 @@ export default class DeploymentViewer extends Component<Props, State> {
 
   _onSelectTarget = (target: string) => this.setState({target})
 
+  _onToggleOtp2 = () => {
+    const {deployment, updateDeployment} = this.props
+    updateDeployment(deployment, { otp2: !deployment.otp2 })
+  }
+
   _onUpdateVersion = (option: ReactSelectOption) => {
     const key = this.props.deployment.r5 ? 'r5Version' : 'otpVersion'
     this._updateDeployment({[key]: option.value})
@@ -419,6 +424,14 @@ export default class DeploymentViewer extends Component<Props, State> {
               value={deployment.r5 ? deployment.r5Version : deployment.otpVersion}
               onChange={this._onUpdateVersion}
               options={options ? options.map(v => ({value: v, label: v})) : []} />
+            {!deployment.r5 &&
+              <Checkbox
+                checked={deployment.otp2}
+                onChange={this._onToggleOtp2}
+              >
+                OTP v2.x
+              </Checkbox>
+            }
           </ListGroupItem>
           <ListGroupItem>
             Deploying to the{' '}
diff --git a/lib/types/index.js b/lib/types/index.js
index d90e92872..4d6b049ea 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -233,6 +233,7 @@ export type Deployment = {
   name: string,
   organizationId: ?string,
   osmExtractUrl: ?string,
+  otp2?: ?boolean,
   otpVersion: ?string,
   projectBounds: Bounds,
   projectId: string,

From 3d07771ecd828ec8e5de754fcd92569556fa5a55 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 5 Feb 2021 09:38:22 -0500
Subject: [PATCH 080/553] refactor: address PR comments

---
 __tests__/test-utils/mock-data/manager.js    | 1 +
 lib/manager/components/DeploymentSettings.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 5d282687c..2182ddb37 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -70,6 +70,7 @@ export const mockProject = {
   autoFetchFeeds: true,
   autoFetchHour: 0,
   autoFetchMinute: 0,
+  autoDeploy: false,
   bounds: null,
   buildConfig: {
     fares: null,
diff --git a/lib/manager/components/DeploymentSettings.js b/lib/manager/components/DeploymentSettings.js
index 6b92507a6..0a26ee165 100644
--- a/lib/manager/components/DeploymentSettings.js
+++ b/lib/manager/components/DeploymentSettings.js
@@ -173,7 +173,6 @@ class DeploymentSettings extends Component<Props, State> {
   _onSave = (evt) => this.props.updateProject(this.props.project.id, this.state, true)
 
   _onToggleAutoDeploy = (evt) => {
-    console.log(evt.target.checked)
     const stateUpdate = { autoDeploy: { $set: evt.target.checked } }
     this.setState(update(this.state, stateUpdate))
   }
@@ -216,8 +215,9 @@ class DeploymentSettings extends Component<Props, State> {
   render () {
     const updaters = get(this.state, 'routerConfig.updaters') || []
     const {project, editDisabled} = this.props
-    const {pinnedDeploymentId} = project
-    const pinnedDeployment = pinnedDeploymentId && project.deployments && project.deployments.find(d => d.id === pinnedDeploymentId)
+    const {deployments, pinnedDeploymentId} = project
+    const pinnedDeployment = pinnedDeploymentId && deployments &&
+      deployments.find(d => d.id === pinnedDeploymentId)
     return (
       <div key={project.lastUpdated} className='deployment-settings-panel'>
         <LinkContainer to={`/admin/servers`} style={{marginBottom: '20px'}}>

From 31aff5480a8c133998645bd978b5f30cdc3f0b74 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Thu, 11 Feb 2021 00:14:00 -0800
Subject: [PATCH 081/553] feat: add ability to add custom files for deployments

---
 __tests__/test-utils/mock-data/manager.js     |   3 +-
 .../__tests__/__snapshots__/projects.js.snap  |   3 +-
 lib/manager/components/DeploymentViewer.js    | 340 ++++++++++++++++--
 .../__snapshots__/DeploymentsPanel.js.snap    |  36 +-
 .../__snapshots__/FeedSourceTable.js.snap     |  24 +-
 lib/style.css                                 |  11 +
 lib/types/index.js                            |  13 +-
 7 files changed, 349 insertions(+), 81 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 5d282687c..79a6ff097 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -57,10 +57,9 @@ export function makeMockDeployment (
     otpVersion: null,
     projectId: project.id,
     projectBounds: {east: 0, west: 0, north: 0, south: 0},
-    r5: false,
-    r5Version: null,
     routerId: null,
     skipOsmExtract: false,
+    tripPlannerVersion: 'OTP_1',
     user: null
   }
 }
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 6cee153b7..7a1b8548e 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -116,10 +116,9 @@ Object {
             "west": 0,
           },
           "projectId": "mock-project-with-deployments-id",
-          "r5": false,
-          "r5Version": null,
           "routerId": null,
           "skipOsmExtract": false,
+          "tripPlannerVersion": "OTP_1",
           "user": null,
         },
       ],
diff --git a/lib/manager/components/DeploymentViewer.js b/lib/manager/components/DeploymentViewer.js
index c1735fe2f..5afbd37a4 100644
--- a/lib/manager/components/DeploymentViewer.js
+++ b/lib/manager/components/DeploymentViewer.js
@@ -45,6 +45,7 @@ import DeploymentVersionsTable from './DeploymentVersionsTable'
 
 import type {Props as ContainerProps} from '../containers/ActiveDeploymentViewer'
 import type {
+  CustomFile,
   Deployment,
   ReactSelectOption,
   ServerJob,
@@ -67,8 +68,8 @@ type Props = ContainerProps & {
 }
 
 type State = {
+  customFileEditIdx: null | number,
   otp: Array<ReactSelectOption>,
-  r5: Array<ReactSelectOption>,
   searchText: ?string,
   target: ?string
 }
@@ -87,13 +88,18 @@ const SAMPLE_ROUTER_CONFIG = `{
   }
 }`
 
+const TRIP_PLANNER_VERSIONS = [
+  { label: 'OTP 1.X', value: 'OTP_1' },
+  { label: 'OTP 2.X', value: 'OTP_2' }
+]
+
 export default class DeploymentViewer extends Component<Props, State> {
   messages = getComponentMessages('DeploymentViewer')
   state = {
+    customFileEditIdx: null,
+    otp: [],
     searchText: null,
-    target: null,
-    r5: [],
-    otp: []
+    target: null
   }
 
   componentDidMount () {
@@ -128,7 +134,7 @@ export default class DeploymentViewer extends Component<Props, State> {
    * @param  {string} text text response from s3
    * @param  {string} key  state key under which to store options
    */
-  _parseOptionsFromXml = (text: string, key: 'otp' | 'r5') => {
+  _parseOptionsFromXml = (text: string) => {
     const parser = new window.DOMParser()
     const doc = parser.parseFromString(text, 'application/xml')
 
@@ -136,23 +142,30 @@ export default class DeploymentViewer extends Component<Props, State> {
       .map(item => item.querySelector('Key').childNodes[0].nodeValue) // get just key
       .filter(item => item !== 'index.html') // don't include the main page
       .map(item => item.replace(/.jar$/, '')) // and remove .jar
-    this.setState({[key]: all})
+    this.setState({otp: all})
   }
 
-  _loadAndParseOptionsFromXml = (url: string, key: 'otp' | 'r5') => {
+  _loadAndParseOptionsFromXml = (url: string) => {
     fetch(url)
       .then(res => res.text())
-      .then(text => this._parseOptionsFromXml(text, key))
+      .then(text => this._parseOptionsFromXml(text))
   }
 
   /**
    * Load .jar options from OTP and R5 S3 buckets.
    */
   _loadOptions = () => {
-    const r5Url = getConfigProperty('modules.deployment.r5_download_url') || 'https://r5-builds.s3.amazonaws.com'
-    this._loadAndParseOptionsFromXml(r5Url, 'r5')
     const otpUrl = getConfigProperty('modules.deployment.otp_download_url') || 'https://opentripplanner-builds.s3.amazonaws.com'
-    this._loadAndParseOptionsFromXml(otpUrl, 'otp')
+    this._loadAndParseOptionsFromXml(otpUrl)
+  }
+
+  _onAddCustomFile = () => {
+    const { deployment } = this.props
+    const customFiles = deployment.customFiles
+      ? [...deployment.customFiles, {}]
+      : [{}]
+    this._updateDeployment({ customFiles })
+    this.setState({ customFileEditIdx: customFiles.length - 1 })
   }
 
   _onAddFeedSource = (feedSourceId: string) => {
@@ -170,8 +183,6 @@ export default class DeploymentViewer extends Component<Props, State> {
 
   _onChangeName = (name: string) => this._updateDeployment({name})
 
-  _onChangeR5 = () => this._updateDeployment({r5: !this.props.deployment.r5})
-
   _onChangeBuildGraphOnly = () => this._updateDeployment({buildGraphOnly: !this.props.deployment.buildGraphOnly})
 
   _onChangeSkipOsmExtract = () => {
@@ -190,6 +201,29 @@ export default class DeploymentViewer extends Component<Props, State> {
 
   _onCloseModal = () => this.setState({target: null})
 
+  _onCancelEditingCustomFile = () => {
+    this.setState({ customFileEditIdx: null })
+  }
+
+  _onEditCustomFile = (idx: number) => {
+    this.setState({ customFileEditIdx: idx })
+  }
+
+  _onDeleteCustomFile = (idx: number) => {
+    const { deployment } = this.props
+    const customFiles = [...deployment.customFiles || []]
+    customFiles.splice(idx, 1)
+    this._updateDeployment({ customFiles })
+  }
+
+  _onSaveCustomFile = (idx: number, data: CustomFile) => {
+    const { deployment } = this.props
+    const customFiles = [...deployment.customFiles || []]
+    customFiles[idx] = data
+    this._updateDeployment({ customFiles })
+    this.setState({ customFileEditIdx: null })
+  }
+
   _setOsmUrl = () => {
     const currentUrl = this.props.deployment.osmExtractUrl || ''
     const osmExtractUrl = window.prompt(
@@ -209,14 +243,13 @@ export default class DeploymentViewer extends Component<Props, State> {
 
   _onSelectTarget = (target: string) => this.setState({target})
 
-  _onToggleOtp2 = () => {
+  _onUpdateTripPlannerVersion = (option: ReactSelectOption) => {
     const {deployment, updateDeployment} = this.props
-    updateDeployment(deployment, { otp2: !deployment.otp2 })
+    updateDeployment(deployment, { tripPlannerVersion: option.value })
   }
 
   _onUpdateVersion = (option: ReactSelectOption) => {
-    const key = this.props.deployment.r5 ? 'r5Version' : 'otpVersion'
-    this._updateDeployment({[key]: option.value})
+    this._updateDeployment({otpVersion: option.value})
   }
 
   _updateDeployment = (props: {[string]: any}) => {
@@ -407,31 +440,35 @@ export default class DeploymentViewer extends Component<Props, State> {
 
   renderConfigurationsPanel () {
     const { deployment, updateDeployment } = this.props
-    const options = deployment.r5 ? this.state.r5 : this.state.otp
+    const options = this.state.otp
+    const isOtp = deployment.tripPlannerVersion.startsWith('OTP_')
 
     return (
       <Panel header={<h3><Icon type='cog' /> OTP Configuration</h3>}>
         <ListGroup fill>
           <ListGroupItem>
-            <Checkbox
-              checked={deployment.r5}
-              onChange={this._onChangeR5}>Use R5</Checkbox>
             <Checkbox
               checked={deployment.buildGraphOnly}
-              onChange={this._onChangeBuildGraphOnly}>Build graph only</Checkbox>
-            {deployment.r5 ? 'R5' : 'OTP'} version
+              onChange={this._onChangeBuildGraphOnly}
+            >
+              Build graph only
+            </Checkbox>
+            Trip Planner Version:
             <Select
-              value={deployment.r5 ? deployment.r5Version : deployment.otpVersion}
-              onChange={this._onUpdateVersion}
-              options={options ? options.map(v => ({value: v, label: v})) : []} />
-            {!deployment.r5 &&
-              <Checkbox
-                checked={deployment.otp2}
-                onChange={this._onToggleOtp2}
-              >
-                OTP v2.x
-              </Checkbox>
-            }
+              value={deployment.tripPlannerVersion}
+              onChange={this._onUpdateTripPlannerVersion}
+              options={TRIP_PLANNER_VERSIONS}
+            />
+            {isOtp && (
+              <div>
+                OTP jar file
+                <Select
+                  value={deployment.otpVersion}
+                  onChange={this._onUpdateVersion}
+                  options={options ? options.map(v => ({value: v, label: v})) : []}
+                />
+              </div>
+            )}
           </ListGroupItem>
           <ListGroupItem>
             Deploying to the{' '}
@@ -495,11 +532,44 @@ export default class DeploymentViewer extends Component<Props, State> {
               updateDeployment={updateDeployment}
               deployment={deployment} />
           </ListGroupItem>
+          {this.renderCustomFiles()}
         </ListGroup>
       </Panel>
     )
   }
 
+  renderCustomFiles = () => {
+    const { deployment } = this.props
+    const { customFileEditIdx } = this.state
+
+    return (
+      <ListGroupItem>
+        <h5>Custom Files</h5>
+        {deployment.customFiles && deployment.customFiles.map(
+          (customFile, idx) => (
+            <CustomFileEditor
+              customFile={customFile}
+              customFileEditIdx={customFileEditIdx}
+              deployment={deployment}
+              idx={idx}
+              onCancelEditing={this._onCancelEditingCustomFile}
+              onDelete={this._onDeleteCustomFile}
+              onEdit={this._onEditCustomFile}
+              onSave={this._onSaveCustomFile}
+            />
+          )
+        )}
+        <Button
+          disabled={customFileEditIdx !== null}
+          onClick={this._onAddCustomFile}
+        >
+          <Glyphicon glyph='plus' />{' '}
+          Add custom file
+        </Button>
+      </ListGroupItem>
+    )
+  }
+
   render () {
     const {
       deleteFeedVersion,
@@ -678,3 +748,205 @@ class CustomConfig extends Component<{
     )
   }
 }
+
+class CustomFileEditor extends Component<{
+  customFile: CustomFile,
+  customFileEditIdx: null | number,
+  idx: number,
+  onCancelEditing: () => void,
+  onDelete: (number) => void,
+  onEdit: (number) => void,
+  onSave: (number, CustomFile) => void
+}, {
+  fileSource: 'raw' | 'uri',
+  model: CustomFile
+}> {
+  constructor (props) {
+    super(props)
+    const { customFile } = props
+    this.state = {
+      fileSource: customFile.contents ? 'raw' : 'uri',
+      model: props.customFile
+    }
+  }
+
+  _onChangeBuildUse = () => {
+    const { model } = this.state
+    this.setState({
+      model: {
+        ...model,
+        useDuringBuild: !model.useDuringBuild
+      }
+    })
+  }
+
+  _onChangeContents = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({
+      model: {
+        ...this.state.model,
+        contents: evt.target.value
+      }
+    })
+  }
+
+  _onChangeFilename = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({
+      model: {
+        ...this.state.model,
+        filename: evt.target.value
+      }
+    })
+  }
+
+  _onChangeServeUse = () => {
+    const { model } = this.state
+    this.setState({
+      model: {
+        ...model,
+        useDuringServe: !model.useDuringServe
+      }
+    })
+  }
+
+  _onChangeSource = (evt: SyntheticInputEvent<HTMLSelectElement>) => {
+    const model = {...this.state.model}
+    // set variable to make flow happy
+    let newSource
+    if (evt.target.value === 'raw') {
+      model.uri = null
+      newSource = 'raw'
+    } else {
+      model.contents = null
+      newSource = 'uri'
+    }
+    this.setState({
+      fileSource: newSource,
+      model
+    })
+  }
+
+  _onChangeUri = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({
+      model: {
+        ...this.state.model,
+        uri: evt.target.value
+      }
+    })
+  }
+
+  _onCancelEditing = () => {
+    const { customFile, onCancelEditing } = this.props
+    this.setState({
+      fileSource: customFile.contents ? 'raw' : 'uri',
+      model: customFile
+    })
+    onCancelEditing()
+  }
+
+  _onDelete = () => {
+    const { idx, onDelete } = this.props
+    onDelete(idx)
+  }
+
+  _onEdit = () => {
+    const { idx, onEdit } = this.props
+    onEdit(idx)
+  }
+
+  _onSave = () => {
+    const { idx, onSave } = this.props
+    onSave(idx, this.state.model)
+  }
+
+  render () {
+    const {
+      customFileEditIdx,
+      idx
+    } = this.props
+    const {
+      fileSource,
+      model: customFile
+    } = this.state
+    const isValid = customFile.contents || customFile.uri
+    const isEditing = idx === customFileEditIdx
+    const canEdit = customFileEditIdx === null
+
+    return (
+      <div className='custom-file'>
+        <ButtonGroup>
+          {isEditing && (
+            <Button
+              disabled={!isValid}
+              onClick={this._onSave}
+            >
+              Save
+            </Button>
+          )}
+          {isEditing && <Button onClick={this._onCancelEditing}>Cancel</Button>}
+          {canEdit && <Button onClick={this._onEdit}>Edit</Button>}
+          {canEdit && <Button onClick={this._onDelete}>Delete</Button>}
+        </ButtonGroup>
+        <FormControl
+          disabled={!isEditing}
+          onChange={this._onChangeFilename}
+          placeholder='Enter filename'
+          type='text'
+          value={customFile.filename}
+        />
+        <Checkbox
+          checked={customFile.useDuringBuild}
+          disabled={!isEditing}
+          onChange={this._onChangeBuildUse}
+        >
+          Use during graph build
+        </Checkbox>
+        <Checkbox
+          checked={customFile.useDuringServe}
+          disabled={!isEditing}
+          onChange={this._onChangeServeUse}
+        >
+          Use while running server
+        </Checkbox>
+        <FormGroup validationState={isValid ? null : 'error'}>
+          <ControlLabel>File source</ControlLabel>
+          <FormControl
+            componentClass='select'
+            disabled={!isEditing}
+            onChange={this._onChangeSource}
+            placeholder='select type'
+            style={{ marginBottom: 5 }}
+            value={fileSource}
+          >
+            <option value='raw'>From raw input</option>
+            <option value='uri'>Download from URI</option>
+          </FormControl>
+          {!isValid && <HelpBlock>Please set contents or uri!</HelpBlock>}
+          {fileSource === 'raw' && (
+            <FormControl
+              componentClass='textarea'
+              disabled={!isEditing}
+              style={{height: '125px'}}
+              placeholder='{"blah": true}'
+              onChange={this._onChangeContents}
+              value={customFile.contents}
+            />
+          )}
+          {fileSource === 'uri' && (
+            <span>
+              <FormControl
+                disabled={!isEditing}
+                placeholder='https://www.examle.com/file.json'
+                onChange={this._onChangeUri}
+                type='text'
+                value={customFile.uri}
+              />
+              {!customFile.uri && (
+                <HelpBlock>Enter either a HTTP(S) URL or AWS S3 URI</HelpBlock>
+              )}
+            </span>
+          )}
+        </FormGroup>
+      </div>
+    )
+  }
+}
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index e48ea83b0..fa0bd7a88 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -129,10 +129,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "west": 0,
             },
             "projectId": "mock-project-with-deployments-id",
-            "r5": false,
-            "r5Version": null,
             "routerId": null,
             "skipOsmExtract": false,
+            "tripPlannerVersion": "OTP_1",
             "user": null,
           },
           Object {
@@ -161,10 +160,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "west": 0,
             },
             "projectId": "mock-project-with-deployments-id",
-            "r5": false,
-            "r5Version": null,
             "routerId": null,
             "skipOsmExtract": false,
+            "tripPlannerVersion": "OTP_1",
             "user": null,
           },
         ],
@@ -352,10 +350,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                 "west": 0,
               },
               "projectId": "mock-project-with-deployments-id",
-              "r5": false,
-              "r5Version": null,
               "routerId": null,
               "skipOsmExtract": false,
+              "tripPlannerVersion": "OTP_1",
               "user": null,
             },
             Object {
@@ -384,10 +381,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                 "west": 0,
               },
               "projectId": "mock-project-with-deployments-id",
-              "r5": false,
-              "r5Version": null,
               "routerId": null,
               "skipOsmExtract": false,
+              "tripPlannerVersion": "OTP_1",
               "user": null,
             },
           ],
@@ -642,10 +638,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                           "west": 0,
                         },
                         "projectId": "mock-project-with-deployments-id",
-                        "r5": false,
-                        "r5Version": null,
                         "routerId": null,
                         "skipOsmExtract": false,
+                        "tripPlannerVersion": "OTP_1",
                         "user": null,
                       },
                       Object {
@@ -674,10 +669,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                           "west": 0,
                         },
                         "projectId": "mock-project-with-deployments-id",
-                        "r5": false,
-                        "r5Version": null,
                         "routerId": null,
                         "skipOsmExtract": false,
+                        "tripPlannerVersion": "OTP_1",
                         "user": null,
                       },
                     ],
@@ -1010,10 +1004,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                   "west": 0,
                                 },
                                 "projectId": "mock-project-with-deployments-id",
-                                "r5": false,
-                                "r5Version": null,
                                 "routerId": null,
                                 "skipOsmExtract": false,
+                                "tripPlannerVersion": "OTP_1",
                                 "user": null,
                               }
                             }
@@ -1133,10 +1126,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "west": 0,
                                     },
                                     "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
                                     "routerId": null,
                                     "skipOsmExtract": false,
+                                    "tripPlannerVersion": "OTP_1",
                                     "user": null,
                                   },
                                   Object {
@@ -1165,10 +1157,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "west": 0,
                                     },
                                     "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
                                     "routerId": null,
                                     "skipOsmExtract": false,
+                                    "tripPlannerVersion": "OTP_1",
                                     "user": null,
                                   },
                                 ],
@@ -1431,10 +1422,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                   "west": 0,
                                 },
                                 "projectId": "mock-project-with-deployments-id",
-                                "r5": false,
-                                "r5Version": null,
                                 "routerId": null,
                                 "skipOsmExtract": false,
+                                "tripPlannerVersion": "OTP_1",
                                 "user": null,
                               }
                             }
@@ -1554,10 +1544,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "west": 0,
                                     },
                                     "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
                                     "routerId": null,
                                     "skipOsmExtract": false,
+                                    "tripPlannerVersion": "OTP_1",
                                     "user": null,
                                   },
                                   Object {
@@ -1586,10 +1575,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "west": 0,
                                     },
                                     "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
                                     "routerId": null,
                                     "skipOsmExtract": false,
+                                    "tripPlannerVersion": "OTP_1",
                                     "user": null,
                                   },
                                 ],
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 163f34121..dc08b312d 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -128,10 +128,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "west": 0,
             },
             "projectId": "mock-project-with-deployments-id",
-            "r5": false,
-            "r5Version": null,
             "routerId": null,
             "skipOsmExtract": false,
+            "tripPlannerVersion": "OTP_1",
             "user": null,
           },
         ],
@@ -411,10 +410,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                 "west": 0,
               },
               "projectId": "mock-project-with-deployments-id",
-              "r5": false,
-              "r5Version": null,
               "routerId": null,
               "skipOsmExtract": false,
+              "tripPlannerVersion": "OTP_1",
               "user": null,
             },
           ],
@@ -675,10 +673,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "west": 0,
                     },
                     "projectId": "mock-project-with-deployments-id",
-                    "r5": false,
-                    "r5Version": null,
                     "routerId": null,
                     "skipOsmExtract": false,
+                    "tripPlannerVersion": "OTP_1",
                     "user": null,
                   },
                 ],
@@ -870,10 +867,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "west": 0,
                       },
                       "projectId": "mock-project-with-deployments-id",
-                      "r5": false,
-                      "r5Version": null,
                       "routerId": null,
                       "skipOsmExtract": false,
+                      "tripPlannerVersion": "OTP_1",
                       "user": null,
                     },
                   ],
@@ -1083,10 +1079,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "west": 0,
                         },
                         "projectId": "mock-project-with-deployments-id",
-                        "r5": false,
-                        "r5Version": null,
                         "routerId": null,
                         "skipOsmExtract": false,
+                        "tripPlannerVersion": "OTP_1",
                         "user": null,
                       },
                     ],
@@ -2949,10 +2944,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "west": 0,
                             },
                             "projectId": "mock-project-with-deployments-id",
-                            "r5": false,
-                            "r5Version": null,
                             "routerId": null,
                             "skipOsmExtract": false,
+                            "tripPlannerVersion": "OTP_1",
                             "user": null,
                           },
                         ],
@@ -3206,10 +3200,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "west": 0,
                               },
                               "projectId": "mock-project-with-deployments-id",
-                              "r5": false,
-                              "r5Version": null,
                               "routerId": null,
                               "skipOsmExtract": false,
+                              "tripPlannerVersion": "OTP_1",
                               "user": null,
                             },
                           ],
@@ -3747,10 +3740,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       "west": 0,
                                     },
                                     "projectId": "mock-project-with-deployments-id",
-                                    "r5": false,
-                                    "r5Version": null,
                                     "routerId": null,
                                     "skipOsmExtract": false,
+                                    "tripPlannerVersion": "OTP_1",
                                     "user": null,
                                   },
                                 ],
diff --git a/lib/style.css b/lib/style.css
index efa2051f4..7702c1676 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -261,6 +261,17 @@ td.feed-source-info {
   margin-right: 5px;
 }
 
+.custom-file {
+  border: 1px solid lightgray;
+  border-radius: 5px;
+  margin-bottom: 10px;
+  padding: 8px;
+}
+
+.custom-file .btn-group {
+  margin-bottom: 8px;
+}
+
 /* Prevent text from being selectable */
 .unselectable {
     -webkit-touch-callout: none;
diff --git a/lib/types/index.js b/lib/types/index.js
index 4d6b049ea..538430db8 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -211,12 +211,21 @@ export type DeploySummary = {
   status: JobStatus
 }
 
+export type CustomFile = {
+  contents?: ?string,
+  filename: ?string,
+  uri?: ?string,
+  useDuringBuild: boolean,
+  useDuringServe: boolean
+}
+
 // TODO: Remove this eslint rule once https://github.com/babel/babel-eslint/pull/584
 // is merged in.
 /* eslint-disable no-use-before-define */
 export type Deployment = {
   buildGraphOnly?: boolean,
   customBuildConfig: ?string,
+  customFiles?: Array<CustomFile>,
   customRouterConfig: ?string,
   dateCreated: number,
   deployJobSummaries: Array<DeploySummary>,
@@ -233,14 +242,12 @@ export type Deployment = {
   name: string,
   organizationId: ?string,
   osmExtractUrl: ?string,
-  otp2?: ?boolean,
   otpVersion: ?string,
   projectBounds: Bounds,
   projectId: string,
-  r5: boolean,
-  r5Version: ?string,
   routerId: ?string,
   skipOsmExtract: boolean,
+  tripPlannerVersion: 'OTP_1' | 'OTP_2',
   user: ?any // TODO add more specific type
 }
 

From 51172b5776fed461e022c270fd5a0aae63e8f04f Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Feb 2021 17:32:41 -0500
Subject: [PATCH 082/553] ci(GitHub Actions): replace travis CI with GH actions

---
 .github/workflows/node-ci.yml                | 101 +++++++++++++++++++
 .travis.yml                                  |  56 ----------
 scripts/check-if-e2e-should-run-on-travis.sh |  22 ++--
 3 files changed, 115 insertions(+), 64 deletions(-)
 create mode 100644 .github/workflows/node-ci.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
new file mode 100644
index 000000000..c7b3f2b49
--- /dev/null
+++ b/.github/workflows/node-ci.yml
@@ -0,0 +1,101 @@
+name: Node.js CI
+
+on: [push, pull_request]
+
+jobs:
+  test-build-release:
+
+    runs-on: ubuntu-latest
+    # Add postgres for end-to-end
+    services:
+      postgres:
+        image: postgres:10.8
+        # Set postgres env variables according to test env.yml config
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: catalogue
+        ports:
+          - 5432:5432
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 12.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+      - name: Install npm/yarn packages using cache
+        uses: bahmutov/npm-install@v1
+      # Inject slug vars, so that we can reference $GITHUB_HEAD_REF_SLUG for branch name
+      - name: Inject slug/short variables
+        uses: rlespinasse/github-slug-action@v3.x
+      - name: Check if End-to-end should run
+        run: ./scripts/check-if-e2e-should-run-on-travis.sh
+      - name: Lint code
+        run: yarn lint
+      - name: Lint messages
+        run: yarn lint-messages
+      - name: Run flow check
+        run: yarn flow
+      - name: Run tests with coverage
+        run: yarn cover-client
+      # Upload coverage results from unit tests and then delete coverage reports to
+      # avoid uploading the same coverage results twice.
+      - name: Upload coverage results from unit tests
+        run: bash <(curl -s https://codecov.io/bash) -c -F unit_tests
+      - name: Build with minification
+        run: yarn run build -- --minify
+      - name: Build docs
+        run: mkdocs build
+      - name: Start MongoDB
+        if: env.SHOULD_RUN_E2E == 'true'
+        uses: supercharge/mongodb-github-action@1.3.0
+        with:
+          mongodb-version: 4.2
+      - name: Add aws credentials for datatools-server
+        if: env.SHOULD_RUN_E2E == 'true'
+        run: mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=us-east-1' > ~/.aws/config; else mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=foo' 'aws_secret_access_key=bar' 'region=us-east-1' > ~/.aws/config
+      - name: Run e2e tests
+        if: env.SHOULD_RUN_E2E == 'true'
+        run: 
+          - mvn test
+        env:
+          AUTH0_API_CLIENT: ${{ secrets.AUTH0_API_CLIENT }}
+          AUTH0_API_SECRET: ${{ secrets.AUTH0_API_SECRET }}
+          AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }}
+          AUTH0_DOMAIN: ${{ secrets.AUTH0_DOMAIN }}
+          AUTH0_SECRET: ${{ secrets.AUTH0_SECRET }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          E2E_AUTH0_PASSWORD: ${{ secrets.E2E_AUTH0_PASSWORD }}
+          E2E_AUTH0_USERNAME: ${{ secrets.E2E_AUTH0_USERNAME }}
+          GRAPH_HOPPER_KEY: ${{ secrets.GRAPH_HOPPER_KEY }}
+          GTFS_DATABASE_PASSWORD: ${{ secrets.GTFS_DATABASE_PASSWORD }}
+          GTFS_DATABASE_URL: ${{ secrets.GTFS_DATABASE_URL }}
+          GTFS_DATABASE_USER: ${{ secrets.GTFS_DATABASE_USER }}
+          MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
+          MONGO_DB_NAME: ${{ secrets.MONGO_DB_NAME }}
+          OSM_VEX: ${{ secrets.OSM_VEX }}
+          RUN_E2E: "true"
+          S3_BUCKET: ${{ secrets.S3_BUCKET }}
+          SPARKPOST_EMAIL: ${{ secrets.SPARKPOST_EMAIL }}
+          SPARKPOST_KEY: ${{ secrets.SPARKPOST_KEY }}
+          TRANSITFEEDS_KEY: ${{ secrets.TRANSITFEEDS_KEY }}
+      # At this point, the build is successful.
+      # Upload coverage results from e2e tests and then delete coverage reports to
+      # avoid uploading the same coverage results twice.
+      - name: Upload coverage results from e2e
+        if: env.SHOULD_RUN_E2E == 'true'
+        run: bash <(curl -s https://codecov.io/bash) -c -F end_to_end_tests
+        continue-on-error: true
+      - name: Semantic Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: yarn semantic-release
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index df71b1a1d..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# although this is a node.js project, specify the use of Java in order for OTP
-# and datatools-server to run as expected on Java 8 specifically. Although not
-# confirmed in any way, another thought with using a Java-specific image is that
-# some things may be more optimized for Java thus making for more expedient and
-# reliable execution of Java code.
-dist: trusty # jdk 8 not available on xenial
-language: java
-java:
-  - oraclejdk8
-install: true
-notifications:
-  email: false
-services:
-  # needed for e2e tests to start datatools-server
-  - mongodb
-  - postgresql
-addons:
-  postgresql: 9.6
-cache:
-  directories:
-    - $HOME/.cache/yarn
-    - $HOME/.cache/pip
-before_install:
-  # install node 12
-  - nvm install 12
-  # install yarn
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - pip install --user mkdocs
-  - source ./scripts/check-if-e2e-should-run-on-travis.sh
-  # create database for e2e tests
-  - if [ "$SHOULD_RUN_E2E" = "true" ]; then psql -U postgres -c 'CREATE DATABASE catalogue;'; fi
-  # add aws credentials for datatools-server
-  - if [ "$SHOULD_RUN_E2E" = "true" ]; then mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=us-east-1' > ~/.aws/config; else mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=foo' 'aws_secret_access_key=bar' 'region=us-east-1' > ~/.aws/config; fi
-script:
-  - yarn
-  - yarn run lint
-  - yarn run lint-messages
-  - yarn run flow
-  - yarn run cover-client
-  # upload coverage results from unit tests and then delete coverage reports to
-  # avoid uploading the same coverage results twice
-  - bash <(curl -s https://codecov.io/bash) -c -F unit_tests
-  - if [ "$SHOULD_RUN_E2E" = "true" ]; then yarn run cover-end-to-end; fi
-  # upload coverage results from e2e tests and then delete coverage reports to
-  # avoid uploading the same coverage results twice
-  - if [ "$SHOULD_RUN_E2E" = "true" ]; then bash <(curl -s https://codecov.io/bash) -c -F end_to_end_tests; fi
-  - yarn run build -- --minify
-  - mkdocs build
-
-# If sudo is disabled, CI runs on container based infrastructure (allows caching &c.)
-sudo: false
-
-# Push results to codecov.io
-after_success:
-  # only deploy the release to github as the package is not needed on npm
-  - yarn run semantic-release
diff --git a/scripts/check-if-e2e-should-run-on-travis.sh b/scripts/check-if-e2e-should-run-on-travis.sh
index d5d4cb578..077b46db9 100644
--- a/scripts/check-if-e2e-should-run-on-travis.sh
+++ b/scripts/check-if-e2e-should-run-on-travis.sh
@@ -1,14 +1,20 @@
 # Since the e2e tests take a while to run and it could present an inconvenience
 # to be making sure the e2e tests work on every single PR, only run the e2e
-# tests on Travis for PRs to master or on commits directly to dev or master
-if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
-  if [[ "$TRAVIS_BRANCH" = "master" ]]; then
-    export SHOULD_RUN_E2E=true;
-    echo 'Will run E2E tests because this is a PR to master'
-  fi
+# tests on CI for PRs to master or on commits directly to dev or master
+if [[ "$GITHUB_BASE_REF_SLUG" = "master" ]]; then
+  echo "SHOULD_RUN_E2E=true" >> $GITHUB_ENV && export SHOULD_RUN_E2E=true
+  echo 'Will run E2E tests because this is a PR to master'
 else
-  if [[ "$TRAVIS_REPO_SLUG" = "ibi-group/datatools-ui" ]] && [[ "$TRAVIS_BRANCH" = "master" || "$TRAVIS_BRANCH" = "dev" ]]; then
-    export SHOULD_RUN_E2E=true;
+  if [[ "$GITHUB_REPOSITORY" = "ibi-group/datatools-server" ]] && [[ "$GITHUB_REF_SLUG" = "master" || "$GITHUB_REF_SLUG" = "dev" || "$GITHUB_REF_SLUG" = "github-actions" ]]; then
+    echo "SHOULD_RUN_E2E=true" >> $GITHUB_ENV && export SHOULD_RUN_E2E=true
     echo 'Will run E2E tests because this is a commit to master or dev'
   fi
 fi
+
+if [[ "$SHOULD_RUN_E2E" != "true" ]]; then
+  echo 'Skipping E2E tests...'
+fi
+
+# FIXME: Re-enable e2e for conditions above.
+echo "SHOULD_RUN_E2E=false" >> $GITHUB_ENV && export SHOULD_RUN_E2E=true
+echo 'Overriding E2E. Temporarily forcing to be false...'

From 76c0d6232d6389626b3a7ab82490d41c85373ab8 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Feb 2021 17:33:51 -0500
Subject: [PATCH 083/553] ci(gh-actions): use correct e2e command

---
 .github/workflows/node-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index c7b3f2b49..451de695f 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -63,7 +63,7 @@ jobs:
       - name: Run e2e tests
         if: env.SHOULD_RUN_E2E == 'true'
         run: 
-          - mvn test
+          - yarn cover-end-to-end
         env:
           AUTH0_API_CLIENT: ${{ secrets.AUTH0_API_CLIENT }}
           AUTH0_API_SECRET: ${{ secrets.AUTH0_API_SECRET }}

From ac74a2d575875be214d771328257677bfcb7d048 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Feb 2021 17:37:31 -0500
Subject: [PATCH 084/553] refactor(gh-actions): fix syntax error

---
 .github/workflows/node-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 451de695f..8a46d83a8 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -62,8 +62,7 @@ jobs:
         run: mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=us-east-1' > ~/.aws/config; else mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=foo' 'aws_secret_access_key=bar' 'region=us-east-1' > ~/.aws/config
       - name: Run e2e tests
         if: env.SHOULD_RUN_E2E == 'true'
-        run: 
-          - yarn cover-end-to-end
+        run: yarn cover-end-to-end
         env:
           AUTH0_API_CLIENT: ${{ secrets.AUTH0_API_CLIENT }}
           AUTH0_API_SECRET: ${{ secrets.AUTH0_API_SECRET }}

From b5beebb61fb1708541f926b68abc746544b89220 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Feb 2021 17:41:52 -0500
Subject: [PATCH 085/553] ci(e2e-check): rename file, fix permissioins

---
 ...e-should-run-on-travis.sh => check-if-e2e-should-run-on-ci.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename scripts/{check-if-e2e-should-run-on-travis.sh => check-if-e2e-should-run-on-ci.sh} (100%)
 mode change 100644 => 100755

diff --git a/scripts/check-if-e2e-should-run-on-travis.sh b/scripts/check-if-e2e-should-run-on-ci.sh
old mode 100644
new mode 100755
similarity index 100%
rename from scripts/check-if-e2e-should-run-on-travis.sh
rename to scripts/check-if-e2e-should-run-on-ci.sh

From a58eb2fd6a561c92496e263437bc5e47600d9700 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Feb 2021 17:45:36 -0500
Subject: [PATCH 086/553] ci(gh-actions): fix e2e check script name

---
 .github/workflows/node-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 8a46d83a8..78ea5c3f8 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Inject slug/short variables
         uses: rlespinasse/github-slug-action@v3.x
       - name: Check if End-to-end should run
-        run: ./scripts/check-if-e2e-should-run-on-travis.sh
+        run: ./scripts/check-if-e2e-should-run-on-ci.sh
       - name: Lint code
         run: yarn lint
       - name: Lint messages

From baaa879c1858fa207c9390e09fc994e4a6b1d268 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Feb 2021 17:53:08 -0500
Subject: [PATCH 087/553] ci(gh-actions): install mkdocs

---
 .github/workflows/node-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 78ea5c3f8..c4963836f 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -25,6 +25,8 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v2
+      - name: Install mkdocs
+        run: pip install --user mkdocs
       - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:

From ba1460e2b7711b79aca11d1293e932c224eaa209 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Feb 2021 18:12:58 -0500
Subject: [PATCH 088/553] ci(gh-actions): setup python environment

---
 .github/workflows/node-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index c4963836f..b22a436d6 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -25,6 +25,8 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v2
+      # Set up Python so that mkdocs command can be run.
+      - uses: actions/setup-python@v2
       - name: Install mkdocs
         run: pip install --user mkdocs
       - name: Use Node.js 12.x

From 712d6321a0580909e423da90d0219da8132e3033 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Feb 2021 18:21:10 -0500
Subject: [PATCH 089/553] ci(gh-actions): fix pip install of mkdocs

---
 .github/workflows/node-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index b22a436d6..057fde7ef 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -27,8 +27,11 @@ jobs:
       - uses: actions/checkout@v2
       # Set up Python so that mkdocs command can be run.
       - uses: actions/setup-python@v2
-      - name: Install mkdocs
-        run: pip install --user mkdocs
+      - name: Install mkdocs with pip
+        uses: actions/pip-action@v1
+        with:
+          packages: mkdocs
+          extra: --user
       - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:

From 6130dfda089670ae703ae8552876265d0ff67bd0 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 12 Feb 2021 09:10:19 -0500
Subject: [PATCH 090/553] ci(gh-actions): update pip install

---
 .github/workflows/node-ci.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 057fde7ef..50cddf3fa 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -25,13 +25,20 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v2
-      # Set up Python so that mkdocs command can be run.
-      - uses: actions/setup-python@v2
-      - name: Install mkdocs with pip
-        uses: actions/pip-action@v1
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Cache pip
+        uses: actions/cache@v2
         with:
-          packages: mkdocs
-          extra: --user
+          # This path is specific to Ubuntu
+          path: ~/.cache/pip
+          # Look to see if there is a cache hit for the corresponding requirements file
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+            ${{ runner.os }}-
+      - name: Install mkdocs
+        run: pip install mkdocs
       - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:

From 8ef099ed6605f5abbcdecd9b3156e620f4ea92ad Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 17 Feb 2021 10:02:02 -0500
Subject: [PATCH 091/553] refactor(DeploymentsPanel): move auto-deploy settings
 to main panel

---
 i18n/english.yml                             |  34 +++--
 lib/manager/components/DeploymentSettings.js |  45 ------
 lib/manager/components/DeploymentsPanel.js   | 153 +++++++++++++------
 lib/manager/components/ProjectViewer.js      | 112 ++++++++------
 4 files changed, 197 insertions(+), 147 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 21ec1197b..38ed82c55 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -57,19 +57,6 @@ components:
     success: Success!
     warning: Warning!
   DeploymentSettings:
-    autoDeploy:
-      description: >
-        Once a pinned deployment has been configured and deployed to a
-        server (at least once), auto-deployment can be enabled so that whenever
-        a new version is processed for an associated feed source, a deployment
-        will be kicked off (assuming there are no critical errors with the new
-        version).
-      label: Enable auto-deploy
-      noPinnedDeployment: None selected
-      pinnedDeploymentHelp: >
-        Tip: Under the Deployments tab, click the thumbtack icon next to the
-        deployment you would like to target for auto-deployments.
-      title: Auto-deployment
     boundsPlaceholder: 'min_lon, min_lat, max_lon, max_lat'
     buildConfig:
       elevationBucket:
@@ -153,8 +140,29 @@ components:
       name: Name
     title: Deployments
   DeploymentsPanel:
+    autoDeploy:
+      help: >
+        Whenever a new version is processed, a deployment will automatically be
+        kicked off (assuming there are no critical errors).
+      label: Enable auto-deploy?
+      noPinnedDeployment: None selected
+      pinnedDeploymentHelp: >
+        Tip: Under the Deployments tab, click the thumbtack icon next to the
+        deployment you would like to target for auto-deployments.
+      title: Auto-deployment
+    configuration:
+      body: >
+        Deployments can use project-level configurations (e.g., for build or
+        router config files) or be configured individually.
+      editSettings: Edit deployment settings
+      manageServers: Manage deployment servers
+      title: Configuring deployments
     delete: Remove deployment
     new: New Deployment
+    pinnedDeployment:
+      help: Pin a deployment (and deploy to a server at least once) to enable auto-deployment.
+      label: Pinned deployment
+      placeholder: Select a deployment to pin
     search: Search for deployments
     table:
       creationDate: Created
diff --git a/lib/manager/components/DeploymentSettings.js b/lib/manager/components/DeploymentSettings.js
index 0a26ee165..501bf7de4 100644
--- a/lib/manager/components/DeploymentSettings.js
+++ b/lib/manager/components/DeploymentSettings.js
@@ -37,7 +37,6 @@ type Props = {
 }
 
 type State = {
-  autoDeploy?: boolean,
   buildConfig: Object,
   routerConfig: Object,
   useCustomOsmBounds?: boolean
@@ -172,11 +171,6 @@ class DeploymentSettings extends Component<Props, State> {
 
   _onSave = (evt) => this.props.updateProject(this.props.project.id, this.state, true)
 
-  _onToggleAutoDeploy = (evt) => {
-    const stateUpdate = { autoDeploy: { $set: evt.target.checked } }
-    this.setState(update(this.state, stateUpdate))
-  }
-
   _onToggleCustomBounds = (evt) => {
     const stateUpdate = { useCustomOsmBounds: { $set: (evt.target.value === 'true') } }
     this.setState(update(this.state, stateUpdate))
@@ -215,47 +209,8 @@ class DeploymentSettings extends Component<Props, State> {
   render () {
     const updaters = get(this.state, 'routerConfig.updaters') || []
     const {project, editDisabled} = this.props
-    const {deployments, pinnedDeploymentId} = project
-    const pinnedDeployment = pinnedDeploymentId && deployments &&
-      deployments.find(d => d.id === pinnedDeploymentId)
     return (
       <div key={project.lastUpdated} className='deployment-settings-panel'>
-        <LinkContainer to={`/admin/servers`} style={{marginBottom: '20px'}}>
-          <Button block bsStyle='primary' bsSize='large'>
-            <Icon type='server' /> {this.messages('manageServers')}
-          </Button>
-        </LinkContainer>
-        {/* Auto-deploy settings */}
-        <Panel header={
-          <h4>
-            <Icon type='rocket' />{' '}
-            {this.messages('autoDeploy.title')}
-          </h4>
-        }>
-          <p>{this.messages('autoDeploy.description')}</p>
-          <p>
-            Pinned Deployment:{' '}
-            {pinnedDeployment
-              ? pinnedDeployment.name
-              : <span className='text-muted'>
-                {this.messages('autoDeploy.noPinnedDeployment')}
-              </span>
-            }
-          </p>
-          {!pinnedDeployment &&
-            <small className='text-danger'>
-              {this.messages('autoDeploy.pinnedDeploymentHelp')}
-            </small>
-          }
-          <Checkbox
-            checked={this._getValue('autoDeploy')}
-            disabled={!pinnedDeployment}
-            name={'autoDeploy'}
-            onChange={this._onToggleAutoDeploy}
-          >
-            {this.messages('autoDeploy.label')}
-          </Checkbox>
-        </Panel>
         {/* Build config settings */}
         <Panel header={
           <h4>
diff --git a/lib/manager/components/DeploymentsPanel.js b/lib/manager/components/DeploymentsPanel.js
index ce4b8bc53..a1de5b5f4 100644
--- a/lib/manager/components/DeploymentsPanel.js
+++ b/lib/manager/components/DeploymentsPanel.js
@@ -4,16 +4,21 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import { LinkContainer } from 'react-router-bootstrap'
 import {
-  Row,
-  Label as BsLabel,
-  Col,
   Button,
   ButtonGroup,
-  Table,
-  FormControl,
+  Checkbox,
+  Col,
+  ControlLabel,
   Glyphicon,
-  Panel
+  HelpBlock,
+  FormControl,
+  FormGroup,
+  Label as BsLabel,
+  Panel,
+  Row,
+  Table
 } from 'react-bootstrap'
+import Select from 'react-select'
 
 import * as deploymentActions from '../actions/deployments'
 import * as feedsActions from '../actions/feeds'
@@ -27,7 +32,7 @@ import {formatTimestamp, fromNow} from '../../common/util/date-time'
 import {getServerDeployedTo} from '../util/deployment'
 
 import type {Props as ContainerProps} from '../containers/DeploymentsPanel'
-import type {Deployment, Project} from '../../types'
+import type {Deployment, Project, ReactSelectOption} from '../../types'
 
 type Props = ContainerProps & {
   createDeployment: typeof deploymentActions.createDeployment,
@@ -40,6 +45,50 @@ type Props = ContainerProps & {
 }
 
 export default class DeploymentsPanel extends Component<Props> {
+  messages = getComponentMessages('DeploymentsPanel')
+
+  _onChangePinned = (option: ReactSelectOption) => {
+    const {
+      fetchProjectDeployments,
+      fetchProjectFeeds,
+      project,
+      updateProject
+    } = this.props
+
+    updateProject(
+      project.id,
+      { pinnedDeploymentId: option ? option.value : null }
+    // $FlowFixMe action is wrapped in dispatch, so it can do promise stuff
+    ).then(
+      () => {
+        fetchProjectDeployments(project.id)
+        // needed in case user switches back to feeds tab
+        fetchProjectFeeds(project.id)
+      }
+    )
+  }
+
+  _onToggleAutoDeploy = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    const {
+      fetchProjectDeployments,
+      fetchProjectFeeds,
+      project,
+      updateProject
+    } = this.props
+
+    updateProject(
+      project.id,
+      { autoDeploy: evt.target.checked }
+    // $FlowFixMe action is wrapped in dispatch, so it can do promise stuff
+    ).then(
+      () => {
+        fetchProjectDeployments(project.id)
+        // needed in case user switches back to feeds tab
+        fetchProjectFeeds(project.id)
+      }
+    )
+  }
+
   _onDeleteDeployment = (deployment: Deployment) => {
     this.refs.confirmModal.open({
       title: 'Delete Deployment?',
@@ -62,8 +111,10 @@ export default class DeploymentsPanel extends Component<Props> {
       updateDeployment,
       updateProject
     } = this.props
-    const deployment = project.deployments &&
-      project.deployments.find(d => d.id && d.id === deploymentId)
+    const deployments = project.deployments || []
+    const deployment = deployments &&
+      deployments.find(d => d.id && d.id === deploymentId)
+    // Deployment is selected and found in list.
     if (deployment) {
       return (
         <ActiveDeploymentViewer
@@ -72,7 +123,8 @@ export default class DeploymentsPanel extends Component<Props> {
           feedSources={project.feedSources} />
       )
     }
-    if (deploymentId && !project.deployments) {
+    // Deployment is selected, but deployments have not finished loading.
+    if (deploymentId && !deployments) {
       return <Loading />
     }
     return (
@@ -90,16 +142,53 @@ export default class DeploymentsPanel extends Component<Props> {
             updateProject={updateProject} />
         </Col>
         <Col xs={3}>
-          <Panel header={<h3>Deploying feeds to OTP</h3>}>
-            <p>A collection of feeds can be deployed to OpenTripPlanner (OTP) instances that have been defined in the organization settings.</p>
+          <Panel header={
+            <h3>
+              <Icon type='rocket' /> {this.messages('autoDeploy.title')}
+            </h3>
+          }>
+            <FormGroup controlId='pinnedDeploymentId'>
+              <ControlLabel>
+                <Icon type='thumb-tack' />{' '}
+                {this.messages('pinnedDeployment.label')}
+              </ControlLabel>
+              <Select
+                name='pinnedDeploymentId'
+                onChange={this._onChangePinned}
+                options={deployments.map(d => ({label: d.name, value: d.id}))}
+                placeholder={this.messages('pinnedDeployment.placeholder')}
+                value={project.pinnedDeploymentId}
+              />
+              <HelpBlock>
+                {this.messages('pinnedDeployment.help')}
+              </HelpBlock>
+            </FormGroup>
+            <Checkbox
+              checked={project.autoDeploy}
+              disabled={!project.pinnedDeploymentId}
+              name={'autoDeploy'}
+              onChange={this._onToggleAutoDeploy}
+            >
+              {this.messages('autoDeploy.label')}
+            </Checkbox>
+            <HelpBlock>{this.messages('autoDeploy.help')}</HelpBlock>
+          </Panel>
+          <Panel header={
+            <h3><Icon type='cog' /> {this.messages('configuration.title')}</h3>
+          }>
+            <p>
+              {this.messages('configuration.body')}
+            </p>
             <LinkContainer to={`/project/${project.id}/settings/deployment`}>
               <Button block>
-                <Icon type='cog' /> Edit deployment settings
+                <Icon type='cog' />{' '}
+                {this.messages('configuration.editSettings')}
               </Button>
             </LinkContainer>
             <LinkContainer to={`/admin/servers`}>
               <Button block>
-                <Icon type='server' /> Manage deployment servers
+                <Icon type='server' />{' '}
+                {this.messages('configuration.manageServers')}
               </Button>
             </LinkContainer>
           </Panel>
@@ -229,28 +318,6 @@ class DeploymentListItem extends Component<RowProps> {
 
   _onClickDelete = () => this.props.deleteDeployment(this.props.deployment)
 
-  _onClickPin = () => {
-    const {
-      deployment,
-      fetchProjectDeployments,
-      fetchProjectFeeds,
-      project,
-      updateProject
-    } = this.props
-
-    updateProject(
-      project.id,
-      { pinnedDeploymentId: this._isPinned() ? null : deployment.id }
-    // $FlowFixMe action is wrapped in dispatch, so it can do promise stuff
-    ).then(
-      () => {
-        fetchProjectDeployments(project.id)
-        // needed in case user switches back to feeds tab
-        fetchProjectFeeds(project.id)
-      }
-    )
-  }
-
   render () {
     const {deployment, project} = this.props
     const server = getServerDeployedTo(deployment, project)
@@ -258,7 +325,14 @@ class DeploymentListItem extends Component<RowProps> {
     return (
       <tr className={this._isPinned() ? 'pinned-deployment' : ''}>
         <td>
+          {this._isPinned()
+            ? <Icon
+              title='This deployment is pinned.'
+              type='thumb-tack' />
+            : null
+          }
           <EditableTextField
+            inline
             isEditing={(deployment.isCreating === true)}
             value={deployment.name}
             rejectEmptyValue
@@ -303,13 +377,6 @@ class DeploymentListItem extends Component<RowProps> {
         </td>
         <td>
           <ButtonGroup className='pull-right'>
-            <Button
-              bsSize='xsmall'
-              bsStyle={this._isPinned() ? 'info' : 'warning'}
-              onClick={this._onClickPin}
-            >
-              <Glyphicon glyph='pushpin' />
-            </Button>
             <Button
               bsStyle='danger'
               bsSize='xsmall'
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index a387f85e1..26057928b 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -21,6 +21,7 @@ import {shallowEqual} from 'react-pure-render'
 import * as deploymentActions from '../actions/deployments'
 import * as feedsActions from '../actions/feeds'
 import * as projectsActions from '../actions/projects'
+import Loading from '../../common/components/Loading'
 import ManagerPage from '../../common/components/ManagerPage'
 import WatchButton from '../../common/containers/WatchButton'
 import {getComponentMessages, getConfigProperty, isModuleEnabled} from '../../common/util/config'
@@ -74,6 +75,61 @@ export default class ProjectViewer extends Component<Props, State> {
     onProjectViewerMount(projectId)
   }
 
+  _renderDeploymentsTab = () => {
+    const {activeComponent, activeSubComponent, project} = this.props
+    return isModuleEnabled('deployment')
+      ? <Tab
+        eventKey='deployments'
+        disabled={this._isProjectEditDisabled()}
+        title={
+          <span><Glyphicon className='icon-link' glyph='globe' />
+            <span className='hidden-xs'>{this.messages('deployments')}</span>
+          </span>
+        }>
+        <DeploymentsPanel
+          activeSubComponent={activeSubComponent}
+          expanded={activeComponent === 'deployments'}
+          project={project}
+        />
+      </Tab>
+      : null
+  }
+
+  _renderPublicFeeds = () => {
+    const s3Bucket = getConfigProperty('application.data.gtfs_s3_bucket')
+    const publicFeedsLink = s3Bucket
+      ? `https://s3.amazonaws.com/${s3Bucket}/public/index.html`
+      : null
+    return isModuleEnabled('enterprise') && !this._isProjectEditDisabled() &&
+      <div style={{marginBottom: '20px'}}>
+        <Button
+          bsStyle='primary'
+          block
+          style={{marginBottom: '5px'}}
+          onClick={this._onClickDeploy}>
+          <Icon type='users' /> {this.messages('makePublic')}
+        </Button>
+        {s3Bucket &&
+          <p className='small'>
+            <strong>Note:</strong> Public feeds page can be viewed{' '}
+            <a target='_blank' href={publicFeedsLink}>here</a>.
+          </p>
+        }
+      </div>
+  }
+
+  _isProjectEditDisabled = () => {
+    const {project, user} = this.props
+    return !user.permissions ||
+      !user.permissions.isProjectAdmin(project.id, project.organizationId)
+  }
+
+  _isWatchingProject = () => {
+    const {project, user} = this.props
+    return user.subscriptions &&
+      user.subscriptions.hasProjectSubscription(project.id, 'project-updated')
+  }
+
   _onClickDeploy = () => this.props.deployPublic(this.props.project)
 
   _toggleCreateView = () => { this.setState({ createMode: !this.state.createMode }) }
@@ -87,15 +143,15 @@ export default class ProjectViewer extends Component<Props, State> {
       project,
       user
     } = this.props
-    if (isFetching && !project) {
-      // Show spinner if fetching (and there is no current feed source loaded).
+    if (activeComponent !== 'deployment' && isFetching && !project) {
+      // Show spinner if fetching (and the project hasn't loaded yet).
       return (
         <ManagerPage ref='page'>
           <Grid fluid>
             <h1
               className='text-center'
               style={{marginTop: '150px'}}>
-              <Icon className='fa-5x fa-spin' type='refresh' />
+              <Loading />
             </h1>
           </Grid>
         </ManagerPage>
@@ -108,7 +164,9 @@ export default class ProjectViewer extends Component<Props, State> {
           <Grid fluid>
             <Row>
               <Col xs={12}>
-                <p className='project-not-found'>No project found for <strong>{this.props.projectId}</strong></p>
+                <p className='project-not-found'>
+                  No project found for <strong>{this.props.projectId}</strong>
+                </p>
                 <p><Link to='/project'>Return to list of projects</Link></p>
               </Col>
             </Row>
@@ -116,13 +174,7 @@ export default class ProjectViewer extends Component<Props, State> {
         </ManagerPage>
       )
     }
-    const s3Bucket = getConfigProperty('application.data.gtfs_s3_bucket')
-    const publicFeedsLink = s3Bucket
-      ? `https://s3.amazonaws.com/${s3Bucket}/public/index.html`
-      : null
-    const isWatchingProject = user.subscriptions && user.subscriptions.hasProjectSubscription(project.id, 'project-updated')
-    const projectEditDisabled = !user.permissions || !user.permissions.isProjectAdmin(project.id, project.organizationId)
-
+    const projectEditDisabled = this._isProjectEditDisabled()
     return (
       <ManagerPage
         ref='page'
@@ -136,7 +188,7 @@ export default class ProjectViewer extends Component<Props, State> {
                 <ButtonToolbar className={`pull-right`}>
                   {getConfigProperty('application.notifications_enabled')
                     ? <WatchButton
-                      isWatching={isWatchingProject}
+                      isWatching={this._isWatchingProject()}
                       user={user}
                       target={project.id}
                       subscriptionType='project-updated' />
@@ -181,23 +233,7 @@ export default class ProjectViewer extends Component<Props, State> {
                   }
                 </Col>
                 <Col xs={12} sm={2}>
-                  {isModuleEnabled('enterprise') && !projectEditDisabled &&
-                    <div style={{marginBottom: '20px'}}>
-                      <Button
-                        bsStyle='primary'
-                        block
-                        style={{marginBottom: '5px'}}
-                        onClick={this._onClickDeploy}>
-                        <Icon type='users' /> {this.messages('makePublic')}
-                      </Button>
-                      {s3Bucket &&
-                        <p className='small'>
-                          <strong>Note:</strong> Public feeds page can be viewed{' '}
-                          <a target='_blank' href={publicFeedsLink}>here</a>.
-                        </p>
-                      }
-                    </div>
-                  }
+                  {this._renderPublicFeeds()}
                   <ProjectSummaryPanel
                     project={project}
                     feedSources={project.feedSources || []} />
@@ -209,23 +245,7 @@ export default class ProjectViewer extends Component<Props, State> {
                 </Col>
               </Row>
             </Tab>
-            {isModuleEnabled('deployment')
-              ? <Tab
-                eventKey='deployments'
-                disabled={projectEditDisabled}
-                title={
-                  <span><Glyphicon className='icon-link' glyph='globe' />
-                    <span className='hidden-xs'>{this.messages('deployments')}</span>
-                  </span>
-                }>
-                <DeploymentsPanel
-                  activeSubComponent={activeSubComponent}
-                  expanded={activeComponent === 'deployments'}
-                  project={project}
-                />
-              </Tab>
-              : null
-            }
+            {this._renderDeploymentsTab()}
             <Tab
               eventKey='settings'
               disabled={projectEditDisabled}

From b8c6c0208b91133deb60eb5a6291cfc51291b865 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 17 Feb 2021 14:19:28 -0500
Subject: [PATCH 092/553] refactor(DeploymentsPanel): clean up deployments
 component/props

---
 i18n/english.yml                           |   2 +-
 lib/manager/components/DeploymentsPanel.js | 241 +++++++--------------
 lib/manager/containers/DeploymentsPanel.js |   4 -
 lib/manager/util/deployment.js             |  22 ++
 4 files changed, 96 insertions(+), 173 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 38ed82c55..8c276670b 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -150,7 +150,7 @@ components:
         Tip: Under the Deployments tab, click the thumbtack icon next to the
         deployment you would like to target for auto-deployments.
       title: Auto-deployment
-    configuration:
+    config:
       body: >
         Deployments can use project-level configurations (e.g., for build or
         router config files) or be configured individually.
diff --git a/lib/manager/components/DeploymentsPanel.js b/lib/manager/components/DeploymentsPanel.js
index a1de5b5f4..21a7e3908 100644
--- a/lib/manager/components/DeploymentsPanel.js
+++ b/lib/manager/components/DeploymentsPanel.js
@@ -5,7 +5,6 @@ import React, {Component} from 'react'
 import { LinkContainer } from 'react-router-bootstrap'
 import {
   Button,
-  ButtonGroup,
   Checkbox,
   Col,
   ControlLabel,
@@ -21,7 +20,6 @@ import {
 import Select from 'react-select'
 
 import * as deploymentActions from '../actions/deployments'
-import * as feedsActions from '../actions/feeds'
 import * as projectsActions from '../actions/projects'
 import ActiveDeploymentViewer from '../containers/ActiveDeploymentViewer'
 import ConfirmModal from '../../common/components/ConfirmModal'
@@ -29,7 +27,7 @@ import EditableTextField from '../../common/components/EditableTextField'
 import Loading from '../../common/components/Loading'
 import {getComponentMessages} from '../../common/util/config'
 import {formatTimestamp, fromNow} from '../../common/util/date-time'
-import {getServerDeployedTo} from '../util/deployment'
+import {deploymentsComparator, getServerDeployedTo} from '../util/deployment'
 
 import type {Props as ContainerProps} from '../containers/DeploymentsPanel'
 import type {Deployment, Project, ReactSelectOption} from '../../types'
@@ -37,8 +35,6 @@ import type {Deployment, Project, ReactSelectOption} from '../../types'
 type Props = ContainerProps & {
   createDeployment: typeof deploymentActions.createDeployment,
   deleteDeployment: typeof deploymentActions.deleteDeployment,
-  fetchProjectDeployments: typeof deploymentActions.fetchProjectDeployments,
-  fetchProjectFeeds: typeof feedsActions.fetchProjectFeeds,
   saveDeployment: typeof deploymentActions.saveDeployment,
   updateDeployment: typeof deploymentActions.updateDeployment,
   updateProject: typeof projectsActions.updateProject
@@ -47,56 +43,24 @@ type Props = ContainerProps & {
 export default class DeploymentsPanel extends Component<Props> {
   messages = getComponentMessages('DeploymentsPanel')
 
-  _onChangePinned = (option: ReactSelectOption) => {
-    const {
-      fetchProjectDeployments,
-      fetchProjectFeeds,
-      project,
-      updateProject
-    } = this.props
+  _updateProject = (updates: any) => {
+    const {project, updateProject} = this.props
+    updateProject(project.id, updates, true)
+  }
 
-    updateProject(
-      project.id,
-      { pinnedDeploymentId: option ? option.value : null }
-    // $FlowFixMe action is wrapped in dispatch, so it can do promise stuff
-    ).then(
-      () => {
-        fetchProjectDeployments(project.id)
-        // needed in case user switches back to feeds tab
-        fetchProjectFeeds(project.id)
-      }
-    )
+  _onChangePinned = (option: ReactSelectOption) => {
+    this._updateProject({pinnedDeploymentId: option ? option.value : null})
   }
 
   _onToggleAutoDeploy = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const {
-      fetchProjectDeployments,
-      fetchProjectFeeds,
-      project,
-      updateProject
-    } = this.props
-
-    updateProject(
-      project.id,
-      { autoDeploy: evt.target.checked }
-    // $FlowFixMe action is wrapped in dispatch, so it can do promise stuff
-    ).then(
-      () => {
-        fetchProjectDeployments(project.id)
-        // needed in case user switches back to feeds tab
-        fetchProjectFeeds(project.id)
-      }
-    )
+    this._updateProject({autoDeploy: evt.target.checked})
   }
 
   _onDeleteDeployment = (deployment: Deployment) => {
     this.refs.confirmModal.open({
       title: 'Delete Deployment?',
       body: `Are you sure you want to delete the deployment ${deployment.name}?`,
-      onConfirm: () => {
-        console.log('OK, deleting')
-        this.props.deleteDeployment(deployment)
-      }
+      onConfirm: () => this.props.deleteDeployment(deployment)
     })
   }
 
@@ -104,16 +68,17 @@ export default class DeploymentsPanel extends Component<Props> {
     const {
       activeSubComponent: deploymentId,
       createDeployment,
-      fetchProjectDeployments,
-      fetchProjectFeeds,
       project,
       saveDeployment,
-      updateDeployment,
-      updateProject
+      updateDeployment
     } = this.props
-    const deployments = project.deployments || []
-    const deployment = deployments &&
-      deployments.find(d => d.id && d.id === deploymentId)
+    const {deployments, pinnedDeploymentId} = project
+    // Deployment is selected, but deployments have not finished loading.
+    if (deploymentId && !deployments) return <Loading />
+    const sortedDeployments = deployments
+      ? deployments.sort((a, b) => deploymentsComparator(a, b, pinnedDeploymentId))
+      : []
+    const deployment = sortedDeployments.find(d => d.id && d.id === deploymentId)
     // Deployment is selected and found in list.
     if (deployment) {
       return (
@@ -123,29 +88,21 @@ export default class DeploymentsPanel extends Component<Props> {
           feedSources={project.feedSources} />
       )
     }
-    // Deployment is selected, but deployments have not finished loading.
-    if (deploymentId && !deployments) {
-      return <Loading />
-    }
     return (
       <Row>
         <ConfirmModal ref='confirmModal' />
-        <Col xs={9}>
+        <Col sm={12} md={9}>
           <DeploymentsList
             createDeployment={createDeployment}
             deleteDeployment={this._onDeleteDeployment}
-            fetchProjectDeployments={fetchProjectDeployments}
-            fetchProjectFeeds={fetchProjectFeeds}
+            deployments={sortedDeployments}
             project={project}
             saveDeployment={saveDeployment}
-            updateDeployment={updateDeployment}
-            updateProject={updateProject} />
+            updateDeployment={updateDeployment} />
         </Col>
-        <Col xs={3}>
+        <Col sm={12} md={3}>
           <Panel header={
-            <h3>
-              <Icon type='rocket' /> {this.messages('autoDeploy.title')}
-            </h3>
+            <h3><Icon type='rocket' /> {this.messages('autoDeploy.title')}</h3>
           }>
             <FormGroup controlId='pinnedDeploymentId'>
               <ControlLabel>
@@ -155,13 +112,11 @@ export default class DeploymentsPanel extends Component<Props> {
               <Select
                 name='pinnedDeploymentId'
                 onChange={this._onChangePinned}
-                options={deployments.map(d => ({label: d.name, value: d.id}))}
+                options={sortedDeployments.map(d => ({label: d.name, value: d.id}))}
                 placeholder={this.messages('pinnedDeployment.placeholder')}
                 value={project.pinnedDeploymentId}
               />
-              <HelpBlock>
-                {this.messages('pinnedDeployment.help')}
-              </HelpBlock>
+              <HelpBlock>{this.messages('pinnedDeployment.help')}</HelpBlock>
             </FormGroup>
             <Checkbox
               checked={project.autoDeploy}
@@ -174,21 +129,17 @@ export default class DeploymentsPanel extends Component<Props> {
             <HelpBlock>{this.messages('autoDeploy.help')}</HelpBlock>
           </Panel>
           <Panel header={
-            <h3><Icon type='cog' /> {this.messages('configuration.title')}</h3>
+            <h3><Icon type='cog' /> {this.messages('config.title')}</h3>
           }>
-            <p>
-              {this.messages('configuration.body')}
-            </p>
+            <p>{this.messages('config.body')}</p>
             <LinkContainer to={`/project/${project.id}/settings/deployment`}>
               <Button block>
-                <Icon type='cog' />{' '}
-                {this.messages('configuration.editSettings')}
+                <Icon type='cog' /> {this.messages('config.editSettings')}
               </Button>
             </LinkContainer>
             <LinkContainer to={`/admin/servers`}>
               <Button block>
-                <Icon type='server' />{' '}
-                {this.messages('configuration.manageServers')}
+                <Icon type='server' /> {this.messages('config.manageServers')}
               </Button>
             </LinkContainer>
           </Panel>
@@ -201,17 +152,13 @@ export default class DeploymentsPanel extends Component<Props> {
 type ListProps = {
   createDeployment: typeof deploymentActions.createDeployment,
   deleteDeployment: Deployment => void,
-  fetchProjectDeployments: typeof deploymentActions.fetchProjectDeployments,
-  fetchProjectFeeds: typeof feedsActions.fetchProjectFeeds,
+  deployments: Array<Deployment>,
   project: Project,
   saveDeployment: typeof deploymentActions.saveDeployment,
-  updateDeployment: typeof deploymentActions.updateDeployment,
-  updateProject: typeof projectsActions.updateProject
+  updateDeployment: typeof deploymentActions.updateDeployment
 }
 
-type State = {
-  searchText?: string
-}
+type State = {searchText?: string}
 
 class DeploymentsList extends Component<ListProps, State> {
   messages = getComponentMessages('DeploymentsList')
@@ -223,37 +170,19 @@ class DeploymentsList extends Component<ListProps, State> {
   _onClickNewDeployment = () => this.props.createDeployment(this.props.project.id)
 
   render () {
-    const {project} = this.props
-    const {deployments} = project
+    const {
+      deleteDeployment,
+      deployments,
+      project,
+      saveDeployment,
+      updateDeployment
+    } = this.props
     const {searchText} = this.state
-    const {pinnedDeploymentId} = project
+    // Filter deployments by search text.
     const visibleDeployments: Array<Deployment> = deployments
-      ? deployments
-        // Filter deployments by search text.
-        .filter(deployment =>
-          deployment.name
-            .toLowerCase()
-            .indexOf((searchText || '').toLowerCase()) !== -1
-        )
-        .sort((a, b) => {
-          // If creating deployment, pin to top.
-          if (!a.name) return -1
-          if (!b.name) return 1
-          // Ensure pinned deployment is first element in list.
-          if (b.id === pinnedDeploymentId) return 1
-          if (a.id === pinnedDeploymentId) return -1
-          // Otherwise, sort by most recent last deployed date and then most recent
-          // created date (ensuring deployments never deployed show up at end of
-          // list).
-          // TODO: Refactor to allow for sorting on multiple fields? This may be
-          //  overkill for deployments.
-          const aValue = a.lastDeployed || a.dateCreated
-          const bValue = b.lastDeployed || b.dateCreated
-          if (b.lastDeployed && !a.lastDeployed) return 1
-          else if (a.lastDeployed && !b.lastDeployed) return -1
-          return bValue - aValue
-        })
-      : []
+      .filter(({name}) =>
+        name.toLowerCase().indexOf((searchText || '').toLowerCase()) !== -1
+      )
     return (
       <Panel
         header={
@@ -266,7 +195,6 @@ class DeploymentsList extends Component<ListProps, State> {
             <Col xs={8}>
               <Button
                 bsStyle='success'
-                // disabled={projectEditDisabled}
                 className='pull-right'
                 onClick={this._onClickNewDeployment}>
                 <Glyphicon glyph='plus' /> {this.messages('new')}
@@ -289,9 +217,13 @@ class DeploymentsList extends Component<ListProps, State> {
           <tbody>
             {visibleDeployments.map((deployment, index) => (
               <DeploymentListItem
-                key={deployment.id || 'new-deployment-' + Math.random()}
+                deleteDeployment={deleteDeployment}
                 deployment={deployment}
-                {...this.props} />
+                key={deployment.id || 'new-deployment-' + Math.random()}
+                project={project}
+                saveDeployment={saveDeployment}
+                updateDeployment={updateDeployment}
+              />
             ))}
           </tbody>
         </Table>
@@ -301,10 +233,20 @@ class DeploymentsList extends Component<ListProps, State> {
 }
 
 type RowProps = {
-  deployment: Deployment
-} & ListProps
+  deleteDeployment: Deployment => void,
+  deployment: Deployment,
+  project: Project,
+  saveDeployment: typeof deploymentActions.saveDeployment,
+  updateDeployment: typeof deploymentActions.updateDeployment
+}
+
+const NA = <span className='deployment-na'>N/A</span>
 
 class DeploymentListItem extends Component<RowProps> {
+  _renderTime = (time: ?number) => time
+    ? <span title={formatTimestamp(time)}>{fromNow(time)}</span>
+    : NA
+
   _isPinned = () => {
     const {deployment, project} = this.props
     return project.pinnedDeploymentId === deployment.id
@@ -321,16 +263,10 @@ class DeploymentListItem extends Component<RowProps> {
   render () {
     const {deployment, project} = this.props
     const server = getServerDeployedTo(deployment, project)
-    const na = (<span className='deployment-na'>N/A</span>)
     return (
       <tr className={this._isPinned() ? 'pinned-deployment' : ''}>
         <td>
-          {this._isPinned()
-            ? <Icon
-              title='This deployment is pinned.'
-              type='thumb-tack' />
-            : null
-          }
+          {this._isPinned() ? <Icon type='thumb-tack' /> : null}
           <EditableTextField
             inline
             isEditing={(deployment.isCreating === true)}
@@ -340,50 +276,19 @@ class DeploymentListItem extends Component<RowProps> {
             link={`/project/${deployment.projectId}/deployments/${deployment.id}`}
           />
         </td>
+        <td>{this._renderTime(deployment.dateCreated)}</td>
+        <td>{this._renderTime(deployment.lastDeployed)}</td>
+        <td>{server ? <BsLabel>{server.name}</BsLabel> : NA}</td>
+        <td>{deployment.feedVersions ? deployment.feedVersions.length : NA}</td>
+        <td>{deployment.routerId ? 'Yes' : NA}</td>
         <td>
-          {deployment.dateCreated
-            ? <span title={formatTimestamp(deployment.dateCreated)}>
-              {' '}
-              {fromNow(deployment.dateCreated)}
-            </span>
-            : na
-          }
-        </td>
-        <td>
-          {deployment.lastDeployed
-            ? <span title={formatTimestamp(deployment.lastDeployed)}>
-              {fromNow(deployment.lastDeployed)}
-            </span>
-            : na
-          }
-        </td>
-        <td>
-          {server
-            ? <BsLabel>{server.name}</BsLabel>
-            : na
-          }
-        </td>
-        <td>
-          {deployment.feedVersions
-            ? <span>{deployment.feedVersions.length}</span>
-            : na
-          }
-        </td>
-        <td>
-          {deployment.routerId
-            ? 'Yes'
-            : na
-          }
-        </td>
-        <td>
-          <ButtonGroup className='pull-right'>
-            <Button
-              bsStyle='danger'
-              bsSize='xsmall'
-              onClick={this._onClickDelete}>
-              <Glyphicon glyph='remove' />
-            </Button>
-          </ButtonGroup>
+          <Button
+            bsSize='xsmall'
+            bsStyle='danger'
+            className='pull-right'
+            onClick={this._onClickDelete}>
+            <Glyphicon glyph='remove' />
+          </Button>
         </td>
       </tr>
     )
diff --git a/lib/manager/containers/DeploymentsPanel.js b/lib/manager/containers/DeploymentsPanel.js
index 9411b87ac..4e4bdae5b 100644
--- a/lib/manager/containers/DeploymentsPanel.js
+++ b/lib/manager/containers/DeploymentsPanel.js
@@ -3,10 +3,8 @@
 import {connect} from 'react-redux'
 
 import {updateProject} from '../actions/projects'
-import {fetchProjectFeeds} from '../actions/feeds'
 import {
   createDeployment,
-  fetchProjectDeployments,
   saveDeployment,
   deleteDeployment,
   updateDeployment
@@ -27,8 +25,6 @@ const mapStateToProps = (state: AppState, ownProps: Props) => ({})
 const mapDispatchToProps = {
   createDeployment,
   deleteDeployment,
-  fetchProjectDeployments,
-  fetchProjectFeeds,
   saveDeployment,
   updateDeployment,
   updateProject
diff --git a/lib/manager/util/deployment.js b/lib/manager/util/deployment.js
index 5dd73b7a9..aabb9a9d4 100644
--- a/lib/manager/util/deployment.js
+++ b/lib/manager/util/deployment.js
@@ -244,3 +244,25 @@ export function getActiveInstanceCount (instances?: Array<EC2InstanceSummary>) {
     ? instances.filter(instance => instance.state.name === 'running').length
     : 0
 }
+
+/**
+ * Sort function for list of deployments.
+ */
+export function deploymentsComparator (a: Deployment, b: Deployment, pinnedDeploymentId: ?string) {
+  // If creating deployment, pin to top.
+  if (!a.name) return -1
+  if (!b.name) return 1
+  // Ensure pinned deployment is first element in list.
+  if (b.id === pinnedDeploymentId) return 1
+  if (a.id === pinnedDeploymentId) return -1
+  // Otherwise, sort by most recent last deployed date and then most recent
+  // created date (ensuring deployments never deployed show up at end of
+  // list).
+  // TODO: Refactor to allow for sorting on multiple fields? This may be
+  //  overkill for deployments.
+  const aValue = a.lastDeployed || a.dateCreated
+  const bValue = b.lastDeployed || b.dateCreated
+  if (b.lastDeployed && !a.lastDeployed) return 1
+  else if (a.lastDeployed && !b.lastDeployed) return -1
+  return bValue - aValue
+}

From 9b0ee1a9c08c636aaf8d318f134d5d2ebb592aae Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 17 Feb 2021 16:17:49 -0500
Subject: [PATCH 093/553] refactor(deployment): move deployment files into
 subdir

---
 .../CurrentDeploymentPanel.js                 | 10 +++----
 .../DeploymentConfirmModal.js                 | 12 ++++----
 .../DeploymentPreviewButton.js                |  2 +-
 .../{ => deployment}/DeploymentSettings.js    | 14 +++++-----
 .../DeploymentVersionsTable.js                | 12 ++++----
 .../{ => deployment}/DeploymentViewer.js      | 28 +++++++++----------
 .../{ => deployment}/DeploymentsPanel.js      | 24 ++++++++--------
 7 files changed, 51 insertions(+), 51 deletions(-)
 rename lib/manager/components/{ => deployment}/CurrentDeploymentPanel.js (96%)
 rename lib/manager/components/{ => deployment}/DeploymentConfirmModal.js (95%)
 rename lib/manager/components/{ => deployment}/DeploymentPreviewButton.js (98%)
 rename lib/manager/components/{ => deployment}/DeploymentSettings.js (96%)
 rename lib/manager/components/{ => deployment}/DeploymentVersionsTable.js (94%)
 rename lib/manager/components/{ => deployment}/DeploymentViewer.js (97%)
 rename lib/manager/components/{ => deployment}/DeploymentsPanel.js (92%)

diff --git a/lib/manager/components/CurrentDeploymentPanel.js b/lib/manager/components/deployment/CurrentDeploymentPanel.js
similarity index 96%
rename from lib/manager/components/CurrentDeploymentPanel.js
rename to lib/manager/components/deployment/CurrentDeploymentPanel.js
index 474144784..3f4f9bd47 100644
--- a/lib/manager/components/CurrentDeploymentPanel.js
+++ b/lib/manager/components/deployment/CurrentDeploymentPanel.js
@@ -9,11 +9,11 @@ import {
   Label as BsLabel
 } from 'react-bootstrap'
 
-import * as deploymentActions from '../actions/deployments'
-import { formatTimestamp } from '../../common/util/date-time'
-import { getActiveInstanceCount, getServerForId } from '../util/deployment'
+import * as deploymentActions from '../../actions/deployments'
+import { formatTimestamp } from '../../../common/util/date-time'
+import { getActiveInstanceCount, getServerForId } from '../../util/deployment'
 import DeploymentPreviewButton from './DeploymentPreviewButton'
-import EC2InstanceCard from '../../common/components/EC2InstanceCard'
+import EC2InstanceCard from '../../../common/components/EC2InstanceCard'
 
 import type {
   Deployment,
@@ -22,7 +22,7 @@ import type {
   OtpServer,
   Project,
   ServerJob
-} from '../../types'
+} from '../../../types'
 
 type Props = {
   deployJobs: Array<ServerJob>,
diff --git a/lib/manager/components/DeploymentConfirmModal.js b/lib/manager/components/deployment/DeploymentConfirmModal.js
similarity index 95%
rename from lib/manager/components/DeploymentConfirmModal.js
rename to lib/manager/components/deployment/DeploymentConfirmModal.js
index 6b273ef99..c873f073a 100644
--- a/lib/manager/components/DeploymentConfirmModal.js
+++ b/lib/manager/components/deployment/DeploymentConfirmModal.js
@@ -4,15 +4,15 @@ import React, {Component, type Node} from 'react'
 import {Alert as BootstrapAlert, Button, Glyphicon, Modal} from 'react-bootstrap'
 import {Map, TileLayer, Rectangle} from 'react-leaflet'
 
-import * as deploymentActions from '../actions/deployments'
-import {getComponentMessages} from '../../common/util/config'
-import {defaultTileLayerProps} from '../../common/util/maps'
-import {getServerForId} from '../util/deployment'
-import {getFeedNames, versionHasExpired} from '../util/version'
+import * as deploymentActions from '../../actions/deployments'
+import {getComponentMessages} from '../../../common/util/config'
+import {defaultTileLayerProps} from '../../../common/util/maps'
+import {getServerForId} from '../../util/deployment'
+import {getFeedNames, versionHasExpired} from '../../util/version'
 import polygon from 'turf-polygon'
 import area from '@turf/area'
 
-import type {Deployment, Project, SummarizedFeedVersion} from '../../types'
+import type {Deployment, Project, SummarizedFeedVersion} from '../../../types'
 
 type Props = {
   deployToTarget: typeof deploymentActions.deployToTarget,
diff --git a/lib/manager/components/DeploymentPreviewButton.js b/lib/manager/components/deployment/DeploymentPreviewButton.js
similarity index 98%
rename from lib/manager/components/DeploymentPreviewButton.js
rename to lib/manager/components/deployment/DeploymentPreviewButton.js
index 0e62ce2f7..a21a11f09 100644
--- a/lib/manager/components/DeploymentPreviewButton.js
+++ b/lib/manager/components/deployment/DeploymentPreviewButton.js
@@ -4,7 +4,7 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import {Button, Tooltip, OverlayTrigger} from 'react-bootstrap'
 
-import type {Deployment, Project} from '../../types'
+import type {Deployment, Project} from '../../../types'
 
 type Props = {
   deployment: Deployment,
diff --git a/lib/manager/components/DeploymentSettings.js b/lib/manager/components/deployment/DeploymentSettings.js
similarity index 96%
rename from lib/manager/components/DeploymentSettings.js
rename to lib/manager/components/deployment/DeploymentSettings.js
index 61be630f2..e711ae041 100644
--- a/lib/manager/components/DeploymentSettings.js
+++ b/lib/manager/components/deployment/DeploymentSettings.js
@@ -9,14 +9,14 @@ import {shallowEqual} from 'react-pure-render'
 import {withRouter} from 'react-router'
 import {LinkContainer} from 'react-router-bootstrap'
 
-import FormInput from '../../common/components/FormInput'
-import {getComponentMessages} from '../../common/util/config'
-import CollapsiblePanel from './CollapsiblePanel'
-import {parseBounds} from '../util'
-import {FIELDS, SERVER_FIELDS, UPDATER_FIELDS} from '../util/deployment'
+import FormInput from '../../../common/components/FormInput'
+import {getComponentMessages} from '../../../common/util/config'
+import CollapsiblePanel from '../CollapsiblePanel'
+import {parseBounds} from '../../util'
+import {FIELDS, SERVER_FIELDS, UPDATER_FIELDS} from '../../util/deployment'
 
-import {updateProject} from '../actions/projects'
-import type {Project} from '../../types'
+import {updateProject} from '../../actions/projects'
+import type {Project} from '../../../types'
 
 type Props = {
   editDisabled: boolean,
diff --git a/lib/manager/components/DeploymentVersionsTable.js b/lib/manager/components/deployment/DeploymentVersionsTable.js
similarity index 94%
rename from lib/manager/components/DeploymentVersionsTable.js
rename to lib/manager/components/deployment/DeploymentVersionsTable.js
index 581b199c3..2ebb0d87a 100644
--- a/lib/manager/components/DeploymentVersionsTable.js
+++ b/lib/manager/components/deployment/DeploymentVersionsTable.js
@@ -4,13 +4,13 @@ import React, {Component} from 'react'
 import {Table, Button, Badge, Glyphicon, ButtonToolbar} from 'react-bootstrap'
 import { Link } from 'react-router'
 
-import * as deploymentActions from '../actions/deployments'
-import {getComponentMessages} from '../../common/util/config'
-import {formatTimestamp, fromNow} from '../../common/util/date-time'
-import {versionHasExpired, versionHasNotBegun} from '../util/version'
+import * as deploymentActions from '../../actions/deployments'
+import {getComponentMessages} from '../../../common/util/config'
+import {formatTimestamp, fromNow} from '../../../common/util/date-time'
+import {versionHasExpired, versionHasNotBegun} from '../../util/version'
 
-import type {Deployment, Feed, Project, SummarizedFeedVersion} from '../../types'
-import type {ManagerUserState} from '../../types/reducers'
+import type {Deployment, Feed, Project, SummarizedFeedVersion} from '../../../types'
+import type {ManagerUserState} from '../../../types/reducers'
 
 type Props = {
   deleteFeedVersion: typeof deploymentActions.deleteFeedVersion,
diff --git a/lib/manager/components/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
similarity index 97%
rename from lib/manager/components/DeploymentViewer.js
rename to lib/manager/components/deployment/DeploymentViewer.js
index 5afbd37a4..b6f06cefd 100644
--- a/lib/manager/components/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -28,30 +28,30 @@ import Select from 'react-select'
 import fetch from 'isomorphic-fetch'
 import validator from 'validator'
 
-import * as deploymentActions from '../actions/deployments'
-import Loading from '../../common/components/Loading'
-import EditableTextField from '../../common/components/EditableTextField'
-import Title from '../../common/components/Title'
-import WatchButton from '../../common/containers/WatchButton'
-import {getComponentMessages, getConfigProperty} from '../../common/util/config'
-import {formatTimestamp, fromNow} from '../../common/util/date-time'
-import {isValidJSONC} from '../../common/util/json'
-import {defaultTileLayerProps} from '../../common/util/maps'
-import { versionsSorter } from '../../common/util/util'
-import {getServerDeployedTo} from '../util/deployment'
+import * as deploymentActions from '../../actions/deployments'
+import Loading from '../../../common/components/Loading'
+import EditableTextField from '../../../common/components/EditableTextField'
+import Title from '../../../common/components/Title'
+import WatchButton from '../../../common/containers/WatchButton'
+import {getComponentMessages, getConfigProperty} from '../../../common/util/config'
+import {formatTimestamp, fromNow} from '../../../common/util/date-time'
+import {isValidJSONC} from '../../../common/util/json'
+import {defaultTileLayerProps} from '../../../common/util/maps'
+import { versionsSorter } from '../../../common/util/util'
+import {getServerDeployedTo} from '../../util/deployment'
 import CurrentDeploymentPanel from './CurrentDeploymentPanel'
 import DeploymentConfirmModal from './DeploymentConfirmModal'
 import DeploymentVersionsTable from './DeploymentVersionsTable'
 
-import type {Props as ContainerProps} from '../containers/ActiveDeploymentViewer'
+import type {Props as ContainerProps} from '../../containers/ActiveDeploymentViewer'
 import type {
   CustomFile,
   Deployment,
   ReactSelectOption,
   ServerJob,
   SummarizedFeedVersion
-} from '../../types'
-import type {ManagerUserState} from '../../types/reducers'
+} from '../../../types'
+import type {ManagerUserState} from '../../../types/reducers'
 
 type Props = ContainerProps & {
   addFeedVersion: typeof deploymentActions.addFeedVersion,
diff --git a/lib/manager/components/DeploymentsPanel.js b/lib/manager/components/deployment/DeploymentsPanel.js
similarity index 92%
rename from lib/manager/components/DeploymentsPanel.js
rename to lib/manager/components/deployment/DeploymentsPanel.js
index ce4b8bc53..a3486862a 100644
--- a/lib/manager/components/DeploymentsPanel.js
+++ b/lib/manager/components/deployment/DeploymentsPanel.js
@@ -15,19 +15,19 @@ import {
   Panel
 } from 'react-bootstrap'
 
-import * as deploymentActions from '../actions/deployments'
-import * as feedsActions from '../actions/feeds'
-import * as projectsActions from '../actions/projects'
-import ActiveDeploymentViewer from '../containers/ActiveDeploymentViewer'
-import ConfirmModal from '../../common/components/ConfirmModal'
-import EditableTextField from '../../common/components/EditableTextField'
-import Loading from '../../common/components/Loading'
-import {getComponentMessages} from '../../common/util/config'
-import {formatTimestamp, fromNow} from '../../common/util/date-time'
-import {getServerDeployedTo} from '../util/deployment'
+import * as deploymentActions from '../../actions/deployments'
+import * as feedsActions from '../../actions/feeds'
+import * as projectsActions from '../../actions/projects'
+import ActiveDeploymentViewer from '../../containers/ActiveDeploymentViewer'
+import ConfirmModal from '../../../common/components/ConfirmModal'
+import EditableTextField from '../../../common/components/EditableTextField'
+import Loading from '../../../common/components/Loading'
+import {getComponentMessages} from '../../../common/util/config'
+import {formatTimestamp, fromNow} from '../../../common/util/date-time'
+import {getServerDeployedTo} from '../../util/deployment'
 
-import type {Props as ContainerProps} from '../containers/DeploymentsPanel'
-import type {Deployment, Project} from '../../types'
+import type {Props as ContainerProps} from '../../containers/DeploymentsPanel'
+import type {Deployment, Project} from '../../../types'
 
 type Props = ContainerProps & {
   createDeployment: typeof deploymentActions.createDeployment,

From f44179f90b400ebc2797a982553999c68872826a Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 17 Feb 2021 16:19:45 -0500
Subject: [PATCH 094/553] refactor(deployment): fix broken imports

---
 lib/manager/components/ProjectSettings.js              | 2 +-
 lib/manager/components/version/FeedVersionNavigator.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/manager/components/ProjectSettings.js b/lib/manager/components/ProjectSettings.js
index 7862fa453..b810a9578 100644
--- a/lib/manager/components/ProjectSettings.js
+++ b/lib/manager/components/ProjectSettings.js
@@ -6,7 +6,7 @@ import {LinkContainer} from 'react-router-bootstrap'
 
 import {deleteProject, updateProject} from '../actions/projects'
 import {getComponentMessages, isModuleEnabled} from '../../common/util/config'
-import DeploymentSettings from './DeploymentSettings'
+import DeploymentSettings from './deployment/DeploymentSettings'
 import ProjectSettingsForm from './ProjectSettingsForm'
 
 import type {Project} from '../../types'
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 5342d1ea8..a05c960b7 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -16,7 +16,7 @@ import {isValidZipFile} from '../../../common/util/util'
 import * as snapshotActions from '../../../editor/actions/snapshots'
 import * as gtfsPlusActions from '../../../gtfsplus/actions/gtfsplus'
 import * as deploymentActions from '../../../manager/actions/deployments'
-import DeploymentPreviewButton from '../DeploymentPreviewButton'
+import DeploymentPreviewButton from '../deployment/DeploymentPreviewButton'
 import FeedVersionViewer from './FeedVersionViewer'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
 

From c578dcdd7766c6a1455944995813e2b3a27f4353 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 17 Feb 2021 17:42:31 -0500
Subject: [PATCH 095/553] refactor(DeploymentViewer): break out components,
 refactor custom file toolbar

---
 .../components/deployment/CustomConfig.js     | 124 ++++
 .../components/deployment/CustomFileEditor.js | 256 ++++++++
 .../DeploymentConfigurationsPanel.js          | 280 +++++++++
 .../components/deployment/DeploymentViewer.js | 569 +-----------------
 4 files changed, 666 insertions(+), 563 deletions(-)
 create mode 100644 lib/manager/components/deployment/CustomConfig.js
 create mode 100644 lib/manager/components/deployment/CustomFileEditor.js
 create mode 100644 lib/manager/components/deployment/DeploymentConfigurationsPanel.js

diff --git a/lib/manager/components/deployment/CustomConfig.js b/lib/manager/components/deployment/CustomConfig.js
new file mode 100644
index 000000000..b7ad588e9
--- /dev/null
+++ b/lib/manager/components/deployment/CustomConfig.js
@@ -0,0 +1,124 @@
+// @flow
+
+import Icon from '@conveyal/woonerf/components/icon'
+import React, {Component} from 'react'
+import {
+  Button,
+  FormControl,
+  FormGroup,
+  HelpBlock,
+  Radio
+} from 'react-bootstrap'
+import { LinkContainer } from 'react-router-bootstrap'
+
+import * as deploymentActions from '../../actions/deployments'
+import {isValidJSONC} from '../../../common/util/json'
+
+import type {
+  Deployment
+} from '../../../types'
+
+const SAMPLE_BUILD_CONFIG = `{
+  "subwayAccessTime": 2.5
+}`
+
+const SAMPLE_ROUTER_CONFIG = `{
+  "routingDefaults": {
+    "walkSpeed": 2.0,
+    "stairsReluctance": 4.0,
+    "carDropoffTime": 240
+  }
+}`
+
+export default class CustomConfig extends Component<{
+  deployment: Deployment,
+  label: string,
+  name: string,
+  updateDeployment: typeof deploymentActions.updateDeployment
+}, {[string]: any}> {
+  state = {}
+
+  _toggleCustomConfig = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    const {deployment, updateDeployment} = this.props
+    const {name} = evt.target
+    const value = deployment[name]
+      ? null
+      : name === 'customBuildConfig'
+        ? SAMPLE_BUILD_CONFIG
+        : SAMPLE_ROUTER_CONFIG
+    updateDeployment(deployment, {[name]: value})
+  }
+
+  _onChangeConfig = (evt: SyntheticInputEvent<HTMLInputElement>) =>
+    this.setState({[this.props.name]: evt.target.value})
+
+  _onSaveConfig = () => {
+    const {deployment, name, updateDeployment} = this.props
+    const value = this.state[name]
+    if (!isValidJSONC(value)) return window.alert('Must provide valid JSON string.')
+    else {
+      updateDeployment(deployment, {[name]: value})
+      this.setState({[name]: undefined})
+    }
+  }
+
+  render () {
+    const {deployment, name, label} = this.props
+    const useCustom = deployment[name] !== null
+    const value = this.state[name] || deployment[name]
+    const validJSON = isValidJSONC(value)
+    return (
+      <div>
+        <h5>{label} configuration</h5>
+        <FormGroup>
+          <Radio
+            checked={!useCustom}
+            name={name}
+            onChange={this._toggleCustomConfig}
+            inline>
+            Project default
+          </Radio>
+          <Radio
+            checked={useCustom}
+            name={name}
+            onChange={this._toggleCustomConfig}
+            inline>
+            Custom
+          </Radio>
+        </FormGroup>
+        <p>
+          {useCustom
+            ? `Use custom JSON defined below for ${label} configuration.`
+            : `Use the ${label} configuration defined in the project deployment settings.`
+          }
+          <span>{' '}
+            {useCustom
+              ? <Button
+                style={{marginLeft: '15px'}}
+                bsSize='xsmall'
+                disabled={!this.state[name] || !validJSON}
+                onClick={this._onSaveConfig}>Save</Button>
+              : <LinkContainer
+                to={`/project/${deployment.projectId}/settings/deployment`}>
+                <Button bsSize='xsmall'>
+                  <Icon type='pencil' /> Edit
+                </Button>
+              </LinkContainer>
+            }
+          </span>
+        </p>
+        {useCustom &&
+          <FormGroup validationState={validJSON ? null : 'error'}>
+            <FormControl
+              componentClass='textarea'
+              style={{height: '125px'}}
+              placeholder='{"blah": true}'
+              onChange={this._onChangeConfig}
+              value={value} />
+            {!validJSON && <HelpBlock>Must provide valid JSON string.</HelpBlock>}
+          </FormGroup>
+        }
+      </div>
+    )
+  }
+}
diff --git a/lib/manager/components/deployment/CustomFileEditor.js b/lib/manager/components/deployment/CustomFileEditor.js
new file mode 100644
index 000000000..a7ca365e9
--- /dev/null
+++ b/lib/manager/components/deployment/CustomFileEditor.js
@@ -0,0 +1,256 @@
+// @flow
+
+import React, {Component} from 'react'
+import {
+  Button,
+  ButtonToolbar,
+  Checkbox,
+  ControlLabel,
+  FormControl,
+  FormGroup,
+  HelpBlock
+} from 'react-bootstrap'
+
+import type {
+  CustomFile
+} from '../../../types'
+
+type Props = {
+  customFile: CustomFile,
+  customFileEditIdx: null | number,
+  idx: number,
+  onCancelEditing: () => void,
+  onDelete: (number) => void,
+  onEdit: (number) => void,
+  onSave: (number, CustomFile) => void
+}
+
+export default class CustomFileEditor extends Component<Props, {
+  fileSource: 'raw' | 'uri',
+  model: CustomFile
+}> {
+  constructor (props: Props) {
+    super(props)
+    const { customFile } = props
+    this.state = {
+      fileSource: customFile.contents ? 'raw' : 'uri',
+      model: props.customFile
+    }
+  }
+
+  _canEdit = () => this.props.customFileEditIdx === null
+
+  _isEditing= () => this.props.idx === this.props.customFileEditIdx
+
+  _isValid = () => {
+    const {model: customFile} = this.state
+    return customFile.contents || customFile.uri
+  }
+
+  _onChangeBuildUse = () => {
+    const { model } = this.state
+    this.setState({
+      model: {
+        ...model,
+        useDuringBuild: !model.useDuringBuild
+      }
+    })
+  }
+
+  _onChangeContents = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({
+      model: {
+        ...this.state.model,
+        contents: evt.target.value
+      }
+    })
+  }
+
+  _onChangeFilename = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({
+      model: {
+        ...this.state.model,
+        filename: evt.target.value
+      }
+    })
+  }
+
+  _onChangeServeUse = () => {
+    const { model } = this.state
+    this.setState({
+      model: {
+        ...model,
+        useDuringServe: !model.useDuringServe
+      }
+    })
+  }
+
+  _onChangeSource = (evt: SyntheticInputEvent<HTMLSelectElement>) => {
+    const model = {...this.state.model}
+    // set variable to make flow happy
+    let newSource
+    if (evt.target.value === 'raw') {
+      model.uri = null
+      newSource = 'raw'
+    } else {
+      model.contents = null
+      newSource = 'uri'
+    }
+    this.setState({
+      fileSource: newSource,
+      model
+    })
+  }
+
+  _onChangeUri = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({
+      model: {
+        ...this.state.model,
+        uri: evt.target.value
+      }
+    })
+  }
+
+  _onCancelEditing = () => {
+    const { customFile, onCancelEditing } = this.props
+    this.setState({
+      fileSource: customFile.contents ? 'raw' : 'uri',
+      model: customFile
+    })
+    onCancelEditing()
+  }
+
+  _onDelete = () => {
+    const { idx, onDelete } = this.props
+    onDelete(idx)
+  }
+
+  _onEdit = () => {
+    const { idx, onEdit } = this.props
+    onEdit(idx)
+  }
+
+  _onSave = () => {
+    const { idx, onSave } = this.props
+    onSave(idx, this.state.model)
+  }
+
+  _renderToolbar = () => {
+    const isEditing = this._isEditing()
+    const canEdit = this._canEdit()
+    const either = !isEditing && !canEdit
+    return (
+      <ButtonToolbar>
+        <Button
+          bsSize='xsmall'
+          disabled={either}
+          onClick={canEdit ? this._onEdit : this._onCancelEditing}
+        >
+          {isEditing ? 'Cancel' : 'Edit'}
+        </Button>
+        {isEditing &&
+          <Button
+            bsSize='xsmall'
+            disabled={!this._isValid()}
+            onClick={this._onSave}
+          >
+            Save
+          </Button>
+        }
+        <Button
+          bsSize='xsmall'
+          bsStyle='danger'
+          className='pull-right'
+          disabled={either}
+          onClick={this._onDelete}
+        >
+          Delete
+        </Button>
+      </ButtonToolbar>
+    )
+  }
+
+  render () {
+    const {
+      fileSource,
+      model: customFile
+    } = this.state
+    const isValid = this._isValid()
+    const isEditing = this._isEditing()
+    return (
+      <div className='custom-file'>
+        {this._renderToolbar()}
+        <div className='margin-top-15'>
+          {isEditing
+            ? <FormControl
+              onChange={this._onChangeFilename}
+              placeholder='Enter filename'
+              type='text'
+              value={customFile.filename}
+            />
+            : <span>
+              Filename:{' '}
+              <span style={{fontFamily: 'monospace'}}>
+                {/* FIXME: what should the behavior be here if missing */}
+                {customFile.filename || '[defaults to URI]'}
+              </span>
+            </span>
+          }
+        </div>
+        <Checkbox
+          checked={customFile.useDuringBuild}
+          disabled={!isEditing}
+          onChange={this._onChangeBuildUse}
+        >
+          Use during graph build
+        </Checkbox>
+        <Checkbox
+          checked={customFile.useDuringServe}
+          disabled={!isEditing}
+          onChange={this._onChangeServeUse}
+        >
+          Use while running server
+        </Checkbox>
+        <FormGroup validationState={isValid ? null : 'error'}>
+          <ControlLabel>File source</ControlLabel>
+          <FormControl
+            componentClass='select'
+            disabled={!isEditing}
+            onChange={this._onChangeSource}
+            placeholder='select type'
+            style={{ marginBottom: 5 }}
+            value={fileSource}
+          >
+            <option value='raw'>From raw input</option>
+            <option value='uri'>Download from URI</option>
+          </FormControl>
+          {!isValid && <HelpBlock>Please set contents or uri!</HelpBlock>}
+          {fileSource === 'raw' && (
+            <FormControl
+              componentClass='textarea'
+              disabled={!isEditing}
+              style={{height: '125px'}}
+              placeholder='{"blah": true}'
+              onChange={this._onChangeContents}
+              value={customFile.contents}
+            />
+          )}
+          {fileSource === 'uri' && (
+            <span>
+              <FormControl
+                disabled={!isEditing}
+                placeholder='https://www.examle.com/file.json'
+                onChange={this._onChangeUri}
+                type='text'
+                value={customFile.uri}
+              />
+              {!customFile.uri && (
+                <HelpBlock>Enter either a HTTP(S) URL or AWS S3 URI</HelpBlock>
+              )}
+            </span>
+          )}
+        </FormGroup>
+      </div>
+    )
+  }
+}
diff --git a/lib/manager/components/deployment/DeploymentConfigurationsPanel.js b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
new file mode 100644
index 000000000..dddbb1dd8
--- /dev/null
+++ b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
@@ -0,0 +1,280 @@
+// @flow
+
+import Icon from '@conveyal/woonerf/components/icon'
+import fetch from 'isomorphic-fetch'
+import React, {Component} from 'react'
+import {
+  Checkbox,
+  ControlLabel,
+  ListGroup,
+  ListGroupItem,
+  Button,
+  Panel,
+  Glyphicon
+} from 'react-bootstrap'
+import Select from 'react-select'
+import validator from 'validator'
+
+import * as deploymentActions from '../../actions/deployments'
+import {getConfigProperty} from '../../../common/util/config'
+import CustomConfig from './CustomConfig'
+import CustomFileEditor from './CustomFileEditor'
+
+import type {
+  CustomFile,
+  Deployment,
+  ReactSelectOption
+} from '../../../types'
+
+const TRIP_PLANNER_VERSIONS = [
+  { label: 'OTP 1.X', value: 'OTP_1' },
+  { label: 'OTP 2.X', value: 'OTP_2' }
+]
+
+export default class DeploymentConfigurationsPanel extends Component<{
+  deployment: Deployment,
+  updateDeployment: typeof deploymentActions.updateDeployment
+}, {
+  customFileEditIdx: null | number,
+  otp: Array<ReactSelectOption>,
+}> {
+  state = {
+    customFileEditIdx: null,
+    otp: []
+  }
+  componentDidMount () {
+    // Fetch the available OTP versions from S3.
+    this._loadOptions()
+  }
+
+  /**
+   * Parse .jar options from an S3 text XML response.
+   * @param  {string} text text response from s3
+   * @param  {string} key  state key under which to store options
+   */
+  _parseOptionsFromXml = (text: string) => {
+    const parser = new window.DOMParser()
+    const doc = parser.parseFromString(text, 'application/xml')
+
+    const all = Array.from(doc.querySelectorAll('Contents'))
+      .map(item => item.querySelector('Key').childNodes[0].nodeValue) // get just key
+      .filter(item => item !== 'index.html') // don't include the main page
+      .map(item => item.replace(/.jar$/, '')) // and remove .jar
+    this.setState({otp: all})
+  }
+
+  _loadAndParseOptionsFromXml = (url: string) => {
+    fetch(url)
+      .then(res => res.text())
+      .then(text => this._parseOptionsFromXml(text))
+  }
+
+  /**
+   * Load .jar options from OTP and R5 S3 buckets.
+   */
+  _loadOptions = () => {
+    const otpUrl = getConfigProperty('modules.deployment.otp_download_url') || 'https://opentripplanner-builds.s3.amazonaws.com'
+    this._loadAndParseOptionsFromXml(otpUrl)
+  }
+
+  _onAddCustomFile = () => {
+    const { deployment } = this.props
+    const customFiles = deployment.customFiles
+      ? [...deployment.customFiles, {}]
+      : [{}]
+    this._updateDeployment({ customFiles })
+    this.setState({ customFileEditIdx: customFiles.length - 1 })
+  }
+
+  _onChangeBuildGraphOnly = () => this._updateDeployment({buildGraphOnly: !this.props.deployment.buildGraphOnly})
+
+  _onChangeSkipOsmExtract = () => {
+    const {skipOsmExtract} = this.props.deployment
+    if (!skipOsmExtract) {
+      // If changing from including OSM to skipping OSM, verify that this is
+      // intentional.
+      if (!window.confirm('Are you sure you want to exclude an OSM extract from the graph build? This will prevent the use of the OSM street network in routing results.')) {
+        return
+      }
+    }
+    this._updateDeployment({skipOsmExtract: !skipOsmExtract})
+  }
+
+  _onCancelEditingCustomFile = () => {
+    this.setState({ customFileEditIdx: null })
+  }
+
+  _onEditCustomFile = (idx: number) => {
+    this.setState({ customFileEditIdx: idx })
+  }
+
+  _onDeleteCustomFile = (idx: number) => {
+    const { deployment } = this.props
+    const customFiles = [...deployment.customFiles || []]
+    customFiles.splice(idx, 1)
+    this._updateDeployment({ customFiles })
+    this.setState({ customFileEditIdx: null })
+  }
+
+  _onSaveCustomFile = (idx: number, data: CustomFile) => {
+    const { deployment } = this.props
+    const customFiles = [...deployment.customFiles || []]
+    customFiles[idx] = data
+    this._updateDeployment({ customFiles })
+    this.setState({ customFileEditIdx: null })
+  }
+
+  _setOsmUrl = () => {
+    const currentUrl = this.props.deployment.osmExtractUrl || ''
+    const osmExtractUrl = window.prompt(
+      'Please provide a public URL from which to download an OSM extract (.pbf).',
+      currentUrl
+    )
+    if (osmExtractUrl) {
+      if (!validator.isURL(osmExtractUrl)) {
+        window.alert(`URL ${osmExtractUrl} is invalid!`)
+        return
+      }
+      this._updateDeployment({osmExtractUrl})
+    }
+  }
+
+  _clearOsmUrl = () => this._updateDeployment({osmExtractUrl: null})
+
+  _onUpdateTripPlannerVersion = (option: ReactSelectOption) => {
+    const {deployment, updateDeployment} = this.props
+    updateDeployment(deployment, { tripPlannerVersion: option.value })
+  }
+
+  _onUpdateVersion = (option: ReactSelectOption) => {
+    this._updateDeployment({otpVersion: option.value})
+  }
+
+  _updateDeployment = (props: {[string]: any}) => {
+    const {deployment, updateDeployment} = this.props
+    updateDeployment(deployment, props)
+  }
+
+  render () {
+    const { deployment, updateDeployment } = this.props
+    const { customFileEditIdx, otp: options } = this.state
+    const isOtp = deployment.tripPlannerVersion.startsWith('OTP_')
+
+    return (
+      <Panel header={<h3><Icon type='cog' /> OTP Configuration</h3>}>
+        <ListGroup fill>
+          <ListGroupItem>
+            <Checkbox
+              checked={deployment.buildGraphOnly}
+              onChange={this._onChangeBuildGraphOnly}
+            >
+              Build graph only
+            </Checkbox>
+            Trip Planner Version:
+            <Select
+              value={deployment.tripPlannerVersion}
+              onChange={this._onUpdateTripPlannerVersion}
+              options={TRIP_PLANNER_VERSIONS}
+            />
+            {isOtp && (
+              <div>
+                OTP jar file
+                <Select
+                  value={deployment.otpVersion}
+                  onChange={this._onUpdateVersion}
+                  options={options ? options.map(v => ({value: v, label: v})) : []}
+                />
+              </div>
+            )}
+          </ListGroupItem>
+          <ListGroupItem>
+            Deploying to the{' '}
+            <small><em>{deployment.routerId || 'default'}</em></small>{' '}
+            OpenTripPlanner router.
+          </ListGroupItem>
+          <ListGroupItem>
+            OpenStreetMap Settings
+            <Checkbox
+              checked={!deployment.skipOsmExtract}
+              onChange={this._onChangeSkipOsmExtract}>
+              Build graph with OSM extract
+            </Checkbox>
+            {/* Hide URL/auto-extract if skipping OSM extract. */}
+            {deployment.skipOsmExtract
+              ? null
+              : deployment.osmExtractUrl
+                ? <div>
+                  <ControlLabel className='unselectable buffer-right'>
+                    URL:
+                  </ControlLabel>
+                  <span
+                    className='overflow'
+                    style={{
+                      marginBottom: '5px',
+                      width: '240px',
+                      verticalAlign: 'middle'
+                    }}
+                    title={deployment.osmExtractUrl}>
+                    {deployment.osmExtractUrl}
+                  </span>
+                  <Button
+                    bsSize='xsmall'
+                    style={{marginLeft: '5px'}}
+                    onClick={this._setOsmUrl}>Change</Button>
+                  <Button
+                    bsSize='xsmall'
+                    style={{marginLeft: '5px'}}
+                    onClick={this._clearOsmUrl}>Clear</Button>
+                </div>
+                : <div>
+                  Auto-extract OSM (N. America only)
+                  <Button
+                    bsSize='xsmall'
+                    style={{marginLeft: '5px'}}
+                    onClick={this._setOsmUrl}>Override</Button>
+                </div>
+            }
+          </ListGroupItem>
+          <ListGroupItem>
+            <CustomConfig
+              name='customBuildConfig'
+              label='Build'
+              updateDeployment={updateDeployment}
+              deployment={deployment} />
+          </ListGroupItem>
+          <ListGroupItem>
+            <CustomConfig
+              name='customRouterConfig'
+              label='Router'
+              updateDeployment={updateDeployment}
+              deployment={deployment} />
+          </ListGroupItem>
+          <ListGroupItem>
+            <h5>Custom Files</h5>
+            {deployment.customFiles && deployment.customFiles.map(
+              (customFile, idx) => (
+                <CustomFileEditor
+                  customFile={customFile}
+                  customFileEditIdx={customFileEditIdx}
+                  deployment={deployment}
+                  idx={idx}
+                  onCancelEditing={this._onCancelEditingCustomFile}
+                  onDelete={this._onDeleteCustomFile}
+                  onEdit={this._onEditCustomFile}
+                  onSave={this._onSaveCustomFile}
+                />
+              )
+            )}
+            <Button
+              disabled={customFileEditIdx !== null}
+              onClick={this._onAddCustomFile}
+            >
+              <Glyphicon glyph='plus' />{' '}
+              Add custom file
+            </Button>
+          </ListGroupItem>
+        </ListGroup>
+      </Panel>
+    )
+  }
+}
diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index b6f06cefd..5c89f2d25 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -4,12 +4,8 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import { LinkContainer } from 'react-router-bootstrap'
 import {
-  Checkbox,
-  ControlLabel,
-  Radio,
   FormGroup,
   InputGroup,
-  HelpBlock,
   ListGroup,
   ListGroupItem,
   Row,
@@ -24,9 +20,6 @@ import {
   MenuItem
 } from 'react-bootstrap'
 import {Map, TileLayer, Rectangle} from 'react-leaflet'
-import Select from 'react-select'
-import fetch from 'isomorphic-fetch'
-import validator from 'validator'
 
 import * as deploymentActions from '../../actions/deployments'
 import Loading from '../../../common/components/Loading'
@@ -35,19 +28,16 @@ import Title from '../../../common/components/Title'
 import WatchButton from '../../../common/containers/WatchButton'
 import {getComponentMessages, getConfigProperty} from '../../../common/util/config'
 import {formatTimestamp, fromNow} from '../../../common/util/date-time'
-import {isValidJSONC} from '../../../common/util/json'
 import {defaultTileLayerProps} from '../../../common/util/maps'
 import { versionsSorter } from '../../../common/util/util'
 import {getServerDeployedTo} from '../../util/deployment'
 import CurrentDeploymentPanel from './CurrentDeploymentPanel'
+import DeploymentConfigurationsPanel from './DeploymentConfigurationsPanel'
 import DeploymentConfirmModal from './DeploymentConfirmModal'
 import DeploymentVersionsTable from './DeploymentVersionsTable'
 
 import type {Props as ContainerProps} from '../../containers/ActiveDeploymentViewer'
 import type {
-  CustomFile,
-  Deployment,
-  ReactSelectOption,
   ServerJob,
   SummarizedFeedVersion
 } from '../../../types'
@@ -68,35 +58,15 @@ type Props = ContainerProps & {
 }
 
 type State = {
-  customFileEditIdx: null | number,
-  otp: Array<ReactSelectOption>,
   searchText: ?string,
   target: ?string
 }
 
 const BOUNDS_LIMIT = 10 // Limit for the decimal degrees span
 
-const SAMPLE_BUILD_CONFIG = `{
-  "subwayAccessTime": 2.5
-}`
-
-const SAMPLE_ROUTER_CONFIG = `{
-  "routingDefaults": {
-    "walkSpeed": 2.0,
-    "stairsReluctance": 4.0,
-    "carDropoffTime": 240
-  }
-}`
-
-const TRIP_PLANNER_VERSIONS = [
-  { label: 'OTP 1.X', value: 'OTP_1' },
-  { label: 'OTP 2.X', value: 'OTP_2' }
-]
-
 export default class DeploymentViewer extends Component<Props, State> {
   messages = getComponentMessages('DeploymentViewer')
   state = {
-    customFileEditIdx: null,
     otp: [],
     searchText: null,
     target: null
@@ -104,8 +74,6 @@ export default class DeploymentViewer extends Component<Props, State> {
 
   componentDidMount () {
     this.resetMap()
-    // Fetch the available OTP and R5 build versions from S3.
-    this._loadOptions()
   }
 
   /**
@@ -129,45 +97,6 @@ export default class DeploymentViewer extends Component<Props, State> {
     return [[north, east], [south, west]]
   }
 
-  /**
-   * Parse .jar options from an S3 text XML response.
-   * @param  {string} text text response from s3
-   * @param  {string} key  state key under which to store options
-   */
-  _parseOptionsFromXml = (text: string) => {
-    const parser = new window.DOMParser()
-    const doc = parser.parseFromString(text, 'application/xml')
-
-    const all = Array.from(doc.querySelectorAll('Contents'))
-      .map(item => item.querySelector('Key').childNodes[0].nodeValue) // get just key
-      .filter(item => item !== 'index.html') // don't include the main page
-      .map(item => item.replace(/.jar$/, '')) // and remove .jar
-    this.setState({otp: all})
-  }
-
-  _loadAndParseOptionsFromXml = (url: string) => {
-    fetch(url)
-      .then(res => res.text())
-      .then(text => this._parseOptionsFromXml(text))
-  }
-
-  /**
-   * Load .jar options from OTP and R5 S3 buckets.
-   */
-  _loadOptions = () => {
-    const otpUrl = getConfigProperty('modules.deployment.otp_download_url') || 'https://opentripplanner-builds.s3.amazonaws.com'
-    this._loadAndParseOptionsFromXml(otpUrl)
-  }
-
-  _onAddCustomFile = () => {
-    const { deployment } = this.props
-    const customFiles = deployment.customFiles
-      ? [...deployment.customFiles, {}]
-      : [{}]
-    this._updateDeployment({ customFiles })
-    this.setState({ customFileEditIdx: customFiles.length - 1 })
-  }
-
   _onAddFeedSource = (feedSourceId: string) => {
     const feed = this.props.feedSources.find(fs => fs.id === feedSourceId)
     const id = feed && feed.latestVersionId
@@ -183,75 +112,12 @@ export default class DeploymentViewer extends Component<Props, State> {
 
   _onChangeName = (name: string) => this._updateDeployment({name})
 
-  _onChangeBuildGraphOnly = () => this._updateDeployment({buildGraphOnly: !this.props.deployment.buildGraphOnly})
-
-  _onChangeSkipOsmExtract = () => {
-    const {skipOsmExtract} = this.props.deployment
-    if (!skipOsmExtract) {
-      // If changing from including OSM to skipping OSM, verify that this is
-      // intentional.
-      if (!window.confirm('Are you sure you want to exclude an OSM extract from the graph build? This will prevent the use of the OSM street network in routing results.')) {
-        return
-      }
-    }
-    this._updateDeployment({skipOsmExtract: !skipOsmExtract})
-  }
-
   _onClickDownload = () => this.props.downloadDeployment(this.props.deployment)
 
   _onCloseModal = () => this.setState({target: null})
 
-  _onCancelEditingCustomFile = () => {
-    this.setState({ customFileEditIdx: null })
-  }
-
-  _onEditCustomFile = (idx: number) => {
-    this.setState({ customFileEditIdx: idx })
-  }
-
-  _onDeleteCustomFile = (idx: number) => {
-    const { deployment } = this.props
-    const customFiles = [...deployment.customFiles || []]
-    customFiles.splice(idx, 1)
-    this._updateDeployment({ customFiles })
-  }
-
-  _onSaveCustomFile = (idx: number, data: CustomFile) => {
-    const { deployment } = this.props
-    const customFiles = [...deployment.customFiles || []]
-    customFiles[idx] = data
-    this._updateDeployment({ customFiles })
-    this.setState({ customFileEditIdx: null })
-  }
-
-  _setOsmUrl = () => {
-    const currentUrl = this.props.deployment.osmExtractUrl || ''
-    const osmExtractUrl = window.prompt(
-      'Please provide a public URL from which to download an OSM extract (.pbf).',
-      currentUrl
-    )
-    if (osmExtractUrl) {
-      if (!validator.isURL(osmExtractUrl)) {
-        window.alert(`URL ${osmExtractUrl} is invalid!`)
-        return
-      }
-      this._updateDeployment({osmExtractUrl})
-    }
-  }
-
-  _clearOsmUrl = () => this._updateDeployment({osmExtractUrl: null})
-
   _onSelectTarget = (target: string) => this.setState({target})
 
-  _onUpdateTripPlannerVersion = (option: ReactSelectOption) => {
-    const {deployment, updateDeployment} = this.props
-    updateDeployment(deployment, { tripPlannerVersion: option.value })
-  }
-
-  _onUpdateVersion = (option: ReactSelectOption) => {
-    this._updateDeployment({otpVersion: option.value})
-  }
-
   _updateDeployment = (props: {[string]: any}) => {
     const {deployment, updateDeployment} = this.props
     updateDeployment(deployment, props)
@@ -438,138 +304,6 @@ export default class DeploymentViewer extends Component<Props, State> {
     )
   }
 
-  renderConfigurationsPanel () {
-    const { deployment, updateDeployment } = this.props
-    const options = this.state.otp
-    const isOtp = deployment.tripPlannerVersion.startsWith('OTP_')
-
-    return (
-      <Panel header={<h3><Icon type='cog' /> OTP Configuration</h3>}>
-        <ListGroup fill>
-          <ListGroupItem>
-            <Checkbox
-              checked={deployment.buildGraphOnly}
-              onChange={this._onChangeBuildGraphOnly}
-            >
-              Build graph only
-            </Checkbox>
-            Trip Planner Version:
-            <Select
-              value={deployment.tripPlannerVersion}
-              onChange={this._onUpdateTripPlannerVersion}
-              options={TRIP_PLANNER_VERSIONS}
-            />
-            {isOtp && (
-              <div>
-                OTP jar file
-                <Select
-                  value={deployment.otpVersion}
-                  onChange={this._onUpdateVersion}
-                  options={options ? options.map(v => ({value: v, label: v})) : []}
-                />
-              </div>
-            )}
-          </ListGroupItem>
-          <ListGroupItem>
-            Deploying to the{' '}
-            <small><em>{deployment.routerId || 'default'}</em></small>{' '}
-            OpenTripPlanner router.
-          </ListGroupItem>
-          <ListGroupItem>
-            OpenStreetMap Settings
-            <Checkbox
-              checked={!deployment.skipOsmExtract}
-              onChange={this._onChangeSkipOsmExtract}>
-              Build graph with OSM extract
-            </Checkbox>
-            {/* Hide URL/auto-extract if skipping OSM extract. */}
-            {deployment.skipOsmExtract
-              ? null
-              : deployment.osmExtractUrl
-                ? <div>
-                  <ControlLabel className='unselectable buffer-right'>
-                    URL:
-                  </ControlLabel>
-                  <span
-                    className='overflow'
-                    style={{
-                      marginBottom: '5px',
-                      width: '240px',
-                      verticalAlign: 'middle'
-                    }}
-                    title={deployment.osmExtractUrl}>
-                    {deployment.osmExtractUrl}
-                  </span>
-                  <Button
-                    bsSize='xsmall'
-                    style={{marginLeft: '5px'}}
-                    onClick={this._setOsmUrl}>Change</Button>
-                  <Button
-                    bsSize='xsmall'
-                    style={{marginLeft: '5px'}}
-                    onClick={this._clearOsmUrl}>Clear</Button>
-                </div>
-                : <div>
-                  Auto-extract OSM (N. America only)
-                  <Button
-                    bsSize='xsmall'
-                    style={{marginLeft: '5px'}}
-                    onClick={this._setOsmUrl}>Override</Button>
-                </div>
-            }
-          </ListGroupItem>
-          <ListGroupItem>
-            <CustomConfig
-              name='customBuildConfig'
-              label='Build'
-              updateDeployment={updateDeployment}
-              deployment={deployment} />
-          </ListGroupItem>
-          <ListGroupItem>
-            <CustomConfig
-              name='customRouterConfig'
-              label='Router'
-              updateDeployment={updateDeployment}
-              deployment={deployment} />
-          </ListGroupItem>
-          {this.renderCustomFiles()}
-        </ListGroup>
-      </Panel>
-    )
-  }
-
-  renderCustomFiles = () => {
-    const { deployment } = this.props
-    const { customFileEditIdx } = this.state
-
-    return (
-      <ListGroupItem>
-        <h5>Custom Files</h5>
-        {deployment.customFiles && deployment.customFiles.map(
-          (customFile, idx) => (
-            <CustomFileEditor
-              customFile={customFile}
-              customFileEditIdx={customFileEditIdx}
-              deployment={deployment}
-              idx={idx}
-              onCancelEditing={this._onCancelEditingCustomFile}
-              onDelete={this._onDeleteCustomFile}
-              onEdit={this._onEditCustomFile}
-              onSave={this._onSaveCustomFile}
-            />
-          )
-        )}
-        <Button
-          disabled={customFileEditIdx !== null}
-          onClick={this._onAddCustomFile}
-        >
-          <Glyphicon glyph='plus' />{' '}
-          Add custom file
-        </Button>
-      </ListGroupItem>
-    )
-  }
-
   render () {
     const {
       deleteFeedVersion,
@@ -578,6 +312,7 @@ export default class DeploymentViewer extends Component<Props, State> {
       deployToTarget,
       feedSources,
       project,
+      updateDeployment,
       updateVersionForFeedSource,
       user
     } = this.props
@@ -648,305 +383,13 @@ export default class DeploymentViewer extends Component<Props, State> {
               server={serverDeployedTo}
               terminateEC2InstanceForDeployment={this.props.terminateEC2InstanceForDeployment} />
             {/* Configurations panel */}
-            {this.renderConfigurationsPanel()}
+            <DeploymentConfigurationsPanel
+              deployment={deployment}
+              updateDeployment={updateDeployment}
+            />
           </Col>
         </Row>
       </div>
     )
   }
 }
-
-class CustomConfig extends Component<{
-  deployment: Deployment,
-  label: string,
-  name: string,
-  updateDeployment: typeof deploymentActions.updateDeployment
-}, {[string]: any}> {
-  state = {}
-
-  _toggleCustomConfig = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const {deployment, updateDeployment} = this.props
-    const {name} = evt.target
-    const value = deployment[name]
-      ? null
-      : name === 'customBuildConfig'
-        ? SAMPLE_BUILD_CONFIG
-        : SAMPLE_ROUTER_CONFIG
-    updateDeployment(deployment, {[name]: value})
-  }
-
-  _onChangeConfig = (evt: SyntheticInputEvent<HTMLInputElement>) =>
-    this.setState({[this.props.name]: evt.target.value})
-
-  _onSaveConfig = () => {
-    const {deployment, name, updateDeployment} = this.props
-    const value = this.state[name]
-    if (!isValidJSONC(value)) return window.alert('Must provide valid JSON string.')
-    else {
-      updateDeployment(deployment, {[name]: value})
-      this.setState({[name]: undefined})
-    }
-  }
-
-  render () {
-    const {deployment, name, label} = this.props
-    const useCustom = deployment[name] !== null
-    const value = this.state[name] || deployment[name]
-    const validJSON = isValidJSONC(value)
-    return (
-      <div>
-        <h5>{label} configuration</h5>
-        <FormGroup>
-          <Radio
-            checked={!useCustom}
-            name={name}
-            onChange={this._toggleCustomConfig}
-            inline>
-            Project default
-          </Radio>
-          <Radio
-            checked={useCustom}
-            name={name}
-            onChange={this._toggleCustomConfig}
-            inline>
-            Custom
-          </Radio>
-        </FormGroup>
-        <p>
-          {useCustom
-            ? `Use custom JSON defined below for ${label} configuration.`
-            : `Use the ${label} configuration defined in the project deployment settings.`
-          }
-          <span>{' '}
-            {useCustom
-              ? <Button
-                style={{marginLeft: '15px'}}
-                bsSize='xsmall'
-                disabled={!this.state[name] || !validJSON}
-                onClick={this._onSaveConfig}>Save</Button>
-              : <LinkContainer
-                to={`/project/${deployment.projectId}/settings/deployment`}>
-                <Button bsSize='xsmall'>
-                  <Icon type='pencil' /> Edit
-                </Button>
-              </LinkContainer>
-            }
-          </span>
-        </p>
-        {useCustom &&
-          <FormGroup validationState={validJSON ? null : 'error'}>
-            <FormControl
-              componentClass='textarea'
-              style={{height: '125px'}}
-              placeholder='{"blah": true}'
-              onChange={this._onChangeConfig}
-              value={value} />
-            {!validJSON && <HelpBlock>Must provide valid JSON string.</HelpBlock>}
-          </FormGroup>
-        }
-      </div>
-    )
-  }
-}
-
-class CustomFileEditor extends Component<{
-  customFile: CustomFile,
-  customFileEditIdx: null | number,
-  idx: number,
-  onCancelEditing: () => void,
-  onDelete: (number) => void,
-  onEdit: (number) => void,
-  onSave: (number, CustomFile) => void
-}, {
-  fileSource: 'raw' | 'uri',
-  model: CustomFile
-}> {
-  constructor (props) {
-    super(props)
-    const { customFile } = props
-    this.state = {
-      fileSource: customFile.contents ? 'raw' : 'uri',
-      model: props.customFile
-    }
-  }
-
-  _onChangeBuildUse = () => {
-    const { model } = this.state
-    this.setState({
-      model: {
-        ...model,
-        useDuringBuild: !model.useDuringBuild
-      }
-    })
-  }
-
-  _onChangeContents = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({
-      model: {
-        ...this.state.model,
-        contents: evt.target.value
-      }
-    })
-  }
-
-  _onChangeFilename = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({
-      model: {
-        ...this.state.model,
-        filename: evt.target.value
-      }
-    })
-  }
-
-  _onChangeServeUse = () => {
-    const { model } = this.state
-    this.setState({
-      model: {
-        ...model,
-        useDuringServe: !model.useDuringServe
-      }
-    })
-  }
-
-  _onChangeSource = (evt: SyntheticInputEvent<HTMLSelectElement>) => {
-    const model = {...this.state.model}
-    // set variable to make flow happy
-    let newSource
-    if (evt.target.value === 'raw') {
-      model.uri = null
-      newSource = 'raw'
-    } else {
-      model.contents = null
-      newSource = 'uri'
-    }
-    this.setState({
-      fileSource: newSource,
-      model
-    })
-  }
-
-  _onChangeUri = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({
-      model: {
-        ...this.state.model,
-        uri: evt.target.value
-      }
-    })
-  }
-
-  _onCancelEditing = () => {
-    const { customFile, onCancelEditing } = this.props
-    this.setState({
-      fileSource: customFile.contents ? 'raw' : 'uri',
-      model: customFile
-    })
-    onCancelEditing()
-  }
-
-  _onDelete = () => {
-    const { idx, onDelete } = this.props
-    onDelete(idx)
-  }
-
-  _onEdit = () => {
-    const { idx, onEdit } = this.props
-    onEdit(idx)
-  }
-
-  _onSave = () => {
-    const { idx, onSave } = this.props
-    onSave(idx, this.state.model)
-  }
-
-  render () {
-    const {
-      customFileEditIdx,
-      idx
-    } = this.props
-    const {
-      fileSource,
-      model: customFile
-    } = this.state
-    const isValid = customFile.contents || customFile.uri
-    const isEditing = idx === customFileEditIdx
-    const canEdit = customFileEditIdx === null
-
-    return (
-      <div className='custom-file'>
-        <ButtonGroup>
-          {isEditing && (
-            <Button
-              disabled={!isValid}
-              onClick={this._onSave}
-            >
-              Save
-            </Button>
-          )}
-          {isEditing && <Button onClick={this._onCancelEditing}>Cancel</Button>}
-          {canEdit && <Button onClick={this._onEdit}>Edit</Button>}
-          {canEdit && <Button onClick={this._onDelete}>Delete</Button>}
-        </ButtonGroup>
-        <FormControl
-          disabled={!isEditing}
-          onChange={this._onChangeFilename}
-          placeholder='Enter filename'
-          type='text'
-          value={customFile.filename}
-        />
-        <Checkbox
-          checked={customFile.useDuringBuild}
-          disabled={!isEditing}
-          onChange={this._onChangeBuildUse}
-        >
-          Use during graph build
-        </Checkbox>
-        <Checkbox
-          checked={customFile.useDuringServe}
-          disabled={!isEditing}
-          onChange={this._onChangeServeUse}
-        >
-          Use while running server
-        </Checkbox>
-        <FormGroup validationState={isValid ? null : 'error'}>
-          <ControlLabel>File source</ControlLabel>
-          <FormControl
-            componentClass='select'
-            disabled={!isEditing}
-            onChange={this._onChangeSource}
-            placeholder='select type'
-            style={{ marginBottom: 5 }}
-            value={fileSource}
-          >
-            <option value='raw'>From raw input</option>
-            <option value='uri'>Download from URI</option>
-          </FormControl>
-          {!isValid && <HelpBlock>Please set contents or uri!</HelpBlock>}
-          {fileSource === 'raw' && (
-            <FormControl
-              componentClass='textarea'
-              disabled={!isEditing}
-              style={{height: '125px'}}
-              placeholder='{"blah": true}'
-              onChange={this._onChangeContents}
-              value={customFile.contents}
-            />
-          )}
-          {fileSource === 'uri' && (
-            <span>
-              <FormControl
-                disabled={!isEditing}
-                placeholder='https://www.examle.com/file.json'
-                onChange={this._onChangeUri}
-                type='text'
-                value={customFile.uri}
-              />
-              {!customFile.uri && (
-                <HelpBlock>Enter either a HTTP(S) URL or AWS S3 URI</HelpBlock>
-              )}
-            </span>
-          )}
-        </FormGroup>
-      </div>
-    )
-  }
-}

From 75fecec584a3f15d9d2d159ae54ac06f839f6830 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 18 Feb 2021 09:12:04 -0500
Subject: [PATCH 096/553] refactor(DeploymentsPanel): fix imports

---
 lib/manager/containers/ActiveDeploymentViewer.js | 2 +-
 lib/manager/containers/DeploymentsPanel.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/manager/containers/ActiveDeploymentViewer.js b/lib/manager/containers/ActiveDeploymentViewer.js
index ed0cda0b8..b9e497386 100644
--- a/lib/manager/containers/ActiveDeploymentViewer.js
+++ b/lib/manager/containers/ActiveDeploymentViewer.js
@@ -13,7 +13,7 @@ import {
   updateDeployment,
   updateVersionForFeedSource
 } from '../actions/deployments'
-import DeploymentViewer from '../components/DeploymentViewer'
+import DeploymentViewer from '../components/deployment/DeploymentViewer'
 
 import type {Deployment, Feed, Project} from '../../types'
 import type {AppState} from '../../types/reducers'
diff --git a/lib/manager/containers/DeploymentsPanel.js b/lib/manager/containers/DeploymentsPanel.js
index 9411b87ac..c3e99fbf1 100644
--- a/lib/manager/containers/DeploymentsPanel.js
+++ b/lib/manager/containers/DeploymentsPanel.js
@@ -11,7 +11,7 @@ import {
   deleteDeployment,
   updateDeployment
 } from '../actions/deployments'
-import DeploymentsPanel from '../components/DeploymentsPanel'
+import DeploymentsPanel from '../components/deployment/DeploymentsPanel'
 
 import type {Project} from '../../types'
 import type {AppState} from '../../types/reducers'

From 005936664289bac5100d49d201d855be897a7623 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 18 Feb 2021 09:15:56 -0500
Subject: [PATCH 097/553] refactor(e2e): temporarily force e2e to true

---
 scripts/check-if-e2e-should-run-on-ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/check-if-e2e-should-run-on-ci.sh b/scripts/check-if-e2e-should-run-on-ci.sh
index 077b46db9..437f8844d 100755
--- a/scripts/check-if-e2e-should-run-on-ci.sh
+++ b/scripts/check-if-e2e-should-run-on-ci.sh
@@ -16,5 +16,5 @@ if [[ "$SHOULD_RUN_E2E" != "true" ]]; then
 fi
 
 # FIXME: Re-enable e2e for conditions above.
-echo "SHOULD_RUN_E2E=false" >> $GITHUB_ENV && export SHOULD_RUN_E2E=true
-echo 'Overriding E2E. Temporarily forcing to be false...'
+echo "SHOULD_RUN_E2E=true" >> $GITHUB_ENV && export SHOULD_RUN_E2E=true
+echo 'Overriding E2E. Temporarily forcing to be true...'

From 7fa5df2fc5dd98f85f3463cb42ad0d168bbbac4d Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 18 Feb 2021 09:39:40 -0500
Subject: [PATCH 098/553] ci(gh-actions): fix aws credentials script

---
 .github/workflows/node-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 50cddf3fa..3a678b0e8 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -73,7 +73,7 @@ jobs:
           mongodb-version: 4.2
       - name: Add aws credentials for datatools-server
         if: env.SHOULD_RUN_E2E == 'true'
-        run: mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=us-east-1' > ~/.aws/config; else mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=foo' 'aws_secret_access_key=bar' 'region=us-east-1' > ~/.aws/config
+        run: mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=us-east-1' > ~/.aws/config
       - name: Run e2e tests
         if: env.SHOULD_RUN_E2E == 'true'
         run: yarn cover-end-to-end

From 4f4ecb2c0828b1dfaf261aa447558a79913465e6 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 18 Feb 2021 09:57:33 -0500
Subject: [PATCH 099/553] ci(gh-actions): override e2e to be false

---
 scripts/check-if-e2e-should-run-on-ci.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/check-if-e2e-should-run-on-ci.sh b/scripts/check-if-e2e-should-run-on-ci.sh
index 437f8844d..51eeb7d09 100755
--- a/scripts/check-if-e2e-should-run-on-ci.sh
+++ b/scripts/check-if-e2e-should-run-on-ci.sh
@@ -16,5 +16,6 @@ if [[ "$SHOULD_RUN_E2E" != "true" ]]; then
 fi
 
 # FIXME: Re-enable e2e for conditions above.
-echo "SHOULD_RUN_E2E=true" >> $GITHUB_ENV && export SHOULD_RUN_E2E=true
-echo 'Overriding E2E. Temporarily forcing to be true...'
+OVERRIDE=false
+echo "SHOULD_RUN_E2E=${OVERRIDE}" >> $GITHUB_ENV && export SHOULD_RUN_E2E=${OVERRIDE}
+echo "Overriding E2E. Temporarily forcing to be ${OVERRIDE}..."

From 34bbb8b64877752915faa4ead53c8e675f63b87c Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 19 Feb 2021 10:16:30 -0500
Subject: [PATCH 100/553] refactor: fix broken snapshots/flow

---
 .../__tests__/__snapshots__/projects.js.snap  |   1 +
 lib/manager/components/DeploymentSettings.js  |   2 -
 .../__snapshots__/ActiveProjectViewer.js.snap |   7 +
 .../__snapshots__/DeploymentsPanel.js.snap    | 701 ++++++++++++++----
 .../__snapshots__/FeedSourceTable.js.snap     |   8 +
 yarn.lock                                     | 522 ++-----------
 6 files changed, 624 insertions(+), 617 deletions(-)

diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 6cee153b7..8385fd715 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -5,6 +5,7 @@ Object {
   "active": null,
   "all": Array [
     Object {
+      "autoDeploy": false,
       "autoFetchFeeds": true,
       "autoFetchHour": 0,
       "autoFetchMinute": 0,
diff --git a/lib/manager/components/DeploymentSettings.js b/lib/manager/components/DeploymentSettings.js
index 501bf7de4..42ab973d9 100644
--- a/lib/manager/components/DeploymentSettings.js
+++ b/lib/manager/components/DeploymentSettings.js
@@ -6,7 +6,6 @@ import {coalesce, get, set} from 'object-path'
 import React, {Component} from 'react'
 import {
   Button,
-  Checkbox,
   Col,
   ControlLabel,
   FormControl,
@@ -19,7 +18,6 @@ import {
 import update from 'react-addons-update'
 import {shallowEqual} from 'react-pure-render'
 import {withRouter} from 'react-router'
-import {LinkContainer} from 'react-router-bootstrap'
 
 import FormInput from '../../common/components/FormInput'
 import {getComponentMessages} from '../../common/util/config'
diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index b7839776c..abfb7dd32 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -49,6 +49,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
       onProjectViewerMount={[Function]}
       project={
         Object {
+          "autoDeploy": false,
           "autoFetchFeeds": true,
           "autoFetchHour": 0,
           "autoFetchMinute": 0,
@@ -1911,6 +1912,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                       onNewFeedSourceClick={[Function]}
                                                       project={
                                                         Object {
+                                                          "autoDeploy": false,
                                                           "autoFetchFeeds": true,
                                                           "autoFetchHour": 0,
                                                           "autoFetchMinute": 0,
@@ -1953,6 +1955,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                         onNewFeedSourceClick={[Function]}
                                                         project={
                                                           Object {
+                                                            "autoDeploy": false,
                                                             "autoFetchFeeds": true,
                                                             "autoFetchHour": 0,
                                                             "autoFetchMinute": 0,
@@ -2068,6 +2071,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                               onNewFeedSourceClick={[Function]}
                                                               project={
                                                                 Object {
+                                                                  "autoDeploy": false,
                                                                   "autoFetchFeeds": true,
                                                                   "autoFetchHour": 0,
                                                                   "autoFetchMinute": 0,
@@ -2114,6 +2118,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                 onNewFeedSourceClick={[Function]}
                                                                 project={
                                                                   Object {
+                                                                    "autoDeploy": false,
                                                                     "autoFetchFeeds": true,
                                                                     "autoFetchHour": 0,
                                                                     "autoFetchMinute": 0,
@@ -2177,6 +2182,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                   }
                                                                   project={
                                                                     Object {
+                                                                      "autoDeploy": false,
                                                                       "autoFetchFeeds": true,
                                                                       "autoFetchHour": 0,
                                                                       "autoFetchMinute": 0,
@@ -3854,6 +3860,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                       feedSources={Array []}
                                                       project={
                                                         Object {
+                                                          "autoDeploy": false,
                                                           "autoFetchFeeds": true,
                                                           "autoFetchHour": 0,
                                                           "autoFetchMinute": 0,
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index e48ea83b0..4192cc93d 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -18,6 +18,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
     expanded={true}
     project={
       Object {
+        "autoDeploy": false,
         "autoFetchFeeds": true,
         "autoFetchHour": 0,
         "autoFetchMinute": 0,
@@ -237,10 +238,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
       createDeployment={[Function]}
       deleteDeployment={[Function]}
       expanded={true}
-      fetchProjectDeployments={[Function]}
-      fetchProjectFeeds={[Function]}
       project={
         Object {
+          "autoDeploy": false,
           "autoFetchFeeds": true,
           "autoFetchHour": 0,
           "autoFetchMinute": 0,
@@ -519,18 +519,158 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
           <Col
             bsClass="col"
             componentClass="div"
-            xs={9}
+            md={9}
+            sm={12}
           >
             <div
-              className="col-xs-9"
+              className="col-md-9 col-sm-12"
             >
               <DeploymentsList
                 createDeployment={[Function]}
                 deleteDeployment={[Function]}
-                fetchProjectDeployments={[Function]}
-                fetchProjectFeeds={[Function]}
+                deployments={
+                  Array [
+                    Object {
+                      "customBuildConfig": null,
+                      "customRouterConfig": null,
+                      "dateCreated": 1553292345720,
+                      "deployJobSummaries": Array [],
+                      "deployedTo": null,
+                      "ec2Instances": Array [],
+                      "feedSourceId": null,
+                      "feedVersions": Array [
+                        Object {
+                          "feedSource": Object {
+                            "dateCreated": 1536195264564,
+                            "deployable": false,
+                            "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                            "externalProperties": Object {},
+                            "id": "mock-feed-with-version-id",
+                            "isPublic": false,
+                            "lastFetched": 1543389038810,
+                            "lastUpdated": 1543389038810,
+                            "latestValidation": Object {
+                              "agencies": null,
+                              "agencyCount": 1,
+                              "avgDailyRevenueTime": 0,
+                              "bounds": Object {
+                                "east": -76.481211,
+                                "north": 39.0486949672717,
+                                "south": 38.92884,
+                                "west": -76.5673055566884,
+                              },
+                              "endDate": "20190801",
+                              "errorCount": 78,
+                              "feedVersionId": "mock-feed-version-id",
+                              "loadFailureReason": null,
+                              "loadStatus": "SUCCESS",
+                              "routeCount": 10,
+                              "startDate": "20180801",
+                              "stopCount": 237,
+                              "stopTimesCount": 11170,
+                              "tripCount": 415,
+                            },
+                            "latestVersionId": "mock-feed-version-id",
+                            "name": "test feed with a version",
+                            "noteCount": 0,
+                            "organizationId": null,
+                            "projectId": "mock-project-id",
+                            "publishedVersionId": null,
+                            "retrievalMethod": "MANUALLY_UPLOADED",
+                            "s3Url": null,
+                            "snapshotVersion": null,
+                            "transformRules": Array [],
+                            "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                            "user": null,
+                          },
+                          "id": "mock-feed-version-id",
+                          "nextVersionId": null,
+                          "previousVersionId": null,
+                          "updated": 1543389038810,
+                          "validationResult": Object {
+                            "agencies": null,
+                            "agencyCount": 1,
+                            "avgDailyRevenueTime": 0,
+                            "bounds": Object {
+                              "east": -76.481211,
+                              "north": 39.0486949672717,
+                              "south": 38.92884,
+                              "west": -76.5673055566884,
+                            },
+                            "endDate": "20190801",
+                            "errorCount": 78,
+                            "feedVersionId": "mock-feed-version-id",
+                            "loadFailureReason": null,
+                            "loadStatus": "SUCCESS",
+                            "routeCount": 10,
+                            "startDate": "20180801",
+                            "stopCount": 237,
+                            "stopTimesCount": 11170,
+                            "tripCount": 415,
+                          },
+                          "version": 1,
+                        },
+                      ],
+                      "id": "mock-deployment-id-0",
+                      "invalidFeedSources": Array [],
+                      "lastDeployed": null,
+                      "lastUpdated": 1553292345726,
+                      "latest": null,
+                      "name": "mock-deployment",
+                      "organizationId": null,
+                      "osmExtractUrl": null,
+                      "otpCommit": null,
+                      "otpVersion": null,
+                      "projectBounds": Object {
+                        "east": 0,
+                        "north": 0,
+                        "south": 0,
+                        "west": 0,
+                      },
+                      "projectId": "mock-project-with-deployments-id",
+                      "r5": false,
+                      "r5Version": null,
+                      "routerId": null,
+                      "skipOsmExtract": false,
+                      "user": null,
+                    },
+                    Object {
+                      "customBuildConfig": null,
+                      "customRouterConfig": null,
+                      "dateCreated": 1553292345720,
+                      "deployJobSummaries": Array [],
+                      "deployedTo": null,
+                      "ec2Instances": Array [],
+                      "feedSourceId": null,
+                      "feedVersions": Array [],
+                      "id": "mock-deployment-id-1",
+                      "invalidFeedSources": Array [],
+                      "lastDeployed": null,
+                      "lastUpdated": 1553292345726,
+                      "latest": null,
+                      "name": "mock-deployment",
+                      "organizationId": null,
+                      "osmExtractUrl": null,
+                      "otpCommit": null,
+                      "otpVersion": null,
+                      "projectBounds": Object {
+                        "east": 0,
+                        "north": 0,
+                        "south": 0,
+                        "west": 0,
+                      },
+                      "projectId": "mock-project-with-deployments-id",
+                      "r5": false,
+                      "r5Version": null,
+                      "routerId": null,
+                      "skipOsmExtract": false,
+                      "user": null,
+                    },
+                  ]
+                }
                 project={
                   Object {
+                    "autoDeploy": false,
                     "autoFetchFeeds": true,
                     "autoFetchHour": 0,
                     "autoFetchMinute": 0,
@@ -746,7 +886,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                 }
                 saveDeployment={[Function]}
                 updateDeployment={[Function]}
-                updateProject={[Function]}
               >
                 <Panel
                   bsClass="panel"
@@ -909,7 +1048,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         </thead>
                         <tbody>
                           <DeploymentListItem
-                            createDeployment={[Function]}
                             deleteDeployment={[Function]}
                             deployment={
                               Object {
@@ -1017,11 +1155,10 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "user": null,
                               }
                             }
-                            fetchProjectDeployments={[Function]}
-                            fetchProjectFeeds={[Function]}
                             key="mock-deployment-id-0"
                             project={
                               Object {
+                                "autoDeploy": false,
                                 "autoFetchFeeds": true,
                                 "autoFetchHour": 0,
                                 "autoFetchMinute": 0,
@@ -1237,23 +1374,38 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                             }
                             saveDeployment={[Function]}
                             updateDeployment={[Function]}
-                            updateProject={[Function]}
                           >
                             <tr
                               className="pinned-deployment"
                             >
                               <td>
+                                <Icon
+                                  type="thumb-tack"
+                                >
+                                  <i
+                                    className="fa fa-thumb-tack fa-fw "
+                                  />
+                                </Icon>
                                 <EditableTextField
+                                  inline={true}
                                   isEditing={false}
                                   link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-0"
                                   onChange={[Function]}
                                   rejectEmptyValue={true}
-                                  style={Object {}}
+                                  style={
+                                    Object {
+                                      "display": "inline-block",
+                                    }
+                                  }
                                   type="text"
                                   value="mock-deployment"
                                 >
                                   <div
-                                    style={Object {}}
+                                    style={
+                                      Object {
+                                        "display": "inline-block",
+                                      }
+                                    }
                                   >
                                     <span>
                                       <span
@@ -1305,7 +1457,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 <span
                                   title="Mar 22nd 2019, 3:05pm"
                                 >
-                                   
                                   2 months ago
                                 </span>
                               </td>
@@ -1324,9 +1475,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 </span>
                               </td>
                               <td>
-                                <span>
-                                  1
-                                </span>
+                                1
                               </td>
                               <td>
                                 <span
@@ -1336,73 +1485,36 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 </span>
                               </td>
                               <td>
-                                <ButtonGroup
+                                <Button
+                                  active={false}
                                   block={false}
-                                  bsClass="btn-group"
+                                  bsClass="btn"
+                                  bsSize="xsmall"
+                                  bsStyle="danger"
                                   className="pull-right"
-                                  justified={false}
-                                  vertical={false}
+                                  disabled={false}
+                                  onClick={[Function]}
                                 >
-                                  <div
-                                    className="pull-right btn-group"
+                                  <button
+                                    className="pull-right btn btn-xs btn-danger"
+                                    disabled={false}
+                                    onClick={[Function]}
+                                    type="button"
                                   >
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="info"
-                                      disabled={false}
-                                      onClick={[Function]}
+                                    <Glyphicon
+                                      bsClass="glyphicon"
+                                      glyph="remove"
                                     >
-                                      <button
-                                        className="btn btn-xs btn-info"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                        type="button"
-                                      >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="pushpin"
-                                        >
-                                          <span
-                                            className="glyphicon glyphicon-pushpin"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="danger"
-                                      disabled={false}
-                                      onClick={[Function]}
-                                    >
-                                      <button
-                                        className="btn btn-xs btn-danger"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                        type="button"
-                                      >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="remove"
-                                        >
-                                          <span
-                                            className="glyphicon glyphicon-remove"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                  </div>
-                                </ButtonGroup>
+                                      <span
+                                        className="glyphicon glyphicon-remove"
+                                      />
+                                    </Glyphicon>
+                                  </button>
+                                </Button>
                               </td>
                             </tr>
                           </DeploymentListItem>
                           <DeploymentListItem
-                            createDeployment={[Function]}
                             deleteDeployment={[Function]}
                             deployment={
                               Object {
@@ -1438,11 +1550,10 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "user": null,
                               }
                             }
-                            fetchProjectDeployments={[Function]}
-                            fetchProjectFeeds={[Function]}
                             key="mock-deployment-id-1"
                             project={
                               Object {
+                                "autoDeploy": false,
                                 "autoFetchFeeds": true,
                                 "autoFetchHour": 0,
                                 "autoFetchMinute": 0,
@@ -1658,23 +1769,31 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                             }
                             saveDeployment={[Function]}
                             updateDeployment={[Function]}
-                            updateProject={[Function]}
                           >
                             <tr
                               className=""
                             >
                               <td>
                                 <EditableTextField
+                                  inline={true}
                                   isEditing={false}
                                   link="/project/mock-project-with-deployments-id/deployments/mock-deployment-id-1"
                                   onChange={[Function]}
                                   rejectEmptyValue={true}
-                                  style={Object {}}
+                                  style={
+                                    Object {
+                                      "display": "inline-block",
+                                    }
+                                  }
                                   type="text"
                                   value="mock-deployment"
                                 >
                                   <div
-                                    style={Object {}}
+                                    style={
+                                      Object {
+                                        "display": "inline-block",
+                                      }
+                                    }
                                   >
                                     <span>
                                       <span
@@ -1726,7 +1845,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 <span
                                   title="Mar 22nd 2019, 3:05pm"
                                 >
-                                   
                                   2 months ago
                                 </span>
                               </td>
@@ -1745,9 +1863,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 </span>
                               </td>
                               <td>
-                                <span>
-                                  0
-                                </span>
+                                0
                               </td>
                               <td>
                                 <span
@@ -1757,68 +1873,32 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 </span>
                               </td>
                               <td>
-                                <ButtonGroup
+                                <Button
+                                  active={false}
                                   block={false}
-                                  bsClass="btn-group"
+                                  bsClass="btn"
+                                  bsSize="xsmall"
+                                  bsStyle="danger"
                                   className="pull-right"
-                                  justified={false}
-                                  vertical={false}
+                                  disabled={false}
+                                  onClick={[Function]}
                                 >
-                                  <div
-                                    className="pull-right btn-group"
+                                  <button
+                                    className="pull-right btn btn-xs btn-danger"
+                                    disabled={false}
+                                    onClick={[Function]}
+                                    type="button"
                                   >
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="warning"
-                                      disabled={false}
-                                      onClick={[Function]}
+                                    <Glyphicon
+                                      bsClass="glyphicon"
+                                      glyph="remove"
                                     >
-                                      <button
-                                        className="btn btn-xs btn-warning"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                        type="button"
-                                      >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="pushpin"
-                                        >
-                                          <span
-                                            className="glyphicon glyphicon-pushpin"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                    <Button
-                                      active={false}
-                                      block={false}
-                                      bsClass="btn"
-                                      bsSize="xsmall"
-                                      bsStyle="danger"
-                                      disabled={false}
-                                      onClick={[Function]}
-                                    >
-                                      <button
-                                        className="btn btn-xs btn-danger"
-                                        disabled={false}
-                                        onClick={[Function]}
-                                        type="button"
-                                      >
-                                        <Glyphicon
-                                          bsClass="glyphicon"
-                                          glyph="remove"
-                                        >
-                                          <span
-                                            className="glyphicon glyphicon-remove"
-                                          />
-                                        </Glyphicon>
-                                      </button>
-                                    </Button>
-                                  </div>
-                                </ButtonGroup>
+                                      <span
+                                        className="glyphicon glyphicon-remove"
+                                      />
+                                    </Glyphicon>
+                                  </button>
+                                </Button>
                               </td>
                             </tr>
                           </DeploymentListItem>
@@ -1833,10 +1913,11 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
           <Col
             bsClass="col"
             componentClass="div"
-            xs={3}
+            md={3}
+            sm={12}
           >
             <div
-              className="col-xs-3"
+              className="col-md-3 col-sm-12"
             >
               <Panel
                 bsClass="panel"
@@ -1844,7 +1925,11 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                 defaultExpanded={false}
                 header={
                   <h3>
-                    Deploying feeds to OTP
+                    <Icon
+                      type="rocket"
+                    />
+                     
+                    Auto-deployment
                   </h3>
                 }
               >
@@ -1857,7 +1942,324 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     <h3
                       className="panel-title"
                     >
-                      Deploying feeds to OTP
+                      <Icon
+                        type="rocket"
+                      >
+                        <i
+                          className="fa fa-rocket fa-fw "
+                        />
+                      </Icon>
+                       
+                      Auto-deployment
+                    </h3>
+                  </div>
+                  <div
+                    className="panel-body"
+                    key="0"
+                  >
+                    <FormGroup
+                      bsClass="form-group"
+                      controlId="pinnedDeploymentId"
+                      key=".0"
+                    >
+                      <div
+                        className="form-group"
+                      >
+                        <ControlLabel
+                          bsClass="control-label"
+                          srOnly={false}
+                        >
+                          <label
+                            className="control-label"
+                            htmlFor="pinnedDeploymentId"
+                          >
+                            <Icon
+                              type="thumb-tack"
+                            >
+                              <i
+                                className="fa fa-thumb-tack fa-fw "
+                              />
+                            </Icon>
+                             
+                            Pinned deployment
+                          </label>
+                        </ControlLabel>
+                        <Select
+                          arrowRenderer={[Function]}
+                          autosize={true}
+                          backspaceRemoves={true}
+                          backspaceToRemoveMessage="Press backspace to remove {label}"
+                          clearAllText="Clear all"
+                          clearRenderer={[Function]}
+                          clearValueText="Clear value"
+                          clearable={true}
+                          closeOnSelect={true}
+                          deleteRemoves={true}
+                          delimiter=","
+                          disabled={false}
+                          escapeClearsValue={true}
+                          filterOptions={[Function]}
+                          ignoreAccents={true}
+                          ignoreCase={true}
+                          inputProps={Object {}}
+                          isLoading={false}
+                          joinValues={false}
+                          labelKey="label"
+                          matchPos="any"
+                          matchProp="any"
+                          menuBuffer={0}
+                          menuRenderer={[Function]}
+                          multi={false}
+                          name="pinnedDeploymentId"
+                          noResultsText="No results found"
+                          onBlurResetsInput={true}
+                          onChange={[Function]}
+                          onCloseResetsInput={true}
+                          onSelectResetsInput={true}
+                          openOnClick={true}
+                          optionComponent={[Function]}
+                          options={
+                            Array [
+                              Object {
+                                "label": "mock-deployment",
+                                "value": "mock-deployment-id-0",
+                              },
+                              Object {
+                                "label": "mock-deployment",
+                                "value": "mock-deployment-id-1",
+                              },
+                            ]
+                          }
+                          pageSize={5}
+                          placeholder="Select a deployment to pin"
+                          removeSelected={true}
+                          required={false}
+                          rtl={false}
+                          scrollMenuIntoView={true}
+                          searchable={true}
+                          simpleValue={false}
+                          tabSelectsValue={true}
+                          trimFilter={true}
+                          value="mock-deployment-id-0"
+                          valueComponent={[Function]}
+                          valueKey="value"
+                        >
+                          <div
+                            className="Select has-value is-clearable is-searchable Select--single"
+                          >
+                            <input
+                              disabled={false}
+                              key="hidden.0"
+                              name="pinnedDeploymentId"
+                              type="hidden"
+                              value="mock-deployment-id-0"
+                            />
+                            <div
+                              className="Select-control"
+                              onKeyDown={[Function]}
+                              onMouseDown={[Function]}
+                              onTouchEnd={[Function]}
+                              onTouchMove={[Function]}
+                              onTouchStart={[Function]}
+                            >
+                              <div
+                                className="Select-multi-value-wrapper"
+                                id="react-select-2--value"
+                              >
+                                <Value
+                                  disabled={false}
+                                  id="react-select-2--value-item"
+                                  instancePrefix="react-select-2-"
+                                  onClick={null}
+                                  placeholder="Select a deployment to pin"
+                                  value={
+                                    Object {
+                                      "label": "mock-deployment",
+                                      "value": "mock-deployment-id-0",
+                                    }
+                                  }
+                                >
+                                  <div
+                                    className="Select-value"
+                                  >
+                                    <span
+                                      aria-selected="true"
+                                      className="Select-value-label"
+                                      id="react-select-2--value-item"
+                                      role="option"
+                                    >
+                                      mock-deployment
+                                    </span>
+                                  </div>
+                                </Value>
+                                <AutosizeInput
+                                  aria-activedescendant="react-select-2--value"
+                                  aria-expanded="false"
+                                  aria-haspopup="false"
+                                  aria-owns=""
+                                  className="Select-input"
+                                  injectStyles={true}
+                                  minWidth="5"
+                                  onBlur={[Function]}
+                                  onChange={[Function]}
+                                  onFocus={[Function]}
+                                  required={false}
+                                  role="combobox"
+                                  value=""
+                                >
+                                  <div
+                                    className="Select-input"
+                                    style={
+                                      Object {
+                                        "display": "inline-block",
+                                      }
+                                    }
+                                  >
+                                    <input
+                                      aria-activedescendant="react-select-2--value"
+                                      aria-expanded="false"
+                                      aria-haspopup="false"
+                                      aria-owns=""
+                                      onBlur={[Function]}
+                                      onChange={[Function]}
+                                      onFocus={[Function]}
+                                      required={false}
+                                      role="combobox"
+                                      style={
+                                        Object {
+                                          "boxSizing": "content-box",
+                                          "width": "5px",
+                                        }
+                                      }
+                                      value=""
+                                    />
+                                    <div
+                                      style={
+                                        Object {
+                                          "height": 0,
+                                          "left": 0,
+                                          "overflow": "scroll",
+                                          "position": "absolute",
+                                          "top": 0,
+                                          "visibility": "hidden",
+                                          "whiteSpace": "pre",
+                                        }
+                                      }
+                                    />
+                                  </div>
+                                </AutosizeInput>
+                              </div>
+                              <span
+                                aria-label="Clear value"
+                                className="Select-clear-zone"
+                                onMouseDown={[Function]}
+                                onTouchEnd={[Function]}
+                                onTouchMove={[Function]}
+                                onTouchStart={[Function]}
+                                title="Clear value"
+                              >
+                                <span
+                                  className="Select-clear"
+                                  dangerouslySetInnerHTML={
+                                    Object {
+                                      "__html": "&times;",
+                                    }
+                                  }
+                                />
+                              </span>
+                              <span
+                                className="Select-arrow-zone"
+                                onMouseDown={[Function]}
+                              >
+                                <span
+                                  className="Select-arrow"
+                                  onMouseDown={[Function]}
+                                />
+                              </span>
+                            </div>
+                          </div>
+                        </Select>
+                        <HelpBlock
+                          bsClass="help-block"
+                        >
+                          <span
+                            className="help-block"
+                          >
+                            Pin a deployment (and deploy to a server at least once) to enable auto-deployment.
+                          </span>
+                        </HelpBlock>
+                      </div>
+                    </FormGroup>
+                    <Checkbox
+                      bsClass="checkbox"
+                      checked={false}
+                      disabled={false}
+                      inline={false}
+                      key=".1"
+                      name="autoDeploy"
+                      onChange={[Function]}
+                    >
+                      <div
+                        className="checkbox"
+                      >
+                        <label>
+                          <input
+                            checked={false}
+                            disabled={false}
+                            name="autoDeploy"
+                            onChange={[Function]}
+                            type="checkbox"
+                          />
+                          Enable auto-deploy?
+                        </label>
+                      </div>
+                    </Checkbox>
+                    <HelpBlock
+                      bsClass="help-block"
+                      key=".2"
+                    >
+                      <span
+                        className="help-block"
+                      >
+                        Whenever a new version is processed, a deployment will automatically be kicked off (assuming there are no critical errors).
+
+                      </span>
+                    </HelpBlock>
+                  </div>
+                </div>
+              </Panel>
+              <Panel
+                bsClass="panel"
+                bsStyle="default"
+                defaultExpanded={false}
+                header={
+                  <h3>
+                    <Icon
+                      type="cog"
+                    />
+                     
+                    Configuring deployments
+                  </h3>
+                }
+              >
+                <div
+                  className="panel panel-default"
+                >
+                  <div
+                    className="panel-heading"
+                  >
+                    <h3
+                      className="panel-title"
+                    >
+                      <Icon
+                        type="cog"
+                      >
+                        <i
+                          className="fa fa-cog fa-fw "
+                        />
+                      </Icon>
+                       
+                      Configuring deployments
                     </h3>
                   </div>
                   <div
@@ -1867,7 +2269,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     <p
                       key=".0"
                     >
-                      A collection of feeds can be deployed to OpenTripPlanner (OTP) instances that have been defined in the organization settings.
+                      Deployments can use project-level configurations (e.g., for build or router config files) or be configured individually.
+
                     </p>
                     <LinkContainer
                       action="push"
@@ -1898,7 +2301,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                               className="fa fa-cog fa-fw "
                             />
                           </Icon>
-                           Edit deployment settings
+                           
+                          Edit deployment settings
                         </button>
                       </Button>
                     </LinkContainer>
@@ -1931,7 +2335,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                               className="fa fa-server fa-fw "
                             />
                           </Icon>
-                           Manage deployment servers
+                           
+                          Manage deployment servers
                         </button>
                       </Button>
                     </LinkContainer>
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 163f34121..78c2e61df 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -17,6 +17,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
     onNewFeedSourceClick={[Function]}
     project={
       Object {
+        "autoDeploy": false,
         "autoFetchFeeds": true,
         "autoFetchHour": 0,
         "autoFetchMinute": 0,
@@ -300,6 +301,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
       onNewFeedSourceClick={[Function]}
       project={
         Object {
+          "autoDeploy": false,
           "autoFetchFeeds": true,
           "autoFetchHour": 0,
           "autoFetchMinute": 0,
@@ -564,6 +566,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             onNewFeedSourceClick={[Function]}
             project={
               Object {
+                "autoDeploy": false,
                 "autoFetchFeeds": true,
                 "autoFetchHour": 0,
                 "autoFetchMinute": 0,
@@ -759,6 +762,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               onNewFeedSourceClick={[Function]}
               project={
                 Object {
+                  "autoDeploy": false,
                   "autoFetchFeeds": true,
                   "autoFetchHour": 0,
                   "autoFetchMinute": 0,
@@ -972,6 +976,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                 }
                 project={
                   Object {
+                    "autoDeploy": false,
                     "autoFetchFeeds": true,
                     "autoFetchHour": 0,
                     "autoFetchMinute": 0,
@@ -2838,6 +2843,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     key="mock-feed-with-version-id"
                     project={
                       Object {
+                        "autoDeploy": false,
                         "autoFetchFeeds": true,
                         "autoFetchHour": 0,
                         "autoFetchMinute": 0,
@@ -3095,6 +3101,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       }
                       project={
                         Object {
+                          "autoDeploy": false,
                           "autoFetchFeeds": true,
                           "autoFetchHour": 0,
                           "autoFetchMinute": 0,
@@ -3636,6 +3643,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             }
                             project={
                               Object {
+                                "autoDeploy": false,
                                 "autoFetchFeeds": true,
                                 "autoFetchHour": 0,
                                 "autoFetchMinute": 0,
diff --git a/yarn.lock b/yarn.lock
index 47bafbaa8..c58b225f2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -729,21 +729,7 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.2"
 
-"@babel/runtime@^7.1.2":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f"
-  integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==
-  dependencies:
-    regenerator-runtime "^0.12.0"
-
-"@babel/runtime@^7.4.2":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.4.tgz#dc2e34982eb236803aa27a07fea6857af1b9171d"
-  integrity sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==
-  dependencies:
-    regenerator-runtime "^0.13.2"
-
-"@babel/runtime@^7.4.5":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
   integrity sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==
@@ -1399,12 +1385,7 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
   integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
 
-"@types/node@*":
-  version "11.13.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.8.tgz#e5d71173c95533be9842b2c798978f095f912aab"
-  integrity sha512-szA3x/3miL90ZJxUCzx9haNbK5/zmPieGraZEe4WI+3srN0eGLiT22NXeMHmyhNEopn+IrxqMc7wdVwvPl8meg==
-
-"@types/node@>= 8":
+"@types/node@*", "@types/node@>= 8":
   version "14.14.8"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.8.tgz#2127bd81949a95c8b7d3240f3254352d72563aec"
   integrity sha512-z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA==
@@ -2285,18 +2266,7 @@ before-after-hook@^2.1.0:
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
   integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
 
-bin-links@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.2.tgz#fb74bd54bae6b7befc6c6221f25322ac830d9757"
-  integrity sha512-8eEHVgYP03nILphilltWjeIjMbKyJo3wvp9K816pHbhP301ismzw15mxAAEVQ/USUwcP++1uNrbERbp8lOA6Fg==
-  dependencies:
-    bluebird "^3.5.0"
-    cmd-shim "^2.0.2"
-    gentle-fs "^2.0.0"
-    graceful-fs "^4.1.11"
-    write-file-atomic "^2.3.0"
-
-bin-links@^1.1.8:
+bin-links@^1.1.2, bin-links@^1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.8.tgz#bd39aadab5dc4bdac222a07df5baf1af745b2228"
   integrity sha512-KgmVfx+QqggqP9dA3iIc5pA4T1qEEEL+hOhOhNPaUm77OTrJoOXE/C05SJLNJe6m/2wUK7F1tDSou7n5TfCDzQ==
@@ -2327,12 +2297,7 @@ bl@^3.0.0:
   dependencies:
     readable-stream "^3.0.1"
 
-bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.4.tgz#d6cc661595de30d5b3af5fcedd3c0b3ef6ec5714"
-  integrity sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==
-
-bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2842,16 +2807,7 @@ camelcase-keys@^4.0.0:
     map-obj "^2.0.0"
     quick-lru "^1.0.0"
 
-camelcase-keys@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.0.1.tgz#a0d1a03cab5499a7ddcc62b23b4874399ca1dfaf"
-  integrity sha512-Pet+fVo99HMVy183qJuyTiQECQlb0dCXg89qhixcud88j4BSns+gzhSrjRT0ustEYSWJqKMO42arm1cS1VG5FA==
-  dependencies:
-    camelcase "^5.3.1"
-    map-obj "^4.0.0"
-    quick-lru "^4.0.1"
-
-camelcase-keys@^6.2.2:
+camelcase-keys@^6.0.0, camelcase-keys@^6.2.2:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
   integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
@@ -3012,12 +2968,7 @@ chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2:
   optionalDependencies:
     fsevents "^1.2.7"
 
-chownr@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
-  integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
-
-chownr@^1.1.2, chownr@^1.1.4:
+chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -3280,17 +3231,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.11.0, commander@^2.19.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
-
-commander@^2.9.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-commander@~2.20.3:
+commander@^2.11.0, commander@^2.19.0, commander@^2.9.0, commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3336,12 +3277,7 @@ component-classes@^1.2.5:
   dependencies:
     component-indexof "0.0.3"
 
-component-emitter@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
-component-emitter@^1.2.1:
+component-emitter@^1.2.0, component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -3490,20 +3426,7 @@ conventional-commits-filter@^2.0.0, conventional-commits-filter@^2.0.1:
     is-subset "^0.1.1"
     modify-values "^1.0.0"
 
-conventional-commits-parser@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.1.tgz#fe1c49753df3f98edb2285a5e485e11ffa7f2e4c"
-  integrity sha512-P6U5UOvDeidUJ8ebHVDIoXzI7gMlQ1OF/id6oUvp8cnZvOXMt1n8nYl74Ey9YMn0uVQtxmCtjPQawpsssBWtGg==
-  dependencies:
-    JSONStream "^1.0.4"
-    is-text-path "^1.0.0"
-    lodash "^4.2.1"
-    meow "^4.0.0"
-    split2 "^2.0.0"
-    through2 "^2.0.0"
-    trim-off-newlines "^1.0.0"
-
-conventional-commits-parser@^3.0.7:
+conventional-commits-parser@^3.0.0, conventional-commits-parser@^3.0.7:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.0.tgz#9e261b139ca4b7b29bcebbc54460da36894004ca"
   integrity sha512-XmJiXPxsF0JhAKyfA2Nn+rZwYKJ60nanlbSWwwkGwLQFbugsc0gv1rzc7VbbUWAzJfR1qR87/pNgv9NgmxtBMQ==
@@ -3574,7 +3497,7 @@ core-js-pure@3.1.4:
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769"
   integrity sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==
 
-core-js@2, core-js@^2.6.5:
+core-js@2, core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
   integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
@@ -3584,11 +3507,6 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
   integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
-core-js@^2.4.0, core-js@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.0.tgz#1e30793e9ee5782b307e37ffa22da0eacddd84d4"
-  integrity sha512-kLRC6ncVpuEW/1kwrOXYX6KQASCVtrh1gQr/UiaVgFlf9WE5Vp+lNe5+h3LuMr5PAucWnnEXwH0nQHRH/gpGtw==
-
 core-js@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
@@ -4066,7 +3984,7 @@ debug@~2.2.0:
   dependencies:
     ms "0.7.1"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
   integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
@@ -4662,7 +4580,7 @@ errorify@^0.3.1:
   resolved "https://registry.yarnpkg.com/errorify/-/errorify-0.3.1.tgz#53e0aaeeb18adc3e55f9f1eb4e2d95929f41b79b"
   integrity sha1-U+Cq7rGK3D5V+fHrTi2Vkp9Bt5s=
 
-es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.7.0, es-abstract@^1.9.0:
+es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.7.0, es-abstract@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
   integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
@@ -4674,17 +4592,6 @@ es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.
     is-regex "^1.0.4"
     object-keys "^1.0.12"
 
-es-abstract@^1.5.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
-  integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
 es-to-primitive@^1.1.1, es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
@@ -4717,16 +4624,11 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-promise@^4.0.3, es6-promise@^4.2.8:
+es6-promise@^4.0.3, es6-promise@^4.1.1, es6-promise@^4.2.8:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
   integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
-es6-promise@^4.1.1:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
-  integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
-
 es6-promise@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
@@ -5786,21 +5688,7 @@ genfun@^5.0.0:
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
   integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
-gentle-fs@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.0.1.tgz#585cfd612bfc5cd52471fdb42537f016a5ce3687"
-  integrity sha512-cEng5+3fuARewXktTEGbwsktcldA+YsnUEaXZwcK/3pjSE1X9ObnTs+/8rYf8s+RnIcQm2D5x3rwpN7Zom8Bew==
-  dependencies:
-    aproba "^1.1.2"
-    fs-vacuum "^1.2.10"
-    graceful-fs "^4.1.11"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    path-is-inside "^1.0.2"
-    read-cmd-shim "^1.0.1"
-    slide "^1.1.6"
-
-gentle-fs@^2.3.0, gentle-fs@^2.3.1:
+gentle-fs@^2.0.0, gentle-fs@^2.3.0, gentle-fs@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.1.tgz#11201bf66c18f930ddca72cf69460bdfa05727b1"
   integrity sha512-OlwBBwqCFPcjm33rF2BjW+Pr6/ll2741l+xooiwTCeaX2CA1ZuclavyMBe0/KlR21/XGsgY6hzEQZ15BdNa13Q==
@@ -5986,19 +5874,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.6:
+glob@^7.0.0, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -6081,17 +5957,7 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
-  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
-
-graceful-fs@^4.2.0:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
-  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
-
-graceful-fs@^4.2.2, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -6272,14 +6138,7 @@ hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.3.1:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz#c09c0555c84b38a7ede6912b61efddafd6e75e1e"
-  integrity sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==
-  dependencies:
-    react-is "^16.3.2"
-
-hoist-non-react-statics@^3.3.0:
+hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
   integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
@@ -6517,12 +6376,7 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.0.2, ignore@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz#e28e584d43ad7e92f96995019cc43b9e1ac49558"
-  integrity sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==
-
-ignore@^5.1.4:
+ignore@^5.0.2, ignore@^5.1.2, ignore@^5.1.4:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
@@ -6545,15 +6399,7 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-fresh@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118"
-  integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-fresh@^3.1.0:
+import-fresh@^3.0.0, import-fresh@^3.1.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
   integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
@@ -6581,7 +6427,7 @@ import-local@^2.0.0:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -7691,15 +7537,7 @@ js-levenshtein@^1.1.3:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@3.x:
-  version "3.12.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
-  integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.1:
+js-yaml@3.x, js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -7934,12 +7772,7 @@ kind-of@^5.0.0:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
-
-kind-of@^6.0.3:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -8232,15 +8065,7 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-lock-verify@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.1.0.tgz#fff4c918b8db9497af0c5fa7f6d71555de3ceb47"
-  integrity sha512-vcLpxnGvrqisKvLQ2C2v0/u7LVly17ak2YSgoK4PrdsYBXQIax19vhKiLfvKNFx7FRrpTnitrpzF/uuCMuorIg==
-  dependencies:
-    npm-package-arg "^6.1.0"
-    semver "^5.4.1"
-
-lock-verify@^2.1.0:
+lock-verify@^2.0.2, lock-verify@^2.1.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.1.tgz#81107948c51ed16f97b96ff8b60675affb243fc1"
   integrity sha512-n0Zw2DVupKfZMazy/HIFVNohJ1z8fIoZ77WBnyyBGG6ixw83uJNyrbiJvvHWe1QKkGiBCjj8RCPlymltliqEww==
@@ -8261,11 +8086,6 @@ lodash-es@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.14.tgz#12a95a963cc5955683cee3b74e85458954f37ecc"
   integrity sha512-7zchRrGa8UZXjD/4ivUWP1867jDkhzTG2c/uj739utSd7O/pFFdxspCemIFKEEjErbcqRzn8nKnGsi7mvTgRPA==
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-  integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=
-
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
@@ -8274,29 +8094,12 @@ lodash._baseuniq@~4.6.0:
     lodash._createset "~4.0.0"
     lodash._root "~3.0.0"
 
-lodash._bindcallback@*:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-  integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=
-
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
   integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
+lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
   integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
@@ -8415,11 +8218,6 @@ lodash.once@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
-lodash.restparam@*:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -8969,20 +8767,13 @@ mime-db@~1.37.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
   integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
 
-mime-types@^2.1.12, mime-types@~2.1.19:
+mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.24"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
   integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
   dependencies:
     mime-db "1.40.0"
 
-mime-types@~2.1.18:
-  version "2.1.21"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
-  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
-  dependencies:
-    mime-db "~1.37.0"
-
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
@@ -8993,17 +8784,7 @@ mime@1.6.0, mime@^1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.0.3:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
-
-mime@^2.4.0:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
-  integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
-
-mime@^2.4.3:
+mime@^2.0.3, mime@^2.4.0, mime@^2.4.3:
   version "2.4.6"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
   integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
@@ -9081,12 +8862,12 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minimist@^1.2.5:
+minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -9096,15 +8877,7 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
-minipass@^2.2.1, minipass@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minipass@^2.8.6:
+minipass@^2.2.1, minipass@^2.3.5, minipass@^2.8.6:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
@@ -9143,14 +8916,14 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
-mkdirp@^0.5.5:
+mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -9223,12 +8996,12 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1, ms@^2.0.0:
+ms@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@2.1.2, ms@^2.1.1:
+ms@2.1.2, ms@^2.0.0, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -9432,15 +9205,7 @@ nopt@3.x:
   dependencies:
     abbrev "1"
 
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-nopt@^4.0.3:
+nopt@^4.0.1, nopt@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
   integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
@@ -9544,17 +9309,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
-  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
-  dependencies:
-    hosted-git-info "^2.6.0"
-    osenv "^0.1.5"
-    semver "^5.5.0"
-    validate-npm-package-name "^3.0.0"
-
-npm-package-arg@^6.1.1:
+"npm-package-arg@^4.0.0 || ^5.0.0 || ^6.0.0", npm-package-arg@^6.0.0, npm-package-arg@^6.1.0, npm-package-arg@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
   integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
@@ -9564,23 +9319,7 @@ npm-package-arg@^6.1.1:
     semver "^5.6.0"
     validate-npm-package-name "^3.0.0"
 
-npm-packlist@^1.1.12:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
-  integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
-npm-packlist@^1.1.6:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz#866224233850ac534b63d1a6e76050092b5d2f44"
-  integrity sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
-npm-packlist@^1.4.8:
+npm-packlist@^1.1.12, npm-packlist@^1.1.6, npm-packlist@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
   integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
@@ -10254,12 +9993,7 @@ pad-right@^0.2.2:
   dependencies:
     repeat-string "^1.5.2"
 
-pako@~1.0.2:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27"
-  integrity sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==
-
-pako@~1.0.5:
+pako@~1.0.2, pako@~1.0.5:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
   integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
@@ -10411,12 +10145,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-key@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
-  integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
-
-path-key@^3.1.0:
+path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -11806,21 +11535,11 @@ react-input-autosize@^2.1.2:
   dependencies:
     prop-types "^15.5.8"
 
-react-is@^16.3.2, react-is@^16.6.0:
-  version "16.6.3"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.3.tgz#d2d7462fcfcbe6ec0da56ad69047e47e56e7eac0"
-  integrity sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA==
-
-react-is@^16.7.0:
+react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
   version "16.11.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz#b85dfecd48ad1ce469ff558a882ca8e8313928fa"
   integrity sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw==
 
-react-is@^16.8.1, react-is@^16.8.4:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
-  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
-
 react-leaflet@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-1.1.0.tgz#0ec55ff030fae8c90e6e00a48163dcbccbadb4d8"
@@ -11868,20 +11587,7 @@ react-pure-render@^1.0.2:
   resolved "https://registry.yarnpkg.com/react-pure-render/-/react-pure-render-1.0.2.tgz#9d8a928c7f2c37513c2d064e57b3e3c356e9fabb"
   integrity sha1-nYqSjH8sN1E8LQZOV7Pjw1bp+rs=
 
-react-redux@^5.0.3:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.1.tgz#88e368682c7fa80e34e055cd7ac56f5936b0f52f"
-  integrity sha512-LE7Ned+cv5qe7tMV5BPYkGQ5Lpg8gzgItK07c67yHvJ8t0iaD9kPFPAli/mYkiyJYrs2pJgExR2ZgsGqlrOApg==
-  dependencies:
-    "@babel/runtime" "^7.1.2"
-    hoist-non-react-statics "^3.1.0"
-    invariant "^2.2.4"
-    loose-envify "^1.1.0"
-    prop-types "^15.6.1"
-    react-is "^16.6.0"
-    react-lifecycles-compat "^3.0.0"
-
-react-redux@^5.0.7:
+react-redux@^5.0.3, react-redux@^5.0.7:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.2.tgz#b19cf9e21d694422727bf798e934a916c4080f57"
   integrity sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==
@@ -12018,14 +11724,7 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
-read-cmd-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz#2d5d157786a37c055d22077c32c53f8329e91c7b"
-  integrity sha1-LV0Vd4ajfAVdIgd8MsU/gynpHHs=
-  dependencies:
-    graceful-fs "^4.1.2"
-
-read-cmd-shim@^1.0.5:
+read-cmd-shim@^1.0.1, read-cmd-shim@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
   integrity sha512-v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA==
@@ -12053,19 +11752,7 @@ read-only-stream@^2.0.0:
   dependencies:
     readable-stream "^2.0.2"
 
-"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13:
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.13.tgz#2e82ebd9f613baa6d2ebe3aa72cefe3f68e41f4a"
-  integrity sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==
-  dependencies:
-    glob "^7.1.1"
-    json-parse-better-errors "^1.0.1"
-    normalize-package-data "^2.0.0"
-    slash "^1.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.2"
-
-read-package-json@^2.1.1:
+"read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@^2.0.13, read-package-json@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
   integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
@@ -12182,16 +11869,7 @@ read@1, read@^1.0.4, read@~1.0.1, read@~1.0.7:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@3, readable-stream@^3.6.0:
+"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -12210,15 +11888,6 @@ readable-stream@3, readable-stream@^3.6.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
-  integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readable-stream@~1.1.10:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -12241,17 +11910,7 @@ readable-stream@~2.0.0, readable-stream@~2.0.6:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readdir-scoped-modules@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
-  integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
-  dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    graceful-fs "^4.1.2"
-    once "^1.3.0"
-
-readdir-scoped-modules@^1.1.0:
+readdir-scoped-modules@^1.0.0, readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -12317,18 +11976,7 @@ reduce-reducers@^0.4.3:
   resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.4.3.tgz#8e052618801cd8fc2714b4915adaa8937eb6d66c"
   integrity sha512-+CNMnI8QhgVMtAt54uQs3kUxC3Sybpa7Y63HR14uGLgI9/QR5ggHvpxwhGGe3wmx5V91YwqQIblN9k5lspAmGw==
 
-redux-actions@^2.2.1:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.6.4.tgz#e1d9d7d987d274071b0134b707365d3e25ba3b26"
-  integrity sha512-Gho+gnsvyR5h0pApoMdHLYssVEu4I0DNqyC91u43Xy/BvLrEddEMtukLF8oL3WXUy7DjxqKOKZHKmpKyN6hxlQ==
-  dependencies:
-    invariant "^2.2.4"
-    just-curry-it "^3.1.0"
-    loose-envify "^1.4.0"
-    reduce-reducers "^0.4.3"
-    to-camel-case "^1.0.0"
-
-redux-actions@^2.6.1:
+redux-actions@^2.2.1, redux-actions@^2.6.1:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-2.6.5.tgz#bdca548768ee99832a63910c276def85e821a27e"
   integrity sha512-pFhEcWFTYNk7DhQgxMGnbsB1H2glqhQJRQrtPb96kD3hWiZRzXHwwmFPswg6V2MjraXRXWNmuP9P84tvdLAJmw==
@@ -12652,21 +12300,7 @@ resolve@1.1.7, resolve@1.1.x:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
-  integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.10.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.1.tgz#664842ac960795bbe758221cdccda61fb64b5f18"
-  integrity sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.17.0:
+resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
@@ -12730,21 +12364,14 @@ right-pad@^1.0.1:
   resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
   integrity sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=
 
-rimraf@2.6.3, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
-
-rimraf@^2.7.1:
+rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -12815,12 +12442,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
-
-safe-buffer@^5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -13639,12 +13261,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-stringify-package@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
-  integrity sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==
-
-stringify-package@^1.0.1:
+stringify-package@^1.0.0, stringify-package@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
   integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
@@ -13880,20 +13497,7 @@ tar-stream@~1.1.0:
     readable-stream "~1.0.33"
     xtend "^4.0.0"
 
-tar@^4:
-  version "4.4.10"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
-  integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.5"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
-tar@^4.4.10, tar@^4.4.12, tar@^4.4.13:
+tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.13:
   version "4.4.13"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
   integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
@@ -14730,12 +14334,12 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@3.3.2, uuid@^3.1.0, uuid@^3.3.2:
+uuid@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-uuid@^3.3.3:
+uuid@^3.1.0, uuid@^3.3.2, uuid@^3.3.3:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
@@ -14972,14 +14576,7 @@ wordwrap@~0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
-worker-farm@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
-  dependencies:
-    errno "~0.1.7"
-
-worker-farm@^1.7.0:
+worker-farm@^1.6.0, worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
   integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
@@ -15026,16 +14623,7 @@ write-file-atomic@2.4.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write-file-atomic@^2.0.0, write-file-atomic@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
-  integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
-  dependencies:
-    graceful-fs "^4.1.11"
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.2"
-
-write-file-atomic@^2.4.3:
+write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
   integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==

From fa37087451d8bb89474e82d4c0992cbd05fbb994 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Mon, 22 Feb 2021 23:16:02 -0800
Subject: [PATCH 101/553] refactor: add more custom file validation

---
 .../components/deployment/CustomFileEditor.js | 101 +++++++++++++-----
 1 file changed, 72 insertions(+), 29 deletions(-)

diff --git a/lib/manager/components/deployment/CustomFileEditor.js b/lib/manager/components/deployment/CustomFileEditor.js
index a7ca365e9..3676063cc 100644
--- a/lib/manager/components/deployment/CustomFileEditor.js
+++ b/lib/manager/components/deployment/CustomFileEditor.js
@@ -40,11 +40,37 @@ export default class CustomFileEditor extends Component<Props, {
 
   _canEdit = () => this.props.customFileEditIdx === null
 
-  _isEditing= () => this.props.idx === this.props.customFileEditIdx
+  /**
+   * Makes sure that the filename is valid. The filename is optional when a uri
+   * is provided, but is required when entering raw input.
+   */
+  _fileNameValid = (): boolean => {
+    const {fileSource, model: customFile} = this.state
+    return (fileSource === 'uri' && !!customFile.uri) ||
+      (!!customFile.contents && !!customFile.filename)
+  }
+
+  /**
+   * Makes sure that a uri or some raw input has been added
+   */
+  _hasContents = (): boolean => {
+    const {model: customFile} = this.state
+    return !!customFile.contents || !!customFile.uri
+  }
 
-  _isValid = () => {
+  /**
+   * Makes sure that the file is used during either graph building, serving or
+   * both.
+   */
+  _hasSomeUsage = (): boolean => {
     const {model: customFile} = this.state
-    return customFile.contents || customFile.uri
+    return customFile.useDuringBuild || customFile.useDuringServe
+  }
+
+  _isEditing= () => this.props.idx === this.props.customFileEditIdx
+
+  _isValidOverall = (): boolean => {
+    return this._fileNameValid() && this._hasSomeUsage() && this._hasContents()
   }
 
   _onChangeBuildUse = () => {
@@ -151,7 +177,7 @@ export default class CustomFileEditor extends Component<Props, {
         {isEditing &&
           <Button
             bsSize='xsmall'
-            disabled={!this._isValid()}
+            disabled={!this._isValidOverall()}
             onClick={this._onSave}
           >
             Save
@@ -175,43 +201,60 @@ export default class CustomFileEditor extends Component<Props, {
       fileSource,
       model: customFile
     } = this.state
-    const isValid = this._isValid()
+    const filenameValid = this._fileNameValid()
+    const hasSomeUsage = this._hasSomeUsage()
+    const hasContents = this._hasContents()
     const isEditing = this._isEditing()
     return (
       <div className='custom-file'>
         {this._renderToolbar()}
         <div className='margin-top-15'>
           {isEditing
-            ? <FormControl
-              onChange={this._onChangeFilename}
-              placeholder='Enter filename'
-              type='text'
-              value={customFile.filename}
-            />
+            ? <FormGroup validationState={filenameValid ? null : 'error'}>
+              <FormControl
+                onChange={this._onChangeFilename}
+                placeholder='Enter filename'
+                type='text'
+                value={customFile.filename}
+              />
+              {!filenameValid && (
+                <HelpBlock>
+                  Filename must be set when providing raw input!
+                </HelpBlock>
+              )}
+            </FormGroup>
             : <span>
               Filename:{' '}
               <span style={{fontFamily: 'monospace'}}>
-                {/* FIXME: what should the behavior be here if missing */}
-                {customFile.filename || '[defaults to URI]'}
+                {fileSource === 'raw'
+                  ? customFile.filename
+                  : customFile.filename || '[defaults to filename at end of URI]'}
               </span>
             </span>
           }
         </div>
-        <Checkbox
-          checked={customFile.useDuringBuild}
-          disabled={!isEditing}
-          onChange={this._onChangeBuildUse}
-        >
-          Use during graph build
-        </Checkbox>
-        <Checkbox
-          checked={customFile.useDuringServe}
-          disabled={!isEditing}
-          onChange={this._onChangeServeUse}
-        >
-          Use while running server
-        </Checkbox>
-        <FormGroup validationState={isValid ? null : 'error'}>
+        <FormGroup validationState={hasSomeUsage ? null : 'error'}>
+          <Checkbox
+            checked={customFile.useDuringBuild}
+            disabled={!isEditing}
+            onChange={this._onChangeBuildUse}
+          >
+            Use during graph build
+          </Checkbox>
+          <Checkbox
+            checked={customFile.useDuringServe}
+            disabled={!isEditing}
+            onChange={this._onChangeServeUse}
+          >
+            Use while running server
+          </Checkbox>
+          {!hasSomeUsage && (
+            <HelpBlock>
+              File must be used during either graph build or running the server (or both)!
+            </HelpBlock>
+          )}
+        </FormGroup>
+        <FormGroup validationState={hasContents ? null : 'error'}>
           <ControlLabel>File source</ControlLabel>
           <FormControl
             componentClass='select'
@@ -224,7 +267,7 @@ export default class CustomFileEditor extends Component<Props, {
             <option value='raw'>From raw input</option>
             <option value='uri'>Download from URI</option>
           </FormControl>
-          {!isValid && <HelpBlock>Please set contents or uri!</HelpBlock>}
+          {!hasContents && <HelpBlock>Please set contents or uri!</HelpBlock>}
           {fileSource === 'raw' && (
             <FormControl
               componentClass='textarea'

From b4f31e4035dbb1600d06a8a0ad742c57ab97c7bc Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 23 Feb 2021 16:37:59 -0500
Subject: [PATCH 102/553] ci: override e2e = true

---
 scripts/check-if-e2e-should-run-on-ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/check-if-e2e-should-run-on-ci.sh b/scripts/check-if-e2e-should-run-on-ci.sh
index 51eeb7d09..83e14d0e3 100755
--- a/scripts/check-if-e2e-should-run-on-ci.sh
+++ b/scripts/check-if-e2e-should-run-on-ci.sh
@@ -16,6 +16,6 @@ if [[ "$SHOULD_RUN_E2E" != "true" ]]; then
 fi
 
 # FIXME: Re-enable e2e for conditions above.
-OVERRIDE=false
+OVERRIDE=true
 echo "SHOULD_RUN_E2E=${OVERRIDE}" >> $GITHUB_ENV && export SHOULD_RUN_E2E=${OVERRIDE}
 echo "Overriding E2E. Temporarily forcing to be ${OVERRIDE}..."

From bbc99157a69e13251150dcbf8179f160234979f2 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 24 Feb 2021 08:29:23 -0500
Subject: [PATCH 103/553] ci: change e2e travis env variables to github

---
 __tests__/test-utils/setup-e2e.js    |  4 ++--
 __tests__/test-utils/teardown-e2e.js | 14 +++++++++-----
 __tests__/test-utils/utils.js        |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index e64107e2b..51552bd60 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -52,7 +52,7 @@ async function startBackendServer () {
   }
 
   const serverFolder = path.join(
-    process.env.TRAVIS_BUILD_DIR,
+    process.env.GITHUB_WORKSPACE,
     '..',
     'datatools-server'
   )
@@ -200,7 +200,7 @@ async function startClientServer () {
 
   // set the working directories for datatools-ui
   const datatoolsUiDir = path.join(
-    process.env.TRAVIS_BUILD_DIR,
+    process.env.GITHUB_WORKSPACE,
     '..',
     'datatools-ui'
   )
diff --git a/__tests__/test-utils/teardown-e2e.js b/__tests__/test-utils/teardown-e2e.js
index 51e0c1f7a..e13937c61 100644
--- a/__tests__/test-utils/teardown-e2e.js
+++ b/__tests__/test-utils/teardown-e2e.js
@@ -19,10 +19,10 @@ const {
 const slackConfigured = process.env.SLACK_TOKEN && process.env.SLACK_CHANNEL
 const msTeamsConfigured = process.env.MS_TEAMS_WEBHOOK_URL
 const logsZipfile = 'logs.zip'
-const repo = process.env.TRAVIS_BUILD_DIR
-  ? process.env.TRAVIS_BUILD_DIR.split(path.sep).pop()
+const repo = process.env.GITHUB_WORKSPACE
+  ? process.env.GITHUB_WORKSPACE.split(path.sep).pop()
   : ''
-const buildNum = process.env.TRAVIS_BUILD_NUMBER
+const buildNum = process.env.GITHUB_RUN_ID
 const uploadedLogsFilename = `${repo}-build-${buildNum}-e2e-logs.zip`
 const {LOGS_S3_BUCKET} = process.env
 
@@ -115,6 +115,10 @@ function shutdownOtp () {
   return killDetachedProcess('otp')
 }
 
+function getBuildUrl () {
+  return `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`
+}
+
 function makeUploadFailureHandler (handlerErrorMsg) {
   return (err) => {
     console.error(handlerErrorMsg)
@@ -160,7 +164,7 @@ async function uploadToMicrosoftTeams () {
     targets: [
       {
         os: 'default',
-        uri: process.env.TRAVIS_BUILD_WEB_URL
+        uri: getBuildUrl()
       }
     ]
   }]
@@ -228,7 +232,7 @@ async function uploadToSlack () {
       file: fs.createReadStream(logsZipfile),
       filename: uploadedLogsFilename,
       filetype: 'zip',
-      initial_comment: `View build logs here: ${process.env.TRAVIS_BUILD_WEB_URL}`
+      initial_comment: `View build logs here: ${getBuildUrl()}`
     })
   } catch (e) {
     console.error('failed to upload logs to slack!')
diff --git a/__tests__/test-utils/utils.js b/__tests__/test-utils/utils.js
index cbea341c4..e7ca9774f 100644
--- a/__tests__/test-utils/utils.js
+++ b/__tests__/test-utils/utils.js
@@ -8,7 +8,7 @@ const request = require('request')
 
 const collectingCoverage = process.env.COLLECT_COVERAGE
 const isCi = !!process.env.CI
-const isUiRepo = process.env.TRAVIS_REPO_SLUG === 'ibi-group/datatools-ui'
+const isUiRepo = process.env.GITHUB_REPOSITORY === 'ibi-group/datatools-ui'
 const testFolderPath = 'e2e-test-results'
 
 /**

From 6f2cbae7c59fbbe27db168ffed1b58c00484a801 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 24 Feb 2021 08:43:25 -0500
Subject: [PATCH 104/553] ci: fix remaining github env variables

---
 __tests__/test-utils/setup-e2e.js    | 4 ++--
 __tests__/test-utils/teardown-e2e.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index 51552bd60..518d871b5 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -47,7 +47,7 @@ async function startBackendServer () {
       'TRANSITFEEDS_KEY'
     ])
   } catch (e) {
-    console.error(`At least one required env var is missin: ${e}`)
+    console.error(`At least one required env var is missing: ${e}`)
     throw e
   }
 
@@ -194,7 +194,7 @@ async function startClientServer () {
       'TRANSITFEEDS_KEY'
     ])
   } catch (e) {
-    console.error(`At least one required env var is missin: ${e}`)
+    console.error(`At least one required env var is missing: ${e}`)
     throw e
   }
 
diff --git a/__tests__/test-utils/teardown-e2e.js b/__tests__/test-utils/teardown-e2e.js
index e13937c61..f5f2f1871 100644
--- a/__tests__/test-utils/teardown-e2e.js
+++ b/__tests__/test-utils/teardown-e2e.js
@@ -183,7 +183,7 @@ async function uploadToMicrosoftTeams () {
   }
 
   let fetchResponse
-  const commit = process.env.TRAVIS_COMMIT
+  const commit = process.env.GITHUB_SHA
   const baseRepoUrl = `https://github.com/ibi-group/datatools-${isUiRepo ? 'ui' : 'server'}`
   const commitUrl = `${baseRepoUrl}/commit/${commit}`
   try {
@@ -196,7 +196,7 @@ async function uploadToMicrosoftTeams () {
           '@type': 'MessageCard',
           themeColor: '0072C6',
           title: `${repo} e2e test ${testResults.success ? 'passed. ✅' : 'failed. ❌'}`,
-          text: `📁 **branch:** ${process.env.TRAVIS_BRANCH}\n
+          text: `📁 **branch:** ${process.env.GITHUB_REF_SLUG}\n
 📄 **commit:** [${commit.slice(0, 6)}](${commitUrl})\n
 📊 **result:** ${testResults.numPassedTests} / ${testResults.numTotalTests} tests passed\n
 `,

From eb648f905b88cf6aef53aeea46895b19f3cad901 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 2 Mar 2021 10:58:35 -0500
Subject: [PATCH 105/553] fix(manager/actions/status): Navigate to latest feed
 ver. after processing complete.

---
 lib/manager/actions/status.js   | 12 ++++++++++++
 lib/manager/actions/versions.js |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index e53eec23e..87fe75a45 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -1,6 +1,7 @@
 // @flow
 
 import moment from 'moment'
+import { browserHistory } from 'react-router'
 import { createAction, type ActionType } from 'redux-actions'
 
 import { createVoidPayloadAction, secureFetch } from '../../common/actions'
@@ -259,6 +260,17 @@ export function handleFinishedJob (job: ServerJob) {
           }
         }
         break
+      case 'PROCESS_FEED':
+        // If viewing a particular feed, navigate to a new feed version as soon as it becomes available.
+        // It is the same path (without version number) as the link shown for this job status.
+        // (If user is not looking at this feed, don't navigate away from their current page.)
+        if (job.feedSourceId) {
+          const newVersionPath = `/feed/${job.feedSourceId}`
+          if (browserHistory.getCurrentLocation().pathname.startsWith(newVersionPath)) {
+            browserHistory.push(newVersionPath)
+          }
+        }
+        break
       default:
         console.warn(`No completion step defined for job type ${job.type}`)
         break
diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index ccfe12835..ad29d8ac1 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -162,7 +162,7 @@ export function publishFeedVersion (feedVersion: FeedVersion) {
 }
 
 /**
- * Merges two feed versions according to the strategy defined within the
+ * Merges two feed versions according to the strategy defined by the mergeType parameter.
  */
 export function mergeVersions (targetVersionId: string, versionId: string, mergeType: 'SERVICE_PERIOD' | 'REGIONAL') {
   return function (dispatch: dispatchFn, getState: getStateFn) {

From d3b6ed1f5e72c4168c6f4b3a19b87d703dfed7e4 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 2 Mar 2021 12:49:42 -0500
Subject: [PATCH 106/553] refactor(VersionComparisonDropdown): Add option to
 exit comparison mode.

---
 .../version/VersionComparisonDropdown.js          | 15 ++++++++++-----
 .../components/version/VersionSelectorDropdown.js |  7 +++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
index 2fbba97e3..6dafb3216 100644
--- a/lib/manager/components/version/VersionComparisonDropdown.js
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -59,6 +59,15 @@ class VersionComparisonDropdown extends Component<Props> {
           id: 'prevVersionSelector',
           onSelect: this._onSelectComparedVersion
         }}
+        extraOptions={comparedFeedVersion
+          ? [
+            {
+              onClick: null,
+              text: 'Exit compare mode'
+            }
+          ]
+          : null
+        }
         header={versions.length < 2
           ? 'Load another version to enable comparison'
           : 'Select a version to compare with'
@@ -76,12 +85,8 @@ const mapStateToProps = (state: AppState, ownProps: {}) => {
   return {}
 }
 
-const {
-  setComparedVersionIndex
-} = versionsActions
-
 const mapDispatchToProps = {
-  setComparedVersionIndex
+  setComparedVersionIndex: versionsActions.setComparedVersionIndex
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(VersionComparisonDropdown)
diff --git a/lib/manager/components/version/VersionSelectorDropdown.js b/lib/manager/components/version/VersionSelectorDropdown.js
index 5de272237..6e1d5328a 100644
--- a/lib/manager/components/version/VersionSelectorDropdown.js
+++ b/lib/manager/components/version/VersionSelectorDropdown.js
@@ -10,6 +10,7 @@ import type { FeedVersion } from '../../../types'
 
 type Props = {
   dropdownProps: any,
+  extraOptions: ?Array<any>,
   header?: string,
   itemFormatter: (FeedVersion, ?FeedVersion) => React.Node,
   title: React.Node,
@@ -40,6 +41,7 @@ export const DefaultItemFormatter = (version: FeedVersion, activeVersion: ?FeedV
 export default function VersionSelectorDropdown (props: Props) {
   const {
     dropdownProps,
+    extraOptions,
     header,
     itemFormatter,
     title,
@@ -61,6 +63,11 @@ export default function VersionSelectorDropdown (props: Props) {
         {versionsSorted.length > 0
           ? versionsSorted.map((v, i) => itemFormatter(v, version))
           : <MenuItem disabled>No versions available</MenuItem>}
+        
+        {extraOptions && <MenuItem divider />}
+        {extraOptions && extraOptions.map((option, i) => (
+          <MenuItem key={i} onClick={option.onClick}>{option.text}</MenuItem>
+        ))}
       </Dropdown.Menu>
     </Dropdown>
   )

From 87c91df27478e860e58a6a01c93003ed1fa59ca3 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 2 Mar 2021 15:32:47 -0500
Subject: [PATCH 107/553] refactor(FeedVersionDetails): Display date validity
 chart for non-comparing mode.

---
 .../components/version/FeedVersionDetails.js  | 41 ++++++++++-------
 .../version/FeedVersionSpanChart.js           | 44 +++++++++++++++++++
 .../version/VersionSelectorDropdown.js        |  2 +-
 3 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index 17eee46d3..5f7b22abf 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -15,7 +15,7 @@ import bboxPoly from 'turf-bbox-polygon'
 import * as versionsActions from '../../actions/versions'
 import {getConfigProperty, isExtensionEnabled} from '../../../common/util/config'
 import {BLOCKING_ERROR_TYPES} from '../../util/version'
-import FeedVersionSpanChart from './FeedVersionSpanChart'
+import FeedVersionSpanChart, { FeedVersionSpanChartInner } from './FeedVersionSpanChart'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
 import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
@@ -114,8 +114,8 @@ export default class FeedVersionDetails extends Component<Props> {
       : 'Merge with version'
     return (
       <ListGroupItem>
-        <h4>
-          <ButtonToolbar className='pull-right' style={{marginTop: '-7px'}}>
+        <div className='pull-right' style={{marginTop: '2px' }}>
+          <ButtonToolbar className='pull-right'>
             {/*
             Only show merge feeds button if the feed starts in the future.
             FIXME: uncomment out the below to prevent merges with non-future feeds.
@@ -158,10 +158,6 @@ export default class FeedVersionDetails extends Component<Props> {
               </Button>
             }
           </ButtonToolbar>
-          <span data-test-id='feed-version-validity'>
-            <Icon type='calendar' />{' '}
-            Feed validity dates
-          </span>
           {(hasBlockingIssue || hasGtfsPlusBlockingIssue) &&
             isExtensionEnabled('mtc') &&
             <div
@@ -181,17 +177,32 @@ export default class FeedVersionDetails extends Component<Props> {
               </Link>.)
             </div>
           }
+        </div>
+
+        <h4 style={{ marginBottom: '2px' }}>
+          <span data-test-id='feed-version-validity'>
+            <Icon type='calendar' />{' '}
+            Feed validity dates
+          </span>
         </h4>
 
-        {comparedVersion && comparedVersionIndex && (
-          <FeedVersionSpanChart
-            activeVersion={version}
-            comparedVersion={comparedVersion}
-            style={{clear: 'right'}}
-          />
-        )}
+        {(comparedVersion && comparedVersionIndex)
+          ? (
+            <FeedVersionSpanChart
+              activeVersion={version}
+              comparedVersion={comparedVersion}
+              style={{float: 'left'}}
+            />
+          )
+          : (
+            <FeedVersionSpanChartInner
+              activeVersion={version}
+              style={{float: 'left'}}
+            />
+          ) 
+        }
 
-        <p>
+        <p style={{clear: 'both'}}>
           {summary && summary.avgDailyRevenueTime
             ? <span>
               <Icon type='clock-o' />
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index aa5b4b6e9..70d46d402 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -12,6 +12,11 @@ type Props = {
   comparedVersion: FeedVersion,
   style: any
 }
+type ActiveOnlyProps = {
+  activeVersion: FeedVersion,
+  style: any
+}
+
 
 const DATE_FORMAT = 'MMM. D, YYYY'
 const TODAY_DATE_FORMAT = 'MMM. D'
@@ -110,6 +115,45 @@ export default class FeedVersionSpanChart extends Component<Props> {
   }
 }
 
+/**
+ * This component renders bars representing the date ranges for which the given feed versions
+ * are valid (e.g., Jan 1 - March 27) and lets the user visualize overlaps or gaps in the validity periods
+ * of the active and compared feed versions.
+ */
+export class FeedVersionSpanChartInner extends Component<ActiveOnlyProps> {
+  render () {
+    const { activeVersion } = this.props
+    // Construct moment objects for the active/compared version start/end dates.
+    const firstDate = moment(activeVersion.validationSummary.startDate)
+    const lastDate = moment(activeVersion.validationSummary.endDate)
+
+    // Render the today marker if it is between first and last date.
+    const today = moment()
+    const totalDays = lastDate.diff(firstDate, 'days')
+    const todayOffset = today.diff(firstDate, 'days')
+    const showToday = todayOffset >= 0 && todayOffset < totalDays
+
+    const activeChartProps = {
+      firstDate,
+      lastDate,
+      top: 0,
+      versionEndDate: lastDate,
+      versionLabel: <VersionDateLabel version={activeVersion} />,
+      versionStartDate: firstDate
+    }
+
+    return (
+      <div style={{ paddingBottom: '20px', position: 'relative', width: '450px' }}>
+        <FeedStartLabel {...activeChartProps} />
+        <FeedEndLabel {...activeChartProps} />
+        <FeedSpan {...activeChartProps} isServiceGap={false} />
+        {showToday && <TodayMarker firstDate={firstDate} lastDate={lastDate} />}
+      </div>
+    )
+  }
+}
+
+
 /** Renders the validity span of one feed using the given props. */
 const FeedSpan = ({
   firstDate,
diff --git a/lib/manager/components/version/VersionSelectorDropdown.js b/lib/manager/components/version/VersionSelectorDropdown.js
index 6e1d5328a..dacbd1796 100644
--- a/lib/manager/components/version/VersionSelectorDropdown.js
+++ b/lib/manager/components/version/VersionSelectorDropdown.js
@@ -10,7 +10,7 @@ import type { FeedVersion } from '../../../types'
 
 type Props = {
   dropdownProps: any,
-  extraOptions: ?Array<any>,
+  extraOptions?: ?Array<any>,
   header?: string,
   itemFormatter: (FeedVersion, ?FeedVersion) => React.Node,
   title: React.Node,

From edc1a1191de0a1595dd439ac8fe809d39c66ff76 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 2 Mar 2021 18:35:46 -0500
Subject: [PATCH 108/553] refactor(FeedVersionDetails): Tweak layout

---
 .../components/version/FeedVersionDetails.js  | 151 ++++++++----------
 .../version/FeedVersionSpanChart.js           |  89 +++--------
 2 files changed, 95 insertions(+), 145 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index 5f7b22abf..ec703cd06 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -15,7 +15,7 @@ import bboxPoly from 'turf-bbox-polygon'
 import * as versionsActions from '../../actions/versions'
 import {getConfigProperty, isExtensionEnabled} from '../../../common/util/config'
 import {BLOCKING_ERROR_TYPES} from '../../util/version'
-import FeedVersionSpanChart, { FeedVersionSpanChartInner } from './FeedVersionSpanChart'
+import FeedVersionSpanChart from './FeedVersionSpanChart'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
 import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
@@ -114,94 +114,83 @@ export default class FeedVersionDetails extends Component<Props> {
       : 'Merge with version'
     return (
       <ListGroupItem>
-        <div className='pull-right' style={{marginTop: '2px' }}>
-          <ButtonToolbar className='pull-right'>
-            {/*
-            Only show merge feeds button if the feed starts in the future.
-            FIXME: uncomment out the below to prevent merges with non-future feeds.
-            moment(summary.startDate).isAfter(moment().startOf('day')) &&
-            */}
-            {isExtensionEnabled('mtc') &&
-              <VersionSelectorDropdown
-                dropdownProps={{
-                  id: 'merge-versions-dropdown',
-                  disabled: isMergedServicePeriods,
-                  onSelect: this._handleMergeVersion
-                }}
-                title={<span><Icon type='code-fork' /> {mergeButtonLabel}</span>}
-                itemFormatter={this._mergeItemFormatter}
-                version={version}
-                versions={feedSource.feedVersions}
-              />
-            }
-            {isExtensionEnabled('mtc') &&
-              <Button
-                disabled={
-                  !gtfsPlusValidation ||
-                  hasGtfsPlusBlockingIssue ||
-                  !gtfsPlusValidation.published ||
-                  !version.validationResult ||
-                  !version.validationResult.error_counts ||
-                  hasBlockingIssue ||
-                  isPublished ||
-                  processing ||
-                  !userCanManageFeed
-                }
-                bsStyle={isPublished ? 'success' : 'warning'}
-                onClick={this._onClickPublish}>
-                {isPublished
-                  ? <span><Icon type='check-circle' /> Published</span>
-                  : processing
-                    ? <span>Processing...</span>
-                    : <span>Publish to MTC</span>
-                }
-              </Button>
-            }
-          </ButtonToolbar>
-          {(hasBlockingIssue || hasGtfsPlusBlockingIssue) &&
-            isExtensionEnabled('mtc') &&
-            <div
-              className='pull-right text-danger'
-              style={{
-                clear: 'right',
-                fontSize: 'x-small',
-                marginLeft: '15px'
-              }}>
-              Cannot publish version because it has a{' '}
-              {hasGtfsPlusBlockingIssue ? 'GTFS+ ' : ''}
-              blocking issue.
-              (See{' '}
-              <Link
-                to={`/feed/${feedSource.id}/version/${version.version}/${hasGtfsPlusBlockingIssue ? 'gtfsplus' : 'issues'}`}>
-                {hasGtfsPlusBlockingIssue ? 'GTFS+' : 'validation'} issues
-              </Link>.)
-            </div>
-          }
-        </div>
-
-        <h4 style={{ marginBottom: '2px' }}>
+        <h4 className='pull-left' style={{ marginBottom: '2px' }}>
           <span data-test-id='feed-version-validity'>
             <Icon type='calendar' />{' '}
             Feed validity dates
           </span>
         </h4>
-
-        {(comparedVersion && comparedVersionIndex)
-          ? (
-            <FeedVersionSpanChart
-              activeVersion={version}
-              comparedVersion={comparedVersion}
-              style={{float: 'left'}}
-            />
-          )
-          : (
-            <FeedVersionSpanChartInner
-              activeVersion={version}
-              style={{float: 'left'}}
+        <ButtonToolbar className='pull-right' style={{ marginTop: '2px' }}>
+          {/*
+          Only show merge feeds button if the feed starts in the future.
+          FIXME: uncomment out the below to prevent merges with non-future feeds.
+          moment(summary.startDate).isAfter(moment().startOf('day')) &&
+          */}
+          {isExtensionEnabled('mtc') &&
+            <VersionSelectorDropdown
+              dropdownProps={{
+                id: 'merge-versions-dropdown',
+                disabled: isMergedServicePeriods,
+                onSelect: this._handleMergeVersion
+              }}
+              title={<span><Icon type='code-fork' /> {mergeButtonLabel}</span>}
+              itemFormatter={this._mergeItemFormatter}
+              version={version}
+              versions={feedSource.feedVersions}
             />
-          ) 
+          }
+          {isExtensionEnabled('mtc') &&
+            <Button
+              disabled={
+                !gtfsPlusValidation ||
+                hasGtfsPlusBlockingIssue ||
+                !gtfsPlusValidation.published ||
+                !version.validationResult ||
+                !version.validationResult.error_counts ||
+                hasBlockingIssue ||
+                isPublished ||
+                processing ||
+                !userCanManageFeed
+              }
+              bsStyle={isPublished ? 'success' : 'warning'}
+              onClick={this._onClickPublish}>
+              {isPublished
+                ? <span><Icon type='check-circle' /> Published</span>
+                : processing
+                  ? <span>Processing...</span>
+                  : <span>Publish to MTC</span>
+              }
+            </Button>
+          }
+        </ButtonToolbar>
+        {(hasBlockingIssue || hasGtfsPlusBlockingIssue) &&
+          isExtensionEnabled('mtc') &&
+          <div
+            className='pull-right text-danger'
+            style={{
+              clear: 'right',
+              fontSize: 'x-small',
+              marginLeft: '5px',
+              textAlign: 'right',
+              width: '180px'
+            }}>
+            Cannot publish version because it has a{' '}
+            {hasGtfsPlusBlockingIssue ? 'GTFS+ ' : ''}
+            blocking issue.
+            (See{' '}
+            <Link
+              to={`/feed/${feedSource.id}/version/${version.version}/${hasGtfsPlusBlockingIssue ? 'gtfsplus' : 'issues'}`}>
+              {hasGtfsPlusBlockingIssue ? 'GTFS+' : 'validation'} issues
+            </Link>.)
+          </div>
         }
 
+        <FeedVersionSpanChart
+          activeVersion={version}
+          comparedVersion={comparedVersion}
+          style={{float: 'left', clear: 'left'}}
+        />
+
         <p style={{clear: 'both'}}>
           {summary && summary.avgDailyRevenueTime
             ? <span>
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 70d46d402..5eb4e4f00 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -9,15 +9,10 @@ import type { FeedVersion } from '../../../types'
 
 type Props = {
   activeVersion: FeedVersion,
-  comparedVersion: FeedVersion,
-  style: any
-}
-type ActiveOnlyProps = {
-  activeVersion: FeedVersion,
+  comparedVersion?: ?FeedVersion,
   style: any
 }
 
-
 const DATE_FORMAT = 'MMM. D, YYYY'
 const TODAY_DATE_FORMAT = 'MMM. D'
 
@@ -40,7 +35,9 @@ const TODAY_MARKER_ZINDEX = 9998
  */
 export default class FeedVersionSpanChart extends Component<Props> {
   render () {
-    const { activeVersion, comparedVersion, style } = this.props
+    const { activeVersion, comparedVersion: comparedVersionProp, style } = this.props
+    const comparedVersion = comparedVersionProp ? comparedVersionProp : activeVersion
+
     // Construct moment objects for the active/compared version start/end dates.
     const activeStartDate = moment(activeVersion.validationSummary.startDate)
     const activeEndDate = moment(activeVersion.validationSummary.endDate)
@@ -86,17 +83,24 @@ export default class FeedVersionSpanChart extends Component<Props> {
 
     return (
       <div style={{ ...style, display: 'flex' }}>
-        <div>
-          <div style={versionProps}>Version {activeVersion.version} (selected)</div>
-          {hasGap &&
-            <div className='text-danger' style={{ height: HEIGHT_PROP }}>Gap in service</div>}
-          <div style={versionProps}>Version {comparedVersion.version}</div>
-        </div>
-        <div style={{ width: '450px', position: 'relative' }}>
+        {comparedVersionProp && (
+          <div>
+            <div style={versionProps}>Version {activeVersion.version} (selected)</div>
+            {hasGap &&
+              <div className='text-danger' style={{ height: HEIGHT_PROP }}>Gap in service</div>}
+            <div style={versionProps}>Version {comparedVersion.version}</div>
+          </div>
+        )}
+        <div style={{ minHeight: HEIGHT_PROP, position: 'relative', width: '400px' }}>
+          {/* Components below are all rendered as direct children of this div to accommodate
+              drawing the "today" line marker above the FeedSpan, while keeping it
+              under the FeedStartLabel and FeedEndLabel contents.
+              FIXME[React 16+]: Extract FeedStartLabel, FeedEndLabel, FeedSpan into <>...</> markup.
+            */}
           <FeedStartLabel {...activeChartProps} />
           <FeedEndLabel {...activeChartProps} />
           <FeedSpan {...activeChartProps} isServiceGap={false} />
-          {hasGap &&
+          {comparedVersionProp && hasGap &&
             <FeedSpan
               firstDate={firstDate}
               isServiceGap
@@ -105,9 +109,9 @@ export default class FeedVersionSpanChart extends Component<Props> {
               versionStartDate={earliestEnd}
               versionEndDate={latestStart}
             />}
-          <FeedStartLabel {...comparedChartProps} />
-          <FeedEndLabel {...comparedChartProps} />
-          <FeedSpan {...comparedChartProps} isServiceGap={false} />
+          {comparedVersionProp && <FeedStartLabel {...comparedChartProps} />}
+          {comparedVersionProp && <FeedEndLabel {...comparedChartProps} />}
+          {comparedVersionProp && <FeedSpan {...comparedChartProps} isServiceGap={false} />}
           {showToday && <TodayMarker firstDate={firstDate} lastDate={lastDate} />}
         </div>
       </div>
@@ -115,45 +119,6 @@ export default class FeedVersionSpanChart extends Component<Props> {
   }
 }
 
-/**
- * This component renders bars representing the date ranges for which the given feed versions
- * are valid (e.g., Jan 1 - March 27) and lets the user visualize overlaps or gaps in the validity periods
- * of the active and compared feed versions.
- */
-export class FeedVersionSpanChartInner extends Component<ActiveOnlyProps> {
-  render () {
-    const { activeVersion } = this.props
-    // Construct moment objects for the active/compared version start/end dates.
-    const firstDate = moment(activeVersion.validationSummary.startDate)
-    const lastDate = moment(activeVersion.validationSummary.endDate)
-
-    // Render the today marker if it is between first and last date.
-    const today = moment()
-    const totalDays = lastDate.diff(firstDate, 'days')
-    const todayOffset = today.diff(firstDate, 'days')
-    const showToday = todayOffset >= 0 && todayOffset < totalDays
-
-    const activeChartProps = {
-      firstDate,
-      lastDate,
-      top: 0,
-      versionEndDate: lastDate,
-      versionLabel: <VersionDateLabel version={activeVersion} />,
-      versionStartDate: firstDate
-    }
-
-    return (
-      <div style={{ paddingBottom: '20px', position: 'relative', width: '450px' }}>
-        <FeedStartLabel {...activeChartProps} />
-        <FeedEndLabel {...activeChartProps} />
-        <FeedSpan {...activeChartProps} isServiceGap={false} />
-        {showToday && <TodayMarker firstDate={firstDate} lastDate={lastDate} />}
-      </div>
-    )
-  }
-}
-
-
 /** Renders the validity span of one feed using the given props. */
 const FeedSpan = ({
   firstDate,
@@ -216,7 +181,6 @@ const FeedStartLabel = ({
     <span
       style={{
         left: `${relativeOffset * BAR_WIDTH_PX}px`,
-        height: HEIGHT_PROP,
         position: 'absolute',
         textAlign: 'right',
         top,
@@ -249,11 +213,8 @@ const FeedEndLabel = ({
   return (
     <span
       style={{
-        height: HEIGHT_PROP,
         left: `${relativeOffset * BAR_WIDTH_PX + SPAN_MARGIN_PX + DATE_WIDTH_PX + relativeLength * BAR_WIDTH_PX + SPAN_MARGIN_PX}px`,
-        overflow: 'hidden',
         position: 'absolute',
-        textOverflow: 'ellipsis',
         top,
         whiteSpace: 'nowrap',
         zIndex: DATE_LABEL_ZINDEX
@@ -285,9 +246,9 @@ const TodayMarker = ({
       placement='top'>
       <div
         style={{
-          backgroundColor: 'yellow',
-          border: '1px solid #bbb',
-          bottom: 0,
+          backgroundColor: '#f0d000',
+          border: '1px solid #c09000',
+          bottom: '-3px',
           left: `${DATE_WIDTH_PX + todayOffset / totalDays * BAR_WIDTH_PX}px`,
           position: 'absolute',
           top: 0,

From 52d2582e7974311729cbcf803cdac07529ca8317 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 2 Mar 2021 18:36:25 -0500
Subject: [PATCH 109/553] refactor(gtfs/reducers): Do not activate compare view
 by default.

---
 lib/gtfs/reducers/filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gtfs/reducers/filter.js b/lib/gtfs/reducers/filter.js
index ea56269ee..7d6a89952 100644
--- a/lib/gtfs/reducers/filter.js
+++ b/lib/gtfs/reducers/filter.js
@@ -51,7 +51,7 @@ const gtfsFilter = (state: FilterState = defaultState, action: Action): FilterSt
       })
     case 'SET_ACTIVE_FEEDVERSION':
       return update(state, {
-        comparedVersion: {$set: action.payload ? action.payload.previousVersionId : null},
+        comparedVersion: {$set: null},
         showAllRoutesOnMap: {$set: false},
         patternFilter: {$set: null},
         routeFilter: {$set: null},

From ae230d68aa4b3b1b97d137f9ba63f5a036996e8f Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 3 Mar 2021 09:48:02 -0500
Subject: [PATCH 110/553] refactor(manager/actions/feeds): Tweak redirect and
 move to fetchFeedSource.

---
 lib/manager/actions/feeds.js  |  8 ++++++++
 lib/manager/actions/status.js | 11 -----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/manager/actions/feeds.js b/lib/manager/actions/feeds.js
index db0b401de..375850c86 100644
--- a/lib/manager/actions/feeds.js
+++ b/lib/manager/actions/feeds.js
@@ -141,6 +141,14 @@ export function fetchFeedSource (feedSourceId: string) {
         dispatch(fetchRelatedTables(feedSource))
         return feedSource
       })
+      .then(() => {
+        // If viewing a particular feed, navigate to a new feed version as soon as it becomes available.
+        // (If user is not looking at this feed, don't navigate away from their current page.)
+        const newVersionPath = `/feed/${feedSourceId}`
+        if (browserHistory.getCurrentLocation().pathname.startsWith(`${newVersionPath}/version/`)) {
+          browserHistory.push(newVersionPath)
+        }
+      })
   }
 }
 
diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index 87fe75a45..8a37bb610 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -260,17 +260,6 @@ export function handleFinishedJob (job: ServerJob) {
           }
         }
         break
-      case 'PROCESS_FEED':
-        // If viewing a particular feed, navigate to a new feed version as soon as it becomes available.
-        // It is the same path (without version number) as the link shown for this job status.
-        // (If user is not looking at this feed, don't navigate away from their current page.)
-        if (job.feedSourceId) {
-          const newVersionPath = `/feed/${job.feedSourceId}`
-          if (browserHistory.getCurrentLocation().pathname.startsWith(newVersionPath)) {
-            browserHistory.push(newVersionPath)
-          }
-        }
-        break
       default:
         console.warn(`No completion step defined for job type ${job.type}`)
         break

From 00e5d75c37bc987ec5abefee1ee6a638421a0589 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 3 Mar 2021 11:29:10 -0500
Subject: [PATCH 111/553] Revert "refactor(manager/actions/feeds): Tweak
 redirect and move to fetchFeedSource."

This reverts commit ae230d68aa4b3b1b97d137f9ba63f5a036996e8f.
---
 lib/manager/actions/feeds.js  |  8 --------
 lib/manager/actions/status.js | 11 +++++++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/manager/actions/feeds.js b/lib/manager/actions/feeds.js
index 375850c86..db0b401de 100644
--- a/lib/manager/actions/feeds.js
+++ b/lib/manager/actions/feeds.js
@@ -141,14 +141,6 @@ export function fetchFeedSource (feedSourceId: string) {
         dispatch(fetchRelatedTables(feedSource))
         return feedSource
       })
-      .then(() => {
-        // If viewing a particular feed, navigate to a new feed version as soon as it becomes available.
-        // (If user is not looking at this feed, don't navigate away from their current page.)
-        const newVersionPath = `/feed/${feedSourceId}`
-        if (browserHistory.getCurrentLocation().pathname.startsWith(`${newVersionPath}/version/`)) {
-          browserHistory.push(newVersionPath)
-        }
-      })
   }
 }
 
diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index 8a37bb610..87fe75a45 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -260,6 +260,17 @@ export function handleFinishedJob (job: ServerJob) {
           }
         }
         break
+      case 'PROCESS_FEED':
+        // If viewing a particular feed, navigate to a new feed version as soon as it becomes available.
+        // It is the same path (without version number) as the link shown for this job status.
+        // (If user is not looking at this feed, don't navigate away from their current page.)
+        if (job.feedSourceId) {
+          const newVersionPath = `/feed/${job.feedSourceId}`
+          if (browserHistory.getCurrentLocation().pathname.startsWith(newVersionPath)) {
+            browserHistory.push(newVersionPath)
+          }
+        }
+        break
       default:
         console.warn(`No completion step defined for job type ${job.type}`)
         break

From e523505e7713ae582879443a8c57a0bafd70cf00 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 3 Mar 2021 11:44:54 -0500
Subject: [PATCH 112/553] refactor(manager/actions/status): Move redirect to
 under VALIDATE_FEED.

---
 lib/manager/actions/status.js | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index 87fe75a45..f51ae531b 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -12,7 +12,7 @@ import { fetchFeedSource } from './feeds'
 import { fetchProjectWithFeeds } from './projects'
 import { downloadSnapshotViaCredentials } from '../../editor/actions/snapshots'
 
-import type {DataToolsConfig, MergeFeedsResult, ServerJob} from '../../types'
+import type {DataToolsConfig, Feed, MergeFeedsResult, ServerJob} from '../../types'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
 
 type ErrorMessage = {
@@ -191,6 +191,15 @@ export function handleFinishedJob (job: ServerJob) {
           return
         }
         dispatch(fetchFeedSource(job.feedSourceId))
+          .then((feedSource: Feed) => {
+            // If viewing a particular feed, navigate to a new feed version as soon as it becomes available.
+            // (If user is not looking at this feed, don't navigate away from their current page.)
+            const newVersionPath = `/feed/${feedSource.id}`
+            if (browserHistory.getCurrentLocation().pathname.startsWith(`${newVersionPath}/version/`)) {
+              browserHistory.push(newVersionPath)
+            }
+          })
+
         if (isExtensionEnabled('mtc')) {
           const firstDate = job.validationResult && job.validationResult.firstCalendarDate
           const now = moment().startOf('day')
@@ -260,17 +269,6 @@ export function handleFinishedJob (job: ServerJob) {
           }
         }
         break
-      case 'PROCESS_FEED':
-        // If viewing a particular feed, navigate to a new feed version as soon as it becomes available.
-        // It is the same path (without version number) as the link shown for this job status.
-        // (If user is not looking at this feed, don't navigate away from their current page.)
-        if (job.feedSourceId) {
-          const newVersionPath = `/feed/${job.feedSourceId}`
-          if (browserHistory.getCurrentLocation().pathname.startsWith(newVersionPath)) {
-            browserHistory.push(newVersionPath)
-          }
-        }
-        break
       default:
         console.warn(`No completion step defined for job type ${job.type}`)
         break

From 03695eda1153b68d93751b1f0d27738edc2b41b1 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 8 Mar 2021 17:55:00 -0500
Subject: [PATCH 113/553] refactor: Remove comparedVersionIndex prop.

---
 .../components/version/FeedVersionDetails.js   |  2 --
 .../components/version/FeedVersionNavigator.js |  9 ++++-----
 .../components/version/FeedVersionTabs.js      |  8 +++-----
 .../components/version/FeedVersionViewer.js    | 12 ++++--------
 .../version/VersionComparisonDropdown.js       | 18 +++++++++---------
 .../containers/ActiveFeedVersionNavigator.js   |  6 ++----
 6 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index ec703cd06..3be4d4b21 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -23,7 +23,6 @@ import type {ManagerUserState} from '../../../types/reducers'
 
 type Props = {
   comparedVersion: ?FeedVersion,
-  comparedVersionIndex: ?number,
   feedSource: Feed,
   gtfsPlusValidation: GtfsPlusValidation,
   mergeVersions: typeof versionsActions.mergeVersions,
@@ -84,7 +83,6 @@ export default class FeedVersionDetails extends Component<Props> {
   render () {
     const {
       comparedVersion,
-      comparedVersionIndex,
       feedSource,
       gtfsPlusValidation,
       user,
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 222895874..090c03f87 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -26,7 +26,7 @@ import type {FeedVersion, GtfsPlusValidation, Note} from '../../../types'
 import type {GtfsState, ManagerUserState} from '../../../types/reducers'
 
 type Props = ContainerProps & {
-  comparedVersionIndex: number,
+  comparedVersion?: FeedVersion,
   createDeploymentFromFeedSource: typeof deploymentActions.createDeploymentFromFeedSource,
   deleteFeedVersion: typeof versionsActions.deleteFeedVersion,
   downloadFeedViaToken: typeof versionsActions.downloadFeedViaToken,
@@ -141,7 +141,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
       fontWeight: 'bold'
     }
     const {
-      comparedVersionIndex,
+      comparedVersion,
       deleteDisabled,
       deleteFeedVersion,
       disabled,
@@ -304,7 +304,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                 <ButtonToolbar className='pull-right'>
                   <ButtonGroup>
                     <VersionComparisonDropdown
-                      comparedVersionIndex={comparedVersionIndex}
+                      comparedVersion={comparedVersion}
                       feedSource={feedSource}
                       version={version}
                       versions={feedSource.feedVersions}
@@ -318,8 +318,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
         <Row>
           <Col xs={12}>
             <FeedVersionViewer
-              comparedVersion={sortedVersions[comparedVersionIndex - 1]}
-              comparedVersionIndex={comparedVersionIndex}
+              comparedVersion={comparedVersion}
               deleteDisabled={deleteDisabled}
               deleteFeedVersion={deleteFeedVersion}
               downloadFeedViaToken={downloadFeedViaToken}
diff --git a/lib/manager/components/version/FeedVersionTabs.js b/lib/manager/components/version/FeedVersionTabs.js
index 99305938c..5d1da7a5e 100644
--- a/lib/manager/components/version/FeedVersionTabs.js
+++ b/lib/manager/components/version/FeedVersionTabs.js
@@ -20,8 +20,7 @@ import type {Element} from 'react'
 import type {FeedVersion} from '../../../types'
 
 type Props = {
-  comparedVersion: ?FeedVersion,
-  comparedVersionIndex: ?number,
+  comparedVersion?: FeedVersion,
   feedVersionIndex: number,
   isochroneBand: any,
   onChangeIsochroneBand: number => void,
@@ -73,7 +72,6 @@ export default class FeedVersionTabs extends Component<Props> {
     const {
       // FIXME: prop drilling.
       comparedVersion,
-      comparedVersionIndex,
       feedVersionIndex,
       isochroneBand,
       onChangeIsochroneBand,
@@ -115,7 +113,7 @@ export default class FeedVersionTabs extends Component<Props> {
                   <Col xs={2} className='text-center' key={c}>
                     <span title={`${value}`} style={{ fontSize: '200%' }}>
                       {numeral(value).format('0a')}
-                      {comparedVersion && comparedVersionIndex &&
+                      {comparedVersion &&
                         // Apply a zero-width to superscript so that `value`
                         // above always appears centered.
                         <sup
@@ -126,7 +124,7 @@ export default class FeedVersionTabs extends Component<Props> {
                           }}
                         >
                           <DeltaStat
-                            comparedVersionIndex={comparedVersionIndex}
+                            comparedVersionIndex={comparedVersion.version}
                             diff={diff}
                             style={{fontSize: '50%', padding: '0 0.2em 0.1em'}}
                             type={c} />
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 6584931e2..3921edfc1 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -33,8 +33,7 @@ import type {Feed, FeedVersion, GtfsPlusValidation, Note, Project} from '../../.
 import type {GtfsState, ManagerUserState} from '../../../types/reducers'
 
 export type Props = {
-  comparedVersion: ?FeedVersion,
-  comparedVersionIndex: ?number,
+  comparedVersion?: FeedVersion,
   deleteDisabled: ?boolean,
   deleteFeedVersion: typeof versionsActions.deleteFeedVersion,
   downloadFeedViaToken: typeof versionsActions.downloadFeedViaToken,
@@ -70,7 +69,6 @@ export default class FeedVersionViewer extends Component<Props> {
   render () {
     const {
       comparedVersion,
-      comparedVersionIndex,
       feedSource,
       feedVersionIndex,
       listView,
@@ -110,7 +108,6 @@ export default class FeedVersionViewer extends Component<Props> {
           <VersionSectionSelector
             version={version}
             comparedVersion={comparedVersion}
-            comparedVersionIndex={comparedVersionIndex}
             gtfsPlusValidation={this.props.gtfsPlusValidation}
             feedVersionIndex={feedVersionIndex}
             versionSection={versionSection} />
@@ -146,7 +143,6 @@ export default class FeedVersionViewer extends Component<Props> {
 
 type SelectorProps = {
   comparedVersion: ?FeedVersion,
-  comparedVersionIndex: ?number,
   feedVersionIndex: number,
   gtfsPlusValidation: GtfsPlusValidation,
   version: FeedVersion,
@@ -155,7 +151,7 @@ type SelectorProps = {
 
 class VersionSectionSelector extends Component<SelectorProps> {
   _renderIssuesLabel = () => {
-    const { version, comparedVersion, comparedVersionIndex } = this.props
+    const { version, comparedVersion } = this.props
     const { validationResult, validationSummary, feedLoadResult } = version
 
     const tableFatalExceptions = getTableFatalExceptions(version)
@@ -180,11 +176,11 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : validationSummary.errorCount
 
     let diffLabel
-    if (comparedVersion && comparedVersionIndex) {
+    if (comparedVersion) {
       const diff = validationSummary.errorCount - comparedVersion.validationSummary.errorCount
       diffLabel = (
         <DeltaStat
-          comparedVersionIndex={comparedVersionIndex}
+          comparedVersionIndex={comparedVersion.version}
           diff={diff}
           inverse
           style={{ marginLeft: '3px' }} />
diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
index 6dafb3216..5fd3e31e0 100644
--- a/lib/manager/components/version/VersionComparisonDropdown.js
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -11,7 +11,7 @@ import type {Feed, FeedVersion} from '../../../types'
 import type {AppState} from '../../../types/reducers'
 
 type Props = {
-  comparedVersionIndex?: number,
+  comparedVersion?: FeedVersion,
   feedSource: Feed,
   setComparedVersionIndex: typeof versionsActions.setComparedVersionIndex,
   version: FeedVersion,
@@ -23,8 +23,10 @@ type Props = {
  * active version.
  */
 class VersionComparisonDropdown extends Component<Props> {
+  //Fix this---
   _onSelectComparedVersion = (index: number) => {
-    const {comparedVersionIndex, feedSource, setComparedVersionIndex} = this.props
+    const {comparedVersion, feedSource, setComparedVersionIndex} = this.props
+    const comparedVersionIndex = comparedVersion ? comparedVersion.version : -1
     if (index !== comparedVersionIndex) {
       setComparedVersionIndex(feedSource, index)
     } else {
@@ -34,15 +36,13 @@ class VersionComparisonDropdown extends Component<Props> {
 
   render () {
     const {
-      comparedVersionIndex,
+      comparedVersion,
       versions,
       version
     } = this.props
     let title = 'Compare versions'
-    let comparedFeedVersion
-    if (comparedVersionIndex !== null && comparedVersionIndex !== undefined) {
-      comparedFeedVersion = versions[comparedVersionIndex - 1]
-      title = `Comparing to version ${comparedVersionIndex}`
+    if (comparedVersion) {
+      title = `Comparing to version ${comparedVersion.version}`
     }
 
     // This custom formatter adds and hides the active version in the list to
@@ -59,7 +59,7 @@ class VersionComparisonDropdown extends Component<Props> {
           id: 'prevVersionSelector',
           onSelect: this._onSelectComparedVersion
         }}
-        extraOptions={comparedFeedVersion
+        extraOptions={comparedVersion
           ? [
             {
               onClick: null,
@@ -74,7 +74,7 @@ class VersionComparisonDropdown extends Component<Props> {
         }
         itemFormatter={itemFormatter}
         title={title}
-        version={comparedFeedVersion}
+        version={comparedVersion}
         versions={versions}
       />
     )
diff --git a/lib/manager/containers/ActiveFeedVersionNavigator.js b/lib/manager/containers/ActiveFeedVersionNavigator.js
index 663f3fca1..981ab121c 100644
--- a/lib/manager/containers/ActiveFeedVersionNavigator.js
+++ b/lib/manager/containers/ActiveFeedVersionNavigator.js
@@ -39,7 +39,7 @@ export type Props = {
 }
 
 const mapStateToProps = (state: AppState, ownProps: Props) => {
-  let feedVersionIndex, comparedVersionIndex
+  let feedVersionIndex
   const {routeParams, feedSource} = ownProps
   const {feedVersions} = feedSource
   const {feedVersionIndex: fvi, subpage} = routeParams
@@ -74,8 +74,7 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
     version = sortedVersions[feedVersionIndex - 1]
 
     if (gtfs.filter.comparedVersion) {
-      comparedVersionIndex = sortedVersions.findIndex(feedVer => feedVer.id === gtfs.filter.comparedVersion) + 1
-      comparedVersion = sortedVersions[comparedVersionIndex - 1]
+      comparedVersion = sortedVersions.find(feedVer => feedVer.id === gtfs.filter.comparedVersion)
     }
   }
   // FIXME: prop drilling.
@@ -83,7 +82,6 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
     gtfs,
     hasVersions,
     feedVersionIndex,
-    comparedVersionIndex,
     gtfsPlusValidation: state.gtfsplus.validation,
     sortedVersions,
     user: state.user,

From 2f0c25f98d5095e97e1b5f6624389aab4209823a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 8 Mar 2021 18:16:54 -0500
Subject: [PATCH 114/553] refactor(manager/actions/versions): Remove action
 setComparedVersionIndex.

---
 lib/manager/actions/versions.js               | 21 +------------------
 .../version/FeedVersionNavigator.js           |  1 -
 .../version/VersionComparisonDropdown.js      | 19 +++++++++--------
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 95027a186..2bcb2b511 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -103,7 +103,7 @@ export function setActiveVersion (version: FeedVersion) {
 // Sets the compared feed version.
 export const setComparedVersion = createAction(
   'SET_COMPARED_FEEDVERSION',
-  (payload: FeedVersion) => payload
+  (payload: ?FeedVersion) => payload
 )
 
 const uploadingFeed = createVoidPayloadAction('UPLOADING_FEED')
@@ -595,25 +595,6 @@ export function setVersionIndex (
   }
 }
 
-export function setComparedVersionIndex (
-  feed: Feed,
-  index: ?number,
-  push?: boolean = true,
-  isPublic?: boolean
-) {
-  return function (dispatch: dispatchFn, getState: getStateFn) {
-    if (feed.feedVersions) {
-      dispatch(setComparedVersion(feed.feedVersions[index - 1]))
-      // TODO: add support for URL/browser history, e.g.:
-      // if (push) {
-      //   browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${activeIndex}/compareto/${index}`)
-      // }
-    } else {
-      console.warn('No feed versions for feed were found.', feed)
-    }
-  }
-}
-
 /**
  * Starts the export shapes server job for a particular feed version.
  *
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 090c03f87..0abd3e155 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -305,7 +305,6 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                   <ButtonGroup>
                     <VersionComparisonDropdown
                       comparedVersion={comparedVersion}
-                      feedSource={feedSource}
                       version={version}
                       versions={feedSource.feedVersions}
                     />
diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
index 5fd3e31e0..7c2a5e173 100644
--- a/lib/manager/components/version/VersionComparisonDropdown.js
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -12,8 +12,7 @@ import type {AppState} from '../../../types/reducers'
 
 type Props = {
   comparedVersion?: FeedVersion,
-  feedSource: Feed,
-  setComparedVersionIndex: typeof versionsActions.setComparedVersionIndex,
+  setComparedVersion: typeof versionsActions.setComparedVersion,
   version: FeedVersion,
   versions: Array<FeedVersion>
 }
@@ -23,17 +22,19 @@ type Props = {
  * active version.
  */
 class VersionComparisonDropdown extends Component<Props> {
-  //Fix this---
   _onSelectComparedVersion = (index: number) => {
-    const {comparedVersion, feedSource, setComparedVersionIndex} = this.props
+    const {comparedVersion, setComparedVersion, versions} = this.props
     const comparedVersionIndex = comparedVersion ? comparedVersion.version : -1
+    // Note: index is 1-based (the menu item at index 0 is a caption).
     if (index !== comparedVersionIndex) {
-      setComparedVersionIndex(feedSource, index)
-    } else {
-      setComparedVersionIndex(feedSource, null)
+      setComparedVersion(versions.find(v => v.version === index))//FIXME:[QBD] pass sorted versions to selector?
     }
   }
 
+  _onClearComparedVersion = () => {
+    this.props.setComparedVersion(null)
+  }
+
   render () {
     const {
       comparedVersion,
@@ -62,7 +63,7 @@ class VersionComparisonDropdown extends Component<Props> {
         extraOptions={comparedVersion
           ? [
             {
-              onClick: null,
+              onClick: this._onClearComparedVersion,
               text: 'Exit compare mode'
             }
           ]
@@ -86,7 +87,7 @@ const mapStateToProps = (state: AppState, ownProps: {}) => {
 }
 
 const mapDispatchToProps = {
-  setComparedVersionIndex: versionsActions.setComparedVersionIndex
+  setComparedVersion: versionsActions.setComparedVersion
 }
 
 export default connect(mapStateToProps, mapDispatchToProps)(VersionComparisonDropdown)

From 909bd7ae9e0d164e79106361966733de7744cb2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Mar 2021 01:04:24 +0000
Subject: [PATCH 115/553] build(deps): bump elliptic from 6.5.3 to 6.5.4

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 70d434802..0e62fc728 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2347,10 +2347,10 @@ blueimp-md5@^2.3.0:
   resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.10.0.tgz#02f0843921f90dca14f5b8920a38593201d6964d"
   integrity sha512-EkNUOi7tpV68TqjpiUz9D9NcT8um2+qtgntmMbi5UKssVX2m/2PLqotcric0RE63pB3HPN/fjf3cKHN2ufGSUQ==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.9"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
-  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.9:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 body-parser@1.18.3:
   version "1.18.3"
@@ -2456,7 +2456,7 @@ braces@^3.0.1:
   dependencies:
     fill-range "^7.0.1"
 
-brorand@^1.0.1:
+brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
@@ -4489,17 +4489,17 @@ element-class@^0.2.0:
   integrity sha1-nTu9B2f5AT744cjr5yLBQCpgBQ4=
 
 elliptic@^6.0.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
-  integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb"
+  integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==
   dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
+    bn.js "^4.11.9"
+    brorand "^1.1.0"
     hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
+    hmac-drbg "^1.0.1"
+    inherits "^2.0.4"
+    minimalistic-assert "^1.0.1"
+    minimalistic-crypto-utils "^1.0.1"
 
 email-validator@^2.0.3:
   version "2.0.4"
@@ -6253,7 +6253,7 @@ history@^3.0.0:
     query-string "^4.2.2"
     warning "^3.0.0"
 
-hmac-drbg@^1.0.0:
+hmac-drbg@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
@@ -9028,7 +9028,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=

From 00445ee33e7b02c77a650d4a4098e64b6c528c67 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Mon, 8 Mar 2021 17:55:45 -0800
Subject: [PATCH 116/553] refactor: address various PR review comments

See https://github.com/ibi-group/datatools-ui/pull/638
---
 .../components/deployment/CustomFileEditor.js | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/lib/manager/components/deployment/CustomFileEditor.js b/lib/manager/components/deployment/CustomFileEditor.js
index 3676063cc..9525a39fb 100644
--- a/lib/manager/components/deployment/CustomFileEditor.js
+++ b/lib/manager/components/deployment/CustomFileEditor.js
@@ -46,8 +46,7 @@ export default class CustomFileEditor extends Component<Props, {
    */
   _fileNameValid = (): boolean => {
     const {fileSource, model: customFile} = this.state
-    return (fileSource === 'uri' && !!customFile.uri) ||
-      (!!customFile.contents && !!customFile.filename)
+    return fileSource === 'uri' || Boolean(customFile.filename)
   }
 
   /**
@@ -55,7 +54,7 @@ export default class CustomFileEditor extends Component<Props, {
    */
   _hasContents = (): boolean => {
     const {model: customFile} = this.state
-    return !!customFile.contents || !!customFile.uri
+    return Boolean(customFile.contents) || Boolean(customFile.uri)
   }
 
   /**
@@ -162,18 +161,28 @@ export default class CustomFileEditor extends Component<Props, {
   }
 
   _renderToolbar = () => {
+    const { customFile } = this.props
     const isEditing = this._isEditing()
     const canEdit = this._canEdit()
-    const either = !isEditing && !canEdit
+    const isNewFile = Object.keys(customFile).every(key => !customFile[key])
     return (
       <ButtonToolbar>
-        <Button
-          bsSize='xsmall'
-          disabled={either}
-          onClick={canEdit ? this._onEdit : this._onCancelEditing}
-        >
-          {isEditing ? 'Cancel' : 'Edit'}
-        </Button>
+        {canEdit &&
+          <Button
+            bsSize='xsmall'
+            onClick={this._onEdit}
+          >
+            Edit
+          </Button>
+        }
+        {isEditing && !isNewFile &&
+          <Button
+            bsSize='xsmall'
+            onClick={this._onCancelEditing}
+          >
+            Cancel
+          </Button>
+        }
         {isEditing &&
           <Button
             bsSize='xsmall'
@@ -187,7 +196,7 @@ export default class CustomFileEditor extends Component<Props, {
           bsSize='xsmall'
           bsStyle='danger'
           className='pull-right'
-          disabled={either}
+          disabled={!canEdit && !isEditing}
           onClick={this._onDelete}
         >
           Delete

From d02b8b14868ce681e00bf0ae864104730be1de72 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Mon, 8 Mar 2021 17:56:23 -0800
Subject: [PATCH 117/553] refactor: add customFile key creation

---
 .../deployment/DeploymentConfigurationsPanel.js     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/manager/components/deployment/DeploymentConfigurationsPanel.js b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
index dddbb1dd8..0b43f032e 100644
--- a/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
+++ b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
@@ -31,6 +31,16 @@ const TRIP_PLANNER_VERSIONS = [
   { label: 'OTP 2.X', value: 'OTP_2' }
 ]
 
+function calculateCustomFileKey (customFile: CustomFile, idx: number): string {
+  return `${
+    customFile.filename || ''
+  }-${
+    customFile.contents || ''
+  }-${
+    customFile.uri || ''
+  }-${idx}`
+}
+
 export default class DeploymentConfigurationsPanel extends Component<{
   deployment: Deployment,
   updateDeployment: typeof deploymentActions.updateDeployment
@@ -258,6 +268,9 @@ export default class DeploymentConfigurationsPanel extends Component<{
                   customFileEditIdx={customFileEditIdx}
                   deployment={deployment}
                   idx={idx}
+                  // create a custom key to make sure a new component is created
+                  // so that previously deleted files are not used
+                  key={calculateCustomFileKey(customFile, idx)}
                   onCancelEditing={this._onCancelEditingCustomFile}
                   onDelete={this._onDeleteCustomFile}
                   onEdit={this._onEditCustomFile}

From f31ee5b6d3386097a185eafaff3213f28c825f10 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Wed, 10 Mar 2021 22:33:12 -0800
Subject: [PATCH 118/553] Apply suggestions from code review

Co-authored-by: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
---
 .../components/deployment/DeploymentConfigurationsPanel.js      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/manager/components/deployment/DeploymentConfigurationsPanel.js b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
index 0b43f032e..1d354b02f 100644
--- a/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
+++ b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
@@ -182,6 +182,7 @@ export default class DeploymentConfigurationsPanel extends Component<{
             </Checkbox>
             Trip Planner Version:
             <Select
+              clearable={false}
               value={deployment.tripPlannerVersion}
               onChange={this._onUpdateTripPlannerVersion}
               options={TRIP_PLANNER_VERSIONS}
@@ -190,6 +191,7 @@ export default class DeploymentConfigurationsPanel extends Component<{
               <div>
                 OTP jar file
                 <Select
+                  clearable={false}
                   value={deployment.otpVersion}
                   onChange={this._onUpdateVersion}
                   options={options ? options.map(v => ({value: v, label: v})) : []}

From aaa3b044262d919933b7d5471b756de094788924 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Wed, 10 Mar 2021 23:35:17 -0800
Subject: [PATCH 119/553] refactor: remove a reference to Travis

---
 __tests__/test-utils/teardown-e2e.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tests__/test-utils/teardown-e2e.js b/__tests__/test-utils/teardown-e2e.js
index f5f2f1871..232de18b7 100644
--- a/__tests__/test-utils/teardown-e2e.js
+++ b/__tests__/test-utils/teardown-e2e.js
@@ -160,7 +160,7 @@ async function uploadToMicrosoftTeams () {
   )
   const actions = [{
     '@type': 'OpenUri',
-    name: `View Travis Build #${buildNum}`,
+    name: `View GitHub Action Build #${buildNum}`,
     targets: [
       {
         os: 'default',

From 848b1e452432ec414e0541dd1fdf7aea12c1a530 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Wed, 10 Mar 2021 23:53:46 -0800
Subject: [PATCH 120/553] ci: add MS Teams webhook url environment variable

---
 .github/workflows/node-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 3a678b0e8..178456404 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -94,6 +94,7 @@ jobs:
           GTFS_DATABASE_USER: ${{ secrets.GTFS_DATABASE_USER }}
           MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
           MONGO_DB_NAME: ${{ secrets.MONGO_DB_NAME }}
+          MS_TEAMS_WEBHOOK_URL: ${{ secrets.MS_TEAMS_WEBHOOK_URL }}
           OSM_VEX: ${{ secrets.OSM_VEX }}
           RUN_E2E: "true"
           S3_BUCKET: ${{ secrets.S3_BUCKET }}

From ee7ac45b20cb091d19260357bd2fa59ea01e096b Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Thu, 11 Mar 2021 00:14:40 -0800
Subject: [PATCH 121/553] ci: add e2e logs bucket environment variable

---
 .github/workflows/node-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 178456404..623fe0d9f 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -92,6 +92,7 @@ jobs:
           GTFS_DATABASE_PASSWORD: ${{ secrets.GTFS_DATABASE_PASSWORD }}
           GTFS_DATABASE_URL: ${{ secrets.GTFS_DATABASE_URL }}
           GTFS_DATABASE_USER: ${{ secrets.GTFS_DATABASE_USER }}
+          LOGS_S3_BUCKET: ${{ secrets.LOGS_S3_BUCKET }}
           MAPBOX_ACCESS_TOKEN: ${{ secrets.MAPBOX_ACCESS_TOKEN }}
           MONGO_DB_NAME: ${{ secrets.MONGO_DB_NAME }}
           MS_TEAMS_WEBHOOK_URL: ${{ secrets.MS_TEAMS_WEBHOOK_URL }}

From 3fa3af61da7eae23f1c297afc9a18242e0f17348 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Mar 2021 13:12:33 -0500
Subject: [PATCH 122/553] ci(gh-actions): add aws credentials to AWS config

---
 .github/workflows/node-ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 623fe0d9f..5c1b5182c 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -73,7 +73,11 @@ jobs:
           mongodb-version: 4.2
       - name: Add aws credentials for datatools-server
         if: env.SHOULD_RUN_E2E == 'true'
-        run: mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=us-east-1' > ~/.aws/config
+        run: mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=${AWS_REGION}' > ~/.aws/config
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Run e2e tests
         if: env.SHOULD_RUN_E2E == 'true'
         run: yarn cover-end-to-end

From 4728d4f1c6f29813102ba1a2f9ade9f1b4c3b022 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Mar 2021 15:41:11 -0500
Subject: [PATCH 123/553] ci: change db name to postgres

---
 .github/workflows/node-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 5c1b5182c..c5c5d5566 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -14,7 +14,7 @@ jobs:
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: catalogue
+          POSTGRES_DB: postgres
         ports:
           - 5432:5432
         # Set health checks to wait until postgres has started

From 4cbda6c5a8a0aeabcc14655e3f7ec0dd90959db1 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Mar 2021 16:33:57 -0500
Subject: [PATCH 124/553] test(setup-e2e.yml): add gtfs database env vars

---
 __tests__/test-utils/setup-e2e.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index 518d871b5..aef49b659 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -40,6 +40,9 @@ async function startBackendServer () {
       'AUTH0_SECRET',
       'AUTH0_API_CLIENT',
       'AUTH0_API_SECRET',
+      'GTFS_DATABASE_PASSWORD',
+      'GTFS_DATABASE_USER',
+      'GTFS_DATABASE_URL',
       'OSM_VEX',
       'SPARKPOST_EMAIL',
       'SPARKPOST_KEY',

From 82cb46566c608d46403fadcbb4694de30d030380 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 11 Mar 2021 16:53:02 -0500
Subject: [PATCH 125/553] test(setup-e2e): DRY out code

---
 __tests__/test-utils/setup-e2e.js | 37 +++++++++++++------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index aef49b659..effb943e6 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -20,7 +20,19 @@ const {
 } = require('./utils')
 
 const serverJarFilename = 'dt-latest-dev.jar'
-
+const ENV_YML_VARIABLES = [
+  'AUTH0_CLIENT_ID',
+  'AUTH0_DOMAIN',
+  'AUTH0_SECRET',
+  'AUTH0_API_CLIENT',
+  'AUTH0_API_SECRET',
+  'GTFS_DATABASE_PASSWORD',
+  'GTFS_DATABASE_USER',
+  'GTFS_DATABASE_URL',
+  'OSM_VEX',
+  'SPARKPOST_KEY',
+  'SPARKPOST_EMAIL'
+]
 /**
  * download, configure and start an instance of datatools-server
  */
@@ -35,17 +47,7 @@ async function startBackendServer () {
   // make sure required environment variables are set
   try {
     requireEnvVars([
-      'AUTH0_CLIENT_ID',
-      'AUTH0_DOMAIN',
-      'AUTH0_SECRET',
-      'AUTH0_API_CLIENT',
-      'AUTH0_API_SECRET',
-      'GTFS_DATABASE_PASSWORD',
-      'GTFS_DATABASE_USER',
-      'GTFS_DATABASE_URL',
-      'OSM_VEX',
-      'SPARKPOST_EMAIL',
-      'SPARKPOST_KEY',
+      ...ENV_YML_VARIABLES,
       'S3_BUCKET',
       'TRANSITFEEDS_KEY'
     ])
@@ -112,16 +114,7 @@ async function startBackendServer () {
             results.readEnvTemplate,
             pick(
               process.env,
-              [
-                'AUTH0_CLIENT_ID',
-                'AUTH0_DOMAIN',
-                'AUTH0_SECRET',
-                'AUTH0_API_CLIENT',
-                'AUTH0_API_SECRET',
-                'OSM_VEX',
-                'SPARKPOST_KEY',
-                'SPARKPOST_EMAIL'
-              ]
+              ENV_YML_VARIABLES
             )
           )
         )

From 24cdc36303fef41bead30e5a0d674e890a89cbbe Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 12 Mar 2021 10:46:00 -0500
Subject: [PATCH 126/553] test(e2e): update add pattern stop test

---
 __tests__/end-to-end.js                                 | 4 ++++
 lib/editor/components/pattern/AddPatternStopDropdown.js | 1 +
 2 files changed, 5 insertions(+)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index 71b0789b4..769b8db48 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -2338,10 +2338,14 @@ describe('end-to-end', () => {
 
           // add 1st stop
           await reactSelectOption('.pattern-stop-card', 'la', 1, true)
+          await wait(500, 'for 1st stop to be selected')
+          await click('[data-test-id="add-stop-by-name-button"]')
           await wait(2000, 'for 1st stop to save')
 
           // add 2nd stop
           await reactSelectOption('.pattern-stop-card', 'ru', 1, true)
+          await wait(500, 'for 2nd stop to be selected')
+          await click('[data-test-id="add-stop-by-name-button"]')
           await wait(2000, 'for auto-save to happen')
 
           // reload to make sure stuff was saved
diff --git a/lib/editor/components/pattern/AddPatternStopDropdown.js b/lib/editor/components/pattern/AddPatternStopDropdown.js
index 713b676b3..6873b0634 100644
--- a/lib/editor/components/pattern/AddPatternStopDropdown.js
+++ b/lib/editor/components/pattern/AddPatternStopDropdown.js
@@ -64,6 +64,7 @@ export default class AddPatternStopDropdown extends Component<Props> {
         <Button
           bsSize={size}
           bsStyle='success'
+          data-test-id='add-pattern-stop-button'
           disabled={addToEndDisabled}
           title={addToEndDisabled ? DISABLED_MESSAGE : ''}
           onClick={this._onAddToEnd}>

From e44d420a605eedc60c4f1764b4b9c561643f1808 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 12 Mar 2021 10:46:42 -0500
Subject: [PATCH 127/553] test(e2e): fix pattern stop button test id

---
 __tests__/end-to-end.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index 769b8db48..dd083ca9a 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -2339,13 +2339,13 @@ describe('end-to-end', () => {
           // add 1st stop
           await reactSelectOption('.pattern-stop-card', 'la', 1, true)
           await wait(500, 'for 1st stop to be selected')
-          await click('[data-test-id="add-stop-by-name-button"]')
+          await click('[data-test-id="add-pattern-stop-button"]')
           await wait(2000, 'for 1st stop to save')
 
           // add 2nd stop
           await reactSelectOption('.pattern-stop-card', 'ru', 1, true)
           await wait(500, 'for 2nd stop to be selected')
-          await click('[data-test-id="add-stop-by-name-button"]')
+          await click('[data-test-id="add-pattern-stop-button"]')
           await wait(2000, 'for auto-save to happen')
 
           // reload to make sure stuff was saved

From 8b5cd9e6acad03ee209252d8fa19c19ad551784f Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 12 Mar 2021 12:20:06 -0500
Subject: [PATCH 128/553] ci: turn off e2e override

---
 scripts/check-if-e2e-should-run-on-ci.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/check-if-e2e-should-run-on-ci.sh b/scripts/check-if-e2e-should-run-on-ci.sh
index 83e14d0e3..08f1b0a0d 100755
--- a/scripts/check-if-e2e-should-run-on-ci.sh
+++ b/scripts/check-if-e2e-should-run-on-ci.sh
@@ -15,7 +15,7 @@ if [[ "$SHOULD_RUN_E2E" != "true" ]]; then
   echo 'Skipping E2E tests...'
 fi
 
-# FIXME: Re-enable e2e for conditions above.
-OVERRIDE=true
-echo "SHOULD_RUN_E2E=${OVERRIDE}" >> $GITHUB_ENV && export SHOULD_RUN_E2E=${OVERRIDE}
-echo "Overriding E2E. Temporarily forcing to be ${OVERRIDE}..."
+# Optionally override the conditions above with the below block:
+# OVERRIDE=true
+# echo "SHOULD_RUN_E2E=${OVERRIDE}" >> $GITHUB_ENV && export SHOULD_RUN_E2E=${OVERRIDE}
+# echo "Overriding E2E. Temporarily forcing to be ${OVERRIDE}..."

From bae498881934d6305eb4de2e315482441d89e92b Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 16 Mar 2021 11:20:23 -0400
Subject: [PATCH 129/553] ci: try removing pip/python install

---
 .github/workflows/node-ci.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index c5c5d5566..672d3ef59 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -25,18 +25,6 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          # This path is specific to Ubuntu
-          path: ~/.cache/pip
-          # Look to see if there is a cache hit for the corresponding requirements file
-          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
       - name: Install mkdocs
         run: pip install mkdocs
       - name: Use Node.js 12.x

From e10f1e462ee2a93c7efbfedd430131975832e0d2 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:46:05 -0400
Subject: [PATCH 130/553] refactor(FeedVersionSpanChart): Refactor chart
 rendering components.

---
 .../version/FeedVersionSpanChart.js           | 97 ++++++++++---------
 1 file changed, 51 insertions(+), 46 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 5eb4e4f00..96f44b743 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -34,6 +34,19 @@ const TODAY_MARKER_ZINDEX = 9998
  * of the active and compared feed versions.
  */
 export default class FeedVersionSpanChart extends Component<Props> {
+  /**
+   * Render a span of the chart.
+   * Note: Components below are all rendered as direct children of the parent element to accommodate
+   * drawing the "today" line marker above the FeedSpan, while keeping that marker
+   * under the FeedStartLabel and FeedEndLabel contents.
+   * FIXME[React 16.2+]: Extract into <>...</> markup.
+   */
+  renderFeedSpan = (name: string, props: any) => [
+    <FeedStartLabel key={`${name}-start`} {...props} />,
+    <FeedEndLabel key={`${name}-end`} {...props} />,
+    <FeedSpan key={`${name}-span`} {...props} isServiceGap={false} />
+  ]
+
   render () {
     const { activeVersion, comparedVersion: comparedVersionProp, style } = this.props
     const comparedVersion = comparedVersionProp ? comparedVersionProp : activeVersion
@@ -92,14 +105,7 @@ export default class FeedVersionSpanChart extends Component<Props> {
           </div>
         )}
         <div style={{ minHeight: HEIGHT_PROP, position: 'relative', width: '400px' }}>
-          {/* Components below are all rendered as direct children of this div to accommodate
-              drawing the "today" line marker above the FeedSpan, while keeping it
-              under the FeedStartLabel and FeedEndLabel contents.
-              FIXME[React 16+]: Extract FeedStartLabel, FeedEndLabel, FeedSpan into <>...</> markup.
-            */}
-          <FeedStartLabel {...activeChartProps} />
-          <FeedEndLabel {...activeChartProps} />
-          <FeedSpan {...activeChartProps} isServiceGap={false} />
+          {this.renderFeedSpan('active', activeChartProps)}
           {comparedVersionProp && hasGap &&
             <FeedSpan
               firstDate={firstDate}
@@ -109,9 +115,7 @@ export default class FeedVersionSpanChart extends Component<Props> {
               versionStartDate={earliestEnd}
               versionEndDate={latestStart}
             />}
-          {comparedVersionProp && <FeedStartLabel {...comparedChartProps} />}
-          {comparedVersionProp && <FeedEndLabel {...comparedChartProps} />}
-          {comparedVersionProp && <FeedSpan {...comparedChartProps} isServiceGap={false} />}
+          {comparedVersionProp && this.renderFeedSpan('compared', comparedChartProps)}
           {showToday && <TodayMarker firstDate={firstDate} lastDate={lastDate} />}
         </div>
       </div>
@@ -119,21 +123,35 @@ export default class FeedVersionSpanChart extends Component<Props> {
   }
 }
 
-/** Renders the validity span of one feed using the given props. */
-const FeedSpan = ({
+/**
+ * Compute label position and sizing info.
+ */
+function getRenderVars ({
   firstDate,
   lastDate,
-  isServiceGap = false,
-  top,
   versionStartDate,
-  versionEndDate
-}) => {
+  versionEndDate,
+  versionLabel
+}) {
   const totalDays = lastDate.diff(firstDate, 'days')
-  const versionOffset = versionStartDate.diff(firstDate, 'days')
   const daysActive = versionEndDate.diff(versionStartDate, 'days')
-  const relativeLength = daysActive / totalDays
-  const relativeOffset = versionOffset / totalDays
+  const versionOffset = versionStartDate.diff(firstDate, 'days')
+
+  return {
+    daysActive,
+    endLabel: versionEndDate.format(DATE_FORMAT),
+    relativeLength: daysActive / totalDays,
+    relativeOffset: versionOffset / totalDays,
+    startLabel: versionStartDate.format(DATE_FORMAT),
+    totalDays,
+    versionOffset
+  }
+}
 
+/** Renders the validity span of one feed using the given props. */
+const FeedSpan = props => {
+  const { isServiceGap = false, top } = props
+  const { daysActive, relativeLength, relativeOffset } = getRenderVars(props)
   return (
     <OverlayTrigger
       placement='bottom'
@@ -166,17 +184,9 @@ const FeedSpan = ({
 /**
  * Renders a validity span START label (needs to be separate from the span itself for Z order).
  */
-const FeedStartLabel = ({
-  firstDate,
-  lastDate,
-  top,
-  versionStartDate
-}) => {
-  const totalDays = lastDate.diff(firstDate, 'days')
-  const versionOffset = versionStartDate.diff(firstDate, 'days')
-  const relativeOffset = versionOffset / totalDays
-  const startLabel = versionStartDate.format(DATE_FORMAT)
-
+const FeedStartLabel = props => {
+  const { top } = props
+  const { relativeOffset, startLabel, totalDays, versionOffset } = getRenderVars(props)
   return (
     <span
       style={{
@@ -195,20 +205,16 @@ const FeedStartLabel = ({
 /**
  * Renders a validity span END label (needs to be separate from the span itself for Z order).
  */
-const FeedEndLabel = ({
-  firstDate,
-  lastDate,
-  top,
-  versionEndDate,
-  versionLabel,
-  versionStartDate
-}) => {
-  const totalDays = lastDate.diff(firstDate, 'days')
-  const versionOffset = versionStartDate.diff(firstDate, 'days')
-  const daysActive = versionEndDate.diff(versionStartDate, 'days')
-  const endLabel = versionEndDate.format(DATE_FORMAT)
-  const relativeLength = daysActive / totalDays
-  const relativeOffset = versionOffset / totalDays
+const FeedEndLabel = props => {
+  const { top, versionLabel } = props
+  const {
+    daysActive,
+    endLabel,
+    relativeLength,
+    relativeOffset,
+    totalDays,
+    versionOffset
+  } = getRenderVars(props)
 
   return (
     <span
@@ -230,7 +236,6 @@ const TodayMarker = ({
   lastDate
 }) => {
   const totalDays = lastDate.diff(firstDate, 'days')
-
   const today = moment()
   const todayOffset = today.diff(firstDate, 'days')
 

From d7a28adf9e869e6f72fea4d618a213ccae954b11 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 16 Mar 2021 17:49:27 -0400
Subject: [PATCH 131/553] refactor: Minor tweaks

---
 .../components/version/FeedVersionSpanChart.js      |  6 +++---
 .../components/version/VersionComparisonDropdown.js | 13 ++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 96f44b743..6008287fa 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -36,9 +36,9 @@ const TODAY_MARKER_ZINDEX = 9998
 export default class FeedVersionSpanChart extends Component<Props> {
   /**
    * Render a span of the chart.
-   * Note: Components below are all rendered as direct children of the parent element to accommodate
-   * drawing the "today" line marker above the FeedSpan, while keeping that marker
-   * under the FeedStartLabel and FeedEndLabel contents.
+   * Note: Components below are all rendered as direct children of the parent element
+   * (hence the returned array), so that the "today" marker appears
+   * above the FeedSpan while remaining below the FeedStartLabel and FeedEndLabel contents.
    * FIXME[React 16.2+]: Extract into <>...</> markup.
    */
   renderFeedSpan = (name: string, props: any) => [
diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
index 7c2a5e173..5cf4c8176 100644
--- a/lib/manager/components/version/VersionComparisonDropdown.js
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -60,15 +60,10 @@ class VersionComparisonDropdown extends Component<Props> {
           id: 'prevVersionSelector',
           onSelect: this._onSelectComparedVersion
         }}
-        extraOptions={comparedVersion
-          ? [
-            {
-              onClick: this._onClearComparedVersion,
-              text: 'Exit compare mode'
-            }
-          ]
-          : null
-        }
+        extraOptions={comparedVersion && [{
+          onClick: this._onClearComparedVersion,
+          text: 'Exit compare mode'
+        }]}
         header={versions.length < 2
           ? 'Load another version to enable comparison'
           : 'Select a version to compare with'

From dbf0d430886ff7f0c7a7f96c2785a474754dbff1 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 16 Mar 2021 18:06:42 -0400
Subject: [PATCH 132/553] refactor: Sort vars.

---
 lib/manager/components/version/FeedVersionDetails.js | 1 +
 lib/manager/components/version/FeedVersionViewer.js  | 4 ++--
 lib/manager/containers/ActiveFeedVersionNavigator.js | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index 3be4d4b21..b79f16d10 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -18,6 +18,7 @@ import {BLOCKING_ERROR_TYPES} from '../../util/version'
 import FeedVersionSpanChart from './FeedVersionSpanChart'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
+
 import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
 import type {ManagerUserState} from '../../../types/reducers'
 
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 3921edfc1..5b2040602 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -151,8 +151,8 @@ type SelectorProps = {
 
 class VersionSectionSelector extends Component<SelectorProps> {
   _renderIssuesLabel = () => {
-    const { version, comparedVersion } = this.props
-    const { validationResult, validationSummary, feedLoadResult } = version
+    const { comparedVersion, version } = this.props
+    const { feedLoadResult, validationResult, validationSummary } = version
 
     const tableFatalExceptions = getTableFatalExceptions(version)
     const hasCriticalError = validationSummary.loadStatus !== 'SUCCESS' ||
diff --git a/lib/manager/containers/ActiveFeedVersionNavigator.js b/lib/manager/containers/ActiveFeedVersionNavigator.js
index 981ab121c..d018526e2 100644
--- a/lib/manager/containers/ActiveFeedVersionNavigator.js
+++ b/lib/manager/containers/ActiveFeedVersionNavigator.js
@@ -63,7 +63,7 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
     ? feedVersions.sort(versionsLastUpdatedComparator)
     : []
 
-  let version, comparedVersion
+  let comparedVersion, version
 
   if (
     hasVersions &&

From 4b1a300ae1e2f573081c305d6b9ddc7cb418ab69 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 17 Mar 2021 09:43:41 -0400
Subject: [PATCH 133/553] refactor(types/reducers): Use FeedVersion in
 FilterState.

---
 lib/types/reducers.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/types/reducers.js b/lib/types/reducers.js
index 28065860c..d6aa53f0b 100644
--- a/lib/types/reducers.js
+++ b/lib/types/reducers.js
@@ -9,6 +9,7 @@ import type {
   Alert,
   ControlPoint,
   DataToolsConfig,
+  FeedVersion,
   FetchStatus,
   GtfsPlusValidation,
   GtfsRoute,
@@ -281,7 +282,7 @@ export type DateTimeFilter = {
 
 export type FilterState = {
   activeFeeds: any,
-  comparedVersion: any,
+  comparedVersion: FeedVersion,
   dateTimeFilter: DateTimeFilter,
   loadedFeeds: Array<any>,
   map: MapFilter,
@@ -295,7 +296,7 @@ export type FilterState = {
   showArrivals: boolean,
   timepointFilter: boolean,
   typeFilter: Array<string>,
-  version: any
+  version: FeedVersion
 }
 
 export type ValidationTrip = {

From 6a7d0de8c1f0b0f1a40428a4a93acbc8cf16bf2f Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Fri, 19 Mar 2021 10:04:31 +0000
Subject: [PATCH 134/553] improvement(AlertEditor.js): MTC Service Alerts:
 Changes to Alert Field Character Limit Validation

Changed character count down to count up. Removed popup validation for title and description. Show
errors when over characater limit

647
---
 lib/alerts/components/AlertEditor.js | 59 ++++++++++++----------------
 1 file changed, 25 insertions(+), 34 deletions(-)

diff --git a/lib/alerts/components/AlertEditor.js b/lib/alerts/components/AlertEditor.js
index 0e1e26fd2..7be5e4166 100644
--- a/lib/alerts/components/AlertEditor.js
+++ b/lib/alerts/components/AlertEditor.js
@@ -1,29 +1,29 @@
 // @flow
 
-import Icon from '@conveyal/woonerf/components/icon'
-import moment from 'moment'
+import * as activeAlertActions from '../actions/activeAlert'
+import * as alertActions from '../actions/alerts'
+
+import type {Alert, Feed, GtfsRoute, GtfsStop, Project} from '../../types'
+import {Button, ButtonToolbar, Col, ControlLabel, FormControl, FormGroup, Grid, Row} from 'react-bootstrap'
+import {CAUSES, EFFECTS, isNew} from '../util'
 import React, {Component} from 'react'
-import {Grid, Row, Col, ButtonToolbar, Button, FormControl, ControlLabel, FormGroup} from 'react-bootstrap'
-import DateTimeField from 'react-bootstrap-datetimepicker'
-import {browserHistory} from 'react-router'
-import Toggle from 'react-toggle'
 
 import AffectedServices from './AffectedServices'
-import * as alertActions from '../actions/alerts'
-import * as activeAlertActions from '../actions/activeAlert'
+import type {Props as ContainerProps} from '../containers/ActiveAlertEditor'
+import DateTimeField from 'react-bootstrap-datetimepicker'
+import GlobalGtfsFilter from '../../gtfs/containers/GlobalGtfsFilter'
+import GtfsMapSearch from '../../gtfs/components/gtfsmapsearch'
+import Icon from '@conveyal/woonerf/components/icon'
 import Loading from '../../common/components/Loading'
 import ManagerPage from '../../common/components/ManagerPage'
+import type {ManagerUserState} from '../../types/reducers'
 import PageNotFound from '../../common/components/PageNotFound'
-import {isModuleEnabled} from '../../common/util/config'
+import Toggle from 'react-toggle'
+import {browserHistory} from 'react-router'
 import {checkEntitiesForFeeds} from '../../common/util/permissions'
+import {isModuleEnabled} from '../../common/util/config'
+import moment from 'moment'
 import toSentenceCase from '../../common/util/to-sentence-case'
-import GtfsMapSearch from '../../gtfs/components/gtfsmapsearch'
-import GlobalGtfsFilter from '../../gtfs/containers/GlobalGtfsFilter'
-import {CAUSES, EFFECTS, isNew} from '../util'
-
-import type {Props as ContainerProps} from '../containers/ActiveAlertEditor'
-import type {Alert, Feed, GtfsRoute, GtfsStop, Project} from '../../types'
-import type {ManagerUserState} from '../../types/reducers'
 
 type Props = ContainerProps & {
   activeFeeds: Array<Feed>,
@@ -78,13 +78,6 @@ export default class AlertEditor extends Component<Props> {
     if (!title.trim()) {
       return window.alert('You must specify an alert title')
     }
-    // alert title/description must meet character limits (for display purposes)
-    if (title.length > ALERT_TITLE_CHAR_LIMIT) {
-      return window.alert(`Alert title must be ${ALERT_TITLE_CHAR_LIMIT} characters or less`)
-    }
-    if (description && description.length > ALERT_DESCRIPTION_CHAR_LIMIT) {
-      return window.alert(`Alert description must be ${ALERT_DESCRIPTION_CHAR_LIMIT} characters or less`)
-    }
     if (!end || !start || !momentEnd.isValid() || !momentStart.isValid()) {
       return window.alert('Alert must have a valid start and end date')
     }
@@ -140,12 +133,8 @@ export default class AlertEditor extends Component<Props> {
     } = this.props
     if (!isModuleEnabled('alerts')) return <PageNotFound message='The alerts module is not enabled.' />
     if (!alert) return <ManagerPage><Loading /></ManagerPage>
-    const titleCharactersRemaining = alert.title
-      ? ALERT_TITLE_CHAR_LIMIT - alert.title.length
-      : ALERT_TITLE_CHAR_LIMIT
-    const descriptionCharactersRemaining = alert.description
-      ? ALERT_DESCRIPTION_CHAR_LIMIT - alert.description.length
-      : ALERT_DESCRIPTION_CHAR_LIMIT
+    const titleCharacterCount = alert.title ? alert.title.length : 0
+    const descriptionCharactersCount = alert.description ? alert.description.length : 0
     const canPublish = alert.affectedEntities.length &&
       checkEntitiesForFeeds(alert.affectedEntities, publishableFeeds)
     const canEdit = checkEntitiesForFeeds(alert.affectedEntities, editableFeeds)
@@ -216,18 +205,19 @@ export default class AlertEditor extends Component<Props> {
                       {' '}
                       <span
                         className={
-                          titleCharactersRemaining > CHAR_WARNING_LIMIT
+                          titleCharacterCount > CHAR_WARNING_LIMIT && titleCharacterCount <= ALERT_TITLE_CHAR_LIMIT
                             ? 'text-muted'
                             : 'text-danger'
                         }
                         style={{fontWeight: 400}}>
-                        {titleCharactersRemaining}
+                        {titleCharacterCount}
                       </span>
                       <h5 style={{margin: '0px'}}>
                         <small>
+                        <span className="text-danger">{titleCharacterCount > ALERT_TITLE_CHAR_LIMIT ? 'WARNING:  Alert title longer than 100 characters may get truncated in some dissemination channels. ' : ''}</span>
                           Note: alert title serves as text for eTID alerts. Use
                           descriptive language so it can serve as a standalone
-                          alert.
+                          alert. 
                         </small>
                       </h5>
                     </ControlLabel>
@@ -297,12 +287,13 @@ export default class AlertEditor extends Component<Props> {
                       {' '}
                       <span
                         className={
-                          descriptionCharactersRemaining > CHAR_WARNING_LIMIT
+                          descriptionCharactersCount > CHAR_WARNING_LIMIT && descriptionCharactersCount <= ALERT_DESCRIPTION_CHAR_LIMIT
                             ? 'text-muted'
                             : 'text-danger'
                         }
                         style={{fontWeight: 400}}>
-                        {descriptionCharactersRemaining}
+                        {descriptionCharactersCount}
+                        <p><span className="text-danger">{descriptionCharactersCount > ALERT_DESCRIPTION_CHAR_LIMIT ? 'WARNING:  Alert description longer than 1200 characters may get truncated in some dissemination channels. ' : ''}</span></p>
                       </span>
                     </ControlLabel>
                     <FormControl

From c64125e27bb8b06165d381843b7f4df261a97af9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 19 Mar 2021 18:16:36 -0400
Subject: [PATCH 135/553] feat(FeedTransformation): Add normalize field
 transformation

---
 i18n/english.yml                              |  3 ++
 lib/common/constants/index.js                 |  3 +-
 .../transform/FeedTransformRules.js           |  3 +-
 .../transform/FeedTransformation.js           | 51 +++++++++++++++++--
 lib/types/index.js                            |  1 +
 5 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 2d3fccbc7..951c0a550 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -244,6 +244,9 @@ components:
     DeleteRecordsTransformation:
       label: Delete records from %tablePlaceholder%
       name: Delete records transformation
+    NormalizeFieldTransformation:
+      label: Normalize fields
+      name: Normalize fields transformation
     ReplaceFileFromStringTransformation:
       label: Replace %tablePlaceholder% from %filePlaceholder%
       name: Replace file from string transformation
diff --git a/lib/common/constants/index.js b/lib/common/constants/index.js
index 3eb71f69d..dc11026f9 100644
--- a/lib/common/constants/index.js
+++ b/lib/common/constants/index.js
@@ -34,6 +34,7 @@ export const RETRIEVAL_METHODS = Object.freeze({
 
 export const FEED_TRANSFORMATION_TYPES = Object.freeze({
   DELETE_RECORDS: 'DeleteRecordsTransformation',
+  NORMALIZE_FIELDS: 'NormalizeFieldTransformation',
   REPLACE_FILE_FROM_VERSION: 'ReplaceFileFromVersionTransformation',
-  REPLACE_FILE_FROM_STRING: 'ReplaceFileFromStringTransformation'
+  REPLACE_FILE_FROM_STRING: 'ReplaceFileFromStringTransformation',
 })
diff --git a/lib/manager/components/transform/FeedTransformRules.js b/lib/manager/components/transform/FeedTransformRules.js
index 180cdfbee..2d5d094e7 100644
--- a/lib/manager/components/transform/FeedTransformRules.js
+++ b/lib/manager/components/transform/FeedTransformRules.js
@@ -32,7 +32,8 @@ function newFeedTransformation (type: string = 'ReplaceFileFromVersionTransforma
 
 const feedTransformationTypes = [
   'ReplaceFileFromVersionTransformation',
-  'ReplaceFileFromStringTransformation'
+  'ReplaceFileFromStringTransformation',
+  'NormalizeFieldTransformation'
 ]
 
 type TransformRulesProps = {
diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index b0bd21040..385526b7b 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -27,8 +27,8 @@ type Props = {
  * Component that renders fields for a single feed transformation
  * (e.g., ReplaceFileFromStringTransformation).
  */
-export default class FeedTransformation extends Component<Props, {csvData: ?string}> {
-  state = { csvData: null }
+export default class FeedTransformation extends Component<Props, {csvData: ?string, fieldName: ?string}> {
+  state = { csvData: null, fieldName: null }
 
   _getFieldsForType = (type: string) => {
     const {feedSource, transformation} = this.props
@@ -55,7 +55,7 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
           />
         )
         break
-      case 'ReplaceFileFromStringTransformation':
+      case 'ReplaceFileFromStringTransformation': {
         const inputIsUnchanged = this.state.csvData === null
         const csvData = inputIsUnchanged
           ? transformation.csvData
@@ -96,6 +96,41 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
           </div>
         )
         break
+      }
+      case 'NormalizeFieldTransformation': {
+        const inputIsUnchanged = this.state.fieldName === null
+        const fieldName = inputIsUnchanged
+          ? transformation.fieldName
+          : this.state.fieldName        
+        fields.push(
+          <div>
+            <label htmlFor='fieldName'>
+              Field to normalize:
+              <input
+                id='fieldName'
+                onChange={this._onChangeFieldToNormalize}
+                value={fieldName} />
+            </label>
+            <div style={{marginBottom: '10px'}}>
+              <Button
+                bsSize='xsmall'
+                disabled={inputIsUnchanged}
+                style={{marginRight: '5px'}}
+                onClick={this._onSaveFieldToNormalize}>
+                Save CSV
+              </Button>
+            </div>
+
+            This transform will:
+            <ul>            
+              <li>Capitalize bus stop names (for bus stops in all-caps),</li>
+              <li>Replace '+' and '&amp;' with 'and', '@' with 'at',</li>
+              <li>Remove contents within parentheses.</li>
+            </ul>
+          </div>
+        )
+        break
+      }
       default:
         break
     }
@@ -141,6 +176,16 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
     this.props.onChange({csvData}, this.props.index)
   }
 
+  _onChangeFieldToNormalize = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({fieldName: evt.target.value})
+  }
+
+  _onSaveFieldToNormalize = () => {
+    const fieldName = this.state.fieldName || null
+    this.setState({fieldName: null})
+    this.props.onChange({fieldName}, this.props.index)
+  }
+
   _onRemoveTransformation = () => {
     this.props.onRemove(this.props.index)
   }
diff --git a/lib/types/index.js b/lib/types/index.js
index d90e92872..c627f762e 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -295,6 +295,7 @@ export type FeedTransformation = {
   '@type': $Values<typeof FEED_TRANSFORMATION_TYPES>,
   active: boolean,
   csvData?: string,
+  fieldName?: string,
   matchField?: string,
   matchValues?: Array<string>,
   sourceVersionId?: string,

From 88a2989b7c0a0216d1585eb403171cde4adbe228 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 22 Mar 2021 18:59:26 -0400
Subject: [PATCH 136/553] refactor(FeedTransformation): Make normalize steps
 optional, add cap exceptions.

---
 .../transform/FeedTransformation.js           | 56 ++++++++++++++++---
 lib/types/index.js                            |  5 ++
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 385526b7b..44593cba5 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -2,7 +2,7 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import {Button} from 'react-bootstrap'
+import {Button, Checkbox, FormControl, FormGroup} from 'react-bootstrap'
 import Select from 'react-select'
 
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
@@ -14,6 +14,7 @@ import type {
   FeedTransformation as FeedTransformationType,
   ReactSelectOption
 } from '../../../types'
+import { transform } from 'lodash-es'
 
 type Props = {
   feedSource: Feed,
@@ -101,7 +102,8 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
         const inputIsUnchanged = this.state.fieldName === null
         const fieldName = inputIsUnchanged
           ? transformation.fieldName
-          : this.state.fieldName        
+          : this.state.fieldName
+
         fields.push(
           <div>
             <label htmlFor='fieldName'>
@@ -117,15 +119,43 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
                 disabled={inputIsUnchanged}
                 style={{marginRight: '5px'}}
                 onClick={this._onSaveFieldToNormalize}>
-                Save CSV
+                Save
               </Button>
             </div>
 
             This transform will:
-            <ul>            
-              <li>Capitalize bus stop names (for bus stops in all-caps),</li>
-              <li>Replace '+' and '&amp;' with 'and', '@' with 'at',</li>
-              <li>Remove contents within parentheses.</li>
+            <ul style={{ listStyleType: 'none', paddingLeft: '10px'}}>
+              <li>
+                <Checkbox
+                  checked={transformation.capitalize}
+                  onChange={this._onChangeCapitalizeField}
+                >
+                  Capitalize bus stop names
+                </Checkbox>
+                <div>Exceptions: 
+                  <FormGroup>
+                    <FormControl
+                      onChange={this._onChangeCapitalizeExceptions}
+                      placeholder="Enter exceptions separated by commas"
+                      type="text"
+                      value={transformation.capitalizeExceptions ? transformation.capitalizeExceptions.join(',') : ''}
+                    />
+                  </FormGroup>                
+                </div>
+              </li>
+              <li>
+                <Checkbox
+                  checked={transformation.performSubstitutions}
+                  inline
+                  onChange={this._onChangePerformSubstitutions}
+                >
+                  Perform the following substitutions:
+                </Checkbox>
+                <ul>
+                  <li>Replace '+' and '&amp;' with 'and', '@' with 'at',</li>
+                  <li>Remove contents within parentheses.</li>
+                </ul>
+              </li>
             </ul>
           </div>
         )
@@ -180,6 +210,18 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
     this.setState({fieldName: evt.target.value})
   }
 
+  _onChangeCapitalizeField = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.props.onChange({capitalize: evt.target.checked}, this.props.index)
+  }
+
+  _onChangeCapitalizeExceptions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.props.onChange({capitalizeExceptions: evt.target.value.split(',')}, this.props.index)
+  }
+
+  _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.props.onChange({performSubstitutions: evt.target.checked}, this.props.index)
+  }
+
   _onSaveFieldToNormalize = () => {
     const fieldName = this.state.fieldName || null
     this.setState({fieldName: null})
diff --git a/lib/types/index.js b/lib/types/index.js
index c627f762e..083f695c1 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -294,6 +294,11 @@ export type FetchFrequency = $Values<typeof FETCH_FREQUENCIES>
 export type FeedTransformation = {
   '@type': $Values<typeof FEED_TRANSFORMATION_TYPES>,
   active: boolean,
+
+  capitalize?: boolean,
+  capitalizeExceptions?: Array<string>,
+  performSubstitutions?: boolean,
+
   csvData?: string,
   fieldName?: string,
   matchField?: string,

From 1fc31f4e1ab426dffa9c8804413cc589b64e3aff Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Tue, 23 Mar 2021 14:35:30 -0700
Subject: [PATCH 137/553] Update
 lib/manager/components/deployment/DeploymentConfigurationsPanel.js

Co-authored-by: Landon Reed <landontreed@gmail.com>
---
 .../deployment/DeploymentConfigurationsPanel.js          | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/deployment/DeploymentConfigurationsPanel.js b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
index 1d354b02f..8898973fd 100644
--- a/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
+++ b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
@@ -32,13 +32,8 @@ const TRIP_PLANNER_VERSIONS = [
 ]
 
 function calculateCustomFileKey (customFile: CustomFile, idx: number): string {
-  return `${
-    customFile.filename || ''
-  }-${
-    customFile.contents || ''
-  }-${
-    customFile.uri || ''
-  }-${idx}`
+  const {contents, filename, uri} = customFile
+  return `${filename || ''}-${contents || ''}-${uri || ''}-${idx}`
 }
 
 export default class DeploymentConfigurationsPanel extends Component<{

From 0e73511fbf4f2ca2152704f0dcb52c710bfdd604 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Wed, 24 Mar 2021 17:56:26 +0000
Subject: [PATCH 138/553] refactor(AlertEditor.js): Refactored, removed
 formatted IDE code

#647
---
 lib/alerts/components/AlertEditor.js | 203 +++++++++++++++------------
 1 file changed, 113 insertions(+), 90 deletions(-)

diff --git a/lib/alerts/components/AlertEditor.js b/lib/alerts/components/AlertEditor.js
index 7be5e4166..35eddebe1 100644
--- a/lib/alerts/components/AlertEditor.js
+++ b/lib/alerts/components/AlertEditor.js
@@ -1,29 +1,29 @@
 // @flow
 
-import * as activeAlertActions from '../actions/activeAlert'
-import * as alertActions from '../actions/alerts'
-
-import type {Alert, Feed, GtfsRoute, GtfsStop, Project} from '../../types'
-import {Button, ButtonToolbar, Col, ControlLabel, FormControl, FormGroup, Grid, Row} from 'react-bootstrap'
-import {CAUSES, EFFECTS, isNew} from '../util'
+import Icon from '@conveyal/woonerf/components/icon'
+import moment from 'moment'
 import React, {Component} from 'react'
+import {Grid, Row, Col, ButtonToolbar, Button, FormControl, ControlLabel, FormGroup} from 'react-bootstrap'
+import DateTimeField from 'react-bootstrap-datetimepicker'
+import {browserHistory} from 'react-router'
+import Toggle from 'react-toggle'
 
 import AffectedServices from './AffectedServices'
-import type {Props as ContainerProps} from '../containers/ActiveAlertEditor'
-import DateTimeField from 'react-bootstrap-datetimepicker'
-import GlobalGtfsFilter from '../../gtfs/containers/GlobalGtfsFilter'
-import GtfsMapSearch from '../../gtfs/components/gtfsmapsearch'
-import Icon from '@conveyal/woonerf/components/icon'
+import * as alertActions from '../actions/alerts'
+import * as activeAlertActions from '../actions/activeAlert'
 import Loading from '../../common/components/Loading'
 import ManagerPage from '../../common/components/ManagerPage'
-import type {ManagerUserState} from '../../types/reducers'
 import PageNotFound from '../../common/components/PageNotFound'
-import Toggle from 'react-toggle'
-import {browserHistory} from 'react-router'
-import {checkEntitiesForFeeds} from '../../common/util/permissions'
 import {isModuleEnabled} from '../../common/util/config'
-import moment from 'moment'
+import {checkEntitiesForFeeds} from '../../common/util/permissions'
 import toSentenceCase from '../../common/util/to-sentence-case'
+import GtfsMapSearch from '../../gtfs/components/gtfsmapsearch'
+import GlobalGtfsFilter from '../../gtfs/containers/GlobalGtfsFilter'
+import {CAUSES, EFFECTS, isNew} from '../util'
+
+import type {Props as ContainerProps} from '../containers/ActiveAlertEditor'
+import type {Alert, Feed, GtfsRoute, GtfsStop, Project} from '../../types'
+import type {ManagerUserState} from '../../types/reducers'
 
 type Props = ContainerProps & {
   activeFeeds: Array<Feed>,
@@ -96,7 +96,7 @@ export default class AlertEditor extends Component<Props> {
   _deleteAlert = () => this.props.deleteAlert(this.props.alert)
 
   _onChange = (evt: SyntheticInputEvent<HTMLInputElement>) =>
-    this.props.setActiveProperty({[evt.target.name]: evt.target.value})
+  this.props.setActiveProperty({[evt.target.name]: evt.target.value})
 
   _onChangeEnd = (time: string) => this.props.setActiveProperty({end: +time})
 
@@ -133,79 +133,90 @@ export default class AlertEditor extends Component<Props> {
     } = this.props
     if (!isModuleEnabled('alerts')) return <PageNotFound message='The alerts module is not enabled.' />
     if (!alert) return <ManagerPage><Loading /></ManagerPage>
-    const titleCharacterCount = alert.title ? alert.title.length : 0
-    const descriptionCharactersCount = alert.description ? alert.description.length : 0
-    const canPublish = alert.affectedEntities.length &&
+    const titleCharactersRemaining = alert.title
+      ? ALERT_TITLE_CHAR_LIMIT - alert.title.length
+      : ALERT_TITLE_CHAR_LIMIT
+      const descriptionCharactersRemaining = alert.description
+      ? ALERT_DESCRIPTION_CHAR_LIMIT - alert.description.length
+      : ALERT_DESCRIPTION_CHAR_LIMIT
+    const titleCharacterCount = alert.title 
+      ? alert.title.length 
+      : 0
+    const descriptionCharactersCount = alert.description
+      ? alert.description.length
+      : 0
+    const canPublish =
+      alert.affectedEntities.length &&
       checkEntitiesForFeeds(alert.affectedEntities, publishableFeeds)
-    const canEdit = checkEntitiesForFeeds(alert.affectedEntities, editableFeeds)
-    const editingIsDisabled = alert.published && !canPublish ? true : !canEdit
-    const sortedFeeds = editableFeeds.sort(sortFeeds511)
-    // If user has edit rights and alert is unpublished, user can delete alert,
-    // else check if they have publish rights.
-    const deleteIsDisabled = !editingIsDisabled && !alert.published
-      ? false
-      : !canPublish
-    const deleteButtonMessage = alert.published && deleteIsDisabled
-      ? 'Cannot delete because alert is published'
-      : !canEdit ? 'Cannot alter alerts for other agencies' : 'Delete alert'
-    const editButtonMessage = alert.published && deleteIsDisabled
-      ? 'Cannot edit because alert is published'
-      : !canEdit ? 'Cannot alter alerts for other agencies' : 'Edit alert'
-    return (
-      <ManagerPage
-        ref='page'
-        title={isNew(alert) ? `Alert ${alert.id}` : 'New Alert'}>
-        <Grid fluid>
-          <Row>
-            <Col xs={4} sm={7} md={8}>
-              <Button
-                onClick={this._onClickBack}>
-                <Icon type='chevron-left' /> Back
-              </Button>
-            </Col>
-            <Col xs={8} sm={5} md={4}>
-              <ButtonToolbar className='pull-right' style={{marginLeft: '5px'}}>
-                <Button
-                  title={editButtonMessage}
-                  bsStyle='primary'
-                  disabled={editingIsDisabled}
-                  onClick={this.validateAndSave}
-                ><Icon type='save' /> Save</Button>
+      const canEdit = checkEntitiesForFeeds(alert.affectedEntities, editableFeeds)
+      const editingIsDisabled = alert.published && !canPublish ? true : !canEdit
+      const sortedFeeds = editableFeeds.sort(sortFeeds511)
+      // If user has edit rights and alert is unpublished, user can delete alert,
+      // else check if they have publish rights.
+      const deleteIsDisabled = !editingIsDisabled && !alert.published
+        ? false
+        : !canPublish
+      const deleteButtonMessage = alert.published && deleteIsDisabled
+        ? 'Cannot delete because alert is published'
+        : !canEdit ? 'Cannot alter alerts for other agencies' : 'Delete alert'
+      const editButtonMessage = alert.published && deleteIsDisabled
+        ? 'Cannot edit because alert is published'
+        : !canEdit ? 'Cannot alter alerts for other agencies' : 'Edit alert'
+      return (
+        <ManagerPage
+          ref='page'
+          title={isNew(alert) ? `Alert ${alert.id}` : 'New Alert'}>
+          <Grid fluid>
+            <Row>
+              <Col xs={4} sm={7} md={8}>
                 <Button
-                  title={deleteButtonMessage}
-                  bsStyle='danger'
-                  disabled={deleteIsDisabled}
-                  onClick={this._onClickDelete}
-                ><Icon type='trash' /> Delete</Button>
-              </ButtonToolbar>
-              <FormGroup
-                className='pull-right'
-                style={{position: 'relative', top: '5px'}}>
-                <Toggle
-                  id='alert-published'
-                  disabled={!canPublish}
-                  checked={alert.published}
-                  onChange={this._onClickPublish} />
-                <label
-                  htmlFor='alert-published'
-                  style={{position: 'relative', top: '-5px', marginLeft: '5px'}}>
-                  Published?
-                </label>
-              </FormGroup>
-            </Col>
-          </Row>
-
-          <Row>
-            <Col xs={12} sm={6}>
-              <Row>
-                <Col xs={12} style={{marginTop: '10px'}}>
-                  <FormGroup controlId='formControlsTitle'>
-                    <ControlLabel>
-                      Alert Title
-                      {' '}
+                  onClick={this._onClickBack}>
+                  <Icon type='chevron-left' /> Back
+                </Button>
+              </Col>
+              <Col xs={8} sm={5} md={4}>
+                <ButtonToolbar className='pull-right' style={{marginLeft: '5px'}}>
+                  <Button
+                    title={editButtonMessage}
+                    bsStyle='primary'
+                    disabled={editingIsDisabled}
+                    onClick={this.validateAndSave}
+                  ><Icon type='save' /> Save</Button>
+                  <Button
+                    title={deleteButtonMessage}
+                    bsStyle='danger'
+                    disabled={deleteIsDisabled}
+                    onClick={this._onClickDelete}
+                  ><Icon type='trash' /> Delete</Button>
+                </ButtonToolbar>
+                <FormGroup
+                  className='pull-right'
+                  style={{position: 'relative', top: '5px'}}>
+                  <Toggle
+                    id='alert-published'
+                    disabled={!canPublish}
+                    checked={alert.published}
+                    onChange={this._onClickPublish} />
+                  <label
+                    htmlFor='alert-published'
+                    style={{position: 'relative', top: '-5px', marginLeft: '5px'}}>
+                    Published?
+                  </label>
+                </FormGroup>
+              </Col>
+            </Row>
+  
+            <Row>
+              <Col xs={12} sm={6}>
+                <Row>
+                  <Col xs={12} style={{marginTop: '10px'}}>
+                    <FormGroup controlId='formControlsTitle'>
+                      <ControlLabel>
+                        Alert Title
+                        {' '}
                       <span
                         className={
-                          titleCharacterCount > CHAR_WARNING_LIMIT && titleCharacterCount <= ALERT_TITLE_CHAR_LIMIT
+                          titleCharactersRemaining > CHAR_WARNING_LIMIT
                             ? 'text-muted'
                             : 'text-danger'
                         }
@@ -214,7 +225,12 @@ export default class AlertEditor extends Component<Props> {
                       </span>
                       <h5 style={{margin: '0px'}}>
                         <small>
-                        <span className="text-danger">{titleCharacterCount > ALERT_TITLE_CHAR_LIMIT ? 'WARNING:  Alert title longer than 100 characters may get truncated in some dissemination channels. ' : ''}</span>
+                          {titleCharacterCount > ALERT_TITLE_CHAR_LIMIT 
+                            ? (
+                              <span className='text-danger'>
+                                {`WARNING:  Alert title longer than ${ALERT_TITLE_CHAR_LIMIT} characters may get truncated in some dissemination channels. `}
+                              </span>
+                          ) : ''} 
                           Note: alert title serves as text for eTID alerts. Use
                           descriptive language so it can serve as a standalone
                           alert. 
@@ -287,14 +303,21 @@ export default class AlertEditor extends Component<Props> {
                       {' '}
                       <span
                         className={
-                          descriptionCharactersCount > CHAR_WARNING_LIMIT && descriptionCharactersCount <= ALERT_DESCRIPTION_CHAR_LIMIT
+                          descriptionCharactersRemaining > CHAR_WARNING_LIMIT
                             ? 'text-muted'
                             : 'text-danger'
                         }
                         style={{fontWeight: 400}}>
                         {descriptionCharactersCount}
-                        <p><span className="text-danger">{descriptionCharactersCount > ALERT_DESCRIPTION_CHAR_LIMIT ? 'WARNING:  Alert description longer than 1200 characters may get truncated in some dissemination channels. ' : ''}</span></p>
                       </span>
+                        {descriptionCharactersCount > ALERT_DESCRIPTION_CHAR_LIMIT
+                          ? (
+                            <h5 style={{margin: '0px'}}>
+                              <small className='text-danger'>
+                                  {`WARNING:  Alert description longer than ${ALERT_DESCRIPTION_CHAR_LIMIT} characters may get truncated in some dissemination channels. `}
+                              </small>
+                            </h5>
+                          ) : ''}
                     </ControlLabel>
                     <FormControl
                       componentClass='textarea'
@@ -318,7 +341,7 @@ export default class AlertEditor extends Component<Props> {
               </Row>
               <Row>
                 <Col xs={12}>
-                  <AffectedServices
+                <AffectedServices
                     sortedFeeds={sortedFeeds}
                     {...this.props} />
                 </Col>

From b533eee8fa67a4412eb8d4e45ba237f7cc2e239d Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Fri, 26 Mar 2021 13:08:45 -0700
Subject: [PATCH 139/553] chore: update issue template

---
 .github/issue_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/issue_template.md b/.github/issue_template.md
index 52aedb349..660f711d0 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,4 +1,4 @@
-_**NOTE:** This issue system is intended for reporting bugs and tracking progress in software development. Although this software is licensed with an open-source license, any issue opened here may not be responded to in a timely manner. [Conveyal](https://www.conveyal.com) is unable to provide technical support for custom deployments of this software unless your company has a support contract with us. Please remove this note when creating the issue._
+_**NOTE:** This issue system is intended for reporting bugs and tracking progress in software development. Although this software is licensed with an open-source license, any issue opened here may not be responded to in a timely manner. [IBI Group](https://www.ibigroup.com/) is unable to provide technical support for custom deployments of this software unless your company has a support contract with us. Please remove this note when creating the issue._
 
 ## Observed behavior (please include a screenshot if possible)
 

From c3f83127563ed44205ccab25a21791947cfee46b Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 29 Mar 2021 16:55:29 +0100
Subject: [PATCH 140/553] refactor(AlertEditor.js): Refactored code, sorted
 Linting errors

Made the title input and description text area full width.

#648
---
 lib/alerts/components/AlertEditor.js | 169 +++++++++++++--------------
 1 file changed, 84 insertions(+), 85 deletions(-)

diff --git a/lib/alerts/components/AlertEditor.js b/lib/alerts/components/AlertEditor.js
index 35eddebe1..591691faf 100644
--- a/lib/alerts/components/AlertEditor.js
+++ b/lib/alerts/components/AlertEditor.js
@@ -24,7 +24,6 @@ import {CAUSES, EFFECTS, isNew} from '../util'
 import type {Props as ContainerProps} from '../containers/ActiveAlertEditor'
 import type {Alert, Feed, GtfsRoute, GtfsStop, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
-
 type Props = ContainerProps & {
   activeFeeds: Array<Feed>,
   addActiveEntity: typeof activeAlertActions.addActiveEntity,
@@ -70,7 +69,7 @@ export default class AlertEditor extends Component<Props> {
 
   validateAndSave = () => {
     const {alert, saveAlert} = this.props
-    const {affectedEntities, description, end, start, title} = alert
+    const {affectedEntities, end, start, title} = alert
     const momentEnd = moment(end)
     const momentStart = moment(start)
 
@@ -96,7 +95,7 @@ export default class AlertEditor extends Component<Props> {
   _deleteAlert = () => this.props.deleteAlert(this.props.alert)
 
   _onChange = (evt: SyntheticInputEvent<HTMLInputElement>) =>
-  this.props.setActiveProperty({[evt.target.name]: evt.target.value})
+    this.props.setActiveProperty({[evt.target.name]: evt.target.value})
 
   _onChangeEnd = (time: string) => this.props.setActiveProperty({end: +time})
 
@@ -136,11 +135,11 @@ export default class AlertEditor extends Component<Props> {
     const titleCharactersRemaining = alert.title
       ? ALERT_TITLE_CHAR_LIMIT - alert.title.length
       : ALERT_TITLE_CHAR_LIMIT
-      const descriptionCharactersRemaining = alert.description
+    const descriptionCharactersRemaining = alert.description
       ? ALERT_DESCRIPTION_CHAR_LIMIT - alert.description.length
       : ALERT_DESCRIPTION_CHAR_LIMIT
-    const titleCharacterCount = alert.title 
-      ? alert.title.length 
+    const titleCharacterCount = alert.title
+      ? alert.title.length
       : 0
     const descriptionCharactersCount = alert.description
       ? alert.description.length
@@ -148,72 +147,72 @@ export default class AlertEditor extends Component<Props> {
     const canPublish =
       alert.affectedEntities.length &&
       checkEntitiesForFeeds(alert.affectedEntities, publishableFeeds)
-      const canEdit = checkEntitiesForFeeds(alert.affectedEntities, editableFeeds)
-      const editingIsDisabled = alert.published && !canPublish ? true : !canEdit
-      const sortedFeeds = editableFeeds.sort(sortFeeds511)
-      // If user has edit rights and alert is unpublished, user can delete alert,
-      // else check if they have publish rights.
-      const deleteIsDisabled = !editingIsDisabled && !alert.published
-        ? false
-        : !canPublish
-      const deleteButtonMessage = alert.published && deleteIsDisabled
-        ? 'Cannot delete because alert is published'
-        : !canEdit ? 'Cannot alter alerts for other agencies' : 'Delete alert'
-      const editButtonMessage = alert.published && deleteIsDisabled
-        ? 'Cannot edit because alert is published'
-        : !canEdit ? 'Cannot alter alerts for other agencies' : 'Edit alert'
-      return (
-        <ManagerPage
-          ref='page'
-          title={isNew(alert) ? `Alert ${alert.id}` : 'New Alert'}>
-          <Grid fluid>
-            <Row>
-              <Col xs={4} sm={7} md={8}>
+    const canEdit = checkEntitiesForFeeds(alert.affectedEntities, editableFeeds)
+    const editingIsDisabled = alert.published && !canPublish ? true : !canEdit
+    const sortedFeeds = editableFeeds.sort(sortFeeds511)
+    // If user has edit rights and alert is unpublished, user can delete alert,
+    // else check if they have publish rights.
+    const deleteIsDisabled = !editingIsDisabled && !alert.published
+      ? false
+      : !canPublish
+    const deleteButtonMessage = alert.published && deleteIsDisabled
+      ? 'Cannot delete because alert is published'
+      : !canEdit ? 'Cannot alter alerts for other agencies' : 'Delete alert'
+    const editButtonMessage = alert.published && deleteIsDisabled
+      ? 'Cannot edit because alert is published'
+      : !canEdit ? 'Cannot alter alerts for other agencies' : 'Edit alert'
+    return (
+      <ManagerPage
+        ref='page'
+        title={isNew(alert) ? `Alert ${alert.id}` : 'New Alert'}>
+        <Grid fluid>
+          <Row>
+            <Col xs={4} sm={7} md={8}>
+              <Button
+                onClick={this._onClickBack}>
+                <Icon type='chevron-left' /> Back
+              </Button>
+            </Col>
+            <Col xs={8} sm={5} md={4}>
+              <ButtonToolbar className='pull-right' style={{marginLeft: '5px'}}>
+                <Button
+                  title={editButtonMessage}
+                  bsStyle='primary'
+                  disabled={editingIsDisabled}
+                  onClick={this.validateAndSave}
+                ><Icon type='save' /> Save</Button>
                 <Button
-                  onClick={this._onClickBack}>
-                  <Icon type='chevron-left' /> Back
-                </Button>
-              </Col>
-              <Col xs={8} sm={5} md={4}>
-                <ButtonToolbar className='pull-right' style={{marginLeft: '5px'}}>
-                  <Button
-                    title={editButtonMessage}
-                    bsStyle='primary'
-                    disabled={editingIsDisabled}
-                    onClick={this.validateAndSave}
-                  ><Icon type='save' /> Save</Button>
-                  <Button
-                    title={deleteButtonMessage}
-                    bsStyle='danger'
-                    disabled={deleteIsDisabled}
-                    onClick={this._onClickDelete}
-                  ><Icon type='trash' /> Delete</Button>
-                </ButtonToolbar>
-                <FormGroup
-                  className='pull-right'
-                  style={{position: 'relative', top: '5px'}}>
-                  <Toggle
-                    id='alert-published'
-                    disabled={!canPublish}
-                    checked={alert.published}
-                    onChange={this._onClickPublish} />
-                  <label
-                    htmlFor='alert-published'
-                    style={{position: 'relative', top: '-5px', marginLeft: '5px'}}>
-                    Published?
-                  </label>
-                </FormGroup>
-              </Col>
-            </Row>
-  
-            <Row>
-              <Col xs={12} sm={6}>
-                <Row>
-                  <Col xs={12} style={{marginTop: '10px'}}>
-                    <FormGroup controlId='formControlsTitle'>
-                      <ControlLabel>
+                  title={deleteButtonMessage}
+                  bsStyle='danger'
+                  disabled={deleteIsDisabled}
+                  onClick={this._onClickDelete}
+                ><Icon type='trash' /> Delete</Button>
+              </ButtonToolbar>
+              <FormGroup
+                className='pull-right'
+                style={{position: 'relative', top: '5px'}}>
+                <Toggle
+                  id='alert-published'
+                  disabled={!canPublish}
+                  checked={alert.published}
+                  onChange={this._onClickPublish} />
+                <label
+                  htmlFor='alert-published'
+                  style={{position: 'relative', top: '-5px', marginLeft: '5px'}}>
+                  Published?
+                </label>
+              </FormGroup>
+            </Col>
+          </Row>
+
+          <Row>
+            <Col xs={12} sm={6}>
+              <Row>
+                <Col xs={12} style={{marginTop: '10px'}}>
+                  <FormGroup controlId='formControlsTitle'>
+                    <ControlLabel>
                         Alert Title
-                        {' '}
+                      {' '}
                       <span
                         className={
                           titleCharactersRemaining > CHAR_WARNING_LIMIT
@@ -225,15 +224,15 @@ export default class AlertEditor extends Component<Props> {
                       </span>
                       <h5 style={{margin: '0px'}}>
                         <small>
-                          {titleCharacterCount > ALERT_TITLE_CHAR_LIMIT 
+                          {titleCharacterCount > ALERT_TITLE_CHAR_LIMIT
                             ? (
                               <span className='text-danger'>
-                                {`WARNING:  Alert title longer than ${ALERT_TITLE_CHAR_LIMIT} characters may get truncated in some dissemination channels. `}
+                                {`WARNING:  Alert title longer than ${ALERT_TITLE_CHAR_LIMIT} characters may get truncated in some dissemination channels.  `}<br />
                               </span>
-                          ) : ''} 
+                            ) : ''}
                           Note: alert title serves as text for eTID alerts. Use
                           descriptive language so it can serve as a standalone
-                          alert. 
+                          alert.
                         </small>
                       </h5>
                     </ControlLabel>
@@ -296,7 +295,7 @@ export default class AlertEditor extends Component<Props> {
                 </Col>
               </Row>
               <Row>
-                <Col xs={12} sm={6}>
+                <Col xs={12}>
                   <FormGroup controlId='formControlsDescription'>
                     <ControlLabel>
                       Description
@@ -310,14 +309,14 @@ export default class AlertEditor extends Component<Props> {
                         style={{fontWeight: 400}}>
                         {descriptionCharactersCount}
                       </span>
-                        {descriptionCharactersCount > ALERT_DESCRIPTION_CHAR_LIMIT
-                          ? (
-                            <h5 style={{margin: '0px'}}>
-                              <small className='text-danger'>
-                                  {`WARNING:  Alert description longer than ${ALERT_DESCRIPTION_CHAR_LIMIT} characters may get truncated in some dissemination channels. `}
-                              </small>
-                            </h5>
-                          ) : ''}
+                      {descriptionCharactersCount > ALERT_DESCRIPTION_CHAR_LIMIT
+                        ? (
+                          <h5 style={{margin: '0px'}}>
+                            <small className='text-danger'>
+                              {`WARNING:  Alert description longer than ${ALERT_DESCRIPTION_CHAR_LIMIT} characters may get truncated in some dissemination channels. `}
+                            </small>
+                          </h5>
+                        ) : ''}
                     </ControlLabel>
                     <FormControl
                       componentClass='textarea'
@@ -327,7 +326,7 @@ export default class AlertEditor extends Component<Props> {
                       onChange={this._onChange} />
                   </FormGroup>
                 </Col>
-                <Col xs={12} sm={6}>
+                <Col xs={12}>
                   <FormGroup controlId='formControlsURL'>
                     <ControlLabel>URL</ControlLabel>
                     <FormControl
@@ -341,7 +340,7 @@ export default class AlertEditor extends Component<Props> {
               </Row>
               <Row>
                 <Col xs={12}>
-                <AffectedServices
+                  <AffectedServices
                     sortedFeeds={sortedFeeds}
                     {...this.props} />
                 </Col>

From d50ca196fccb1b885e057b6ca97fb9504c4c2fe8 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Mon, 29 Mar 2021 14:38:30 -0700
Subject: [PATCH 141/553] ci: sanity check to see if mkdocs gets installed

---
 .github/workflows/node-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 672d3ef59..522793c65 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -26,7 +26,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install mkdocs
-        run: pip install mkdocs
+        run: |
+          pip install mkdocs
+          mkdocs --version
       - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:

From 6c4bf790693b3778235574368a9853698d8efc20 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Mon, 29 Mar 2021 14:45:02 -0700
Subject: [PATCH 142/553] ci: try to upgrade pip?

---
 .github/workflows/node-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 522793c65..0565f7f27 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -27,6 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Install mkdocs
         run: |
+          python -m pip install --upgrade pip
           pip install mkdocs
           mkdocs --version
       - name: Use Node.js 12.x

From ef89a66512265821f07f65209bb3caa5d5b99630 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Mon, 29 Mar 2021 18:02:59 -0700
Subject: [PATCH 143/553] ci: try to setup python v3

---
 .github/workflows/node-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 0565f7f27..c0d859c7f 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -25,9 +25,11 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
       - name: Install mkdocs
         run: |
-          python -m pip install --upgrade pip
           pip install mkdocs
           mkdocs --version
       - name: Use Node.js 12.x

From 272042d1f8fe13f6fbf3980b1d83ae7ebca9abb3 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Tue, 30 Mar 2021 16:59:02 +0100
Subject: [PATCH 144/553] refactor(AlertEditor.js): Refactor

Sorted final IDE quirks to do with spacing

#648
---
 lib/alerts/components/AlertEditor.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/alerts/components/AlertEditor.js b/lib/alerts/components/AlertEditor.js
index 591691faf..763874226 100644
--- a/lib/alerts/components/AlertEditor.js
+++ b/lib/alerts/components/AlertEditor.js
@@ -24,6 +24,7 @@ import {CAUSES, EFFECTS, isNew} from '../util'
 import type {Props as ContainerProps} from '../containers/ActiveAlertEditor'
 import type {Alert, Feed, GtfsRoute, GtfsStop, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
+
 type Props = ContainerProps & {
   activeFeeds: Array<Feed>,
   addActiveEntity: typeof activeAlertActions.addActiveEntity,
@@ -211,7 +212,7 @@ export default class AlertEditor extends Component<Props> {
                 <Col xs={12} style={{marginTop: '10px'}}>
                   <FormGroup controlId='formControlsTitle'>
                     <ControlLabel>
-                        Alert Title
+                      Alert Title
                       {' '}
                       <span
                         className={
@@ -224,12 +225,13 @@ export default class AlertEditor extends Component<Props> {
                       </span>
                       <h5 style={{margin: '0px'}}>
                         <small>
-                          {titleCharacterCount > ALERT_TITLE_CHAR_LIMIT
-                            ? (
+                          {titleCharacterCount > ALERT_TITLE_CHAR_LIMIT &&
+                            (
                               <span className='text-danger'>
-                                {`WARNING:  Alert title longer than ${ALERT_TITLE_CHAR_LIMIT} characters may get truncated in some dissemination channels.  `}<br />
+                                WARNING: Alert title longer than {ALERT_TITLE_CHAR_LIMIT} characters may get truncated in some dissemination channels. <br />
                               </span>
-                            ) : ''}
+                            )
+                          }
                           Note: alert title serves as text for eTID alerts. Use
                           descriptive language so it can serve as a standalone
                           alert.
@@ -309,14 +311,15 @@ export default class AlertEditor extends Component<Props> {
                         style={{fontWeight: 400}}>
                         {descriptionCharactersCount}
                       </span>
-                      {descriptionCharactersCount > ALERT_DESCRIPTION_CHAR_LIMIT
-                        ? (
+                      {descriptionCharactersCount > ALERT_DESCRIPTION_CHAR_LIMIT &&
+                        (
                           <h5 style={{margin: '0px'}}>
                             <small className='text-danger'>
-                              {`WARNING:  Alert description longer than ${ALERT_DESCRIPTION_CHAR_LIMIT} characters may get truncated in some dissemination channels. `}
+                              WARNING: Alert description longer than {ALERT_DESCRIPTION_CHAR_LIMIT} characters may get truncated in some dissemination channels.
                             </small>
                           </h5>
-                        ) : ''}
+                        )
+                      }
                     </ControlLabel>
                     <FormControl
                       componentClass='textarea'

From b8abb1df7e878837a27f942f00a695a7a110840f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 16:39:14 +0000
Subject: [PATCH 145/553] build(deps): bump y18n from 3.2.1 to 3.2.2

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index edfd31ac0..49c0199d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15102,9 +15102,9 @@ xmlbuilder@~9.0.1:
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"

From 457a0e5b598bf12181f2f9da21f955fd71269d8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 19:22:38 +0000
Subject: [PATCH 146/553] build(deps): bump y18n from 3.2.1 to 3.2.2 in
 /scripts

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
---
 scripts/yarn.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index ecdceb1fc..04fa1906d 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -1200,8 +1200,9 @@ xregexp@2.0.0:
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
 
 y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 yallist@^2.0.0, yallist@^2.1.2:
   version "2.1.2"

From c29f1aafc24df94bd603a268a753d5d5d755541e Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Tue, 30 Mar 2021 16:32:06 -0700
Subject: [PATCH 147/553] ci: add note about python3 install

---
 .github/workflows/node-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index c0d859c7f..005008dce 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -25,6 +25,7 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v2
+      # install python 3.x in order to have mkdocs properly installed
       - uses: actions/setup-python@v2
         with:
           python-version: '3.x'

From 26f9962e1c2396daa76fa082035815a4ab4c8cea Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Wed, 31 Mar 2021 11:07:27 -0700
Subject: [PATCH 148/553] refactor: update issue template with mailto link

---
 .github/issue_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/issue_template.md b/.github/issue_template.md
index 660f711d0..6239fc4fb 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,4 +1,4 @@
-_**NOTE:** This issue system is intended for reporting bugs and tracking progress in software development. Although this software is licensed with an open-source license, any issue opened here may not be responded to in a timely manner. [IBI Group](https://www.ibigroup.com/) is unable to provide technical support for custom deployments of this software unless your company has a support contract with us. Please remove this note when creating the issue._
+_**NOTE:** This issue system is intended for reporting bugs and tracking progress in software development. Although this software is licensed with an open-source license, any issue opened here may not be responded to in a timely manner. [IBI Group](https://www.ibigroup.com/) is able to provide technical support for custom deployments of this software. Please contact [Ritesh Warade](mailto:ritesh.warade@ibigroup.com?subject=Data%20Tools%20inquiry%20via%20GitHub&body=Name:%20%0D%0AAgency/Company:%20%0D%0ABest%20date/time%20for%20a%20demo/discussion:%20%0D%0ADescription%20of%20needs:%20) if your company is interested in opening a support contract with us. Please remove this note when creating the issue._
 
 ## Observed behavior (please include a screenshot if possible)
 

From 9602d0a3b54a8e0bc0158f46034a0e8f9f84782e Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Wed, 31 Mar 2021 21:51:11 +0100
Subject: [PATCH 149/553] refactor(AlertEditor.js): CSS styling of the
 description textarea

Added an inline style to increase the height so that 4 lines were visible

#648
---
 lib/alerts/components/AlertEditor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/alerts/components/AlertEditor.js b/lib/alerts/components/AlertEditor.js
index 763874226..0fe7ffe6a 100644
--- a/lib/alerts/components/AlertEditor.js
+++ b/lib/alerts/components/AlertEditor.js
@@ -326,7 +326,8 @@ export default class AlertEditor extends Component<Props> {
                       placeholder='Detailed description of alert...'
                       defaultValue={alert.description}
                       name='description'
-                      onChange={this._onChange} />
+                      onChange={this._onChange}
+                      style={{ minHeight: '89px' }} />
                   </FormGroup>
                 </Col>
                 <Col xs={12}>

From e754d45ec785cc8e4f402413570c4d7fd66ffd02 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 2 Apr 2021 18:08:56 -0400
Subject: [PATCH 150/553] refactor(FeedTransformations): Persist cap exceptions
 and substitutions as string.

---
 .../transform/FeedTransformation.js           | 30 ++++++++++++-------
 lib/types/index.js                            |  4 ++-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 44593cba5..5c8361dad 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -14,7 +14,6 @@ import type {
   FeedTransformation as FeedTransformationType,
   ReactSelectOption
 } from '../../../types'
-import { transform } from 'lodash-es'
 
 type Props = {
   feedSource: Feed,
@@ -132,15 +131,15 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
                 >
                   Capitalize bus stop names
                 </Checkbox>
-                <div>Exceptions: 
+                <div>Exceptions:
                   <FormGroup>
                     <FormControl
                       onChange={this._onChangeCapitalizeExceptions}
-                      placeholder="Enter exceptions separated by commas"
-                      type="text"
-                      value={transformation.capitalizeExceptions ? transformation.capitalizeExceptions.join(',') : ''}
+                      placeholder='Enter exceptions separated by commas'
+                      type='text'
+                      value={transformation.capitalizeExceptions || ''}
                     />
-                  </FormGroup>                
+                  </FormGroup>
                 </div>
               </li>
               <li>
@@ -151,10 +150,15 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
                 >
                   Perform the following substitutions:
                 </Checkbox>
-                <ul>
-                  <li>Replace '+' and '&amp;' with 'and', '@' with 'at',</li>
-                  <li>Remove contents within parentheses.</li>
-                </ul>
+                <FormGroup>
+                  <FormControl
+                    onChange={this._onChangeSubstitutions}
+                    // TODO: Add hint text
+                    placeholder='Enter substitutions in the form old => new, separated by commas'
+                    type='text'
+                    value={transformation.substitutions || ''}
+                  />
+                </FormGroup>
               </li>
             </ul>
           </div>
@@ -215,13 +219,17 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
   }
 
   _onChangeCapitalizeExceptions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.props.onChange({capitalizeExceptions: evt.target.value.split(',')}, this.props.index)
+    this.props.onChange({capitalizeExceptions: evt.target.value}, this.props.index)
   }
 
   _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     this.props.onChange({performSubstitutions: evt.target.checked}, this.props.index)
   }
 
+  _onChangeSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.props.onChange({substitutions: evt.target.value}, this.props.index)
+  }
+
   _onSaveFieldToNormalize = () => {
     const fieldName = this.state.fieldName || null
     this.setState({fieldName: null})
diff --git a/lib/types/index.js b/lib/types/index.js
index 083f695c1..f0b91fd3a 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -295,9 +295,11 @@ export type FeedTransformation = {
   '@type': $Values<typeof FEED_TRANSFORMATION_TYPES>,
   active: boolean,
 
+  // TODO: Split the types for different transformations
   capitalize?: boolean,
-  capitalizeExceptions?: Array<string>,
+  capitalizeExceptions?: string,
   performSubstitutions?: boolean,
+  substitutions?: string,
 
   csvData?: string,
   fieldName?: string,

From f2ceef820f005d141f5b84a6c3cd7d54b460ac4b Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 6 Apr 2021 09:27:39 -0400
Subject: [PATCH 151/553] Update lib/manager/components/version/DeltaStat.js

Co-authored-by: Evan Siroky <evan.siroky@yahoo.com>
---
 lib/manager/components/version/DeltaStat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/version/DeltaStat.js b/lib/manager/components/version/DeltaStat.js
index becc309c6..3bd655fe6 100644
--- a/lib/manager/components/version/DeltaStat.js
+++ b/lib/manager/components/version/DeltaStat.js
@@ -6,7 +6,7 @@ import {Label as BsLabel, OverlayTrigger, Tooltip} from 'react-bootstrap'
 import {formatDelta} from '../../util/version'
 
 /**
- * Renders a delta statistic  as a label with tooltip when comparing feed
+ * Renders a delta statistic as a label with tooltip when comparing feed
  * versions.
  */
 const DeltaStat = (

From 8c399f0e3de145bf3f62d8e4995c4e75b228a22e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 6 Apr 2021 10:38:42 -0400
Subject: [PATCH 152/553] refactor: Fix lint

---
 .../version/FeedVersionSpanChart.js           | 23 +++++++++----------
 .../components/version/FeedVersionViewer.js   | 10 ++++----
 .../version/VersionComparisonDropdown.js      |  8 +++----
 .../version/VersionSelectorDropdown.js        |  8 +++----
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 6008287fa..07511b92f 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -49,7 +49,7 @@ export default class FeedVersionSpanChart extends Component<Props> {
 
   render () {
     const { activeVersion, comparedVersion: comparedVersionProp, style } = this.props
-    const comparedVersion = comparedVersionProp ? comparedVersionProp : activeVersion
+    const comparedVersion = comparedVersionProp || activeVersion
 
     // Construct moment objects for the active/compared version start/end dates.
     const activeStartDate = moment(activeVersion.validationSummary.startDate)
@@ -112,8 +112,8 @@ export default class FeedVersionSpanChart extends Component<Props> {
               isServiceGap
               lastDate={lastDate}
               top={`${HEIGHT_EM}em`}
-              versionStartDate={earliestEnd}
               versionEndDate={latestStart}
+              versionStartDate={earliestEnd}
             />}
           {comparedVersionProp && this.renderFeedSpan('compared', comparedChartProps)}
           {showToday && <TodayMarker firstDate={firstDate} lastDate={lastDate} />}
@@ -129,9 +129,9 @@ export default class FeedVersionSpanChart extends Component<Props> {
 function getRenderVars ({
   firstDate,
   lastDate,
-  versionStartDate,
   versionEndDate,
-  versionLabel
+  versionLabel,
+  versionStartDate
 }) {
   const totalDays = lastDate.diff(firstDate, 'days')
   const daysActive = versionEndDate.diff(versionStartDate, 'days')
@@ -154,8 +154,10 @@ const FeedSpan = props => {
   const { daysActive, relativeLength, relativeOffset } = getRenderVars(props)
   return (
     <OverlayTrigger
-      placement='bottom'
-      overlay={<Tooltip id={`feed-span`}>
+      overlay={<Tooltip
+        id={`feed-span`}
+        placement='bottom'
+      >
         {isServiceGap && 'No service for'}{' '}
         {daysActive} days
       </Tooltip>}>
@@ -170,9 +172,9 @@ const FeedSpan = props => {
         <span
           style={{
             backgroundColor: isServiceGap ? 'red' : 'grey',
+            bottom: '10%',
             height: '.75em',
             position: 'absolute',
-            bottom: '10%',
             width: '100%'
           }}
         />
@@ -186,7 +188,7 @@ const FeedSpan = props => {
  */
 const FeedStartLabel = props => {
   const { top } = props
-  const { relativeOffset, startLabel, totalDays, versionOffset } = getRenderVars(props)
+  const { relativeOffset, startLabel } = getRenderVars(props)
   return (
     <span
       style={{
@@ -208,12 +210,9 @@ const FeedStartLabel = props => {
 const FeedEndLabel = props => {
   const { top, versionLabel } = props
   const {
-    daysActive,
     endLabel,
     relativeLength,
-    relativeOffset,
-    totalDays,
-    versionOffset
+    relativeOffset
   } = getRenderVars(props)
 
   return (
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 5b2040602..462bac4b1 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -25,7 +25,7 @@ import * as plusActions from '../../../gtfsplus/actions/gtfsplus'
 import ActiveGtfsPlusVersionSummary from '../../../gtfsplus/containers/ActiveGtfsPlusVersionSummary'
 import VersionDateLabel from './VersionDateLabel'
 import NotesViewer from '../NotesViewer'
-import {errorPriorityLevels, formatDelta, getTableFatalExceptions} from '../../util/version'
+import {errorPriorityLevels, getTableFatalExceptions} from '../../util/version'
 import GtfsValidationViewer from '../validation/GtfsValidationViewer'
 import VersionButtonToolbar from './VersionButtonToolbar'
 
@@ -74,10 +74,10 @@ export default class FeedVersionViewer extends Component<Props> {
       listView,
       newNotePosted,
       notesRequested,
+      user,
       version,
       versions,
-      versionSection,
-      user
+      versionSection
     } = this.props
 
     if (feedSource && !feedSource.latestValidation) {
@@ -106,10 +106,10 @@ export default class FeedVersionViewer extends Component<Props> {
       <Row>
         <Col xs={12} sm={3}>
           <VersionSectionSelector
-            version={version}
             comparedVersion={comparedVersion}
-            gtfsPlusValidation={this.props.gtfsPlusValidation}
             feedVersionIndex={feedVersionIndex}
+            gtfsPlusValidation={this.props.gtfsPlusValidation}
+            version={version}
             versionSection={versionSection} />
         </Col>
         <Col xs={12} sm={9}>
diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
index 5cf4c8176..cd3e922d2 100644
--- a/lib/manager/components/version/VersionComparisonDropdown.js
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -7,7 +7,7 @@ import {connect} from 'react-redux'
 import * as versionsActions from '../../actions/versions'
 import VersionSelectorDropdown, {DefaultItemFormatter} from './VersionSelectorDropdown'
 
-import type {Feed, FeedVersion} from '../../../types'
+import type {FeedVersion} from '../../../types'
 import type {AppState} from '../../../types/reducers'
 
 type Props = {
@@ -27,7 +27,7 @@ class VersionComparisonDropdown extends Component<Props> {
     const comparedVersionIndex = comparedVersion ? comparedVersion.version : -1
     // Note: index is 1-based (the menu item at index 0 is a caption).
     if (index !== comparedVersionIndex) {
-      setComparedVersion(versions.find(v => v.version === index))//FIXME:[QBD] pass sorted versions to selector?
+      setComparedVersion(versions.find(v => v.version === index))
     }
   }
 
@@ -38,8 +38,8 @@ class VersionComparisonDropdown extends Component<Props> {
   render () {
     const {
       comparedVersion,
-      versions,
-      version
+      version,
+      versions
     } = this.props
     let title = 'Compare versions'
     if (comparedVersion) {
diff --git a/lib/manager/components/version/VersionSelectorDropdown.js b/lib/manager/components/version/VersionSelectorDropdown.js
index dacbd1796..757b771a9 100644
--- a/lib/manager/components/version/VersionSelectorDropdown.js
+++ b/lib/manager/components/version/VersionSelectorDropdown.js
@@ -21,15 +21,15 @@ type Props = {
 
 export const DefaultItemFormatter = (version: FeedVersion, activeVersion: ?FeedVersion) => (
   <MenuItem
-    key={version.id}
     eventKey={version.version}
+    key={version.id}
   >
     {activeVersion && version.id === activeVersion.id
       ? <Icon
         style={{
-          position: 'absolute',
           left: '2px',
-          marginTop: '3px'
+          marginTop: '3px',
+          position: 'absolute'
         }}
         type='check' />
       : null}
@@ -63,7 +63,7 @@ export default function VersionSelectorDropdown (props: Props) {
         {versionsSorted.length > 0
           ? versionsSorted.map((v, i) => itemFormatter(v, version))
           : <MenuItem disabled>No versions available</MenuItem>}
-        
+
         {extraOptions && <MenuItem divider />}
         {extraOptions && extraOptions.map((option, i) => (
           <MenuItem key={i} onClick={option.onClick}>{option.text}</MenuItem>

From 331339a1a03af1f70986a770dccf112f83bde46f Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 6 Apr 2021 11:31:06 -0400
Subject: [PATCH 153/553] refactor: Fix flow errors

---
 lib/common/components/MenuItem.js             |  6 ++--
 .../version/FeedVersionSpanChart.js           | 36 +++++++++++--------
 lib/types/reducers.js                         |  4 +--
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/lib/common/components/MenuItem.js b/lib/common/components/MenuItem.js
index 8b6fcd40b..a0d3eb342 100644
--- a/lib/common/components/MenuItem.js
+++ b/lib/common/components/MenuItem.js
@@ -8,14 +8,14 @@ import {MenuItem as BsMenuItem} from 'react-bootstrap'
  * Simple wrapper around Bootstrap's menu item to inject a checkmark if the item
  * is selected.
  */
-const MenuItem = ({children, selected, ...menuItemProps}: {children: React.Node, selected?: boolean}) => (
+const MenuItem = ({children, selected, ...menuItemProps}: {children?: React.Node, selected?: boolean}) => (
   <BsMenuItem {...menuItemProps}>
     {selected
       ? <Icon
         style={{
-          position: 'absolute',
           left: '2px',
-          marginTop: '3px'
+          marginTop: '3px',
+          position: 'absolute'
         }}
         type='check'
       />
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 07511b92f..75e70730c 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -154,13 +154,16 @@ const FeedSpan = props => {
   const { daysActive, relativeLength, relativeOffset } = getRenderVars(props)
   return (
     <OverlayTrigger
-      overlay={<Tooltip
-        id={`feed-span`}
-        placement='bottom'
-      >
-        {isServiceGap && 'No service for'}{' '}
-        {daysActive} days
-      </Tooltip>}>
+      overlay={(
+        <Tooltip
+          id='feed-span'
+        >
+          {isServiceGap && 'No service for'}{' '}
+          {daysActive} days
+        </Tooltip>
+      )}
+      placement='bottom'
+    >
       <span
         style={{
           height: HEIGHT_PROP,
@@ -240,14 +243,17 @@ const TodayMarker = ({
 
   return (
     <OverlayTrigger
-      overlay={<Tooltip
-        className='in'
-        id={`today-tip`}
-        placement={'top'}
-        positionTop={-25}>
-        {`Today - ${today.format(TODAY_DATE_FORMAT)}`}
-      </Tooltip>}
-      placement='top'>
+      overlay={(
+        <Tooltip
+          className='in'
+          id='today-tip'
+          positionTop={-25}
+        >
+          {`Today - ${today.format(TODAY_DATE_FORMAT)}`}
+        </Tooltip>
+      )}
+      placement='top'
+    >
       <div
         style={{
           backgroundColor: '#f0d000',
diff --git a/lib/types/reducers.js b/lib/types/reducers.js
index 58a239522..b3365ab16 100644
--- a/lib/types/reducers.js
+++ b/lib/types/reducers.js
@@ -287,7 +287,7 @@ export type DateTimeFilter = {
 
 export type FilterState = {
   activeFeeds: any,
-  comparedVersion: FeedVersion,
+  comparedVersion: ?FeedVersion,
   dateTimeFilter: DateTimeFilter,
   loadedFeeds: Array<any>,
   map: MapFilter,
@@ -301,7 +301,7 @@ export type FilterState = {
   showArrivals: boolean,
   timepointFilter: boolean,
   typeFilter: Array<string>,
-  version: FeedVersion
+  version: ?FeedVersion
 }
 
 export type ValidationTrip = {

From 6236f136509bbafe788a0815a5d74d6098ab0c89 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Thu, 8 Apr 2021 17:23:40 +0100
Subject: [PATCH 154/553] fix(EditorInput.js gtfs.yml): Added missing GTFS
 Extended Route Types

Added the route types to the GTFS.yml file and then added logic to display the route_type field in
an optgroup

#645
---
 gtfs.yml                             | 150 +++++++++++++++++++++++++++
 lib/editor/components/EditorInput.js |  15 ++-
 2 files changed, 164 insertions(+), 1 deletion(-)

diff --git a/gtfs.yml b/gtfs.yml
index 4170346d5..17b76574c 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -290,6 +290,156 @@
       text: Gondola
     - value: 7
       text: Funicular
+    - value: 100
+      text: Railway Service
+    - value: 100
+      text: Railway Service
+    - value: 101
+      text: High Speed Rail Service
+    - value: 102
+      text: Long Distance Trains
+    - value: 103
+      text: Inter Regional Rail Service
+    - value: 104
+      text: Car Transport Rail Service
+    - value: 105
+      text: Sleeper Rail Service
+    - value: 106
+      text: Regional Rail Service
+    - value: 107
+      text: Tourist Railway Service
+    - value: 108
+      text: Rail Shuttle (Within Complex)
+    - value: 109
+      text: Suburban Railway
+    - value: 110
+      text: Replacement Rail Service
+    - value: 111
+      text: Special Rail Service
+    - value: 112
+      text: Lorry Transport Rail Service
+    - value: 113
+      text: All Rail Services
+    - value: 114
+      text: Cross-Country Rail Service
+    - value: 115
+      text: Vehicle Transport Rail Service
+    - value: 116
+      text: Rack and Pinion Railway
+    - value: 117
+      text: Additional Rail Service
+    - value: 200
+      text: Coach Service
+    - value: 201
+      text: International Coach Service
+    - value: 202
+      text: National Coach Service
+    - value: 203
+      text: Shuttle Coach Service
+    - value: 204
+      text: Regional Coach Service
+    - value: 205
+      text: Special Coach Service
+    - value: 206
+      text: Sightseeing Coach Service
+    - value: 207
+      text: Tourist Coach Service
+    - value: 208
+      text: Commuter Coach Service
+    - value: 209
+      text: All Coach Services
+    - value: 400
+      text: Urban Railway Service
+    - value: 401
+      text: Metro Service
+    - value: 402
+      text: Underground Service
+    - value: 403
+      text: Urban Railway Service
+    - value: 404
+      text: All Urban Railway Services
+    - value: 405
+      text: Monorail
+    - value: 700
+      text: Bus Service
+    - value: 701
+      text: Regional Bus Service
+    - value: 702
+      text: Express Bus Service
+    - value: 703
+      text: Stopping Bus Service
+    - value: 704
+      text: Local Bus Service
+    - value: 705
+      text: Night Bus Service
+    - value: 706
+      text: Post Bus Service
+    - value: 707
+      text: Special Needs Bus
+    - value: 708
+      text: Mobility Bus Service
+    - value: 709
+      text: Mobility Bus for Registered Disabled
+    - value: 710
+      text: Sightseeing Bus
+    - value: 711
+      text: Shuttle Bus
+    - value: 712
+      text: School Bus
+    - value: 713
+      text: School and Public Service Bus
+    - value: 714
+      text: Rail Replacement Bus Service
+    - value: 715
+      text: Demand and Response Bus Service
+    - value: 716
+      text: All Bus Services
+    - value: 800
+      text: Trolleybus Service
+    - value: 900
+      text: Tram Service
+    - value: 901
+      text: City Tram Service
+    - value: 902
+      text: Local Tram Service
+    - value: 903
+      text: Regional Tram Service
+    - value: 904
+      text: Sightseeing Tram Service
+    - value: 905
+      text: Shuttle Tram Service
+    - value: 906
+      text: All Tram Services
+    - value: 1000
+      text: Water Transport Service
+    - value: 1100
+      text: Air Service
+    - value: 1200
+      text: Ferry Service
+    - value: 1300
+      text: Aerial Lift Service
+    - value: 1400
+      text: Funicular Service
+    - value: 1500
+      text: Taxi Service
+    - value: 1501
+      text: Communal Taxi Service
+    - value: 1502
+      text: Water Taxi Service
+    - value: 1503
+      text: Rail Taxi Service
+    - value: 1504
+      text: Bike Taxi Service
+    - value: 1505
+      text: Licensed Taxi Service
+    - value: 1506
+      text: Private Hire Service Vehicle
+    - value: 1507
+      text: All Taxi Services
+    - value: 1700
+      text: Miscellaneous Service
+    - value: 1702
+      text: Horse-drawn Carriage
     columnWidth: 6
     helpContent: The route_type field describes the type of transportation used on a route. Valid values for this field are...
   - name: route_sort_order
diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 5b291fabf..8836ba34b 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -300,6 +300,8 @@ export default class EditorInput extends Component<Props> {
           </span>
         )
       case 'DROPDOWN':
+        const standard = 'Standard'
+        const extended = 'Extended'
         return (
           <FormGroup
             {...formProps}
@@ -314,7 +316,18 @@ export default class EditorInput extends Component<Props> {
                 ? <option disabled value=''>{field.required ? '-- select an option --' : '(optional)' }</option>
                 : null
               }
-              {field.options && field.options.map(o => (<option value={o.value} key={o.value}>{o.text || o.value}</option>))}
+              {field.name === 'route_type' &&
+                <optgroup label={standard}>
+                  {field.options.slice(0, 7).map(o => (
+                    <option value={o.value} key={o.value}>{o.text} ({o.value})</option>))}
+                </optgroup>}
+              {field.name === 'route_type' &&
+                <optgroup label={extended}>
+                  {field.options.slice(8).map(o => (
+                    <option value={o.value} key={o.value}>{o.text} ({o.value})</option>))}
+                </optgroup>}
+              )}
+              {field.name !== 'route_type' && field.options && field.options.map(o => (<option value={o.value} key={o.value}>{o.text || o.value}</option>))}}
             </FormControl>
           </FormGroup>
         )

From decd272884532576604bd369e77fe27cf9ada042 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 9 Apr 2021 17:59:43 -0400
Subject: [PATCH 155/553] refactor(NormalizeFields): Extract component

---
 .../transform/FeedTransformation.js           |  97 +--------
 .../components/transform/NormalizeFields.js   | 185 ++++++++++++++++++
 2 files changed, 193 insertions(+), 89 deletions(-)
 create mode 100644 lib/manager/components/transform/NormalizeFields.js

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 5c8361dad..208d55fbe 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -8,6 +8,7 @@ import Select from 'react-select'
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
 import {getTransformationName} from '../../util/transform'
 import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
+import NormalizeFields from './NormalizeFields'
 
 import type {
   Feed,
@@ -98,70 +99,14 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
         break
       }
       case 'NormalizeFieldTransformation': {
-        const inputIsUnchanged = this.state.fieldName === null
-        const fieldName = inputIsUnchanged
-          ? transformation.fieldName
-          : this.state.fieldName
-
         fields.push(
-          <div>
-            <label htmlFor='fieldName'>
-              Field to normalize:
-              <input
-                id='fieldName'
-                onChange={this._onChangeFieldToNormalize}
-                value={fieldName} />
-            </label>
-            <div style={{marginBottom: '10px'}}>
-              <Button
-                bsSize='xsmall'
-                disabled={inputIsUnchanged}
-                style={{marginRight: '5px'}}
-                onClick={this._onSaveFieldToNormalize}>
-                Save
-              </Button>
-            </div>
-
-            This transform will:
-            <ul style={{ listStyleType: 'none', paddingLeft: '10px'}}>
-              <li>
-                <Checkbox
-                  checked={transformation.capitalize}
-                  onChange={this._onChangeCapitalizeField}
-                >
-                  Capitalize bus stop names
-                </Checkbox>
-                <div>Exceptions:
-                  <FormGroup>
-                    <FormControl
-                      onChange={this._onChangeCapitalizeExceptions}
-                      placeholder='Enter exceptions separated by commas'
-                      type='text'
-                      value={transformation.capitalizeExceptions || ''}
-                    />
-                  </FormGroup>
-                </div>
-              </li>
-              <li>
-                <Checkbox
-                  checked={transformation.performSubstitutions}
-                  inline
-                  onChange={this._onChangePerformSubstitutions}
-                >
-                  Perform the following substitutions:
-                </Checkbox>
-                <FormGroup>
-                  <FormControl
-                    onChange={this._onChangeSubstitutions}
-                    // TODO: Add hint text
-                    placeholder='Enter substitutions in the form old => new, separated by commas'
-                    type='text'
-                    value={transformation.substitutions || ''}
-                  />
-                </FormGroup>
-              </li>
-            </ul>
-          </div>
+          <NormalizeFields
+            feedSource={feedSource}
+            key={index++}
+            index={this.props.index}
+            onSave={this.props.onChange}
+            transformation={transformation}
+          />
         )
         break
       }
@@ -210,32 +155,6 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
     this.props.onChange({csvData}, this.props.index)
   }
 
-  _onChangeFieldToNormalize = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({fieldName: evt.target.value})
-  }
-
-  _onChangeCapitalizeField = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.props.onChange({capitalize: evt.target.checked}, this.props.index)
-  }
-
-  _onChangeCapitalizeExceptions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.props.onChange({capitalizeExceptions: evt.target.value}, this.props.index)
-  }
-
-  _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.props.onChange({performSubstitutions: evt.target.checked}, this.props.index)
-  }
-
-  _onChangeSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.props.onChange({substitutions: evt.target.value}, this.props.index)
-  }
-
-  _onSaveFieldToNormalize = () => {
-    const fieldName = this.state.fieldName || null
-    this.setState({fieldName: null})
-    this.props.onChange({fieldName}, this.props.index)
-  }
-
   _onRemoveTransformation = () => {
     this.props.onRemove(this.props.index)
   }
diff --git a/lib/manager/components/transform/NormalizeFields.js b/lib/manager/components/transform/NormalizeFields.js
new file mode 100644
index 000000000..81fd6bda8
--- /dev/null
+++ b/lib/manager/components/transform/NormalizeFields.js
@@ -0,0 +1,185 @@
+// @flow
+
+import { isEqual } from 'lodash'
+import React, {Component} from 'react'
+import {Button, Checkbox, FormControl, FormGroup} from 'react-bootstrap'
+
+import type {
+  Feed,
+  FeedTransformation as FeedTransformationType
+} from '../../../types'
+
+// TODO: Use the correct feed transformation type instead.
+type State = {
+  capitalize?: boolean,
+  capitalizeExceptions?: string,
+  fieldName: ?string,
+  performSubstitutions?: boolean,
+  substitutions?: string
+}
+
+type Props = {
+  feedSource: Feed,
+  index: number,
+  onSave: (State, number) => void,
+  transformation: FeedTransformationType // TODO: split tranformation types.
+}
+
+function getTransformationFields (transformation: FeedTransformationType): State {
+  const {
+    capitalize,
+    capitalizeExceptions = '',
+    fieldName = '',
+    performSubstitutions,
+    substitutions = ''
+  } = transformation
+  return {
+    capitalize,
+    capitalizeExceptions,
+    fieldName,
+    performSubstitutions,
+    substitutions
+  }
+}
+
+/**
+ * Component that renders input fields for the NoramlizeFieldTransformation.
+ */
+export default class NormalizeFields extends Component<Props, State> {
+  state = {
+    capitalize: true,
+    capitalizeExceptions: '',
+    fieldName: '',
+    performSubstitutions: true,
+    substitutions: ''
+  }
+
+  constructor (props: Props) {
+    super(props)
+    this.state = getTransformationFields(props.transformation)
+  }
+
+  _getValidationIssues = () => {
+    const {feedSource, transformation} = this.props
+    // Get selected version (if applicable).
+    const version = feedSource.feedVersions &&
+      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
+    const issues = []
+    if (!transformation.table) {
+      issues.push('Table must be defined')
+    }
+
+    // TODO: add validation.
+
+    return issues
+  }
+
+  _onChangeFieldToNormalize = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({fieldName: evt.target.value})
+  }
+
+  _onChangeCapitalizeValues = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({capitalize: evt.target.checked})
+  }
+
+  _onChangeCapitalizeExceptions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({capitalizeExceptions: evt.target.value})
+  }
+
+  _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({performSubstitutions: evt.target.checked})
+  }
+
+  _onChangeSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({substitutions: evt.target.value})
+  }
+
+  _onSaveTransformationSettings = () => {
+    this.props.onSave(this.state, this.props.index)
+  }
+
+  componentDidUpdate (prevProps: Props) {
+    const { transformation } = this.props
+    if (!isEqual(transformation, prevProps.transformation)) {
+      this.setState(getTransformationFields(transformation))
+    }
+  }
+
+  render () {
+    const { transformation } = this.props
+    const {
+      capitalize,
+      capitalizeExceptions,
+      fieldName,
+      performSubstitutions,
+      substitutions
+    } = this.state
+
+    const inputIsUnchanged = isEqual(this.state, getTransformationFields(transformation))
+
+    return (
+      <div>
+        <label htmlFor='fieldName'>
+          Field to normalize:
+          <input
+            // TODO: find a component that lists fields of a table.
+            // TODO: add validation.
+            id='fieldName'
+            onChange={this._onChangeFieldToNormalize}
+            value={fieldName}
+          />
+        </label>
+
+        <ul style={{ listStyleType: 'none', paddingLeft: '0px' }}>
+          <li>
+            <Checkbox
+              checked={capitalize}
+              onChange={this._onChangeCapitalizeValues}
+            >
+              Capitalize field value
+            </Checkbox>
+            <span style={{display: 'block'}}>Exceptions (comma-separated):
+              <FormGroup>
+                <FormControl
+                  disabled={!capitalize}
+                  onChange={this._onChangeCapitalizeExceptions}
+                  placeholder='Enter exceptions separated by commas'
+                  type='text'
+                  value={capitalizeExceptions}
+                />
+              </FormGroup>
+            </span>
+          </li>
+          <li>
+            <Checkbox
+              checked={performSubstitutions}
+              onChange={this._onChangePerformSubstitutions}
+            >
+              Perform the following substitutions:
+            </Checkbox>
+            <FormGroup>
+              <FormControl
+                disabled={!performSubstitutions}
+                onChange={this._onChangeSubstitutions}
+                // TODO: Add something to explain the syntax (when finalized).
+                placeholder='Enter substitutions in the form old => new, separated by commas'
+                type='text'
+                value={substitutions}
+              />
+            </FormGroup>
+          </li>
+        </ul>
+        <div style={{marginBottom: '10px'}}>
+          <Button
+            bsSize='xsmall'
+            disabled={inputIsUnchanged}
+            onClick={this._onSaveTransformationSettings}
+            style={{marginRight: '5px'}}
+          >
+            Save
+          </Button>
+        </div>
+      </div>
+    )
+  }
+}

From f83fd3e09ebfc4b6ec1c135531840931f47e1bc5 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 12 Apr 2021 11:52:12 -0400
Subject: [PATCH 156/553] refactor(ReplaceFileFromStringFields): Extract
 component.

---
 i18n/english.yml                              |   4 +-
 .../transform/FeedTransformation.js           |  72 +++---------
 .../components/transform/NormalizeFields.js   |  35 +++---
 .../transform/ReplaceFileFromStringFields.js  | 109 ++++++++++++++++++
 4 files changed, 146 insertions(+), 74 deletions(-)
 create mode 100644 lib/manager/components/transform/ReplaceFileFromStringFields.js

diff --git a/i18n/english.yml b/i18n/english.yml
index 951c0a550..e9d7ee0c4 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -245,8 +245,8 @@ components:
       label: Delete records from %tablePlaceholder%
       name: Delete records transformation
     NormalizeFieldTransformation:
-      label: Normalize fields
-      name: Normalize fields transformation
+      label: Normalize field
+      name: Normalize field transformation
     ReplaceFileFromStringTransformation:
       label: Replace %tablePlaceholder% from %filePlaceholder%
       name: Replace file from string transformation
diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 208d55fbe..4bf279230 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -8,7 +8,8 @@ import Select from 'react-select'
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
 import {getTransformationName} from '../../util/transform'
 import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
-import NormalizeFields from './NormalizeFields'
+import NormalizeFields, {getNormalizeFieldsValidationIssues} from './NormalizeFields'
+import ReplaceFileFromStringFields, {getReplaceFileFromStringValidationIssues} from './ReplaceFileFromStringFields'
 
 import type {
   Feed,
@@ -28,9 +29,7 @@ type Props = {
  * Component that renders fields for a single feed transformation
  * (e.g., ReplaceFileFromStringTransformation).
  */
-export default class FeedTransformation extends Component<Props, {csvData: ?string, fieldName: ?string}> {
-  state = { csvData: null, fieldName: null }
-
+export default class FeedTransformation extends Component<Props> {
   _getFieldsForType = (type: string) => {
     const {feedSource, transformation} = this.props
     // Get selected version (if applicable).
@@ -57,44 +56,14 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
         )
         break
       case 'ReplaceFileFromStringTransformation': {
-        const inputIsUnchanged = this.state.csvData === null
-        const csvData = inputIsUnchanged
-          ? transformation.csvData
-          : this.state.csvData
-        const textValue = csvData || ''
-        const numLines = !textValue ? 0 : textValue.split(/\r*\n/).length
         fields.push(
-          <div>
-            <label htmlFor='csvData'>
-              Add the CSV data to add to/replace in the incoming GTFS:
-              <textarea
-                id='csvData'
-                onChange={this._onChangeCsvData}
-                style={{
-                  fontFamily: 'monospace',
-                  fontSize: 'x-small',
-                  height: '80px',
-                  overflow: 'auto',
-                  width: '400px',
-                  whiteSpace: 'pre'
-                }}
-                placeholder={
-                  `stop_id,stop_code,stop_name,stop_lat,stop_lon
-  1234567,188390987,Broad Ave,33.98768,-87.72686`
-                }
-                value={textValue} />
-            </label>
-            <div style={{marginBottom: '10px'}}>
-              <Button
-                bsSize='xsmall'
-                disabled={inputIsUnchanged}
-                style={{marginRight: '5px'}}
-                onClick={this._onSaveCsvData}>
-                Save CSV
-              </Button>
-              <small>{numLines} lines</small>
-            </div>
-          </div>
+          <ReplaceFileFromStringFields
+            feedSource={feedSource}
+            key={index++}
+            index={this.props.index}
+            onSave={this.props.onChange}
+            transformation={transformation}
+          />
         )
         break
       }
@@ -121,7 +90,7 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
     // Get selected version (if applicable).
     const version = feedSource.feedVersions &&
       feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
-    const issues = []
+    let issues: Array<string> = []
     if (!transformation.table) {
       issues.push('Table must be defined')
     }
@@ -133,28 +102,17 @@ export default class FeedTransformation extends Component<Props, {csvData: ?stri
         }
         break
       case 'ReplaceFileFromStringTransformation':
-        if (!transformation.csvData) {
-          issues.push('CSV Data must be defined')
-        }
-        // TODO: Further validate CSV data based on parsing fields, checking for
-        //   missing columns, etc.
+        issues = issues.concat(getReplaceFileFromStringValidationIssues(transformation))
         break
+      case 'NormalizeFieldTransformation':
+        issues = issues.concat(getNormalizeFieldsValidationIssues(transformation))
+        break;
       default:
         break
     }
     return issues
   }
 
-  _onChangeCsvData = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({csvData: evt.target.value})
-  }
-
-  _onSaveCsvData = () => {
-    const csvData = this.state.csvData || null
-    this.setState({csvData: null})
-    this.props.onChange({csvData}, this.props.index)
-  }
-
   _onRemoveTransformation = () => {
     this.props.onRemove(this.props.index)
   }
diff --git a/lib/manager/components/transform/NormalizeFields.js b/lib/manager/components/transform/NormalizeFields.js
index 81fd6bda8..6b8dfc87b 100644
--- a/lib/manager/components/transform/NormalizeFields.js
+++ b/lib/manager/components/transform/NormalizeFields.js
@@ -42,6 +42,26 @@ function getTransformationFields (transformation: FeedTransformationType): State
   }
 }
 
+/**
+ * Obtain the list of validation issues for the given transformation.
+ */
+export function getNormalizeFieldsValidationIssues (transformation: FeedTransformationType) : Array<string> {
+  const issues = []
+  const { fieldName, performSubstitutions, substitutions } = transformation
+
+  // fieldName must be defined.
+  if (!fieldName || fieldName.length === 0) {
+    issues.push('Field to normalize must be defined.')
+  }
+
+  // If substitutions are enabled, then substitutions must be defined.
+  if (performSubstitutions && (!substitutions || substitutions.length === 0)) {
+    issues.push('Substitutions must be defined when enabling substitutions.')
+  }
+
+  return issues
+}
+
 /**
  * Component that renders input fields for the NoramlizeFieldTransformation.
  */
@@ -59,21 +79,6 @@ export default class NormalizeFields extends Component<Props, State> {
     this.state = getTransformationFields(props.transformation)
   }
 
-  _getValidationIssues = () => {
-    const {feedSource, transformation} = this.props
-    // Get selected version (if applicable).
-    const version = feedSource.feedVersions &&
-      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
-    const issues = []
-    if (!transformation.table) {
-      issues.push('Table must be defined')
-    }
-
-    // TODO: add validation.
-
-    return issues
-  }
-
   _onChangeFieldToNormalize = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({fieldName: evt.target.value})
   }
diff --git a/lib/manager/components/transform/ReplaceFileFromStringFields.js b/lib/manager/components/transform/ReplaceFileFromStringFields.js
new file mode 100644
index 000000000..98f53e32b
--- /dev/null
+++ b/lib/manager/components/transform/ReplaceFileFromStringFields.js
@@ -0,0 +1,109 @@
+// @flow
+
+import Icon from '@conveyal/woonerf/components/icon'
+import { isEqual } from 'lodash'
+import React, {Component} from 'react'
+import {Button, Checkbox, FormControl, FormGroup} from 'react-bootstrap'
+import Select from 'react-select'
+
+import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
+import {getTransformationName} from '../../util/transform'
+import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
+import NormalizeFields from './NormalizeFields'
+
+import type {
+  Feed,
+  FeedTransformation as FeedTransformationType,
+  ReactSelectOption
+} from '../../../types'
+
+type Props = {
+  feedSource: Feed,
+  index: number,
+  onSave: (any, number) => void,
+  transformation: FeedTransformationType
+}
+
+export function getReplaceFileFromStringValidationIssues (transformation: FeedTransformationType) : Array<string> {
+  const issues = []
+
+  // CSV data must be defined.
+  if (!transformation.csvData) {
+    issues.push('CSV data must be defined.')
+  }
+
+  return issues
+}
+
+/**
+ * Component that renders fields for ReplaceFileFromStringTransformation.
+ */
+export default class ReplaceFileFromStringFields extends Component<Props, {csvData: ?string}> {
+  state = { csvData: null }
+
+  componentDidUpdate (prevProps: Props) {
+    const { transformation } = this.props
+    if (!isEqual(transformation, prevProps.transformation)) {
+      this.setState({ csvData: transformation.csvData })
+    }
+  }
+
+  render () {
+    const {feedSource, transformation} = this.props
+    // Get selected version (if applicable).
+    const version = feedSource.feedVersions &&
+      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
+    const fields = []
+    let index = 0
+
+    const inputIsUnchanged = this.state.csvData === null
+    const csvData = inputIsUnchanged
+      ? transformation.csvData
+      : this.state.csvData
+    const textValue = csvData || ''
+    const numLines = !textValue ? 0 : textValue.split(/\r*\n/).length
+
+    return (
+      <div>
+        <label htmlFor='csvData'>
+          Add the CSV data to add to/replace in the incoming GTFS:
+          <textarea
+            id='csvData'
+            onChange={this._onChangeCsvData}
+            style={{
+              fontFamily: 'monospace',
+              fontSize: 'x-small',
+              height: '80px',
+              overflow: 'auto',
+              width: '400px',
+              whiteSpace: 'pre'
+            }}
+            placeholder={
+              `stop_id,stop_code,stop_name,stop_lat,stop_lon
+1234567,188390987,Broad Ave,33.98768,-87.72686`
+            }
+            value={textValue} />
+        </label>
+        <div style={{marginBottom: '10px'}}>
+          <Button
+            bsSize='xsmall'
+            disabled={inputIsUnchanged}
+            style={{marginRight: '5px'}}
+            onClick={this._onSaveCsvData}>
+            Save CSV
+          </Button>
+          <small>{numLines} lines</small>
+        </div>
+      </div>
+    )
+  }
+
+  _onChangeCsvData = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({csvData: evt.target.value})
+  }
+
+  _onSaveCsvData = () => {
+    const csvData = this.state.csvData || null
+    this.props.onSave({csvData}, this.props.index)
+  }
+}

From 95f28f4d31198fe9449940d56592b9a047544fdb Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 12 Apr 2021 15:39:49 -0400
Subject: [PATCH 157/553] refactor(ReplaceFileFromVersionFields): Extract
 component, remove switch cases.

---
 lib/common/constants/index.js                 |   2 +-
 .../transform/FeedTransformation.js           | 117 ++++++------------
 .../components/transform/NormalizeFields.js   |   2 +-
 .../transform/ReplaceFileFromStringFields.js  |  37 ++----
 .../transform/ReplaceFileFromVersionFields.js |  69 +++++++++++
 5 files changed, 118 insertions(+), 109 deletions(-)
 create mode 100644 lib/manager/components/transform/ReplaceFileFromVersionFields.js

diff --git a/lib/common/constants/index.js b/lib/common/constants/index.js
index dc11026f9..2d34cc3ac 100644
--- a/lib/common/constants/index.js
+++ b/lib/common/constants/index.js
@@ -35,6 +35,6 @@ export const RETRIEVAL_METHODS = Object.freeze({
 export const FEED_TRANSFORMATION_TYPES = Object.freeze({
   DELETE_RECORDS: 'DeleteRecordsTransformation',
   NORMALIZE_FIELDS: 'NormalizeFieldTransformation',
-  REPLACE_FILE_FROM_VERSION: 'ReplaceFileFromVersionTransformation',
   REPLACE_FILE_FROM_STRING: 'ReplaceFileFromStringTransformation',
+  REPLACE_FILE_FROM_VERSION: 'ReplaceFileFromVersionTransformation'
 })
diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 4bf279230..6c585ec7a 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -2,14 +2,14 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import {Button, Checkbox, FormControl, FormGroup} from 'react-bootstrap'
+import {Button} from 'react-bootstrap'
 import Select from 'react-select'
 
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
 import {getTransformationName} from '../../util/transform'
-import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
 import NormalizeFields, {getNormalizeFieldsValidationIssues} from './NormalizeFields'
 import ReplaceFileFromStringFields, {getReplaceFileFromStringValidationIssues} from './ReplaceFileFromStringFields'
+import ReplaceFileFromVersionFields, {getReplaceFileFromVersionValidationIssues} from './ReplaceFileFromVersionFields'
 
 import type {
   Feed,
@@ -25,90 +25,52 @@ type Props = {
   transformation: FeedTransformationType
 }
 
+// An index of UI components and validation checks for different transformation types.
+// (All transformation types should be listed, but component and/or getValidationIssues for each are optional.)
+const transformationTypes = {
+  DeleteRecordsTransformation: {},
+  NormalizeFieldTransformation: {
+    component: NormalizeFields,
+    getValidationIssues: getNormalizeFieldsValidationIssues
+  },
+  ReplaceFileFromStringTransformation: {
+    component: ReplaceFileFromStringFields,
+    getValidationIssues: getReplaceFileFromStringValidationIssues
+  },
+  ReplaceFileFromVersionTransformation: {
+    component: ReplaceFileFromVersionFields,
+    getValidationIssues: getReplaceFileFromVersionValidationIssues
+  }
+}
+
 /**
  * Component that renders fields for a single feed transformation
  * (e.g., ReplaceFileFromStringTransformation).
  */
 export default class FeedTransformation extends Component<Props> {
   _getFieldsForType = (type: string) => {
-    const {feedSource, transformation} = this.props
-    // Get selected version (if applicable).
-    const version = feedSource.feedVersions &&
-      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
-    const fields = []
-    let index = 0
-    switch (type) {
-      case 'ReplaceFileFromVersionTransformation':
-        fields.push(
-          <VersionSelectorDropdown
-            key={index++}
-            dropdownProps={{
-              id: 'merge-versions-dropdown',
-              onSelect: this._onSelectVersion
-            }}
-            title={version
-              ? `From source version ${version.version}`
-              : 'Select a source version'
-            }
-            version={version}
-            versions={feedSource.feedVersions}
-          />
-        )
-        break
-      case 'ReplaceFileFromStringTransformation': {
-        fields.push(
-          <ReplaceFileFromStringFields
-            feedSource={feedSource}
-            key={index++}
-            index={this.props.index}
-            onSave={this.props.onChange}
-            transformation={transformation}
-          />
-        )
-        break
-      }
-      case 'NormalizeFieldTransformation': {
-        fields.push(
-          <NormalizeFields
-            feedSource={feedSource}
-            key={index++}
-            index={this.props.index}
-            onSave={this.props.onChange}
-            transformation={transformation}
-          />
-        )
-        break
-      }
-      default:
-        break
-    }
-    return fields
+    const {feedSource, index, onChange, transformation} = this.props
+    const FieldsComponent = transformationTypes[type].component
+    return FieldsComponent && (
+      <FieldsComponent
+        feedSource={feedSource}
+        index={index}
+        onSave={onChange}
+        transformation={transformation}
+      />
+    )
   }
 
   _getValidationIssues = () => {
     const {feedSource, transformation} = this.props
-    // Get selected version (if applicable).
-    const version = feedSource.feedVersions &&
-      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
     let issues: Array<string> = []
     if (!transformation.table) {
       issues.push('Table must be defined')
     }
-    switch (transformation['@type']) {
-      case 'ReplaceFileFromVersionTransformation':
-        // Only trigger validation issue if versions have been loaded.
-        if (!version && feedSource.feedVersions) {
-          issues.push('Version must be defined')
-        }
-        break
-      case 'ReplaceFileFromStringTransformation':
-        issues = issues.concat(getReplaceFileFromStringValidationIssues(transformation))
-        break
-      case 'NormalizeFieldTransformation':
-        issues = issues.concat(getNormalizeFieldsValidationIssues(transformation))
-        break;
-      default:
-        break
+
+    const {getValidationIssues} = transformationTypes[transformation['@type']]
+    if (typeof getValidationIssues === 'function') {
+      issues = issues.concat(getValidationIssues(transformation, feedSource))
     }
     return issues
   }
@@ -121,16 +83,6 @@ export default class FeedTransformation extends Component<Props> {
     this.props.onChange({table: tableOption.value}, this.props.index)
   }
 
-  _onSelectVersion = (versionIndex: number) => {
-    const {feedSource, onChange} = this.props
-    if (feedSource.feedVersions) {
-      const version = feedSource.feedVersions[versionIndex - 1]
-      onChange({sourceVersionId: version.id}, this.props.index)
-    } else {
-      console.warn('Feed source does not have list of feed versions')
-    }
-  }
-
   render () {
     const {feedSource, index, transformation} = this.props
     const tables = [...getGtfsSpec()].filter(t => !t.datatools)
@@ -140,6 +92,7 @@ export default class FeedTransformation extends Component<Props> {
     const backgroundColor = validationIssues.length === 0
       ? '#f7f7f7'
       : '#ffdf68'
+
     return (
       <div style={{
         backgroundColor,
diff --git a/lib/manager/components/transform/NormalizeFields.js b/lib/manager/components/transform/NormalizeFields.js
index 6b8dfc87b..b15ce11fd 100644
--- a/lib/manager/components/transform/NormalizeFields.js
+++ b/lib/manager/components/transform/NormalizeFields.js
@@ -45,7 +45,7 @@ function getTransformationFields (transformation: FeedTransformationType): State
 /**
  * Obtain the list of validation issues for the given transformation.
  */
-export function getNormalizeFieldsValidationIssues (transformation: FeedTransformationType) : Array<string> {
+export function getNormalizeFieldsValidationIssues (transformation: FeedTransformationType, feedSource: Feed): Array<string> {
   const issues = []
   const { fieldName, performSubstitutions, substitutions } = transformation
 
diff --git a/lib/manager/components/transform/ReplaceFileFromStringFields.js b/lib/manager/components/transform/ReplaceFileFromStringFields.js
index 98f53e32b..e18febf02 100644
--- a/lib/manager/components/transform/ReplaceFileFromStringFields.js
+++ b/lib/manager/components/transform/ReplaceFileFromStringFields.js
@@ -1,20 +1,12 @@
 // @flow
 
-import Icon from '@conveyal/woonerf/components/icon'
 import { isEqual } from 'lodash'
 import React, {Component} from 'react'
-import {Button, Checkbox, FormControl, FormGroup} from 'react-bootstrap'
-import Select from 'react-select'
-
-import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
-import {getTransformationName} from '../../util/transform'
-import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
-import NormalizeFields from './NormalizeFields'
+import {Button} from 'react-bootstrap'
 
 import type {
   Feed,
-  FeedTransformation as FeedTransformationType,
-  ReactSelectOption
+  FeedTransformation as FeedTransformationType
 } from '../../../types'
 
 type Props = {
@@ -24,7 +16,7 @@ type Props = {
   transformation: FeedTransformationType
 }
 
-export function getReplaceFileFromStringValidationIssues (transformation: FeedTransformationType) : Array<string> {
+export function getReplaceFileFromStringValidationIssues (transformation: FeedTransformationType, feedSource: Feed): Array<string> {
   const issues = []
 
   // CSV data must be defined.
@@ -49,13 +41,7 @@ export default class ReplaceFileFromStringFields extends Component<Props, {csvDa
   }
 
   render () {
-    const {feedSource, transformation} = this.props
-    // Get selected version (if applicable).
-    const version = feedSource.feedVersions &&
-      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
-    const fields = []
-    let index = 0
-
+    const {transformation} = this.props
     const inputIsUnchanged = this.state.csvData === null
     const csvData = inputIsUnchanged
       ? transformation.csvData
@@ -70,26 +56,27 @@ export default class ReplaceFileFromStringFields extends Component<Props, {csvDa
           <textarea
             id='csvData'
             onChange={this._onChangeCsvData}
+            placeholder={
+              `stop_id,stop_code,stop_name,stop_lat,stop_lon
+1234567,188390987,Broad Ave,33.98768,-87.72686`
+            }
             style={{
               fontFamily: 'monospace',
               fontSize: 'x-small',
               height: '80px',
               overflow: 'auto',
-              width: '400px',
-              whiteSpace: 'pre'
+              whiteSpace: 'pre',
+              width: '400px'
             }}
-            placeholder={
-              `stop_id,stop_code,stop_name,stop_lat,stop_lon
-1234567,188390987,Broad Ave,33.98768,-87.72686`
-            }
             value={textValue} />
         </label>
         <div style={{marginBottom: '10px'}}>
           <Button
             bsSize='xsmall'
             disabled={inputIsUnchanged}
+            onClick={this._onSaveCsvData}
             style={{marginRight: '5px'}}
-            onClick={this._onSaveCsvData}>
+          >
             Save CSV
           </Button>
           <small>{numLines} lines</small>
diff --git a/lib/manager/components/transform/ReplaceFileFromVersionFields.js b/lib/manager/components/transform/ReplaceFileFromVersionFields.js
new file mode 100644
index 000000000..d5fd05c28
--- /dev/null
+++ b/lib/manager/components/transform/ReplaceFileFromVersionFields.js
@@ -0,0 +1,69 @@
+// @flow
+
+import React, {Component} from 'react'
+
+import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
+
+import type {
+  Feed,
+  FeedTransformation as FeedTransformationType
+} from '../../../types'
+
+type Props = {
+  feedSource: Feed,
+  index: number,
+  onSave: (any, number) => void,
+  transformation: FeedTransformationType
+}
+
+export function getReplaceFileFromVersionValidationIssues (transformation: FeedTransformationType, feedSource: Feed) {
+  // Get selected version (if applicable).
+  const version = feedSource.feedVersions &&
+    feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
+  const issues: Array<string> = []
+
+  // Only trigger validation issue if versions have been loaded.
+  if (!version && feedSource.feedVersions) {
+    issues.push('Version must be defined')
+  }
+
+  return issues
+}
+
+/**
+ * Component that renders fields for a single feed transformation
+ * (e.g., ReplaceFileFromStringTransformation).
+ */
+export default class ReplaceFileFromVersionFields extends Component<Props> {
+  _onSelectVersion = (versionIndex: number) => {
+    const {feedSource, onSave} = this.props
+    if (feedSource.feedVersions) {
+      const version = feedSource.feedVersions[versionIndex - 1]
+      onSave({sourceVersionId: version.id}, this.props.index)
+    } else {
+      console.warn('Feed source does not have list of feed versions')
+    }
+  }
+
+  render () {
+    const {feedSource, transformation} = this.props
+    // Get selected version (if applicable).
+    const version = feedSource.feedVersions &&
+      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
+
+    return (
+      <VersionSelectorDropdown
+        dropdownProps={{
+          id: 'merge-versions-dropdown',
+          onSelect: this._onSelectVersion
+        }}
+        title={version
+          ? `From source version ${version.version}`
+          : 'Select a source version'
+        }
+        version={version}
+        versions={feedSource.feedVersions}
+      />
+    )
+  }
+}

From 2833f87e25e96c9e5cbcf1f11391c4170c09a804 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 12 Apr 2021 16:46:52 -0400
Subject: [PATCH 158/553] refactor: Rename transform field components.

---
 .../components/transform/FeedTransformation.js     | 14 +++++++-------
 .../{NormalizeFields.js => NormalizeField.js}      |  3 +--
 ...romStringFields.js => ReplaceFileFromString.js} |  2 +-
 ...mVersionFields.js => ReplaceFileFromVersion.js} |  5 ++---
 lib/types/index.js                                 |  4 ++--
 5 files changed, 13 insertions(+), 15 deletions(-)
 rename lib/manager/components/transform/{NormalizeFields.js => NormalizeField.js} (98%)
 rename lib/manager/components/transform/{ReplaceFileFromStringFields.js => ReplaceFileFromString.js} (96%)
 rename lib/manager/components/transform/{ReplaceFileFromVersionFields.js => ReplaceFileFromVersion.js} (90%)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 6c585ec7a..31d4b5356 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -7,9 +7,9 @@ import Select from 'react-select'
 
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
 import {getTransformationName} from '../../util/transform'
-import NormalizeFields, {getNormalizeFieldsValidationIssues} from './NormalizeFields'
-import ReplaceFileFromStringFields, {getReplaceFileFromStringValidationIssues} from './ReplaceFileFromStringFields'
-import ReplaceFileFromVersionFields, {getReplaceFileFromVersionValidationIssues} from './ReplaceFileFromVersionFields'
+import NormalizeField, {getNormalizeFieldsValidationIssues} from './NormalizeField'
+import ReplaceFileFromString, {getReplaceFileFromStringValidationIssues} from './ReplaceFileFromString'
+import ReplaceFileFromVersion, {getReplaceFileFromVersionValidationIssues} from './ReplaceFileFromVersion'
 
 import type {
   Feed,
@@ -30,21 +30,21 @@ type Props = {
 const transformationTypes = {
   DeleteRecordsTransformation: {},
   NormalizeFieldTransformation: {
-    component: NormalizeFields,
+    component: NormalizeField,
     getValidationIssues: getNormalizeFieldsValidationIssues
   },
   ReplaceFileFromStringTransformation: {
-    component: ReplaceFileFromStringFields,
+    component: ReplaceFileFromString,
     getValidationIssues: getReplaceFileFromStringValidationIssues
   },
   ReplaceFileFromVersionTransformation: {
-    component: ReplaceFileFromVersionFields,
+    component: ReplaceFileFromVersion,
     getValidationIssues: getReplaceFileFromVersionValidationIssues
   }
 }
 
 /**
- * Component that renders fields for a single feed transformation
+ * Component that renders fields for one feed transformation
  * (e.g., ReplaceFileFromStringTransformation).
  */
 export default class FeedTransformation extends Component<Props> {
diff --git a/lib/manager/components/transform/NormalizeFields.js b/lib/manager/components/transform/NormalizeField.js
similarity index 98%
rename from lib/manager/components/transform/NormalizeFields.js
rename to lib/manager/components/transform/NormalizeField.js
index b15ce11fd..eba827ba7 100644
--- a/lib/manager/components/transform/NormalizeFields.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -65,7 +65,7 @@ export function getNormalizeFieldsValidationIssues (transformation: FeedTransfor
 /**
  * Component that renders input fields for the NoramlizeFieldTransformation.
  */
-export default class NormalizeFields extends Component<Props, State> {
+export default class NormalizeField extends Component<Props, State> {
   state = {
     capitalize: true,
     capitalizeExceptions: '',
@@ -128,7 +128,6 @@ export default class NormalizeFields extends Component<Props, State> {
           Field to normalize:
           <input
             // TODO: find a component that lists fields of a table.
-            // TODO: add validation.
             id='fieldName'
             onChange={this._onChangeFieldToNormalize}
             value={fieldName}
diff --git a/lib/manager/components/transform/ReplaceFileFromStringFields.js b/lib/manager/components/transform/ReplaceFileFromString.js
similarity index 96%
rename from lib/manager/components/transform/ReplaceFileFromStringFields.js
rename to lib/manager/components/transform/ReplaceFileFromString.js
index e18febf02..626910d59 100644
--- a/lib/manager/components/transform/ReplaceFileFromStringFields.js
+++ b/lib/manager/components/transform/ReplaceFileFromString.js
@@ -30,7 +30,7 @@ export function getReplaceFileFromStringValidationIssues (transformation: FeedTr
 /**
  * Component that renders fields for ReplaceFileFromStringTransformation.
  */
-export default class ReplaceFileFromStringFields extends Component<Props, {csvData: ?string}> {
+export default class ReplaceFileFromString extends Component<Props, {csvData: ?string}> {
   state = { csvData: null }
 
   componentDidUpdate (prevProps: Props) {
diff --git a/lib/manager/components/transform/ReplaceFileFromVersionFields.js b/lib/manager/components/transform/ReplaceFileFromVersion.js
similarity index 90%
rename from lib/manager/components/transform/ReplaceFileFromVersionFields.js
rename to lib/manager/components/transform/ReplaceFileFromVersion.js
index d5fd05c28..55b58a613 100644
--- a/lib/manager/components/transform/ReplaceFileFromVersionFields.js
+++ b/lib/manager/components/transform/ReplaceFileFromVersion.js
@@ -31,10 +31,9 @@ export function getReplaceFileFromVersionValidationIssues (transformation: FeedT
 }
 
 /**
- * Component that renders fields for a single feed transformation
- * (e.g., ReplaceFileFromStringTransformation).
+ * Component that renders fields for ReplaceFileFromVersionTransformation.
  */
-export default class ReplaceFileFromVersionFields extends Component<Props> {
+export default class ReplaceFileFromVersion extends Component<Props> {
   _onSelectVersion = (versionIndex: number) => {
     const {feedSource, onSave} = this.props
     if (feedSource.feedVersions) {
diff --git a/lib/types/index.js b/lib/types/index.js
index f0b91fd3a..fabce763c 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -295,14 +295,14 @@ export type FeedTransformation = {
   '@type': $Values<typeof FEED_TRANSFORMATION_TYPES>,
   active: boolean,
 
-  // TODO: Split the types for different transformations
   capitalize?: boolean,
   capitalizeExceptions?: string,
+  fieldName?: string,
   performSubstitutions?: boolean,
   substitutions?: string,
 
   csvData?: string,
-  fieldName?: string,
+
   matchField?: string,
   matchValues?: Array<string>,
   sourceVersionId?: string,

From d62312516b72e2d8446ba4ee8607c70d3d2d29f9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 12 Apr 2021 18:13:08 -0400
Subject: [PATCH 159/553] refactor(NormalizeField): Add gtfs field selector.

---
 lib/common/constants/index.js                 |  2 +-
 .../transform/FeedTransformation.js           |  1 +
 .../components/transform/NormalizeField.js    | 70 +++++++++++++++----
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/lib/common/constants/index.js b/lib/common/constants/index.js
index 2d34cc3ac..6782195bc 100644
--- a/lib/common/constants/index.js
+++ b/lib/common/constants/index.js
@@ -34,7 +34,7 @@ export const RETRIEVAL_METHODS = Object.freeze({
 
 export const FEED_TRANSFORMATION_TYPES = Object.freeze({
   DELETE_RECORDS: 'DeleteRecordsTransformation',
-  NORMALIZE_FIELDS: 'NormalizeFieldTransformation',
+  NORMALIZE_FIELD: 'NormalizeFieldTransformation',
   REPLACE_FILE_FROM_STRING: 'ReplaceFileFromStringTransformation',
   REPLACE_FILE_FROM_VERSION: 'ReplaceFileFromVersionTransformation'
 })
diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 31d4b5356..273eef2b0 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -114,6 +114,7 @@ export default class FeedTransformation extends Component<Props> {
           <Select
             style={{margin: '10px 0px', width: '230px'}}
             clearable={false}
+            searchable={false}
             placeholder='Choose the file/table to replace'
             options={tables.map(table => ({value: table.name.split('.txt')[0], label: table.name}))}
             value={transformation.table}
diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index eba827ba7..2fe5f4362 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -1,12 +1,17 @@
 // @flow
 
-import { isEqual } from 'lodash'
+import {isEqual} from 'lodash'
 import React, {Component} from 'react'
 import {Button, Checkbox, FormControl, FormGroup} from 'react-bootstrap'
+import Select from 'react-select'
+
+import {getGtfsSpec} from '../../../common/util/config'
 
 import type {
   Feed,
-  FeedTransformation as FeedTransformationType
+  FeedTransformation as FeedTransformationType,
+  GtfsSpecTable,
+  ReactSelectOption
 } from '../../../types'
 
 // TODO: Use the correct feed transformation type instead.
@@ -79,8 +84,8 @@ export default class NormalizeField extends Component<Props, State> {
     this.state = getTransformationFields(props.transformation)
   }
 
-  _onChangeFieldToNormalize = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({fieldName: evt.target.value})
+  _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
+    this.setState({fieldName: fieldOption.value})
   }
 
   _onChangeCapitalizeValues = (evt: SyntheticInputEvent<HTMLInputElement>) => {
@@ -124,15 +129,11 @@ export default class NormalizeField extends Component<Props, State> {
 
     return (
       <div>
-        <label htmlFor='fieldName'>
-          Field to normalize:
-          <input
-            // TODO: find a component that lists fields of a table.
-            id='fieldName'
-            onChange={this._onChangeFieldToNormalize}
-            value={fieldName}
-          />
-        </label>
+        <GtfsFieldSelector
+          onChange={this._onChangeFieldToNormalize}
+          selectedField={fieldName}
+          tableName={transformation.table}
+        />
 
         <ul style={{ listStyleType: 'none', paddingLeft: '0px' }}>
           <li>
@@ -140,7 +141,7 @@ export default class NormalizeField extends Component<Props, State> {
               checked={capitalize}
               onChange={this._onChangeCapitalizeValues}
             >
-              Capitalize field value
+              Capitalize value
             </Checkbox>
             <span style={{display: 'block'}}>Exceptions (comma-separated):
               <FormGroup>
@@ -187,3 +188,44 @@ export default class NormalizeField extends Component<Props, State> {
     )
   }
 }
+
+type GtfsFieldSelectorProps = {
+  onChange: (ReactSelectOption => void),
+  selectedField: ?string,
+  tableName: ?string
+}
+
+/**
+ * Obtains the desired GTFS spec table.
+ */
+function getGtfsTableSpec (tableName: string): ?GtfsSpecTable {
+  const spec = getGtfsSpec()
+  if (!spec) {
+    throw new Error('GTFS spec could not be found!')
+  }
+  const tableFile = `${tableName}.txt`
+  return spec.find(t => t.name === tableFile)
+}
+
+/**
+ * Dropdown selector to select a field from a given GTFS table.
+ */
+const GtfsFieldSelector = (props: GtfsFieldSelectorProps) => {
+  const { onChange, selectedField, tableName } = props
+  if (!tableName) return null
+
+  const table = getGtfsTableSpec(tableName)
+  if (!table) return null
+
+  return (
+    <Select
+      clearable={false}
+      onChange={onChange}
+      options={table.fields.map((field, colIndex) => ({label: field.name, value: field.name}))}
+      placeholder='Choose the field to normalize'
+      searchable={false}
+      style={{margin: '10px 0px', width: '230px'}}
+      value={selectedField}
+    />
+  )
+}

From cdf1ff4714ecadbfd8c1135634049cf7b7448ba5 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 12 Apr 2021 18:31:14 -0400
Subject: [PATCH 160/553] refactor(NormalizeField): Merge types for state and
 transform props.

---
 .../components/transform/NormalizeField.js     | 18 +++++-------------
 lib/types/index.js                             | 12 +++++++-----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 2fe5f4362..de8a55f4e 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -11,26 +11,18 @@ import type {
   Feed,
   FeedTransformation as FeedTransformationType,
   GtfsSpecTable,
+  NormalizeFieldFields,
   ReactSelectOption
 } from '../../../types'
 
-// TODO: Use the correct feed transformation type instead.
-type State = {
-  capitalize?: boolean,
-  capitalizeExceptions?: string,
-  fieldName: ?string,
-  performSubstitutions?: boolean,
-  substitutions?: string
-}
-
 type Props = {
   feedSource: Feed,
   index: number,
-  onSave: (State, number) => void,
-  transformation: FeedTransformationType // TODO: split tranformation types.
+  onSave: (NormalizeFieldFields, number) => void,
+  transformation: FeedTransformationType
 }
 
-function getTransformationFields (transformation: FeedTransformationType): State {
+function getTransformationFields (transformation: FeedTransformationType): NormalizeFieldFields {
   const {
     capitalize,
     capitalizeExceptions = '',
@@ -70,7 +62,7 @@ export function getNormalizeFieldsValidationIssues (transformation: FeedTransfor
 /**
  * Component that renders input fields for the NoramlizeFieldTransformation.
  */
-export default class NormalizeField extends Component<Props, State> {
+export default class NormalizeField extends Component<Props, NormalizeFieldFields> {
   state = {
     capitalize: true,
     capitalizeExceptions: '',
diff --git a/lib/types/index.js b/lib/types/index.js
index fabce763c..99128e45a 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -291,24 +291,26 @@ export type RetrievalMethod = $Values<typeof RETRIEVAL_METHODS>
 
 export type FetchFrequency = $Values<typeof FETCH_FREQUENCIES>
 
-export type FeedTransformation = {
-  '@type': $Values<typeof FEED_TRANSFORMATION_TYPES>,
-  active: boolean,
-
+export type NormalizeFieldFields = {
   capitalize?: boolean,
   capitalizeExceptions?: string,
   fieldName?: string,
   performSubstitutions?: boolean,
   substitutions?: string,
+}
 
+export type FeedTransformationBase = {
+  '@type': $Values<typeof FEED_TRANSFORMATION_TYPES>,
+  active: boolean,
   csvData?: string,
-
   matchField?: string,
   matchValues?: Array<string>,
   sourceVersionId?: string,
   table: ?string
 }
 
+export type FeedTransformation = FeedTransformationBase & NormalizeFieldFields
+
 export type FeedTransformRules = {
   active: boolean,
   createNewVersion: boolean,

From 07a06a6f90a27c2a67fb09f6f375f7d4f954b932 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Tue, 20 Apr 2021 13:43:17 +0100
Subject: [PATCH 161/553] refactor(gtfs.yml, EditorInput.js): Refactored code

Added a group option to the gtfs route types options. Added method to render the route type options.

#656
---
 gtfs.yml                             | 83 ++++++++++++++++++++++++++++
 lib/editor/components/EditorInput.js | 41 ++++++++++----
 2 files changed, 112 insertions(+), 12 deletions(-)

diff --git a/gtfs.yml b/gtfs.yml
index 17b76574c..d71a39d23 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -276,170 +276,253 @@
     options:
     - value: 3
       text: Bus
+      group: Standard
     - value: 0
       text: Tram
+      group: Standard
     - value: 1
       text: Subway
+      group: Standard
     - value: 2
       text: Rail
+      group: Standard
     - value: 4
       text: Ferry
+      group: Standard
     - value: 5
       text: Cable car
+      group: Standard
     - value: 6
       text: Gondola
+      group: Standard
     - value: 7
       text: Funicular
+      group: Extended
     - value: 100
       text: Railway Service
+      group: Extended
     - value: 100
       text: Railway Service
+      group: Extended
     - value: 101
       text: High Speed Rail Service
+      group: Extended
     - value: 102
       text: Long Distance Trains
+      group: Extended
     - value: 103
       text: Inter Regional Rail Service
+      group: Extended
     - value: 104
       text: Car Transport Rail Service
+      group: Extended
     - value: 105
       text: Sleeper Rail Service
+      group: Extended
     - value: 106
       text: Regional Rail Service
+      group: Extended
     - value: 107
       text: Tourist Railway Service
+      group: Extended
     - value: 108
       text: Rail Shuttle (Within Complex)
+      group: Extended
     - value: 109
       text: Suburban Railway
+      group: Extended
     - value: 110
       text: Replacement Rail Service
+      group: Extended
     - value: 111
       text: Special Rail Service
+      group: Extended
     - value: 112
       text: Lorry Transport Rail Service
+      group: Extended
     - value: 113
       text: All Rail Services
+      group: Extended
     - value: 114
       text: Cross-Country Rail Service
+      group: Extended
     - value: 115
       text: Vehicle Transport Rail Service
+      group: Extended
     - value: 116
       text: Rack and Pinion Railway
+      group: Extended
     - value: 117
       text: Additional Rail Service
+      group: Extended
     - value: 200
       text: Coach Service
+      group: Extended
     - value: 201
       text: International Coach Service
+      group: Extended
     - value: 202
       text: National Coach Service
+      group: Extended
     - value: 203
       text: Shuttle Coach Service
+      group: Extended
     - value: 204
       text: Regional Coach Service
+      group: Extended
     - value: 205
       text: Special Coach Service
+      group: Extended
     - value: 206
       text: Sightseeing Coach Service
+      group: Extended
     - value: 207
       text: Tourist Coach Service
+      group: Extended
     - value: 208
       text: Commuter Coach Service
+      group: Extended
     - value: 209
       text: All Coach Services
+      group: Extended
     - value: 400
       text: Urban Railway Service
+      group: Extended
     - value: 401
       text: Metro Service
+      group: Extended
     - value: 402
       text: Underground Service
+      group: Extended
     - value: 403
       text: Urban Railway Service
+      group: Extended
     - value: 404
       text: All Urban Railway Services
+      group: Extended
     - value: 405
       text: Monorail
+      group: Extended
     - value: 700
       text: Bus Service
+      group: Extended
     - value: 701
       text: Regional Bus Service
+      group: Extended
     - value: 702
       text: Express Bus Service
+      group: Extended
     - value: 703
       text: Stopping Bus Service
+      group: Extended
     - value: 704
       text: Local Bus Service
+      group: Extended
     - value: 705
       text: Night Bus Service
+      group: Extended
     - value: 706
       text: Post Bus Service
+      group: Extended
     - value: 707
       text: Special Needs Bus
+      group: Extended
     - value: 708
       text: Mobility Bus Service
+      group: Extended
     - value: 709
       text: Mobility Bus for Registered Disabled
+      group: Extended
     - value: 710
       text: Sightseeing Bus
+      group: Extended
     - value: 711
       text: Shuttle Bus
+      group: Extended
     - value: 712
       text: School Bus
+      group: Extended
     - value: 713
       text: School and Public Service Bus
+      group: Extended
     - value: 714
       text: Rail Replacement Bus Service
+      group: Extended
     - value: 715
       text: Demand and Response Bus Service
+      group: Extended
     - value: 716
       text: All Bus Services
+      group: Extended
     - value: 800
       text: Trolleybus Service
+      group: Extended
     - value: 900
       text: Tram Service
+      group: Extended
     - value: 901
       text: City Tram Service
+      group: Extended
     - value: 902
       text: Local Tram Service
+      group: Extended
     - value: 903
       text: Regional Tram Service
+      group: Extended
     - value: 904
       text: Sightseeing Tram Service
+      group: Extended
     - value: 905
       text: Shuttle Tram Service
+      group: Extended
     - value: 906
       text: All Tram Services
+      group: Extended
     - value: 1000
       text: Water Transport Service
+      group: Extended
     - value: 1100
       text: Air Service
+      group: Extended
     - value: 1200
       text: Ferry Service
+      group: Extended
     - value: 1300
       text: Aerial Lift Service
+      group: Extended
     - value: 1400
       text: Funicular Service
+      group: Extended
     - value: 1500
       text: Taxi Service
+      group: Extended
     - value: 1501
       text: Communal Taxi Service
+      group: Extended
     - value: 1502
       text: Water Taxi Service
+      group: Extended
     - value: 1503
       text: Rail Taxi Service
+      group: Extended
     - value: 1504
       text: Bike Taxi Service
+      group: Extended
     - value: 1505
       text: Licensed Taxi Service
+      group: Extended
     - value: 1506
       text: Private Hire Service Vehicle
+      group: Extended
     - value: 1507
       text: All Taxi Services
+      group: Extended
     - value: 1700
       text: Miscellaneous Service
+      group: Extended
     - value: 1702
       text: Horse-drawn Carriage
+      group: Extended
     columnWidth: 6
     helpContent: The route_type field describes the type of transportation used on a route. Valid values for this field are...
   - name: route_sort_order
diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 8836ba34b..473259085 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -118,6 +118,33 @@ export default class EditorInput extends Component<Props> {
     }
   }
 
+  _renderRouteTypeOptions = (field: any) => {
+    const standardTypes = []
+    const extendedTypes = []
+    const routeTypes = ['Standard', 'Extended']
+    const fieldOptions = field.options
+    for (const option in fieldOptions) {
+      if (fieldOptions[option].group === 'Standard') {
+        standardTypes.push(fieldOptions[option])
+      } else {
+        extendedTypes.push(fieldOptions[option])
+      }
+    }
+    return (
+      routeTypes.map<any>(type => (
+        <optgroup key={type} label={type}>
+          {type === 'Standard'
+            ? standardTypes.map<any>(sType => (
+              <option key={sType.value}>{sType.text}</option>
+            ))
+            : extendedTypes.map<any>(exType => (
+              <option key={exType.value}>{exType.text}</option>
+            ))
+          }
+        </optgroup>
+      )))
+  }
+
   render () {
     const {
       activeEntity,
@@ -300,8 +327,6 @@ export default class EditorInput extends Component<Props> {
           </span>
         )
       case 'DROPDOWN':
-        const standard = 'Standard'
-        const extended = 'Extended'
         return (
           <FormGroup
             {...formProps}
@@ -316,16 +341,8 @@ export default class EditorInput extends Component<Props> {
                 ? <option disabled value=''>{field.required ? '-- select an option --' : '(optional)' }</option>
                 : null
               }
-              {field.name === 'route_type' &&
-                <optgroup label={standard}>
-                  {field.options.slice(0, 7).map(o => (
-                    <option value={o.value} key={o.value}>{o.text} ({o.value})</option>))}
-                </optgroup>}
-              {field.name === 'route_type' &&
-                <optgroup label={extended}>
-                  {field.options.slice(8).map(o => (
-                    <option value={o.value} key={o.value}>{o.text} ({o.value})</option>))}
-                </optgroup>}
+              {field.name === 'route_type' && (
+                this._renderRouteTypeOptions(field)
               )}
               {field.name !== 'route_type' && field.options && field.options.map(o => (<option value={o.value} key={o.value}>{o.text || o.value}</option>))}}
             </FormControl>

From c6989f8425c9510ad01bed1e42e7db270379c188 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 20 Apr 2021 19:46:09 -0400
Subject: [PATCH 162/553] refactor(EditorInput): suggest changes for #656

---
 gtfs.yml                             | 93 ++--------------------------
 lib/editor/components/EditorInput.js | 69 +++++++++++----------
 2 files changed, 40 insertions(+), 122 deletions(-)

diff --git a/gtfs.yml b/gtfs.yml
index d71a39d23..9baf2d08c 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -276,253 +276,168 @@
     options:
     - value: 3
       text: Bus
-      group: Standard
     - value: 0
       text: Tram
-      group: Standard
     - value: 1
       text: Subway
-      group: Standard
     - value: 2
       text: Rail
-      group: Standard
     - value: 4
       text: Ferry
-      group: Standard
     - value: 5
       text: Cable car
-      group: Standard
     - value: 6
       text: Gondola
-      group: Standard
     - value: 7
       text: Funicular
-      group: Extended
+    - value: 11
+      text: Trolleybus
+    - value: 12
+      text: Monorail
     - value: 100
       text: Railway Service
-      group: Extended
     - value: 100
       text: Railway Service
-      group: Extended
     - value: 101
       text: High Speed Rail Service
-      group: Extended
     - value: 102
       text: Long Distance Trains
-      group: Extended
     - value: 103
       text: Inter Regional Rail Service
-      group: Extended
     - value: 104
       text: Car Transport Rail Service
-      group: Extended
     - value: 105
       text: Sleeper Rail Service
-      group: Extended
     - value: 106
       text: Regional Rail Service
-      group: Extended
     - value: 107
       text: Tourist Railway Service
-      group: Extended
     - value: 108
       text: Rail Shuttle (Within Complex)
-      group: Extended
     - value: 109
       text: Suburban Railway
-      group: Extended
     - value: 110
       text: Replacement Rail Service
-      group: Extended
     - value: 111
       text: Special Rail Service
-      group: Extended
     - value: 112
       text: Lorry Transport Rail Service
-      group: Extended
     - value: 113
       text: All Rail Services
-      group: Extended
     - value: 114
       text: Cross-Country Rail Service
-      group: Extended
     - value: 115
       text: Vehicle Transport Rail Service
-      group: Extended
     - value: 116
       text: Rack and Pinion Railway
-      group: Extended
     - value: 117
       text: Additional Rail Service
-      group: Extended
     - value: 200
       text: Coach Service
-      group: Extended
     - value: 201
       text: International Coach Service
-      group: Extended
     - value: 202
       text: National Coach Service
-      group: Extended
     - value: 203
       text: Shuttle Coach Service
-      group: Extended
     - value: 204
       text: Regional Coach Service
-      group: Extended
     - value: 205
       text: Special Coach Service
-      group: Extended
     - value: 206
       text: Sightseeing Coach Service
-      group: Extended
     - value: 207
       text: Tourist Coach Service
-      group: Extended
     - value: 208
       text: Commuter Coach Service
-      group: Extended
     - value: 209
       text: All Coach Services
-      group: Extended
     - value: 400
       text: Urban Railway Service
-      group: Extended
     - value: 401
       text: Metro Service
-      group: Extended
     - value: 402
       text: Underground Service
-      group: Extended
     - value: 403
       text: Urban Railway Service
-      group: Extended
     - value: 404
       text: All Urban Railway Services
-      group: Extended
-    - value: 405
-      text: Monorail
-      group: Extended
     - value: 700
       text: Bus Service
-      group: Extended
     - value: 701
       text: Regional Bus Service
-      group: Extended
     - value: 702
       text: Express Bus Service
-      group: Extended
     - value: 703
       text: Stopping Bus Service
-      group: Extended
     - value: 704
       text: Local Bus Service
-      group: Extended
     - value: 705
       text: Night Bus Service
-      group: Extended
     - value: 706
       text: Post Bus Service
-      group: Extended
     - value: 707
       text: Special Needs Bus
-      group: Extended
     - value: 708
       text: Mobility Bus Service
-      group: Extended
     - value: 709
       text: Mobility Bus for Registered Disabled
-      group: Extended
     - value: 710
       text: Sightseeing Bus
-      group: Extended
     - value: 711
       text: Shuttle Bus
-      group: Extended
     - value: 712
       text: School Bus
-      group: Extended
     - value: 713
       text: School and Public Service Bus
-      group: Extended
     - value: 714
       text: Rail Replacement Bus Service
-      group: Extended
     - value: 715
       text: Demand and Response Bus Service
-      group: Extended
     - value: 716
       text: All Bus Services
-      group: Extended
-    - value: 800
-      text: Trolleybus Service
-      group: Extended
     - value: 900
       text: Tram Service
-      group: Extended
     - value: 901
       text: City Tram Service
-      group: Extended
     - value: 902
       text: Local Tram Service
-      group: Extended
     - value: 903
       text: Regional Tram Service
-      group: Extended
     - value: 904
       text: Sightseeing Tram Service
-      group: Extended
     - value: 905
       text: Shuttle Tram Service
-      group: Extended
     - value: 906
       text: All Tram Services
-      group: Extended
     - value: 1000
       text: Water Transport Service
-      group: Extended
     - value: 1100
       text: Air Service
-      group: Extended
     - value: 1200
       text: Ferry Service
-      group: Extended
     - value: 1300
       text: Aerial Lift Service
-      group: Extended
-    - value: 1400
-      text: Funicular Service
-      group: Extended
     - value: 1500
       text: Taxi Service
-      group: Extended
     - value: 1501
       text: Communal Taxi Service
-      group: Extended
     - value: 1502
       text: Water Taxi Service
-      group: Extended
     - value: 1503
       text: Rail Taxi Service
-      group: Extended
     - value: 1504
       text: Bike Taxi Service
-      group: Extended
     - value: 1505
       text: Licensed Taxi Service
-      group: Extended
     - value: 1506
       text: Private Hire Service Vehicle
-      group: Extended
     - value: 1507
       text: All Taxi Services
-      group: Extended
     - value: 1700
       text: Miscellaneous Service
-      group: Extended
     - value: 1702
       text: Horse-drawn Carriage
-      group: Extended
     columnWidth: 6
     helpContent: The route_type field describes the type of transportation used on a route. Valid values for this field are...
   - name: route_sort_order
diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 473259085..1a2a81ae6 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -1,6 +1,6 @@
 // @flow
 
-import React, {Component} from 'react'
+import * as React from 'react'
 import {Checkbox, FormControl, FormGroup, ControlLabel, Tooltip, OverlayTrigger} from 'react-bootstrap'
 import Select from 'react-select'
 import moment from 'moment'
@@ -53,7 +53,7 @@ const entityToOption = (entity: ?Entity, key: string) => {
     : null
 }
 
-export default class EditorInput extends Component<Props> {
+export default class EditorInput extends React.Component<Props> {
   _onColorChange = (color: any) => {
     const {onChange, updateActiveGtfsEntity, activeEntity, activeComponent, field} = this.props
     const val = color.hex.split('#')[1]
@@ -118,31 +118,26 @@ export default class EditorInput extends Component<Props> {
     }
   }
 
-  _renderRouteTypeOptions = (field: any) => {
-    const standardTypes = []
-    const extendedTypes = []
-    const routeTypes = ['Standard', 'Extended']
-    const fieldOptions = field.options
-    for (const option in fieldOptions) {
-      if (fieldOptions[option].group === 'Standard') {
-        standardTypes.push(fieldOptions[option])
-      } else {
-        extendedTypes.push(fieldOptions[option])
+  _renderRouteTypeOptions = (field: GtfsSpecField): React.Node => {
+    const options = field.options || []
+    const toOption = ({value, text}) => (
+      <option key={value}>{text} ({value})</option>
+    )
+    // The first 10 options (types 0 - 12) are the standard types found in the
+    // GTFS specification. All others represent extended route types.
+    const routeTypes = [
+      {
+        label: 'Standard',
+        options: options.slice(0, 9).map(toOption)
+      },
+      {
+        label: 'Extended',
+        options: options.slice(10).map(toOption)
       }
-    }
-    return (
-      routeTypes.map<any>(type => (
-        <optgroup key={type} label={type}>
-          {type === 'Standard'
-            ? standardTypes.map<any>(sType => (
-              <option key={sType.value}>{sType.text}</option>
-            ))
-            : extendedTypes.map<any>(exType => (
-              <option key={exType.value}>{exType.text}</option>
-            ))
-          }
-        </optgroup>
-      )))
+    ]
+    return routeTypes.map(({label, options}) => (
+      <optgroup key={label} label={label}>{options}</optgroup>
+    ))
   }
 
   render () {
@@ -327,6 +322,7 @@ export default class EditorInput extends Component<Props> {
           </span>
         )
       case 'DROPDOWN':
+        const options = field.options || []
         return (
           <FormGroup
             {...formProps}
@@ -334,17 +330,24 @@ export default class EditorInput extends Component<Props> {
             {basicLabel}
             <FormControl
               {...fieldProps}
-              value={!doesNotExist(value) ? value : ''} // set value to '' to allow for selection of disabled option
+              // set value to '' to allow for selection of disabled option
+              value={!doesNotExist(value) ? value : ''}
               disabled={approveGtfsDisabled && field.adminOnly}>
               {/* Add field for empty string value if that is not an allowable option so that user selection triggers onChange */}
-              {field.options && field.options.findIndex(option => option.value === '') === -1
-                ? <option disabled value=''>{field.required ? '-- select an option --' : '(optional)' }</option>
+              {options.findIndex(option => option.value === '') === -1
+                ? <option disabled value=''>
+                  {field.required ? '-- select an option --' : '(optional)' }
+                </option>
                 : null
               }
-              {field.name === 'route_type' && (
-                this._renderRouteTypeOptions(field)
-              )}
-              {field.name !== 'route_type' && field.options && field.options.map(o => (<option value={o.value} key={o.value}>{o.text || o.value}</option>))}}
+              {field.name === 'route_type'
+                ? this._renderRouteTypeOptions(field)
+                : options.map(o => (
+                  <option value={o.value} key={o.value}>
+                    {o.text || o.value}
+                  </option>
+                ))
+              }
             </FormControl>
           </FormGroup>
         )

From a7296121781a1413670f4e5ad6eb4bafabbee7bb Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 22 Apr 2021 14:12:04 -0400
Subject: [PATCH 163/553] refactor: Address PR comments regarding
 componentDidUpdate.

---
 .../transform/FeedTransformation.js           |  4 +++
 .../components/transform/NormalizeField.js    | 21 ++----------
 .../transform/ReplaceFileFromString.js        | 33 ++++++++-----------
 3 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 273eef2b0..11e49fa53 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -51,10 +51,14 @@ export default class FeedTransformation extends Component<Props> {
   _getFieldsForType = (type: string) => {
     const {feedSource, index, onChange, transformation} = this.props
     const FieldsComponent = transformationTypes[type].component
+    // Pass a key to React that depends on transform content, so that
+    // the component is recreated/rerendered if transform changes.
+    const key = JSON.stringify(transformation)
     return FieldsComponent && (
       <FieldsComponent
         feedSource={feedSource}
         index={index}
+        key={key}
         onSave={onChange}
         transformation={transformation}
       />
diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index de8a55f4e..9c5da5ce7 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -22,7 +22,7 @@ type Props = {
   transformation: FeedTransformationType
 }
 
-function getTransformationFields (transformation: FeedTransformationType): NormalizeFieldFields {
+function extractStateFields (transformation: FeedTransformationType): NormalizeFieldFields {
   const {
     capitalize,
     capitalizeExceptions = '',
@@ -63,17 +63,9 @@ export function getNormalizeFieldsValidationIssues (transformation: FeedTransfor
  * Component that renders input fields for the NoramlizeFieldTransformation.
  */
 export default class NormalizeField extends Component<Props, NormalizeFieldFields> {
-  state = {
-    capitalize: true,
-    capitalizeExceptions: '',
-    fieldName: '',
-    performSubstitutions: true,
-    substitutions: ''
-  }
-
   constructor (props: Props) {
     super(props)
-    this.state = getTransformationFields(props.transformation)
+    this.state = extractStateFields(props.transformation)
   }
 
   _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
@@ -100,13 +92,6 @@ export default class NormalizeField extends Component<Props, NormalizeFieldField
     this.props.onSave(this.state, this.props.index)
   }
 
-  componentDidUpdate (prevProps: Props) {
-    const { transformation } = this.props
-    if (!isEqual(transformation, prevProps.transformation)) {
-      this.setState(getTransformationFields(transformation))
-    }
-  }
-
   render () {
     const { transformation } = this.props
     const {
@@ -117,7 +102,7 @@ export default class NormalizeField extends Component<Props, NormalizeFieldField
       substitutions
     } = this.state
 
-    const inputIsUnchanged = isEqual(this.state, getTransformationFields(transformation))
+    const inputIsUnchanged = isEqual(this.state, extractStateFields(transformation))
 
     return (
       <div>
diff --git a/lib/manager/components/transform/ReplaceFileFromString.js b/lib/manager/components/transform/ReplaceFileFromString.js
index 626910d59..9a534c073 100644
--- a/lib/manager/components/transform/ReplaceFileFromString.js
+++ b/lib/manager/components/transform/ReplaceFileFromString.js
@@ -1,6 +1,5 @@
 // @flow
 
-import { isEqual } from 'lodash'
 import React, {Component} from 'react'
 import {Button} from 'react-bootstrap'
 
@@ -31,21 +30,24 @@ export function getReplaceFileFromStringValidationIssues (transformation: FeedTr
  * Component that renders fields for ReplaceFileFromStringTransformation.
  */
 export default class ReplaceFileFromString extends Component<Props, {csvData: ?string}> {
-  state = { csvData: null }
+  constructor (props: Props) {
+    super(props)
+    this.state = {csvData: props.transformation.csvData}
+  }
 
-  componentDidUpdate (prevProps: Props) {
-    const { transformation } = this.props
-    if (!isEqual(transformation, prevProps.transformation)) {
-      this.setState({ csvData: transformation.csvData })
-    }
+  _onChangeCsvData = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({csvData: evt.target.value})
+  }
+
+  _onSaveCsvData = () => {
+    const csvData = this.state.csvData || null
+    this.props.onSave({csvData}, this.props.index)
   }
 
   render () {
     const {transformation} = this.props
-    const inputIsUnchanged = this.state.csvData === null
-    const csvData = inputIsUnchanged
-      ? transformation.csvData
-      : this.state.csvData
+    const {csvData} = this.state
+    const inputIsUnchanged = csvData === transformation.csvData
     const textValue = csvData || ''
     const numLines = !textValue ? 0 : textValue.split(/\r*\n/).length
 
@@ -84,13 +86,4 @@ export default class ReplaceFileFromString extends Component<Props, {csvData: ?s
       </div>
     )
   }
-
-  _onChangeCsvData = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({csvData: evt.target.value})
-  }
-
-  _onSaveCsvData = () => {
-    const csvData = this.state.csvData || null
-    this.props.onSave({csvData}, this.props.index)
-  }
 }

From ccc561232dfc744f574b02b6b35c44cdf0a73f9b Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 22 Apr 2021 16:17:28 -0400
Subject: [PATCH 164/553] refactor(Transforms): Validate editing transform
 state (extract generic component).

---
 .../transform/FeedTransformation.js           | 38 +++++-----
 .../components/transform/NormalizeField.js    | 69 ++++++++-----------
 .../transform/ReplaceFileFromString.js        | 43 +++++-------
 .../transform/ReplaceFileFromVersion.js       | 45 +++++-------
 lib/manager/components/transform/Transform.js | 61 ++++++++++++++++
 lib/types/index.js                            | 10 ++-
 6 files changed, 152 insertions(+), 114 deletions(-)
 create mode 100644 lib/manager/components/transform/Transform.js

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 11e49fa53..e79368e98 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -7,9 +7,9 @@ import Select from 'react-select'
 
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
 import {getTransformationName} from '../../util/transform'
-import NormalizeField, {getNormalizeFieldsValidationIssues} from './NormalizeField'
-import ReplaceFileFromString, {getReplaceFileFromStringValidationIssues} from './ReplaceFileFromString'
-import ReplaceFileFromVersion, {getReplaceFileFromVersionValidationIssues} from './ReplaceFileFromVersion'
+import NormalizeField from './NormalizeField'
+import ReplaceFileFromString from './ReplaceFileFromString'
+import ReplaceFileFromVersion from './ReplaceFileFromVersion'
 
 import type {
   Feed,
@@ -30,16 +30,13 @@ type Props = {
 const transformationTypes = {
   DeleteRecordsTransformation: {},
   NormalizeFieldTransformation: {
-    component: NormalizeField,
-    getValidationIssues: getNormalizeFieldsValidationIssues
+    component: NormalizeField
   },
   ReplaceFileFromStringTransformation: {
-    component: ReplaceFileFromString,
-    getValidationIssues: getReplaceFileFromStringValidationIssues
+    component: ReplaceFileFromString
   },
   ReplaceFileFromVersionTransformation: {
-    component: ReplaceFileFromVersion,
-    getValidationIssues: getReplaceFileFromVersionValidationIssues
+    component: ReplaceFileFromVersion
   }
 }
 
@@ -47,7 +44,11 @@ const transformationTypes = {
  * Component that renders fields for one feed transformation
  * (e.g., ReplaceFileFromStringTransformation).
  */
-export default class FeedTransformation extends Component<Props> {
+export default class FeedTransformation extends Component<Props, {errors: Array<string>}> {
+  state = {
+    errors: []
+  }
+
   _getFieldsForType = (type: string) => {
     const {feedSource, index, onChange, transformation} = this.props
     const FieldsComponent = transformationTypes[type].component
@@ -60,23 +61,18 @@ export default class FeedTransformation extends Component<Props> {
         index={index}
         key={key}
         onSave={onChange}
+        onValidationErrors={this._onValidationErrors}
         transformation={transformation}
       />
     )
   }
 
-  _getValidationIssues = () => {
-    const {feedSource, transformation} = this.props
-    let issues: Array<string> = []
-    if (!transformation.table) {
+  _onValidationErrors = (errors: Array<string>) => {
+    const issues: Array<string> = []
+    if (!this.props.transformation.table) {
       issues.push('Table must be defined')
     }
-
-    const {getValidationIssues} = transformationTypes[transformation['@type']]
-    if (typeof getValidationIssues === 'function') {
-      issues = issues.concat(getValidationIssues(transformation, feedSource))
-    }
-    return issues
+    this.setState({ errors: issues.concat(errors) })
   }
 
   _onRemoveTransformation = () => {
@@ -92,7 +88,7 @@ export default class FeedTransformation extends Component<Props> {
     const tables = [...getGtfsSpec()].filter(t => !t.datatools)
     if (isModuleEnabled('gtfsplus')) tables.push(...getGtfsPlusSpec())
     const transformationType = transformation['@type']
-    const validationIssues = this._getValidationIssues()
+    const {errors: validationIssues} = this.state
     const backgroundColor = validationIssues.length === 0
       ? '#f7f7f7'
       : '#ffdf68'
diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 9c5da5ce7..ad1a3cf0a 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -1,26 +1,20 @@
 // @flow
 
-import {isEqual} from 'lodash'
-import React, {Component} from 'react'
-import {Button, Checkbox, FormControl, FormGroup} from 'react-bootstrap'
+import { isEqual } from 'lodash'
+import React from 'react'
+import { Button, Checkbox, FormControl, FormGroup } from 'react-bootstrap'
 import Select from 'react-select'
 
-import {getGtfsSpec} from '../../../common/util/config'
+import { getGtfsSpec } from '../../../common/util/config'
+import Transform from './Transform'
 
 import type {
-  Feed,
   FeedTransformation as FeedTransformationType,
   GtfsSpecTable,
   NormalizeFieldFields,
   ReactSelectOption
 } from '../../../types'
-
-type Props = {
-  feedSource: Feed,
-  index: number,
-  onSave: (NormalizeFieldFields, number) => void,
-  transformation: FeedTransformationType
-}
+import type { TransformProps } from './Transform'
 
 function extractStateFields (transformation: FeedTransformationType): NormalizeFieldFields {
   const {
@@ -39,59 +33,56 @@ function extractStateFields (transformation: FeedTransformationType): NormalizeF
   }
 }
 
-/**
- * Obtain the list of validation issues for the given transformation.
- */
-export function getNormalizeFieldsValidationIssues (transformation: FeedTransformationType, feedSource: Feed): Array<string> {
-  const issues = []
-  const { fieldName, performSubstitutions, substitutions } = transformation
-
-  // fieldName must be defined.
-  if (!fieldName || fieldName.length === 0) {
-    issues.push('Field to normalize must be defined.')
-  }
-
-  // If substitutions are enabled, then substitutions must be defined.
-  if (performSubstitutions && (!substitutions || substitutions.length === 0)) {
-    issues.push('Substitutions must be defined when enabling substitutions.')
-  }
-
-  return issues
-}
-
 /**
  * Component that renders input fields for the NoramlizeFieldTransformation.
  */
-export default class NormalizeField extends Component<Props, NormalizeFieldFields> {
-  constructor (props: Props) {
+export default class NormalizeField extends Transform<NormalizeFieldFields> {
+  constructor (props: TransformProps<NormalizeFieldFields>) {
     super(props)
     this.state = extractStateFields(props.transformation)
   }
 
   _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
-    this.setState({fieldName: fieldOption.value})
+    this.updateState({fieldName: fieldOption.value})
   }
 
   _onChangeCapitalizeValues = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({capitalize: evt.target.checked})
+    this.updateState({capitalize: evt.target.checked})
   }
 
   _onChangeCapitalizeExceptions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({capitalizeExceptions: evt.target.value})
+    this.updateState({capitalizeExceptions: evt.target.value})
   }
 
   _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({performSubstitutions: evt.target.checked})
+    this.updateState({performSubstitutions: evt.target.checked})
   }
 
   _onChangeSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({substitutions: evt.target.value})
+    this.updateState({substitutions: evt.target.value})
   }
 
   _onSaveTransformationSettings = () => {
     this.props.onSave(this.state, this.props.index)
   }
 
+  getValidationErrors (): Array<string> {
+    const issues = []
+    const { fieldName, performSubstitutions, substitutions } = this.state
+
+    // fieldName must be defined.
+    if (!fieldName || fieldName.length === 0) {
+      issues.push('Field to normalize must be defined.')
+    }
+
+    // If substitutions are enabled, then substitutions must be defined.
+    if (performSubstitutions && (!substitutions || substitutions.length === 0)) {
+      issues.push('Substitutions must be defined when enabling substitutions.')
+    }
+
+    return issues
+  }
+
   render () {
     const { transformation } = this.props
     const {
diff --git a/lib/manager/components/transform/ReplaceFileFromString.js b/lib/manager/components/transform/ReplaceFileFromString.js
index 9a534c073..1b1d25a84 100644
--- a/lib/manager/components/transform/ReplaceFileFromString.js
+++ b/lib/manager/components/transform/ReplaceFileFromString.js
@@ -1,42 +1,24 @@
 // @flow
 
-import React, {Component} from 'react'
+import React from 'react'
 import {Button} from 'react-bootstrap'
 
-import type {
-  Feed,
-  FeedTransformation as FeedTransformationType
-} from '../../../types'
+import Transform from './Transform'
 
-type Props = {
-  feedSource: Feed,
-  index: number,
-  onSave: (any, number) => void,
-  transformation: FeedTransformationType
-}
-
-export function getReplaceFileFromStringValidationIssues (transformation: FeedTransformationType, feedSource: Feed): Array<string> {
-  const issues = []
-
-  // CSV data must be defined.
-  if (!transformation.csvData) {
-    issues.push('CSV data must be defined.')
-  }
-
-  return issues
-}
+import type { ReplaceFileFromStringFields } from '../../../types'
+import type { TransformProps } from './Transform'
 
 /**
  * Component that renders fields for ReplaceFileFromStringTransformation.
  */
-export default class ReplaceFileFromString extends Component<Props, {csvData: ?string}> {
-  constructor (props: Props) {
+export default class ReplaceFileFromString extends Transform<ReplaceFileFromStringFields> {
+  constructor (props: TransformProps<ReplaceFileFromStringFields>) {
     super(props)
     this.state = {csvData: props.transformation.csvData}
   }
 
   _onChangeCsvData = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.setState({csvData: evt.target.value})
+    this.updateState({csvData: evt.target.value})
   }
 
   _onSaveCsvData = () => {
@@ -44,6 +26,17 @@ export default class ReplaceFileFromString extends Component<Props, {csvData: ?s
     this.props.onSave({csvData}, this.props.index)
   }
 
+  getValidationErrors (): Array<string> {
+    const issues = []
+
+    // CSV data must be defined.
+    if (!this.props.transformation.csvData) {
+      issues.push('CSV data must be defined.')
+    }
+
+    return issues
+  }
+
   render () {
     const {transformation} = this.props
     const {csvData} = this.state
diff --git a/lib/manager/components/transform/ReplaceFileFromVersion.js b/lib/manager/components/transform/ReplaceFileFromVersion.js
index 55b58a613..5ed10740b 100644
--- a/lib/manager/components/transform/ReplaceFileFromVersion.js
+++ b/lib/manager/components/transform/ReplaceFileFromVersion.js
@@ -1,39 +1,15 @@
 // @flow
 
-import React, {Component} from 'react'
+import React from 'react'
 
 import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
 
-import type {
-  Feed,
-  FeedTransformation as FeedTransformationType
-} from '../../../types'
-
-type Props = {
-  feedSource: Feed,
-  index: number,
-  onSave: (any, number) => void,
-  transformation: FeedTransformationType
-}
-
-export function getReplaceFileFromVersionValidationIssues (transformation: FeedTransformationType, feedSource: Feed) {
-  // Get selected version (if applicable).
-  const version = feedSource.feedVersions &&
-    feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
-  const issues: Array<string> = []
-
-  // Only trigger validation issue if versions have been loaded.
-  if (!version && feedSource.feedVersions) {
-    issues.push('Version must be defined')
-  }
-
-  return issues
-}
+import Transform from './Transform'
 
 /**
  * Component that renders fields for ReplaceFileFromVersionTransformation.
  */
-export default class ReplaceFileFromVersion extends Component<Props> {
+export default class ReplaceFileFromVersion extends Transform<{}> {
   _onSelectVersion = (versionIndex: number) => {
     const {feedSource, onSave} = this.props
     if (feedSource.feedVersions) {
@@ -44,6 +20,21 @@ export default class ReplaceFileFromVersion extends Component<Props> {
     }
   }
 
+  getValidationErrors (): Array<string> {
+    const { feedSource, transformation } = this.props
+    // Get selected version (if applicable).
+    const version = feedSource.feedVersions &&
+      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
+    const issues: Array<string> = []
+
+    // Only trigger validation issue if versions have been loaded.
+    if (!version && feedSource.feedVersions) {
+      issues.push('Version must be defined')
+    }
+
+    return issues
+  }
+
   render () {
     const {feedSource, transformation} = this.props
     // Get selected version (if applicable).
diff --git a/lib/manager/components/transform/Transform.js b/lib/manager/components/transform/Transform.js
new file mode 100644
index 000000000..49a88a710
--- /dev/null
+++ b/lib/manager/components/transform/Transform.js
@@ -0,0 +1,61 @@
+// @flow
+
+import { Component } from 'react'
+
+import type {
+  Feed,
+  FeedTransformation as FeedTransformationType
+} from '../../../types'
+
+export type TransformProps<StateType> = {
+  feedSource: Feed,
+  index: number,
+  onSave: (StateType, number) => void,
+  onValidationErrors: (Array<string>) => void,
+  transformation: FeedTransformationType
+}
+
+/**
+ * Generic Transform component that holds helper methods for derived components.
+ */
+export default class Transform<StateType> extends Component<TransformProps<StateType>, StateType> {
+  /**
+   * Overridable method to obtain validation errors for the current editing state,
+   * if applicable.
+   */
+  getValidationErrors (): Array<string> {
+    return []
+  }
+
+  /**
+   * Make derived components perform their own error checks,
+   * and notify parent components of the resulting validation errors if any.
+   */
+  _updateErrors = () => {
+    const { onValidationErrors } = this.props
+    if (typeof onValidationErrors === 'function') {
+      onValidationErrors(this.getValidationErrors())
+    }
+  }
+
+  /**
+   * Update the component editing state
+   * and perform and notify of validation checks.
+   */
+  updateState = (partialState: any) => {
+    const newState = {
+      ...this.state,
+      ...partialState
+    }
+    this.setState(newState)
+    this._updateErrors()
+  }
+
+  componentDidMount () {
+    this._updateErrors()
+  }
+
+  render () {
+    throw new Error('render() called on abstract class Transform')
+  }
+}
diff --git a/lib/types/index.js b/lib/types/index.js
index 99128e45a..03757ee8d 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -299,17 +299,23 @@ export type NormalizeFieldFields = {
   substitutions?: string,
 }
 
+export type ReplaceFileFromStringFields = {
+  csvData?: ?string
+}
+
 export type FeedTransformationBase = {
   '@type': $Values<typeof FEED_TRANSFORMATION_TYPES>,
   active: boolean,
-  csvData?: string,
   matchField?: string,
   matchValues?: Array<string>,
   sourceVersionId?: string,
   table: ?string
 }
 
-export type FeedTransformation = FeedTransformationBase & NormalizeFieldFields
+export type FeedTransformation =
+  & FeedTransformationBase
+  & ReplaceFileFromStringFields
+  & NormalizeFieldFields
 
 export type FeedTransformRules = {
   active: boolean,

From 7fbd6ef01cbf47c9671a95b7c9bc6c37d8e2cc43 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 22 Apr 2021 17:11:23 -0400
Subject: [PATCH 165/553] refactor(Transform): Pass updated editing state for
 validation.

---
 .../components/transform/NormalizeField.js    | 19 ++++++++++---------
 .../transform/ReplaceFileFromString.js        |  6 +++---
 lib/manager/components/transform/Transform.js | 10 ++++++----
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index ad1a3cf0a..37f09a2b3 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -18,18 +18,18 @@ import type { TransformProps } from './Transform'
 
 function extractStateFields (transformation: FeedTransformationType): NormalizeFieldFields {
   const {
-    capitalize,
-    capitalizeExceptions = '',
-    fieldName = '',
-    performSubstitutions,
-    substitutions = ''
-  } = transformation
-  return {
     capitalize,
     capitalizeExceptions,
     fieldName,
     performSubstitutions,
     substitutions
+  } = transformation
+  return {
+    capitalize: capitalize,
+    capitalizeExceptions: capitalizeExceptions || '',
+    fieldName: fieldName || '',
+    performSubstitutions: performSubstitutions,
+    substitutions: substitutions || ''
   }
 }
 
@@ -55,6 +55,7 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
   }
 
   _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    console.log(evt.target.checked)
     this.updateState({performSubstitutions: evt.target.checked})
   }
 
@@ -66,9 +67,9 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
     this.props.onSave(this.state, this.props.index)
   }
 
-  getValidationErrors (): Array<string> {
+  getValidationErrors (fields: NormalizeFieldFields): Array<string> {
     const issues = []
-    const { fieldName, performSubstitutions, substitutions } = this.state
+    const { fieldName, performSubstitutions, substitutions } = fields
 
     // fieldName must be defined.
     if (!fieldName || fieldName.length === 0) {
diff --git a/lib/manager/components/transform/ReplaceFileFromString.js b/lib/manager/components/transform/ReplaceFileFromString.js
index 1b1d25a84..89f26edd5 100644
--- a/lib/manager/components/transform/ReplaceFileFromString.js
+++ b/lib/manager/components/transform/ReplaceFileFromString.js
@@ -26,14 +26,14 @@ export default class ReplaceFileFromString extends Transform<ReplaceFileFromStri
     this.props.onSave({csvData}, this.props.index)
   }
 
-  getValidationErrors (): Array<string> {
+  getValidationErrors (fields: ReplaceFileFromStringFields): Array<string> {
     const issues = []
+    const { csvData } = fields
 
     // CSV data must be defined.
-    if (!this.props.transformation.csvData) {
+    if (!csvData || csvData.length === 0) {
       issues.push('CSV data must be defined.')
     }
-
     return issues
   }
 
diff --git a/lib/manager/components/transform/Transform.js b/lib/manager/components/transform/Transform.js
index 49a88a710..51e980b4c 100644
--- a/lib/manager/components/transform/Transform.js
+++ b/lib/manager/components/transform/Transform.js
@@ -22,19 +22,21 @@ export default class Transform<StateType> extends Component<TransformProps<State
   /**
    * Overridable method to obtain validation errors for the current editing state,
    * if applicable.
+   * @param fields: The state to be validated. May be different from (more recent than) this.state.
    */
-  getValidationErrors (): Array<string> {
+  getValidationErrors (fields: StateType): Array<string> {
     return []
   }
 
   /**
    * Make derived components perform their own error checks,
    * and notify parent components of the resulting validation errors if any.
+   * @param fields: The updated state. If not set, the component state will be used.
    */
-  _updateErrors = () => {
+  _updateErrors = (fields?: StateType) => {
     const { onValidationErrors } = this.props
     if (typeof onValidationErrors === 'function') {
-      onValidationErrors(this.getValidationErrors())
+      onValidationErrors(this.getValidationErrors(fields || this.state))
     }
   }
 
@@ -48,7 +50,7 @@ export default class Transform<StateType> extends Component<TransformProps<State
       ...partialState
     }
     this.setState(newState)
-    this._updateErrors()
+    this._updateErrors(newState)
   }
 
   componentDidMount () {

From 4bc1bd460bd0c02282d312a7eabb1a06822a4ac6 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Thu, 22 Apr 2021 22:21:50 +0100
Subject: [PATCH 166/553] improvement(HomeProjectDropdown.js): Changed
 Bootstrap Dropdown to React-Select

#650
---
 lib/manager/components/HomeProjectDropdown.js | 102 ++++++------------
 1 file changed, 32 insertions(+), 70 deletions(-)

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index d192e9316..86036b18d 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -2,9 +2,9 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import { Button, DropdownButton, MenuItem } from 'react-bootstrap'
+import { Button, MenuItem } from 'react-bootstrap'
 import { LinkContainer } from 'react-router-bootstrap'
-import {getAbbreviatedProjectName} from '../../common/util/util'
+import Select from 'react-select'
 
 import type {Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
@@ -15,88 +15,50 @@ type Props = {
   visibleProjects: Array<Project>
 }
 
-export default class HomeProjectDropdown extends Component<Props> {
+type State = {
+  selectedOption: any
+}
+
+export default class HomeProjectDropdown extends Component<Props, State> {
+  state = {
+    selectedOption: ''
+  };
+
+  handleChange = (selectedOption: any) => {
+    this.setState(
+      {selectedOption},
+      () => console.log(`Option selected:`, this.state.selectedOption)
+    )
+  };
+
   render () {
+    const {selectedOption} = this.state
     const {
       activeProject,
       user,
       visibleProjects
     } = this.props
-    const isAdmin = user.permissions && user.permissions.isApplicationAdmin()
     const {profile} = user
     if (!profile) return null
-    const abbreviatedProjectName = getAbbreviatedProjectName(activeProject)
     return (
       <div style={{marginBottom: '20px'}}>
         {activeProject
-          ? <LinkContainer className='pull-right' to={`/project/${activeProject.id}`}>
-            <Button bsStyle='primary'>View {abbreviatedProjectName}</Button>
+          ? <LinkContainer className='pull-right' style={{position: 'relative', listStyle: 'none', zIndex: '1', marginBottom: '5px'}} to={`/project/${selectedOption && selectedOption.value}`}>
+            <Button bsStyle='primary'>View {selectedOption && selectedOption.label}</Button>
           </LinkContainer>
           : null
         }
-        <DropdownButton
-          id='context-dropdown'
-          title={activeProject
-            ? <span>
-              <Icon type='folder-open-o' /> {abbreviatedProjectName}
-            </span>
-            : <span>
-              <img alt={profile.email} height={20} width={20} src={profile.picture} />
-              {' '}
-              {profile.nickname}
-            </span>
-          }
-        >
-          {activeProject && (
-            <LinkContainer key='home-link' to={`/home/`}>
-              <MenuItem>
-                <span>
-                  <img alt={profile.email} height={20} width={20} src={profile.picture} />
-                  {' '}
-                  {profile.nickname}
-                </span>
-              </MenuItem>
-            </LinkContainer>
-          )}
-          {activeProject && <MenuItem key='divider' divider />}
-          {visibleProjects.length > 0
-            ? visibleProjects.map((project, index) => {
-              if (activeProject && project.id === activeProject.id) {
-                return null
-              }
-              return (
-                <LinkContainer to={`/home/${project.id}`} key={project.id}>
-                  <MenuItem eventKey={project.id}>
-                    <Icon type='folder-o' /> {project.name}
-                  </MenuItem>
-                </LinkContainer>
-              )
-            })
-            : null
-          }
-          {(activeProject && visibleProjects.length > 1) || !activeProject ? <MenuItem divider /> : null}
-          {
-            isAdmin && (
-              <LinkContainer to='/settings/organizations'>
-                <MenuItem>
-                  <Icon type='users' /> Manage projects
-                </MenuItem>
-              </LinkContainer>
-            )
-          }
-          {
-            isAdmin && <MenuItem divider />
-          }
-          {
-            isAdmin && (
-              <LinkContainer to='/project/new'>
-                <MenuItem>
-                  <Icon type='plus' /> Create project
-                </MenuItem>
-              </LinkContainer>
-            )
-          }
-        </DropdownButton>
+        <Select
+          value={selectedOption}
+          style={{marginBottom: '5px', zIndex: '0'}}
+          onChange={this.handleChange}
+          options={visibleProjects.map(p => ({value: p.id, label: p.name}))} placeholder={`Select Project...`}
+        />
+        <LinkContainer to='/project/new' style={{listStyle: 'none'}}>
+          <MenuItem>
+            <Icon type='plus' /> Create project
+          </MenuItem>
+        </LinkContainer>
       </div>
     )
   }

From 1eb77bc1cc15f4f6d24be4ee2d161a07e4d2e188 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Thu, 22 Apr 2021 22:26:59 +0100
Subject: [PATCH 167/553] refactor(HomeProjectDropdown.js): Slight ammendment
 to code

#650
---
 lib/manager/components/HomeProjectDropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index 86036b18d..67eea8a0f 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -56,7 +56,7 @@ export default class HomeProjectDropdown extends Component<Props, State> {
         />
         <LinkContainer to='/project/new' style={{listStyle: 'none'}}>
           <MenuItem>
-            <Icon type='plus' /> Create project
+            <Icon type='plus' /> New project
           </MenuItem>
         </LinkContainer>
       </div>

From 15147fcd33991ee0f4f58e8ebebd647b928999bd Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 23 Apr 2021 17:06:34 -0400
Subject: [PATCH 168/553] refactor(NormalizeField): Try out react-select on
 capit exceptions

---
 .../components/transform/NormalizeField.js    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 37f09a2b3..425b96135 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -50,8 +50,8 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
     this.updateState({capitalize: evt.target.checked})
   }
 
-  _onChangeCapitalizeExceptions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.updateState({capitalizeExceptions: evt.target.value})
+  _onChangeCapitalizeExceptions = (values: Array<{value: string}>) => {
+    this.updateState({capitalizeExceptions: values.map(v => v.value).join(',')})
   }
 
   _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
@@ -95,6 +95,10 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
     } = this.state
 
     const inputIsUnchanged = isEqual(this.state, extractStateFields(transformation))
+    const capitalizeExceptionList = capitalizeExceptions && capitalizeExceptions
+      .split(',')
+      .map(s => s.trim())
+      .map(s => ({ label: s, value: s }))
 
     return (
       <div>
@@ -112,14 +116,16 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
             >
               Capitalize value
             </Checkbox>
-            <span style={{display: 'block'}}>Exceptions (comma-separated):
+            <span style={{display: 'block'}}>
+              Exceptions:
               <FormGroup>
-                <FormControl
-                  disabled={!capitalize}
+                <Select.Creatable
+                  arrowRenderer={null}
+                  clearable={false}
+                  multi
                   onChange={this._onChangeCapitalizeExceptions}
-                  placeholder='Enter exceptions separated by commas'
-                  type='text'
-                  value={capitalizeExceptions}
+                  placeholder='Enter exceptions then press enter'
+                  value={capitalizeExceptionList}
                 />
               </FormGroup>
             </span>

From 7eeb16c583ddd539c06863e139f58a2e2becff6b Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 26 Apr 2021 14:42:06 +0100
Subject: [PATCH 169/553] improvement(HomeProjectDropdown.js): REfactored code
 to implement feedback

Used browserHistory to push the active project id to the URL to get the activeproject.id to connect
to the react-select onchange prop

#650
---
 lib/manager/components/HomeProjectDropdown.js | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index 67eea8a0f..c66b388c6 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -2,10 +2,12 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import { Button, MenuItem } from 'react-bootstrap'
+import { Button } from 'react-bootstrap'
 import { LinkContainer } from 'react-router-bootstrap'
+import {browserHistory} from 'react-router'
 import Select from 'react-select'
 
+import {getAbbreviatedProjectName} from '../../common/util/util'
 import type {Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
@@ -15,50 +17,43 @@ type Props = {
   visibleProjects: Array<Project>
 }
 
-type State = {
-  selectedOption: any
-}
-
-export default class HomeProjectDropdown extends Component<Props, State> {
-  state = {
-    selectedOption: ''
-  };
-
-  handleChange = (selectedOption: any) => {
-    this.setState(
-      {selectedOption},
-      () => console.log(`Option selected:`, this.state.selectedOption)
-    )
-  };
+export default class HomeProjectDropdown extends Component<Props> {
+  getOptions = (visibleProjects) => {
+    return visibleProjects.map(p => ({value: p.id, label: p.name}))
+  }
 
   render () {
-    const {selectedOption} = this.state
     const {
       activeProject,
       user,
       visibleProjects
     } = this.props
     const {profile} = user
+    const abbreviatedProjectName = getAbbreviatedProjectName(activeProject)
+    const isAdmin = user.permissions && user.permissions.isApplicationAdmin()
     if (!profile) return null
     return (
       <div style={{marginBottom: '20px'}}>
+        {
+          isAdmin && (
+            <LinkContainer to='/project/new'>
+              <Button>
+                <Icon type='plus' /> New project
+              </Button>
+            </LinkContainer>
+          )
+        }
         {activeProject
-          ? <LinkContainer className='pull-right' style={{position: 'relative', listStyle: 'none', zIndex: '1', marginBottom: '5px'}} to={`/project/${selectedOption && selectedOption.value}`}>
-            <Button bsStyle='primary'>View {selectedOption && selectedOption.label}</Button>
+          ? <LinkContainer className='pull-right' style={{marginBottom: '5px'}} to={`/project/${activeProject.id}`}>
+            <Button bsStyle='primary'>View {abbreviatedProjectName}</Button>
           </LinkContainer>
           : null
         }
         <Select
-          value={selectedOption}
-          style={{marginBottom: '5px', zIndex: '0'}}
-          onChange={this.handleChange}
-          options={visibleProjects.map(p => ({value: p.id, label: p.name}))} placeholder={`Select Project...`}
+          value={activeProject && {value: activeProject.id, label: activeProject.name}}
+          onChange={(selectedOption) => browserHistory.push(`/home/${selectedOption.value}`)}
+          options={this.getOptions(visibleProjects)}
         />
-        <LinkContainer to='/project/new' style={{listStyle: 'none'}}>
-          <MenuItem>
-            <Icon type='plus' /> New project
-          </MenuItem>
-        </LinkContainer>
       </div>
     )
   }

From d6459eb06eb4ba33b2646eb2d33e676ac080cb17 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 26 Apr 2021 15:43:03 +0100
Subject: [PATCH 170/553] refactor(HomepProjectDropdown.js): Refactred code
 slightly

Added a type to the visibleProjects

#650
---
 lib/manager/components/HomeProjectDropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index c66b388c6..154883b5b 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -18,7 +18,7 @@ type Props = {
 }
 
 export default class HomeProjectDropdown extends Component<Props> {
-  getOptions = (visibleProjects) => {
+  getOptions = (visibleProjects: Props) => {
     return visibleProjects.map(p => ({value: p.id, label: p.name}))
   }
 

From 476067026c8fe3a0b4893a99dbe1fc58573de3c9 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 26 Apr 2021 16:26:28 +0100
Subject: [PATCH 171/553] refactor(HomePrjectDropdown.js): Refactor

Changed the TYPE on visibleProjects

#650
---
 lib/manager/components/HomeProjectDropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index 154883b5b..038f8a025 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -18,7 +18,7 @@ type Props = {
 }
 
 export default class HomeProjectDropdown extends Component<Props> {
-  getOptions = (visibleProjects: Props) => {
+  getOptions = (visibleProjects: Array<Project>) => {
     return visibleProjects.map(p => ({value: p.id, label: p.name}))
   }
 

From 2094b36209c6b956fb4e4f2e190ae31e74ca1d35 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 26 Apr 2021 18:23:55 +0100
Subject: [PATCH 172/553] refactor(HomeProjectDropdown.js): Refactor to fix
 clear error

I added some routing so when the clear option is pressed it clears the url

#650
---
 lib/manager/components/HomeProjectDropdown.js | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index 038f8a025..aa6a61de4 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -17,9 +17,20 @@ type Props = {
   visibleProjects: Array<Project>
 }
 
-export default class HomeProjectDropdown extends Component<Props> {
-  getOptions = (visibleProjects: Array<Project>) => {
-    return visibleProjects.map(p => ({value: p.id, label: p.name}))
+type State = {
+  selectedOption: any
+}
+
+export default class HomeProjectDropdown extends Component<Props, State> {
+  state = {
+    selectedOption: ''
+  }
+
+  handleChange = (selectedOption, activeProject) => {
+    this.setState({selectedOption})
+    activeProject === null
+      ? browserHistory.push(`/home/${selectedOption.value}`)
+      : browserHistory.push(`/home/`)
   }
 
   render () {
@@ -51,8 +62,9 @@ export default class HomeProjectDropdown extends Component<Props> {
         }
         <Select
           value={activeProject && {value: activeProject.id, label: activeProject.name}}
-          onChange={(selectedOption) => browserHistory.push(`/home/${selectedOption.value}`)}
-          options={this.getOptions(visibleProjects)}
+          onChange={(selectedOption) => this.handleChange(selectedOption, activeProject)}
+          options={visibleProjects.map(p => ({value: p.id, label: p.name}))}
+          style={{marginTop: '5px'}}
         />
       </div>
     )

From 0b1a1dc106efc7c8a74aaaff811e2ccd73543570 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 26 Apr 2021 18:28:06 +0100
Subject: [PATCH 173/553] refactor(HomeProjectDropdown.js): Added type to prop

#650
---
 lib/manager/components/HomeProjectDropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index aa6a61de4..81203f09d 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -26,7 +26,7 @@ export default class HomeProjectDropdown extends Component<Props, State> {
     selectedOption: ''
   }
 
-  handleChange = (selectedOption, activeProject) => {
+  handleChange = (selectedOption: any, activeProject: any) => {
     this.setState({selectedOption})
     activeProject === null
       ? browserHistory.push(`/home/${selectedOption.value}`)

From 67a416c654f106bee6074525549ae7aa1d2e3884 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 26 Apr 2021 19:13:05 -0400
Subject: [PATCH 174/553] refactor(NormalizeField): Implement structured
 substitution editing.

---
 .../components/transform/NormalizeField.js    | 164 +++++++++++++++---
 lib/types/index.js                            |   8 +-
 2 files changed, 151 insertions(+), 21 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 425b96135..ee7b384fe 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -1,22 +1,23 @@
 // @flow
 
+import Icon from '@conveyal/woonerf/components/icon'
 import { isEqual } from 'lodash'
-import React from 'react'
-import { Button, Checkbox, FormControl, FormGroup } from 'react-bootstrap'
+import React, { Component } from 'react'
+import { Button, Checkbox, FormControl, FormGroup, Table } from 'react-bootstrap'
 import Select from 'react-select'
 
 import { getGtfsSpec } from '../../../common/util/config'
 import Transform from './Transform'
 
 import type {
-  FeedTransformation as FeedTransformationType,
   GtfsSpecTable,
   NormalizeFieldFields,
-  ReactSelectOption
+  ReactSelectOption,
+  Substitution
 } from '../../../types'
 import type { TransformProps } from './Transform'
 
-function extractStateFields (transformation: FeedTransformationType): NormalizeFieldFields {
+function extractStateFields (transformation: NormalizeFieldFields): NormalizeFieldFields {
   const {
     capitalize,
     capitalizeExceptions,
@@ -29,7 +30,7 @@ function extractStateFields (transformation: FeedTransformationType): NormalizeF
     capitalizeExceptions: capitalizeExceptions || '',
     fieldName: fieldName || '',
     performSubstitutions: performSubstitutions,
-    substitutions: substitutions || ''
+    substitutions: substitutions || []
   }
 }
 
@@ -55,16 +56,34 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
   }
 
   _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    console.log(evt.target.checked)
     this.updateState({performSubstitutions: evt.target.checked})
   }
 
-  _onChangeSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.updateState({substitutions: evt.target.value})
+  _onChangeSubstitution = (substitution: Substitution, index: number) => {
+    const newSubstitutions = [...this.state.substitutions]
+    newSubstitutions[index] = substitution
+    this.updateState({substitutions: newSubstitutions})
+  }
+
+  _onRemoveSubstitution = (index: number) => {
+    const newSubstitutions = [...this.state.substitutions]
+    newSubstitutions.splice(index, 1)
+    this.updateState({substitutions: newSubstitutions})
+  }
+
+  _onNewSubstitution = () => {
+    this.updateState({substitutions: [...this.state.substitutions, {
+      pattern: 'Text to find',
+      replacement: 'Replacement'
+    }]})
   }
 
   _onSaveTransformationSettings = () => {
-    this.props.onSave(this.state, this.props.index)
+    this.props.onSave(extractStateFields(this.state), this.props.index)
+  }
+
+  _onRevertTransformationSettings = () => {
+    this.updateState(extractStateFields(this.props.transformation))
   }
 
   getValidationErrors (fields: NormalizeFieldFields): Array<string> {
@@ -114,7 +133,7 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
               checked={capitalize}
               onChange={this._onChangeCapitalizeValues}
             >
-              Capitalize value
+              Capitalize field value
             </Checkbox>
             <span style={{display: 'block'}}>
               Exceptions:
@@ -138,14 +157,34 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
               Perform the following substitutions:
             </Checkbox>
             <FormGroup>
-              <FormControl
-                disabled={!performSubstitutions}
-                onChange={this._onChangeSubstitutions}
-                // TODO: Add something to explain the syntax (when finalized).
-                placeholder='Enter substitutions in the form old => new, separated by commas'
-                type='text'
-                value={substitutions}
-              />
+              <Table condensed>
+                <thead>
+                  <tr>
+                    <th>Substitute</th>
+                    <th>With</th>
+                    <th>Normalize space?</th>
+                    <th />
+                  </tr>
+                </thead>
+                <tbody>
+                  {substitutions && substitutions.map((s, i) => (
+                    <SubstitutionRow
+                      index={i}
+                      key={i}
+                      onChange={this._onChangeSubstitution}
+                      onRemove={this._onRemoveSubstitution}
+                      substitution={s}
+                    />
+                  ))}
+                  <tr>
+                    <td colSpan='4'>
+                      <Button bsSize='xsmall' onClick={this._onNewSubstitution}>
+                        <Icon type='plus' /> New
+                      </Button>
+                    </td>
+                  </tr>
+                </tbody>
+              </Table>
             </FormGroup>
           </li>
         </ul>
@@ -158,6 +197,14 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
           >
             Save
           </Button>
+          <Button
+            bsSize='xsmall'
+            disabled={inputIsUnchanged}
+            onClick={this._onRevertTransformationSettings}
+            style={{marginRight: '5px'}}
+          >
+            Revert
+          </Button>
         </div>
       </div>
     )
@@ -196,7 +243,7 @@ const GtfsFieldSelector = (props: GtfsFieldSelectorProps) => {
     <Select
       clearable={false}
       onChange={onChange}
-      options={table.fields.map((field, colIndex) => ({label: field.name, value: field.name}))}
+      options={table.fields.map(field => ({label: field.name, value: field.name}))}
       placeholder='Choose the field to normalize'
       searchable={false}
       style={{margin: '10px 0px', width: '230px'}}
@@ -204,3 +251,80 @@ const GtfsFieldSelector = (props: GtfsFieldSelectorProps) => {
     />
   )
 }
+
+type SubstitutionRowType = {
+  index: number,
+  onChange: (Substitution, number) => void,
+  onRemove: number => void,
+  substitution: Substitution
+}
+
+/**
+ * Renders and lets user edit a substitution.
+ */
+class SubstitutionRow extends Component<SubstitutionRowType> {
+  _onEditPattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution({ pattern: evt.target.value })
+  }
+
+  _onEditReplacement = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution({ replacement: evt.target.value })
+  }
+
+  _onEditNormalizeSpace = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution({ normalizeSpace: evt.target.checked })
+  }
+
+  _onRemove = () => {
+    this.props.onRemove(this.props.index)
+  }
+
+  _updateSubtitution (partialState: any) {
+    const newSubstitution = {
+      ...this.props.substitution,
+      ...partialState
+    }
+    this.props.onChange(newSubstitution, this.props.index)
+  }
+
+  render () {
+    const { substitution } = this.props
+    const { normalizeSpace, pattern, replacement } = substitution
+    return (
+      <tr>
+        <td>
+          <FormControl
+            onChange={this._onEditPattern}
+            placeholder='Enter text to find'
+            style={{height: 'unset', padding: '2px'}}
+            value={pattern}
+          />
+        </td>
+        <td>
+          <FormControl
+            onChange={this._onEditReplacement}
+            placeholder='Enter replacement text'
+            style={{height: 'unset', padding: '2px'}}
+            value={replacement}
+          />
+        </td>
+        <td>
+          <Checkbox
+            checked={normalizeSpace}
+            onChange={this._onEditNormalizeSpace}
+            style={{margin: '2px 0'}}
+          />
+        </td>
+        <td>
+          <Button
+            bsSize='xsmall'
+            onClick={this._onRemove}
+            title='Remove this substitution'
+          >
+            <Icon type='remove' />
+          </Button>
+        </td>
+      </tr>
+    )
+  }
+}
diff --git a/lib/types/index.js b/lib/types/index.js
index 03757ee8d..bf56857c3 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -291,12 +291,18 @@ export type RetrievalMethod = $Values<typeof RETRIEVAL_METHODS>
 
 export type FetchFrequency = $Values<typeof FETCH_FREQUENCIES>
 
+export type Substitution = {
+  normalizeSpace?: boolean,
+  pattern: string,
+  replacement: string
+}
+
 export type NormalizeFieldFields = {
   capitalize?: boolean,
   capitalizeExceptions?: string,
   fieldName?: string,
   performSubstitutions?: boolean,
-  substitutions?: string,
+  substitutions: Array<Substitution>
 }
 
 export type ReplaceFileFromStringFields = {

From eb0a5dbacabd93aa4bbb516916d08cb6a4f5e756 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 27 Apr 2021 09:47:10 -0400
Subject: [PATCH 175/553] refactor(NormalizeField): Fix flow

---
 .../components/transform/NormalizeField.js    | 19 +++++++++----------
 lib/types/index.js                            |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index ee7b384fe..1fe2cb5f0 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -60,19 +60,19 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
   }
 
   _onChangeSubstitution = (substitution: Substitution, index: number) => {
-    const newSubstitutions = [...this.state.substitutions]
+    const newSubstitutions = [].concat(this.state.substitutions)
     newSubstitutions[index] = substitution
     this.updateState({substitutions: newSubstitutions})
   }
 
   _onRemoveSubstitution = (index: number) => {
-    const newSubstitutions = [...this.state.substitutions]
+    const newSubstitutions = [].concat(this.state.substitutions)
     newSubstitutions.splice(index, 1)
     this.updateState({substitutions: newSubstitutions})
   }
 
   _onNewSubstitution = () => {
-    this.updateState({substitutions: [...this.state.substitutions, {
+    this.updateState({substitutions: [...[].concat(this.state.substitutions), {
       pattern: 'Text to find',
       replacement: 'Replacement'
     }]})
@@ -252,7 +252,7 @@ const GtfsFieldSelector = (props: GtfsFieldSelectorProps) => {
   )
 }
 
-type SubstitutionRowType = {
+type SubstitutionRowProps = {
   index: number,
   onChange: (Substitution, number) => void,
   onRemove: number => void,
@@ -262,7 +262,7 @@ type SubstitutionRowType = {
 /**
  * Renders and lets user edit a substitution.
  */
-class SubstitutionRow extends Component<SubstitutionRowType> {
+class SubstitutionRow extends Component<SubstitutionRowProps> {
   _onEditPattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     this._updateSubtitution({ pattern: evt.target.value })
   }
@@ -275,16 +275,15 @@ class SubstitutionRow extends Component<SubstitutionRowType> {
     this._updateSubtitution({ normalizeSpace: evt.target.checked })
   }
 
-  _onRemove = () => {
-    this.props.onRemove(this.props.index)
-  }
+  _onRemove = () => this.props.onRemove(this.props.index)
 
   _updateSubtitution (partialState: any) {
+    const { index, onChange, substitution } = this.props
     const newSubstitution = {
-      ...this.props.substitution,
+      ...substitution,
       ...partialState
     }
-    this.props.onChange(newSubstitution, this.props.index)
+    onChange(newSubstitution, index)
   }
 
   render () {
diff --git a/lib/types/index.js b/lib/types/index.js
index bf56857c3..23c458885 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -302,7 +302,7 @@ export type NormalizeFieldFields = {
   capitalizeExceptions?: string,
   fieldName?: string,
   performSubstitutions?: boolean,
-  substitutions: Array<Substitution>
+  substitutions?: Array<Substitution>
 }
 
 export type ReplaceFileFromStringFields = {

From f1a833df8df3f5b18daa29fd815bb593418a42b0 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 27 Apr 2021 10:26:01 -0400
Subject: [PATCH 176/553] refactor(NormalizeField): Add validation for
 non-blank subst patterns.

---
 .../components/transform/NormalizeField.js    | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 1fe2cb5f0..c43175f79 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -17,6 +17,9 @@ import type {
 } from '../../../types'
 import type { TransformProps } from './Transform'
 
+/**
+ * Extract just the subset of fields to build the state variable.
+ */
 function extractStateFields (transformation: NormalizeFieldFields): NormalizeFieldFields {
   const {
     capitalize,
@@ -79,7 +82,7 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
   }
 
   _onSaveTransformationSettings = () => {
-    this.props.onSave(extractStateFields(this.state), this.props.index)
+    this.props.onSave(this.state, this.props.index)
   }
 
   _onRevertTransformationSettings = () => {
@@ -95,9 +98,16 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
       issues.push('Field to normalize must be defined.')
     }
 
-    // If substitutions are enabled, then substitutions must be defined.
-    if (performSubstitutions && (!substitutions || substitutions.length === 0)) {
-      issues.push('Substitutions must be defined when enabling substitutions.')
+    // If substitutions are enabled, then substitutions must be defined,
+    // and the pattern for each must not be null or empty.
+    if (performSubstitutions) {
+      if (substitutions && substitutions.length > 0) {
+        if (substitutions.filter(s => !s.pattern || s.pattern === '').length > 0) {
+          issues.push('Substitution patterns must be defined.')
+        }
+      } else {
+        issues.push('Substitutions must be defined when enabling substitutions.')
+      }
     }
 
     return issues
@@ -179,7 +189,7 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
                   <tr>
                     <td colSpan='4'>
                       <Button bsSize='xsmall' onClick={this._onNewSubstitution}>
-                        <Icon type='plus' /> New
+                        <Icon type='plus' /> Add
                       </Button>
                     </td>
                   </tr>

From e8196461335ce850e90f5ad9cc41c50cedf9fce2 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Wed, 28 Apr 2021 21:09:03 +0100
Subject: [PATCH 177/553] refactor(HomeProjectDropdown.js): Refactor code

Applying some tips from Landons solution + bug fix

#650
---
 lib/manager/components/HomeProjectDropdown.js | 42 +++++++++----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index 81203f09d..d87e3a14d 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -3,12 +3,12 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import { Button } from 'react-bootstrap'
-import { LinkContainer } from 'react-router-bootstrap'
 import {browserHistory} from 'react-router'
+import { LinkContainer } from 'react-router-bootstrap'
 import Select from 'react-select'
-
 import {getAbbreviatedProjectName} from '../../common/util/util'
-import type {Project} from '../../types'
+
+import type {Project, ReactSelectOption} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
 type Props = {
@@ -17,20 +17,9 @@ type Props = {
   visibleProjects: Array<Project>
 }
 
-type State = {
-  selectedOption: any
-}
-
-export default class HomeProjectDropdown extends Component<Props, State> {
-  state = {
-    selectedOption: ''
-  }
-
-  handleChange = (selectedOption: any, activeProject: any) => {
-    this.setState({selectedOption})
-    activeProject === null
-      ? browserHistory.push(`/home/${selectedOption.value}`)
-      : browserHistory.push(`/home/`)
+export default class HomeProjectDropdown extends Component<Props> {
+  handleChange = (option: ReactSelectOption) => {
+    browserHistory.push(`/home/${option ? option.value : ''}`)
   }
 
   render () {
@@ -39,10 +28,13 @@ export default class HomeProjectDropdown extends Component<Props, State> {
       user,
       visibleProjects
     } = this.props
-    const {profile} = user
-    const abbreviatedProjectName = getAbbreviatedProjectName(activeProject)
     const isAdmin = user.permissions && user.permissions.isApplicationAdmin()
+    const {profile} = user
     if (!profile) return null
+    const abbreviatedProjectName = getAbbreviatedProjectName(activeProject)
+    const options = visibleProjects.map(
+      project => ({value: project.id, label: project.name})
+    )
     return (
       <div style={{marginBottom: '20px'}}>
         {
@@ -55,15 +47,19 @@ export default class HomeProjectDropdown extends Component<Props, State> {
           )
         }
         {activeProject
-          ? <LinkContainer className='pull-right' style={{marginBottom: '5px'}} to={`/project/${activeProject.id}`}>
+          ? <LinkContainer
+            className='pull-right'
+            style={{marginBottom: '5px'}}
+            to={`/project/${activeProject.id}`}
+          >
             <Button bsStyle='primary'>View {abbreviatedProjectName}</Button>
           </LinkContainer>
           : null
         }
         <Select
-          value={activeProject && {value: activeProject.id, label: activeProject.name}}
-          onChange={(selectedOption) => this.handleChange(selectedOption, activeProject)}
-          options={visibleProjects.map(p => ({value: p.id, label: p.name}))}
+          value={activeProject && {label: activeProject.name}}
+          onChange={this.handleChange}
+          options={options}
           style={{marginTop: '5px'}}
         />
       </div>

From 7778d4bb3123d39936be338917e1331f1f93a89b Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 29 Apr 2021 21:37:02 -0400
Subject: [PATCH 178/553] refactor(NormalizeField): Convert cap exceptions to
 array. Add substitution description.

---
 .../components/transform/NormalizeField.js    | 157 +++++++-----------
 .../components/transform/SubstitutionRow.js   |  98 +++++++++++
 lib/types/index.js                            |   3 +-
 3 files changed, 156 insertions(+), 102 deletions(-)
 create mode 100644 lib/manager/components/transform/SubstitutionRow.js

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index c43175f79..a949b0b7e 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -2,11 +2,19 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import { isEqual } from 'lodash'
-import React, { Component } from 'react'
-import { Button, Checkbox, FormControl, FormGroup, Table } from 'react-bootstrap'
+import React from 'react'
+import {
+  Button,
+  Checkbox,
+  FormGroup,
+  OverlayTrigger,
+  Table,
+  Tooltip
+} from 'react-bootstrap'
 import Select from 'react-select'
 
 import { getGtfsSpec } from '../../../common/util/config'
+import SubstitutionRow from './SubstitutionRow'
 import Transform from './Transform'
 
 import type {
@@ -22,17 +30,17 @@ import type { TransformProps } from './Transform'
  */
 function extractStateFields (transformation: NormalizeFieldFields): NormalizeFieldFields {
   const {
+    capitalizationExceptions,
     capitalize,
-    capitalizeExceptions,
     fieldName,
     performSubstitutions,
     substitutions
   } = transformation
   return {
-    capitalize: capitalize,
-    capitalizeExceptions: capitalizeExceptions || '',
+    capitalizationExceptions: capitalizationExceptions || [],
+    capitalize,
     fieldName: fieldName || '',
-    performSubstitutions: performSubstitutions,
+    performSubstitutions,
     substitutions: substitutions || []
   }
 }
@@ -50,12 +58,12 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
     this.updateState({fieldName: fieldOption.value})
   }
 
-  _onChangeCapitalizeValues = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+  _onChangeCapitalize = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     this.updateState({capitalize: evt.target.checked})
   }
 
-  _onChangeCapitalizeExceptions = (values: Array<{value: string}>) => {
-    this.updateState({capitalizeExceptions: values.map(v => v.value).join(',')})
+  _onChangeCapitalizationExceptions = (values: Array<{value: string}>) => {
+    this.updateState({capitalizationExceptions: values.map(v => v.value)})
   }
 
   _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
@@ -117,17 +125,28 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
     const { transformation } = this.props
     const {
       capitalize,
-      capitalizeExceptions,
+      capitalizationExceptions,
       fieldName,
       performSubstitutions,
       substitutions
     } = this.state
 
     const inputIsUnchanged = isEqual(this.state, extractStateFields(transformation))
-    const capitalizeExceptionList = capitalizeExceptions && capitalizeExceptions
-      .split(',')
-      .map(s => s.trim())
-      .map(s => ({ label: s, value: s }))
+    const capitalizationExceptionList = capitalizationExceptions &&
+      capitalizationExceptions.map(s => ({ label: s, value: s }))
+
+    const tooltip = (
+      <Tooltip id='normalize-space-tooltip'>
+        <p>
+          If checked, this option will add or shrink the space surrounding
+          the text to substitute to one space.
+        </p>
+        <p>
+          For example if "@" was replaced with "and",
+          then "12th@&nbsp;&nbsp;&nbsp;West" would become "12th and West".
+        </p>
+      </Tooltip>
+    )
 
     return (
       <div>
@@ -141,7 +160,7 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
           <li>
             <Checkbox
               checked={capitalize}
-              onChange={this._onChangeCapitalizeValues}
+              onChange={this._onChangeCapitalize}
             >
               Capitalize field value
             </Checkbox>
@@ -152,9 +171,9 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
                   arrowRenderer={null}
                   clearable={false}
                   multi
-                  onChange={this._onChangeCapitalizeExceptions}
+                  onChange={this._onChangeCapitalizationExceptions}
                   placeholder='Enter exceptions then press enter'
-                  value={capitalizeExceptionList}
+                  value={capitalizationExceptionList}
                 />
               </FormGroup>
             </span>
@@ -172,7 +191,15 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
                   <tr>
                     <th>Substitute</th>
                     <th>With</th>
-                    <th>Normalize space?</th>
+                    <th>
+                      <OverlayTrigger
+                        overlay={tooltip}
+                        placement='top'
+                      >
+                        <span>Normalize<br />space?</span>
+                      </OverlayTrigger>
+                    </th>
+                    <th style={{width: '45%'}}>Description</th>
                     <th />
                   </tr>
                 </thead>
@@ -244,96 +271,24 @@ function getGtfsTableSpec (tableName: string): ?GtfsSpecTable {
  */
 const GtfsFieldSelector = (props: GtfsFieldSelectorProps) => {
   const { onChange, selectedField, tableName } = props
-  if (!tableName) return null
-
-  const table = getGtfsTableSpec(tableName)
-  if (!table) return null
+  let options = []
+  let placeholder = 'First, select a table above'
+  if (tableName) {
+    const table = getGtfsTableSpec(tableName)
+    options = table && table.fields.map(field => ({ label: field.name, value: field.name }))
+    placeholder = 'Choose the field to normalize'
+  }
 
   return (
     <Select
       clearable={false}
+      disabled={!tableName}
       onChange={onChange}
-      options={table.fields.map(field => ({label: field.name, value: field.name}))}
-      placeholder='Choose the field to normalize'
-      searchable={false}
+      options={options}
+      placeholder={placeholder}
+      searchable
       style={{margin: '10px 0px', width: '230px'}}
       value={selectedField}
     />
   )
 }
-
-type SubstitutionRowProps = {
-  index: number,
-  onChange: (Substitution, number) => void,
-  onRemove: number => void,
-  substitution: Substitution
-}
-
-/**
- * Renders and lets user edit a substitution.
- */
-class SubstitutionRow extends Component<SubstitutionRowProps> {
-  _onEditPattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution({ pattern: evt.target.value })
-  }
-
-  _onEditReplacement = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution({ replacement: evt.target.value })
-  }
-
-  _onEditNormalizeSpace = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution({ normalizeSpace: evt.target.checked })
-  }
-
-  _onRemove = () => this.props.onRemove(this.props.index)
-
-  _updateSubtitution (partialState: any) {
-    const { index, onChange, substitution } = this.props
-    const newSubstitution = {
-      ...substitution,
-      ...partialState
-    }
-    onChange(newSubstitution, index)
-  }
-
-  render () {
-    const { substitution } = this.props
-    const { normalizeSpace, pattern, replacement } = substitution
-    return (
-      <tr>
-        <td>
-          <FormControl
-            onChange={this._onEditPattern}
-            placeholder='Enter text to find'
-            style={{height: 'unset', padding: '2px'}}
-            value={pattern}
-          />
-        </td>
-        <td>
-          <FormControl
-            onChange={this._onEditReplacement}
-            placeholder='Enter replacement text'
-            style={{height: 'unset', padding: '2px'}}
-            value={replacement}
-          />
-        </td>
-        <td>
-          <Checkbox
-            checked={normalizeSpace}
-            onChange={this._onEditNormalizeSpace}
-            style={{margin: '2px 0'}}
-          />
-        </td>
-        <td>
-          <Button
-            bsSize='xsmall'
-            onClick={this._onRemove}
-            title='Remove this substitution'
-          >
-            <Icon type='remove' />
-          </Button>
-        </td>
-      </tr>
-    )
-  }
-}
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
new file mode 100644
index 000000000..ecc422b72
--- /dev/null
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -0,0 +1,98 @@
+// @flow
+
+import Icon from '@conveyal/woonerf/components/icon'
+import React, { Component } from 'react'
+import { Button, Checkbox, FormControl } from 'react-bootstrap'
+
+import type {
+  Substitution
+} from '../../../types'
+
+type SubstitutionRowProps = {
+  index: number,
+  onChange: (Substitution, number) => void,
+  onRemove: number => void,
+  substitution: Substitution
+}
+
+/**
+ * Renders and lets user edit a substitution.
+ */
+export default class SubstitutionRow extends Component<SubstitutionRowProps> {
+  _onEditPattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution({ pattern: evt.target.value })
+  }
+
+  _onEditReplacement = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution({ replacement: evt.target.value })
+  }
+
+  _onEditNormalizeSpace = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution({ normalizeSpace: evt.target.checked })
+  }
+
+  _onEditDescription = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution({ description: evt.target.value })
+  }
+
+  _onRemove = () => this.props.onRemove(this.props.index)
+
+  _updateSubtitution (partialState: any) {
+    const { index, onChange, substitution } = this.props
+    const newSubstitution = {
+      ...substitution,
+      ...partialState
+    }
+    onChange(newSubstitution, index)
+  }
+
+  render () {
+    const { substitution } = this.props
+    const { description, normalizeSpace, pattern, replacement } = substitution
+    const inputStyle = { height: 'unset', padding: '2px' }
+    return (
+      <tr>
+        <td>
+          <FormControl
+            onChange={this._onEditPattern}
+            placeholder='Enter text to find'
+            style={inputStyle}
+            value={pattern}
+          />
+        </td>
+        <td>
+          <FormControl
+            onChange={this._onEditReplacement}
+            placeholder='Enter replacement text'
+            style={inputStyle}
+            value={replacement}
+          />
+        </td>
+        <td>
+          <Checkbox
+            checked={normalizeSpace}
+            onChange={this._onEditNormalizeSpace}
+            style={{margin: '2px 0'}}
+          />
+        </td>
+        <td>
+          <FormControl
+            onChange={this._onEditDescription}
+            placeholder='Enter optional description'
+            style={inputStyle}
+            value={description || ''}
+          />
+        </td>
+        <td>
+          <Button
+            bsSize='xsmall'
+            onClick={this._onRemove}
+            title='Remove this substitution'
+          >
+            <Icon type='remove' />
+          </Button>
+        </td>
+      </tr>
+    )
+  }
+}
diff --git a/lib/types/index.js b/lib/types/index.js
index 23c458885..418de8cff 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -292,14 +292,15 @@ export type RetrievalMethod = $Values<typeof RETRIEVAL_METHODS>
 export type FetchFrequency = $Values<typeof FETCH_FREQUENCIES>
 
 export type Substitution = {
+  description?: string,
   normalizeSpace?: boolean,
   pattern: string,
   replacement: string
 }
 
 export type NormalizeFieldFields = {
+  capitalizationExceptions?: Array<string>,
   capitalize?: boolean,
-  capitalizeExceptions?: string,
   fieldName?: string,
   performSubstitutions?: boolean,
   substitutions?: Array<Substitution>

From 9da9672dee5c95dfe300d7cd635fbe13ac0b48c5 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 30 Apr 2021 10:20:07 -0400
Subject: [PATCH 179/553] refactor(SubstitutionRow): Add links to regexr,
 improve fields.

---
 .../components/transform/NormalizeField.js    | 32 ++++++++--
 .../components/transform/SubstitutionRow.js   | 64 ++++++++++++-------
 2 files changed, 69 insertions(+), 27 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index a949b0b7e..c31e97a1a 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -135,7 +135,7 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
     const capitalizationExceptionList = capitalizationExceptions &&
       capitalizationExceptions.map(s => ({ label: s, value: s }))
 
-    const tooltip = (
+    const normalizeTooltip = (
       <Tooltip id='normalize-space-tooltip'>
         <p>
           If checked, this option will add or shrink the space surrounding
@@ -148,6 +148,19 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
       </Tooltip>
     )
 
+    const substituteTooltip = (
+      <Tooltip id='substitute-space-tooltip'>
+        <p>
+          Enter the text to search as a regular expression (regex).
+          Some characters may need to be escaped (e.g., enter "\+" for the "+" symbol).
+        </p>
+        <p>
+          Click the <Icon title='Test this regex' type='flask' /> icon next to a regex below to test it
+          or to get help writing one.
+        </p>
+      </Tooltip>
+    )
+
     return (
       <div>
         <GtfsFieldSelector
@@ -189,14 +202,23 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
               <Table condensed>
                 <thead>
                   <tr>
-                    <th>Substitute</th>
-                    <th>With</th>
                     <th>
+                      Substitute
+                      <OverlayTrigger
+                        overlay={substituteTooltip}
+                        placement='top'
+                      >
+                        <Icon type='info-circle' />
+                      </OverlayTrigger>
+                    </th>
+                    <th>With</th>
+                    <th style={{ textAlign: 'right' }}>
+                      Normalize<br />space?
                       <OverlayTrigger
-                        overlay={tooltip}
+                        overlay={normalizeTooltip}
                         placement='top'
                       >
-                        <span>Normalize<br />space?</span>
+                        <Icon type='info-circle' />
                       </OverlayTrigger>
                     </th>
                     <th style={{width: '45%'}}>Description</th>
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index ecc422b72..abae936c6 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -2,7 +2,7 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, { Component } from 'react'
-import { Button, Checkbox, FormControl } from 'react-bootstrap'
+import { Button, FormControl, InputGroup } from 'react-bootstrap'
 
 import type {
   Substitution
@@ -15,6 +15,9 @@ type SubstitutionRowProps = {
   substitution: Substitution
 }
 
+// (Encoded) test string to be included to URL to regex test tool (regexr).
+const STRING_FOR_REGEXR_TEST = encodeURIComponent('Route 10 to Bay 1 @ Train Station (10th+West)')
+
 /**
  * Renders and lets user edit a substitution.
  */
@@ -50,35 +53,52 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
     const { substitution } = this.props
     const { description, normalizeSpace, pattern, replacement } = substitution
     const inputStyle = { height: 'unset', padding: '2px' }
+    const regexTestLink = `https://regexr.com/?expression=${encodeURIComponent(pattern)}&text=${STRING_FOR_REGEXR_TEST}`
+
     return (
       <tr>
         <td>
-          <FormControl
-            onChange={this._onEditPattern}
-            placeholder='Enter text to find'
-            style={inputStyle}
-            value={pattern}
-          />
-        </td>
-        <td>
-          <FormControl
-            onChange={this._onEditReplacement}
-            placeholder='Enter replacement text'
-            style={inputStyle}
-            value={replacement}
-          />
+          <InputGroup style={{ padding: 0 }}>
+            <FormControl
+              onChange={this._onEditPattern}
+              placeholder='Text (regex) to find'
+              style={inputStyle}
+              value={pattern}
+            />
+            <InputGroup.Addon style={inputStyle}>
+              <a
+                href={regexTestLink}
+                target='_blank'
+                title='Test this regex'
+              >
+                <Icon type='flask' />
+              </a>
+            </InputGroup.Addon>
+          </InputGroup>
         </td>
-        <td>
-          <Checkbox
-            checked={normalizeSpace}
-            onChange={this._onEditNormalizeSpace}
-            style={{margin: '2px 0'}}
-          />
+        <td colSpan='2'>
+          <InputGroup style={{ padding: 0 }}>
+            <FormControl
+              onChange={this._onEditReplacement}
+              placeholder='Replacement'
+              style={inputStyle}
+              value={replacement}
+            />
+            <InputGroup.Addon style={{ padding: '0 6px' }}>
+              <input
+                ariaLabel='Normalize space'
+                checked={normalizeSpace}
+                onChange={this._onEditNormalizeSpace}
+                style={{ padding: '0 6px' }}
+                type='checkbox'
+              />
+            </InputGroup.Addon>
+          </InputGroup>
         </td>
         <td>
           <FormControl
             onChange={this._onEditDescription}
-            placeholder='Enter optional description'
+            placeholder='Optional description'
             style={inputStyle}
             value={description || ''}
           />

From b0968a9aa3abf8e96cbe59f9df8a5dc6887ee723 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 30 Apr 2021 10:58:08 -0400
Subject: [PATCH 180/553] refactor(SubstitutionRow): Add dangling refactor

---
 lib/manager/components/transform/SubstitutionRow.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index abae936c6..122b5eccc 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -53,12 +53,13 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
     const { substitution } = this.props
     const { description, normalizeSpace, pattern, replacement } = substitution
     const inputStyle = { height: 'unset', padding: '2px' }
+    const inputGroupStyle = { padding: 0 }
     const regexTestLink = `https://regexr.com/?expression=${encodeURIComponent(pattern)}&text=${STRING_FOR_REGEXR_TEST}`
 
     return (
       <tr>
         <td>
-          <InputGroup style={{ padding: 0 }}>
+          <InputGroup style={inputGroupStyle}>
             <FormControl
               onChange={this._onEditPattern}
               placeholder='Text (regex) to find'
@@ -77,7 +78,7 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
           </InputGroup>
         </td>
         <td colSpan='2'>
-          <InputGroup style={{ padding: 0 }}>
+          <InputGroup style={inputGroupStyle}>
             <FormControl
               onChange={this._onEditReplacement}
               placeholder='Replacement'

From 19fb3d2f7d2a415b941f3b47e667877c0958fe69 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 3 May 2021 17:25:10 -0400
Subject: [PATCH 181/553] refactor(GtfsFieldSelector): Extract
 GtfsFieldSelector component

---
 lib/manager/components/GtfsFieldSelector.js   | 55 +++++++++++++++++++
 .../components/transform/NormalizeField.js    | 50 +----------------
 2 files changed, 57 insertions(+), 48 deletions(-)
 create mode 100644 lib/manager/components/GtfsFieldSelector.js

diff --git a/lib/manager/components/GtfsFieldSelector.js b/lib/manager/components/GtfsFieldSelector.js
new file mode 100644
index 000000000..aa50cf375
--- /dev/null
+++ b/lib/manager/components/GtfsFieldSelector.js
@@ -0,0 +1,55 @@
+// @flow
+
+import React from 'react'
+import Select from 'react-select'
+
+import { getGtfsSpec } from '../../common/util/config'
+
+import type { GtfsSpecTable, ReactSelectOption } from '../../types'
+
+type GtfsFieldSelectorProps = {
+  onChange: (ReactSelectOption => void),
+  selectedField: ?string,
+  tableName: ?string
+}
+
+/**
+ * Obtains the desired GTFS spec table.
+ */
+function getGtfsTableSpec (tableName: string): ?GtfsSpecTable {
+  const spec = getGtfsSpec()
+  if (!spec) {
+    throw new Error('GTFS spec could not be found!')
+  }
+  const tableFile = `${tableName}.txt`
+  return spec.find(t => t.name === tableFile)
+}
+
+/**
+ * Dropdown selector to select a field from a given GTFS table.
+ */
+const GtfsFieldSelector = (props: GtfsFieldSelectorProps) => {
+  const { onChange, selectedField, tableName } = props
+  let options = []
+  let placeholder = 'First, select a table above'
+  if (tableName) {
+    const table = getGtfsTableSpec(tableName)
+    options = table && table.fields.map(field => ({ label: field.name, value: field.name }))
+    placeholder = 'Choose the field to normalize'
+  }
+
+  return (
+    <Select
+      clearable={false}
+      disabled={!tableName}
+      onChange={onChange}
+      options={options}
+      placeholder={placeholder}
+      searchable
+      style={{margin: '10px 0px', width: '230px'}}
+      value={selectedField}
+    />
+  )
+}
+
+export default GtfsFieldSelector
diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index c31e97a1a..a52845463 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -13,12 +13,11 @@ import {
 } from 'react-bootstrap'
 import Select from 'react-select'
 
-import { getGtfsSpec } from '../../../common/util/config'
+import GtfsFieldSelector from '../GtfsFieldSelector'
 import SubstitutionRow from './SubstitutionRow'
 import Transform from './Transform'
 
 import type {
-  GtfsSpecTable,
   NormalizeFieldFields,
   ReactSelectOption,
   Substitution
@@ -124,8 +123,8 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
   render () {
     const { transformation } = this.props
     const {
-      capitalize,
       capitalizationExceptions,
+      capitalize,
       fieldName,
       performSubstitutions,
       substitutions
@@ -269,48 +268,3 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
     )
   }
 }
-
-type GtfsFieldSelectorProps = {
-  onChange: (ReactSelectOption => void),
-  selectedField: ?string,
-  tableName: ?string
-}
-
-/**
- * Obtains the desired GTFS spec table.
- */
-function getGtfsTableSpec (tableName: string): ?GtfsSpecTable {
-  const spec = getGtfsSpec()
-  if (!spec) {
-    throw new Error('GTFS spec could not be found!')
-  }
-  const tableFile = `${tableName}.txt`
-  return spec.find(t => t.name === tableFile)
-}
-
-/**
- * Dropdown selector to select a field from a given GTFS table.
- */
-const GtfsFieldSelector = (props: GtfsFieldSelectorProps) => {
-  const { onChange, selectedField, tableName } = props
-  let options = []
-  let placeholder = 'First, select a table above'
-  if (tableName) {
-    const table = getGtfsTableSpec(tableName)
-    options = table && table.fields.map(field => ({ label: field.name, value: field.name }))
-    placeholder = 'Choose the field to normalize'
-  }
-
-  return (
-    <Select
-      clearable={false}
-      disabled={!tableName}
-      onChange={onChange}
-      options={options}
-      placeholder={placeholder}
-      searchable
-      style={{margin: '10px 0px', width: '230px'}}
-      value={selectedField}
-    />
-  )
-}

From 7d2e6c59df29acbf3e4bc97678071528fb85f45e Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 3 May 2021 18:16:01 -0400
Subject: [PATCH 182/553] refactor: update auto-deploy for backend changes

---
 i18n/english.yml                           | 10 ++++--
 lib/common/constants/index.js              |  5 +++
 lib/manager/components/DeploymentsPanel.js | 36 ++++++++++++++--------
 lib/types/index.js                         | 11 +++++--
 4 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 8c276670b..7c2580190 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -142,14 +142,18 @@ components:
   DeploymentsPanel:
     autoDeploy:
       help: >
-        Whenever a new version is processed, a deployment will automatically be
-        kicked off (assuming there are no critical errors).
-      label: Enable auto-deploy?
+        A deployment will automatically be kicked off (assuming there are no
+        critical errors) whenever one of the above-defined events occurs.
+      label: Auto-deploy events
       noPinnedDeployment: None selected
       pinnedDeploymentHelp: >
         Tip: Under the Deployments tab, click the thumbtack icon next to the
         deployment you would like to target for auto-deployments.
+      placeholder: Specify auto-deploy events
       title: Auto-deployment
+      types:
+        ON_FEED_FETCH: A new version is fetched
+        ON_PROCESS_FEED: A new version is processed
     config:
       body: >
         Deployments can use project-level configurations (e.g., for build or
diff --git a/lib/common/constants/index.js b/lib/common/constants/index.js
index 3eb71f69d..34f078ae0 100644
--- a/lib/common/constants/index.js
+++ b/lib/common/constants/index.js
@@ -11,6 +11,11 @@ export const DEFAULT_LOGO = 'https://d2tyb7byn1fef9.cloudfront.net/ibi_group_bla
 export const DEFAULT_LOGO_SMALL = 'https://d2tyb7byn1fef9.cloudfront.net/ibi_group-128x128.png'
 export const DEFAULT_TITLE = 'Data Tools'
 
+export const AUTO_DEPLOY_TYPES = Object.freeze({
+  ON_FEED_FETCH: 'ON_FEED_FETCH',
+  ON_PROCESS_FEED: 'ON_PROCESS_FEED'
+})
+
 export const FETCH_FREQUENCIES = Object.freeze({
   MINUTES: 'MINUTES',
   HOURS: 'HOURS',
diff --git a/lib/manager/components/DeploymentsPanel.js b/lib/manager/components/DeploymentsPanel.js
index 21a7e3908..8d280f8bc 100644
--- a/lib/manager/components/DeploymentsPanel.js
+++ b/lib/manager/components/DeploymentsPanel.js
@@ -5,7 +5,6 @@ import React, {Component} from 'react'
 import { LinkContainer } from 'react-router-bootstrap'
 import {
   Button,
-  Checkbox,
   Col,
   ControlLabel,
   Glyphicon,
@@ -25,6 +24,7 @@ import ActiveDeploymentViewer from '../containers/ActiveDeploymentViewer'
 import ConfirmModal from '../../common/components/ConfirmModal'
 import EditableTextField from '../../common/components/EditableTextField'
 import Loading from '../../common/components/Loading'
+import {AUTO_DEPLOY_TYPES} from '../../common/constants'
 import {getComponentMessages} from '../../common/util/config'
 import {formatTimestamp, fromNow} from '../../common/util/date-time'
 import {deploymentsComparator, getServerDeployedTo} from '../util/deployment'
@@ -52,8 +52,8 @@ export default class DeploymentsPanel extends Component<Props> {
     this._updateProject({pinnedDeploymentId: option ? option.value : null})
   }
 
-  _onToggleAutoDeploy = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateProject({autoDeploy: evt.target.checked})
+  _onToggleAutoDeploy = (options: Array<ReactSelectOption>) => {
+    this._updateProject({autoDeployTypes: options.map(o => o.value)})
   }
 
   _onDeleteDeployment = (deployment: Deployment) => {
@@ -118,15 +118,27 @@ export default class DeploymentsPanel extends Component<Props> {
               />
               <HelpBlock>{this.messages('pinnedDeployment.help')}</HelpBlock>
             </FormGroup>
-            <Checkbox
-              checked={project.autoDeploy}
-              disabled={!project.pinnedDeploymentId}
-              name={'autoDeploy'}
-              onChange={this._onToggleAutoDeploy}
-            >
-              {this.messages('autoDeploy.label')}
-            </Checkbox>
-            <HelpBlock>{this.messages('autoDeploy.help')}</HelpBlock>
+            <FormGroup controlId='pinnedDeploymentId'>
+              <ControlLabel>
+                <Icon type='thumb-tack' />{' '}
+                {this.messages('autoDeploy.label')}
+              </ControlLabel>
+              <Select
+                multi
+                name='autoDeployTypes'
+                onChange={this._onToggleAutoDeploy}
+                options={Object.values(AUTO_DEPLOY_TYPES).map(t => ({
+                  // Satisfy flow with typeof check. Ugh.
+                  label: typeof t === 'string'
+                    ? this.messages(`autoDeploy.types.${t}`)
+                    : t,
+                  value: t
+                }))}
+                placeholder={this.messages('autoDeploy.placeholder')}
+                value={project.autoDeployTypes}
+              />
+              <HelpBlock>{this.messages('autoDeploy.help')}</HelpBlock>
+            </FormGroup>
           </Panel>
           <Panel header={
             <h3><Icon type='cog' /> {this.messages('config.title')}</h3>
diff --git a/lib/types/index.js b/lib/types/index.js
index c9548bdd8..4f444fc08 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -1,7 +1,12 @@
 // @flow
 
 import {POINT_TYPE} from '../editor/constants'
-import {FEED_TRANSFORMATION_TYPES, FETCH_FREQUENCIES, RETRIEVAL_METHODS} from '../common/constants'
+import {
+  AUTO_DEPLOY_TYPES,
+  FEED_TRANSFORMATION_TYPES,
+  FETCH_FREQUENCIES,
+  RETRIEVAL_METHODS
+} from '../common/constants'
 
 import type UserPermissions from '../common/user/UserPermissions'
 
@@ -689,8 +694,10 @@ export type RouterConfig = {
   walkSpeed?: ?any // TODO: define more specific type
 }
 
+export type AutoDeployType = $Values<typeof AUTO_DEPLOY_TYPES>
+
 export type Project = {
-  autoDeploy: boolean,
+  autoDeployTypes: Array<AutoDeployType>,
   autoFetchFeeds: boolean,
   autoFetchHour: number,
   autoFetchMinute: number,

From b5d7b7d9e825efa8e869232c342b83a42304516e Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Mon, 3 May 2021 18:16:23 -0400
Subject: [PATCH 183/553] build(yarn.lock): update file with local changes

---
 yarn.lock | 37 +++++++------------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c58b225f2..c6ad8dbd8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2297,7 +2297,7 @@ bl@^3.0.0:
   dependencies:
     readable-stream "^3.0.1"
 
-bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
+bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -3113,14 +3113,6 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-cmd-shim@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb"
-  integrity sha1-b8vamUg6j9FdfTChlspp1oii79s=
-  dependencies:
-    graceful-fs "^4.1.2"
-    mkdirp "~0.5.0"
-
 cmd-shim@^3.0.0, cmd-shim@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-3.0.3.tgz#2c35238d3df37d98ecdd7d5f6b8dc6b21cadc7cb"
@@ -4592,7 +4584,7 @@ es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.4.
     is-regex "^1.0.4"
     object-keys "^1.0.12"
 
-es-to-primitive@^1.1.1, es-to-primitive@^1.2.0:
+es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
   integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
@@ -5688,7 +5680,7 @@ genfun@^5.0.0:
   resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
   integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
-gentle-fs@^2.0.0, gentle-fs@^2.3.0, gentle-fs@^2.3.1:
+gentle-fs@^2.3.0, gentle-fs@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.1.tgz#11201bf66c18f930ddca72cf69460bdfa05727b1"
   integrity sha512-OlwBBwqCFPcjm33rF2BjW+Pr6/ll2741l+xooiwTCeaX2CA1ZuclavyMBe0/KlR21/XGsgY6hzEQZ15BdNa13Q==
@@ -6138,7 +6130,7 @@ hoist-non-react-statics@^2.1.0, hoist-non-react-statics@^2.3.1:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:
+hoist-non-react-statics@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
   integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
@@ -6157,7 +6149,7 @@ hook-std@^2.0.0:
   resolved "https://registry.yarnpkg.com/hook-std/-/hook-std-2.0.0.tgz#ff9aafdebb6a989a354f729bb6445cf4a3a7077c"
   integrity sha512-zZ6T5WcuBMIUVh49iPQS9t977t7C0l7OtHrpeMb5uk48JdflRX0NSFvCekfYNmGQETnLq9W/isMyHl69kxGi8g==
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1, hosted-git-info@^2.8.8:
+hosted-git-info@^2.1.4, hosted-git-info@^2.7.1, hosted-git-info@^2.8.8:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
@@ -6967,7 +6959,7 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.0"
 
-is-text-path@^1.0.0, is-text-path@^1.0.1:
+is-text-path@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
   integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
@@ -8762,11 +8754,6 @@ mime-db@1.40.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
   integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
-mime-db@~1.37.0:
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
-  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
-
 mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
   version "2.1.24"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
@@ -11535,7 +11522,7 @@ react-input-autosize@^2.1.2:
   dependencies:
     prop-types "^15.5.8"
 
-react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
+react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
   version "16.11.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz#b85dfecd48ad1ce469ff558a882ca8e8313928fa"
   integrity sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw==
@@ -12056,11 +12043,6 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-runtime@^0.12.0:
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
-  integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
-
 regenerator-runtime@^0.13.2:
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
@@ -12801,11 +12783,6 @@ slack@^11.0.1:
   dependencies:
     tiny-json-http "^7.0.0"
 
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
-
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"

From 54f1aac3573cc5af4575bd839afb116708e626e8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 3 May 2021 18:18:12 -0400
Subject: [PATCH 184/553] refactor(types): Split up transf types, remove transf
 inheritance.

---
 .../transform/FeedTransformation.js           |  4 +-
 .../components/transform/NormalizeField.js    | 33 ++++++++++--
 .../transform/ReplaceFileFromString.js        | 36 +++++++++++--
 .../transform/ReplaceFileFromVersion.js       | 21 ++++++--
 .../components/transform/SubstitutionRow.js   |  2 +-
 lib/manager/components/transform/Transform.js | 53 +------------------
 lib/manager/util/__tests__/transform.js       | 18 ++++---
 lib/manager/util/transform.js                 | 30 +++++++----
 lib/types/index.js                            | 21 +++++++-
 9 files changed, 136 insertions(+), 82 deletions(-)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index e79368e98..705c79ed2 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -6,7 +6,7 @@ import {Button} from 'react-bootstrap'
 import Select from 'react-select'
 
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
-import {getTransformationName} from '../../util/transform'
+import {getTransformationLabel} from '../../util/transform'
 import NormalizeField from './NormalizeField'
 import ReplaceFileFromString from './ReplaceFileFromString'
 import ReplaceFileFromVersion from './ReplaceFileFromVersion'
@@ -108,7 +108,7 @@ export default class FeedTransformation extends Component<Props, {errors: Array<
             onClick={this._onRemoveTransformation}>
             Delete step
           </Button>
-          Step {index + 1} - {getTransformationName(transformationType, transformation, feedSource.feedVersions)}
+          Step {index + 1} - {getTransformationLabel(transformationType, transformation, feedSource.feedVersions)}
         </h5>
         <div className='feed-transformation-body'>
           <Select
diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index a52845463..8f54d5c93 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -2,7 +2,7 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import { isEqual } from 'lodash'
-import React from 'react'
+import React, { Component } from 'react'
 import {
   Button,
   Checkbox,
@@ -15,7 +15,6 @@ import Select from 'react-select'
 
 import GtfsFieldSelector from '../GtfsFieldSelector'
 import SubstitutionRow from './SubstitutionRow'
-import Transform from './Transform'
 
 import type {
   NormalizeFieldFields,
@@ -47,7 +46,7 @@ function extractStateFields (transformation: NormalizeFieldFields): NormalizeFie
 /**
  * Component that renders input fields for the NoramlizeFieldTransformation.
  */
-export default class NormalizeField extends Transform<NormalizeFieldFields> {
+export default class NormalizeField extends Component<TransformProps<NormalizeFieldFields>, NormalizeFieldFields> {
   constructor (props: TransformProps<NormalizeFieldFields>) {
     super(props)
     this.state = extractStateFields(props.transformation)
@@ -120,6 +119,34 @@ export default class NormalizeField extends Transform<NormalizeFieldFields> {
     return issues
   }
 
+  /**
+   * Notify containing component of the resulting validation errors if any.
+   * @param fields: The updated state. If not set, the component state will be used.
+   */
+  _updateErrors = (fields?: NormalizeFieldFields) => {
+    const { onValidationErrors } = this.props
+    if (typeof onValidationErrors === 'function') {
+      onValidationErrors(this.getValidationErrors(fields || this.state))
+    }
+  }
+
+  /**
+   * Update the component editing state
+   * and perform and notify of validation checks.
+   */
+  updateState = (partialState: any) => {
+    const newState = {
+      ...this.state,
+      ...partialState
+    }
+    this.setState(newState)
+    this._updateErrors(newState)
+  }
+
+  componentDidMount () {
+    this._updateErrors()
+  }
+
   render () {
     const { transformation } = this.props
     const {
diff --git a/lib/manager/components/transform/ReplaceFileFromString.js b/lib/manager/components/transform/ReplaceFileFromString.js
index 89f26edd5..3dc9556c0 100644
--- a/lib/manager/components/transform/ReplaceFileFromString.js
+++ b/lib/manager/components/transform/ReplaceFileFromString.js
@@ -1,9 +1,7 @@
 // @flow
 
-import React from 'react'
-import {Button} from 'react-bootstrap'
-
-import Transform from './Transform'
+import React, { Component } from 'react'
+import { Button } from 'react-bootstrap'
 
 import type { ReplaceFileFromStringFields } from '../../../types'
 import type { TransformProps } from './Transform'
@@ -11,7 +9,7 @@ import type { TransformProps } from './Transform'
 /**
  * Component that renders fields for ReplaceFileFromStringTransformation.
  */
-export default class ReplaceFileFromString extends Transform<ReplaceFileFromStringFields> {
+export default class ReplaceFileFromString extends Component<TransformProps<ReplaceFileFromStringFields>, ReplaceFileFromStringFields> {
   constructor (props: TransformProps<ReplaceFileFromStringFields>) {
     super(props)
     this.state = {csvData: props.transformation.csvData}
@@ -37,6 +35,34 @@ export default class ReplaceFileFromString extends Transform<ReplaceFileFromStri
     return issues
   }
 
+  /**
+   * Notify containing component of the resulting validation errors if any.
+   * @param fields: The updated state. If not set, the component state will be used.
+   */
+  _updateErrors = (fields?: ReplaceFileFromStringFields) => {
+    const { onValidationErrors } = this.props
+    if (typeof onValidationErrors === 'function') {
+      onValidationErrors(this.getValidationErrors(fields || this.state))
+    }
+  }
+
+  /**
+   * Update the component editing state
+   * and perform and notify of validation checks.
+   */
+  updateState = (partialState: any) => {
+    const newState = {
+      ...this.state,
+      ...partialState
+    }
+    this.setState(newState)
+    this._updateErrors(newState)
+  }
+
+  componentDidMount () {
+    this._updateErrors()
+  }
+
   render () {
     const {transformation} = this.props
     const {csvData} = this.state
diff --git a/lib/manager/components/transform/ReplaceFileFromVersion.js b/lib/manager/components/transform/ReplaceFileFromVersion.js
index 5ed10740b..9f64f7946 100644
--- a/lib/manager/components/transform/ReplaceFileFromVersion.js
+++ b/lib/manager/components/transform/ReplaceFileFromVersion.js
@@ -1,15 +1,15 @@
 // @flow
 
-import React from 'react'
+import React, { Component } from 'react'
 
 import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
 
-import Transform from './Transform'
+import type { TransformProps } from './Transform'
 
 /**
  * Component that renders fields for ReplaceFileFromVersionTransformation.
  */
-export default class ReplaceFileFromVersion extends Transform<{}> {
+export default class ReplaceFileFromVersion extends Component<TransformProps<{}>, {}> {
   _onSelectVersion = (versionIndex: number) => {
     const {feedSource, onSave} = this.props
     if (feedSource.feedVersions) {
@@ -35,6 +35,21 @@ export default class ReplaceFileFromVersion extends Transform<{}> {
     return issues
   }
 
+  /**
+   * Notify containing component of the resulting validation errors if any.
+   * @param fields: The updated state. If not set, the component state will be used.
+   */
+  _updateErrors = () => {
+    const { onValidationErrors } = this.props
+    if (typeof onValidationErrors === 'function') {
+      onValidationErrors(this.getValidationErrors())
+    }
+  }
+
+  componentDidMount () {
+    this._updateErrors()
+  }
+
   render () {
     const {feedSource, transformation} = this.props
     // Get selected version (if applicable).
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index 122b5eccc..42d132e90 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -81,7 +81,7 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
           <InputGroup style={inputGroupStyle}>
             <FormControl
               onChange={this._onEditReplacement}
-              placeholder='Replacement'
+              placeholder='<blank>'
               style={inputStyle}
               value={replacement}
             />
diff --git a/lib/manager/components/transform/Transform.js b/lib/manager/components/transform/Transform.js
index 51e980b4c..11e79ebe6 100644
--- a/lib/manager/components/transform/Transform.js
+++ b/lib/manager/components/transform/Transform.js
@@ -1,10 +1,8 @@
 // @flow
 
-import { Component } from 'react'
-
 import type {
   Feed,
-  FeedTransformation as FeedTransformationType
+  FeedTransformationBase
 } from '../../../types'
 
 export type TransformProps<StateType> = {
@@ -12,52 +10,5 @@ export type TransformProps<StateType> = {
   index: number,
   onSave: (StateType, number) => void,
   onValidationErrors: (Array<string>) => void,
-  transformation: FeedTransformationType
-}
-
-/**
- * Generic Transform component that holds helper methods for derived components.
- */
-export default class Transform<StateType> extends Component<TransformProps<StateType>, StateType> {
-  /**
-   * Overridable method to obtain validation errors for the current editing state,
-   * if applicable.
-   * @param fields: The state to be validated. May be different from (more recent than) this.state.
-   */
-  getValidationErrors (fields: StateType): Array<string> {
-    return []
-  }
-
-  /**
-   * Make derived components perform their own error checks,
-   * and notify parent components of the resulting validation errors if any.
-   * @param fields: The updated state. If not set, the component state will be used.
-   */
-  _updateErrors = (fields?: StateType) => {
-    const { onValidationErrors } = this.props
-    if (typeof onValidationErrors === 'function') {
-      onValidationErrors(this.getValidationErrors(fields || this.state))
-    }
-  }
-
-  /**
-   * Update the component editing state
-   * and perform and notify of validation checks.
-   */
-  updateState = (partialState: any) => {
-    const newState = {
-      ...this.state,
-      ...partialState
-    }
-    this.setState(newState)
-    this._updateErrors(newState)
-  }
-
-  componentDidMount () {
-    this._updateErrors()
-  }
-
-  render () {
-    throw new Error('render() called on abstract class Transform')
-  }
+  transformation: FeedTransformationBase & StateType
 }
diff --git a/lib/manager/util/__tests__/transform.js b/lib/manager/util/__tests__/transform.js
index d9b0c7821..0dd46c9c6 100644
--- a/lib/manager/util/__tests__/transform.js
+++ b/lib/manager/util/__tests__/transform.js
@@ -1,18 +1,20 @@
 // @flow
 import clone from 'lodash/cloneDeep'
 
-import {getTransformationName} from '../transform'
+import {getTransformationName, getTransformationLabel} from '../transform'
 import {FEED_TRANSFORMATION_TYPES} from '../../../common/constants'
 
-import type {FeedTransformation} from '../../../types'
+import type {ReplaceFileFromStringTransformation} from '../../../types'
 
 const {REPLACE_FILE_FROM_STRING} = FEED_TRANSFORMATION_TYPES
 
-const replaceFileTransformation: FeedTransformation = {
+const replaceFileTransformation: ReplaceFileFromStringTransformation = {
   '@type': REPLACE_FILE_FROM_STRING,
   active: true,
+  csvData: null,
   sourceVersionId: 'abcdefg-12345.zip',
-  table: null
+  table: null,
+  typeName: REPLACE_FILE_FROM_STRING
 }
 
 const halfCompletedTransformation = clone(replaceFileTransformation)
@@ -26,10 +28,12 @@ describe('manager > util > transform >', () => {
     it('should return name for ReplaceFileFromStringTranformation', () => {
       expect(getTransformationName(REPLACE_FILE_FROM_STRING)).toMatchSnapshot()
     })
+  })
 
+  describe('getTransformationLabel >', () => {
     it('should return unreplaced label for ReplaceFileFromStringTranformation', () => {
       expect(
-        getTransformationName(
+        getTransformationLabel(
           REPLACE_FILE_FROM_STRING,
           replaceFileTransformation
         )
@@ -38,7 +42,7 @@ describe('manager > util > transform >', () => {
 
     it('should return half-replaced label for ReplaceFileFromStringTranformation', () => {
       expect(
-        getTransformationName(
+        getTransformationLabel(
           REPLACE_FILE_FROM_STRING,
           halfCompletedTransformation
         )
@@ -47,7 +51,7 @@ describe('manager > util > transform >', () => {
 
     it('should return fully-replaced label for ReplaceFileFromStringTranformation', () => {
       expect(
-        getTransformationName(
+        getTransformationLabel(
           REPLACE_FILE_FROM_STRING,
           fullyCompletedTransformation
         )
diff --git a/lib/manager/util/transform.js b/lib/manager/util/transform.js
index daf7fb55e..2643ca698 100644
--- a/lib/manager/util/transform.js
+++ b/lib/manager/util/transform.js
@@ -1,28 +1,38 @@
 // @flow
 import {getComponentMessages} from '../../common/util/config'
 
-import type {FeedTransformation, FeedVersion} from '../../types'
+import type {
+  FeedTransformation,
+  FeedVersion
+} from '../../types'
 
 /**
- * Returns human readable name or description (if transformation object provided)
+ * Returns human readable name
  * for transformation type based on messages defined in
  * english.yml#components.FeedTransformationDescriptions.
  */
-export function getTransformationName (
+export function getTransformationName (type: string) {
+  const messages = getComponentMessages('FeedTransformationDescriptions')
+  return messages(`${type}.name`)
+}
+
+/**
+ * Returns human readable description
+ * for transformation type based on messages defined in
+ * english.yml#components.FeedTransformationDescriptions.
+ */
+export function getTransformationLabel (
   type: string,
-  transformation?: FeedTransformation,
+  transformation: FeedTransformation,
   versions?: Array<FeedVersion>
 ) {
   // Get the base component messages.
   const messages = getComponentMessages('FeedTransformationDescriptions')
-  // If no transformation is provided, the name of the transformation is being
-  // requested.
-  if (!transformation) return messages(`${type}.name`)
   if (type !== transformation['@type']) {
     console.error(`Input feed transformation type (${type}) does not match type found in transformation object`, transformation)
   }
   // Otherwise, build the label/description up piece by piece.
-  const {csvData, table, sourceVersionId} = transformation
+  const {sourceVersionId, table} = transformation
   let label = messages(`${type}.label`)
   // Note: Additional placeholder values can be added to this list and the below
   // switch statement.
@@ -34,7 +44,9 @@ export function getTransformationName (
     // value below.
     switch (placeholderId) {
       case 'filePlaceholder':
-        if (csvData) replacementText = messages(`general.fileDefined`)
+        if (transformation.typeName === 'ReplaceFileFromStringTransformation') {
+          if (transformation.csvData) replacementText = messages(`general.fileDefined`)
+        }
         break
       case 'tablePlaceholder':
         if (table) replacementText = `${table} ${messages(`general.table`)}`
diff --git a/lib/types/index.js b/lib/types/index.js
index 418de8cff..b2ed5f2e7 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -319,11 +319,30 @@ export type FeedTransformationBase = {
   table: ?string
 }
 
-export type FeedTransformation =
+export type DeleteRecordsTransformation =
+  & {typeName: 'DeleteRecordsTransformation'}
+  & FeedTransformationBase
+
+export type ReplaceFileFromVersionTransformation =
+  & {typeName: 'ReplaceFileFromVersionTransformation'}
+  & FeedTransformationBase
+
+export type ReplaceFileFromStringTransformation =
+  & {typeName: 'ReplaceFileFromStringTransformation'}
   & FeedTransformationBase
   & ReplaceFileFromStringFields
+
+export type NormalizeFieldTransformation =
+  & {typeName: 'NormalizeFieldTransformation'}
+  & FeedTransformationBase
   & NormalizeFieldFields
 
+export type FeedTransformation =
+  | DeleteRecordsTransformation
+  | ReplaceFileFromVersionTransformation
+  | ReplaceFileFromStringTransformation
+  | NormalizeFieldTransformation
+
 export type FeedTransformRules = {
   active: boolean,
   createNewVersion: boolean,

From 1c7fcd908e39e0b991ff515a5513f69dd3f483b3 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 3 May 2021 19:12:54 -0400
Subject: [PATCH 185/553] refactor(getTransformName): Unsplit getTransformName.

---
 .../transform/FeedTransformation.js           |  4 ++--
 lib/manager/util/__tests__/transform.js       | 10 ++++------
 lib/manager/util/transform.js                 | 19 +++++--------------
 3 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 705c79ed2..e79368e98 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -6,7 +6,7 @@ import {Button} from 'react-bootstrap'
 import Select from 'react-select'
 
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
-import {getTransformationLabel} from '../../util/transform'
+import {getTransformationName} from '../../util/transform'
 import NormalizeField from './NormalizeField'
 import ReplaceFileFromString from './ReplaceFileFromString'
 import ReplaceFileFromVersion from './ReplaceFileFromVersion'
@@ -108,7 +108,7 @@ export default class FeedTransformation extends Component<Props, {errors: Array<
             onClick={this._onRemoveTransformation}>
             Delete step
           </Button>
-          Step {index + 1} - {getTransformationLabel(transformationType, transformation, feedSource.feedVersions)}
+          Step {index + 1} - {getTransformationName(transformationType, transformation, feedSource.feedVersions)}
         </h5>
         <div className='feed-transformation-body'>
           <Select
diff --git a/lib/manager/util/__tests__/transform.js b/lib/manager/util/__tests__/transform.js
index 0dd46c9c6..f788e5d1d 100644
--- a/lib/manager/util/__tests__/transform.js
+++ b/lib/manager/util/__tests__/transform.js
@@ -1,7 +1,7 @@
 // @flow
 import clone from 'lodash/cloneDeep'
 
-import {getTransformationName, getTransformationLabel} from '../transform'
+import {getTransformationName} from '../transform'
 import {FEED_TRANSFORMATION_TYPES} from '../../../common/constants'
 
 import type {ReplaceFileFromStringTransformation} from '../../../types'
@@ -28,12 +28,10 @@ describe('manager > util > transform >', () => {
     it('should return name for ReplaceFileFromStringTranformation', () => {
       expect(getTransformationName(REPLACE_FILE_FROM_STRING)).toMatchSnapshot()
     })
-  })
 
-  describe('getTransformationLabel >', () => {
     it('should return unreplaced label for ReplaceFileFromStringTranformation', () => {
       expect(
-        getTransformationLabel(
+        getTransformationName(
           REPLACE_FILE_FROM_STRING,
           replaceFileTransformation
         )
@@ -42,7 +40,7 @@ describe('manager > util > transform >', () => {
 
     it('should return half-replaced label for ReplaceFileFromStringTranformation', () => {
       expect(
-        getTransformationLabel(
+        getTransformationName(
           REPLACE_FILE_FROM_STRING,
           halfCompletedTransformation
         )
@@ -51,7 +49,7 @@ describe('manager > util > transform >', () => {
 
     it('should return fully-replaced label for ReplaceFileFromStringTranformation', () => {
       expect(
-        getTransformationLabel(
+        getTransformationName(
           REPLACE_FILE_FROM_STRING,
           fullyCompletedTransformation
         )
diff --git a/lib/manager/util/transform.js b/lib/manager/util/transform.js
index 2643ca698..a765dac55 100644
--- a/lib/manager/util/transform.js
+++ b/lib/manager/util/transform.js
@@ -7,27 +7,18 @@ import type {
 } from '../../types'
 
 /**
- * Returns human readable name
+ * Returns human readable name or description
  * for transformation type based on messages defined in
  * english.yml#components.FeedTransformationDescriptions.
  */
-export function getTransformationName (type: string) {
-  const messages = getComponentMessages('FeedTransformationDescriptions')
-  return messages(`${type}.name`)
-}
-
-/**
- * Returns human readable description
- * for transformation type based on messages defined in
- * english.yml#components.FeedTransformationDescriptions.
- */
-export function getTransformationLabel (
+export function getTransformationName (
   type: string,
-  transformation: FeedTransformation,
+  transformation?: FeedTransformation,
   versions?: Array<FeedVersion>
 ) {
   // Get the base component messages.
   const messages = getComponentMessages('FeedTransformationDescriptions')
+  if (!transformation) return messages(`${type}.name`)
   if (type !== transformation['@type']) {
     console.error(`Input feed transformation type (${type}) does not match type found in transformation object`, transformation)
   }
@@ -44,7 +35,7 @@ export function getTransformationLabel (
     // value below.
     switch (placeholderId) {
       case 'filePlaceholder':
-        if (transformation.typeName === 'ReplaceFileFromStringTransformation') {
+        if (transformation && transformation.typeName === 'ReplaceFileFromStringTransformation') {
           if (transformation.csvData) replacementText = messages(`general.fileDefined`)
         }
         break

From 9a4a01d4b5a48e77d70e5e34c9f20226a04a2e8e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 3 May 2021 19:53:57 -0400
Subject: [PATCH 186/553] refactor(FeedTransformation): Make table selector
 searchable again. Minor tweaks.

---
 lib/manager/components/GtfsFieldSelector.js            | 1 -
 lib/manager/components/transform/FeedTransformation.js | 1 -
 lib/manager/components/transform/NormalizeField.js     | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/manager/components/GtfsFieldSelector.js b/lib/manager/components/GtfsFieldSelector.js
index aa50cf375..8c39d7f93 100644
--- a/lib/manager/components/GtfsFieldSelector.js
+++ b/lib/manager/components/GtfsFieldSelector.js
@@ -45,7 +45,6 @@ const GtfsFieldSelector = (props: GtfsFieldSelectorProps) => {
       onChange={onChange}
       options={options}
       placeholder={placeholder}
-      searchable
       style={{margin: '10px 0px', width: '230px'}}
       value={selectedField}
     />
diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index e79368e98..843d611bc 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -114,7 +114,6 @@ export default class FeedTransformation extends Component<Props, {errors: Array<
           <Select
             style={{margin: '10px 0px', width: '230px'}}
             clearable={false}
-            searchable={false}
             placeholder='Choose the file/table to replace'
             options={tables.map(table => ({value: table.name.split('.txt')[0], label: table.name}))}
             value={transformation.table}
diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 8f54d5c93..8418d4c07 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -168,7 +168,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
           the text to substitute to one space.
         </p>
         <p>
-          For example if "@" was replaced with "and",
+          For example if "@" were replaced with "and",
           then "12th@&nbsp;&nbsp;&nbsp;West" would become "12th and West".
         </p>
       </Tooltip>

From 587d01a79270e8f2cb9f1faa0995df7b680871e0 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 4 May 2021 09:47:28 -0400
Subject: [PATCH 187/553] refactor(ReplaceFileFromString): Inline method
 updateState.

---
 .../transform/ReplaceFileFromString.js          | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/lib/manager/components/transform/ReplaceFileFromString.js b/lib/manager/components/transform/ReplaceFileFromString.js
index 3dc9556c0..0e7740993 100644
--- a/lib/manager/components/transform/ReplaceFileFromString.js
+++ b/lib/manager/components/transform/ReplaceFileFromString.js
@@ -16,7 +16,9 @@ export default class ReplaceFileFromString extends Component<TransformProps<Repl
   }
 
   _onChangeCsvData = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.updateState({csvData: evt.target.value})
+    const newState = {csvData: evt.target.value}
+    this.setState(newState)
+    this._updateErrors(newState)
   }
 
   _onSaveCsvData = () => {
@@ -46,19 +48,6 @@ export default class ReplaceFileFromString extends Component<TransformProps<Repl
     }
   }
 
-  /**
-   * Update the component editing state
-   * and perform and notify of validation checks.
-   */
-  updateState = (partialState: any) => {
-    const newState = {
-      ...this.state,
-      ...partialState
-    }
-    this.setState(newState)
-    this._updateErrors(newState)
-  }
-
   componentDidMount () {
     this._updateErrors()
   }

From ffeaee8b982d4eebd457aac164b05a3fceecf373 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 4 May 2021 13:40:16 -0400
Subject: [PATCH 188/553] fix(deployment): grab deployment that is actively
 deployed

fix #665
---
 lib/manager/components/version/FeedVersionNavigator.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index a05c960b7..f7a6103df 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -161,10 +161,15 @@ export default class FeedVersionNavigator extends Component<Props, State> {
       version,
       versionSection
     } = this.props
+    // Grab the feed-source-specific deployment that is both actively deployed
+    // and contains the selected version's GTFS.
     const deploymentForVersion =
       version &&
       feedSource.deployments &&
-      feedSource.deployments.find(d => d.feedVersions.findIndex(v => v.id === version.id) !== -1)
+      feedSource.deployments.find(d =>
+        d.deployedTo &&
+        d.feedVersions.findIndex(v => v.id === version.id) !== -1
+      )
     const dropdownTitle = `${this.messages('version')} ${feedVersionIndex} ${this.messages('of')} ${sortedVersions.length}`
     return (
       <div>

From 1ed136b9809af903aea0a54ddd9569a0cfcf168e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 5 May 2021 16:50:51 -0400
Subject: [PATCH 189/553] refactor(GtfsFieldSelector): Add GTFS+ table field
 support.

---
 lib/manager/components/GtfsFieldSelector.js | 27 ++++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/manager/components/GtfsFieldSelector.js b/lib/manager/components/GtfsFieldSelector.js
index 8c39d7f93..e33a159ee 100644
--- a/lib/manager/components/GtfsFieldSelector.js
+++ b/lib/manager/components/GtfsFieldSelector.js
@@ -3,7 +3,7 @@
 import React from 'react'
 import Select from 'react-select'
 
-import { getGtfsSpec } from '../../common/util/config'
+import { getGtfsSpec, getGtfsPlusSpec, isModuleEnabled } from '../../common/util/config'
 
 import type { GtfsSpecTable, ReactSelectOption } from '../../types'
 
@@ -14,17 +14,32 @@ type GtfsFieldSelectorProps = {
 }
 
 /**
- * Obtains the desired GTFS spec table.
+ * Obtains the desired table from the provided GTFS/GTFS plus spec.
  */
-function getGtfsTableSpec (tableName: string): ?GtfsSpecTable {
-  const spec = getGtfsSpec()
+function getTableFromSpec (spec: Array<GtfsSpecTable>, specName: string, tableName: string): ?GtfsSpecTable {
   if (!spec) {
-    throw new Error('GTFS spec could not be found!')
+    throw new Error(`${specName} could not be found!`)
   }
   const tableFile = `${tableName}.txt`
   return spec.find(t => t.name === tableFile)
 }
 
+/**
+ * Obtains the desired GTFS spec table.
+ */
+function getGtfsTableSpec (tableName: string): ?GtfsSpecTable {
+  return getTableFromSpec(getGtfsSpec(), 'GTFS spec', tableName)
+}
+
+/**
+ * Obtains the desired GTFS Plus spec table (if the GTFS Plus module is enabled).
+ */
+function getGtfsPlusTableSpec (tableName: string): ?GtfsSpecTable {
+  return isModuleEnabled('gtfsplus')
+    ? getTableFromSpec(getGtfsPlusSpec(), 'GTFS Plus spec', tableName)
+    : null
+}
+
 /**
  * Dropdown selector to select a field from a given GTFS table.
  */
@@ -33,7 +48,7 @@ const GtfsFieldSelector = (props: GtfsFieldSelectorProps) => {
   let options = []
   let placeholder = 'First, select a table above'
   if (tableName) {
-    const table = getGtfsTableSpec(tableName)
+    const table = getGtfsTableSpec(tableName) || getGtfsPlusTableSpec(tableName)
     options = table && table.fields.map(field => ({ label: field.name, value: field.name }))
     placeholder = 'Choose the field to normalize'
   }

From 122c6db4946c28275758b12506de2634fa548b60 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 6 May 2021 11:37:07 -0400
Subject: [PATCH 190/553] fix(deployment): fix type def for tripPlannerVersion

---
 .../DeploymentConfigurationsPanel.js          | 22 ++++++++-----------
 lib/types/index.js                            |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lib/manager/components/deployment/DeploymentConfigurationsPanel.js b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
index 8898973fd..daf9b3c52 100644
--- a/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
+++ b/lib/manager/components/deployment/DeploymentConfigurationsPanel.js
@@ -163,8 +163,6 @@ export default class DeploymentConfigurationsPanel extends Component<{
   render () {
     const { deployment, updateDeployment } = this.props
     const { customFileEditIdx, otp: options } = this.state
-    const isOtp = deployment.tripPlannerVersion.startsWith('OTP_')
-
     return (
       <Panel header={<h3><Icon type='cog' /> OTP Configuration</h3>}>
         <ListGroup fill>
@@ -182,17 +180,15 @@ export default class DeploymentConfigurationsPanel extends Component<{
               onChange={this._onUpdateTripPlannerVersion}
               options={TRIP_PLANNER_VERSIONS}
             />
-            {isOtp && (
-              <div>
-                OTP jar file
-                <Select
-                  clearable={false}
-                  value={deployment.otpVersion}
-                  onChange={this._onUpdateVersion}
-                  options={options ? options.map(v => ({value: v, label: v})) : []}
-                />
-              </div>
-            )}
+            <div>
+              OTP jar file
+              <Select
+                clearable={false}
+                value={deployment.otpVersion}
+                onChange={this._onUpdateVersion}
+                options={options ? options.map(v => ({value: v, label: v})) : []}
+              />
+            </div>
           </ListGroupItem>
           <ListGroupItem>
             Deploying to the{' '}
diff --git a/lib/types/index.js b/lib/types/index.js
index 538430db8..e5291b1d4 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -247,7 +247,7 @@ export type Deployment = {
   projectId: string,
   routerId: ?string,
   skipOsmExtract: boolean,
-  tripPlannerVersion: 'OTP_1' | 'OTP_2',
+  tripPlannerVersion?: 'OTP_1' | 'OTP_2',
   user: ?any // TODO add more specific type
 }
 

From b2997454b4decd49643ef7916534fc1c0845bc7f Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Thu, 6 May 2021 16:50:55 +0100
Subject: [PATCH 191/553] feat(gtfs.yml and validation.js): Updated GTFS Spec
 for stops.txt and agency.txt

#663
---
 gtfs.yml                      | 10 ++++++++--
 lib/editor/util/validation.js | 36 +++++++++++++++++++++++++----------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/gtfs.yml b/gtfs.yml
index 4170346d5..caf511556 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -151,12 +151,12 @@
     columnWidth: 12
     helpContent: "The stop_desc field contains a description of a stop. Please provide useful, quality information. Do not simply duplicate the name of the stop."
   - name: "stop_lat"
-    required: true
+    required: false
     inputType: LATITUDE
     columnWidth: 6
     helpContent: "The stop_lat field contains the latitude of a stop or station. The field value must be a valid WGS 84 latitude."
   - name: "stop_lon"
-    required: true
+    required: false
     inputType: LONGITUDE
     columnWidth: 6
     helpContent: "The stop_lon field contains the longitude of a stop or station. The field value must be a valid WGS 84 longitude value from -180 to 180."
@@ -180,6 +180,12 @@
       text: Stop (0)
     - value: '1'
       text: Station (1)
+    - value: '2'
+      text: Entrance/Exit (2)
+    - value: '3'
+      text: Generic Node (3)
+    - value: '4'
+      text: Boarding Area (4)
     columnWidth: 12
     helpContent: "The location_type field identifies whether this stop ID represents a stop or station. If no location type is specified, or the location_type is blank, stop IDs are treated as stops. Stations may have different properties from stops when they are represented on a map or used in trip planning."
   - name: "parent_station"
diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index f6451d01c..0fc91b493 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -25,6 +25,7 @@ export function doesNotExist (value: any): boolean {
  * Returns false if the value is ok.
  * Returns an EditorValidationIssue object if the value is not ok.
  */
+// eslint-disable-next-line complexity
 export function validate (
   field: GtfsSpecField,
   value: any,
@@ -36,8 +37,8 @@ export function validate (
   const valueDoesNotExist = doesNotExist(value)
   const isRequiredButEmpty = required && valueDoesNotExist
   const isOptionalAndEmpty = !required && valueDoesNotExist
-  let reason = 'Required field must not be empty'
   const agencies = getTableById(tableData, 'agency')
+  let reason = 'Required field must not be empty'
 
   // setting as a variable here because of eslint bug
   type CheckPositiveOutput = {
@@ -100,12 +101,19 @@ export function validate (
         (indices.length > 1 ||
           (indices.length > 0 && entities[indices[0]].id !== entity.id))
       )
+      console.log(idList.length)
+      console.log({entity})
+      if (agencies.length > 1 && entity.agency_id === null) {
+        reason = 'Identifier is required if more than one agency exists'
+        return {field: name, invalid: isRequiredButEmpty, reason}
+      }
       if (isRequiredButEmpty || isNotUnique) {
         if (isNotUnique) {
           reason = 'Identifier must be unique'
         }
         return {field: name, invalid: isRequiredButEmpty || isNotUnique, reason}
-      } else {
+      } 
+      else {
         return false
       }
     case 'TEXT':
@@ -175,21 +183,29 @@ export function validate (
       }
     case 'LATITUDE':
       const isNotLat = value > 90 || value < -90
-      if (isRequiredButEmpty || isNotLat) {
-        if (isNotLat) {
-          reason = 'Field must be valid latitude.'
+      if (isNotLat) {
+        reason = 'Field must be valid latitude.'
+        return {field: name, invalid: isOptionalAndEmpty || isNotLat, reason}
+      }
+      if (entity && entity.location_type >= 2) {
+        if (isOptionalAndEmpty) {
+          reason = '1 Latitude and Longitude are required for your current location type'
+          return {field: name, invalid: isOptionalAndEmpty || isNotLat, reason}
         }
-        return {field: name, invalid: isRequiredButEmpty || isNotLat, reason}
       } else {
         return false
       }
     case 'LONGITUDE':
       const isNotLng = value > 180 || value < -180
-      if (isRequiredButEmpty || isNotLng) {
-        if (isNotLng) {
-          reason = 'Field must be valid longitude.'
+      if (isNotLng) {
+        reason = 'Field must be valid longitude.'
+        return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
+      }
+      if (entity && entity.location_type >= 2) {
+        if (isOptionalAndEmpty) {
+          reason = '1 Latitude and Longitude are required for your current location type'
+          return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
         }
-        return {field: name, invalid: isRequiredButEmpty || isNotLng, reason}
       } else {
         return false
       }

From 976b5c7af0b3b6fab3ce7848c690f2ef3d70ffab Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Thu, 6 May 2021 17:14:57 +0100
Subject: [PATCH 192/553] style(validation.js): removed space

#663
---
 lib/editor/util/validation.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index 0fc91b493..d4ed659ab 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -112,8 +112,7 @@ export function validate (
           reason = 'Identifier must be unique'
         }
         return {field: name, invalid: isRequiredButEmpty || isNotUnique, reason}
-      } 
-      else {
+      } else {
         return false
       }
     case 'TEXT':

From d564985fd86b6d29a09d31d9aaee33e8bb5b40a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 May 2021 22:17:36 +0000
Subject: [PATCH 193/553] build(deps): bump ua-parser-js from 0.7.19 to 0.7.28

Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.19 to 0.7.28.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.19...0.7.28)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 49c0199d2..9b09fbcb2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14425,9 +14425,9 @@ typescript@^3.2.1:
   integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
 
 ua-parser-js@^0.7.18:
-  version "0.7.19"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
-  integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==
+  version "0.7.28"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
+  integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
 
 uglify-js@^3.1.4:
   version "3.7.3"

From ef085dc4a96419e438c773a7e53b41dcb0a3ac5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 May 2021 03:22:42 +0000
Subject: [PATCH 194/553] build(deps): bump handlebars from 4.5.3 to 4.7.7

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.3 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.3...v4.7.7)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 51 +++++++++++++--------------------------------------
 1 file changed, 13 insertions(+), 38 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 49c0199d2..b3a3bf8b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3290,11 +3290,6 @@ commander@^2.9.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
-commander@~2.20.3:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 commitizen@^3.0.7:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-3.1.2.tgz#29ddd8b39396923e9058a0e4840cbeef144290be"
@@ -6112,13 +6107,14 @@ growly@^1.3.0:
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
 handlebars@^4.0.1, handlebars@^4.1.0, handlebars@^4.1.2:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
-  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
   dependencies:
+    minimist "^1.2.5"
     neo-async "^2.6.0"
-    optimist "^0.6.1"
     source-map "^0.6.1"
+    wordwrap "^1.0.0"
   optionalDependencies:
     uglify-js "^3.1.4"
 
@@ -9081,21 +9077,16 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minimist@^1.2.5:
+minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-
 minipass@^2.2.1, minipass@^2.3.5:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
@@ -9296,9 +9287,9 @@ negotiator@0.6.1:
   integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
 
 neo-async@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 nerf-dart@^1.0.0:
   version "1.0.0"
@@ -10008,14 +9999,6 @@ opn@^3.0.2:
   dependencies:
     object-assign "^4.0.1"
 
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
@@ -14430,12 +14413,9 @@ ua-parser-js@^0.7.18:
   integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==
 
 uglify-js@^3.1.4:
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
-  integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg==
-  dependencies:
-    commander "~2.20.3"
-    source-map "~0.6.1"
+  version "3.13.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
+  integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==
 
 uglifyify@^5.0.1:
   version "5.0.1"
@@ -14975,11 +14955,6 @@ wordwrap@^1.0.0, wordwrap@~1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
 worker-farm@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"

From afe8538b936c73cd4feadc35c866443150f2086e Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Thu, 6 May 2021 23:37:55 -0700
Subject: [PATCH 195/553] feat(deployment): add a few things to enable
 auto-deployments

- add ability to auto-deploy with critical errors
- add ability to fast-forward to latest feed version in deployment
- add ability to pin versions in deployments
---
 __tests__/test-utils/mock-data/manager.js     |   3 +
 i18n/english.yml                              |   6 +
 .../__tests__/__snapshots__/projects.js.snap  |   3 +
 lib/manager/actions/deployments.js            |  17 +
 .../deployment/DeploymentVersionsTable.js     | 170 +---------
 .../components/deployment/DeploymentViewer.js |  21 +-
 .../components/deployment/DeploymentsPanel.js |  27 +-
 .../deployment/FeedVersionTableRow.js         | 274 ++++++++++++++++
 .../containers/ActiveDeploymentViewer.js      |   8 +-
 .../__snapshots__/ActiveProjectViewer.js.snap |  14 +
 .../__snapshots__/DeploymentsPanel.js.snap    | 297 ++++++++++++++++--
 .../__snapshots__/FeedSourceTable.js.snap     |  24 ++
 lib/manager/util/version.js                   |  14 +
 lib/types/index.js                            |   2 +
 14 files changed, 672 insertions(+), 208 deletions(-)
 create mode 100644 lib/manager/components/deployment/FeedVersionTableRow.js

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 8b5648d29..35e09d4e6 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -55,6 +55,7 @@ export function makeMockDeployment (
     osmExtractUrl: null,
     otpCommit: null,
     otpVersion: null,
+    pinnedfeedVersionIds: [],
     projectId: project.id,
     projectBounds: {east: 0, west: 0, north: 0, south: 0},
     routerId: null,
@@ -70,6 +71,8 @@ export const mockProject = {
   autoFetchHour: 0,
   autoFetchMinute: 0,
   autoDeploy: false,
+  autoDeployTypes: [],
+  autoDeployWithCriticalErrors: false,
   bounds: null,
   buildConfig: {
     fares: null,
diff --git a/i18n/english.yml b/i18n/english.yml
index 7c2580190..929612eaa 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -141,6 +141,12 @@ components:
     title: Deployments
   DeploymentsPanel:
     autoDeploy:
+      deployWithErrors:
+        checklabel: Deploy even if some feed versions have critical errors
+        help: >
+          If this is unchecked, an auto-deployment will halt if any of the feed
+          versions in the deployment have at least one critical error
+        title: Critical Errors Handling
       help: >
         A deployment will automatically be kicked off (assuming there are no
         critical errors) whenever one of the above-defined events occurs.
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 30aa35478..60ebc8cf0 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -6,6 +6,8 @@ Object {
   "all": Array [
     Object {
       "autoDeploy": false,
+      "autoDeployTypes": Array [],
+      "autoDeployWithCriticalErrors": false,
       "autoFetchFeeds": true,
       "autoFetchHour": 0,
       "autoFetchMinute": 0,
@@ -110,6 +112,7 @@ Object {
           "osmExtractUrl": null,
           "otpCommit": null,
           "otpVersion": null,
+          "pinnedfeedVersionIds": Array [],
           "projectBounds": Object {
             "east": 0,
             "north": 0,
diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 2b052ea81..846d00f45 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -209,6 +209,23 @@ export function createDeploymentFromFeedSource (feedSource: Feed) {
   }
 }
 
+export function togglePinFeedVersion (
+  deployment: Deployment,
+  version: SummarizedFeedVersion
+) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    let pinnedfeedVersionIds
+    if (deployment.pinnedfeedVersionIds.indexOf(version.id) > -1) {
+      pinnedfeedVersionIds = deployment.pinnedfeedVersionIds.filter(
+        id => id !== version.id
+      )
+    } else {
+      pinnedfeedVersionIds = [...deployment.pinnedfeedVersionIds, version.id]
+    }
+    dispatch(updateDeployment(deployment, {pinnedfeedVersionIds}))
+  }
+}
+
 export function updateDeployment (
   deployment: Deployment,
   changes: any // using the any type because $Shape<Deployment> was giving
diff --git a/lib/manager/components/deployment/DeploymentVersionsTable.js b/lib/manager/components/deployment/DeploymentVersionsTable.js
index 2ebb0d87a..f0523bbd9 100644
--- a/lib/manager/components/deployment/DeploymentVersionsTable.js
+++ b/lib/manager/components/deployment/DeploymentVersionsTable.js
@@ -1,23 +1,16 @@
 // @flow
 
 import React, {Component} from 'react'
-import {Table, Button, Badge, Glyphicon, ButtonToolbar} from 'react-bootstrap'
-import { Link } from 'react-router'
+import {Table} from 'react-bootstrap'
 
-import * as deploymentActions from '../../actions/deployments'
 import {getComponentMessages} from '../../../common/util/config'
-import {formatTimestamp, fromNow} from '../../../common/util/date-time'
-import {versionHasExpired, versionHasNotBegun} from '../../util/version'
+import FeedVersionTableRow from './FeedVersionTableRow'
 
-import type {Deployment, Feed, Project, SummarizedFeedVersion} from '../../../types'
-import type {ManagerUserState} from '../../../types/reducers'
+import type {Deployment, Project, SummarizedFeedVersion} from '../../../types'
 
 type Props = {
-  deleteFeedVersion: typeof deploymentActions.deleteFeedVersion,
   deployment: Deployment,
   project: Project,
-  updateVersionForFeedSource: typeof deploymentActions.updateVersionForFeedSource,
-  user: ManagerUserState,
   versions: Array<SummarizedFeedVersion>
 }
 
@@ -27,11 +20,8 @@ export default class DeploymentVersionsTable extends Component<Props> {
   render () {
     const {
       deployment,
-      deleteFeedVersion,
       project,
-      versions,
-      updateVersionForFeedSource,
-      user
+      versions
     } = this.props
     return (
       <Table striped hover fill>
@@ -39,7 +29,6 @@ export default class DeploymentVersionsTable extends Component<Props> {
           <tr>
             <th className='col-md-4'>{this.messages('name')}</th>
             <th>Version</th>
-            <th className='hidden-xs'>{this.messages('dateRetrieved')}</th>
             <th className='hidden-xs'>{this.messages('loadStatus')}</th>
             <th className='hidden-xs'>{this.messages('errorCount')}</th>
             <th className='hidden-xs'>{this.messages('routeCount')}</th>
@@ -52,151 +41,18 @@ export default class DeploymentVersionsTable extends Component<Props> {
         </thead>
         <tbody>
           {versions.map((version) => {
-            return <FeedVersionTableRow
-              feedSource={version.feedSource}
-              version={version}
-              project={project}
-              deployment={deployment}
-              key={version.id}
-              user={user}
-              updateVersionForFeedSource={updateVersionForFeedSource}
-              deleteFeedVersion={deleteFeedVersion} />
+            return (
+              <FeedVersionTableRow
+                feedSource={version.feedSource}
+                version={version}
+                project={project}
+                deployment={deployment}
+                key={version.id}
+              />
+            )
           })}
         </tbody>
       </Table>
     )
   }
 }
-
-type RowProps = {
-    deleteFeedVersion: typeof deploymentActions.deleteFeedVersion,
-    deployment: Deployment,
-    feedSource: Feed,
-    project: Project,
-    updateVersionForFeedSource: typeof deploymentActions.updateVersionForFeedSource,
-    user: ManagerUserState,
-    version: SummarizedFeedVersion
-  }
-
-class FeedVersionTableRow extends Component<RowProps> {
-  _decrementVersion = () => {
-    const {deployment, feedSource, updateVersionForFeedSource, version} = this.props
-    const {previousVersionId: id} = version
-    if (!id) {
-      console.warn('No previous version ID exists for version', version)
-      return
-    }
-    updateVersionForFeedSource(deployment, feedSource, {id})
-  }
-
-  _incrementVersion = () => {
-    const {deployment, feedSource, updateVersionForFeedSource, version} = this.props
-    const {nextVersionId: id} = version
-    if (!id) {
-      console.warn('No next version ID exists for version', version)
-      return
-    }
-    updateVersionForFeedSource(deployment, feedSource, {id})
-  }
-
-  _removeVersion = () => {
-    const {deleteFeedVersion, deployment, version} = this.props
-    deleteFeedVersion(deployment, version)
-  }
-
-  render () {
-    const {
-      deployment,
-      feedSource,
-      project,
-      user,
-      version
-    } = this.props
-    const {validationResult: result} = version
-    const na = (<span style={{ color: 'lightGray' }}>N/A</span>)
-    const hasVersionStyle = {cursor: 'pointer'}
-    const noVersionStyle = {color: 'lightGray'}
-    const disabled = !user.permissions ||
-      !user.permissions.hasFeedPermission(
-        project.organizationId,
-        project.id,
-        feedSource.id,
-        'manage-feed'
-      )
-    const expired = versionHasExpired(version)
-    const future = versionHasNotBegun(version)
-    return (
-      <tr key={feedSource.id}>
-        <td>
-          <Link to={`/feed/${feedSource.id}`}>{feedSource.name}</Link>
-        </td>
-        <td className='col-md-1 col-xs-2'>
-          <Link to={`/feed/${feedSource.id}/version/${version.version}`}>
-            <small>Version {version.version}</small>
-          </Link>
-          <ButtonToolbar>
-            <Button
-              bsSize='xsmall'
-              bsStyle='default'
-              style={{color: 'black'}}
-              disabled={!version.previousVersionId}
-              onClick={this._decrementVersion}>
-              <Glyphicon
-                glyph='menu-left'
-                style={version.previousVersionId ? hasVersionStyle : noVersionStyle}
-                title={version.previousVersionId ? 'Previous version' : 'No previous versions'}
-                alt='Previous version' />
-            </Button>
-            <Button
-              bsSize='xsmall'
-              bsStyle='default'
-              style={{color: 'black'}}
-              disabled={!version.nextVersionId}
-              onClick={this._incrementVersion}>
-              <Glyphicon
-                glyph='menu-right'
-                style={version.nextVersionId ? hasVersionStyle : noVersionStyle}
-                title={version.nextVersionId ? 'Next version' : 'No newer versions'}
-                alt='Next Version' />
-            </Button>
-          </ButtonToolbar>
-        </td>
-        <td className='hidden-xs'>
-          {na}
-        </td>
-        <td className='hidden-xs'>
-          <Badge>{result.loadStatus}</Badge>
-        </td>
-        <td className={`hidden-xs${result.errorCount && ' warning'}`}>
-          {result.errorCount}
-        </td>
-        <td className={`hidden-xs${!result.routeCount ? ' warning' : ''}`}>
-          {result.routeCount}
-        </td>
-        <td className={`hidden-xs${!result.tripCount ? ' warning' : ''}`}>
-          {result.tripCount}
-        </td>
-        <td className={`hidden-xs${!result.stopTimesCount ? ' warning' : ''}`}>
-          {result.stopTimesCount}
-        </td>
-        <td className={future ? 'danger' : ''}>
-          {formatTimestamp(result.startDate, false)} ({fromNow(result.startDate)})
-        </td>
-        <td className={expired ? 'danger' : ''}>
-          {formatTimestamp(result.endDate, false)} ({fromNow(result.endDate)})
-        </td>
-        <td>
-          <Button
-            bsStyle='danger'
-            bsSize='xsmall'
-            // Cannot remove feed source if the deployment is feed-specific
-            disabled={disabled || deployment.feedSourceId === feedSource.id}
-            className='pull-right'
-            onClick={this._removeVersion}>
-            <Glyphicon glyph='remove' />
-          </Button>
-        </td>
-      </tr>
-    )
-  }
-}
diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index 5c89f2d25..663ee07ac 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -45,7 +45,6 @@ import type {ManagerUserState} from '../../../types/reducers'
 
 type Props = ContainerProps & {
   addFeedVersion: typeof deploymentActions.addFeedVersion,
-  deleteFeedVersion: typeof deploymentActions.deleteFeedVersion,
   deployJobs: Array<ServerJob>,
   deployToTarget: typeof deploymentActions.deployToTarget,
   downloadBuildArtifact: typeof deploymentActions.downloadBuildArtifact,
@@ -53,7 +52,6 @@ type Props = ContainerProps & {
   fetchDeployment: typeof deploymentActions.fetchDeployment,
   terminateEC2InstanceForDeployment: typeof deploymentActions.terminateEC2InstanceForDeployment,
   updateDeployment: typeof deploymentActions.updateDeployment,
-  updateVersionForFeedSource: typeof deploymentActions.updateVersionForFeedSource,
   user: ManagerUserState
 }
 
@@ -306,15 +304,12 @@ export default class DeploymentViewer extends Component<Props, State> {
 
   render () {
     const {
-      deleteFeedVersion,
       deployJobs,
       deployment,
       deployToTarget,
       feedSources,
       project,
-      updateDeployment,
-      updateVersionForFeedSource,
-      user
+      updateDeployment
     } = this.props
     const {target} = this.state
     const {feedVersions} = deployment
@@ -361,13 +356,13 @@ export default class DeploymentViewer extends Component<Props, State> {
                   ? <p className='lead text-center margin-top-15'>
                     No feed sources found.
                   </p>
-                  : <DeploymentVersionsTable
-                    deleteFeedVersion={deleteFeedVersion}
-                    deployment={deployment}
-                    project={project}
-                    updateVersionForFeedSource={updateVersionForFeedSource}
-                    user={user}
-                    versions={versions} />
+                  : (
+                    <DeploymentVersionsTable
+                      deployment={deployment}
+                      project={project}
+                      versions={versions}
+                    />
+                  )
                 }
               </ListGroup>
             </Panel>
diff --git a/lib/manager/components/deployment/DeploymentsPanel.js b/lib/manager/components/deployment/DeploymentsPanel.js
index dd0513e9a..81d1250c3 100644
--- a/lib/manager/components/deployment/DeploymentsPanel.js
+++ b/lib/manager/components/deployment/DeploymentsPanel.js
@@ -5,6 +5,7 @@ import React, {Component} from 'react'
 import { LinkContainer } from 'react-router-bootstrap'
 import {
   Button,
+  Checkbox,
   Col,
   ControlLabel,
   Glyphicon,
@@ -56,6 +57,12 @@ export default class DeploymentsPanel extends Component<Props> {
     this._updateProject({autoDeployTypes: options.map(o => o.value)})
   }
 
+  _onChangeDeployWithCriticalErrors = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateProject({
+      autoDeployWithCriticalErrors: !this.props.project.autoDeployWithCriticalErrors
+    })
+  }
+
   _onDeleteDeployment = (deployment: Deployment) => {
     this.refs.confirmModal.open({
       title: 'Delete Deployment?',
@@ -118,9 +125,9 @@ export default class DeploymentsPanel extends Component<Props> {
               />
               <HelpBlock>{this.messages('pinnedDeployment.help')}</HelpBlock>
             </FormGroup>
-            <FormGroup controlId='pinnedDeploymentId'>
+            <FormGroup controlId='autoDeployTypes'>
               <ControlLabel>
-                <Icon type='thumb-tack' />{' '}
+                <Icon type='bolt' />{' '}
                 {this.messages('autoDeploy.label')}
               </ControlLabel>
               <Select
@@ -139,6 +146,22 @@ export default class DeploymentsPanel extends Component<Props> {
               />
               <HelpBlock>{this.messages('autoDeploy.help')}</HelpBlock>
             </FormGroup>
+            <FormGroup controlId='autoDeployWithCriticalErrors'>
+              <ControlLabel>
+                <Icon type='warning' />{' '}
+                {this.messages('autoDeploy.deployWithErrors.title')}
+              </ControlLabel>
+              <Checkbox
+                checked={project.autoDeployWithCriticalErrors}
+                name='autoDeployWithCriticalErrors'
+                onChange={this._onChangeDeployWithCriticalErrors}
+              >
+                {this.messages('autoDeploy.deployWithErrors.checklabel')}
+              </Checkbox>
+              <HelpBlock>
+                {this.messages('autoDeploy.deployWithErrors.help')}
+              </HelpBlock>
+            </FormGroup>
           </Panel>
           <Panel header={
             <h3><Icon type='cog' /> {this.messages('config.title')}</h3>
diff --git a/lib/manager/components/deployment/FeedVersionTableRow.js b/lib/manager/components/deployment/FeedVersionTableRow.js
new file mode 100644
index 000000000..21c8bbaff
--- /dev/null
+++ b/lib/manager/components/deployment/FeedVersionTableRow.js
@@ -0,0 +1,274 @@
+// @flow
+
+import React, {Component} from 'react'
+import {Button, Badge, Glyphicon, ButtonToolbar} from 'react-bootstrap'
+import {connect} from 'react-redux'
+import { Link } from 'react-router'
+
+import {
+  deleteFeedVersion,
+  togglePinFeedVersion,
+  updateVersionForFeedSource
+} from '../../actions/deployments'
+import {formatTimestamp, fromNow} from '../../../common/util/date-time'
+import {
+  versionHasExpired,
+  versionHasNotBegun,
+  versionIsPinnedInDeployment
+} from '../../util/version'
+
+import type {
+  Deployment,
+  Feed,
+  Project,
+  SummarizedFeedVersion
+} from '../../../types'
+import type {AppState} from '../../../types/reducers'
+
+function addClassIfFalsy (val, className) {
+  return !val ? ` ${className}` : ''
+}
+
+function warnIfFalsy (val) {
+  return addClassIfFalsy(val, 'warning')
+}
+
+function dangerIfTruthy (val) {
+  return addClassIfFalsy(!val, 'danger')
+}
+
+type RowProps = {
+  deployment: Deployment,
+  feedSource: Feed,
+  project: Project,
+  version: SummarizedFeedVersion
+}
+
+type ConnectedRowProps = RowProps & {
+  deleteFeedVersion: typeof deleteFeedVersion,
+  feedVersionPinned: boolean,
+  togglePinFeedVersion: typeof togglePinFeedVersion,
+  updateVersionForFeedSource: typeof updateVersionForFeedSource,
+  userCanDecrementVersion: boolean,
+  userCanEditDeployment: boolean,
+  userCanIncrementVersion: boolean,
+  userCanRemoveVersion: boolean
+}
+
+class FeedVersionTableRow extends Component<ConnectedRowProps> {
+  _decrementVersion = () => {
+    const {deployment, feedSource, updateVersionForFeedSource, version} = this.props
+    const {previousVersionId: id} = version
+    if (!id) {
+      console.warn('No previous version ID exists for version', version)
+      return
+    }
+    updateVersionForFeedSource(deployment, feedSource, {id})
+  }
+
+  _incrementVersion = () => {
+    const {
+      deployment,
+      feedSource,
+      updateVersionForFeedSource,
+      version
+    } = this.props
+    const {nextVersionId: id} = version
+    if (!id) {
+      console.warn('No next version ID exists for version', version)
+      return
+    }
+    updateVersionForFeedSource(deployment, feedSource, {id})
+  }
+
+  _incrementVersionToLatest = () => {
+    const {deployment, feedSource, updateVersionForFeedSource} = this.props
+    if (!feedSource.latestVersionId) {
+      console.warn('No latest version ID exists for feedSource', feedSource)
+      return
+    }
+    updateVersionForFeedSource(
+      deployment,
+      feedSource,
+      {id: feedSource.latestVersionId}
+    )
+  }
+
+  _togglePinFeedVersion = () => {
+    const {togglePinFeedVersion, deployment, version} = this.props
+    togglePinFeedVersion(deployment, version)
+  }
+
+  _removeVersion = () => {
+    const {deleteFeedVersion, deployment, version} = this.props
+    deleteFeedVersion(deployment, version)
+  }
+
+  render () {
+    const {
+      feedSource,
+      feedVersionPinned,
+      userCanDecrementVersion,
+      userCanEditDeployment,
+      userCanIncrementVersion,
+      userCanRemoveVersion,
+      version
+    } = this.props
+    const {validationResult: result} = version
+    const hasVersionStyle = {cursor: 'pointer'}
+    const noVersionStyle = {color: 'lightGray'}
+    const expired = versionHasExpired(version)
+    const future = versionHasNotBegun(version)
+    return (
+      <tr key={feedSource.id}>
+        <td>
+          <Link to={`/feed/${feedSource.id}`}>{feedSource.name}</Link>
+          {feedVersionPinned && (
+            <div style={{ fontSize: 12, fontStyle: 'italic', margin: 5 }}>
+              <Glyphicon
+                glyph='star'
+                style={hasVersionStyle}
+                alt='star'
+              />
+              {' '}
+              Version pinned for auto-deployment
+            </div>
+          )}
+        </td>
+        <td className='col-md-1 col-xs-2'>
+          <Link to={`/feed/${feedSource.id}/version/${version.version}`}>
+            <small>Version {version.version}</small>
+          </Link>
+          <ButtonToolbar>
+            <Button
+              bsSize='xsmall'
+              bsStyle='default'
+              style={{color: 'black'}}
+              disabled={!userCanDecrementVersion}
+              onClick={this._decrementVersion}>
+              <Glyphicon
+                glyph='menu-left'
+                style={userCanDecrementVersion ? hasVersionStyle : noVersionStyle}
+                title={version.previousVersionId ? 'Previous version' : 'No previous versions'}
+                alt='Previous version' />
+            </Button>
+            <Button
+              bsSize='xsmall'
+              bsStyle='default'
+              style={{color: 'black'}}
+              disabled={!userCanIncrementVersion}
+              onClick={this._incrementVersion}>
+              <Glyphicon
+                glyph='menu-right'
+                style={userCanIncrementVersion ? hasVersionStyle : noVersionStyle}
+                title={version.nextVersionId ? 'Next version' : 'No newer versions'}
+                alt='Next Version' />
+            </Button>
+            <Button
+              bsSize='xsmall'
+              bsStyle='default'
+              disabled={!userCanEditDeployment}
+              style={{color: 'black'}}
+              onClick={this._togglePinFeedVersion}>
+              <Glyphicon
+                glyph={feedVersionPinned ? 'star-empty' : 'star'}
+                style={hasVersionStyle}
+                title={feedVersionPinned
+                  ? 'Unpin version in auto-deployments'
+                  : 'Pin version in auto-deployments'
+                }
+                alt='Toggle pin version' />
+            </Button>
+            <Button
+              bsSize='xsmall'
+              bsStyle='default'
+              style={{color: 'black'}}
+              disabled={!userCanIncrementVersion}
+              onClick={this._incrementVersionToLatest}>
+              <Glyphicon
+                glyph='fast-forward'
+                style={userCanIncrementVersion ? hasVersionStyle : noVersionStyle}
+                title={version.nextVersionId ? 'Latest version' : 'No newer versions'}
+                alt='Latest Version' />
+            </Button>
+          </ButtonToolbar>
+        </td>
+        <td className='hidden-xs'>
+          <Badge>{result.loadStatus}</Badge>
+        </td>
+        <td className={`hidden-xs${warnIfFalsy(!result.errorCount)}`}>
+          {result.errorCount}
+        </td>
+        <td className={`hidden-xs${warnIfFalsy(result.routeCount)}`}>
+          {result.routeCount}
+        </td>
+        <td className={`hidden-xs${warnIfFalsy(result.tripCount)}`}>
+          {result.tripCount}
+        </td>
+        <td className={`hidden-xs${warnIfFalsy(result.stopTimesCount)}`}>
+          {result.stopTimesCount}
+        </td>
+        <td className={dangerIfTruthy(future)}>
+          {formatTimestamp(result.startDate, false)} ({fromNow(result.startDate)})
+        </td>
+        <td className={dangerIfTruthy(expired)}>
+          {formatTimestamp(result.endDate, false)} ({fromNow(result.endDate)})
+        </td>
+        <td>
+          <Button
+            bsStyle='danger'
+            bsSize='xsmall'
+            disabled={!userCanRemoveVersion}
+            className='pull-right'
+            onClick={this._removeVersion}>
+            <Glyphicon glyph='remove' />
+          </Button>
+        </td>
+      </tr>
+    )
+  }
+}
+
+const mapStateToProps = (state: AppState, ownProps: RowProps) => {
+  const {deployment, feedSource, project, version} = ownProps
+  const feedVersionPinned = versionIsPinnedInDeployment(deployment, version)
+  const user = state.user
+  const userCanEditDeployment = user.permissions &&
+    user.permissions.hasFeedPermission(
+      project.organizationId,
+      project.id,
+      feedSource.id,
+      'manage-feed'
+    )
+  const userCanDecrementVersion = userCanEditDeployment &&
+    !feedVersionPinned &&
+    version.previousVersionId
+
+  const userCanIncrementVersion = userCanEditDeployment &&
+    !feedVersionPinned &&
+    version.nextVersionId
+
+  // Cannot remove feed source if the deployment is feed-specific or it is
+  // pinned
+  const userCanRemoveVersion = userCanEditDeployment &&
+    !feedVersionPinned &&
+    deployment.feedSourceId !== feedSource.id
+  return {
+    feedVersionPinned,
+    userCanDecrementVersion,
+    userCanEditDeployment,
+    userCanIncrementVersion,
+    userCanRemoveVersion
+  }
+}
+
+const mapDispatchToProps = {
+  deleteFeedVersion,
+  togglePinFeedVersion,
+  updateVersionForFeedSource
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(FeedVersionTableRow)
diff --git a/lib/manager/containers/ActiveDeploymentViewer.js b/lib/manager/containers/ActiveDeploymentViewer.js
index b9e497386..8c931ef7a 100644
--- a/lib/manager/containers/ActiveDeploymentViewer.js
+++ b/lib/manager/containers/ActiveDeploymentViewer.js
@@ -4,14 +4,12 @@ import {connect} from 'react-redux'
 
 import {
   addFeedVersion,
-  deleteFeedVersion,
   deployToTarget,
   downloadBuildArtifact,
   downloadDeployment,
   fetchDeployment,
   terminateEC2InstanceForDeployment,
-  updateDeployment,
-  updateVersionForFeedSource
+  updateDeployment
 } from '../actions/deployments'
 import DeploymentViewer from '../components/deployment/DeploymentViewer'
 
@@ -36,14 +34,12 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
 
 const mapDispatchToProps = {
   addFeedVersion,
-  deleteFeedVersion,
   deployToTarget,
   downloadBuildArtifact,
   downloadDeployment,
   fetchDeployment,
   terminateEC2InstanceForDeployment,
-  updateDeployment,
-  updateVersionForFeedSource
+  updateDeployment
 }
 
 const ActiveDeploymentViewer = connect(
diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index abfb7dd32..5670f513b 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -50,6 +50,8 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
       project={
         Object {
           "autoDeploy": false,
+          "autoDeployTypes": Array [],
+          "autoDeployWithCriticalErrors": false,
           "autoFetchFeeds": true,
           "autoFetchHour": 0,
           "autoFetchMinute": 0,
@@ -1913,6 +1915,8 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                       project={
                                                         Object {
                                                           "autoDeploy": false,
+                                                          "autoDeployTypes": Array [],
+                                                          "autoDeployWithCriticalErrors": false,
                                                           "autoFetchFeeds": true,
                                                           "autoFetchHour": 0,
                                                           "autoFetchMinute": 0,
@@ -1956,6 +1960,8 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                         project={
                                                           Object {
                                                             "autoDeploy": false,
+                                                            "autoDeployTypes": Array [],
+                                                            "autoDeployWithCriticalErrors": false,
                                                             "autoFetchFeeds": true,
                                                             "autoFetchHour": 0,
                                                             "autoFetchMinute": 0,
@@ -2072,6 +2078,8 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                               project={
                                                                 Object {
                                                                   "autoDeploy": false,
+                                                                  "autoDeployTypes": Array [],
+                                                                  "autoDeployWithCriticalErrors": false,
                                                                   "autoFetchFeeds": true,
                                                                   "autoFetchHour": 0,
                                                                   "autoFetchMinute": 0,
@@ -2119,6 +2127,8 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                 project={
                                                                   Object {
                                                                     "autoDeploy": false,
+                                                                    "autoDeployTypes": Array [],
+                                                                    "autoDeployWithCriticalErrors": false,
                                                                     "autoFetchFeeds": true,
                                                                     "autoFetchHour": 0,
                                                                     "autoFetchMinute": 0,
@@ -2183,6 +2193,8 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                   project={
                                                                     Object {
                                                                       "autoDeploy": false,
+                                                                      "autoDeployTypes": Array [],
+                                                                      "autoDeployWithCriticalErrors": false,
                                                                       "autoFetchFeeds": true,
                                                                       "autoFetchHour": 0,
                                                                       "autoFetchMinute": 0,
@@ -3861,6 +3873,8 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                       project={
                                                         Object {
                                                           "autoDeploy": false,
+                                                          "autoDeployTypes": Array [],
+                                                          "autoDeployWithCriticalErrors": false,
                                                           "autoFetchFeeds": true,
                                                           "autoFetchHour": 0,
                                                           "autoFetchMinute": 0,
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index ccd730e93..66e684134 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -19,6 +19,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
     project={
       Object {
         "autoDeploy": false,
+        "autoDeployTypes": Array [],
+        "autoDeployWithCriticalErrors": false,
         "autoFetchFeeds": true,
         "autoFetchHour": 0,
         "autoFetchMinute": 0,
@@ -123,6 +125,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
               "east": 0,
               "north": 0,
@@ -154,6 +157,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
               "east": 0,
               "north": 0,
@@ -239,6 +243,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
       project={
         Object {
           "autoDeploy": false,
+          "autoDeployTypes": Array [],
+          "autoDeployWithCriticalErrors": false,
           "autoFetchFeeds": true,
           "autoFetchHour": 0,
           "autoFetchMinute": 0,
@@ -343,6 +349,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
                 "east": 0,
                 "north": 0,
@@ -374,6 +381,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
                 "east": 0,
                 "north": 0,
@@ -617,6 +625,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
                         "east": 0,
                         "north": 0,
@@ -624,10 +633,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "west": 0,
                       },
                       "projectId": "mock-project-with-deployments-id",
-                      "r5": false,
-                      "r5Version": null,
                       "routerId": null,
                       "skipOsmExtract": false,
+                      "tripPlannerVersion": "OTP_1",
                       "user": null,
                     },
                     Object {
@@ -649,6 +657,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
                         "east": 0,
                         "north": 0,
@@ -656,10 +665,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "west": 0,
                       },
                       "projectId": "mock-project-with-deployments-id",
-                      "r5": false,
-                      "r5Version": null,
                       "routerId": null,
                       "skipOsmExtract": false,
+                      "tripPlannerVersion": "OTP_1",
                       "user": null,
                     },
                   ]
@@ -667,6 +675,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                 project={
                   Object {
                     "autoDeploy": false,
+                    "autoDeployTypes": Array [],
+                    "autoDeployWithCriticalErrors": false,
                     "autoFetchFeeds": true,
                     "autoFetchHour": 0,
                     "autoFetchMinute": 0,
@@ -771,6 +781,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
                           "east": 0,
                           "north": 0,
@@ -802,6 +813,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
                           "east": 0,
                           "north": 0,
@@ -1135,6 +1147,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "osmExtractUrl": null,
                                 "otpCommit": null,
                                 "otpVersion": null,
+                                "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
                                   "east": 0,
                                   "north": 0,
@@ -1152,6 +1165,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                             project={
                               Object {
                                 "autoDeploy": false,
+                                "autoDeployTypes": Array [],
+                                "autoDeployWithCriticalErrors": false,
                                 "autoFetchFeeds": true,
                                 "autoFetchHour": 0,
                                 "autoFetchMinute": 0,
@@ -1256,6 +1271,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
                                       "north": 0,
@@ -1287,6 +1303,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
                                       "north": 0,
@@ -1527,6 +1544,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "osmExtractUrl": null,
                                 "otpCommit": null,
                                 "otpVersion": null,
+                                "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
                                   "east": 0,
                                   "north": 0,
@@ -1544,6 +1562,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                             project={
                               Object {
                                 "autoDeploy": false,
+                                "autoDeployTypes": Array [],
+                                "autoDeployWithCriticalErrors": false,
                                 "autoFetchFeeds": true,
                                 "autoFetchHour": 0,
                                 "autoFetchMinute": 0,
@@ -1648,6 +1668,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
                                       "north": 0,
@@ -1679,6 +1700,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
                                       "north": 0,
@@ -2178,41 +2200,256 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         </HelpBlock>
                       </div>
                     </FormGroup>
-                    <Checkbox
-                      bsClass="checkbox"
-                      checked={false}
-                      disabled={false}
-                      inline={false}
+                    <FormGroup
+                      bsClass="form-group"
+                      controlId="autoDeployTypes"
                       key=".1"
-                      name="autoDeploy"
-                      onChange={[Function]}
                     >
                       <div
-                        className="checkbox"
+                        className="form-group"
                       >
-                        <label>
-                          <input
-                            checked={false}
-                            disabled={false}
-                            name="autoDeploy"
-                            onChange={[Function]}
-                            type="checkbox"
-                          />
-                          Enable auto-deploy?
-                        </label>
+                        <ControlLabel
+                          bsClass="control-label"
+                          srOnly={false}
+                        >
+                          <label
+                            className="control-label"
+                            htmlFor="autoDeployTypes"
+                          >
+                            <Icon
+                              type="bolt"
+                            >
+                              <i
+                                className="fa fa-bolt fa-fw "
+                              />
+                            </Icon>
+                             
+                            Auto-deploy events
+                          </label>
+                        </ControlLabel>
+                        <Select
+                          arrowRenderer={[Function]}
+                          autosize={true}
+                          backspaceRemoves={true}
+                          backspaceToRemoveMessage="Press backspace to remove {label}"
+                          clearAllText="Clear all"
+                          clearRenderer={[Function]}
+                          clearValueText="Clear value"
+                          clearable={true}
+                          closeOnSelect={true}
+                          deleteRemoves={true}
+                          delimiter=","
+                          disabled={false}
+                          escapeClearsValue={true}
+                          filterOptions={[Function]}
+                          ignoreAccents={true}
+                          ignoreCase={true}
+                          inputProps={Object {}}
+                          isLoading={false}
+                          joinValues={false}
+                          labelKey="label"
+                          matchPos="any"
+                          matchProp="any"
+                          menuBuffer={0}
+                          menuRenderer={[Function]}
+                          multi={true}
+                          name="autoDeployTypes"
+                          noResultsText="No results found"
+                          onBlurResetsInput={true}
+                          onChange={[Function]}
+                          onCloseResetsInput={true}
+                          onSelectResetsInput={true}
+                          openOnClick={true}
+                          optionComponent={[Function]}
+                          options={
+                            Array [
+                              Object {
+                                "label": "A new version is fetched",
+                                "value": "ON_FEED_FETCH",
+                              },
+                              Object {
+                                "label": "A new version is processed",
+                                "value": "ON_PROCESS_FEED",
+                              },
+                            ]
+                          }
+                          pageSize={5}
+                          placeholder="Specify auto-deploy events"
+                          removeSelected={true}
+                          required={false}
+                          rtl={false}
+                          scrollMenuIntoView={true}
+                          searchable={true}
+                          simpleValue={false}
+                          tabSelectsValue={true}
+                          trimFilter={true}
+                          value={Array []}
+                          valueComponent={[Function]}
+                          valueKey="value"
+                        >
+                          <div
+                            className="Select is-clearable is-searchable Select--multi"
+                          >
+                            <div
+                              className="Select-control"
+                              onKeyDown={[Function]}
+                              onMouseDown={[Function]}
+                              onTouchEnd={[Function]}
+                              onTouchMove={[Function]}
+                              onTouchStart={[Function]}
+                            >
+                              <div
+                                className="Select-multi-value-wrapper"
+                                id="react-select-3--value"
+                              >
+                                <div
+                                  className="Select-placeholder"
+                                >
+                                  Specify auto-deploy events
+                                </div>
+                                <AutosizeInput
+                                  aria-activedescendant="react-select-3--value"
+                                  aria-expanded="false"
+                                  aria-haspopup="false"
+                                  aria-owns=""
+                                  className="Select-input"
+                                  injectStyles={true}
+                                  minWidth="5"
+                                  onBlur={[Function]}
+                                  onChange={[Function]}
+                                  onFocus={[Function]}
+                                  required={false}
+                                  role="combobox"
+                                  value=""
+                                >
+                                  <div
+                                    className="Select-input"
+                                    style={
+                                      Object {
+                                        "display": "inline-block",
+                                      }
+                                    }
+                                  >
+                                    <input
+                                      aria-activedescendant="react-select-3--value"
+                                      aria-expanded="false"
+                                      aria-haspopup="false"
+                                      aria-owns=""
+                                      onBlur={[Function]}
+                                      onChange={[Function]}
+                                      onFocus={[Function]}
+                                      required={false}
+                                      role="combobox"
+                                      style={
+                                        Object {
+                                          "boxSizing": "content-box",
+                                          "width": "5px",
+                                        }
+                                      }
+                                      value=""
+                                    />
+                                    <div
+                                      style={
+                                        Object {
+                                          "height": 0,
+                                          "left": 0,
+                                          "overflow": "scroll",
+                                          "position": "absolute",
+                                          "top": 0,
+                                          "visibility": "hidden",
+                                          "whiteSpace": "pre",
+                                        }
+                                      }
+                                    />
+                                  </div>
+                                </AutosizeInput>
+                              </div>
+                              <span
+                                className="Select-arrow-zone"
+                                onMouseDown={[Function]}
+                              >
+                                <span
+                                  className="Select-arrow"
+                                  onMouseDown={[Function]}
+                                />
+                              </span>
+                            </div>
+                          </div>
+                        </Select>
+                        <HelpBlock
+                          bsClass="help-block"
+                        >
+                          <span
+                            className="help-block"
+                          >
+                            A deployment will automatically be kicked off (assuming there are no critical errors) whenever one of the above-defined events occurs.
+
+                          </span>
+                        </HelpBlock>
                       </div>
-                    </Checkbox>
-                    <HelpBlock
-                      bsClass="help-block"
+                    </FormGroup>
+                    <FormGroup
+                      bsClass="form-group"
+                      controlId="autoDeployWithCriticalErrors"
                       key=".2"
                     >
-                      <span
-                        className="help-block"
+                      <div
+                        className="form-group"
                       >
-                        Whenever a new version is processed, a deployment will automatically be kicked off (assuming there are no critical errors).
+                        <ControlLabel
+                          bsClass="control-label"
+                          srOnly={false}
+                        >
+                          <label
+                            className="control-label"
+                            htmlFor="autoDeployWithCriticalErrors"
+                          >
+                            <Icon
+                              type="warning"
+                            >
+                              <i
+                                className="fa fa-warning fa-fw "
+                              />
+                            </Icon>
+                             
+                            Critical Errors Handling
+                          </label>
+                        </ControlLabel>
+                        <Checkbox
+                          bsClass="checkbox"
+                          checked={false}
+                          disabled={false}
+                          inline={false}
+                          name="autoDeployWithCriticalErrors"
+                          onChange={[Function]}
+                        >
+                          <div
+                            className="checkbox"
+                          >
+                            <label>
+                              <input
+                                checked={false}
+                                disabled={false}
+                                name="autoDeployWithCriticalErrors"
+                                onChange={[Function]}
+                                type="checkbox"
+                              />
+                              Deploy even if some feed versions have critical errors
+                            </label>
+                          </div>
+                        </Checkbox>
+                        <HelpBlock
+                          bsClass="help-block"
+                        >
+                          <span
+                            className="help-block"
+                          >
+                            If this is unchecked, an auto-deployment will halt if any of the feed versions in the deployment have at least one critical error
 
-                      </span>
-                    </HelpBlock>
+                          </span>
+                        </HelpBlock>
+                      </div>
+                    </FormGroup>
                   </div>
                 </div>
               </Panel>
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 063cabca5..d2c1628be 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -18,6 +18,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
     project={
       Object {
         "autoDeploy": false,
+        "autoDeployTypes": Array [],
+        "autoDeployWithCriticalErrors": false,
         "autoFetchFeeds": true,
         "autoFetchHour": 0,
         "autoFetchMinute": 0,
@@ -122,6 +124,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
               "east": 0,
               "north": 0,
@@ -301,6 +304,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
       project={
         Object {
           "autoDeploy": false,
+          "autoDeployTypes": Array [],
+          "autoDeployWithCriticalErrors": false,
           "autoFetchFeeds": true,
           "autoFetchHour": 0,
           "autoFetchMinute": 0,
@@ -405,6 +410,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
                 "east": 0,
                 "north": 0,
@@ -565,6 +571,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             project={
               Object {
                 "autoDeploy": false,
+                "autoDeployTypes": Array [],
+                "autoDeployWithCriticalErrors": false,
                 "autoFetchFeeds": true,
                 "autoFetchHour": 0,
                 "autoFetchMinute": 0,
@@ -669,6 +677,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "osmExtractUrl": null,
                     "otpCommit": null,
                     "otpVersion": null,
+                    "pinnedfeedVersionIds": Array [],
                     "projectBounds": Object {
                       "east": 0,
                       "north": 0,
@@ -760,6 +769,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               project={
                 Object {
                   "autoDeploy": false,
+                  "autoDeployTypes": Array [],
+                  "autoDeployWithCriticalErrors": false,
                   "autoFetchFeeds": true,
                   "autoFetchHour": 0,
                   "autoFetchMinute": 0,
@@ -864,6 +875,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
                         "east": 0,
                         "north": 0,
@@ -973,6 +985,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                 project={
                   Object {
                     "autoDeploy": false,
+                    "autoDeployTypes": Array [],
+                    "autoDeployWithCriticalErrors": false,
                     "autoFetchFeeds": true,
                     "autoFetchHour": 0,
                     "autoFetchMinute": 0,
@@ -1077,6 +1091,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
                           "east": 0,
                           "north": 0,
@@ -2839,6 +2854,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     project={
                       Object {
                         "autoDeploy": false,
+                        "autoDeployTypes": Array [],
+                        "autoDeployWithCriticalErrors": false,
                         "autoFetchFeeds": true,
                         "autoFetchHour": 0,
                         "autoFetchMinute": 0,
@@ -2943,6 +2960,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "osmExtractUrl": null,
                             "otpCommit": null,
                             "otpVersion": null,
+                            "pinnedfeedVersionIds": Array [],
                             "projectBounds": Object {
                               "east": 0,
                               "north": 0,
@@ -3096,6 +3114,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       project={
                         Object {
                           "autoDeploy": false,
+                          "autoDeployTypes": Array [],
+                          "autoDeployWithCriticalErrors": false,
                           "autoFetchFeeds": true,
                           "autoFetchHour": 0,
                           "autoFetchMinute": 0,
@@ -3200,6 +3220,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "osmExtractUrl": null,
                               "otpCommit": null,
                               "otpVersion": null,
+                              "pinnedfeedVersionIds": Array [],
                               "projectBounds": Object {
                                 "east": 0,
                                 "north": 0,
@@ -3637,6 +3658,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             project={
                               Object {
                                 "autoDeploy": false,
+                                "autoDeployTypes": Array [],
+                                "autoDeployWithCriticalErrors": false,
                                 "autoFetchFeeds": true,
                                 "autoFetchHour": 0,
                                 "autoFetchMinute": 0,
@@ -3741,6 +3764,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
                                       "north": 0,
diff --git a/lib/manager/util/version.js b/lib/manager/util/version.js
index ea61a4c3b..a49d6d2a4 100644
--- a/lib/manager/util/version.js
+++ b/lib/manager/util/version.js
@@ -5,6 +5,7 @@ import moment from 'moment'
 import { isExtensionEnabled } from '../../common/util/config'
 
 import type {
+  Deployment,
   Feed,
   FeedVersion,
   Project,
@@ -58,6 +59,19 @@ export function versionHasNotBegun (
   return moment(version.validationResult.startDate).isAfter(moment())
 }
 
+/**
+ * Returns true if the given version is in the list of pinned versions for the
+ * given deployment.
+ */
+export function versionIsPinnedInDeployment (
+  deployment: Deployment,
+  version: SummarizedFeedVersion
+) {
+  return deployment.pinnedfeedVersionIds.some(
+    pinnedId => version.id === pinnedId
+  )
+}
+
 // Error types that should prevent publishing a feed version to MTC. These types
 // must correspond to those found at:
 // https://github.com/conveyal/gtfs-lib/blob/dev/src/main/java/com/conveyal/gtfs/error/NewGTFSErrorType.java
diff --git a/lib/types/index.js b/lib/types/index.js
index 974ef17f2..de580c519 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -248,6 +248,7 @@ export type Deployment = {
   organizationId: ?string,
   osmExtractUrl: ?string,
   otpVersion: ?string,
+  pinnedfeedVersionIds: Array<string>,
   projectBounds: Bounds,
   projectId: string,
   routerId: ?string,
@@ -706,6 +707,7 @@ export type AutoDeployType = $Values<typeof AUTO_DEPLOY_TYPES>
 
 export type Project = {
   autoDeployTypes: Array<AutoDeployType>,
+  autoDeployWithCriticalErrors: boolean,
   autoFetchFeeds: boolean,
   autoFetchHour: number,
   autoFetchMinute: number,

From 72f8fe6dc749f75586196701553462c50b1bc59a Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Fri, 7 May 2021 00:29:22 -0700
Subject: [PATCH 196/553] refactor(deployment): address PR review comments

See https://github.com/ibi-group/datatools-ui/pull/637
---
 i18n/english.yml                                    |  4 ----
 lib/manager/components/ProjectViewer.js             | 11 +++++------
 .../components/deployment/DeploymentsPanel.js       | 13 ++++++-------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 929612eaa..9e86d7576 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -151,10 +151,6 @@ components:
         A deployment will automatically be kicked off (assuming there are no
         critical errors) whenever one of the above-defined events occurs.
       label: Auto-deploy events
-      noPinnedDeployment: None selected
-      pinnedDeploymentHelp: >
-        Tip: Under the Deployments tab, click the thumbtack icon next to the
-        deployment you would like to target for auto-deployments.
       placeholder: Specify auto-deploy events
       title: Auto-deployment
       types:
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index 26057928b..9a08a1740 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -77,8 +77,8 @@ export default class ProjectViewer extends Component<Props, State> {
 
   _renderDeploymentsTab = () => {
     const {activeComponent, activeSubComponent, project} = this.props
-    return isModuleEnabled('deployment')
-      ? <Tab
+    return isModuleEnabled('deployment') && (
+      <Tab
         eventKey='deployments'
         disabled={this._isProjectEditDisabled()}
         title={
@@ -92,14 +92,13 @@ export default class ProjectViewer extends Component<Props, State> {
           project={project}
         />
       </Tab>
-      : null
+    )
   }
 
   _renderPublicFeeds = () => {
     const s3Bucket = getConfigProperty('application.data.gtfs_s3_bucket')
-    const publicFeedsLink = s3Bucket
-      ? `https://s3.amazonaws.com/${s3Bucket}/public/index.html`
-      : null
+    const publicFeedsLink = s3Bucket &&
+      `https://s3.amazonaws.com/${s3Bucket}/public/index.html`
     return isModuleEnabled('enterprise') && !this._isProjectEditDisabled() &&
       <div style={{marginBottom: '20px'}}>
         <Button
diff --git a/lib/manager/components/deployment/DeploymentsPanel.js b/lib/manager/components/deployment/DeploymentsPanel.js
index 81d1250c3..7aa86855e 100644
--- a/lib/manager/components/deployment/DeploymentsPanel.js
+++ b/lib/manager/components/deployment/DeploymentsPanel.js
@@ -79,13 +79,12 @@ export default class DeploymentsPanel extends Component<Props> {
       saveDeployment,
       updateDeployment
     } = this.props
-    const {deployments, pinnedDeploymentId} = project
+    const {deployments = [], pinnedDeploymentId} = project
     // Deployment is selected, but deployments have not finished loading.
     if (deploymentId && !deployments) return <Loading />
-    const sortedDeployments = deployments
-      ? deployments.sort((a, b) => deploymentsComparator(a, b, pinnedDeploymentId))
-      : []
-    const deployment = sortedDeployments.find(d => d.id && d.id === deploymentId)
+    // FIXME don't sort this on every render
+    deployments.sort((a, b) => deploymentsComparator(a, b, pinnedDeploymentId))
+    const deployment = deployments.find(d => d.id && d.id === deploymentId)
     // Deployment is selected and found in list.
     if (deployment) {
       return (
@@ -102,7 +101,7 @@ export default class DeploymentsPanel extends Component<Props> {
           <DeploymentsList
             createDeployment={createDeployment}
             deleteDeployment={this._onDeleteDeployment}
-            deployments={sortedDeployments}
+            deployments={deployments}
             project={project}
             saveDeployment={saveDeployment}
             updateDeployment={updateDeployment} />
@@ -119,7 +118,7 @@ export default class DeploymentsPanel extends Component<Props> {
               <Select
                 name='pinnedDeploymentId'
                 onChange={this._onChangePinned}
-                options={sortedDeployments.map(d => ({label: d.name, value: d.id}))}
+                options={deployments.map(d => ({label: d.name, value: d.id}))}
                 placeholder={this.messages('pinnedDeployment.placeholder')}
                 value={project.pinnedDeploymentId}
               />

From 959f3042acce504042fa635d5cdc6e2ad42bc211 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 7 May 2021 08:25:40 -0400
Subject: [PATCH 197/553] refactor(HomeProjectDropdown): update option renderer
 and use flex

---
 lib/common/util/util.js                       |  2 +-
 lib/manager/components/HomeProjectDropdown.js | 54 +++++++++++++------
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/lib/common/util/util.js b/lib/common/util/util.js
index 7839c6dc4..bf9e25d8a 100644
--- a/lib/common/util/util.js
+++ b/lib/common/util/util.js
@@ -13,7 +13,7 @@ export function defaultSorter (a: FeedVersion | Project | Feed, b: FeedVersion |
 }
 
 export function getAbbreviatedProjectName (project: Project): string {
-  return project && project.name.length > 16
+  return project && project.name && project.name.length > 16
     ? `${project.name.substr(0, 12)}...`
     : project
       ? project.name
diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index d87e3a14d..aaf3e567d 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -6,6 +6,7 @@ import { Button } from 'react-bootstrap'
 import {browserHistory} from 'react-router'
 import { LinkContainer } from 'react-router-bootstrap'
 import Select from 'react-select'
+
 import {getAbbreviatedProjectName} from '../../common/util/util'
 
 import type {Project, ReactSelectOption} from '../../types'
@@ -22,6 +23,14 @@ export default class HomeProjectDropdown extends Component<Props> {
     browserHistory.push(`/home/${option ? option.value : ''}`)
   }
 
+  _optionRenderer = (option: ReactSelectOption) => {
+    return (
+      <span title={option.label}>
+        <Icon type='folder-o' /> {option.label}
+      </span>
+    )
+  }
+
   render () {
     const {
       activeProject,
@@ -33,35 +42,48 @@ export default class HomeProjectDropdown extends Component<Props> {
     if (!profile) return null
     const abbreviatedProjectName = getAbbreviatedProjectName(activeProject)
     const options = visibleProjects.map(
-      project => ({value: project.id, label: project.name})
+      project => ({value: project.id, label: project.name || '[No name]'})
     )
     return (
       <div style={{marginBottom: '20px'}}>
         {
           isAdmin && (
             <LinkContainer to='/project/new'>
-              <Button>
+              <Button bsStyle='link' style={{paddingLeft: 0}}>
                 <Icon type='plus' /> New project
               </Button>
             </LinkContainer>
           )
         }
-        {activeProject
-          ? <LinkContainer
-            className='pull-right'
-            style={{marginBottom: '5px'}}
-            to={`/project/${activeProject.id}`}
+        <div style={{display: 'flex'}}>
+          <div style={{paddingRight: '10px', width: '70%'}}>
+            <Select
+              onChange={this.handleChange}
+              optionRenderer={this._optionRenderer}
+              options={options}
+              placeholder='Select project...'
+              value={options.find(o =>
+                activeProject && o.value === activeProject.id
+              )}
+              valueRenderer={this._optionRenderer}
+            />
+          </div>
+          <LinkContainer
+            to={activeProject ? `/project/${activeProject.id}` : ''}
           >
-            <Button bsStyle='primary'>View {abbreviatedProjectName}</Button>
+            <Button
+              disabled={!activeProject}
+              style={{width: '30%'}}
+              title={activeProject ? `View ${activeProject.name}` : ''}
+              bsStyle='primary'
+            >
+              {activeProject
+                ? `View ${abbreviatedProjectName}`
+                : 'Select project'
+              }
+            </Button>
           </LinkContainer>
-          : null
-        }
-        <Select
-          value={activeProject && {label: activeProject.name}}
-          onChange={this.handleChange}
-          options={options}
-          style={{marginTop: '5px'}}
-        />
+        </div>
       </div>
     )
   }

From 0f7be2d6646dd9c2948a4ff832cbf7ef71ef7def Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 May 2021 12:33:13 +0000
Subject: [PATCH 198/553] build(deps): bump lodash from 4.17.19 to 4.17.21 in
 /scripts

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
---
 scripts/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 04fa1906d..6d77f6abc 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -634,9 +634,9 @@ lodash.once@^4.0.0:
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
 lodash@^4.13.1:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 lower-case-first@^1.0.0:
   version "1.0.2"

From 8bf1037f0344cbd1c02d0dcd463cb779673479e0 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 7 May 2021 13:30:55 -0400
Subject: [PATCH 199/553] refactor: Apply suggestions from code review

Co-authored-by: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
---
 lib/editor/components/EditorInput.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 1a2a81ae6..1aa421136 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -118,7 +118,7 @@ export default class EditorInput extends React.Component<Props> {
     }
   }
 
-  _renderRouteTypeOptions = (field: GtfsSpecField): React.Node => {
+  _renderRouteTypeOptions = (field: GtfsSpecField): Array<React.Node> => {
     const options = field.options || []
     const toOption = ({value, text}) => (
       <option key={value}>{text} ({value})</option>
@@ -128,11 +128,11 @@ export default class EditorInput extends React.Component<Props> {
     const routeTypes = [
       {
         label: 'Standard',
-        options: options.slice(0, 9).map(toOption)
+        options: options.filter(opt => opt.value < 100).map(toOption)
       },
       {
         label: 'Extended',
-        options: options.slice(10).map(toOption)
+        options: options.filter(opt => opt.value >= 100).map(toOption)
       }
     ]
     return routeTypes.map(({label, options}) => (

From b1341cf75094c3d8445c96f8cb0ce7715e831ea5 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 10 May 2021 11:44:31 +0100
Subject: [PATCH 200/553] refactor(validation.js): SOrted typing issues and
 removed some code

#668
---
 lib/editor/util/validation.js | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index d4ed659ab..2f0d125c9 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -38,8 +38,14 @@ export function validate (
   const isRequiredButEmpty = required && valueDoesNotExist
   const isOptionalAndEmpty = !required && valueDoesNotExist
   const agencies = getTableById(tableData, 'agency')
+  let locationType: ?number = 0
   let reason = 'Required field must not be empty'
 
+  // entity.locationtype is a string.  Convert to number for conditinals later on.
+  if (entity && entity.location_type) {
+    locationType = parseInt(entity.location_type)
+  }
+
   // setting as a variable here because of eslint bug
   type CheckPositiveOutput = {
     num?: number,
@@ -101,9 +107,11 @@ export function validate (
         (indices.length > 1 ||
           (indices.length > 0 && entities[indices[0]].id !== entity.id))
       )
-      console.log(idList.length)
-      console.log({entity})
-      if (agencies.length > 1 && entity.agency_id === null) {
+      if (
+        name === 'agency_id' &&
+        idList.length > 1 &&
+        valueDoesNotExist
+      ) {
         reason = 'Identifier is required if more than one agency exists'
         return {field: name, invalid: isRequiredButEmpty, reason}
       }
@@ -184,30 +192,28 @@ export function validate (
       const isNotLat = value > 90 || value < -90
       if (isNotLat) {
         reason = 'Field must be valid latitude.'
-        return {field: name, invalid: isOptionalAndEmpty || isNotLat, reason}
+        return {field: name, invalid: isNotLat, reason}
       }
-      if (entity && entity.location_type >= 2) {
+      if (!locationType || locationType < 2) {
         if (isOptionalAndEmpty) {
-          reason = '1 Latitude and Longitude are required for your current location type'
-          return {field: name, invalid: isOptionalAndEmpty || isNotLat, reason}
+          reason = 'Latitude and Longitude are required for your current location type'
+          return {field: name, invalid: isOptionalAndEmpty, reason}
         }
-      } else {
-        return false
       }
+      return false
     case 'LONGITUDE':
       const isNotLng = value > 180 || value < -180
       if (isNotLng) {
         reason = 'Field must be valid longitude.'
         return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
       }
-      if (entity && entity.location_type >= 2) {
+      if (!locationType || locationType < 2) {
         if (isOptionalAndEmpty) {
-          reason = '1 Latitude and Longitude are required for your current location type'
+          reason = 'Latitude and Longitude are required for your current location type'
           return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
         }
-      } else {
-        return false
       }
+      return false
     case 'TIME':
     case 'NUMBER':
       const isNotANumber = isNaN(value)

From f2ea39377db89e8e4bca522d0e2e4b1b7ed2a56c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 May 2021 15:33:37 +0000
Subject: [PATCH 201/553] build(deps): bump lodash from 4.17.20 to 4.17.21

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 49c0199d2..0aa3e7ed1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8476,9 +8476,9 @@ lodash@4.17.14:
   integrity sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==
 
 lodash@^4.0.0, lodash@^4.0.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 lodash@~3.2.0:
   version "3.2.0"

From 02d2fccff2b28a25e7425e987262ecf27c4e911d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 May 2021 15:34:01 +0000
Subject: [PATCH 202/553] build(deps): bump hosted-git-info from 2.4.2 to 2.8.9
 in /scripts

Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.4.2 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.4.2...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
---
 scripts/yarn.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 6d77f6abc..fcf8686a5 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -421,8 +421,9 @@ has-symbols@^1.0.0:
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
 hosted-git-info@^2.1.4:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 http-errors@1.6.2:
   version "1.6.2"

From 9540441ed96e625ba9fcd153683fc8087387270b Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 11 May 2021 08:46:19 -0400
Subject: [PATCH 203/553] refactor(feed-diffs): tweak code a bit

---
 .../version/FeedVersionNavigator.js           |  21 ++--
 .../version/FeedVersionSpanChart.js           | 100 ++++++++++--------
 .../version/VersionSelectorDropdown.js        |   5 +-
 3 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 392ca8221..bdbdcddfd 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -231,6 +231,15 @@ export default class FeedVersionNavigator extends Component<Props, State> {
               }
 
               <ButtonToolbar className='pull-right'>
+                {feedSource.feedVersions &&
+                  <ButtonGroup>
+                    <VersionComparisonDropdown
+                      comparedVersion={comparedVersion}
+                      version={version}
+                      versions={feedSource.feedVersions}
+                    />
+                  </ButtonGroup>
+                }
                 <ButtonGroup>
                   {isModuleEnabled('deployment') && deploymentForVersion
                     ? <DeploymentPreviewButton
@@ -299,18 +308,6 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                   : null
                 }
               </ButtonToolbar>
-
-              {feedSource.feedVersions &&
-                <ButtonToolbar className='pull-right'>
-                  <ButtonGroup>
-                    <VersionComparisonDropdown
-                      comparedVersion={comparedVersion}
-                      version={version}
-                      versions={feedSource.feedVersions}
-                    />
-                  </ButtonGroup>
-                </ButtonToolbar>
-              }
             </ButtonToolbar>
           </Col>
         </Row>
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 75e70730c..8fbd7afdd 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -5,16 +5,16 @@ import React, { Component } from 'react'
 import { OverlayTrigger, Tooltip } from 'react-bootstrap'
 
 import VersionDateLabel from './VersionDateLabel'
-import type { FeedVersion } from '../../../types'
+import type { FeedVersion, Style } from '../../../types'
 
 type Props = {
   activeVersion: FeedVersion,
   comparedVersion?: ?FeedVersion,
-  style: any
+  style: Style
 }
 
-const DATE_FORMAT = 'MMM. D, YYYY'
-const TODAY_DATE_FORMAT = 'MMM. D'
+const DATE_FORMAT = 'MMM D, YYYY'
+const TODAY_DATE_FORMAT = 'MMM D'
 
 // Width of feed span bar.
 const BAR_WIDTH_PX = 150
@@ -34,28 +34,18 @@ const TODAY_MARKER_ZINDEX = 9998
  * of the active and compared feed versions.
  */
 export default class FeedVersionSpanChart extends Component<Props> {
-  /**
-   * Render a span of the chart.
-   * Note: Components below are all rendered as direct children of the parent element
-   * (hence the returned array), so that the "today" marker appears
-   * above the FeedSpan while remaining below the FeedStartLabel and FeedEndLabel contents.
-   * FIXME[React 16.2+]: Extract into <>...</> markup.
-   */
-  renderFeedSpan = (name: string, props: any) => [
-    <FeedStartLabel key={`${name}-start`} {...props} />,
-    <FeedEndLabel key={`${name}-end`} {...props} />,
-    <FeedSpan key={`${name}-span`} {...props} isServiceGap={false} />
-  ]
-
   render () {
-    const { activeVersion, comparedVersion: comparedVersionProp, style } = this.props
-    const comparedVersion = comparedVersionProp || activeVersion
+    const { activeVersion, comparedVersion, style } = this.props
+    // Get the validation summary to compare against for min/max dates
+    const comparisonDates = comparedVersion
+      ? comparedVersion.validationSummary
+      : activeVersion.validationSummary
 
     // Construct moment objects for the active/compared version start/end dates.
     const activeStartDate = moment(activeVersion.validationSummary.startDate)
     const activeEndDate = moment(activeVersion.validationSummary.endDate)
-    const comparedStartDate = moment(comparedVersion.validationSummary.startDate)
-    const comparedEndDate = moment(comparedVersion.validationSummary.endDate)
+    const comparedStartDate = moment(comparisonDates.startDate)
+    const comparedEndDate = moment(comparisonDates.endDate)
 
     const firstDate = moment.min(activeStartDate, comparedStartDate)
     const lastDate = moment.max(activeEndDate, comparedEndDate)
@@ -70,24 +60,7 @@ export default class FeedVersionSpanChart extends Component<Props> {
     const totalDays = lastDate.diff(firstDate, 'days')
     const todayOffset = today.diff(firstDate, 'days')
     const showToday = todayOffset >= 0 && todayOffset < totalDays
-
-    const activeChartProps = {
-      firstDate,
-      lastDate,
-      top: 0,
-      versionEndDate: activeEndDate,
-      versionLabel: <VersionDateLabel version={activeVersion} />,
-      versionStartDate: activeStartDate
-    }
-    const comparedChartProps = {
-      firstDate,
-      lastDate,
-      top: (`${(hasGap ? 2 : 1) * HEIGHT_EM}em`),
-      versionEndDate: comparedEndDate,
-      versionLabel: <VersionDateLabel version={comparedVersion} />,
-      versionStartDate: comparedStartDate
-    }
-    const versionProps = {
+    const labelStyle = {
       height: HEIGHT_PROP,
       overflow: 'hidden',
       textOverflow: 'ellipsis',
@@ -96,17 +69,30 @@ export default class FeedVersionSpanChart extends Component<Props> {
 
     return (
       <div style={{ ...style, display: 'flex' }}>
-        {comparedVersionProp && (
+        {/* Chart Labels */}
+        {comparedVersion && (
           <div>
-            <div style={versionProps}>Version {activeVersion.version} (selected)</div>
+            <div style={labelStyle}>Version {activeVersion.version} (selected)</div>
             {hasGap &&
-              <div className='text-danger' style={{ height: HEIGHT_PROP }}>Gap in service</div>}
-            <div style={versionProps}>Version {comparedVersion.version}</div>
+              <div className='text-danger' style={{ height: HEIGHT_PROP }}>
+                Gap in service
+              </div>
+            }
+            <div style={labelStyle}>Version {comparedVersion.version}</div>
           </div>
         )}
+        {/* Chart Spans */}
         <div style={{ minHeight: HEIGHT_PROP, position: 'relative', width: '400px' }}>
-          {this.renderFeedSpan('active', activeChartProps)}
-          {comparedVersionProp && hasGap &&
+          <FeedSpanWithDates
+            name='active'
+            firstDate={firstDate}
+            lastDate={lastDate}
+            top={0}
+            versionEndDate={activeEndDate}
+            versionLabel={<VersionDateLabel version={activeVersion} />}
+            versionStartDate={activeStartDate}
+          />
+          {comparedVersion && hasGap &&
             <FeedSpan
               firstDate={firstDate}
               isServiceGap
@@ -115,7 +101,17 @@ export default class FeedVersionSpanChart extends Component<Props> {
               versionEndDate={latestStart}
               versionStartDate={earliestEnd}
             />}
-          {comparedVersionProp && this.renderFeedSpan('compared', comparedChartProps)}
+          {comparedVersion &&
+            <FeedSpanWithDates
+              name='compared'
+              firstDate={firstDate}
+              lastDate={lastDate}
+              top={`${(hasGap ? 2 : 1) * HEIGHT_EM}em`}
+              versionEndDate={comparedEndDate}
+              versionLabel={<VersionDateLabel version={comparedVersion} />}
+              versionStartDate={comparedStartDate}
+            />
+          }
           {showToday && <TodayMarker firstDate={firstDate} lastDate={lastDate} />}
         </div>
       </div>
@@ -123,6 +119,18 @@ export default class FeedVersionSpanChart extends Component<Props> {
   }
 }
 
+/**
+ * Render a span of the chart with date labels.
+ * FIXME[React 16.2+]: Extract into <>...</> markup.
+ */
+const FeedSpanWithDates = ({name, ...props}) => (
+  <div>
+    <FeedStartLabel key={`${name}-start`} {...props} />
+    <FeedEndLabel key={`${name}-end`} {...props} />
+    <FeedSpan key={`${name}-span`} {...props} isServiceGap={false} />
+  </div>
+)
+
 /**
  * Compute label position and sizing info.
  */
diff --git a/lib/manager/components/version/VersionSelectorDropdown.js b/lib/manager/components/version/VersionSelectorDropdown.js
index 6d2c68f66..1f8881814 100644
--- a/lib/manager/components/version/VersionSelectorDropdown.js
+++ b/lib/manager/components/version/VersionSelectorDropdown.js
@@ -11,7 +11,7 @@ import type { FeedVersion } from '../../../types'
 
 type Props = {
   dropdownProps: any,
-  extraOptions?: ?Array<any>,
+  extraOptions?: ?Array<{onClick: () => void, text: string}>,
   header?: string,
   itemFormatter: (FeedVersion, ?FeedVersion) => React.Node,
   title: React.Node,
@@ -34,7 +34,8 @@ export const DefaultItemFormatter = (version: FeedVersion, activeVersion: ?FeedV
           position: 'absolute'
         }}
         type='check' />
-      : null}
+      : null
+    }
     {version.version}. {version.name}{' '}
     <VersionRetrievalBadge version={version} />
   </MenuItem>

From 8a9c3834686e24436e51184b752236612b765ab6 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Tue, 11 May 2021 15:10:06 +0100
Subject: [PATCH 204/553] improvement(gtfs.yml, end-to-end.js,
 index.js,validation.js): WIP: Various GTFS changes and updates

gtfs.yml
---
 __tests__/end-to-end.js       |  2 +-
 gtfs.yml                      |  9 +++++++--
 lib/editor/util/validation.js | 10 ++++++++--
 lib/types/index.js            |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index dd083ca9a..81c6efe2c 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -418,7 +418,7 @@ async function createStop ({
     option: number
   },
   url: string,
-  wheelchairBoarding?: string, // make optional due to https://github.com/facebook/flow/issues/183
+  wheelchairBoarding?: number, // make optional due to https://github.com/facebook/flow/issues/183
   zoneId?: string // make optional due to https://github.com/facebook/flow/issues/183
 }) {
   log.info(`creating stop with name: ${name}`)
diff --git a/gtfs.yml b/gtfs.yml
index caf511556..248178dd0 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -139,7 +139,7 @@
     columnWidth: 6
     helpContent: "The stop_code field contains short text or a number that uniquely identifies the stop for passengers. Stop codes are often used in phone-based transit information systems or printed on stop signage to make it easier for riders to get a stop schedule or real-time arrival information for a particular stop."
   - name: "stop_name"
-    required: true
+    required: false
     inputType: TEXT
     bulkEditEnabled: true
     columnWidth: 12
@@ -186,8 +186,13 @@
       text: Generic Node (3)
     - value: '4'
       text: Boarding Area (4)
-    columnWidth: 12
+    columnWidth: 7
     helpContent: "The location_type field identifies whether this stop ID represents a stop or station. If no location type is specified, or the location_type is blank, stop IDs are treated as stops. Stations may have different properties from stops when they are represented on a map or used in trip planning."
+  - name: "platform_code"
+    required: false
+    inputType: TEXT
+    columnWidth: 5
+    helpContent: "Platform identifier for a platform stop (a stop belonging to a station). This should be just the platform identifier (eg. G or 3)."
   - name: "parent_station"
     required: false
     inputType: GTFS_STOP
diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index 2f0d125c9..05f577523 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -124,6 +124,12 @@ export function validate (
         return false
       }
     case 'TEXT':
+      if (name === 'stop_name' && isOptionalAndEmpty) {
+        if (!locationType || locationType <= 2) {
+          reason = 'Stop name is required for your current location type'
+          return {field: name, invalid: isOptionalAndEmpty, reason}
+        }
+      }
       if (name === 'route_short_name' && !value && entity && entity.route_long_name) {
         return false
       } else if (
@@ -194,7 +200,7 @@ export function validate (
         reason = 'Field must be valid latitude.'
         return {field: name, invalid: isNotLat, reason}
       }
-      if (!locationType || locationType < 2) {
+      if (!locationType || locationType <= 2) {
         if (isOptionalAndEmpty) {
           reason = 'Latitude and Longitude are required for your current location type'
           return {field: name, invalid: isOptionalAndEmpty, reason}
@@ -207,7 +213,7 @@ export function validate (
         reason = 'Field must be valid longitude.'
         return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
       }
-      if (!locationType || locationType < 2) {
+      if (!locationType || locationType <= 2) {
         if (isOptionalAndEmpty) {
           reason = 'Latitude and Longitude are required for your current location type'
           return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
diff --git a/lib/types/index.js b/lib/types/index.js
index 538430db8..0f3c411c2 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -89,7 +89,7 @@ export type Route = {
   routeTextColor: string,
   routeUrl: string,
   status: string,
-  wheelchairBoarding: string
+  wheelchairBoarding: number
 }
 
 export type Calendar = {|

From baaba8b5342008d446db9f39cde2f5bf0eb69363 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Tue, 11 May 2021 15:17:48 +0100
Subject: [PATCH 205/553] improvement(gtfs.yml): Added continuous_pickup and
 drop off fields to routes.txt

---
 gtfs.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gtfs.yml b/gtfs.yml
index 248178dd0..ffbdfe6cb 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -308,6 +308,36 @@
     inputType: POSITIVE_INT
     columnWidth: 6
     helpContent: The route_sort_order field can be used to order the routes in a way which is ideal for presentation to customers. It must be a non-negative integer. Routes with smaller route_sort_order values should be displayed before routes with larger route_sort_order values.
+  - name: continuous_pickup
+    required: false
+    inputType: DROPDOWN
+    bulkEditEnabled: true
+    options:
+    - value: 0
+      text: Continuous stopping pickup (0)
+    - value: 1
+      text: No continuous stopping pickup (1)
+    - value: 2
+      text: Must phone an agency to arrange continuous stopping pickup (2)
+    - value: 3
+      text: Must coordinate with a driver to arrange continuous stopping pickup (3)
+    columnWidth: 12
+    helpContent: Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.
+  - name: continuous_drop_off
+    required: false
+    inputType: DROPDOWN
+    bulkEditEnabled: true
+    options:
+    - value: 0
+      text: Continuous stopping drop-off (0)
+    - value: 1
+      text: No continuous stopping drop-off (1)
+    - value: 2
+      text: Must phone an agency to arrange continuous stopping drop-off (2)
+    - value: 3
+      text: Must coordinate with a driver to arrange continuous stopping drop-off (3)
+    columnWidth: 12
+    helpContent: Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.
   - name: route_url
     required: false
     inputType: URL

From f7d80e70efaecf9b4ef478fc857c55ae6e82c0f4 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 11 May 2021 11:26:45 -0400
Subject: [PATCH 206/553] fix(deps): bump deps in scripts/package.json

---
 scripts/package.json |    2 +-
 scripts/yarn.lock    | 1166 ++++++++++++++++++++----------------------
 2 files changed, 546 insertions(+), 622 deletions(-)

diff --git a/scripts/package.json b/scripts/package.json
index d8e0d6482..4db510af6 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "auth0": "^2.27.1",
+    "auth0": "^2.34.2",
     "make-runnable": "^1.3.6",
     "request-promise-native": "^1.0.5"
   }
diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 6d77f6abc..4d59135a2 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -2,18 +2,23 @@
 # yarn lockfile v1
 
 
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+
 "@types/body-parser@*":
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
-  integrity sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
+  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
 
 "@types/connect@*":
-  version "3.4.32"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
-  integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==
+  version "3.4.34"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
+  integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==
   dependencies:
     "@types/node" "*"
 
@@ -25,12 +30,13 @@
     "@types/express" "*"
     "@types/express-unless" "*"
 
-"@types/express-serve-static-core@*":
-  version "4.16.7"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz#50ba6f8a691c08a3dd9fa7fba25ef3133d298049"
-  integrity sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
+  integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==
   dependencies:
     "@types/node" "*"
+    "@types/qs" "*"
     "@types/range-parser" "*"
 
 "@types/express-unless@*":
@@ -41,23 +47,29 @@
     "@types/express" "*"
 
 "@types/express@*":
-  version "4.17.0"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.0.tgz#49eaedb209582a86f12ed9b725160f12d04ef287"
-  integrity sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
+  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
   dependencies:
     "@types/body-parser" "*"
-    "@types/express-serve-static-core" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/mime@*":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
-  integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
 "@types/node@*":
-  version "12.6.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.6.7.tgz#cd79418e9c67aba62afbe707655fc028e5989ff3"
-  integrity sha512-Dagl2ASgoIeJCD/HWqgAPIZABYQdNHIUg11wz7JpvXSj0pUlP2ASBNvPp3J14Wmw3PS/NcFFtU1BkdFtz83qvA==
+  version "15.0.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67"
+  integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA==
+
+"@types/qs@*":
+  version "6.9.6"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
+  integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
 
 "@types/range-parser@*":
   version "1.2.3"
@@ -65,62 +77,66 @@
   integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
 
 "@types/serve-static@*":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
-  integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==
+  version "1.13.9"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"
+  integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==
   dependencies:
-    "@types/express-serve-static-core" "*"
-    "@types/mime" "*"
+    "@types/mime" "^1"
+    "@types/node" "*"
 
-agent-base@4, agent-base@^4.2.0, agent-base@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+agent-base@6, agent-base@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
-    es6-promisify "^5.0.0"
+    debug "4"
 
-agent-base@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
-  dependencies:
-    es6-promisify "^5.0.0"
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
 
-ast-types@0.x.x:
-  version "0.9.14"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.14.tgz#d34ba5dffb9d15a44351fd2a9d82e4ab2838b5ba"
+ast-types@^0.13.2:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.4.tgz#ee0d77b343263965ecc3fb62da16e7222b2b6782"
+  integrity sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==
+  dependencies:
+    tslib "^2.0.1"
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-auth0@^2.27.1:
-  version "2.27.1"
-  resolved "https://registry.yarnpkg.com/auth0/-/auth0-2.27.1.tgz#a9bcc766a4c89e12893092611c66d25f9313f6c9"
-  integrity sha512-RpjH7jCSR3YydqK18aXwXUJG5nZfg0Z31Uwp6g9TKtFZG5v79ogwrt+yNYPzV6IgDZH2c7ADSjkeOO75MSCvqg==
+auth0@^2.34.2:
+  version "2.34.2"
+  resolved "https://registry.yarnpkg.com/auth0/-/auth0-2.34.2.tgz#5357ce2ffb57e6d69b7172b1e3fde17006b67b42"
+  integrity sha512-aViznMt3FHKVjUHy1iwPOo9GYi8gMUS0wrVnQrncbHDBOiGBvyb9xLVy8RF3STIJIf3dgQZTrdh08QCgrSBI4A==
   dependencies:
-    axios "^0.19.2"
-    bluebird "^3.5.5"
+    axios "^0.21.1"
+    es6-promisify "^6.1.1"
     form-data "^3.0.0"
     jsonwebtoken "^8.5.1"
-    jwks-rsa "^1.8.0"
+    jwks-rsa "^1.12.1"
     lru-memoizer "^2.1.0"
-    object.assign "^4.1.0"
-    rest-facade "^1.12.0"
+    rest-facade "^1.13.0"
     retry "^0.12.0"
 
-axios@^0.19.2:
-  version "0.19.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
-  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+axios@^0.21.1:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
   dependencies:
-    follow-redirects "1.5.10"
+    follow-redirects "^1.10.0"
 
-bluebird@^3.5.0, bluebird@^3.5.5:
+bluebird@^3.5.0:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -130,28 +146,31 @@ buffer-equal-constant-time@1.0.1:
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
   integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=
 
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+call-bind@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
 
 camel-case@^1.1.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-1.2.2.tgz#1aca7c4d195359a2ce9955793433c6e5542511f2"
+  integrity sha1-Gsp8TRlTWaLOmVV5NDPG5VQlEfI=
   dependencies:
     sentence-case "^1.1.1"
     upper-case "^1.1.1"
 
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-
 change-case@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/change-case/-/change-case-2.3.1.tgz#2c4fde3f063bb41d00cd68e0d5a09db61cbe894f"
+  integrity sha1-LE/ePwY7tB0AzWjg1aCdthy+iU8=
   dependencies:
     camel-case "^1.1.1"
     constant-case "^1.1.0"
@@ -170,21 +189,26 @@ change-case@^2.3.0:
     upper-case "^1.1.1"
     upper-case-first "^1.1.0"
 
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 combined-stream@^1.0.8:
   version "1.0.8"
@@ -201,6 +225,7 @@ component-emitter@^1.3.0:
 constant-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-1.1.2.tgz#8ec2ca5ba343e00aa38dbf4e200fd5ac907efd63"
+  integrity sha1-jsLKW6ND4Aqjjb9OIA/VrJB+/WM=
   dependencies:
     snake-case "^1.1.0"
     upper-case "^1.1.1"
@@ -213,76 +238,60 @@ cookiejar@^2.1.2:
 core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-data-uri-to-buffer@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz#77163ea9c20d8641b4707e8f18abdf9a78f34835"
-
-debug@2:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  dependencies:
-    ms "2.0.0"
+data-uri-to-buffer@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
+  integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
 
-debug@3.1.0, debug@=3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+debug@4, debug@^4.1.0, debug@^4.1.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
-    ms "2.0.0"
+    ms "2.1.2"
 
 debug@^3.1.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-decamelize@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
 deepmerge@^3.2.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.3.0.tgz#d3c47fd6f3a93d517b14426b0628a17b0125f5f7"
   integrity sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA==
 
-define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
-  dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
-
-degenerator@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-1.0.4.tgz#fcf490a37ece266464d9cc431ab98c5819ced095"
+degenerator@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-2.2.0.tgz#49e98c11fa0293c5b26edfbb52f15729afcdb254"
+  integrity sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==
   dependencies:
-    ast-types "0.x.x"
-    escodegen "1.x.x"
-    esprima "3.x.x"
+    ast-types "^0.13.2"
+    escodegen "^1.8.1"
+    esprima "^4.0.0"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 dot-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-1.1.2.tgz#1e73826900de28d6de5480bc1de31d0842b06bec"
+  integrity sha1-HnOCaQDeKNbeVIC8HeMdCEKwa+w=
   dependencies:
     sentence-case "^1.1.2"
 
@@ -293,87 +302,72 @@ ecdsa-sig-formatter@1.0.11:
   dependencies:
     safe-buffer "^5.0.1"
 
-error-ex@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
-  dependencies:
-    is-arrayish "^0.2.1"
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+es6-promisify@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz#46837651b7b06bf6fff893d03f29393668d01621"
+  integrity sha512-HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg==
 
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-escodegen@1.x.x:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+escodegen@^1.8.1:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
   dependencies:
-    esprima "^3.1.3"
+    esprima "^4.0.1"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
-    source-map "~0.5.6"
+    source-map "~0.6.1"
 
-esprima@3.x.x, esprima@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+esprima@^4.0.0, esprima@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-
-extend@3:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
-  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-fast-levenshtein@~2.0.4:
+fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-safe-stringify@^2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
   integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
 
-file-uri-to-path@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
+file-uri-to-path@2:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba"
+  integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+follow-redirects@^1.10.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
+  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
 
 form-data@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.0.tgz#31b7e39c85f1355b7139ee0c647cf0de7f83c682"
-  integrity sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
@@ -384,9 +378,19 @@ formidable@^1.2.2:
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9"
   integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==
 
-ftp@~0.3.10:
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+ftp@^0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
+  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
   dependencies:
     readable-stream "1.1.x"
     xregexp "2.0.0"
@@ -396,119 +400,124 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-uri@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.1.tgz#dbdcacacd8c608a38316869368117697a1631c59"
+get-intrinsic@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
   dependencies:
-    data-uri-to-buffer "1"
-    debug "2"
-    extend "3"
-    file-uri-to-path "1"
-    ftp "~0.3.10"
-    readable-stream "2"
-
-graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-has-symbols@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
 
-hosted-git-info@^2.1.4:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+get-uri@3:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-3.0.2.tgz#f0ef1356faabc70e1f9404fa3b66b2ba9bfc725c"
+  integrity sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==
+  dependencies:
+    "@tootallnate/once" "1"
+    data-uri-to-buffer "3"
+    debug "4"
+    file-uri-to-path "2"
+    fs-extra "^8.1.0"
+    ftp "^0.3.10"
+
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+
+has-symbols@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
-http-errors@1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
-    depd "1.1.1"
-    inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
+    function-bind "^1.1.1"
 
-http-proxy-agent@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
-  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+http-errors@1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
   dependencies:
-    agent-base "4"
-    debug "3.1.0"
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
 
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
   dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
 
-iconv-lite@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+https-proxy-agent@5, https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
 
-inherits@2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+iconv-lite@0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
 
-inherits@^2.0.3:
+inherits@2.0.4, inherits@^2.0.3, inherits@~2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-
 ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-lower-case@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-1.1.3.tgz#7e147be4768dc466db3bfb21cc60b31e6ad69393"
+  integrity sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=
   dependencies:
     lower-case "^1.1.0"
 
 is-upper-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-1.1.2.tgz#8d0b1fa7e7933a1e58483600ec7d9661cbaf756f"
+  integrity sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=
   dependencies:
     upper-case "^1.1.0"
 
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
 
 jsonwebtoken@^8.5.1:
   version "8.5.1"
@@ -535,18 +544,21 @@ jwa@^1.4.1:
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
-jwks-rsa@^1.8.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-1.8.1.tgz#375c62a50c4ca805ad5bd682c12c8a695de13ddf"
-  integrity sha512-CcE8ypsATHwGmzELwzeFjLzPBXTXTrMmDYbn92LTQwYsZdOedp+ZIuYTofUdrWreu8CKRuXmhk17+6/li2sR6g==
+jwks-rsa@^1.12.1:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/jwks-rsa/-/jwks-rsa-1.12.3.tgz#40232f85d16734cb82837f38bb3e350a34435400"
+  integrity sha512-cFipFDeYYaO9FhhYJcZWX/IyZgc0+g316rcHnDpT2dNRNIE/lMOmWKKqp09TkJoYlNFzrEVODsR4GgXJMgWhnA==
   dependencies:
     "@types/express-jwt" "0.0.42"
-    axios "^0.19.2"
+    axios "^0.21.1"
     debug "^4.1.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
     jsonwebtoken "^8.5.1"
     limiter "^1.1.5"
     lru-memoizer "^2.1.2"
     ms "^2.1.2"
+    proxy-from-env "^1.1.0"
 
 jws@^3.2.2:
   version "3.2.2"
@@ -556,15 +568,10 @@ jws@^3.2.2:
     jwa "^1.4.1"
     safe-buffer "^5.0.1"
 
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
-  dependencies:
-    invert-kv "^1.0.0"
-
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
@@ -574,20 +581,6 @@ limiter@^1.1.5:
   resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
   integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-lodash.assign@^4.0.3, lodash.assign@^4.0.6:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -633,7 +626,7 @@ lodash.once@^4.0.0:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
-lodash@^4.13.1:
+lodash@^4.17.19:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -641,164 +634,142 @@ lodash@^4.13.1:
 lower-case-first@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lower-case-first/-/lower-case-first-1.0.2.tgz#e5da7c26f29a7073be02d52bac9980e5922adfa1"
+  integrity sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=
   dependencies:
     lower-case "^1.1.2"
 
 lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
 
-lru-cache@^4.1.2:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
-  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
+    yallist "^4.0.0"
 
 lru-cache@~4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
+  integrity sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=
   dependencies:
     pseudomap "^1.0.1"
     yallist "^2.0.0"
 
 lru-memoizer@^2.1.0, lru-memoizer@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.1.2.tgz#5c6b43659c78ad0e9e65bf81a9e5ef1ee109a2dd"
-  integrity sha512-N5L5xlnVcbIinNn/TJ17vHBZwBMt9t7aJDz2n97moWubjNl6VO9Ao2XuAGBBddkYdjrwR9HfzXbT6NfMZXAZ/A==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/lru-memoizer/-/lru-memoizer-2.1.4.tgz#b864d92b557f00b1eeb322156a0409cb06dafac6"
+  integrity sha512-IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ==
   dependencies:
     lodash.clonedeep "^4.5.0"
     lru-cache "~4.0.0"
 
 make-runnable@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-runnable/-/make-runnable-1.3.6.tgz#ca9b1d31b06f051e37570fb7ad98bc5369f982be"
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/make-runnable/-/make-runnable-1.3.8.tgz#ce547757d776c1f369028dbd937731db9514fe6a"
+  integrity sha512-8lXEwzB1eLl1pGFx5JZxFbWac6v6bHfRrCn/xDO4Qk9H6DN0QqIsJOquGxz7NkZxedhh7uki1txsbgTci1W/Vw==
   dependencies:
     bluebird "^3.5.0"
-    yargs "^4.7.1"
+    yargs "^16.0.3"
 
 methods@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+mime-db@1.47.0:
+  version "1.47.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
+  integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
 
 mime-types@^2.1.12:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+  version "2.1.30"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
+  integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
   dependencies:
-    mime-db "~1.30.0"
+    mime-db "1.47.0"
 
 mime@^2.4.6:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
-  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
+  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
-ms@^2.1.1, ms@^2.1.2:
+ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-netmask@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/netmask/-/netmask-1.0.6.tgz#20297e89d86f6f6400f250d9f4f6b4c1945fcd35"
-
-normalize-package-data@^2.3.2:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-object-keys@^1.0.11:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+ms@^2.1.1, ms@^2.1.2:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-object-keys@^1.0.8:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+netmask@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
+  integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
+object-inspect@^1.9.0:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
+  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
 
 optionator@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
+    fast-levenshtein "~2.0.6"
     levn "~0.3.0"
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
-    wordwrap "~1.0.0"
+    word-wrap "~1.2.3"
 
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
-
-pac-proxy-agent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-3.0.0.tgz#11d578b72a164ad74bf9d5bac9ff462a38282432"
-  integrity sha512-AOUX9jES/EkQX2zRz0AW7lSx9jD//hQS8wFXBvcnd/J2Py9KaMJMqV/LPqJssj1tgGufotb2mmopGPR15ODv1Q==
-  dependencies:
-    agent-base "^4.2.0"
-    debug "^3.1.0"
-    get-uri "^2.0.0"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-    pac-resolver "^3.0.0"
+pac-proxy-agent@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-4.1.0.tgz#66883eeabadc915fc5e95457324cb0f0ac78defb"
+  integrity sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+    get-uri "3"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "5"
+    pac-resolver "^4.1.0"
     raw-body "^2.2.0"
-    socks-proxy-agent "^4.0.1"
+    socks-proxy-agent "5"
 
-pac-resolver@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-3.0.0.tgz#6aea30787db0a891704deb7800a722a7615a6f26"
+pac-resolver@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-4.2.0.tgz#b82bcb9992d48166920bc83c7542abb454bd9bdd"
+  integrity sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==
   dependencies:
-    co "^4.6.0"
-    degenerator "^1.0.4"
+    degenerator "^2.2.0"
     ip "^1.1.5"
-    netmask "^1.0.6"
-    thunkify "^2.1.2"
+    netmask "^2.0.1"
 
 param-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-1.1.2.tgz#dcb091a43c259b9228f1c341e7b6a44ea0bf9743"
+  integrity sha1-3LCRpDwlm5Io8cNB57akTqC/l0M=
   dependencies:
     sentence-case "^1.1.2"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  dependencies:
-    error-ex "^1.2.0"
-
 pascal-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-1.1.2.tgz#3e5d64a20043830a7c49344c2d74b41be0c9c99b"
+  integrity sha1-Pl1kogBDgwp8STRMLXS0G+DJyZs=
   dependencies:
     camel-case "^1.1.1"
     upper-case-first "^1.1.0"
@@ -806,122 +777,76 @@ pascal-case@^1.1.0:
 path-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/path-case/-/path-case-1.1.2.tgz#50ce6ba0d3bed3dd0b5c2a9c4553697434409514"
+  integrity sha1-UM5roNO+090LXCqcRVNpdDRAlRQ=
   dependencies:
     sentence-case "^1.1.2"
 
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-proxy-agent@3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-3.1.0.tgz#3cf86ee911c94874de4359f37efd9de25157c113"
-  integrity sha512-IkbZL4ClW3wwBL/ABFD2zJ8iP84CY0uKMvBPk/OceQe/cEjrxzN1pMHsLwhbzUoRhG9QbSxYC+Z7LBkTiBNvrA==
-  dependencies:
-    agent-base "^4.2.0"
-    debug "^3.1.0"
-    http-proxy-agent "^2.1.0"
-    https-proxy-agent "^2.2.1"
-    lru-cache "^4.1.2"
-    pac-proxy-agent "^3.0.0"
+proxy-agent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-4.0.1.tgz#326c3250776c7044cd19655ccbfadf2e065a045c"
+  integrity sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==
+  dependencies:
+    agent-base "^6.0.0"
+    debug "4"
+    http-proxy-agent "^4.0.0"
+    https-proxy-agent "^5.0.0"
+    lru-cache "^5.1.1"
+    pac-proxy-agent "^4.1.0"
     proxy-from-env "^1.0.0"
-    socks-proxy-agent "^4.0.1"
+    socks-proxy-agent "^5.0.0"
 
-proxy-from-env@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
-  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
+proxy-from-env@^1.0.0, proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
-pseudomap@^1.0.1, pseudomap@^1.0.2:
+pseudomap@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+psl@^1.1.28:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
+  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+
+punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@^6.9.4:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
-  integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
+  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+  dependencies:
+    side-channel "^1.0.4"
 
 raw-body@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.1.tgz#30ac82f98bb5ae8c152e67149dac8d55153b168c"
+  integrity sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==
   dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
+    bytes "3.1.0"
+    http-errors "1.7.3"
+    iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
 readable-stream@1.1.x:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
 readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -931,29 +856,28 @@ readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-request-promise-core@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
+request-promise-core@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
+  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
   dependencies:
-    lodash "^4.13.1"
+    lodash "^4.17.19"
 
 request-promise-native@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
+  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
   dependencies:
-    request-promise-core "1.1.1"
-    stealthy-require "^1.1.0"
-    tough-cookie ">=2.3.3"
+    request-promise-core "1.1.4"
+    stealthy-require "^1.1.1"
+    tough-cookie "^2.3.3"
 
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-
-rest-facade@^1.12.0:
+rest-facade@^1.13.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/rest-facade/-/rest-facade-1.13.0.tgz#ce2680b9b1c90d6a93799c7c68982fba47e251e2"
   integrity sha512-0tVvvP+xUtl1LxsxuDBioj7hEWBFS/cpdxpxguuVbRj9GaZySx/E1le+awmT1xP3RHdwcaoC8ud3yQ5IqnmM7A==
@@ -969,103 +893,101 @@ retry@^0.12.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
 
-safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-"semver@2 || 3 || 4 || 5":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
 
 sentence-case@^1.1.1, sentence-case@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-1.1.3.tgz#8034aafc2145772d3abe1509aa42c9e1042dc139"
+  integrity sha1-gDSq/CFFdy06vhUJqkLJ4QQtwTk=
   dependencies:
     lower-case "^1.1.1"
 
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
 
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
 
-smart-buffer@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
-  integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==
+smart-buffer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
+  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
 
 snake-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-1.1.2.tgz#0c2f25e305158d9a18d3d977066187fef8a5a66a"
+  integrity sha1-DC8l4wUVjZoY09l3BmGH/vilpmo=
   dependencies:
     sentence-case "^1.1.2"
 
-socks-proxy-agent@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
-  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
+socks-proxy-agent@5, socks-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60"
+  integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==
   dependencies:
-    agent-base "~4.2.1"
-    socks "~2.3.2"
+    agent-base "6"
+    debug "4"
+    socks "^2.3.3"
 
-socks@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.2.tgz#ade388e9e6d87fdb11649c15746c578922a5883e"
-  integrity sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==
+socks@^2.3.3:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
+  integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
   dependencies:
     ip "^1.1.5"
-    smart-buffer "4.0.2"
-
-source-map@~0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
-  dependencies:
-    spdx-license-ids "^1.0.2"
-
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+    smart-buffer "^4.1.0"
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-"statuses@>= 1.3.1 < 2":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+"statuses@>= 1.5.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-stealthy-require@^1.1.0:
+stealthy-require@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
   dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
 
 string_decoder@^1.1.1:
   version "1.3.0"
@@ -1077,32 +999,22 @@ string_decoder@^1.1.1:
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
   dependencies:
-    ansi-regex "^2.0.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  dependencies:
-    is-utf8 "^0.2.0"
+    ansi-regex "^5.0.0"
 
 superagent-proxy@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/superagent-proxy/-/superagent-proxy-2.0.0.tgz#9f57515cd660e2e9ce55c0e6bd70f92eb07c3ee0"
-  integrity sha512-TktJma5jPdiH1BNN+reF/RMW3b8aBTCV7KlLFV0uYcREgNf3pvo7Rdt564OcFHwkGb3mYEhHuWPBhSbOwiNaYw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/superagent-proxy/-/superagent-proxy-2.1.0.tgz#34e91f9024fbace95f0a35c50c69edf2a0d331e2"
+  integrity sha512-DnarpKN6Xn8e3pYlFV4Yvsj9yxLY4q5FIsUe5JvN7vjzP+YCfzXv03dTkZSD2yzrSadsNYHf0IgOUJwKjX457A==
   dependencies:
     debug "^3.1.0"
-    proxy-agent "3"
+    proxy-agent "^4.0.0"
 
 superagent@^5.1.1:
   version "5.3.1"
@@ -1124,112 +1036,124 @@ superagent@^5.1.1:
 swap-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-1.1.2.tgz#c39203a4587385fad3c850a0bd1bcafa081974e3"
+  integrity sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=
   dependencies:
     lower-case "^1.1.1"
     upper-case "^1.1.1"
 
-thunkify@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d"
-
 title-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/title-case/-/title-case-1.1.2.tgz#fae4a6ae546bfa22d083a0eea910a40d12ed4f5a"
+  integrity sha1-+uSmrlRr+iLQg6DuqRCkDRLtT1o=
   dependencies:
     sentence-case "^1.1.1"
     upper-case "^1.0.3"
 
-tough-cookie@>=2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+tough-cookie@^2.3.3:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
-    punycode "^1.4.1"
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tslib@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
+  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 unpipe@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
 upper-case-first@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-1.1.2.tgz#5d79bedcff14419518fd2edb0a0507c9b6859115"
+  integrity sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=
   dependencies:
     upper-case "^1.1.1"
 
 upper-case@^1.0.3, upper-case@^1.1.0, upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
 
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-  dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
-
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-
-window-size@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
-
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
 
 xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
+  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
 
-y18n@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
-  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
-yallist@^2.0.0, yallist@^2.1.2:
+yallist@^2.0.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-
-yargs-parser@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
-  dependencies:
-    camelcase "^3.0.0"
-    lodash.assign "^4.0.6"
-
-yargs@^4.7.1:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
-  dependencies:
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    lodash.assign "^4.0.3"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
+
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@^20.2.2:
+  version "20.2.7"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
+  integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
+
+yargs@^16.0.3:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.1"
-    which-module "^1.0.0"
-    window-size "^0.2.0"
-    y18n "^3.2.1"
-    yargs-parser "^2.4.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"

From 2b3b24fef01fabbee5e5de8a7b90f2703d2d6203 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 11 May 2021 11:53:45 -0400
Subject: [PATCH 207/553] refactor(Transform fields): Move componentDidUpdate,
 rename methods.

---
 .../components/transform/NormalizeField.js    | 30 +++++++++----------
 .../transform/ReplaceFileFromString.js        | 12 ++++----
 .../transform/ReplaceFileFromVersion.js       | 12 ++++----
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 8418d4c07..40dd38fef 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -52,36 +52,40 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     this.state = extractStateFields(props.transformation)
   }
 
+  componentDidMount () {
+    this._updateErrors()
+  }
+
   _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
-    this.updateState({fieldName: fieldOption.value})
+    this._updateState({fieldName: fieldOption.value})
   }
 
   _onChangeCapitalize = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.updateState({capitalize: evt.target.checked})
+    this._updateState({capitalize: evt.target.checked})
   }
 
   _onChangeCapitalizationExceptions = (values: Array<{value: string}>) => {
-    this.updateState({capitalizationExceptions: values.map(v => v.value)})
+    this._updateState({capitalizationExceptions: values.map(v => v.value)})
   }
 
   _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this.updateState({performSubstitutions: evt.target.checked})
+    this._updateState({performSubstitutions: evt.target.checked})
   }
 
   _onChangeSubstitution = (substitution: Substitution, index: number) => {
     const newSubstitutions = [].concat(this.state.substitutions)
     newSubstitutions[index] = substitution
-    this.updateState({substitutions: newSubstitutions})
+    this._updateState({substitutions: newSubstitutions})
   }
 
   _onRemoveSubstitution = (index: number) => {
     const newSubstitutions = [].concat(this.state.substitutions)
     newSubstitutions.splice(index, 1)
-    this.updateState({substitutions: newSubstitutions})
+    this._updateState({substitutions: newSubstitutions})
   }
 
   _onNewSubstitution = () => {
-    this.updateState({substitutions: [...[].concat(this.state.substitutions), {
+    this._updateState({substitutions: [...[].concat(this.state.substitutions), {
       pattern: 'Text to find',
       replacement: 'Replacement'
     }]})
@@ -92,10 +96,10 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   }
 
   _onRevertTransformationSettings = () => {
-    this.updateState(extractStateFields(this.props.transformation))
+    this._updateState(extractStateFields(this.props.transformation))
   }
 
-  getValidationErrors (fields: NormalizeFieldFields): Array<string> {
+  _getValidationErrors (fields: NormalizeFieldFields): Array<string> {
     const issues = []
     const { fieldName, performSubstitutions, substitutions } = fields
 
@@ -126,7 +130,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   _updateErrors = (fields?: NormalizeFieldFields) => {
     const { onValidationErrors } = this.props
     if (typeof onValidationErrors === 'function') {
-      onValidationErrors(this.getValidationErrors(fields || this.state))
+      onValidationErrors(this._getValidationErrors(fields || this.state))
     }
   }
 
@@ -134,7 +138,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
    * Update the component editing state
    * and perform and notify of validation checks.
    */
-  updateState = (partialState: any) => {
+  _updateState = (partialState: any) => {
     const newState = {
       ...this.state,
       ...partialState
@@ -143,10 +147,6 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     this._updateErrors(newState)
   }
 
-  componentDidMount () {
-    this._updateErrors()
-  }
-
   render () {
     const { transformation } = this.props
     const {
diff --git a/lib/manager/components/transform/ReplaceFileFromString.js b/lib/manager/components/transform/ReplaceFileFromString.js
index 0e7740993..2eeb1a3ab 100644
--- a/lib/manager/components/transform/ReplaceFileFromString.js
+++ b/lib/manager/components/transform/ReplaceFileFromString.js
@@ -15,6 +15,10 @@ export default class ReplaceFileFromString extends Component<TransformProps<Repl
     this.state = {csvData: props.transformation.csvData}
   }
 
+  componentDidMount () {
+    this._updateErrors()
+  }
+
   _onChangeCsvData = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     const newState = {csvData: evt.target.value}
     this.setState(newState)
@@ -26,7 +30,7 @@ export default class ReplaceFileFromString extends Component<TransformProps<Repl
     this.props.onSave({csvData}, this.props.index)
   }
 
-  getValidationErrors (fields: ReplaceFileFromStringFields): Array<string> {
+  _getValidationErrors (fields: ReplaceFileFromStringFields): Array<string> {
     const issues = []
     const { csvData } = fields
 
@@ -44,14 +48,10 @@ export default class ReplaceFileFromString extends Component<TransformProps<Repl
   _updateErrors = (fields?: ReplaceFileFromStringFields) => {
     const { onValidationErrors } = this.props
     if (typeof onValidationErrors === 'function') {
-      onValidationErrors(this.getValidationErrors(fields || this.state))
+      onValidationErrors(this._getValidationErrors(fields || this.state))
     }
   }
 
-  componentDidMount () {
-    this._updateErrors()
-  }
-
   render () {
     const {transformation} = this.props
     const {csvData} = this.state
diff --git a/lib/manager/components/transform/ReplaceFileFromVersion.js b/lib/manager/components/transform/ReplaceFileFromVersion.js
index 9f64f7946..6cd12916b 100644
--- a/lib/manager/components/transform/ReplaceFileFromVersion.js
+++ b/lib/manager/components/transform/ReplaceFileFromVersion.js
@@ -10,6 +10,10 @@ import type { TransformProps } from './Transform'
  * Component that renders fields for ReplaceFileFromVersionTransformation.
  */
 export default class ReplaceFileFromVersion extends Component<TransformProps<{}>, {}> {
+  componentDidMount () {
+    this._updateErrors()
+  }
+
   _onSelectVersion = (versionIndex: number) => {
     const {feedSource, onSave} = this.props
     if (feedSource.feedVersions) {
@@ -20,7 +24,7 @@ export default class ReplaceFileFromVersion extends Component<TransformProps<{}>
     }
   }
 
-  getValidationErrors (): Array<string> {
+  _getValidationErrors (): Array<string> {
     const { feedSource, transformation } = this.props
     // Get selected version (if applicable).
     const version = feedSource.feedVersions &&
@@ -42,14 +46,10 @@ export default class ReplaceFileFromVersion extends Component<TransformProps<{}>
   _updateErrors = () => {
     const { onValidationErrors } = this.props
     if (typeof onValidationErrors === 'function') {
-      onValidationErrors(this.getValidationErrors())
+      onValidationErrors(this._getValidationErrors())
     }
   }
 
-  componentDidMount () {
-    this._updateErrors()
-  }
-
   render () {
     const {feedSource, transformation} = this.props
     // Get selected version (if applicable).

From acd651a59c1ef0ae9318cecd0f084f0f9e4a6024 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Tue, 11 May 2021 16:54:29 +0100
Subject: [PATCH 208/553] feat(gtfs.yml): Added fields to feed_info.txt

Added defult_lang, feed_contact_email, feed_contact_url

#663
---
 gtfs.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gtfs.yml b/gtfs.yml
index ffbdfe6cb..b708b20b1 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -17,12 +17,16 @@
     required: true
     inputType: URL
     columnWidth: 12
-    helpContent: "The feed_publisher_url field contains the URL of the feed publishing organization's website. (This may be the same as one of the agency_url values in agency.txt.) The value must be a fully qualified URL that includes http:// or https://, and any special characters in the URL must be correctly escaped. See http://www.w3.org/Addressing/URL/4_URI_Recommentations.html for a description of how to create fully qualified URL values."
   - name: "feed_lang"
     required: true
     inputType: LANGUAGE
     columnWidth: 12
     helpContent: "The feed_lang field contains a IETF BCP 47 language code specifying the default language used for the text in this feed. This setting helps GTFS consumers choose capitalization rules and other language-specific settings for the feed. For an introduction to IETF BCP 47, please refer to http://www.rfc-editor.org/rfc/bcp/bcp47.txt and http://www.w3.org/International/articles/language-tags/."
+  - name: "default_lang"
+    required: false
+    inputType: LANGUAGE
+    columnWidth: 12
+    helpContent: "Defines the language used when the data consumer doesn’t know the language of the rider. It's often defined as en, English."
   - name: "feed_start_date"
     required: false
     inputType: DATE
@@ -67,6 +71,16 @@
     inputType: TEXT
     columnWidth: 12
     helpContent: "The feed publisher can specify a string here that indicates the current version of their GTFS feed. GTFS-consuming applications can display this value to help feed publishers determine whether the latest version of their feed has been incorporated."
+  - name: "feed_contact_email"
+    required: false
+    inputType: EMAIL
+    columnWidth: 12
+    helpContent: "Email address for communication regarding the GTFS dataset and data publishing practices."
+  - name: "feed_contact_url"
+    required: false
+    inputType: URL
+    columnWidth: 12
+    helpContent: "URL for contact information, a web-form, support desk, or other tools for communication regarding the GTFS dataset and data publishing practices."
 
 - id: agency
   name: agency.txt

From 67a1f9562a5d38d0be0c94feef136f5b3c0fbfff Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 11 May 2021 15:50:15 -0400
Subject: [PATCH 209/553] refactor(FeedVersionDetails): Move MTC-specific
 toolbar under single if condition.

---
 .../components/version/FeedVersionDetails.js      | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index b79f16d10..ea0c4ae27 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -119,13 +119,8 @@ export default class FeedVersionDetails extends Component<Props> {
             Feed validity dates
           </span>
         </h4>
-        <ButtonToolbar className='pull-right' style={{ marginTop: '2px' }}>
-          {/*
-          Only show merge feeds button if the feed starts in the future.
-          FIXME: uncomment out the below to prevent merges with non-future feeds.
-          moment(summary.startDate).isAfter(moment().startOf('day')) &&
-          */}
-          {isExtensionEnabled('mtc') &&
+        {isExtensionEnabled('mtc') &&
+          <ButtonToolbar className='pull-right' style={{ marginTop: '2px' }}>
             <VersionSelectorDropdown
               dropdownProps={{
                 id: 'merge-versions-dropdown',
@@ -137,8 +132,6 @@ export default class FeedVersionDetails extends Component<Props> {
               version={version}
               versions={feedSource.feedVersions}
             />
-          }
-          {isExtensionEnabled('mtc') &&
             <Button
               disabled={
                 !gtfsPlusValidation ||
@@ -160,8 +153,8 @@ export default class FeedVersionDetails extends Component<Props> {
                   : <span>Publish to MTC</span>
               }
             </Button>
-          }
-        </ButtonToolbar>
+          </ButtonToolbar>
+        }
         {(hasBlockingIssue || hasGtfsPlusBlockingIssue) &&
           isExtensionEnabled('mtc') &&
           <div

From 8f3a4209bc4b7659648cf019274c4ee7a6d01346 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 May 2021 21:04:19 +0000
Subject: [PATCH 210/553] build(deps): bump hosted-git-info from 2.8.8 to 2.8.9

Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0c107ba4f..cf9cc851d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6295,9 +6295,9 @@ hook-std@^2.0.0:
   integrity sha512-zZ6T5WcuBMIUVh49iPQS9t977t7C0l7OtHrpeMb5uk48JdflRX0NSFvCekfYNmGQETnLq9W/isMyHl69kxGi8g==
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1, hosted-git-info@^2.8.8:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hosted-git-info@^3.0.0, hosted-git-info@^3.0.6:
   version "3.0.7"

From 27b8ab4507c089cdb0effbd088b15c6427a97add Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 13 May 2021 15:12:49 -0400
Subject: [PATCH 211/553] refactor: suggest changes for #649

---
 i18n/english.yml                                   |  3 +++
 .../components/transform/FeedTransformation.js     |  4 ++--
 lib/manager/components/transform/NormalizeField.js |  6 +++---
 .../components/transform/ReplaceFileFromString.js  |  3 +--
 .../components/transform/ReplaceFileFromVersion.js |  2 +-
 lib/manager/components/transform/Transform.js      | 14 --------------
 lib/manager/util/transform.js                      | 14 ++++++++++++++
 lib/types/index.js                                 |  8 ++++++++
 8 files changed, 32 insertions(+), 22 deletions(-)
 delete mode 100644 lib/manager/components/transform/Transform.js

diff --git a/i18n/english.yml b/i18n/english.yml
index e9d7ee0c4..1e48eddef 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -245,12 +245,15 @@ components:
       label: Delete records from %tablePlaceholder%
       name: Delete records transformation
     NormalizeFieldTransformation:
+      filePlaceholder: Choose file/table to normalize
       label: Normalize field
       name: Normalize field transformation
     ReplaceFileFromStringTransformation:
+      filePlaceholder: Choose the file/table to replace
       label: Replace %tablePlaceholder% from %filePlaceholder%
       name: Replace file from string transformation
     ReplaceFileFromVersionTransformation:
+      filePlaceholder: Choose the file/table to replace
       label: Replace %tablePlaceholder% from %versionPlaceholder%
       name: Replace file from version transformation
   FeedVersionNavigator:
diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 843d611bc..d3ca2e062 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -6,7 +6,7 @@ import {Button} from 'react-bootstrap'
 import Select from 'react-select'
 
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
-import {getTransformationName} from '../../util/transform'
+import {getTransformationName, getTransformationPlaceholder} from '../../util/transform'
 import NormalizeField from './NormalizeField'
 import ReplaceFileFromString from './ReplaceFileFromString'
 import ReplaceFileFromVersion from './ReplaceFileFromVersion'
@@ -114,7 +114,7 @@ export default class FeedTransformation extends Component<Props, {errors: Array<
           <Select
             style={{margin: '10px 0px', width: '230px'}}
             clearable={false}
-            placeholder='Choose the file/table to replace'
+            placeholder={getTransformationPlaceholder(transformationType, 'filePlaceholder')}
             options={tables.map(table => ({value: table.name.split('.txt')[0], label: table.name}))}
             value={transformation.table}
             onChange={this._onSelectTable} />
diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 40dd38fef..76bcd0575 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -19,9 +19,9 @@ import SubstitutionRow from './SubstitutionRow'
 import type {
   NormalizeFieldFields,
   ReactSelectOption,
-  Substitution
+  Substitution,
+  TransformProps
 } from '../../../types'
-import type { TransformProps } from './Transform'
 
 /**
  * Extract just the subset of fields to build the state variable.
@@ -44,7 +44,7 @@ function extractStateFields (transformation: NormalizeFieldFields): NormalizeFie
 }
 
 /**
- * Component that renders input fields for the NoramlizeFieldTransformation.
+ * Component that renders input fields for the NormalizeFieldTransformation.
  */
 export default class NormalizeField extends Component<TransformProps<NormalizeFieldFields>, NormalizeFieldFields> {
   constructor (props: TransformProps<NormalizeFieldFields>) {
diff --git a/lib/manager/components/transform/ReplaceFileFromString.js b/lib/manager/components/transform/ReplaceFileFromString.js
index 2eeb1a3ab..1240640f5 100644
--- a/lib/manager/components/transform/ReplaceFileFromString.js
+++ b/lib/manager/components/transform/ReplaceFileFromString.js
@@ -3,8 +3,7 @@
 import React, { Component } from 'react'
 import { Button } from 'react-bootstrap'
 
-import type { ReplaceFileFromStringFields } from '../../../types'
-import type { TransformProps } from './Transform'
+import type { ReplaceFileFromStringFields, TransformProps } from '../../../types'
 
 /**
  * Component that renders fields for ReplaceFileFromStringTransformation.
diff --git a/lib/manager/components/transform/ReplaceFileFromVersion.js b/lib/manager/components/transform/ReplaceFileFromVersion.js
index 6cd12916b..277938baf 100644
--- a/lib/manager/components/transform/ReplaceFileFromVersion.js
+++ b/lib/manager/components/transform/ReplaceFileFromVersion.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react'
 
 import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
 
-import type { TransformProps } from './Transform'
+import type { TransformProps } from '../../../types'
 
 /**
  * Component that renders fields for ReplaceFileFromVersionTransformation.
diff --git a/lib/manager/components/transform/Transform.js b/lib/manager/components/transform/Transform.js
deleted file mode 100644
index 11e79ebe6..000000000
--- a/lib/manager/components/transform/Transform.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// @flow
-
-import type {
-  Feed,
-  FeedTransformationBase
-} from '../../../types'
-
-export type TransformProps<StateType> = {
-  feedSource: Feed,
-  index: number,
-  onSave: (StateType, number) => void,
-  onValidationErrors: (Array<string>) => void,
-  transformation: FeedTransformationBase & StateType
-}
diff --git a/lib/manager/util/transform.js b/lib/manager/util/transform.js
index a765dac55..a15aa9de3 100644
--- a/lib/manager/util/transform.js
+++ b/lib/manager/util/transform.js
@@ -54,3 +54,17 @@ export function getTransformationName (
   })
   return label
 }
+
+export function getTransformationPlaceholder (
+  type: string,
+  placeholderId: string
+) {
+  // Get the base component messages.
+  const messages = getComponentMessages('FeedTransformationDescriptions')
+  const messageId = `${type}.${placeholderId}`
+  const message = messages(messageId)
+  // If message does not exist for component, fall back on general message.
+  return message.indexOf(messageId) !== -1
+    ? messages(`general.${placeholderId}`)
+    : message
+}
diff --git a/lib/types/index.js b/lib/types/index.js
index b2ed5f2e7..719f5c92f 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -319,6 +319,14 @@ export type FeedTransformationBase = {
   table: ?string
 }
 
+export type TransformProps<StateType> = {
+  feedSource: Feed,
+  index: number,
+  onSave: (StateType, number) => void,
+  onValidationErrors: (Array<string>) => void,
+  transformation: FeedTransformationBase & StateType
+}
+
 export type DeleteRecordsTransformation =
   & {typeName: 'DeleteRecordsTransformation'}
   & FeedTransformationBase

From 5777b32582014149b7cef5e35d4dc72770e4fd40 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 13 May 2021 15:59:15 -0400
Subject: [PATCH 212/553] refactor: more tweaks for #649

---
 .../components/transform/NormalizeField.js    | 20 ++++++++++++-------
 .../transform/ReplaceFileFromString.js        |  4 +---
 .../transform/ReplaceFileFromVersion.js       |  4 +---
 .../components/transform/SubstitutionRow.js   |  8 +++++++-
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 76bcd0575..87f4358b6 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -129,9 +129,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
    */
   _updateErrors = (fields?: NormalizeFieldFields) => {
     const { onValidationErrors } = this.props
-    if (typeof onValidationErrors === 'function') {
-      onValidationErrors(this._getValidationErrors(fields || this.state))
-    }
+    onValidationErrors(this._getValidationErrors(fields || this.state))
   }
 
   /**
@@ -201,15 +199,18 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
               checked={capitalize}
               onChange={this._onChangeCapitalize}
             >
-              Capitalize field value
+              Enforce title case (e.g., "Main Street and First Avenue")
             </Checkbox>
             <span style={{display: 'block'}}>
-              Exceptions:
+              <label htmlFor='capitalizationExceptionsList'>
+                Capitalization exceptions (e.g., "via" or "MLK")
+              </label>
               <FormGroup>
                 <Select.Creatable
                   arrowRenderer={null}
                   clearable={false}
                   multi
+                  id='capitalizationExceptionsList'
                   onChange={this._onChangeCapitalizationExceptions}
                   placeholder='Enter exceptions then press enter'
                   value={capitalizationExceptionList}
@@ -222,7 +223,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
               checked={performSubstitutions}
               onChange={this._onChangePerformSubstitutions}
             >
-              Perform the following substitutions:
+              Perform the following substitutions
             </Checkbox>
             <FormGroup>
               <Table condensed>
@@ -254,6 +255,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
                 <tbody>
                   {substitutions && substitutions.map((s, i) => (
                     <SubstitutionRow
+                      disabled={!performSubstitutions}
                       index={i}
                       key={i}
                       onChange={this._onChangeSubstitution}
@@ -263,7 +265,11 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
                   ))}
                   <tr>
                     <td colSpan='4'>
-                      <Button bsSize='xsmall' onClick={this._onNewSubstitution}>
+                      <Button
+                        bsSize='xsmall'
+                        disabled={!performSubstitutions}
+                        onClick={this._onNewSubstitution}
+                      >
                         <Icon type='plus' /> Add
                       </Button>
                     </td>
diff --git a/lib/manager/components/transform/ReplaceFileFromString.js b/lib/manager/components/transform/ReplaceFileFromString.js
index 1240640f5..d7f9bbd92 100644
--- a/lib/manager/components/transform/ReplaceFileFromString.js
+++ b/lib/manager/components/transform/ReplaceFileFromString.js
@@ -46,9 +46,7 @@ export default class ReplaceFileFromString extends Component<TransformProps<Repl
    */
   _updateErrors = (fields?: ReplaceFileFromStringFields) => {
     const { onValidationErrors } = this.props
-    if (typeof onValidationErrors === 'function') {
-      onValidationErrors(this._getValidationErrors(fields || this.state))
-    }
+    onValidationErrors(this._getValidationErrors(fields || this.state))
   }
 
   render () {
diff --git a/lib/manager/components/transform/ReplaceFileFromVersion.js b/lib/manager/components/transform/ReplaceFileFromVersion.js
index 277938baf..ebfaaea16 100644
--- a/lib/manager/components/transform/ReplaceFileFromVersion.js
+++ b/lib/manager/components/transform/ReplaceFileFromVersion.js
@@ -45,9 +45,7 @@ export default class ReplaceFileFromVersion extends Component<TransformProps<{}>
    */
   _updateErrors = () => {
     const { onValidationErrors } = this.props
-    if (typeof onValidationErrors === 'function') {
-      onValidationErrors(this._getValidationErrors())
-    }
+    onValidationErrors(this._getValidationErrors())
   }
 
   render () {
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index 42d132e90..f69daf315 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -9,6 +9,7 @@ import type {
 } from '../../../types'
 
 type SubstitutionRowProps = {
+  disabled: boolean,
   index: number,
   onChange: (Substitution, number) => void,
   onRemove: number => void,
@@ -50,7 +51,7 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
   }
 
   render () {
-    const { substitution } = this.props
+    const { disabled, substitution } = this.props
     const { description, normalizeSpace, pattern, replacement } = substitution
     const inputStyle = { height: 'unset', padding: '2px' }
     const inputGroupStyle = { padding: 0 }
@@ -61,6 +62,7 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
         <td>
           <InputGroup style={inputGroupStyle}>
             <FormControl
+              disabled={disabled}
               onChange={this._onEditPattern}
               placeholder='Text (regex) to find'
               style={inputStyle}
@@ -80,6 +82,7 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
         <td colSpan='2'>
           <InputGroup style={inputGroupStyle}>
             <FormControl
+              disabled={disabled}
               onChange={this._onEditReplacement}
               placeholder='<blank>'
               style={inputStyle}
@@ -88,6 +91,7 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
             <InputGroup.Addon style={{ padding: '0 6px' }}>
               <input
                 ariaLabel='Normalize space'
+                disabled={disabled}
                 checked={normalizeSpace}
                 onChange={this._onEditNormalizeSpace}
                 style={{ padding: '0 6px' }}
@@ -98,6 +102,7 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
         </td>
         <td>
           <FormControl
+            disabled={disabled}
             onChange={this._onEditDescription}
             placeholder='Optional description'
             style={inputStyle}
@@ -107,6 +112,7 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
         <td>
           <Button
             bsSize='xsmall'
+            disabled={disabled}
             onClick={this._onRemove}
             title='Remove this substitution'
           >

From 0c0ffc371daab23acc93e5d855960f0319f7bd5a Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Thu, 13 May 2021 15:46:03 -0700
Subject: [PATCH 213/553] refactor: address PR review comments

See https://github.com/ibi-group/datatools-ui/pull/637
---
 lib/manager/actions/deployments.js            |  6 +++++-
 ...rsionTableRow.js => DeploymentTableRow.js} | 20 ++++++++-----------
 .../deployment/DeploymentVersionsTable.js     |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename lib/manager/components/deployment/{FeedVersionTableRow.js => DeploymentTableRow.js} (94%)

diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 846d00f45..6105e764d 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -215,11 +215,15 @@ export function togglePinFeedVersion (
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     let pinnedfeedVersionIds
-    if (deployment.pinnedfeedVersionIds.indexOf(version.id) > -1) {
+    if (deployment.pinnedfeedVersionIds.includes(version.id)) {
+      // The feed version already exists in list of pinned feed versions.
+      // Therefore, the toggle outcome is to unpin the feed version.
       pinnedfeedVersionIds = deployment.pinnedfeedVersionIds.filter(
         id => id !== version.id
       )
     } else {
+      // The feed version doesn't yet exist in list of pinned feed versions.
+      // Therefore, the toggle outcome is to pin the feed version.
       pinnedfeedVersionIds = [...deployment.pinnedfeedVersionIds, version.id]
     }
     dispatch(updateDeployment(deployment, {pinnedfeedVersionIds}))
diff --git a/lib/manager/components/deployment/FeedVersionTableRow.js b/lib/manager/components/deployment/DeploymentTableRow.js
similarity index 94%
rename from lib/manager/components/deployment/FeedVersionTableRow.js
rename to lib/manager/components/deployment/DeploymentTableRow.js
index 21c8bbaff..af6ed8a66 100644
--- a/lib/manager/components/deployment/FeedVersionTableRow.js
+++ b/lib/manager/components/deployment/DeploymentTableRow.js
@@ -55,7 +55,7 @@ type ConnectedRowProps = RowProps & {
   userCanRemoveVersion: boolean
 }
 
-class FeedVersionTableRow extends Component<ConnectedRowProps> {
+class DeploymentTableRow extends Component<ConnectedRowProps> {
   _decrementVersion = () => {
     const {deployment, feedSource, updateVersionForFeedSource, version} = this.props
     const {previousVersionId: id} = version
@@ -120,7 +120,7 @@ class FeedVersionTableRow extends Component<ConnectedRowProps> {
     const expired = versionHasExpired(version)
     const future = versionHasNotBegun(version)
     return (
-      <tr key={feedSource.id}>
+      <tr>
         <td>
           <Link to={`/feed/${feedSource.id}`}>{feedSource.name}</Link>
           {feedVersionPinned && (
@@ -240,19 +240,15 @@ const mapStateToProps = (state: AppState, ownProps: RowProps) => {
       feedSource.id,
       'manage-feed'
     )
-  const userCanDecrementVersion = userCanEditDeployment &&
-    !feedVersionPinned &&
-    version.previousVersionId
-
-  const userCanIncrementVersion = userCanEditDeployment &&
-    !feedVersionPinned &&
-    version.nextVersionId
+  const isVersionEditable = userCanEditDeployment && !feedVersionPinned
+  const userCanDecrementVersion = isVersionEditable && version.previousVersionId
+  const userCanIncrementVersion = isVersionEditable && version.nextVersionId
 
   // Cannot remove feed source if the deployment is feed-specific or it is
   // pinned
-  const userCanRemoveVersion = userCanEditDeployment &&
-    !feedVersionPinned &&
+  const userCanRemoveVersion = isVersionEditable &&
     deployment.feedSourceId !== feedSource.id
+
   return {
     feedVersionPinned,
     userCanDecrementVersion,
@@ -271,4 +267,4 @@ const mapDispatchToProps = {
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(FeedVersionTableRow)
+)(DeploymentTableRow)
diff --git a/lib/manager/components/deployment/DeploymentVersionsTable.js b/lib/manager/components/deployment/DeploymentVersionsTable.js
index f0523bbd9..77026aa8b 100644
--- a/lib/manager/components/deployment/DeploymentVersionsTable.js
+++ b/lib/manager/components/deployment/DeploymentVersionsTable.js
@@ -4,7 +4,7 @@ import React, {Component} from 'react'
 import {Table} from 'react-bootstrap'
 
 import {getComponentMessages} from '../../../common/util/config'
-import FeedVersionTableRow from './FeedVersionTableRow'
+import DeploymentTableRow from './DeploymentTableRow'
 
 import type {Deployment, Project, SummarizedFeedVersion} from '../../../types'
 
@@ -42,7 +42,7 @@ export default class DeploymentVersionsTable extends Component<Props> {
         <tbody>
           {versions.map((version) => {
             return (
-              <FeedVersionTableRow
+              <DeploymentTableRow
                 feedSource={version.feedSource}
                 version={version}
                 project={project}

From c87759946e6f4063138a115f870aa16d28c5e94a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 14 May 2021 16:54:16 -0400
Subject: [PATCH 214/553] refactor(NormalizeField): Remove save/revert, persist
 changes onblur of substitution fields.

---
 .../components/transform/NormalizeField.js    | 89 ++++-------------
 .../components/transform/SubstitutionRow.js   | 97 +++++++++++++++----
 2 files changed, 95 insertions(+), 91 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 87f4358b6..7f87d99b9 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -1,7 +1,6 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
-import { isEqual } from 'lodash'
 import React, { Component } from 'react'
 import {
   Button,
@@ -23,82 +22,49 @@ import type {
   TransformProps
 } from '../../../types'
 
-/**
- * Extract just the subset of fields to build the state variable.
- */
-function extractStateFields (transformation: NormalizeFieldFields): NormalizeFieldFields {
-  const {
-    capitalizationExceptions,
-    capitalize,
-    fieldName,
-    performSubstitutions,
-    substitutions
-  } = transformation
-  return {
-    capitalizationExceptions: capitalizationExceptions || [],
-    capitalize,
-    fieldName: fieldName || '',
-    performSubstitutions,
-    substitutions: substitutions || []
-  }
-}
-
 /**
  * Component that renders input fields for the NormalizeFieldTransformation.
  */
 export default class NormalizeField extends Component<TransformProps<NormalizeFieldFields>, NormalizeFieldFields> {
-  constructor (props: TransformProps<NormalizeFieldFields>) {
-    super(props)
-    this.state = extractStateFields(props.transformation)
-  }
-
   componentDidMount () {
     this._updateErrors()
   }
 
   _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
-    this._updateState({fieldName: fieldOption.value})
+    this._updateTransformation({fieldName: fieldOption.value})
   }
 
   _onChangeCapitalize = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateState({capitalize: evt.target.checked})
+    this._updateTransformation({capitalize: evt.target.checked})
   }
 
   _onChangeCapitalizationExceptions = (values: Array<{value: string}>) => {
-    this._updateState({capitalizationExceptions: values.map(v => v.value)})
+    this._updateTransformation({capitalizationExceptions: values.map(v => v.value)})
   }
 
   _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateState({performSubstitutions: evt.target.checked})
+    this._updateTransformation({performSubstitutions: evt.target.checked})
   }
 
   _onChangeSubstitution = (substitution: Substitution, index: number) => {
-    const newSubstitutions = [].concat(this.state.substitutions)
+    const newSubstitutions = [].concat(this.props.transformation.substitutions)
     newSubstitutions[index] = substitution
-    this._updateState({substitutions: newSubstitutions})
+    this._updateTransformation({substitutions: newSubstitutions})
   }
 
   _onRemoveSubstitution = (index: number) => {
-    const newSubstitutions = [].concat(this.state.substitutions)
+    const newSubstitutions = [].concat(this.props.transformation.substitutions)
     newSubstitutions.splice(index, 1)
-    this._updateState({substitutions: newSubstitutions})
+    this._updateTransformation({substitutions: newSubstitutions})
   }
 
   _onNewSubstitution = () => {
-    this._updateState({substitutions: [...[].concat(this.state.substitutions), {
+    this._updateTransformation({substitutions: [...[].concat(this.props.transformation.substitutions), {
       pattern: 'Text to find',
       replacement: 'Replacement'
     }]})
   }
 
-  _onSaveTransformationSettings = () => {
-    this.props.onSave(this.state, this.props.index)
-  }
-
-  _onRevertTransformationSettings = () => {
-    this._updateState(extractStateFields(this.props.transformation))
-  }
-
   _getValidationErrors (fields: NormalizeFieldFields): Array<string> {
     const issues = []
     const { fieldName, performSubstitutions, substitutions } = fields
@@ -125,24 +91,24 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
 
   /**
    * Notify containing component of the resulting validation errors if any.
-   * @param fields: The updated state. If not set, the component state will be used.
+   * @param fields: The updated transformation fields. If not set, the initial transformation will be used.
    */
   _updateErrors = (fields?: NormalizeFieldFields) => {
     const { onValidationErrors } = this.props
-    onValidationErrors(this._getValidationErrors(fields || this.state))
+    onValidationErrors(this._getValidationErrors(fields || this.props.transformation))
   }
 
   /**
    * Update the component editing state
    * and perform and notify of validation checks.
    */
-  _updateState = (partialState: any) => {
-    const newState = {
-      ...this.state,
+  _updateTransformation = (partialState: any) => {
+    const newTransformation = {
+      ...this.props.transformation,
       ...partialState
     }
-    this.setState(newState)
-    this._updateErrors(newState)
+    this.props.onSave(newTransformation, this.props.index)
+    this._updateErrors(newTransformation)
   }
 
   render () {
@@ -153,9 +119,8 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
       fieldName,
       performSubstitutions,
       substitutions
-    } = this.state
+    } = transformation
 
-    const inputIsUnchanged = isEqual(this.state, extractStateFields(transformation))
     const capitalizationExceptionList = capitalizationExceptions &&
       capitalizationExceptions.map(s => ({ label: s, value: s }))
 
@@ -199,7 +164,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
               checked={capitalize}
               onChange={this._onChangeCapitalize}
             >
-              Enforce title case (e.g., "Main Street and First Avenue")
+              Enforce title case (e.g., "Main Street And First Avenue")
             </Checkbox>
             <span style={{display: 'block'}}>
               <label htmlFor='capitalizationExceptionsList'>
@@ -279,24 +244,6 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
             </FormGroup>
           </li>
         </ul>
-        <div style={{marginBottom: '10px'}}>
-          <Button
-            bsSize='xsmall'
-            disabled={inputIsUnchanged}
-            onClick={this._onSaveTransformationSettings}
-            style={{marginRight: '5px'}}
-          >
-            Save
-          </Button>
-          <Button
-            bsSize='xsmall'
-            disabled={inputIsUnchanged}
-            onClick={this._onRevertTransformationSettings}
-            style={{marginRight: '5px'}}
-          >
-            Revert
-          </Button>
-        </div>
       </div>
     )
   }
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index f69daf315..b47f7690d 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -1,6 +1,7 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
+import { isEqual } from 'lodash'
 import React, { Component } from 'react'
 import { Button, FormControl, InputGroup } from 'react-bootstrap'
 
@@ -8,7 +9,7 @@ import type {
   Substitution
 } from '../../../types'
 
-type SubstitutionRowProps = {
+type Props = {
   disabled: boolean,
   index: number,
   onChange: (Substitution, number) => void,
@@ -16,43 +17,96 @@ type SubstitutionRowProps = {
   substitution: Substitution
 }
 
+// Hold/update the state for input[type=text] elements when onChange occurs,
+// and notify containers when onBlur occurs to reduce unnecessary
+// network calls to update the substitution object.
+type State = {
+  description: string,
+  pattern: string,
+  replacement: string
+}
+
 // (Encoded) test string to be included to URL to regex test tool (regexr).
 const STRING_FOR_REGEXR_TEST = encodeURIComponent('Route 10 to Bay 1 @ Train Station (10th+West)')
 
+/**
+ * Extract just the subset of fields to build the state variable.
+ */
+function extractStateFields (props: Props): State {
+  const { description = '', pattern, replacement } = props.substitution
+  return {
+    description,
+    pattern,
+    replacement
+  }
+}
+
 /**
  * Renders and lets user edit a substitution.
  */
-export default class SubstitutionRow extends Component<SubstitutionRowProps> {
-  _onEditPattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution({ pattern: evt.target.value })
+export default class SubstitutionRow extends Component<Props, State> {
+  constructor (props: Props) {
+    super(props)
+    this.state = extractStateFields(props)
+  }
+
+  componentDidUpdate (prevProps: Props) {
+    if (
+      prevProps.index !== this.props.index ||
+      !isEqual(prevProps.substitution, this.props.substitution)
+    ) {
+      this.setState(extractStateFields(this.props))
+    }
   }
 
-  _onEditReplacement = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution({ replacement: evt.target.value })
+  _onBlurPattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution('pattern', evt.target.value)
+  }
+
+  _onChangePattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({ pattern: evt.target.value })
+  }
+
+  _onBlurReplacement = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution('replacement', evt.target.value)
+  }
+
+  _onChangeReplacement = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({ replacement: evt.target.value })
   }
 
   _onEditNormalizeSpace = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution({ normalizeSpace: evt.target.checked })
+    this._updateSubtitution('normalizeSpace', evt.target.checked)
+  }
+
+  _onBlurDescription = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this._updateSubtitution('description', evt.target.value)
   }
 
-  _onEditDescription = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution({ description: evt.target.value })
+  _onChangeDescription = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({ description: evt.target.value })
   }
 
   _onRemove = () => this.props.onRemove(this.props.index)
 
-  _updateSubtitution (partialState: any) {
+  _updateSubtitution (field: string, value: string | boolean) {
     const { index, onChange, substitution } = this.props
-    const newSubstitution = {
-      ...substitution,
-      ...partialState
+
+    // Trigger the onChange event
+    // only if the value in the given substitution field was changed.
+    if (value !== substitution[field]) {
+      const newSubstitution = {
+        ...substitution,
+        [field]: value
+      }
+      onChange(newSubstitution, index)
     }
-    onChange(newSubstitution, index)
   }
 
   render () {
     const { disabled, substitution } = this.props
-    const { description, normalizeSpace, pattern, replacement } = substitution
+    const { normalizeSpace } = substitution
+    const { description, pattern, replacement } = this.state
     const inputStyle = { height: 'unset', padding: '2px' }
     const inputGroupStyle = { padding: 0 }
     const regexTestLink = `https://regexr.com/?expression=${encodeURIComponent(pattern)}&text=${STRING_FOR_REGEXR_TEST}`
@@ -63,7 +117,8 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
           <InputGroup style={inputGroupStyle}>
             <FormControl
               disabled={disabled}
-              onChange={this._onEditPattern}
+              onBlur={this._onBlurPattern}
+              onChange={this._onChangePattern}
               placeholder='Text (regex) to find'
               style={inputStyle}
               value={pattern}
@@ -83,14 +138,15 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
           <InputGroup style={inputGroupStyle}>
             <FormControl
               disabled={disabled}
-              onChange={this._onEditReplacement}
+              onBlur={this._onBlurReplacement}
+              onChange={this._onChangeReplacement}
               placeholder='<blank>'
               style={inputStyle}
               value={replacement}
             />
             <InputGroup.Addon style={{ padding: '0 6px' }}>
               <input
-                ariaLabel='Normalize space'
+                aria-label='Normalize space'
                 disabled={disabled}
                 checked={normalizeSpace}
                 onChange={this._onEditNormalizeSpace}
@@ -103,10 +159,11 @@ export default class SubstitutionRow extends Component<SubstitutionRowProps> {
         <td>
           <FormControl
             disabled={disabled}
-            onChange={this._onEditDescription}
+            onBlur={this._onBlurDescription}
+            onChange={this._onChangeDescription}
             placeholder='Optional description'
             style={inputStyle}
-            value={description || ''}
+            value={description}
           />
         </td>
         <td>

From 9ce5bb212895e4024b8cd1ecc5e406577831d084 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 14 May 2021 17:04:11 -0400
Subject: [PATCH 215/553] refactor(NormalizeField): Address React warnings,
 tweak code.

---
 lib/manager/components/transform/NormalizeField.js  | 12 +++++++-----
 lib/manager/components/transform/SubstitutionRow.js |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 7f87d99b9..aa24edc35 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -103,16 +103,17 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
    * and perform and notify of validation checks.
    */
   _updateTransformation = (partialState: any) => {
+    const { index, onSave, transformation } = this.props
     const newTransformation = {
-      ...this.props.transformation,
+      ...transformation,
       ...partialState
     }
-    this.props.onSave(newTransformation, this.props.index)
+    onSave(newTransformation, index)
     this._updateErrors(newTransformation)
   }
 
   render () {
-    const { transformation } = this.props
+    const { index, transformation } = this.props
     const {
       capitalizationExceptions,
       capitalize,
@@ -123,6 +124,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
 
     const capitalizationExceptionList = capitalizationExceptions &&
       capitalizationExceptions.map(s => ({ label: s, value: s }))
+    const capitalizationExceptionListId = `capitalizationExceptionList-${index}`
 
     const normalizeTooltip = (
       <Tooltip id='normalize-space-tooltip'>
@@ -167,15 +169,15 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
               Enforce title case (e.g., "Main Street And First Avenue")
             </Checkbox>
             <span style={{display: 'block'}}>
-              <label htmlFor='capitalizationExceptionsList'>
+              <label htmlFor={capitalizationExceptionListId}>
                 Capitalization exceptions (e.g., "via" or "MLK")
               </label>
               <FormGroup>
                 <Select.Creatable
                   arrowRenderer={null}
                   clearable={false}
+                  id={capitalizationExceptionListId}
                   multi
-                  id='capitalizationExceptionsList'
                   onChange={this._onChangeCapitalizationExceptions}
                   placeholder='Enter exceptions then press enter'
                   value={capitalizationExceptionList}
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index b47f7690d..a054a4aa0 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -33,9 +33,9 @@ const STRING_FOR_REGEXR_TEST = encodeURIComponent('Route 10 to Bay 1 @ Train Sta
  * Extract just the subset of fields to build the state variable.
  */
 function extractStateFields (props: Props): State {
-  const { description = '', pattern, replacement } = props.substitution
+  const { description, pattern, replacement } = props.substitution
   return {
-    description,
+    description: description || '',
     pattern,
     replacement
   }

From 9f10808f1536bc3c6eac246b38ff77106f211e42 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 14 May 2021 18:04:26 -0400
Subject: [PATCH 216/553] refactor(NormalizeField): Remove performSubstitutions
 prop & checkbox.

---
 .../components/transform/NormalizeField.js    | 183 ++++++++----------
 .../components/transform/SubstitutionRow.js   |  17 +-
 lib/types/index.js                            |   1 -
 3 files changed, 85 insertions(+), 116 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index aa24edc35..647c58d9a 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -5,6 +5,7 @@ import React, { Component } from 'react'
 import {
   Button,
   Checkbox,
+  ControlLabel,
   FormGroup,
   OverlayTrigger,
   Table,
@@ -42,10 +43,6 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     this._updateTransformation({capitalizationExceptions: values.map(v => v.value)})
   }
 
-  _onChangePerformSubstitutions = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateTransformation({performSubstitutions: evt.target.checked})
-  }
-
   _onChangeSubstitution = (substitution: Substitution, index: number) => {
     const newSubstitutions = [].concat(this.props.transformation.substitutions)
     newSubstitutions[index] = substitution
@@ -67,23 +64,16 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
 
   _getValidationErrors (fields: NormalizeFieldFields): Array<string> {
     const issues = []
-    const { fieldName, performSubstitutions, substitutions } = fields
+    const { fieldName, substitutions } = fields
 
     // fieldName must be defined.
     if (!fieldName || fieldName.length === 0) {
       issues.push('Field to normalize must be defined.')
     }
 
-    // If substitutions are enabled, then substitutions must be defined,
-    // and the pattern for each must not be null or empty.
-    if (performSubstitutions) {
-      if (substitutions && substitutions.length > 0) {
-        if (substitutions.filter(s => !s.pattern || s.pattern === '').length > 0) {
-          issues.push('Substitution patterns must be defined.')
-        }
-      } else {
-        issues.push('Substitutions must be defined when enabling substitutions.')
-      }
+    // The pattern for substitutions must not be null or empty.
+    if (substitutions && substitutions.filter(s => !s.pattern || s.pattern === '').length > 0) {
+      issues.push('Substitution patterns must be defined.')
     }
 
     return issues
@@ -99,7 +89,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   }
 
   /**
-   * Update the component editing state
+   * Update the transformation
    * and perform and notify of validation checks.
    */
   _updateTransformation = (partialState: any) => {
@@ -118,7 +108,6 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
       capitalizationExceptions,
       capitalize,
       fieldName,
-      performSubstitutions,
       substitutions
     } = transformation
 
@@ -133,7 +122,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
           the text to substitute to one space.
         </p>
         <p>
-          For example if "@" were replaced with "and",
+          For example, if "@" were replaced with "and",
           then "12th@&nbsp;&nbsp;&nbsp;West" would become "12th and West".
         </p>
       </Tooltip>
@@ -160,92 +149,78 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
           tableName={transformation.table}
         />
 
-        <ul style={{ listStyleType: 'none', paddingLeft: '0px' }}>
-          <li>
-            <Checkbox
-              checked={capitalize}
-              onChange={this._onChangeCapitalize}
-            >
-              Enforce title case (e.g., "Main Street And First Avenue")
-            </Checkbox>
-            <span style={{display: 'block'}}>
-              <label htmlFor={capitalizationExceptionListId}>
-                Capitalization exceptions (e.g., "via" or "MLK")
-              </label>
-              <FormGroup>
-                <Select.Creatable
-                  arrowRenderer={null}
-                  clearable={false}
-                  id={capitalizationExceptionListId}
-                  multi
-                  onChange={this._onChangeCapitalizationExceptions}
-                  placeholder='Enter exceptions then press enter'
-                  value={capitalizationExceptionList}
-                />
-              </FormGroup>
-            </span>
-          </li>
-          <li>
-            <Checkbox
-              checked={performSubstitutions}
-              onChange={this._onChangePerformSubstitutions}
-            >
-              Perform the following substitutions
-            </Checkbox>
-            <FormGroup>
-              <Table condensed>
-                <thead>
-                  <tr>
-                    <th>
-                      Substitute
-                      <OverlayTrigger
-                        overlay={substituteTooltip}
-                        placement='top'
-                      >
-                        <Icon type='info-circle' />
-                      </OverlayTrigger>
-                    </th>
-                    <th>With</th>
-                    <th style={{ textAlign: 'right' }}>
-                      Normalize<br />space?
-                      <OverlayTrigger
-                        overlay={normalizeTooltip}
-                        placement='top'
-                      >
-                        <Icon type='info-circle' />
-                      </OverlayTrigger>
-                    </th>
-                    <th style={{width: '45%'}}>Description</th>
-                    <th />
-                  </tr>
-                </thead>
-                <tbody>
-                  {substitutions && substitutions.map((s, i) => (
-                    <SubstitutionRow
-                      disabled={!performSubstitutions}
-                      index={i}
-                      key={i}
-                      onChange={this._onChangeSubstitution}
-                      onRemove={this._onRemoveSubstitution}
-                      substitution={s}
-                    />
-                  ))}
-                  <tr>
-                    <td colSpan='4'>
-                      <Button
-                        bsSize='xsmall'
-                        disabled={!performSubstitutions}
-                        onClick={this._onNewSubstitution}
-                      >
-                        <Icon type='plus' /> Add
-                      </Button>
-                    </td>
-                  </tr>
-                </tbody>
-              </Table>
-            </FormGroup>
-          </li>
-        </ul>
+        <Checkbox
+          checked={capitalize}
+          onChange={this._onChangeCapitalize}
+        >
+          Enforce title case (e.g., "Main Street And First Avenue")
+        </Checkbox>
+        <FormGroup>
+          <ControlLabel htmlFor={capitalizationExceptionListId}>
+            Capitalization exceptions (e.g., "via" or "MLK")
+          </ControlLabel>
+          <Select.Creatable
+            arrowRenderer={null}
+            clearable={false}
+            id={capitalizationExceptionListId}
+            multi
+            onChange={this._onChangeCapitalizationExceptions}
+            placeholder='Enter exceptions then press enter'
+            value={capitalizationExceptionList}
+          />
+        </FormGroup>
+
+        <Table condensed>
+          <thead>
+            <tr>
+              <th>
+                Substitute
+                <OverlayTrigger
+                  overlay={substituteTooltip}
+                  placement='top'
+                >
+                  <Icon type='info-circle' />
+                </OverlayTrigger>
+              </th>
+              <th>With</th>
+              <th style={{ lineHeight: '1.0', textAlign: 'right' }}>
+                Normalize<br />space?
+                <OverlayTrigger
+                  overlay={normalizeTooltip}
+                  placement='top'
+                >
+                  <Icon type='info-circle' />
+                </OverlayTrigger>
+              </th>
+              <th style={{ width: '45%' }}>Description</th>
+              <th />
+            </tr>
+          </thead>
+          <tbody>
+            {substitutions && substitutions.map((s, i) => (
+              <SubstitutionRow
+                index={i}
+                key={i}
+                onChange={this._onChangeSubstitution}
+                onRemove={this._onRemoveSubstitution}
+                substitution={s}
+              />
+            ))}
+            <tr>
+              <td colSpan='4' style={{ borderTop: 'none' }}>
+                {(!substitutions || substitutions.length === 0) && (
+                  <p>(No substitutions defined)</p>
+                )}
+                <Button
+                  bsSize='xsmall'
+                  onClick={this._onNewSubstitution}
+                >
+                  <Icon type='plus' /> Add
+                </Button>
+              </td>
+            </tr>
+          </tbody>
+        </Table>
       </div>
     )
   }
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index a054a4aa0..cd5ae6fee 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -10,7 +10,6 @@ import type {
 } from '../../../types'
 
 type Props = {
-  disabled: boolean,
   index: number,
   onChange: (Substitution, number) => void,
   onRemove: number => void,
@@ -104,19 +103,19 @@ export default class SubstitutionRow extends Component<Props, State> {
   }
 
   render () {
-    const { disabled, substitution } = this.props
+    const { substitution } = this.props
     const { normalizeSpace } = substitution
     const { description, pattern, replacement } = this.state
     const inputStyle = { height: 'unset', padding: '2px' }
     const inputGroupStyle = { padding: 0 }
+    const cellStyle = { borderTop: 'none' }
     const regexTestLink = `https://regexr.com/?expression=${encodeURIComponent(pattern)}&text=${STRING_FOR_REGEXR_TEST}`
 
     return (
       <tr>
-        <td>
+        <td style={cellStyle}>
           <InputGroup style={inputGroupStyle}>
             <FormControl
-              disabled={disabled}
               onBlur={this._onBlurPattern}
               onChange={this._onChangePattern}
               placeholder='Text (regex) to find'
@@ -134,10 +133,9 @@ export default class SubstitutionRow extends Component<Props, State> {
             </InputGroup.Addon>
           </InputGroup>
         </td>
-        <td colSpan='2'>
+        <td colSpan='2' style={cellStyle}>
           <InputGroup style={inputGroupStyle}>
             <FormControl
-              disabled={disabled}
               onBlur={this._onBlurReplacement}
               onChange={this._onChangeReplacement}
               placeholder='<blank>'
@@ -147,7 +145,6 @@ export default class SubstitutionRow extends Component<Props, State> {
             <InputGroup.Addon style={{ padding: '0 6px' }}>
               <input
                 aria-label='Normalize space'
-                disabled={disabled}
                 checked={normalizeSpace}
                 onChange={this._onEditNormalizeSpace}
                 style={{ padding: '0 6px' }}
@@ -156,9 +153,8 @@ export default class SubstitutionRow extends Component<Props, State> {
             </InputGroup.Addon>
           </InputGroup>
         </td>
-        <td>
+        <td style={cellStyle}>
           <FormControl
-            disabled={disabled}
             onBlur={this._onBlurDescription}
             onChange={this._onChangeDescription}
             placeholder='Optional description'
@@ -166,10 +162,9 @@ export default class SubstitutionRow extends Component<Props, State> {
             value={description}
           />
         </td>
-        <td>
+        <td style={cellStyle}>
           <Button
             bsSize='xsmall'
-            disabled={disabled}
             onClick={this._onRemove}
             title='Remove this substitution'
           >
diff --git a/lib/types/index.js b/lib/types/index.js
index 719f5c92f..39a89af63 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -302,7 +302,6 @@ export type NormalizeFieldFields = {
   capitalizationExceptions?: Array<string>,
   capitalize?: boolean,
   fieldName?: string,
-  performSubstitutions?: boolean,
   substitutions?: Array<Substitution>
 }
 

From f783967fcfa13d6aba626169c4b16fd03cad4c47 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 14 May 2021 18:21:47 -0400
Subject: [PATCH 217/553] refactor(FeedTransformation): Reset fieldName on
 table change.

---
 lib/manager/components/transform/FeedTransformation.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index d3ca2e062..e5f42db09 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -80,7 +80,9 @@ export default class FeedTransformation extends Component<Props, {errors: Array<
   }
 
   _onSelectTable = (tableOption: ReactSelectOption) => {
-    this.props.onChange({table: tableOption.value}, this.props.index)
+    // Set the table name, and also reset the fieldName of NormalizeFieldTransformations
+    // to force the user to pick the table field.
+    this.props.onChange({fieldName: null, table: tableOption.value}, this.props.index)
   }
 
   render () {

From a595d1a6b4f0f173dc330fb9987f0489e49d20ee Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 19 May 2021 10:50:07 -0400
Subject: [PATCH 218/553] refactor(Normalizefield): Fix bug adding substitution
 when no defaults are set.

---
 lib/manager/components/transform/NormalizeField.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 647c58d9a..43661793e 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -56,7 +56,8 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   }
 
   _onNewSubstitution = () => {
-    this._updateTransformation({substitutions: [...[].concat(this.props.transformation.substitutions), {
+    const { substitutions } = this.props.transformation
+    this._updateTransformation({substitutions: [...(substitutions || []), {
       pattern: 'Text to find',
       replacement: 'Replacement'
     }]})

From 220b01afa93aa38c58f739c56eb1e05792585e49 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Wed, 19 May 2021 09:13:39 -0700
Subject: [PATCH 219/553] ci: remove codecov

---
 .github/workflows/node-ci.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 005008dce..c159a3358 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -51,11 +51,7 @@ jobs:
       - name: Run flow check
         run: yarn flow
       - name: Run tests with coverage
-        run: yarn cover-client
-      # Upload coverage results from unit tests and then delete coverage reports to
-      # avoid uploading the same coverage results twice.
-      - name: Upload coverage results from unit tests
-        run: bash <(curl -s https://codecov.io/bash) -c -F unit_tests
+        run: yarn test-client
       - name: Build with minification
         run: yarn run build -- --minify
       - name: Build docs
@@ -74,7 +70,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Run e2e tests
         if: env.SHOULD_RUN_E2E == 'true'
-        run: yarn cover-end-to-end
+        run: yarn test-end-to-end
         env:
           AUTH0_API_CLIENT: ${{ secrets.AUTH0_API_CLIENT }}
           AUTH0_API_SECRET: ${{ secrets.AUTH0_API_SECRET }}
@@ -101,12 +97,6 @@ jobs:
           SPARKPOST_KEY: ${{ secrets.SPARKPOST_KEY }}
           TRANSITFEEDS_KEY: ${{ secrets.TRANSITFEEDS_KEY }}
       # At this point, the build is successful.
-      # Upload coverage results from e2e tests and then delete coverage reports to
-      # avoid uploading the same coverage results twice.
-      - name: Upload coverage results from e2e
-        if: env.SHOULD_RUN_E2E == 'true'
-        run: bash <(curl -s https://codecov.io/bash) -c -F end_to_end_tests
-        continue-on-error: true
       - name: Semantic Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 214c2e1ebf0ca84b8bb94803c4c0e78873351315 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Wed, 19 May 2021 09:14:25 -0700
Subject: [PATCH 220/553] Update pull_request_template.md

---
 .github/pull_request_template.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 4900eb602..3e0b2267b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -7,7 +7,6 @@
 - [ ] All tests and CI builds passing
 - [ ] The description lists all relevant PRs included in this release _(remove this if not merging to master)_
 - [ ] e2e tests are all passing _(remove this if not merging to master)_
-- [ ] Code coverage does not significantly worsen (ideally it improves) _(remove this if not merging to master)_
 
 ### Description
 

From 8e84a74dfacba77200ee272128a19c80a119a374 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Thu, 20 May 2021 21:25:13 -0700
Subject: [PATCH 221/553] ci: rename a step

---
 .github/workflows/node-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index c159a3358..7bae60741 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -50,7 +50,7 @@ jobs:
         run: yarn lint-messages
       - name: Run flow check
         run: yarn flow
-      - name: Run tests with coverage
+      - name: Run tests
         run: yarn test-client
       - name: Build with minification
         run: yarn run build -- --minify

From 6e74f4859f36769af29febb7c4cd3cea96f5475a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 21 May 2021 18:28:01 -0400
Subject: [PATCH 222/553] refactor(NormalizeField): Prevent persistence race
 conditions on add/delete after edit.

---
 .../transform/FeedTransformation.js           |  4 --
 .../components/transform/NormalizeField.js    | 61 ++++++++++++++++++-
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index e5f42db09..8e7777ef4 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -52,14 +52,10 @@ export default class FeedTransformation extends Component<Props, {errors: Array<
   _getFieldsForType = (type: string) => {
     const {feedSource, index, onChange, transformation} = this.props
     const FieldsComponent = transformationTypes[type].component
-    // Pass a key to React that depends on transform content, so that
-    // the component is recreated/rerendered if transform changes.
-    const key = JSON.stringify(transformation)
     return FieldsComponent && (
       <FieldsComponent
         feedSource={feedSource}
         index={index}
-        key={key}
         onSave={onChange}
         onValidationErrors={this._onValidationErrors}
         transformation={transformation}
diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 43661793e..67e826f79 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -1,6 +1,7 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
+import { isEqual } from 'lodash'
 import React, { Component } from 'react'
 import {
   Button,
@@ -23,14 +24,49 @@ import type {
   TransformProps
 } from '../../../types'
 
+type State = NormalizeFieldFields & {
+  isPendingNewSubstitution: boolean,
+  pendingDeleteIndex: number,
+  pendingUpdateIndex: number
+}
+
 /**
  * Component that renders input fields for the NormalizeFieldTransformation.
  */
-export default class NormalizeField extends Component<TransformProps<NormalizeFieldFields>, NormalizeFieldFields> {
+export default class NormalizeField extends Component<TransformProps<NormalizeFieldFields>, State> {
+  // The 'pending' state vars below prevent a race condition when clicking the Add or Delete
+  // substitution buttons after editing a field of an existing substitution.
+  state = {
+    isPendingNewSubstitution: false,
+    pendingDeleteIndex: -1,
+    pendingUpdateIndex: -1
+  }
+
   componentDidMount () {
     this._updateErrors()
   }
 
+  componentDidUpdate (prevProps: TransformProps<NormalizeFieldFields>) {
+    const { isPendingNewSubstitution, pendingDeleteIndex, pendingUpdateIndex } = this.state
+    const prevSubstitutions = prevProps.transformation.substitutions
+    const thisSubstitutions = this.props.transformation.substitutions
+    if (pendingUpdateIndex !== -1 && prevSubstitutions && thisSubstitutions) {
+      // If the substitution at the pending update index has been updated,
+      // then clear the pending update index.
+      if (!isEqual(prevSubstitutions[pendingUpdateIndex], thisSubstitutions[pendingUpdateIndex])) {
+        this.setState({ pendingUpdateIndex: -1 })
+      }
+    } else {
+      // If the substitution at the pending update index has been updated,
+      // then proceed with any pending add/delete operation.
+      if (isPendingNewSubstitution) {
+        this._addNewSubstitution()
+      } else if (pendingDeleteIndex !== -1) {
+        this._removeSubstitution(pendingDeleteIndex)
+      }
+    }
+  }
+
   _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
     this._updateTransformation({fieldName: fieldOption.value})
   }
@@ -44,18 +80,31 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   }
 
   _onChangeSubstitution = (substitution: Substitution, index: number) => {
+    // Keep track of this index to let onBlur events complete
+    // before adding or deleting substitutions.
+    this.setState({ pendingUpdateIndex: index })
     const newSubstitutions = [].concat(this.props.transformation.substitutions)
     newSubstitutions[index] = substitution
     this._updateTransformation({substitutions: newSubstitutions})
   }
 
-  _onRemoveSubstitution = (index: number) => {
+  _removeSubstitution = (index: number) => {
+    // Clear pending flag before performing deletion
+    this.setState({ pendingDeleteIndex: -1 })
     const newSubstitutions = [].concat(this.props.transformation.substitutions)
     newSubstitutions.splice(index, 1)
     this._updateTransformation({substitutions: newSubstitutions})
   }
 
-  _onNewSubstitution = () => {
+  _onRemoveSubstitution = (index: number) => {
+    // Only mark the remove operation as pending
+    // to allow any onBlur events on other fields to complete.
+    this.setState({ pendingDeleteIndex: index })
+  }
+
+  _addNewSubstitution = () => {
+    // Clear pending flag before performing addition
+    this.setState({ isPendingNewSubstitution: false })
     const { substitutions } = this.props.transformation
     this._updateTransformation({substitutions: [...(substitutions || []), {
       pattern: 'Text to find',
@@ -63,6 +112,12 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     }]})
   }
 
+  _onNewSubstitution = () => {
+    // Only mark the add operation as pending
+    // to allow any onBlur events on other fields to complete.
+    this.setState({ isPendingNewSubstitution: true })
+  }
+
   _getValidationErrors (fields: NormalizeFieldFields): Array<string> {
     const issues = []
     const { fieldName, substitutions } = fields

From 1bacf70312044895bcd5260a4440e5fec6f9a918 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 May 2021 00:42:29 +0000
Subject: [PATCH 223/553] build(deps): bump browserslist from 4.6.6 to 4.16.6

Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.6.6 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.6.6...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 50 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3fba7c05b..fdde4534e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2618,13 +2618,15 @@ browserify@^16.1.0, browserify@^16.2.3:
     xtend "^4.0.0"
 
 browserslist@^4.0.0, browserslist@^4.6.0, browserslist@^4.6.2, browserslist@^4.6.3, browserslist@^4.6.4:
-  version "4.6.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453"
-  integrity sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
   dependencies:
-    caniuse-lite "^1.0.30000984"
-    electron-to-chromium "^1.3.191"
-    node-releases "^1.1.25"
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
+    escalade "^3.1.1"
+    node-releases "^1.1.71"
 
 bser@^2.0.0:
   version "2.1.0"
@@ -2885,10 +2887,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000941, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30000984:
-  version "1.0.30000988"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz#742f35ec1b8b75b9628d705d7652eea1fef983db"
-  integrity sha512-lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000941, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001219:
+  version "1.0.30001228"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
+  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3245,6 +3247,11 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -4473,10 +4480,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.191:
-  version "1.3.209"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.209.tgz#cd43879f1d3fb85c75bb843fb11a828570fa1ce4"
-  integrity sha512-KxRvLp5jUapyKIcMaecwgmUpJEsJKuHn0DJJPZjZh2valqYlzdmGvaE/nTAqwKqQwf0jIKv7Go4FYHu9wKWzOg==
+electron-to-chromium@^1.3.723:
+  version "1.3.736"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052"
+  integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig==
 
 element-class@^0.2.0:
   version "0.2.2"
@@ -4762,6 +4769,11 @@ es6-weak-map@^2.0.2:
     es6-iterator "^2.0.1"
     es6-symbol "^3.1.1"
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -9409,12 +9421,10 @@ node-pre-gyp@^0.12.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.25:
-  version "1.1.26"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.26.tgz#f30563edc5c7dc20cf524cc8652ffa7be0762937"
-  integrity sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==
-  dependencies:
-    semver "^5.3.0"
+node-releases@^1.1.71:
+  version "1.1.72"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
+  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
 nopt@3.x:
   version "3.0.6"

From 1d483020b1a4314b3c85f1a755437c95fc476f50 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 25 May 2021 16:34:39 -0400
Subject: [PATCH 224/553] refactor(SubstitutionRow): Edit one row at a time.

---
 .../components/transform/NormalizeField.js    |  67 ++------
 .../components/transform/SubstitutionRow.js   | 144 +++++++++++-------
 2 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 67e826f79..58909f3f5 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -1,7 +1,6 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
-import { isEqual } from 'lodash'
 import React, { Component } from 'react'
 import {
   Button,
@@ -25,48 +24,21 @@ import type {
 } from '../../../types'
 
 type State = NormalizeFieldFields & {
-  isPendingNewSubstitution: boolean,
-  pendingDeleteIndex: number,
-  pendingUpdateIndex: number
+  activeEditingIndex: number
 }
 
 /**
  * Component that renders input fields for the NormalizeFieldTransformation.
  */
 export default class NormalizeField extends Component<TransformProps<NormalizeFieldFields>, State> {
-  // The 'pending' state vars below prevent a race condition when clicking the Add or Delete
-  // substitution buttons after editing a field of an existing substitution.
   state = {
-    isPendingNewSubstitution: false,
-    pendingDeleteIndex: -1,
-    pendingUpdateIndex: -1
+    activeEditingIndex: -1
   }
 
   componentDidMount () {
     this._updateErrors()
   }
 
-  componentDidUpdate (prevProps: TransformProps<NormalizeFieldFields>) {
-    const { isPendingNewSubstitution, pendingDeleteIndex, pendingUpdateIndex } = this.state
-    const prevSubstitutions = prevProps.transformation.substitutions
-    const thisSubstitutions = this.props.transformation.substitutions
-    if (pendingUpdateIndex !== -1 && prevSubstitutions && thisSubstitutions) {
-      // If the substitution at the pending update index has been updated,
-      // then clear the pending update index.
-      if (!isEqual(prevSubstitutions[pendingUpdateIndex], thisSubstitutions[pendingUpdateIndex])) {
-        this.setState({ pendingUpdateIndex: -1 })
-      }
-    } else {
-      // If the substitution at the pending update index has been updated,
-      // then proceed with any pending add/delete operation.
-      if (isPendingNewSubstitution) {
-        this._addNewSubstitution()
-      } else if (pendingDeleteIndex !== -1) {
-        this._removeSubstitution(pendingDeleteIndex)
-      }
-    }
-  }
-
   _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
     this._updateTransformation({fieldName: fieldOption.value})
   }
@@ -80,31 +52,18 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   }
 
   _onChangeSubstitution = (substitution: Substitution, index: number) => {
-    // Keep track of this index to let onBlur events complete
-    // before adding or deleting substitutions.
-    this.setState({ pendingUpdateIndex: index })
     const newSubstitutions = [].concat(this.props.transformation.substitutions)
     newSubstitutions[index] = substitution
     this._updateTransformation({substitutions: newSubstitutions})
   }
 
-  _removeSubstitution = (index: number) => {
-    // Clear pending flag before performing deletion
-    this.setState({ pendingDeleteIndex: -1 })
+  _onRemoveSubstitution = (index: number) => {
     const newSubstitutions = [].concat(this.props.transformation.substitutions)
     newSubstitutions.splice(index, 1)
     this._updateTransformation({substitutions: newSubstitutions})
   }
 
-  _onRemoveSubstitution = (index: number) => {
-    // Only mark the remove operation as pending
-    // to allow any onBlur events on other fields to complete.
-    this.setState({ pendingDeleteIndex: index })
-  }
-
-  _addNewSubstitution = () => {
-    // Clear pending flag before performing addition
-    this.setState({ isPendingNewSubstitution: false })
+  _onNewSubstitution = () => {
     const { substitutions } = this.props.transformation
     this._updateTransformation({substitutions: [...(substitutions || []), {
       pattern: 'Text to find',
@@ -112,12 +71,6 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     }]})
   }
 
-  _onNewSubstitution = () => {
-    // Only mark the add operation as pending
-    // to allow any onBlur events on other fields to complete.
-    this.setState({ isPendingNewSubstitution: true })
-  }
-
   _getValidationErrors (fields: NormalizeFieldFields): Array<string> {
     const issues = []
     const { fieldName, substitutions } = fields
@@ -135,6 +88,14 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     return issues
   }
 
+  _onBeginEditSubstitution = (index: number) => {
+    this.setState({ activeEditingIndex: index })
+  }
+
+  _onEndEditSubstitution = () => {
+    this.setState({ activeEditingIndex: -1 })
+  }
+
   /**
    * Notify containing component of the resulting validation errors if any.
    * @param fields: The updated transformation fields. If not set, the initial transformation will be used.
@@ -166,6 +127,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
       fieldName,
       substitutions
     } = transformation
+    const { activeEditingIndex } = this.state
 
     const capitalizationExceptionList = capitalizationExceptions &&
       capitalizationExceptions.map(s => ({ label: s, value: s }))
@@ -255,9 +217,12 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
           <tbody>
             {substitutions && substitutions.map((s, i) => (
               <SubstitutionRow
+                activeEditingIndex={activeEditingIndex}
                 index={i}
                 key={i}
+                onBeginEdit={this._onBeginEditSubstitution}
                 onChange={this._onChangeSubstitution}
+                onEndEdit={this._onEndEditSubstitution}
                 onRemove={this._onRemoveSubstitution}
                 substitution={s}
               />
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index cd5ae6fee..4c2badc47 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -3,38 +3,48 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import { isEqual } from 'lodash'
 import React, { Component } from 'react'
-import { Button, FormControl, InputGroup } from 'react-bootstrap'
+import { Button, ButtonGroup, FormControl, InputGroup } from 'react-bootstrap'
 
 import type {
   Substitution
 } from '../../../types'
 
 type Props = {
+  activeEditingIndex: number,
   index: number,
+  onBeginEdit: number => void,
   onChange: (Substitution, number) => void,
+  onEndEdit: number => void,
   onRemove: number => void,
   substitution: Substitution
 }
 
-// Hold/update the state for input[type=text] elements when onChange occurs,
-// and notify containers when onBlur occurs to reduce unnecessary
-// network calls to update the substitution object.
-type State = {
-  description: string,
-  pattern: string,
-  replacement: string
-}
-
 // (Encoded) test string to be included to URL to regex test tool (regexr).
 const STRING_FOR_REGEXR_TEST = encodeURIComponent('Route 10 to Bay 1 @ Train Station (10th+West)')
 
+// Misc styles.
+const buttonGroupStyle = { width: '60px' }
+const inputGroupStyle = { padding: 0 }
+const cellStyle = { borderTop: 'none' }
+const editingInputStyle = {
+  height: 'unset',
+  padding: '2px'
+}
+const defaultInputStyle = {
+  ...editingInputStyle,
+  background: 'none',
+  border: 'none',
+  boxShadow: 'none'
+}
+
 /**
  * Extract just the subset of fields to build the state variable.
  */
-function extractStateFields (props: Props): State {
-  const { description, pattern, replacement } = props.substitution
+function extractStateFields (props: Props): Substitution {
+  const { description, normalizeSpace, pattern, replacement } = props.substitution
   return {
     description: description || '',
+    normalizeSpace,
     pattern,
     replacement
   }
@@ -43,7 +53,7 @@ function extractStateFields (props: Props): State {
 /**
  * Renders and lets user edit a substitution.
  */
-export default class SubstitutionRow extends Component<Props, State> {
+export default class SubstitutionRow extends Component<Props, Substitution> {
   constructor (props: Props) {
     super(props)
     this.state = extractStateFields(props)
@@ -58,57 +68,52 @@ export default class SubstitutionRow extends Component<Props, State> {
     }
   }
 
-  _onBlurPattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution('pattern', evt.target.value)
-  }
-
   _onChangePattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({ pattern: evt.target.value })
   }
 
-  _onBlurReplacement = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution('replacement', evt.target.value)
-  }
-
   _onChangeReplacement = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({ replacement: evt.target.value })
   }
 
   _onEditNormalizeSpace = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution('normalizeSpace', evt.target.checked)
-  }
-
-  _onBlurDescription = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    this._updateSubtitution('description', evt.target.value)
+    const { activeEditingIndex, index } = this.props
+    const isEditing = index === activeEditingIndex
+    if (isEditing) {
+      this.setState({ normalizeSpace: evt.target.checked })
+    }
   }
 
   _onChangeDescription = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({ description: evt.target.value })
   }
 
-  _onRemove = () => this.props.onRemove(this.props.index)
+  _onClickEdit = () => {
+    this.props.onBeginEdit(this.props.index)
+  }
 
-  _updateSubtitution (field: string, value: string | boolean) {
+  _onClickDiscard = () => {
+    this.setState(extractStateFields(this.props))
+    this.props.onEndEdit(this.props.index)
+  }
+
+  _onClickSave = () => {
     const { index, onChange, substitution } = this.props
 
-    // Trigger the onChange event
-    // only if the value in the given substitution field was changed.
-    if (value !== substitution[field]) {
-      const newSubstitution = {
-        ...substitution,
-        [field]: value
-      }
-      onChange(newSubstitution, index)
+    // Trigger the onChange event if the substitution fields were changed.
+    if (!isEqual(this.state, substitution)) {
+      onChange(this.state, index)
     }
+    this._onClickDiscard()
   }
 
+  _onRemove = () => this.props.onRemove(this.props.index)
+
   render () {
-    const { substitution } = this.props
-    const { normalizeSpace } = substitution
-    const { description, pattern, replacement } = this.state
-    const inputStyle = { height: 'unset', padding: '2px' }
-    const inputGroupStyle = { padding: 0 }
-    const cellStyle = { borderTop: 'none' }
+    const { activeEditingIndex, index } = this.props
+    const { description, normalizeSpace, pattern, replacement } = this.state
+    const isEditing = index === activeEditingIndex
+    const inputStyle = isEditing ? editingInputStyle : defaultInputStyle
     const regexTestLink = `https://regexr.com/?expression=${encodeURIComponent(pattern)}&text=${STRING_FOR_REGEXR_TEST}`
 
     return (
@@ -116,9 +121,9 @@ export default class SubstitutionRow extends Component<Props, State> {
         <td style={cellStyle}>
           <InputGroup style={inputGroupStyle}>
             <FormControl
-              onBlur={this._onBlurPattern}
               onChange={this._onChangePattern}
               placeholder='Text (regex) to find'
+              readOnly={!isEditing}
               style={inputStyle}
               value={pattern}
             />
@@ -136,13 +141,13 @@ export default class SubstitutionRow extends Component<Props, State> {
         <td colSpan='2' style={cellStyle}>
           <InputGroup style={inputGroupStyle}>
             <FormControl
-              onBlur={this._onBlurReplacement}
               onChange={this._onChangeReplacement}
               placeholder='<blank>'
+              readOnly={!isEditing}
               style={inputStyle}
               value={replacement}
             />
-            <InputGroup.Addon style={{ padding: '0 6px' }}>
+            <InputGroup.Addon style={{ ...inputStyle, padding: '0 6px' }}>
               <input
                 aria-label='Normalize space'
                 checked={normalizeSpace}
@@ -155,21 +160,54 @@ export default class SubstitutionRow extends Component<Props, State> {
         </td>
         <td style={cellStyle}>
           <FormControl
-            onBlur={this._onBlurDescription}
             onChange={this._onChangeDescription}
             placeholder='Optional description'
+            readOnly={!isEditing}
             style={inputStyle}
             value={description}
           />
         </td>
         <td style={cellStyle}>
-          <Button
-            bsSize='xsmall'
-            onClick={this._onRemove}
-            title='Remove this substitution'
-          >
-            <Icon type='remove' />
-          </Button>
+          {isEditing
+            ? (
+              // Show save/discard changes buttons if this row is being edited.
+              <ButtonGroup style={buttonGroupStyle}>
+                <Button
+                  bsSize='xsmall'
+                  onClick={this._onClickSave}
+                  title='Save changes in this row'
+                >
+                  <Icon type='check' />
+                </Button>
+                <Button
+                  bsSize='xsmall'
+                  onClick={this._onClickDiscard}
+                  title='Discard changes in this row'
+                >
+                  <Icon type='remove' />
+                </Button>
+              </ButtonGroup>
+            )
+            : activeEditingIndex === -1 && (
+              // Show edit/delete if no other row is being edited.
+              <ButtonGroup style={buttonGroupStyle}>
+                <Button
+                  bsSize='xsmall'
+                  onClick={this._onClickEdit}
+                  title='Edit this substitution'
+                >
+                  <Icon type='pencil' />
+                </Button>
+                <Button
+                  bsSize='xsmall'
+                  onClick={this._onRemove}
+                  title='Remove this substitution'
+                >
+                  <Icon type='trash' />
+                </Button>
+              </ButtonGroup>
+            )
+          }
         </td>
       </tr>
     )

From 5839fc9a13a9587531d57306d585e207086374c9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 25 May 2021 17:20:18 -0400
Subject: [PATCH 225/553] refactor(SubstitutionRow): Tweak styling and UI
 behavior.

---
 lib/common/components/EditableTextField.js    |  4 +-
 .../components/transform/NormalizeField.js    |  3 +-
 .../components/transform/SubstitutionRow.js   | 57 +++++++++++++++----
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/lib/common/components/EditableTextField.js b/lib/common/components/EditableTextField.js
index 2cb4e269a..1dcc2db6b 100644
--- a/lib/common/components/EditableTextField.js
+++ b/lib/common/components/EditableTextField.js
@@ -94,8 +94,8 @@ export default class EditableTextField extends Component<Props, State> {
 
   handleKeyDown = (e: SyntheticKeyboardEvent<HTMLInputElement>) => {
     switch (e.keyCode) {
-      case 9: // [Enter]
-      case 13: // [Tab]
+      case 9: // [Tab]
+      case 13: // [Enter]
         e.preventDefault()
         if (this.state.isEditing) {
           this._save(e)
diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 58909f3f5..36fb540b6 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -210,7 +210,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
                   <Icon type='info-circle' />
                 </OverlayTrigger>
               </th>
-              <th style={{ width: '45%' }}>Description</th>
+              <th style={{ width: '35%' }}>Description</th>
               <th />
             </tr>
           </thead>
@@ -234,6 +234,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
                 )}
                 <Button
                   bsSize='xsmall'
+                  disabled={activeEditingIndex !== -1}
                   onClick={this._onNewSubstitution}
                 >
                   <Icon type='plus' /> Add
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index 4c2badc47..f91a58f34 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -33,7 +33,7 @@ const editingInputStyle = {
 const defaultInputStyle = {
   ...editingInputStyle,
   background: 'none',
-  border: 'none',
+  borderColor: 'transparent',
   boxShadow: 'none'
 }
 
@@ -64,10 +64,16 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
       prevProps.index !== this.props.index ||
       !isEqual(prevProps.substitution, this.props.substitution)
     ) {
+      console.log('Row did update', this.props)
       this.setState(extractStateFields(this.props))
     }
   }
 
+  _isEditing = (): boolean => {
+    const { activeEditingIndex, index } = this.props
+    return index === activeEditingIndex
+  }
+
   _onChangePattern = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({ pattern: evt.target.value })
   }
@@ -77,9 +83,7 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
   }
 
   _onEditNormalizeSpace = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const { activeEditingIndex, index } = this.props
-    const isEditing = index === activeEditingIndex
-    if (isEditing) {
+    if (this._isEditing()) {
       this.setState({ normalizeSpace: evt.target.checked })
     }
   }
@@ -89,30 +93,54 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
   }
 
   _onClickEdit = () => {
-    this.props.onBeginEdit(this.props.index)
+    // Don't start editing on field click if another row is being edited.
+    const { activeEditingIndex, index, onBeginEdit } = this.props
+    if (activeEditingIndex === -1) {
+      onBeginEdit(index)
+    }
+  }
+
+  _stopEditing = (index: number) => {
+    this.props.onEndEdit(this.props.index)
   }
 
   _onClickDiscard = () => {
     this.setState(extractStateFields(this.props))
-    this.props.onEndEdit(this.props.index)
+    this._stopEditing(this.props.index)
   }
 
   _onClickSave = () => {
-    const { index, onChange, substitution } = this.props
-
     // Trigger the onChange event if the substitution fields were changed.
+    const { index, onChange, substitution } = this.props
     if (!isEqual(this.state, substitution)) {
       onChange(this.state, index)
     }
-    this._onClickDiscard()
+    this._stopEditing(index)
+  }
+
+  _onKeyDown = (e: SyntheticKeyboardEvent<HTMLInputElement>) => {
+    // Handle Enter and Esc keys on the text controls.
+    switch (e.keyCode) {
+      case 13: // [Enter]
+        e.preventDefault()
+        if (this._isEditing()) {
+          this._onClickSave()
+        }
+        break
+      case 27: // [Esc]
+        e.preventDefault()
+        return this._onClickDiscard()
+      default:
+        break
+    }
   }
 
   _onRemove = () => this.props.onRemove(this.props.index)
 
   render () {
-    const { activeEditingIndex, index } = this.props
+    const { activeEditingIndex } = this.props
     const { description, normalizeSpace, pattern, replacement } = this.state
-    const isEditing = index === activeEditingIndex
+    const isEditing = this._isEditing()
     const inputStyle = isEditing ? editingInputStyle : defaultInputStyle
     const regexTestLink = `https://regexr.com/?expression=${encodeURIComponent(pattern)}&text=${STRING_FOR_REGEXR_TEST}`
 
@@ -122,6 +150,8 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
           <InputGroup style={inputGroupStyle}>
             <FormControl
               onChange={this._onChangePattern}
+              onClick={this._onClickEdit}
+              onKeyDown={this._onKeyDown}
               placeholder='Text (regex) to find'
               readOnly={!isEditing}
               style={inputStyle}
@@ -142,6 +172,8 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
           <InputGroup style={inputGroupStyle}>
             <FormControl
               onChange={this._onChangeReplacement}
+              onClick={this._onClickEdit}
+              onKeyDown={this._onKeyDown}
               placeholder='<blank>'
               readOnly={!isEditing}
               style={inputStyle}
@@ -152,6 +184,7 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
                 aria-label='Normalize space'
                 checked={normalizeSpace}
                 onChange={this._onEditNormalizeSpace}
+                onClick={this._onClickEdit}
                 style={{ padding: '0 6px' }}
                 type='checkbox'
               />
@@ -161,6 +194,8 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
         <td style={cellStyle}>
           <FormControl
             onChange={this._onChangeDescription}
+            onClick={this._onClickEdit}
+            onKeyDown={this._onKeyDown}
             placeholder='Optional description'
             readOnly={!isEditing}
             style={inputStyle}

From 19fa36898d1a4fc5eebbb7ca618d947164c35ced Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 25 May 2021 17:29:52 -0400
Subject: [PATCH 226/553] refactor(NormalizeField): Remove unused state mixin.

---
 lib/manager/components/transform/NormalizeField.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 36fb540b6..e4e04c866 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -23,7 +23,7 @@ import type {
   TransformProps
 } from '../../../types'
 
-type State = NormalizeFieldFields & {
+type State = {
   activeEditingIndex: number
 }
 

From 5da86d98aa2de4b95e6509021c8de11a5d5770b7 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 26 May 2021 12:43:13 -0400
Subject: [PATCH 227/553] refactor(deployment): modify version selector in
 table

---
 lib/manager/actions/deployments.js            |  16 +-
 .../deployment/DeploymentTableRow.js          | 140 +++++-------------
 .../components/deployment/DeploymentViewer.js |  85 +++++++----
 .../containers/ActiveDeploymentViewer.js      |   2 +
 lib/types/index.js                            |   3 +-
 yarn.lock                                     |   2 +-
 6 files changed, 113 insertions(+), 135 deletions(-)

diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 6105e764d..174722b3c 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -42,7 +42,7 @@ export type DeploymentActions = ActionType<typeof createDeployment> |
   ActionType<typeof requestingDeployments> |
   ActionType<typeof savingDeployment>
 
-type FeedVersionId = { id: string }
+type FeedVersionId = { id: string } | { feedSourceId: string, version: number }
 
 export function addFeedVersion (
   deployment: Deployment,
@@ -258,3 +258,17 @@ export function updateVersionForFeedSource (
     return dispatch(updateDeployment(deployment, {feedVersions}))
   }
 }
+
+/**
+ * Increments all feed versions in the deployment to the latest version, except
+ * for those that have been pinned to a specific version.
+ */
+export function incrementAllVersionsToLatest (deployment: Deployment) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    const feedVersions = deployment.feedVersions.map(v =>
+      deployment.pinnedfeedVersionIds.includes(v.id)
+        ? v
+        : ({id: v.feedSource.latestVersionId}))
+    return dispatch(updateDeployment(deployment, {feedVersions}))
+  }
+}
diff --git a/lib/manager/components/deployment/DeploymentTableRow.js b/lib/manager/components/deployment/DeploymentTableRow.js
index af6ed8a66..5c0a2f00e 100644
--- a/lib/manager/components/deployment/DeploymentTableRow.js
+++ b/lib/manager/components/deployment/DeploymentTableRow.js
@@ -1,15 +1,13 @@
 // @flow
 
+import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
-import {Button, Badge, Glyphicon, ButtonToolbar} from 'react-bootstrap'
+import {Button, Badge, Glyphicon} from 'react-bootstrap'
 import {connect} from 'react-redux'
 import { Link } from 'react-router'
+import Select from 'react-select'
 
-import {
-  deleteFeedVersion,
-  togglePinFeedVersion,
-  updateVersionForFeedSource
-} from '../../actions/deployments'
+import * as deploymentActions from '../../actions/deployments'
 import {formatTimestamp, fromNow} from '../../../common/util/date-time'
 import {
   versionHasExpired,
@@ -45,10 +43,10 @@ type RowProps = {
 }
 
 type ConnectedRowProps = RowProps & {
-  deleteFeedVersion: typeof deleteFeedVersion,
+  deleteFeedVersion: typeof deploymentActions.deleteFeedVersion,
   feedVersionPinned: boolean,
-  togglePinFeedVersion: typeof togglePinFeedVersion,
-  updateVersionForFeedSource: typeof updateVersionForFeedSource,
+  togglePinFeedVersion: typeof deploymentActions.togglePinFeedVersion,
+  updateVersionForFeedSource: typeof deploymentActions.updateVersionForFeedSource,
   userCanDecrementVersion: boolean,
   userCanEditDeployment: boolean,
   userCanIncrementVersion: boolean,
@@ -56,42 +54,16 @@ type ConnectedRowProps = RowProps & {
 }
 
 class DeploymentTableRow extends Component<ConnectedRowProps> {
-  _decrementVersion = () => {
-    const {deployment, feedSource, updateVersionForFeedSource, version} = this.props
-    const {previousVersionId: id} = version
-    if (!id) {
-      console.warn('No previous version ID exists for version', version)
-      return
-    }
-    updateVersionForFeedSource(deployment, feedSource, {id})
-  }
+  _numberToOption = n => ({value: n, label: n})
 
-  _incrementVersion = () => {
+  _onChangeVersion = option => {
     const {
       deployment,
       feedSource,
-      updateVersionForFeedSource,
-      version
+      updateVersionForFeedSource
     } = this.props
-    const {nextVersionId: id} = version
-    if (!id) {
-      console.warn('No next version ID exists for version', version)
-      return
-    }
-    updateVersionForFeedSource(deployment, feedSource, {id})
-  }
-
-  _incrementVersionToLatest = () => {
-    const {deployment, feedSource, updateVersionForFeedSource} = this.props
-    if (!feedSource.latestVersionId) {
-      console.warn('No latest version ID exists for feedSource', feedSource)
-      return
-    }
-    updateVersionForFeedSource(
-      deployment,
-      feedSource,
-      {id: feedSource.latestVersionId}
-    )
+    const versionToAdd = {feedSourceId: feedSource.id, version: option.value}
+    updateVersionForFeedSource(deployment, feedSource, versionToAdd)
   }
 
   _togglePinFeedVersion = () => {
@@ -108,90 +80,48 @@ class DeploymentTableRow extends Component<ConnectedRowProps> {
     const {
       feedSource,
       feedVersionPinned,
-      userCanDecrementVersion,
       userCanEditDeployment,
-      userCanIncrementVersion,
       userCanRemoveVersion,
       version
     } = this.props
+    const {latestVersionId} = feedSource
     const {validationResult: result} = version
-    const hasVersionStyle = {cursor: 'pointer'}
-    const noVersionStyle = {color: 'lightGray'}
     const expired = versionHasExpired(version)
     const future = versionHasNotBegun(version)
     return (
       <tr>
         <td>
           <Link to={`/feed/${feedSource.id}`}>{feedSource.name}</Link>
-          {feedVersionPinned && (
-            <div style={{ fontSize: 12, fontStyle: 'italic', margin: 5 }}>
-              <Glyphicon
-                glyph='star'
-                style={hasVersionStyle}
-                alt='star'
-              />
-              {' '}
-              Version pinned for auto-deployment
-            </div>
-          )}
+          {feedVersionPinned && <Icon type='thumb-tack' />}
         </td>
-        <td className='col-md-1 col-xs-2'>
-          <Link to={`/feed/${feedSource.id}/version/${version.version}`}>
-            <small>Version {version.version}</small>
-          </Link>
-          <ButtonToolbar>
-            <Button
-              bsSize='xsmall'
-              bsStyle='default'
-              style={{color: 'black'}}
-              disabled={!userCanDecrementVersion}
-              onClick={this._decrementVersion}>
-              <Glyphicon
-                glyph='menu-left'
-                style={userCanDecrementVersion ? hasVersionStyle : noVersionStyle}
-                title={version.previousVersionId ? 'Previous version' : 'No previous versions'}
-                alt='Previous version' />
-            </Button>
-            <Button
-              bsSize='xsmall'
-              bsStyle='default'
-              style={{color: 'black'}}
-              disabled={!userCanIncrementVersion}
-              onClick={this._incrementVersion}>
-              <Glyphicon
-                glyph='menu-right'
-                style={userCanIncrementVersion ? hasVersionStyle : noVersionStyle}
-                title={version.nextVersionId ? 'Next version' : 'No newer versions'}
-                alt='Next Version' />
-            </Button>
+        <td className={version.id !== latestVersionId ? 'warning' : ''}>
+          <div style={{display: 'flex'}}>
             <Button
               bsSize='xsmall'
-              bsStyle='default'
+              active={feedVersionPinned}
               disabled={!userCanEditDeployment}
-              style={{color: 'black'}}
               onClick={this._togglePinFeedVersion}>
-              <Glyphicon
-                glyph={feedVersionPinned ? 'star-empty' : 'star'}
-                style={hasVersionStyle}
+              <Icon
+                type={'thumb-tack'}
                 title={feedVersionPinned
                   ? 'Unpin version in auto-deployments'
                   : 'Pin version in auto-deployments'
                 }
                 alt='Toggle pin version' />
             </Button>
-            <Button
-              bsSize='xsmall'
-              bsStyle='default'
-              style={{color: 'black'}}
-              disabled={!userCanIncrementVersion}
-              onClick={this._incrementVersionToLatest}>
-              <Glyphicon
-                glyph='fast-forward'
-                style={userCanIncrementVersion ? hasVersionStyle : noVersionStyle}
-                title={version.nextVersionId ? 'Latest version' : 'No newer versions'}
-                alt='Latest Version' />
-            </Button>
-          </ButtonToolbar>
+            <div style={{marginLeft: '5px'}}>
+              <Select
+                clearable={false}
+                disabled={feedVersionPinned}
+                options={Array.from(Array(feedSource.versions).keys())
+                  .reverse()
+                  .map(n => this._numberToOption(n + 1))
+                }
+                value={this._numberToOption(version.version)}
+                onChange={this._onChangeVersion}
+              />
+            </div>
+          </div>
         </td>
         <td className='hidden-xs'>
           <Badge>{result.loadStatus}</Badge>
@@ -259,9 +189,9 @@ const mapStateToProps = (state: AppState, ownProps: RowProps) => {
 }
 
 const mapDispatchToProps = {
-  deleteFeedVersion,
-  togglePinFeedVersion,
-  updateVersionForFeedSource
+  deleteFeedVersion: deploymentActions.deleteFeedVersion,
+  togglePinFeedVersion: deploymentActions.togglePinFeedVersion,
+  updateVersionForFeedSource: deploymentActions.updateVersionForFeedSource
 }
 
 export default connect(
diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index 663ee07ac..8a54bdbb5 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -50,6 +50,7 @@ type Props = ContainerProps & {
   downloadBuildArtifact: typeof deploymentActions.downloadBuildArtifact,
   downloadDeployment: typeof deploymentActions.downloadDeployment,
   fetchDeployment: typeof deploymentActions.fetchDeployment,
+  incrementAllVersionsToLatest: typeof deploymentActions.incrementAllVersionsToLatest,
   terminateEC2InstanceForDeployment: typeof deploymentActions.terminateEC2InstanceForDeployment,
   updateDeployment: typeof deploymentActions.updateDeployment,
   user: ManagerUserState
@@ -121,6 +122,18 @@ export default class DeploymentViewer extends Component<Props, State> {
     updateDeployment(deployment, props)
   }
 
+  _incrementAllVersionsToLatest = () => {
+    const {deployment, incrementAllVersionsToLatest} = this.props
+    const feedsNeedingUpdates = deployment.feedVersions.filter(
+      v => !deployment.pinnedfeedVersionIds.includes(v.id) &&
+        v.id !== v.feedSource.latestVersionId
+    )
+    const message = `Are you sure you would like to advance ${feedsNeedingUpdates.length} feed(s) to their latest versions?`
+    if (window.confirm(message)) {
+      incrementAllVersionsToLatest(deployment)
+    }
+  }
+
   renderHeader () {
     const {
       deployJobs,
@@ -256,7 +269,10 @@ export default class DeploymentViewer extends Component<Props, State> {
       : []
     const earliestDate = formatTimestamp(`${Math.min(...versions.map(v => +v.validationResult.startDate))}`, false)
     const latestDate = formatTimestamp(`${Math.max(...versions.map(v => +v.validationResult.endDate))}`, false)
-
+    const feedsAreUpToDate = deployment.feedVersions.every(
+      v => deployment.pinnedfeedVersionIds.includes(v.id) ||
+        v.id === v.feedSource.latestVersionId
+    )
     return (
       <Row>
         <Col xs={6}>
@@ -271,32 +287,47 @@ export default class DeploymentViewer extends Component<Props, State> {
           </h4>
         </Col>
         <Col xs={6}>
-          <FormGroup className='pull-right'>
-            <InputGroup>
-              <FormControl
-                type='text'
-                className='pull-right'
-                style={{width: '160px'}}
-                placeholder={this.messages('search')}
-                onChange={this._onChangeSearch} />
-              <DropdownButton
-                id='add-feedsource-button'
-                componentClass={InputGroup.Button}
-                disabled={!deployableFeeds.length}
-                title={deployableFeeds.length
-                  ? <span>
-                    <Glyphicon glyph='plus' />{' '}
-                    {this.messages('addFeedSource')}
-                  </span>
-                  : <span>{this.messages('allFeedsAdded')}</span>
-                }
-                onSelect={this._onAddFeedSource}>
-                {deployableFeeds.map((fs, i) => (
-                  <MenuItem MenuItem key={i} eventKey={fs.id}>{fs.name}</MenuItem>
-                ))}
-              </DropdownButton>
-            </InputGroup>
-          </FormGroup>
+          <div className='pull-right' style={{display: 'flex'}}>
+            <Button
+              bsStyle={feedsAreUpToDate ? 'success' : 'default'}
+              disabled={feedsAreUpToDate}
+              onClick={this._incrementAllVersionsToLatest}
+            >
+              <Icon
+                type={feedsAreUpToDate ? 'check-circle-o' : 'arrow-circle-o-right'}
+              />{' '}
+              {feedsAreUpToDate
+                ? 'All feeds up-to-date!'
+                : 'Advance all feeds'
+              }
+            </Button>
+            <FormGroup style={{marginLeft: '5px', marginBottom: 0}}>
+              <InputGroup>
+                <FormControl
+                  type='text'
+                  className='pull-right'
+                  style={{width: '160px'}}
+                  placeholder={this.messages('search')}
+                  onChange={this._onChangeSearch} />
+                <DropdownButton
+                  id='add-feedsource-button'
+                  componentClass={InputGroup.Button}
+                  disabled={!deployableFeeds.length}
+                  title={deployableFeeds.length
+                    ? <span>
+                      <Glyphicon glyph='plus' />{' '}
+                      {this.messages('addFeedSource')}
+                    </span>
+                    : <span>{this.messages('allFeedsAdded')}</span>
+                  }
+                  onSelect={this._onAddFeedSource}>
+                  {deployableFeeds.map((fs, i) => (
+                    <MenuItem MenuItem key={i} eventKey={fs.id}>{fs.name}</MenuItem>
+                  ))}
+                </DropdownButton>
+              </InputGroup>
+            </FormGroup>
+          </div>
         </Col>
       </Row>
     )
diff --git a/lib/manager/containers/ActiveDeploymentViewer.js b/lib/manager/containers/ActiveDeploymentViewer.js
index 8c931ef7a..5eab417fc 100644
--- a/lib/manager/containers/ActiveDeploymentViewer.js
+++ b/lib/manager/containers/ActiveDeploymentViewer.js
@@ -8,6 +8,7 @@ import {
   downloadBuildArtifact,
   downloadDeployment,
   fetchDeployment,
+  incrementAllVersionsToLatest,
   terminateEC2InstanceForDeployment,
   updateDeployment
 } from '../actions/deployments'
@@ -38,6 +39,7 @@ const mapDispatchToProps = {
   downloadBuildArtifact,
   downloadDeployment,
   fetchDeployment,
+  incrementAllVersionsToLatest,
   terminateEC2InstanceForDeployment,
   updateDeployment
 }
diff --git a/lib/types/index.js b/lib/types/index.js
index 8802f085e..240af5049 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -351,7 +351,8 @@ export type Feed = {
   snapshotVersion: ?string,
   transformRules: Array<FeedTransformRules>,
   url: ?string,
-  user: ?any // TODO: add more exact type
+  user: ?any, // TODO: add more exact type
+  versions: number
 }
 
 export type NewFeed = {
diff --git a/yarn.lock b/yarn.lock
index 2e6c0e5fb..4d749b8b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6155,7 +6155,7 @@ hook-std@^2.0.0:
   resolved "https://registry.yarnpkg.com/hook-std/-/hook-std-2.0.0.tgz#ff9aafdebb6a989a354f729bb6445cf4a3a7077c"
   integrity sha512-zZ6T5WcuBMIUVh49iPQS9t977t7C0l7OtHrpeMb5uk48JdflRX0NSFvCekfYNmGQETnLq9W/isMyHl69kxGi8g==
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.6.0, hosted-git-info@^2.7.1, hosted-git-info@^2.8.8:
+hosted-git-info@^2.1.4, hosted-git-info@^2.7.1, hosted-git-info@^2.8.8:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==

From 7f078023d701ba52f5d3dc19326f0f515e7b821a Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 26 May 2021 13:17:41 -0400
Subject: [PATCH 228/553] refactor(DeploymentTableRow): fix edit permissions

---
 .../components/deployment/DeploymentTableRow.js       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/deployment/DeploymentTableRow.js b/lib/manager/components/deployment/DeploymentTableRow.js
index 5c0a2f00e..16a83ceb8 100644
--- a/lib/manager/components/deployment/DeploymentTableRow.js
+++ b/lib/manager/components/deployment/DeploymentTableRow.js
@@ -45,11 +45,10 @@ type RowProps = {
 type ConnectedRowProps = RowProps & {
   deleteFeedVersion: typeof deploymentActions.deleteFeedVersion,
   feedVersionPinned: boolean,
+  isVersionEditable: boolean,
   togglePinFeedVersion: typeof deploymentActions.togglePinFeedVersion,
   updateVersionForFeedSource: typeof deploymentActions.updateVersionForFeedSource,
-  userCanDecrementVersion: boolean,
   userCanEditDeployment: boolean,
-  userCanIncrementVersion: boolean,
   userCanRemoveVersion: boolean
 }
 
@@ -80,6 +79,7 @@ class DeploymentTableRow extends Component<ConnectedRowProps> {
     const {
       feedSource,
       feedVersionPinned,
+      isVersionEditable,
       userCanEditDeployment,
       userCanRemoveVersion,
       version
@@ -112,7 +112,7 @@ class DeploymentTableRow extends Component<ConnectedRowProps> {
             <div style={{marginLeft: '5px'}}>
               <Select
                 clearable={false}
-                disabled={feedVersionPinned}
+                disabled={!isVersionEditable}
                 options={Array.from(Array(feedSource.versions).keys())
                   .reverse()
                   .map(n => this._numberToOption(n + 1))
@@ -171,8 +171,6 @@ const mapStateToProps = (state: AppState, ownProps: RowProps) => {
       'manage-feed'
     )
   const isVersionEditable = userCanEditDeployment && !feedVersionPinned
-  const userCanDecrementVersion = isVersionEditable && version.previousVersionId
-  const userCanIncrementVersion = isVersionEditable && version.nextVersionId
 
   // Cannot remove feed source if the deployment is feed-specific or it is
   // pinned
@@ -181,9 +179,8 @@ const mapStateToProps = (state: AppState, ownProps: RowProps) => {
 
   return {
     feedVersionPinned,
-    userCanDecrementVersion,
+    isVersionEditable,
     userCanEditDeployment,
-    userCanIncrementVersion,
     userCanRemoveVersion
   }
 }

From e48b0bf36a9dd3b80b4a5f74a7acc07be2b3e0cd Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 26 May 2021 16:15:24 -0400
Subject: [PATCH 229/553] test: fix mock data w type changes

---
 __tests__/test-utils/mock-data/manager.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 35e09d4e6..ed1fe0650 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -144,7 +144,8 @@ export const mockFeedWithVersion = {
   snapshotVersion: null,
   transformRules: [],
   url: 'http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip',
-  user: null
+  user: null,
+  versions: 1
 }
 
 // a mock feed with no versions
@@ -166,7 +167,8 @@ export const mockFeedWithoutVersion = {
   snapshotVersion: null,
   transformRules: [],
   url: null,
-  user: null
+  user: null,
+  versions: 0
 }
 
 // a mock feedversion that has validation data

From 986598dbba7124b12cd509a24c89b2c2eb1dcdd8 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 27 May 2021 13:20:42 -0400
Subject: [PATCH 230/553] test: update snapshots

---
 .../__tests__/__snapshots__/projects.js.snap  |  2 ++
 .../__snapshots__/DeploymentsPanel.js.snap    | 12 ++++++++++
 .../__snapshots__/FeedSourceTable.js.snap     | 22 +++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 60ebc8cf0..0dfef3a75 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -73,6 +73,7 @@ Object {
                 "transformRules": Array [],
                 "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                 "user": null,
+                "versions": 1,
               },
               "id": "mock-feed-version-id",
               "nextVersionId": null,
@@ -169,6 +170,7 @@ Object {
           "transformRules": Array [],
           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
           "user": null,
+          "versions": 1,
         },
       ],
       "id": "mock-project-with-deployments-id",
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index 66e684134..e47a3254c 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -86,6 +86,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                   "transformRules": Array [],
                   "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                   "user": null,
+                  "versions": 1,
                 },
                 "id": "mock-feed-version-id",
                 "nextVersionId": null,
@@ -214,6 +215,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "transformRules": Array [],
             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
             "user": null,
+            "versions": 1,
           },
         ],
         "id": "mock-project-with-deployments-id",
@@ -310,6 +312,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     "transformRules": Array [],
                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                     "user": null,
+                    "versions": 1,
                   },
                   "id": "mock-feed-version-id",
                   "nextVersionId": null,
@@ -438,6 +441,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "transformRules": Array [],
               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
               "user": null,
+              "versions": 1,
             },
           ],
           "id": "mock-project-with-deployments-id",
@@ -586,6 +590,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                             "transformRules": Array [],
                             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                             "user": null,
+                            "versions": 1,
                           },
                           "id": "mock-feed-version-id",
                           "nextVersionId": null,
@@ -742,6 +747,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                               "transformRules": Array [],
                               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                               "user": null,
+                              "versions": 1,
                             },
                             "id": "mock-feed-version-id",
                             "nextVersionId": null,
@@ -870,6 +876,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "transformRules": Array [],
                         "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                         "user": null,
+                        "versions": 1,
                       },
                     ],
                     "id": "mock-project-with-deployments-id",
@@ -1108,6 +1115,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "transformRules": Array [],
                                       "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                       "user": null,
+                                      "versions": 1,
                                     },
                                     "id": "mock-feed-version-id",
                                     "nextVersionId": null,
@@ -1232,6 +1240,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                           "transformRules": Array [],
                                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                           "user": null,
+                                          "versions": 1,
                                         },
                                         "id": "mock-feed-version-id",
                                         "nextVersionId": null,
@@ -1360,6 +1369,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "transformRules": Array [],
                                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                     "user": null,
+                                    "versions": 1,
                                   },
                                 ],
                                 "id": "mock-project-with-deployments-id",
@@ -1629,6 +1639,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                           "transformRules": Array [],
                                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                           "user": null,
+                                          "versions": 1,
                                         },
                                         "id": "mock-feed-version-id",
                                         "nextVersionId": null,
@@ -1757,6 +1768,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "transformRules": Array [],
                                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                     "user": null,
+                                    "versions": 1,
                                   },
                                 ],
                                 "id": "mock-project-with-deployments-id",
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index d2c1628be..fddc15fcb 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -85,6 +85,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   "transformRules": Array [],
                   "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                   "user": null,
+                  "versions": 1,
                 },
                 "id": "mock-feed-version-id",
                 "nextVersionId": null,
@@ -181,6 +182,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "transformRules": Array [],
             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
             "user": null,
+            "versions": 1,
           },
         ],
         "id": "mock-project-with-deployments-id",
@@ -248,6 +250,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "transformRules": Array [],
             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
             "user": null,
+            "versions": 1,
           },
         ]
       }
@@ -295,6 +298,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "transformRules": Array [],
             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
             "user": null,
+            "versions": 1,
           },
         ]
       }
@@ -371,6 +375,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "transformRules": Array [],
                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                     "user": null,
+                    "versions": 1,
                   },
                   "id": "mock-feed-version-id",
                   "nextVersionId": null,
@@ -467,6 +472,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "transformRules": Array [],
               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
               "user": null,
+              "versions": 1,
             },
           ],
           "id": "mock-project-with-deployments-id",
@@ -638,6 +644,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "transformRules": Array [],
                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                           "user": null,
+                          "versions": 1,
                         },
                         "id": "mock-feed-version-id",
                         "nextVersionId": null,
@@ -734,6 +741,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "transformRules": Array [],
                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                     "user": null,
+                    "versions": 1,
                   },
                 ],
                 "id": "mock-project-with-deployments-id",
@@ -836,6 +844,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "transformRules": Array [],
                             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                             "user": null,
+                            "versions": 1,
                           },
                           "id": "mock-feed-version-id",
                           "nextVersionId": null,
@@ -932,6 +941,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "transformRules": Array [],
                       "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                       "user": null,
+                      "versions": 1,
                     },
                   ],
                   "id": "mock-project-with-deployments-id",
@@ -1052,6 +1062,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "transformRules": Array [],
                               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                               "user": null,
+                              "versions": 1,
                             },
                             "id": "mock-feed-version-id",
                             "nextVersionId": null,
@@ -1148,6 +1159,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "transformRules": Array [],
                         "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                         "user": null,
+                        "versions": 1,
                       },
                     ],
                     "id": "mock-project-with-deployments-id",
@@ -2848,6 +2860,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "transformRules": Array [],
                         "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                         "user": null,
+                        "versions": 1,
                       }
                     }
                     key="mock-feed-with-version-id"
@@ -2921,6 +2934,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   "transformRules": Array [],
                                   "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                   "user": null,
+                                  "versions": 1,
                                 },
                                 "id": "mock-feed-version-id",
                                 "nextVersionId": null,
@@ -3017,6 +3031,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "transformRules": Array [],
                             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                             "user": null,
+                            "versions": 1,
                           },
                         ],
                         "id": "mock-project-with-deployments-id",
@@ -3109,6 +3124,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "transformRules": Array [],
                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                           "user": null,
+                          "versions": 1,
                         }
                       }
                       project={
@@ -3181,6 +3197,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "transformRules": Array [],
                                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                     "user": null,
+                                    "versions": 1,
                                   },
                                   "id": "mock-feed-version-id",
                                   "nextVersionId": null,
@@ -3277,6 +3294,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "transformRules": Array [],
                               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                               "user": null,
+                              "versions": 1,
                             },
                           ],
                           "id": "mock-project-with-deployments-id",
@@ -3424,6 +3442,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "transformRules": Array [],
                                 "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                 "user": null,
+                                "versions": 1,
                               }
                             }
                           >
@@ -3653,6 +3672,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "transformRules": Array [],
                                 "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                 "user": null,
+                                "versions": 1,
                               }
                             }
                             project={
@@ -3725,6 +3745,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           "transformRules": Array [],
                                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                           "user": null,
+                                          "versions": 1,
                                         },
                                         "id": "mock-feed-version-id",
                                         "nextVersionId": null,
@@ -3821,6 +3842,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "transformRules": Array [],
                                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                     "user": null,
+                                    "versions": 1,
                                   },
                                 ],
                                 "id": "mock-project-with-deployments-id",

From b3d55ab1f501cfb85485377df858c59d6c95e430 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 27 May 2021 15:27:54 -0400
Subject: [PATCH 231/553] refactor(SubstitutionRow): Address PR comments.

---
 .../components/transform/NormalizeField.js    |  34 +++--
 .../components/transform/SubstitutionRow.js   | 120 ++++++++++--------
 lib/style.css                                 |  25 ++++
 3 files changed, 111 insertions(+), 68 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index e4e04c866..31a86370c 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -14,7 +14,7 @@ import {
 import Select from 'react-select'
 
 import GtfsFieldSelector from '../GtfsFieldSelector'
-import SubstitutionRow from './SubstitutionRow'
+import SubstitutionRow, { isSubstitutionInvalid } from './SubstitutionRow'
 
 import type {
   NormalizeFieldFields,
@@ -65,10 +65,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
 
   _onNewSubstitution = () => {
     const { substitutions } = this.props.transformation
-    this._updateTransformation({substitutions: [...(substitutions || []), {
-      pattern: 'Text to find',
-      replacement: 'Replacement'
-    }]})
+    this.setState({ activeEditingIndex: (substitutions || []).length })
   }
 
   _getValidationErrors (fields: NormalizeFieldFields): Array<string> {
@@ -81,7 +78,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     }
 
     // The pattern for substitutions must not be null or empty.
-    if (substitutions && substitutions.filter(s => !s.pattern || s.pattern === '').length > 0) {
+    if (substitutions && substitutions.filter(isSubstitutionInvalid).length > 0) {
       issues.push('Substitution patterns must be defined.')
     }
 
@@ -121,13 +118,14 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
 
   render () {
     const { index, transformation } = this.props
+    const { activeEditingIndex } = this.state
     const {
       capitalizationExceptions,
       capitalize,
       fieldName,
-      substitutions
+      substitutions: originalSubstitutions
     } = transformation
-    const { activeEditingIndex } = this.state
+    const substitutions = originalSubstitutions || []
 
     const capitalizationExceptionList = capitalizationExceptions &&
       capitalizationExceptions.map(s => ({ label: s, value: s }))
@@ -215,7 +213,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
             </tr>
           </thead>
           <tbody>
-            {substitutions && substitutions.map((s, i) => (
+            {substitutions.map((s, i) => (
               <SubstitutionRow
                 activeEditingIndex={activeEditingIndex}
                 index={i}
@@ -227,11 +225,23 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
                 substitution={s}
               />
             ))}
+            {activeEditingIndex === substitutions.length &&
+              // If user clicked 'Add', render the new substitution row.
+              <SubstitutionRow
+                activeEditingIndex={activeEditingIndex}
+                index={activeEditingIndex}
+                key={activeEditingIndex}
+                onChange={this._onChangeSubstitution}
+                onEndEdit={this._onEndEditSubstitution}
+                substitution={{
+                  pattern: '',
+                  replacement: ''
+                }}
+              />
+            }
             <tr>
               <td colSpan='4' style={{ borderTop: 'none' }}>
-                {(!substitutions || substitutions.length === 0) && (
-                  <p>(No substitutions defined)</p>
-                )}
+                {substitutions.length === 0 && <p>(No substitutions defined)</p>}
                 <Button
                   bsSize='xsmall'
                   disabled={activeEditingIndex !== -1}
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index f91a58f34..ccc35ec97 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -3,7 +3,7 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import { isEqual } from 'lodash'
 import React, { Component } from 'react'
-import { Button, ButtonGroup, FormControl, InputGroup } from 'react-bootstrap'
+import { Button, ButtonGroup, FormControl, FormGroup, InputGroup } from 'react-bootstrap'
 
 import type {
   Substitution
@@ -12,30 +12,18 @@ import type {
 type Props = {
   activeEditingIndex: number,
   index: number,
-  onBeginEdit: number => void,
+  onBeginEdit?: number => void,
   onChange: (Substitution, number) => void,
   onEndEdit: number => void,
-  onRemove: number => void,
+  onRemove?: number => void,
   substitution: Substitution
 }
 
 // (Encoded) test string to be included to URL to regex test tool (regexr).
 const STRING_FOR_REGEXR_TEST = encodeURIComponent('Route 10 to Bay 1 @ Train Station (10th+West)')
 
-// Misc styles.
+// This style is needed otherwise the button group renders not as one row.
 const buttonGroupStyle = { width: '60px' }
-const inputGroupStyle = { padding: 0 }
-const cellStyle = { borderTop: 'none' }
-const editingInputStyle = {
-  height: 'unset',
-  padding: '2px'
-}
-const defaultInputStyle = {
-  ...editingInputStyle,
-  background: 'none',
-  borderColor: 'transparent',
-  boxShadow: 'none'
-}
 
 /**
  * Extract just the subset of fields to build the state variable.
@@ -50,6 +38,13 @@ function extractStateFields (props: Props): Substitution {
   }
 }
 
+/**
+ * @returns true if the given substitution pattern is null or empty, false otherwise.
+ */
+export function isSubstitutionInvalid (substitution: Substitution) {
+  return !substitution.pattern || substitution.pattern === ''
+}
+
 /**
  * Renders and lets user edit a substitution.
  */
@@ -60,11 +55,10 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
   }
 
   componentDidUpdate (prevProps: Props) {
-    if (
-      prevProps.index !== this.props.index ||
-      !isEqual(prevProps.substitution, this.props.substitution)
-    ) {
-      console.log('Row did update', this.props)
+    const { index, substitution } = this.props
+
+    // If a new substition is associated with this component, reset its state.
+    if (prevProps.index !== index || !isEqual(prevProps.substitution, substitution)) {
       this.setState(extractStateFields(this.props))
     }
   }
@@ -95,7 +89,7 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
   _onClickEdit = () => {
     // Don't start editing on field click if another row is being edited.
     const { activeEditingIndex, index, onBeginEdit } = this.props
-    if (activeEditingIndex === -1) {
+    if (activeEditingIndex === -1 && onBeginEdit) {
       onBeginEdit(index)
     }
   }
@@ -135,51 +129,65 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
     }
   }
 
-  _onRemove = () => this.props.onRemove(this.props.index)
+  _onRemove = () => {
+    const { index, onRemove } = this.props
+    if (onRemove) {
+      onRemove(index)
+    }
+  }
 
   render () {
     const { activeEditingIndex } = this.props
     const { description, normalizeSpace, pattern, replacement } = this.state
-    const isEditing = this._isEditing()
-    const inputStyle = isEditing ? editingInputStyle : defaultInputStyle
     const regexTestLink = `https://regexr.com/?expression=${encodeURIComponent(pattern)}&text=${STRING_FOR_REGEXR_TEST}`
+    const isEditing = this._isEditing()
+    const allowEdit = activeEditingIndex === -1
+    const isEditingInvalid = isSubstitutionInvalid(this.state)
+
+    // Construct CSS class for row
+    const editingClassName = isEditing ? '' : 'inactive'
+    const allowEditClassName = allowEdit ? 'allow-edit' : ''
+    const rowClassName = `substitution-row ${editingClassName} ${allowEditClassName}`
 
     return (
-      <tr>
-        <td style={cellStyle}>
-          <InputGroup style={inputGroupStyle}>
-            <FormControl
-              onChange={this._onChangePattern}
-              onClick={this._onClickEdit}
-              onKeyDown={this._onKeyDown}
-              placeholder='Text (regex) to find'
-              readOnly={!isEditing}
-              style={inputStyle}
-              value={pattern}
-            />
-            <InputGroup.Addon style={inputStyle}>
-              <a
-                href={regexTestLink}
-                target='_blank'
-                title='Test this regex'
-              >
-                <Icon type='flask' />
-              </a>
-            </InputGroup.Addon>
-          </InputGroup>
+      <tr className={rowClassName}>
+        <td>
+          <FormGroup style={{ margin: 0 }} validationState={isEditingInvalid ? 'error' : null}>
+            <InputGroup>
+              <FormControl
+                // eslint-disable-next-line jsx-a11y/no-autofocus
+                autoFocus
+                onChange={this._onChangePattern}
+                onClick={this._onClickEdit}
+                onKeyDown={this._onKeyDown}
+                placeholder='Text (regex) to find'
+                readOnly={!isEditing}
+                title={isEditingInvalid ? 'Substitution search pattern cannot be empty' : null}
+                value={pattern}
+              />
+              <InputGroup.Addon>
+                <a
+                  href={regexTestLink}
+                  target='_blank'
+                  title='Test this regex'
+                >
+                  <Icon type='flask' />
+                </a>
+              </InputGroup.Addon>
+            </InputGroup>
+          </FormGroup>
         </td>
-        <td colSpan='2' style={cellStyle}>
-          <InputGroup style={inputGroupStyle}>
+        <td colSpan='2'>
+          <InputGroup>
             <FormControl
               onChange={this._onChangeReplacement}
               onClick={this._onClickEdit}
               onKeyDown={this._onKeyDown}
               placeholder='<blank>'
               readOnly={!isEditing}
-              style={inputStyle}
               value={replacement}
             />
-            <InputGroup.Addon style={{ ...inputStyle, padding: '0 6px' }}>
+            <InputGroup.Addon style={{ padding: '0 6px' }}>
               <input
                 aria-label='Normalize space'
                 checked={normalizeSpace}
@@ -191,26 +199,26 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
             </InputGroup.Addon>
           </InputGroup>
         </td>
-        <td style={cellStyle}>
+        <td>
           <FormControl
             onChange={this._onChangeDescription}
             onClick={this._onClickEdit}
             onKeyDown={this._onKeyDown}
             placeholder='Optional description'
             readOnly={!isEditing}
-            style={inputStyle}
             value={description}
           />
         </td>
-        <td style={cellStyle}>
+        <td>
           {isEditing
             ? (
               // Show save/discard changes buttons if this row is being edited.
               <ButtonGroup style={buttonGroupStyle}>
                 <Button
                   bsSize='xsmall'
+                  disabled={isEditingInvalid}
                   onClick={this._onClickSave}
-                  title='Save changes in this row'
+                  title={isEditingInvalid ? 'Unable to save, there are errors in this row.' : 'Save changes in this row'}
                 >
                   <Icon type='check' />
                 </Button>
@@ -223,7 +231,7 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
                 </Button>
               </ButtonGroup>
             )
-            : activeEditingIndex === -1 && (
+            : allowEdit && (
               // Show edit/delete if no other row is being edited.
               <ButtonGroup style={buttonGroupStyle}>
                 <Button
diff --git a/lib/style.css b/lib/style.css
index efa2051f4..883cad8f8 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -141,6 +141,31 @@ td.feed-source-info {
   margin-bottom: 5px;
 }
 
+/* Feed transformation substitution styling */
+.substitution-row td {
+  border-top: none;
+}
+
+.substitution-row .input-group {
+  padding: 0;
+}
+
+.substitution-row .form-control, .substitution-row .input-group > * {
+  height: unset;
+  padding: 2px;
+}
+
+.substitution-row.allow-edit:hover .form-control {
+  color: #337ab7;
+  cursor: pointer;
+}
+
+.substitution-row.inactive .form-control, .substitution-row.inactive .input-group > * {
+  background: none;
+  border-color: transparent;
+  box-shadow: none;
+}
+
 /* Feed version status styling */
 .feed-status {
   border-radius: 5px;

From 892a1bd9ca4e38037f1d5b190720ca2790d2b149 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 27 May 2021 15:32:11 -0400
Subject: [PATCH 232/553] refactor(SubstitutionRow): Add comment

---
 lib/manager/components/transform/SubstitutionRow.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index ccc35ec97..cd9c56713 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -155,6 +155,7 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
           <FormGroup style={{ margin: 0 }} validationState={isEditingInvalid ? 'error' : null}>
             <InputGroup>
               <FormControl
+                // Autofocus the pattern field when user begins editing the substitution row.
                 // eslint-disable-next-line jsx-a11y/no-autofocus
                 autoFocus
                 onChange={this._onChangePattern}

From 7b00cee840ea112c6961167dc26b613ec040ddc8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 27 May 2021 17:22:54 -0400
Subject: [PATCH 233/553] fix(FeedTransformation): Revalidate errors if user
 selects a table for transform.

---
 .../components/transform/FeedTransformation.js      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 8e7777ef4..77e33f8d9 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -40,6 +40,8 @@ const transformationTypes = {
   }
 }
 
+const TABLE_MUST_BE_DEFINED_ERROR = 'Table must be defined'
+
 /**
  * Component that renders fields for one feed transformation
  * (e.g., ReplaceFileFromStringTransformation).
@@ -49,6 +51,15 @@ export default class FeedTransformation extends Component<Props, {errors: Array<
     errors: []
   }
 
+  componentDidUpdate (prevProps: Props) {
+    // Update error state if props.transformation.table changed
+    // and 'Table must be defined' no longer applies.
+    const { table } = this.props.transformation
+    if (table && prevProps.transformation.table !== table) {
+      this.setState({ errors: this.state.errors.filter(e => e !== TABLE_MUST_BE_DEFINED_ERROR) })
+    }
+  }
+
   _getFieldsForType = (type: string) => {
     const {feedSource, index, onChange, transformation} = this.props
     const FieldsComponent = transformationTypes[type].component
@@ -66,7 +77,7 @@ export default class FeedTransformation extends Component<Props, {errors: Array<
   _onValidationErrors = (errors: Array<string>) => {
     const issues: Array<string> = []
     if (!this.props.transformation.table) {
-      issues.push('Table must be defined')
+      issues.push(TABLE_MUST_BE_DEFINED_ERROR)
     }
     this.setState({ errors: issues.concat(errors) })
   }

From fadcc23808f74c0321112eb6997242c900ed665a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 27 May 2021 18:14:17 -0400
Subject: [PATCH 234/553] refactor(NormalizeField): Refactor substitutions null
 check.

---
 .../components/transform/NormalizeField.js      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 31a86370c..0dd580608 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -39,6 +39,11 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     this._updateErrors()
   }
 
+  /**
+   * @returns The list of substitutions from backend or at least an empty list.
+   */
+  _getSubstitutions = () => this.props.transformation.substitutions || []
+
   _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
     this._updateTransformation({fieldName: fieldOption.value})
   }
@@ -64,13 +69,12 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   }
 
   _onNewSubstitution = () => {
-    const { substitutions } = this.props.transformation
-    this.setState({ activeEditingIndex: (substitutions || []).length })
+    this.setState({ activeEditingIndex: this._getSubstitutions().length })
   }
 
   _getValidationErrors (fields: NormalizeFieldFields): Array<string> {
     const issues = []
-    const { fieldName, substitutions } = fields
+    const { fieldName } = fields
 
     // fieldName must be defined.
     if (!fieldName || fieldName.length === 0) {
@@ -78,7 +82,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     }
 
     // The pattern for substitutions must not be null or empty.
-    if (substitutions && substitutions.filter(isSubstitutionInvalid).length > 0) {
+    if (this._getSubstitutions().filter(isSubstitutionInvalid).length > 0) {
       issues.push('Substitution patterns must be defined.')
     }
 
@@ -122,10 +126,9 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     const {
       capitalizationExceptions,
       capitalize,
-      fieldName,
-      substitutions: originalSubstitutions
+      fieldName
     } = transformation
-    const substitutions = originalSubstitutions || []
+    const substitutions = this._getSubstitutions()
 
     const capitalizationExceptionList = capitalizationExceptions &&
       capitalizationExceptions.map(s => ({ label: s, value: s }))

From 37738c3e7a0859980e0fedcc363e77a7543682fe Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 28 May 2021 09:51:42 -0400
Subject: [PATCH 235/553] refactor(DeploymentTableRow): fix style, use
 versionCount field

---
 lib/manager/components/deployment/DeploymentTableRow.js | 6 +++---
 lib/types/index.js                                      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/manager/components/deployment/DeploymentTableRow.js b/lib/manager/components/deployment/DeploymentTableRow.js
index 16a83ceb8..90cf44cf5 100644
--- a/lib/manager/components/deployment/DeploymentTableRow.js
+++ b/lib/manager/components/deployment/DeploymentTableRow.js
@@ -95,7 +95,7 @@ class DeploymentTableRow extends Component<ConnectedRowProps> {
           {feedVersionPinned && <Icon type='thumb-tack' />}
         </td>
         <td className={version.id !== latestVersionId ? 'warning' : ''}>
-          <div style={{display: 'flex'}}>
+          <div style={{display: 'flex', minWidth: '100px'}}>
             <Button
               bsSize='xsmall'
               active={feedVersionPinned}
@@ -109,11 +109,11 @@ class DeploymentTableRow extends Component<ConnectedRowProps> {
                 }
                 alt='Toggle pin version' />
             </Button>
-            <div style={{marginLeft: '5px'}}>
+            <div style={{marginLeft: '5px', width: '70%'}}>
               <Select
                 clearable={false}
                 disabled={!isVersionEditable}
-                options={Array.from(Array(feedSource.versions).keys())
+                options={Array.from(Array(feedSource.versionCount).keys())
                   .reverse()
                   .map(n => this._numberToOption(n + 1))
                 }
diff --git a/lib/types/index.js b/lib/types/index.js
index 240af5049..f58bd9337 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -352,7 +352,7 @@ export type Feed = {
   transformRules: Array<FeedTransformRules>,
   url: ?string,
   user: ?any, // TODO: add more exact type
-  versions: number
+  versionCount: number
 }
 
 export type NewFeed = {

From d0514fc59e1767806d4e389d89143d15dc6e0d59 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 28 May 2021 10:16:54 -0400
Subject: [PATCH 236/553] test: update type def/snapshots

---
 __tests__/test-utils/mock-data/manager.js     |  4 +-
 .../__tests__/__snapshots__/projects.js.snap  |  4 +-
 .../__snapshots__/DeploymentsPanel.js.snap    | 24 +++++-----
 .../__snapshots__/FeedSourceTable.js.snap     | 44 +++++++++----------
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index ed1fe0650..2faf1d3c0 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -145,7 +145,7 @@ export const mockFeedWithVersion = {
   transformRules: [],
   url: 'http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip',
   user: null,
-  versions: 1
+  versionCount: 1
 }
 
 // a mock feed with no versions
@@ -168,7 +168,7 @@ export const mockFeedWithoutVersion = {
   transformRules: [],
   url: null,
   user: null,
-  versions: 0
+  versionCount: 0
 }
 
 // a mock feedversion that has validation data
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 0dfef3a75..bce7b3e32 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -73,7 +73,7 @@ Object {
                 "transformRules": Array [],
                 "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                 "user": null,
-                "versions": 1,
+                "versionCount": 1,
               },
               "id": "mock-feed-version-id",
               "nextVersionId": null,
@@ -170,7 +170,7 @@ Object {
           "transformRules": Array [],
           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
           "user": null,
-          "versions": 1,
+          "versionCount": 1,
         },
       ],
       "id": "mock-project-with-deployments-id",
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index e47a3254c..cde1a7a3a 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -86,7 +86,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                   "transformRules": Array [],
                   "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                   "user": null,
-                  "versions": 1,
+                  "versionCount": 1,
                 },
                 "id": "mock-feed-version-id",
                 "nextVersionId": null,
@@ -215,7 +215,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "transformRules": Array [],
             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
             "user": null,
-            "versions": 1,
+            "versionCount": 1,
           },
         ],
         "id": "mock-project-with-deployments-id",
@@ -312,7 +312,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     "transformRules": Array [],
                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                     "user": null,
-                    "versions": 1,
+                    "versionCount": 1,
                   },
                   "id": "mock-feed-version-id",
                   "nextVersionId": null,
@@ -441,7 +441,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "transformRules": Array [],
               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
               "user": null,
-              "versions": 1,
+              "versionCount": 1,
             },
           ],
           "id": "mock-project-with-deployments-id",
@@ -590,7 +590,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                             "transformRules": Array [],
                             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                             "user": null,
-                            "versions": 1,
+                            "versionCount": 1,
                           },
                           "id": "mock-feed-version-id",
                           "nextVersionId": null,
@@ -747,7 +747,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                               "transformRules": Array [],
                               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                               "user": null,
-                              "versions": 1,
+                              "versionCount": 1,
                             },
                             "id": "mock-feed-version-id",
                             "nextVersionId": null,
@@ -876,7 +876,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "transformRules": Array [],
                         "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                         "user": null,
-                        "versions": 1,
+                        "versionCount": 1,
                       },
                     ],
                     "id": "mock-project-with-deployments-id",
@@ -1115,7 +1115,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "transformRules": Array [],
                                       "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                       "user": null,
-                                      "versions": 1,
+                                      "versionCount": 1,
                                     },
                                     "id": "mock-feed-version-id",
                                     "nextVersionId": null,
@@ -1240,7 +1240,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                           "transformRules": Array [],
                                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                           "user": null,
-                                          "versions": 1,
+                                          "versionCount": 1,
                                         },
                                         "id": "mock-feed-version-id",
                                         "nextVersionId": null,
@@ -1369,7 +1369,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "transformRules": Array [],
                                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                     "user": null,
-                                    "versions": 1,
+                                    "versionCount": 1,
                                   },
                                 ],
                                 "id": "mock-project-with-deployments-id",
@@ -1639,7 +1639,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                           "transformRules": Array [],
                                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                           "user": null,
-                                          "versions": 1,
+                                          "versionCount": 1,
                                         },
                                         "id": "mock-feed-version-id",
                                         "nextVersionId": null,
@@ -1768,7 +1768,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "transformRules": Array [],
                                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                     "user": null,
-                                    "versions": 1,
+                                    "versionCount": 1,
                                   },
                                 ],
                                 "id": "mock-project-with-deployments-id",
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index fddc15fcb..4d9414282 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -85,7 +85,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   "transformRules": Array [],
                   "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                   "user": null,
-                  "versions": 1,
+                  "versionCount": 1,
                 },
                 "id": "mock-feed-version-id",
                 "nextVersionId": null,
@@ -182,7 +182,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "transformRules": Array [],
             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
             "user": null,
-            "versions": 1,
+            "versionCount": 1,
           },
         ],
         "id": "mock-project-with-deployments-id",
@@ -250,7 +250,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "transformRules": Array [],
             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
             "user": null,
-            "versions": 1,
+            "versionCount": 1,
           },
         ]
       }
@@ -298,7 +298,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "transformRules": Array [],
             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
             "user": null,
-            "versions": 1,
+            "versionCount": 1,
           },
         ]
       }
@@ -375,7 +375,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "transformRules": Array [],
                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                     "user": null,
-                    "versions": 1,
+                    "versionCount": 1,
                   },
                   "id": "mock-feed-version-id",
                   "nextVersionId": null,
@@ -472,7 +472,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "transformRules": Array [],
               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
               "user": null,
-              "versions": 1,
+              "versionCount": 1,
             },
           ],
           "id": "mock-project-with-deployments-id",
@@ -644,7 +644,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "transformRules": Array [],
                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                           "user": null,
-                          "versions": 1,
+                          "versionCount": 1,
                         },
                         "id": "mock-feed-version-id",
                         "nextVersionId": null,
@@ -741,7 +741,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "transformRules": Array [],
                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                     "user": null,
-                    "versions": 1,
+                    "versionCount": 1,
                   },
                 ],
                 "id": "mock-project-with-deployments-id",
@@ -844,7 +844,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "transformRules": Array [],
                             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                             "user": null,
-                            "versions": 1,
+                            "versionCount": 1,
                           },
                           "id": "mock-feed-version-id",
                           "nextVersionId": null,
@@ -941,7 +941,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "transformRules": Array [],
                       "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                       "user": null,
-                      "versions": 1,
+                      "versionCount": 1,
                     },
                   ],
                   "id": "mock-project-with-deployments-id",
@@ -1062,7 +1062,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "transformRules": Array [],
                               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                               "user": null,
-                              "versions": 1,
+                              "versionCount": 1,
                             },
                             "id": "mock-feed-version-id",
                             "nextVersionId": null,
@@ -1159,7 +1159,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "transformRules": Array [],
                         "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                         "user": null,
-                        "versions": 1,
+                        "versionCount": 1,
                       },
                     ],
                     "id": "mock-project-with-deployments-id",
@@ -2860,7 +2860,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "transformRules": Array [],
                         "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                         "user": null,
-                        "versions": 1,
+                        "versionCount": 1,
                       }
                     }
                     key="mock-feed-with-version-id"
@@ -2934,7 +2934,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   "transformRules": Array [],
                                   "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                   "user": null,
-                                  "versions": 1,
+                                  "versionCount": 1,
                                 },
                                 "id": "mock-feed-version-id",
                                 "nextVersionId": null,
@@ -3031,7 +3031,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "transformRules": Array [],
                             "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                             "user": null,
-                            "versions": 1,
+                            "versionCount": 1,
                           },
                         ],
                         "id": "mock-project-with-deployments-id",
@@ -3124,7 +3124,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "transformRules": Array [],
                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                           "user": null,
-                          "versions": 1,
+                          "versionCount": 1,
                         }
                       }
                       project={
@@ -3197,7 +3197,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "transformRules": Array [],
                                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                     "user": null,
-                                    "versions": 1,
+                                    "versionCount": 1,
                                   },
                                   "id": "mock-feed-version-id",
                                   "nextVersionId": null,
@@ -3294,7 +3294,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "transformRules": Array [],
                               "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                               "user": null,
-                              "versions": 1,
+                              "versionCount": 1,
                             },
                           ],
                           "id": "mock-project-with-deployments-id",
@@ -3442,7 +3442,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "transformRules": Array [],
                                 "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                 "user": null,
-                                "versions": 1,
+                                "versionCount": 1,
                               }
                             }
                           >
@@ -3672,7 +3672,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "transformRules": Array [],
                                 "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                 "user": null,
-                                "versions": 1,
+                                "versionCount": 1,
                               }
                             }
                             project={
@@ -3745,7 +3745,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           "transformRules": Array [],
                                           "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                           "user": null,
-                                          "versions": 1,
+                                          "versionCount": 1,
                                         },
                                         "id": "mock-feed-version-id",
                                         "nextVersionId": null,
@@ -3842,7 +3842,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "transformRules": Array [],
                                     "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
                                     "user": null,
-                                    "versions": 1,
+                                    "versionCount": 1,
                                   },
                                 ],
                                 "id": "mock-project-with-deployments-id",

From 7897565431e26ddcb393990c0b00951fac42a6ac Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 28 May 2021 10:18:09 -0400
Subject: [PATCH 237/553] refactor(NormalizeField): Make substitutions and
 capitalizationExceptions non-null.

---
 .../components/transform/NormalizeField.js     | 18 +++++++-----------
 lib/types/index.js                             |  4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 0dd580608..bcba3698f 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -39,11 +39,6 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     this._updateErrors()
   }
 
-  /**
-   * @returns The list of substitutions from backend or at least an empty list.
-   */
-  _getSubstitutions = () => this.props.transformation.substitutions || []
-
   _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
     this._updateTransformation({fieldName: fieldOption.value})
   }
@@ -69,7 +64,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   }
 
   _onNewSubstitution = () => {
-    this.setState({ activeEditingIndex: this._getSubstitutions().length })
+    this.setState({ activeEditingIndex: this.props.transformation.substitutions.length })
   }
 
   _getValidationErrors (fields: NormalizeFieldFields): Array<string> {
@@ -82,7 +77,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     }
 
     // The pattern for substitutions must not be null or empty.
-    if (this._getSubstitutions().filter(isSubstitutionInvalid).length > 0) {
+    if (this.props.transformation.substitutions.filter(isSubstitutionInvalid).length > 0) {
       issues.push('Substitution patterns must be defined.')
     }
 
@@ -126,12 +121,13 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     const {
       capitalizationExceptions,
       capitalize,
-      fieldName
+      fieldName,
+      substitutions
     } = transformation
-    const substitutions = this._getSubstitutions()
 
-    const capitalizationExceptionList = capitalizationExceptions &&
-      capitalizationExceptions.map(s => ({ label: s, value: s }))
+    const capitalizationExceptionList = capitalizationExceptions.map(
+      text => ({ label: text, value: text })
+    )
     const capitalizationExceptionListId = `capitalizationExceptionList-${index}`
 
     const normalizeTooltip = (
diff --git a/lib/types/index.js b/lib/types/index.js
index 39a89af63..58dc7cba8 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -299,10 +299,10 @@ export type Substitution = {
 }
 
 export type NormalizeFieldFields = {
-  capitalizationExceptions?: Array<string>,
+  capitalizationExceptions: Array<string>,
   capitalize?: boolean,
   fieldName?: string,
-  substitutions?: Array<Substitution>
+  substitutions: Array<Substitution>
 }
 
 export type ReplaceFileFromStringFields = {

From 93b1f538244205cadc912686a4cfb23d3c26e2e3 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Tue, 1 Jun 2021 16:47:17 +0100
Subject: [PATCH 238/553] improvement(OatternStopCard.js lib/gtfs/util/index.js
 lib/types/index.js): Update to the GTFS Spec U

Added the changes where applicable to the gtfs.yml file. Added the new types for continuous drop
off/pick up and added fields as well as basic validation in the patternStopCard file.

BREAKING CHANGE: There have been added fields that need to coincide with changes on the backend as
the api will be looking for the new fields and those fields need to be present on the Front end

#663
---
 .../components/pattern/PatternStopCard.js     | 156 +++++++++++++++++-
 lib/gtfs/util/index.js                        |   2 +
 lib/types/index.js                            |   2 +
 3 files changed, 158 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index 4ae24cdf5..ee3ba637b 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -3,7 +3,7 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import { DragSource, DropTarget } from 'react-dnd'
-import { Row, Col, Collapse, FormGroup, ControlLabel, Checkbox } from 'react-bootstrap'
+import { Row, Col, Collapse, FormGroup, ControlLabel, Checkbox, FormControl } from 'react-bootstrap'
 
 import * as activeActions from '../../actions/active'
 import * as stopStrategiesActions from '../../actions/map/stopStrategies'
@@ -246,12 +246,90 @@ class PatternStopContents extends Component<Props, State> {
     updatePatternStops(activePattern, patternStops)
   }
 
+  _onPickupChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    const newPickup: number = parseInt(evt.target.value)
+    const {activePattern, index, updatePatternStops} = this.props
+    const patternStops = [...activePattern.patternStops]
+
+    patternStops[index].pickupType = newPickup
+    this.setState({update: true})
+    updatePatternStops(activePattern, patternStops)
+  }
+
+  _onDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    const newDropOff: number = parseInt(evt.target.value)
+    const {activePattern, index, updatePatternStops} = this.props
+    const patternStops = [...activePattern.patternStops]
+
+    patternStops[index].dropOffType = newDropOff
+    this.setState({update: true})
+    updatePatternStops(activePattern, patternStops)
+  }
+
+  _onContinuousPickupChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    const newPickup: number = parseInt(evt.target.value)
+    const {activePattern, index, updatePatternStops} = this.props
+    const patternStops = [...activePattern.patternStops]
+
+    patternStops[index].continuousPickup = newPickup
+    this.setState({update: true})
+    updatePatternStops(activePattern, patternStops)
+  }
+ 
+  _onContinuousDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    const newPickup: number = parseInt(evt.target.value)
+    const {activePattern, index, updatePatternStops} = this.props
+    const patternStops = [...activePattern.patternStops]
+
+    patternStops[index].continuousDropOff = newPickup
+    this.setState({update: true})
+    updatePatternStops(activePattern, patternStops)
+  }
+
   render () {
-    const {active, patternEdited, patternStop} = this.props
+    const {active, activePattern, patternEdited, patternStop} = this.props
     // This component has a special shouldComponentUpdate to ensure that state
     // is not overwritten with new props, so use state.update to check edited
     // state.
     const isEdited = patternEdited || this.state.update
+    const hasShapeId = activePattern.shapeId !== null ? false : true
+    const pickupDropoffOptions = [
+      {
+        value: 0,
+        text: 'Regularly scheduled (0)'
+      },
+      {
+        value: 1,
+        text: 'Not available (1)'
+      },
+      {
+        value: 2,
+        text: 'Must phone agency to arrange (2)'
+      },
+      {
+        value: 3,
+        text: 'Must coordinate with driver to arrange (3)'
+      }
+    ]
+    const continuousPickupDropoffOptions = [
+      {
+        value: 0,
+        text: 'Continuous stopping pickup (0)'
+      },
+      {
+        value: 1,
+        text: 'Not available (1)'
+      },
+      {
+        value: 2,
+        text: 'Must phone agency to arrange (2)'
+      },
+      {
+        value: 3,
+        text: 'Must coordinate with driver to arrange (3)'
+      }
+    ]
+
     let innerDiv
     if (active) {
       innerDiv = <div>
@@ -301,6 +379,80 @@ class PatternStopContents extends Component<Props, State> {
             </FormGroup>
           </Col>
         </Row>
+        {/* Pickup and drop off type selectors */}
+        <Row>
+          <Col xs={6}>
+            <FormGroup
+              controlId='pickupType'
+              bsSize='small'>
+              <ControlLabel
+                className='small'
+                title='Define the pickup method/availability at this stop.'
+              >
+                Pickup type
+              </ControlLabel>
+              <FormControl componentClass='select' placeholder='select' value={patternStop.pickupType} onChange={this._onPickupChange}>
+                {pickupDropoffOptions.map(o => (
+                  <option key={o.value} value={o.value}>{o.text}</option>
+                ))}
+              </FormControl>
+            </FormGroup>
+          </Col>
+          <Col xs={6}>
+            <FormGroup
+              controlId='dropoffType'
+              bsSize='small'>
+              <ControlLabel
+                className='small'
+                title='Define the dropff method/availability at this stop.'
+              >
+                Drop-off type
+              </ControlLabel>
+              <FormControl componentClass='select' placeholder='select' value={patternStop.dropOffType} onChange={this._onDropOffChange}>
+                {pickupDropoffOptions.map(o => (
+                  <option key={o.value} value={o.value}>{o.text}</option>
+                ))}
+              </FormControl>
+            </FormGroup>
+          </Col>
+        </Row>
+        {/* Continuous Stopping Pickup and drop off type selectors */}
+        <Row>
+          <Col xs={6}>
+            <FormGroup
+              controlId='continuous_pick-up'
+              bsSize='small'>
+              <ControlLabel
+                className='small'
+                title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
+              >
+                  Continuous Pickup
+              </ControlLabel>
+              <FormControl componentClass='select' placeholder='select' disabled={hasShapeId} defaultValue={1} value={patternStop.continuousPickup} onChange={this._onContinuousPickupChange}>
+                {continuousPickupDropoffOptions.map(o => (
+                  <option key={o.value} value={o.value}>{o.text}</option>
+                ))}
+              </FormControl>
+            </FormGroup>
+          </Col>
+          <Col xs={6}>
+            <FormGroup
+              controlId='continuous_drop_off'
+              bsSize='small'>
+              <ControlLabel
+                className='small'
+                title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
+              >
+                  Continuous Drop off
+              </ControlLabel>
+              <FormControl componentClass='select' disabled={hasShapeId} placeholder='select' defaultValue={1} value={patternStop.continuousDropOff} onChange={this._onContinuousDropOffChange}>
+                {continuousPickupDropoffOptions.map(o => (
+                  <option key={o.value} value={o.value}>{o.text}</option>
+                ))}
+              </FormControl>
+            </FormGroup>
+          </Col>
+        </Row>
         <NormalizeStopTimesTip />
       </div>
     }
diff --git a/lib/gtfs/util/index.js b/lib/gtfs/util/index.js
index 20fd5d4ab..a65575e91 100644
--- a/lib/gtfs/util/index.js
+++ b/lib/gtfs/util/index.js
@@ -79,6 +79,8 @@ export function getGraphQLFieldsForEntity (type: string, editor: boolean = false
     pickup_type
     drop_off_type
     timepoint
+    continuous_pickup
+    continuous_drop_off
   }`
   switch (type.toLowerCase()) {
     case 'stoptime':
diff --git a/lib/types/index.js b/lib/types/index.js
index 0f3c411c2..1fefb02fb 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -492,6 +492,8 @@ export type GeoJsonFeatureCollection = {
 }
 
 export type PatternStop = {
+  continuousDropOff: number,
+  continuousPickup: number,
   defaultDwellTime: number,
   defaultTravelTime: number,
   dropOffType: number,

From 5397f4ac998d19ccb009e1fde609b6e3895b4691 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Tue, 1 Jun 2021 17:00:16 +0100
Subject: [PATCH 239/553] refactor(patternStopCard.js): Refactored code from
 github feedback

Removed spaces. Improved boolean ternary

#663
---
 lib/editor/components/pattern/PatternStopCard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index ee3ba637b..f5dc23c7c 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -275,7 +275,7 @@ class PatternStopContents extends Component<Props, State> {
     this.setState({update: true})
     updatePatternStops(activePattern, patternStops)
   }
- 
+
   _onContinuousDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     const newPickup: number = parseInt(evt.target.value)
     const {activePattern, index, updatePatternStops} = this.props
@@ -292,7 +292,7 @@ class PatternStopContents extends Component<Props, State> {
     // is not overwritten with new props, so use state.update to check edited
     // state.
     const isEdited = patternEdited || this.state.update
-    const hasShapeId = activePattern.shapeId !== null ? false : true
+    const hasShapeId = activePattern.shapeId === null
     const pickupDropoffOptions = [
       {
         value: 0,

From 6a29237e0f4838671580e71cc22a39f9f4d302c8 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 2 Jun 2021 09:38:02 -0400
Subject: [PATCH 240/553] refactor(MergeFeedsResult): add strategy to modal

---
 lib/manager/actions/status.js | 11 +++++++++--
 lib/types/index.js            |  4 ++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index f51ae531b..11816ee33 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -7,6 +7,7 @@ import { createAction, type ActionType } from 'redux-actions'
 import { createVoidPayloadAction, secureFetch } from '../../common/actions'
 import {API_PREFIX} from '../../common/constants'
 import {isExtensionEnabled} from '../../common/util/config'
+import toSentenceCase from '../../common/util/to-sentence-case'
 import { fetchDeployment } from './deployments'
 import { fetchFeedSource } from './feeds'
 import { fetchProjectWithFeeds } from './projects'
@@ -137,13 +138,19 @@ export async function fetchAppInfo () {
   }
 }
 
+/**
+ * Constructs modal content from an service period merge (principally used for
+ * MTC).
+ */
 function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
   const details = []
+  const mergeStrategy = toSentenceCase(result.mergeStrategy).replace(/_/g, ' ')
+  details.push(`Strategy used: ${mergeStrategy}`)
   // Do nothing or show merged feed modal? Feed version is be created
   details.push('Remapped ID count: ' + result.remappedReferences)
   if (Object.keys(result.remappedIds).length > 0) {
     const remappedIdStrings = []
-    for (let key in result.remappedIds) {
+    for (const key in result.remappedIds) {
       // Modify key to remove feed name.
       const split = key.split(':')
       const tableAndId = split.splice(1, 1)
@@ -159,7 +166,7 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
       skippedRecordsForTables[table] = (skippedRecordsForTables[table] || 0) + 1
     })
     const skippedRecordsStrings = []
-    for (let key in skippedRecordsForTables) {
+    for (const key in skippedRecordsForTables) {
       skippedRecordsStrings.push(`${key} - ${skippedRecordsForTables[key]}`)
     }
     details.push('Skipped records: ' + skippedRecordsStrings.join(', '))
diff --git a/lib/types/index.js b/lib/types/index.js
index 27563f786..f3a4cafa4 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -970,6 +970,10 @@ export type MergeFeedsResult = {
   failureReasons: String[],
   feedCount: number,
   idConflicts: String[],
+  mergeStrategy: 'DEFAULT' |
+    'EXTEND_FUTURE' |
+    'FAIL_DUE_TO_MATCHING_TRIP_IDS' |
+    'CHECK_STOP_TIMES',
   recordsSkipCount: number,
   remappedIds: { [string]: string },
   remappedReferences: number,

From ad6bfe69c73fc43f332d9f42a0a728d95d280b61 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Wed, 2 Jun 2021 15:17:22 +0100
Subject: [PATCH 241/553] refactor(end-to-end.js map.js index.js): Fix errors

Changed wheelchairBoarding to a string. Added continuous fields to the map.js.

#663
---
 __tests__/end-to-end.js | 2 +-
 lib/editor/util/map.js  | 2 ++
 lib/types/index.js      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index 81c6efe2c..dd083ca9a 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -418,7 +418,7 @@ async function createStop ({
     option: number
   },
   url: string,
-  wheelchairBoarding?: number, // make optional due to https://github.com/facebook/flow/issues/183
+  wheelchairBoarding?: string, // make optional due to https://github.com/facebook/flow/issues/183
   zoneId?: string // make optional due to https://github.com/facebook/flow/issues/183
 }) {
   log.info(`creating stop with name: ${name}`)
diff --git a/lib/editor/util/map.js b/lib/editor/util/map.js
index 6dd7e3636..3abb91bfe 100644
--- a/lib/editor/util/map.js
+++ b/lib/editor/util/map.js
@@ -754,6 +754,8 @@ export function stopToPatternStop (
     id: generateUID(),
     stopSequence,
     stopId: stop.stop_id,
+    continuousDropOff: 1,
+    continuousPickup: 1,
     defaultDwellTime: 0,
     defaultTravelTime: 0,
     dropOffType: 0,
diff --git a/lib/types/index.js b/lib/types/index.js
index 1fefb02fb..b27c7bc69 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -89,7 +89,7 @@ export type Route = {
   routeTextColor: string,
   routeUrl: string,
   status: string,
-  wheelchairBoarding: number
+  wheelchairBoarding: string
 }
 
 export type Calendar = {|

From a3cf3c32412fe664a6130cf721b667d6518c55d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Jun 2021 19:13:56 +0000
Subject: [PATCH 242/553] build(deps): bump auth0-lock from 11.27.1 to 11.30.1

Bumps [auth0-lock](https://github.com/auth0/lock) from 11.27.1 to 11.30.1.
- [Release notes](https://github.com/auth0/lock/releases)
- [Changelog](https://github.com/auth0/lock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/lock/compare/v11.27.1...v11.30.1)

---
updated-dependencies:
- dependency-name: auth0-lock
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 179 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 119 insertions(+), 60 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3fba7c05b..dc6e3c0bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2038,27 +2038,28 @@ attr-accept@^1.0.3:
   dependencies:
     core-js "^2.5.0"
 
-auth0-js@^9.13.3, auth0-js@^9.3.2:
-  version "9.13.4"
-  resolved "https://registry.yarnpkg.com/auth0-js/-/auth0-js-9.13.4.tgz#e5238ca8ea45b6f172eb917accf570a8bb9f4d0a"
-  integrity sha512-G7wXTtEUe8OG5UMdcFPoS47odorEZ3WerNyWLLhoGlLqYcPgv0t+B0ECHv/rVLULbpctbSBrRFFYa43/bJV4+Q==
+auth0-js@^9.16.2, auth0-js@^9.3.2:
+  version "9.16.2"
+  resolved "https://registry.yarnpkg.com/auth0-js/-/auth0-js-9.16.2.tgz#7c4ca32add3d8f7419ce33deb8f4839179606779"
+  integrity sha512-cF1nRjmMDezmhJ+ZwwYp23F0gPqU0zNmF/VvTpcwvCrEMl9lAvkCd4iburN1I7G8SYaaIYEfcGedCphpDZw6OQ==
   dependencies:
     base64-js "^1.3.0"
-    idtoken-verifier "^2.0.3"
+    idtoken-verifier "^2.1.2"
     js-cookie "^2.2.0"
     qs "^6.7.0"
-    superagent "^3.8.3"
+    superagent "^5.3.1"
     url-join "^4.0.1"
     winchan "^0.2.2"
 
 auth0-lock@^11.27.1:
-  version "11.27.1"
-  resolved "https://registry.yarnpkg.com/auth0-lock/-/auth0-lock-11.27.1.tgz#942301f61561f67caf40894104e8b3dfd8c67876"
-  integrity sha512-qUa6f+rQJgTI3vCw8jDQA6m91TXiTYCQM9FLINyMRFKYvcJ/gIE1E5jMEll84miaAkXVWU8X+1vC7UHiRx8epA==
+  version "11.30.1"
+  resolved "https://registry.yarnpkg.com/auth0-lock/-/auth0-lock-11.30.1.tgz#919eba463576ae8ff3e6b2b7a188dce4f52a529b"
+  integrity sha512-ytnCDPChVc5DnJLsTqeq5I99lPn1QeMAdjqDMteXpKIm+LvQ8vp/mRmnvm1hOJ0ev0fKLd2w9QRGOvh0M85TUg==
   dependencies:
-    auth0-js "^9.13.3"
+    auth0-js "^9.16.2"
     auth0-password-policies "^1.0.2"
     blueimp-md5 "2.3.1"
+    dompurify "^2.2.8"
     immutable "^3.7.3"
     jsonp "^0.2.1"
     password-sheriff "^1.1.0"
@@ -2067,9 +2068,9 @@ auth0-lock@^11.27.1:
     react "^15.6.2"
     react-dom "^15.6.2"
     react-transition-group "^2.2.1"
-    trim "0.0.1"
+    trim "1.0.0"
     url-join "^1.1.0"
-    validator "^13.1.1"
+    validator "^13.6.0"
 
 auth0-password-policies@^1.0.2:
   version "1.0.2"
@@ -2804,6 +2805,14 @@ cachedir@2.1.0:
   resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.1.0.tgz#b448c32b44cd9c0cd6ce4c419fa5b3c112c02191"
   integrity sha512-xGBpPqoBvn3unBW7oxgb8aJn42K0m9m1/wyjmazah10Fq7bROGG3kRAE6OIyr3U3PIJUqGuebhCEdMk9OKJG0A==
 
+call-bind@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 call-limit@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.1.tgz#ef15f2670db3f1992557e2d965abc459e6e358d4"
@@ -3273,7 +3282,7 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0:
     lodash.memoize "~3.0.3"
     source-map "~0.5.3"
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -3331,12 +3340,7 @@ component-classes@^1.2.5:
   dependencies:
     component-indexof "0.0.3"
 
-component-emitter@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
-component-emitter@^1.2.1:
+component-emitter@^1.2.1, component-emitter@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -3533,7 +3537,7 @@ cookie@0.3.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
   integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
 
-cookiejar@^2.1.0:
+cookiejar@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
   integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==
@@ -3749,7 +3753,7 @@ crypto-browserify@^3.0.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-crypto-js@^3.2.1:
+crypto-js@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b"
   integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==
@@ -4381,6 +4385,11 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
+dompurify@^2.2.8:
+  version "2.2.9"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.9.tgz#4b42e244238032d9286a0d2c87b51313581d9624"
+  integrity sha512-+9MqacuigMIZ+1+EwoEltogyWGFTJZWU3258Rupxs+2CGs4H914G9er6pZbsme/bvb5L67o2rade9n21e4RW/w==
+
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
@@ -5349,6 +5358,11 @@ fast-levenshtein@~2.0.4:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fast-safe-stringify@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
+  integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
+
 fastq@^1.6.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947"
@@ -5592,7 +5606,16 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@^2.3.1, form-data@~2.3.2:
+form-data@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
+form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
   integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
@@ -5601,10 +5624,10 @@ form-data@^2.3.1, form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-formidable@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.1.tgz#70fb7ca0290ee6ff961090415f4b3df3d2082659"
-  integrity sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==
+formidable@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9"
+  integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==
 
 forwarded@~0.1.2:
   version "0.1.2"
@@ -5848,6 +5871,15 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
 
+get-intrinsic@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-ports@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-ports/-/get-ports-1.0.3.tgz#f40bd580aca7ec0efb7b96cbfcbeb03ef894b5e8"
@@ -6170,6 +6202,11 @@ has-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
   integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
 
+has-symbols@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+
 has-unicode@^2.0.0, has-unicode@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -6469,13 +6506,13 @@ iconv-lite@0.4.8:
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.8.tgz#c6019a7595f2cefca702eab694a010bcd9298d20"
   integrity sha1-xgGadZXyzvynAuq2lKAQvNkpjSA=
 
-idtoken-verifier@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/idtoken-verifier/-/idtoken-verifier-2.0.3.tgz#b60a933848900c9f684e6296332f62e5f2e79360"
-  integrity sha512-X1izD2ZTMoo+2tw2RKVUvvCSw2B6UOCNMJ0bgHRH758LFTMwBf4JZfCZm61MPBaBW2CIuhkcSnKCZP6jXpSDmw==
+idtoken-verifier@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/idtoken-verifier/-/idtoken-verifier-2.1.2.tgz#185ec29b70400b47a1d48b068e7b95d1bbf7dcef"
+  integrity sha512-YMHiP9zAMjB+pWreV4EHnIj3XCQ168+InWirVRFeRtlsMQIK61S+LLnyLGI8EL0wtlk/v7ya69Gjfio3P9/7Gw==
   dependencies:
     base64-js "^1.3.0"
-    crypto-js "^3.2.1"
+    crypto-js "3.3.0"
     es6-promise "^4.2.8"
     jsbn "^1.1.0"
     unfetch "^4.1.0"
@@ -8903,7 +8940,7 @@ messageformat@^2.2.1:
     messageformat-formatters "^2.0.1"
     messageformat-parser "^4.1.2"
 
-methods@^1.1.1, methods@~1.1.2:
+methods@^1.1.2, methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
@@ -8984,7 +9021,7 @@ mime@1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@1.6.0, mime@^1.4.1:
+mime@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -9004,6 +9041,11 @@ mime@^2.4.3:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
   integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
 
+mime@^2.4.6:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
+  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -9853,6 +9895,11 @@ object-inspect@^1.6.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
   integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
 
+object-inspect@^1.9.0:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
+  integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
+
 object-is@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
@@ -11478,10 +11525,12 @@ qs@6.5.2, qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-qs@^6.2.1, qs@^6.5.1, qs@^6.7.0:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz#20082c65cb78223635ab1a9eaca8875a29bf8ec9"
-  integrity sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==
+qs@^6.2.1, qs@^6.5.1, qs@^6.7.0, qs@^6.9.4:
+  version "6.10.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
+  integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
+  dependencies:
+    side-channel "^1.0.4"
 
 query-string@^4.2.2, query-string@^4.2.3:
   version "4.3.4"
@@ -12160,7 +12209,7 @@ read@1, read@^1.0.4, read@~1.0.1, read@~1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -13110,6 +13159,15 @@ shpjs@^3.3.2:
     parsedbf "^1.0.0"
     proj4 "^2.1.4"
 
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -13730,21 +13788,22 @@ subarg@^1.0.0:
   dependencies:
     minimist "^1.1.0"
 
-superagent@^3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128"
-  integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==
+superagent@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-5.3.1.tgz#d62f3234d76b8138c1320e90fa83dc1850ccabf1"
+  integrity sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==
   dependencies:
-    component-emitter "^1.2.0"
-    cookiejar "^2.1.0"
-    debug "^3.1.0"
-    extend "^3.0.0"
-    form-data "^2.3.1"
-    formidable "^1.2.0"
-    methods "^1.1.1"
-    mime "^1.4.1"
-    qs "^6.5.1"
-    readable-stream "^2.3.5"
+    component-emitter "^1.3.0"
+    cookiejar "^2.1.2"
+    debug "^4.1.1"
+    fast-safe-stringify "^2.0.7"
+    form-data "^3.0.0"
+    formidable "^1.2.2"
+    methods "^1.1.2"
+    mime "^2.4.6"
+    qs "^6.9.4"
+    readable-stream "^3.6.0"
+    semver "^7.3.2"
 
 supports-color@1.3.1:
   version "1.3.1"
@@ -14217,10 +14276,10 @@ trim-right@^1.0.1:
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
-trim@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
-  integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
+trim@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim/-/trim-1.0.0.tgz#fd1f30b878bdd2d8435fa0f2cc9cbb55f518be7d"
+  integrity sha512-UgtES1lYpE+f4WiGY5lyJlHchuGhTa/xMPH96g/B7gc+pEQPiL41s6ECm7Ky3hkhARG/u1SHGFcleJodAvQOKQ==
 
 truncate@^2.0.0:
   version "2.0.1"
@@ -14748,10 +14807,10 @@ validator@7.0.0:
   resolved "https://registry.yarnpkg.com/validator/-/validator-7.0.0.tgz#c74deb8063512fac35547938e6f0b1504a282fd2"
   integrity sha1-x03rgGNRL6w1VHk45vCxUEooL9I=
 
-validator@^13.1.1:
-  version "13.1.17"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-13.1.17.tgz#ad677736950adddd3c37209484a6b2e0966579ad"
-  integrity sha512-zL5QBoemJ3jYFb2/j38y7ljhwYGXVLUp8H6W1nVxadnAOvUOytec+L7BHh1oBQ82/TzWXHd+GSaxUWp4lROkLg==
+validator@^13.6.0:
+  version "13.6.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059"
+  integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg==
 
 vary@~1.1.2:
   version "1.1.2"

From 6a9e2ed6403c6e130e599ff100c657e8bea77347 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 7 Jun 2021 17:41:19 +0100
Subject: [PATCH 243/553] refactor(PatternStopCard.js): Refactored based on PR
 Feedback.

---
 .../components/pattern/PatternStopCard.js     | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index f5dc23c7c..7efad9373 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -3,7 +3,15 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import { DragSource, DropTarget } from 'react-dnd'
-import { Row, Col, Collapse, FormGroup, ControlLabel, Checkbox, FormControl } from 'react-bootstrap'
+import {
+  Checkbox,
+  Col,
+  Collapse,
+  ControlLabel,
+  FormControl,
+  FormGroup,
+  Row
+} from 'react-bootstrap'
 
 import * as activeActions from '../../actions/active'
 import * as stopStrategiesActions from '../../actions/map/stopStrategies'
@@ -277,11 +285,11 @@ class PatternStopContents extends Component<Props, State> {
   }
 
   _onContinuousDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const newPickup: number = parseInt(evt.target.value)
+    const newDropOff: number = parseInt(evt.target.value)
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]
 
-    patternStops[index].continuousDropOff = newPickup
+    patternStops[index].continuousDropOff = newDropOff
     this.setState({update: true})
     updatePatternStops(activePattern, patternStops)
   }
@@ -296,25 +304,7 @@ class PatternStopContents extends Component<Props, State> {
     const pickupDropoffOptions = [
       {
         value: 0,
-        text: 'Regularly scheduled (0)'
-      },
-      {
-        value: 1,
-        text: 'Not available (1)'
-      },
-      {
-        value: 2,
-        text: 'Must phone agency to arrange (2)'
-      },
-      {
-        value: 3,
-        text: 'Must coordinate with driver to arrange (3)'
-      }
-    ]
-    const continuousPickupDropoffOptions = [
-      {
-        value: 0,
-        text: 'Continuous stopping pickup (0)'
+        text: 'Available (0)'
       },
       {
         value: 1,
@@ -428,8 +418,15 @@ class PatternStopContents extends Component<Props, State> {
               >
                   Continuous Pickup
               </ControlLabel>
-              <FormControl componentClass='select' placeholder='select' disabled={hasShapeId} defaultValue={1} value={patternStop.continuousPickup} onChange={this._onContinuousPickupChange}>
-                {continuousPickupDropoffOptions.map(o => (
+              <FormControl
+                componentClass='select'
+                placeholder='select'
+                disabled={hasShapeId}
+                defaultValue={1}
+                value={patternStop.continuousPickup}
+                onChange={this._onContinuousPickupChange}
+              >
+                {pickupDropoffOptions.map(o => (
                   <option key={o.value} value={o.value}>{o.text}</option>
                 ))}
               </FormControl>
@@ -445,8 +442,15 @@ class PatternStopContents extends Component<Props, State> {
               >
                   Continuous Drop off
               </ControlLabel>
-              <FormControl componentClass='select' disabled={hasShapeId} placeholder='select' defaultValue={1} value={patternStop.continuousDropOff} onChange={this._onContinuousDropOffChange}>
-                {continuousPickupDropoffOptions.map(o => (
+              <FormControl
+                componentClass='select'
+                disabled={hasShapeId}
+                placeholder='select'
+                defaultValue={1}
+                value={patternStop.continuousDropOff}
+                onChange={this._onContinuousDropOffChange}
+              >
+                {pickupDropoffOptions.map(o => (
                   <option key={o.value} value={o.value}>{o.text}</option>
                 ))}
               </FormControl>

From b30a941e97828d9c5dd447725a2aaad0eb3e9980 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Tue, 8 Jun 2021 17:57:11 +0100
Subject: [PATCH 244/553] refactor(PatternStopCard.js): REfactor

Consolidated duplicate methods into a facade type pattern

#663
---
 .../components/pattern/PatternStopCard.js     | 83 +++++++++----------
 1 file changed, 38 insertions(+), 45 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index 7efad9373..00b7cc99f 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -254,42 +254,29 @@ class PatternStopContents extends Component<Props, State> {
     updatePatternStops(activePattern, patternStops)
   }
 
-  _onPickupChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const newPickup: number = parseInt(evt.target.value)
-    const {activePattern, index, updatePatternStops} = this.props
-    const patternStops = [...activePattern.patternStops]
-
-    patternStops[index].pickupType = newPickup
-    this.setState({update: true})
-    updatePatternStops(activePattern, patternStops)
-  }
+  _onPickupOrDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+    const selectOptionType: string = evt.target.id
+    const selectedOptionValue: number = parseInt(evt.target.value)
 
-  _onDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const newDropOff: number = parseInt(evt.target.value)
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]
 
-    patternStops[index].dropOffType = newDropOff
-    this.setState({update: true})
-    updatePatternStops(activePattern, patternStops)
-  }
-
-  _onContinuousPickupChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const newPickup: number = parseInt(evt.target.value)
-    const {activePattern, index, updatePatternStops} = this.props
-    const patternStops = [...activePattern.patternStops]
-
-    patternStops[index].continuousPickup = newPickup
-    this.setState({update: true})
-    updatePatternStops(activePattern, patternStops)
-  }
-
-  _onContinuousDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const newDropOff: number = parseInt(evt.target.value)
-    const {activePattern, index, updatePatternStops} = this.props
-    const patternStops = [...activePattern.patternStops]
-
-    patternStops[index].continuousDropOff = newDropOff
+    switch (selectOptionType) {
+      case 'continuous_pick-up':
+        patternStops[index].continuousPickup = selectedOptionValue
+        break
+      case 'continuous_drop_off':
+        patternStops[index].continuousDropOff = selectedOptionValue
+        break
+      case 'pickup_type':
+        patternStops[index].pickupType = selectedOptionValue
+        break
+      case 'drop_off_type':
+        patternStops[index].dropOffType = selectedOptionValue
+        break
+      default:
+        return null
+    }
     this.setState({update: true})
     updatePatternStops(activePattern, patternStops)
   }
@@ -373,15 +360,19 @@ class PatternStopContents extends Component<Props, State> {
         <Row>
           <Col xs={6}>
             <FormGroup
-              controlId='pickupType'
+              controlId='pickup_type'
               bsSize='small'>
               <ControlLabel
                 className='small'
                 title='Define the pickup method/availability at this stop.'
               >
-                Pickup type
+                Pickup
               </ControlLabel>
-              <FormControl componentClass='select' placeholder='select' value={patternStop.pickupType} onChange={this._onPickupChange}>
+              <FormControl
+                componentClass='select'
+                onChange={this._onPickupOrDropOffChange}
+                placeholder='select'
+                value={patternStop.pickupType}>
                 {pickupDropoffOptions.map(o => (
                   <option key={o.value} value={o.value}>{o.text}</option>
                 ))}
@@ -390,15 +381,19 @@ class PatternStopContents extends Component<Props, State> {
           </Col>
           <Col xs={6}>
             <FormGroup
-              controlId='dropoffType'
+              controlId='drop_off_type'
               bsSize='small'>
               <ControlLabel
                 className='small'
                 title='Define the dropff method/availability at this stop.'
               >
-                Drop-off type
+                Drop-off
               </ControlLabel>
-              <FormControl componentClass='select' placeholder='select' value={patternStop.dropOffType} onChange={this._onDropOffChange}>
+              <FormControl
+                componentClass='select'
+                onChange={this._onPickupOrDropOffChange}
+                placeholder='select'
+                value={patternStop.dropOffType}>
                 {pickupDropoffOptions.map(o => (
                   <option key={o.value} value={o.value}>{o.text}</option>
                 ))}
@@ -416,15 +411,14 @@ class PatternStopContents extends Component<Props, State> {
                 className='small'
                 title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
               >
-                  Continuous Pickup
+                  Continuous pickup
               </ControlLabel>
               <FormControl
                 componentClass='select'
-                placeholder='select'
                 disabled={hasShapeId}
-                defaultValue={1}
+                onChange={this._onPickupOrDropOffChange}
+                placeholder='select'
                 value={patternStop.continuousPickup}
-                onChange={this._onContinuousPickupChange}
               >
                 {pickupDropoffOptions.map(o => (
                   <option key={o.value} value={o.value}>{o.text}</option>
@@ -440,15 +434,14 @@ class PatternStopContents extends Component<Props, State> {
                 className='small'
                 title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
               >
-                  Continuous Drop off
+                Continuous drop-off
               </ControlLabel>
               <FormControl
                 componentClass='select'
                 disabled={hasShapeId}
+                onChange={this._onPickupOrDropOffChange}
                 placeholder='select'
-                defaultValue={1}
                 value={patternStop.continuousDropOff}
-                onChange={this._onContinuousDropOffChange}
               >
                 {pickupDropoffOptions.map(o => (
                   <option key={o.value} value={o.value}>{o.text}</option>

From bbb63bc07e50f4ea33515656ef8311702c911898 Mon Sep 17 00:00:00 2001
From: Evan Siroky <evan.siroky@yahoo.com>
Date: Tue, 8 Jun 2021 10:07:07 -0700
Subject: [PATCH 245/553] chore: update issue template wording

---
 .github/issue_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/issue_template.md b/.github/issue_template.md
index 6239fc4fb..6fd56471c 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,4 +1,4 @@
-_**NOTE:** This issue system is intended for reporting bugs and tracking progress in software development. Although this software is licensed with an open-source license, any issue opened here may not be responded to in a timely manner. [IBI Group](https://www.ibigroup.com/) is able to provide technical support for custom deployments of this software. Please contact [Ritesh Warade](mailto:ritesh.warade@ibigroup.com?subject=Data%20Tools%20inquiry%20via%20GitHub&body=Name:%20%0D%0AAgency/Company:%20%0D%0ABest%20date/time%20for%20a%20demo/discussion:%20%0D%0ADescription%20of%20needs:%20) if your company is interested in opening a support contract with us. Please remove this note when creating the issue._
+_**NOTE:** This issue system is intended for reporting bugs and tracking progress in software development. Although this software is licensed with an open-source license, any issue opened here may not be dealt with in a timely manner. [IBI Group](https://www.ibigroup.com/) is able to provide technical support for custom deployments of this software. Please contact [Ritesh Warade](mailto:ritesh.warade@ibigroup.com?subject=Data%20Tools%20inquiry%20via%20GitHub&body=Name:%20%0D%0AAgency/Company:%20%0D%0ABest%20date/time%20for%20a%20demo/discussion:%20%0D%0ADescription%20of%20needs:%20) if your company or organization is interested in opening a support contract with us. Please remove this note when creating the issue._
 
 ## Observed behavior (please include a screenshot if possible)
 

From c4cf1153b19c1ea363c9f11db906d60459e94388 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Wed, 9 Jun 2021 16:03:03 +0100
Subject: [PATCH 246/553] refactor(PatternStopCard.js): Refactored drop down
 select method

The select IDs were changed to matcth the api patternstop model and then there was no need for the
switch block

#371
---
 .../components/pattern/PatternStopCard.js     | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index 00b7cc99f..c17562c87 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -255,28 +255,28 @@ class PatternStopContents extends Component<Props, State> {
   }
 
   _onPickupOrDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const selectOptionType: string = evt.target.id
     const selectedOptionValue: number = parseInt(evt.target.value)
 
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]
 
-    switch (selectOptionType) {
-      case 'continuous_pick-up':
-        patternStops[index].continuousPickup = selectedOptionValue
-        break
-      case 'continuous_drop_off':
-        patternStops[index].continuousDropOff = selectedOptionValue
-        break
-      case 'pickup_type':
-        patternStops[index].pickupType = selectedOptionValue
-        break
-      case 'drop_off_type':
-        patternStops[index].dropOffType = selectedOptionValue
-        break
-      default:
-        return null
-    }
+    patternStops[index][evt.target.id] = selectedOptionValue
+ 
+    // switch (selectOptionType) {
+    //   case 'continuous_pick-up':
+    //     break
+    //   case 'continuousDropOff':
+    //     patternStops[index].continuousDropOff = selectedOptionValue
+    //     break
+    //   case 'pickup_type':
+    //     patternStops[index].pickupType = selectedOptionValue
+    //     break
+    //   case 'drop_off_type':
+    //     patternStops[index].dropOffType = selectedOptionValue
+    //     break
+    //   default:
+    //     return null
+    // }
     this.setState({update: true})
     updatePatternStops(activePattern, patternStops)
   }
@@ -360,7 +360,7 @@ class PatternStopContents extends Component<Props, State> {
         <Row>
           <Col xs={6}>
             <FormGroup
-              controlId='pickup_type'
+              controlId='pickupType'
               bsSize='small'>
               <ControlLabel
                 className='small'
@@ -381,7 +381,7 @@ class PatternStopContents extends Component<Props, State> {
           </Col>
           <Col xs={6}>
             <FormGroup
-              controlId='drop_off_type'
+              controlId='dropOffType'
               bsSize='small'>
               <ControlLabel
                 className='small'
@@ -405,7 +405,7 @@ class PatternStopContents extends Component<Props, State> {
         <Row>
           <Col xs={6}>
             <FormGroup
-              controlId='continuous_pick-up'
+              controlId='continuousPickup'
               bsSize='small'>
               <ControlLabel
                 className='small'
@@ -428,7 +428,7 @@ class PatternStopContents extends Component<Props, State> {
           </Col>
           <Col xs={6}>
             <FormGroup
-              controlId='continuous_drop_off'
+              controlId='continuousDropOff'
               bsSize='small'>
               <ControlLabel
                 className='small'

From 36a759d43d6d0bf99df2b084f42daf4d9281e793 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Wed, 9 Jun 2021 16:40:54 +0100
Subject: [PATCH 247/553] refactor(PatternStopCard.js): Fix lint errors

---
 .../components/pattern/PatternStopCard.js      | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index c17562c87..db1f4f7f9 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -256,27 +256,9 @@ class PatternStopContents extends Component<Props, State> {
 
   _onPickupOrDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     const selectedOptionValue: number = parseInt(evt.target.value)
-
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]
-
     patternStops[index][evt.target.id] = selectedOptionValue
- 
-    // switch (selectOptionType) {
-    //   case 'continuous_pick-up':
-    //     break
-    //   case 'continuousDropOff':
-    //     patternStops[index].continuousDropOff = selectedOptionValue
-    //     break
-    //   case 'pickup_type':
-    //     patternStops[index].pickupType = selectedOptionValue
-    //     break
-    //   case 'drop_off_type':
-    //     patternStops[index].dropOffType = selectedOptionValue
-    //     break
-    //   default:
-    //     return null
-    // }
     this.setState({update: true})
     updatePatternStops(activePattern, patternStops)
   }

From 8d8fdc5183d35c3440203c9dbceb97c26d4a66c0 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 10 Jun 2021 12:52:44 -0400
Subject: [PATCH 248/553] refactor(status): update strategy messages; use i18n

---
 i18n/english.yml              | 17 +++++++++
 lib/manager/actions/status.js | 67 +++++++++++++++++++++++------------
 2 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 1e48eddef..105735993 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -450,6 +450,23 @@ components:
     placeholder: Select language...
   Login:
     title: Log in
+  MergeFeedsResult:
+    body:
+      failure: Merge failed with $errorCount errors.
+      success: Merge was completed successfully. A new version will be processed/validated containing the resulting feed.
+    idConflicts: ID conflicts
+    remappedIdCount: Remapped ID count
+    remappedIds: Remapped IDs
+    skipped: Skipped records
+    strategyUsed: Strategy used
+    DEFAULT: 'Condition 1: Both feeds have non-matching service IDs and trip IDs - future feed appended to active feed'
+    EXTEND_FUTURE: 'Condition 2: Both feeds have same service IDs and trip IDs - future feed starts from active feed start date'
+    CHECK_STOP_TIMES: 'Condition 3: Matching service IDs, partial non matching trip IDs - non matching trip IDs included, merged feed extends from active start date to future end date'
+    FAIL_DUE_TO_MATCHING_TRIP_IDS: 'Condition 4: Merge failed due non matching service IDs and matching trip IDs'
+    title:
+      failure: 'Warning: Errors encountered during feed merge!'
+      success: 'Feed merge was successful!'
+
   NormalizeStopTimesTip:
     info: "Tip: when changing travel times, consider
     using the 'Normalize stop times' button above to automatically update
diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index 11816ee33..138d6aa92 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -1,13 +1,13 @@
 // @flow
 
+import * as React from 'react'
 import moment from 'moment'
 import { browserHistory } from 'react-router'
 import { createAction, type ActionType } from 'redux-actions'
 
 import { createVoidPayloadAction, secureFetch } from '../../common/actions'
 import {API_PREFIX} from '../../common/constants'
-import {isExtensionEnabled} from '../../common/util/config'
-import toSentenceCase from '../../common/util/to-sentence-case'
+import {getComponentMessages, isExtensionEnabled} from '../../common/util/config'
 import { fetchDeployment } from './deployments'
 import { fetchFeedSource } from './feeds'
 import { fetchProjectWithFeeds } from './projects'
@@ -25,7 +25,7 @@ type ErrorMessage = {
 
 type ModalContent = {
   action?: any,
-  body: string,
+  body: string | React.Node,
   detail?: any,
   title: string
 }
@@ -143,24 +143,39 @@ export async function fetchAppInfo () {
  * MTC).
  */
 function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
+  const SEPARATOR = ': '
+  const {
+    errorCount,
+    failed,
+    failureReasons,
+    idConflicts,
+    mergeStrategy,
+    remappedIds,
+    remappedReferences,
+    skippedIds
+  } = result
+  const messages = getComponentMessages('MergeFeedsResult')
   const details = []
-  const mergeStrategy = toSentenceCase(result.mergeStrategy).replace(/_/g, ' ')
-  details.push(`Strategy used: ${mergeStrategy}`)
+  details.push(
+    [messages('strategyUsed'), messages(mergeStrategy)].join(SEPARATOR)
+  )
   // Do nothing or show merged feed modal? Feed version is be created
-  details.push('Remapped ID count: ' + result.remappedReferences)
-  if (Object.keys(result.remappedIds).length > 0) {
+  details.push([messages('remappedIdCount'), remappedReferences].join(SEPARATOR))
+  if (Object.keys(remappedIds).length > 0) {
     const remappedIdStrings = []
-    for (const key in result.remappedIds) {
+    for (const key in remappedIds) {
       // Modify key to remove feed name.
       const split = key.split(':')
       const tableAndId = split.splice(1, 1)
-      remappedIdStrings.push(`${tableAndId.join(':')} -> ${result.remappedIds[key]}`)
+      remappedIdStrings.push(`${tableAndId.join(':')} -> ${remappedIds[key]}`)
     }
-    details.push('Remapped IDs: ' + remappedIdStrings.join(', '))
+    details.push(
+      [messages('remappedIds'), remappedIdStrings.join(', ')].join(SEPARATOR)
+    )
   }
-  if (result.skippedIds.length > 0) {
+  if (skippedIds.length > 0) {
     const skippedRecordsForTables = {}
-    result.skippedIds.forEach(id => {
+    skippedIds.forEach(id => {
       const table = id.split(':')[0]
       // Increment count of skipped records for each value found per table.
       skippedRecordsForTables[table] = (skippedRecordsForTables[table] || 0) + 1
@@ -169,19 +184,27 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
     for (const key in skippedRecordsForTables) {
       skippedRecordsStrings.push(`${key} - ${skippedRecordsForTables[key]}`)
     }
-    details.push('Skipped records: ' + skippedRecordsStrings.join(', '))
+    details.push(
+      [messages('skipped'), skippedRecordsStrings.join(', ')].join(SEPARATOR)
+    )
   }
-  if (result.idConflicts.length > 0) {
-    // const conflicts = result.idConflicts
-    details.push('ID conflicts: ' + result.idConflicts.join(', '))
+  if (idConflicts.length > 0) {
+    details.push(
+      [messages('idConflicts'), idConflicts.join(', ')].join(SEPARATOR)
+    )
   }
   return {
-    title: result.failed
-      ? 'Warning: Errors encountered during feed merge!'
-      : 'Feed merge was successful!',
-    body: result.failed
-      ? `Merge failed with ${result.errorCount} errors. ${result.failureReasons.join(', ')}`
-      : `Merge was completed successfully. A new version will be processed/validated containing the resulting feed.`,
+    title: failed
+      ? messages('title.failure')
+      : messages('title.success'),
+    body: failed
+      ? <div>
+        {messages('body.failure').replace('$errorCount', errorCount.toString())}
+        <ul>
+          {failureReasons.map((r, i) => <li key={i}>{r}</li>)}
+        </ul>
+      </div>
+      : messages('body.success'),
     detail: details.join('\n')
   }
 }

From e6095644d7736e81229be948ef1efa473e389513 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 10 Jun 2021 16:52:19 -0400
Subject: [PATCH 249/553] refactor: update messages for merge feeds

---
 i18n/english.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 105735993..7bb0d4bec 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -459,10 +459,10 @@ components:
     remappedIds: Remapped IDs
     skipped: Skipped records
     strategyUsed: Strategy used
-    DEFAULT: 'Condition 1: Both feeds have non-matching service IDs and trip IDs - future feed appended to active feed'
-    EXTEND_FUTURE: 'Condition 2: Both feeds have same service IDs and trip IDs - future feed starts from active feed start date'
-    CHECK_STOP_TIMES: 'Condition 3: Matching service IDs, partial non matching trip IDs - non matching trip IDs included, merged feed extends from active start date to future end date'
-    FAIL_DUE_TO_MATCHING_TRIP_IDS: 'Condition 4: Merge failed due non matching service IDs and matching trip IDs'
+    DEFAULT: 'Condition 1: Feeds had unique service IDs and trip IDs - future feed was appended to active feed'
+    EXTEND_FUTURE: 'Feeds had matching service IDs and trip IDs - future feed took precedence and was extended to the active feed's start date'
+    CHECK_STOP_TIMES: 'Feeds had matching service IDs, but not all trip IDs were unique - matching trips will span the active and future service period and unique trips will be included under modified service IDs'
+    FAIL_DUE_TO_MATCHING_TRIP_IDS: 'Merge failed due to unique service IDs, yet trip IDs that match exactly'
     title:
       failure: 'Warning: Errors encountered during feed merge!'
       success: 'Feed merge was successful!'

From 88dfe63efaad34794f2476a8fa6234c1ff999cbf Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 10 Jun 2021 16:56:42 -0400
Subject: [PATCH 250/553] refactor: fix message quotation

---
 i18n/english.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 7bb0d4bec..b8cbece8d 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -460,9 +460,9 @@ components:
     skipped: Skipped records
     strategyUsed: Strategy used
     DEFAULT: 'Condition 1: Feeds had unique service IDs and trip IDs - future feed was appended to active feed'
-    EXTEND_FUTURE: 'Feeds had matching service IDs and trip IDs - future feed took precedence and was extended to the active feed's start date'
-    CHECK_STOP_TIMES: 'Feeds had matching service IDs, but not all trip IDs were unique - matching trips will span the active and future service period and unique trips will be included under modified service IDs'
-    FAIL_DUE_TO_MATCHING_TRIP_IDS: 'Merge failed due to unique service IDs, yet trip IDs that match exactly'
+    EXTEND_FUTURE: "Condition 2: Feeds had matching service IDs and trip IDs - future feed took precedence and was extended to the active feed's start date"
+    CHECK_STOP_TIMES: 'Condition 3: Feeds had matching service IDs, but not all trip IDs were unique - matching trips will span the active and future service period and unique trips will be included under modified service IDs'
+    FAIL_DUE_TO_MATCHING_TRIP_IDS: 'Condition 4: Merge failed due to unique service IDs, yet trip IDs that match exactly'
     title:
       failure: 'Warning: Errors encountered during feed merge!'
       success: 'Feed merge was successful!'

From a3d19daf5856ae291fd646b863768744de03b891 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Fri, 11 Jun 2021 15:19:53 -0400
Subject: [PATCH 251/553] refactor(status): fix inconsistent spacing

---
 lib/manager/actions/status.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index 138d6aa92..7849f71c5 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -6,8 +6,8 @@ import { browserHistory } from 'react-router'
 import { createAction, type ActionType } from 'redux-actions'
 
 import { createVoidPayloadAction, secureFetch } from '../../common/actions'
-import {API_PREFIX} from '../../common/constants'
-import {getComponentMessages, isExtensionEnabled} from '../../common/util/config'
+import { API_PREFIX } from '../../common/constants'
+import { getComponentMessages, isExtensionEnabled } from '../../common/util/config'
 import { fetchDeployment } from './deployments'
 import { fetchFeedSource } from './feeds'
 import { fetchProjectWithFeeds } from './projects'

From 93c1062cafb437489f8015a023e412153ab10b5e Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:30:29 -0400
Subject: [PATCH 252/553] fix(SubstitutionRow): Add feedback for invalid
 substitution patterns.

---
 .../components/transform/NormalizeField.js    | 17 ++++++++-
 .../components/transform/SubstitutionRow.js   | 38 ++++++++++++++-----
 lib/types/index.js                            |  1 +
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index bcba3698f..76a2998f2 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -14,7 +14,7 @@ import {
 import Select from 'react-select'
 
 import GtfsFieldSelector from '../GtfsFieldSelector'
-import SubstitutionRow, { isSubstitutionInvalid } from './SubstitutionRow'
+import SubstitutionRow, { isSubstitutionBlank, isSubstitutionInvalid } from './SubstitutionRow'
 
 import type {
   NormalizeFieldFields,
@@ -39,6 +39,12 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     this._updateErrors()
   }
 
+  componentDidUpdate (prevProps: TransformProps<NormalizeFieldFields>) {
+    if (prevProps.transformation !== this.props.transformation) {
+      this._updateErrors()
+    }
+  }
+
   _onChangeFieldToNormalize = (fieldOption: ReactSelectOption) => {
     this._updateTransformation({fieldName: fieldOption.value})
   }
@@ -70,6 +76,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   _getValidationErrors (fields: NormalizeFieldFields): Array<string> {
     const issues = []
     const { fieldName } = fields
+    const { substitutions } = this.props.transformation
 
     // fieldName must be defined.
     if (!fieldName || fieldName.length === 0) {
@@ -77,10 +84,15 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
     }
 
     // The pattern for substitutions must not be null or empty.
-    if (this.props.transformation.substitutions.filter(isSubstitutionInvalid).length > 0) {
+    if (substitutions.filter(isSubstitutionBlank).length > 0) {
       issues.push('Substitution patterns must be defined.')
     }
 
+    // The pattern for substitutions must be valid.
+    if (substitutions.filter(isSubstitutionInvalid).length > 0) {
+      issues.push('Some substitution patterns are invalid.')
+    }
+
     return issues
   }
 
@@ -233,6 +245,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
                 onChange={this._onChangeSubstitution}
                 onEndEdit={this._onEndEditSubstitution}
                 substitution={{
+                  invalid: false,
                   pattern: '',
                   replacement: ''
                 }}
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index cd9c56713..f9141db27 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -29,9 +29,10 @@ const buttonGroupStyle = { width: '60px' }
  * Extract just the subset of fields to build the state variable.
  */
 function extractStateFields (props: Props): Substitution {
-  const { description, normalizeSpace, pattern, replacement } = props.substitution
+  const { description, invalid, normalizeSpace, pattern, replacement } = props.substitution
   return {
     description: description || '',
+    invalid,
     normalizeSpace,
     pattern,
     replacement
@@ -41,10 +42,17 @@ function extractStateFields (props: Props): Substitution {
 /**
  * @returns true if the given substitution pattern is null or empty, false otherwise.
  */
-export function isSubstitutionInvalid (substitution: Substitution) {
+export function isSubstitutionBlank (substitution: Substitution) {
   return !substitution.pattern || substitution.pattern === ''
 }
 
+/**
+ * @returns true if the given substitution is marked invalid by the backend, false otherwise.
+ */
+export function isSubstitutionInvalid (substitution: Substitution) {
+  return substitution.invalid
+}
+
 /**
  * Renders and lets user edit a substitution.
  */
@@ -137,18 +145,29 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
   }
 
   render () {
-    const { activeEditingIndex } = this.props
-    const { description, normalizeSpace, pattern, replacement } = this.state
+    const { activeEditingIndex, substitution: originalSubstitution } = this.props
+    const { description, invalid, normalizeSpace, pattern, replacement } = this.state
     const regexTestLink = `https://regexr.com/?expression=${encodeURIComponent(pattern)}&text=${STRING_FOR_REGEXR_TEST}`
     const isEditing = this._isEditing()
     const allowEdit = activeEditingIndex === -1
-    const isEditingInvalid = isSubstitutionInvalid(this.state)
+    const isPatternBlank = isSubstitutionBlank(this.state)
+    const isPatternInvalid = invalid && pattern === originalSubstitution.pattern
+    const isEditingInvalid = isPatternBlank || isPatternInvalid
+    let validationMessage = null
+    if (isPatternBlank) {
+      validationMessage = 'The substitution search pattern cannot be empty'
+    } else if (isPatternInvalid) {
+      validationMessage = `The substitution search pattern '${originalSubstitution.pattern}' is invalid`
+    }
 
     // Construct CSS class for row
     const editingClassName = isEditing ? '' : 'inactive'
     const allowEditClassName = allowEdit ? 'allow-edit' : ''
     const rowClassName = `substitution-row ${editingClassName} ${allowEditClassName}`
 
+    // Override style for inputs with invalid search patterns.
+    const patternStyleOverride = isPatternInvalid ? { borderColor: 'inherit' } : null
+
     return (
       <tr className={rowClassName}>
         <td>
@@ -163,10 +182,11 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
                 onKeyDown={this._onKeyDown}
                 placeholder='Text (regex) to find'
                 readOnly={!isEditing}
-                title={isEditingInvalid ? 'Substitution search pattern cannot be empty' : null}
+                style={patternStyleOverride}
+                title={validationMessage}
                 value={pattern}
               />
-              <InputGroup.Addon>
+              <InputGroup.Addon style={patternStyleOverride}>
                 <a
                   href={regexTestLink}
                   target='_blank'
@@ -217,9 +237,9 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
               <ButtonGroup style={buttonGroupStyle}>
                 <Button
                   bsSize='xsmall'
-                  disabled={isEditingInvalid}
+                  disabled={isPatternInvalid}
                   onClick={this._onClickSave}
-                  title={isEditingInvalid ? 'Unable to save, there are errors in this row.' : 'Save changes in this row'}
+                  title={isPatternInvalid ? 'Unable to save, there are errors in this row.' : 'Save changes in this row'}
                 >
                   <Icon type='check' />
                 </Button>
diff --git a/lib/types/index.js b/lib/types/index.js
index 27563f786..057636bcd 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -301,6 +301,7 @@ export type FetchFrequency = $Values<typeof FETCH_FREQUENCIES>
 
 export type Substitution = {
   description?: string,
+  invalid: boolean,
   normalizeSpace?: boolean,
   pattern: string,
   replacement: string

From 5a5b78d14c8886cb766f86c1ce42ca59738f299c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Jun 2021 19:22:10 +0000
Subject: [PATCH 253/553] build(deps): bump postcss from 7.0.17 to 7.0.36

Bumps [postcss](https://github.com/postcss/postcss) from 7.0.17 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.17...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 298d2471a..ff7cc6060 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10940,9 +10940,9 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     uniq "^1.0.1"
 
 postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
-  version "7.0.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
-  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
+  version "7.0.36"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
+  integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"

From 5a981d63d09ff5387716249e55e2eb341f8282b1 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 16 Jun 2021 15:51:47 -0400
Subject: [PATCH 254/553] fix(NormalizeField): Adjust for changes from backend.

---
 .../components/transform/NormalizeField.js    | 70 ++++++++++++++++---
 .../components/transform/SubstitutionRow.js   | 18 ++---
 lib/types/index.js                            |  4 +-
 3 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index 76a2998f2..a01968502 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -1,6 +1,7 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
+import { isEqual } from 'lodash'
 import React, { Component } from 'react'
 import {
   Button,
@@ -24,7 +25,33 @@ import type {
 } from '../../../types'
 
 type State = {
-  activeEditingIndex: number
+  activeEditingIndex: number,
+  // Holds the contents that should be shown in the SubstitutionRow component.
+  activeSubstitution: ?Substitution,
+  // Last edited contents.
+  previousEditingIndex: number,
+  previousSubstitution: ?Substitution
+}
+
+/**
+ * Determines whether two substitutions are equal (except for the valid field).
+ */
+function areEqual (sub1: ?Substitution, sub2: ?Substitution): boolean {
+  if (!sub1 || !sub2) return false
+  return isEqual(
+    {
+      description: sub1.description,
+      normalizeSpace: sub1.normalizeSpace,
+      pattern: sub1.pattern,
+      replacement: sub1.replacement
+    },
+    {
+      description: sub2.description,
+      normalizeSpace: sub2.normalizeSpace,
+      pattern: sub2.pattern,
+      replacement: sub2.replacement
+    }
+  )
 }
 
 /**
@@ -32,7 +59,10 @@ type State = {
  */
 export default class NormalizeField extends Component<TransformProps<NormalizeFieldFields>, State> {
   state = {
-    activeEditingIndex: -1
+    activeEditingIndex: -1,
+    activeSubstitution: null,
+    previousEditingIndex: -1,
+    previousSubstitution: null
   }
 
   componentDidMount () {
@@ -42,6 +72,21 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   componentDidUpdate (prevProps: TransformProps<NormalizeFieldFields>) {
     if (prevProps.transformation !== this.props.transformation) {
       this._updateErrors()
+
+      // If user entered an invalid substitution pattern and clicks save,
+      // it will be rejected and the values entered will be lost.
+      // To avoid that, keep the new row visible and in editing state.
+      const { previousEditingIndex, previousSubstitution: editedSubstitution } = this.state
+      const loadedSubstitution = this.props.transformation.substitutions[previousEditingIndex]
+      if (previousEditingIndex !== -1 && !areEqual(editedSubstitution, loadedSubstitution)) {
+        this.setState({
+          activeEditingIndex: previousEditingIndex,
+          activeSubstitution: {
+            ...editedSubstitution,
+            valid: false
+          }
+        })
+      }
     }
   }
 
@@ -60,12 +105,17 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   _onChangeSubstitution = (substitution: Substitution, index: number) => {
     const newSubstitutions = [].concat(this.props.transformation.substitutions)
     newSubstitutions[index] = substitution
+    this.setState({
+      activeSubstitution: null,
+      previousSubstitution: substitution
+    })
     this._updateTransformation({substitutions: newSubstitutions})
   }
 
   _onRemoveSubstitution = (index: number) => {
     const newSubstitutions = [].concat(this.props.transformation.substitutions)
     newSubstitutions.splice(index, 1)
+    this.setState({ previousEditingIndex: -1 })
     this._updateTransformation({substitutions: newSubstitutions})
   }
 
@@ -101,7 +151,11 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
   }
 
   _onEndEditSubstitution = () => {
-    this.setState({ activeEditingIndex: -1 })
+    this.setState({
+      activeEditingIndex: -1,
+      activeSubstitution: null,
+      previousEditingIndex: this.state.activeEditingIndex
+    })
   }
 
   /**
@@ -129,7 +183,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
 
   render () {
     const { index, transformation } = this.props
-    const { activeEditingIndex } = this.state
+    const { activeEditingIndex, activeSubstitution } = this.state
     const {
       capitalizationExceptions,
       capitalize,
@@ -233,7 +287,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
                 onChange={this._onChangeSubstitution}
                 onEndEdit={this._onEndEditSubstitution}
                 onRemove={this._onRemoveSubstitution}
-                substitution={s}
+                substitution={activeEditingIndex === i ? (activeSubstitution || s) : s}
               />
             ))}
             {activeEditingIndex === substitutions.length &&
@@ -244,10 +298,10 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
                 key={activeEditingIndex}
                 onChange={this._onChangeSubstitution}
                 onEndEdit={this._onEndEditSubstitution}
-                substitution={{
-                  invalid: false,
+                substitution={activeSubstitution || {
                   pattern: '',
-                  replacement: ''
+                  replacement: '',
+                  valid: true
                 }}
               />
             }
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index f9141db27..383e1ef0f 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -29,13 +29,13 @@ const buttonGroupStyle = { width: '60px' }
  * Extract just the subset of fields to build the state variable.
  */
 function extractStateFields (props: Props): Substitution {
-  const { description, invalid, normalizeSpace, pattern, replacement } = props.substitution
+  const { description, normalizeSpace, pattern, replacement, valid } = props.substitution
   return {
     description: description || '',
-    invalid,
-    normalizeSpace,
+    normalizeSpace: normalizeSpace || false,
     pattern,
-    replacement
+    replacement,
+    valid
   }
 }
 
@@ -50,7 +50,7 @@ export function isSubstitutionBlank (substitution: Substitution) {
  * @returns true if the given substitution is marked invalid by the backend, false otherwise.
  */
 export function isSubstitutionInvalid (substitution: Substitution) {
-  return substitution.invalid
+  return !substitution.valid
 }
 
 /**
@@ -66,7 +66,7 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
     const { index, substitution } = this.props
 
     // If a new substition is associated with this component, reset its state.
-    if (prevProps.index !== index || !isEqual(prevProps.substitution, substitution)) {
+    if (prevProps.index !== index || prevProps.substitution !== substitution) {
       this.setState(extractStateFields(this.props))
     }
   }
@@ -146,12 +146,12 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
 
   render () {
     const { activeEditingIndex, substitution: originalSubstitution } = this.props
-    const { description, invalid, normalizeSpace, pattern, replacement } = this.state
+    const { description, normalizeSpace, pattern, replacement, valid } = this.state
     const regexTestLink = `https://regexr.com/?expression=${encodeURIComponent(pattern)}&text=${STRING_FOR_REGEXR_TEST}`
     const isEditing = this._isEditing()
     const allowEdit = activeEditingIndex === -1
     const isPatternBlank = isSubstitutionBlank(this.state)
-    const isPatternInvalid = invalid && pattern === originalSubstitution.pattern
+    const isPatternInvalid = !valid && pattern === originalSubstitution.pattern
     const isEditingInvalid = isPatternBlank || isPatternInvalid
     let validationMessage = null
     if (isPatternBlank) {
@@ -166,7 +166,7 @@ export default class SubstitutionRow extends Component<Props, Substitution> {
     const rowClassName = `substitution-row ${editingClassName} ${allowEditClassName}`
 
     // Override style for inputs with invalid search patterns.
-    const patternStyleOverride = isPatternInvalid ? { borderColor: 'inherit' } : null
+    const patternStyleOverride = isPatternInvalid ? { borderColor: '#a94442' } : null
 
     return (
       <tr className={rowClassName}>
diff --git a/lib/types/index.js b/lib/types/index.js
index 057636bcd..e9fa2aee1 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -301,10 +301,10 @@ export type FetchFrequency = $Values<typeof FETCH_FREQUENCIES>
 
 export type Substitution = {
   description?: string,
-  invalid: boolean,
   normalizeSpace?: boolean,
   pattern: string,
-  replacement: string
+  replacement: string,
+  valid: boolean
 }
 
 export type NormalizeFieldFields = {

From cf0d3a024691f9841665e88aba94cd027048044b Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 17 Jun 2021 18:27:43 -0400
Subject: [PATCH 255/553] refactor(NormalizeField): Address PR comments

---
 .../components/transform/NormalizeField.js      |  7 ++++---
 .../components/transform/SubstitutionRow.js     | 16 ++--------------
 lib/manager/util/transform.js                   | 17 ++++++++++++++++-
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/lib/manager/components/transform/NormalizeField.js b/lib/manager/components/transform/NormalizeField.js
index a01968502..7cb4a4ef2 100644
--- a/lib/manager/components/transform/NormalizeField.js
+++ b/lib/manager/components/transform/NormalizeField.js
@@ -15,7 +15,8 @@ import {
 import Select from 'react-select'
 
 import GtfsFieldSelector from '../GtfsFieldSelector'
-import SubstitutionRow, { isSubstitutionBlank, isSubstitutionInvalid } from './SubstitutionRow'
+import SubstitutionRow from './SubstitutionRow'
+import { isSubstitutionBlank, isSubstitutionInvalid } from '../../util/transform'
 
 import type {
   NormalizeFieldFields,
@@ -36,7 +37,7 @@ type State = {
 /**
  * Determines whether two substitutions are equal (except for the valid field).
  */
-function areEqual (sub1: ?Substitution, sub2: ?Substitution): boolean {
+function areSubstitutionsEqual (sub1: ?Substitution, sub2: ?Substitution): boolean {
   if (!sub1 || !sub2) return false
   return isEqual(
     {
@@ -78,7 +79,7 @@ export default class NormalizeField extends Component<TransformProps<NormalizeFi
       // To avoid that, keep the new row visible and in editing state.
       const { previousEditingIndex, previousSubstitution: editedSubstitution } = this.state
       const loadedSubstitution = this.props.transformation.substitutions[previousEditingIndex]
-      if (previousEditingIndex !== -1 && !areEqual(editedSubstitution, loadedSubstitution)) {
+      if (previousEditingIndex !== -1 && !areSubstitutionsEqual(editedSubstitution, loadedSubstitution)) {
         this.setState({
           activeEditingIndex: previousEditingIndex,
           activeSubstitution: {
diff --git a/lib/manager/components/transform/SubstitutionRow.js b/lib/manager/components/transform/SubstitutionRow.js
index 383e1ef0f..08bf5a3d7 100644
--- a/lib/manager/components/transform/SubstitutionRow.js
+++ b/lib/manager/components/transform/SubstitutionRow.js
@@ -5,6 +5,8 @@ import { isEqual } from 'lodash'
 import React, { Component } from 'react'
 import { Button, ButtonGroup, FormControl, FormGroup, InputGroup } from 'react-bootstrap'
 
+import { isSubstitutionBlank } from '../../util/transform'
+
 import type {
   Substitution
 } from '../../../types'
@@ -39,20 +41,6 @@ function extractStateFields (props: Props): Substitution {
   }
 }
 
-/**
- * @returns true if the given substitution pattern is null or empty, false otherwise.
- */
-export function isSubstitutionBlank (substitution: Substitution) {
-  return !substitution.pattern || substitution.pattern === ''
-}
-
-/**
- * @returns true if the given substitution is marked invalid by the backend, false otherwise.
- */
-export function isSubstitutionInvalid (substitution: Substitution) {
-  return !substitution.valid
-}
-
 /**
  * Renders and lets user edit a substitution.
  */
diff --git a/lib/manager/util/transform.js b/lib/manager/util/transform.js
index a15aa9de3..039f18ad4 100644
--- a/lib/manager/util/transform.js
+++ b/lib/manager/util/transform.js
@@ -3,7 +3,8 @@ import {getComponentMessages} from '../../common/util/config'
 
 import type {
   FeedTransformation,
-  FeedVersion
+  FeedVersion,
+  Substitution
 } from '../../types'
 
 /**
@@ -68,3 +69,17 @@ export function getTransformationPlaceholder (
     ? messages(`general.${placeholderId}`)
     : message
 }
+
+/**
+ * @returns true if the given substitution pattern is null or empty, false otherwise.
+ */
+export function isSubstitutionBlank (substitution: Substitution) {
+  return !substitution.pattern || substitution.pattern === ''
+}
+
+/**
+ * @returns true if the given substitution is marked invalid by the backend, false otherwise.
+ */
+export function isSubstitutionInvalid (substitution: Substitution) {
+  return !substitution.valid
+}

From f15532072f52ef381fc1327d0899c3f01738bfc9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 21 Jun 2021 09:53:59 -0400
Subject: [PATCH 256/553] chore(lint): Add pre-commit hook to enforce
 formatting.

---
 .husky/.gitignore |   1 +
 .husky/pre-commit |   4 +
 package.json      |   8 ++
 yarn.lock         | 288 +++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 296 insertions(+), 5 deletions(-)
 create mode 100644 .husky/.gitignore
 create mode 100755 .husky/pre-commit

diff --git a/.husky/.gitignore b/.husky/.gitignore
new file mode 100644
index 000000000..31354ec13
--- /dev/null
+++ b/.husky/.gitignore
@@ -0,0 +1 @@
+_
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 000000000..c37466e2b
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged
\ No newline at end of file
diff --git a/package.json b/package.json
index 15c7374a9..6b942eaaf 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "flow": "mastarm flow",
     "lint": "mastarm lint __mocks__ __tests__ lib scripts --quiet",
     "lint-messages": "node scripts/lint-messages.js",
+    "postinstall": "husky install",
     "predeploy": "yarn",
     "prestart": "yarn",
     "semantic-release": "semantic-release --prepare false --publish @semantic-release/github --verify-conditions @semantic-release/github",
@@ -128,9 +129,11 @@
     "flow-bin": "0.84",
     "flow-coverage-report": "^0.3.0",
     "fs-extra": "^6.0.1",
+    "husky": "^6.0.0",
     "istanbul-middleware": "^0.2.2",
     "js-yaml": "^3.11.0",
     "jsonwebtoken": "^7.4.1",
+    "lint-staged": "^11.0.0",
     "mastarm": "^5.3.1",
     "md5-file": "^4.0.0",
     "nock": "^9.0.14",
@@ -142,6 +145,11 @@
     "simple-node-logger": "^0.93.37",
     "slack": "^11.0.1"
   },
+  "lint-staged": {
+    "*.{js,jsx}": [
+      "eslint --config node_modules/mastarm/lib/eslintrc.json --fix"
+    ]
+  },
   "standard": {
     "env": [
       "jest"
diff --git a/yarn.lock b/yarn.lock
index 298d2471a..845dd47b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1624,11 +1624,23 @@ ansi-align@^2.0.0:
   dependencies:
     string-width "^2.0.0"
 
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
 ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
+ansi-escapes@^4.3.0:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
 ansi-escapes@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
@@ -1970,6 +1982,11 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -2933,6 +2950,14 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3061,6 +3086,13 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
 cli-table3@^0.5.0, cli-table3@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
@@ -3078,6 +3110,14 @@ cli-table@^0.3.1:
   dependencies:
     colors "1.0.3"
 
+cli-truncate@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
+  integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
+  dependencies:
+    slice-ansi "^3.0.0"
+    string-width "^4.2.0"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -3249,6 +3289,11 @@ commander@^2.9.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
+commander@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
 commitizen@^3.0.7:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-3.1.2.tgz#29ddd8b39396923e9058a0e4840cbeef144290be"
@@ -3556,6 +3601,17 @@ cosmiconfig@^6.0.0:
     path-type "^4.0.0"
     yaml "^1.7.2"
 
+cosmiconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
 crc32-stream@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-3.0.1.tgz#cae6eeed003b0e44d739d279de5ae63b171b4e85"
@@ -3654,7 +3710,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0:
+cross-spawn@^7.0.0, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -3990,6 +4046,13 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
@@ -4020,7 +4083,7 @@ decode-uri-component@^0.2.0:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-dedent@0.7.0:
+dedent@0.7.0, dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
@@ -4471,6 +4534,13 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
+enquirer@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 entities@^1.1.1, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -5087,6 +5157,21 @@ execa@^4.0.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+execa@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
 exenv@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.0.tgz#3835f127abf075bfe082d0aed4484057c78e3c89"
@@ -5787,6 +5872,11 @@ get-intrinsic@^1.0.2:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-own-enumerable-property-symbols@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
+  integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
+
 get-ports@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-ports/-/get-ports-1.0.3.tgz#f40bd580aca7ec0efb7b96cbfcbeb03ef894b5e8"
@@ -5818,6 +5908,11 @@ get-stream@^5.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -6353,6 +6448,11 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
 humanize-duration@^3.18.0:
   version "3.18.0"
   resolved "https://registry.yarnpkg.com/humanize-duration/-/humanize-duration-3.18.0.tgz#ba07a945d6d4358b9751fecabe27864bf965afbc"
@@ -6365,6 +6465,11 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
+husky@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
+  integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
+
 iconv-lite@0.4.23:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -6459,6 +6564,14 @@ import-fresh@^3.0.0, import-fresh@^3.1.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 import-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
@@ -6919,7 +7032,7 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^1.0.0:
+is-obj@^1.0.0, is-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
@@ -6975,6 +7088,11 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -7031,6 +7149,11 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
 is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
@@ -8063,6 +8186,40 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
+lint-staged@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.0.0.tgz#24d0a95aa316ba28e257f5c4613369a75a10c712"
+  integrity sha512-3rsRIoyaE8IphSUtO1RVTFl1e0SLBtxxUOPBtHxQgBHS5/i6nqvjcUfNioMa4BU9yGnPzbO+xkfLtXtxBpCzjw==
+  dependencies:
+    chalk "^4.1.1"
+    cli-truncate "^2.1.0"
+    commander "^7.2.0"
+    cosmiconfig "^7.0.0"
+    debug "^4.3.1"
+    dedent "^0.7.0"
+    enquirer "^2.3.6"
+    execa "^5.0.0"
+    listr2 "^3.8.2"
+    log-symbols "^4.1.0"
+    micromatch "^4.0.4"
+    normalize-path "^3.0.0"
+    please-upgrade-node "^3.2.0"
+    string-argv "0.3.1"
+    stringify-object "^3.3.0"
+
+listr2@^3.8.2:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.10.0.tgz#58105a53ed7fa1430d1b738c6055ef7bb006160f"
+  integrity sha512-eP40ZHihu70sSmqFNbNy2NL1YwImmlMmPh9WO5sLmPDleurMHt3n+SwEWNu2kzKScexZnkyFtc1VI0z/TGlmpw==
+  dependencies:
+    cli-truncate "^2.1.0"
+    colorette "^1.2.2"
+    log-update "^4.0.0"
+    p-map "^4.0.0"
+    rxjs "^6.6.7"
+    through "^2.3.8"
+    wrap-ansi "^7.0.0"
+
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -8342,6 +8499,24 @@ log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
+log-symbols@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
+log-update@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
+  integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
+  dependencies:
+    ansi-escapes "^4.3.0"
+    cli-cursor "^3.1.0"
+    slice-ansi "^4.0.0"
+    wrap-ansi "^6.2.0"
+
 loglevel-colored-level-prefix@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz#6a40218fdc7ae15fc76c3d0f3e676c465388603e"
@@ -8794,6 +8969,14 @@ micromatch@^4.0.2:
     braces "^3.0.1"
     picomatch "^2.0.5"
 
+micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
 middleware-proxy@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/middleware-proxy/-/middleware-proxy-2.0.5.tgz#4038f309a1ee95afd3d017bc701950df82fd1660"
@@ -9433,7 +9616,7 @@ npm-run-path@^3.0.0:
   dependencies:
     path-key "^3.0.0"
 
-npm-run-path@^4.0.0:
+npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
@@ -9785,6 +9968,13 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+  dependencies:
+    mimic-fn "^2.1.0"
+
 opener@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
@@ -10284,6 +10474,11 @@ picomatch@^2.0.5, picomatch@^2.2.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
 
+picomatch@^2.2.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
+
 pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -10340,6 +10535,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+please-upgrade-node@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
+  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
+  dependencies:
+    semver-compare "^1.0.0"
+
 plur@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/plur/-/plur-1.0.0.tgz#db85c6814f5e5e5a3b49efc28d604fec62975156"
@@ -12371,6 +12573,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -12484,6 +12694,13 @@ rxjs@^6.1.0, rxjs@^6.4.0, rxjs@^6.5.2:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.6.7:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -12565,6 +12782,11 @@ semantic-release@^17.2.3:
     signale "^1.2.1"
     yargs "^15.0.1"
 
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -12802,6 +13024,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
+signal-exit@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
 signale@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/signale/-/signale-1.4.0.tgz#c4be58302fb0262ac00fc3d886a7c113759042f1"
@@ -12876,6 +13103,24 @@ slice-ansi@^2.1.0:
     astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
+slice-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
+  integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
 slide@^1.1.6, slide@~1.1.3, slide@~1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
@@ -13207,6 +13452,11 @@ strict-uri-encode@^2.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
   integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
 
+string-argv@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
+  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
+
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
@@ -13312,6 +13562,15 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-object@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+  integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
+  dependencies:
+    get-own-enumerable-property-symbols "^3.0.0"
+    is-obj "^1.0.1"
+    is-regexp "^1.0.0"
+
 stringify-package@^1.0.0, stringify-package@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.1.tgz#e5aa3643e7f74d0f28628b72f3dad5cecfc3ba85"
@@ -13699,7 +13958,7 @@ through2@~0.6.1:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.7, through@~2.3.4:
+through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.7, through@^2.3.8, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -14044,6 +14303,11 @@ type-fest@^0.18.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
   integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
@@ -14660,6 +14924,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -14757,6 +15030,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml@^1.10.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
 yaml@^1.7.2:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"

From 79073f74a0a5bce5acf8a25ae87e09bc84de8f11 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 28 Jun 2021 16:03:31 +0100
Subject: [PATCH 257/553] refactor(PatternStopCard.js validation.js): Refactor
 the form control and switch case block

#663
---
 .../components/pattern/PatternStopCard.js     | 204 +++++++++---------
 lib/editor/util/validation.js                 |  31 ++-
 2 files changed, 108 insertions(+), 127 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index db1f4f7f9..9c223c616 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -29,6 +29,7 @@ type Props = {
   addStopToPattern: typeof stopStrategiesActions.addStopToPattern,
   // property is available through react dnd?
   connectDragSource: any,
+  controlLabel: string,
   cumulativeTravelTime: number,
   feedSource: Feed,
   findCard: string => { card: PatternStop, index: number },
@@ -41,15 +42,71 @@ type Props = {
   removeStopFromPattern: typeof stopStrategiesActions.removeStopFromPattern,
   rowStyle: {[string]: number | string},
   saveActiveGtfsEntity: typeof activeActions.saveActiveGtfsEntity,
+  selectType: any,
   setActiveEntity: typeof activeActions.setActiveEntity,
   setActiveStop: typeof tripPatternActions.setActiveStop,
+  shouldHaveDisabledOption: boolean,
   status: any,
   stop: any,
   stopIsActive: boolean,
+  title: string,
   updateActiveGtfsEntity: typeof activeActions.updateActiveGtfsEntity,
   updatePatternStops: typeof tripPatternActions.updatePatternStops
 }
 
+type State = {
+  initialDwellTime: number,
+  initialTravelTime: number,
+  update: boolean
+}
+
+const pickupDropoffOptions = [
+  {
+    value: 0,
+    text: 'Available (0)'
+  },
+  {
+    value: 1,
+    text: 'Not available (1)'
+  },
+  {
+    value: 2,
+    text: 'Must phone agency to arrange (2)'
+  },
+  {
+    value: 3,
+    text: 'Must coordinate with driver to arrange (3)'
+  }
+]
+
+// renders the form control drop downs for dropOff/Pick up and also continuous
+const PickupDropoffSelect = (props: Props) => {
+  const {activePattern, controlLabel, selectType, shouldHaveDisabledOption, title, onChange, value} = props
+  const hasShapeId = activePattern.shapeId === null
+  return (
+    <FormGroup
+      controlId={selectType}
+      bsSize='small'>
+      <ControlLabel
+        className='small'
+        title={title}
+      >
+        {controlLabel}
+      </ControlLabel>
+      <FormControl
+        disabled={shouldHaveDisabledOption && hasShapeId}
+        componentClass='select'
+        onChange={onChange}
+        value={value}
+        placeholder='select'>
+        {pickupDropoffOptions.map(o => (
+          <option key={o.value} value={o.value}>{o.text}</option>
+        ))}
+      </FormControl>
+    </FormGroup>
+  )
+}
+
 const cardSource = {
   beginDrag (props: Props) {
     return {
@@ -182,12 +239,6 @@ class PatternStopCard extends Component<Props> {
   }
 }
 
-type State = {
-  initialDwellTime: number,
-  initialTravelTime: number,
-  update: boolean
-}
-
 class PatternStopContents extends Component<Props, State> {
   componentWillMount () {
     this.setState({
@@ -255,39 +306,21 @@ class PatternStopContents extends Component<Props, State> {
   }
 
   _onPickupOrDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const selectedOptionValue: number = parseInt(evt.target.value)
+    const selectedOptionValue: number = parseInt(evt.target.value, 10)
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]
+
     patternStops[index][evt.target.id] = selectedOptionValue
     this.setState({update: true})
     updatePatternStops(activePattern, patternStops)
   }
 
   render () {
-    const {active, activePattern, patternEdited, patternStop} = this.props
+    const {active, patternEdited, patternStop} = this.props
     // This component has a special shouldComponentUpdate to ensure that state
     // is not overwritten with new props, so use state.update to check edited
     // state.
     const isEdited = patternEdited || this.state.update
-    const hasShapeId = activePattern.shapeId === null
-    const pickupDropoffOptions = [
-      {
-        value: 0,
-        text: 'Available (0)'
-      },
-      {
-        value: 1,
-        text: 'Not available (1)'
-      },
-      {
-        value: 2,
-        text: 'Must phone agency to arrange (2)'
-      },
-      {
-        value: 3,
-        text: 'Must coordinate with driver to arrange (3)'
-      }
-    ]
 
     let innerDiv
     if (active) {
@@ -341,95 +374,50 @@ class PatternStopContents extends Component<Props, State> {
         {/* Pickup and drop off type selectors */}
         <Row>
           <Col xs={6}>
-            <FormGroup
-              controlId='pickupType'
-              bsSize='small'>
-              <ControlLabel
-                className='small'
-                title='Define the pickup method/availability at this stop.'
-              >
-                Pickup
-              </ControlLabel>
-              <FormControl
-                componentClass='select'
-                onChange={this._onPickupOrDropOffChange}
-                placeholder='select'
-                value={patternStop.pickupType}>
-                {pickupDropoffOptions.map(o => (
-                  <option key={o.value} value={o.value}>{o.text}</option>
-                ))}
-              </FormControl>
-            </FormGroup>
+            <PickupDropoffSelect
+              {...this.props}
+              shouldHaveDisabledOption={false}
+              selectType='pickupType'
+              title='Define the pickup method/availability at this stop.'
+              controlLabel='Pickup'
+              value={patternStop.pickupType || ''}
+              onChange={this._onPickupOrDropOffChange}
+            />
           </Col>
           <Col xs={6}>
-            <FormGroup
-              controlId='dropOffType'
-              bsSize='small'>
-              <ControlLabel
-                className='small'
-                title='Define the dropff method/availability at this stop.'
-              >
-                Drop-off
-              </ControlLabel>
-              <FormControl
-                componentClass='select'
-                onChange={this._onPickupOrDropOffChange}
-                placeholder='select'
-                value={patternStop.dropOffType}>
-                {pickupDropoffOptions.map(o => (
-                  <option key={o.value} value={o.value}>{o.text}</option>
-                ))}
-              </FormControl>
-            </FormGroup>
+            <PickupDropoffSelect
+              {...this.props}
+              shouldHaveDisabledOption={false}
+              selectType='dropOffType'
+              title='Define the dropff method/availability at this stop.'
+              controlLabel='Drop-off'
+              value={patternStop.dropOffType || ''}
+              onChange={this._onPickupOrDropOffChange}
+            />
           </Col>
         </Row>
-        {/* Continuous Stopping Pickup and drop off type selectors */}
         <Row>
           <Col xs={6}>
-            <FormGroup
-              controlId='continuousPickup'
-              bsSize='small'>
-              <ControlLabel
-                className='small'
-                title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
-              >
-                  Continuous pickup
-              </ControlLabel>
-              <FormControl
-                componentClass='select'
-                disabled={hasShapeId}
-                onChange={this._onPickupOrDropOffChange}
-                placeholder='select'
-                value={patternStop.continuousPickup}
-              >
-                {pickupDropoffOptions.map(o => (
-                  <option key={o.value} value={o.value}>{o.text}</option>
-                ))}
-              </FormControl>
-            </FormGroup>
+            <PickupDropoffSelect
+              {...this.props}
+              shouldHaveDisabledOption
+              selectType='continuousPickup'
+              title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
+              controlLabel='Continuous pickup'
+              value={patternStop.continuousPickup || ''}
+              onChange={this._onPickupOrDropOffChange}
+            />
           </Col>
           <Col xs={6}>
-            <FormGroup
-              controlId='continuousDropOff'
-              bsSize='small'>
-              <ControlLabel
-                className='small'
-                title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
-              >
-                Continuous drop-off
-              </ControlLabel>
-              <FormControl
-                componentClass='select'
-                disabled={hasShapeId}
-                onChange={this._onPickupOrDropOffChange}
-                placeholder='select'
-                value={patternStop.continuousDropOff}
-              >
-                {pickupDropoffOptions.map(o => (
-                  <option key={o.value} value={o.value}>{o.text}</option>
-                ))}
-              </FormControl>
-            </FormGroup>
+            <PickupDropoffSelect
+              {...this.props}
+              shouldHaveDisabledOption
+              selectType='continuousDropOff'
+              title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
+              controlLabel='Continuous drop-off'
+              value={patternStop.continuousDropOff || ''}
+              onChange={this._onPickupOrDropOffChange}
+            />
           </Col>
         </Row>
         <NormalizeStopTimesTip />
diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index 05f577523..cf15641ca 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -25,7 +25,6 @@ export function doesNotExist (value: any): boolean {
  * Returns false if the value is ok.
  * Returns an EditorValidationIssue object if the value is not ok.
  */
-// eslint-disable-next-line complexity
 export function validate (
   field: GtfsSpecField,
   value: any,
@@ -38,12 +37,12 @@ export function validate (
   const isRequiredButEmpty = required && valueDoesNotExist
   const isOptionalAndEmpty = !required && valueDoesNotExist
   const agencies = getTableById(tableData, 'agency')
-  let locationType: ?number = 0
+  let locationType: ?number = null
   let reason = 'Required field must not be empty'
 
   // entity.locationtype is a string.  Convert to number for conditinals later on.
-  if (entity && entity.location_type) {
-    locationType = parseInt(entity.location_type)
+  if (entity && entity.location_type !== null) {
+    locationType = parseInt(entity.location_type, 10)
   }
 
   // setting as a variable here because of eslint bug
@@ -124,11 +123,9 @@ export function validate (
         return false
       }
     case 'TEXT':
-      if (name === 'stop_name' && isOptionalAndEmpty) {
-        if (!locationType || locationType <= 2) {
-          reason = 'Stop name is required for your current location type'
-          return {field: name, invalid: isOptionalAndEmpty, reason}
-        }
+      if (name === 'stop_name' && locationType !== null && locationType <= 2) {
+        reason = 'Stop name is required for your current location type'
+        return {field: name, invalid: isOptionalAndEmpty, reason}
       }
       if (name === 'route_short_name' && !value && entity && entity.route_long_name) {
         return false
@@ -200,11 +197,9 @@ export function validate (
         reason = 'Field must be valid latitude.'
         return {field: name, invalid: isNotLat, reason}
       }
-      if (!locationType || locationType <= 2) {
-        if (isOptionalAndEmpty) {
-          reason = 'Latitude and Longitude are required for your current location type'
-          return {field: name, invalid: isOptionalAndEmpty, reason}
-        }
+      if (isOptionalAndEmpty && locationType !== null && locationType <= 2) {
+        reason = 'Latitude and Longitude are required for your current location type'
+        return {field: name, invalid: isOptionalAndEmpty, reason}
       }
       return false
     case 'LONGITUDE':
@@ -213,11 +208,9 @@ export function validate (
         reason = 'Field must be valid longitude.'
         return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
       }
-      if (!locationType || locationType <= 2) {
-        if (isOptionalAndEmpty) {
-          reason = 'Latitude and Longitude are required for your current location type'
-          return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
-        }
+      if (isOptionalAndEmpty && locationType !== null && locationType <= 2) {
+        reason = 'Latitude and Longitude are required for your current location type'
+        return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
       }
       return false
     case 'TIME':

From 094efc7a74b5805e224ed6b93ad0c3d5dfecb78d Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 28 Jun 2021 16:59:55 +0100
Subject: [PATCH 258/553] refactor(validation.js PatternStopCard.js): Fix flow
 issues

#663
---
 lib/editor/components/pattern/PatternStopCard.js | 11 +++++++----
 lib/editor/util/validation.js                    |  7 ++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index 9c223c616..ac77806e4 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -22,8 +22,10 @@ import NormalizeStopTimesTip from './NormalizeStopTimesTip'
 import PatternStopButtons from './PatternStopButtons'
 
 import type {Feed, Pattern, PatternStop} from '../../../types'
+import { string } from 'jszip/lib/support'
 
 type Props = {
+  _onPickupOrDropOffChange: () => void,
   active: boolean,
   activePattern: Pattern,
   addStopToPattern: typeof stopStrategiesActions.addStopToPattern,
@@ -42,7 +44,8 @@ type Props = {
   removeStopFromPattern: typeof stopStrategiesActions.removeStopFromPattern,
   rowStyle: {[string]: number | string},
   saveActiveGtfsEntity: typeof activeActions.saveActiveGtfsEntity,
-  selectType: any,
+  selectType: string,
+  selectValue: string,
   setActiveEntity: typeof activeActions.setActiveEntity,
   setActiveStop: typeof tripPatternActions.setActiveStop,
   shouldHaveDisabledOption: boolean,
@@ -81,7 +84,7 @@ const pickupDropoffOptions = [
 
 // renders the form control drop downs for dropOff/Pick up and also continuous
 const PickupDropoffSelect = (props: Props) => {
-  const {activePattern, controlLabel, selectType, shouldHaveDisabledOption, title, onChange, value} = props
+  const {activePattern, controlLabel, selectType, shouldHaveDisabledOption, title, _onPickupOrDropOffChange, selectValue} = props
   const hasShapeId = activePattern.shapeId === null
   return (
     <FormGroup
@@ -96,8 +99,8 @@ const PickupDropoffSelect = (props: Props) => {
       <FormControl
         disabled={shouldHaveDisabledOption && hasShapeId}
         componentClass='select'
-        onChange={onChange}
-        value={value}
+        onChange={_onPickupOrDropOffChange}
+        value={selectValue}
         placeholder='select'>
         {pickupDropoffOptions.map(o => (
           <option key={o.value} value={o.value}>{o.text}</option>
diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index cf15641ca..43fa8006d 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -25,6 +25,7 @@ export function doesNotExist (value: any): boolean {
  * Returns false if the value is ok.
  * Returns an EditorValidationIssue object if the value is not ok.
  */
+// eslint-disable-next-line complexity
 export function validate (
   field: GtfsSpecField,
   value: any,
@@ -123,7 +124,7 @@ export function validate (
         return false
       }
     case 'TEXT':
-      if (name === 'stop_name' && locationType !== null && locationType <= 2) {
+      if (name === 'stop_name' && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
         reason = 'Stop name is required for your current location type'
         return {field: name, invalid: isOptionalAndEmpty, reason}
       }
@@ -197,7 +198,7 @@ export function validate (
         reason = 'Field must be valid latitude.'
         return {field: name, invalid: isNotLat, reason}
       }
-      if (isOptionalAndEmpty && locationType !== null && locationType <= 2) {
+      if (isOptionalAndEmpty && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
         reason = 'Latitude and Longitude are required for your current location type'
         return {field: name, invalid: isOptionalAndEmpty, reason}
       }
@@ -208,7 +209,7 @@ export function validate (
         reason = 'Field must be valid longitude.'
         return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
       }
-      if (isOptionalAndEmpty && locationType !== null && locationType <= 2) {
+      if (isOptionalAndEmpty && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
         reason = 'Latitude and Longitude are required for your current location type'
         return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
       }

From 7717c28996c349ae2862d698805cd8bdde877a08 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Mon, 28 Jun 2021 17:06:08 +0100
Subject: [PATCH 259/553] fix(PatternStopCard.js): Fix flow issue

#663
---
 lib/editor/components/pattern/PatternStopCard.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index ac77806e4..d592e70a8 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -22,7 +22,6 @@ import NormalizeStopTimesTip from './NormalizeStopTimesTip'
 import PatternStopButtons from './PatternStopButtons'
 
 import type {Feed, Pattern, PatternStop} from '../../../types'
-import { string } from 'jszip/lib/support'
 
 type Props = {
   _onPickupOrDropOffChange: () => void,

From f1cb21e1edc578434b66382ec07e4791d7c64656 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 1 Jul 2021 14:33:50 -0400
Subject: [PATCH 260/553] refactor(validation.js): add validationIssue method

---
 lib/editor/util/validation.js | 87 +++++++++++++++++------------------
 1 file changed, 43 insertions(+), 44 deletions(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index 43fa8006d..cdca6cb36 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -15,6 +15,8 @@ export type EditorValidationIssue = {
   reason: string
 }
 
+const EMPTY_FIELD_REASON = 'Required field must not be empty'
+
 export function doesNotExist (value: any): boolean {
   return value === '' || value === null || typeof value === 'undefined'
 }
@@ -39,7 +41,6 @@ export function validate (
   const isOptionalAndEmpty = !required && valueDoesNotExist
   const agencies = getTableById(tableData, 'agency')
   let locationType: ?number = null
-  let reason = 'Required field must not be empty'
 
   // entity.locationtype is a string.  Convert to number for conditinals later on.
   if (entity && entity.location_type !== null) {
@@ -52,13 +53,21 @@ export function validate (
     result: false | EditorValidationIssue
   }
 
+  /**
+   * Construct an EditorValidationIssue for the field name and reason (defaults to
+   * empty field message).
+   */
+  function validationIssue (reason = EMPTY_FIELD_REASON, field = name) {
+    return {field, invalid: true, reason}
+  }
+
   /**
    * Checks whether value is a positive number
    */
   function checkPositiveNumber (): CheckPositiveOutput {
     if (isRequiredButEmpty) {
       return {
-        result: {field: name, invalid: isRequiredButEmpty, reason}
+        result: validationIssue()
       }
     } else if (isOptionalAndEmpty) {
       return {
@@ -70,14 +79,14 @@ export function validate (
     // make sure value is parseable to a number
     if (isNaN(num)) {
       return {
-        result: {field: name, invalid: true, reason: 'Field must be a valid number'}
+        result: validationIssue('Field must be a valid number')
       }
     }
 
     // make sure value is positive
     if (num < 0) {
       return {
-        result: {field: name, invalid: true, reason: 'Field must be a positive number'}
+        result: validationIssue('Field must be a positive number')
       }
     }
 
@@ -112,21 +121,20 @@ export function validate (
         idList.length > 1 &&
         valueDoesNotExist
       ) {
-        reason = 'Identifier is required if more than one agency exists'
-        return {field: name, invalid: isRequiredButEmpty, reason}
+        return validationIssue('Identifier is required if more than one agency exists')
       }
       if (isRequiredButEmpty || isNotUnique) {
+        let reason
         if (isNotUnique) {
           reason = 'Identifier must be unique'
         }
-        return {field: name, invalid: isRequiredButEmpty || isNotUnique, reason}
+        return validationIssue(reason)
       } else {
         return false
       }
     case 'TEXT':
       if (name === 'stop_name' && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
-        reason = 'Stop name is required for your current location type'
-        return {field: name, invalid: isOptionalAndEmpty, reason}
+        return validationIssue('Stop name is required for your current location type')
       }
       if (name === 'route_short_name' && !value && entity && entity.route_long_name) {
         return false
@@ -139,7 +147,7 @@ export function validate (
         return false
       } else {
         if (isRequiredButEmpty) {
-          return {field: name, invalid: isRequiredButEmpty, reason}
+          return validationIssue()
         } else {
           return false
         }
@@ -150,82 +158,77 @@ export function validate (
     case 'GTFS_FARE':
     case 'GTFS_SERVICE':
       if (isRequiredButEmpty) {
-        return {field: name, invalid: isRequiredButEmpty, reason}
+        return validationIssue()
       } else {
         return false
       }
     case 'URL':
       const isNotUrl = value && !validator.isURL(value)
       if (isRequiredButEmpty || isNotUrl) {
+        let reason
         if (isNotUrl) {
           reason = 'Field must contain valid URL.'
         }
-        return {field: name, invalid: isRequiredButEmpty || isNotUrl, reason}
+        return validationIssue(reason)
       } else {
         return false
       }
     case 'EMAIL':
       const isNotEmail = value && !validator.isEmail(value)
       if (isRequiredButEmpty || isNotEmail) {
+        let reason
         if (isNotEmail) {
           reason = 'Field must contain valid email address.'
         }
-        return {field: name, invalid: isRequiredButEmpty || isNotEmail, reason}
+        return validationIssue(reason)
       } else {
         return false
       }
     case 'GTFS_ZONE':
       if (isRequiredButEmpty) {
-        return {field: name, invalid: isRequiredButEmpty, reason}
+        return validationIssue()
       } else {
         return false
       }
     case 'TIMEZONE':
       if (isRequiredButEmpty) {
-        return {field: name, invalid: isRequiredButEmpty, reason}
+        return validationIssue()
       } else {
         return false
       }
     case 'LANGUAGE':
       if (isRequiredButEmpty) {
-        return {field: name, invalid: isRequiredButEmpty, reason}
+        return validationIssue()
       } else {
         return false
       }
     case 'LATITUDE':
       const isNotLat = value > 90 || value < -90
       if (isNotLat) {
-        reason = 'Field must be valid latitude.'
-        return {field: name, invalid: isNotLat, reason}
+        return validationIssue(name, 'Field must be valid latitude.')
       }
       if (isOptionalAndEmpty && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
-        reason = 'Latitude and Longitude are required for your current location type'
-        return {field: name, invalid: isOptionalAndEmpty, reason}
+        return validationIssue('Latitude and Longitude are required for your current location type')
       }
       return false
     case 'LONGITUDE':
       const isNotLng = value > 180 || value < -180
       if (isNotLng) {
-        reason = 'Field must be valid longitude.'
-        return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
+        return validationIssue('Field must be valid longitude.')
       }
-      if (isOptionalAndEmpty && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
-        reason = 'Latitude and Longitude are required for your current location type'
-        return {field: name, invalid: isOptionalAndEmpty || isNotLng, reason}
+      if (isOptionalAndEmpty && typeof locationType === 'number' && locationType <= 2) {
+        return validationIssue('Latitude and Longitude are required for your current location type')
       }
       return false
     case 'TIME':
     case 'NUMBER':
       const isNotANumber = isNaN(value)
       if (isRequiredButEmpty || isNotANumber) {
+        let reason
         if (isNotANumber) {
           reason = 'Field must be valid number'
         }
-        return {
-          field: name,
-          invalid: isRequiredButEmpty || isNotANumber,
-          reason
-        }
+        return validationIssue(reason)
       } else {
         return false
       }
@@ -247,8 +250,7 @@ export function validate (
       }
       if (!hasService && name === 'monday') {
         // only add validation issue for one day of week (monday)
-        reason = 'Calendar must have service for at least one day'
-        return {field: name, invalid: isRequiredButEmpty, reason}
+        return validationIssue('Calendar must have service for at least one day')
       }
       return false
     case 'DROPDOWN':
@@ -257,7 +259,7 @@ export function validate (
         field.options &&
         field.options.findIndex(o => o.value === '') === -1
       ) {
-        return {field: name, invalid: isRequiredButEmpty, reason}
+        return validationIssue()
       } else {
         return false
       }
@@ -267,11 +269,7 @@ export function validate (
         agencies.length > 1
       ) {
         if (valueDoesNotExist) {
-          return {
-            field: name,
-            invalid: true,
-            reason: 'Field must be populated for feeds with more than one agency.'
-          }
+          return validationIssue('Field must be populated for feeds with more than one agency.')
         }
       }
       return false
@@ -300,18 +298,19 @@ export function validate (
         }
       }
       if (!value || value.length === 0) {
-        return {field: `dates`, invalid: true, reason}
+        return validationIssue(EMPTY_FIELD_REASON, 'dates')
       }
       // check if date already exists in this or other exceptions
       for (let i = 0; i < value.length; i++) {
+        const dateItemName = `dates-${i}`
         if (dateMap[value[i]] && dateMap[value[i]].length > 1) {
           // eslint-disable-next-line standard/computed-property-even-spacing
-          reason = `Date (${value[
+          const reason = `Date (${value[
             i
           ]}) cannot appear more than once for all exceptions`
-          return {field: `dates-${i}`, invalid: true, reason}
+          return validationIssue(reason, dateItemName)
         } else if (!moment(value[i], 'YYYYMMDD', true).isValid()) {
-          return {field: `dates-${i}`, invalid: true, reason}
+          return validationIssue(EMPTY_FIELD_REASON, dateItemName)
         }
       }
       return false
@@ -331,7 +330,7 @@ export function validate (
           )
         )
       ) {
-        return {field: name, invalid: true, reason: 'Field must be a positive integer'}
+        return validationIssue(name, 'Field must be a positive integer')
       }
       return false
     case 'POSITIVE_NUM':
@@ -342,7 +341,7 @@ export function validate (
     case 'COLOR':
     default:
       if (isRequiredButEmpty) {
-        return {field: name, invalid: isRequiredButEmpty, reason}
+        return validationIssue()
       }
       return false
   }

From ff05ac795644c9b5adece49619174fb643fde3c4 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 1 Jul 2021 14:39:16 -0400
Subject: [PATCH 261/553] refactor(validation): fix stop name message

---
 lib/editor/util/validation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index cdca6cb36..6c8eb0dea 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -134,7 +134,7 @@ export function validate (
       }
     case 'TEXT':
       if (name === 'stop_name' && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
-        return validationIssue('Stop name is required for your current location type')
+        return validationIssue('Stop name is required for stop, station, and entrance location types.')
       }
       if (name === 'route_short_name' && !value && entity && entity.route_long_name) {
         return false

From 5d17fbb376c24fce3e203f353f069b55302acdb8 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 1 Jul 2021 14:45:47 -0400
Subject: [PATCH 262/553] refactor(validation): fix bad invocation of
 validationIssue

---
 lib/editor/util/validation.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index 6c8eb0dea..b34b3a7cc 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -205,7 +205,7 @@ export function validate (
     case 'LATITUDE':
       const isNotLat = value > 90 || value < -90
       if (isNotLat) {
-        return validationIssue(name, 'Field must be valid latitude.')
+        return validationIssue('Field must be valid latitude.')
       }
       if (isOptionalAndEmpty && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
         return validationIssue('Latitude and Longitude are required for your current location type')
@@ -330,7 +330,7 @@ export function validate (
           )
         )
       ) {
-        return validationIssue(name, 'Field must be a positive integer')
+        return validationIssue('Field must be a positive integer')
       }
       return false
     case 'POSITIVE_NUM':

From 212cf37efc4ce7a7ee7381b065f0d43bb566458e Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Fri, 2 Jul 2021 17:23:56 +0100
Subject: [PATCH 263/553] refactor(PatternStopCard.js): Changed a method name
 and added a deleted line back in

#668
---
 gtfs.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gtfs.yml b/gtfs.yml
index b708b20b1..0674ed8f1 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -17,6 +17,7 @@
     required: true
     inputType: URL
     columnWidth: 12
+    helpContent: "The feed_publisher_url field contains the URL of the feed publishing organization's website. (This may be the same as one of the agency_url values in agency.txt.) The value must be a fully qualified URL that includes http:// or https://, and any special characters in the URL must be correctly escaped. See http://www.w3.org/Addressing/URL/4_URI_Recommentations.html for a description of how to create fully qualified URL values."
   - name: "feed_lang"
     required: true
     inputType: LANGUAGE

From 3b9771960b4990eff0d2ecb7ecffe738ce4314d1 Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Fri, 2 Jul 2021 17:26:55 +0100
Subject: [PATCH 264/553] refactor(PatternStopCard.js): Changed method name

#668
---
 lib/editor/components/pattern/PatternStopCard.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index d592e70a8..99084ca0f 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -24,7 +24,6 @@ import PatternStopButtons from './PatternStopButtons'
 import type {Feed, Pattern, PatternStop} from '../../../types'
 
 type Props = {
-  _onPickupOrDropOffChange: () => void,
   active: boolean,
   activePattern: Pattern,
   addStopToPattern: typeof stopStrategiesActions.addStopToPattern,
@@ -38,6 +37,7 @@ type Props = {
   index: number,
   isDragging: boolean,
   moveCard: (string, number) => void,
+  onChange: () => void,
   patternEdited: boolean,
   patternStop: PatternStop,
   removeStopFromPattern: typeof stopStrategiesActions.removeStopFromPattern,
@@ -83,7 +83,7 @@ const pickupDropoffOptions = [
 
 // renders the form control drop downs for dropOff/Pick up and also continuous
 const PickupDropoffSelect = (props: Props) => {
-  const {activePattern, controlLabel, selectType, shouldHaveDisabledOption, title, _onPickupOrDropOffChange, selectValue} = props
+  const {activePattern, controlLabel, selectType, shouldHaveDisabledOption, title, onChange, selectValue} = props
   const hasShapeId = activePattern.shapeId === null
   return (
     <FormGroup
@@ -98,7 +98,7 @@ const PickupDropoffSelect = (props: Props) => {
       <FormControl
         disabled={shouldHaveDisabledOption && hasShapeId}
         componentClass='select'
-        onChange={_onPickupOrDropOffChange}
+        onChange={onChange}
         value={selectValue}
         placeholder='select'>
         {pickupDropoffOptions.map(o => (
@@ -307,7 +307,7 @@ class PatternStopContents extends Component<Props, State> {
     updatePatternStops(activePattern, patternStops)
   }
 
-  _onPickupOrDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+  onChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     const selectedOptionValue: number = parseInt(evt.target.value, 10)
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]
@@ -383,7 +383,7 @@ class PatternStopContents extends Component<Props, State> {
               title='Define the pickup method/availability at this stop.'
               controlLabel='Pickup'
               value={patternStop.pickupType || ''}
-              onChange={this._onPickupOrDropOffChange}
+              onChange={this.onChange}
             />
           </Col>
           <Col xs={6}>
@@ -394,7 +394,7 @@ class PatternStopContents extends Component<Props, State> {
               title='Define the dropff method/availability at this stop.'
               controlLabel='Drop-off'
               value={patternStop.dropOffType || ''}
-              onChange={this._onPickupOrDropOffChange}
+              onChange={this.onChange}
             />
           </Col>
         </Row>
@@ -407,7 +407,7 @@ class PatternStopContents extends Component<Props, State> {
               title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
               controlLabel='Continuous pickup'
               value={patternStop.continuousPickup || ''}
-              onChange={this._onPickupOrDropOffChange}
+              onChange={this.onChange}
             />
           </Col>
           <Col xs={6}>
@@ -418,7 +418,7 @@ class PatternStopContents extends Component<Props, State> {
               title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
               controlLabel='Continuous drop-off'
               value={patternStop.continuousDropOff || ''}
-              onChange={this._onPickupOrDropOffChange}
+              onChange={this.onChange}
             />
           </Col>
         </Row>

From 4039af7c2a0cf731ddb23ce3c02b4f61b136c21d Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Fri, 2 Jul 2021 18:01:09 +0100
Subject: [PATCH 265/553] fix(PatternSTopCard.js): Fixed prop bug

#668
---
 .../components/pattern/PatternStopCard.js     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index 99084ca0f..b05920adc 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -44,7 +44,6 @@ type Props = {
   rowStyle: {[string]: number | string},
   saveActiveGtfsEntity: typeof activeActions.saveActiveGtfsEntity,
   selectType: string,
-  selectValue: string,
   setActiveEntity: typeof activeActions.setActiveEntity,
   setActiveStop: typeof tripPatternActions.setActiveStop,
   shouldHaveDisabledOption: boolean,
@@ -53,7 +52,8 @@ type Props = {
   stopIsActive: boolean,
   title: string,
   updateActiveGtfsEntity: typeof activeActions.updateActiveGtfsEntity,
-  updatePatternStops: typeof tripPatternActions.updatePatternStops
+  updatePatternStops: typeof tripPatternActions.updatePatternStops,
+  value: string
 }
 
 type State = {
@@ -83,7 +83,7 @@ const pickupDropoffOptions = [
 
 // renders the form control drop downs for dropOff/Pick up and also continuous
 const PickupDropoffSelect = (props: Props) => {
-  const {activePattern, controlLabel, selectType, shouldHaveDisabledOption, title, onChange, selectValue} = props
+  const {activePattern, controlLabel, selectType, shouldHaveDisabledOption, title, onChange, value} = props
   const hasShapeId = activePattern.shapeId === null
   return (
     <FormGroup
@@ -99,7 +99,7 @@ const PickupDropoffSelect = (props: Props) => {
         disabled={shouldHaveDisabledOption && hasShapeId}
         componentClass='select'
         onChange={onChange}
-        value={selectValue}
+        value={value}
         placeholder='select'>
         {pickupDropoffOptions.map(o => (
           <option key={o.value} value={o.value}>{o.text}</option>
@@ -307,7 +307,7 @@ class PatternStopContents extends Component<Props, State> {
     updatePatternStops(activePattern, patternStops)
   }
 
-  onChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+  _onPickupOrDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     const selectedOptionValue: number = parseInt(evt.target.value, 10)
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]
@@ -315,6 +315,7 @@ class PatternStopContents extends Component<Props, State> {
     patternStops[index][evt.target.id] = selectedOptionValue
     this.setState({update: true})
     updatePatternStops(activePattern, patternStops)
+    console.log('made it to here')
   }
 
   render () {
@@ -383,7 +384,7 @@ class PatternStopContents extends Component<Props, State> {
               title='Define the pickup method/availability at this stop.'
               controlLabel='Pickup'
               value={patternStop.pickupType || ''}
-              onChange={this.onChange}
+              onChange={this._onPickupOrDropOffChange}
             />
           </Col>
           <Col xs={6}>
@@ -394,7 +395,7 @@ class PatternStopContents extends Component<Props, State> {
               title='Define the dropff method/availability at this stop.'
               controlLabel='Drop-off'
               value={patternStop.dropOffType || ''}
-              onChange={this.onChange}
+              onChange={this._onPickupOrDropOffChange}
             />
           </Col>
         </Row>
@@ -407,7 +408,7 @@ class PatternStopContents extends Component<Props, State> {
               title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
               controlLabel='Continuous pickup'
               value={patternStop.continuousPickup || ''}
-              onChange={this.onChange}
+              onChange={this._onPickupOrDropOffChange}
             />
           </Col>
           <Col xs={6}>
@@ -418,7 +419,7 @@ class PatternStopContents extends Component<Props, State> {
               title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
               controlLabel='Continuous drop-off'
               value={patternStop.continuousDropOff || ''}
-              onChange={this.onChange}
+              onChange={this._onPickupOrDropOffChange}
             />
           </Col>
         </Row>

From 025502962c8397a1e5d9860f7d0b8fb20b07d51d Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Sat, 3 Jul 2021 13:57:25 +0100
Subject: [PATCH 266/553] fix(PatternStopCard.js): Attempt to fix flow error

#668
---
 lib/editor/components/pattern/PatternStopCard.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index b05920adc..6a38ae4b6 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -37,7 +37,6 @@ type Props = {
   index: number,
   isDragging: boolean,
   moveCard: (string, number) => void,
-  onChange: () => void,
   patternEdited: boolean,
   patternStop: PatternStop,
   removeStopFromPattern: typeof stopStrategiesActions.removeStopFromPattern,
@@ -53,7 +52,7 @@ type Props = {
   title: string,
   updateActiveGtfsEntity: typeof activeActions.updateActiveGtfsEntity,
   updatePatternStops: typeof tripPatternActions.updatePatternStops,
-  value: string
+  value: string | number
 }
 
 type State = {
@@ -315,7 +314,6 @@ class PatternStopContents extends Component<Props, State> {
     patternStops[index][evt.target.id] = selectedOptionValue
     this.setState({update: true})
     updatePatternStops(activePattern, patternStops)
-    console.log('made it to here')
   }
 
   render () {

From ae5eaaefe8a46e81b4b560c332f10adf574e600d Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Sat, 3 Jul 2021 14:02:02 +0100
Subject: [PATCH 267/553] fix(PatternStopCard.js): Attempt to fix flow issue
 again

#668
---
 lib/editor/components/pattern/PatternStopCard.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index 6a38ae4b6..ed0c1988f 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -37,6 +37,7 @@ type Props = {
   index: number,
   isDragging: boolean,
   moveCard: (string, number) => void,
+  onChange: () => void,
   patternEdited: boolean,
   patternStop: PatternStop,
   removeStopFromPattern: typeof stopStrategiesActions.removeStopFromPattern,

From cb588bed71d3620b1465d65453ecd4275aa9b91a Mon Sep 17 00:00:00 2001
From: Rob Gregg <rob.gregg@ibigroup.com>
Date: Sat, 3 Jul 2021 14:09:04 +0100
Subject: [PATCH 268/553] fix(PatternStopCard.js): Attempt to fox flow issue 3

#668
---
 lib/editor/components/pattern/PatternStopCard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index ed0c1988f..6af561ad8 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -37,7 +37,7 @@ type Props = {
   index: number,
   isDragging: boolean,
   moveCard: (string, number) => void,
-  onChange: () => void,
+  onChange: (evt: SyntheticInputEvent<HTMLInputElement>) => void,
   patternEdited: boolean,
   patternStop: PatternStop,
   removeStopFromPattern: typeof stopStrategiesActions.removeStopFromPattern,
@@ -307,7 +307,7 @@ class PatternStopContents extends Component<Props, State> {
     updatePatternStops(activePattern, patternStops)
   }
 
-  _onPickupOrDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
+  _onPickupOrDropOffChange = (evt) => {
     const selectedOptionValue: number = parseInt(evt.target.value, 10)
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]

From a95a02c0b51a8b19a8b554133e9fa3c5ca5b4d27 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 6 Jul 2021 11:15:12 -0400
Subject: [PATCH 269/553] refactor(PatternStopCard): Separate props for
 <PickupDropoffSelect>

---
 .../components/pattern/PatternStopCard.js     | 70 +++++++++++--------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index 6af561ad8..7638b9a89 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -29,7 +29,6 @@ type Props = {
   addStopToPattern: typeof stopStrategiesActions.addStopToPattern,
   // property is available through react dnd?
   connectDragSource: any,
-  controlLabel: string,
   cumulativeTravelTime: number,
   feedSource: Feed,
   findCard: string => { card: PatternStop, index: number },
@@ -37,22 +36,27 @@ type Props = {
   index: number,
   isDragging: boolean,
   moveCard: (string, number) => void,
-  onChange: (evt: SyntheticInputEvent<HTMLInputElement>) => void,
   patternEdited: boolean,
   patternStop: PatternStop,
   removeStopFromPattern: typeof stopStrategiesActions.removeStopFromPattern,
   rowStyle: {[string]: number | string},
   saveActiveGtfsEntity: typeof activeActions.saveActiveGtfsEntity,
-  selectType: string,
   setActiveEntity: typeof activeActions.setActiveEntity,
   setActiveStop: typeof tripPatternActions.setActiveStop,
-  shouldHaveDisabledOption: boolean,
   status: any,
   stop: any,
   stopIsActive: boolean,
-  title: string,
   updateActiveGtfsEntity: typeof activeActions.updateActiveGtfsEntity,
-  updatePatternStops: typeof tripPatternActions.updatePatternStops,
+  updatePatternStops: typeof tripPatternActions.updatePatternStops
+}
+
+type PickupDropoffSelectProps = {
+  activePattern: Pattern,
+  controlLabel: string,
+  onChange: (evt: SyntheticInputEvent<HTMLInputElement>) => void,
+  selectType: string,
+  shouldHaveDisabledOption: boolean,
+  title: string,
   value: string | number
 }
 
@@ -82,13 +86,22 @@ const pickupDropoffOptions = [
 ]
 
 // renders the form control drop downs for dropOff/Pick up and also continuous
-const PickupDropoffSelect = (props: Props) => {
-  const {activePattern, controlLabel, selectType, shouldHaveDisabledOption, title, onChange, value} = props
+const PickupDropoffSelect = (props: PickupDropoffSelectProps) => {
+  const {
+    activePattern,
+    controlLabel,
+    onChange,
+    selectType,
+    shouldHaveDisabledOption,
+    title,
+    value
+  } = props
   const hasShapeId = activePattern.shapeId === null
   return (
     <FormGroup
+      bsSize='small'
       controlId={selectType}
-      bsSize='small'>
+    >
       <ControlLabel
         className='small'
         title={title}
@@ -96,11 +109,12 @@ const PickupDropoffSelect = (props: Props) => {
         {controlLabel}
       </ControlLabel>
       <FormControl
-        disabled={shouldHaveDisabledOption && hasShapeId}
         componentClass='select'
+        disabled={shouldHaveDisabledOption && hasShapeId}
         onChange={onChange}
+        placeholder='select'
         value={value}
-        placeholder='select'>
+      >
         {pickupDropoffOptions.map(o => (
           <option key={o.value} value={o.value}>{o.text}</option>
         ))}
@@ -318,7 +332,7 @@ class PatternStopContents extends Component<Props, State> {
   }
 
   render () {
-    const {active, patternEdited, patternStop} = this.props
+    const {active, activePattern, patternEdited, patternStop} = this.props
     // This component has a special shouldComponentUpdate to ensure that state
     // is not overwritten with new props, so use state.update to check edited
     // state.
@@ -377,48 +391,48 @@ class PatternStopContents extends Component<Props, State> {
         <Row>
           <Col xs={6}>
             <PickupDropoffSelect
-              {...this.props}
-              shouldHaveDisabledOption={false}
+              activePattern={activePattern}
+              controlLabel='Pickup'
+              onChange={this._onPickupOrDropOffChange}
               selectType='pickupType'
+              shouldHaveDisabledOption={false}
               title='Define the pickup method/availability at this stop.'
-              controlLabel='Pickup'
               value={patternStop.pickupType || ''}
-              onChange={this._onPickupOrDropOffChange}
             />
           </Col>
           <Col xs={6}>
             <PickupDropoffSelect
-              {...this.props}
-              shouldHaveDisabledOption={false}
+              activePattern={activePattern}
+              controlLabel='Drop-off'
+              onChange={this._onPickupOrDropOffChange}
               selectType='dropOffType'
+              shouldHaveDisabledOption={false}
               title='Define the dropff method/availability at this stop.'
-              controlLabel='Drop-off'
               value={patternStop.dropOffType || ''}
-              onChange={this._onPickupOrDropOffChange}
             />
           </Col>
         </Row>
         <Row>
           <Col xs={6}>
             <PickupDropoffSelect
-              {...this.props}
-              shouldHaveDisabledOption
+              activePattern={activePattern}
+              controlLabel='Continuous pickup'
+              onChange={this._onPickupOrDropOffChange}
               selectType='continuousPickup'
+              shouldHaveDisabledOption
               title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
-              controlLabel='Continuous pickup'
               value={patternStop.continuousPickup || ''}
-              onChange={this._onPickupOrDropOffChange}
             />
           </Col>
           <Col xs={6}>
             <PickupDropoffSelect
-              {...this.props}
-              shouldHaveDisabledOption
+              activePattern={activePattern}
+              controlLabel='Continuous drop-off'
+              onChange={this._onPickupOrDropOffChange}
               selectType='continuousDropOff'
+              shouldHaveDisabledOption
               title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
-              controlLabel='Continuous drop-off'
               value={patternStop.continuousDropOff || ''}
-              onChange={this._onPickupOrDropOffChange}
             />
           </Col>
         </Row>

From 5696ff19fd40e6d48e7fb8ce807e4c02b71bf0bd Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 6 Jul 2021 11:16:32 -0400
Subject: [PATCH 270/553] refactor(editor/util/validation): Add
 emptyFieldValidationIssue.

---
 lib/editor/util/validation.js | 66 +++++++++++++++++------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index b34b3a7cc..3e7c94922 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -57,17 +57,25 @@ export function validate (
    * Construct an EditorValidationIssue for the field name and reason (defaults to
    * empty field message).
    */
-  function validationIssue (reason = EMPTY_FIELD_REASON, field = name) {
+  function validationIssue (reason: string, field = name) {
     return {field, invalid: true, reason}
   }
 
+  /**
+   * Construct an EditorValidationIssue for this field, used if it is required
+   * and has an empty value.
+   */
+  function emptyFieldValidationIssue () {
+    return {field: name, invalid: true, reason: EMPTY_FIELD_REASON}
+  }
+
   /**
    * Checks whether value is a positive number
    */
   function checkPositiveNumber (): CheckPositiveOutput {
     if (isRequiredButEmpty) {
       return {
-        result: validationIssue()
+        result: emptyFieldValidationIssue()
       }
     } else if (isOptionalAndEmpty) {
       return {
@@ -123,12 +131,10 @@ export function validate (
       ) {
         return validationIssue('Identifier is required if more than one agency exists')
       }
-      if (isRequiredButEmpty || isNotUnique) {
-        let reason
-        if (isNotUnique) {
-          reason = 'Identifier must be unique'
-        }
-        return validationIssue(reason)
+      if (isRequiredButEmpty) {
+        return emptyFieldValidationIssue()
+      } else if (isNotUnique) {
+        return validationIssue('Identifier must be unique')
       } else {
         return false
       }
@@ -147,7 +153,7 @@ export function validate (
         return false
       } else {
         if (isRequiredButEmpty) {
-          return validationIssue()
+          return emptyFieldValidationIssue()
         } else {
           return false
         }
@@ -158,47 +164,43 @@ export function validate (
     case 'GTFS_FARE':
     case 'GTFS_SERVICE':
       if (isRequiredButEmpty) {
-        return validationIssue()
+        return emptyFieldValidationIssue()
       } else {
         return false
       }
     case 'URL':
       const isNotUrl = value && !validator.isURL(value)
-      if (isRequiredButEmpty || isNotUrl) {
-        let reason
-        if (isNotUrl) {
-          reason = 'Field must contain valid URL.'
-        }
-        return validationIssue(reason)
+      if (isRequiredButEmpty) {
+        return emptyFieldValidationIssue()
+      } else if (isNotUrl) {
+        return validationIssue('Field must contain valid URL.')
       } else {
         return false
       }
     case 'EMAIL':
       const isNotEmail = value && !validator.isEmail(value)
-      if (isRequiredButEmpty || isNotEmail) {
-        let reason
-        if (isNotEmail) {
-          reason = 'Field must contain valid email address.'
-        }
-        return validationIssue(reason)
+      if (isRequiredButEmpty) {
+        return emptyFieldValidationIssue()
+      } else if (isNotEmail) {
+        return validationIssue('Field must contain valid email address.')
       } else {
         return false
       }
     case 'GTFS_ZONE':
       if (isRequiredButEmpty) {
-        return validationIssue()
+        return emptyFieldValidationIssue()
       } else {
         return false
       }
     case 'TIMEZONE':
       if (isRequiredButEmpty) {
-        return validationIssue()
+        return emptyFieldValidationIssue()
       } else {
         return false
       }
     case 'LANGUAGE':
       if (isRequiredButEmpty) {
-        return validationIssue()
+        return emptyFieldValidationIssue()
       } else {
         return false
       }
@@ -223,12 +225,10 @@ export function validate (
     case 'TIME':
     case 'NUMBER':
       const isNotANumber = isNaN(value)
-      if (isRequiredButEmpty || isNotANumber) {
-        let reason
-        if (isNotANumber) {
-          reason = 'Field must be valid number'
-        }
-        return validationIssue(reason)
+      if (isRequiredButEmpty) {
+        return emptyFieldValidationIssue()
+      } else if (isNotANumber) {
+        return validationIssue('Field must be valid number')
       } else {
         return false
       }
@@ -259,7 +259,7 @@ export function validate (
         field.options &&
         field.options.findIndex(o => o.value === '') === -1
       ) {
-        return validationIssue()
+        return emptyFieldValidationIssue()
       } else {
         return false
       }
@@ -341,7 +341,7 @@ export function validate (
     case 'COLOR':
     default:
       if (isRequiredButEmpty) {
-        return validationIssue()
+        return emptyFieldValidationIssue()
       }
       return false
   }

From e692199a8824774af57441185a527f5cd9a49835 Mon Sep 17 00:00:00 2001
From: Robert Gregg <hi@robertgregg.co.uk>
Date: Wed, 7 Jul 2021 15:40:30 +0100
Subject: [PATCH 271/553] refactor(PatternStopCard.js   validation.js):
 Refactor

Create separate prop types for the pickUpDropOffSelect method. Reorder the props alphabetically. Add
additional placeholder prop.  Refactor validation to use separate methods for validation errors and
empty errors

#668
---
 lib/editor/components/pattern/PatternStopCard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index 7638b9a89..fbdb4cee7 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -85,7 +85,7 @@ const pickupDropoffOptions = [
   }
 ]
 
-// renders the form control drop downs for dropOff/Pick up and also continuous
+/** renders the form control drop downs for dropOff/Pick up and also continuous */
 const PickupDropoffSelect = (props: PickupDropoffSelectProps) => {
   const {
     activePattern,
@@ -321,7 +321,7 @@ class PatternStopContents extends Component<Props, State> {
     updatePatternStops(activePattern, patternStops)
   }
 
-  _onPickupOrDropOffChange = (evt) => {
+  _onPickupOrDropOffChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
     const selectedOptionValue: number = parseInt(evt.target.value, 10)
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]

From f56707782a994c438978beab6e269e856375eb3b Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 7 Jul 2021 11:06:22 -0400
Subject: [PATCH 272/553] refactor(validation): reuse validation method for
 'empty' method

---
 lib/editor/util/validation.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index 3e7c94922..f977a86a2 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -15,8 +15,6 @@ export type EditorValidationIssue = {
   reason: string
 }
 
-const EMPTY_FIELD_REASON = 'Required field must not be empty'
-
 export function doesNotExist (value: any): boolean {
   return value === '' || value === null || typeof value === 'undefined'
 }
@@ -65,8 +63,8 @@ export function validate (
    * Construct an EditorValidationIssue for this field, used if it is required
    * and has an empty value.
    */
-  function emptyFieldValidationIssue () {
-    return {field: name, invalid: true, reason: EMPTY_FIELD_REASON}
+  function emptyFieldValidationIssue (field = name) {
+    return validationIssue('Required field must not be empty', field)
   }
 
   /**
@@ -298,7 +296,7 @@ export function validate (
         }
       }
       if (!value || value.length === 0) {
-        return validationIssue(EMPTY_FIELD_REASON, 'dates')
+        return emptyFieldValidationIssue('dates')
       }
       // check if date already exists in this or other exceptions
       for (let i = 0; i < value.length; i++) {
@@ -310,7 +308,7 @@ export function validate (
           ]}) cannot appear more than once for all exceptions`
           return validationIssue(reason, dateItemName)
         } else if (!moment(value[i], 'YYYYMMDD', true).isValid()) {
-          return validationIssue(EMPTY_FIELD_REASON, dateItemName)
+          return emptyFieldValidationIssue(dateItemName)
         }
       }
       return false

From 589b6c65d35e1067e86d2fdb90f31ba3fb42fa00 Mon Sep 17 00:00:00 2001
From: Robert Gregg <hi@robertgregg.co.uk>
Date: Wed, 7 Jul 2021 16:59:40 +0100
Subject: [PATCH 273/553] fix(validation.js): Remove ES lint waiver

#668
---
 lib/editor/util/validation.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index f977a86a2..00b810164 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -25,7 +25,6 @@ export function doesNotExist (value: any): boolean {
  * Returns false if the value is ok.
  * Returns an EditorValidationIssue object if the value is not ok.
  */
-// eslint-disable-next-line complexity
 export function validate (
   field: GtfsSpecField,
   value: any,

From 9d78e3722fed54fae20006ce969fe3fddba2910f Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 15 Jul 2021 11:38:23 -0400
Subject: [PATCH 274/553] fix(FeedTransformRules): Remove version clone
 trigger, add gtfs+ trigger.

---
 i18n/english.yml                              |  4 ++++
 lib/common/constants/index.js                 |  1 +
 lib/common/util/util.js                       | 19 ++++++++++++++++---
 .../transform/FeedTransformRules.js           | 13 ++++++++-----
 .../version/VersionRetrievalBadge.js          |  2 +-
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 90a6b4865..8b68ee371 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -253,6 +253,10 @@ components:
         fetchedAutomatically: Fetched Automatically
         manuallyUploaded: Manually Uploaded
         producedInHouse: Produced In-house
+        producedInHouseGtfsPlus: Produced In-house (GTFS+)
+        regionalMerge: Regional Merge
+        servicePeriodMerge: Service Period Merge
+        versionClone: Version Clone
         title: Retrieval Method
       snapshot: Editor Snapshot
       title: Settings
diff --git a/lib/common/constants/index.js b/lib/common/constants/index.js
index 117b0dc86..0c98fb832 100644
--- a/lib/common/constants/index.js
+++ b/lib/common/constants/index.js
@@ -32,6 +32,7 @@ export const RETRIEVAL_METHODS = Object.freeze({
   MANUALLY_UPLOADED: 'MANUALLY_UPLOADED',
   FETCHED_AUTOMATICALLY: 'FETCHED_AUTOMATICALLY',
   PRODUCED_IN_HOUSE: 'PRODUCED_IN_HOUSE',
+  PRODUCED_IN_HOUSE_GTFS_PLUS: 'PRODUCED_IN_HOUSE_GTFS_PLUS',
   SERVICE_PERIOD_MERGE: 'SERVICE_PERIOD_MERGE',
   REGIONAL_MERGE: 'REGIONAL_MERGE',
   VERSION_CLONE: 'VERSION_CLONE'
diff --git a/lib/common/util/util.js b/lib/common/util/util.js
index bf9e25d8a..9a91d1116 100644
--- a/lib/common/util/util.js
+++ b/lib/common/util/util.js
@@ -2,6 +2,7 @@
 
 import gravatar from 'gravatar'
 
+import {getComponentMessages} from '../../common/util/config'
 import type {Feed, FeedVersion, Project, SummarizedFeedVersion} from '../../types'
 
 export function defaultSorter (a: FeedVersion | Project | Feed, b: FeedVersion | Project | Feed): number {
@@ -30,13 +31,25 @@ export function versionsSorter (
 }
 
 export function retrievalMethodString (method: string): string {
+  // Get the retrieval method strings.
+  const messages = getComponentMessages('FeedSourceViewer')
+  const retrievalMethod = 'properties.retrievalMethod'
+
   switch (method) {
     case 'MANUALLY_UPLOADED':
-      return 'Manually Uploaded'
+      return messages(`${retrievalMethod}.manuallyUploaded`)
     case 'FETCHED_AUTOMATICALLY':
-      return 'Fetched Automatically'
+      return messages(`${retrievalMethod}.fetchedAutomatically`)
     case 'PRODUCED_IN_HOUSE':
-      return 'Produced In-house'
+      return messages(`${retrievalMethod}.producedInHouse`)
+    case 'PRODUCED_IN_HOUSE_GTFS_PLUS':
+      return messages(`${retrievalMethod}.producedInHouseGtfsPlus`)
+    case 'REGIONAL_MERGE':
+      return messages(`${retrievalMethod}.regionalMerge`)
+    case 'SERVICE_PERIOD_MERGE':
+      return messages(`${retrievalMethod}.servicePeriodMerge`)
+    case 'VERSION_CLONE':
+      return messages(`${retrievalMethod}.versionClone`)
     default:
       throw new Error('Unknown method')
   }
diff --git a/lib/manager/components/transform/FeedTransformRules.js b/lib/manager/components/transform/FeedTransformRules.js
index 2d5d094e7..ed3f011eb 100644
--- a/lib/manager/components/transform/FeedTransformRules.js
+++ b/lib/manager/components/transform/FeedTransformRules.js
@@ -12,17 +12,17 @@ import {
 import Select from 'react-select'
 
 import {RETRIEVAL_METHODS} from '../../../common/constants'
-import toSentenceCase from '../../../common/util/to-sentence-case'
-import FeedTransformation from './FeedTransformation'
+import {retrievalMethodString} from '../../../common/util/util'
 import {getTransformationName} from '../../util/transform'
 import VersionRetrievalBadge from '../version/VersionRetrievalBadge'
-
 import type {
   Feed,
   FeedTransformRules as FeedTransformRulesType,
   ReactSelectOption
 } from '../../../types'
 
+import FeedTransformation from './FeedTransformation'
+
 function newFeedTransformation (type: string = 'ReplaceFileFromVersionTransformation', props: any = {}) {
   return {
     '@type': type,
@@ -95,7 +95,7 @@ export default class FeedTransformRules extends Component<TransformRulesProps> {
     if (typeof method === 'string') {
       return {
         value: method,
-        label: toSentenceCase(method.toLowerCase().split('_').join(' '))
+        label: retrievalMethodString(method)
       }
     }
     return null
@@ -103,6 +103,9 @@ export default class FeedTransformRules extends Component<TransformRulesProps> {
 
   render () {
     const {feedSource, ruleSet, index} = this.props
+    const retrievalOptions = Object.values(RETRIEVAL_METHODS)
+      .filter(v => v !== RETRIEVAL_METHODS.VERSION_CLONE)
+      .map(this._retrievalMethodToOption)
     const methodBadges = ruleSet.retrievalMethods.map(method =>
       <VersionRetrievalBadge key={method} retrievalMethod={method} />)
     return (
@@ -135,7 +138,7 @@ export default class FeedTransformRules extends Component<TransformRulesProps> {
           clearable={false}
           multi
           placeholder='Select GTFS retrieval methods'
-          options={Object.values(RETRIEVAL_METHODS).map(this._retrievalMethodToOption)}
+          options={retrievalOptions}
           value={ruleSet.retrievalMethods.map(this._retrievalMethodToOption)}
           onChange={this._onChangeRetrievalMethods} />
         {ruleSet.transformations.length > 0
diff --git a/lib/manager/components/version/VersionRetrievalBadge.js b/lib/manager/components/version/VersionRetrievalBadge.js
index aa0c93cb3..ce0143cdd 100644
--- a/lib/manager/components/version/VersionRetrievalBadge.js
+++ b/lib/manager/components/version/VersionRetrievalBadge.js
@@ -4,7 +4,6 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React from 'react'
 
 import toSentenceCase from '../../../common/util/to-sentence-case'
-
 import type { FeedVersion, RetrievalMethod } from '../../../types'
 
 type Props = {
@@ -19,6 +18,7 @@ const iconForRetrievalMethod = (retrievalMethod: RetrievalMethod | 'UNKNOWN') =>
     case 'REGIONAL_MERGE':
       return 'globe'
     case 'PRODUCED_IN_HOUSE':
+    case 'PRODUCED_IN_HOUSE_GTFS_PLUS':
       return 'pencil'
     case 'MANUALLY_UPLOADED':
       return 'upload'

From 8619a6cb68c549f654da6a891ead5900f87c76b6 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 15 Jul 2021 12:04:02 -0400
Subject: [PATCH 275/553] refactor(lib/common/util): Replace strings with enum
 entries.

---
 lib/common/util/util.js                        | 18 +++++++++++-------
 .../components/transform/FeedTransformRules.js |  5 +++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/common/util/util.js b/lib/common/util/util.js
index 9a91d1116..bf3a850fa 100644
--- a/lib/common/util/util.js
+++ b/lib/common/util/util.js
@@ -4,6 +4,7 @@ import gravatar from 'gravatar'
 
 import {getComponentMessages} from '../../common/util/config'
 import type {Feed, FeedVersion, Project, SummarizedFeedVersion} from '../../types'
+import { RETRIEVAL_METHODS } from '../constants'
 
 export function defaultSorter (a: FeedVersion | Project | Feed, b: FeedVersion | Project | Feed): number {
   if (a.isCreating && !b.isCreating) return -1
@@ -30,25 +31,28 @@ export function versionsSorter (
   return 0
 }
 
+/**
+ * Obtains the displayed (localizable) text for the given feed retrieval method.
+ */
 export function retrievalMethodString (method: string): string {
   // Get the retrieval method strings.
   const messages = getComponentMessages('FeedSourceViewer')
   const retrievalMethod = 'properties.retrievalMethod'
 
   switch (method) {
-    case 'MANUALLY_UPLOADED':
+    case RETRIEVAL_METHODS.MANUALLY_UPLOADED:
       return messages(`${retrievalMethod}.manuallyUploaded`)
-    case 'FETCHED_AUTOMATICALLY':
+    case RETRIEVAL_METHODS.FETCHED_AUTOMATICALLY:
       return messages(`${retrievalMethod}.fetchedAutomatically`)
-    case 'PRODUCED_IN_HOUSE':
+    case RETRIEVAL_METHODS.PRODUCED_IN_HOUSE:
       return messages(`${retrievalMethod}.producedInHouse`)
-    case 'PRODUCED_IN_HOUSE_GTFS_PLUS':
+    case RETRIEVAL_METHODS.PRODUCED_IN_HOUSE_GTFS_PLUS:
       return messages(`${retrievalMethod}.producedInHouseGtfsPlus`)
-    case 'REGIONAL_MERGE':
+    case RETRIEVAL_METHODS.REGIONAL_MERGE:
       return messages(`${retrievalMethod}.regionalMerge`)
-    case 'SERVICE_PERIOD_MERGE':
+    case RETRIEVAL_METHODS.SERVICE_PERIOD_MERGE:
       return messages(`${retrievalMethod}.servicePeriodMerge`)
-    case 'VERSION_CLONE':
+    case RETRIEVAL_METHODS.VERSION_CLONE:
       return messages(`${retrievalMethod}.versionClone`)
     default:
       throw new Error('Unknown method')
diff --git a/lib/manager/components/transform/FeedTransformRules.js b/lib/manager/components/transform/FeedTransformRules.js
index ed3f011eb..e0df8b562 100644
--- a/lib/manager/components/transform/FeedTransformRules.js
+++ b/lib/manager/components/transform/FeedTransformRules.js
@@ -103,9 +103,10 @@ export default class FeedTransformRules extends Component<TransformRulesProps> {
 
   render () {
     const {feedSource, ruleSet, index} = this.props
+    // Retrieval options exclude the ambiguous VERSION_CLONE method.
     const retrievalOptions = Object.values(RETRIEVAL_METHODS)
-      .filter(v => v !== RETRIEVAL_METHODS.VERSION_CLONE)
-      .map(this._retrievalMethodToOption)
+      .filter(m => m !== RETRIEVAL_METHODS.VERSION_CLONE)
+      .map(m => this._retrievalMethodToOption(m))
     const methodBadges = ruleSet.retrievalMethods.map(method =>
       <VersionRetrievalBadge key={method} retrievalMethod={method} />)
     return (

From ec1c5267449779faa1bfadfe5098fefe090e8701 Mon Sep 17 00:00:00 2001
From: Robert Gregg <hi@robertgregg.co.uk>
Date: Mon, 19 Jul 2021 15:22:24 +0100
Subject: [PATCH 276/553] fix(lib/types/index.js): Replaced the gtfs field
 option type from value: syring to value : string |

I was getting a flow error of not being able to compare a string to an integer.

#656
---
 lib/types/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types/index.js b/lib/types/index.js
index 538430db8..0fbf00484 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -578,7 +578,7 @@ export type GtfsSpecField = {
   helpContent?: string,
   inputType: InputType,
   name: string,
-  options?: Array<{text: string, value: string}>,
+  options?: Array<{text: string, value: string | number}>,
   placeholder?: string,
   required: boolean
 }

From da0bda5500d85ffb4d085e0553e31e63f405bd80 Mon Sep 17 00:00:00 2001
From: Robert Gregg <hi@robertgregg.co.uk>
Date: Mon, 19 Jul 2021 15:31:00 +0100
Subject: [PATCH 277/553] fix(EditorInput.js): Refactored the argument to
 compare a number with a number

The value in a gtfs option is a string, so converting to a number to make the comparrisson.

#656
---
 lib/editor/components/EditorInput.js | 4 ++--
 lib/types/index.js                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 1aa421136..54506d259 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -128,11 +128,11 @@ export default class EditorInput extends React.Component<Props> {
     const routeTypes = [
       {
         label: 'Standard',
-        options: options.filter(opt => opt.value < 100).map(toOption)
+        options: options.filter(opt => parseInt(opt.value) < 100).map(toOption)
       },
       {
         label: 'Extended',
-        options: options.filter(opt => opt.value >= 100).map(toOption)
+        options: options.filter(opt => parseInt(opt.value) >= 100).map(toOption)
       }
     ]
     return routeTypes.map(({label, options}) => (
diff --git a/lib/types/index.js b/lib/types/index.js
index 0fbf00484..538430db8 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -578,7 +578,7 @@ export type GtfsSpecField = {
   helpContent?: string,
   inputType: InputType,
   name: string,
-  options?: Array<{text: string, value: string | number}>,
+  options?: Array<{text: string, value: string}>,
   placeholder?: string,
   required: boolean
 }

From d85268bf97cf99a5ff0f36af114bce7253257e65 Mon Sep 17 00:00:00 2001
From: Robert Gregg <hi@robertgregg.co.uk>
Date: Mon, 19 Jul 2021 15:38:10 +0100
Subject: [PATCH 278/553] refactor(EditorInput.js): Aded a radix argunment to
 the parseInt

#656
---
 lib/editor/components/EditorInput.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 54506d259..7a33841e7 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -128,11 +128,11 @@ export default class EditorInput extends React.Component<Props> {
     const routeTypes = [
       {
         label: 'Standard',
-        options: options.filter(opt => parseInt(opt.value) < 100).map(toOption)
+        options: options.filter(opt => parseInt(opt.value, 10) < 100).map(toOption)
       },
       {
         label: 'Extended',
-        options: options.filter(opt => parseInt(opt.value) >= 100).map(toOption)
+        options: options.filter(opt => parseInt(opt.value, 10) >= 100).map(toOption)
       }
     ]
     return routeTypes.map(({label, options}) => (

From ef69da36f4a448b098dca8e5c8008888aad04074 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 19 Jul 2021 17:03:07 -0400
Subject: [PATCH 279/553] fix(editor/util/validation): Fix stop name
 validation.

---
 lib/editor/util/validation.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index 00b810164..ec4ce6cf2 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -136,7 +136,11 @@ export function validate (
         return false
       }
     case 'TEXT':
-      if (name === 'stop_name' && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
+      if (name === 'stop_name' &&
+          !value &&
+          locationType !== null &&
+          (typeof locationType === 'number' && locationType <= 2)
+      ) {
         return validationIssue('Stop name is required for stop, station, and entrance location types.')
       }
       if (name === 'route_short_name' && !value && entity && entity.route_long_name) {

From 3121b7f03d5658411b2f4695e1dd02c95bf2cfe4 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 20 Jul 2021 11:17:50 -0400
Subject: [PATCH 280/553] feat(ProjectViewer): show labels in project

---
 lib/common/components/Label.js          |  28 +++++
 lib/manager/components/ProjectViewer.js | 138 ++++++++++++++++--------
 lib/style.css                           | 119 +++++++++++---------
 package.json                            |   1 +
 yarn.lock                               |   5 +
 5 files changed, 195 insertions(+), 96 deletions(-)
 create mode 100644 lib/common/components/Label.js

diff --git a/lib/common/components/Label.js b/lib/common/components/Label.js
new file mode 100644
index 000000000..a85a04613
--- /dev/null
+++ b/lib/common/components/Label.js
@@ -0,0 +1,28 @@
+import React from 'react'
+import tinycolor from 'tinycolor2'
+
+const getComplementaryColor = (cssHex, strength) => {
+  const color = tinycolor(cssHex)
+
+  const complementary = color.isDark()
+    ? color.lighten(strength)
+    : color.darken(strength + 10)
+  return complementary.toHexString()
+}
+
+export default function Label (props) {
+  const { name, color } = props
+
+  return (
+    <span
+      className='feedLabel'
+      style={{
+        backgroundColor: color,
+        color: getComplementaryColor(color, 45),
+        borderColor: getComplementaryColor(color, 10)
+      }}
+    >
+      {name}
+    </span>
+  )
+}
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index 9a08a1740..3fe515e31 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -27,13 +27,14 @@ import WatchButton from '../../common/containers/WatchButton'
 import {getComponentMessages, getConfigProperty, isModuleEnabled} from '../../common/util/config'
 import DeploymentsPanel from '../containers/DeploymentsPanel'
 import FeedSourceTable from '../containers/FeedSourceTable'
-import ProjectSettings from './ProjectSettings'
-import CreateFeedSource from './CreateFeedSource'
-
+import Label from '../../common/components/Label'
 import type {Props as ContainerProps} from '../containers/ActiveProjectViewer'
 import type {Feed, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
+import CreateFeedSource from './CreateFeedSource'
+import ProjectSettings from './ProjectSettings'
+
 type Props = ContainerProps & {
   activeComponent: ?string,
   activeSubComponent: ?string,
@@ -175,9 +176,7 @@ export default class ProjectViewer extends Component<Props, State> {
     }
     const projectEditDisabled = this._isProjectEditDisabled()
     return (
-      <ManagerPage
-        ref='page'
-        title={project.name}>
+      <ManagerPage ref='page' title={project.name}>
         <Grid fluid>
           <Row className='project-header'>
             <Col xs={12}>
@@ -185,18 +184,30 @@ export default class ProjectViewer extends Component<Props, State> {
                 <Icon className='icon-link' type='folder-open-o' />
                 <Link to={`/project/${project.id}`}>{project.name}</Link>
                 <ButtonToolbar className={`pull-right`}>
-                  {getConfigProperty('application.notifications_enabled')
-                    ? <WatchButton
+                  {getConfigProperty('application.notifications_enabled') ? (
+                    <WatchButton
                       isWatching={this._isWatchingProject()}
                       user={user}
                       target={project.id}
-                      subscriptionType='project-updated' />
-                    : null
-                  }
+                      subscriptionType='project-updated'
+                    />
+                  ) : null}
                 </ButtonToolbar>
               </h3>
-              <ul className='list-unstyled list-inline small' style={{marginBottom: '0px'}}>
-                <li><Icon type='cloud-download' /> {project.autoFetchFeeds ? `${project.autoFetchHour}:${project.autoFetchMinute < 10 ? '0' + project.autoFetchMinute : project.autoFetchMinute}` : 'Auto fetch disabled'}</li>
+              <ul
+                className='list-unstyled list-inline small'
+                style={{ marginBottom: '0px' }}
+              >
+                <li>
+                  <Icon type='cloud-download' />{' '}
+                  {project.autoFetchFeeds
+                    ? `${project.autoFetchHour}:${
+                      project.autoFetchMinute < 10
+                        ? '0' + project.autoFetchMinute
+                        : project.autoFetchMinute
+                    }`
+                    : 'Auto fetch disabled'}
+                </li>
               </ul>
             </Col>
           </Row>
@@ -204,43 +215,42 @@ export default class ProjectViewer extends Component<Props, State> {
             id='project-viewer-tabs'
             activeKey={activeComponent || 'sources'}
             mountOnEnter
-            onSelect={this._selectTab}>
+            onSelect={this._selectTab}
+          >
             <Tab
               eventKey='sources'
               title={
                 <span>
                   <Glyphicon className='icon-link' glyph='list' />
-                  <span className='hidden-xs'>{this.messages('feeds.title')}</span>
+                  <span className='hidden-xs'>
+                    {this.messages('feeds.title')}
+                  </span>
                 </span>
-              }>
+              }
+            >
               <Row>
                 <Col xs={12} sm={10}>
-                  {this.state.createMode
-                    ? (
-                      <CreateFeedSource
-                        createFeedSource={createFeedSource}
-                        onCancel={this._toggleCreateView}
-                        projectId={project.id}
-                      />
-                    )
-                    : (
-                      <FeedSourceTable
-                        onNewFeedSourceClick={this._toggleCreateView}
-                        project={project}
-                      />
-                    )
-                  }
+                  {this.state.createMode ? (
+                    <CreateFeedSource
+                      createFeedSource={createFeedSource}
+                      onCancel={this._toggleCreateView}
+                      projectId={project.id}
+                    />
+                  ) : (
+                    <FeedSourceTable
+                      onNewFeedSourceClick={this._toggleCreateView}
+                      project={project}
+                    />
+                  )}
                 </Col>
                 <Col xs={12} sm={2}>
                   {this._renderPublicFeeds()}
                   <ProjectSummaryPanel
                     project={project}
-                    feedSources={project.feedSources || []} />
-                  <Panel header={<h3>What is a feed source?</h3>}>
-                    A feed source defines the location or upstream source of a{' '}
-                    GTFS feed. GTFS can be populated via automatic fetch,{' '}
-                    directly editing or uploading a zip file.
-                  </Panel>
+                    feedSources={project.feedSources || []}
+                  />
+                  <ExplanatoryPanel project={project} />
+                  <LabelPanel project={project} />
                 </Col>
               </Row>
             </Tab>
@@ -253,15 +263,17 @@ export default class ProjectViewer extends Component<Props, State> {
                   <Glyphicon className='icon-link' glyph='cog' />
                   <span className='hidden-xs'>{this.messages('settings')}</span>
                 </span>
-              }>
-              {// Prevent rendering component if not active to ensure that
-                // keyboard listener is not active while form is not visible.
-                activeComponent === 'settings' &&
-                <ProjectSettings
-                  activeSettingsPanel={activeSubComponent}
-                  projectEditDisabled={projectEditDisabled}
-                  {...this.props} />
               }
+            >
+              {// Prevent rendering component if not active to ensure that
+              // keyboard listener is not active while form is not visible.
+                activeComponent === 'settings' && (
+                  <ProjectSettings
+                    activeSettingsPanel={activeSubComponent}
+                    projectEditDisabled={projectEditDisabled}
+                    {...this.props}
+                  />
+                )}
             </Tab>
           </Tabs>
         </Grid>
@@ -295,3 +307,39 @@ class ProjectSummaryPanel extends Component<{feedSources: Array<Feed>, project:
     )
   }
 }
+
+const LabelPanel = ({ project }) => {
+  const { labels } = project
+
+  let labelBody = 'There are no labels in this project.'
+  if (labels.length > 0) {
+    labelBody = labels.map((label) => (
+      // Disable this rule as it is not a form label
+      // eslint-disable-next-line jsx-a11y/label-has-for
+      <Label key={label.id} {...label} />
+    ))
+  }
+
+  return (
+    <Panel header={<h3>Labels</h3>}>
+      <div className='feedLabelContainer'>
+        {labelBody}
+      </div>
+    </Panel>
+  )
+}
+
+const ExplanatoryPanel = ({ project }) => {
+  // If user has more than 3 labels, hide the feed source instruction
+  if (project.labels.length <= 3) {
+    return (
+      <Panel header={<h3>What is a feed source?</h3>}>
+        A feed source defines the location or upstream source of a GTFS feed.
+        GTFS can be populated via automatic fetch, directly editing or uploading
+        a zip file.
+      </Panel>
+    )
+  }
+
+  return <div />
+}
diff --git a/lib/style.css b/lib/style.css
index d8d7365dd..cbd785f80 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -16,22 +16,22 @@ body {
 
 /* Font for entire app */
 * {
-  font-family: 'Sarabun', sans-serif;
+  font-family: "Sarabun", sans-serif;
 }
 
 kbd {
   display: inline-block;
-  margin: 0 .1em;
-  padding: .1em .6em;
-  font-family: Arial,"Helvetica Neue",Helvetica,sans-serif;
+  margin: 0 0.1em;
+  padding: 0.1em 0.6em;
+  font-family: Arial, "Helvetica Neue", Helvetica, sans-serif;
   font-size: 11px;
   line-height: 1.4;
   color: #242729;
-  text-shadow: 0 1px 0 #FFF;
+  text-shadow: 0 1px 0 #fff;
   background-color: #e1e3e5;
   border: 1px solid #adb3b9;
   border-radius: 3px;
-  box-shadow: 0 1px 0 rgba(12,13,14,0.2), 0 0 0 2px #FFF inset;
+  box-shadow: 0 1px 0 rgba(12, 13, 14, 0.2), 0 0 0 2px #fff inset;
   white-space: nowrap;
 }
 
@@ -50,7 +50,8 @@ kbd {
   margin-top: 15px;
 }
 
-.nav-tabs > .active > a, .nav-tabs > .active > a:hover {
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
   outline: 0;
 }
 
@@ -66,7 +67,7 @@ kbd {
 /* Project */
 
 .project-header {
-  background-color: #F5F5F5;
+  background-color: #f5f5f5;
   border-bottom: 1px #e3e3e3 solid;
   margin: -40px;
   margin-bottom: -64px;
@@ -81,7 +82,8 @@ kbd {
   width: 100%;
 }
 
-.feed-source-table td, .feed-source-table th {
+.feed-source-table td,
+.feed-source-table th {
   padding: 10px;
 }
 
@@ -105,11 +107,11 @@ kbd {
 }
 
 .comparison-column {
-  background-color: #CCCCCC;
+  background-color: #cccccc;
 }
 
 .feed-version-column {
-  background-color: #EEEEEE;
+  background-color: #eeeeee;
 }
 
 .feed-source-table-row {
@@ -141,6 +143,27 @@ td.feed-source-info {
   margin-bottom: 5px;
 }
 
+/* LABELS */
+.feedLabelContainer {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
+  gap: 10px;
+  grid-auto-flow: dense;
+}
+.feedLabel {
+  display: inline-block;
+  word-break: break-word;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  border-radius: 5px;
+  border: 1px solid;
+
+  padding: 5px;
+}
+
 /* Feed transformation substitution styling */
 .substitution-row td {
   border-top: none;
@@ -150,7 +173,8 @@ td.feed-source-info {
   padding: 0;
 }
 
-.substitution-row .form-control, .substitution-row .input-group > * {
+.substitution-row .form-control,
+.substitution-row .input-group > * {
   height: unset;
   padding: 2px;
 }
@@ -160,7 +184,8 @@ td.feed-source-info {
   cursor: pointer;
 }
 
-.substitution-row.inactive .form-control, .substitution-row.inactive .input-group > * {
+.substitution-row.inactive .form-control,
+.substitution-row.inactive .input-group > * {
   background: none;
   border-color: transparent;
   box-shadow: none;
@@ -174,7 +199,7 @@ td.feed-source-info {
 }
 
 .status-active {
-  background-color: #59B542;
+  background-color: #59b542;
 }
 
 .status-expiring-20 {
@@ -182,7 +207,7 @@ td.feed-source-info {
 }
 
 .status-expiring-5 {
-  background-color: #C44C35;
+  background-color: #c44c35;
 }
 
 .status-expired {
@@ -190,11 +215,11 @@ td.feed-source-info {
 }
 
 .status-future {
-  background-color: #4366B8;
+  background-color: #4366b8;
 }
 
 .status-no-version {
-  background-color: #853BE5;
+  background-color: #853be5;
 }
 
 .feed-status-subtext {
@@ -299,23 +324,24 @@ td.feed-source-info {
 
 /* Prevent text from being selectable */
 .unselectable {
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 
 /* EDITOR ENTITY LIST */
 
 .entity-list-row {
   /*background-color: '#f5f5f5';*/
-  outline: 'none';
+  outline: "none";
 }
 
-.EntityList input:focus, textarea:focus {
-    outline: none;
+.EntityList input:focus,
+textarea:focus {
+  outline: none;
 }
 
 /* Route List */
@@ -374,14 +400,14 @@ td.feed-source-info {
 
 .trip-pattern-list {
   height: 90%;
-  overflow-y: scroll
+  overflow-y: scroll;
 }
 
 .pattern-stop-card {
   border: 1px solid #ccc;
   padding: 0.5rem 0.5rem;
-  margin-bottom: .5rem;
-  background-color: #FAFFFD;
+  margin-bottom: 0.5rem;
+  background-color: #fafffd;
   border-radius: 3px;
 }
 
@@ -412,11 +438,11 @@ td.feed-source-info {
 
 .noselect {
   -webkit-touch-callout: none; /* iOS Safari */
-  -webkit-user-select: none;   /* Chrome/Safari/Opera */
-  -khtml-user-select: none;    /* Konqueror */
-  -moz-user-select: none;      /* Firefox */
-  -ms-user-select: none;       /* Internet Explorer/Edge */
-  user-select: none;           /* Non-prefixed version, currently
+  -webkit-user-select: none; /* Chrome/Safari/Opera */
+  -khtml-user-select: none; /* Konqueror */
+  -moz-user-select: none; /* Firefox */
+  -ms-user-select: none; /* Internet Explorer/Edge */
+  user-select: none; /* Non-prefixed version, currently
                                   not supported by any browser */
 }
 
@@ -480,7 +506,6 @@ td.feed-source-info {
 
 /* SIDEBAR */
 .Sidebar {
-
 }
 
 .Sidebar > nav {
@@ -547,25 +572,23 @@ td.feed-source-info {
   font-weight: bold;
 }
 
-
 /* React Bootstrap Table adjustments (no way to change toolbar class otherwise) */
 
 .react-bs-table-tool-bar {
   margin: 0px;
 }
 
-
 /* Ensure react-select menu is on top of leaflet */
 .Select > .Select-menu-outer {
-	z-index: 2000000;
+  z-index: 2000000;
 }
 
 .loading-ellipsis:after {
   overflow: hidden;
   display: inline-block;
   vertical-align: bottom;
-  -webkit-animation: ellipsis steps(4,end) 900ms infinite;
-  animation: ellipsis steps(4,end) 900ms infinite;
+  -webkit-animation: ellipsis steps(4, end) 900ms infinite;
+  animation: ellipsis steps(4, end) 900ms infinite;
   content: "\2026"; /* ascii code for the ellipsis character */
   width: 0px;
 }
@@ -596,7 +619,7 @@ td.feed-source-info {
 }
 
 .editable-cell .cell-input {
-  background-color: rgba(0,0,0,0);
+  background-color: rgba(0, 0, 0, 0);
   border: 0;
   height: 100%;
   width: 100%;
@@ -621,10 +644,9 @@ h4.line {
   font-size: 13px;
   position: relative;
   overflow: hidden;
-  text-align:left;
+  text-align: left;
 }
 
-
 h4.line:after {
   display: inline-block;
   content: "";
@@ -637,7 +659,6 @@ h4.line:after {
   margin-left: 10px;
 }
 
-
 .nomargin {
   margin: 0px;
 }
@@ -660,7 +681,7 @@ h4.line:after {
 }
 
 .manager-header {
-  background-color: #F5F5F5;
+  background-color: #f5f5f5;
   margin: -40px;
   padding-top: 40px;
   margin-bottom: -64px;
@@ -670,7 +691,6 @@ h4.line:after {
   border-bottom: 1px #e3e3e3 solid;
 }
 
-
 /* GTFS+ Editor */
 
 .gtfsplus-table-button {
@@ -681,7 +701,6 @@ h4.line:after {
   white-space: nowrap;
 }
 
-
 .gtfs-plus-column-header {
   background: gray;
   border-right: 4px solid white;
@@ -732,16 +751,14 @@ h4.line:after {
   text-align: center;
 }
 
-
 .link-disabled {
-  cursor: not-allowed
+  cursor: not-allowed;
 }
 
 .link-disabled * {
-  pointer-events: none
+  pointer-events: none;
 }
 
-
 /* Recent activity */
 
 .recent-activity-comment {
diff --git a/package.json b/package.json
index 6b942eaaf..62c49f0fc 100644
--- a/package.json
+++ b/package.json
@@ -99,6 +99,7 @@
     "redux-undo": "^1.0.0-beta9-9-7",
     "reselect": "^3.0.0",
     "shpjs": "^3.3.2",
+    "tinycolor2": "^1.4.2",
     "truncate": "^2.0.0",
     "turf-area": "^3.0.12",
     "turf-bbox-polygon": "^3.0.12",
diff --git a/yarn.lock b/yarn.lock
index 86a151805..c29d1984c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14008,6 +14008,11 @@ tinycolor2@^1.4.1:
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
   integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
 
+tinycolor2@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
+  integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==
+
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"

From be0b052d7f6a0a8cbba124c9b3f940f6d95546f3 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 20 Jul 2021 12:10:20 -0400
Subject: [PATCH 281/553] feat(FeedSourceTableRow): show labels of feed source

---
 lib/common/components/{Label.js => FeedLabel.js} |  4 ++--
 lib/manager/components/FeedSourceTableRow.js     | 11 ++++++++++-
 lib/manager/components/ProjectViewer.js          |  2 +-
 lib/style.css                                    | 11 ++++++++++-
 lib/types/index.js                               |  9 ++++++++-
 5 files changed, 31 insertions(+), 6 deletions(-)
 rename lib/common/components/{Label.js => FeedLabel.js} (85%)

diff --git a/lib/common/components/Label.js b/lib/common/components/FeedLabel.js
similarity index 85%
rename from lib/common/components/Label.js
rename to lib/common/components/FeedLabel.js
index a85a04613..57ff04197 100644
--- a/lib/common/components/Label.js
+++ b/lib/common/components/FeedLabel.js
@@ -11,11 +11,11 @@ const getComplementaryColor = (cssHex, strength) => {
 }
 
 export default function Label (props) {
-  const { name, color } = props
+  const { name, color, small } = props
 
   return (
     <span
-      className='feedLabel'
+      className={`feedLabel ${small ? 'small' : ''}`}
       style={{
         backgroundColor: color,
         color: getComplementaryColor(color, 45),
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 7d4ad422f..bf96aa2a8 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -25,7 +25,7 @@ import {abbreviate, isValidZipFile} from '../../common/util/util'
 import ConfirmModal from '../../common/components/ConfirmModal'
 import SelectFileModal from '../../common/components/SelectFileModal'
 import WatchButton from '../../common/containers/WatchButton'
-
+import FeedLabel from '../../common/components/FeedLabel'
 import type {Props as ContainerProps} from '../containers/FeedSourceTableRow'
 import type {Feed, ValidationSummary} from '../../types'
 import type {
@@ -266,6 +266,15 @@ class FeedInfo extends PureComponent<{ feedSource: Feed }> {
             <Icon type={feedSource.isPublic ? 'globe' : 'lock'} />
             {feedSource.isPublic ? 'Public' : 'Private'}
           </Col>
+          {feedSource.labels.length > 0 &&
+          <Col xs={12}>
+            <div className='feedSourceLabelRow'>
+              <Icon type={'tag'} />
+              <div className='feedLabelContainer'>
+                {feedSource.labels.map(label => <FeedLabel small key={label.id} {...label} />)}
+              </div>
+            </div>
+          </Col>}
         </Row>
       </div>
     )
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index 3fe515e31..37482497a 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -27,7 +27,7 @@ import WatchButton from '../../common/containers/WatchButton'
 import {getComponentMessages, getConfigProperty, isModuleEnabled} from '../../common/util/config'
 import DeploymentsPanel from '../containers/DeploymentsPanel'
 import FeedSourceTable from '../containers/FeedSourceTable'
-import Label from '../../common/components/Label'
+import Label from '../../common/components/FeedLabel'
 import type {Props as ContainerProps} from '../containers/ActiveProjectViewer'
 import type {Feed, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
diff --git a/lib/style.css b/lib/style.css
index cbd785f80..279e2b22d 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -147,8 +147,14 @@ td.feed-source-info {
 .feedLabelContainer {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
-  gap: 10px;
+  grid-gap: 5px;
   grid-auto-flow: dense;
+  width: 100%;
+}
+.feedSourceLabelRow {
+  display: inline-flex;
+  width: 100%;
+  align-items: baseline;
 }
 .feedLabel {
   display: inline-block;
@@ -163,6 +169,9 @@ td.feed-source-info {
 
   padding: 5px;
 }
+.feedLabel.small {
+  padding: 2.5px;
+}
 
 /* Feed transformation substitution styling */
 .substitution-row td {
diff --git a/lib/types/index.js b/lib/types/index.js
index d99eb5c63..befcd732b 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -7,7 +7,6 @@ import {
   FETCH_FREQUENCIES,
   RETRIEVAL_METHODS
 } from '../common/constants'
-
 import type UserPermissions from '../common/user/UserPermissions'
 
 type InputType =
@@ -385,6 +384,7 @@ export type Feed = {
   id: string,
   isCreating?: boolean,
   isPublic: boolean,
+  labels: Array<Label>,
   lastFetched?: ?number,
   lastUpdated?: number,
   latestValidation?: ValidationSummary,
@@ -522,6 +522,13 @@ export type FeedVersion = {|
   version: number
 |}
 
+export type Label = {
+  color: string,
+  description: string,
+  id: string,
+  name: string
+}
+
 // TODO: Remove this eslint rule once https://github.com/babel/babel-eslint/pull/584
 // is merged in.
 /* eslint-enable no-use-before-define */

From 83ae860a3a114ccd45eef4043f14109a1b53ff32 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 20 Jul 2021 12:12:59 -0400
Subject: [PATCH 282/553] feat(FeedLabel): denote admin-only label

---
 lib/common/components/FeedLabel.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 57ff04197..6a0a5d55d 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import tinycolor from 'tinycolor2'
+import Icon from '@conveyal/woonerf/components/icon'
 
 const getComplementaryColor = (cssHex, strength) => {
   const color = tinycolor(cssHex)
@@ -11,7 +12,7 @@ const getComplementaryColor = (cssHex, strength) => {
 }
 
 export default function Label (props) {
-  const { name, color, small } = props
+  const { name, color, small, adminOnly } = props
 
   return (
     <span
@@ -22,6 +23,7 @@ export default function Label (props) {
         borderColor: getComplementaryColor(color, 10)
       }}
     >
+      {adminOnly ? <Icon type='lock' /> : ''}
       {name}
     </span>
   )

From c2945e209f898a72e22d875984a8d8d9d4536c73 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 20 Jul 2021 17:05:41 -0400
Subject: [PATCH 283/553] feat(Label): add edit and delete button to labels

---
 lib/common/components/FeedLabel.js      | 66 +++++++++++++++++++------
 lib/common/containers/FeedLabel.js      | 21 ++++++++
 lib/manager/actions/labels.js           | 44 +++++++++++++++++
 lib/manager/components/LabelEditor.js   | 53 ++++++++++++++++++++
 lib/manager/components/ProjectViewer.js |  6 +--
 lib/style.css                           | 39 +++++++++++++--
 lib/types/index.js                      |  3 +-
 7 files changed, 208 insertions(+), 24 deletions(-)
 create mode 100644 lib/common/containers/FeedLabel.js
 create mode 100644 lib/manager/actions/labels.js
 create mode 100644 lib/manager/components/LabelEditor.js

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 6a0a5d55d..5fcfb58b0 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -2,6 +2,9 @@ import React from 'react'
 import tinycolor from 'tinycolor2'
 import Icon from '@conveyal/woonerf/components/icon'
 
+import ConfirmModal from '../../common/components/ConfirmModal'
+import { LabelEditorModal } from '../../manager/components/LabelEditor'
+
 const getComplementaryColor = (cssHex, strength) => {
   const color = tinycolor(cssHex)
 
@@ -11,20 +14,51 @@ const getComplementaryColor = (cssHex, strength) => {
   return complementary.toHexString()
 }
 
-export default function Label (props) {
-  const { name, color, small, adminOnly } = props
-
-  return (
-    <span
-      className={`feedLabel ${small ? 'small' : ''}`}
-      style={{
-        backgroundColor: color,
-        color: getComplementaryColor(color, 45),
-        borderColor: getComplementaryColor(color, 10)
-      }}
-    >
-      {adminOnly ? <Icon type='lock' /> : ''}
-      {name}
-    </span>
-  )
+export default class FeedLabel extends React.Component {
+  _onConfirmDelete = () => {
+    this.props.deleteLabel(this.props)
+  }
+
+  _onClickDelete = () => {
+    this.refs.deleteModal.open()
+  }
+
+  _onClickEdit = () => {
+    this.refs.editModal.open()
+  }
+
+  render () {
+    const { name, color, small, adminOnly } = this.props
+
+    return (
+      <div
+        className={`feedLabel ${small ? 'small' : ''}`}
+        style={{
+          backgroundColor: color,
+          color: getComplementaryColor(color, 40),
+          borderColor: getComplementaryColor(color, 10)
+        }}
+      >
+
+        <div className='labelName'>
+          {adminOnly ? <Icon type='lock' /> : ''}
+          <span>{name}</span>
+        </div>
+        { small ? ''
+          : <div className='actionButtons small'>
+            <ConfirmModal
+              ref='deleteModal'
+              title='Delete Label?'
+              body={`Are you sure you want to delete the label ${name}?`}
+              onConfirm={this._onConfirmDelete}
+            />
+            <LabelEditorModal ref='editModal' label={{ ...this.props }} />
+
+            <button onClick={() => this._onClickEdit()}>Edit</button>
+            <button onClick={() => this._onClickDelete()}>Delete</button>
+          </div>
+        }
+      </div>
+    )
+  }
 }
diff --git a/lib/common/containers/FeedLabel.js b/lib/common/containers/FeedLabel.js
new file mode 100644
index 000000000..786bee9ff
--- /dev/null
+++ b/lib/common/containers/FeedLabel.js
@@ -0,0 +1,21 @@
+// @flow
+
+import { connect } from 'react-redux'
+
+import { deleteLabel } from '../../manager/actions/labels'
+import FeedLabel from '../components/FeedLabel'
+
+const mapStateToProps = (state, ownProps) => {
+  return {
+    label: state.label
+  }
+}
+
+const mapDispatchToProps = {
+  deleteLabel
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(FeedLabel)
diff --git a/lib/manager/actions/labels.js b/lib/manager/actions/labels.js
new file mode 100644
index 000000000..8b50b87ab
--- /dev/null
+++ b/lib/manager/actions/labels.js
@@ -0,0 +1,44 @@
+// @flow
+
+import {secureFetch} from '../../common/actions'
+import type {dispatchFn, getStateFn} from '../../types/reducers'
+
+import { fetchProject } from './projects'
+import {fetchProjectFeeds} from './feeds'
+
+// Public action used by component or other actions
+
+const LABEL_URL = '/api/manager/secure/label'
+
+/**
+ * Create new label from provided properties.
+ */
+export function createLabel (newLabel: Label) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    return dispatch(secureFetch(LABEL_URL, 'post', newLabel))
+      .then((res) => res.json())
+      .then((createdLabel) => {
+        // TODO
+      })
+  }
+}
+
+/**
+ * Update existing label with provided properties.
+ */
+export function updateLabel (label: Label, properties: {[string]: any}) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'put', {...label, ...properties}))
+      .then((res) => dispatch(fetchProject(label.projectId)))
+  }
+}
+
+/**
+ * Permanently delete single label */
+export function deleteLabel (label: Label) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'delete'))
+      .then((res) => dispatch(fetchProject(label.projectId)))
+      .then(() => dispatch(fetchProjectFeeds(label.projectId)))
+  }
+}
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
new file mode 100644
index 000000000..3c20f66f2
--- /dev/null
+++ b/lib/manager/components/LabelEditor.js
@@ -0,0 +1,53 @@
+// @flow
+
+import React from 'react'
+import { Modal } from 'react-bootstrap'
+
+type LabelEditorProps = {
+  label?: Label,
+}
+
+type LabelEditorState = {
+  showModal: boolean,
+}
+
+export function LabelEditor ({label}) {
+  return <div>{label.name}</div>
+}
+export class LabelEditorModal extends React.Component<LabelEditorProps, LabelEditorState> {
+  state = {
+    showModal: false
+  }
+
+   close = () => {
+     this.setState({
+       showModal: false
+     })
+   }
+
+  open = () => {
+    this.setState({
+      showModal: true
+    })
+  }
+
+  ok = () => {
+    this.close()
+  }
+
+  render () {
+    const {Body, Header, Title} = Modal
+    const {label} = this.props
+    return (
+      <Modal show={this.state.showModal} onHide={this.close}>
+        <Header>
+          <Title>Editing {label.name ? label.name : 'New Label'}</Title>
+        </Header>
+
+        <Body>
+          <LabelEditor label={label} />
+        </Body>
+      </Modal>
+    )
+  }
+}
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index 37482497a..5467ea9ac 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -27,7 +27,7 @@ import WatchButton from '../../common/containers/WatchButton'
 import {getComponentMessages, getConfigProperty, isModuleEnabled} from '../../common/util/config'
 import DeploymentsPanel from '../containers/DeploymentsPanel'
 import FeedSourceTable from '../containers/FeedSourceTable'
-import Label from '../../common/components/FeedLabel'
+import FeedLabel from '../../common/containers/FeedLabel'
 import type {Props as ContainerProps} from '../containers/ActiveProjectViewer'
 import type {Feed, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
@@ -314,9 +314,7 @@ const LabelPanel = ({ project }) => {
   let labelBody = 'There are no labels in this project.'
   if (labels.length > 0) {
     labelBody = labels.map((label) => (
-      // Disable this rule as it is not a form label
-      // eslint-disable-next-line jsx-a11y/label-has-for
-      <Label key={label.id} {...label} />
+      <FeedLabel key={label.id} {...label} />
     ))
   }
 
diff --git a/lib/style.css b/lib/style.css
index 279e2b22d..5496e820f 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -162,15 +162,48 @@ td.feed-source-info {
 
   display: flex;
   align-items: center;
-  justify-content: center;
+  justify-content: space-between;
 
   border-radius: 5px;
   border: 1px solid;
 
-  padding: 5px;
+  padding: 5px 0 8px 0;
 }
 .feedLabel.small {
-  padding: 2.5px;
+  /* removing bottom padding seems to be only way to account for the icon baseline fix */
+  padding: 2px 0 0 0;
+  align-items: baseline;
+  justify-content: center;
+}
+.feedLabel.small .labelName span {
+  /* The icon adds this, so we have to add it as well */
+  margin-bottom: 5px;
+}
+.feedLabel .labelName {
+  flex: 2;
+  display: flex;
+  justify-content: center;
+  align-items: baseline;
+  padding: 5px;
+}
+.feedLabel.small .labelName {
+  padding: 0;
+}
+
+/* Delete Button */
+.feedLabel .actionButtons {
+  display: flex;
+  align-items: flex-end;
+  flex-direction: column;
+}
+.feedLabel .actionButtons button {
+  background: none;
+  border: none;
+  text-decoration: underline;
+  opacity: 0.7;
+}
+.feedLabel .actionButtons button:hover {
+  opacity: 1;
 }
 
 /* Feed transformation substitution styling */
diff --git a/lib/types/index.js b/lib/types/index.js
index befcd732b..aaa544abd 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -526,7 +526,8 @@ export type Label = {
   color: string,
   description: string,
   id: string,
-  name: string
+  name: string,
+  projectId: string
 }
 
 // TODO: Remove this eslint rule once https://github.com/babel/babel-eslint/pull/584

From 00ea4d41acd8a3123183174dc1b9cbc859b6a0f7 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 20 Jul 2021 17:18:52 -0400
Subject: [PATCH 284/553] style(editor/util/validation): Reformat stop_name
 validation condition

---
 lib/editor/util/validation.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index ec4ce6cf2..d6ddd7601 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -136,10 +136,11 @@ export function validate (
         return false
       }
     case 'TEXT':
-      if (name === 'stop_name' &&
-          !value &&
-          locationType !== null &&
-          (typeof locationType === 'number' && locationType <= 2)
+      if (
+        name === 'stop_name' &&
+        !value &&
+        locationType !== null &&
+        (typeof locationType === 'number' && locationType <= 2)
       ) {
         return validationIssue('Stop name is required for stop, station, and entrance location types.')
       }

From 6379c57df3176295ecf457f85d6a38637f91d3cb Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 20 Jul 2021 17:21:30 -0400
Subject: [PATCH 285/553] refactor(FeedLabel): change edit and delete button to
 icons

---
 lib/common/components/FeedLabel.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 5fcfb58b0..f5c28222c 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -45,7 +45,7 @@ export default class FeedLabel extends React.Component {
           <span>{name}</span>
         </div>
         { small ? ''
-          : <div className='actionButtons small'>
+          : <div className='actionButtons'>
             <ConfirmModal
               ref='deleteModal'
               title='Delete Label?'
@@ -54,8 +54,8 @@ export default class FeedLabel extends React.Component {
             />
             <LabelEditorModal ref='editModal' label={{ ...this.props }} />
 
-            <button onClick={() => this._onClickEdit()}>Edit</button>
-            <button onClick={() => this._onClickDelete()}>Delete</button>
+            <button onClick={() => this._onClickEdit()}><Icon type='pencil' /></button>
+            <button onClick={() => this._onClickDelete()}><Icon type='trash' /></button>
           </div>
         }
       </div>

From e7f12c128e883a9e67daf2c9aab4177b092bd6d8 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 21 Jul 2021 12:25:51 -0400
Subject: [PATCH 286/553] feat(Labels): add label editor

---
 lib/common/components/FeedLabel.js           |  18 +-
 lib/common/containers/FeedLabel.js           |   1 -
 lib/manager/actions/labels.js                |  16 +-
 lib/manager/components/FeedSourceTableRow.js |   2 +-
 lib/manager/components/LabelEditor.js        | 201 +++++++++++++++----
 lib/manager/components/LabelEditorModal.js   |  53 +++++
 lib/manager/components/ProjectViewer.js      |   2 +-
 lib/manager/containers/LabelEditor.js        |  22 ++
 lib/style.css                                |   3 +-
 9 files changed, 264 insertions(+), 54 deletions(-)
 create mode 100644 lib/manager/components/LabelEditorModal.js
 create mode 100644 lib/manager/containers/LabelEditor.js

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index f5c28222c..4756993f8 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -3,7 +3,7 @@ import tinycolor from 'tinycolor2'
 import Icon from '@conveyal/woonerf/components/icon'
 
 import ConfirmModal from '../../common/components/ConfirmModal'
-import { LabelEditorModal } from '../../manager/components/LabelEditor'
+import LabelEditorModal from '../../manager/components/LabelEditorModal'
 
 const getComplementaryColor = (cssHex, strength) => {
   const color = tinycolor(cssHex)
@@ -28,31 +28,31 @@ export default class FeedLabel extends React.Component {
   }
 
   render () {
-    const { name, color, small, adminOnly } = this.props
+    const {small, label} = this.props
 
     return (
       <div
         className={`feedLabel ${small ? 'small' : ''}`}
         style={{
-          backgroundColor: color,
-          color: getComplementaryColor(color, 40),
-          borderColor: getComplementaryColor(color, 10)
+          backgroundColor: label.color,
+          color: getComplementaryColor(label.color, 40),
+          borderColor: getComplementaryColor(label.color, 10)
         }}
       >
 
         <div className='labelName'>
-          {adminOnly ? <Icon type='lock' /> : ''}
-          <span>{name}</span>
+          {label.adminOnly ? <Icon type='lock' /> : ''}
+          <span>{label.name}</span>
         </div>
         { small ? ''
           : <div className='actionButtons'>
             <ConfirmModal
               ref='deleteModal'
               title='Delete Label?'
-              body={`Are you sure you want to delete the label ${name}?`}
+              body={`Are you sure you want to delete the label ${label.name}?`}
               onConfirm={this._onConfirmDelete}
             />
-            <LabelEditorModal ref='editModal' label={{ ...this.props }} />
+            <LabelEditorModal ref='editModal' label={this.props.label} />
 
             <button onClick={() => this._onClickEdit()}><Icon type='pencil' /></button>
             <button onClick={() => this._onClickDelete()}><Icon type='trash' /></button>
diff --git a/lib/common/containers/FeedLabel.js b/lib/common/containers/FeedLabel.js
index 786bee9ff..ca6a11bea 100644
--- a/lib/common/containers/FeedLabel.js
+++ b/lib/common/containers/FeedLabel.js
@@ -7,7 +7,6 @@ import FeedLabel from '../components/FeedLabel'
 
 const mapStateToProps = (state, ownProps) => {
   return {
-    label: state.label
   }
 }
 
diff --git a/lib/manager/actions/labels.js b/lib/manager/actions/labels.js
index 8b50b87ab..9e16987fb 100644
--- a/lib/manager/actions/labels.js
+++ b/lib/manager/actions/labels.js
@@ -13,12 +13,13 @@ const LABEL_URL = '/api/manager/secure/label'
 /**
  * Create new label from provided properties.
  */
-export function createLabel (newLabel: Label) {
+export function createLabel (label: Label) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
-    return dispatch(secureFetch(LABEL_URL, 'post', newLabel))
+    return dispatch(secureFetch(LABEL_URL, 'post', label))
       .then((res) => res.json())
       .then((createdLabel) => {
-        // TODO
+        dispatch(fetchProject(createdLabel.projectId))
+        dispatch(fetchProjectFeeds(createdLabel.projectId))
       })
   }
 }
@@ -27,9 +28,16 @@ export function createLabel (newLabel: Label) {
  * Update existing label with provided properties.
  */
 export function updateLabel (label: Label, properties: {[string]: any}) {
+  // remove keys which the server doesn't like
+  // TODO: is there a cleaner/more dynamic way to do this? Properties can't be guaranteed to
+  // include all the keys we need, so can't use that
+  delete label.organizationId
+  delete label.user
+
   return function (dispatch: dispatchFn, getState: getStateFn) {
-    return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'put', {...label, ...properties}))
+    return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'put', {...label}))
       .then((res) => dispatch(fetchProject(label.projectId)))
+      .then(() => dispatch(fetchProjectFeeds(label.projectId)))
   }
 }
 
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index bf96aa2a8..b8181923c 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -271,7 +271,7 @@ class FeedInfo extends PureComponent<{ feedSource: Feed }> {
             <div className='feedSourceLabelRow'>
               <Icon type={'tag'} />
               <div className='feedLabelContainer'>
-                {feedSource.labels.map(label => <FeedLabel small key={label.id} {...label} />)}
+                {feedSource.labels.map(label => <FeedLabel small key={label.id} label={label} />)}
               </div>
             </div>
           </Col>}
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index 3c20f66f2..46e0f3748 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -1,53 +1,180 @@
 // @flow
 
 import React from 'react'
-import { Modal } from 'react-bootstrap'
+import {
+  Button,
+  Col,
+  ControlLabel,
+  FormControl,
+  FormGroup,
+  HelpBlock,
+  ListGroup,
+  ListGroupItem,
+  Panel,
+  Row
+} from 'react-bootstrap'
+import update from 'react-addons-update'
 
-type LabelEditorProps = {
-  label?: Label,
-}
+import {validationState} from '../util'
+import type {ManagerUserState} from '../../types/reducers'
 
-type LabelEditorState = {
-  showModal: boolean,
-}
+// TODO: props
+export default class LabelEditor extends React.Component {
+    state = {
+      validation: {
+        name: true
+      },
+      newLabel: {...this.props.label}
+    }
 
-export function LabelEditor ({label}) {
-  return <div>{label.name}</div>
-}
-export class LabelEditorModal extends React.Component<LabelEditorProps, LabelEditorState> {
-  state = {
-    showModal: false
-  }
+    componentDidMount = () => {
+      // If we didn't get a label passed in, declare the label to be new
+      if (!this.props.label) {
+        this.setState({
+          labelIsNew: true
+        })
+      }
+    }
 
-   close = () => {
-     this.setState({
-       showModal: false
-     })
-   }
+    userIsAdmin = (user: ManagerUserState) => {
+      const {permissions} = user
+      if (!permissions) return false
+      else return permissions.isApplicationAdmin() || permissions.canAdministerAnOrganization()
+    }
+
+  _onFormChange = ({target}: {target: HTMLInputElement}) => {
+    const {name, value, type, checked} = target
+    const universalValue = type === 'checkbox' ? checked : value
+    const valid = type === 'checkbox' ? true : universalValue.length > 0
+
+    this.setState(
+      update(this.state, {
+        newLabel: { $merge: {[name]: universalValue} },
+        validation: { [name]: { $set: universalValue !== undefined && valid } }
+      })
+    )
+  }
 
-  open = () => {
-    this.setState({
-      showModal: true
+  _getChanges = () => {
+    const newLabel = this.state.newLabel
+    const oldLabel = this.props.label || {}
+    const changes: any = {}
+    Object.keys(oldLabel).map(k => {
+      if (oldLabel[k] !== newLabel[k]) {
+        changes[k] = oldLabel[k]
+      }
     })
+    return changes
   }
+  _settingsAreUnedited = () => Object.keys(this._getChanges()).length === 0
 
-  ok = () => {
-    this.close()
+  _formIsValid = () => {
+    const {validation} = this.state
+    return Object.keys(validation).every(k => validation[k])
+  }
+
+  _onSaveSettings = () => {
+    const {labelIsNew, newLabel: label} = this.state
+    const {createLabel, updateLabel} = this.props
+
+    if (labelIsNew) {
+      createLabel(label)
+    } else {
+      updateLabel(label)
+    }
+
+    // This passed method will close the editor
+    this.props.onDone()
   }
 
   render () {
-    const {Body, Header, Title} = Modal
-    const {label} = this.props
-    return (
-      <Modal show={this.state.showModal} onHide={this.close}>
-        <Header>
-          <Title>Editing {label.name ? label.name : 'New Label'}</Title>
-        </Header>
-
-        <Body>
-          <LabelEditor label={label} />
-        </Body>
-      </Modal>
-    )
+    const {newLabel, validation} = this.state
+    const {user} = this.props
+
+    return <div>
+      <Panel>
+
+        <ListGroup fill>
+          <ListGroupItem>
+            <FormGroup
+              data-test-id='label-name'
+              validationState={validationState(validation.name)}
+            >
+
+              <ControlLabel>Name</ControlLabel>
+              <FormControl
+                value={newLabel.name}
+                name={'name'}
+                onChange={this._onFormChange}
+              />
+              <FormControl.Feedback />
+              <HelpBlock>Required.</HelpBlock>
+            </FormGroup>
+          </ListGroupItem>
+          <ListGroupItem>
+            <Row>
+              <Col xs={3}>
+                <FormGroup
+                  data-test-id='label-color'
+                >
+                  <ControlLabel>Color</ControlLabel>
+                  <FormControl
+                    value={newLabel.color}
+                    name={'color'}
+                    type='color'
+                    onChange={this._onFormChange}
+                  />
+                  <FormControl.Feedback />
+                </FormGroup>
+              </Col>
+              <Col xs={9}>
+                {this.userIsAdmin(user)
+                  ? <FormGroup
+                    data-test-id='label-adminOnly'
+                  >
+                    <ControlLabel>Visible to admins only?</ControlLabel>
+                    <Row>
+                      <Col xs={3}>
+                        <FormControl
+                          checked={newLabel.adminOnly}
+                          name={'adminOnly'}
+                          type='checkbox'
+                          onChange={this._onFormChange}
+                        />
+                      </Col>
+                      <Col xs={9}>
+                        <div>If checked, this label will only be visible to project and application admins. Users with feed-specific priveleges will not see this label applied to any feed sources.</div>
+                      </Col>
+                    </Row>
+                  </FormGroup>
+                  : ''}
+              </Col>
+            </Row>
+          </ListGroupItem>
+        </ListGroup>
+      </Panel>
+      <Row>
+        <Col xs={12}>
+          {/* Cancel button */}
+          <Button
+            onClick={this.props.onDone}
+            style={{marginRight: 10}}
+          >
+            Cancel
+          </Button>
+          {/* Save button */}
+          <Button
+            bsStyle='primary'
+            data-test-id='label-form-save-button'
+            disabled={
+              this._settingsAreUnedited() ||
+                !this._formIsValid()
+            }
+            onClick={this._onSaveSettings}>
+            Save
+          </Button>
+        </Col>
+      </Row>
+    </div>
   }
 }
diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
new file mode 100644
index 000000000..ffc89e9a4
--- /dev/null
+++ b/lib/manager/components/LabelEditorModal.js
@@ -0,0 +1,53 @@
+import React from 'react'
+import {Modal} from 'react-bootstrap'
+
+// @flow
+
+import LabelEditor from '../containers/LabelEditor'
+import type {Label} from '../../types'
+
+type LabelEditorModalProps = {
+    label?: Label,
+  }
+
+  type LabelEditorModalState = {
+    showModal: boolean,
+  }
+
+export default class LabelEditorModal extends React.Component<LabelEditorModalProps, LabelEditorModalState> {
+    state = {
+      showModal: false
+    }
+
+     close = () => {
+       this.setState({
+         showModal: false
+       })
+     }
+
+    open = () => {
+      this.setState({
+        showModal: true
+      })
+    }
+
+    ok = () => {
+      this.close()
+    }
+
+    render () {
+      const {Body, Header, Title} = Modal
+      const {label} = this.props
+      return (
+        <Modal show={this.state.showModal} onHide={this.close}>
+          <Header>
+            <Title>Editing {label.name ? 'Label' : 'New Label'}</Title>
+          </Header>
+
+          <Body>
+            <LabelEditor label={label} onDone={this.close} />
+          </Body>
+        </Modal>
+      )
+    }
+}
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index 5467ea9ac..684a91844 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -314,7 +314,7 @@ const LabelPanel = ({ project }) => {
   let labelBody = 'There are no labels in this project.'
   if (labels.length > 0) {
     labelBody = labels.map((label) => (
-      <FeedLabel key={label.id} {...label} />
+      <FeedLabel key={label.id} label={label} />
     ))
   }
 
diff --git a/lib/manager/containers/LabelEditor.js b/lib/manager/containers/LabelEditor.js
new file mode 100644
index 000000000..485033d74
--- /dev/null
+++ b/lib/manager/containers/LabelEditor.js
@@ -0,0 +1,22 @@
+// @flow
+
+import { connect } from 'react-redux'
+
+import { createLabel, updateLabel } from '../../manager/actions/labels'
+import LabelEditor from '../components/LabelEditor'
+
+const mapStateToProps = (state, ownProps) => {
+  return {
+    newLabel: state.newLabel,
+    user: state.user
+  }
+}
+
+const mapDispatchToProps = {
+  createLabel, updateLabel
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(LabelEditor)
diff --git a/lib/style.css b/lib/style.css
index 5496e820f..0317bb25c 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -150,6 +150,7 @@ td.feed-source-info {
   grid-gap: 5px;
   grid-auto-flow: dense;
   width: 100%;
+  align-items: center;
 }
 .feedSourceLabelRow {
   display: inline-flex;
@@ -171,7 +172,7 @@ td.feed-source-info {
 }
 .feedLabel.small {
   /* removing bottom padding seems to be only way to account for the icon baseline fix */
-  padding: 2px 0 0 0;
+  padding: 2px 4px 0 4px;
   align-items: baseline;
   justify-content: center;
 }

From 350c6a1d9b4e50b7b7c5a9234a33761844355e5f Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 21 Jul 2021 12:33:52 -0400
Subject: [PATCH 287/553] feat(Labels): add label descriptions

---
 lib/common/components/FeedLabel.js    |  1 +
 lib/manager/components/LabelEditor.js | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 4756993f8..582419142 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -38,6 +38,7 @@ export default class FeedLabel extends React.Component {
           color: getComplementaryColor(label.color, 40),
           borderColor: getComplementaryColor(label.color, 10)
         }}
+        title={label.description}
       >
 
         <div className='labelName'>
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index 46e0f3748..992120277 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -22,7 +22,8 @@ import type {ManagerUserState} from '../../types/reducers'
 export default class LabelEditor extends React.Component {
     state = {
       validation: {
-        name: true
+        name: true,
+        description: true
       },
       newLabel: {...this.props.label}
     }
@@ -42,10 +43,11 @@ export default class LabelEditor extends React.Component {
       else return permissions.isApplicationAdmin() || permissions.canAdministerAnOrganization()
     }
 
-  _onFormChange = ({target}: {target: HTMLInputElement}) => {
+  _onFormChange = ({target}: {target: HTMLInputElement}, alwaysValid: Boolean) => {
     const {name, value, type, checked} = target
+
     const universalValue = type === 'checkbox' ? checked : value
-    const valid = type === 'checkbox' ? true : universalValue.length > 0
+    const valid = alwaysValid || universalValue.length
 
     this.setState(
       update(this.state, {
@@ -110,6 +112,17 @@ export default class LabelEditor extends React.Component {
               <FormControl.Feedback />
               <HelpBlock>Required.</HelpBlock>
             </FormGroup>
+            <FormGroup
+              data-test-id='label-description'
+            >
+              <ControlLabel>Description</ControlLabel>
+              <FormControl
+                value={newLabel.description}
+                name={'description'}
+                onChange={e => this._onFormChange(e, true)}
+              />
+              <FormControl.Feedback />
+            </FormGroup>
           </ListGroupItem>
           <ListGroupItem>
             <Row>
@@ -139,7 +152,7 @@ export default class LabelEditor extends React.Component {
                           checked={newLabel.adminOnly}
                           name={'adminOnly'}
                           type='checkbox'
-                          onChange={this._onFormChange}
+                          onChange={e => this._onFormChange(e, true)}
                         />
                       </Col>
                       <Col xs={9}>

From ccb4afb29e4c7a923f8cd66c2127199539ce94a9 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 21 Jul 2021 13:28:33 -0400
Subject: [PATCH 288/553] feat(Labels): create new labels

---
 lib/common/components/FeedLabel.js         |  4 +--
 lib/manager/actions/labels.js              |  6 ++--
 lib/manager/components/LabelEditor.js      | 23 +++++++++-----
 lib/manager/components/LabelEditorModal.js |  6 ++--
 lib/manager/components/ProjectViewer.js    | 36 +++++++++++++---------
 lib/style.css                              | 19 +++++++++++-
 6 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 582419142..9d45a6f9c 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -16,7 +16,7 @@ const getComplementaryColor = (cssHex, strength) => {
 
 export default class FeedLabel extends React.Component {
   _onConfirmDelete = () => {
-    this.props.deleteLabel(this.props)
+    this.props.deleteLabel(this.props.label)
   }
 
   _onClickDelete = () => {
@@ -35,7 +35,7 @@ export default class FeedLabel extends React.Component {
         className={`feedLabel ${small ? 'small' : ''}`}
         style={{
           backgroundColor: label.color,
-          color: getComplementaryColor(label.color, 40),
+          color: getComplementaryColor(label.color, 55),
           borderColor: getComplementaryColor(label.color, 10)
         }}
         title={label.description}
diff --git a/lib/manager/actions/labels.js b/lib/manager/actions/labels.js
index 9e16987fb..f25c1e53b 100644
--- a/lib/manager/actions/labels.js
+++ b/lib/manager/actions/labels.js
@@ -15,9 +15,11 @@ const LABEL_URL = '/api/manager/secure/label'
  */
 export function createLabel (label: Label) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
+    console.log('createlabel')
+    console.log(label)
     return dispatch(secureFetch(LABEL_URL, 'post', label))
-      .then((res) => res.json())
-      .then((createdLabel) => {
+      .then(async (res) => {
+        const createdLabel = await res.json()
         dispatch(fetchProject(createdLabel.projectId))
         dispatch(fetchProjectFeeds(createdLabel.projectId))
       })
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index 992120277..4073d3451 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -30,9 +30,13 @@ export default class LabelEditor extends React.Component {
 
     componentDidMount = () => {
       // If we didn't get a label passed in, declare the label to be new
-      if (!this.props.label) {
+      if (Object.keys(this.props.label).length === 0) {
         this.setState({
-          labelIsNew: true
+          labelIsNew: true,
+          // Default to a nice orange
+          newLabel: {
+            color: '#FF9200'
+          }
         })
       }
     }
@@ -47,23 +51,24 @@ export default class LabelEditor extends React.Component {
     const {name, value, type, checked} = target
 
     const universalValue = type === 'checkbox' ? checked : value
-    const valid = alwaysValid || universalValue.length
+    const valid = alwaysValid || universalValue.length > 0
 
     this.setState(
       update(this.state, {
         newLabel: { $merge: {[name]: universalValue} },
-        validation: { [name]: { $set: universalValue !== undefined && valid } }
+        validation: { [name]: { $set: universalValue && valid } }
       })
     )
   }
 
   _getChanges = () => {
     const newLabel = this.state.newLabel
-    const oldLabel = this.props.label || {}
+    const oldLabel = this.props.label
+
     const changes: any = {}
-    Object.keys(oldLabel).map(k => {
-      if (oldLabel[k] !== newLabel[k]) {
-        changes[k] = oldLabel[k]
+    Object.keys(newLabel).map(k => {
+      if (newLabel[k] !== oldLabel[k]) {
+        changes[k] = newLabel[k]
       }
     })
     return changes
@@ -80,6 +85,8 @@ export default class LabelEditor extends React.Component {
     const {createLabel, updateLabel} = this.props
 
     if (labelIsNew) {
+      // Insert project ID
+      label.projectId = this.props.projectId
       createLabel(label)
     } else {
       updateLabel(label)
diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
index ffc89e9a4..dee22b763 100644
--- a/lib/manager/components/LabelEditorModal.js
+++ b/lib/manager/components/LabelEditorModal.js
@@ -8,6 +8,7 @@ import type {Label} from '../../types'
 
 type LabelEditorModalProps = {
     label?: Label,
+    projectId?: String
   }
 
   type LabelEditorModalState = {
@@ -37,7 +38,8 @@ export default class LabelEditorModal extends React.Component<LabelEditorModalPr
 
     render () {
       const {Body, Header, Title} = Modal
-      const {label} = this.props
+      const label = this.props.label || {}
+      const { projectId } = this.props
       return (
         <Modal show={this.state.showModal} onHide={this.close}>
           <Header>
@@ -45,7 +47,7 @@ export default class LabelEditorModal extends React.Component<LabelEditorModalPr
           </Header>
 
           <Body>
-            <LabelEditor label={label} onDone={this.close} />
+            <LabelEditor label={label} onDone={this.close} projectId={projectId} />
           </Body>
         </Modal>
       )
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index 684a91844..1a7013031 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -32,6 +32,7 @@ import type {Props as ContainerProps} from '../containers/ActiveProjectViewer'
 import type {Feed, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
+import LabelEditorModal from './LabelEditorModal'
 import CreateFeedSource from './CreateFeedSource'
 import ProjectSettings from './ProjectSettings'
 
@@ -308,23 +309,28 @@ class ProjectSummaryPanel extends Component<{feedSources: Array<Feed>, project:
   }
 }
 
-const LabelPanel = ({ project }) => {
-  const { labels } = project
+class LabelPanel extends Component<{project: Project}> {
+  _onClickNewLabel = () => this.refs.newLabelModal.open()
+  render () {
+    const { labels, id: projectId } = this.props.project
 
-  let labelBody = 'There are no labels in this project.'
-  if (labels.length > 0) {
-    labelBody = labels.map((label) => (
-      <FeedLabel key={label.id} label={label} />
-    ))
-  }
+    let labelBody = 'There are no labels in this project.'
+    if (labels.length > 0) {
+      labelBody = labels.map((label) => (
+        <FeedLabel key={label.id} label={label} />
+      ))
+    }
 
-  return (
-    <Panel header={<h3>Labels</h3>}>
-      <div className='feedLabelContainer'>
-        {labelBody}
-      </div>
-    </Panel>
-  )
+    return (
+      <Panel header={<h3>Labels</h3>}>
+        <div className='feedLabelContainer'>
+          <LabelEditorModal ref='newLabelModal' projectId={projectId} />
+          <button className='newLabel' onClick={this._onClickNewLabel}>Add a new label</button>
+          {labelBody}
+        </div>
+      </Panel>
+    )
+  }
 }
 
 const ExplanatoryPanel = ({ project }) => {
diff --git a/lib/style.css b/lib/style.css
index 0317bb25c..b0e3c742b 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -191,7 +191,11 @@ td.feed-source-info {
   padding: 0;
 }
 
-/* Delete Button */
+.feedLabel .labelName i {
+  padding-right: 2px;
+}
+
+/* Label Buttons */
 .feedLabel .actionButtons {
   display: flex;
   align-items: flex-end;
@@ -207,6 +211,19 @@ td.feed-source-info {
   opacity: 1;
 }
 
+/* New Label "button" */
+.newLabel {
+  background: none;
+  border: none;
+  margin: 0 0 10px 0;
+  padding: 0;
+  color: #337ab7;
+  text-decoration: none;
+}
+.newLabel:hover {
+  text-decoration: underline;
+}
+
 /* Feed transformation substitution styling */
 .substitution-row td {
   border-top: none;

From cb3a1e70ac44728baf370cda926ac4aa2cb14373 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 21 Jul 2021 14:14:59 -0400
Subject: [PATCH 289/553] fix(feeds.js): format labels to be supported by
 server

---
 lib/manager/actions/feeds.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/manager/actions/feeds.js b/lib/manager/actions/feeds.js
index db0b401de..06b49b5cb 100644
--- a/lib/manager/actions/feeds.js
+++ b/lib/manager/actions/feeds.js
@@ -5,15 +5,15 @@ import {createAction, type ActionType} from 'redux-actions'
 
 import {createVoidPayloadAction, secureFetch} from '../../common/actions'
 import {isModuleEnabled} from '../../common/util/config'
-import {fetchFeedSourceDeployments} from './deployments'
 import {fetchSnapshots} from '../../editor/actions/snapshots'
+import type {Feed, NewFeed} from '../../types'
+import type {dispatchFn, getStateFn} from '../../types/reducers'
+
+import {fetchFeedSourceDeployments} from './deployments'
 import {fetchProject, fetchProjectWithFeeds} from './projects'
 import {handleJobResponse} from './status'
 import {fetchFeedVersions} from './versions'
 
-import type {Feed, NewFeed} from '../../types'
-import type {dispatchFn, getStateFn} from '../../types/reducers'
-
 // Private actions
 const requestingFeedSource = createVoidPayloadAction('REQUESTING_FEEDSOURCE')
 const requestingFeedSources = createVoidPayloadAction('REQUESTING_FEEDSOURCES')
@@ -81,6 +81,8 @@ export function createFeedSource (newFeed: NewFeed) {
 export function updateFeedSource (feedSource: Feed, properties: {[string]: any}) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(savingFeedSource())
+    // Convert feed source labels to format wanted by datatools-server
+    feedSource.labels = feedSource.labels.map(label => label.id)
     return dispatch(secureFetch(`${FS_URL}/${feedSource.id}`, 'put', {...feedSource, ...properties}))
       // Re-fetch feed source with versions and snapshots.
       .then((res) => dispatch(fetchFeedSource(feedSource.id)))

From 0bebaf0034ffa431535039c11648ceb651f220d2 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 21 Jul 2021 15:28:36 -0400
Subject: [PATCH 290/553] refactor(common/util/util.js): Use camel case to
 derive messageid of transf trigger.

---
 lib/common/util/util.js | 33 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 23 deletions(-)

diff --git a/lib/common/util/util.js b/lib/common/util/util.js
index bf3a850fa..4083aed55 100644
--- a/lib/common/util/util.js
+++ b/lib/common/util/util.js
@@ -1,10 +1,16 @@
 // @flow
 
 import gravatar from 'gravatar'
+import camelCase from 'lodash/camelCase'
 
 import {getComponentMessages} from '../../common/util/config'
-import type {Feed, FeedVersion, Project, SummarizedFeedVersion} from '../../types'
-import { RETRIEVAL_METHODS } from '../constants'
+import type {
+  Feed,
+  FeedVersion,
+  Project,
+  RetrievalMethod,
+  SummarizedFeedVersion
+} from '../../types'
 
 export function defaultSorter (a: FeedVersion | Project | Feed, b: FeedVersion | Project | Feed): number {
   if (a.isCreating && !b.isCreating) return -1
@@ -34,29 +40,10 @@ export function versionsSorter (
 /**
  * Obtains the displayed (localizable) text for the given feed retrieval method.
  */
-export function retrievalMethodString (method: string): string {
+export function retrievalMethodString (method: RetrievalMethod): string {
   // Get the retrieval method strings.
   const messages = getComponentMessages('FeedSourceViewer')
-  const retrievalMethod = 'properties.retrievalMethod'
-
-  switch (method) {
-    case RETRIEVAL_METHODS.MANUALLY_UPLOADED:
-      return messages(`${retrievalMethod}.manuallyUploaded`)
-    case RETRIEVAL_METHODS.FETCHED_AUTOMATICALLY:
-      return messages(`${retrievalMethod}.fetchedAutomatically`)
-    case RETRIEVAL_METHODS.PRODUCED_IN_HOUSE:
-      return messages(`${retrievalMethod}.producedInHouse`)
-    case RETRIEVAL_METHODS.PRODUCED_IN_HOUSE_GTFS_PLUS:
-      return messages(`${retrievalMethod}.producedInHouseGtfsPlus`)
-    case RETRIEVAL_METHODS.REGIONAL_MERGE:
-      return messages(`${retrievalMethod}.regionalMerge`)
-    case RETRIEVAL_METHODS.SERVICE_PERIOD_MERGE:
-      return messages(`${retrievalMethod}.servicePeriodMerge`)
-    case RETRIEVAL_METHODS.VERSION_CLONE:
-      return messages(`${retrievalMethod}.versionClone`)
-    default:
-      throw new Error('Unknown method')
-  }
+  return messages(`properties.retrievalMethod.${camelCase(method)}`)
 }
 
 export function generateUID (): string {

From 2a361bd1308222cd028596e2c007b7b201b9edc0 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 21 Jul 2021 15:37:36 -0400
Subject: [PATCH 291/553] refactor(common/util/util.js): Unrestrict type for
 retrievalMethodString.

---
 lib/common/util/util.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/common/util/util.js b/lib/common/util/util.js
index 4083aed55..49ff1ee74 100644
--- a/lib/common/util/util.js
+++ b/lib/common/util/util.js
@@ -8,7 +8,6 @@ import type {
   Feed,
   FeedVersion,
   Project,
-  RetrievalMethod,
   SummarizedFeedVersion
 } from '../../types'
 
@@ -40,7 +39,7 @@ export function versionsSorter (
 /**
  * Obtains the displayed (localizable) text for the given feed retrieval method.
  */
-export function retrievalMethodString (method: RetrievalMethod): string {
+export function retrievalMethodString (method: string): string {
   // Get the retrieval method strings.
   const messages = getComponentMessages('FeedSourceViewer')
   return messages(`properties.retrievalMethod.${camelCase(method)}`)

From c03d86891f6450d210e1d25a86698b11cfd744f2 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 21 Jul 2021 15:59:49 -0400
Subject: [PATCH 292/553] feat(Labels): add label assigner

---
 lib/common/components/FeedLabel.js         | 15 ++++++-
 lib/manager/actions/feeds.js               |  6 ++-
 lib/manager/components/GeneralSettings.js  | 11 ++++--
 lib/manager/components/LabelAssigner.js    | 46 ++++++++++++++++++++++
 lib/manager/components/LabelEditorModal.js |  2 +-
 lib/manager/containers/LabelAssigner.js    | 20 ++++++++++
 lib/manager/util/index.js                  | 11 +++++-
 lib/style.css                              | 14 +++++++
 8 files changed, 115 insertions(+), 10 deletions(-)
 create mode 100644 lib/manager/components/LabelAssigner.js
 create mode 100644 lib/manager/containers/LabelAssigner.js

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 9d45a6f9c..dcade522b 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -28,20 +28,31 @@ export default class FeedLabel extends React.Component {
   }
 
   render () {
-    const {small, label} = this.props
+    const {small, label, checked, onClick} = this.props
 
     return (
       <div
-        className={`feedLabel ${small ? 'small' : ''}`}
+        className={`feedLabel ${small ? 'small' : ''} ${checked !== undefined ? 'clickable' : ''}`}
         style={{
           backgroundColor: label.color,
           color: getComplementaryColor(label.color, 55),
           borderColor: getComplementaryColor(label.color, 10)
         }}
         title={label.description}
+
+        onClick={() => onClick(label.id)}
+        onKeyPress={() => onClick(label.id)}
+        role='checkbox'
+        aria-checked={checked}
+        tabIndex={0}
       >
 
         <div className='labelName'>
+          {checked !== undefined
+            ? <div className='actionButtons'>
+              <input type='checkbox' checked={checked} />
+            </div>
+            : ''}
           {label.adminOnly ? <Icon type='lock' /> : ''}
           <span>{label.name}</span>
         </div>
diff --git a/lib/manager/actions/feeds.js b/lib/manager/actions/feeds.js
index 06b49b5cb..cb92b0e4e 100644
--- a/lib/manager/actions/feeds.js
+++ b/lib/manager/actions/feeds.js
@@ -8,6 +8,7 @@ import {isModuleEnabled} from '../../common/util/config'
 import {fetchSnapshots} from '../../editor/actions/snapshots'
 import type {Feed, NewFeed} from '../../types'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
+import { stringifyLabels } from '../util'
 
 import {fetchFeedSourceDeployments} from './deployments'
 import {fetchProject, fetchProjectWithFeeds} from './projects'
@@ -81,8 +82,9 @@ export function createFeedSource (newFeed: NewFeed) {
 export function updateFeedSource (feedSource: Feed, properties: {[string]: any}) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(savingFeedSource())
-    // Convert feed source labels to format wanted by datatools-server
-    feedSource.labels = feedSource.labels.map(label => label.id)
+    feedSource.labels = stringifyLabels(feedSource.labels)
+    properties.labels = stringifyLabels(properties.labels)
+
     return dispatch(secureFetch(`${FS_URL}/${feedSource.id}`, 'put', {...feedSource, ...properties}))
       // Re-fetch feed source with versions and snapshots.
       .then((res) => dispatch(fetchFeedSource(feedSource.id)))
diff --git a/lib/manager/components/GeneralSettings.js b/lib/manager/components/GeneralSettings.js
index e2bf4beb0..8a4bab6e6 100644
--- a/lib/manager/components/GeneralSettings.js
+++ b/lib/manager/components/GeneralSettings.js
@@ -17,10 +17,11 @@ import {
 
 import * as feedsActions from '../actions/feeds'
 import {FREQUENCY_INTERVALS} from '../../common/constants'
-import FeedFetchFrequency from './FeedFetchFrequency'
-
 import type {Feed, FetchFrequency, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
+import LabelAssigner from '../containers/LabelAssigner'
+
+import FeedFetchFrequency from './FeedFetchFrequency'
 
 type Props = {
   confirmDeleteFeedSource: () => void,
@@ -108,7 +109,8 @@ export default class GeneralSettings extends Component<Props, State> {
     const {
       confirmDeleteFeedSource,
       disabled,
-      feedSource
+      feedSource,
+      project
     } = this.props
     const {
       name,
@@ -199,6 +201,9 @@ export default class GeneralSettings extends Component<Props, State> {
             </ListGroupItem>
           </ListGroup>
         </Panel>
+        <Panel header={<h3>Labels</h3>}>
+          <LabelAssigner feedSource={feedSource} project={project} />
+        </Panel>
         <Panel bsStyle='danger' header={<h3>Danger zone</h3>}>
           <ListGroup fill>
             <ListGroupItem>
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
new file mode 100644
index 000000000..8b68b0057
--- /dev/null
+++ b/lib/manager/components/LabelAssigner.js
@@ -0,0 +1,46 @@
+// @flow
+
+import React from 'react'
+
+import FeedLabel from '../../common/containers/FeedLabel'
+import { stringifyLabels } from '../util'
+
+// TODO: props
+export default class LabelAssigner extends React.Component {
+  state = {};
+  onLabelClick = (labelId) => {
+    const {feedSource} = this.props
+    const updatedLabels = stringifyLabels(feedSource.labels)
+
+    const labelIndex = updatedLabels.indexOf(labelId)
+
+    // Either remove the label from the list, or add it
+    if (labelIndex < 0) {
+      updatedLabels.push(labelId)
+    } else {
+      updatedLabels.splice(labelIndex, 1)
+    }
+
+    this.props.updateFeedSource(feedSource, { labels: updatedLabels })
+  }
+
+  render () {
+    const { project, feedSource } = this.props
+    const projectLabels = project.labels
+    const fsLabelIds = feedSource.labels.map((label) => label.id)
+
+    return (
+      <div className='feedLabelContainer large'>
+        {projectLabels.map((label) => (
+          <FeedLabel
+            key={label.id}
+            label={label}
+            checked={fsLabelIds.find((id) => id === label.id) !== undefined}
+            small
+            onClick={this.onLabelClick}
+          />
+        ))}
+      </div>
+    )
+  }
+}
diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
index dee22b763..af3cb72cf 100644
--- a/lib/manager/components/LabelEditorModal.js
+++ b/lib/manager/components/LabelEditorModal.js
@@ -43,7 +43,7 @@ export default class LabelEditorModal extends React.Component<LabelEditorModalPr
       return (
         <Modal show={this.state.showModal} onHide={this.close}>
           <Header>
-            <Title>Editing {label.name ? 'Label' : 'New Label'}</Title>
+            <Title>{label.name ? 'Edit Label' : 'Create New Label'}</Title>
           </Header>
 
           <Body>
diff --git a/lib/manager/containers/LabelAssigner.js b/lib/manager/containers/LabelAssigner.js
new file mode 100644
index 000000000..619cc567f
--- /dev/null
+++ b/lib/manager/containers/LabelAssigner.js
@@ -0,0 +1,20 @@
+// @flow
+
+import { connect } from 'react-redux'
+
+import { updateFeedSource } from '../actions/feeds'
+import LabelAssigner from '../components/LabelAssigner'
+
+const mapStateToProps = (state, ownProps) => {
+  return {
+  }
+}
+
+const mapDispatchToProps = {
+  updateFeedSource
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(LabelAssigner)
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index 4a5b89e08..eb7adb5dd 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -3,8 +3,6 @@
 import moment from 'moment'
 import {get} from 'object-path'
 
-import {getVersionValidationSummaryByFilterStrategy} from './version'
-
 import type {
   Bounds,
   Feed,
@@ -20,6 +18,8 @@ import type {
   ProjectsState
 } from '../../types/reducers'
 
+import {getVersionValidationSummaryByFilterStrategy} from './version'
+
 /**
  * Sort function that compares a field that might be datetimes. If ascending is
  * set to false, the entities will be sorting in descending order. Empty entries
@@ -397,3 +397,10 @@ export function projectHasAtLeastOneFeedWithAPublishedVersion (project: ?Project
 export function validationState (val: ?boolean): ?string {
   return val ? undefined : 'error'
 }
+
+export function stringifyLabels (labels: [any]) {
+  // Convert feed source labels to id strings wanted by datatools-server,
+  // but only if we have a label object
+  if (!labels) return []
+  return labels.map(label => label.id ? label.id : label)
+}
diff --git a/lib/style.css b/lib/style.css
index b0e3c742b..8a3a698ab 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -152,6 +152,10 @@ td.feed-source-info {
   width: 100%;
   align-items: center;
 }
+.feedLabelContainer.large {
+  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+  grid-gap: 15px;
+}
 .feedSourceLabelRow {
   display: inline-flex;
   width: 100%;
@@ -169,6 +173,10 @@ td.feed-source-info {
   border: 1px solid;
 
   padding: 5px 0 8px 0;
+  height: 100%;
+}
+.feedLabel.clickable {
+  cursor: pointer;
 }
 .feedLabel.small {
   /* removing bottom padding seems to be only way to account for the icon baseline fix */
@@ -189,6 +197,8 @@ td.feed-source-info {
 }
 .feedLabel.small .labelName {
   padding: 0;
+  height: 100%;
+  align-items: center;
 }
 
 .feedLabel .labelName i {
@@ -201,6 +211,10 @@ td.feed-source-info {
   align-items: flex-end;
   flex-direction: column;
 }
+.feedLabel .actionButtons input[type="checkbox"] {
+  margin: 0 5px 2px 0;
+  padding: 0;
+}
 .feedLabel .actionButtons button {
   background: none;
   border: none;

From 818bb954ed7f4f143e9d29930dd0e68d25fb3ebf Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 21 Jul 2021 16:13:58 -0400
Subject: [PATCH 293/553] feat(ProjectSettingsForm): add project labels

---
 lib/manager/components/LabelPanel.js          | 37 +++++++++++++++++++
 lib/manager/components/ProjectSettingsForm.js |  8 ++--
 lib/manager/components/ProjectViewer.js       | 27 +-------------
 lib/style.css                                 |  4 ++
 4 files changed, 47 insertions(+), 29 deletions(-)
 create mode 100644 lib/manager/components/LabelPanel.js

diff --git a/lib/manager/components/LabelPanel.js b/lib/manager/components/LabelPanel.js
new file mode 100644
index 000000000..ed7c52946
--- /dev/null
+++ b/lib/manager/components/LabelPanel.js
@@ -0,0 +1,37 @@
+import React, { Component } from 'react'
+import { Panel } from 'react-bootstrap'
+
+import FeedLabel from '../../common/containers/FeedLabel'
+import { Project } from '../../types'
+
+import LabelEditorModal from './LabelEditorModal'
+
+export default class LabelPanel extends Component<{ project: Project; }> {
+  _onClickNewLabel = () => this.refs.newLabelModal.open();
+
+  render () {
+    const {large, project} = this.props
+    const { labels, id: projectId } = project
+
+    let labelBody = (
+      <div className='noLabelsMessage' >
+        There are no labels in this project.
+      </div>
+    )
+    if (labels.length > 0) {
+      labelBody = labels.map((label) => (
+        <FeedLabel key={label.id} label={label} />
+      ))
+    }
+
+    return (
+      <Panel header={<h3>Labels</h3>}>
+        <div className={`feedLabelContainer ${large ? 'large' : ''}`}>
+          <LabelEditorModal ref='newLabelModal' projectId={projectId} />
+          <button className='newLabel' onClick={this._onClickNewLabel}>Add a new label</button>
+          {labelBody}
+        </div>
+      </Panel>
+    )
+  }
+}
diff --git a/lib/manager/components/ProjectSettingsForm.js b/lib/manager/components/ProjectSettingsForm.js
index 6d7601e03..55efdc37c 100644
--- a/lib/manager/components/ProjectSettingsForm.js
+++ b/lib/manager/components/ProjectSettingsForm.js
@@ -30,9 +30,10 @@ import ConfirmModal from '../../common/components/ConfirmModal'
 import TimezoneSelect from '../../common/components/TimezoneSelect'
 import {getComponentMessages} from '../../common/util/config'
 import {parseBounds, validationState} from '../util'
-
 import type {Bounds, Project} from '../../types'
 
+import LabelPanel from './LabelPanel'
+
 type ProjectModel = {
   autoFetchFeeds?: boolean,
   autoFetchHour?: number,
@@ -235,7 +236,7 @@ export default class ProjectSettingsForm extends Component<Props, State> {
   _getChanges = () => {
     const {model} = this.state
     const {project} = this.props
-    let changes: any = {}
+    const changes: any = {}
     Object.keys(model).map(k => {
       if (model[k] !== project[k]) {
         changes[k] = model[k]
@@ -252,7 +253,7 @@ export default class ProjectSettingsForm extends Component<Props, State> {
   }
 
   render () {
-    const {editDisabled, showDangerZone} = this.props
+    const {editDisabled, showDangerZone, project} = this.props
     const {model, validation} = this.state
     const {autoFetchHour, autoFetchMinute} = model
     const autoFetchChecked = model.autoFetchFeeds
@@ -359,6 +360,7 @@ export default class ProjectSettingsForm extends Component<Props, State> {
             </ListGroupItem>
           </ListGroup>
         </Panel>
+        <LabelPanel project={project} large />
         {showDangerZone &&
           <Panel bsStyle='danger' header={<h3>Danger zone</h3>}>
             <ListGroup fill>
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index 1a7013031..562ed5ae5 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -27,14 +27,13 @@ import WatchButton from '../../common/containers/WatchButton'
 import {getComponentMessages, getConfigProperty, isModuleEnabled} from '../../common/util/config'
 import DeploymentsPanel from '../containers/DeploymentsPanel'
 import FeedSourceTable from '../containers/FeedSourceTable'
-import FeedLabel from '../../common/containers/FeedLabel'
 import type {Props as ContainerProps} from '../containers/ActiveProjectViewer'
 import type {Feed, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
-import LabelEditorModal from './LabelEditorModal'
 import CreateFeedSource from './CreateFeedSource'
 import ProjectSettings from './ProjectSettings'
+import LabelPanel from './LabelPanel'
 
 type Props = ContainerProps & {
   activeComponent: ?string,
@@ -309,30 +308,6 @@ class ProjectSummaryPanel extends Component<{feedSources: Array<Feed>, project:
   }
 }
 
-class LabelPanel extends Component<{project: Project}> {
-  _onClickNewLabel = () => this.refs.newLabelModal.open()
-  render () {
-    const { labels, id: projectId } = this.props.project
-
-    let labelBody = 'There are no labels in this project.'
-    if (labels.length > 0) {
-      labelBody = labels.map((label) => (
-        <FeedLabel key={label.id} label={label} />
-      ))
-    }
-
-    return (
-      <Panel header={<h3>Labels</h3>}>
-        <div className='feedLabelContainer'>
-          <LabelEditorModal ref='newLabelModal' projectId={projectId} />
-          <button className='newLabel' onClick={this._onClickNewLabel}>Add a new label</button>
-          {labelBody}
-        </div>
-      </Panel>
-    )
-  }
-}
-
 const ExplanatoryPanel = ({ project }) => {
   // If user has more than 3 labels, hide the feed source instruction
   if (project.labels.length <= 3) {
diff --git a/lib/style.css b/lib/style.css
index 8a3a698ab..9171aa0ac 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -156,6 +156,10 @@ td.feed-source-info {
   grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
   grid-gap: 15px;
 }
+.feedLabelContainer.large .noLabelsMessage {
+  /* Match the margin of the new labels "button" */
+  margin: 0 0 10px 0;
+}
 .feedSourceLabelRow {
   display: inline-flex;
   width: 100%;

From 90d37ad952553ba0a05cf5eb7e3bc79428af12c0 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 21 Jul 2021 16:49:00 -0400
Subject: [PATCH 294/553] feat(FeedSourceTableRow): add label assigner to feed
 sources

---
 lib/manager/components/FeedSourceTableRow.js | 41 +++++++++-----
 lib/manager/components/LabelAssignerModal.js | 59 ++++++++++++++++++++
 lib/manager/components/LabelPanel.js         |  2 +-
 lib/style.css                                |  4 +-
 4 files changed, 90 insertions(+), 16 deletions(-)
 create mode 100644 lib/manager/components/LabelAssignerModal.js

diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index b8181923c..89e4cf3c6 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -26,6 +26,7 @@ import ConfirmModal from '../../common/components/ConfirmModal'
 import SelectFileModal from '../../common/components/SelectFileModal'
 import WatchButton from '../../common/containers/WatchButton'
 import FeedLabel from '../../common/components/FeedLabel'
+import LabelAssignerModal from '../components/LabelAssignerModal'
 import type {Props as ContainerProps} from '../containers/FeedSourceTableRow'
 import type {Feed, ValidationSummary} from '../../types'
 import type {
@@ -131,7 +132,8 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
     const {
       comparisonColumn,
       comparisonValidationSummary,
-      feedSource
+      feedSource,
+      project
     } = this.props
 
     // data for feed source info column
@@ -181,7 +183,7 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
     return (
       <tr key={feedSource.id} className='feed-source-table-row'>
         <td className='feed-source-info'>
-          <FeedInfo feedSource={feedSource} />
+          <FeedInfo feedSource={feedSource} project={project} />
         </td>
         {comparisonColumn &&
           <td className='comparison-column'>
@@ -226,9 +228,9 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
   }
 }
 
-class FeedInfo extends PureComponent<{ feedSource: Feed }> {
+class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project }> {
   render () {
-    const {feedSource} = this.props
+    const {feedSource, project} = this.props
 
     const lastUpdateText = feedSource.lastUpdated
       ? `Last updated ${moment(feedSource.lastUpdated).format(dateFormat)}`
@@ -241,7 +243,7 @@ class FeedInfo extends PureComponent<{ feedSource: Feed }> {
         </h4>
         <h5>{lastUpdateText}</h5>
         <Row>
-          {feedSource.url &&
+          {feedSource.url && (
             <Col xs={12}>
               <Icon type='link' />
               <a href={feedSource.url} target='_blank'>
@@ -249,32 +251,45 @@ class FeedInfo extends PureComponent<{ feedSource: Feed }> {
                 <Icon type='external-link' />
               </a>
             </Col>
-          }
-          {feedSource.retrievalMethod === 'FETCHED_AUTOMATICALLY' &&
+          )}
+          {feedSource.retrievalMethod === 'FETCHED_AUTOMATICALLY' && (
             <Col xs={6}>
               <Icon type='feed' />
               Auto fetch
             </Col>
-          }
-          {feedSource.deployable &&
+          )}
+          {feedSource.deployable && (
             <Col xs={6}>
               <Icon type='rocket' />
               Deployable
             </Col>
-          }
+          )}
           <Col xs={6}>
             <Icon type={feedSource.isPublic ? 'globe' : 'lock'} />
             {feedSource.isPublic ? 'Public' : 'Private'}
           </Col>
-          {feedSource.labels.length > 0 &&
           <Col xs={12}>
             <div className='feedSourceLabelRow'>
               <Icon type={'tag'} />
+              <LabelAssignerModal
+                ref='labelAssignerModal'
+                feedSource={feedSource}
+                project={project}
+              />
+              <button
+                className='labelActionButton small'
+                style={{ marginRight: '5px' }}
+                onClick={() => this.refs.labelAssignerModal.open()}
+              >
+                  Edit
+              </button>
               <div className='feedLabelContainer'>
-                {feedSource.labels.map(label => <FeedLabel small key={label.id} label={label} />)}
+                {feedSource.labels.map((label) => (
+                  <FeedLabel small key={label.id} label={label} />
+                ))}
               </div>
             </div>
-          </Col>}
+          </Col>
         </Row>
       </div>
     )
diff --git a/lib/manager/components/LabelAssignerModal.js b/lib/manager/components/LabelAssignerModal.js
new file mode 100644
index 000000000..465e237ee
--- /dev/null
+++ b/lib/manager/components/LabelAssignerModal.js
@@ -0,0 +1,59 @@
+import React from 'react'
+import { Modal, Button } from 'react-bootstrap'
+
+// @flow
+
+import LabelAssigner from '../containers/LabelAssigner'
+import type {FeedSource, Project} from '../../types'
+
+type Props = {
+    feedSource: FeedSource,
+    project: Project
+  }
+
+  type State = {
+    showModal: boolean,
+  }
+
+export default class LabelEditorModal extends React.Component<Props, State> {
+    state = {
+      showModal: false
+    }
+
+     close = () => {
+       this.setState({
+         showModal: false
+       })
+     }
+
+    open = () => {
+      this.setState({
+        showModal: true
+      })
+    }
+
+    ok = () => {
+      this.close()
+    }
+
+    render () {
+      const {Body, Header, Title, Footer} = Modal
+      const { feedSource, project } = this.props
+      return (
+        <Modal show={this.state.showModal} onHide={this.close}>
+          <Header>
+            <Title>{`Add Labels to ${feedSource.name}`}</Title>
+          </Header>
+
+          <Body>
+            <LabelAssigner feedSource={feedSource} project={project} />
+          </Body>
+          <Footer>
+            <Button
+              data-test-id='label-assigner-done-button'
+              onClick={this.close}>Done</Button>
+          </Footer>
+        </Modal>
+      )
+    }
+}
diff --git a/lib/manager/components/LabelPanel.js b/lib/manager/components/LabelPanel.js
index ed7c52946..819543707 100644
--- a/lib/manager/components/LabelPanel.js
+++ b/lib/manager/components/LabelPanel.js
@@ -28,7 +28,7 @@ export default class LabelPanel extends Component<{ project: Project; }> {
       <Panel header={<h3>Labels</h3>}>
         <div className={`feedLabelContainer ${large ? 'large' : ''}`}>
           <LabelEditorModal ref='newLabelModal' projectId={projectId} />
-          <button className='newLabel' onClick={this._onClickNewLabel}>Add a new label</button>
+          <button className='labelActionButton' onClick={this._onClickNewLabel}>Add a new label</button>
           {labelBody}
         </div>
       </Panel>
diff --git a/lib/style.css b/lib/style.css
index 9171aa0ac..bb0f236ad 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -230,7 +230,7 @@ td.feed-source-info {
 }
 
 /* New Label "button" */
-.newLabel {
+.labelActionButton {
   background: none;
   border: none;
   margin: 0 0 10px 0;
@@ -238,7 +238,7 @@ td.feed-source-info {
   color: #337ab7;
   text-decoration: none;
 }
-.newLabel:hover {
+.labelActionButton:hover {
   text-decoration: underline;
 }
 

From 62a9a4084584c3310200a4edeb1888c8cbf16241 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 21 Jul 2021 17:33:36 -0400
Subject: [PATCH 295/553] refactor: add/fix flow types

---
 __tests__/test-utils/mock-data/manager.js    |   4 +-
 lib/common/components/FeedLabel.js           |   6 +-
 lib/manager/actions/labels.js                |   6 +-
 lib/manager/components/FeedSourceTableRow.js | 105 ++++++++++++-------
 lib/manager/components/LabelAssigner.js      |  13 ++-
 lib/manager/components/LabelEditor.js        |  36 +++++--
 lib/manager/util/index.js                    |   2 +-
 lib/types/index.js                           |   2 +
 8 files changed, 119 insertions(+), 55 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 2faf1d3c0..06f163a14 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -4,7 +4,6 @@ import clone from 'lodash/cloneDeep'
 
 import UserPermissions from '../../../lib/common/user/UserPermissions'
 import UserSubscriptions from '../../../lib/common/user/UserSubscriptions'
-
 import type {
   Deployment,
   FeedVersion,
@@ -86,6 +85,7 @@ export const mockProject = {
   feedSources: [],
   id: 'mock-project-id',
   lastUpdated: 1553236399556,
+  labels: [],
   name: 'mock-project',
   organizationId: null,
   otpServers: [],
@@ -134,6 +134,7 @@ export const mockFeedWithVersion = {
     tripCount: 415
   },
   latestVersionId: 'mock-feed-version-id',
+  labels: [],
   name: 'test feed with a version',
   noteCount: 0,
   organizationId: null,
@@ -158,6 +159,7 @@ export const mockFeedWithoutVersion = {
   isPublic: false,
   lastFetched: null,
   name: 'test feed with no version',
+  labels: [],
   noteCount: 0,
   organizationId: null,
   projectId: mockProject.id,
diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index dcade522b..3d82184ba 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -28,7 +28,7 @@ export default class FeedLabel extends React.Component {
   }
 
   render () {
-    const {small, label, checked, onClick} = this.props
+    const {small, label, checked, onClick: labelOnClick} = this.props
 
     return (
       <div
@@ -40,8 +40,8 @@ export default class FeedLabel extends React.Component {
         }}
         title={label.description}
 
-        onClick={() => onClick(label.id)}
-        onKeyPress={() => onClick(label.id)}
+        onClick={!labelOnClick ? null : () => labelOnClick(label.id)}
+        onKeyPress={!labelOnClick ? null : () => labelOnClick(label.id)}
         role='checkbox'
         aria-checked={checked}
         tabIndex={0}
diff --git a/lib/manager/actions/labels.js b/lib/manager/actions/labels.js
index f25c1e53b..ddbe4ce5c 100644
--- a/lib/manager/actions/labels.js
+++ b/lib/manager/actions/labels.js
@@ -2,6 +2,7 @@
 
 import {secureFetch} from '../../common/actions'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
+import type {Label} from '../../types'
 
 import { fetchProject } from './projects'
 import {fetchProjectFeeds} from './feeds'
@@ -15,8 +16,6 @@ const LABEL_URL = '/api/manager/secure/label'
  */
 export function createLabel (label: Label) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
-    console.log('createlabel')
-    console.log(label)
     return dispatch(secureFetch(LABEL_URL, 'post', label))
       .then(async (res) => {
         const createdLabel = await res.json()
@@ -33,7 +32,10 @@ export function updateLabel (label: Label, properties: {[string]: any}) {
   // remove keys which the server doesn't like
   // TODO: is there a cleaner/more dynamic way to do this? Properties can't be guaranteed to
   // include all the keys we need, so can't use that
+
+  // $FlowFixMe
   delete label.organizationId
+  // $FlowFixMe
   delete label.user
 
   return function (dispatch: dispatchFn, getState: getStateFn) {
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 89e4cf3c6..16b6c9ce7 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -28,7 +28,7 @@ import WatchButton from '../../common/containers/WatchButton'
 import FeedLabel from '../../common/components/FeedLabel'
 import LabelAssignerModal from '../components/LabelAssignerModal'
 import type {Props as ContainerProps} from '../containers/FeedSourceTableRow'
-import type {Feed, ValidationSummary} from '../../types'
+import type {Feed, ValidationSummary, Project} from '../../types'
 import type {
   FeedSourceTableComparisonColumns,
   ManagerUserState
@@ -125,6 +125,46 @@ function relativeDuration (time: any) {
   )
 }
 
+function generateFeedSourceLabelRenderVars (feedSource, comparisonValidationSummary) {
+  // data for feed source info column
+  let lastVersionUpdate = !!feedSource.lastUpdated &&
+      relativeDuration(feedSource.lastUpdated)
+  lastVersionUpdate = lastVersionUpdate
+    ? `Last updated ${lastVersionUpdate} ago`
+    : ''
+
+  // data for comparison column
+  const comparisonData = comparisonValidationSummary &&
+      getVersionDisplayData(comparisonValidationSummary)
+
+  let comparisonSubtext, comparisonSubtextDate
+  if (comparisonData && comparisonValidationSummary) {
+    if (comparisonData.status === 'future') {
+      comparisonSubtext = `Starting in ${
+        relativeDuration(comparisonValidationSummary.startDate)
+      }`
+      comparisonSubtextDate = comparisonValidationSummary.startDate
+    } else if (comparisonData.status === 'expired') {
+      comparisonSubtext = `Expired ${
+        relativeDuration(comparisonValidationSummary.endDate)
+      } ago`
+      comparisonSubtextDate = comparisonValidationSummary.endDate
+    } else {
+      comparisonSubtext = `Valid for another ${
+        relativeDuration(comparisonValidationSummary.endDate)
+      }`
+      comparisonSubtextDate = comparisonValidationSummary.endDate
+    }
+  }
+
+  return {
+    lastVersionUpdate,
+    comparisonSubtext,
+    comparisonSubtextDate,
+    comparisonData
+  }
+}
+
 export default class FeedSourceTableRow extends PureComponent<Props> {
   messages = getComponentMessages('FeedSourceTableRow')
 
@@ -136,36 +176,15 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
       project
     } = this.props
 
-    // data for feed source info column
-    let lastVersionUpdate = !!feedSource.lastUpdated &&
-      relativeDuration(feedSource.lastUpdated)
-    lastVersionUpdate = lastVersionUpdate
-      ? `Last updated ${lastVersionUpdate} ago`
-      : ''
-
-    // data for comparison column
-    const comparisonData = comparisonValidationSummary &&
-      getVersionDisplayData(comparisonValidationSummary)
-
-    let comparisonSubtext, comparisonSubtextDate
-    if (comparisonData && comparisonValidationSummary) {
-      if (comparisonData.status === 'future') {
-        comparisonSubtext = `Starting in ${
-          relativeDuration(comparisonValidationSummary.startDate)
-        }`
-        comparisonSubtextDate = comparisonValidationSummary.startDate
-      } else if (comparisonData.status === 'expired') {
-        comparisonSubtext = `Expired ${
-          relativeDuration(comparisonValidationSummary.endDate)
-        } ago`
-        comparisonSubtextDate = comparisonValidationSummary.endDate
-      } else {
-        comparisonSubtext = `Valid for another ${
-          relativeDuration(comparisonValidationSummary.endDate)
-        }`
-        comparisonSubtextDate = comparisonValidationSummary.endDate
-      }
-    }
+    const {
+      lastVersionUpdate,
+      comparisonSubtext,
+      comparisonData,
+      comparisonSubtextDate
+    } = generateFeedSourceLabelRenderVars(
+      feedSource,
+      comparisonValidationSummary
+    )
 
     // data for latest validation columns
     const currentVersionData = getVersionDisplayData(feedSource.latestValidation)
@@ -362,13 +381,7 @@ class FeedActionsDropdown extends PureComponent<Props> {
     }
   }
 
-  render () {
-    const {
-      feedSource,
-      project,
-      user
-    } = this.props
-
+  generateFeedActionDropdownRenderVars = function (user, project, feedSource) {
     const {permissions, subscriptions} = user
     const disabled = !permissions ||
       !permissions.hasFeedPermission(project.organizationId, project.id, feedSource.id, 'manage-feed')
@@ -377,6 +390,22 @@ class FeedActionsDropdown extends PureComponent<Props> {
     const editGtfsDisabled = !permissions ||
       !permissions.hasFeedPermission(project.organizationId, project.id, feedSource.id, 'edit-gtfs')
 
+    return {disabled, isWatchingFeed, editGtfsDisabled}
+  }
+
+  render () {
+    const {
+      feedSource,
+      project,
+      user
+    } = this.props
+
+    const {
+      disabled,
+      isWatchingFeed,
+      editGtfsDisabled
+    } = this.generateFeedActionDropdownRenderVars(user, project, feedSource)
+
     return (
       <DropdownButton
         id={`feed-source-action-button-${feedSource.id}`}
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
index 8b68b0057..8c460afad 100644
--- a/lib/manager/components/LabelAssigner.js
+++ b/lib/manager/components/LabelAssigner.js
@@ -4,11 +4,16 @@ import React from 'react'
 
 import FeedLabel from '../../common/containers/FeedLabel'
 import { stringifyLabels } from '../util'
+import type {Feed, Project} from '../../types'
 
-// TODO: props
-export default class LabelAssigner extends React.Component {
-  state = {};
-  onLabelClick = (labelId) => {
+type Props = {
+ feedSource: Feed,
+ project: Project,
+ updateFeedSource: Function
+}
+
+export default class LabelAssigner extends React.Component<Props> {
+  onLabelClick = (labelId: String) => {
     const {feedSource} = this.props
     const updatedLabels = stringifyLabels(feedSource.labels)
 
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index 4073d3451..e8d3457ad 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -17,15 +17,34 @@ import update from 'react-addons-update'
 
 import {validationState} from '../util'
 import type {ManagerUserState} from '../../types/reducers'
+import type {Label} from '../../types'
+
+type Props = {
+  createLabel: Function,
+  label: Label,
+  onDone?: Function,
+  projectId: string,
+  updateLabel: Function,
+  user: ManagerUserState
+}
 
+type State = {
+  labelIsNew?: boolean,
+  newLabel: Label,
+  validation: {
+    description: boolean,
+    name: boolean
+  }
+}
 // TODO: props
-export default class LabelEditor extends React.Component {
+export default class LabelEditor extends React.Component<Props, State> {
     state = {
       validation: {
         name: true,
         description: true
       },
-      newLabel: {...this.props.label}
+      newLabel: {...this.props.label},
+      labelIsNew: false
     }
 
     componentDidMount = () => {
@@ -34,6 +53,8 @@ export default class LabelEditor extends React.Component {
         this.setState({
           labelIsNew: true,
           // Default to a nice orange
+          // we can safely set a partial object here
+          // $FlowFixMe
           newLabel: {
             color: '#FF9200'
           }
@@ -47,11 +68,14 @@ export default class LabelEditor extends React.Component {
       else return permissions.isApplicationAdmin() || permissions.canAdministerAnOrganization()
     }
 
-  _onFormChange = ({target}: {target: HTMLInputElement}, alwaysValid: Boolean) => {
+  _onFormChange = ({target}: {target: HTMLInputElement}, alwaysValid: boolean) => {
     const {name, value, type, checked} = target
 
-    const universalValue = type === 'checkbox' ? checked : value
-    const valid = alwaysValid || universalValue.length > 0
+    const universalValue: string | boolean = type === 'checkbox' ? checked : value
+    // Annoying extra check for flow
+    const valid =
+      alwaysValid ||
+      (typeof universalValue === 'string' && universalValue.length > 0)
 
     this.setState(
       update(this.state, {
@@ -93,7 +117,7 @@ export default class LabelEditor extends React.Component {
     }
 
     // This passed method will close the editor
-    this.props.onDone()
+    this.props.onDone && this.props.onDone()
   }
 
   render () {
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index eb7adb5dd..db8a6d9f9 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -398,7 +398,7 @@ export function validationState (val: ?boolean): ?string {
   return val ? undefined : 'error'
 }
 
-export function stringifyLabels (labels: [any]) {
+export function stringifyLabels (labels: Array<any>): Array<any> {
   // Convert feed source labels to id strings wanted by datatools-server,
   // but only if we have a label object
   if (!labels) return []
diff --git a/lib/types/index.js b/lib/types/index.js
index aaa544abd..259a054ed 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -523,6 +523,7 @@ export type FeedVersion = {|
 |}
 
 export type Label = {
+  adminOnly: boolean,
   color: string,
   description: string,
   id: string,
@@ -780,6 +781,7 @@ export type Project = {
   feedSources: Array<Feed>,
   id: string,
   isCreating?: boolean,
+  labels: Array<Label>,
   lastUpdated: number | string,
   name: string,
   organizationId: ?string,

From 85546acd304c61a4ae844bb561afa27656e66817 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 21 Jul 2021 17:42:40 -0400
Subject: [PATCH 296/553] test: update test snapshots for labels

---
 .../__tests__/__snapshots__/projects.js.snap  |   3 +
 .../__snapshots__/ActiveProjectViewer.js.snap | 231 +++++++-
 .../__snapshots__/DeploymentsPanel.js.snap    |  17 +
 .../__snapshots__/FeedSourceTable.js.snap     | 546 ++++++++++++++++++
 4 files changed, 773 insertions(+), 24 deletions(-)

diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index bce7b3e32..cce744beb 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -38,6 +38,7 @@ Object {
                 "externalProperties": Object {},
                 "id": "mock-feed-with-version-id",
                 "isPublic": false,
+                "labels": Array [],
                 "lastFetched": 1543389038810,
                 "lastUpdated": 1543389038810,
                 "latestValidation": Object {
@@ -135,6 +136,7 @@ Object {
           "externalProperties": Object {},
           "id": "mock-feed-with-version-id",
           "isPublic": false,
+          "labels": Array [],
           "lastFetched": 1543389038810,
           "lastUpdated": 1543389038810,
           "latestValidation": Object {
@@ -174,6 +176,7 @@ Object {
         },
       ],
       "id": "mock-project-with-deployments-id",
+      "labels": Array [],
       "lastUpdated": 1553236399556,
       "name": "mock-project-with-deployments",
       "organizationId": null,
diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 5670f513b..4fc3e5c1d 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -67,6 +67,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
           "deployments": Array [],
           "feedSources": Array [],
           "id": "mock-project-id",
+          "labels": Array [],
           "lastUpdated": 1553236399556,
           "name": "mock-project",
           "organizationId": null,
@@ -1932,6 +1933,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "deployments": Array [],
                                                           "feedSources": Array [],
                                                           "id": "mock-project-id",
+                                                          "labels": Array [],
                                                           "lastUpdated": 1553236399556,
                                                           "name": "mock-project",
                                                           "organizationId": null,
@@ -1977,6 +1979,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                             "deployments": Array [],
                                                             "feedSources": Array [],
                                                             "id": "mock-project-id",
+                                                            "labels": Array [],
                                                             "lastUpdated": 1553236399556,
                                                             "name": "mock-project",
                                                             "organizationId": null,
@@ -2095,6 +2098,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                   "deployments": Array [],
                                                                   "feedSources": Array [],
                                                                   "id": "mock-project-id",
+                                                                  "labels": Array [],
                                                                   "lastUpdated": 1553236399556,
                                                                   "name": "mock-project",
                                                                   "organizationId": null,
@@ -2144,6 +2148,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                     "deployments": Array [],
                                                                     "feedSources": Array [],
                                                                     "id": "mock-project-id",
+                                                                    "labels": Array [],
                                                                     "lastUpdated": 1553236399556,
                                                                     "name": "mock-project",
                                                                     "organizationId": null,
@@ -2210,6 +2215,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                       "deployments": Array [],
                                                                       "feedSources": Array [],
                                                                       "id": "mock-project-id",
+                                                                      "labels": Array [],
                                                                       "lastUpdated": 1553236399556,
                                                                       "name": "mock-project",
                                                                       "organizationId": null,
@@ -3890,6 +3896,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "deployments": Array [],
                                                           "feedSources": Array [],
                                                           "id": "mock-project-id",
+                                                          "labels": Array [],
                                                           "lastUpdated": 1553236399556,
                                                           "name": "mock-project",
                                                           "organizationId": null,
@@ -3983,40 +3990,216 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                         </div>
                                                       </Panel>
                                                     </ProjectSummaryPanel>
-                                                    <Panel
-                                                      bsClass="panel"
-                                                      bsStyle="default"
-                                                      defaultExpanded={false}
-                                                      header={
-                                                        <h3>
-                                                          What is a feed source?
-                                                        </h3>
+                                                    <ExplanatoryPanel
+                                                      project={
+                                                        Object {
+                                                          "autoDeploy": false,
+                                                          "autoDeployTypes": Array [],
+                                                          "autoDeployWithCriticalErrors": false,
+                                                          "autoFetchFeeds": true,
+                                                          "autoFetchHour": 0,
+                                                          "autoFetchMinute": 0,
+                                                          "bounds": null,
+                                                          "buildConfig": Object {
+                                                            "fares": null,
+                                                            "fetchElevationUS": null,
+                                                            "stationTransfers": null,
+                                                            "subwayAccessTime": null,
+                                                          },
+                                                          "dateCreated": 1526305321824,
+                                                          "defaultTimeZone": null,
+                                                          "deployments": Array [],
+                                                          "feedSources": Array [],
+                                                          "id": "mock-project-id",
+                                                          "labels": Array [],
+                                                          "lastUpdated": 1553236399556,
+                                                          "name": "mock-project",
+                                                          "organizationId": null,
+                                                          "otpServers": Array [],
+                                                          "pinnedDeploymentId": null,
+                                                          "routerConfig": Object {
+                                                            "carDropoffTime": null,
+                                                            "numItineraries": null,
+                                                            "requestLogFile": null,
+                                                            "stairsReluctance": null,
+                                                            "updaters": null,
+                                                            "walkSpeed": null,
+                                                          },
+                                                          "useCustomOsmBounds": false,
+                                                          "user": null,
+                                                        }
                                                       }
                                                     >
-                                                      <div
-                                                        className="panel panel-default"
+                                                      <Panel
+                                                        bsClass="panel"
+                                                        bsStyle="default"
+                                                        defaultExpanded={false}
+                                                        header={
+                                                          <h3>
+                                                            What is a feed source?
+                                                          </h3>
+                                                        }
                                                       >
                                                         <div
-                                                          className="panel-heading"
+                                                          className="panel panel-default"
                                                         >
-                                                          <h3
-                                                            className="panel-title"
+                                                          <div
+                                                            className="panel-heading"
                                                           >
-                                                            What is a feed source?
-                                                          </h3>
+                                                            <h3
+                                                              className="panel-title"
+                                                            >
+                                                              What is a feed source?
+                                                            </h3>
+                                                          </div>
+                                                          <div
+                                                            className="panel-body"
+                                                            key="0"
+                                                          >
+                                                            A feed source defines the location or upstream source of a GTFS feed. GTFS can be populated via automatic fetch, directly editing or uploading a zip file.
+                                                          </div>
                                                         </div>
+                                                      </Panel>
+                                                    </ExplanatoryPanel>
+                                                    <LabelPanel
+                                                      project={
+                                                        Object {
+                                                          "autoDeploy": false,
+                                                          "autoDeployTypes": Array [],
+                                                          "autoDeployWithCriticalErrors": false,
+                                                          "autoFetchFeeds": true,
+                                                          "autoFetchHour": 0,
+                                                          "autoFetchMinute": 0,
+                                                          "bounds": null,
+                                                          "buildConfig": Object {
+                                                            "fares": null,
+                                                            "fetchElevationUS": null,
+                                                            "stationTransfers": null,
+                                                            "subwayAccessTime": null,
+                                                          },
+                                                          "dateCreated": 1526305321824,
+                                                          "defaultTimeZone": null,
+                                                          "deployments": Array [],
+                                                          "feedSources": Array [],
+                                                          "id": "mock-project-id",
+                                                          "labels": Array [],
+                                                          "lastUpdated": 1553236399556,
+                                                          "name": "mock-project",
+                                                          "organizationId": null,
+                                                          "otpServers": Array [],
+                                                          "pinnedDeploymentId": null,
+                                                          "routerConfig": Object {
+                                                            "carDropoffTime": null,
+                                                            "numItineraries": null,
+                                                            "requestLogFile": null,
+                                                            "stairsReluctance": null,
+                                                            "updaters": null,
+                                                            "walkSpeed": null,
+                                                          },
+                                                          "useCustomOsmBounds": false,
+                                                          "user": null,
+                                                        }
+                                                      }
+                                                    >
+                                                      <Panel
+                                                        bsClass="panel"
+                                                        bsStyle="default"
+                                                        defaultExpanded={false}
+                                                        header={
+                                                          <h3>
+                                                            Labels
+                                                          </h3>
+                                                        }
+                                                      >
                                                         <div
-                                                          className="panel-body"
-                                                          key="0"
+                                                          className="panel panel-default"
                                                         >
-                                                          A feed source defines the location or upstream source of a
-                                                           
-                                                          GTFS feed. GTFS can be populated via automatic fetch,
-                                                           
-                                                          directly editing or uploading a zip file.
+                                                          <div
+                                                            className="panel-heading"
+                                                          >
+                                                            <h3
+                                                              className="panel-title"
+                                                            >
+                                                              Labels
+                                                            </h3>
+                                                          </div>
+                                                          <div
+                                                            className="panel-body"
+                                                            key="0"
+                                                          >
+                                                            <div
+                                                              className="feedLabelContainer "
+                                                              key=".0"
+                                                            >
+                                                              <LabelEditorModal
+                                                                projectId="mock-project-id"
+                                                              >
+                                                                <Modal
+                                                                  animation={true}
+                                                                  autoFocus={true}
+                                                                  backdrop={true}
+                                                                  bsClass="modal"
+                                                                  dialogComponentClass={[Function]}
+                                                                  enforceFocus={true}
+                                                                  keyboard={true}
+                                                                  manager={
+                                                                    ModalManager {
+                                                                      "containers": Array [],
+                                                                      "data": Array [],
+                                                                      "handleContainerOverflow": true,
+                                                                      "hideSiblingNodes": true,
+                                                                      "modals": Array [],
+                                                                    }
+                                                                  }
+                                                                  onHide={[Function]}
+                                                                  renderBackdrop={[Function]}
+                                                                  restoreFocus={true}
+                                                                  show={false}
+                                                                >
+                                                                  <Modal
+                                                                    autoFocus={true}
+                                                                    backdrop={true}
+                                                                    backdropClassName="modal-backdrop"
+                                                                    backdropTransitionTimeout={150}
+                                                                    containerClassName="modal-open"
+                                                                    dialogTransitionTimeout={300}
+                                                                    enforceFocus={true}
+                                                                    keyboard={true}
+                                                                    manager={
+                                                                      ModalManager {
+                                                                        "containers": Array [],
+                                                                        "data": Array [],
+                                                                        "handleContainerOverflow": true,
+                                                                        "hideSiblingNodes": true,
+                                                                        "modals": Array [],
+                                                                      }
+                                                                    }
+                                                                    onEntering={[Function]}
+                                                                    onExited={[Function]}
+                                                                    onHide={[Function]}
+                                                                    renderBackdrop={[Function]}
+                                                                    restoreFocus={true}
+                                                                    show={false}
+                                                                    transition={[Function]}
+                                                                  />
+                                                                </Modal>
+                                                              </LabelEditorModal>
+                                                              <button
+                                                                className="labelActionButton"
+                                                                onClick={[Function]}
+                                                              >
+                                                                Add a new label
+                                                              </button>
+                                                              <div
+                                                                className="noLabelsMessage"
+                                                              >
+                                                                There are no labels in this project.
+                                                              </div>
+                                                            </div>
+                                                          </div>
                                                         </div>
-                                                      </div>
-                                                    </Panel>
+                                                      </Panel>
+                                                    </LabelPanel>
                                                   </div>
                                                 </Col>
                                               </div>
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index cde1a7a3a..d1531fe28 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -51,6 +51,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                   "externalProperties": Object {},
                   "id": "mock-feed-with-version-id",
                   "isPublic": false,
+                  "labels": Array [],
                   "lastFetched": 1543389038810,
                   "lastUpdated": 1543389038810,
                   "latestValidation": Object {
@@ -180,6 +181,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "externalProperties": Object {},
             "id": "mock-feed-with-version-id",
             "isPublic": false,
+            "labels": Array [],
             "lastFetched": 1543389038810,
             "lastUpdated": 1543389038810,
             "latestValidation": Object {
@@ -219,6 +221,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
           },
         ],
         "id": "mock-project-with-deployments-id",
+        "labels": Array [],
         "lastUpdated": 1553236399556,
         "name": "mock-project-with-deployments",
         "organizationId": null,
@@ -277,6 +280,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     "externalProperties": Object {},
                     "id": "mock-feed-with-version-id",
                     "isPublic": false,
+                    "labels": Array [],
                     "lastFetched": 1543389038810,
                     "lastUpdated": 1543389038810,
                     "latestValidation": Object {
@@ -406,6 +410,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "externalProperties": Object {},
               "id": "mock-feed-with-version-id",
               "isPublic": false,
+              "labels": Array [],
               "lastFetched": 1543389038810,
               "lastUpdated": 1543389038810,
               "latestValidation": Object {
@@ -445,6 +450,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             },
           ],
           "id": "mock-project-with-deployments-id",
+          "labels": Array [],
           "lastUpdated": 1553236399556,
           "name": "mock-project-with-deployments",
           "organizationId": null,
@@ -555,6 +561,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                             "externalProperties": Object {},
                             "id": "mock-feed-with-version-id",
                             "isPublic": false,
+                            "labels": Array [],
                             "lastFetched": 1543389038810,
                             "lastUpdated": 1543389038810,
                             "latestValidation": Object {
@@ -712,6 +719,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                               "externalProperties": Object {},
                               "id": "mock-feed-with-version-id",
                               "isPublic": false,
+                              "labels": Array [],
                               "lastFetched": 1543389038810,
                               "lastUpdated": 1543389038810,
                               "latestValidation": Object {
@@ -841,6 +849,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "externalProperties": Object {},
                         "id": "mock-feed-with-version-id",
                         "isPublic": false,
+                        "labels": Array [],
                         "lastFetched": 1543389038810,
                         "lastUpdated": 1543389038810,
                         "latestValidation": Object {
@@ -880,6 +889,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       },
                     ],
                     "id": "mock-project-with-deployments-id",
+                    "labels": Array [],
                     "lastUpdated": 1553236399556,
                     "name": "mock-project-with-deployments",
                     "organizationId": null,
@@ -1080,6 +1090,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "externalProperties": Object {},
                                       "id": "mock-feed-with-version-id",
                                       "isPublic": false,
+                                      "labels": Array [],
                                       "lastFetched": 1543389038810,
                                       "lastUpdated": 1543389038810,
                                       "latestValidation": Object {
@@ -1205,6 +1216,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                           "externalProperties": Object {},
                                           "id": "mock-feed-with-version-id",
                                           "isPublic": false,
+                                          "labels": Array [],
                                           "lastFetched": 1543389038810,
                                           "lastUpdated": 1543389038810,
                                           "latestValidation": Object {
@@ -1334,6 +1346,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "externalProperties": Object {},
                                     "id": "mock-feed-with-version-id",
                                     "isPublic": false,
+                                    "labels": Array [],
                                     "lastFetched": 1543389038810,
                                     "lastUpdated": 1543389038810,
                                     "latestValidation": Object {
@@ -1373,6 +1386,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                   },
                                 ],
                                 "id": "mock-project-with-deployments-id",
+                                "labels": Array [],
                                 "lastUpdated": 1553236399556,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
@@ -1604,6 +1618,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                           "externalProperties": Object {},
                                           "id": "mock-feed-with-version-id",
                                           "isPublic": false,
+                                          "labels": Array [],
                                           "lastFetched": 1543389038810,
                                           "lastUpdated": 1543389038810,
                                           "latestValidation": Object {
@@ -1733,6 +1748,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "externalProperties": Object {},
                                     "id": "mock-feed-with-version-id",
                                     "isPublic": false,
+                                    "labels": Array [],
                                     "lastFetched": 1543389038810,
                                     "lastUpdated": 1543389038810,
                                     "latestValidation": Object {
@@ -1772,6 +1788,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                   },
                                 ],
                                 "id": "mock-project-with-deployments-id",
+                                "labels": Array [],
                                 "lastUpdated": 1553236399556,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 4d9414282..98cfe5e35 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -50,6 +50,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   "externalProperties": Object {},
                   "id": "mock-feed-with-version-id",
                   "isPublic": false,
+                  "labels": Array [],
                   "lastFetched": 1543389038810,
                   "lastUpdated": 1543389038810,
                   "latestValidation": Object {
@@ -147,6 +148,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "externalProperties": Object {},
             "id": "mock-feed-with-version-id",
             "isPublic": false,
+            "labels": Array [],
             "lastFetched": 1543389038810,
             "lastUpdated": 1543389038810,
             "latestValidation": Object {
@@ -186,6 +188,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
           },
         ],
         "id": "mock-project-with-deployments-id",
+        "labels": Array [],
         "lastUpdated": 1553236399556,
         "name": "mock-project-with-deployments",
         "organizationId": null,
@@ -215,6 +218,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "externalProperties": Object {},
             "id": "mock-feed-with-version-id",
             "isPublic": false,
+            "labels": Array [],
             "lastFetched": 1543389038810,
             "lastUpdated": 1543389038810,
             "latestValidation": Object {
@@ -263,6 +267,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "externalProperties": Object {},
             "id": "mock-feed-with-version-id",
             "isPublic": false,
+            "labels": Array [],
             "lastFetched": 1543389038810,
             "lastUpdated": 1543389038810,
             "latestValidation": Object {
@@ -340,6 +345,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "externalProperties": Object {},
                     "id": "mock-feed-with-version-id",
                     "isPublic": false,
+                    "labels": Array [],
                     "lastFetched": 1543389038810,
                     "lastUpdated": 1543389038810,
                     "latestValidation": Object {
@@ -437,6 +443,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "externalProperties": Object {},
               "id": "mock-feed-with-version-id",
               "isPublic": false,
+              "labels": Array [],
               "lastFetched": 1543389038810,
               "lastUpdated": 1543389038810,
               "latestValidation": Object {
@@ -476,6 +483,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             },
           ],
           "id": "mock-project-with-deployments-id",
+          "labels": Array [],
           "lastUpdated": 1553236399556,
           "name": "mock-project-with-deployments",
           "organizationId": null,
@@ -609,6 +617,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "externalProperties": Object {},
                           "id": "mock-feed-with-version-id",
                           "isPublic": false,
+                          "labels": Array [],
                           "lastFetched": 1543389038810,
                           "lastUpdated": 1543389038810,
                           "latestValidation": Object {
@@ -706,6 +715,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "externalProperties": Object {},
                     "id": "mock-feed-with-version-id",
                     "isPublic": false,
+                    "labels": Array [],
                     "lastFetched": 1543389038810,
                     "lastUpdated": 1543389038810,
                     "latestValidation": Object {
@@ -745,6 +755,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   },
                 ],
                 "id": "mock-project-with-deployments-id",
+                "labels": Array [],
                 "lastUpdated": 1553236399556,
                 "name": "mock-project-with-deployments",
                 "organizationId": null,
@@ -809,6 +820,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "externalProperties": Object {},
                             "id": "mock-feed-with-version-id",
                             "isPublic": false,
+                            "labels": Array [],
                             "lastFetched": 1543389038810,
                             "lastUpdated": 1543389038810,
                             "latestValidation": Object {
@@ -906,6 +918,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "externalProperties": Object {},
                       "id": "mock-feed-with-version-id",
                       "isPublic": false,
+                      "labels": Array [],
                       "lastFetched": 1543389038810,
                       "lastUpdated": 1543389038810,
                       "latestValidation": Object {
@@ -945,6 +958,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     },
                   ],
                   "id": "mock-project-with-deployments-id",
+                  "labels": Array [],
                   "lastUpdated": 1553236399556,
                   "name": "mock-project-with-deployments",
                   "organizationId": null,
@@ -1027,6 +1041,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "externalProperties": Object {},
                               "id": "mock-feed-with-version-id",
                               "isPublic": false,
+                              "labels": Array [],
                               "lastFetched": 1543389038810,
                               "lastUpdated": 1543389038810,
                               "latestValidation": Object {
@@ -1124,6 +1139,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "externalProperties": Object {},
                         "id": "mock-feed-with-version-id",
                         "isPublic": false,
+                        "labels": Array [],
                         "lastFetched": 1543389038810,
                         "lastUpdated": 1543389038810,
                         "latestValidation": Object {
@@ -1163,6 +1179,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       },
                     ],
                     "id": "mock-project-with-deployments-id",
+                    "labels": Array [],
                     "lastUpdated": 1553236399556,
                     "name": "mock-project-with-deployments",
                     "organizationId": null,
@@ -2825,6 +2842,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "externalProperties": Object {},
                         "id": "mock-feed-with-version-id",
                         "isPublic": false,
+                        "labels": Array [],
                         "lastFetched": 1543389038810,
                         "lastUpdated": 1543389038810,
                         "latestValidation": Object {
@@ -2899,6 +2917,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   "externalProperties": Object {},
                                   "id": "mock-feed-with-version-id",
                                   "isPublic": false,
+                                  "labels": Array [],
                                   "lastFetched": 1543389038810,
                                   "lastUpdated": 1543389038810,
                                   "latestValidation": Object {
@@ -2996,6 +3015,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "externalProperties": Object {},
                             "id": "mock-feed-with-version-id",
                             "isPublic": false,
+                            "labels": Array [],
                             "lastFetched": 1543389038810,
                             "lastUpdated": 1543389038810,
                             "latestValidation": Object {
@@ -3035,6 +3055,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           },
                         ],
                         "id": "mock-project-with-deployments-id",
+                        "labels": Array [],
                         "lastUpdated": 1553236399556,
                         "name": "mock-project-with-deployments",
                         "organizationId": null,
@@ -3089,6 +3110,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "externalProperties": Object {},
                           "id": "mock-feed-with-version-id",
                           "isPublic": false,
+                          "labels": Array [],
                           "lastFetched": 1543389038810,
                           "lastUpdated": 1543389038810,
                           "latestValidation": Object {
@@ -3162,6 +3184,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "externalProperties": Object {},
                                     "id": "mock-feed-with-version-id",
                                     "isPublic": false,
+                                    "labels": Array [],
                                     "lastFetched": 1543389038810,
                                     "lastUpdated": 1543389038810,
                                     "latestValidation": Object {
@@ -3259,6 +3282,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "externalProperties": Object {},
                               "id": "mock-feed-with-version-id",
                               "isPublic": false,
+                              "labels": Array [],
                               "lastFetched": 1543389038810,
                               "lastUpdated": 1543389038810,
                               "latestValidation": Object {
@@ -3298,6 +3322,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             },
                           ],
                           "id": "mock-project-with-deployments-id",
+                          "labels": Array [],
                           "lastUpdated": 1553236399556,
                           "name": "mock-project-with-deployments",
                           "organizationId": null,
@@ -3407,6 +3432,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "externalProperties": Object {},
                                 "id": "mock-feed-with-version-id",
                                 "isPublic": false,
+                                "labels": Array [],
                                 "lastFetched": 1543389038810,
                                 "lastUpdated": 1543389038810,
                                 "latestValidation": Object {
@@ -3445,6 +3471,197 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "versionCount": 1,
                               }
                             }
+                            project={
+                              Object {
+                                "autoDeploy": false,
+                                "autoDeployTypes": Array [],
+                                "autoDeployWithCriticalErrors": false,
+                                "autoFetchFeeds": true,
+                                "autoFetchHour": 0,
+                                "autoFetchMinute": 0,
+                                "bounds": null,
+                                "buildConfig": Object {
+                                  "fares": null,
+                                  "fetchElevationUS": null,
+                                  "stationTransfers": null,
+                                  "subwayAccessTime": null,
+                                },
+                                "dateCreated": 1526305321824,
+                                "defaultTimeZone": null,
+                                "deployments": Array [
+                                  Object {
+                                    "customBuildConfig": null,
+                                    "customRouterConfig": null,
+                                    "dateCreated": 1553292345720,
+                                    "deployJobSummaries": Array [],
+                                    "deployedTo": null,
+                                    "ec2Instances": Array [],
+                                    "feedSourceId": null,
+                                    "feedVersions": Array [
+                                      Object {
+                                        "feedSource": Object {
+                                          "dateCreated": 1536195264564,
+                                          "deployable": false,
+                                          "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                          "externalProperties": Object {},
+                                          "id": "mock-feed-with-version-id",
+                                          "isPublic": false,
+                                          "labels": Array [],
+                                          "lastFetched": 1543389038810,
+                                          "lastUpdated": 1543389038810,
+                                          "latestValidation": Object {
+                                            "agencies": null,
+                                            "agencyCount": 1,
+                                            "avgDailyRevenueTime": 0,
+                                            "bounds": Object {
+                                              "east": -76.481211,
+                                              "north": 39.0486949672717,
+                                              "south": 38.92884,
+                                              "west": -76.5673055566884,
+                                            },
+                                            "endDate": "20190801",
+                                            "errorCount": 78,
+                                            "feedVersionId": "mock-feed-version-id",
+                                            "loadFailureReason": null,
+                                            "loadStatus": "SUCCESS",
+                                            "routeCount": 10,
+                                            "startDate": "20180801",
+                                            "stopCount": 237,
+                                            "stopTimesCount": 11170,
+                                            "tripCount": 415,
+                                          },
+                                          "latestVersionId": "mock-feed-version-id",
+                                          "name": "test feed with a version",
+                                          "noteCount": 0,
+                                          "organizationId": null,
+                                          "projectId": "mock-project-id",
+                                          "publishedVersionId": null,
+                                          "retrievalMethod": "MANUALLY_UPLOADED",
+                                          "s3Url": null,
+                                          "snapshotVersion": null,
+                                          "transformRules": Array [],
+                                          "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                          "user": null,
+                                          "versionCount": 1,
+                                        },
+                                        "id": "mock-feed-version-id",
+                                        "nextVersionId": null,
+                                        "previousVersionId": null,
+                                        "updated": 1543389038810,
+                                        "validationResult": Object {
+                                          "agencies": null,
+                                          "agencyCount": 1,
+                                          "avgDailyRevenueTime": 0,
+                                          "bounds": Object {
+                                            "east": -76.481211,
+                                            "north": 39.0486949672717,
+                                            "south": 38.92884,
+                                            "west": -76.5673055566884,
+                                          },
+                                          "endDate": "20190801",
+                                          "errorCount": 78,
+                                          "feedVersionId": "mock-feed-version-id",
+                                          "loadFailureReason": null,
+                                          "loadStatus": "SUCCESS",
+                                          "routeCount": 10,
+                                          "startDate": "20180801",
+                                          "stopCount": 237,
+                                          "stopTimesCount": 11170,
+                                          "tripCount": 415,
+                                        },
+                                        "version": 1,
+                                      },
+                                    ],
+                                    "id": "mock-deployment-id-0",
+                                    "invalidFeedSources": Array [],
+                                    "lastDeployed": null,
+                                    "lastUpdated": 1553292345726,
+                                    "latest": null,
+                                    "name": "mock-deployment",
+                                    "organizationId": null,
+                                    "osmExtractUrl": null,
+                                    "otpCommit": null,
+                                    "otpVersion": null,
+                                    "pinnedfeedVersionIds": Array [],
+                                    "projectBounds": Object {
+                                      "east": 0,
+                                      "north": 0,
+                                      "south": 0,
+                                      "west": 0,
+                                    },
+                                    "projectId": "mock-project-with-deployments-id",
+                                    "routerId": null,
+                                    "skipOsmExtract": false,
+                                    "tripPlannerVersion": "OTP_1",
+                                    "user": null,
+                                  },
+                                ],
+                                "feedSources": Array [
+                                  Object {
+                                    "dateCreated": 1536195264564,
+                                    "deployable": false,
+                                    "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                    "externalProperties": Object {},
+                                    "id": "mock-feed-with-version-id",
+                                    "isPublic": false,
+                                    "labels": Array [],
+                                    "lastFetched": 1543389038810,
+                                    "lastUpdated": 1543389038810,
+                                    "latestValidation": Object {
+                                      "agencies": null,
+                                      "agencyCount": 1,
+                                      "avgDailyRevenueTime": 0,
+                                      "bounds": Object {
+                                        "east": -76.481211,
+                                        "north": 39.0486949672717,
+                                        "south": 38.92884,
+                                        "west": -76.5673055566884,
+                                      },
+                                      "endDate": "20190801",
+                                      "errorCount": 78,
+                                      "feedVersionId": "mock-feed-version-id",
+                                      "loadFailureReason": null,
+                                      "loadStatus": "SUCCESS",
+                                      "routeCount": 10,
+                                      "startDate": "20180801",
+                                      "stopCount": 237,
+                                      "stopTimesCount": 11170,
+                                      "tripCount": 415,
+                                    },
+                                    "latestVersionId": "mock-feed-version-id",
+                                    "name": "test feed with a version",
+                                    "noteCount": 0,
+                                    "organizationId": null,
+                                    "projectId": "mock-project-id",
+                                    "publishedVersionId": null,
+                                    "retrievalMethod": "MANUALLY_UPLOADED",
+                                    "s3Url": null,
+                                    "snapshotVersion": null,
+                                    "transformRules": Array [],
+                                    "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                    "user": null,
+                                    "versionCount": 1,
+                                  },
+                                ],
+                                "id": "mock-project-with-deployments-id",
+                                "labels": Array [],
+                                "lastUpdated": 1553236399556,
+                                "name": "mock-project-with-deployments",
+                                "organizationId": null,
+                                "otpServers": Array [],
+                                "pinnedDeploymentId": null,
+                                "routerConfig": Object {
+                                  "carDropoffTime": null,
+                                  "numItineraries": null,
+                                  "requestLogFile": null,
+                                  "stairsReluctance": null,
+                                  "updaters": null,
+                                  "walkSpeed": null,
+                                },
+                                "useCustomOsmBounds": false,
+                                "user": null,
+                              }
+                            }
                           >
                             <div>
                               <h4>
@@ -3519,6 +3736,331 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       Private
                                     </div>
                                   </Col>
+                                  <Col
+                                    bsClass="col"
+                                    componentClass="div"
+                                    xs={12}
+                                  >
+                                    <div
+                                      className="col-xs-12"
+                                    >
+                                      <div
+                                        className="feedSourceLabelRow"
+                                      >
+                                        <Icon
+                                          type="tag"
+                                        >
+                                          <i
+                                            className="fa fa-tag fa-fw "
+                                          />
+                                        </Icon>
+                                        <LabelEditorModal
+                                          feedSource={
+                                            Object {
+                                              "dateCreated": 1536195264564,
+                                              "deployable": false,
+                                              "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                              "externalProperties": Object {},
+                                              "id": "mock-feed-with-version-id",
+                                              "isPublic": false,
+                                              "labels": Array [],
+                                              "lastFetched": 1543389038810,
+                                              "lastUpdated": 1543389038810,
+                                              "latestValidation": Object {
+                                                "agencies": null,
+                                                "agencyCount": 1,
+                                                "avgDailyRevenueTime": 0,
+                                                "bounds": Object {
+                                                  "east": -76.481211,
+                                                  "north": 39.0486949672717,
+                                                  "south": 38.92884,
+                                                  "west": -76.5673055566884,
+                                                },
+                                                "endDate": "20190801",
+                                                "errorCount": 78,
+                                                "feedVersionId": "mock-feed-version-id",
+                                                "loadFailureReason": null,
+                                                "loadStatus": "SUCCESS",
+                                                "routeCount": 10,
+                                                "startDate": "20180801",
+                                                "stopCount": 237,
+                                                "stopTimesCount": 11170,
+                                                "tripCount": 415,
+                                              },
+                                              "latestVersionId": "mock-feed-version-id",
+                                              "name": "test feed with a version",
+                                              "noteCount": 0,
+                                              "organizationId": null,
+                                              "projectId": "mock-project-id",
+                                              "publishedVersionId": null,
+                                              "retrievalMethod": "MANUALLY_UPLOADED",
+                                              "s3Url": null,
+                                              "snapshotVersion": null,
+                                              "transformRules": Array [],
+                                              "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                              "user": null,
+                                              "versionCount": 1,
+                                            }
+                                          }
+                                          project={
+                                            Object {
+                                              "autoDeploy": false,
+                                              "autoDeployTypes": Array [],
+                                              "autoDeployWithCriticalErrors": false,
+                                              "autoFetchFeeds": true,
+                                              "autoFetchHour": 0,
+                                              "autoFetchMinute": 0,
+                                              "bounds": null,
+                                              "buildConfig": Object {
+                                                "fares": null,
+                                                "fetchElevationUS": null,
+                                                "stationTransfers": null,
+                                                "subwayAccessTime": null,
+                                              },
+                                              "dateCreated": 1526305321824,
+                                              "defaultTimeZone": null,
+                                              "deployments": Array [
+                                                Object {
+                                                  "customBuildConfig": null,
+                                                  "customRouterConfig": null,
+                                                  "dateCreated": 1553292345720,
+                                                  "deployJobSummaries": Array [],
+                                                  "deployedTo": null,
+                                                  "ec2Instances": Array [],
+                                                  "feedSourceId": null,
+                                                  "feedVersions": Array [
+                                                    Object {
+                                                      "feedSource": Object {
+                                                        "dateCreated": 1536195264564,
+                                                        "deployable": false,
+                                                        "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                                        "externalProperties": Object {},
+                                                        "id": "mock-feed-with-version-id",
+                                                        "isPublic": false,
+                                                        "labels": Array [],
+                                                        "lastFetched": 1543389038810,
+                                                        "lastUpdated": 1543389038810,
+                                                        "latestValidation": Object {
+                                                          "agencies": null,
+                                                          "agencyCount": 1,
+                                                          "avgDailyRevenueTime": 0,
+                                                          "bounds": Object {
+                                                            "east": -76.481211,
+                                                            "north": 39.0486949672717,
+                                                            "south": 38.92884,
+                                                            "west": -76.5673055566884,
+                                                          },
+                                                          "endDate": "20190801",
+                                                          "errorCount": 78,
+                                                          "feedVersionId": "mock-feed-version-id",
+                                                          "loadFailureReason": null,
+                                                          "loadStatus": "SUCCESS",
+                                                          "routeCount": 10,
+                                                          "startDate": "20180801",
+                                                          "stopCount": 237,
+                                                          "stopTimesCount": 11170,
+                                                          "tripCount": 415,
+                                                        },
+                                                        "latestVersionId": "mock-feed-version-id",
+                                                        "name": "test feed with a version",
+                                                        "noteCount": 0,
+                                                        "organizationId": null,
+                                                        "projectId": "mock-project-id",
+                                                        "publishedVersionId": null,
+                                                        "retrievalMethod": "MANUALLY_UPLOADED",
+                                                        "s3Url": null,
+                                                        "snapshotVersion": null,
+                                                        "transformRules": Array [],
+                                                        "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                                        "user": null,
+                                                        "versionCount": 1,
+                                                      },
+                                                      "id": "mock-feed-version-id",
+                                                      "nextVersionId": null,
+                                                      "previousVersionId": null,
+                                                      "updated": 1543389038810,
+                                                      "validationResult": Object {
+                                                        "agencies": null,
+                                                        "agencyCount": 1,
+                                                        "avgDailyRevenueTime": 0,
+                                                        "bounds": Object {
+                                                          "east": -76.481211,
+                                                          "north": 39.0486949672717,
+                                                          "south": 38.92884,
+                                                          "west": -76.5673055566884,
+                                                        },
+                                                        "endDate": "20190801",
+                                                        "errorCount": 78,
+                                                        "feedVersionId": "mock-feed-version-id",
+                                                        "loadFailureReason": null,
+                                                        "loadStatus": "SUCCESS",
+                                                        "routeCount": 10,
+                                                        "startDate": "20180801",
+                                                        "stopCount": 237,
+                                                        "stopTimesCount": 11170,
+                                                        "tripCount": 415,
+                                                      },
+                                                      "version": 1,
+                                                    },
+                                                  ],
+                                                  "id": "mock-deployment-id-0",
+                                                  "invalidFeedSources": Array [],
+                                                  "lastDeployed": null,
+                                                  "lastUpdated": 1553292345726,
+                                                  "latest": null,
+                                                  "name": "mock-deployment",
+                                                  "organizationId": null,
+                                                  "osmExtractUrl": null,
+                                                  "otpCommit": null,
+                                                  "otpVersion": null,
+                                                  "pinnedfeedVersionIds": Array [],
+                                                  "projectBounds": Object {
+                                                    "east": 0,
+                                                    "north": 0,
+                                                    "south": 0,
+                                                    "west": 0,
+                                                  },
+                                                  "projectId": "mock-project-with-deployments-id",
+                                                  "routerId": null,
+                                                  "skipOsmExtract": false,
+                                                  "tripPlannerVersion": "OTP_1",
+                                                  "user": null,
+                                                },
+                                              ],
+                                              "feedSources": Array [
+                                                Object {
+                                                  "dateCreated": 1536195264564,
+                                                  "deployable": false,
+                                                  "editorNamespace": "gzek_ztquwiwjmselpeswgbsrre",
+                                                  "externalProperties": Object {},
+                                                  "id": "mock-feed-with-version-id",
+                                                  "isPublic": false,
+                                                  "labels": Array [],
+                                                  "lastFetched": 1543389038810,
+                                                  "lastUpdated": 1543389038810,
+                                                  "latestValidation": Object {
+                                                    "agencies": null,
+                                                    "agencyCount": 1,
+                                                    "avgDailyRevenueTime": 0,
+                                                    "bounds": Object {
+                                                      "east": -76.481211,
+                                                      "north": 39.0486949672717,
+                                                      "south": 38.92884,
+                                                      "west": -76.5673055566884,
+                                                    },
+                                                    "endDate": "20190801",
+                                                    "errorCount": 78,
+                                                    "feedVersionId": "mock-feed-version-id",
+                                                    "loadFailureReason": null,
+                                                    "loadStatus": "SUCCESS",
+                                                    "routeCount": 10,
+                                                    "startDate": "20180801",
+                                                    "stopCount": 237,
+                                                    "stopTimesCount": 11170,
+                                                    "tripCount": 415,
+                                                  },
+                                                  "latestVersionId": "mock-feed-version-id",
+                                                  "name": "test feed with a version",
+                                                  "noteCount": 0,
+                                                  "organizationId": null,
+                                                  "projectId": "mock-project-id",
+                                                  "publishedVersionId": null,
+                                                  "retrievalMethod": "MANUALLY_UPLOADED",
+                                                  "s3Url": null,
+                                                  "snapshotVersion": null,
+                                                  "transformRules": Array [],
+                                                  "url": "http://mdtrip.org/googletransit/AnnapolisTransit/google_transit.zip",
+                                                  "user": null,
+                                                  "versionCount": 1,
+                                                },
+                                              ],
+                                              "id": "mock-project-with-deployments-id",
+                                              "labels": Array [],
+                                              "lastUpdated": 1553236399556,
+                                              "name": "mock-project-with-deployments",
+                                              "organizationId": null,
+                                              "otpServers": Array [],
+                                              "pinnedDeploymentId": null,
+                                              "routerConfig": Object {
+                                                "carDropoffTime": null,
+                                                "numItineraries": null,
+                                                "requestLogFile": null,
+                                                "stairsReluctance": null,
+                                                "updaters": null,
+                                                "walkSpeed": null,
+                                              },
+                                              "useCustomOsmBounds": false,
+                                              "user": null,
+                                            }
+                                          }
+                                        >
+                                          <Modal
+                                            animation={true}
+                                            autoFocus={true}
+                                            backdrop={true}
+                                            bsClass="modal"
+                                            dialogComponentClass={[Function]}
+                                            enforceFocus={true}
+                                            keyboard={true}
+                                            manager={
+                                              ModalManager {
+                                                "containers": Array [],
+                                                "data": Array [],
+                                                "handleContainerOverflow": true,
+                                                "hideSiblingNodes": true,
+                                                "modals": Array [],
+                                              }
+                                            }
+                                            onHide={[Function]}
+                                            renderBackdrop={[Function]}
+                                            restoreFocus={true}
+                                            show={false}
+                                          >
+                                            <Modal
+                                              autoFocus={true}
+                                              backdrop={true}
+                                              backdropClassName="modal-backdrop"
+                                              backdropTransitionTimeout={150}
+                                              containerClassName="modal-open"
+                                              dialogTransitionTimeout={300}
+                                              enforceFocus={true}
+                                              keyboard={true}
+                                              manager={
+                                                ModalManager {
+                                                  "containers": Array [],
+                                                  "data": Array [],
+                                                  "handleContainerOverflow": true,
+                                                  "hideSiblingNodes": true,
+                                                  "modals": Array [],
+                                                }
+                                              }
+                                              onEntering={[Function]}
+                                              onExited={[Function]}
+                                              onHide={[Function]}
+                                              renderBackdrop={[Function]}
+                                              restoreFocus={true}
+                                              show={false}
+                                              transition={[Function]}
+                                            />
+                                          </Modal>
+                                        </LabelEditorModal>
+                                        <button
+                                          className="labelActionButton small"
+                                          onClick={[Function]}
+                                          style={
+                                            Object {
+                                              "marginRight": "5px",
+                                            }
+                                          }
+                                        >
+                                          Edit
+                                        </button>
+                                        <div
+                                          className="feedLabelContainer"
+                                        />
+                                      </div>
+                                    </div>
+                                  </Col>
                                 </div>
                               </Row>
                             </div>
@@ -3637,6 +4179,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "externalProperties": Object {},
                                 "id": "mock-feed-with-version-id",
                                 "isPublic": false,
+                                "labels": Array [],
                                 "lastFetched": 1543389038810,
                                 "lastUpdated": 1543389038810,
                                 "latestValidation": Object {
@@ -3710,6 +4253,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           "externalProperties": Object {},
                                           "id": "mock-feed-with-version-id",
                                           "isPublic": false,
+                                          "labels": Array [],
                                           "lastFetched": 1543389038810,
                                           "lastUpdated": 1543389038810,
                                           "latestValidation": Object {
@@ -3807,6 +4351,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "externalProperties": Object {},
                                     "id": "mock-feed-with-version-id",
                                     "isPublic": false,
+                                    "labels": Array [],
                                     "lastFetched": 1543389038810,
                                     "lastUpdated": 1543389038810,
                                     "latestValidation": Object {
@@ -3846,6 +4391,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   },
                                 ],
                                 "id": "mock-project-with-deployments-id",
+                                "labels": Array [],
                                 "lastUpdated": 1553236399556,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,

From ea2aedf96ff72e2d9dca245a718688dd572aaf17 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 13:31:28 -0400
Subject: [PATCH 297/553] improvement: don't show users actions they're not
 permitted to take

---
 lib/manager/components/CreateProject.js       |  7 +++-
 lib/manager/components/FeedSourceTableRow.js  |  4 +++
 lib/manager/components/LabelAssigner.js       |  2 +-
 lib/manager/components/LabelEditor.js         |  2 +-
 lib/manager/components/LabelPanel.js          | 34 ++++++++++++++++---
 lib/manager/components/ProjectSettings.js     | 12 ++++---
 lib/manager/components/ProjectSettingsForm.js |  8 +++--
 lib/manager/components/ProjectViewer.js       |  2 +-
 8 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/lib/manager/components/CreateProject.js b/lib/manager/components/CreateProject.js
index f43267ce8..e1ebf0583 100644
--- a/lib/manager/components/CreateProject.js
+++ b/lib/manager/components/CreateProject.js
@@ -5,10 +5,13 @@ import {Col, Grid, Row} from 'react-bootstrap'
 
 import {createProject} from '../actions/projects'
 import ManagerPage from '../../common/components/ManagerPage'
+import type {ManagerUserState} from '../../types/reducers'
+
 import ProjectSettingsForm from './ProjectSettingsForm'
 
 type Props = {
-  createProject: typeof createProject
+  createProject: typeof createProject,
+  user: ManagerUserState
 }
 
 /**
@@ -20,6 +23,7 @@ export default class CreateProject extends Component<Props> {
   }
 
   render () {
+    const { user } = this.props
     return (
       <ManagerPage
         ref='page'
@@ -32,6 +36,7 @@ export default class CreateProject extends Component<Props> {
                 onCancelUrl='/project'
                 // Initialize project with empty object.
                 project={{}}
+                user={user}
                 updateProject={this._saveProject}
               />
             </Col>
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 16b6c9ce7..c3b898421 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -125,6 +125,8 @@ function relativeDuration (time: any) {
   )
 }
 
+// This method is extracted variable generation which had to be split
+// out of the render function to appease the eslint complexity rule
 function generateFeedSourceLabelRenderVars (feedSource, comparisonValidationSummary) {
   // data for feed source info column
   let lastVersionUpdate = !!feedSource.lastUpdated &&
@@ -381,6 +383,8 @@ class FeedActionsDropdown extends PureComponent<Props> {
     }
   }
 
+  // This method is extracted variable generation which had to be split
+  // out of the render function to appease the eslint complexity rule
   generateFeedActionDropdownRenderVars = function (user, project, feedSource) {
     const {permissions, subscriptions} = user
     const disabled = !permissions ||
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
index 8c460afad..5fd093da7 100644
--- a/lib/manager/components/LabelAssigner.js
+++ b/lib/manager/components/LabelAssigner.js
@@ -2,7 +2,7 @@
 
 import React from 'react'
 
-import FeedLabel from '../../common/containers/FeedLabel'
+import FeedLabel from '../../common/components/FeedLabel'
 import { stringifyLabels } from '../util'
 import type {Feed, Project} from '../../types'
 
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index e8d3457ad..72758ae5c 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -36,7 +36,7 @@ type State = {
     name: boolean
   }
 }
-// TODO: props
+
 export default class LabelEditor extends React.Component<Props, State> {
     state = {
       validation: {
diff --git a/lib/manager/components/LabelPanel.js b/lib/manager/components/LabelPanel.js
index 819543707..85bd20e5c 100644
--- a/lib/manager/components/LabelPanel.js
+++ b/lib/manager/components/LabelPanel.js
@@ -1,18 +1,35 @@
+// @flow
 import React, { Component } from 'react'
 import { Panel } from 'react-bootstrap'
 
 import FeedLabel from '../../common/containers/FeedLabel'
-import { Project } from '../../types'
+import type {ManagerUserState} from '../../types/reducers'
 
 import LabelEditorModal from './LabelEditorModal'
 
-export default class LabelPanel extends Component<{ project: Project; }> {
+export type Props = {
+  large?: boolean,
+  project?: any,
+  user: ManagerUserState,
+};
+
+export default class LabelPanel extends Component<Props> {
   _onClickNewLabel = () => this.refs.newLabelModal.open();
 
   render () {
-    const {large, project} = this.props
+    const {large, project, user} = this.props
+
+    // To make flow happy, make sure there is a valid
+    // project we can add labels tobefore continuing
+    if (!project || !project.labels || !project.id) { return <div /> }
+
     const { labels, id: projectId } = project
 
+    const projectAdmin =
+      user &&
+      user.permissions &&
+      user.permissions.isProjectAdmin(project.id)
+
     let labelBody = (
       <div className='noLabelsMessage' >
         There are no labels in this project.
@@ -20,6 +37,8 @@ export default class LabelPanel extends Component<{ project: Project; }> {
     )
     if (labels.length > 0) {
       labelBody = labels.map((label) => (
+        // Flow doesn't like things being created within a map
+        // $FlowFixMe
         <FeedLabel key={label.id} label={label} />
       ))
     }
@@ -28,7 +47,14 @@ export default class LabelPanel extends Component<{ project: Project; }> {
       <Panel header={<h3>Labels</h3>}>
         <div className={`feedLabelContainer ${large ? 'large' : ''}`}>
           <LabelEditorModal ref='newLabelModal' projectId={projectId} />
-          <button className='labelActionButton' onClick={this._onClickNewLabel}>Add a new label</button>
+          {projectAdmin && (
+            <button
+              className='labelActionButton'
+              onClick={this._onClickNewLabel}
+            >
+              Add a new label
+            </button>
+          )}
           {labelBody}
         </div>
       </Panel>
diff --git a/lib/manager/components/ProjectSettings.js b/lib/manager/components/ProjectSettings.js
index b810a9578..672ee55a4 100644
--- a/lib/manager/components/ProjectSettings.js
+++ b/lib/manager/components/ProjectSettings.js
@@ -6,17 +6,19 @@ import {LinkContainer} from 'react-router-bootstrap'
 
 import {deleteProject, updateProject} from '../actions/projects'
 import {getComponentMessages, isModuleEnabled} from '../../common/util/config'
+import type {ManagerUserState} from '../../types/reducers'
+import type {Project} from '../../types'
+
 import DeploymentSettings from './deployment/DeploymentSettings'
 import ProjectSettingsForm from './ProjectSettingsForm'
 
-import type {Project} from '../../types'
-
 type Props = {
   activeSettingsPanel?: ?string,
   deleteProject: typeof deleteProject,
   project: Project,
   projectEditDisabled: boolean,
-  updateProject: typeof updateProject
+  updateProject: typeof updateProject,
+  user: ManagerUserState
 }
 
 export default class ProjectSettings extends Component<Props> {
@@ -34,7 +36,8 @@ export default class ProjectSettings extends Component<Props> {
       deleteProject,
       project,
       projectEditDisabled,
-      updateProject
+      updateProject,
+      user
     } = this.props
     const activePanel = !activeSettingsPanel
       ? <ProjectSettingsForm
@@ -44,6 +47,7 @@ export default class ProjectSettings extends Component<Props> {
         project={project}
         updateProject={updateProject}
         showDangerZone
+        user={user}
       />
       : <DeploymentSettings
         project={project}
diff --git a/lib/manager/components/ProjectSettingsForm.js b/lib/manager/components/ProjectSettingsForm.js
index 55efdc37c..83c118bf3 100644
--- a/lib/manager/components/ProjectSettingsForm.js
+++ b/lib/manager/components/ProjectSettingsForm.js
@@ -31,6 +31,7 @@ import TimezoneSelect from '../../common/components/TimezoneSelect'
 import {getComponentMessages} from '../../common/util/config'
 import {parseBounds, validationState} from '../util'
 import type {Bounds, Project} from '../../types'
+import type {ManagerUserState} from '../../types/reducers'
 
 import LabelPanel from './LabelPanel'
 
@@ -50,7 +51,8 @@ type Props = {
   onCancelUrl: string,
   project: Project | ProjectModel,
   showDangerZone?: boolean,
-  updateProject: typeof projectsActions.updateProject
+  updateProject: typeof projectsActions.updateProject,
+  user: ManagerUserState
 }
 
 type State = {
@@ -253,7 +255,7 @@ export default class ProjectSettingsForm extends Component<Props, State> {
   }
 
   render () {
-    const {editDisabled, showDangerZone, project} = this.props
+    const {editDisabled, showDangerZone, project, user} = this.props
     const {model, validation} = this.state
     const {autoFetchHour, autoFetchMinute} = model
     const autoFetchChecked = model.autoFetchFeeds
@@ -360,7 +362,7 @@ export default class ProjectSettingsForm extends Component<Props, State> {
             </ListGroupItem>
           </ListGroup>
         </Panel>
-        <LabelPanel project={project} large />
+        <LabelPanel project={project} large user={user} />
         {showDangerZone &&
           <Panel bsStyle='danger' header={<h3>Danger zone</h3>}>
             <ListGroup fill>
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index 562ed5ae5..4b9df14d5 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -250,7 +250,7 @@ export default class ProjectViewer extends Component<Props, State> {
                     feedSources={project.feedSources || []}
                   />
                   <ExplanatoryPanel project={project} />
-                  <LabelPanel project={project} />
+                  <LabelPanel project={project} user={user} />
                 </Col>
               </Row>
             </Tab>

From 02d129046849a4b8a6265e9e71673be33eae9f85 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 13:47:27 -0400
Subject: [PATCH 298/553] test(ActiveProjectViewer): account for additional
 passed props

---
 .../__snapshots__/ActiveProjectViewer.js.snap | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 4fc3e5c1d..73d72c520 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -4100,6 +4100,78 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "user": null,
                                                         }
                                                       }
+                                                      user={
+                                                        Object {
+                                                          "isCheckingLogin": false,
+                                                          "permissions": UserPermissions {
+                                                            "appPermissionLookup": Object {
+                                                              "administer-application": Object {
+                                                                "type": "administer-application",
+                                                              },
+                                                            },
+                                                            "orgPermissionLookup": Object {},
+                                                            "organizationLookup": Object {},
+                                                            "projectLookup": Object {},
+                                                          },
+                                                          "profile": Object {
+                                                            "app_metadata": Object {
+                                                              "datatools": Array [
+                                                                Object {
+                                                                  "client_id": "mock-client-id",
+                                                                  "organizations": Array [],
+                                                                  "permissions": Array [
+                                                                    Object {
+                                                                      "type": "administer-application",
+                                                                    },
+                                                                  ],
+                                                                  "projects": Array [],
+                                                                  "subscriptions": Array [],
+                                                                },
+                                                              ],
+                                                            },
+                                                            "clientID": "mock-client-id",
+                                                            "created_at": "2016-03-04T18:59:22.569Z",
+                                                            "email": "mock-user@conveyal.com",
+                                                            "email_verified": true,
+                                                            "identities": Array [
+                                                              Object {
+                                                                "connection": "Username-Password-Authentication",
+                                                                "isSocial": false,
+                                                                "provider": "auth0",
+                                                                "user_id": "12345",
+                                                              },
+                                                            ],
+                                                            "jti": "gibberish",
+                                                            "last_password_reset": "2017-07-13T13:58:01.021Z",
+                                                            "name": "mock-user@conveyal.com",
+                                                            "nickname": "mock-user",
+                                                            "persistent": Object {},
+                                                            "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
+                                                            "sub": "auth0|12345",
+                                                            "updated_at": "2019-03-21T19:05:30.180Z",
+                                                            "user_id": "auth0|12345",
+                                                            "user_metadata": Object {
+                                                              "datatools": Array [
+                                                                Object {
+                                                                  "client_id": "mock-client-id",
+                                                                  "editor": Object {
+                                                                    "map_id": "mapbox.streets",
+                                                                  },
+                                                                  "hideTutorial": true,
+                                                                  "sidebarExpanded": false,
+                                                                },
+                                                              ],
+                                                              "lang": "en",
+                                                            },
+                                                          },
+                                                          "recentActivity": null,
+                                                          "redirectOnSuccess": null,
+                                                          "subscriptions": UserSubscriptions {
+                                                            "subscriptionLookup": Object {},
+                                                          },
+                                                          "token": "mock-token",
+                                                        }
+                                                      }
                                                     >
                                                       <Panel
                                                         bsClass="panel"

From e701a60f2fad26538a29f05a6443c37d3e7bd5cf Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 13:55:23 -0400
Subject: [PATCH 299/553] improvement(FeedSourceTableRow): hide label assigner
 unless permitted

---
 lib/manager/components/FeedSourceTableRow.js | 29 +++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index c3b898421..7266d3274 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -175,7 +175,8 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
       comparisonColumn,
       comparisonValidationSummary,
       feedSource,
-      project
+      project,
+      user
     } = this.props
 
     const {
@@ -204,7 +205,7 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
     return (
       <tr key={feedSource.id} className='feed-source-table-row'>
         <td className='feed-source-info'>
-          <FeedInfo feedSource={feedSource} project={project} />
+          <FeedInfo feedSource={feedSource} project={project} user={user} />
         </td>
         {comparisonColumn &&
           <td className='comparison-column'>
@@ -249,9 +250,16 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
   }
 }
 
-class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project }> {
+class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user: ManagerUserState }> {
   render () {
-    const {feedSource, project} = this.props
+    const {feedSource, project, user} = this.props
+
+    const userCanManageFeed = user.permissions.hasFeedPermission(
+      project.organizationId,
+      project.id,
+      feedSource.id,
+      'manage-feed'
+    )
 
     const lastUpdateText = feedSource.lastUpdated
       ? `Last updated ${moment(feedSource.lastUpdated).format(dateFormat)}`
@@ -297,13 +305,14 @@ class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project }> {
                 feedSource={feedSource}
                 project={project}
               />
-              <button
-                className='labelActionButton small'
-                style={{ marginRight: '5px' }}
-                onClick={() => this.refs.labelAssignerModal.open()}
-              >
+              {userCanManageFeed && (
+                <button
+                  className='labelActionButton small'
+                  style={{ marginRight: '5px' }}
+                  onClick={() => this.refs.labelAssignerModal.open()}
+                >
                   Edit
-              </button>
+                </button>)}
               <div className='feedLabelContainer'>
                 {feedSource.labels.map((label) => (
                   <FeedLabel small key={label.id} label={label} />

From 9fca12b597e08a7b8c03b78b5dcf67109ca7556d Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 13:59:20 -0400
Subject: [PATCH 300/553] refactor(FeedSourceTableRow): extra type checking for
 flow

---
 lib/manager/components/FeedSourceTableRow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 7266d3274..bef60512f 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -254,7 +254,7 @@ class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user:
   render () {
     const {feedSource, project, user} = this.props
 
-    const userCanManageFeed = user.permissions.hasFeedPermission(
+    const userCanManageFeed = user && user.permissions && user.permissions.hasFeedPermission(
       project.organizationId,
       project.id,
       feedSource.id,

From 330a9d171842f209bedf4af9e424918d106985d3 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 14:04:02 -0400
Subject: [PATCH 301/553] fix(FeedLabel): further permission checks

---
 lib/common/components/FeedLabel.js            | 29 ++++++--
 lib/common/containers/FeedLabel.js            |  1 +
 .../__snapshots__/FeedSourceTable.js.snap     | 72 +++++++++++++++++++
 3 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 3d82184ba..7f4158591 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -1,7 +1,10 @@
+// @flow
 import React from 'react'
 import tinycolor from 'tinycolor2'
 import Icon from '@conveyal/woonerf/components/icon'
 
+import type { Label } from '../../types'
+import type {ManagerUserState} from '../../types/reducers'
 import ConfirmModal from '../../common/components/ConfirmModal'
 import LabelEditorModal from '../../manager/components/LabelEditorModal'
 
@@ -14,9 +17,19 @@ const getComplementaryColor = (cssHex, strength) => {
   return complementary.toHexString()
 }
 
-export default class FeedLabel extends React.Component {
+export type Props = {
+  checked?: boolean,
+  deleteLabel?: Function,
+  label: Label,
+  onClick?: Function,
+  small: boolean,
+  user?: ManagerUserState
+}
+export type State = {}
+
+export default class FeedLabel extends React.Component<Props, State> {
   _onConfirmDelete = () => {
-    this.props.deleteLabel(this.props.label)
+    this.props.deleteLabel && this.props.deleteLabel(this.props.label)
   }
 
   _onClickDelete = () => {
@@ -28,7 +41,11 @@ export default class FeedLabel extends React.Component {
   }
 
   render () {
-    const {small, label, checked, onClick: labelOnClick} = this.props
+    const {small, label, checked, onClick: labelOnClick, user} = this.props
+    const projectAdmin =
+      user &&
+      user.permissions &&
+      user.permissions.isProjectAdmin(label.projectId)
 
     return (
       <div
@@ -56,8 +73,8 @@ export default class FeedLabel extends React.Component {
           {label.adminOnly ? <Icon type='lock' /> : ''}
           <span>{label.name}</span>
         </div>
-        { small ? ''
-          : <div className='actionButtons'>
+        { !small && projectAdmin && (
+          <div className='actionButtons'>
             <ConfirmModal
               ref='deleteModal'
               title='Delete Label?'
@@ -69,7 +86,7 @@ export default class FeedLabel extends React.Component {
             <button onClick={() => this._onClickEdit()}><Icon type='pencil' /></button>
             <button onClick={() => this._onClickDelete()}><Icon type='trash' /></button>
           </div>
-        }
+        )}
       </div>
     )
   }
diff --git a/lib/common/containers/FeedLabel.js b/lib/common/containers/FeedLabel.js
index ca6a11bea..2995c6bfa 100644
--- a/lib/common/containers/FeedLabel.js
+++ b/lib/common/containers/FeedLabel.js
@@ -7,6 +7,7 @@ import FeedLabel from '../components/FeedLabel'
 
 const mapStateToProps = (state, ownProps) => {
   return {
+    user: state.user
   }
 }
 
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 98cfe5e35..89021fbb9 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -3662,6 +3662,78 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "user": null,
                               }
                             }
+                            user={
+                              Object {
+                                "isCheckingLogin": false,
+                                "permissions": UserPermissions {
+                                  "appPermissionLookup": Object {
+                                    "administer-application": Object {
+                                      "type": "administer-application",
+                                    },
+                                  },
+                                  "orgPermissionLookup": Object {},
+                                  "organizationLookup": Object {},
+                                  "projectLookup": Object {},
+                                },
+                                "profile": Object {
+                                  "app_metadata": Object {
+                                    "datatools": Array [
+                                      Object {
+                                        "client_id": "mock-client-id",
+                                        "organizations": Array [],
+                                        "permissions": Array [
+                                          Object {
+                                            "type": "administer-application",
+                                          },
+                                        ],
+                                        "projects": Array [],
+                                        "subscriptions": Array [],
+                                      },
+                                    ],
+                                  },
+                                  "clientID": "mock-client-id",
+                                  "created_at": "2016-03-04T18:59:22.569Z",
+                                  "email": "mock-user@conveyal.com",
+                                  "email_verified": true,
+                                  "identities": Array [
+                                    Object {
+                                      "connection": "Username-Password-Authentication",
+                                      "isSocial": false,
+                                      "provider": "auth0",
+                                      "user_id": "12345",
+                                    },
+                                  ],
+                                  "jti": "gibberish",
+                                  "last_password_reset": "2017-07-13T13:58:01.021Z",
+                                  "name": "mock-user@conveyal.com",
+                                  "nickname": "mock-user",
+                                  "persistent": Object {},
+                                  "picture": "https://s.gravatar.com/avatar/f8660ca52d1229e3d55e88f2db4affda?s=480&r=pg&d=https%3A%2F%2Fcdn.auth0.com%2Favatars%2Fmu.png",
+                                  "sub": "auth0|12345",
+                                  "updated_at": "2019-03-21T19:05:30.180Z",
+                                  "user_id": "auth0|12345",
+                                  "user_metadata": Object {
+                                    "datatools": Array [
+                                      Object {
+                                        "client_id": "mock-client-id",
+                                        "editor": Object {
+                                          "map_id": "mapbox.streets",
+                                        },
+                                        "hideTutorial": true,
+                                        "sidebarExpanded": false,
+                                      },
+                                    ],
+                                    "lang": "en",
+                                  },
+                                },
+                                "recentActivity": null,
+                                "redirectOnSuccess": null,
+                                "subscriptions": UserSubscriptions {
+                                  "subscriptionLookup": Object {},
+                                },
+                                "token": "mock-token",
+                              }
+                            }
                           >
                             <div>
                               <h4>

From f8995e90b5763fba4634def53ab1de9cf2774cec Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 16:11:50 -0400
Subject: [PATCH 302/553] feat(ProjectFeedListToolbar): allow filtering by
 label

---
 lib/manager/actions/visibilityFilter.js       |   4 +
 .../components/ProjectFeedListToolbar.js      |  68 ++++++--
 .../containers/ProjectFeedListToolbar.js      |   5 +-
 .../__snapshots__/ActiveProjectViewer.js.snap | 164 ++++++++++++++++++
 .../__snapshots__/FeedSourceTable.js.snap     | 164 ++++++++++++++++++
 lib/manager/reducers/projects.js              |   4 +-
 lib/manager/util/index.js                     |  15 ++
 lib/style.css                                 |   9 +
 lib/types/reducers.js                         |   3 +-
 9 files changed, 417 insertions(+), 19 deletions(-)

diff --git a/lib/manager/actions/visibilityFilter.js b/lib/manager/actions/visibilityFilter.js
index e00202fed..870ac4ea0 100644
--- a/lib/manager/actions/visibilityFilter.js
+++ b/lib/manager/actions/visibilityFilter.js
@@ -6,6 +6,10 @@ export const setVisibilitySearchText = createAction(
   'SET_PROJECT_VISIBILITY_SEARCH_TEXT',
   (payload: null | string) => payload
 )
+export const setVisibilityLabel = createAction(
+  'SET_PROJECT_VISIBILITY_LABEL',
+  (payload: Array<any>) => payload
+)
 export const setVisibilityFilter = createAction(
   'SET_PROJECT_VISIBILITY_FILTER',
   (payload: any) => payload
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index c357d52a1..27a7ccb42 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -30,7 +30,7 @@ import {
   versionStatusFilters
 } from '../util'
 import {getVersionValidationSummaryByFilterStrategy} from '../util/version'
-
+import FeedLabel from '../../common/components/FeedLabel'
 import type {ExtensionType} from '../../types'
 import type {Props as ContainerProps} from '../containers/ProjectFeedListToolbar'
 import type {
@@ -50,7 +50,8 @@ type Props = ContainerProps & {
   projectEditDisabled: boolean,
   setFeedSort: typeof projectsActions.setFeedSort,
   setFeedSourceTableFilterCountStrategy: typeof projectsActions.setFeedSourceTableFilterCountStrategy,
-  setVisibilityFilter: typeof visibilityFilterActions.setVisibilitySearchText,
+  setVisibilityFilter: typeof visibilityFilterActions.setVisibilityFilter,
+  setVisibilityLabel: typeof visibilityFilterActions.setVisibilityLabel,
   setVisibilitySearchText: typeof visibilityFilterActions.setVisibilitySearchText,
   sort: FeedSourceTableSortStrategiesWithOrders,
   thirdPartySync: typeof projectsActions.thirdPartySync,
@@ -288,6 +289,33 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
     return options
   }
 
+  _renderLabelFilter = () => {
+    const { project, setVisibilityLabel } = this.props
+    // This variable must be set directly from this.props both
+    // to allow the override and for flow
+    const labels = this.props.filter.labels || []
+
+    function handleClick (labelId: string) {
+      const index = labels.indexOf(labelId)
+      index >= 0 ? labels.splice(index, 1) : labels.push(labelId)
+      setVisibilityLabel(labels)
+    }
+    return <MenuItem header style={{minWidth: 275}}>
+      <h5>Select labels to filter by</h5>
+      <div className='feedLabelContainer'>
+        {project.labels.map((label) => (
+          <FeedLabel
+            key={label.id}
+            label={label}
+            checked={labels.includes(label.id)}
+            small
+            onClick={() => handleClick(label.id)}
+          />
+        ))}
+      </div>
+    </MenuItem>
+  }
+
   _renderFilterToolbarLabel = () => {
     const {filter, possibleComparisons} = this.props
 
@@ -331,6 +359,7 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
 
     const activeFilter = filter.filter || 'all'
     const nonFilterColumnOffset = 25
+    const activeFilterLabelCount = (filter.labels && filter.labels.length) || 0
 
     return (
       <Row>
@@ -359,7 +388,7 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
           <FormGroup id='feedFilterToolbarControl'>
             {this._renderFilterToolbarLabel()}
             <ButtonGroup>
-              {Object.keys(versionStatusFilters).map(filterOption => (
+              {Object.keys(versionStatusFilters).map((filterOption) => (
                 <OptionButton
                   active={activeFilter === filterOption}
                   className={activeFilter === filterOption ? 'active' : ''}
@@ -368,12 +397,27 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
                   value={filterOption}
                 >
                   {this.messages(`filter.${filterOption}`)}{' '}
-                  <Badge
-                    style={{backgroundColor: '#babec0'}}>
+                  <Badge style={{ backgroundColor: '#babec0' }}>
                     {filterCounts[filterOption]}
                   </Badge>
                 </OptionButton>
               ))}
+              <DropdownButton
+                id='project-feedsource-label-filter-button'
+                // to match the buttons with badges
+                style={{ paddingBottom: 7 }}
+                title={
+                  <span
+                    style={{
+                      fontWeight: activeFilterLabelCount > 0 ? 'bold' : ''
+                    }}
+                  >
+                    Labels
+                  </span>
+                }
+              >
+                {this._renderLabelFilter()}
+              </DropdownButton>
             </ButtonGroup>
           </FormGroup>
         </Col>
@@ -385,7 +429,7 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
             style={{ marginLeft: 20 }}
             title='Actions'
           >
-            {!projectEditDisabled &&
+            {!projectEditDisabled && (
               <MenuItem
                 data-test-id='project-header-create-new-feed-source-button'
                 disabled={projectEditDisabled}
@@ -394,7 +438,7 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
               >
                 <Glyphicon glyph='plus' /> {this.messages('feeds.new')}
               </MenuItem>
-            }
+            )}
             {this._renderSyncMenuItem('transitland')}
             {this._renderSyncMenuItem('transitfeeds')}
             {this._renderSyncMenuItem('mtc')}
@@ -405,16 +449,10 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
             >
               <Icon type='cloud-download' /> {this.messages('feeds.update')}
             </MenuItem>
-            <MenuItem
-              key='merge-feeds-button'
-              onClick={this._onDownloadMerged}
-            >
+            <MenuItem key='merge-feeds-button' onClick={this._onDownloadMerged}>
               <Glyphicon glyph='download' /> {this.messages('mergeFeeds')}
             </MenuItem>
-            <MenuItem
-              key='csv-download-button'
-              onClick={this._onCsvDownload}
-            >
+            <MenuItem key='csv-download-button' onClick={this._onCsvDownload}>
               <Icon type='table' /> {this.messages('downloadCsv')}
             </MenuItem>
           </DropdownButton>
diff --git a/lib/manager/containers/ProjectFeedListToolbar.js b/lib/manager/containers/ProjectFeedListToolbar.js
index 01907fce1..7c97dff17 100644
--- a/lib/manager/containers/ProjectFeedListToolbar.js
+++ b/lib/manager/containers/ProjectFeedListToolbar.js
@@ -12,7 +12,8 @@ import {
 } from '../actions/projects'
 import {
   setVisibilityFilter,
-  setVisibilitySearchText
+  setVisibilitySearchText,
+  setVisibilityLabel
 } from '../actions/visibilityFilter'
 import {deploymentsEnabledAndAccessAllowedForProject} from '../../common/util/permissions'
 import ProjectFeedListToolbar from '../components/ProjectFeedListToolbar'
@@ -21,7 +22,6 @@ import {
   projectHasAtLeastOneDeployment,
   projectHasAtLeastOneFeedWithAPublishedVersion
 } from '../util'
-
 import type {Project} from '../../types'
 import type {AppState} from '../../types/reducers'
 
@@ -71,6 +71,7 @@ const mapDispatchToProps = {
   setFeedSourceTableFilterCountStrategy,
   setVisibilityFilter,
   setVisibilitySearchText,
+  setVisibilityLabel,
   thirdPartySync
 }
 
diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 73d72c520..7839aaf4a 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -2237,6 +2237,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                   setFeedSort={[Function]}
                                                                   setFeedSourceTableFilterCountStrategy={[Function]}
                                                                   setVisibilityFilter={[Function]}
+                                                                  setVisibilityLabel={[Function]}
                                                                   setVisibilitySearchText={[Function]}
                                                                   sort="alphabetically-asc"
                                                                   thirdPartySync={[Function]}
@@ -3431,6 +3432,169 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       </SafeAnchor>
                                                                                     </Button>
                                                                                   </OptionButton>
+                                                                                  <DropdownButton
+                                                                                    id="project-feedsource-label-filter-button"
+                                                                                    style={
+                                                                                      Object {
+                                                                                        "paddingBottom": 7,
+                                                                                      }
+                                                                                    }
+                                                                                    title={
+                                                                                      <span
+                                                                                        style={
+                                                                                          Object {
+                                                                                            "fontWeight": "",
+                                                                                          }
+                                                                                        }
+                                                                                      >
+                                                                                        Labels
+                                                                                      </span>
+                                                                                    }
+                                                                                  >
+                                                                                    <Uncontrolled(Dropdown)
+                                                                                      id="project-feedsource-label-filter-button"
+                                                                                    >
+                                                                                      <Dropdown
+                                                                                        bsClass="dropdown"
+                                                                                        componentClass={[Function]}
+                                                                                        id="project-feedsource-label-filter-button"
+                                                                                        onToggle={[Function]}
+                                                                                      >
+                                                                                        <ButtonGroup
+                                                                                          block={false}
+                                                                                          bsClass="btn-group"
+                                                                                          className="dropdown"
+                                                                                          justified={false}
+                                                                                          vertical={false}
+                                                                                        >
+                                                                                          <div
+                                                                                            className="dropdown btn-group"
+                                                                                          >
+                                                                                            <DropdownToggle
+                                                                                              bsClass="dropdown-toggle"
+                                                                                              bsRole="toggle"
+                                                                                              id="project-feedsource-label-filter-button"
+                                                                                              key=".0"
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              open={false}
+                                                                                              style={
+                                                                                                Object {
+                                                                                                  "paddingBottom": 7,
+                                                                                                }
+                                                                                              }
+                                                                                              useAnchor={false}
+                                                                                            >
+                                                                                              <Button
+                                                                                                active={false}
+                                                                                                aria-expanded={false}
+                                                                                                aria-haspopup={true}
+                                                                                                block={false}
+                                                                                                bsClass="btn"
+                                                                                                bsStyle="default"
+                                                                                                className="dropdown-toggle"
+                                                                                                disabled={false}
+                                                                                                id="project-feedsource-label-filter-button"
+                                                                                                onClick={[Function]}
+                                                                                                onKeyDown={[Function]}
+                                                                                                role="button"
+                                                                                                style={
+                                                                                                  Object {
+                                                                                                    "paddingBottom": 7,
+                                                                                                  }
+                                                                                                }
+                                                                                              >
+                                                                                                <button
+                                                                                                  aria-expanded={false}
+                                                                                                  aria-haspopup={true}
+                                                                                                  className="dropdown-toggle btn btn-default"
+                                                                                                  disabled={false}
+                                                                                                  id="project-feedsource-label-filter-button"
+                                                                                                  onClick={[Function]}
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="button"
+                                                                                                  style={
+                                                                                                    Object {
+                                                                                                      "paddingBottom": 7,
+                                                                                                    }
+                                                                                                  }
+                                                                                                  type="button"
+                                                                                                >
+                                                                                                  <span
+                                                                                                    style={
+                                                                                                      Object {
+                                                                                                        "fontWeight": "",
+                                                                                                      }
+                                                                                                    }
+                                                                                                  >
+                                                                                                    Labels
+                                                                                                  </span>
+                                                                                                   
+                                                                                                  <span
+                                                                                                    className="caret"
+                                                                                                  />
+                                                                                                </button>
+                                                                                              </Button>
+                                                                                            </DropdownToggle>
+                                                                                            <DropdownMenu
+                                                                                              bsClass="dropdown-menu"
+                                                                                              bsRole="menu"
+                                                                                              key=".1"
+                                                                                              labelledBy="project-feedsource-label-filter-button"
+                                                                                              onClose={[Function]}
+                                                                                              onSelect={[Function]}
+                                                                                              pullRight={false}
+                                                                                            >
+                                                                                              <RootCloseWrapper
+                                                                                                disabled={true}
+                                                                                                event="click"
+                                                                                                onRootClose={[Function]}
+                                                                                              >
+                                                                                                <ul
+                                                                                                  aria-labelledby="project-feedsource-label-filter-button"
+                                                                                                  className="dropdown-menu"
+                                                                                                  role="menu"
+                                                                                                >
+                                                                                                  <MenuItem
+                                                                                                    bsClass="dropdown"
+                                                                                                    disabled={false}
+                                                                                                    divider={false}
+                                                                                                    header={true}
+                                                                                                    key=".0"
+                                                                                                    onKeyDown={[Function]}
+                                                                                                    onSelect={[Function]}
+                                                                                                    style={
+                                                                                                      Object {
+                                                                                                        "minWidth": 275,
+                                                                                                      }
+                                                                                                    }
+                                                                                                  >
+                                                                                                    <li
+                                                                                                      className="dropdown-header"
+                                                                                                      onKeyDown={[Function]}
+                                                                                                      role="heading"
+                                                                                                      style={
+                                                                                                        Object {
+                                                                                                          "minWidth": 275,
+                                                                                                        }
+                                                                                                      }
+                                                                                                    >
+                                                                                                      <h5>
+                                                                                                        Select labels to filter by
+                                                                                                      </h5>
+                                                                                                      <div
+                                                                                                        className="feedLabelContainer"
+                                                                                                      />
+                                                                                                    </li>
+                                                                                                  </MenuItem>
+                                                                                                </ul>
+                                                                                              </RootCloseWrapper>
+                                                                                            </DropdownMenu>
+                                                                                          </div>
+                                                                                        </ButtonGroup>
+                                                                                      </Dropdown>
+                                                                                    </Uncontrolled(Dropdown)>
+                                                                                  </DropdownButton>
                                                                                 </div>
                                                                               </ButtonGroup>
                                                                             </div>
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 89021fbb9..bb39e4554 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -1201,6 +1201,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                 setFeedSort={[Function]}
                 setFeedSourceTableFilterCountStrategy={[Function]}
                 setVisibilityFilter={[Function]}
+                setVisibilityLabel={[Function]}
                 setVisibilitySearchText={[Function]}
                 sort="alphabetically-asc"
                 thirdPartySync={[Function]}
@@ -2408,6 +2409,169 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     </SafeAnchor>
                                   </Button>
                                 </OptionButton>
+                                <DropdownButton
+                                  id="project-feedsource-label-filter-button"
+                                  style={
+                                    Object {
+                                      "paddingBottom": 7,
+                                    }
+                                  }
+                                  title={
+                                    <span
+                                      style={
+                                        Object {
+                                          "fontWeight": "",
+                                        }
+                                      }
+                                    >
+                                      Labels
+                                    </span>
+                                  }
+                                >
+                                  <Uncontrolled(Dropdown)
+                                    id="project-feedsource-label-filter-button"
+                                  >
+                                    <Dropdown
+                                      bsClass="dropdown"
+                                      componentClass={[Function]}
+                                      id="project-feedsource-label-filter-button"
+                                      onToggle={[Function]}
+                                    >
+                                      <ButtonGroup
+                                        block={false}
+                                        bsClass="btn-group"
+                                        className="dropdown"
+                                        justified={false}
+                                        vertical={false}
+                                      >
+                                        <div
+                                          className="dropdown btn-group"
+                                        >
+                                          <DropdownToggle
+                                            bsClass="dropdown-toggle"
+                                            bsRole="toggle"
+                                            id="project-feedsource-label-filter-button"
+                                            key=".0"
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            open={false}
+                                            style={
+                                              Object {
+                                                "paddingBottom": 7,
+                                              }
+                                            }
+                                            useAnchor={false}
+                                          >
+                                            <Button
+                                              active={false}
+                                              aria-expanded={false}
+                                              aria-haspopup={true}
+                                              block={false}
+                                              bsClass="btn"
+                                              bsStyle="default"
+                                              className="dropdown-toggle"
+                                              disabled={false}
+                                              id="project-feedsource-label-filter-button"
+                                              onClick={[Function]}
+                                              onKeyDown={[Function]}
+                                              role="button"
+                                              style={
+                                                Object {
+                                                  "paddingBottom": 7,
+                                                }
+                                              }
+                                            >
+                                              <button
+                                                aria-expanded={false}
+                                                aria-haspopup={true}
+                                                className="dropdown-toggle btn btn-default"
+                                                disabled={false}
+                                                id="project-feedsource-label-filter-button"
+                                                onClick={[Function]}
+                                                onKeyDown={[Function]}
+                                                role="button"
+                                                style={
+                                                  Object {
+                                                    "paddingBottom": 7,
+                                                  }
+                                                }
+                                                type="button"
+                                              >
+                                                <span
+                                                  style={
+                                                    Object {
+                                                      "fontWeight": "",
+                                                    }
+                                                  }
+                                                >
+                                                  Labels
+                                                </span>
+                                                 
+                                                <span
+                                                  className="caret"
+                                                />
+                                              </button>
+                                            </Button>
+                                          </DropdownToggle>
+                                          <DropdownMenu
+                                            bsClass="dropdown-menu"
+                                            bsRole="menu"
+                                            key=".1"
+                                            labelledBy="project-feedsource-label-filter-button"
+                                            onClose={[Function]}
+                                            onSelect={[Function]}
+                                            pullRight={false}
+                                          >
+                                            <RootCloseWrapper
+                                              disabled={true}
+                                              event="click"
+                                              onRootClose={[Function]}
+                                            >
+                                              <ul
+                                                aria-labelledby="project-feedsource-label-filter-button"
+                                                className="dropdown-menu"
+                                                role="menu"
+                                              >
+                                                <MenuItem
+                                                  bsClass="dropdown"
+                                                  disabled={false}
+                                                  divider={false}
+                                                  header={true}
+                                                  key=".0"
+                                                  onKeyDown={[Function]}
+                                                  onSelect={[Function]}
+                                                  style={
+                                                    Object {
+                                                      "minWidth": 275,
+                                                    }
+                                                  }
+                                                >
+                                                  <li
+                                                    className="dropdown-header"
+                                                    onKeyDown={[Function]}
+                                                    role="heading"
+                                                    style={
+                                                      Object {
+                                                        "minWidth": 275,
+                                                      }
+                                                    }
+                                                  >
+                                                    <h5>
+                                                      Select labels to filter by
+                                                    </h5>
+                                                    <div
+                                                      className="feedLabelContainer"
+                                                    />
+                                                  </li>
+                                                </MenuItem>
+                                              </ul>
+                                            </RootCloseWrapper>
+                                          </DropdownMenu>
+                                        </div>
+                                      </ButtonGroup>
+                                    </Dropdown>
+                                  </Uncontrolled(Dropdown)>
+                                </DropdownButton>
                               </div>
                             </ButtonGroup>
                           </div>
diff --git a/lib/manager/reducers/projects.js b/lib/manager/reducers/projects.js
index 467ed2d4e..3484aeea7 100644
--- a/lib/manager/reducers/projects.js
+++ b/lib/manager/reducers/projects.js
@@ -1,10 +1,10 @@
 // @flow
 
 import update from 'react-addons-update'
+
 import {getConfigProperty} from '../../common/util/config'
 import {defaultSorter} from '../../common/util/util'
 import {getIndexesFromFeed} from '../util'
-
 import type {Action} from '../../types/actions'
 import type {ProjectsState} from '../../types/reducers'
 
@@ -36,6 +36,8 @@ const projects = (state: ProjectsState = defaultState, action: Action): Projects
       return update(state, {sort: {$set: action.payload}})
     case 'SET_PROJECT_VISIBILITY_SEARCH_TEXT':
       return update(state, {filter: {searchText: {$set: action.payload}}})
+    case 'SET_PROJECT_VISIBILITY_LABEL':
+      return update(state, {filter: {labels: {$set: action.payload}}})
     case 'SET_PROJECT_VISIBILITY_FILTER':
       return update(state, {filter: {filter: {$set: action.payload}}})
     case 'CREATE_DEPLOYMENT':
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index db8a6d9f9..5496ff0ee 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -198,6 +198,21 @@ export function getFilteredFeeds (
       filter.filter || 'all',
       project
     ))
+    // filter by label
+    .filter(feedSource => {
+      const labels = filter.labels
+      // If no label is specified, return all
+      if (!labels || labels.length === 0) return feedSource
+
+      return labels.find(labelToCheck => {
+        return feedSource.labels
+        // first map to strings
+          .map(label => label.id)
+        // If any label is matched, we include it regardless
+        // of what happens next
+          .includes(labelToCheck)
+      })
+    })
     .sort(feedSortOptions[sort])
 }
 
diff --git a/lib/style.css b/lib/style.css
index bb0f236ad..14780ddbb 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -191,6 +191,12 @@ td.feed-source-info {
 .feedLabel.small .labelName span {
   /* The icon adds this, so we have to add it as well */
   margin-bottom: 5px;
+  text-overflow: ellipsis;
+  white-space: normal;
+}
+.feedLabel.small.clickable .labelName span {
+  /* The checkbox changes the math from above */
+  margin-bottom: 2px;
 }
 .feedLabel .labelName {
   flex: 2;
@@ -202,6 +208,9 @@ td.feed-source-info {
 .feedLabel.small .labelName {
   padding: 0;
   height: 100%;
+  align-items: baseline;
+}
+.feedLabel.small.clickable .labelName {
   align-items: center;
 }
 
diff --git a/lib/types/reducers.js b/lib/types/reducers.js
index b3365ab16..74305295a 100644
--- a/lib/types/reducers.js
+++ b/lib/types/reducers.js
@@ -4,6 +4,7 @@ import {latLngBounds} from 'leaflet'
 
 import UserPermissions from '../common/user/UserPermissions'
 import UserSubscriptions from '../common/user/UserSubscriptions'
+import type {PermissionType} from '../common/user/UserPermissions'
 
 import type {
   Alert,
@@ -25,7 +26,6 @@ import type {
   Trip,
   UserProfile
 } from './'
-import type {PermissionType} from '../common/user/UserPermissions'
 
 type FetchStatusSubState = {
   fetchStatus: FetchStatus
@@ -511,6 +511,7 @@ export type ProjectFilter = {
   feedSourceTableComparisonColumn: FeedSourceTableComparisonColumns,
   feedSourceTableFilterCountStrategy: FeedSourceTableFilterCountStrategies,
   filter: any,
+  labels?: Array<string>,
   searchText: null | string
 }
 

From c3dd2e7ca7f2d2ef1b43b304dc6cc25954734755 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 17:00:00 -0400
Subject: [PATCH 303/553] feat(ProjectFeedListToolbar): allow user to and/or
 filter labels

---
 lib/manager/actions/visibilityFilter.js       |  4 ++
 .../components/ProjectFeedListToolbar.js      | 57 ++++++++++++++-----
 .../containers/ProjectFeedListToolbar.js      |  4 +-
 lib/manager/reducers/projects.js              |  2 +
 lib/manager/util/index.js                     | 12 +++-
 lib/types/reducers.js                         |  1 +
 6 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/lib/manager/actions/visibilityFilter.js b/lib/manager/actions/visibilityFilter.js
index 870ac4ea0..eaaf86263 100644
--- a/lib/manager/actions/visibilityFilter.js
+++ b/lib/manager/actions/visibilityFilter.js
@@ -10,6 +10,10 @@ export const setVisibilityLabel = createAction(
   'SET_PROJECT_VISIBILITY_LABEL',
   (payload: Array<any>) => payload
 )
+export const setVisibilityLabelMode = createAction(
+  'SET_PROJECT_VISIBILITY_LABEL_MODE',
+  (payload: string) => payload
+)
 export const setVisibilityFilter = createAction(
   'SET_PROJECT_VISIBILITY_FILTER',
   (payload: any) => payload
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index 27a7ccb42..170d9d562 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -1,3 +1,6 @@
+/* eslint-disable jsx-a11y/no-onchange */
+// Deprecated rule (https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/docs/rules/no-onchange.md)
+
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
@@ -52,6 +55,7 @@ type Props = ContainerProps & {
   setFeedSourceTableFilterCountStrategy: typeof projectsActions.setFeedSourceTableFilterCountStrategy,
   setVisibilityFilter: typeof visibilityFilterActions.setVisibilityFilter,
   setVisibilityLabel: typeof visibilityFilterActions.setVisibilityLabel,
+  setVisibilityLabelMode: typeof visibilityFilterActions.setVisibilityLabelMode,
   setVisibilitySearchText: typeof visibilityFilterActions.setVisibilitySearchText,
   sort: FeedSourceTableSortStrategiesWithOrders,
   thirdPartySync: typeof projectsActions.thirdPartySync,
@@ -290,30 +294,49 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
   }
 
   _renderLabelFilter = () => {
-    const { project, setVisibilityLabel } = this.props
+    const { project, setVisibilityLabel, setVisibilityLabelMode, filter } = this.props
     // This variable must be set directly from this.props both
     // to allow the override and for flow
     const labels = this.props.filter.labels || []
+    const {labelsFilterMode} = filter
 
     function handleClick (labelId: string) {
       const index = labels.indexOf(labelId)
       index >= 0 ? labels.splice(index, 1) : labels.push(labelId)
       setVisibilityLabel(labels)
     }
-    return <MenuItem header style={{minWidth: 275}}>
-      <h5>Select labels to filter by</h5>
-      <div className='feedLabelContainer'>
-        {project.labels.map((label) => (
-          <FeedLabel
-            key={label.id}
-            label={label}
-            checked={labels.includes(label.id)}
-            small
-            onClick={() => handleClick(label.id)}
-          />
-        ))}
-      </div>
-    </MenuItem>
+    function handleSelectLabelMode (e) {
+      const { value: newMode } = e.target
+      setVisibilityLabelMode(newMode)
+    }
+    return (
+      <MenuItem header style={{ minWidth: 275 }}>
+        <h5>
+          Show{' '}
+          <select
+            name='anyonly'
+            id='anyonly'
+            value={labelsFilterMode}
+            onChange={handleSelectLabelMode}
+          >
+            <option value='any'>any</option>
+            <option value='only'>only</option>
+          </select>{' '}
+          feeds with the labels
+        </h5>
+        <div className='feedLabelContainer'>
+          {project.labels.map((label) => (
+            <FeedLabel
+              key={label.id}
+              label={label}
+              checked={labels.includes(label.id)}
+              small
+              onClick={() => handleClick(label.id)}
+            />
+          ))}
+        </div>
+      </MenuItem>
+    )
   }
 
   _renderFilterToolbarLabel = () => {
@@ -348,6 +371,10 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
     )
   }
 
+  componentDidMount = () => {
+    this.props.setVisibilityLabelMode('any')
+  }
+
   render () {
     const {
       filter,
diff --git a/lib/manager/containers/ProjectFeedListToolbar.js b/lib/manager/containers/ProjectFeedListToolbar.js
index 7c97dff17..f3aa4cf28 100644
--- a/lib/manager/containers/ProjectFeedListToolbar.js
+++ b/lib/manager/containers/ProjectFeedListToolbar.js
@@ -13,7 +13,8 @@ import {
 import {
   setVisibilityFilter,
   setVisibilitySearchText,
-  setVisibilityLabel
+  setVisibilityLabel,
+  setVisibilityLabelMode
 } from '../actions/visibilityFilter'
 import {deploymentsEnabledAndAccessAllowedForProject} from '../../common/util/permissions'
 import ProjectFeedListToolbar from '../components/ProjectFeedListToolbar'
@@ -72,6 +73,7 @@ const mapDispatchToProps = {
   setVisibilityFilter,
   setVisibilitySearchText,
   setVisibilityLabel,
+  setVisibilityLabelMode,
   thirdPartySync
 }
 
diff --git a/lib/manager/reducers/projects.js b/lib/manager/reducers/projects.js
index 3484aeea7..495056a0f 100644
--- a/lib/manager/reducers/projects.js
+++ b/lib/manager/reducers/projects.js
@@ -38,6 +38,8 @@ const projects = (state: ProjectsState = defaultState, action: Action): Projects
       return update(state, {filter: {searchText: {$set: action.payload}}})
     case 'SET_PROJECT_VISIBILITY_LABEL':
       return update(state, {filter: {labels: {$set: action.payload}}})
+    case 'SET_PROJECT_VISIBILITY_LABEL_MODE':
+      return update(state, {filter: {labelsFilterMode: {$set: action.payload}}})
     case 'SET_PROJECT_VISIBILITY_FILTER':
       return update(state, {filter: {filter: {$set: action.payload}}})
     case 'CREATE_DEPLOYMENT':
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index 5496ff0ee..34999b150 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -204,14 +204,22 @@ export function getFilteredFeeds (
       // If no label is specified, return all
       if (!labels || labels.length === 0) return feedSource
 
-      return labels.find(labelToCheck => {
+      function labelVerify (labelToCheck) {
         return feedSource.labels
         // first map to strings
           .map(label => label.id)
         // If any label is matched, we include it regardless
         // of what happens next
           .includes(labelToCheck)
-      })
+      }
+
+      if (filter.labelsFilterMode === 'any') {
+        return labels.find(labelVerify)
+      }
+
+      if (filter.labelsFilterMode === 'only') {
+        return labels.every(labelVerify)
+      }
     })
     .sort(feedSortOptions[sort])
 }
diff --git a/lib/types/reducers.js b/lib/types/reducers.js
index 74305295a..860c8b177 100644
--- a/lib/types/reducers.js
+++ b/lib/types/reducers.js
@@ -512,6 +512,7 @@ export type ProjectFilter = {
   feedSourceTableFilterCountStrategy: FeedSourceTableFilterCountStrategies,
   filter: any,
   labels?: Array<string>,
+  labelsFilterMode: string,
   searchText: null | string
 }
 

From 662ab4d3f5d96034676773de2d99f92e568c0586 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 17:04:57 -0400
Subject: [PATCH 304/553] refactor: update flow types for label filtering

---
 .../__tests__/__snapshots__/projects.js.snap  |  2 ++
 .../components/ProjectFeedListToolbar.js      |  4 ----
 .../__snapshots__/ActiveProjectViewer.js.snap | 24 ++++++++++++++++++-
 .../__snapshots__/FeedSourceTable.js.snap     | 24 ++++++++++++++++++-
 lib/manager/reducers/projects.js              |  7 ++++--
 5 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index cce744beb..2a3471290 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -198,6 +198,7 @@ Object {
     "feedSourceTableComparisonColumn": "DEPLOYED",
     "feedSourceTableFilterCountStrategy": "LATEST",
     "filter": null,
+    "labelsFilterMode": "any",
     "searchText": null,
   },
   "isFetching": false,
@@ -213,6 +214,7 @@ Object {
     "feedSourceTableComparisonColumn": null,
     "feedSourceTableFilterCountStrategy": "LATEST",
     "filter": null,
+    "labelsFilterMode": "any",
     "searchText": null,
   },
   "isFetching": false,
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index 170d9d562..49b61945d 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -371,10 +371,6 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
     )
   }
 
-  componentDidMount = () => {
-    this.props.setVisibilityLabelMode('any')
-  }
-
   render () {
     const {
       filter,
diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 7839aaf4a..848b16b92 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -2177,6 +2177,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                       "feedSourceTableComparisonColumn": null,
                                                                       "feedSourceTableFilterCountStrategy": "LATEST",
                                                                       "filter": null,
+                                                                      "labelsFilterMode": "any",
                                                                       "searchText": null,
                                                                     }
                                                                   }
@@ -2238,6 +2239,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                   setFeedSourceTableFilterCountStrategy={[Function]}
                                                                   setVisibilityFilter={[Function]}
                                                                   setVisibilityLabel={[Function]}
+                                                                  setVisibilityLabelMode={[Function]}
                                                                   setVisibilitySearchText={[Function]}
                                                                   sort="alphabetically-asc"
                                                                   thirdPartySync={[Function]}
@@ -3580,7 +3582,27 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                                       }
                                                                                                     >
                                                                                                       <h5>
-                                                                                                        Select labels to filter by
+                                                                                                        Show
+                                                                                                         
+                                                                                                        <select
+                                                                                                          id="anyonly"
+                                                                                                          name="anyonly"
+                                                                                                          onChange={[Function]}
+                                                                                                          value="any"
+                                                                                                        >
+                                                                                                          <option
+                                                                                                            value="any"
+                                                                                                          >
+                                                                                                            any
+                                                                                                          </option>
+                                                                                                          <option
+                                                                                                            value="only"
+                                                                                                          >
+                                                                                                            only
+                                                                                                          </option>
+                                                                                                        </select>
+                                                                                                         
+                                                                                                        feeds with the labels
                                                                                                       </h5>
                                                                                                       <div
                                                                                                         className="feedLabelContainer"
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index bb39e4554..43cb9b98a 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -987,6 +987,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "feedSourceTableComparisonColumn": "DEPLOYED",
                     "feedSourceTableFilterCountStrategy": "LATEST",
                     "filter": null,
+                    "labelsFilterMode": "any",
                     "searchText": null,
                   }
                 }
@@ -1202,6 +1203,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                 setFeedSourceTableFilterCountStrategy={[Function]}
                 setVisibilityFilter={[Function]}
                 setVisibilityLabel={[Function]}
+                setVisibilityLabelMode={[Function]}
                 setVisibilitySearchText={[Function]}
                 sort="alphabetically-asc"
                 thirdPartySync={[Function]}
@@ -2557,7 +2559,27 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                                     }
                                                   >
                                                     <h5>
-                                                      Select labels to filter by
+                                                      Show
+                                                       
+                                                      <select
+                                                        id="anyonly"
+                                                        name="anyonly"
+                                                        onChange={[Function]}
+                                                        value="any"
+                                                      >
+                                                        <option
+                                                          value="any"
+                                                        >
+                                                          any
+                                                        </option>
+                                                        <option
+                                                          value="only"
+                                                        >
+                                                          only
+                                                        </option>
+                                                      </select>
+                                                       
+                                                      feeds with the labels
                                                     </h5>
                                                     <div
                                                       className="feedLabelContainer"
diff --git a/lib/manager/reducers/projects.js b/lib/manager/reducers/projects.js
index 495056a0f..4a5c74749 100644
--- a/lib/manager/reducers/projects.js
+++ b/lib/manager/reducers/projects.js
@@ -23,7 +23,9 @@ export const defaultState = {
     // in the feed source table, this is a validation status filter
     filter: null,
     // This is used to sort both the Project List or the FeedSourceTable
-    searchText: null
+    searchText: null,
+    // Used by the label filtering dropdown
+    labelsFilterMode: 'any'
   },
   // this is used to sort the FeedSourceTable
   sort: 'alphabetically-asc'
@@ -83,7 +85,8 @@ const projects = (state: ProjectsState = defaultState, action: Action): Projects
           feedSourceTableComparisonColumn: null,
           feedSourceTableFilterCountStrategy: 'LATEST',
           filter: null,
-          searchText: null
+          searchText: null,
+          labelsFilterMode: 'any'
         },
         sort: 'alphabetically-asc'
       }

From ae2120c226cabab33fe266a826fd7064fc7f509e Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 17:49:51 -0400
Subject: [PATCH 305/553] style: add comments & clean up

---
 lib/common/components/FeedLabel.js            |  49 +++++----
 lib/manager/actions/feeds.js                  |  25 +++--
 lib/manager/actions/labels.js                 |  10 +-
 lib/manager/components/CreateProject.js       |   9 +-
 lib/manager/components/FeedSourceTableRow.js  |  20 ++--
 lib/manager/components/GeneralSettings.js     |   8 +-
 lib/manager/components/LabelAssigner.js       |   2 +-
 lib/manager/components/LabelAssignerModal.js  |  95 ++++++++--------
 lib/manager/components/LabelEditor.js         |  16 +--
 lib/manager/components/LabelEditorModal.js    | 103 ++++++++++--------
 lib/manager/components/LabelPanel.js          |  16 +--
 .../components/ProjectFeedListToolbar.js      |   9 +-
 lib/manager/components/ProjectSettings.js     |  17 +--
 lib/manager/components/ProjectSettingsForm.js |  14 +--
 lib/manager/util/index.js                     |   5 +-
 lib/types/reducers.js                         |   4 +-
 16 files changed, 214 insertions(+), 188 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 7f4158591..b83b29e3e 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -8,15 +8,6 @@ import type {ManagerUserState} from '../../types/reducers'
 import ConfirmModal from '../../common/components/ConfirmModal'
 import LabelEditorModal from '../../manager/components/LabelEditorModal'
 
-const getComplementaryColor = (cssHex, strength) => {
-  const color = tinycolor(cssHex)
-
-  const complementary = color.isDark()
-    ? color.lighten(strength)
-    : color.darken(strength + 10)
-  return complementary.toHexString()
-}
-
 export type Props = {
   checked?: boolean,
   deleteLabel?: Function,
@@ -27,6 +18,17 @@ export type Props = {
 }
 export type State = {}
 
+// Generate lightened/darkened versions of a color for use in text
+// and border rendering
+const getComplementaryColor = (cssHex, strength) => {
+  const color = tinycolor(cssHex)
+
+  const complementary = color.isDark()
+    ? color.lighten(strength)
+    : color.darken(strength + 10)
+  return complementary.toHexString()
+}
+
 export default class FeedLabel extends React.Component<Props, State> {
   _onConfirmDelete = () => {
     this.props.deleteLabel && this.props.deleteLabel(this.props.label)
@@ -49,31 +51,36 @@ export default class FeedLabel extends React.Component<Props, State> {
 
     return (
       <div
-        className={`feedLabel ${small ? 'small' : ''} ${checked !== undefined ? 'clickable' : ''}`}
+        className={`feedLabel ${small && 'small'} 
+        ${
+  // Need an explicit check for undefined, since it is expected
+  // to be true/false
+      checked !== undefined ? 'clickable' : ''
+      }`}
         style={{
           backgroundColor: label.color,
           color: getComplementaryColor(label.color, 55),
           borderColor: getComplementaryColor(label.color, 10)
         }}
         title={label.description}
-
         onClick={!labelOnClick ? null : () => labelOnClick(label.id)}
         onKeyPress={!labelOnClick ? null : () => labelOnClick(label.id)}
         role='checkbox'
         aria-checked={checked}
         tabIndex={0}
       >
-
         <div className='labelName'>
-          {checked !== undefined
-            ? <div className='actionButtons'>
+          {checked !== undefined && (
+            <div className='actionButtons'>
               <input type='checkbox' checked={checked} />
             </div>
-            : ''}
-          {label.adminOnly ? <Icon type='lock' /> : ''}
+          )}
+          {label.adminOnly && <Icon type='lock' />}
           <span>{label.name}</span>
         </div>
-        { !small && projectAdmin && (
+        {/* Only project admins can see controls that only appear
+        on large labels */}
+        {!small && projectAdmin && (
           <div className='actionButtons'>
             <ConfirmModal
               ref='deleteModal'
@@ -83,8 +90,12 @@ export default class FeedLabel extends React.Component<Props, State> {
             />
             <LabelEditorModal ref='editModal' label={this.props.label} />
 
-            <button onClick={() => this._onClickEdit()}><Icon type='pencil' /></button>
-            <button onClick={() => this._onClickDelete()}><Icon type='trash' /></button>
+            <button onClick={() => this._onClickEdit()}>
+              <Icon type='pencil' />
+            </button>
+            <button onClick={() => this._onClickDelete()}>
+              <Icon type='trash' />
+            </button>
           </div>
         )}
       </div>
diff --git a/lib/manager/actions/feeds.js b/lib/manager/actions/feeds.js
index cb92b0e4e..7600951d1 100644
--- a/lib/manager/actions/feeds.js
+++ b/lib/manager/actions/feeds.js
@@ -1,19 +1,19 @@
 // @flow
 
-import {browserHistory} from 'react-router'
-import {createAction, type ActionType} from 'redux-actions'
-
-import {createVoidPayloadAction, secureFetch} from '../../common/actions'
-import {isModuleEnabled} from '../../common/util/config'
-import {fetchSnapshots} from '../../editor/actions/snapshots'
-import type {Feed, NewFeed} from '../../types'
-import type {dispatchFn, getStateFn} from '../../types/reducers'
+import { browserHistory } from 'react-router'
+import { createAction, type ActionType } from 'redux-actions'
+
+import { createVoidPayloadAction, secureFetch } from '../../common/actions'
+import { isModuleEnabled } from '../../common/util/config'
+import { fetchSnapshots } from '../../editor/actions/snapshots'
+import type { Feed, NewFeed } from '../../types'
+import type { dispatchFn, getStateFn } from '../../types/reducers'
 import { stringifyLabels } from '../util'
 
-import {fetchFeedSourceDeployments} from './deployments'
-import {fetchProject, fetchProjectWithFeeds} from './projects'
-import {handleJobResponse} from './status'
-import {fetchFeedVersions} from './versions'
+import { fetchFeedSourceDeployments } from './deployments'
+import { fetchProject, fetchProjectWithFeeds } from './projects'
+import { handleJobResponse } from './status'
+import { fetchFeedVersions } from './versions'
 
 // Private actions
 const requestingFeedSource = createVoidPayloadAction('REQUESTING_FEEDSOURCE')
@@ -82,6 +82,7 @@ export function createFeedSource (newFeed: NewFeed) {
 export function updateFeedSource (feedSource: Feed, properties: {[string]: any}) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(savingFeedSource())
+    // Convert all labels to be only strings, which the server requires
     feedSource.labels = stringifyLabels(feedSource.labels)
     properties.labels = stringifyLabels(properties.labels)
 
diff --git a/lib/manager/actions/labels.js b/lib/manager/actions/labels.js
index ddbe4ce5c..34f89cb2d 100644
--- a/lib/manager/actions/labels.js
+++ b/lib/manager/actions/labels.js
@@ -1,11 +1,11 @@
 // @flow
 
-import {secureFetch} from '../../common/actions'
-import type {dispatchFn, getStateFn} from '../../types/reducers'
-import type {Label} from '../../types'
+import { secureFetch } from '../../common/actions'
+import type { dispatchFn, getStateFn } from '../../types/reducers'
+import type { Label } from '../../types'
 
 import { fetchProject } from './projects'
-import {fetchProjectFeeds} from './feeds'
+import { fetchProjectFeeds } from './feeds'
 
 // Public action used by component or other actions
 
@@ -29,7 +29,7 @@ export function createLabel (label: Label) {
  * Update existing label with provided properties.
  */
 export function updateLabel (label: Label, properties: {[string]: any}) {
-  // remove keys which the server doesn't like
+  // remove keys which the server doesn't like, which may be in the object
   // TODO: is there a cleaner/more dynamic way to do this? Properties can't be guaranteed to
   // include all the keys we need, so can't use that
 
diff --git a/lib/manager/components/CreateProject.js b/lib/manager/components/CreateProject.js
index e1ebf0583..302b3b033 100644
--- a/lib/manager/components/CreateProject.js
+++ b/lib/manager/components/CreateProject.js
@@ -1,11 +1,11 @@
 // @flow
 
-import React, {Component} from 'react'
-import {Col, Grid, Row} from 'react-bootstrap'
+import React, { Component } from 'react'
+import { Col, Grid, Row } from 'react-bootstrap'
 
-import {createProject} from '../actions/projects'
+import { createProject } from '../actions/projects'
 import ManagerPage from '../../common/components/ManagerPage'
-import type {ManagerUserState} from '../../types/reducers'
+import type { ManagerUserState } from '../../types/reducers'
 
 import ProjectSettingsForm from './ProjectSettingsForm'
 
@@ -24,6 +24,7 @@ export default class CreateProject extends Component<Props> {
 
   render () {
     const { user } = this.props
+
     return (
       <ManagerPage
         ref='page'
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index bef60512f..30a85581e 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -3,15 +3,9 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import humanizeDuration from 'humanize-duration'
 import moment from 'moment'
-import React, {PureComponent} from 'react'
-import {
-  Col,
-  DropdownButton,
-  Glyphicon,
-  MenuItem,
-  Row
-} from 'react-bootstrap'
-import {browserHistory, Link} from 'react-router'
+import React, { PureComponent } from 'react'
+import { Col, DropdownButton, Glyphicon, MenuItem, Row } from 'react-bootstrap'
+import { browserHistory, Link } from 'react-router'
 
 import * as deploymentActions from '../actions/deployments'
 import * as feedsActions from '../actions/feeds'
@@ -21,14 +15,14 @@ import {
   isModuleEnabled,
   getConfigProperty
 } from '../../common/util/config'
-import {abbreviate, isValidZipFile} from '../../common/util/util'
+import { abbreviate, isValidZipFile } from '../../common/util/util'
 import ConfirmModal from '../../common/components/ConfirmModal'
 import SelectFileModal from '../../common/components/SelectFileModal'
 import WatchButton from '../../common/containers/WatchButton'
 import FeedLabel from '../../common/components/FeedLabel'
 import LabelAssignerModal from '../components/LabelAssignerModal'
-import type {Props as ContainerProps} from '../containers/FeedSourceTableRow'
-import type {Feed, ValidationSummary, Project} from '../../types'
+import type { Props as ContainerProps } from '../containers/FeedSourceTableRow'
+import type { Feed, ValidationSummary, Project } from '../../types'
 import type {
   FeedSourceTableComparisonColumns,
   ManagerUserState
@@ -252,7 +246,7 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
 
 class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user: ManagerUserState }> {
   render () {
-    const {feedSource, project, user} = this.props
+    const { feedSource, project, user } = this.props
 
     const userCanManageFeed = user && user.permissions && user.permissions.hasFeedPermission(
       project.organizationId,
diff --git a/lib/manager/components/GeneralSettings.js b/lib/manager/components/GeneralSettings.js
index 8a4bab6e6..9b6fc8ea4 100644
--- a/lib/manager/components/GeneralSettings.js
+++ b/lib/manager/components/GeneralSettings.js
@@ -1,7 +1,7 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
-import React, {Component} from 'react'
+import React, { Component } from 'react'
 import {
   Button,
   Checkbox,
@@ -16,9 +16,9 @@ import {
 } from 'react-bootstrap'
 
 import * as feedsActions from '../actions/feeds'
-import {FREQUENCY_INTERVALS} from '../../common/constants'
-import type {Feed, FetchFrequency, Project} from '../../types'
-import type {ManagerUserState} from '../../types/reducers'
+import { FREQUENCY_INTERVALS } from '../../common/constants'
+import type { Feed, FetchFrequency, Project } from '../../types'
+import type { ManagerUserState } from '../../types/reducers'
 import LabelAssigner from '../containers/LabelAssigner'
 
 import FeedFetchFrequency from './FeedFetchFrequency'
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
index 5fd093da7..598952228 100644
--- a/lib/manager/components/LabelAssigner.js
+++ b/lib/manager/components/LabelAssigner.js
@@ -4,7 +4,7 @@ import React from 'react'
 
 import FeedLabel from '../../common/components/FeedLabel'
 import { stringifyLabels } from '../util'
-import type {Feed, Project} from '../../types'
+import type { Feed, Project } from '../../types'
 
 type Props = {
  feedSource: Feed,
diff --git a/lib/manager/components/LabelAssignerModal.js b/lib/manager/components/LabelAssignerModal.js
index 465e237ee..98f14f91e 100644
--- a/lib/manager/components/LabelAssignerModal.js
+++ b/lib/manager/components/LabelAssignerModal.js
@@ -4,56 +4,59 @@ import { Modal, Button } from 'react-bootstrap'
 // @flow
 
 import LabelAssigner from '../containers/LabelAssigner'
-import type {FeedSource, Project} from '../../types'
+import type { FeedSource, Project } from '../../types'
 
 type Props = {
-    feedSource: FeedSource,
-    project: Project
-  }
+  feedSource: FeedSource,
+  project: Project,
+};
 
-  type State = {
-    showModal: boolean,
-  }
+type State = {
+  showModal: boolean,
+};
 
 export default class LabelEditorModal extends React.Component<Props, State> {
-    state = {
+  state = {
+    showModal: false
+  };
+
+  close = () => {
+    this.setState({
       showModal: false
-    }
-
-     close = () => {
-       this.setState({
-         showModal: false
-       })
-     }
-
-    open = () => {
-      this.setState({
-        showModal: true
-      })
-    }
-
-    ok = () => {
-      this.close()
-    }
-
-    render () {
-      const {Body, Header, Title, Footer} = Modal
-      const { feedSource, project } = this.props
-      return (
-        <Modal show={this.state.showModal} onHide={this.close}>
-          <Header>
-            <Title>{`Add Labels to ${feedSource.name}`}</Title>
-          </Header>
-
-          <Body>
-            <LabelAssigner feedSource={feedSource} project={project} />
-          </Body>
-          <Footer>
-            <Button
-              data-test-id='label-assigner-done-button'
-              onClick={this.close}>Done</Button>
-          </Footer>
-        </Modal>
-      )
-    }
+    })
+  };
+
+  open = () => {
+    this.setState({
+      showModal: true
+    })
+  };
+
+  ok = () => {
+    this.close()
+  };
+
+  render () {
+    const { Body, Header, Title, Footer } = Modal
+    const { feedSource, project } = this.props
+    return (
+      <Modal show={this.state.showModal} onHide={this.close}>
+        <Header>
+          <Title>{`Add Labels to ${feedSource.name}`}</Title>
+        </Header>
+
+        <Body>
+          <LabelAssigner feedSource={feedSource} project={project} />
+        </Body>
+        <Footer>
+          <Button
+            data-test-id='label-assigner-done-button'
+            onClick={this.close}
+          >
+            Done
+          </Button>
+        </Footer>
+      </Modal>
+    )
+  }
 }
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index 72758ae5c..f3e2961d3 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -15,9 +15,9 @@ import {
 } from 'react-bootstrap'
 import update from 'react-addons-update'
 
-import {validationState} from '../util'
-import type {ManagerUserState} from '../../types/reducers'
-import type {Label} from '../../types'
+import { validationState } from '../util'
+import type { ManagerUserState } from '../../types/reducers'
+import type { Label } from '../../types'
 
 type Props = {
   createLabel: Function,
@@ -72,7 +72,7 @@ export default class LabelEditor extends React.Component<Props, State> {
     const {name, value, type, checked} = target
 
     const universalValue: string | boolean = type === 'checkbox' ? checked : value
-    // Annoying extra check for flow
+    // extra check for flow
     const valid =
       alwaysValid ||
       (typeof universalValue === 'string' && universalValue.length > 0)
@@ -85,6 +85,8 @@ export default class LabelEditor extends React.Component<Props, State> {
     )
   }
 
+  // compares the dirty label from the old one to determine
+  // which keys changed
   _getChanges = () => {
     const newLabel = this.state.newLabel
     const oldLabel = this.props.label
@@ -121,19 +123,17 @@ export default class LabelEditor extends React.Component<Props, State> {
   }
 
   render () {
-    const {newLabel, validation} = this.state
-    const {user} = this.props
+    const { newLabel, validation } = this.state
+    const { user } = this.props
 
     return <div>
       <Panel>
-
         <ListGroup fill>
           <ListGroupItem>
             <FormGroup
               data-test-id='label-name'
               validationState={validationState(validation.name)}
             >
-
               <ControlLabel>Name</ControlLabel>
               <FormControl
                 value={newLabel.name}
diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
index af3cb72cf..5e1b82ef6 100644
--- a/lib/manager/components/LabelEditorModal.js
+++ b/lib/manager/components/LabelEditorModal.js
@@ -1,55 +1,62 @@
 import React from 'react'
-import {Modal} from 'react-bootstrap'
+import { Modal } from 'react-bootstrap'
 
 // @flow
 
 import LabelEditor from '../containers/LabelEditor'
-import type {Label} from '../../types'
-
-type LabelEditorModalProps = {
-    label?: Label,
-    projectId?: String
-  }
-
-  type LabelEditorModalState = {
-    showModal: boolean,
-  }
-
-export default class LabelEditorModal extends React.Component<LabelEditorModalProps, LabelEditorModalState> {
-    state = {
+import type { Label } from '../../types'
+
+type Props = {
+  label?: Label,
+  projectId?: String,
+};
+
+type State = {
+  showModal: boolean,
+};
+
+export default class LabelEditorModal extends React.Component<
+  Props,
+  State
+> {
+  state = {
+    showModal: false
+  };
+
+  close = () => {
+    this.setState({
       showModal: false
-    }
-
-     close = () => {
-       this.setState({
-         showModal: false
-       })
-     }
-
-    open = () => {
-      this.setState({
-        showModal: true
-      })
-    }
-
-    ok = () => {
-      this.close()
-    }
-
-    render () {
-      const {Body, Header, Title} = Modal
-      const label = this.props.label || {}
-      const { projectId } = this.props
-      return (
-        <Modal show={this.state.showModal} onHide={this.close}>
-          <Header>
-            <Title>{label.name ? 'Edit Label' : 'Create New Label'}</Title>
-          </Header>
-
-          <Body>
-            <LabelEditor label={label} onDone={this.close} projectId={projectId} />
-          </Body>
-        </Modal>
-      )
-    }
+    })
+  };
+
+  open = () => {
+    this.setState({
+      showModal: true
+    })
+  };
+
+  ok = () => {
+    this.close()
+  };
+
+  render () {
+    const { Body, Header, Title } = Modal
+    const label = this.props.label || {}
+    const { projectId } = this.props
+    return (
+      <Modal show={this.state.showModal} onHide={this.close}>
+        <Header>
+          <Title>{label.name ? 'Edit Label' : 'Create New Label'}</Title>
+        </Header>
+
+        <Body>
+          <LabelEditor
+            label={label}
+            onDone={this.close}
+            projectId={projectId}
+          />
+        </Body>
+      </Modal>
+    )
+  }
 }
diff --git a/lib/manager/components/LabelPanel.js b/lib/manager/components/LabelPanel.js
index 85bd20e5c..152b46a2e 100644
--- a/lib/manager/components/LabelPanel.js
+++ b/lib/manager/components/LabelPanel.js
@@ -3,7 +3,7 @@ import React, { Component } from 'react'
 import { Panel } from 'react-bootstrap'
 
 import FeedLabel from '../../common/containers/FeedLabel'
-import type {ManagerUserState} from '../../types/reducers'
+import type { ManagerUserState } from '../../types/reducers'
 
 import LabelEditorModal from './LabelEditorModal'
 
@@ -17,21 +17,21 @@ export default class LabelPanel extends Component<Props> {
   _onClickNewLabel = () => this.refs.newLabelModal.open();
 
   render () {
-    const {large, project, user} = this.props
+    const { large, project, user } = this.props
 
-    // To make flow happy, make sure there is a valid
+    // make sure there is a valid
     // project we can add labels tobefore continuing
-    if (!project || !project.labels || !project.id) { return <div /> }
+    if (!project || !project.labels || !project.id) {
+      return <div />
+    }
 
     const { labels, id: projectId } = project
 
     const projectAdmin =
-      user &&
-      user.permissions &&
-      user.permissions.isProjectAdmin(project.id)
+      user && user.permissions && user.permissions.isProjectAdmin(project.id)
 
     let labelBody = (
-      <div className='noLabelsMessage' >
+      <div className='noLabelsMessage'>
         There are no labels in this project.
       </div>
     )
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index 49b61945d..d7db08635 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -294,11 +294,16 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
   }
 
   _renderLabelFilter = () => {
-    const { project, setVisibilityLabel, setVisibilityLabelMode, filter } = this.props
+    const {
+      project,
+      setVisibilityLabel,
+      setVisibilityLabelMode,
+      filter
+    } = this.props
     // This variable must be set directly from this.props both
     // to allow the override and for flow
     const labels = this.props.filter.labels || []
-    const {labelsFilterMode} = filter
+    const { labelsFilterMode } = filter
 
     function handleClick (labelId: string) {
       const index = labels.indexOf(labelId)
diff --git a/lib/manager/components/ProjectSettings.js b/lib/manager/components/ProjectSettings.js
index 672ee55a4..a9889d6fe 100644
--- a/lib/manager/components/ProjectSettings.js
+++ b/lib/manager/components/ProjectSettings.js
@@ -1,13 +1,16 @@
 // @flow
 
-import React, {Component} from 'react'
-import {Row, Col, Panel, ListGroup, ListGroupItem} from 'react-bootstrap'
-import {LinkContainer} from 'react-router-bootstrap'
+import React, { Component } from 'react'
+import { Row, Col, Panel, ListGroup, ListGroupItem } from 'react-bootstrap'
+import { LinkContainer } from 'react-router-bootstrap'
 
-import {deleteProject, updateProject} from '../actions/projects'
-import {getComponentMessages, isModuleEnabled} from '../../common/util/config'
-import type {ManagerUserState} from '../../types/reducers'
-import type {Project} from '../../types'
+import { deleteProject, updateProject } from '../actions/projects'
+import {
+  getComponentMessages,
+  isModuleEnabled
+} from '../../common/util/config'
+import type { ManagerUserState } from '../../types/reducers'
+import type { Project } from '../../types'
 
 import DeploymentSettings from './deployment/DeploymentSettings'
 import ProjectSettingsForm from './ProjectSettingsForm'
diff --git a/lib/manager/components/ProjectSettingsForm.js b/lib/manager/components/ProjectSettingsForm.js
index 83c118bf3..7b60d6741 100644
--- a/lib/manager/components/ProjectSettingsForm.js
+++ b/lib/manager/components/ProjectSettingsForm.js
@@ -2,7 +2,7 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import moment from 'moment'
-import React, {Component} from 'react'
+import React, { Component } from 'react'
 import update from 'react-addons-update'
 import {
   Button,
@@ -21,17 +21,17 @@ import {
 } from 'react-bootstrap'
 import DateTimeField from 'react-bootstrap-datetimepicker'
 import ReactDOM from 'react-dom'
-import {shallowEqual} from 'react-pure-render'
-import {browserHistory} from 'react-router'
+import { shallowEqual } from 'react-pure-render'
+import { browserHistory } from 'react-router'
 
 import * as projectsActions from '../actions/projects'
 import MapModal from '../../common/components/MapModal.js'
 import ConfirmModal from '../../common/components/ConfirmModal'
 import TimezoneSelect from '../../common/components/TimezoneSelect'
-import {getComponentMessages} from '../../common/util/config'
-import {parseBounds, validationState} from '../util'
-import type {Bounds, Project} from '../../types'
-import type {ManagerUserState} from '../../types/reducers'
+import { getComponentMessages } from '../../common/util/config'
+import { parseBounds, validationState } from '../util'
+import type { Bounds, Project } from '../../types'
+import type { ManagerUserState } from '../../types/reducers'
 
 import LabelPanel from './LabelPanel'
 
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index 34999b150..2fa802c33 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -208,16 +208,17 @@ export function getFilteredFeeds (
         return feedSource.labels
         // first map to strings
           .map(label => label.id)
-        // If any label is matched, we include it regardless
-        // of what happens next
           .includes(labelToCheck)
       }
 
       if (filter.labelsFilterMode === 'any') {
+        // Do OR by checking for one match and ignoring
+        // what happens after
         return labels.find(labelVerify)
       }
 
       if (filter.labelsFilterMode === 'only') {
+        // Do AND by ensuring that every label is found
         return labels.every(labelVerify)
       }
     })
diff --git a/lib/types/reducers.js b/lib/types/reducers.js
index 860c8b177..71d34339d 100644
--- a/lib/types/reducers.js
+++ b/lib/types/reducers.js
@@ -1,10 +1,10 @@
 // @flow
 
-import {latLngBounds} from 'leaflet'
+import { latLngBounds } from 'leaflet'
 
 import UserPermissions from '../common/user/UserPermissions'
 import UserSubscriptions from '../common/user/UserSubscriptions'
-import type {PermissionType} from '../common/user/UserPermissions'
+import type { PermissionType } from '../common/user/UserPermissions'
 
 import type {
   Alert,

From f34703bb4d36b460a4c161d76749395c39d7de4f Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 22 Jul 2021 17:54:01 -0400
Subject: [PATCH 306/553] test: follow flow guideline on boolean ternary

---
 lib/common/components/FeedLabel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index b83b29e3e..88f36c108 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -51,7 +51,7 @@ export default class FeedLabel extends React.Component<Props, State> {
 
     return (
       <div
-        className={`feedLabel ${small && 'small'} 
+        className={`feedLabel ${small ? 'small' : ''} 
         ${
   // Need an explicit check for undefined, since it is expected
   // to be true/false

From 7981da71584542f65d8a6485028214fbda990eb1 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Fri, 23 Jul 2021 10:25:16 -0400
Subject: [PATCH 307/553] fix(index.js): Add status=500 context

---
 lib/common/actions/index.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index c5c55c360..cb0fc8690 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -54,9 +54,16 @@ export function secureFetch (url: string, method: string = 'get', payload?: any,
         const {status} = res
         if (status >= 500) {
           action = 'RELOAD'
-          message = `Network error!\n\n(${method} request on ${url})`
-          consoleError(message)
-          dispatch(setErrorMessage({message, action}))
+          res.json().then(json => {
+            const {detail, message} = json
+            const unknown = `Network error!\n\n(${method} request on ${url})`
+            consoleError(message || JSON.stringify(json) || unknown)
+            dispatch(setErrorMessage({
+              message: message || JSON.stringify(json) || unknown,
+              action,
+              detail
+            }))
+          })
           return null
         } else if (status >= 400) {
           action = status === 401

From 81b6f3a40ebdbe3e59a14de6ba378f0fd5f55283 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Fri, 23 Jul 2021 10:32:53 -0400
Subject: [PATCH 308/553] refactor(linting):

---
 lib/common/actions/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index cb0fc8690..c3f5b6218 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -49,7 +49,7 @@ export function secureFetch (url: string, method: string = 'get', payload?: any,
       .then(res => {
         // if raw response is requested
         if (raw) return res
-        let action, message
+        let action
         // check for errors
         const {status} = res
         if (status >= 500) {

From a1bc3e9a045412a77ff51fd101331edc5d41ee49 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Mon, 26 Jul 2021 10:40:32 -0400
Subject: [PATCH 309/553] refactor: address pr feedback

---
 lib/common/components/FeedLabel.js            |  25 ++-
 lib/common/containers/FeedLabel.js            |  21 --
 lib/manager/actions/visibilityFilter.js       |   4 +-
 lib/manager/components/GeneralSettings.js     |   2 +-
 lib/manager/components/LabelAssigner.js       |  18 +-
 lib/manager/components/LabelAssignerModal.js  |   2 +-
 lib/manager/components/LabelEditor.js         | 200 ++++++++++--------
 lib/manager/components/LabelEditorModal.js    |   2 +-
 lib/manager/components/LabelPanel.js          |   4 +-
 .../components/ProjectFeedListToolbar.js      |  29 +--
 lib/manager/containers/LabelAssigner.js       |  20 --
 lib/manager/containers/LabelEditor.js         |  22 --
 lib/style.css                                 |  40 ++--
 yarn.lock                                     |   7 +-
 14 files changed, 186 insertions(+), 210 deletions(-)
 delete mode 100644 lib/common/containers/FeedLabel.js
 delete mode 100644 lib/manager/containers/LabelAssigner.js
 delete mode 100644 lib/manager/containers/LabelEditor.js

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 88f36c108..6f200b8a8 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -2,7 +2,9 @@
 import React from 'react'
 import tinycolor from 'tinycolor2'
 import Icon from '@conveyal/woonerf/components/icon'
+import { connect } from 'react-redux'
 
+import { deleteLabel } from '../../manager/actions/labels'
 import type { Label } from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 import ConfirmModal from '../../common/components/ConfirmModal'
@@ -10,7 +12,7 @@ import LabelEditorModal from '../../manager/components/LabelEditorModal'
 
 export type Props = {
   checked?: boolean,
-  deleteLabel?: Function,
+  deleteLabel: Function,
   label: Label,
   onClick?: Function,
   small: boolean,
@@ -29,7 +31,7 @@ const getComplementaryColor = (cssHex, strength) => {
   return complementary.toHexString()
 }
 
-export default class FeedLabel extends React.Component<Props, State> {
+class FeedLabel extends React.Component<Props, State> {
   _onConfirmDelete = () => {
     this.props.deleteLabel && this.props.deleteLabel(this.props.label)
   }
@@ -90,10 +92,10 @@ export default class FeedLabel extends React.Component<Props, State> {
             />
             <LabelEditorModal ref='editModal' label={this.props.label} />
 
-            <button onClick={() => this._onClickEdit()}>
+            <button onClick={this._onClickEdit}>
               <Icon type='pencil' />
             </button>
-            <button onClick={() => this._onClickDelete()}>
+            <button onClick={this._onClickDelete}>
               <Icon type='trash' />
             </button>
           </div>
@@ -102,3 +104,18 @@ export default class FeedLabel extends React.Component<Props, State> {
     )
   }
 }
+
+const mapStateToProps = (state, ownProps) => {
+  return {
+    user: state.user
+  }
+}
+
+const mapDispatchToProps = {
+  deleteLabel
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(FeedLabel)
diff --git a/lib/common/containers/FeedLabel.js b/lib/common/containers/FeedLabel.js
deleted file mode 100644
index 2995c6bfa..000000000
--- a/lib/common/containers/FeedLabel.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// @flow
-
-import { connect } from 'react-redux'
-
-import { deleteLabel } from '../../manager/actions/labels'
-import FeedLabel from '../components/FeedLabel'
-
-const mapStateToProps = (state, ownProps) => {
-  return {
-    user: state.user
-  }
-}
-
-const mapDispatchToProps = {
-  deleteLabel
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(FeedLabel)
diff --git a/lib/manager/actions/visibilityFilter.js b/lib/manager/actions/visibilityFilter.js
index eaaf86263..8fba39c7e 100644
--- a/lib/manager/actions/visibilityFilter.js
+++ b/lib/manager/actions/visibilityFilter.js
@@ -1,6 +1,6 @@
 // @flow
 
-import {createAction, type ActionType} from 'redux-actions'
+import { createAction, type ActionType } from 'redux-actions'
 
 export const setVisibilitySearchText = createAction(
   'SET_PROJECT_VISIBILITY_SEARCH_TEXT',
@@ -8,7 +8,7 @@ export const setVisibilitySearchText = createAction(
 )
 export const setVisibilityLabel = createAction(
   'SET_PROJECT_VISIBILITY_LABEL',
-  (payload: Array<any>) => payload
+  (payload: Array<string>) => payload
 )
 export const setVisibilityLabelMode = createAction(
   'SET_PROJECT_VISIBILITY_LABEL_MODE',
diff --git a/lib/manager/components/GeneralSettings.js b/lib/manager/components/GeneralSettings.js
index 9b6fc8ea4..ce3e17a07 100644
--- a/lib/manager/components/GeneralSettings.js
+++ b/lib/manager/components/GeneralSettings.js
@@ -19,7 +19,7 @@ import * as feedsActions from '../actions/feeds'
 import { FREQUENCY_INTERVALS } from '../../common/constants'
 import type { Feed, FetchFrequency, Project } from '../../types'
 import type { ManagerUserState } from '../../types/reducers'
-import LabelAssigner from '../containers/LabelAssigner'
+import LabelAssigner from '../components/LabelAssigner'
 
 import FeedFetchFrequency from './FeedFetchFrequency'
 
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
index 598952228..bd0c2dc54 100644
--- a/lib/manager/components/LabelAssigner.js
+++ b/lib/manager/components/LabelAssigner.js
@@ -1,7 +1,9 @@
 // @flow
 
 import React from 'react'
+import { connect } from 'react-redux'
 
+import { updateFeedSource } from '../actions/feeds'
 import FeedLabel from '../../common/components/FeedLabel'
 import { stringifyLabels } from '../util'
 import type { Feed, Project } from '../../types'
@@ -12,7 +14,7 @@ type Props = {
  updateFeedSource: Function
 }
 
-export default class LabelAssigner extends React.Component<Props> {
+class LabelAssigner extends React.Component<Props> {
   onLabelClick = (labelId: String) => {
     const {feedSource} = this.props
     const updatedLabels = stringifyLabels(feedSource.labels)
@@ -49,3 +51,17 @@ export default class LabelAssigner extends React.Component<Props> {
     )
   }
 }
+
+const mapStateToProps = (state, ownProps) => {
+  return {
+  }
+}
+
+const mapDispatchToProps = {
+  updateFeedSource
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(LabelAssigner)
diff --git a/lib/manager/components/LabelAssignerModal.js b/lib/manager/components/LabelAssignerModal.js
index 98f14f91e..e6fa6be0e 100644
--- a/lib/manager/components/LabelAssignerModal.js
+++ b/lib/manager/components/LabelAssignerModal.js
@@ -3,7 +3,7 @@ import { Modal, Button } from 'react-bootstrap'
 
 // @flow
 
-import LabelAssigner from '../containers/LabelAssigner'
+import LabelAssigner from '../components/LabelAssigner'
 import type { FeedSource, Project } from '../../types'
 
 type Props = {
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index f3e2961d3..f7b5a647d 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -14,7 +14,9 @@ import {
   Row
 } from 'react-bootstrap'
 import update from 'react-addons-update'
+import { connect } from 'react-redux'
 
+import { createLabel, updateLabel } from '../../manager/actions/labels'
 import { validationState } from '../util'
 import type { ManagerUserState } from '../../types/reducers'
 import type { Label } from '../../types'
@@ -37,7 +39,7 @@ type State = {
   }
 }
 
-export default class LabelEditor extends React.Component<Props, State> {
+class LabelEditor extends React.Component<Props, State> {
     state = {
       validation: {
         name: true,
@@ -126,99 +128,109 @@ export default class LabelEditor extends React.Component<Props, State> {
     const { newLabel, validation } = this.state
     const { user } = this.props
 
-    return <div>
-      <Panel>
-        <ListGroup fill>
-          <ListGroupItem>
-            <FormGroup
-              data-test-id='label-name'
-              validationState={validationState(validation.name)}
-            >
-              <ControlLabel>Name</ControlLabel>
-              <FormControl
-                value={newLabel.name}
-                name={'name'}
-                onChange={this._onFormChange}
-              />
-              <FormControl.Feedback />
-              <HelpBlock>Required.</HelpBlock>
-            </FormGroup>
-            <FormGroup
-              data-test-id='label-description'
-            >
-              <ControlLabel>Description</ControlLabel>
-              <FormControl
-                value={newLabel.description}
-                name={'description'}
-                onChange={e => this._onFormChange(e, true)}
-              />
-              <FormControl.Feedback />
-            </FormGroup>
-          </ListGroupItem>
-          <ListGroupItem>
-            <Row>
-              <Col xs={3}>
-                <FormGroup
-                  data-test-id='label-color'
-                >
-                  <ControlLabel>Color</ControlLabel>
-                  <FormControl
-                    value={newLabel.color}
-                    name={'color'}
-                    type='color'
-                    onChange={this._onFormChange}
-                  />
-                  <FormControl.Feedback />
-                </FormGroup>
-              </Col>
-              <Col xs={9}>
-                {this.userIsAdmin(user)
-                  ? <FormGroup
-                    data-test-id='label-adminOnly'
-                  >
-                    <ControlLabel>Visible to admins only?</ControlLabel>
-                    <Row>
-                      <Col xs={3}>
-                        <FormControl
-                          checked={newLabel.adminOnly}
-                          name={'adminOnly'}
-                          type='checkbox'
-                          onChange={e => this._onFormChange(e, true)}
-                        />
-                      </Col>
-                      <Col xs={9}>
-                        <div>If checked, this label will only be visible to project and application admins. Users with feed-specific priveleges will not see this label applied to any feed sources.</div>
-                      </Col>
-                    </Row>
+    return (
+      <div>
+        <Panel>
+          <ListGroup fill>
+            <ListGroupItem>
+              <FormGroup validationState={validationState(validation.name)}>
+                <ControlLabel>Name</ControlLabel>
+                <FormControl
+                  value={newLabel.name}
+                  name={'name'}
+                  onChange={this._onFormChange}
+                />
+                <FormControl.Feedback />
+                <HelpBlock>Required.</HelpBlock>
+              </FormGroup>
+              <FormGroup>
+                <ControlLabel>Description</ControlLabel>
+                <FormControl
+                  value={newLabel.description}
+                  name={'description'}
+                  onChange={(e) => this._onFormChange(e, true)}
+                />
+                <FormControl.Feedback />
+              </FormGroup>
+            </ListGroupItem>
+            <ListGroupItem>
+              <Row>
+                <Col xs={3}>
+                  <FormGroup>
+                    <ControlLabel>Color</ControlLabel>
+                    <FormControl
+                      value={newLabel.color}
+                      name={'color'}
+                      type='color'
+                      onChange={this._onFormChange}
+                    />
+                    <FormControl.Feedback />
                   </FormGroup>
-                  : ''}
-              </Col>
-            </Row>
-          </ListGroupItem>
-        </ListGroup>
-      </Panel>
-      <Row>
-        <Col xs={12}>
-          {/* Cancel button */}
-          <Button
-            onClick={this.props.onDone}
-            style={{marginRight: 10}}
-          >
-            Cancel
-          </Button>
-          {/* Save button */}
-          <Button
-            bsStyle='primary'
-            data-test-id='label-form-save-button'
-            disabled={
-              this._settingsAreUnedited() ||
-                !this._formIsValid()
-            }
-            onClick={this._onSaveSettings}>
-            Save
-          </Button>
-        </Col>
-      </Row>
-    </div>
+                </Col>
+                <Col xs={9}>
+                  {this.userIsAdmin(user) ? (
+                    <FormGroup>
+                      <ControlLabel>Visible to admins only?</ControlLabel>
+                      <Row>
+                        <Col xs={3}>
+                          <FormControl
+                            checked={newLabel.adminOnly}
+                            name={'adminOnly'}
+                            type='checkbox'
+                            onChange={(e) => this._onFormChange(e, true)}
+                          />
+                        </Col>
+                        <Col xs={9}>
+                          <div>
+                            If checked, this label will only be visible to
+                            project and application admins. Users with
+                            feed-specific priveleges will not see this label
+                            applied to any feed sources.
+                          </div>
+                        </Col>
+                      </Row>
+                    </FormGroup>
+                  ) : (
+                    ''
+                  )}
+                </Col>
+              </Row>
+            </ListGroupItem>
+          </ListGroup>
+        </Panel>
+        <Row>
+          <Col xs={12}>
+            {/* Cancel button */}
+            <Button onClick={this.props.onDone} style={{ marginRight: 10 }}>
+              Cancel
+            </Button>
+            {/* Save button */}
+            <Button
+              bsStyle='primary'
+              disabled={this._settingsAreUnedited() || !this._formIsValid()}
+              onClick={this._onSaveSettings}
+            >
+              Save
+            </Button>
+          </Col>
+        </Row>
+      </div>
+    )
+  }
+}
+
+const mapStateToProps = (state, ownProps) => {
+  return {
+    newLabel: state.newLabel,
+    user: state.user
   }
 }
+
+const mapDispatchToProps = {
+  createLabel, updateLabel
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(LabelEditor)
diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
index 5e1b82ef6..5f6d4b48e 100644
--- a/lib/manager/components/LabelEditorModal.js
+++ b/lib/manager/components/LabelEditorModal.js
@@ -3,7 +3,7 @@ import { Modal } from 'react-bootstrap'
 
 // @flow
 
-import LabelEditor from '../containers/LabelEditor'
+import LabelEditor from '../components/LabelEditor'
 import type { Label } from '../../types'
 
 type Props = {
diff --git a/lib/manager/components/LabelPanel.js b/lib/manager/components/LabelPanel.js
index 152b46a2e..3432e84b5 100644
--- a/lib/manager/components/LabelPanel.js
+++ b/lib/manager/components/LabelPanel.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react'
 import { Panel } from 'react-bootstrap'
 
-import FeedLabel from '../../common/containers/FeedLabel'
+import FeedLabel from '../../common/components/FeedLabel'
 import type { ManagerUserState } from '../../types/reducers'
 
 import LabelEditorModal from './LabelEditorModal'
@@ -22,7 +22,7 @@ export default class LabelPanel extends Component<Props> {
     // make sure there is a valid
     // project we can add labels tobefore continuing
     if (!project || !project.labels || !project.id) {
-      return <div />
+      return null
     }
 
     const { labels, id: projectId } = project
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index d7db08635..6ed81a75c 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -236,6 +236,20 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
     this.props.setFeedSort(type)
   })
 
+  _onLabelClick = (labelId: string) => {
+    // This variable must be set directly from this.props both
+    // to allow the override and for flow
+    const labels = this.props.filter.labels || []
+
+    const index = labels.indexOf(labelId)
+    index >= 0 ? labels.splice(index, 1) : labels.push(labelId)
+    this.props.setVisibilityLabel(labels)
+  }
+  _onLabelModeSelectorClick = (e: { target: {value: string} }) => {
+    const { value: newMode } = e.target
+    this.props.setVisibilityLabelMode(newMode)
+  }
+
   /**
    * Renders a third party sync menu item if it is enabled.
    */
@@ -296,8 +310,6 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
   _renderLabelFilter = () => {
     const {
       project,
-      setVisibilityLabel,
-      setVisibilityLabelMode,
       filter
     } = this.props
     // This variable must be set directly from this.props both
@@ -305,15 +317,6 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
     const labels = this.props.filter.labels || []
     const { labelsFilterMode } = filter
 
-    function handleClick (labelId: string) {
-      const index = labels.indexOf(labelId)
-      index >= 0 ? labels.splice(index, 1) : labels.push(labelId)
-      setVisibilityLabel(labels)
-    }
-    function handleSelectLabelMode (e) {
-      const { value: newMode } = e.target
-      setVisibilityLabelMode(newMode)
-    }
     return (
       <MenuItem header style={{ minWidth: 275 }}>
         <h5>
@@ -322,7 +325,7 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
             name='anyonly'
             id='anyonly'
             value={labelsFilterMode}
-            onChange={handleSelectLabelMode}
+            onChange={this._onLabelModeSelectorClick}
           >
             <option value='any'>any</option>
             <option value='only'>only</option>
@@ -336,7 +339,7 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
               label={label}
               checked={labels.includes(label.id)}
               small
-              onClick={() => handleClick(label.id)}
+              onClick={() => this._onLabelClick(label.id)}
             />
           ))}
         </div>
diff --git a/lib/manager/containers/LabelAssigner.js b/lib/manager/containers/LabelAssigner.js
deleted file mode 100644
index 619cc567f..000000000
--- a/lib/manager/containers/LabelAssigner.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// @flow
-
-import { connect } from 'react-redux'
-
-import { updateFeedSource } from '../actions/feeds'
-import LabelAssigner from '../components/LabelAssigner'
-
-const mapStateToProps = (state, ownProps) => {
-  return {
-  }
-}
-
-const mapDispatchToProps = {
-  updateFeedSource
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(LabelAssigner)
diff --git a/lib/manager/containers/LabelEditor.js b/lib/manager/containers/LabelEditor.js
deleted file mode 100644
index 485033d74..000000000
--- a/lib/manager/containers/LabelEditor.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// @flow
-
-import { connect } from 'react-redux'
-
-import { createLabel, updateLabel } from '../../manager/actions/labels'
-import LabelEditor from '../components/LabelEditor'
-
-const mapStateToProps = (state, ownProps) => {
-  return {
-    newLabel: state.newLabel,
-    user: state.user
-  }
-}
-
-const mapDispatchToProps = {
-  createLabel, updateLabel
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(LabelEditor)
diff --git a/lib/style.css b/lib/style.css
index 14780ddbb..e6a97c95f 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -145,48 +145,44 @@ td.feed-source-info {
 
 /* LABELS */
 .feedLabelContainer {
+  align-items: center;
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
-  grid-gap: 5px;
   grid-auto-flow: dense;
+  grid-gap: 5px;
+  grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
   width: 100%;
-  align-items: center;
 }
 .feedLabelContainer.large {
-  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
   grid-gap: 15px;
+  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
 }
 .feedLabelContainer.large .noLabelsMessage {
   /* Match the margin of the new labels "button" */
   margin: 0 0 10px 0;
 }
 .feedSourceLabelRow {
+  align-items: baseline;
   display: inline-flex;
   width: 100%;
-  align-items: baseline;
 }
 .feedLabel {
-  display: inline-block;
-  word-break: break-word;
-
-  display: flex;
   align-items: center;
-  justify-content: space-between;
-
   border-radius: 5px;
   border: 1px solid;
-
-  padding: 5px 0 8px 0;
+  display: flex;
   height: 100%;
+  justify-content: space-between;
+  padding: 5px 0 8px 0;
+  word-break: break-word;
 }
 .feedLabel.clickable {
   cursor: pointer;
 }
 .feedLabel.small {
-  /* removing bottom padding seems to be only way to account for the icon baseline fix */
-  padding: 2px 4px 0 4px;
   align-items: baseline;
   justify-content: center;
+  /* removing bottom padding seems to be only way to account for the icon baseline fix */
+  padding: 2px 4px 0 4px;
 }
 .feedLabel.small .labelName span {
   /* The icon adds this, so we have to add it as well */
@@ -199,16 +195,16 @@ td.feed-source-info {
   margin-bottom: 2px;
 }
 .feedLabel .labelName {
-  flex: 2;
+  align-items: baseline;
   display: flex;
+  flex: 2;
   justify-content: center;
-  align-items: baseline;
   padding: 5px;
 }
 .feedLabel.small .labelName {
-  padding: 0;
-  height: 100%;
   align-items: baseline;
+  height: 100%;
+  padding: 0;
 }
 .feedLabel.small.clickable .labelName {
   align-items: center;
@@ -220,8 +216,8 @@ td.feed-source-info {
 
 /* Label Buttons */
 .feedLabel .actionButtons {
-  display: flex;
   align-items: flex-end;
+  display: flex;
   flex-direction: column;
 }
 .feedLabel .actionButtons input[type="checkbox"] {
@@ -231,8 +227,8 @@ td.feed-source-info {
 .feedLabel .actionButtons button {
   background: none;
   border: none;
-  text-decoration: underline;
   opacity: 0.7;
+  text-decoration: underline;
 }
 .feedLabel .actionButtons button:hover {
   opacity: 1;
@@ -242,9 +238,9 @@ td.feed-source-info {
 .labelActionButton {
   background: none;
   border: none;
+  color: #337ab7;
   margin: 0 0 10px 0;
   padding: 0;
-  color: #337ab7;
   text-decoration: none;
 }
 .labelActionButton:hover {
diff --git a/yarn.lock b/yarn.lock
index c29d1984c..6921e28d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14003,12 +14003,7 @@ tiny-relative-date@^1.3.0:
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
 
-tinycolor2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8"
-  integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=
-
-tinycolor2@^1.4.2:
+tinycolor2@^1.4.1, tinycolor2@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803"
   integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==

From 1fca76780c02b27761bdf069d975d521e0e68443 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Mon, 26 Jul 2021 11:15:31 -0400
Subject: [PATCH 310/553] refactor: hide label action buttons if no labels

---
 lib/manager/components/FeedSourceTableRow.js  |  6 ++--
 .../components/ProjectFeedListToolbar.js      | 33 ++++++++++---------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 30a85581e..1af179e31 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -293,13 +293,15 @@ class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user:
           </Col>
           <Col xs={12}>
             <div className='feedSourceLabelRow'>
-              <Icon type={'tag'} />
+              {project.labels.length > 0 && (
+                <Icon type={'tag'} />
+              )}
               <LabelAssignerModal
                 ref='labelAssignerModal'
                 feedSource={feedSource}
                 project={project}
               />
-              {userCanManageFeed && (
+              {userCanManageFeed && project.labels.length > 0 && (
                 <button
                   className='labelActionButton small'
                   style={{ marginRight: '5px' }}
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index 6ed81a75c..26c023fed 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -385,6 +385,7 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
       filterCounts,
       onNewFeedSourceClick,
       projectEditDisabled,
+      project,
       setVisibilityFilter
     } = this.props
 
@@ -433,22 +434,24 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
                   </Badge>
                 </OptionButton>
               ))}
-              <DropdownButton
-                id='project-feedsource-label-filter-button'
-                // to match the buttons with badges
-                style={{ paddingBottom: 7 }}
-                title={
-                  <span
-                    style={{
-                      fontWeight: activeFilterLabelCount > 0 ? 'bold' : ''
-                    }}
-                  >
+              {project.labels.length > 0 && (
+                <DropdownButton
+                  id='project-feedsource-label-filter-button'
+                  // to match the buttons with badges
+                  style={{ paddingBottom: 7 }}
+                  title={
+                    <span
+                      style={{
+                        fontWeight: activeFilterLabelCount > 0 ? 'bold' : ''
+                      }}
+                    >
                     Labels
-                  </span>
-                }
-              >
-                {this._renderLabelFilter()}
-              </DropdownButton>
+                    </span>
+                  }
+                >
+                  {this._renderLabelFilter()}
+                </DropdownButton>
+              )}
             </ButtonGroup>
           </FormGroup>
         </Col>

From 4df5f69a195d0c1828a391e6dbba4befa82c5b24 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Mon, 26 Jul 2021 11:16:55 -0400
Subject: [PATCH 311/553] test: update tests to account for hidden by default
 labels sort button

---
 .../__snapshots__/ActiveProjectViewer.js.snap | 183 ----------------
 .../__snapshots__/FeedSourceTable.js.snap     | 201 ------------------
 2 files changed, 384 deletions(-)

diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 848b16b92..85d975a7a 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -3434,189 +3434,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       </SafeAnchor>
                                                                                     </Button>
                                                                                   </OptionButton>
-                                                                                  <DropdownButton
-                                                                                    id="project-feedsource-label-filter-button"
-                                                                                    style={
-                                                                                      Object {
-                                                                                        "paddingBottom": 7,
-                                                                                      }
-                                                                                    }
-                                                                                    title={
-                                                                                      <span
-                                                                                        style={
-                                                                                          Object {
-                                                                                            "fontWeight": "",
-                                                                                          }
-                                                                                        }
-                                                                                      >
-                                                                                        Labels
-                                                                                      </span>
-                                                                                    }
-                                                                                  >
-                                                                                    <Uncontrolled(Dropdown)
-                                                                                      id="project-feedsource-label-filter-button"
-                                                                                    >
-                                                                                      <Dropdown
-                                                                                        bsClass="dropdown"
-                                                                                        componentClass={[Function]}
-                                                                                        id="project-feedsource-label-filter-button"
-                                                                                        onToggle={[Function]}
-                                                                                      >
-                                                                                        <ButtonGroup
-                                                                                          block={false}
-                                                                                          bsClass="btn-group"
-                                                                                          className="dropdown"
-                                                                                          justified={false}
-                                                                                          vertical={false}
-                                                                                        >
-                                                                                          <div
-                                                                                            className="dropdown btn-group"
-                                                                                          >
-                                                                                            <DropdownToggle
-                                                                                              bsClass="dropdown-toggle"
-                                                                                              bsRole="toggle"
-                                                                                              id="project-feedsource-label-filter-button"
-                                                                                              key=".0"
-                                                                                              onClick={[Function]}
-                                                                                              onKeyDown={[Function]}
-                                                                                              open={false}
-                                                                                              style={
-                                                                                                Object {
-                                                                                                  "paddingBottom": 7,
-                                                                                                }
-                                                                                              }
-                                                                                              useAnchor={false}
-                                                                                            >
-                                                                                              <Button
-                                                                                                active={false}
-                                                                                                aria-expanded={false}
-                                                                                                aria-haspopup={true}
-                                                                                                block={false}
-                                                                                                bsClass="btn"
-                                                                                                bsStyle="default"
-                                                                                                className="dropdown-toggle"
-                                                                                                disabled={false}
-                                                                                                id="project-feedsource-label-filter-button"
-                                                                                                onClick={[Function]}
-                                                                                                onKeyDown={[Function]}
-                                                                                                role="button"
-                                                                                                style={
-                                                                                                  Object {
-                                                                                                    "paddingBottom": 7,
-                                                                                                  }
-                                                                                                }
-                                                                                              >
-                                                                                                <button
-                                                                                                  aria-expanded={false}
-                                                                                                  aria-haspopup={true}
-                                                                                                  className="dropdown-toggle btn btn-default"
-                                                                                                  disabled={false}
-                                                                                                  id="project-feedsource-label-filter-button"
-                                                                                                  onClick={[Function]}
-                                                                                                  onKeyDown={[Function]}
-                                                                                                  role="button"
-                                                                                                  style={
-                                                                                                    Object {
-                                                                                                      "paddingBottom": 7,
-                                                                                                    }
-                                                                                                  }
-                                                                                                  type="button"
-                                                                                                >
-                                                                                                  <span
-                                                                                                    style={
-                                                                                                      Object {
-                                                                                                        "fontWeight": "",
-                                                                                                      }
-                                                                                                    }
-                                                                                                  >
-                                                                                                    Labels
-                                                                                                  </span>
-                                                                                                   
-                                                                                                  <span
-                                                                                                    className="caret"
-                                                                                                  />
-                                                                                                </button>
-                                                                                              </Button>
-                                                                                            </DropdownToggle>
-                                                                                            <DropdownMenu
-                                                                                              bsClass="dropdown-menu"
-                                                                                              bsRole="menu"
-                                                                                              key=".1"
-                                                                                              labelledBy="project-feedsource-label-filter-button"
-                                                                                              onClose={[Function]}
-                                                                                              onSelect={[Function]}
-                                                                                              pullRight={false}
-                                                                                            >
-                                                                                              <RootCloseWrapper
-                                                                                                disabled={true}
-                                                                                                event="click"
-                                                                                                onRootClose={[Function]}
-                                                                                              >
-                                                                                                <ul
-                                                                                                  aria-labelledby="project-feedsource-label-filter-button"
-                                                                                                  className="dropdown-menu"
-                                                                                                  role="menu"
-                                                                                                >
-                                                                                                  <MenuItem
-                                                                                                    bsClass="dropdown"
-                                                                                                    disabled={false}
-                                                                                                    divider={false}
-                                                                                                    header={true}
-                                                                                                    key=".0"
-                                                                                                    onKeyDown={[Function]}
-                                                                                                    onSelect={[Function]}
-                                                                                                    style={
-                                                                                                      Object {
-                                                                                                        "minWidth": 275,
-                                                                                                      }
-                                                                                                    }
-                                                                                                  >
-                                                                                                    <li
-                                                                                                      className="dropdown-header"
-                                                                                                      onKeyDown={[Function]}
-                                                                                                      role="heading"
-                                                                                                      style={
-                                                                                                        Object {
-                                                                                                          "minWidth": 275,
-                                                                                                        }
-                                                                                                      }
-                                                                                                    >
-                                                                                                      <h5>
-                                                                                                        Show
-                                                                                                         
-                                                                                                        <select
-                                                                                                          id="anyonly"
-                                                                                                          name="anyonly"
-                                                                                                          onChange={[Function]}
-                                                                                                          value="any"
-                                                                                                        >
-                                                                                                          <option
-                                                                                                            value="any"
-                                                                                                          >
-                                                                                                            any
-                                                                                                          </option>
-                                                                                                          <option
-                                                                                                            value="only"
-                                                                                                          >
-                                                                                                            only
-                                                                                                          </option>
-                                                                                                        </select>
-                                                                                                         
-                                                                                                        feeds with the labels
-                                                                                                      </h5>
-                                                                                                      <div
-                                                                                                        className="feedLabelContainer"
-                                                                                                      />
-                                                                                                    </li>
-                                                                                                  </MenuItem>
-                                                                                                </ul>
-                                                                                              </RootCloseWrapper>
-                                                                                            </DropdownMenu>
-                                                                                          </div>
-                                                                                        </ButtonGroup>
-                                                                                      </Dropdown>
-                                                                                    </Uncontrolled(Dropdown)>
-                                                                                  </DropdownButton>
                                                                                 </div>
                                                                               </ButtonGroup>
                                                                             </div>
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 43cb9b98a..d046e14ca 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -2411,189 +2411,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     </SafeAnchor>
                                   </Button>
                                 </OptionButton>
-                                <DropdownButton
-                                  id="project-feedsource-label-filter-button"
-                                  style={
-                                    Object {
-                                      "paddingBottom": 7,
-                                    }
-                                  }
-                                  title={
-                                    <span
-                                      style={
-                                        Object {
-                                          "fontWeight": "",
-                                        }
-                                      }
-                                    >
-                                      Labels
-                                    </span>
-                                  }
-                                >
-                                  <Uncontrolled(Dropdown)
-                                    id="project-feedsource-label-filter-button"
-                                  >
-                                    <Dropdown
-                                      bsClass="dropdown"
-                                      componentClass={[Function]}
-                                      id="project-feedsource-label-filter-button"
-                                      onToggle={[Function]}
-                                    >
-                                      <ButtonGroup
-                                        block={false}
-                                        bsClass="btn-group"
-                                        className="dropdown"
-                                        justified={false}
-                                        vertical={false}
-                                      >
-                                        <div
-                                          className="dropdown btn-group"
-                                        >
-                                          <DropdownToggle
-                                            bsClass="dropdown-toggle"
-                                            bsRole="toggle"
-                                            id="project-feedsource-label-filter-button"
-                                            key=".0"
-                                            onClick={[Function]}
-                                            onKeyDown={[Function]}
-                                            open={false}
-                                            style={
-                                              Object {
-                                                "paddingBottom": 7,
-                                              }
-                                            }
-                                            useAnchor={false}
-                                          >
-                                            <Button
-                                              active={false}
-                                              aria-expanded={false}
-                                              aria-haspopup={true}
-                                              block={false}
-                                              bsClass="btn"
-                                              bsStyle="default"
-                                              className="dropdown-toggle"
-                                              disabled={false}
-                                              id="project-feedsource-label-filter-button"
-                                              onClick={[Function]}
-                                              onKeyDown={[Function]}
-                                              role="button"
-                                              style={
-                                                Object {
-                                                  "paddingBottom": 7,
-                                                }
-                                              }
-                                            >
-                                              <button
-                                                aria-expanded={false}
-                                                aria-haspopup={true}
-                                                className="dropdown-toggle btn btn-default"
-                                                disabled={false}
-                                                id="project-feedsource-label-filter-button"
-                                                onClick={[Function]}
-                                                onKeyDown={[Function]}
-                                                role="button"
-                                                style={
-                                                  Object {
-                                                    "paddingBottom": 7,
-                                                  }
-                                                }
-                                                type="button"
-                                              >
-                                                <span
-                                                  style={
-                                                    Object {
-                                                      "fontWeight": "",
-                                                    }
-                                                  }
-                                                >
-                                                  Labels
-                                                </span>
-                                                 
-                                                <span
-                                                  className="caret"
-                                                />
-                                              </button>
-                                            </Button>
-                                          </DropdownToggle>
-                                          <DropdownMenu
-                                            bsClass="dropdown-menu"
-                                            bsRole="menu"
-                                            key=".1"
-                                            labelledBy="project-feedsource-label-filter-button"
-                                            onClose={[Function]}
-                                            onSelect={[Function]}
-                                            pullRight={false}
-                                          >
-                                            <RootCloseWrapper
-                                              disabled={true}
-                                              event="click"
-                                              onRootClose={[Function]}
-                                            >
-                                              <ul
-                                                aria-labelledby="project-feedsource-label-filter-button"
-                                                className="dropdown-menu"
-                                                role="menu"
-                                              >
-                                                <MenuItem
-                                                  bsClass="dropdown"
-                                                  disabled={false}
-                                                  divider={false}
-                                                  header={true}
-                                                  key=".0"
-                                                  onKeyDown={[Function]}
-                                                  onSelect={[Function]}
-                                                  style={
-                                                    Object {
-                                                      "minWidth": 275,
-                                                    }
-                                                  }
-                                                >
-                                                  <li
-                                                    className="dropdown-header"
-                                                    onKeyDown={[Function]}
-                                                    role="heading"
-                                                    style={
-                                                      Object {
-                                                        "minWidth": 275,
-                                                      }
-                                                    }
-                                                  >
-                                                    <h5>
-                                                      Show
-                                                       
-                                                      <select
-                                                        id="anyonly"
-                                                        name="anyonly"
-                                                        onChange={[Function]}
-                                                        value="any"
-                                                      >
-                                                        <option
-                                                          value="any"
-                                                        >
-                                                          any
-                                                        </option>
-                                                        <option
-                                                          value="only"
-                                                        >
-                                                          only
-                                                        </option>
-                                                      </select>
-                                                       
-                                                      feeds with the labels
-                                                    </h5>
-                                                    <div
-                                                      className="feedLabelContainer"
-                                                    />
-                                                  </li>
-                                                </MenuItem>
-                                              </ul>
-                                            </RootCloseWrapper>
-                                          </DropdownMenu>
-                                        </div>
-                                      </ButtonGroup>
-                                    </Dropdown>
-                                  </Uncontrolled(Dropdown)>
-                                </DropdownButton>
                               </div>
                             </ButtonGroup>
                           </div>
@@ -4005,13 +3822,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       <div
                                         className="feedSourceLabelRow"
                                       >
-                                        <Icon
-                                          type="tag"
-                                        >
-                                          <i
-                                            className="fa fa-tag fa-fw "
-                                          />
-                                        </Icon>
                                         <LabelEditorModal
                                           feedSource={
                                             Object {
@@ -4302,17 +4112,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                             />
                                           </Modal>
                                         </LabelEditorModal>
-                                        <button
-                                          className="labelActionButton small"
-                                          onClick={[Function]}
-                                          style={
-                                            Object {
-                                              "marginRight": "5px",
-                                            }
-                                          }
-                                        >
-                                          Edit
-                                        </button>
                                         <div
                                           className="feedLabelContainer"
                                         />

From 5369939b574ac64e9f61f04a855f017765244625 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 27 Jul 2021 15:27:00 -0400
Subject: [PATCH 312/553] refactor(LabelEditor): address pr comments

---
 lib/common/components/FeedLabel.js            | 49 +++++++-------
 lib/manager/actions/labels.js                 |  9 ++-
 lib/manager/components/LabelEditor.js         | 67 +++++++++----------
 lib/manager/components/LabelEditorModal.js    |  3 +-
 lib/manager/components/LabelPanel.js          |  2 +-
 .../components/ProjectFeedListToolbar.js      | 10 +--
 lib/manager/components/ProjectSettingsForm.js |  5 +-
 lib/manager/util/index.js                     |  2 +-
 lib/style.css                                 | 64 +++++++++---------
 9 files changed, 107 insertions(+), 104 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 6f200b8a8..1f0b058b4 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -52,36 +52,39 @@ class FeedLabel extends React.Component<Props, State> {
       user.permissions.isProjectAdmin(label.projectId)
 
     return (
-      <div
-        className={`feedLabel ${small ? 'small' : ''} 
-        ${
-  // Need an explicit check for undefined, since it is expected
-  // to be true/false
-      checked !== undefined ? 'clickable' : ''
-      }`}
-        style={{
-          backgroundColor: label.color,
-          color: getComplementaryColor(label.color, 55),
-          borderColor: getComplementaryColor(label.color, 10)
-        }}
-        title={label.description}
+      <div className='feedLabelWrapper'
         onClick={!labelOnClick ? null : () => labelOnClick(label.id)}
         onKeyPress={!labelOnClick ? null : () => labelOnClick(label.id)}
         role='checkbox'
         aria-checked={checked}
         tabIndex={0}
       >
-        <div className='labelName'>
-          {checked !== undefined && (
-            <div className='actionButtons'>
-              <input type='checkbox' checked={checked} />
-            </div>
-          )}
-          {label.adminOnly && <Icon type='lock' />}
-          <span>{label.name}</span>
-        </div>
-        {/* Only project admins can see controls that only appear
+        {checked !== undefined && (
+          <div className='actionButtons'>
+            <input type='checkbox' checked={checked} />
+          </div>
+        )}
+        <div
+          className={`feedLabel ${small ? 'smaller' : ''} 
+        ${
+  // Need an explicit check for undefined, since it is expected
+  // to be true/false
+      checked !== undefined ? 'clickable' : ''
+      }`}
+          style={{
+            backgroundColor: label.color,
+            color: getComplementaryColor(label.color, 55),
+            borderColor: getComplementaryColor(label.color, 10)
+          }}
+          title={label.description}
+        >
+          <div className='labelName'>
+            {label.adminOnly && <Icon type='lock' />}
+            <span>{label.name}</span>
+          </div>
+          {/* Only project admins can see controls that only appear
         on large labels */}
+        </div>
         {!small && projectAdmin && (
           <div className='actionButtons'>
             <ConfirmModal
diff --git a/lib/manager/actions/labels.js b/lib/manager/actions/labels.js
index 34f89cb2d..56cd3e2a6 100644
--- a/lib/manager/actions/labels.js
+++ b/lib/manager/actions/labels.js
@@ -1,9 +1,11 @@
 // @flow
 
 import { secureFetch } from '../../common/actions'
+import { isModuleEnabled } from '../../common/util/config'
 import type { dispatchFn, getStateFn } from '../../types/reducers'
 import type { Label } from '../../types'
 
+import {fetchProjectDeployments} from './deployments'
 import { fetchProject } from './projects'
 import { fetchProjectFeeds } from './feeds'
 
@@ -21,6 +23,7 @@ export function createLabel (label: Label) {
         const createdLabel = await res.json()
         dispatch(fetchProject(createdLabel.projectId))
         dispatch(fetchProjectFeeds(createdLabel.projectId))
+        isModuleEnabled('deployment') && dispatch(fetchProjectDeployments(createdLabel.projectId))
       })
   }
 }
@@ -40,8 +43,9 @@ export function updateLabel (label: Label, properties: {[string]: any}) {
 
   return function (dispatch: dispatchFn, getState: getStateFn) {
     return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'put', {...label}))
-      .then((res) => dispatch(fetchProject(label.projectId)))
+      .then(() => dispatch(fetchProject(label.projectId)))
       .then(() => dispatch(fetchProjectFeeds(label.projectId)))
+      .then(() => isModuleEnabled('deployment') && dispatch(fetchProjectDeployments(label.projectId)))
   }
 }
 
@@ -50,7 +54,8 @@ export function updateLabel (label: Label, properties: {[string]: any}) {
 export function deleteLabel (label: Label) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'delete'))
-      .then((res) => dispatch(fetchProject(label.projectId)))
+      .then(() => dispatch(fetchProject(label.projectId)))
       .then(() => dispatch(fetchProjectFeeds(label.projectId)))
+      .then(() => isModuleEnabled('deployment') && dispatch(fetchProjectDeployments(label.projectId)))
   }
 }
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index f7b5a647d..563a3fbb7 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -4,7 +4,9 @@ import React from 'react'
 import {
   Button,
   Col,
+  Checkbox,
   ControlLabel,
+  Form,
   FormControl,
   FormGroup,
   HelpBlock,
@@ -39,6 +41,10 @@ type State = {
   }
 }
 
+/**
+ * Component to edit a label. If a label is specified, that label will be pre-filled. If a new label
+ * is to be created, a blank object and project id must be passed in.
+ */
 class LabelEditor extends React.Component<Props, State> {
     state = {
       validation: {
@@ -53,13 +59,7 @@ class LabelEditor extends React.Component<Props, State> {
       // If we didn't get a label passed in, declare the label to be new
       if (Object.keys(this.props.label).length === 0) {
         this.setState({
-          labelIsNew: true,
-          // Default to a nice orange
-          // we can safely set a partial object here
-          // $FlowFixMe
-          newLabel: {
-            color: '#FF9200'
-          }
+          labelIsNew: true
         })
       }
     }
@@ -94,7 +94,7 @@ class LabelEditor extends React.Component<Props, State> {
     const oldLabel = this.props.label
 
     const changes: any = {}
-    Object.keys(newLabel).map(k => {
+    Object.keys(newLabel).forEach(k => {
       if (newLabel[k] !== oldLabel[k]) {
         changes[k] = newLabel[k]
       }
@@ -129,7 +129,7 @@ class LabelEditor extends React.Component<Props, State> {
     const { user } = this.props
 
     return (
-      <div>
+      <Form>
         <Panel>
           <ListGroup fill>
             <ListGroupItem>
@@ -167,33 +167,25 @@ class LabelEditor extends React.Component<Props, State> {
                     <FormControl.Feedback />
                   </FormGroup>
                 </Col>
-                <Col xs={9}>
-                  {this.userIsAdmin(user) ? (
-                    <FormGroup>
-                      <ControlLabel>Visible to admins only?</ControlLabel>
-                      <Row>
-                        <Col xs={3}>
-                          <FormControl
-                            checked={newLabel.adminOnly}
-                            name={'adminOnly'}
-                            type='checkbox'
-                            onChange={(e) => this._onFormChange(e, true)}
-                          />
-                        </Col>
-                        <Col xs={9}>
-                          <div>
-                            If checked, this label will only be visible to
-                            project and application admins. Users with
-                            feed-specific priveleges will not see this label
-                            applied to any feed sources.
-                          </div>
-                        </Col>
-                      </Row>
-                    </FormGroup>
-                  ) : (
-                    ''
-                  )}
-                </Col>
+                {this.userIsAdmin(user) && (
+                  <Col xs={9}>
+                    <Checkbox
+                      checked={newLabel.adminOnly}
+                      name={'adminOnly'}
+                      type='checkbox'
+                      onChange={(e) => this._onFormChange(e, true)}
+                      style={{margin: 0}}
+                    >
+                      <strong>Visible to admins only?</strong>
+                    </Checkbox>
+                    <div style={{marginTop: 5}}>
+                                          If checked, this label will only be visible to
+                                          project and application admins. Users with
+                                          feed-specific priveleges will not see this label
+                                          applied to any feed sources.
+                    </div>
+                  </Col>
+                )}
               </Row>
             </ListGroupItem>
           </ListGroup>
@@ -208,13 +200,14 @@ class LabelEditor extends React.Component<Props, State> {
             <Button
               bsStyle='primary'
               disabled={this._settingsAreUnedited() || !this._formIsValid()}
+              type='submit'
               onClick={this._onSaveSettings}
             >
               Save
             </Button>
           </Col>
         </Row>
-      </div>
+      </Form>
     )
   }
 }
diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
index 5f6d4b48e..90e0e98ae 100644
--- a/lib/manager/components/LabelEditorModal.js
+++ b/lib/manager/components/LabelEditorModal.js
@@ -43,8 +43,9 @@ export default class LabelEditorModal extends React.Component<
     const { Body, Header, Title } = Modal
     const label = this.props.label || {}
     const { projectId } = this.props
+
     return (
-      <Modal show={this.state.showModal} onHide={this.close}>
+      <Modal show={this.state.showModal} onHide={this.close} keyboard>
         <Header>
           <Title>{label.name ? 'Edit Label' : 'Create New Label'}</Title>
         </Header>
diff --git a/lib/manager/components/LabelPanel.js b/lib/manager/components/LabelPanel.js
index 3432e84b5..5a475cceb 100644
--- a/lib/manager/components/LabelPanel.js
+++ b/lib/manager/components/LabelPanel.js
@@ -45,7 +45,7 @@ export default class LabelPanel extends Component<Props> {
 
     return (
       <Panel header={<h3>Labels</h3>}>
-        <div className={`feedLabelContainer ${large ? 'large' : ''}`}>
+        <div className={`feedLabelContainer ${large ? 'large' : ''} grid`}>
           <LabelEditorModal ref='newLabelModal' projectId={projectId} />
           {projectAdmin && (
             <button
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index 26c023fed..0227d6a4c 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -318,21 +318,21 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
     const { labelsFilterMode } = filter
 
     return (
-      <MenuItem header style={{ minWidth: 275 }}>
+      <MenuItem header style={{ width: 275 }}>
         <h5>
           Show{' '}
           <select
-            name='anyonly'
-            id='anyonly'
+            name='anyall'
+            id='anyall'
             value={labelsFilterMode}
             onChange={this._onLabelModeSelectorClick}
           >
             <option value='any'>any</option>
-            <option value='only'>only</option>
+            <option value='all'>all</option>
           </select>{' '}
           feeds with the labels
         </h5>
-        <div className='feedLabelContainer'>
+        <div className='feedLabelContainer grid'>
           {project.labels.map((label) => (
             <FeedLabel
               key={label.id}
diff --git a/lib/manager/components/ProjectSettingsForm.js b/lib/manager/components/ProjectSettingsForm.js
index 7b60d6741..16775a4b9 100644
--- a/lib/manager/components/ProjectSettingsForm.js
+++ b/lib/manager/components/ProjectSettingsForm.js
@@ -33,8 +33,6 @@ import { parseBounds, validationState } from '../util'
 import type { Bounds, Project } from '../../types'
 import type { ManagerUserState } from '../../types/reducers'
 
-import LabelPanel from './LabelPanel'
-
 type ProjectModel = {
   autoFetchFeeds?: boolean,
   autoFetchHour?: number,
@@ -255,7 +253,7 @@ export default class ProjectSettingsForm extends Component<Props, State> {
   }
 
   render () {
-    const {editDisabled, showDangerZone, project, user} = this.props
+    const {editDisabled, showDangerZone} = this.props
     const {model, validation} = this.state
     const {autoFetchHour, autoFetchMinute} = model
     const autoFetchChecked = model.autoFetchFeeds
@@ -362,7 +360,6 @@ export default class ProjectSettingsForm extends Component<Props, State> {
             </ListGroupItem>
           </ListGroup>
         </Panel>
-        <LabelPanel project={project} large user={user} />
         {showDangerZone &&
           <Panel bsStyle='danger' header={<h3>Danger zone</h3>}>
             <ListGroup fill>
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index 2fa802c33..30474107c 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -217,7 +217,7 @@ export function getFilteredFeeds (
         return labels.find(labelVerify)
       }
 
-      if (filter.labelsFilterMode === 'only') {
+      if (filter.labelsFilterMode === 'all') {
         // Do AND by ensuring that every label is found
         return labels.every(labelVerify)
       }
diff --git a/lib/style.css b/lib/style.css
index e6a97c95f..2d2858694 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -145,16 +145,11 @@ td.feed-source-info {
 
 /* LABELS */
 .feedLabelContainer {
-  align-items: center;
-  display: grid;
-  grid-auto-flow: dense;
-  grid-gap: 5px;
-  grid-template-columns: repeat(auto-fill, minmax(80px, 1fr));
   width: 100%;
 }
-.feedLabelContainer.large {
-  grid-gap: 15px;
-  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+.feedLabelContainer.grid {
+  display: grid;
+  grid-template-columns: 100%;
 }
 .feedLabelContainer.large .noLabelsMessage {
   /* Match the margin of the new labels "button" */
@@ -169,26 +164,19 @@ td.feed-source-info {
   align-items: center;
   border-radius: 5px;
   border: 1px solid;
-  display: flex;
   height: 100%;
-  justify-content: space-between;
   padding: 5px 0 8px 0;
   word-break: break-word;
+  max-width: 100%;
+  min-width: 60px;
 }
 .feedLabel.clickable {
   cursor: pointer;
 }
-.feedLabel.small {
-  align-items: baseline;
+.feedLabel.smaller {
+  align-items: center;
   justify-content: center;
-  /* removing bottom padding seems to be only way to account for the icon baseline fix */
-  padding: 2px 4px 0 4px;
-}
-.feedLabel.small .labelName span {
-  /* The icon adds this, so we have to add it as well */
-  margin-bottom: 5px;
-  text-overflow: ellipsis;
-  white-space: normal;
+  padding: 0px 4px;
 }
 .feedLabel.small.clickable .labelName span {
   /* The checkbox changes the math from above */
@@ -197,42 +185,57 @@ td.feed-source-info {
 .feedLabel .labelName {
   align-items: baseline;
   display: flex;
-  flex: 2;
   justify-content: center;
   padding: 5px;
+  overflow: hidden;
+  width: 100%;
 }
-.feedLabel.small .labelName {
+.feedLabel.smaller .labelName {
   align-items: baseline;
   height: 100%;
   padding: 0;
 }
-.feedLabel.small.clickable .labelName {
+.feedLabel.smaller.clickable .labelName {
   align-items: center;
 }
 
 .feedLabel .labelName i {
   padding-right: 2px;
+  margin: 0;
+}
+.feedLabel .labelName span {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  margin: 0 0 2px 0;
+  white-space: nowrap;
+}
+
+.feedLabelWrapper {
+  height: 100%;
+  display: inline-flex;
+  justify-content: flex-start; /* No option looks particularly good... */
+  align-items: center;
+  padding: 0 5px 2px 0;
 }
 
 /* Label Buttons */
-.feedLabel .actionButtons {
+.feedLabelWrapper .actionButtons {
   align-items: flex-end;
   display: flex;
   flex-direction: column;
 }
-.feedLabel .actionButtons input[type="checkbox"] {
-  margin: 0 5px 2px 0;
-  padding: 0;
-}
-.feedLabel .actionButtons button {
+.feedLabelWrapper .actionButtons button {
   background: none;
   border: none;
   opacity: 0.7;
   text-decoration: underline;
 }
-.feedLabel .actionButtons button:hover {
+.feedLabelWrapper .actionButtons button:hover {
   opacity: 1;
 }
+.feedLabelWrapper .actionButtons input[type="checkbox"] {
+  margin: 0 7px 0 0;
+}
 
 /* New Label "button" */
 .labelActionButton {
@@ -242,6 +245,7 @@ td.feed-source-info {
   margin: 0 0 10px 0;
   padding: 0;
   text-decoration: none;
+  grid-column: 1 / -1;
 }
 .labelActionButton:hover {
   text-decoration: underline;

From 85d38fa8d3975d0fb2497883cc7024acf8d8bb66 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 27 Jul 2021 20:29:50 -0400
Subject: [PATCH 313/553] refactor: Address PR comments

---
 lib/common/components/FeedLabel.js            | 12 ++++-
 .../__tests__/__snapshots__/projects.js.snap  |  2 +
 lib/manager/actions/labels.js                 |  8 +--
 lib/manager/components/FeedSourceTableRow.js  | 19 +++++--
 lib/manager/components/LabelAssigner.js       | 50 +++++++++++++++----
 lib/manager/components/LabelAssignerModal.js  |  2 +
 lib/manager/components/LabelEditor.js         |  6 ++-
 lib/manager/components/LabelEditorModal.js    | 16 ++++--
 .../components/ProjectFeedListToolbar.js      | 15 +++---
 lib/manager/components/ProjectSettings.js     |  6 +--
 lib/manager/components/ProjectViewer.js       | 33 ++++++------
 .../__snapshots__/ActiveProjectViewer.js.snap |  3 +-
 .../__snapshots__/FeedSourceTable.js.snap     |  1 +
 lib/manager/reducers/projects.js              |  4 +-
 lib/manager/util/index.js                     |  8 ++-
 lib/types/index.js                            |  4 +-
 lib/types/reducers.js                         |  2 +-
 17 files changed, 125 insertions(+), 66 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 1f0b058b4..91a2ab322 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -20,8 +20,12 @@ export type Props = {
 }
 export type State = {}
 
-// Generate lightened/darkened versions of a color for use in text
-// and border rendering
+/**
+ * Generate lightened/darkened versions of a color for use in text and border rendering
+ * @param {string} cssHex     The css hex value to modify
+ * @param {number} strength   The amount to lighten or darken by
+ * @returns                   String with lightened/darkened css hex value
+ */
 const getComplementaryColor = (cssHex, strength) => {
   const color = tinycolor(cssHex)
 
@@ -31,6 +35,10 @@ const getComplementaryColor = (cssHex, strength) => {
   return complementary.toHexString()
 }
 
+/**
+ * Renders a feed label, either large or small and optionally renders a checkbox or edit/delete
+ * buttons alongside the label
+ */
 class FeedLabel extends React.Component<Props, State> {
   _onConfirmDelete = () => {
     this.props.deleteLabel && this.props.deleteLabel(this.props.label)
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 2a3471290..ded226863 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -198,6 +198,7 @@ Object {
     "feedSourceTableComparisonColumn": "DEPLOYED",
     "feedSourceTableFilterCountStrategy": "LATEST",
     "filter": null,
+    "labels": Array [],
     "labelsFilterMode": "any",
     "searchText": null,
   },
@@ -214,6 +215,7 @@ Object {
     "feedSourceTableComparisonColumn": null,
     "feedSourceTableFilterCountStrategy": "LATEST",
     "filter": null,
+    "labels": Array [],
     "labelsFilterMode": "any",
     "searchText": null,
   },
diff --git a/lib/manager/actions/labels.js b/lib/manager/actions/labels.js
index 56cd3e2a6..b80601f0d 100644
--- a/lib/manager/actions/labels.js
+++ b/lib/manager/actions/labels.js
@@ -31,15 +31,11 @@ export function createLabel (label: Label) {
 /**
  * Update existing label with provided properties.
  */
-export function updateLabel (label: Label, properties: {[string]: any}) {
+export function updateLabel (dirtyLabel: Label, properties: {[string]: any}) {
   // remove keys which the server doesn't like, which may be in the object
   // TODO: is there a cleaner/more dynamic way to do this? Properties can't be guaranteed to
   // include all the keys we need, so can't use that
-
-  // $FlowFixMe
-  delete label.organizationId
-  // $FlowFixMe
-  delete label.user
+  const { organizationId, user, ...label } = dirtyLabel
 
   return function (dispatch: dispatchFn, getState: getStateFn) {
     return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'put', {...label}))
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 1af179e31..1550fd32b 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -119,9 +119,12 @@ function relativeDuration (time: any) {
   )
 }
 
-// This method is extracted variable generation which had to be split
-// out of the render function to appease the eslint complexity rule
-function generateFeedSourceLabelRenderVars (feedSource, comparisonValidationSummary) {
+//
+/**
+ * This method is extracted variable generation which had to be split out
+ * of the render function to appease the eslint complexity rule
+ */
+function generateFeedSourceLabelRenderVars (feedSource: Feed, comparisonValidationSummary: ?ValidationSummary) {
   // data for feed source info column
   let lastVersionUpdate = !!feedSource.lastUpdated &&
       relativeDuration(feedSource.lastUpdated)
@@ -388,8 +391,14 @@ class FeedActionsDropdown extends PureComponent<Props> {
     }
   }
 
-  // This method is extracted variable generation which had to be split
-  // out of the render function to appease the eslint complexity rule
+  /**
+   * This method is extracted variable generation which had to be split
+   * out of the render function to appease the eslint complexity rule
+   * @param {*} user        User used in child components
+   * @param {*} project     Project object used in child components
+   * @param {*} feedSource  FeedSource object used in child components
+   * @returns               React which makes up dropdowns
+   */
   generateFeedActionDropdownRenderVars = function (user, project, feedSource) {
     const {permissions, subscriptions} = user
     const disabled = !permissions ||
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
index bd0c2dc54..291c245ff 100644
--- a/lib/manager/components/LabelAssigner.js
+++ b/lib/manager/components/LabelAssigner.js
@@ -13,36 +13,66 @@ type Props = {
  project: Project,
  updateFeedSource: Function
 }
+type State = {
+  updatedLabelIds: Array<String>
+}
+
+/**
+ * Displays all labels of a project, and renders feed labels along with checkboxes.
+ * Each label which is of a feed source is checked. Will keep track of changes made
+ * and save changes as the component unmounts
+ */
+class LabelAssigner extends React.Component<Props, State> {
+  state = {
+    updatedLabelIds: []
+  }
+
+  componentDidMount = () => {
+    const { feedSource } = this.props
+    this.setState({
+      updatedLabelIds: stringifyLabels(feedSource.labels)
+    })
+  }
 
-class LabelAssigner extends React.Component<Props> {
   onLabelClick = (labelId: String) => {
-    const {feedSource} = this.props
-    const updatedLabels = stringifyLabels(feedSource.labels)
+    const { updatedLabelIds } = this.state
 
-    const labelIndex = updatedLabels.indexOf(labelId)
+    const labelIndex = updatedLabelIds.indexOf(labelId)
 
     // Either remove the label from the list, or add it
     if (labelIndex < 0) {
-      updatedLabels.push(labelId)
+      updatedLabelIds.push(labelId)
     } else {
-      updatedLabels.splice(labelIndex, 1)
+      updatedLabelIds.splice(labelIndex, 1)
     }
 
-    this.props.updateFeedSource(feedSource, { labels: updatedLabels })
+    this.setState({ updatedLabelIds })
+  }
+
+  componentWillUnmount = () => {
+    const { feedSource } = this.props
+    const { updatedLabelIds } = this.state
+    this.props.updateFeedSource(feedSource, { labels: updatedLabelIds })
   }
 
   render () {
-    const { project, feedSource } = this.props
+    const { project } = this.props
     const projectLabels = project.labels
-    const fsLabelIds = feedSource.labels.map((label) => label.id)
+
+    const { updatedLabelIds: labelIds } = this.state
 
     return (
       <div className='feedLabelContainer large'>
+        {projectLabels.length === 0 && (
+          <div className='noLabelsMessage'>
+        There are no labels in this project.
+          </div>
+        )}
         {projectLabels.map((label) => (
           <FeedLabel
             key={label.id}
             label={label}
-            checked={fsLabelIds.find((id) => id === label.id) !== undefined}
+            checked={labelIds.find((id) => id === label.id) !== undefined}
             small
             onClick={this.onLabelClick}
           />
diff --git a/lib/manager/components/LabelAssignerModal.js b/lib/manager/components/LabelAssignerModal.js
index e6fa6be0e..1da6fefd1 100644
--- a/lib/manager/components/LabelAssignerModal.js
+++ b/lib/manager/components/LabelAssignerModal.js
@@ -26,12 +26,14 @@ export default class LabelEditorModal extends React.Component<Props, State> {
     })
   };
 
+  // Used in the ref
   open = () => {
     this.setState({
       showModal: true
     })
   };
 
+  // Used in the ref
   ok = () => {
     this.close()
   };
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index 563a3fbb7..1ef81598c 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -87,8 +87,9 @@ class LabelEditor extends React.Component<Props, State> {
     )
   }
 
-  // compares the dirty label from the old one to determine
-  // which keys changed
+  /* Compares the dirty label from the old one to determine
+  which keys changed
+  */
   _getChanges = () => {
     const newLabel = this.state.newLabel
     const oldLabel = this.props.label
@@ -101,6 +102,7 @@ class LabelEditor extends React.Component<Props, State> {
     })
     return changes
   }
+
   _settingsAreUnedited = () => Object.keys(this._getChanges()).length === 0
 
   _formIsValid = () => {
diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
index 90e0e98ae..ef4930a33 100644
--- a/lib/manager/components/LabelEditorModal.js
+++ b/lib/manager/components/LabelEditorModal.js
@@ -8,13 +8,17 @@ import type { Label } from '../../types'
 
 type Props = {
   label?: Label,
-  projectId?: String,
-};
+  projectId?: String
+}
 
 type State = {
-  showModal: boolean,
-};
+  showModal: boolean
+}
 
+/**
+ * Renders a LabelEditor within a Modal, including a dynamic title depending
+ * on if a label is new
+ */
 export default class LabelEditorModal extends React.Component<
   Props,
   State
@@ -29,12 +33,14 @@ export default class LabelEditorModal extends React.Component<
     })
   };
 
+  // Used in the ref
   open = () => {
     this.setState({
       showModal: true
     })
   };
 
+  // Used in the ref
   ok = () => {
     this.close()
   };
@@ -45,7 +51,7 @@ export default class LabelEditorModal extends React.Component<
     const { projectId } = this.props
 
     return (
-      <Modal show={this.state.showModal} onHide={this.close} keyboard>
+      <Modal keyboard onHide={this.close} show={this.state.showModal}>
         <Header>
           <Title>{label.name ? 'Edit Label' : 'Create New Label'}</Title>
         </Header>
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index 0227d6a4c..607b71ad2 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -239,13 +239,15 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
   _onLabelClick = (labelId: string) => {
     // This variable must be set directly from this.props both
     // to allow the override and for flow
-    const labels = this.props.filter.labels || []
+    const { filter } = this.props
+    const { labels } = filter
 
     const index = labels.indexOf(labelId)
     index >= 0 ? labels.splice(index, 1) : labels.push(labelId)
     this.props.setVisibilityLabel(labels)
   }
-  _onLabelModeSelectorClick = (e: { target: {value: string} }) => {
+
+  _onLabelModeSelectorClick = (e: SyntheticInputEvent<HTMLInputElement>) => {
     const { value: newMode } = e.target
     this.props.setVisibilityLabelMode(newMode)
   }
@@ -312,10 +314,7 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
       project,
       filter
     } = this.props
-    // This variable must be set directly from this.props both
-    // to allow the override and for flow
-    const labels = this.props.filter.labels || []
-    const { labelsFilterMode } = filter
+    const { labels, labelsFilterMode } = filter
 
     return (
       <MenuItem header style={{ width: 275 }}>
@@ -438,11 +437,11 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
                 <DropdownButton
                   id='project-feedsource-label-filter-button'
                   // to match the buttons with badges
-                  style={{ paddingBottom: 7 }}
+                  style={{ paddingBottom: '5.5pt' }}
                   title={
                     <span
                       style={{
-                        fontWeight: activeFilterLabelCount > 0 ? 'bold' : ''
+                        fontWeight: activeFilterLabelCount > 0 ? '900' : ''
                       }}
                     >
                     Labels
diff --git a/lib/manager/components/ProjectSettings.js b/lib/manager/components/ProjectSettings.js
index a9889d6fe..fe80b60e6 100644
--- a/lib/manager/components/ProjectSettings.js
+++ b/lib/manager/components/ProjectSettings.js
@@ -4,7 +4,7 @@ import React, { Component } from 'react'
 import { Row, Col, Panel, ListGroup, ListGroupItem } from 'react-bootstrap'
 import { LinkContainer } from 'react-router-bootstrap'
 
-import { deleteProject, updateProject } from '../actions/projects'
+import * as projectActions from '../actions/projects'
 import {
   getComponentMessages,
   isModuleEnabled
@@ -17,10 +17,10 @@ import ProjectSettingsForm from './ProjectSettingsForm'
 
 type Props = {
   activeSettingsPanel?: ?string,
-  deleteProject: typeof deleteProject,
+  deleteProject: typeof projectActions.deleteProject,
   project: Project,
   projectEditDisabled: boolean,
-  updateProject: typeof updateProject,
+  updateProject: typeof projectActions.updateProject,
   user: ManagerUserState
 }
 
diff --git a/lib/manager/components/ProjectViewer.js b/lib/manager/components/ProjectViewer.js
index 4b9df14d5..b99941c1e 100644
--- a/lib/manager/components/ProjectViewer.js
+++ b/lib/manager/components/ProjectViewer.js
@@ -184,14 +184,12 @@ export default class ProjectViewer extends Component<Props, State> {
                 <Icon className='icon-link' type='folder-open-o' />
                 <Link to={`/project/${project.id}`}>{project.name}</Link>
                 <ButtonToolbar className={`pull-right`}>
-                  {getConfigProperty('application.notifications_enabled') ? (
-                    <WatchButton
-                      isWatching={this._isWatchingProject()}
-                      user={user}
-                      target={project.id}
-                      subscriptionType='project-updated'
-                    />
-                  ) : null}
+                  {getConfigProperty('application.notifications_enabled') ? <WatchButton
+                    isWatching={this._isWatchingProject()}
+                    user={user}
+                    target={project.id}
+                    subscriptionType='project-updated'
+                  /> : null}
                 </ButtonToolbar>
               </h3>
               <ul
@@ -230,17 +228,14 @@ export default class ProjectViewer extends Component<Props, State> {
             >
               <Row>
                 <Col xs={12} sm={10}>
-                  {this.state.createMode ? (
-                    <CreateFeedSource
-                      createFeedSource={createFeedSource}
-                      onCancel={this._toggleCreateView}
-                      projectId={project.id}
-                    />
-                  ) : (
-                    <FeedSourceTable
-                      onNewFeedSourceClick={this._toggleCreateView}
-                      project={project}
-                    />
+                  {this.state.createMode ? (<CreateFeedSource
+                    createFeedSource={createFeedSource}
+                    onCancel={this._toggleCreateView}
+                    projectId={project.id}
+                  />) : (<FeedSourceTable
+                    onNewFeedSourceClick={this._toggleCreateView}
+                    project={project}
+                  />
                   )}
                 </Col>
                 <Col xs={12} sm={2}>
diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 85d975a7a..f414ac9ec 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -2177,6 +2177,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                       "feedSourceTableComparisonColumn": null,
                                                                       "feedSourceTableFilterCountStrategy": "LATEST",
                                                                       "filter": null,
+                                                                      "labels": Array [],
                                                                       "labelsFilterMode": "any",
                                                                       "searchText": null,
                                                                     }
@@ -4203,7 +4204,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                             key="0"
                                                           >
                                                             <div
-                                                              className="feedLabelContainer "
+                                                              className="feedLabelContainer  grid"
                                                               key=".0"
                                                             >
                                                               <LabelEditorModal
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index d046e14ca..32de6ec9c 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -987,6 +987,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "feedSourceTableComparisonColumn": "DEPLOYED",
                     "feedSourceTableFilterCountStrategy": "LATEST",
                     "filter": null,
+                    "labels": Array [],
                     "labelsFilterMode": "any",
                     "searchText": null,
                   }
diff --git a/lib/manager/reducers/projects.js b/lib/manager/reducers/projects.js
index 4a5c74749..8f2583b62 100644
--- a/lib/manager/reducers/projects.js
+++ b/lib/manager/reducers/projects.js
@@ -25,7 +25,8 @@ export const defaultState = {
     // This is used to sort both the Project List or the FeedSourceTable
     searchText: null,
     // Used by the label filtering dropdown
-    labelsFilterMode: 'any'
+    labelsFilterMode: 'any',
+    labels: []
   },
   // this is used to sort the FeedSourceTable
   sort: 'alphabetically-asc'
@@ -85,6 +86,7 @@ const projects = (state: ProjectsState = defaultState, action: Action): Projects
           feedSourceTableComparisonColumn: null,
           feedSourceTableFilterCountStrategy: 'LATEST',
           filter: null,
+          labels: [],
           searchText: null,
           labelsFilterMode: 'any'
         },
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index 30474107c..6f7bd3684 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -422,9 +422,13 @@ export function validationState (val: ?boolean): ?string {
   return val ? undefined : 'error'
 }
 
+/**
+ * Converts an array of Label objects and string IDs into array of strings, the IDs of
+ * those labels
+ * @param {Array<Label | string>} labels An array of strings and Label objects
+ * @returns                              An array of label IDs
+ */
 export function stringifyLabels (labels: Array<any>): Array<any> {
-  // Convert feed source labels to id strings wanted by datatools-server,
-  // but only if we have a label object
   if (!labels) return []
   return labels.map(label => label.id ? label.id : label)
 }
diff --git a/lib/types/index.js b/lib/types/index.js
index 259a054ed..08359a0ee 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -528,7 +528,9 @@ export type Label = {
   description: string,
   id: string,
   name: string,
-  projectId: string
+  organizationId?: string,
+  projectId: string,
+  user?: string
 }
 
 // TODO: Remove this eslint rule once https://github.com/babel/babel-eslint/pull/584
diff --git a/lib/types/reducers.js b/lib/types/reducers.js
index 71d34339d..b84f0c5b9 100644
--- a/lib/types/reducers.js
+++ b/lib/types/reducers.js
@@ -511,7 +511,7 @@ export type ProjectFilter = {
   feedSourceTableComparisonColumn: FeedSourceTableComparisonColumns,
   feedSourceTableFilterCountStrategy: FeedSourceTableFilterCountStrategies,
   filter: any,
-  labels?: Array<string>,
+  labels: Array<string>,
   labelsFilterMode: string,
   searchText: null | string
 }

From c2bbe636c647be8bf3588ee94f93ef74c9043d94 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 27 Jul 2021 20:51:34 -0400
Subject: [PATCH 314/553] refactor(style.css): sort properties

---
 lib/style.css | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/style.css b/lib/style.css
index 2d2858694..454fe6d50 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -165,10 +165,10 @@ td.feed-source-info {
   border-radius: 5px;
   border: 1px solid;
   height: 100%;
-  padding: 5px 0 8px 0;
-  word-break: break-word;
   max-width: 100%;
   min-width: 60px;
+  padding: 5px 0 8px 0;
+  word-break: break-word;
 }
 .feedLabel.clickable {
   cursor: pointer;
@@ -186,8 +186,8 @@ td.feed-source-info {
   align-items: baseline;
   display: flex;
   justify-content: center;
-  padding: 5px;
   overflow: hidden;
+  padding: 5px;
   width: 100%;
 }
 .feedLabel.smaller .labelName {
@@ -200,21 +200,21 @@ td.feed-source-info {
 }
 
 .feedLabel .labelName i {
-  padding-right: 2px;
   margin: 0;
+  padding-right: 2px;
 }
 .feedLabel .labelName span {
-  text-overflow: ellipsis;
-  overflow: hidden;
   margin: 0 0 2px 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
   white-space: nowrap;
 }
 
 .feedLabelWrapper {
-  height: 100%;
+  align-items: center;
   display: inline-flex;
+  height: 100%;
   justify-content: flex-start; /* No option looks particularly good... */
-  align-items: center;
   padding: 0 5px 2px 0;
 }
 
@@ -242,10 +242,10 @@ td.feed-source-info {
   background: none;
   border: none;
   color: #337ab7;
+  grid-column: 1 / -1;
   margin: 0 0 10px 0;
   padding: 0;
   text-decoration: none;
-  grid-column: 1 / -1;
 }
 .labelActionButton:hover {
   text-decoration: underline;

From f9b1dfe9a739ede45564496d39f7c3f5d66eb772 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Wed, 28 Jul 2021 17:58:39 -0400
Subject: [PATCH 315/553] refactor: update for server changes, feedsource only
 contains label ids

---
 lib/manager/actions/feeds.js                 |  4 ----
 lib/manager/components/FeedSourceTableRow.js |  3 ++-
 lib/manager/components/LabelAssigner.js      |  7 +++---
 lib/manager/util/index.js                    | 23 ++++++++++----------
 lib/types/index.js                           |  2 +-
 5 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/lib/manager/actions/feeds.js b/lib/manager/actions/feeds.js
index 7600951d1..0e3eac057 100644
--- a/lib/manager/actions/feeds.js
+++ b/lib/manager/actions/feeds.js
@@ -8,7 +8,6 @@ import { isModuleEnabled } from '../../common/util/config'
 import { fetchSnapshots } from '../../editor/actions/snapshots'
 import type { Feed, NewFeed } from '../../types'
 import type { dispatchFn, getStateFn } from '../../types/reducers'
-import { stringifyLabels } from '../util'
 
 import { fetchFeedSourceDeployments } from './deployments'
 import { fetchProject, fetchProjectWithFeeds } from './projects'
@@ -82,9 +81,6 @@ export function createFeedSource (newFeed: NewFeed) {
 export function updateFeedSource (feedSource: Feed, properties: {[string]: any}) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(savingFeedSource())
-    // Convert all labels to be only strings, which the server requires
-    feedSource.labels = stringifyLabels(feedSource.labels)
-    properties.labels = stringifyLabels(properties.labels)
 
     return dispatch(secureFetch(`${FS_URL}/${feedSource.id}`, 'put', {...feedSource, ...properties}))
       // Re-fetch feed source with versions and snapshots.
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 1550fd32b..07cdee466 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -10,6 +10,7 @@ import { browserHistory, Link } from 'react-router'
 import * as deploymentActions from '../actions/deployments'
 import * as feedsActions from '../actions/feeds'
 import * as versionsActions from '../actions/versions'
+import { deStringifyLabels } from '../util'
 import {
   getComponentMessages,
   isModuleEnabled,
@@ -313,7 +314,7 @@ class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user:
                   Edit
                 </button>)}
               <div className='feedLabelContainer'>
-                {feedSource.labels.map((label) => (
+                {deStringifyLabels(feedSource.labels, project).map((label) => (
                   <FeedLabel small key={label.id} label={label} />
                 ))}
               </div>
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
index 291c245ff..a2742aa42 100644
--- a/lib/manager/components/LabelAssigner.js
+++ b/lib/manager/components/LabelAssigner.js
@@ -5,7 +5,6 @@ import { connect } from 'react-redux'
 
 import { updateFeedSource } from '../actions/feeds'
 import FeedLabel from '../../common/components/FeedLabel'
-import { stringifyLabels } from '../util'
 import type { Feed, Project } from '../../types'
 
 type Props = {
@@ -14,7 +13,7 @@ type Props = {
  updateFeedSource: Function
 }
 type State = {
-  updatedLabelIds: Array<String>
+  updatedLabelIds: Array<string>
 }
 
 /**
@@ -30,11 +29,11 @@ class LabelAssigner extends React.Component<Props, State> {
   componentDidMount = () => {
     const { feedSource } = this.props
     this.setState({
-      updatedLabelIds: stringifyLabels(feedSource.labels)
+      updatedLabelIds: feedSource.labels
     })
   }
 
-  onLabelClick = (labelId: String) => {
+  onLabelClick = (labelId: string) => {
     const { updatedLabelIds } = this.state
 
     const labelIndex = updatedLabelIds.indexOf(labelId)
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index 6f7bd3684..87fe39256 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -205,10 +205,7 @@ export function getFilteredFeeds (
       if (!labels || labels.length === 0) return feedSource
 
       function labelVerify (labelToCheck) {
-        return feedSource.labels
-        // first map to strings
-          .map(label => label.id)
-          .includes(labelToCheck)
+        return feedSource.labels.includes(labelToCheck)
       }
 
       if (filter.labelsFilterMode === 'any') {
@@ -423,12 +420,16 @@ export function validationState (val: ?boolean): ?string {
 }
 
 /**
- * Converts an array of Label objects and string IDs into array of strings, the IDs of
- * those labels
- * @param {Array<Label | string>} labels An array of strings and Label objects
- * @returns                              An array of label IDs
+ * Takes a list of label IDs and returns corresponding label objects from
+ * a project, should that label exist in the project
+ * @param {*} labelIds  An array of strings representing label IDs
+ * @param {*} project   A project containing Label objects
+ * @returns
  */
-export function stringifyLabels (labels: Array<any>): Array<any> {
-  if (!labels) return []
-  return labels.map(label => label.id ? label.id : label)
+export function deStringifyLabels (labelIds: Array<string>, project: Project) {
+  const labels = project.labels.filter(label => labelIds.includes(label.id))
+  if (labels.length !== labelIds.length) {
+    console.warn('Encountered label IDs that could not be found in project!')
+  }
+  return labels
 }
diff --git a/lib/types/index.js b/lib/types/index.js
index 08359a0ee..d08fb5797 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -384,7 +384,7 @@ export type Feed = {
   id: string,
   isCreating?: boolean,
   isPublic: boolean,
-  labels: Array<Label>,
+  labels: Array<string>,
   lastFetched?: ?number,
   lastUpdated?: number,
   latestValidation?: ValidationSummary,

From 312f9a2a3be80e64b83a9aa510c1005f3b615a56 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 29 Jul 2021 09:34:30 -0400
Subject: [PATCH 316/553] refactor: move error handling into new methods

---
 lib/common/actions/index.js | 107 ++++++++++++++++++++----------------
 1 file changed, 61 insertions(+), 46 deletions(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index c3f5b6218..41f62fddf 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -7,16 +7,24 @@ import { setErrorMessage } from '../../manager/actions/status'
 
 import type {dispatchFn, getStateFn} from '../../types/reducers'
 
+type ErrorResponse = {
+  detail: string,
+  message?: string
+}
+
 export function createVoidPayloadAction (type: string) {
   return () => ({ type })
 }
 
-export function secureFetch (url: string, method: string = 'get', payload?: any, raw: boolean = false, isJSON: boolean = true, actionOnFail?: string): any {
+export function secureFetch (
+  url: string,
+  method: string = 'get',
+  payload?: any,
+  raw: boolean = false,
+  isJSON: boolean = true,
+  actionOnFail?: string
+): any {
   return function (dispatch: dispatchFn, getState: getStateFn) {
-    function consoleError (message) {
-      console.error(`Error making ${method} request to ${url}: `, message)
-    }
-
     // if running in a test environment, fetch will complain when using relative
     // urls, so prefix all urls with http://localhost:4000.
     if (process.env.NODE_ENV === 'test') {
@@ -42,50 +50,57 @@ export function secureFetch (url: string, method: string = 'get', payload?: any,
     return fetch(url, {method, headers, body})
       // Catch basic error during fetch
       .catch(err => {
-        const message = `Error making request: (${err})`
-        consoleError(message)
+        const message = `Error making ${method} request to ${url}`
+        console.error(message, err)
         return dispatch(setErrorMessage({message}))
       })
-      .then(res => {
-        // if raw response is requested
-        if (raw) return res
-        let action
-        // check for errors
-        const {status} = res
-        if (status >= 500) {
-          action = 'RELOAD'
-          res.json().then(json => {
-            const {detail, message} = json
-            const unknown = `Network error!\n\n(${method} request on ${url})`
-            consoleError(message || JSON.stringify(json) || unknown)
-            dispatch(setErrorMessage({
-              message: message || JSON.stringify(json) || unknown,
-              action,
-              detail
-            }))
-          })
-          return null
-        } else if (status >= 400) {
-          action = status === 401
-            ? 'LOG_IN'
-            : actionOnFail
-          res.json()
-            .then(json => {
-              const {detail, message} = json
-              const unknown = `Unknown (${status}) error occurred while making request`
-              consoleError(message || JSON.stringify(json) || unknown)
-              dispatch(setErrorMessage({
-                message: message || JSON.stringify(json) || unknown,
-                action,
-                detail
-              }))
-            })
-          return null
-        } else {
-          return res
-        }
-      })
+      .then(res => dispatch(handleResponse(method, url, res, raw)))
+  }
+}
+
+function handleResponse (method, url, res, raw, actionOnFail) {
+  return async function (dispatch: dispatchFn, getState: getStateFn) {
+    // if raw response is requested
+    if (raw) return res
+    const {status} = res
+    // Return response with no further action if there are no errors.
+    if (status < 400) return res
+    // check for errors
+    let json
+    try {
+      json = await res.json()
+    } catch (e) {
+      console.warn('Could not parse JSON from error response')
+    }
+    const errorMessage = getErrorMessageFromJson(json, status, method, url, actionOnFail)
+    dispatch(setErrorMessage(errorMessage))
+    return null
+  }
+}
+
+function getErrorMessageFromJson (
+  json: ?ErrorResponse,
+  status,
+  method,
+  url,
+  actionOnFail
+) {
+  let action = 'RELOAD'
+  let detail
+  // let detail, message
+  let errorMessage = `Network error!\n\n(${method} request on ${url})`
+  if (status < 500) {
+    action = status === 401
+      ? 'LOG_IN'
+      : actionOnFail
+    errorMessage = `Unknown (${status}) error occurred while making request`
+  }
+  if (json) {
+    detail = json.detail
+    errorMessage = json.message || JSON.stringify(json)
   }
+  console.error(`Error making ${method} request to ${url}: `, errorMessage)
+  return { action, detail, message: errorMessage }
 }
 
 function graphQLErrorsToString (errors: Array<{locations: any, message: string}>): Array<string> {

From b2a50976ef5e2ebd51638fb6ecb59b3c03d96f6e Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 29 Jul 2021 11:33:30 -0400
Subject: [PATCH 317/553] refactor(LabelEditor): cleaner validation for
 checkbox

---
 lib/manager/components/LabelEditor.js | 28 ++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index 1ef81598c..d766c9376 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -70,19 +70,25 @@ class LabelEditor extends React.Component<Props, State> {
       else return permissions.isApplicationAdmin() || permissions.canAdministerAnOrganization()
     }
 
-  _onFormChange = ({target}: {target: HTMLInputElement}, alwaysValid: boolean) => {
-    const {name, value, type, checked} = target
+  _onFormChange = ({target}: {target: HTMLInputElement}) => {
+    const {name, value} = target
 
-    const universalValue: string | boolean = type === 'checkbox' ? checked : value
-    // extra check for flow
-    const valid =
-      alwaysValid ||
-      (typeof universalValue === 'string' && universalValue.length > 0)
+    this.setState(
+      update(this.state, {
+        newLabel: { $merge: {[name]: value} },
+        validation: { [name]: { $set: value && value.length > 0 } }
+      })
+    )
+  }
+
+  _onCheckboxChange = ({target}: {target: HTMLInputElement}) => {
+    const {name, checked} = target
 
     this.setState(
       update(this.state, {
-        newLabel: { $merge: {[name]: universalValue} },
-        validation: { [name]: { $set: universalValue && valid } }
+        newLabel: { $merge: {[name]: checked} },
+        // Checkboxes are valid in any state
+        validation: { [name]: { $set: true } }
       })
     )
   }
@@ -173,9 +179,9 @@ class LabelEditor extends React.Component<Props, State> {
                   <Col xs={9}>
                     <Checkbox
                       checked={newLabel.adminOnly}
-                      name={'adminOnly'}
+                      name='adminOnly'
                       type='checkbox'
-                      onChange={(e) => this._onFormChange(e, true)}
+                      onChange={(e) => this._onCheckboxChange(e)}
                       style={{margin: 0}}
                     >
                       <strong>Visible to admins only?</strong>

From 09a58b7b33b077bb5373f7152719c076fe250eb3 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 29 Jul 2021 11:51:55 -0400
Subject: [PATCH 318/553] refactor: address pr feedback

---
 lib/manager/actions/labels.js                |  3 +-
 lib/manager/components/FeedSourceTableRow.js |  5 +--
 lib/manager/components/LabelAssigner.js      |  2 +-
 lib/manager/components/LabelEditor.js        | 41 +++++++++-----------
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/lib/manager/actions/labels.js b/lib/manager/actions/labels.js
index b80601f0d..69194b346 100644
--- a/lib/manager/actions/labels.js
+++ b/lib/manager/actions/labels.js
@@ -46,7 +46,8 @@ export function updateLabel (dirtyLabel: Label, properties: {[string]: any}) {
 }
 
 /**
- * Permanently delete single label */
+ * Permanently delete single label
+ */
 export function deleteLabel (label: Label) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'delete'))
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 07cdee466..56f997522 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -120,10 +120,9 @@ function relativeDuration (time: any) {
   )
 }
 
-//
 /**
- * This method is extracted variable generation which had to be split out
- * of the render function to appease the eslint complexity rule
+ * This method is variable generation which used to live in the render method,
+ * but was extracted to appease the eslint complexity rule
  */
 function generateFeedSourceLabelRenderVars (feedSource: Feed, comparisonValidationSummary: ?ValidationSummary) {
   // data for feed source info column
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
index a2742aa42..69215161d 100644
--- a/lib/manager/components/LabelAssigner.js
+++ b/lib/manager/components/LabelAssigner.js
@@ -64,7 +64,7 @@ class LabelAssigner extends React.Component<Props, State> {
       <div className='feedLabelContainer large'>
         {projectLabels.length === 0 && (
           <div className='noLabelsMessage'>
-        There are no labels in this project.
+            There are no labels in this project.
           </div>
         )}
         {projectLabels.map((label) => (
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index d766c9376..c1204e3bb 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -12,6 +12,7 @@ import {
   HelpBlock,
   ListGroup,
   ListGroupItem,
+  Modal,
   Panel,
   Row
 } from 'react-bootstrap'
@@ -93,9 +94,10 @@ class LabelEditor extends React.Component<Props, State> {
     )
   }
 
-  /* Compares the dirty label from the old one to determine
-  which keys changed
-  */
+  /**
+   * Compares the dirty label from the old one to determine which keys changed
+   * @returns Object with all changes
+   */
   _getChanges = () => {
     const newLabel = this.state.newLabel
     const oldLabel = this.props.label
@@ -187,10 +189,7 @@ class LabelEditor extends React.Component<Props, State> {
                       <strong>Visible to admins only?</strong>
                     </Checkbox>
                     <div style={{marginTop: 5}}>
-                                          If checked, this label will only be visible to
-                                          project and application admins. Users with
-                                          feed-specific priveleges will not see this label
-                                          applied to any feed sources.
+                      If checked, this label will only be visible to project and application admins. Users with feed-specific priveleges will not see this label applied to any feed sources.
                     </div>
                   </Col>
                 )}
@@ -198,23 +197,21 @@ class LabelEditor extends React.Component<Props, State> {
             </ListGroupItem>
           </ListGroup>
         </Panel>
-        <Row>
-          <Col xs={12}>
-            {/* Cancel button */}
-            <Button onClick={this.props.onDone} style={{ marginRight: 10 }}>
+        <Modal.Footer>
+          {/* Cancel button */}
+          <Button onClick={this.props.onDone} style={{ marginRight: 10 }}>
               Cancel
-            </Button>
-            {/* Save button */}
-            <Button
-              bsStyle='primary'
-              disabled={this._settingsAreUnedited() || !this._formIsValid()}
-              type='submit'
-              onClick={this._onSaveSettings}
-            >
+          </Button>
+          {/* Save button */}
+          <Button
+            bsStyle='primary'
+            disabled={this._settingsAreUnedited() || !this._formIsValid()}
+            type='submit'
+            onClick={this._onSaveSettings}
+          >
               Save
-            </Button>
-          </Col>
-        </Row>
+          </Button>
+        </Modal.Footer>
       </Form>
     )
   }

From 348cbac75dd74dbd18bead4b83296442bcba2208 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 29 Jul 2021 13:08:34 -0400
Subject: [PATCH 319/553] refactor(LabelEditor): resolve type issues

---
 lib/manager/components/LabelEditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index c1204e3bb..b30d02785 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -158,7 +158,7 @@ class LabelEditor extends React.Component<Props, State> {
                 <FormControl
                   value={newLabel.description}
                   name={'description'}
-                  onChange={(e) => this._onFormChange(e, true)}
+                  onChange={(e) => this._onFormChange(e)}
                 />
                 <FormControl.Feedback />
               </FormGroup>

From 104c77a786299cb76c8b8d5004aab12ca2b154b8 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 29 Jul 2021 17:19:13 -0400
Subject: [PATCH 320/553] refactor(labels): tweak styling

---
 lib/common/components/FeedLabel.js            | 51 +++++++++++++------
 lib/manager/components/LabelAssigner.js       |  1 -
 lib/manager/components/LabelPanel.js          | 10 ++--
 .../components/ProjectFeedListToolbar.js      | 50 +++++++++---------
 lib/style.css                                 | 13 ++---
 5 files changed, 71 insertions(+), 54 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 91a2ab322..80493fc44 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -15,7 +15,7 @@ export type Props = {
   deleteLabel: Function,
   label: Label,
   onClick?: Function,
-  small: boolean,
+  small?: boolean,
   user?: ManagerUserState
 }
 export type State = {}
@@ -48,43 +48,64 @@ class FeedLabel extends React.Component<Props, State> {
     this.refs.deleteModal.open()
   }
 
+  _getWrapperClasses = () => {
+    const classes = ['feedLabelWrapper']
+    if (this._isEditable()) classes.push('withButtons')
+    return classes.join(' ')
+  }
+
+  _getLabelClasses = () => {
+    const classes = ['feedLabel']
+    classes.push('smaller')
+    if (this._isCheckable()) classes.push('clickable')
+    return classes.join(' ')
+  }
+
+  _isCheckable = () => this.props.checked !== undefined
+
   _onClickEdit = () => {
     this.refs.editModal.open()
   }
 
-  render () {
-    const {small, label, checked, onClick: labelOnClick, user} = this.props
+  _onClick = () => {
+    const {label, onClick} = this.props
+    onClick && onClick(label.id)
+  }
+
+  _isEditable = () => {
+    const {editable, label, user} = this.props
+    if (!editable) return false
     const projectAdmin =
       user &&
       user.permissions &&
       user.permissions.isProjectAdmin(label.projectId)
+    return projectAdmin
+    // justify-content: flex-start;
+  }
 
+  render () {
+    const {label, checked = false} = this.props
     return (
-      <div className='feedLabelWrapper'
-        onClick={!labelOnClick ? null : () => labelOnClick(label.id)}
-        onKeyPress={!labelOnClick ? null : () => labelOnClick(label.id)}
+      <div className={this._getWrapperClasses()}
+        onClick={this._onClick}
+        onKeyPress={this._onClick}
         role='checkbox'
         aria-checked={checked}
         tabIndex={0}
       >
-        {checked !== undefined && (
+        {this._isCheckable() && (
           <div className='actionButtons'>
             <input type='checkbox' checked={checked} />
           </div>
         )}
         <div
-          className={`feedLabel ${small ? 'smaller' : ''} 
-        ${
-  // Need an explicit check for undefined, since it is expected
-  // to be true/false
-      checked !== undefined ? 'clickable' : ''
-      }`}
+          className={this._getLabelClasses()}
           style={{
             backgroundColor: label.color,
             color: getComplementaryColor(label.color, 55),
             borderColor: getComplementaryColor(label.color, 10)
           }}
-          title={label.description}
+          title={label.description || label.name}
         >
           <div className='labelName'>
             {label.adminOnly && <Icon type='lock' />}
@@ -93,7 +114,7 @@ class FeedLabel extends React.Component<Props, State> {
           {/* Only project admins can see controls that only appear
         on large labels */}
         </div>
-        {!small && projectAdmin && (
+        {this._isEditable() && (
           <div className='actionButtons'>
             <ConfirmModal
               ref='deleteModal'
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
index 69215161d..cbb3c8199 100644
--- a/lib/manager/components/LabelAssigner.js
+++ b/lib/manager/components/LabelAssigner.js
@@ -72,7 +72,6 @@ class LabelAssigner extends React.Component<Props, State> {
             key={label.id}
             label={label}
             checked={labelIds.find((id) => id === label.id) !== undefined}
-            small
             onClick={this.onLabelClick}
           />
         ))}
diff --git a/lib/manager/components/LabelPanel.js b/lib/manager/components/LabelPanel.js
index 5a475cceb..93c758032 100644
--- a/lib/manager/components/LabelPanel.js
+++ b/lib/manager/components/LabelPanel.js
@@ -1,4 +1,5 @@
 // @flow
+import Icon from '@conveyal/woonerf/components/icon'
 import React, { Component } from 'react'
 import { Panel } from 'react-bootstrap'
 
@@ -36,15 +37,12 @@ export default class LabelPanel extends Component<Props> {
       </div>
     )
     if (labels.length > 0) {
-      labelBody = labels.map((label) => (
-        // Flow doesn't like things being created within a map
-        // $FlowFixMe
-        <FeedLabel key={label.id} label={label} />
-      ))
+      labelBody = labels.map((label) =>
+        <FeedLabel editable key={label.id} label={label} />)
     }
 
     return (
-      <Panel header={<h3>Labels</h3>}>
+      <Panel header={<h3><Icon type={'tag'} />{' '}Labels</h3>}>
         <div className={`feedLabelContainer ${large ? 'large' : ''} grid`}>
           <LabelEditorModal ref='newLabelModal' projectId={projectId} />
           {projectAdmin && (
diff --git a/lib/manager/components/ProjectFeedListToolbar.js b/lib/manager/components/ProjectFeedListToolbar.js
index 607b71ad2..632eab4f7 100644
--- a/lib/manager/components/ProjectFeedListToolbar.js
+++ b/lib/manager/components/ProjectFeedListToolbar.js
@@ -319,17 +319,18 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
     return (
       <MenuItem header style={{ width: 275 }}>
         <h5>
-          Show{' '}
+          Show feeds with
           <select
             name='anyall'
             id='anyall'
             value={labelsFilterMode}
             onChange={this._onLabelModeSelectorClick}
+            style={{margin: '0 3px'}}
           >
             <option value='any'>any</option>
             <option value='all'>all</option>
-          </select>{' '}
-          feeds with the labels
+          </select>
+          of the labels:
         </h5>
         <div className='feedLabelContainer grid'>
           {project.labels.map((label) => (
@@ -337,7 +338,6 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
               key={label.id}
               label={label}
               checked={labels.includes(label.id)}
-              small
               onClick={() => this._onLabelClick(label.id)}
             />
           ))}
@@ -384,14 +384,13 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
       filterCounts,
       onNewFeedSourceClick,
       projectEditDisabled,
-      project,
       setVisibilityFilter
     } = this.props
 
     const activeFilter = filter.filter || 'all'
     const nonFilterColumnOffset = 25
     const activeFilterLabelCount = (filter.labels && filter.labels.length) || 0
-
+    const badgeStyle = { backgroundColor: '#babec0' }
     return (
       <Row>
         <Col xs={4} style={{ marginTop: nonFilterColumnOffset }}>
@@ -408,6 +407,7 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
             </FormGroup>
           </Form>
           <DropdownButton
+            bsSize='small'
             id='project-feedsource-table-sort-button'
             style={{ marginLeft: 20 }}
             title='Sort By'
@@ -418,44 +418,42 @@ export default class ProjectFeedListToolbar extends PureComponent<Props> {
         <Col xs={6}>
           <FormGroup id='feedFilterToolbarControl'>
             {this._renderFilterToolbarLabel()}
-            <ButtonGroup>
+            <ButtonGroup style={{ marginRight: 10 }}>
               {Object.keys(versionStatusFilters).map((filterOption) => (
                 <OptionButton
                   active={activeFilter === filterOption}
+                  bsSize='small'
                   className={activeFilter === filterOption ? 'active' : ''}
                   key={filterOption}
                   onClick={setVisibilityFilter}
                   value={filterOption}
                 >
                   {this.messages(`filter.${filterOption}`)}{' '}
-                  <Badge style={{ backgroundColor: '#babec0' }}>
+                  <Badge style={badgeStyle}>
                     {filterCounts[filterOption]}
                   </Badge>
                 </OptionButton>
               ))}
-              {project.labels.length > 0 && (
-                <DropdownButton
-                  id='project-feedsource-label-filter-button'
-                  // to match the buttons with badges
-                  style={{ paddingBottom: '5.5pt' }}
-                  title={
-                    <span
-                      style={{
-                        fontWeight: activeFilterLabelCount > 0 ? '900' : ''
-                      }}
-                    >
-                    Labels
-                    </span>
-                  }
-                >
-                  {this._renderLabelFilter()}
-                </DropdownButton>
-              )}
             </ButtonGroup>
+            <DropdownButton
+              bsSize='small'
+              id='project-feedsource-label-filter-button'
+              title={
+                <span title='Filter feeds by labels'>
+                  <Icon type={'tag'} />{' '}
+                  <Badge style={badgeStyle}>
+                    {activeFilterLabelCount}
+                  </Badge>
+                </span>
+              }
+            >
+              {this._renderLabelFilter()}
+            </DropdownButton>
           </FormGroup>
         </Col>
         <Col xs={2} style={{ marginTop: nonFilterColumnOffset }}>
           <DropdownButton
+            bsSize='small'
             bsStyle='primary'
             data-test-id='project-header-action-dropdown-button'
             id='project-header-actions'
diff --git a/lib/style.css b/lib/style.css
index 454fe6d50..2c047b06d 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -164,10 +164,8 @@ td.feed-source-info {
   align-items: center;
   border-radius: 5px;
   border: 1px solid;
-  height: 100%;
   max-width: 100%;
   min-width: 60px;
-  padding: 5px 0 8px 0;
   word-break: break-word;
 }
 .feedLabel.clickable {
@@ -214,20 +212,23 @@ td.feed-source-info {
   align-items: center;
   display: inline-flex;
   height: 100%;
-  justify-content: flex-start; /* No option looks particularly good... */
+  justify-content: flex-start
   padding: 0 5px 2px 0;
 }
+.feedLabelWrapper.withButtons {
+  justify-content: space-between;
+}
 
 /* Label Buttons */
 .feedLabelWrapper .actionButtons {
-  align-items: flex-end;
-  display: flex;
-  flex-direction: column;
+  min-width: 43px;
 }
 .feedLabelWrapper .actionButtons button {
   background: none;
   border: none;
+  font-size: 12px;
   opacity: 0.7;
+  padding: 0px;
   text-decoration: underline;
 }
 .feedLabelWrapper .actionButtons button:hover {

From d10ff1afb4d66dad8a69a8e80a7cd5b75248783c Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 29 Jul 2021 17:22:57 -0400
Subject: [PATCH 321/553] refactor: fix flow

---
 lib/common/components/FeedLabel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 80493fc44..00b9ffde2 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -13,9 +13,9 @@ import LabelEditorModal from '../../manager/components/LabelEditorModal'
 export type Props = {
   checked?: boolean,
   deleteLabel: Function,
+  editable?: boolean,
   label: Label,
   onClick?: Function,
-  small?: boolean,
   user?: ManagerUserState
 }
 export type State = {}

From f697c19b7d56a5690de14c609c6b8d0f2ec24303 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Thu, 29 Jul 2021 17:50:49 -0400
Subject: [PATCH 322/553] feat(DeploymentViewer): add custom geocoder settings
 panel

---
 __tests__/test-utils/mock-data/manager.js     |  4 +-
 .../__tests__/__snapshots__/projects.js.snap  |  3 +
 .../components/deployment/DeploymentViewer.js | 16 ++--
 .../components/deployment/PeliasPanel.js      | 90 +++++++++++++++++++
 .../__snapshots__/ActiveProjectViewer.js.snap |  7 ++
 .../__snapshots__/DeploymentsPanel.js.snap    | 33 +++++++
 .../__snapshots__/FeedSourceTable.js.snap     | 24 +++++
 lib/types/index.js                            |  4 +-
 8 files changed, 174 insertions(+), 7 deletions(-)
 create mode 100644 lib/manager/components/deployment/PeliasPanel.js

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 2faf1d3c0..4c8773451 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -4,7 +4,6 @@ import clone from 'lodash/cloneDeep'
 
 import UserPermissions from '../../../lib/common/user/UserPermissions'
 import UserSubscriptions from '../../../lib/common/user/UserSubscriptions'
-
 import type {
   Deployment,
   FeedVersion,
@@ -61,6 +60,8 @@ export function makeMockDeployment (
     routerId: null,
     skipOsmExtract: false,
     tripPlannerVersion: 'OTP_1',
+    peliasUpdate: null,
+    peliasWebhookUrl: null,
     user: null
   }
 }
@@ -86,6 +87,7 @@ export const mockProject = {
   feedSources: [],
   id: 'mock-project-id',
   lastUpdated: 1553236399556,
+  lastUsedPeliasWebhookUrl: null,
   name: 'mock-project',
   organizationId: null,
   otpServers: [],
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index bce7b3e32..f96f36dee 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -113,6 +113,8 @@ Object {
           "osmExtractUrl": null,
           "otpCommit": null,
           "otpVersion": null,
+          "peliasUpdate": null,
+          "peliasWebhookUrl": null,
           "pinnedfeedVersionIds": Array [],
           "projectBounds": Object {
             "east": 0,
@@ -175,6 +177,7 @@ Object {
       ],
       "id": "mock-project-with-deployments-id",
       "lastUpdated": 1553236399556,
+      "lastUsedPeliasWebhookUrl": null,
       "name": "mock-project-with-deployments",
       "organizationId": null,
       "otpServers": Array [],
diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index 8a54bdbb5..4bd3971d0 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -31,11 +31,6 @@ import {formatTimestamp, fromNow} from '../../../common/util/date-time'
 import {defaultTileLayerProps} from '../../../common/util/maps'
 import { versionsSorter } from '../../../common/util/util'
 import {getServerDeployedTo} from '../../util/deployment'
-import CurrentDeploymentPanel from './CurrentDeploymentPanel'
-import DeploymentConfigurationsPanel from './DeploymentConfigurationsPanel'
-import DeploymentConfirmModal from './DeploymentConfirmModal'
-import DeploymentVersionsTable from './DeploymentVersionsTable'
-
 import type {Props as ContainerProps} from '../../containers/ActiveDeploymentViewer'
 import type {
   ServerJob,
@@ -43,6 +38,12 @@ import type {
 } from '../../../types'
 import type {ManagerUserState} from '../../../types/reducers'
 
+import CurrentDeploymentPanel from './CurrentDeploymentPanel'
+import DeploymentConfigurationsPanel from './DeploymentConfigurationsPanel'
+import DeploymentConfirmModal from './DeploymentConfirmModal'
+import DeploymentVersionsTable from './DeploymentVersionsTable'
+import PeliasPanel from './PeliasPanel'
+
 type Props = ContainerProps & {
   addFeedVersion: typeof deploymentActions.addFeedVersion,
   deployJobs: Array<ServerJob>,
@@ -413,6 +414,11 @@ export default class DeploymentViewer extends Component<Props, State> {
               deployment={deployment}
               updateDeployment={updateDeployment}
             />
+            {/* Pelias panel */}
+            <PeliasPanel
+              deployment={deployment}
+              updateDeployment={updateDeployment}
+            />
           </Col>
         </Row>
       </div>
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
new file mode 100644
index 000000000..875175645
--- /dev/null
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -0,0 +1,90 @@
+// @flow
+
+import Icon from '@conveyal/woonerf/components/icon'
+import React, { Component } from 'react'
+import { Checkbox, FormControl, ListGroup, ListGroupItem, Panel } from 'react-bootstrap'
+
+import * as deploymentActions from '../../actions/deployments'
+import type {
+  Deployment
+} from '../../../types'
+
+type Props = {
+  deployment: Deployment,
+  updateDeployment: typeof deploymentActions.updateDeployment,
+}
+
+type State = {
+  webhookUrl: string
+}
+
+export default class PeliasPanel extends Component<Props, State> {
+  state = { webhookUrl: '' };
+
+  componentDidMount = () => {
+    const { deployment } = this.props
+    this.setState({ webhookUrl: (deployment.peliasWebhookUrl || '') })
+  };
+
+  _onChangeUpdatePelias = () =>
+    this._updateDeployment({
+      peliasUpdate: !this.props.deployment.peliasUpdate
+    });
+
+  _onBlurWebhookUrl = (event: SyntheticInputEvent<HTMLInputElement>) => {
+    const { target } = event
+    const { value } = target
+    this._updateDeployment({ peliasWebhookUrl: value })
+  };
+  _onChangeWebhookUrl = (event: SyntheticInputEvent<HTMLInputElement>) => {
+    const { target } = event
+    const { value } = target
+    this.setState({ webhookUrl: value })
+  };
+
+  _updateDeployment = (props: { [string]: any }) => {
+    const { deployment, updateDeployment } = this.props
+    updateDeployment(deployment, props)
+  };
+
+  render () {
+    const { deployment } = this.props
+    const { webhookUrl } = this.state
+
+    return (
+      <Panel
+        header={
+          <h3>
+            <Icon type='map-marker' /> Custom Geocoder Settings
+          </h3>
+        }
+      >
+        <ListGroup fill>
+          <ListGroupItem>
+            <h5>Custom Geocoder Webhook URL</h5>
+            <FormControl
+              type='url'
+              placeholder='Update webhook URL'
+              value={webhookUrl}
+              onChange={this._onChangeWebhookUrl}
+              onBlur={this._onBlurWebhookUrl}
+            />
+          </ListGroupItem>
+          <ListGroupItem>
+            <h5>Send GTFS feeds to custom geocoder</h5>
+            <Checkbox
+              checked={deployment.peliasUpdate}
+              onChange={this._onChangeUpdatePelias}
+            >
+              Update Custom Geocoder
+            </Checkbox>
+          </ListGroupItem>
+          <ListGroupItem>
+            <h5>Custom POI CSV Upload</h5>
+            TODO
+          </ListGroupItem>
+        </ListGroup>
+      </Panel>
+    )
+  }
+}
diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 5670f513b..9709aa744 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -68,6 +68,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
           "feedSources": Array [],
           "id": "mock-project-id",
           "lastUpdated": 1553236399556,
+          "lastUsedPeliasWebhookUrl": null,
           "name": "mock-project",
           "organizationId": null,
           "otpServers": Array [],
@@ -1933,6 +1934,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "feedSources": Array [],
                                                           "id": "mock-project-id",
                                                           "lastUpdated": 1553236399556,
+                                                          "lastUsedPeliasWebhookUrl": null,
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
@@ -1978,6 +1980,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                             "feedSources": Array [],
                                                             "id": "mock-project-id",
                                                             "lastUpdated": 1553236399556,
+                                                            "lastUsedPeliasWebhookUrl": null,
                                                             "name": "mock-project",
                                                             "organizationId": null,
                                                             "otpServers": Array [],
@@ -2096,6 +2099,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                   "feedSources": Array [],
                                                                   "id": "mock-project-id",
                                                                   "lastUpdated": 1553236399556,
+                                                                  "lastUsedPeliasWebhookUrl": null,
                                                                   "name": "mock-project",
                                                                   "organizationId": null,
                                                                   "otpServers": Array [],
@@ -2145,6 +2149,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                     "feedSources": Array [],
                                                                     "id": "mock-project-id",
                                                                     "lastUpdated": 1553236399556,
+                                                                    "lastUsedPeliasWebhookUrl": null,
                                                                     "name": "mock-project",
                                                                     "organizationId": null,
                                                                     "otpServers": Array [],
@@ -2211,6 +2216,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                       "feedSources": Array [],
                                                                       "id": "mock-project-id",
                                                                       "lastUpdated": 1553236399556,
+                                                                      "lastUsedPeliasWebhookUrl": null,
                                                                       "name": "mock-project",
                                                                       "organizationId": null,
                                                                       "otpServers": Array [],
@@ -3891,6 +3897,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "feedSources": Array [],
                                                           "id": "mock-project-id",
                                                           "lastUpdated": 1553236399556,
+                                                          "lastUsedPeliasWebhookUrl": null,
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index cde1a7a3a..9010d623c 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -126,6 +126,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "peliasUpdate": null,
+            "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
               "east": 0,
@@ -158,6 +160,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "peliasUpdate": null,
+            "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
               "east": 0,
@@ -220,6 +224,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
         ],
         "id": "mock-project-with-deployments-id",
         "lastUpdated": 1553236399556,
+        "lastUsedPeliasWebhookUrl": null,
         "name": "mock-project-with-deployments",
         "organizationId": null,
         "otpServers": Array [],
@@ -352,6 +357,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "peliasUpdate": null,
+              "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
                 "east": 0,
@@ -384,6 +391,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "peliasUpdate": null,
+              "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
                 "east": 0,
@@ -446,6 +455,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
           ],
           "id": "mock-project-with-deployments-id",
           "lastUpdated": 1553236399556,
+          "lastUsedPeliasWebhookUrl": null,
           "name": "mock-project-with-deployments",
           "organizationId": null,
           "otpServers": Array [],
@@ -630,6 +640,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "peliasUpdate": null,
+                      "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
                         "east": 0,
@@ -662,6 +674,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "peliasUpdate": null,
+                      "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
                         "east": 0,
@@ -787,6 +801,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "peliasUpdate": null,
+                        "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
                           "east": 0,
@@ -819,6 +835,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "peliasUpdate": null,
+                        "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
                           "east": 0,
@@ -881,6 +899,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     ],
                     "id": "mock-project-with-deployments-id",
                     "lastUpdated": 1553236399556,
+                    "lastUsedPeliasWebhookUrl": null,
                     "name": "mock-project-with-deployments",
                     "organizationId": null,
                     "otpServers": Array [],
@@ -1155,6 +1174,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "osmExtractUrl": null,
                                 "otpCommit": null,
                                 "otpVersion": null,
+                                "peliasUpdate": null,
+                                "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
                                   "east": 0,
@@ -1280,6 +1301,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasUpdate": null,
+                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -1312,6 +1335,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasUpdate": null,
+                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -1374,6 +1399,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 ],
                                 "id": "mock-project-with-deployments-id",
                                 "lastUpdated": 1553236399556,
+                                "lastUsedPeliasWebhookUrl": null,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
@@ -1554,6 +1580,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "osmExtractUrl": null,
                                 "otpCommit": null,
                                 "otpVersion": null,
+                                "peliasUpdate": null,
+                                "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
                                   "east": 0,
@@ -1679,6 +1707,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasUpdate": null,
+                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -1711,6 +1741,8 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasUpdate": null,
+                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -1773,6 +1805,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 ],
                                 "id": "mock-project-with-deployments-id",
                                 "lastUpdated": 1553236399556,
+                                "lastUsedPeliasWebhookUrl": null,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 4d9414282..e0a818e6c 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -125,6 +125,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "peliasUpdate": null,
+            "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
               "east": 0,
@@ -187,6 +189,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
         ],
         "id": "mock-project-with-deployments-id",
         "lastUpdated": 1553236399556,
+        "lastUsedPeliasWebhookUrl": null,
         "name": "mock-project-with-deployments",
         "organizationId": null,
         "otpServers": Array [],
@@ -415,6 +418,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "peliasUpdate": null,
+              "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
                 "east": 0,
@@ -477,6 +482,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
           ],
           "id": "mock-project-with-deployments-id",
           "lastUpdated": 1553236399556,
+          "lastUsedPeliasWebhookUrl": null,
           "name": "mock-project-with-deployments",
           "organizationId": null,
           "otpServers": Array [],
@@ -684,6 +690,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "osmExtractUrl": null,
                     "otpCommit": null,
                     "otpVersion": null,
+                    "peliasUpdate": null,
+                    "peliasWebhookUrl": null,
                     "pinnedfeedVersionIds": Array [],
                     "projectBounds": Object {
                       "east": 0,
@@ -746,6 +754,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                 ],
                 "id": "mock-project-with-deployments-id",
                 "lastUpdated": 1553236399556,
+                "lastUsedPeliasWebhookUrl": null,
                 "name": "mock-project-with-deployments",
                 "organizationId": null,
                 "otpServers": Array [],
@@ -884,6 +893,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "peliasUpdate": null,
+                      "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
                         "east": 0,
@@ -946,6 +957,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   ],
                   "id": "mock-project-with-deployments-id",
                   "lastUpdated": 1553236399556,
+                  "lastUsedPeliasWebhookUrl": null,
                   "name": "mock-project-with-deployments",
                   "organizationId": null,
                   "otpServers": Array [],
@@ -1102,6 +1114,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "peliasUpdate": null,
+                        "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
                           "east": 0,
@@ -1164,6 +1178,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     ],
                     "id": "mock-project-with-deployments-id",
                     "lastUpdated": 1553236399556,
+                    "lastUsedPeliasWebhookUrl": null,
                     "name": "mock-project-with-deployments",
                     "organizationId": null,
                     "otpServers": Array [],
@@ -2974,6 +2989,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "osmExtractUrl": null,
                             "otpCommit": null,
                             "otpVersion": null,
+                            "peliasUpdate": null,
+                            "peliasWebhookUrl": null,
                             "pinnedfeedVersionIds": Array [],
                             "projectBounds": Object {
                               "east": 0,
@@ -3036,6 +3053,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         ],
                         "id": "mock-project-with-deployments-id",
                         "lastUpdated": 1553236399556,
+                        "lastUsedPeliasWebhookUrl": null,
                         "name": "mock-project-with-deployments",
                         "organizationId": null,
                         "otpServers": Array [],
@@ -3237,6 +3255,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "osmExtractUrl": null,
                               "otpCommit": null,
                               "otpVersion": null,
+                              "peliasUpdate": null,
+                              "peliasWebhookUrl": null,
                               "pinnedfeedVersionIds": Array [],
                               "projectBounds": Object {
                                 "east": 0,
@@ -3299,6 +3319,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           ],
                           "id": "mock-project-with-deployments-id",
                           "lastUpdated": 1553236399556,
+                          "lastUsedPeliasWebhookUrl": null,
                           "name": "mock-project-with-deployments",
                           "organizationId": null,
                           "otpServers": Array [],
@@ -3785,6 +3806,8 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasUpdate": null,
+                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -3847,6 +3870,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 ],
                                 "id": "mock-project-with-deployments-id",
                                 "lastUpdated": 1553236399556,
+                                "lastUsedPeliasWebhookUrl": null,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
diff --git a/lib/types/index.js b/lib/types/index.js
index d99eb5c63..d0aefcd09 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -7,7 +7,6 @@ import {
   FETCH_FREQUENCIES,
   RETRIEVAL_METHODS
 } from '../common/constants'
-
 import type UserPermissions from '../common/user/UserPermissions'
 
 type InputType =
@@ -248,6 +247,8 @@ export type Deployment = {
   organizationId: ?string,
   osmExtractUrl: ?string,
   otpVersion: ?string,
+  peliasUpdate: ?boolean,
+  peliasWebhookUrl: ?string,
   pinnedfeedVersionIds: Array<string>,
   projectBounds: Bounds,
   projectId: string,
@@ -773,6 +774,7 @@ export type Project = {
   id: string,
   isCreating?: boolean,
   lastUpdated: number | string,
+  lastUsedPeliasWebhookUrl: ?string,
   name: string,
   organizationId: ?string,
   otpServers?: Array<OtpServer>,

From 03f364e563619554de9390974bc2e086e6cc0820 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Fri, 30 Jul 2021 10:00:05 -0400
Subject: [PATCH 323/553] test: fix tests

---
 .../__snapshots__/ActiveProjectViewer.js.snap | 277 +++++++++++++++++-
 .../__snapshots__/FeedSourceTable.js.snap     | 265 ++++++++++++++++-
 2 files changed, 514 insertions(+), 28 deletions(-)

diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index f414ac9ec..60069eff1 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -2387,6 +2387,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                             </form>
                                                                           </Form>
                                                                           <DropdownButton
+                                                                            bsSize="small"
                                                                             id="project-feedsource-table-sort-button"
                                                                             style={
                                                                               Object {
@@ -2396,10 +2397,12 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                             title="Sort By"
                                                                           >
                                                                             <Uncontrolled(Dropdown)
+                                                                              bsSize="small"
                                                                               id="project-feedsource-table-sort-button"
                                                                             >
                                                                               <Dropdown
                                                                                 bsClass="dropdown"
+                                                                                bsSize="small"
                                                                                 componentClass={[Function]}
                                                                                 id="project-feedsource-table-sort-button"
                                                                                 onToggle={[Function]}
@@ -2407,16 +2410,18 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                 <ButtonGroup
                                                                                   block={false}
                                                                                   bsClass="btn-group"
+                                                                                  bsSize="small"
                                                                                   className="dropdown"
                                                                                   justified={false}
                                                                                   vertical={false}
                                                                                 >
                                                                                   <div
-                                                                                    className="dropdown btn-group"
+                                                                                    className="dropdown btn-group btn-group-sm"
                                                                                   >
                                                                                     <DropdownToggle
                                                                                       bsClass="dropdown-toggle"
                                                                                       bsRole="toggle"
+                                                                                      bsSize="small"
                                                                                       id="project-feedsource-table-sort-button"
                                                                                       key=".0"
                                                                                       onClick={[Function]}
@@ -2435,6 +2440,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                         aria-haspopup={true}
                                                                                         block={false}
                                                                                         bsClass="btn"
+                                                                                        bsSize="small"
                                                                                         bsStyle="default"
                                                                                         className="dropdown-toggle"
                                                                                         disabled={false}
@@ -2451,7 +2457,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                         <button
                                                                                           aria-expanded={false}
                                                                                           aria-haspopup={true}
-                                                                                          className="dropdown-toggle btn btn-default"
+                                                                                          className="dropdown-toggle btn btn-sm btn-default"
                                                                                           disabled={false}
                                                                                           id="project-feedsource-table-sort-button"
                                                                                           onClick={[Function]}
@@ -3135,13 +3141,24 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                 block={false}
                                                                                 bsClass="btn-group"
                                                                                 justified={false}
+                                                                                style={
+                                                                                  Object {
+                                                                                    "marginRight": 10,
+                                                                                  }
+                                                                                }
                                                                                 vertical={false}
                                                                               >
                                                                                 <div
                                                                                   className="btn-group"
+                                                                                  style={
+                                                                                    Object {
+                                                                                      "marginRight": 10,
+                                                                                    }
+                                                                                  }
                                                                                 >
                                                                                   <OptionButton
                                                                                     active={true}
+                                                                                    bsSize="small"
                                                                                     className="active"
                                                                                     key="all"
                                                                                     onClick={[Function]}
@@ -3151,6 +3168,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       active={true}
                                                                                       block={false}
                                                                                       bsClass="btn"
+                                                                                      bsSize="small"
                                                                                       bsStyle="default"
                                                                                       className="active"
                                                                                       disabled={false}
@@ -3159,7 +3177,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       value="all"
                                                                                     >
                                                                                       <SafeAnchor
-                                                                                        className="active btn btn-default active"
+                                                                                        className="active btn btn-sm btn-default active"
                                                                                         componentClass="a"
                                                                                         disabled={false}
                                                                                         href="#"
@@ -3167,7 +3185,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                         value="all"
                                                                                       >
                                                                                         <a
-                                                                                          className="active btn btn-default active"
+                                                                                          className="active btn btn-sm btn-default active"
                                                                                           href="#"
                                                                                           onClick={[Function]}
                                                                                           role="button"
@@ -3201,6 +3219,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                   </OptionButton>
                                                                                   <OptionButton
                                                                                     active={false}
+                                                                                    bsSize="small"
                                                                                     className=""
                                                                                     key="active"
                                                                                     onClick={[Function]}
@@ -3210,6 +3229,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       active={false}
                                                                                       block={false}
                                                                                       bsClass="btn"
+                                                                                      bsSize="small"
                                                                                       bsStyle="default"
                                                                                       className=""
                                                                                       disabled={false}
@@ -3218,7 +3238,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       value="active"
                                                                                     >
                                                                                       <SafeAnchor
-                                                                                        className="btn btn-default"
+                                                                                        className="btn btn-sm btn-default"
                                                                                         componentClass="a"
                                                                                         disabled={false}
                                                                                         href="#"
@@ -3226,7 +3246,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                         value="active"
                                                                                       >
                                                                                         <a
-                                                                                          className="btn btn-default"
+                                                                                          className="btn btn-sm btn-default"
                                                                                           href="#"
                                                                                           onClick={[Function]}
                                                                                           role="button"
@@ -3260,6 +3280,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                   </OptionButton>
                                                                                   <OptionButton
                                                                                     active={false}
+                                                                                    bsSize="small"
                                                                                     className=""
                                                                                     key="expiring"
                                                                                     onClick={[Function]}
@@ -3269,6 +3290,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       active={false}
                                                                                       block={false}
                                                                                       bsClass="btn"
+                                                                                      bsSize="small"
                                                                                       bsStyle="default"
                                                                                       className=""
                                                                                       disabled={false}
@@ -3277,7 +3299,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       value="expiring"
                                                                                     >
                                                                                       <SafeAnchor
-                                                                                        className="btn btn-default"
+                                                                                        className="btn btn-sm btn-default"
                                                                                         componentClass="a"
                                                                                         disabled={false}
                                                                                         href="#"
@@ -3285,7 +3307,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                         value="expiring"
                                                                                       >
                                                                                         <a
-                                                                                          className="btn btn-default"
+                                                                                          className="btn btn-sm btn-default"
                                                                                           href="#"
                                                                                           onClick={[Function]}
                                                                                           role="button"
@@ -3319,6 +3341,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                   </OptionButton>
                                                                                   <OptionButton
                                                                                     active={false}
+                                                                                    bsSize="small"
                                                                                     className=""
                                                                                     key="expired"
                                                                                     onClick={[Function]}
@@ -3328,6 +3351,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       active={false}
                                                                                       block={false}
                                                                                       bsClass="btn"
+                                                                                      bsSize="small"
                                                                                       bsStyle="default"
                                                                                       className=""
                                                                                       disabled={false}
@@ -3336,7 +3360,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       value="expired"
                                                                                     >
                                                                                       <SafeAnchor
-                                                                                        className="btn btn-default"
+                                                                                        className="btn btn-sm btn-default"
                                                                                         componentClass="a"
                                                                                         disabled={false}
                                                                                         href="#"
@@ -3344,7 +3368,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                         value="expired"
                                                                                       >
                                                                                         <a
-                                                                                          className="btn btn-default"
+                                                                                          className="btn btn-sm btn-default"
                                                                                           href="#"
                                                                                           onClick={[Function]}
                                                                                           role="button"
@@ -3378,6 +3402,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                   </OptionButton>
                                                                                   <OptionButton
                                                                                     active={false}
+                                                                                    bsSize="small"
                                                                                     className=""
                                                                                     key="future"
                                                                                     onClick={[Function]}
@@ -3387,6 +3412,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       active={false}
                                                                                       block={false}
                                                                                       bsClass="btn"
+                                                                                      bsSize="small"
                                                                                       bsStyle="default"
                                                                                       className=""
                                                                                       disabled={false}
@@ -3395,7 +3421,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                       value="future"
                                                                                     >
                                                                                       <SafeAnchor
-                                                                                        className="btn btn-default"
+                                                                                        className="btn btn-sm btn-default"
                                                                                         componentClass="a"
                                                                                         disabled={false}
                                                                                         href="#"
@@ -3403,7 +3429,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                         value="future"
                                                                                       >
                                                                                         <a
-                                                                                          className="btn btn-default"
+                                                                                          className="btn btn-sm btn-default"
                                                                                           href="#"
                                                                                           onClick={[Function]}
                                                                                           role="button"
@@ -3437,6 +3463,211 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                   </OptionButton>
                                                                                 </div>
                                                                               </ButtonGroup>
+                                                                              <DropdownButton
+                                                                                bsSize="small"
+                                                                                id="project-feedsource-label-filter-button"
+                                                                                title={
+                                                                                  <span
+                                                                                    title="Filter feeds by labels"
+                                                                                  >
+                                                                                    <Icon
+                                                                                      type="tag"
+                                                                                    />
+                                                                                     
+                                                                                    <Badge
+                                                                                      bsClass="badge"
+                                                                                      pullRight={false}
+                                                                                      style={
+                                                                                        Object {
+                                                                                          "backgroundColor": "#babec0",
+                                                                                        }
+                                                                                      }
+                                                                                    >
+                                                                                      0
+                                                                                    </Badge>
+                                                                                  </span>
+                                                                                }
+                                                                              >
+                                                                                <Uncontrolled(Dropdown)
+                                                                                  bsSize="small"
+                                                                                  id="project-feedsource-label-filter-button"
+                                                                                >
+                                                                                  <Dropdown
+                                                                                    bsClass="dropdown"
+                                                                                    bsSize="small"
+                                                                                    componentClass={[Function]}
+                                                                                    id="project-feedsource-label-filter-button"
+                                                                                    onToggle={[Function]}
+                                                                                  >
+                                                                                    <ButtonGroup
+                                                                                      block={false}
+                                                                                      bsClass="btn-group"
+                                                                                      bsSize="small"
+                                                                                      className="dropdown"
+                                                                                      justified={false}
+                                                                                      vertical={false}
+                                                                                    >
+                                                                                      <div
+                                                                                        className="dropdown btn-group btn-group-sm"
+                                                                                      >
+                                                                                        <DropdownToggle
+                                                                                          bsClass="dropdown-toggle"
+                                                                                          bsRole="toggle"
+                                                                                          bsSize="small"
+                                                                                          id="project-feedsource-label-filter-button"
+                                                                                          key=".0"
+                                                                                          onClick={[Function]}
+                                                                                          onKeyDown={[Function]}
+                                                                                          open={false}
+                                                                                          useAnchor={false}
+                                                                                        >
+                                                                                          <Button
+                                                                                            active={false}
+                                                                                            aria-expanded={false}
+                                                                                            aria-haspopup={true}
+                                                                                            block={false}
+                                                                                            bsClass="btn"
+                                                                                            bsSize="small"
+                                                                                            bsStyle="default"
+                                                                                            className="dropdown-toggle"
+                                                                                            disabled={false}
+                                                                                            id="project-feedsource-label-filter-button"
+                                                                                            onClick={[Function]}
+                                                                                            onKeyDown={[Function]}
+                                                                                            role="button"
+                                                                                          >
+                                                                                            <button
+                                                                                              aria-expanded={false}
+                                                                                              aria-haspopup={true}
+                                                                                              className="dropdown-toggle btn btn-sm btn-default"
+                                                                                              disabled={false}
+                                                                                              id="project-feedsource-label-filter-button"
+                                                                                              onClick={[Function]}
+                                                                                              onKeyDown={[Function]}
+                                                                                              role="button"
+                                                                                              type="button"
+                                                                                            >
+                                                                                              <span
+                                                                                                title="Filter feeds by labels"
+                                                                                              >
+                                                                                                <Icon
+                                                                                                  type="tag"
+                                                                                                >
+                                                                                                  <i
+                                                                                                    className="fa fa-tag fa-fw "
+                                                                                                  />
+                                                                                                </Icon>
+                                                                                                 
+                                                                                                <Badge
+                                                                                                  bsClass="badge"
+                                                                                                  pullRight={false}
+                                                                                                  style={
+                                                                                                    Object {
+                                                                                                      "backgroundColor": "#babec0",
+                                                                                                    }
+                                                                                                  }
+                                                                                                >
+                                                                                                  <span
+                                                                                                    className="badge"
+                                                                                                    style={
+                                                                                                      Object {
+                                                                                                        "backgroundColor": "#babec0",
+                                                                                                      }
+                                                                                                    }
+                                                                                                  >
+                                                                                                    0
+                                                                                                  </span>
+                                                                                                </Badge>
+                                                                                              </span>
+                                                                                               
+                                                                                              <span
+                                                                                                className="caret"
+                                                                                              />
+                                                                                            </button>
+                                                                                          </Button>
+                                                                                        </DropdownToggle>
+                                                                                        <DropdownMenu
+                                                                                          bsClass="dropdown-menu"
+                                                                                          bsRole="menu"
+                                                                                          key=".1"
+                                                                                          labelledBy="project-feedsource-label-filter-button"
+                                                                                          onClose={[Function]}
+                                                                                          onSelect={[Function]}
+                                                                                          pullRight={false}
+                                                                                        >
+                                                                                          <RootCloseWrapper
+                                                                                            disabled={true}
+                                                                                            event="click"
+                                                                                            onRootClose={[Function]}
+                                                                                          >
+                                                                                            <ul
+                                                                                              aria-labelledby="project-feedsource-label-filter-button"
+                                                                                              className="dropdown-menu"
+                                                                                              role="menu"
+                                                                                            >
+                                                                                              <MenuItem
+                                                                                                bsClass="dropdown"
+                                                                                                disabled={false}
+                                                                                                divider={false}
+                                                                                                header={true}
+                                                                                                key=".0"
+                                                                                                onKeyDown={[Function]}
+                                                                                                onSelect={[Function]}
+                                                                                                style={
+                                                                                                  Object {
+                                                                                                    "width": 275,
+                                                                                                  }
+                                                                                                }
+                                                                                              >
+                                                                                                <li
+                                                                                                  className="dropdown-header"
+                                                                                                  onKeyDown={[Function]}
+                                                                                                  role="heading"
+                                                                                                  style={
+                                                                                                    Object {
+                                                                                                      "width": 275,
+                                                                                                    }
+                                                                                                  }
+                                                                                                >
+                                                                                                  <h5>
+                                                                                                    Show feeds with
+                                                                                                    <select
+                                                                                                      id="anyall"
+                                                                                                      name="anyall"
+                                                                                                      onChange={[Function]}
+                                                                                                      style={
+                                                                                                        Object {
+                                                                                                          "margin": "0 3px",
+                                                                                                        }
+                                                                                                      }
+                                                                                                      value="any"
+                                                                                                    >
+                                                                                                      <option
+                                                                                                        value="any"
+                                                                                                      >
+                                                                                                        any
+                                                                                                      </option>
+                                                                                                      <option
+                                                                                                        value="all"
+                                                                                                      >
+                                                                                                        all
+                                                                                                      </option>
+                                                                                                    </select>
+                                                                                                    of the labels:
+                                                                                                  </h5>
+                                                                                                  <div
+                                                                                                    className="feedLabelContainer grid"
+                                                                                                  />
+                                                                                                </li>
+                                                                                              </MenuItem>
+                                                                                            </ul>
+                                                                                          </RootCloseWrapper>
+                                                                                        </DropdownMenu>
+                                                                                      </div>
+                                                                                    </ButtonGroup>
+                                                                                  </Dropdown>
+                                                                                </Uncontrolled(Dropdown)>
+                                                                              </DropdownButton>
                                                                             </div>
                                                                           </FormGroup>
                                                                         </div>
@@ -3460,6 +3691,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                           }
                                                                         >
                                                                           <DropdownButton
+                                                                            bsSize="small"
                                                                             bsStyle="primary"
                                                                             data-test-id="project-header-action-dropdown-button"
                                                                             id="project-header-actions"
@@ -3471,11 +3703,13 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                             title="Actions"
                                                                           >
                                                                             <Uncontrolled(Dropdown)
+                                                                              bsSize="small"
                                                                               bsStyle="primary"
                                                                               id="project-header-actions"
                                                                             >
                                                                               <Dropdown
                                                                                 bsClass="dropdown"
+                                                                                bsSize="small"
                                                                                 bsStyle="primary"
                                                                                 componentClass={[Function]}
                                                                                 id="project-header-actions"
@@ -3484,17 +3718,19 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                 <ButtonGroup
                                                                                   block={false}
                                                                                   bsClass="btn-group"
+                                                                                  bsSize="small"
                                                                                   bsStyle="primary"
                                                                                   className="dropdown"
                                                                                   justified={false}
                                                                                   vertical={false}
                                                                                 >
                                                                                   <div
-                                                                                    className="dropdown btn-group btn-group-primary"
+                                                                                    className="dropdown btn-group btn-group-sm btn-group-primary"
                                                                                   >
                                                                                     <DropdownToggle
                                                                                       bsClass="dropdown-toggle"
                                                                                       bsRole="toggle"
+                                                                                      bsSize="small"
                                                                                       bsStyle="primary"
                                                                                       data-test-id="project-header-action-dropdown-button"
                                                                                       id="project-header-actions"
@@ -3515,6 +3751,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                         aria-haspopup={true}
                                                                                         block={false}
                                                                                         bsClass="btn"
+                                                                                        bsSize="small"
                                                                                         bsStyle="primary"
                                                                                         className="dropdown-toggle"
                                                                                         data-test-id="project-header-action-dropdown-button"
@@ -3532,7 +3769,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                                         <button
                                                                                           aria-expanded={false}
                                                                                           aria-haspopup={true}
-                                                                                          className="dropdown-toggle btn btn-primary"
+                                                                                          className="dropdown-toggle btn btn-sm btn-primary"
                                                                                           data-test-id="project-header-action-dropdown-button"
                                                                                           disabled={false}
                                                                                           id="project-header-actions"
@@ -4183,6 +4420,10 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                         defaultExpanded={false}
                                                         header={
                                                           <h3>
+                                                            <Icon
+                                                              type="tag"
+                                                            />
+                                                             
                                                             Labels
                                                           </h3>
                                                         }
@@ -4196,6 +4437,14 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                             <h3
                                                               className="panel-title"
                                                             >
+                                                              <Icon
+                                                                type="tag"
+                                                              >
+                                                                <i
+                                                                  className="fa fa-tag fa-fw "
+                                                                />
+                                                              </Icon>
+                                                               
                                                               Labels
                                                             </h3>
                                                           </div>
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 32de6ec9c..910fede5b 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -1351,6 +1351,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           </form>
                         </Form>
                         <DropdownButton
+                          bsSize="small"
                           id="project-feedsource-table-sort-button"
                           style={
                             Object {
@@ -1360,10 +1361,12 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           title="Sort By"
                         >
                           <Uncontrolled(Dropdown)
+                            bsSize="small"
                             id="project-feedsource-table-sort-button"
                           >
                             <Dropdown
                               bsClass="dropdown"
+                              bsSize="small"
                               componentClass={[Function]}
                               id="project-feedsource-table-sort-button"
                               onToggle={[Function]}
@@ -1371,16 +1374,18 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               <ButtonGroup
                                 block={false}
                                 bsClass="btn-group"
+                                bsSize="small"
                                 className="dropdown"
                                 justified={false}
                                 vertical={false}
                               >
                                 <div
-                                  className="dropdown btn-group"
+                                  className="dropdown btn-group btn-group-sm"
                                 >
                                   <DropdownToggle
                                     bsClass="dropdown-toggle"
                                     bsRole="toggle"
+                                    bsSize="small"
                                     id="project-feedsource-table-sort-button"
                                     key=".0"
                                     onClick={[Function]}
@@ -1399,6 +1404,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       aria-haspopup={true}
                                       block={false}
                                       bsClass="btn"
+                                      bsSize="small"
                                       bsStyle="default"
                                       className="dropdown-toggle"
                                       disabled={false}
@@ -1415,7 +1421,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       <button
                                         aria-expanded={false}
                                         aria-haspopup={true}
-                                        className="dropdown-toggle btn btn-default"
+                                        className="dropdown-toggle btn btn-sm btn-default"
                                         disabled={false}
                                         id="project-feedsource-table-sort-button"
                                         onClick={[Function]}
@@ -2112,13 +2118,24 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               block={false}
                               bsClass="btn-group"
                               justified={false}
+                              style={
+                                Object {
+                                  "marginRight": 10,
+                                }
+                              }
                               vertical={false}
                             >
                               <div
                                 className="btn-group"
+                                style={
+                                  Object {
+                                    "marginRight": 10,
+                                  }
+                                }
                               >
                                 <OptionButton
                                   active={true}
+                                  bsSize="small"
                                   className="active"
                                   key="all"
                                   onClick={[Function]}
@@ -2128,6 +2145,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     active={true}
                                     block={false}
                                     bsClass="btn"
+                                    bsSize="small"
                                     bsStyle="default"
                                     className="active"
                                     disabled={false}
@@ -2136,7 +2154,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     value="all"
                                   >
                                     <SafeAnchor
-                                      className="active btn btn-default active"
+                                      className="active btn btn-sm btn-default active"
                                       componentClass="a"
                                       disabled={false}
                                       href="#"
@@ -2144,7 +2162,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       value="all"
                                     >
                                       <a
-                                        className="active btn btn-default active"
+                                        className="active btn btn-sm btn-default active"
                                         href="#"
                                         onClick={[Function]}
                                         role="button"
@@ -2178,6 +2196,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 </OptionButton>
                                 <OptionButton
                                   active={false}
+                                  bsSize="small"
                                   className=""
                                   key="active"
                                   onClick={[Function]}
@@ -2187,6 +2206,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     active={false}
                                     block={false}
                                     bsClass="btn"
+                                    bsSize="small"
                                     bsStyle="default"
                                     className=""
                                     disabled={false}
@@ -2195,7 +2215,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     value="active"
                                   >
                                     <SafeAnchor
-                                      className="btn btn-default"
+                                      className="btn btn-sm btn-default"
                                       componentClass="a"
                                       disabled={false}
                                       href="#"
@@ -2203,7 +2223,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       value="active"
                                     >
                                       <a
-                                        className="btn btn-default"
+                                        className="btn btn-sm btn-default"
                                         href="#"
                                         onClick={[Function]}
                                         role="button"
@@ -2237,6 +2257,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 </OptionButton>
                                 <OptionButton
                                   active={false}
+                                  bsSize="small"
                                   className=""
                                   key="expiring"
                                   onClick={[Function]}
@@ -2246,6 +2267,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     active={false}
                                     block={false}
                                     bsClass="btn"
+                                    bsSize="small"
                                     bsStyle="default"
                                     className=""
                                     disabled={false}
@@ -2254,7 +2276,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     value="expiring"
                                   >
                                     <SafeAnchor
-                                      className="btn btn-default"
+                                      className="btn btn-sm btn-default"
                                       componentClass="a"
                                       disabled={false}
                                       href="#"
@@ -2262,7 +2284,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       value="expiring"
                                     >
                                       <a
-                                        className="btn btn-default"
+                                        className="btn btn-sm btn-default"
                                         href="#"
                                         onClick={[Function]}
                                         role="button"
@@ -2296,6 +2318,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 </OptionButton>
                                 <OptionButton
                                   active={false}
+                                  bsSize="small"
                                   className=""
                                   key="expired"
                                   onClick={[Function]}
@@ -2305,6 +2328,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     active={false}
                                     block={false}
                                     bsClass="btn"
+                                    bsSize="small"
                                     bsStyle="default"
                                     className=""
                                     disabled={false}
@@ -2313,7 +2337,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     value="expired"
                                   >
                                     <SafeAnchor
-                                      className="btn btn-default"
+                                      className="btn btn-sm btn-default"
                                       componentClass="a"
                                       disabled={false}
                                       href="#"
@@ -2321,7 +2345,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       value="expired"
                                     >
                                       <a
-                                        className="btn btn-default"
+                                        className="btn btn-sm btn-default"
                                         href="#"
                                         onClick={[Function]}
                                         role="button"
@@ -2355,6 +2379,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 </OptionButton>
                                 <OptionButton
                                   active={false}
+                                  bsSize="small"
                                   className=""
                                   key="future"
                                   onClick={[Function]}
@@ -2364,6 +2389,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     active={false}
                                     block={false}
                                     bsClass="btn"
+                                    bsSize="small"
                                     bsStyle="default"
                                     className=""
                                     disabled={false}
@@ -2372,7 +2398,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     value="future"
                                   >
                                     <SafeAnchor
-                                      className="btn btn-default"
+                                      className="btn btn-sm btn-default"
                                       componentClass="a"
                                       disabled={false}
                                       href="#"
@@ -2380,7 +2406,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       value="future"
                                     >
                                       <a
-                                        className="btn btn-default"
+                                        className="btn btn-sm btn-default"
                                         href="#"
                                         onClick={[Function]}
                                         role="button"
@@ -2414,6 +2440,211 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 </OptionButton>
                               </div>
                             </ButtonGroup>
+                            <DropdownButton
+                              bsSize="small"
+                              id="project-feedsource-label-filter-button"
+                              title={
+                                <span
+                                  title="Filter feeds by labels"
+                                >
+                                  <Icon
+                                    type="tag"
+                                  />
+                                   
+                                  <Badge
+                                    bsClass="badge"
+                                    pullRight={false}
+                                    style={
+                                      Object {
+                                        "backgroundColor": "#babec0",
+                                      }
+                                    }
+                                  >
+                                    0
+                                  </Badge>
+                                </span>
+                              }
+                            >
+                              <Uncontrolled(Dropdown)
+                                bsSize="small"
+                                id="project-feedsource-label-filter-button"
+                              >
+                                <Dropdown
+                                  bsClass="dropdown"
+                                  bsSize="small"
+                                  componentClass={[Function]}
+                                  id="project-feedsource-label-filter-button"
+                                  onToggle={[Function]}
+                                >
+                                  <ButtonGroup
+                                    block={false}
+                                    bsClass="btn-group"
+                                    bsSize="small"
+                                    className="dropdown"
+                                    justified={false}
+                                    vertical={false}
+                                  >
+                                    <div
+                                      className="dropdown btn-group btn-group-sm"
+                                    >
+                                      <DropdownToggle
+                                        bsClass="dropdown-toggle"
+                                        bsRole="toggle"
+                                        bsSize="small"
+                                        id="project-feedsource-label-filter-button"
+                                        key=".0"
+                                        onClick={[Function]}
+                                        onKeyDown={[Function]}
+                                        open={false}
+                                        useAnchor={false}
+                                      >
+                                        <Button
+                                          active={false}
+                                          aria-expanded={false}
+                                          aria-haspopup={true}
+                                          block={false}
+                                          bsClass="btn"
+                                          bsSize="small"
+                                          bsStyle="default"
+                                          className="dropdown-toggle"
+                                          disabled={false}
+                                          id="project-feedsource-label-filter-button"
+                                          onClick={[Function]}
+                                          onKeyDown={[Function]}
+                                          role="button"
+                                        >
+                                          <button
+                                            aria-expanded={false}
+                                            aria-haspopup={true}
+                                            className="dropdown-toggle btn btn-sm btn-default"
+                                            disabled={false}
+                                            id="project-feedsource-label-filter-button"
+                                            onClick={[Function]}
+                                            onKeyDown={[Function]}
+                                            role="button"
+                                            type="button"
+                                          >
+                                            <span
+                                              title="Filter feeds by labels"
+                                            >
+                                              <Icon
+                                                type="tag"
+                                              >
+                                                <i
+                                                  className="fa fa-tag fa-fw "
+                                                />
+                                              </Icon>
+                                               
+                                              <Badge
+                                                bsClass="badge"
+                                                pullRight={false}
+                                                style={
+                                                  Object {
+                                                    "backgroundColor": "#babec0",
+                                                  }
+                                                }
+                                              >
+                                                <span
+                                                  className="badge"
+                                                  style={
+                                                    Object {
+                                                      "backgroundColor": "#babec0",
+                                                    }
+                                                  }
+                                                >
+                                                  0
+                                                </span>
+                                              </Badge>
+                                            </span>
+                                             
+                                            <span
+                                              className="caret"
+                                            />
+                                          </button>
+                                        </Button>
+                                      </DropdownToggle>
+                                      <DropdownMenu
+                                        bsClass="dropdown-menu"
+                                        bsRole="menu"
+                                        key=".1"
+                                        labelledBy="project-feedsource-label-filter-button"
+                                        onClose={[Function]}
+                                        onSelect={[Function]}
+                                        pullRight={false}
+                                      >
+                                        <RootCloseWrapper
+                                          disabled={true}
+                                          event="click"
+                                          onRootClose={[Function]}
+                                        >
+                                          <ul
+                                            aria-labelledby="project-feedsource-label-filter-button"
+                                            className="dropdown-menu"
+                                            role="menu"
+                                          >
+                                            <MenuItem
+                                              bsClass="dropdown"
+                                              disabled={false}
+                                              divider={false}
+                                              header={true}
+                                              key=".0"
+                                              onKeyDown={[Function]}
+                                              onSelect={[Function]}
+                                              style={
+                                                Object {
+                                                  "width": 275,
+                                                }
+                                              }
+                                            >
+                                              <li
+                                                className="dropdown-header"
+                                                onKeyDown={[Function]}
+                                                role="heading"
+                                                style={
+                                                  Object {
+                                                    "width": 275,
+                                                  }
+                                                }
+                                              >
+                                                <h5>
+                                                  Show feeds with
+                                                  <select
+                                                    id="anyall"
+                                                    name="anyall"
+                                                    onChange={[Function]}
+                                                    style={
+                                                      Object {
+                                                        "margin": "0 3px",
+                                                      }
+                                                    }
+                                                    value="any"
+                                                  >
+                                                    <option
+                                                      value="any"
+                                                    >
+                                                      any
+                                                    </option>
+                                                    <option
+                                                      value="all"
+                                                    >
+                                                      all
+                                                    </option>
+                                                  </select>
+                                                  of the labels:
+                                                </h5>
+                                                <div
+                                                  className="feedLabelContainer grid"
+                                                />
+                                              </li>
+                                            </MenuItem>
+                                          </ul>
+                                        </RootCloseWrapper>
+                                      </DropdownMenu>
+                                    </div>
+                                  </ButtonGroup>
+                                </Dropdown>
+                              </Uncontrolled(Dropdown)>
+                            </DropdownButton>
                           </div>
                         </FormGroup>
                       </div>
@@ -2437,6 +2668,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         }
                       >
                         <DropdownButton
+                          bsSize="small"
                           bsStyle="primary"
                           data-test-id="project-header-action-dropdown-button"
                           id="project-header-actions"
@@ -2448,11 +2680,13 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           title="Actions"
                         >
                           <Uncontrolled(Dropdown)
+                            bsSize="small"
                             bsStyle="primary"
                             id="project-header-actions"
                           >
                             <Dropdown
                               bsClass="dropdown"
+                              bsSize="small"
                               bsStyle="primary"
                               componentClass={[Function]}
                               id="project-header-actions"
@@ -2461,17 +2695,19 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               <ButtonGroup
                                 block={false}
                                 bsClass="btn-group"
+                                bsSize="small"
                                 bsStyle="primary"
                                 className="dropdown"
                                 justified={false}
                                 vertical={false}
                               >
                                 <div
-                                  className="dropdown btn-group btn-group-primary"
+                                  className="dropdown btn-group btn-group-sm btn-group-primary"
                                 >
                                   <DropdownToggle
                                     bsClass="dropdown-toggle"
                                     bsRole="toggle"
+                                    bsSize="small"
                                     bsStyle="primary"
                                     data-test-id="project-header-action-dropdown-button"
                                     id="project-header-actions"
@@ -2492,6 +2728,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       aria-haspopup={true}
                                       block={false}
                                       bsClass="btn"
+                                      bsSize="small"
                                       bsStyle="primary"
                                       className="dropdown-toggle"
                                       data-test-id="project-header-action-dropdown-button"
@@ -2509,7 +2746,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                       <button
                                         aria-expanded={false}
                                         aria-haspopup={true}
-                                        className="dropdown-toggle btn btn-primary"
+                                        className="dropdown-toggle btn btn-sm btn-primary"
                                         data-test-id="project-header-action-dropdown-button"
                                         disabled={false}
                                         id="project-header-actions"

From 44b05b54be9e41d4b3014d5407e5f38319d8a05c Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Fri, 30 Jul 2021 10:12:04 -0400
Subject: [PATCH 324/553] refactor(FeedLabel): fix flexbox weirdness, improve
 html syntax

---
 lib/common/components/FeedLabel.js | 31 +++++++++++++++++-------------
 lib/style.css                      |  8 +++++---
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 00b9ffde2..9398edadb 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -80,28 +80,35 @@ class FeedLabel extends React.Component<Props, State> {
       user.permissions &&
       user.permissions.isProjectAdmin(label.projectId)
     return projectAdmin
-    // justify-content: flex-start;
   }
 
   render () {
     const {label, checked = false} = this.props
+
+    // Used to avoid collision when label is rendered multiple times
+    const uniqueId = `${label.id}-${Date.now().toString(36)}`
+
     return (
-      <div className={this._getWrapperClasses()}
-        onClick={this._onClick}
-        onKeyPress={this._onClick}
-        role='checkbox'
-        aria-checked={checked}
-        tabIndex={0}
-      >
+      <div className={this._getWrapperClasses()}>
         {this._isCheckable() && (
           <div className='actionButtons'>
-            <input type='checkbox' checked={checked} />
+            <input
+              type='checkbox'
+              checked={checked}
+              onClick={this._onClick}
+              onKeyPress={this._onClick}
+              aria-checked={checked}
+              tabIndex={0}
+              id={uniqueId}
+            />
           </div>
         )}
-        <div
+        <label
+          htmlFor={uniqueId}
           className={this._getLabelClasses()}
           style={{
             backgroundColor: label.color,
+            fontWeight: 'normal',
             color: getComplementaryColor(label.color, 55),
             borderColor: getComplementaryColor(label.color, 10)
           }}
@@ -111,9 +118,7 @@ class FeedLabel extends React.Component<Props, State> {
             {label.adminOnly && <Icon type='lock' />}
             <span>{label.name}</span>
           </div>
-          {/* Only project admins can see controls that only appear
-        on large labels */}
-        </div>
+        </label>
         {this._isEditable() && (
           <div className='actionButtons'>
             <ConfirmModal
diff --git a/lib/style.css b/lib/style.css
index 2c047b06d..543611b83 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -212,21 +212,23 @@ td.feed-source-info {
   align-items: center;
   display: inline-flex;
   height: 100%;
-  justify-content: flex-start
+  justify-content: flex-start;
   padding: 0 5px 2px 0;
 }
 .feedLabelWrapper.withButtons {
+  align-items: baseline;
   justify-content: space-between;
+  padding: 5px 0;
 }
 
 /* Label Buttons */
 .feedLabelWrapper .actionButtons {
-  min-width: 43px;
+  display: flex;
 }
 .feedLabelWrapper .actionButtons button {
   background: none;
   border: none;
-  font-size: 12px;
+  font-size: 16px;
   opacity: 0.7;
   padding: 0px;
   text-decoration: underline;

From 5910758ede7118c07fbfbda0c33cc7f55c804b80 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Fri, 30 Jul 2021 12:07:49 -0400
Subject: [PATCH 325/553] refactor(DeploymentViewer): add restrictions
 enhancing clarity

---
 lib/manager/components/deployment/DeploymentViewer.js | 6 +++---
 lib/manager/components/deployment/PeliasPanel.js      | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index 4bd3971d0..b82940413 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -414,11 +414,11 @@ export default class DeploymentViewer extends Component<Props, State> {
               deployment={deployment}
               updateDeployment={updateDeployment}
             />
-            {/* Pelias panel */}
-            <PeliasPanel
+            {/* Pelias panel. Only show if deployment is pinned */}
+            {project.pinnedDeploymentId === deployment.id && <PeliasPanel
               deployment={deployment}
               updateDeployment={updateDeployment}
-            />
+            />}
           </Col>
         </Row>
       </div>
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 875175645..3b78a373c 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -51,6 +51,8 @@ export default class PeliasPanel extends Component<Props, State> {
     const { deployment } = this.props
     const { webhookUrl } = this.state
 
+    const optionsEnabled = webhookUrl !== ''
+
     return (
       <Panel
         header={
@@ -73,6 +75,7 @@ export default class PeliasPanel extends Component<Props, State> {
           <ListGroupItem>
             <h5>Send GTFS feeds to custom geocoder</h5>
             <Checkbox
+              disabled={!optionsEnabled}
               checked={deployment.peliasUpdate}
               onChange={this._onChangeUpdatePelias}
             >

From 42dd681420b212f17ea1c421737ef7bcabeaba7c Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Fri, 30 Jul 2021 13:25:31 -0400
Subject: [PATCH 326/553] refactor: address pr comments

---
 lib/common/components/FeedLabel.js           | 16 +++----
 lib/manager/components/FeedSourceTableRow.js |  4 +-
 lib/manager/components/LabelEditor.js        | 49 +++++++++-----------
 3 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index 9398edadb..c70b9bdd5 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -89,9 +89,9 @@ class FeedLabel extends React.Component<Props, State> {
     const uniqueId = `${label.id}-${Date.now().toString(36)}`
 
     return (
-      <div className={this._getWrapperClasses()}>
+      <span className={this._getWrapperClasses()}>
         {this._isCheckable() && (
-          <div className='actionButtons'>
+          <span className='actionButtons'>
             <input
               type='checkbox'
               checked={checked}
@@ -101,7 +101,7 @@ class FeedLabel extends React.Component<Props, State> {
               tabIndex={0}
               id={uniqueId}
             />
-          </div>
+          </span>
         )}
         <label
           htmlFor={uniqueId}
@@ -114,13 +114,13 @@ class FeedLabel extends React.Component<Props, State> {
           }}
           title={label.description || label.name}
         >
-          <div className='labelName'>
+          <span className='labelName'>
             {label.adminOnly && <Icon type='lock' />}
             <span>{label.name}</span>
-          </div>
+          </span>
         </label>
         {this._isEditable() && (
-          <div className='actionButtons'>
+          <span className='actionButtons'>
             <ConfirmModal
               ref='deleteModal'
               title='Delete Label?'
@@ -135,9 +135,9 @@ class FeedLabel extends React.Component<Props, State> {
             <button onClick={this._onClickDelete}>
               <Icon type='trash' />
             </button>
-          </div>
+          </span>
         )}
-      </div>
+      </span>
     )
   }
 }
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 56f997522..0bc2e50ad 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -392,8 +392,8 @@ class FeedActionsDropdown extends PureComponent<Props> {
   }
 
   /**
-   * This method is extracted variable generation which had to be split
-   * out of the render function to appease the eslint complexity rule
+   * This method is variable generation which used to live in the render method,
+   * but was extracted to appease the eslint complexity rule
    * @param {*} user        User used in child components
    * @param {*} project     Project object used in child components
    * @param {*} feedSource  FeedSource object used in child components
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index b30d02785..e3f08a39f 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -72,24 +72,22 @@ class LabelEditor extends React.Component<Props, State> {
     }
 
   _onFormChange = ({target}: {target: HTMLInputElement}) => {
-    const {name, value} = target
+    const {checked, name, value: targetValue, type} = target
 
-    this.setState(
-      update(this.state, {
-        newLabel: { $merge: {[name]: value} },
-        validation: { [name]: { $set: value && value.length > 0 } }
-      })
-    )
-  }
+    let valid = targetValue && targetValue.length > 0
 
-  _onCheckboxChange = ({target}: {target: HTMLInputElement}) => {
-    const {name, checked} = target
+    // Some fields may be blank
+    if (target.name === 'description' || target.name === 'adminOnly') {
+      valid = true
+    }
+
+    // Checkboxes store value in checked not "value"
+    const value = type === 'checkbox' ? checked : targetValue
 
     this.setState(
       update(this.state, {
-        newLabel: { $merge: {[name]: checked} },
-        // Checkboxes are valid in any state
-        validation: { [name]: { $set: true } }
+        newLabel: { $merge: {[name]: value} },
+        validation: { [name]: { $set: valid } }
       })
     )
   }
@@ -114,8 +112,12 @@ class LabelEditor extends React.Component<Props, State> {
   _settingsAreUnedited = () => Object.keys(this._getChanges()).length === 0
 
   _formIsValid = () => {
-    const {validation} = this.state
-    return Object.keys(validation).every(k => validation[k])
+    const {validation, newLabel} = this.state
+
+    return Object.keys(validation).every(k => validation[k]) &&
+    // Resolve edge case when creating a new label
+    newLabel.name &&
+    newLabel.name !== ''
   }
 
   _onSaveSettings = () => {
@@ -139,17 +141,13 @@ class LabelEditor extends React.Component<Props, State> {
     const { user } = this.props
 
     return (
-      <Form>
+      <Form onChange={(e) => this._onFormChange(e)}>
         <Panel>
           <ListGroup fill>
             <ListGroupItem>
               <FormGroup validationState={validationState(validation.name)}>
                 <ControlLabel>Name</ControlLabel>
-                <FormControl
-                  value={newLabel.name}
-                  name={'name'}
-                  onChange={this._onFormChange}
-                />
+                <FormControl value={newLabel.name} name={'name'} />
                 <FormControl.Feedback />
                 <HelpBlock>Required.</HelpBlock>
               </FormGroup>
@@ -158,7 +156,6 @@ class LabelEditor extends React.Component<Props, State> {
                 <FormControl
                   value={newLabel.description}
                   name={'description'}
-                  onChange={(e) => this._onFormChange(e)}
                 />
                 <FormControl.Feedback />
               </FormGroup>
@@ -172,7 +169,6 @@ class LabelEditor extends React.Component<Props, State> {
                       value={newLabel.color}
                       name={'color'}
                       type='color'
-                      onChange={this._onFormChange}
                     />
                     <FormControl.Feedback />
                   </FormGroup>
@@ -183,8 +179,7 @@ class LabelEditor extends React.Component<Props, State> {
                       checked={newLabel.adminOnly}
                       name='adminOnly'
                       type='checkbox'
-                      onChange={(e) => this._onCheckboxChange(e)}
-                      style={{margin: 0}}
+                      style={{ margin: 0 }}
                     >
                       <strong>Visible to admins only?</strong>
                     </Checkbox>
@@ -200,7 +195,7 @@ class LabelEditor extends React.Component<Props, State> {
         <Modal.Footer>
           {/* Cancel button */}
           <Button onClick={this.props.onDone} style={{ marginRight: 10 }}>
-              Cancel
+            Cancel
           </Button>
           {/* Save button */}
           <Button
@@ -209,7 +204,7 @@ class LabelEditor extends React.Component<Props, State> {
             type='submit'
             onClick={this._onSaveSettings}
           >
-              Save
+            Save
           </Button>
         </Modal.Footer>
       </Form>

From 705dda57f69536b3a0f6e46989936224ec18f487 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Fri, 30 Jul 2021 15:07:59 -0400
Subject: [PATCH 327/553] refactor: address pr comments

---
 lib/manager/components/FeedSourceTableRow.js |  4 ++--
 lib/manager/components/LabelEditor.js        | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 0bc2e50ad..302f3b66a 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -121,7 +121,7 @@ function relativeDuration (time: any) {
 }
 
 /**
- * This method is variable generation which used to live in the render method,
+ * This method generates the variables and used to live in the render method,
  * but was extracted to appease the eslint complexity rule
  */
 function generateFeedSourceLabelRenderVars (feedSource: Feed, comparisonValidationSummary: ?ValidationSummary) {
@@ -392,7 +392,7 @@ class FeedActionsDropdown extends PureComponent<Props> {
   }
 
   /**
-   * This method is variable generation which used to live in the render method,
+   * This method generates variables and used to live in the render method,
    * but was extracted to appease the eslint complexity rule
    * @param {*} user        User used in child components
    * @param {*} project     Project object used in child components
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index e3f08a39f..ed7477336 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -114,10 +114,12 @@ class LabelEditor extends React.Component<Props, State> {
   _formIsValid = () => {
     const {validation, newLabel} = this.state
 
-    return Object.keys(validation).every(k => validation[k]) &&
-    // Resolve edge case when creating a new label
-    newLabel.name &&
-    newLabel.name !== ''
+    return (
+      Object.keys(validation).every((k) => validation[k]) &&
+      // Resolve edge case when creating a new label
+      newLabel.name &&
+      newLabel.name !== ''
+    )
   }
 
   _onSaveSettings = () => {
@@ -194,9 +196,7 @@ class LabelEditor extends React.Component<Props, State> {
         </Panel>
         <Modal.Footer>
           {/* Cancel button */}
-          <Button onClick={this.props.onDone} style={{ marginRight: 10 }}>
-            Cancel
-          </Button>
+          <Button onClick={this.props.onDone} style={{ marginRight: 10 }}>Cancel</Button>
           {/* Save button */}
           <Button
             bsStyle='primary'

From 01a654810677f4acaf50b3b3ff6addd13b7c4796 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Fri, 30 Jul 2021 15:41:33 -0400
Subject: [PATCH 328/553] refactor(getErrorMessageFromJson): Display old
 network error in small text if json content overrides

---
 lib/common/actions/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index 41f62fddf..4fb72d5b6 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -4,7 +4,6 @@ import fetch from 'isomorphic-fetch'
 
 import {GTFS_GRAPHQL_PREFIX} from '../../common/constants'
 import { setErrorMessage } from '../../manager/actions/status'
-
 import type {dispatchFn, getStateFn} from '../../types/reducers'
 
 type ErrorResponse = {
@@ -87,7 +86,6 @@ function getErrorMessageFromJson (
 ) {
   let action = 'RELOAD'
   let detail
-  // let detail, message
   let errorMessage = `Network error!\n\n(${method} request on ${url})`
   if (status < 500) {
     action = status === 401
@@ -98,6 +96,10 @@ function getErrorMessageFromJson (
   if (json) {
     detail = json.detail
     errorMessage = json.message || JSON.stringify(json)
+    // if status >= 500 and detail is being overrode, add original network error in small text
+    if (status >= 500) {
+      detail = detail ? detail += `\nNetwork error!\n\n(${method} request on ${url})` : `\nNetwork error!\n\n(${method} request on ${url})`
+    }
   }
   console.error(`Error making ${method} request to ${url}: `, errorMessage)
   return { action, detail, message: errorMessage }

From 31999e7155eb9cbdf239842e57e4802dcdc6049b Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Mon, 2 Aug 2021 15:48:41 -0400
Subject: [PATCH 329/553] refactor(PeliasPanel): support webhook http
 authentication

---
 __tests__/test-utils/mock-data/manager.js     |  2 +
 .../__tests__/__snapshots__/projects.js.snap  |  2 +
 .../components/deployment/PeliasPanel.js      | 62 ++++++++++++++-----
 .../__snapshots__/DeploymentsPanel.js.snap    | 28 +++++++++
 .../__snapshots__/FeedSourceTable.js.snap     | 16 +++++
 lib/types/index.js                            |  2 +
 6 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 4c8773451..09cbc6bff 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -61,6 +61,8 @@ export function makeMockDeployment (
     skipOsmExtract: false,
     tripPlannerVersion: 'OTP_1',
     peliasUpdate: null,
+    peliasUsername: null,
+    peliasPassword: null,
     peliasWebhookUrl: null,
     user: null
   }
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index f96f36dee..8b67ef5b2 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -113,7 +113,9 @@ Object {
           "osmExtractUrl": null,
           "otpCommit": null,
           "otpVersion": null,
+          "peliasPassword": null,
           "peliasUpdate": null,
+          "peliasUsername": null,
           "peliasWebhookUrl": null,
           "pinnedfeedVersionIds": Array [],
           "projectBounds": Object {
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 3b78a373c..83e4c7ccf 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -15,15 +15,26 @@ type Props = {
 }
 
 type State = {
-  webhookUrl: string
+  peliasPassword: string,
+  peliasUsername: string,
+  peliasWebhookUrl: string
 }
 
 export default class PeliasPanel extends Component<Props, State> {
-  state = { webhookUrl: '' };
+  state = {
+    peliasWebhookUrl: '',
+    peliasPassword: '',
+    peliasUsername: ''
+  };
 
   componentDidMount = () => {
     const { deployment } = this.props
-    this.setState({ webhookUrl: (deployment.peliasWebhookUrl || '') })
+    // Auto-populate blank field if project has webhook URL in it
+    this.setState({
+      peliasWebhookUrl: deployment.peliasWebhookUrl || '',
+      peliasPassword: deployment.peliasPassword || '',
+      peliasUsername: deployment.peliasUsername || ''
+    })
   };
 
   _onChangeUpdatePelias = () =>
@@ -31,15 +42,15 @@ export default class PeliasPanel extends Component<Props, State> {
       peliasUpdate: !this.props.deployment.peliasUpdate
     });
 
-  _onBlurWebhookUrl = (event: SyntheticInputEvent<HTMLInputElement>) => {
+  _onBlurTextInput = (event: SyntheticInputEvent<HTMLInputElement>) => {
     const { target } = event
-    const { value } = target
-    this._updateDeployment({ peliasWebhookUrl: value })
+    const { value, id } = target
+    this._updateDeployment({ [id]: value })
   };
-  _onChangeWebhookUrl = (event: SyntheticInputEvent<HTMLInputElement>) => {
+  _onChangeTextInput = (event: SyntheticInputEvent<HTMLInputElement>) => {
     const { target } = event
-    const { value } = target
-    this.setState({ webhookUrl: value })
+    const { value, id } = target
+    this.setState({ [id]: value })
   };
 
   _updateDeployment = (props: { [string]: any }) => {
@@ -49,9 +60,9 @@ export default class PeliasPanel extends Component<Props, State> {
 
   render () {
     const { deployment } = this.props
-    const { webhookUrl } = this.state
+    const { peliasWebhookUrl, peliasPassword, peliasUsername } = this.state
 
-    const optionsEnabled = webhookUrl !== ''
+    const optionsEnabled = peliasWebhookUrl !== ''
 
     return (
       <Panel
@@ -66,10 +77,33 @@ export default class PeliasPanel extends Component<Props, State> {
             <h5>Custom Geocoder Webhook URL</h5>
             <FormControl
               type='url'
+              id='peliasWebhookUrl'
               placeholder='Update webhook URL'
-              value={webhookUrl}
-              onChange={this._onChangeWebhookUrl}
-              onBlur={this._onBlurWebhookUrl}
+              value={peliasWebhookUrl}
+              onChange={this._onChangeTextInput}
+              onBlur={this._onBlurTextInput}
+            />
+            <h5>Username</h5>
+            <FormControl
+              type='text'
+              id='peliasUsername'
+              disabled={!optionsEnabled}
+              autocomplete='off'
+              placeholder='Webhook Username'
+              value={peliasUsername}
+              onChange={this._onChangeTextInput}
+              onBlur={this._onBlurTextInput}
+            />
+            <h5>Password</h5>
+            <FormControl
+              type='password'
+              id='peliasPassword'
+              disabled={!optionsEnabled}
+              autocomplete='off'
+              placeholder='Webhook Password'
+              value={peliasPassword}
+              onChange={this._onChangeTextInput}
+              onBlur={this._onBlurTextInput}
             />
           </ListGroupItem>
           <ListGroupItem>
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index 9010d623c..ea0a31a88 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -126,7 +126,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "peliasPassword": null,
             "peliasUpdate": null,
+            "peliasUsername": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
@@ -160,7 +162,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "peliasPassword": null,
             "peliasUpdate": null,
+            "peliasUsername": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
@@ -357,7 +361,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "peliasPassword": null,
               "peliasUpdate": null,
+              "peliasUsername": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
@@ -391,7 +397,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "peliasPassword": null,
               "peliasUpdate": null,
+              "peliasUsername": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
@@ -640,7 +648,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "peliasPassword": null,
                       "peliasUpdate": null,
+                      "peliasUsername": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
@@ -674,7 +684,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "peliasPassword": null,
                       "peliasUpdate": null,
+                      "peliasUsername": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
@@ -801,7 +813,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "peliasPassword": null,
                         "peliasUpdate": null,
+                        "peliasUsername": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
@@ -835,7 +849,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "peliasPassword": null,
                         "peliasUpdate": null,
+                        "peliasUsername": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
@@ -1174,7 +1190,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "osmExtractUrl": null,
                                 "otpCommit": null,
                                 "otpVersion": null,
+                                "peliasPassword": null,
                                 "peliasUpdate": null,
+                                "peliasUsername": null,
                                 "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
@@ -1301,7 +1319,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasPassword": null,
                                     "peliasUpdate": null,
+                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
@@ -1335,7 +1355,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasPassword": null,
                                     "peliasUpdate": null,
+                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
@@ -1580,7 +1602,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "osmExtractUrl": null,
                                 "otpCommit": null,
                                 "otpVersion": null,
+                                "peliasPassword": null,
                                 "peliasUpdate": null,
+                                "peliasUsername": null,
                                 "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
@@ -1707,7 +1731,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasPassword": null,
                                     "peliasUpdate": null,
+                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
@@ -1741,7 +1767,9 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasPassword": null,
                                     "peliasUpdate": null,
+                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index e0a818e6c..8de0e9d9f 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -125,7 +125,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "peliasPassword": null,
             "peliasUpdate": null,
+            "peliasUsername": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
@@ -418,7 +420,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "peliasPassword": null,
               "peliasUpdate": null,
+              "peliasUsername": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
@@ -690,7 +694,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "osmExtractUrl": null,
                     "otpCommit": null,
                     "otpVersion": null,
+                    "peliasPassword": null,
                     "peliasUpdate": null,
+                    "peliasUsername": null,
                     "peliasWebhookUrl": null,
                     "pinnedfeedVersionIds": Array [],
                     "projectBounds": Object {
@@ -893,7 +899,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "peliasPassword": null,
                       "peliasUpdate": null,
+                      "peliasUsername": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
@@ -1114,7 +1122,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "peliasPassword": null,
                         "peliasUpdate": null,
+                        "peliasUsername": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
@@ -2989,7 +2999,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "osmExtractUrl": null,
                             "otpCommit": null,
                             "otpVersion": null,
+                            "peliasPassword": null,
                             "peliasUpdate": null,
+                            "peliasUsername": null,
                             "peliasWebhookUrl": null,
                             "pinnedfeedVersionIds": Array [],
                             "projectBounds": Object {
@@ -3255,7 +3267,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "osmExtractUrl": null,
                               "otpCommit": null,
                               "otpVersion": null,
+                              "peliasPassword": null,
                               "peliasUpdate": null,
+                              "peliasUsername": null,
                               "peliasWebhookUrl": null,
                               "pinnedfeedVersionIds": Array [],
                               "projectBounds": Object {
@@ -3806,7 +3820,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasPassword": null,
                                     "peliasUpdate": null,
+                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
diff --git a/lib/types/index.js b/lib/types/index.js
index d0aefcd09..97e8f5b7f 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -247,7 +247,9 @@ export type Deployment = {
   organizationId: ?string,
   osmExtractUrl: ?string,
   otpVersion: ?string,
+  peliasPassword: ?string,
   peliasUpdate: ?boolean,
+  peliasUsername: ?string,
   peliasWebhookUrl: ?string,
   pinnedfeedVersionIds: Array<string>,
   projectBounds: Bounds,

From dd96eabf78b508fdce109df5841ee0a055e58587 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 3 Aug 2021 07:06:45 -0400
Subject: [PATCH 330/553] refactor(PeliasPanel): add csv upload button

---
 lib/common/util/upload-file.js                |  9 ++++---
 .../components/deployment/PeliasPanel.js      | 26 ++++++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/lib/common/util/upload-file.js b/lib/common/util/upload-file.js
index 1fb477cee..278b76bca 100644
--- a/lib/common/util/upload-file.js
+++ b/lib/common/util/upload-file.js
@@ -5,13 +5,16 @@ import fetch from 'isomorphic-fetch'
 import {getHeaders} from './util'
 
 export function uploadFile ({
-  file, token, url
+  file, mimeType, token, url
 }: {
-  file: File, token: string, url: string
+  file: File, mimeType: ?string, token: string, url: string
 }) {
+  // This previously defaulted to zip. This is included for backwards compatibility
+  const mime = mimeType || 'application/zip'
+
   return fetch(url, {
     method: 'post',
-    headers: getHeaders(token, true, 'application/zip'),
+    headers: getHeaders(token, true, mime),
     body: file
   })
 }
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 83e4c7ccf..276817174 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -2,8 +2,9 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, { Component } from 'react'
-import { Checkbox, FormControl, ListGroup, ListGroupItem, Panel } from 'react-bootstrap'
+import { Button, Checkbox, FormControl, ListGroup, ListGroupItem, Panel } from 'react-bootstrap'
 
+import SelectFileModal from '../../../common/components/SelectFileModal'
 import * as deploymentActions from '../../actions/deployments'
 import type {
   Deployment
@@ -53,6 +54,16 @@ export default class PeliasPanel extends Component<Props, State> {
     this.setState({ [id]: value })
   };
 
+  _onConfirmUpload = (files: Array<File>) => {
+    const file = files[0]
+    if (file.type === 'text/csv') {
+      // TODO: method to use file to upload feed
+      return true
+    } else {
+      return false
+    }
+  }
+
   _updateDeployment = (props: { [string]: any }) => {
     const { deployment, updateDeployment } = this.props
     updateDeployment(deployment, props)
@@ -88,7 +99,7 @@ export default class PeliasPanel extends Component<Props, State> {
               type='text'
               id='peliasUsername'
               disabled={!optionsEnabled}
-              autocomplete='off'
+              autoComplete='off'
               placeholder='Webhook Username'
               value={peliasUsername}
               onChange={this._onChangeTextInput}
@@ -99,7 +110,7 @@ export default class PeliasPanel extends Component<Props, State> {
               type='password'
               id='peliasPassword'
               disabled={!optionsEnabled}
-              autocomplete='off'
+              autoComplete='off'
               placeholder='Webhook Password'
               value={peliasPassword}
               onChange={this._onChangeTextInput}
@@ -118,7 +129,14 @@ export default class PeliasPanel extends Component<Props, State> {
           </ListGroupItem>
           <ListGroupItem>
             <h5>Custom POI CSV Upload</h5>
-            TODO
+            <SelectFileModal
+              ref='uploadModal'
+              title='Upload CSV File'
+              body='Select a CSV file of POIs to upload:'
+              onConfirm={this._onConfirmUpload}
+              errorMessage='Uploaded file must be a valid csv file (.csv).'
+            />
+            <Button disabled={!optionsEnabled} onClick={() => this.refs.uploadModal.open()}>Upload</Button>
           </ListGroupItem>
         </ListGroup>
       </Panel>

From 91310e1cd52df8c32ba2731d3edbd70018ade8d7 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 3 Aug 2021 07:49:53 -0400
Subject: [PATCH 331/553] refactor: rename variables to conform to server
 change

---
 lib/manager/components/FeedSourceTableRow.js | 2 +-
 lib/manager/components/LabelAssigner.js      | 2 +-
 lib/manager/util/index.js                    | 2 +-
 lib/types/index.js                           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 302f3b66a..051e3a391 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -313,7 +313,7 @@ class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user:
                   Edit
                 </button>)}
               <div className='feedLabelContainer'>
-                {deStringifyLabels(feedSource.labels, project).map((label) => (
+                {deStringifyLabels(feedSource.labelIds, project).map((label) => (
                   <FeedLabel small key={label.id} label={label} />
                 ))}
               </div>
diff --git a/lib/manager/components/LabelAssigner.js b/lib/manager/components/LabelAssigner.js
index cbb3c8199..ff1ffdfbe 100644
--- a/lib/manager/components/LabelAssigner.js
+++ b/lib/manager/components/LabelAssigner.js
@@ -29,7 +29,7 @@ class LabelAssigner extends React.Component<Props, State> {
   componentDidMount = () => {
     const { feedSource } = this.props
     this.setState({
-      updatedLabelIds: feedSource.labels
+      updatedLabelIds: feedSource.labelIds
     })
   }
 
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index 87fe39256..2fe98ab85 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -205,7 +205,7 @@ export function getFilteredFeeds (
       if (!labels || labels.length === 0) return feedSource
 
       function labelVerify (labelToCheck) {
-        return feedSource.labels.includes(labelToCheck)
+        return feedSource.labelIds.includes(labelToCheck)
       }
 
       if (filter.labelsFilterMode === 'any') {
diff --git a/lib/types/index.js b/lib/types/index.js
index d08fb5797..d46de0534 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -384,7 +384,7 @@ export type Feed = {
   id: string,
   isCreating?: boolean,
   isPublic: boolean,
-  labels: Array<string>,
+  labelIds: Array<string>,
   lastFetched?: ?number,
   lastUpdated?: number,
   latestValidation?: ValidationSummary,
@@ -783,7 +783,7 @@ export type Project = {
   feedSources: Array<Feed>,
   id: string,
   isCreating?: boolean,
-  labels: Array<Label>,
+  labelIds: Array<string>,
   lastUpdated: number | string,
   name: string,
   organizationId: ?string,

From 23a76d8c45a5d10a147e1d08bd5236ad1e70d0a9 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 3 Aug 2021 07:57:09 -0400
Subject: [PATCH 332/553] revert: remove incorrect type adjustment

---
 lib/types/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types/index.js b/lib/types/index.js
index d46de0534..ada18d2a9 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -783,7 +783,7 @@ export type Project = {
   feedSources: Array<Feed>,
   id: string,
   isCreating?: boolean,
-  labelIds: Array<string>,
+  labels: Array<Label>,
   lastUpdated: number | string,
   name: string,
   organizationId: ?string,

From 9bd738784311e6662982c139e91e6d118ce82bb7 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 3 Aug 2021 07:59:35 -0400
Subject: [PATCH 333/553] test: have tests match new types

---
 __tests__/test-utils/mock-data/manager.js     |  4 +-
 .../__tests__/__snapshots__/projects.js.snap  |  4 +-
 .../__snapshots__/DeploymentsPanel.js.snap    | 24 ++++-----
 .../__snapshots__/FeedSourceTable.js.snap     | 54 +++++++++----------
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 06f163a14..f8c69a9a5 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -134,7 +134,7 @@ export const mockFeedWithVersion = {
     tripCount: 415
   },
   latestVersionId: 'mock-feed-version-id',
-  labels: [],
+  labelIds: [],
   name: 'test feed with a version',
   noteCount: 0,
   organizationId: null,
@@ -159,7 +159,7 @@ export const mockFeedWithoutVersion = {
   isPublic: false,
   lastFetched: null,
   name: 'test feed with no version',
-  labels: [],
+  labelIds: [],
   noteCount: 0,
   organizationId: null,
   projectId: mockProject.id,
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index ded226863..ecf864c7e 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -38,7 +38,7 @@ Object {
                 "externalProperties": Object {},
                 "id": "mock-feed-with-version-id",
                 "isPublic": false,
-                "labels": Array [],
+                "labelIds": Array [],
                 "lastFetched": 1543389038810,
                 "lastUpdated": 1543389038810,
                 "latestValidation": Object {
@@ -136,7 +136,7 @@ Object {
           "externalProperties": Object {},
           "id": "mock-feed-with-version-id",
           "isPublic": false,
-          "labels": Array [],
+          "labelIds": Array [],
           "lastFetched": 1543389038810,
           "lastUpdated": 1543389038810,
           "latestValidation": Object {
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index d1531fe28..503bb7304 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -51,7 +51,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                   "externalProperties": Object {},
                   "id": "mock-feed-with-version-id",
                   "isPublic": false,
-                  "labels": Array [],
+                  "labelIds": Array [],
                   "lastFetched": 1543389038810,
                   "lastUpdated": 1543389038810,
                   "latestValidation": Object {
@@ -181,7 +181,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "externalProperties": Object {},
             "id": "mock-feed-with-version-id",
             "isPublic": false,
-            "labels": Array [],
+            "labelIds": Array [],
             "lastFetched": 1543389038810,
             "lastUpdated": 1543389038810,
             "latestValidation": Object {
@@ -280,7 +280,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     "externalProperties": Object {},
                     "id": "mock-feed-with-version-id",
                     "isPublic": false,
-                    "labels": Array [],
+                    "labelIds": Array [],
                     "lastFetched": 1543389038810,
                     "lastUpdated": 1543389038810,
                     "latestValidation": Object {
@@ -410,7 +410,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "externalProperties": Object {},
               "id": "mock-feed-with-version-id",
               "isPublic": false,
-              "labels": Array [],
+              "labelIds": Array [],
               "lastFetched": 1543389038810,
               "lastUpdated": 1543389038810,
               "latestValidation": Object {
@@ -561,7 +561,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                             "externalProperties": Object {},
                             "id": "mock-feed-with-version-id",
                             "isPublic": false,
-                            "labels": Array [],
+                            "labelIds": Array [],
                             "lastFetched": 1543389038810,
                             "lastUpdated": 1543389038810,
                             "latestValidation": Object {
@@ -719,7 +719,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                               "externalProperties": Object {},
                               "id": "mock-feed-with-version-id",
                               "isPublic": false,
-                              "labels": Array [],
+                              "labelIds": Array [],
                               "lastFetched": 1543389038810,
                               "lastUpdated": 1543389038810,
                               "latestValidation": Object {
@@ -849,7 +849,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "externalProperties": Object {},
                         "id": "mock-feed-with-version-id",
                         "isPublic": false,
-                        "labels": Array [],
+                        "labelIds": Array [],
                         "lastFetched": 1543389038810,
                         "lastUpdated": 1543389038810,
                         "latestValidation": Object {
@@ -1090,7 +1090,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                       "externalProperties": Object {},
                                       "id": "mock-feed-with-version-id",
                                       "isPublic": false,
-                                      "labels": Array [],
+                                      "labelIds": Array [],
                                       "lastFetched": 1543389038810,
                                       "lastUpdated": 1543389038810,
                                       "latestValidation": Object {
@@ -1216,7 +1216,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                           "externalProperties": Object {},
                                           "id": "mock-feed-with-version-id",
                                           "isPublic": false,
-                                          "labels": Array [],
+                                          "labelIds": Array [],
                                           "lastFetched": 1543389038810,
                                           "lastUpdated": 1543389038810,
                                           "latestValidation": Object {
@@ -1346,7 +1346,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "externalProperties": Object {},
                                     "id": "mock-feed-with-version-id",
                                     "isPublic": false,
-                                    "labels": Array [],
+                                    "labelIds": Array [],
                                     "lastFetched": 1543389038810,
                                     "lastUpdated": 1543389038810,
                                     "latestValidation": Object {
@@ -1618,7 +1618,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                           "externalProperties": Object {},
                                           "id": "mock-feed-with-version-id",
                                           "isPublic": false,
-                                          "labels": Array [],
+                                          "labelIds": Array [],
                                           "lastFetched": 1543389038810,
                                           "lastUpdated": 1543389038810,
                                           "latestValidation": Object {
@@ -1748,7 +1748,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "externalProperties": Object {},
                                     "id": "mock-feed-with-version-id",
                                     "isPublic": false,
-                                    "labels": Array [],
+                                    "labelIds": Array [],
                                     "lastFetched": 1543389038810,
                                     "lastUpdated": 1543389038810,
                                     "latestValidation": Object {
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 910fede5b..a332e5cc8 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -50,7 +50,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   "externalProperties": Object {},
                   "id": "mock-feed-with-version-id",
                   "isPublic": false,
-                  "labels": Array [],
+                  "labelIds": Array [],
                   "lastFetched": 1543389038810,
                   "lastUpdated": 1543389038810,
                   "latestValidation": Object {
@@ -148,7 +148,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "externalProperties": Object {},
             "id": "mock-feed-with-version-id",
             "isPublic": false,
-            "labels": Array [],
+            "labelIds": Array [],
             "lastFetched": 1543389038810,
             "lastUpdated": 1543389038810,
             "latestValidation": Object {
@@ -218,7 +218,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "externalProperties": Object {},
             "id": "mock-feed-with-version-id",
             "isPublic": false,
-            "labels": Array [],
+            "labelIds": Array [],
             "lastFetched": 1543389038810,
             "lastUpdated": 1543389038810,
             "latestValidation": Object {
@@ -267,7 +267,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "externalProperties": Object {},
             "id": "mock-feed-with-version-id",
             "isPublic": false,
-            "labels": Array [],
+            "labelIds": Array [],
             "lastFetched": 1543389038810,
             "lastUpdated": 1543389038810,
             "latestValidation": Object {
@@ -345,7 +345,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "externalProperties": Object {},
                     "id": "mock-feed-with-version-id",
                     "isPublic": false,
-                    "labels": Array [],
+                    "labelIds": Array [],
                     "lastFetched": 1543389038810,
                     "lastUpdated": 1543389038810,
                     "latestValidation": Object {
@@ -443,7 +443,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "externalProperties": Object {},
               "id": "mock-feed-with-version-id",
               "isPublic": false,
-              "labels": Array [],
+              "labelIds": Array [],
               "lastFetched": 1543389038810,
               "lastUpdated": 1543389038810,
               "latestValidation": Object {
@@ -617,7 +617,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "externalProperties": Object {},
                           "id": "mock-feed-with-version-id",
                           "isPublic": false,
-                          "labels": Array [],
+                          "labelIds": Array [],
                           "lastFetched": 1543389038810,
                           "lastUpdated": 1543389038810,
                           "latestValidation": Object {
@@ -715,7 +715,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "externalProperties": Object {},
                     "id": "mock-feed-with-version-id",
                     "isPublic": false,
-                    "labels": Array [],
+                    "labelIds": Array [],
                     "lastFetched": 1543389038810,
                     "lastUpdated": 1543389038810,
                     "latestValidation": Object {
@@ -820,7 +820,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "externalProperties": Object {},
                             "id": "mock-feed-with-version-id",
                             "isPublic": false,
-                            "labels": Array [],
+                            "labelIds": Array [],
                             "lastFetched": 1543389038810,
                             "lastUpdated": 1543389038810,
                             "latestValidation": Object {
@@ -918,7 +918,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "externalProperties": Object {},
                       "id": "mock-feed-with-version-id",
                       "isPublic": false,
-                      "labels": Array [],
+                      "labelIds": Array [],
                       "lastFetched": 1543389038810,
                       "lastUpdated": 1543389038810,
                       "latestValidation": Object {
@@ -1043,7 +1043,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "externalProperties": Object {},
                               "id": "mock-feed-with-version-id",
                               "isPublic": false,
-                              "labels": Array [],
+                              "labelIds": Array [],
                               "lastFetched": 1543389038810,
                               "lastUpdated": 1543389038810,
                               "latestValidation": Object {
@@ -1141,7 +1141,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "externalProperties": Object {},
                         "id": "mock-feed-with-version-id",
                         "isPublic": false,
-                        "labels": Array [],
+                        "labelIds": Array [],
                         "lastFetched": 1543389038810,
                         "lastUpdated": 1543389038810,
                         "latestValidation": Object {
@@ -3083,7 +3083,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "externalProperties": Object {},
                         "id": "mock-feed-with-version-id",
                         "isPublic": false,
-                        "labels": Array [],
+                        "labelIds": Array [],
                         "lastFetched": 1543389038810,
                         "lastUpdated": 1543389038810,
                         "latestValidation": Object {
@@ -3158,7 +3158,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                   "externalProperties": Object {},
                                   "id": "mock-feed-with-version-id",
                                   "isPublic": false,
-                                  "labels": Array [],
+                                  "labelIds": Array [],
                                   "lastFetched": 1543389038810,
                                   "lastUpdated": 1543389038810,
                                   "latestValidation": Object {
@@ -3256,7 +3256,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "externalProperties": Object {},
                             "id": "mock-feed-with-version-id",
                             "isPublic": false,
-                            "labels": Array [],
+                            "labelIds": Array [],
                             "lastFetched": 1543389038810,
                             "lastUpdated": 1543389038810,
                             "latestValidation": Object {
@@ -3351,7 +3351,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "externalProperties": Object {},
                           "id": "mock-feed-with-version-id",
                           "isPublic": false,
-                          "labels": Array [],
+                          "labelIds": Array [],
                           "lastFetched": 1543389038810,
                           "lastUpdated": 1543389038810,
                           "latestValidation": Object {
@@ -3425,7 +3425,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "externalProperties": Object {},
                                     "id": "mock-feed-with-version-id",
                                     "isPublic": false,
-                                    "labels": Array [],
+                                    "labelIds": Array [],
                                     "lastFetched": 1543389038810,
                                     "lastUpdated": 1543389038810,
                                     "latestValidation": Object {
@@ -3523,7 +3523,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "externalProperties": Object {},
                               "id": "mock-feed-with-version-id",
                               "isPublic": false,
-                              "labels": Array [],
+                              "labelIds": Array [],
                               "lastFetched": 1543389038810,
                               "lastUpdated": 1543389038810,
                               "latestValidation": Object {
@@ -3673,7 +3673,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "externalProperties": Object {},
                                 "id": "mock-feed-with-version-id",
                                 "isPublic": false,
-                                "labels": Array [],
+                                "labelIds": Array [],
                                 "lastFetched": 1543389038810,
                                 "lastUpdated": 1543389038810,
                                 "latestValidation": Object {
@@ -3747,7 +3747,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           "externalProperties": Object {},
                                           "id": "mock-feed-with-version-id",
                                           "isPublic": false,
-                                          "labels": Array [],
+                                          "labelIds": Array [],
                                           "lastFetched": 1543389038810,
                                           "lastUpdated": 1543389038810,
                                           "latestValidation": Object {
@@ -3845,7 +3845,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "externalProperties": Object {},
                                     "id": "mock-feed-with-version-id",
                                     "isPublic": false,
-                                    "labels": Array [],
+                                    "labelIds": Array [],
                                     "lastFetched": 1543389038810,
                                     "lastUpdated": 1543389038810,
                                     "latestValidation": Object {
@@ -4069,7 +4069,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                               "externalProperties": Object {},
                                               "id": "mock-feed-with-version-id",
                                               "isPublic": false,
-                                              "labels": Array [],
+                                              "labelIds": Array [],
                                               "lastFetched": 1543389038810,
                                               "lastUpdated": 1543389038810,
                                               "latestValidation": Object {
@@ -4143,7 +4143,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                                         "externalProperties": Object {},
                                                         "id": "mock-feed-with-version-id",
                                                         "isPublic": false,
-                                                        "labels": Array [],
+                                                        "labelIds": Array [],
                                                         "lastFetched": 1543389038810,
                                                         "lastUpdated": 1543389038810,
                                                         "latestValidation": Object {
@@ -4241,7 +4241,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                                   "externalProperties": Object {},
                                                   "id": "mock-feed-with-version-id",
                                                   "isPublic": false,
-                                                  "labels": Array [],
+                                                  "labelIds": Array [],
                                                   "lastFetched": 1543389038810,
                                                   "lastUpdated": 1543389038810,
                                                   "latestValidation": Object {
@@ -4474,7 +4474,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "externalProperties": Object {},
                                 "id": "mock-feed-with-version-id",
                                 "isPublic": false,
-                                "labels": Array [],
+                                "labelIds": Array [],
                                 "lastFetched": 1543389038810,
                                 "lastUpdated": 1543389038810,
                                 "latestValidation": Object {
@@ -4548,7 +4548,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                           "externalProperties": Object {},
                                           "id": "mock-feed-with-version-id",
                                           "isPublic": false,
-                                          "labels": Array [],
+                                          "labelIds": Array [],
                                           "lastFetched": 1543389038810,
                                           "lastUpdated": 1543389038810,
                                           "latestValidation": Object {
@@ -4646,7 +4646,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "externalProperties": Object {},
                                     "id": "mock-feed-with-version-id",
                                     "isPublic": false,
-                                    "labels": Array [],
+                                    "labelIds": Array [],
                                     "lastFetched": 1543389038810,
                                     "lastUpdated": 1543389038810,
                                     "latestValidation": Object {

From 6b031c4552ed0023cc03df2e2558c3fda9cc7dd6 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 3 Aug 2021 11:42:02 -0400
Subject: [PATCH 334/553] refactor(PeliasPanel): add csv upload

---
 .../components/deployment/PeliasPanel.js      | 67 +++++++++++++++++--
 1 file changed, 62 insertions(+), 5 deletions(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 276817174..60cc82900 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -1,11 +1,14 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
+import { connect } from 'react-redux'
 import React, { Component } from 'react'
 import { Button, Checkbox, FormControl, ListGroup, ListGroupItem, Panel } from 'react-bootstrap'
 
 import SelectFileModal from '../../../common/components/SelectFileModal'
+import { getHeaders } from '../../../common/util/util'
 import * as deploymentActions from '../../actions/deployments'
+import {SECURE_API_PREFIX} from '../../../common/constants'
 import type {
   Deployment
 } from '../../../types'
@@ -21,7 +24,7 @@ type State = {
   peliasWebhookUrl: string
 }
 
-export default class PeliasPanel extends Component<Props, State> {
+class PeliasPanel extends Component<Props, State> {
   state = {
     peliasWebhookUrl: '',
     peliasPassword: '',
@@ -54,21 +57,54 @@ export default class PeliasPanel extends Component<Props, State> {
     this.setState({ [id]: value })
   };
 
-  _onConfirmUpload = (files: Array<File>) => {
+  _onConfirmUpload = async (files: Array<File>) => {
+    const { user, deployment } = this.props
     const file = files[0]
     if (file.type === 'text/csv') {
-      // TODO: method to use file to upload feed
+      const url = `${SECURE_API_PREFIX}deployments/${deployment.id}/upload`
+      const formData = new FormData()
+      formData.append('file', file)
+
+      const s3UploadResponse = await fetch(url, {
+        method: 'post',
+        headers: getHeaders(user.token, false, null),
+        body: formData
+      })
+      const s3UploadUrl = await s3UploadResponse.text()
+      this._updateDeployment({ 'peliasCsvFiles': [ ...deployment.peliasCsvFiles, s3UploadUrl ] })
       return true
     } else {
       return false
     }
   }
 
+  _deleteCsvFile = async (url: string) => {
+    const { deployment } = this.props
+    const updatedCsvFiles = deployment.peliasCsvFiles.filter(u => u !== url)
+    this._updateDeployment({'peliasCsvFiles': updatedCsvFiles})
+  }
+
   _updateDeployment = (props: { [string]: any }) => {
     const { deployment, updateDeployment } = this.props
     updateDeployment(deployment, props)
   };
 
+  renderCsvUrl = (url: string, enabled: boolean) => {
+    // Usually, files will be rendered by https://github.com/ibi-group/datatools-server/blob/dev/src/main/java/com/conveyal/datatools/manager/controllers/api/DeploymentController.java
+    // so we can take advantage of a predictable filename
+    // As a fallback, render the full url
+    const fileName = url.split('_').length === 2 ? url.split('_')[1] : url
+    return (
+      <li key={url}>
+        {fileName}{' '}
+        <Button disabled={!enabled} bsSize='xsmall' onClick={() => { this.refs.uploadModal.open(); this._deleteCsvFile(url) }}>
+          Replace
+        </Button>
+        <Button disabled={!enabled} bsSize='xsmall' onClick={() => this._deleteCsvFile(url)}>Delete</Button>
+      </li>
+    )
+  }
+
   render () {
     const { deployment } = this.props
     const { peliasWebhookUrl, peliasPassword, peliasUsername } = this.state
@@ -128,7 +164,7 @@ export default class PeliasPanel extends Component<Props, State> {
             </Checkbox>
           </ListGroupItem>
           <ListGroupItem>
-            <h5>Custom POI CSV Upload</h5>
+            <h5>Custom POI CSV Files</h5>
             <SelectFileModal
               ref='uploadModal'
               title='Upload CSV File'
@@ -136,10 +172,31 @@ export default class PeliasPanel extends Component<Props, State> {
               onConfirm={this._onConfirmUpload}
               errorMessage='Uploaded file must be a valid csv file (.csv).'
             />
-            <Button disabled={!optionsEnabled} onClick={() => this.refs.uploadModal.open()}>Upload</Button>
+            <ul>{deployment.peliasCsvFiles.map(url => this.renderCsvUrl(url, optionsEnabled))}</ul>
+            <Button
+              style={{ marginTop: '5px' }}
+              disabled={!optionsEnabled}
+              onClick={() => this.refs.uploadModal.open()}
+            >
+              Upload New CSV File
+            </Button>
           </ListGroupItem>
         </ListGroup>
       </Panel>
     )
   }
 }
+
+const mapStateToProps = (state, ownProps) => {
+  return {
+    user: state.user
+  }
+}
+
+const mapDispatchToProps = {
+}
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PeliasPanel)

From edbe9e96491c04e8764c41b45e94c10a672cf628 Mon Sep 17 00:00:00 2001
From: miles-grant-ibi <miles.grant@ibigroup.com>
Date: Tue, 3 Aug 2021 11:58:31 -0400
Subject: [PATCH 335/553] refactor: type fixes, update tests

---
 __tests__/test-utils/mock-data/manager.js       |  1 +
 lib/common/components/SelectFileModal.js        |  8 ++++----
 lib/common/util/upload-file.js                  |  9 +++------
 .../__tests__/__snapshots__/projects.js.snap    |  1 +
 .../components/deployment/PeliasPanel.js        | 17 ++++++++++++++---
 .../__snapshots__/DeploymentsPanel.js.snap      | 14 ++++++++++++++
 .../__snapshots__/FeedSourceTable.js.snap       |  8 ++++++++
 lib/types/index.js                              |  1 +
 8 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 09cbc6bff..8a507e452 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -64,6 +64,7 @@ export function makeMockDeployment (
     peliasUsername: null,
     peliasPassword: null,
     peliasWebhookUrl: null,
+    peliasCsvFiles: [],
     user: null
   }
 }
diff --git a/lib/common/components/SelectFileModal.js b/lib/common/components/SelectFileModal.js
index 4cf59efc8..fa7717ed7 100644
--- a/lib/common/components/SelectFileModal.js
+++ b/lib/common/components/SelectFileModal.js
@@ -8,7 +8,7 @@ type Props = {
   body?: string,
   errorMessage?: string,
   onClose?: () => void,
-  onConfirm?: (any) => boolean,
+  onConfirm?: (any) => Promise<boolean> | boolean,
   title?: string
 }
 
@@ -16,7 +16,7 @@ type State = {
   body?: string,
   errorMessage?: string,
   onClose?: () => void,
-  onConfirm?: (any) => boolean,
+  onConfirm?: (any) => Promise<boolean> | boolean,
   showModal: boolean,
   title?: string
 }
@@ -50,7 +50,7 @@ export default class SelectFileModal extends Component<Props, State> {
     }
   }
 
-  ok = () => {
+  ok = async () => {
     const {errorMessage: propsErrorMessage, onConfirm: propsConfirm} = this.props
     const {errorMessage: stateErrorMessage, onConfirm: stateConfirm} = this.state
     if (!propsConfirm && !stateConfirm) {
@@ -61,7 +61,7 @@ export default class SelectFileModal extends Component<Props, State> {
     const files = (node && node.files) ? node.files : []
 
     if (propsConfirm) {
-      if (propsConfirm(files)) {
+      if (await propsConfirm(files)) {
         this.close()
       } else {
         this.setState({errorMessage: propsErrorMessage || stateErrorMessage})
diff --git a/lib/common/util/upload-file.js b/lib/common/util/upload-file.js
index 278b76bca..1fb477cee 100644
--- a/lib/common/util/upload-file.js
+++ b/lib/common/util/upload-file.js
@@ -5,16 +5,13 @@ import fetch from 'isomorphic-fetch'
 import {getHeaders} from './util'
 
 export function uploadFile ({
-  file, mimeType, token, url
+  file, token, url
 }: {
-  file: File, mimeType: ?string, token: string, url: string
+  file: File, token: string, url: string
 }) {
-  // This previously defaulted to zip. This is included for backwards compatibility
-  const mime = mimeType || 'application/zip'
-
   return fetch(url, {
     method: 'post',
-    headers: getHeaders(token, true, mime),
+    headers: getHeaders(token, true, 'application/zip'),
     body: file
   })
 }
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 8b67ef5b2..7bc7aa8b5 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -113,6 +113,7 @@ Object {
           "osmExtractUrl": null,
           "otpCommit": null,
           "otpVersion": null,
+          "peliasCsvFiles": Array [],
           "peliasPassword": null,
           "peliasUpdate": null,
           "peliasUsername": null,
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 60cc82900..cdb616f22 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -12,10 +12,12 @@ import {SECURE_API_PREFIX} from '../../../common/constants'
 import type {
   Deployment
 } from '../../../types'
+import type { ManagerUserState } from '../../../types/reducers'
 
 type Props = {
   deployment: Deployment,
   updateDeployment: typeof deploymentActions.updateDeployment,
+  user: ManagerUserState
 }
 
 type State = {
@@ -59,6 +61,12 @@ class PeliasPanel extends Component<Props, State> {
 
   _onConfirmUpload = async (files: Array<File>) => {
     const { user, deployment } = this.props
+    const peliasCsvFiles = deployment.peliasCsvFiles || []
+
+    if (!user.token || user.token === null) {
+      return false
+    }
+
     const file = files[0]
     if (file.type === 'text/csv') {
       const url = `${SECURE_API_PREFIX}deployments/${deployment.id}/upload`
@@ -67,11 +75,12 @@ class PeliasPanel extends Component<Props, State> {
 
       const s3UploadResponse = await fetch(url, {
         method: 'post',
-        headers: getHeaders(user.token, false, null),
+        // $FlowFixMe user.token is tested above, but not detected by flow
+        headers: getHeaders(user.token, false),
         body: formData
       })
       const s3UploadUrl = await s3UploadResponse.text()
-      this._updateDeployment({ 'peliasCsvFiles': [ ...deployment.peliasCsvFiles, s3UploadUrl ] })
+      this._updateDeployment({ 'peliasCsvFiles': [ ...peliasCsvFiles, s3UploadUrl ] })
       return true
     } else {
       return false
@@ -80,6 +89,8 @@ class PeliasPanel extends Component<Props, State> {
 
   _deleteCsvFile = async (url: string) => {
     const { deployment } = this.props
+    if (!deployment.peliasCsvFiles) return
+
     const updatedCsvFiles = deployment.peliasCsvFiles.filter(u => u !== url)
     this._updateDeployment({'peliasCsvFiles': updatedCsvFiles})
   }
@@ -172,7 +183,7 @@ class PeliasPanel extends Component<Props, State> {
               onConfirm={this._onConfirmUpload}
               errorMessage='Uploaded file must be a valid csv file (.csv).'
             />
-            <ul>{deployment.peliasCsvFiles.map(url => this.renderCsvUrl(url, optionsEnabled))}</ul>
+            <ul>{deployment.peliasCsvFiles && deployment.peliasCsvFiles.map(url => this.renderCsvUrl(url, optionsEnabled))}</ul>
             <Button
               style={{ marginTop: '5px' }}
               disabled={!optionsEnabled}
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index ea0a31a88..b3544f084 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -126,6 +126,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "peliasCsvFiles": Array [],
             "peliasPassword": null,
             "peliasUpdate": null,
             "peliasUsername": null,
@@ -162,6 +163,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "peliasCsvFiles": Array [],
             "peliasPassword": null,
             "peliasUpdate": null,
             "peliasUsername": null,
@@ -361,6 +363,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "peliasCsvFiles": Array [],
               "peliasPassword": null,
               "peliasUpdate": null,
               "peliasUsername": null,
@@ -397,6 +400,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "peliasCsvFiles": Array [],
               "peliasPassword": null,
               "peliasUpdate": null,
               "peliasUsername": null,
@@ -648,6 +652,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "peliasCsvFiles": Array [],
                       "peliasPassword": null,
                       "peliasUpdate": null,
                       "peliasUsername": null,
@@ -684,6 +689,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "peliasCsvFiles": Array [],
                       "peliasPassword": null,
                       "peliasUpdate": null,
                       "peliasUsername": null,
@@ -813,6 +819,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "peliasCsvFiles": Array [],
                         "peliasPassword": null,
                         "peliasUpdate": null,
                         "peliasUsername": null,
@@ -849,6 +856,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "peliasCsvFiles": Array [],
                         "peliasPassword": null,
                         "peliasUpdate": null,
                         "peliasUsername": null,
@@ -1190,6 +1198,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "osmExtractUrl": null,
                                 "otpCommit": null,
                                 "otpVersion": null,
+                                "peliasCsvFiles": Array [],
                                 "peliasPassword": null,
                                 "peliasUpdate": null,
                                 "peliasUsername": null,
@@ -1319,6 +1328,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasCsvFiles": Array [],
                                     "peliasPassword": null,
                                     "peliasUpdate": null,
                                     "peliasUsername": null,
@@ -1355,6 +1365,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasCsvFiles": Array [],
                                     "peliasPassword": null,
                                     "peliasUpdate": null,
                                     "peliasUsername": null,
@@ -1602,6 +1613,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "osmExtractUrl": null,
                                 "otpCommit": null,
                                 "otpVersion": null,
+                                "peliasCsvFiles": Array [],
                                 "peliasPassword": null,
                                 "peliasUpdate": null,
                                 "peliasUsername": null,
@@ -1731,6 +1743,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasCsvFiles": Array [],
                                     "peliasPassword": null,
                                     "peliasUpdate": null,
                                     "peliasUsername": null,
@@ -1767,6 +1780,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasCsvFiles": Array [],
                                     "peliasPassword": null,
                                     "peliasUpdate": null,
                                     "peliasUsername": null,
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 8de0e9d9f..514424776 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -125,6 +125,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "osmExtractUrl": null,
             "otpCommit": null,
             "otpVersion": null,
+            "peliasCsvFiles": Array [],
             "peliasPassword": null,
             "peliasUpdate": null,
             "peliasUsername": null,
@@ -420,6 +421,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "osmExtractUrl": null,
               "otpCommit": null,
               "otpVersion": null,
+              "peliasCsvFiles": Array [],
               "peliasPassword": null,
               "peliasUpdate": null,
               "peliasUsername": null,
@@ -694,6 +696,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "osmExtractUrl": null,
                     "otpCommit": null,
                     "otpVersion": null,
+                    "peliasCsvFiles": Array [],
                     "peliasPassword": null,
                     "peliasUpdate": null,
                     "peliasUsername": null,
@@ -899,6 +902,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "osmExtractUrl": null,
                       "otpCommit": null,
                       "otpVersion": null,
+                      "peliasCsvFiles": Array [],
                       "peliasPassword": null,
                       "peliasUpdate": null,
                       "peliasUsername": null,
@@ -1122,6 +1126,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "osmExtractUrl": null,
                         "otpCommit": null,
                         "otpVersion": null,
+                        "peliasCsvFiles": Array [],
                         "peliasPassword": null,
                         "peliasUpdate": null,
                         "peliasUsername": null,
@@ -2999,6 +3004,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "osmExtractUrl": null,
                             "otpCommit": null,
                             "otpVersion": null,
+                            "peliasCsvFiles": Array [],
                             "peliasPassword": null,
                             "peliasUpdate": null,
                             "peliasUsername": null,
@@ -3267,6 +3273,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "osmExtractUrl": null,
                               "otpCommit": null,
                               "otpVersion": null,
+                              "peliasCsvFiles": Array [],
                               "peliasPassword": null,
                               "peliasUpdate": null,
                               "peliasUsername": null,
@@ -3820,6 +3827,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasCsvFiles": Array [],
                                     "peliasPassword": null,
                                     "peliasUpdate": null,
                                     "peliasUsername": null,
diff --git a/lib/types/index.js b/lib/types/index.js
index 97e8f5b7f..8ad4392e1 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -247,6 +247,7 @@ export type Deployment = {
   organizationId: ?string,
   osmExtractUrl: ?string,
   otpVersion: ?string,
+  peliasCsvFiles: ?Array<string>,
   peliasPassword: ?string,
   peliasUpdate: ?boolean,
   peliasUsername: ?string,

From 64d180251d8f422baa2c0e0d79355decb2f2cd34 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 3 Aug 2021 14:24:48 -0400
Subject: [PATCH 336/553] refactor(PeliasPanel): clean up and fix project
 default url feature

---
 .../components/deployment/DeploymentViewer.js |  1 +
 .../components/deployment/PeliasPanel.js      | 58 +++++++++++++++----
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index b82940413..0d95dc9c7 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -418,6 +418,7 @@ export default class DeploymentViewer extends Component<Props, State> {
             {project.pinnedDeploymentId === deployment.id && <PeliasPanel
               deployment={deployment}
               updateDeployment={updateDeployment}
+              project={project}
             />}
           </Col>
         </Row>
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index cdb616f22..bf7858eae 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -11,11 +11,12 @@ import * as deploymentActions from '../../actions/deployments'
 import {SECURE_API_PREFIX} from '../../../common/constants'
 import type {
   Deployment
-} from '../../../types'
+  , Project } from '../../../types'
 import type { ManagerUserState } from '../../../types/reducers'
 
 type Props = {
   deployment: Deployment,
+  project: Project,
   updateDeployment: typeof deploymentActions.updateDeployment,
   user: ManagerUserState
 }
@@ -34,31 +35,47 @@ class PeliasPanel extends Component<Props, State> {
   };
 
   componentDidMount = () => {
-    const { deployment } = this.props
-    // Auto-populate blank field if project has webhook URL in it
+    const { deployment, project } = this.props
     this.setState({
-      peliasWebhookUrl: deployment.peliasWebhookUrl || '',
+    // Auto-populate blank field if project has webhook URL in it
+      peliasWebhookUrl: deployment.peliasWebhookUrl || project.lastUsedPeliasWebhookUrl || '',
       peliasPassword: deployment.peliasPassword || '',
       peliasUsername: deployment.peliasUsername || ''
     })
   };
 
+  /**
+   *  Method fired when Pelias Update checkbox is checked
+   */
   _onChangeUpdatePelias = () =>
     this._updateDeployment({
       peliasUpdate: !this.props.deployment.peliasUpdate
     });
 
-  _onBlurTextInput = (event: SyntheticInputEvent<HTMLInputElement>) => {
+  /**
+   * Updates state on input changes. Does not persist changes to deployment
+   */
+  _onChangeTextInput = (event: SyntheticInputEvent<HTMLInputElement>) => {
     const { target } = event
     const { value, id } = target
-    this._updateDeployment({ [id]: value })
+    this.setState({ [id]: value })
   };
-  _onChangeTextInput = (event: SyntheticInputEvent<HTMLInputElement>) => {
+  /**
+   * Fires when input field is blurred, and persists state changes to the deployment by
+   * making a network request
+  */
+  _onBlurTextInput = (event: SyntheticInputEvent<HTMLInputElement>) => {
     const { target } = event
     const { value, id } = target
-    this.setState({ [id]: value })
+    this._updateDeployment({ [id]: value })
   };
 
+  /**
+   * Takes files submitted via the file uploader modal and sends them to datatools server where they are
+   * uploaded to S3
+   * @param files Array of files returned by the file upload modal
+   * @returns     True or false depending on if the upload was a success
+   */
   _onConfirmUpload = async (files: Array<File>) => {
     const { user, deployment } = this.props
     const peliasCsvFiles = deployment.peliasCsvFiles || []
@@ -87,6 +104,11 @@ class PeliasPanel extends Component<Props, State> {
     }
   }
 
+  /**
+   * Removes a csv file from the list of Pelias csv files associated with a deployment
+   * WARNING: DOES NOT REMOVE THE FILE FROM S3!
+   * @param url   The URL of the csv file to remove from the deployment
+   */
   _deleteCsvFile = async (url: string) => {
     const { deployment } = this.props
     if (!deployment.peliasCsvFiles) return
@@ -95,11 +117,21 @@ class PeliasPanel extends Component<Props, State> {
     this._updateDeployment({'peliasCsvFiles': updatedCsvFiles})
   }
 
+  /**
+   * Persists changes to the deployment object by making a request to the datatools server
+   */
   _updateDeployment = (props: { [string]: any }) => {
     const { deployment, updateDeployment } = this.props
     updateDeployment(deployment, props)
   };
 
+  /**
+   * Renders a csv link associated with the deployment. Renders the file name (or URI if not added by datatools) and
+   * buttons to replace or remove the file
+   * @param {*} url     The URL to add to the list of csv files associated with the deployment
+   * @param {*} enabled Whether the buttons should be enabled
+   * @returns           JSX including the file name and buttons
+   */
   renderCsvUrl = (url: string, enabled: boolean) => {
     // Usually, files will be rendered by https://github.com/ibi-group/datatools-server/blob/dev/src/main/java/com/conveyal/datatools/manager/controllers/api/DeploymentController.java
     // so we can take advantage of a predictable filename
@@ -183,7 +215,12 @@ class PeliasPanel extends Component<Props, State> {
               onConfirm={this._onConfirmUpload}
               errorMessage='Uploaded file must be a valid csv file (.csv).'
             />
-            <ul>{deployment.peliasCsvFiles && deployment.peliasCsvFiles.map(url => this.renderCsvUrl(url, optionsEnabled))}</ul>
+            <ul>
+              {deployment.peliasCsvFiles &&
+                deployment.peliasCsvFiles.map((url) =>
+                  this.renderCsvUrl(url, optionsEnabled)
+                )}
+            </ul>
             <Button
               style={{ marginTop: '5px' }}
               disabled={!optionsEnabled}
@@ -204,8 +241,7 @@ const mapStateToProps = (state, ownProps) => {
   }
 }
 
-const mapDispatchToProps = {
-}
+const mapDispatchToProps = {}
 
 export default connect(
   mapStateToProps,

From 255bb9f901899049e16f1cb27a169d15463210f4 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 3 Aug 2021 15:27:55 -0400
Subject: [PATCH 337/553] refactor(labels): tweak label editor, label actions

---
 lib/common/components/FeedLabel.js    |  2 +-
 lib/manager/actions/labels.js         | 25 +++++++++++++------------
 lib/manager/components/LabelEditor.js | 18 ++++++++++++++----
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/lib/common/components/FeedLabel.js b/lib/common/components/FeedLabel.js
index c70b9bdd5..9936513d5 100644
--- a/lib/common/components/FeedLabel.js
+++ b/lib/common/components/FeedLabel.js
@@ -124,7 +124,7 @@ class FeedLabel extends React.Component<Props, State> {
             <ConfirmModal
               ref='deleteModal'
               title='Delete Label?'
-              body={`Are you sure you want to delete the label ${label.name}?`}
+              body={`Are you sure you want to delete the label ${label.name}? This action will remove the label from all feed sources it's assigned to.`}
               onConfirm={this._onConfirmDelete}
             />
             <LabelEditorModal ref='editModal' label={this.props.label} />
diff --git a/lib/manager/actions/labels.js b/lib/manager/actions/labels.js
index 69194b346..354fb1c5f 100644
--- a/lib/manager/actions/labels.js
+++ b/lib/manager/actions/labels.js
@@ -19,12 +19,17 @@ const LABEL_URL = '/api/manager/secure/label'
 export function createLabel (label: Label) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     return dispatch(secureFetch(LABEL_URL, 'post', label))
-      .then(async (res) => {
-        const createdLabel = await res.json()
-        dispatch(fetchProject(createdLabel.projectId))
-        dispatch(fetchProjectFeeds(createdLabel.projectId))
-        isModuleEnabled('deployment') && dispatch(fetchProjectDeployments(createdLabel.projectId))
-      })
+      .then(res => res.json())
+      .then(createdLabel => dispatch(refetchProject(createdLabel.projectId)))
+  }
+}
+
+function refetchProject (projectId: string) {
+  return async function (dispatch: dispatchFn, getState: getStateFn) {
+    // Wait for project to be fetched before fetching feeds/deployments.
+    await dispatch(fetchProject(projectId))
+    dispatch(fetchProjectFeeds(projectId))
+    isModuleEnabled('deployment') && dispatch(fetchProjectDeployments(projectId))
   }
 }
 
@@ -39,9 +44,7 @@ export function updateLabel (dirtyLabel: Label, properties: {[string]: any}) {
 
   return function (dispatch: dispatchFn, getState: getStateFn) {
     return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'put', {...label}))
-      .then(() => dispatch(fetchProject(label.projectId)))
-      .then(() => dispatch(fetchProjectFeeds(label.projectId)))
-      .then(() => isModuleEnabled('deployment') && dispatch(fetchProjectDeployments(label.projectId)))
+      .then(() => dispatch(refetchProject(label.projectId)))
   }
 }
 
@@ -51,8 +54,6 @@ export function updateLabel (dirtyLabel: Label, properties: {[string]: any}) {
 export function deleteLabel (label: Label) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     return dispatch(secureFetch(`${LABEL_URL}/${label.id}`, 'delete'))
-      .then(() => dispatch(fetchProject(label.projectId)))
-      .then(() => dispatch(fetchProjectFeeds(label.projectId)))
-      .then(() => isModuleEnabled('deployment') && dispatch(fetchProjectDeployments(label.projectId)))
+      .then(() => dispatch(refetchProject(label.projectId)))
   }
 }
diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index ed7477336..ad88ae03f 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -18,6 +18,7 @@ import {
 } from 'react-bootstrap'
 import update from 'react-addons-update'
 import { connect } from 'react-redux'
+import tinycolor from 'tinycolor2'
 
 import { createLabel, updateLabel } from '../../manager/actions/labels'
 import { validationState } from '../util'
@@ -52,7 +53,10 @@ class LabelEditor extends React.Component<Props, State> {
         name: true,
         description: true
       },
-      newLabel: {...this.props.label},
+      newLabel: {
+        color: tinycolor.random().toHexString(),
+        ...this.props.label
+      },
       labelIsNew: false
     }
 
@@ -71,7 +75,7 @@ class LabelEditor extends React.Component<Props, State> {
       else return permissions.isApplicationAdmin() || permissions.canAdministerAnOrganization()
     }
 
-  _onFormChange = ({target}: {target: HTMLInputElement}) => {
+  _onFormChange = ({target}: {target: HtmlInputElement}) => {
     const {checked, name, value: targetValue, type} = target
 
     let valid = targetValue && targetValue.length > 0
@@ -122,7 +126,9 @@ class LabelEditor extends React.Component<Props, State> {
     )
   }
 
-  _onSaveSettings = () => {
+  _onSaveSettings = (e: SyntheticInputEvent<HtmlInputElement>) => {
+    // Prevent form submission query params from attaching to the URL
+    e.preventDefault()
     const {labelIsNew, newLabel: label} = this.state
     const {createLabel, updateLabel} = this.props
 
@@ -149,7 +155,11 @@ class LabelEditor extends React.Component<Props, State> {
             <ListGroupItem>
               <FormGroup validationState={validationState(validation.name)}>
                 <ControlLabel>Name</ControlLabel>
-                <FormControl value={newLabel.name} name={'name'} />
+                <FormControl
+                  maxLength={25}
+                  name={'name'}
+                  value={newLabel.name}
+                />
                 <FormControl.Feedback />
                 <HelpBlock>Required.</HelpBlock>
               </FormGroup>

From 92cdccfa641277ae2de6b4387e4d21c7029085bb Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 3 Aug 2021 15:29:54 -0400
Subject: [PATCH 338/553] refactor(LabelEditor.js): add max length to
 description

---
 lib/manager/components/LabelEditor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index ad88ae03f..fdfe11bfd 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -166,8 +166,9 @@ class LabelEditor extends React.Component<Props, State> {
               <FormGroup>
                 <ControlLabel>Description</ControlLabel>
                 <FormControl
-                  value={newLabel.description}
+                  maxLength={50}
                   name={'description'}
+                  value={newLabel.description}
                 />
                 <FormControl.Feedback />
               </FormGroup>

From 051d5affe3063976a7cf1a945bb3f3bfa5a32bd8 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Tue, 3 Aug 2021 15:31:42 -0400
Subject: [PATCH 339/553] refactor: fix flow

---
 lib/manager/components/LabelEditor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index fdfe11bfd..06d72ee52 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -75,7 +75,7 @@ class LabelEditor extends React.Component<Props, State> {
       else return permissions.isApplicationAdmin() || permissions.canAdministerAnOrganization()
     }
 
-  _onFormChange = ({target}: {target: HtmlInputElement}) => {
+  _onFormChange = ({target}: {target: HTMLInputElement}) => {
     const {checked, name, value: targetValue, type} = target
 
     let valid = targetValue && targetValue.length > 0
@@ -126,7 +126,7 @@ class LabelEditor extends React.Component<Props, State> {
     )
   }
 
-  _onSaveSettings = (e: SyntheticInputEvent<HtmlInputElement>) => {
+  _onSaveSettings = (e: SyntheticInputEvent<HTMLInputElement>) => {
     // Prevent form submission query params from attaching to the URL
     e.preventDefault()
     const {labelIsNew, newLabel: label} = this.state

From 1f67a66dc9f9d0711c8ae19ab8515c9c459bc5c3 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 3 Aug 2021 15:45:35 -0400
Subject: [PATCH 340/553] improvement(PeliasPanel): confirm before delete or
 replace

---
 .../components/deployment/PeliasPanel.js      | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index bf7858eae..1b6d8025c 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -22,6 +22,7 @@ type Props = {
 }
 
 type State = {
+  fileToDeleteOnSuccesfulUpload: string,
   peliasPassword: string,
   peliasUsername: string,
   peliasWebhookUrl: string
@@ -29,6 +30,7 @@ type State = {
 
 class PeliasPanel extends Component<Props, State> {
   state = {
+    fileToDeleteOnSuccesfulUpload: null,
     peliasWebhookUrl: '',
     peliasPassword: '',
     peliasUsername: ''
@@ -78,13 +80,16 @@ class PeliasPanel extends Component<Props, State> {
    */
   _onConfirmUpload = async (files: Array<File>) => {
     const { user, deployment } = this.props
-    const peliasCsvFiles = deployment.peliasCsvFiles || []
+    const { fileToDeleteOnSuccesfulUpload } = this.state
+
+    let peliasCsvFiles = deployment.peliasCsvFiles || []
 
     if (!user.token || user.token === null) {
       return false
     }
 
     const file = files[0]
+    // TODO: more extensive csv validation?
     if (file.type === 'text/csv') {
       const url = `${SECURE_API_PREFIX}deployments/${deployment.id}/upload`
       const formData = new FormData()
@@ -97,6 +102,13 @@ class PeliasPanel extends Component<Props, State> {
         body: formData
       })
       const s3UploadUrl = await s3UploadResponse.text()
+
+      // If a file is set to delete on successful upload, delete it here
+      if (fileToDeleteOnSuccesfulUpload) {
+        peliasCsvFiles = peliasCsvFiles.filter(csv => csv !== fileToDeleteOnSuccesfulUpload)
+        this.setState({ fileToDeleteOnSuccesfulUpload: null })
+      }
+
       this._updateDeployment({ 'peliasCsvFiles': [ ...peliasCsvFiles, s3UploadUrl ] })
       return true
     } else {
@@ -140,10 +152,17 @@ class PeliasPanel extends Component<Props, State> {
     return (
       <li key={url}>
         {fileName}{' '}
-        <Button disabled={!enabled} bsSize='xsmall' onClick={() => { this.refs.uploadModal.open(); this._deleteCsvFile(url) }}>
+        <Button disabled={!enabled} bsSize='xsmall' onClick={() => {
+          this.refs.uploadModal.open()
+          this.setState({fileToDeleteOnSuccesfulUpload: url})
+        }}>
           Replace
         </Button>
-        <Button disabled={!enabled} bsSize='xsmall' onClick={() => this._deleteCsvFile(url)}>Delete</Button>
+        <Button disabled={!enabled} bsSize='xsmall' onClick={() => {
+          if (confirm('Are you sure you want to delete this CSV file?')) {
+            this._deleteCsvFile(url)
+          }
+        }}>Delete</Button>
       </li>
     )
   }
@@ -213,6 +232,7 @@ class PeliasPanel extends Component<Props, State> {
               title='Upload CSV File'
               body='Select a CSV file of POIs to upload:'
               onConfirm={this._onConfirmUpload}
+              onCancel={() => this.setState({fileToDeleteOnSuccesfulUpload: null})}
               errorMessage='Uploaded file must be a valid csv file (.csv).'
             />
             <ul>

From 42a0294a2918ec8b9da4fe36dd8342359095a7d5 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 3 Aug 2021 15:48:57 -0400
Subject: [PATCH 341/553] revert: remove username and password functionality

---
 __tests__/test-utils/mock-data/manager.js     |  2 --
 .../__tests__/__snapshots__/projects.js.snap  |  2 --
 .../components/deployment/PeliasPanel.js      | 36 +++----------------
 .../__snapshots__/DeploymentsPanel.js.snap    | 28 ---------------
 .../__snapshots__/FeedSourceTable.js.snap     | 16 ---------
 lib/types/index.js                            |  2 --
 6 files changed, 4 insertions(+), 82 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 8a507e452..4b072906b 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -61,8 +61,6 @@ export function makeMockDeployment (
     skipOsmExtract: false,
     tripPlannerVersion: 'OTP_1',
     peliasUpdate: null,
-    peliasUsername: null,
-    peliasPassword: null,
     peliasWebhookUrl: null,
     peliasCsvFiles: [],
     user: null
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 7bc7aa8b5..6dc4b72c4 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -114,9 +114,7 @@ Object {
           "otpCommit": null,
           "otpVersion": null,
           "peliasCsvFiles": Array [],
-          "peliasPassword": null,
           "peliasUpdate": null,
-          "peliasUsername": null,
           "peliasWebhookUrl": null,
           "pinnedfeedVersionIds": Array [],
           "projectBounds": Object {
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 1b6d8025c..aa8ce2d22 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -22,27 +22,21 @@ type Props = {
 }
 
 type State = {
-  fileToDeleteOnSuccesfulUpload: string,
-  peliasPassword: string,
-  peliasUsername: string,
+  fileToDeleteOnSuccesfulUpload: string | null,
   peliasWebhookUrl: string
 }
 
 class PeliasPanel extends Component<Props, State> {
   state = {
     fileToDeleteOnSuccesfulUpload: null,
-    peliasWebhookUrl: '',
-    peliasPassword: '',
-    peliasUsername: ''
+    peliasWebhookUrl: ''
   };
 
   componentDidMount = () => {
     const { deployment, project } = this.props
     this.setState({
     // Auto-populate blank field if project has webhook URL in it
-      peliasWebhookUrl: deployment.peliasWebhookUrl || project.lastUsedPeliasWebhookUrl || '',
-      peliasPassword: deployment.peliasPassword || '',
-      peliasUsername: deployment.peliasUsername || ''
+      peliasWebhookUrl: deployment.peliasWebhookUrl || project.lastUsedPeliasWebhookUrl || ''
     })
   };
 
@@ -169,7 +163,7 @@ class PeliasPanel extends Component<Props, State> {
 
   render () {
     const { deployment } = this.props
-    const { peliasWebhookUrl, peliasPassword, peliasUsername } = this.state
+    const { peliasWebhookUrl } = this.state
 
     const optionsEnabled = peliasWebhookUrl !== ''
 
@@ -192,28 +186,6 @@ class PeliasPanel extends Component<Props, State> {
               onChange={this._onChangeTextInput}
               onBlur={this._onBlurTextInput}
             />
-            <h5>Username</h5>
-            <FormControl
-              type='text'
-              id='peliasUsername'
-              disabled={!optionsEnabled}
-              autoComplete='off'
-              placeholder='Webhook Username'
-              value={peliasUsername}
-              onChange={this._onChangeTextInput}
-              onBlur={this._onBlurTextInput}
-            />
-            <h5>Password</h5>
-            <FormControl
-              type='password'
-              id='peliasPassword'
-              disabled={!optionsEnabled}
-              autoComplete='off'
-              placeholder='Webhook Password'
-              value={peliasPassword}
-              onChange={this._onChangeTextInput}
-              onBlur={this._onBlurTextInput}
-            />
           </ListGroupItem>
           <ListGroupItem>
             <h5>Send GTFS feeds to custom geocoder</h5>
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index b3544f084..e838d7328 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -127,9 +127,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "otpCommit": null,
             "otpVersion": null,
             "peliasCsvFiles": Array [],
-            "peliasPassword": null,
             "peliasUpdate": null,
-            "peliasUsername": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
@@ -164,9 +162,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "otpCommit": null,
             "otpVersion": null,
             "peliasCsvFiles": Array [],
-            "peliasPassword": null,
             "peliasUpdate": null,
-            "peliasUsername": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
@@ -364,9 +360,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "otpCommit": null,
               "otpVersion": null,
               "peliasCsvFiles": Array [],
-              "peliasPassword": null,
               "peliasUpdate": null,
-              "peliasUsername": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
@@ -401,9 +395,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "otpCommit": null,
               "otpVersion": null,
               "peliasCsvFiles": Array [],
-              "peliasPassword": null,
               "peliasUpdate": null,
-              "peliasUsername": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
@@ -653,9 +645,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "otpCommit": null,
                       "otpVersion": null,
                       "peliasCsvFiles": Array [],
-                      "peliasPassword": null,
                       "peliasUpdate": null,
-                      "peliasUsername": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
@@ -690,9 +680,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "otpCommit": null,
                       "otpVersion": null,
                       "peliasCsvFiles": Array [],
-                      "peliasPassword": null,
                       "peliasUpdate": null,
-                      "peliasUsername": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
@@ -820,9 +808,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "otpCommit": null,
                         "otpVersion": null,
                         "peliasCsvFiles": Array [],
-                        "peliasPassword": null,
                         "peliasUpdate": null,
-                        "peliasUsername": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
@@ -857,9 +843,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "otpCommit": null,
                         "otpVersion": null,
                         "peliasCsvFiles": Array [],
-                        "peliasPassword": null,
                         "peliasUpdate": null,
-                        "peliasUsername": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
@@ -1199,9 +1183,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "otpCommit": null,
                                 "otpVersion": null,
                                 "peliasCsvFiles": Array [],
-                                "peliasPassword": null,
                                 "peliasUpdate": null,
-                                "peliasUsername": null,
                                 "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
@@ -1329,9 +1311,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasPassword": null,
                                     "peliasUpdate": null,
-                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
@@ -1366,9 +1346,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasPassword": null,
                                     "peliasUpdate": null,
-                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
@@ -1614,9 +1592,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "otpCommit": null,
                                 "otpVersion": null,
                                 "peliasCsvFiles": Array [],
-                                "peliasPassword": null,
                                 "peliasUpdate": null,
-                                "peliasUsername": null,
                                 "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
@@ -1744,9 +1720,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasPassword": null,
                                     "peliasUpdate": null,
-                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
@@ -1781,9 +1755,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasPassword": null,
                                     "peliasUpdate": null,
-                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 514424776..2e21c2d74 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -126,9 +126,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "otpCommit": null,
             "otpVersion": null,
             "peliasCsvFiles": Array [],
-            "peliasPassword": null,
             "peliasUpdate": null,
-            "peliasUsername": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
@@ -422,9 +420,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "otpCommit": null,
               "otpVersion": null,
               "peliasCsvFiles": Array [],
-              "peliasPassword": null,
               "peliasUpdate": null,
-              "peliasUsername": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
@@ -697,9 +693,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "otpCommit": null,
                     "otpVersion": null,
                     "peliasCsvFiles": Array [],
-                    "peliasPassword": null,
                     "peliasUpdate": null,
-                    "peliasUsername": null,
                     "peliasWebhookUrl": null,
                     "pinnedfeedVersionIds": Array [],
                     "projectBounds": Object {
@@ -903,9 +897,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "otpCommit": null,
                       "otpVersion": null,
                       "peliasCsvFiles": Array [],
-                      "peliasPassword": null,
                       "peliasUpdate": null,
-                      "peliasUsername": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
@@ -1127,9 +1119,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "otpCommit": null,
                         "otpVersion": null,
                         "peliasCsvFiles": Array [],
-                        "peliasPassword": null,
                         "peliasUpdate": null,
-                        "peliasUsername": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
@@ -3005,9 +2995,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "otpCommit": null,
                             "otpVersion": null,
                             "peliasCsvFiles": Array [],
-                            "peliasPassword": null,
                             "peliasUpdate": null,
-                            "peliasUsername": null,
                             "peliasWebhookUrl": null,
                             "pinnedfeedVersionIds": Array [],
                             "projectBounds": Object {
@@ -3274,9 +3262,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "otpCommit": null,
                               "otpVersion": null,
                               "peliasCsvFiles": Array [],
-                              "peliasPassword": null,
                               "peliasUpdate": null,
-                              "peliasUsername": null,
                               "peliasWebhookUrl": null,
                               "pinnedfeedVersionIds": Array [],
                               "projectBounds": Object {
@@ -3828,9 +3814,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasPassword": null,
                                     "peliasUpdate": null,
-                                    "peliasUsername": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
diff --git a/lib/types/index.js b/lib/types/index.js
index 8ad4392e1..58666f40a 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -248,9 +248,7 @@ export type Deployment = {
   osmExtractUrl: ?string,
   otpVersion: ?string,
   peliasCsvFiles: ?Array<string>,
-  peliasPassword: ?string,
   peliasUpdate: ?boolean,
-  peliasUsername: ?string,
   peliasWebhookUrl: ?string,
   pinnedfeedVersionIds: Array<string>,
   projectBounds: Bounds,

From 43023fe80fabcd426753f48b7195f314e1307f78 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 4 Aug 2021 08:30:05 -0400
Subject: [PATCH 342/553] refactor(PeliasPanel): move csv upload fetch to redux

---
 lib/manager/actions/deployments.js            | 47 +++++++++++++-
 .../components/deployment/PeliasPanel.js      | 64 +++++--------------
 2 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 174722b3c..fd1f9ac17 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -5,12 +5,13 @@ import { browserHistory } from 'react-router'
 import { createAction, type ActionType } from 'redux-actions'
 
 import { createVoidPayloadAction, secureFetch } from '../../common/actions'
-import { receiveProject } from './projects'
-import { startJobMonitor } from './status'
 import fileDownload from '../../common/util/file-download'
-
 import type {Deployment, Feed, SummarizedFeedVersion} from '../../types'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
+import { getHeaders } from '../../common/util/util'
+
+import { startJobMonitor } from './status'
+import { receiveProject } from './projects'
 
 const DEPLOYMENT_URL = `/api/manager/secure/deployments`
 
@@ -259,6 +260,46 @@ export function updateVersionForFeedSource (
   }
 }
 
+/**
+ * Uploads a csv file to the server, which uploads it to s3. Associates the resulting URL with
+ * a deployment
+ * @param {*} deployment                    The deployment to add the csv file to
+ * @param {*} file                          The csv file to upload
+ * @param {*} fileToDeleteOnSuccesfulUpload A URL to delete from the deployment on a successful upload
+ * @returns                                 false if something fails, otherwise the deployment update
+ */
+export function uploadPeliasWebhookCsvFile (deployment: Deployment, file: File, fileToDeleteOnSuccesfulUpload?: string) {
+  return async function (dispatch: dispatchFn, getState: getStateFn) {
+    const { user } = getState()
+    const { id } = deployment
+    const url = `${DEPLOYMENT_URL}/${id}/upload`
+    let peliasCsvFiles = deployment.peliasCsvFiles || []
+
+    const formData = new FormData()
+    formData.append('file', file)
+
+    // Have to use custom fetch because Spark is very particular about which
+    // headers must accompany a multipart file request
+    const s3UploadResponse = await fetch(url, {
+      method: 'post',
+      headers: getHeaders(user.token, false),
+      body: formData
+    })
+    if (s3UploadResponse.status >= 400) {
+      const errorJson = await s3UploadResponse.json()
+      errorJson && window.alert(errorJson.message || 'Could not upload CSV file')
+      return false
+    }
+    const s3UploadUrl = await s3UploadResponse.text()
+    // If a file is set to delete on successful upload, delete it here
+    if (fileToDeleteOnSuccesfulUpload) {
+      peliasCsvFiles = peliasCsvFiles.filter(csv => csv !== fileToDeleteOnSuccesfulUpload)
+    }
+
+    return dispatch(updateDeployment(deployment, { 'peliasCsvFiles': [ ...peliasCsvFiles, s3UploadUrl ] }))
+  }
+}
+
 /**
  * Increments all feed versions in the deployment to the latest version, except
  * for those that have been pinned to a specific version.
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index aa8ce2d22..360ffe872 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -3,22 +3,24 @@
 import Icon from '@conveyal/woonerf/components/icon'
 import { connect } from 'react-redux'
 import React, { Component } from 'react'
-import { Button, Checkbox, FormControl, ListGroup, ListGroupItem, Panel } from 'react-bootstrap'
+import {
+  Button,
+  Checkbox,
+  FormControl,
+  ListGroup,
+  ListGroupItem,
+  Panel
+} from 'react-bootstrap'
 
 import SelectFileModal from '../../../common/components/SelectFileModal'
-import { getHeaders } from '../../../common/util/util'
-import * as deploymentActions from '../../actions/deployments'
-import {SECURE_API_PREFIX} from '../../../common/constants'
-import type {
-  Deployment
-  , Project } from '../../../types'
-import type { ManagerUserState } from '../../../types/reducers'
+import { updateDeployment, uploadPeliasWebhookCsvFile } from '../../actions/deployments'
+import type { Deployment, Project } from '../../../types'
 
 type Props = {
   deployment: Deployment,
   project: Project,
-  updateDeployment: typeof deploymentActions.updateDeployment,
-  user: ManagerUserState
+  updateDeployment: typeof updateDeployment,
+  uploadPeliasWebhookCsvFile: typeof uploadPeliasWebhookCsvFile
 }
 
 type State = {
@@ -73,41 +75,15 @@ class PeliasPanel extends Component<Props, State> {
    * @returns     True or false depending on if the upload was a success
    */
   _onConfirmUpload = async (files: Array<File>) => {
-    const { user, deployment } = this.props
+    const { deployment, uploadPeliasWebhookCsvFile } = this.props
     const { fileToDeleteOnSuccesfulUpload } = this.state
 
-    let peliasCsvFiles = deployment.peliasCsvFiles || []
-
-    if (!user.token || user.token === null) {
-      return false
-    }
-
     const file = files[0]
     // TODO: more extensive csv validation?
-    if (file.type === 'text/csv') {
-      const url = `${SECURE_API_PREFIX}deployments/${deployment.id}/upload`
-      const formData = new FormData()
-      formData.append('file', file)
-
-      const s3UploadResponse = await fetch(url, {
-        method: 'post',
-        // $FlowFixMe user.token is tested above, but not detected by flow
-        headers: getHeaders(user.token, false),
-        body: formData
-      })
-      const s3UploadUrl = await s3UploadResponse.text()
-
-      // If a file is set to delete on successful upload, delete it here
-      if (fileToDeleteOnSuccesfulUpload) {
-        peliasCsvFiles = peliasCsvFiles.filter(csv => csv !== fileToDeleteOnSuccesfulUpload)
-        this.setState({ fileToDeleteOnSuccesfulUpload: null })
-      }
-
-      this._updateDeployment({ 'peliasCsvFiles': [ ...peliasCsvFiles, s3UploadUrl ] })
-      return true
-    } else {
+    if (file.type !== 'text/csv') {
       return false
     }
+    return uploadPeliasWebhookCsvFile(deployment, file, fileToDeleteOnSuccesfulUpload)
   }
 
   /**
@@ -227,15 +203,9 @@ class PeliasPanel extends Component<Props, State> {
   }
 }
 
-const mapStateToProps = (state, ownProps) => {
-  return {
-    user: state.user
-  }
-}
-
-const mapDispatchToProps = {}
+const mapDispatchToProps = {uploadPeliasWebhookCsvFile}
 
 export default connect(
-  mapStateToProps,
+  null,
   mapDispatchToProps
 )(PeliasPanel)

From ee73fd676970b12ea8fbb1911ef17fd65f4d67ab Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 4 Aug 2021 08:55:14 -0400
Subject: [PATCH 343/553] refactor: fix flow types

---
 lib/manager/actions/deployments.js               | 10 ++++++++--
 lib/manager/components/deployment/PeliasPanel.js |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index fd1f9ac17..602baae5d 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -268,9 +268,13 @@ export function updateVersionForFeedSource (
  * @param {*} fileToDeleteOnSuccesfulUpload A URL to delete from the deployment on a successful upload
  * @returns                                 false if something fails, otherwise the deployment update
  */
-export function uploadPeliasWebhookCsvFile (deployment: Deployment, file: File, fileToDeleteOnSuccesfulUpload?: string) {
+export async function uploadPeliasWebhookCsvFile (deployment: Deployment, file: File, fileToDeleteOnSuccesfulUpload?: string | null) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
     const { user } = getState()
+    if (!user || !user.token) {
+      window.alert('You are not logged in. Please log in again.')
+      return false
+    }
     const { id } = deployment
     const url = `${DEPLOYMENT_URL}/${id}/upload`
     let peliasCsvFiles = deployment.peliasCsvFiles || []
@@ -282,6 +286,7 @@ export function uploadPeliasWebhookCsvFile (deployment: Deployment, file: File,
     // headers must accompany a multipart file request
     const s3UploadResponse = await fetch(url, {
       method: 'post',
+      // $FlowFixMe user is checked above, but Flow doesn't recognize it
       headers: getHeaders(user.token, false),
       body: formData
     })
@@ -296,7 +301,8 @@ export function uploadPeliasWebhookCsvFile (deployment: Deployment, file: File,
       peliasCsvFiles = peliasCsvFiles.filter(csv => csv !== fileToDeleteOnSuccesfulUpload)
     }
 
-    return dispatch(updateDeployment(deployment, { 'peliasCsvFiles': [ ...peliasCsvFiles, s3UploadUrl ] }))
+    await dispatch(updateDeployment(deployment, { 'peliasCsvFiles': [ ...peliasCsvFiles, s3UploadUrl ] }))
+    return true
   }
 }
 
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 360ffe872..c3fa90bc0 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -83,7 +83,9 @@ class PeliasPanel extends Component<Props, State> {
     if (file.type !== 'text/csv') {
       return false
     }
-    return uploadPeliasWebhookCsvFile(deployment, file, fileToDeleteOnSuccesfulUpload)
+    // Without the redundant await, flow is unhappy
+    // eslint-disable-next-line no-return-await
+    return await uploadPeliasWebhookCsvFile(deployment, file, fileToDeleteOnSuccesfulUpload)
   }
 
   /**

From 76d879fd3f9609e92fee57e6088324ec456b2cd1 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 4 Aug 2021 11:13:35 -0400
Subject: [PATCH 344/553] feat(notes): add optional admin-only visibility for
 notes

re #702
---
 i18n/english.yml                              |   7 +-
 lib/manager/components/NoteForm.js            | 103 ++++++++++++++++++
 lib/manager/components/NotesViewer.js         |  87 ++++-----------
 .../components/version/FeedVersionViewer.js   |  11 +-
 lib/types/index.js                            |   3 +-
 5 files changed, 140 insertions(+), 71 deletions(-)
 create mode 100644 lib/manager/components/NoteForm.js

diff --git a/i18n/english.yml b/i18n/english.yml
index 8b68ee371..cf9c39c32 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -487,13 +487,16 @@ components:
     info: "Tip: when changing travel times, consider
     using the 'Normalize stop times' button above to automatically update
     all stop times to the updated travel time."
+  NoteForm:
+    adminOnly: 'Admin only?'
+    new: Post
+    postComment: Post a New Comment
   NotesViewer:
+    adminOnly: 'This message is visible to admins only.'
     all: All Comments
     feedSource: Feed Source
     feedVersion: Version
-    new: Post
     none: No comments.
-    postComment: Post a New Comment
     refresh: Refresh
     title: Comments
   OrganizationList:
diff --git a/lib/manager/components/NoteForm.js b/lib/manager/components/NoteForm.js
new file mode 100644
index 000000000..bbf473105
--- /dev/null
+++ b/lib/manager/components/NoteForm.js
@@ -0,0 +1,103 @@
+// @flow
+
+import Icon from '@conveyal/woonerf/components/icon'
+import React, {Component} from 'react'
+import { Button, Checkbox, Col, FormControl, Media, Panel } from 'react-bootstrap'
+
+import {getComponentMessages} from '../../common/util/config'
+import { getProfileLink } from '../../common/util/util'
+import type {Feed} from '../../types'
+import type {ManagerUserState} from '../../types/reducers'
+
+type Props = {
+  feedSource: Feed,
+  newNotePosted: ({body: string}) => void,
+  stacked?: boolean,
+  user: ManagerUserState
+}
+
+type State = {
+  adminOnly: boolean,
+  body: string
+}
+
+const DEFAULT_STATE = {
+  adminOnly: false,
+  body: ''
+}
+
+export default class NoteForm extends Component<Props, State> {
+  messages = getComponentMessages('NoteForm')
+  state = DEFAULT_STATE
+
+  _onChange = ({target}: {target: HTMLInputElement}) =>
+    this.setState({[target.name]: target.type === 'checkbox' ? target.checked : target.value})
+
+  _onClickPublish = () => {
+    this.props.newNotePosted(this.state)
+    this.setState(DEFAULT_STATE)
+  }
+
+  render () {
+    const {
+      feedSource,
+      stacked,
+      user
+    } = this.props
+    const {Body, Heading, Left} = Media
+    const {adminOnly, body} = this.state
+    const {profile} = user
+    if (!profile) {
+      console.warn('Could not locate user profile', user)
+      return null
+    }
+    const isProjectAdmin = user.permissions && user.permissions.isProjectAdmin(
+      feedSource.projectId, feedSource.organizationId
+    )
+    const userLink = user
+      ? <a href={getProfileLink(profile.email)}>{profile.email}</a>
+      : 'Unknown user'
+    return (
+      <Col xs={12} sm={stacked ? 12 : 4} md={stacked ? 12 : 6}>
+        <h3>{this.messages('postComment')}</h3>
+        <Media>
+          <Left>
+            <img
+              alt={profile.email}
+              width={64}
+              height={64}
+              src={user ? profile.picture : ''} />
+          </Left>
+          <Body>
+            <Panel
+              className='comment-panel'
+              header={<Heading>{userLink}</Heading>}>
+              <FormControl
+                ref='newNoteBody'
+                componentClass='textarea'
+                name='body'
+                value={body}
+                onChange={this._onChange} />
+              <Button
+                className='pull-right'
+                style={{marginTop: '10px'}}
+                disabled={body === ''}
+                onClick={this._onClickPublish}>
+                {this.messages('new')}
+              </Button>
+              {isProjectAdmin &&
+                <Checkbox
+                  name='adminOnly'
+                  onChange={this._onChange}
+                  value={adminOnly}
+                >
+                  <Icon type='lock' /> {this.messages('adminOnly')}
+                </Checkbox>
+              }
+            </Panel>
+          </Body>
+        </Media>
+      </Col>
+    )
+  }
+}
diff --git a/lib/manager/components/NotesViewer.js b/lib/manager/components/NotesViewer.js
index 5da9fd69c..565b7f4a9 100644
--- a/lib/manager/components/NotesViewer.js
+++ b/lib/manager/components/NotesViewer.js
@@ -1,67 +1,46 @@
 // @flow
 
+import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import moment from 'moment'
 import gravatar from 'gravatar'
-import { Panel, Row, Col, Glyphicon, FormControl, Button, ButtonToolbar, Media } from 'react-bootstrap'
+import { Panel, Row, Col, Glyphicon, Button, ButtonToolbar, Media } from 'react-bootstrap'
 
 import {getComponentMessages} from '../../common/util/config'
 import { getProfileLink } from '../../common/util/util'
-
-import type {Feed, Note, FeedVersion} from '../../types'
+import type {Feed, Note} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
+import NoteForm from './NoteForm'
+
 type Props = {
-  feedSource?: Feed,
+  feedSource: Feed,
   newNotePosted: ({body: string}) => void,
   notes: ?Array<Note>,
   notesRequested: () => void,
   stacked?: boolean,
-  type: string,
-  user: ManagerUserState,
-  version?: FeedVersion
+  user: ManagerUserState
 }
 
-type State = {
-  value: string
-}
-
-export default class NotesViewer extends Component<Props, State> {
+export default class NotesViewer extends Component<Props> {
   messages = getComponentMessages('NotesViewer')
-  state = {
-    value: ''
-  }
 
   componentWillMount () {
     this.props.notesRequested()
   }
 
-  _onChangeBody = (evt: SyntheticInputEvent<HTMLInputElement>) =>
-    this.setState({value: evt.target.value})
-
-  _onClickPublish = () => {
-    this.props.newNotePosted({body: this.state.value})
-    this.setState({value: ''})
-  }
-
   _getUserUrl = (email: string): string =>
     gravatar.url(email, {protocol: 'https', s: '100'})
 
   render () {
     const {
+      feedSource,
+      newNotePosted,
       notes,
       notesRequested,
       stacked,
       user
     } = this.props
-    const {profile} = user
-    if (!profile) {
-      console.warn('Could not locate user profile', user)
-      return null
-    }
-    const userLink = user
-      ? <a href={getProfileLink(profile.email)}>{profile.email}</a>
-      : 'Unknown user'
     const {Body, Heading, Left} = Media
     return (
       <Row>
@@ -84,7 +63,7 @@ export default class NotesViewer extends Component<Props, State> {
           </h3>
           {/* List of notes */}
           {notes && notes.length > 0
-            ? notes.map(note => {
+            ? notes.sort((a, b) => b.dateCreated - a.dateCreated).map(note => {
               const noteDate = moment(note.date)
               return (
                 <Media key={note.id}>
@@ -107,6 +86,13 @@ export default class NotesViewer extends Component<Props, State> {
                           <small title={noteDate.format('h:MMa, MMM. DD YYYY')}>
                             commented {noteDate.fromNow()}
                           </small>
+                          {note.adminOnly &&
+                            <span
+                              title={this.messages('adminOnly')}
+                              className='pull-right'>
+                              <Icon type='lock' />
+                            </span>
+                          }
                         </Heading>
                       }>
                       <p>{note.body || '(no content)'}</p>
@@ -118,37 +104,12 @@ export default class NotesViewer extends Component<Props, State> {
             : <p><i>{this.messages('none')}</i></p>
           }
         </Col>
-        {/* Post note form */}
-        <Col xs={12} sm={stacked ? 12 : 4} md={stacked ? 12 : 6}>
-          <h3>{this.messages('postComment')}</h3>
-          <Media>
-            <Left>
-              <img
-                alt={profile.email}
-                width={64}
-                height={64}
-                src={user ? profile.picture : ''} />
-            </Left>
-            <Body>
-              <Panel
-                className='comment-panel'
-                header={<Heading>{userLink}</Heading>}>
-                <FormControl
-                  ref='newNoteBody'
-                  componentClass='textarea'
-                  value={this.state.value}
-                  onChange={this._onChangeBody} />
-                <Button
-                  className='pull-right'
-                  style={{marginTop: '10px'}}
-                  disabled={this.state.value === ''}
-                  onClick={this._onClickPublish}>
-                  {this.messages('new')}
-                </Button>
-              </Panel>
-            </Body>
-          </Media>
-        </Col>
+        <NoteForm
+          feedSource={feedSource}
+          newNotePosted={newNotePosted}
+          stacked={stacked}
+          user={user}
+        />
       </Row>
     )
   }
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 462bac4b1..5ac89ab29 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -18,20 +18,20 @@ import { LinkContainer } from 'react-router-bootstrap'
 import * as versionsActions from '../../actions/versions'
 import {getComponentMessages, isModuleEnabled} from '../../../common/util/config'
 import Loading from '../../../common/components/Loading'
-import DeltaStat from './DeltaStat'
 import * as snapshotActions from '../../../editor/actions/snapshots'
-import FeedVersionReport from './FeedVersionReport'
 import * as plusActions from '../../../gtfsplus/actions/gtfsplus'
 import ActiveGtfsPlusVersionSummary from '../../../gtfsplus/containers/ActiveGtfsPlusVersionSummary'
-import VersionDateLabel from './VersionDateLabel'
 import NotesViewer from '../NotesViewer'
 import {errorPriorityLevels, getTableFatalExceptions} from '../../util/version'
 import GtfsValidationViewer from '../validation/GtfsValidationViewer'
-import VersionButtonToolbar from './VersionButtonToolbar'
-
 import type {Feed, FeedVersion, GtfsPlusValidation, Note, Project} from '../../../types'
 import type {GtfsState, ManagerUserState} from '../../../types/reducers'
 
+import VersionButtonToolbar from './VersionButtonToolbar'
+import VersionDateLabel from './VersionDateLabel'
+import FeedVersionReport from './FeedVersionReport'
+import DeltaStat from './DeltaStat'
+
 export type Props = {
   comparedVersion?: FeedVersion,
   deleteDisabled: ?boolean,
@@ -125,6 +125,7 @@ export default class FeedVersionViewer extends Component<Props> {
                   version={version} />
                 : versionSection === 'comments'
                   ? <NotesViewer
+                    feedSource={feedSource}
                     type='feed-version'
                     stacked
                     user={user}
diff --git a/lib/types/index.js b/lib/types/index.js
index d99eb5c63..c7bf79950 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -7,7 +7,6 @@ import {
   FETCH_FREQUENCIES,
   RETRIEVAL_METHODS
 } from '../common/constants'
-
 import type UserPermissions from '../common/user/UserPermissions'
 
 type InputType =
@@ -154,8 +153,10 @@ type DatatoolsSettings = {
 }
 
 export type Note = {
+  adminOnly: boolean,
   body: string,
   date: number,
+  dateCreated: number,
   id: string,
   type: string,
   userEmail: string

From 918eac69f31a610b9c05278a3c8bf830d0d7f082 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 4 Aug 2021 11:22:00 -0400
Subject: [PATCH 345/553] refactor(FeedVersionViewer): remove unused props

---
 lib/manager/components/version/FeedVersionViewer.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 5ac89ab29..7a8075f9b 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -126,12 +126,9 @@ export default class FeedVersionViewer extends Component<Props> {
                 : versionSection === 'comments'
                   ? <NotesViewer
                     feedSource={feedSource}
-                    type='feed-version'
                     stacked
                     user={user}
-                    version={version}
                     notes={version.notes}
-                    noteCount={version.noteCount}
                     notesRequested={notesRequested}
                     newNotePosted={newNotePosted} />
                   : null

From e52fced352d423d646aa501a60e155abb707cdee Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Wed, 4 Aug 2021 20:11:08 -0400
Subject: [PATCH 346/553] refactor(NoteForm): fix issue with checkbox
 interference

---
 lib/manager/components/NoteForm.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/NoteForm.js b/lib/manager/components/NoteForm.js
index bbf473105..ea3324f48 100644
--- a/lib/manager/components/NoteForm.js
+++ b/lib/manager/components/NoteForm.js
@@ -80,7 +80,8 @@ export default class NoteForm extends Component<Props, State> {
                 onChange={this._onChange} />
               <Button
                 className='pull-right'
-                style={{marginTop: '10px'}}
+                // Ensure button clicking is not obscured by checkbox.
+                style={{marginTop: '10px', position: 'relative', zIndex: 2}}
                 disabled={body === ''}
                 onClick={this._onClickPublish}>
                 {this.messages('new')}

From abda8672a1904abd02e05cc6c8d4edd6370ae9a1 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 5 Aug 2021 10:58:41 -0400
Subject: [PATCH 347/553] refactor(NoteForm): address PR comments, sort props

---
 lib/manager/components/NoteForm.js | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/manager/components/NoteForm.js b/lib/manager/components/NoteForm.js
index ea3324f48..1e569e005 100644
--- a/lib/manager/components/NoteForm.js
+++ b/lib/manager/components/NoteForm.js
@@ -30,8 +30,10 @@ export default class NoteForm extends Component<Props, State> {
   messages = getComponentMessages('NoteForm')
   state = DEFAULT_STATE
 
-  _onChange = ({target}: {target: HTMLInputElement}) =>
-    this.setState({[target.name]: target.type === 'checkbox' ? target.checked : target.value})
+  _onChange = ({target}: {target: HTMLInputElement}) => {
+    const value = target.type === 'checkbox' ? target.checked : target.value
+    this.setState({[target.name]: value})
+  }
 
   _onClickPublish = () => {
     this.props.newNotePosted(this.state)
@@ -54,9 +56,6 @@ export default class NoteForm extends Component<Props, State> {
     const isProjectAdmin = user.permissions && user.permissions.isProjectAdmin(
       feedSource.projectId, feedSource.organizationId
     )
-    const userLink = user
-      ? <a href={getProfileLink(profile.email)}>{profile.email}</a>
-      : 'Unknown user'
     return (
       <Col xs={12} sm={stacked ? 12 : 4} md={stacked ? 12 : 6}>
         <h3>{this.messages('postComment')}</h3>
@@ -64,26 +63,33 @@ export default class NoteForm extends Component<Props, State> {
           <Left>
             <img
               alt={profile.email}
-              width={64}
               height={64}
-              src={user ? profile.picture : ''} />
+              width={64}
+              src={profile.picture} />
           </Left>
           <Body>
             <Panel
               className='comment-panel'
-              header={<Heading>{userLink}</Heading>}>
+              header={
+                <Heading>
+                  <a href={getProfileLink(profile.email)}>{profile.email}</a>
+                </Heading>
+              }
+            >
               <FormControl
-                ref='newNoteBody'
                 componentClass='textarea'
                 name='body'
-                value={body}
-                onChange={this._onChange} />
+                ref='newNoteBody'
+                style={{resize: 'none'}}
+                onChange={this._onChange}
+                value={body} />
               <Button
                 className='pull-right'
+                disabled={body === ''}
+                onClick={this._onClickPublish}
                 // Ensure button clicking is not obscured by checkbox.
                 style={{marginTop: '10px', position: 'relative', zIndex: 2}}
-                disabled={body === ''}
-                onClick={this._onClickPublish}>
+              >
                 {this.messages('new')}
               </Button>
               {isProjectAdmin &&

From fe059a95e46646ce63ab96835ae6e6395f086636 Mon Sep 17 00:00:00 2001
From: Landon Reed <landontreed@gmail.com>
Date: Thu, 5 Aug 2021 15:31:39 -0400
Subject: [PATCH 348/553] refactor(notes): address PR comments

---
 lib/manager/components/NoteForm.js    | 97 ++++++++++++++-------------
 lib/manager/components/NotesViewer.js | 13 ++--
 2 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/lib/manager/components/NoteForm.js b/lib/manager/components/NoteForm.js
index 1e569e005..e2451066f 100644
--- a/lib/manager/components/NoteForm.js
+++ b/lib/manager/components/NoteForm.js
@@ -26,6 +26,10 @@ const DEFAULT_STATE = {
   body: ''
 }
 
+/**
+ * This component shows a form that allows a user to submit a note for either a
+ * feed source or feed version.
+ */
 export default class NoteForm extends Component<Props, State> {
   messages = getComponentMessages('NoteForm')
   state = DEFAULT_STATE
@@ -41,6 +45,7 @@ export default class NoteForm extends Component<Props, State> {
   }
 
   render () {
+    console.log(this.state)
     const {
       feedSource,
       stacked,
@@ -57,54 +62,56 @@ export default class NoteForm extends Component<Props, State> {
       feedSource.projectId, feedSource.organizationId
     )
     return (
-      <Col xs={12} sm={stacked ? 12 : 4} md={stacked ? 12 : 6}>
-        <h3>{this.messages('postComment')}</h3>
-        <Media>
-          <Left>
-            <img
-              alt={profile.email}
-              height={64}
-              width={64}
-              src={profile.picture} />
-          </Left>
-          <Body>
-            <Panel
-              className='comment-panel'
-              header={
-                <Heading>
-                  <a href={getProfileLink(profile.email)}>{profile.email}</a>
-                </Heading>
-              }
-            >
-              <FormControl
-                componentClass='textarea'
-                name='body'
-                ref='newNoteBody'
-                style={{resize: 'none'}}
-                onChange={this._onChange}
-                value={body} />
-              <Button
-                className='pull-right'
-                disabled={body === ''}
-                onClick={this._onClickPublish}
-                // Ensure button clicking is not obscured by checkbox.
-                style={{marginTop: '10px', position: 'relative', zIndex: 2}}
+      <form>
+        <Col xs={12} sm={stacked ? 12 : 4} md={stacked ? 12 : 6}>
+          <h3>{this.messages('postComment')}</h3>
+          <Media>
+            <Left>
+              <img
+                alt={profile.email}
+                height={64}
+                width={64}
+                src={profile.picture} />
+            </Left>
+            <Body>
+              <Panel
+                className='comment-panel'
+                header={
+                  <Heading>
+                    <a href={getProfileLink(profile.email)}>{profile.email}</a>
+                  </Heading>
+                }
               >
-                {this.messages('new')}
-              </Button>
-              {isProjectAdmin &&
-                <Checkbox
-                  name='adminOnly'
+                <FormControl
+                  componentClass='textarea'
+                  name='body'
+                  style={{resize: 'none'}}
                   onChange={this._onChange}
-                  value={adminOnly}
+                  value={body} />
+                <Button
+                  className='pull-right'
+                  disabled={body === ''}
+                  onClick={this._onClickPublish}
+                  // Ensure button clicking is not obscured by checkbox.
+                  style={{marginTop: '10px', position: 'relative', zIndex: 2}}
+                  type='submit'
                 >
-                  <Icon type='lock' /> {this.messages('adminOnly')}
-                </Checkbox>
-              }
-            </Panel>
-          </Body>
-        </Media>
-      </Col>
+                  {this.messages('new')}
+                </Button>
+                {isProjectAdmin &&
+                  <Checkbox
+                    checked={adminOnly}
+                    name='adminOnly'
+                    onChange={this._onChange}
+                  >
+                    <Icon type='lock' /> {this.messages('adminOnly')}
+                  </Checkbox>
+                }
+              </Panel>
+            </Body>
+          </Media>
+        </Col>
+      </form>
     )
   }
 }
diff --git a/lib/manager/components/NotesViewer.js b/lib/manager/components/NotesViewer.js
index 565b7f4a9..0578af75a 100644
--- a/lib/manager/components/NotesViewer.js
+++ b/lib/manager/components/NotesViewer.js
@@ -79,6 +79,12 @@ export default class NotesViewer extends Component<Props> {
                       className='comment-panel'
                       header={
                         <Heading>
+                          {note.adminOnly &&
+                            <Icon
+                              className='pull-right'
+                              title={this.messages('adminOnly')}
+                              type='lock' />
+                          }
                           <a href={getProfileLink(note.userEmail)}>
                             {note.userEmail}
                           </a>
@@ -86,13 +92,6 @@ export default class NotesViewer extends Component<Props> {
                           <small title={noteDate.format('h:MMa, MMM. DD YYYY')}>
                             commented {noteDate.fromNow()}
                           </small>
-                          {note.adminOnly &&
-                            <span
-                              title={this.messages('adminOnly')}
-                              className='pull-right'>
-                              <Icon type='lock' />
-                            </span>
-                          }
                         </Heading>
                       }>
                       <p>{note.body || '(no content)'}</p>

From c3e8b6eb417c7314d1595b1f82a2eac4eb9ecc9a Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 6 Aug 2021 08:11:18 -0400
Subject: [PATCH 349/553] refactor(PeliasPanel): move csv action button clicks
 to class methods

---
 .../components/deployment/PeliasPanel.js      | 41 +++++++++++++++----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index c3fa90bc0..0159f5ea0 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -68,6 +68,24 @@ class PeliasPanel extends Component<Props, State> {
     this._updateDeployment({ [id]: value })
   };
 
+  _onCsvActionButtonClick = (event: SyntheticInputEvent<HTMLInputElement>, url: string) => {
+    const { id } = event.target
+
+    switch (id) {
+      case 'replace':
+        this.refs.uploadModal.open()
+        this.setState({fileToDeleteOnSuccesfulUpload: url})
+        break
+      case 'delete':
+        if (confirm('Are you sure you want to delete this CSV file?')) {
+          this._deleteCsvFile(url)
+        }
+        break
+      default:
+        console.error('CSV button click handler called from outside valid button')
+    }
+  }
+
   /**
    * Takes files submitted via the file uploader modal and sends them to datatools server where they are
    * uploaded to S3
@@ -124,17 +142,22 @@ class PeliasPanel extends Component<Props, State> {
     return (
       <li key={url}>
         {fileName}{' '}
-        <Button disabled={!enabled} bsSize='xsmall' onClick={() => {
-          this.refs.uploadModal.open()
-          this.setState({fileToDeleteOnSuccesfulUpload: url})
-        }}>
+        <Button
+          disabled={!enabled}
+          bsSize='xsmall'
+          id='replace'
+          onClick={(e) => this._onCsvActionButtonClick(e, url)}
+        >
           Replace
         </Button>
-        <Button disabled={!enabled} bsSize='xsmall' onClick={() => {
-          if (confirm('Are you sure you want to delete this CSV file?')) {
-            this._deleteCsvFile(url)
-          }
-        }}>Delete</Button>
+        <Button
+          disabled={!enabled}
+          bsSize='xsmall'
+          id='delete'
+          onClick={(e) => this._onCsvActionButtonClick(e, url)}
+        >
+          Delete
+        </Button>
       </li>
     )
   }

From 45d38380d4404e915c09f33e54f5f2b6e66e3b6a Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 6 Aug 2021 08:12:56 -0400
Subject: [PATCH 350/553] test: update snapshots for merge

---
 .../__tests__/__snapshots__/ActiveProjectViewer.js.snap   | 2 ++
 .../__tests__/__snapshots__/FeedSourceTable.js.snap       | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 684c80ce0..8fd7b6ac6 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -4261,6 +4261,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "id": "mock-project-id",
                                                           "labels": Array [],
                                                           "lastUpdated": 1553236399556,
+                                                          "lastUsedPeliasWebhookUrl": null,
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
@@ -4332,6 +4333,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "id": "mock-project-id",
                                                           "labels": Array [],
                                                           "lastUpdated": 1553236399556,
+                                                          "lastUsedPeliasWebhookUrl": null,
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index c735a18e3..a0d981776 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -3851,6 +3851,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "osmExtractUrl": null,
                                     "otpCommit": null,
                                     "otpVersion": null,
+                                    "peliasCsvFiles": Array [],
+                                    "peliasUpdate": null,
+                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -3915,6 +3918,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "id": "mock-project-with-deployments-id",
                                 "labels": Array [],
                                 "lastUpdated": 1553236399556,
+                                "lastUsedPeliasWebhookUrl": null,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
@@ -4247,6 +4251,9 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                                   "osmExtractUrl": null,
                                                   "otpCommit": null,
                                                   "otpVersion": null,
+                                                  "peliasCsvFiles": Array [],
+                                                  "peliasUpdate": null,
+                                                  "peliasWebhookUrl": null,
                                                   "pinnedfeedVersionIds": Array [],
                                                   "projectBounds": Object {
                                                     "east": 0,
@@ -4311,6 +4318,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                               "id": "mock-project-with-deployments-id",
                                               "labels": Array [],
                                               "lastUpdated": 1553236399556,
+                                              "lastUsedPeliasWebhookUrl": null,
                                               "name": "mock-project-with-deployments",
                                               "organizationId": null,
                                               "otpServers": Array [],

From 3a6c67521105b3b5a190409d25888a332231eda9 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 6 Aug 2021 08:17:39 -0400
Subject: [PATCH 351/553] revert: remove project webhook assistance feature

---
 __tests__/test-utils/mock-data/manager.js              |  1 -
 .../actions/__tests__/__snapshots__/projects.js.snap   |  1 -
 lib/manager/components/deployment/PeliasPanel.js       |  4 ++--
 .../__snapshots__/ActiveProjectViewer.js.snap          |  9 ---------
 .../__tests__/__snapshots__/DeploymentsPanel.js.snap   |  5 -----
 .../__tests__/__snapshots__/FeedSourceTable.js.snap    | 10 ----------
 lib/types/index.js                                     |  1 -
 7 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index f34716f62..2a67ec4a5 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -88,7 +88,6 @@ export const mockProject = {
   feedSources: [],
   id: 'mock-project-id',
   lastUpdated: 1553236399556,
-  lastUsedPeliasWebhookUrl: null,
   labels: [],
   name: 'mock-project',
   organizationId: null,
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 08c14e464..f9fe6a963 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -181,7 +181,6 @@ Object {
       "id": "mock-project-with-deployments-id",
       "labels": Array [],
       "lastUpdated": 1553236399556,
-      "lastUsedPeliasWebhookUrl": null,
       "name": "mock-project-with-deployments",
       "organizationId": null,
       "otpServers": Array [],
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 0159f5ea0..f338b8cac 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -35,10 +35,10 @@ class PeliasPanel extends Component<Props, State> {
   };
 
   componentDidMount = () => {
-    const { deployment, project } = this.props
+    const { deployment } = this.props
     this.setState({
     // Auto-populate blank field if project has webhook URL in it
-      peliasWebhookUrl: deployment.peliasWebhookUrl || project.lastUsedPeliasWebhookUrl || ''
+      peliasWebhookUrl: deployment.peliasWebhookUrl || ''
     })
   };
 
diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 8fd7b6ac6..60069eff1 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -69,7 +69,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
           "id": "mock-project-id",
           "labels": Array [],
           "lastUpdated": 1553236399556,
-          "lastUsedPeliasWebhookUrl": null,
           "name": "mock-project",
           "organizationId": null,
           "otpServers": Array [],
@@ -1936,7 +1935,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "id": "mock-project-id",
                                                           "labels": Array [],
                                                           "lastUpdated": 1553236399556,
-                                                          "lastUsedPeliasWebhookUrl": null,
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
@@ -1983,7 +1981,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                             "id": "mock-project-id",
                                                             "labels": Array [],
                                                             "lastUpdated": 1553236399556,
-                                                            "lastUsedPeliasWebhookUrl": null,
                                                             "name": "mock-project",
                                                             "organizationId": null,
                                                             "otpServers": Array [],
@@ -2103,7 +2100,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                   "id": "mock-project-id",
                                                                   "labels": Array [],
                                                                   "lastUpdated": 1553236399556,
-                                                                  "lastUsedPeliasWebhookUrl": null,
                                                                   "name": "mock-project",
                                                                   "organizationId": null,
                                                                   "otpServers": Array [],
@@ -2154,7 +2150,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                     "id": "mock-project-id",
                                                                     "labels": Array [],
                                                                     "lastUpdated": 1553236399556,
-                                                                    "lastUsedPeliasWebhookUrl": null,
                                                                     "name": "mock-project",
                                                                     "organizationId": null,
                                                                     "otpServers": Array [],
@@ -2224,7 +2219,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                       "id": "mock-project-id",
                                                                       "labels": Array [],
                                                                       "lastUpdated": 1553236399556,
-                                                                      "lastUsedPeliasWebhookUrl": null,
                                                                       "name": "mock-project",
                                                                       "organizationId": null,
                                                                       "otpServers": Array [],
@@ -4145,7 +4139,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "id": "mock-project-id",
                                                           "labels": Array [],
                                                           "lastUpdated": 1553236399556,
-                                                          "lastUsedPeliasWebhookUrl": null,
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
@@ -4261,7 +4254,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "id": "mock-project-id",
                                                           "labels": Array [],
                                                           "lastUpdated": 1553236399556,
-                                                          "lastUsedPeliasWebhookUrl": null,
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
@@ -4333,7 +4325,6 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "id": "mock-project-id",
                                                           "labels": Array [],
                                                           "lastUpdated": 1553236399556,
-                                                          "lastUsedPeliasWebhookUrl": null,
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index 2f4fe4332..e2e17dfd1 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -229,7 +229,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
         "id": "mock-project-with-deployments-id",
         "labels": Array [],
         "lastUpdated": 1553236399556,
-        "lastUsedPeliasWebhookUrl": null,
         "name": "mock-project-with-deployments",
         "organizationId": null,
         "otpServers": Array [],
@@ -465,7 +464,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
           "id": "mock-project-with-deployments-id",
           "labels": Array [],
           "lastUpdated": 1553236399556,
-          "lastUsedPeliasWebhookUrl": null,
           "name": "mock-project-with-deployments",
           "organizationId": null,
           "otpServers": Array [],
@@ -917,7 +915,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     "id": "mock-project-with-deployments-id",
                     "labels": Array [],
                     "lastUpdated": 1553236399556,
-                    "lastUsedPeliasWebhookUrl": null,
                     "name": "mock-project-with-deployments",
                     "organizationId": null,
                     "otpServers": Array [],
@@ -1424,7 +1421,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "id": "mock-project-with-deployments-id",
                                 "labels": Array [],
                                 "lastUpdated": 1553236399556,
-                                "lastUsedPeliasWebhookUrl": null,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
@@ -1836,7 +1832,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "id": "mock-project-with-deployments-id",
                                 "labels": Array [],
                                 "lastUpdated": 1553236399556,
-                                "lastUsedPeliasWebhookUrl": null,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index a0d981776..dd392a4ae 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -193,7 +193,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
         "id": "mock-project-with-deployments-id",
         "labels": Array [],
         "lastUpdated": 1553236399556,
-        "lastUsedPeliasWebhookUrl": null,
         "name": "mock-project-with-deployments",
         "organizationId": null,
         "otpServers": Array [],
@@ -492,7 +491,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
           "id": "mock-project-with-deployments-id",
           "labels": Array [],
           "lastUpdated": 1553236399556,
-          "lastUsedPeliasWebhookUrl": null,
           "name": "mock-project-with-deployments",
           "organizationId": null,
           "otpServers": Array [],
@@ -768,7 +766,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                 "id": "mock-project-with-deployments-id",
                 "labels": Array [],
                 "lastUpdated": 1553236399556,
-                "lastUsedPeliasWebhookUrl": null,
                 "name": "mock-project-with-deployments",
                 "organizationId": null,
                 "otpServers": Array [],
@@ -975,7 +972,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   "id": "mock-project-with-deployments-id",
                   "labels": Array [],
                   "lastUpdated": 1553236399556,
-                  "lastUsedPeliasWebhookUrl": null,
                   "name": "mock-project-with-deployments",
                   "organizationId": null,
                   "otpServers": Array [],
@@ -1202,7 +1198,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "id": "mock-project-with-deployments-id",
                     "labels": Array [],
                     "lastUpdated": 1553236399556,
-                    "lastUsedPeliasWebhookUrl": null,
                     "name": "mock-project-with-deployments",
                     "organizationId": null,
                     "otpServers": Array [],
@@ -3321,7 +3316,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "id": "mock-project-with-deployments-id",
                         "labels": Array [],
                         "lastUpdated": 1553236399556,
-                        "lastUsedPeliasWebhookUrl": null,
                         "name": "mock-project-with-deployments",
                         "organizationId": null,
                         "otpServers": Array [],
@@ -3592,7 +3586,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "id": "mock-project-with-deployments-id",
                           "labels": Array [],
                           "lastUpdated": 1553236399556,
-                          "lastUsedPeliasWebhookUrl": null,
                           "name": "mock-project-with-deployments",
                           "organizationId": null,
                           "otpServers": Array [],
@@ -3918,7 +3911,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "id": "mock-project-with-deployments-id",
                                 "labels": Array [],
                                 "lastUpdated": 1553236399556,
-                                "lastUsedPeliasWebhookUrl": null,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
@@ -4318,7 +4310,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                               "id": "mock-project-with-deployments-id",
                                               "labels": Array [],
                                               "lastUpdated": 1553236399556,
-                                              "lastUsedPeliasWebhookUrl": null,
                                               "name": "mock-project-with-deployments",
                                               "organizationId": null,
                                               "otpServers": Array [],
@@ -4727,7 +4718,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "id": "mock-project-with-deployments-id",
                                 "labels": Array [],
                                 "lastUpdated": 1553236399556,
-                                "lastUsedPeliasWebhookUrl": null,
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
diff --git a/lib/types/index.js b/lib/types/index.js
index 9a57226b0..b3a66ccb1 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -790,7 +790,6 @@ export type Project = {
   isCreating?: boolean,
   labels: Array<Label>,
   lastUpdated: number | string,
-  lastUsedPeliasWebhookUrl: ?string,
   name: string,
   organizationId: ?string,
   otpServers?: Array<OtpServer>,

From bb5a281af5b506931783d2b37cd1d6b6350d1279 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Aug 2021 22:15:38 +0000
Subject: [PATCH 352/553] build(deps): bump path-parse from 1.0.6 to 1.0.7

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6921e28d9..b8164f724 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10391,9 +10391,9 @@ path-key@^3.0.0, path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-platform@~0.11.15:
   version "0.11.15"

From db2101cd90cc3074eb5d87b24d12d5fd35061e58 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Mon, 16 Aug 2021 16:28:55 +0200
Subject: [PATCH 353/553] fix(LabelEditor): show admin-only checkbox to project
 admins

---
 lib/manager/components/LabelEditor.js      | 11 +++--------
 lib/manager/components/LabelEditorModal.js |  2 +-
 lib/manager/components/LabelPanel.js       |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/manager/components/LabelEditor.js b/lib/manager/components/LabelEditor.js
index 06d72ee52..22bb21996 100644
--- a/lib/manager/components/LabelEditor.js
+++ b/lib/manager/components/LabelEditor.js
@@ -69,12 +69,6 @@ class LabelEditor extends React.Component<Props, State> {
       }
     }
 
-    userIsAdmin = (user: ManagerUserState) => {
-      const {permissions} = user
-      if (!permissions) return false
-      else return permissions.isApplicationAdmin() || permissions.canAdministerAnOrganization()
-    }
-
   _onFormChange = ({target}: {target: HTMLInputElement}) => {
     const {checked, name, value: targetValue, type} = target
 
@@ -146,7 +140,8 @@ class LabelEditor extends React.Component<Props, State> {
 
   render () {
     const { newLabel, validation } = this.state
-    const { user } = this.props
+    const { user, projectId } = this.props
+    const isProjectAdmin = user && user.permissions && user.permissions.isProjectAdmin(projectId)
 
     return (
       <Form onChange={(e) => this._onFormChange(e)}>
@@ -186,7 +181,7 @@ class LabelEditor extends React.Component<Props, State> {
                     <FormControl.Feedback />
                   </FormGroup>
                 </Col>
-                {this.userIsAdmin(user) && (
+                {isProjectAdmin && (
                   <Col xs={9}>
                     <Checkbox
                       checked={newLabel.adminOnly}
diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
index ef4930a33..fa6b68657 100644
--- a/lib/manager/components/LabelEditorModal.js
+++ b/lib/manager/components/LabelEditorModal.js
@@ -60,7 +60,7 @@ export default class LabelEditorModal extends React.Component<
           <LabelEditor
             label={label}
             onDone={this.close}
-            projectId={projectId}
+            projectId={projectId || label.projectId}
           />
         </Body>
       </Modal>
diff --git a/lib/manager/components/LabelPanel.js b/lib/manager/components/LabelPanel.js
index 93c758032..e5c198d4f 100644
--- a/lib/manager/components/LabelPanel.js
+++ b/lib/manager/components/LabelPanel.js
@@ -29,7 +29,7 @@ export default class LabelPanel extends Component<Props> {
     const { labels, id: projectId } = project
 
     const projectAdmin =
-      user && user.permissions && user.permissions.isProjectAdmin(project.id)
+      user && user.permissions && user.permissions.isProjectAdmin(projectId)
 
     let labelBody = (
       <div className='noLabelsMessage'>

From a0edbbf579f895d943bad26c7516559d4abea535 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Mon, 16 Aug 2021 16:59:36 -0400
Subject: [PATCH 354/553] refactor(getErrorMessageFromJson): Imporve
 readability

---
 lib/common/actions/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index 4fb72d5b6..05b4f7c37 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -98,7 +98,8 @@ function getErrorMessageFromJson (
     errorMessage = json.message || JSON.stringify(json)
     // if status >= 500 and detail is being overrode, add original network error in small text
     if (status >= 500) {
-      detail = detail ? detail += `\nNetwork error!\n\n(${method} request on ${url})` : `\nNetwork error!\n\n(${method} request on ${url})`
+      const networkMessage = `\nNetwork error!\n\n(${method} request on ${url})`
+      detail = detail ? detail + networkMessage : networkMessage
     }
   }
   console.error(`Error making ${method} request to ${url}: `, errorMessage)

From 472950e2c55f4eda4561a0c8a05e7541f07d1777 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 17 Aug 2021 11:32:04 +0200
Subject: [PATCH 355/553] refactor(LabelEditorModal): clarify projectId
 sourcing

---
 lib/manager/components/LabelEditorModal.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/manager/components/LabelEditorModal.js b/lib/manager/components/LabelEditorModal.js
index fa6b68657..1b9be7ed7 100644
--- a/lib/manager/components/LabelEditorModal.js
+++ b/lib/manager/components/LabelEditorModal.js
@@ -60,6 +60,9 @@ export default class LabelEditorModal extends React.Component<
           <LabelEditor
             label={label}
             onDone={this.close}
+            /* If a new label is being created, project ID will be passed in via props.
+               If an existing label is being edited, extract project ID from the label
+            */
             projectId={projectId || label.projectId}
           />
         </Body>

From 7242f13da7192bc93fb1d537532a92cb68869981 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Tue, 17 Aug 2021 09:38:06 -0400
Subject: [PATCH 356/553] refactor(secureFetch): Avoid string duplicates

---
 lib/common/actions/index.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index 05b4f7c37..4af050455 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -46,18 +46,18 @@ export function secureFetch (
     const body = payload && isJSON
       ? JSON.stringify(payload)
       : payload
+    const basicError = `Error making ${method} request to ${url}`
     return fetch(url, {method, headers, body})
       // Catch basic error during fetch
       .catch(err => {
-        const message = `Error making ${method} request to ${url}`
-        console.error(message, err)
-        return dispatch(setErrorMessage({message}))
+        console.error(basicError, err)
+        return dispatch(setErrorMessage({basicError}))
       })
-      .then(res => dispatch(handleResponse(method, url, res, raw)))
+      .then(res => dispatch(handleResponse(method, url, res, raw, actionOnFail, basicError)))
   }
 }
 
-function handleResponse (method, url, res, raw, actionOnFail) {
+function handleResponse (method, url, res, raw, actionOnFail, basicError) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
     // if raw response is requested
     if (raw) return res
@@ -71,7 +71,7 @@ function handleResponse (method, url, res, raw, actionOnFail) {
     } catch (e) {
       console.warn('Could not parse JSON from error response')
     }
-    const errorMessage = getErrorMessageFromJson(json, status, method, url, actionOnFail)
+    const errorMessage = getErrorMessageFromJson(json, status, method, url, actionOnFail, basicError)
     dispatch(setErrorMessage(errorMessage))
     return null
   }
@@ -82,11 +82,14 @@ function getErrorMessageFromJson (
   status,
   method,
   url,
-  actionOnFail
+  actionOnFail,
+  basicError
 ) {
   let action = 'RELOAD'
   let detail
-  let errorMessage = `Network error!\n\n(${method} request on ${url})`
+  const networkError = `Network error!\n\n(${method} request on ${url})`
+  let errorMessage = networkError
+
   if (status < 500) {
     action = status === 401
       ? 'LOG_IN'
@@ -98,11 +101,10 @@ function getErrorMessageFromJson (
     errorMessage = json.message || JSON.stringify(json)
     // if status >= 500 and detail is being overrode, add original network error in small text
     if (status >= 500) {
-      const networkMessage = `\nNetwork error!\n\n(${method} request on ${url})`
-      detail = detail ? detail + networkMessage : networkMessage
+      detail = detail ? detail + networkError : networkError
     }
   }
-  console.error(`Error making ${method} request to ${url}: `, errorMessage)
+  console.error(basicError, errorMessage)
   return { action, detail, message: errorMessage }
 }
 

From 2972f9b2a9fd7d76337ef6855b2805b818acbfb6 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Tue, 17 Aug 2021 11:02:35 -0400
Subject: [PATCH 357/553] refactor(secureFetch): define getErrorMessage method

---
 lib/common/actions/index.js | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index 4af050455..67d5c595d 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -11,6 +11,14 @@ type ErrorResponse = {
   message?: string
 }
 
+function getErrorMessage (status, method, url) {
+  let errorMessage = `Error (${status}) making ${method} request to ${url}`
+  if (status >= 500) {
+    errorMessage = `Network error (${status})!\n\n(${method} request on ${url})`
+  }
+  return errorMessage
+}
+
 export function createVoidPayloadAction (type: string) {
   return () => ({ type })
 }
@@ -46,18 +54,18 @@ export function secureFetch (
     const body = payload && isJSON
       ? JSON.stringify(payload)
       : payload
-    const basicError = `Error making ${method} request to ${url}`
     return fetch(url, {method, headers, body})
       // Catch basic error during fetch
       .catch(err => {
-        console.error(basicError, err)
-        return dispatch(setErrorMessage({basicError}))
+        const message = getErrorMessage(status, method, url)
+        console.error(message, err)
+        return dispatch(setErrorMessage({message}))
       })
-      .then(res => dispatch(handleResponse(method, url, res, raw, actionOnFail, basicError)))
+      .then(res => dispatch(handleResponse(method, url, res, raw, actionOnFail)))
   }
 }
 
-function handleResponse (method, url, res, raw, actionOnFail, basicError) {
+function handleResponse (method, url, res, raw, actionOnFail) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
     // if raw response is requested
     if (raw) return res
@@ -71,7 +79,7 @@ function handleResponse (method, url, res, raw, actionOnFail, basicError) {
     } catch (e) {
       console.warn('Could not parse JSON from error response')
     }
-    const errorMessage = getErrorMessageFromJson(json, status, method, url, actionOnFail, basicError)
+    const errorMessage = getErrorMessageFromJson(json, status, method, url, actionOnFail)
     dispatch(setErrorMessage(errorMessage))
     return null
   }
@@ -82,29 +90,26 @@ function getErrorMessageFromJson (
   status,
   method,
   url,
-  actionOnFail,
-  basicError
+  actionOnFail
 ) {
   let action = 'RELOAD'
   let detail
-  const networkError = `Network error!\n\n(${method} request on ${url})`
-  let errorMessage = networkError
-
+  let errorMessage = getErrorMessage(status, method, url)
   if (status < 500) {
     action = status === 401
       ? 'LOG_IN'
       : actionOnFail
-    errorMessage = `Unknown (${status}) error occurred while making request`
   }
   if (json) {
     detail = json.detail
-    errorMessage = json.message || JSON.stringify(json)
     // if status >= 500 and detail is being overrode, add original network error in small text
     if (status >= 500) {
-      detail = detail ? detail + networkError : networkError
+      detail = detail ? detail + errorMessage : errorMessage
     }
+    // re-assign error message after it gets used in the detail.
+    errorMessage = json.message || JSON.stringify(json)
   }
-  console.error(basicError, errorMessage)
+  console.error(errorMessage)
   return { action, detail, message: errorMessage }
 }
 

From b2c53217c92bb9b757095f5f34eb4f531a8f95bd Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Wed, 18 Aug 2021 14:32:29 -0400
Subject: [PATCH 358/553] refactor(getErrorMessage): Make status optional

---
 lib/common/actions/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index 67d5c595d..1c17ec125 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -11,8 +11,8 @@ type ErrorResponse = {
   message?: string
 }
 
-function getErrorMessage (status, method, url) {
-  let errorMessage = `Error (${status}) making ${method} request to ${url}`
+function getErrorMessage (method: string, url: string, status?: number) {
+  let errorMessage = status ? `Error (${status}) making ${method} request to ${url}` : `Error making ${method} request to ${url}`
   if (status >= 500) {
     errorMessage = `Network error (${status})!\n\n(${method} request on ${url})`
   }
@@ -57,7 +57,7 @@ export function secureFetch (
     return fetch(url, {method, headers, body})
       // Catch basic error during fetch
       .catch(err => {
-        const message = getErrorMessage(status, method, url)
+        const message = getErrorMessage(method, url)
         console.error(message, err)
         return dispatch(setErrorMessage({message}))
       })
@@ -94,7 +94,7 @@ function getErrorMessageFromJson (
 ) {
   let action = 'RELOAD'
   let detail
-  let errorMessage = getErrorMessage(status, method, url)
+  let errorMessage = getErrorMessage(method, url, status)
   if (status < 500) {
     action = status === 401
       ? 'LOG_IN'

From 30cb8b3b6d8a3dad68754e7c30388a0c7f13cea9 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Mon, 23 Aug 2021 19:33:18 +0100
Subject: [PATCH 359/553] refactor(PeliasPanel): rudimentary error reporting

---
 lib/manager/components/deployment/PeliasPanel.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index f338b8cac..af4bf1198 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -103,7 +103,13 @@ class PeliasPanel extends Component<Props, State> {
     }
     // Without the redundant await, flow is unhappy
     // eslint-disable-next-line no-return-await
-    return await uploadPeliasWebhookCsvFile(deployment, file, fileToDeleteOnSuccesfulUpload)
+    try {
+      return await uploadPeliasWebhookCsvFile(deployment, file, fileToDeleteOnSuccesfulUpload)
+    } catch (error) {
+      // Fixme: Use native modal popup
+      alert(error.message)
+      return false
+    }
   }
 
   /**

From 4103b3a372e10a8d2413c6081b1988e41109905c Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Mon, 23 Aug 2021 19:51:47 +0100
Subject: [PATCH 360/553] improvement(PeliasPanel): avoid empty deployment
 update requests

---
 lib/manager/components/deployment/PeliasPanel.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index af4bf1198..a9066a2fe 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -65,7 +65,12 @@ class PeliasPanel extends Component<Props, State> {
   _onBlurTextInput = (event: SyntheticInputEvent<HTMLInputElement>) => {
     const { target } = event
     const { value, id } = target
-    this._updateDeployment({ [id]: value })
+    const { deployment } = this.props
+
+    // Only make a network request if the value differs
+    if (deployment[id] !== value) {
+      this._updateDeployment({ [id]: value })
+    }
   };
 
   _onCsvActionButtonClick = (event: SyntheticInputEvent<HTMLInputElement>, url: string) => {
@@ -73,6 +78,7 @@ class PeliasPanel extends Component<Props, State> {
 
     switch (id) {
       case 'replace':
+        // Action is launched via a prop of the modal
         this.refs.uploadModal.open()
         this.setState({fileToDeleteOnSuccesfulUpload: url})
         break

From 45c84c7bb932830ffcaa73e4f72358565103dc43 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 24 Aug 2021 09:23:17 +0100
Subject: [PATCH 361/553] refactor(deployments): move csv upload replace to
 server

---
 lib/manager/actions/deployments.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 602baae5d..1211a2efc 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -277,7 +277,11 @@ export async function uploadPeliasWebhookCsvFile (deployment: Deployment, file:
     }
     const { id } = deployment
     const url = `${DEPLOYMENT_URL}/${id}/upload`
-    let peliasCsvFiles = deployment.peliasCsvFiles || []
+
+    const headers = getHeaders(user.token, false)
+    if (fileToDeleteOnSuccesfulUpload) {
+      headers.urlToDelete = fileToDeleteOnSuccesfulUpload
+    }
 
     const formData = new FormData()
     formData.append('file', file)
@@ -286,8 +290,7 @@ export async function uploadPeliasWebhookCsvFile (deployment: Deployment, file:
     // headers must accompany a multipart file request
     const s3UploadResponse = await fetch(url, {
       method: 'post',
-      // $FlowFixMe user is checked above, but Flow doesn't recognize it
-      headers: getHeaders(user.token, false),
+      headers,
       body: formData
     })
     if (s3UploadResponse.status >= 400) {
@@ -295,14 +298,8 @@ export async function uploadPeliasWebhookCsvFile (deployment: Deployment, file:
       errorJson && window.alert(errorJson.message || 'Could not upload CSV file')
       return false
     }
-    const s3UploadUrl = await s3UploadResponse.text()
-    // If a file is set to delete on successful upload, delete it here
-    if (fileToDeleteOnSuccesfulUpload) {
-      peliasCsvFiles = peliasCsvFiles.filter(csv => csv !== fileToDeleteOnSuccesfulUpload)
-    }
-
-    await dispatch(updateDeployment(deployment, { 'peliasCsvFiles': [ ...peliasCsvFiles, s3UploadUrl ] }))
-    return true
+    const updatedDeployment = await s3UploadResponse.json()
+    return dispatch(receiveDeployment(updatedDeployment))
   }
 }
 

From 56154e91ab4c1c7132f4d4187336a77472840133 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 24 Aug 2021 09:25:16 +0100
Subject: [PATCH 362/553] improvement(PeliasPanel): use bootstrap modal to show
 csv upload error

---
 lib/manager/components/deployment/PeliasPanel.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index a9066a2fe..9a7e6eed3 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -14,11 +14,13 @@ import {
 
 import SelectFileModal from '../../../common/components/SelectFileModal'
 import { updateDeployment, uploadPeliasWebhookCsvFile } from '../../actions/deployments'
+import { setErrorMessage } from '../../actions/status'
 import type { Deployment, Project } from '../../../types'
 
 type Props = {
   deployment: Deployment,
   project: Project,
+  setErrorMessage: typeof setErrorMessage,
   updateDeployment: typeof updateDeployment,
   uploadPeliasWebhookCsvFile: typeof uploadPeliasWebhookCsvFile
 }
@@ -112,8 +114,10 @@ class PeliasPanel extends Component<Props, State> {
     try {
       return await uploadPeliasWebhookCsvFile(deployment, file, fileToDeleteOnSuccesfulUpload)
     } catch (error) {
-      // Fixme: Use native modal popup
-      alert(error.message)
+      const { setErrorMessage } = this.props
+      const { message } = error
+      // TODO: a prettier solution than doubled modals
+      setErrorMessage({ title: 'Error while Uploading CSV File', message })
       return false
     }
   }
@@ -240,7 +244,7 @@ class PeliasPanel extends Component<Props, State> {
   }
 }
 
-const mapDispatchToProps = {uploadPeliasWebhookCsvFile}
+const mapDispatchToProps = {uploadPeliasWebhookCsvFile, setErrorMessage}
 
 export default connect(
   null,

From f30c6f0f5dffe5c1d73cf961c9d2d041793c6326 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Mon, 30 Aug 2021 10:29:54 -0400
Subject: [PATCH 363/553] test(getErrorMessage): Address flow error

---
 lib/common/actions/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index 1c17ec125..16f9acef5 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -13,7 +13,7 @@ type ErrorResponse = {
 
 function getErrorMessage (method: string, url: string, status?: number) {
   let errorMessage = status ? `Error (${status}) making ${method} request to ${url}` : `Error making ${method} request to ${url}`
-  if (status >= 500) {
+  if (status && status >= 500) {
     errorMessage = `Network error (${status})!\n\n(${method} request on ${url})`
   }
   return errorMessage

From 9ffcf4dc379872d35a6cf0f371f2688f175f396b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 15:51:01 +0000
Subject: [PATCH 364/553] build(deps): bump tar from 4.4.13 to 4.4.19

Bumps [tar](https://github.com/npm/node-tar) from 4.4.13 to 4.4.19.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.13...v4.4.19)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 60 ++++++++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6921e28d9..49d8c3675 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5717,12 +5717,12 @@ fs-extra@^9.0.0:
     jsonfile "^6.0.1"
     universalify "^1.0.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
-  integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
+fs-minipass@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
   dependencies:
-    minipass "^2.2.1"
+    minipass "^2.6.0"
 
 fs-vacuum@^1.2.10, fs-vacuum@~1.2.10:
   version "1.2.10"
@@ -9107,15 +9107,7 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minipass@^2.2.1, minipass@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minipass@^2.8.6:
+minipass@^2.3.5, minipass@^2.6.0, minipass@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
@@ -9123,12 +9115,12 @@ minipass@^2.8.6:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
-  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+minizlib@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
   dependencies:
-    minipass "^2.2.1"
+    minipass "^2.9.0"
 
 mississippi@^3.0.0:
   version "3.0.0"
@@ -12706,7 +12698,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -13809,17 +13801,17 @@ tar-stream@~1.1.0:
     xtend "^4.0.0"
 
 tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.13:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  version "4.4.19"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
+  integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
   dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
+    chownr "^1.1.4"
+    fs-minipass "^1.2.7"
+    minipass "^2.9.0"
+    minizlib "^1.3.3"
+    mkdirp "^0.5.5"
+    safe-buffer "^5.2.1"
+    yallist "^3.1.1"
 
 temp-dir@^2.0.0:
   version "2.0.0"
@@ -15020,10 +15012,10 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
-  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yallist@^4.0.0:
   version "4.0.0"

From d402ffca67359d4f20283c710918f84890a44a7e Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 1 Sep 2021 11:30:57 +0100
Subject: [PATCH 365/553] improvement(SelectFileModal): disable ok button while
 loading response

---
 lib/common/components/SelectFileModal.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/common/components/SelectFileModal.js b/lib/common/components/SelectFileModal.js
index fa7717ed7..d83e6c29c 100644
--- a/lib/common/components/SelectFileModal.js
+++ b/lib/common/components/SelectFileModal.js
@@ -14,6 +14,7 @@ type Props = {
 
 type State = {
   body?: string,
+  disabled?: boolean,
   errorMessage?: string,
   onClose?: () => void,
   onConfirm?: (any) => Promise<boolean> | boolean,
@@ -23,6 +24,7 @@ type State = {
 
 export default class SelectFileModal extends Component<Props, State> {
   state = {
+    disabled: false,
     errorMessage: '',
     onConfirm: (args: any) => false,
     showModal: false
@@ -39,6 +41,7 @@ export default class SelectFileModal extends Component<Props, State> {
     if (props) {
       this.setState({
         body: props.body,
+        disabled: false,
         errorMessage: props.errorMessage,
         onClose: props.onClose,
         onConfirm: props.onConfirm,
@@ -46,13 +49,17 @@ export default class SelectFileModal extends Component<Props, State> {
         title: props.title
       })
     } else {
-      this.setState({ showModal: true })
+      this.setState({ disabled: false, showModal: true })
     }
   }
 
   ok = async () => {
     const {errorMessage: propsErrorMessage, onConfirm: propsConfirm} = this.props
     const {errorMessage: stateErrorMessage, onConfirm: stateConfirm} = this.state
+
+    // disable buttons while "loading" response
+    this.setState({disabled: true})
+
     if (!propsConfirm && !stateConfirm) {
       return this.close()
     }
@@ -64,20 +71,20 @@ export default class SelectFileModal extends Component<Props, State> {
       if (await propsConfirm(files)) {
         this.close()
       } else {
-        this.setState({errorMessage: propsErrorMessage || stateErrorMessage})
+        this.setState({disabled: false, errorMessage: propsErrorMessage || stateErrorMessage})
       }
     } else if (stateConfirm) {
       if (stateConfirm(files)) {
         this.close()
       } else {
-        this.setState({errorMessage: propsErrorMessage || stateErrorMessage})
+        this.setState({disabled: false, errorMessage: propsErrorMessage || stateErrorMessage})
       }
     }
   }
 
   render () {
     const {Body, Footer, Header, Title} = Modal
-    const {errorMessage} = this.state
+    const {disabled, errorMessage} = this.state
     return (
       <Modal show={this.state.showModal} onHide={this.close}>
         <Header>
@@ -94,8 +101,8 @@ export default class SelectFileModal extends Component<Props, State> {
         </Body>
 
         <Footer>
-          <Button onClick={this.ok}>OK</Button>
-          <Button onClick={this.close}>Cancel</Button>
+          <Button disabled={disabled} onClick={this.ok}>OK</Button>
+          <Button disabled={disabled} onClick={this.close}>Cancel</Button>
         </Footer>
       </Modal>
     )

From 573981b1779ec365de5ce2263cce248ad95e62f7 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 10 Sep 2021 13:42:42 +0100
Subject: [PATCH 366/553] docs(deploying-feeds): add note about Custom Places
 Index panel

---
 docs/user/deploying-feeds.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/user/deploying-feeds.md b/docs/user/deploying-feeds.md
index 00148f6ec..17cb2dba3 100644
--- a/docs/user/deploying-feeds.md
+++ b/docs/user/deploying-feeds.md
@@ -22,6 +22,14 @@ To deploy or update GTFS feeds to OTP:
 7. If you select `Custom` under `Build configuration` or `Router configuration`, enter the desired configuration settings.
 8. Click the `Deploy` dropdown at the top of the main pane, then pick the server on which to perform the deployment. Existing deployments on that server will be discarded.
 
+## Updating the Custom Places Index
+
+A GTFS feed's stops can be sent to a Custom Places Index, should one be set up. You'll need the secret Webhook URL of your Custom Places Index server.
+
+Only a pinned deployment's feed can be sent to a Custom Places Index. When opening a pinned deployment, a `Custom Geocoder Settings` pane appears below the `OTP Configuration` pane. In the text field, paste in the secret Webhook URL for your Custom Places Index server. Once it's entered, the `Update Custom Geocoder` checkbox will be clickable. If it is checked, your Custom Places Index will be updated when deploying the feed.
+
+The pane also has an option to upload Custom POI CSV files. These files contain special landmarks and coordinates which are prioritized when returning geocoder results. You can upload as many custom CSV files as you like. They will all be added to the Custom Places Index.
+
 ## Watching deployments take place
 
 After click Deploy, you can watch the deployment progress from the right-hand panel:

From 3f832614074de2f1b2e1115af38a539c3d5b9e1a Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 14 Sep 2021 13:40:37 +0100
Subject: [PATCH 367/553] refactor(PeliasPanel): implement changes from #712

---
 lib/common/actions/index.js                   | 30 +++++++++++++++++--
 lib/editor/actions/editor.js                  | 19 ++++++------
 lib/manager/actions/deployments.js            | 25 ++++------------
 .../components/deployment/PeliasPanel.js      | 17 ++++-------
 4 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/lib/common/actions/index.js b/lib/common/actions/index.js
index c5c55c360..1b29b5229 100644
--- a/lib/common/actions/index.js
+++ b/lib/common/actions/index.js
@@ -4,14 +4,37 @@ import fetch from 'isomorphic-fetch'
 
 import {GTFS_GRAPHQL_PREFIX} from '../../common/constants'
 import { setErrorMessage } from '../../manager/actions/status'
-
 import type {dispatchFn, getStateFn} from '../../types/reducers'
 
 export function createVoidPayloadAction (type: string) {
   return () => ({ type })
 }
 
-export function secureFetch (url: string, method: string = 'get', payload?: any, raw: boolean = false, isJSON: boolean = true, actionOnFail?: string): any {
+/**
+ * Shorthand fetch call to pass a file as formData on a POST request to the
+ * specified URL.
+ */
+export function postFormData (url: string, file: File, customHeaders?: {[string]: string}) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    if (!file) {
+      alert('No file to upload!')
+      return
+    }
+    const data = new window.FormData()
+    data.append('file', file)
+    return dispatch(secureFetch(url, 'post', data, false, false, undefined, customHeaders))
+  }
+}
+
+export function secureFetch (
+  url: string,
+  method: string = 'get',
+  payload?: any,
+  raw: boolean = false,
+  isJSON: boolean = true,
+  actionOnFail?: string,
+  customHeaders?: {[string]: string}
+): any {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     function consoleError (message) {
       console.error(`Error making ${method} request to ${url}: `, message)
@@ -31,7 +54,8 @@ export function secureFetch (url: string, method: string = 'get', payload?: any,
     }
     const headers: {[string]: string} = {
       'Authorization': `Bearer ${token}`,
-      'Accept': 'application/json'
+      'Accept': 'application/json',
+      ...customHeaders
     }
     if (isJSON) {
       headers['Content-Type'] = 'application/json'
diff --git a/lib/editor/actions/editor.js b/lib/editor/actions/editor.js
index 62f2f6a75..d06d9edc9 100644
--- a/lib/editor/actions/editor.js
+++ b/lib/editor/actions/editor.js
@@ -6,9 +6,13 @@ import moment from 'moment'
 import qs from 'qs'
 import {createAction, type ActionType} from 'redux-actions'
 
-import {createVoidPayloadAction, fetchGraphQL, secureFetch} from '../../common/actions'
+import {
+  createVoidPayloadAction,
+  fetchGraphQL,
+  postFormData,
+  secureFetch
+} from '../../common/actions'
 import {generateUID} from '../../common/util/util'
-import {clearGtfsContent, saveActiveGtfsEntity, setActiveGtfsEntity} from './active'
 import {ENTITY} from '../constants'
 import {
   generateNullProps,
@@ -17,7 +21,6 @@ import {
   getTableById
 } from '../util/gtfs'
 import {fetchGTFSEntities} from '../../manager/actions/versions'
-
 import type {
   dispatchFn,
   getStateFn,
@@ -26,6 +29,8 @@ import type {
   LockState
 } from '../../types/reducers'
 
+import {clearGtfsContent, saveActiveGtfsEntity, setActiveGtfsEntity} from './active'
+
 export const updateEntitySort = createAction('UPDATE_ENTITY_SORT')
 
 const createGtfsEntity = createAction(
@@ -327,16 +332,10 @@ export function uploadBrandingAsset (
   file: File
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
-    if (!file) {
-      console.warn('No file to upload!')
-      return
-    }
-    var data = new window.FormData()
-    data.append('file', file)
     const {sessionId} = getState().editor.data.lock
     const url = `/api/editor/secure/${component}/${entityId}/uploadbranding?feedId=${feedId}&sessionId=${sessionId || ''}`
     // Server handles associating branding asset entity's field
-    return dispatch(secureFetch(url, 'post', data, false, false))
+    return dispatch(postFormData(url, file))
       .then(res => res.json())
       .then(r => {
         const namespace = getEditorNamespace(feedId, getState())
diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 1211a2efc..e731dfd46 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -4,11 +4,10 @@ import qs from 'qs'
 import { browserHistory } from 'react-router'
 import { createAction, type ActionType } from 'redux-actions'
 
-import { createVoidPayloadAction, secureFetch } from '../../common/actions'
+import { createVoidPayloadAction, postFormData, secureFetch } from '../../common/actions'
 import fileDownload from '../../common/util/file-download'
 import type {Deployment, Feed, SummarizedFeedVersion} from '../../types'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
-import { getHeaders } from '../../common/util/util'
 
 import { startJobMonitor } from './status'
 import { receiveProject } from './projects'
@@ -278,28 +277,16 @@ export async function uploadPeliasWebhookCsvFile (deployment: Deployment, file:
     const { id } = deployment
     const url = `${DEPLOYMENT_URL}/${id}/upload`
 
-    const headers = getHeaders(user.token, false)
+    const headers = {}
     if (fileToDeleteOnSuccesfulUpload) {
       headers.urlToDelete = fileToDeleteOnSuccesfulUpload
     }
 
-    const formData = new FormData()
-    formData.append('file', file)
-
-    // Have to use custom fetch because Spark is very particular about which
-    // headers must accompany a multipart file request
-    const s3UploadResponse = await fetch(url, {
-      method: 'post',
-      headers,
-      body: formData
-    })
-    if (s3UploadResponse.status >= 400) {
-      const errorJson = await s3UploadResponse.json()
-      errorJson && window.alert(errorJson.message || 'Could not upload CSV file')
-      return false
+    const s3UploadResponse = await dispatch(postFormData(url, file, headers))
+    if (s3UploadResponse) {
+      const updatedDeployment = await s3UploadResponse.json()
+      return dispatch(receiveDeployment(updatedDeployment))
     }
-    const updatedDeployment = await s3UploadResponse.json()
-    return dispatch(receiveDeployment(updatedDeployment))
   }
 }
 
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 9a7e6eed3..b36f16c37 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -109,17 +109,10 @@ class PeliasPanel extends Component<Props, State> {
     if (file.type !== 'text/csv') {
       return false
     }
-    // Without the redundant await, flow is unhappy
-    // eslint-disable-next-line no-return-await
-    try {
-      return await uploadPeliasWebhookCsvFile(deployment, file, fileToDeleteOnSuccesfulUpload)
-    } catch (error) {
-      const { setErrorMessage } = this.props
-      const { message } = error
-      // TODO: a prettier solution than doubled modals
-      setErrorMessage({ title: 'Error while Uploading CSV File', message })
-      return false
-    }
+
+    // Extra step is required for flow to be appeased
+    const uploadSuccess = await uploadPeliasWebhookCsvFile(deployment, file, fileToDeleteOnSuccesfulUpload)
+    return uploadSuccess
   }
 
   /**
@@ -220,7 +213,7 @@ class PeliasPanel extends Component<Props, State> {
               ref='uploadModal'
               title='Upload CSV File'
               body='Select a CSV file of POIs to upload:'
-              onConfirm={this._onConfirmUpload}
+              onConfirm={async (files) => this._onConfirmUpload(files)}
               onCancel={() => this.setState({fileToDeleteOnSuccesfulUpload: null})}
               errorMessage='Uploaded file must be a valid csv file (.csv).'
             />

From ebefbbf85e9971e7ea9e2c8e2aa9d870d6ee75dc Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 15 Sep 2021 16:55:46 -0400
Subject: [PATCH 368/553] fix(actions/manager/deployments): Suggest zip name
 based on deployment name.

---
 lib/manager/actions/deployments.js | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 174722b3c..f1ec78ec3 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -5,13 +5,13 @@ import { browserHistory } from 'react-router'
 import { createAction, type ActionType } from 'redux-actions'
 
 import { createVoidPayloadAction, secureFetch } from '../../common/actions'
-import { receiveProject } from './projects'
-import { startJobMonitor } from './status'
 import fileDownload from '../../common/util/file-download'
-
 import type {Deployment, Feed, SummarizedFeedVersion} from '../../types'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
 
+import { startJobMonitor } from './status'
+import { receiveProject } from './projects'
+
 const DEPLOYMENT_URL = `/api/manager/secure/deployments`
 
 // Deployment Actions
@@ -132,11 +132,28 @@ export function downloadBuildArtifact (deployment: Deployment, filename: ?string
   }
 }
 
+/**
+ * Set a suggested file name for the given deployment.
+ *
+ * Note: Although a suggested file name is returned in the 'content-disposition' header of the 'download' endpoint,
+ * it is still needed to set it here because we trigger the "Save As" dialog separately from the actual fetch.
+ * Also, it is probably simpler to recompute the file name here instead of extracting it from the response.
+ *
+ * @param deployment The deployment object from which to derive the zip file name.
+ * @returns The suggested zip file name ending in ".zip" for the browser "Save As" dialog.
+ */
+function getDeploymentZipFileName (deployment: Deployment): string {
+  // Remove all spaces and special chars from deployment name.
+  const zipBase = deployment.name.replace(/[^a-zA-Z0-9]/g, '')
+  return `${zipBase}.zip`
+}
+
 export function downloadDeployment (deployment: Deployment) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
+    const zipName = getDeploymentZipFileName(deployment)
     return dispatch(secureFetch(`${DEPLOYMENT_URL}/${deployment.id}/download`))
       .then(response => response.blob())
-      .then(blob => fileDownload(blob, 'test.zip', 'application/zip'))
+      .then(blob => fileDownload(blob, zipName, 'application/zip'))
   }
 }
 

From 910bed2452eb6b175d84ec318c84069ac503832b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Sep 2021 13:38:37 +0000
Subject: [PATCH 369/553] build(deps): bump axios from 0.21.1 to 0.21.4 in
 /scripts

Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 scripts/yarn.lock | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 4d59135a2..97253bfd0 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -130,11 +130,11 @@ auth0@^2.34.2:
     retry "^0.12.0"
 
 axios@^0.21.1:
-  version "0.21.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
-  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+  version "0.21.4"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
-    follow-redirects "^1.10.0"
+    follow-redirects "^1.14.0"
 
 bluebird@^3.5.0:
   version "3.7.2"
@@ -359,10 +359,10 @@ file-uri-to-path@2:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz#7b415aeba227d575851e0a5b0c640d7656403fba"
   integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==
 
-follow-redirects@^1.10.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
-  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+follow-redirects@^1.14.0:
+  version "1.14.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.4.tgz#838fdf48a8bbdd79e52ee51fb1c94e3ed98b9379"
+  integrity sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==
 
 form-data@^3.0.0:
   version "3.0.1"

From ad2b00c99295bfbef840e3f270af331c2163bf16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Sep 2021 23:08:30 +0000
Subject: [PATCH 370/553] build(deps): bump object-path from 0.11.5 to 0.11.8

Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.5 to 0.11.8.
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits)

---
updated-dependencies:
- dependency-name: object-path
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 49d8c3675..e10cb7b95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9837,9 +9837,9 @@ object-keys@^1.0.11, object-keys@^1.0.12:
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-path@^0.11.5:
-  version "0.11.5"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a"
-  integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.8.tgz#ed002c02bbdd0070b78a27455e8ae01fc14d4742"
+  integrity sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==
 
 object-visit@^1.0.0:
   version "1.0.1"

From 1b67956ef466b79404dc30cf8ab2de8a9ec2ae8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Sep 2021 01:26:31 +0000
Subject: [PATCH 371/553] build(deps): bump tmpl from 1.0.4 to 1.0.5

Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 49d8c3675..6590a4a7e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14008,9 +14008,9 @@ tmp@^0.0.33:
     os-tmpdir "~1.0.2"
 
 tmpl@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"

From 59d429a741b40aa19232203bcba3a83b14658b55 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 21 Sep 2021 10:16:09 -0400
Subject: [PATCH 372/553] refactor(PatternStopCard): Clone before updating
 pickup/dropoff stop attribute.

---
 lib/editor/components/pattern/PatternStopCard.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index fbdb4cee7..e5aa5d053 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -1,7 +1,8 @@
 // @flow
 
 import Icon from '@conveyal/woonerf/components/icon'
-import React, {Component} from 'react'
+import clone from 'lodash/cloneDeep'
+import React, { Component } from 'react'
 import { DragSource, DropTarget } from 'react-dnd'
 import {
   Checkbox,
@@ -18,11 +19,11 @@ import * as stopStrategiesActions from '../../actions/map/stopStrategies'
 import * as tripPatternActions from '../../actions/tripPattern'
 import {getEntityName, getAbbreviatedStopName} from '../../util/gtfs'
 import MinuteSecondInput from '../MinuteSecondInput'
+import type {Feed, Pattern, PatternStop} from '../../../types'
+
 import NormalizeStopTimesTip from './NormalizeStopTimesTip'
 import PatternStopButtons from './PatternStopButtons'
 
-import type {Feed, Pattern, PatternStop} from '../../../types'
-
 type Props = {
   active: boolean,
   activePattern: Pattern,
@@ -326,7 +327,9 @@ class PatternStopContents extends Component<Props, State> {
     const {activePattern, index, updatePatternStops} = this.props
     const patternStops = [...activePattern.patternStops]
 
-    patternStops[index][evt.target.id] = selectedOptionValue
+    const newPatternStop = clone(patternStops[index])
+    newPatternStop[evt.target.id] = selectedOptionValue
+    patternStops[index] = newPatternStop
     this.setState({update: true})
     updatePatternStops(activePattern, patternStops)
   }

From 0a5745280b49a6fdff416713f61b62527f7d070e Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Wed, 22 Sep 2021 12:42:52 +0200
Subject: [PATCH 373/553] remove unused var

---
 lib/scenario-editor/utils/valhalla.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/scenario-editor/utils/valhalla.js b/lib/scenario-editor/utils/valhalla.js
index a6842daac..3f967ea2e 100644
--- a/lib/scenario-editor/utils/valhalla.js
+++ b/lib/scenario-editor/utils/valhalla.js
@@ -194,8 +194,7 @@ export async function getSegment (
  *
  * Example URL: https://graphhopper.com/api/1/route?point=49.932707,11.588051&point=50.3404,11.64705&vehicle=car&debug=true&&type=json
  */
-export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopperResponse> {
-  var graphhopper_url
+export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopperResponse> {  
   if (points.length < 2) {
     console.warn('need at least two points to route with graphhopper', points)
     return null

From 548fb245d0622af183781add229e57fc97e99e20 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Wed, 22 Sep 2021 09:54:50 -0400
Subject: [PATCH 374/553] fix(saveEntity, saveTripsForCalendar): Resolve
 missing defaults with GTFS spec change

fix #716, #717
---
 lib/editor/actions/active.js | 23 +++++++++++++++++------
 lib/editor/actions/trip.js   | 10 +++++++++-
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index 49b74d68a..f7bf8fc37 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -6,10 +6,8 @@ import {createAction, type ActionType} from 'redux-actions'
 
 import {createVoidPayloadAction, secureFetch} from '../../common/actions'
 import {ENTITY} from '../constants'
-import {newGtfsEntity, fetchBaseGtfs} from './editor'
 import {fetchFeedSourceAndProject} from '../../manager/actions/feeds'
 import {fetchGTFSEntities} from '../../manager/actions/versions'
-import {saveTripPattern} from './tripPattern'
 import {
   getEditorNamespace,
   getTableById,
@@ -18,10 +16,12 @@ import {
   subSubComponentList
 } from '../util/gtfs'
 import {getMapFromGtfsStrategy, entityIsNew} from '../util/objects'
-
 import type {Entity, Feed} from '../../types'
 import type {dispatchFn, getStateFn, AppState} from '../../types/reducers'
 
+import {saveTripPattern} from './tripPattern'
+import {newGtfsEntity, fetchBaseGtfs} from './editor'
+
 export const clearGtfsContent = createVoidPayloadAction('CLEAR_GTFSEDITOR_CONTENT')
 const receivedNewEntity = createAction(
   'RECEIVE_NEW_ENTITY',
@@ -331,14 +331,25 @@ export function saveEntity (
       return
     }
     dispatch(savingActiveGtfsEntity())
-    const notNew = !entityIsNew(entity)
+    // Add default vals for component
+    const defaults = {}
+    if (component === 'route') {
+      defaults.continuous_pickup = 1 // Default value for no continuous pickup
+      defaults.continuous_drop_off = 1 // Default value for no continuous drop off
+    } else if (component === 'feedinfo') {
+      defaults.default_lang = ''
+      defaults.feed_contact_url = ''
+      defaults.feed_contact_email = ''
+    }
+    const entityWithDefaults = {...defaults, ...(entity: any)} // add defaults, if any.
+    const notNew = !entityIsNew(entityWithDefaults)
     const method = notNew ? 'put' : 'post'
-    const idParam = notNew ? `/${entity.id || ''}` : ''
+    const idParam = notNew ? `/${entityWithDefaults.id || ''}` : ''
     const {sessionId} = getState().editor.data.lock
     const route = component === 'fare' ? 'fareattribute' : component
     const url = `/api/editor/secure/${route}${idParam}?feedId=${feedId}&sessionId=${sessionId || ''}`
     const mappingStrategy = getMapFromGtfsStrategy(component)
-    const data = mappingStrategy(entity)
+    const data = mappingStrategy(entityWithDefaults)
     return dispatch(secureFetch(url, method, data))
       .then(res => res.json())
       .then(savedEntity => {
diff --git a/lib/editor/actions/trip.js b/lib/editor/actions/trip.js
index 8b25515c6..6f65a0cb9 100644
--- a/lib/editor/actions/trip.js
+++ b/lib/editor/actions/trip.js
@@ -7,7 +7,6 @@ import {createVoidPayloadAction, fetchGraphQL, secureFetch} from '../../common/a
 import {setErrorMessage} from '../../manager/actions/status'
 import {entityIsNew} from '../util/objects'
 import {getEditorNamespace} from '../util/gtfs'
-
 import type {Pattern, TimetableColumn, Trip} from '../../types'
 import type {dispatchFn, getStateFn, TripCounts} from '../../types/reducers'
 
@@ -159,6 +158,15 @@ export function saveTripsForCalendar (
     trips = trips.map(snakeCaseKeys)
     return Promise.all(trips.filter(t => t).map((trip, index) => {
       const tripExists = !entityIsNew(trip) && trip.id !== null
+      const tripCopy: any = (trip: any)
+      // Add default value to continuous pickup if not provided
+      const defaults = {
+        continuous_pickup: 1,
+        continuous_drop_off: 1
+      }
+      tripCopy.stop_times = tripCopy.stop_times.map((stopTime, index) => {
+        return {...defaults, ...(stopTime: any)}
+      })
       const method = tripExists ? 'put' : 'post'
       const url = tripExists && trip.id
         ? `/api/editor/secure/trip/${trip.id}?feedId=${feedId}&sessionId=${sessionId}`

From c48bb1826bdeb075763a93734a394a61ed9ba3af Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Wed, 22 Sep 2021 12:26:58 -0400
Subject: [PATCH 375/553] refactor(fetchBaseGtfs, saveTripsForCalendar): Fix
 fetch of new spec fields, address comments

---
 lib/editor/actions/editor.js | 7 +++++--
 lib/editor/actions/trip.js   | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/editor/actions/editor.js b/lib/editor/actions/editor.js
index 62f2f6a75..6d1d97bde 100644
--- a/lib/editor/actions/editor.js
+++ b/lib/editor/actions/editor.js
@@ -8,7 +8,6 @@ import {createAction, type ActionType} from 'redux-actions'
 
 import {createVoidPayloadAction, fetchGraphQL, secureFetch} from '../../common/actions'
 import {generateUID} from '../../common/util/util'
-import {clearGtfsContent, saveActiveGtfsEntity, setActiveGtfsEntity} from './active'
 import {ENTITY} from '../constants'
 import {
   generateNullProps,
@@ -17,7 +16,6 @@ import {
   getTableById
 } from '../util/gtfs'
 import {fetchGTFSEntities} from '../../manager/actions/versions'
-
 import type {
   dispatchFn,
   getStateFn,
@@ -26,6 +24,8 @@ import type {
   LockState
 } from '../../types/reducers'
 
+import {clearGtfsContent, saveActiveGtfsEntity, setActiveGtfsEntity} from './active'
+
 export const updateEntitySort = createAction('UPDATE_ENTITY_SORT')
 
 const createGtfsEntity = createAction(
@@ -384,6 +384,9 @@ export function fetchBaseGtfs ({
             feed_version
             default_route_color
             default_route_type
+            default_lang
+            feed_contact_url
+            feed_contact_email
           }
           agency (limit: -1) {
             id
diff --git a/lib/editor/actions/trip.js b/lib/editor/actions/trip.js
index 6f65a0cb9..752001496 100644
--- a/lib/editor/actions/trip.js
+++ b/lib/editor/actions/trip.js
@@ -1,5 +1,5 @@
 // @flow
-
+import clone from 'lodash/cloneDeep'
 import {createAction, type ActionType} from 'redux-actions'
 
 import {snakeCaseKeys} from '../../common/util/map-keys'
@@ -158,8 +158,9 @@ export function saveTripsForCalendar (
     trips = trips.map(snakeCaseKeys)
     return Promise.all(trips.filter(t => t).map((trip, index) => {
       const tripExists = !entityIsNew(trip) && trip.id !== null
-      const tripCopy: any = (trip: any)
+      const tripCopy: any = clone((trip: any))
       // Add default value to continuous pickup if not provided
+      // Editing continuous pickup/drop off is not currently supported in the schedule editor
       const defaults = {
         continuous_pickup: 1,
         continuous_drop_off: 1

From cda4f65a8dc80f555e1e0aaf167621ffa0cbac0a Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Wed, 22 Sep 2021 14:45:38 -0400
Subject: [PATCH 376/553] refactor(saveTripsForCalendar): Fix missing tripCopy
 ref

---
 lib/editor/actions/trip.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/editor/actions/trip.js b/lib/editor/actions/trip.js
index 752001496..ddef25d49 100644
--- a/lib/editor/actions/trip.js
+++ b/lib/editor/actions/trip.js
@@ -172,7 +172,7 @@ export function saveTripsForCalendar (
       const url = tripExists && trip.id
         ? `/api/editor/secure/trip/${trip.id}?feedId=${feedId}&sessionId=${sessionId}`
         : `/api/editor/secure/trip?feedId=${feedId}&sessionId=${sessionId}`
-      return dispatch(secureFetch(url, method, trip))
+      return dispatch(secureFetch(url, method, tripCopy))
         .then(res => res.json())
         .catch(err => {
           console.warn(err)

From 329a2f7ac0cd5f7ffcef670fd8aded5a49745834 Mon Sep 17 00:00:00 2001
From: Martijn van Laar <martijn@mvanlaar.net>
Date: Thu, 23 Sep 2021 16:39:52 +0200
Subject: [PATCH 377/553] remove trainling space.

---
 lib/scenario-editor/utils/valhalla.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/scenario-editor/utils/valhalla.js b/lib/scenario-editor/utils/valhalla.js
index 3f967ea2e..1e85f46db 100644
--- a/lib/scenario-editor/utils/valhalla.js
+++ b/lib/scenario-editor/utils/valhalla.js
@@ -194,7 +194,7 @@ export async function getSegment (
  *
  * Example URL: https://graphhopper.com/api/1/route?point=49.932707,11.588051&point=50.3404,11.64705&vehicle=car&debug=true&&type=json
  */
-export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopperResponse> {  
+export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopperResponse> {
   if (points.length < 2) {
     console.warn('need at least two points to route with graphhopper', points)
     return null

From c531c5e24274c74db91fe75f4786a58d439441e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Sep 2021 15:40:55 +0000
Subject: [PATCH 378/553] build(deps): bump ansi-regex from 5.0.0 to 5.0.1 in
 /scripts

Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 scripts/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 97253bfd0..75b952865 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -92,9 +92,9 @@ agent-base@6, agent-base@^6.0.0:
     debug "4"
 
 ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^4.0.0:
   version "4.3.0"

From a86e8be735a6403c739cba674e39b92b6440ff6f Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 24 Sep 2021 16:30:22 -0400
Subject: [PATCH 379/553] refactor(EditorInput): Extract route type rendering,
 pass route type value.

---
 lib/editor/components/EditorInput.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 7a33841e7..78de55719 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -9,19 +9,19 @@ import Dropzone from 'react-dropzone'
 
 import * as activeActions from '../actions/active'
 import * as editorActions from '../actions/editor'
-import ColorField from './ColorField'
 import {getEntityName, getTableById} from '../util/gtfs'
 import {FIELD_PROPS} from '../util/types'
 import {doesNotExist} from '../util/validation'
-import VirtualizedEntitySelect from './VirtualizedEntitySelect'
 import TimezoneSelect from '../../common/components/TimezoneSelect'
 import LanguageSelect from '../../common/components/LanguageSelect'
 import toSentenceCase from '../../common/util/to-sentence-case'
-import ZoneSelect from './ZoneSelect'
-
 import type {Entity, Feed, GtfsSpecField, GtfsAgency, GtfsStop} from '../../types'
 import type {EditorTables} from '../../types/reducers'
 
+import ZoneSelect from './ZoneSelect'
+import VirtualizedEntitySelect from './VirtualizedEntitySelect'
+import ColorField from './ColorField'
+
 type Props = {
   activeComponent: string,
   activeEntity?: Entity,
@@ -53,6 +53,10 @@ const entityToOption = (entity: ?Entity, key: string) => {
     : null
 }
 
+const renderRouteTypeOption = ({text, value}: {text: string, value: string}) => (
+  <option key={value} value={value}>{text} ({value})</option>
+)
+
 export default class EditorInput extends React.Component<Props> {
   _onColorChange = (color: any) => {
     const {onChange, updateActiveGtfsEntity, activeEntity, activeComponent, field} = this.props
@@ -120,19 +124,16 @@ export default class EditorInput extends React.Component<Props> {
 
   _renderRouteTypeOptions = (field: GtfsSpecField): Array<React.Node> => {
     const options = field.options || []
-    const toOption = ({value, text}) => (
-      <option key={value}>{text} ({value})</option>
-    )
     // The first 10 options (types 0 - 12) are the standard types found in the
     // GTFS specification. All others represent extended route types.
     const routeTypes = [
       {
         label: 'Standard',
-        options: options.filter(opt => parseInt(opt.value, 10) < 100).map(toOption)
+        options: options.filter(opt => parseInt(opt.value, 10) < 100).map(renderRouteTypeOption)
       },
       {
         label: 'Extended',
-        options: options.filter(opt => parseInt(opt.value, 10) >= 100).map(toOption)
+        options: options.filter(opt => parseInt(opt.value, 10) >= 100).map(renderRouteTypeOption)
       }
     ]
     return routeTypes.map(({label, options}) => (

From 1061f1f70f4512d51ca35cf3b60724d9b628e2de Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 24 Sep 2021 16:32:21 -0400
Subject: [PATCH 380/553] refactor(EditorInput): Reorder imports

---
 lib/editor/components/EditorInput.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 78de55719..fd32a0886 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -18,9 +18,9 @@ import toSentenceCase from '../../common/util/to-sentence-case'
 import type {Entity, Feed, GtfsSpecField, GtfsAgency, GtfsStop} from '../../types'
 import type {EditorTables} from '../../types/reducers'
 
-import ZoneSelect from './ZoneSelect'
-import VirtualizedEntitySelect from './VirtualizedEntitySelect'
 import ColorField from './ColorField'
+import VirtualizedEntitySelect from './VirtualizedEntitySelect'
+import ZoneSelect from './ZoneSelect'
 
 type Props = {
   activeComponent: string,

From 8d3536a157395b8bed77154b0a523974bcf385dc Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 30 Sep 2021 17:44:21 -0400
Subject: [PATCH 381/553] test(HomeProjectDropdown): Reinstate input id dropped
 by #662.

Makes e2e tests pass, hopefully.
---
 lib/manager/components/HomeProjectDropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
index aaf3e567d..699056091 100644
--- a/lib/manager/components/HomeProjectDropdown.js
+++ b/lib/manager/components/HomeProjectDropdown.js
@@ -8,7 +8,6 @@ import { LinkContainer } from 'react-router-bootstrap'
 import Select from 'react-select'
 
 import {getAbbreviatedProjectName} from '../../common/util/util'
-
 import type {Project, ReactSelectOption} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
@@ -58,6 +57,7 @@ export default class HomeProjectDropdown extends Component<Props> {
         <div style={{display: 'flex'}}>
           <div style={{paddingRight: '10px', width: '70%'}}>
             <Select
+              id='context-dropdown'
               onChange={this.handleChange}
               optionRenderer={this._optionRenderer}
               options={options}

From 687125eb57a9658f4236ecaaacf28583425306ae Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 1 Oct 2021 09:25:23 +0100
Subject: [PATCH 382/553] fix(PeliasPanel): support windows csv mime type

---
 lib/manager/components/deployment/PeliasPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index b36f16c37..540f73968 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -106,7 +106,7 @@ class PeliasPanel extends Component<Props, State> {
 
     const file = files[0]
     // TODO: more extensive csv validation?
-    if (file.type !== 'text/csv') {
+    if (file.type !== 'text/csv' && file.type !== 'application/vnd.ms-excel') {
       return false
     }
 

From c7bea571806cdf3047d7f4ee6c1b10ff02343ef2 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Oct 2021 12:10:09 -0400
Subject: [PATCH 383/553] test(FeedVersionSpanChart): Add element attrs for e2e
 tests.

---
 __tests__/end-to-end.js                       | 38 ++++++++-------
 .../version/FeedVersionSpanChart.js           | 48 +++++++++++--------
 2 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index dd083ca9a..af0ca3b5a 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -259,6 +259,20 @@ async function expectSelectorToNotContainHtml (selector: string, html: string) {
   expect(innerHTML).not.toContain(html)
 }
 
+/**
+ * Checks that the expected feed version validity dates are displayed.
+ */
+async function expectFeedVersionValidityDates (startDate: string, endDate: string) {
+  await expectSelectorToContainHtml(
+    '[data-test-id="active-feed-version-validity-start"]',
+    startDate
+  )
+  await expectSelectorToContainHtml(
+    '[data-test-id="active-feed-version-validity-end"]',
+    endDate
+  )
+}
+
 /**
  * Create a new project.  Assumes that this is called while the browser is on
  * the home page.
@@ -1085,13 +1099,10 @@ describe('end-to-end', () => {
       await uploadGtfs()
 
       // wait for main tab to show up with version validity info
-      await waitForSelector('[data-test-id="feed-version-validity"]')
+      await waitForSelector('[data-test-id="active-feed-version-validity-start"]')
 
       // verify feed was uploaded
-      await expectSelectorToContainHtml(
-        '[data-test-id="feed-version-validity"]',
-        'Valid from Jan. 01, 2014 to Dec. 31, 2018'
-      )
+      await expectFeedVersionValidityDates('Jan 1, 2014', 'Dec 31, 2018')
     }, defaultTestTimeout)
 
     // this test also sets the feed source as deployable
@@ -1132,10 +1143,7 @@ describe('end-to-end', () => {
       await wait(2000, 'for feed source to update')
 
       // verify that feed was fetched and processed
-      await expectSelectorToContainHtml(
-        '[data-test-id="feed-version-validity"]',
-        'Valid from Apr. 08, 2018 to Jun. 30, 2018'
-      )
+      await expectFeedVersionValidityDates('Apr 08, 2018', 'Jun 30, 2018')
     }, defaultTestTimeout)
 
     if (doNonEssentialSteps) {
@@ -1245,10 +1253,7 @@ describe('end-to-end', () => {
         await wait(2000, 'for data to refresh')
         await waitForSelector('#feed-source-viewer-tabs')
         // verify that the previous feed is now the displayed feed
-        await expectSelectorToContainHtml(
-          '[data-test-id="feed-version-validity"]',
-          'Valid from Apr. 08, 2018 to Jun. 30, 2018'
-        )
+        await expectFeedVersionValidityDates('Apr 08, 2018', 'Jun 30, 2018')
       }, defaultTestTimeout)
     }
   })
@@ -2657,13 +2662,10 @@ describe('end-to-end', () => {
       await click('#feed-source-viewer-tabs-tab-')
 
       // wait for main tab to show up with version validity info
-      await waitForSelector('[data-test-id="feed-version-validity"]')
+      await waitForSelector('[data-test-id="active-feed-version-validity-start"]')
 
       // verify that snapshot was made active version
-      await expectSelectorToContainHtml(
-        '[data-test-id="feed-version-validity"]',
-        'Valid from May. 29, 2018 to May. 29, 2028'
-      )
+      await expectFeedVersionValidityDates('May 29, 2018', 'May 29, 2028')
     }, defaultTestTimeout, 'should create snapshot')
 
     // TODO: download and validate gtfs??
diff --git a/lib/manager/components/version/FeedVersionSpanChart.js b/lib/manager/components/version/FeedVersionSpanChart.js
index 8fbd7afdd..ddb23f518 100644
--- a/lib/manager/components/version/FeedVersionSpanChart.js
+++ b/lib/manager/components/version/FeedVersionSpanChart.js
@@ -4,9 +4,10 @@ import moment from 'moment'
 import React, { Component } from 'react'
 import { OverlayTrigger, Tooltip } from 'react-bootstrap'
 
-import VersionDateLabel from './VersionDateLabel'
 import type { FeedVersion, Style } from '../../../types'
 
+import VersionDateLabel from './VersionDateLabel'
+
 type Props = {
   activeVersion: FeedVersion,
   comparedVersion?: ?FeedVersion,
@@ -84,9 +85,9 @@ export default class FeedVersionSpanChart extends Component<Props> {
         {/* Chart Spans */}
         <div style={{ minHeight: HEIGHT_PROP, position: 'relative', width: '400px' }}>
           <FeedSpanWithDates
-            name='active'
             firstDate={firstDate}
             lastDate={lastDate}
+            name='active'
             top={0}
             versionEndDate={activeEndDate}
             versionLabel={<VersionDateLabel version={activeVersion} />}
@@ -103,9 +104,9 @@ export default class FeedVersionSpanChart extends Component<Props> {
             />}
           {comparedVersion &&
             <FeedSpanWithDates
-              name='compared'
               firstDate={firstDate}
               lastDate={lastDate}
+              name='compared'
               top={`${(hasGap ? 2 : 1) * HEIGHT_EM}em`}
               versionEndDate={comparedEndDate}
               versionLabel={<VersionDateLabel version={comparedVersion} />}
@@ -123,13 +124,16 @@ export default class FeedVersionSpanChart extends Component<Props> {
  * Render a span of the chart with date labels.
  * FIXME[React 16.2+]: Extract into <>...</> markup.
  */
-const FeedSpanWithDates = ({name, ...props}) => (
-  <div>
-    <FeedStartLabel key={`${name}-start`} {...props} />
-    <FeedEndLabel key={`${name}-end`} {...props} />
-    <FeedSpan key={`${name}-span`} {...props} isServiceGap={false} />
-  </div>
-)
+const FeedSpanWithDates = props => {
+  const { name } = props
+  return (
+    <div>
+      <FeedStartLabel key={`${name}-start`} {...props} />
+      <FeedEndLabel key={`${name}-end`} {...props} />
+      <FeedSpan key={`${name}-span`} {...props} isServiceGap={false} />
+    </div>
+  )
+}
 
 /**
  * Compute label position and sizing info.
@@ -163,9 +167,7 @@ const FeedSpan = props => {
   return (
     <OverlayTrigger
       overlay={(
-        <Tooltip
-          id='feed-span'
-        >
+        <Tooltip id='feed-span'>
           {isServiceGap && 'No service for'}{' '}
           {daysActive} days
         </Tooltip>
@@ -179,7 +181,8 @@ const FeedSpan = props => {
           position: 'absolute',
           top,
           width: `${relativeLength * BAR_WIDTH_PX}px`
-        }}>
+        }}
+      >
         <span
           style={{
             backgroundColor: isServiceGap ? 'red' : 'grey',
@@ -198,10 +201,11 @@ const FeedSpan = props => {
  * Renders a validity span START label (needs to be separate from the span itself for Z order).
  */
 const FeedStartLabel = props => {
-  const { top } = props
+  const { name, top } = props
   const { relativeOffset, startLabel } = getRenderVars(props)
   return (
     <span
+      data-test-id={`${name}-feed-version-validity-start`}
       style={{
         left: `${relativeOffset * BAR_WIDTH_PX}px`,
         position: 'absolute',
@@ -209,7 +213,8 @@ const FeedStartLabel = props => {
         top,
         width: `${DATE_WIDTH_PX}px`,
         zIndex: DATE_LABEL_ZINDEX
-      }}>
+      }}
+    >
       {startLabel}
     </span>
   )
@@ -219,7 +224,7 @@ const FeedStartLabel = props => {
  * Renders a validity span END label (needs to be separate from the span itself for Z order).
  */
 const FeedEndLabel = props => {
-  const { top, versionLabel } = props
+  const { name, top, versionLabel } = props
   const {
     endLabel,
     relativeLength,
@@ -234,8 +239,13 @@ const FeedEndLabel = props => {
         top,
         whiteSpace: 'nowrap',
         zIndex: DATE_LABEL_ZINDEX
-      }}>
-      {endLabel} {versionLabel}
+      }}
+    >
+      <span data-test-id={`${name}-feed-version-validity-end`}>
+        {endLabel}
+      </span>
+      {' '}
+      {versionLabel}
     </span>
   )
 }

From f3eae846b0af97224a25308c5bf7db4af355660d Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Oct 2021 12:14:45 -0400
Subject: [PATCH 384/553] ci(e2e): Temporary force running e2e tests to see if
 they work.

---
 scripts/check-if-e2e-should-run-on-ci.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/check-if-e2e-should-run-on-ci.sh b/scripts/check-if-e2e-should-run-on-ci.sh
index 08f1b0a0d..113464c13 100755
--- a/scripts/check-if-e2e-should-run-on-ci.sh
+++ b/scripts/check-if-e2e-should-run-on-ci.sh
@@ -16,6 +16,6 @@ if [[ "$SHOULD_RUN_E2E" != "true" ]]; then
 fi
 
 # Optionally override the conditions above with the below block:
-# OVERRIDE=true
-# echo "SHOULD_RUN_E2E=${OVERRIDE}" >> $GITHUB_ENV && export SHOULD_RUN_E2E=${OVERRIDE}
-# echo "Overriding E2E. Temporarily forcing to be ${OVERRIDE}..."
+OVERRIDE=true
+echo "SHOULD_RUN_E2E=${OVERRIDE}" >> $GITHUB_ENV && export SHOULD_RUN_E2E=${OVERRIDE}
+echo "Overriding E2E. Temporarily forcing to be ${OVERRIDE}..."

From e23d9d2f6ae8734004ab77308a522af01c6d215f Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Oct 2021 12:34:50 -0400
Subject: [PATCH 385/553] test(e2e): Fix date formats.

---
 __tests__/end-to-end.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index af0ca3b5a..d6fd4ab84 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -1143,7 +1143,7 @@ describe('end-to-end', () => {
       await wait(2000, 'for feed source to update')
 
       // verify that feed was fetched and processed
-      await expectFeedVersionValidityDates('Apr 08, 2018', 'Jun 30, 2018')
+      await expectFeedVersionValidityDates('Apr 8, 2018', 'Jun 30, 2018')
     }, defaultTestTimeout)
 
     if (doNonEssentialSteps) {
@@ -1253,7 +1253,7 @@ describe('end-to-end', () => {
         await wait(2000, 'for data to refresh')
         await waitForSelector('#feed-source-viewer-tabs')
         // verify that the previous feed is now the displayed feed
-        await expectFeedVersionValidityDates('Apr 08, 2018', 'Jun 30, 2018')
+        await expectFeedVersionValidityDates('Apr 8, 2018', 'Jun 30, 2018')
       }, defaultTestTimeout)
     }
   })

From ce5a8e6a55e440abd97d3c426b1608639c9485ee Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 4 Oct 2021 16:00:13 -0400
Subject: [PATCH 386/553] test(e2e): Try datatools-server jar that runs
 otp-runner during e2e.

---
 __tests__/test-utils/setup-e2e.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index effb943e6..3bd034662 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -19,7 +19,7 @@ const {
   writeYamlFile
 } = require('./utils')
 
-const serverJarFilename = 'dt-latest-dev.jar'
+const serverJarFilename = 'dt-latest-fix-otp-runner-e2e.jar' // 'dt-latest-dev.jar'
 const ENV_YML_VARIABLES = [
   'AUTH0_CLIENT_ID',
   'AUTH0_DOMAIN',
@@ -483,6 +483,8 @@ module.exports = async function () {
   if (isCi) {
     setupItems.push(setupForContinuousIntegrationEnvironment())
   } else {
+    await startOtp()
+    await execa('sleep', ['5s'])
     setupItems.push(verifySetupForLocalEnvironment())
   }
   if (collectingCoverage) setupItems.push(startCoverageServer())

From b1f3da668a2dad6f403f455c1448079ebf293b26 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 5 Oct 2021 10:27:22 -0400
Subject: [PATCH 387/553] test(e2e): Fix OTP query e2e test

---
 __tests__/end-to-end.js           | 11 +++++++++--
 __tests__/test-utils/setup-e2e.js |  3 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index d6fd4ab84..17a638063 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -9,6 +9,7 @@ import md5File from 'md5-file/promise'
 import moment from 'moment'
 import SimpleNodeLogger from 'simple-node-logger'
 import uuidv4 from 'uuid/v4'
+import execa from 'execa'
 
 import {collectingCoverage, getTestFolderFilename, isCi} from './test-utils/utils'
 
@@ -2694,7 +2695,10 @@ describe('end-to-end', () => {
         '[data-test-id="deployment-router-id"]'
       )
       // get rid of router id text and react tags
-      routerId = innerHTML.replace('Router ID: ', '')
+      // (remove any square brackets too)
+      routerId = innerHTML
+        .replace('Router ID: ', '')
+        .replace(/[[\]]/g, '')
 
       // confirm deployment
       await click('[data-test-id="confirm-deploy-server-button"]')
@@ -2704,9 +2708,12 @@ describe('end-to-end', () => {
     }, defaultTestTimeout + 30000) // Add thirty seconds for deployment job
 
     makeEditorEntityTest('should be able to do a trip plan on otp', async () => {
+      // Wait a few seconds before sending query, so that OTP picks up the newly-built graph.
+      await execa('sleep', ['5s'])
       // hit the otp endpoint
+      const url = `${OTP_ROOT}${routerId}/plan?fromPlace=37.04532992924222%2C-122.07542181015015&toPlace=37.04899494106061%2C-122.07432746887208&time=00%3A32&date=2018-07-24&mode=TRANSIT%2CWALK&maxWalkDistance=804.672&arriveBy=false&wheelchair=false&locale=en`
       const response = await fetch(
-        `${OTP_ROOT}${routerId}/plan?fromPlace=37.04532992924222%2C-122.07542181015015&toPlace=37.04899494106061%2C-122.07432746887208&time=12%3A32am&date=07-24-2018&mode=TRANSIT%2CWALK&maxWalkDistance=804.672&arriveBy=false&wheelchair=false&locale=en`,
+        url,
         {
           headers: {
             'Content-Type': 'application/json; charset=utf-8'
diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index 3bd034662..f68b7a692 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -349,6 +349,7 @@ async function startOtp () {
         '-jar',
         otpJarFilename,
         '--server',
+        '--autoScan',
         '--insecure',
         '--router',
         'default'
@@ -483,8 +484,6 @@ module.exports = async function () {
   if (isCi) {
     setupItems.push(setupForContinuousIntegrationEnvironment())
   } else {
-    await startOtp()
-    await execa('sleep', ['5s'])
     setupItems.push(verifySetupForLocalEnvironment())
   }
   if (collectingCoverage) setupItems.push(startCoverageServer())

From e7d802216f1a58b8b41f094ea0ec4f3909bd2e60 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 5 Oct 2021 12:59:19 -0400
Subject: [PATCH 388/553] test(e2e): Try to detect CI environment.

---
 __tests__/test-utils/utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/__tests__/test-utils/utils.js b/__tests__/test-utils/utils.js
index e7ca9774f..1bfaf4e27 100644
--- a/__tests__/test-utils/utils.js
+++ b/__tests__/test-utils/utils.js
@@ -7,6 +7,7 @@ const {safeDump, safeLoad} = require('js-yaml')
 const request = require('request')
 
 const collectingCoverage = process.env.COLLECT_COVERAGE
+console.log(`CI: ${process.env.CI}`)
 const isCi = !!process.env.CI
 const isUiRepo = process.env.GITHUB_REPOSITORY === 'ibi-group/datatools-ui'
 const testFolderPath = 'e2e-test-results'

From d93bdcf85bda3e023a2a17b96209740653de79fa Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 5 Oct 2021 13:22:01 -0400
Subject: [PATCH 389/553] test(e2e): Create default dir for OTP autoscan

---
 __tests__/test-utils/setup-e2e.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index f68b7a692..321f80276 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -339,6 +339,9 @@ async function startOtp () {
   )
 
   console.log('starting otp')
+  // Ensure default folder for graphs exists.
+  // (OTP 1.4.0 autoscan() does a directory listing without checking directory existence.)
+  await fs.mkdirp('/var/otp')
 
   // start otp
   try {

From 584a11af2af054749f68a7c638739e7872b52fbc Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 5 Oct 2021 14:18:24 -0400
Subject: [PATCH 390/553] ci(Install otp-runner on CI runs.):

---
 .github/workflows/node-ci.yml     | 3 +++
 __tests__/test-utils/setup-e2e.js | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 7bae60741..258b9e2f4 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -68,6 +68,9 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: Install otp-runner
+        if: env.SHOULD_RUN_E2E == 'true'
+        run: yarn global add https://github.com/ibi-group/otp-runner.git
       - name: Run e2e tests
         if: env.SHOULD_RUN_E2E == 'true'
         run: yarn test-end-to-end
diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index 321f80276..c170e58d7 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -341,7 +341,8 @@ async function startOtp () {
   console.log('starting otp')
   // Ensure default folder for graphs exists.
   // (OTP 1.4.0 autoscan() does a directory listing without checking directory existence.)
-  await fs.mkdirp('/var/otp')
+  const otpBasePath = '/tmp/otp'
+  await fs.mkdirp(otpBasePath)
 
   // start otp
   try {
@@ -353,6 +354,8 @@ async function startOtp () {
         otpJarFilename,
         '--server',
         '--autoScan',
+        '--basePath',
+        otpBasePath,
         '--insecure',
         '--router',
         'default'

From 4657d9e140cda7604ecafabc4c20a9999318bc4b Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 5 Oct 2021 14:41:46 -0400
Subject: [PATCH 391/553] test(e2e): Fix OTP base folder.

---
 __tests__/test-utils/setup-e2e.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index c170e58d7..ddf510074 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -342,7 +342,7 @@ async function startOtp () {
   // Ensure default folder for graphs exists.
   // (OTP 1.4.0 autoscan() does a directory listing without checking directory existence.)
   const otpBasePath = '/tmp/otp'
-  await fs.mkdirp(otpBasePath)
+  await fs.mkdirp(`${otpBasePath}/graphs`)
 
   // start otp
   try {

From 9470c89762c46737bc8ac0e9c3bcb5f85c214ff3 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 5 Oct 2021 20:50:51 -0400
Subject: [PATCH 392/553] test(e2e): Extend sleep time for OTP to pick up new
 graph.

---
 __tests__/end-to-end.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index 17a638063..fd015c311 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -2709,7 +2709,7 @@ describe('end-to-end', () => {
 
     makeEditorEntityTest('should be able to do a trip plan on otp', async () => {
       // Wait a few seconds before sending query, so that OTP picks up the newly-built graph.
-      await execa('sleep', ['5s'])
+      await execa('sleep', ['15s'])
       // hit the otp endpoint
       const url = `${OTP_ROOT}${routerId}/plan?fromPlace=37.04532992924222%2C-122.07542181015015&toPlace=37.04899494106061%2C-122.07432746887208&time=00%3A32&date=2018-07-24&mode=TRANSIT%2CWALK&maxWalkDistance=804.672&arriveBy=false&wheelchair=false&locale=en`
       const response = await fetch(

From c915b681508de405f227d64c56872aa2283beed9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 6 Oct 2021 10:51:15 -0400
Subject: [PATCH 393/553] test(e2e): Wait a few secs before checking project
 deletion markup.

---
 __tests__/end-to-end.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index fd015c311..2cf7433d6 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -9,7 +9,6 @@ import md5File from 'md5-file/promise'
 import moment from 'moment'
 import SimpleNodeLogger from 'simple-node-logger'
 import uuidv4 from 'uuid/v4'
-import execa from 'execa'
 
 import {collectingCoverage, getTestFolderFilename, isCi} from './test-utils/utils'
 
@@ -316,6 +315,7 @@ async function deleteProject (projectId: string) {
   // verify deletion
   await goto(`http://localhost:9966/project/${projectId}`)
   await waitForSelector('.project-not-found')
+  await wait(5000, 'for previously rendered project markup to be removed')
   await expectSelectorToContainHtml('.project-not-found', projectId)
   log.info(`confirmed successful deletion of project with id ${projectId}`)
 }
@@ -2708,8 +2708,7 @@ describe('end-to-end', () => {
     }, defaultTestTimeout + 30000) // Add thirty seconds for deployment job
 
     makeEditorEntityTest('should be able to do a trip plan on otp', async () => {
-      // Wait a few seconds before sending query, so that OTP picks up the newly-built graph.
-      await execa('sleep', ['15s'])
+      await wait(15000, 'for OTP picks up the newly-built graph')
       // hit the otp endpoint
       const url = `${OTP_ROOT}${routerId}/plan?fromPlace=37.04532992924222%2C-122.07542181015015&toPlace=37.04899494106061%2C-122.07432746887208&time=00%3A32&date=2018-07-24&mode=TRANSIT%2CWALK&maxWalkDistance=804.672&arriveBy=false&wheelchair=false&locale=en`
       const response = await fetch(

From 096624817a6f1105ecfe2086052a6d375813ecee Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 6 Oct 2021 11:08:39 -0400
Subject: [PATCH 394/553] test(e2e): Revert some settings now that e2e passed.

---
 __tests__/end-to-end.js                  | 2 +-
 __tests__/test-utils/setup-e2e.js        | 2 +-
 scripts/check-if-e2e-should-run-on-ci.sh | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index 2cf7433d6..4596e378f 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -2708,7 +2708,7 @@ describe('end-to-end', () => {
     }, defaultTestTimeout + 30000) // Add thirty seconds for deployment job
 
     makeEditorEntityTest('should be able to do a trip plan on otp', async () => {
-      await wait(15000, 'for OTP picks up the newly-built graph')
+      await wait(15000, 'for OTP to pick up the newly-built graph')
       // hit the otp endpoint
       const url = `${OTP_ROOT}${routerId}/plan?fromPlace=37.04532992924222%2C-122.07542181015015&toPlace=37.04899494106061%2C-122.07432746887208&time=00%3A32&date=2018-07-24&mode=TRANSIT%2CWALK&maxWalkDistance=804.672&arriveBy=false&wheelchair=false&locale=en`
       const response = await fetch(
diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index ddf510074..e31da0712 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -19,7 +19,7 @@ const {
   writeYamlFile
 } = require('./utils')
 
-const serverJarFilename = 'dt-latest-fix-otp-runner-e2e.jar' // 'dt-latest-dev.jar'
+const serverJarFilename = 'dt-latest-dev.jar'
 const ENV_YML_VARIABLES = [
   'AUTH0_CLIENT_ID',
   'AUTH0_DOMAIN',
diff --git a/scripts/check-if-e2e-should-run-on-ci.sh b/scripts/check-if-e2e-should-run-on-ci.sh
index 113464c13..08f1b0a0d 100755
--- a/scripts/check-if-e2e-should-run-on-ci.sh
+++ b/scripts/check-if-e2e-should-run-on-ci.sh
@@ -16,6 +16,6 @@ if [[ "$SHOULD_RUN_E2E" != "true" ]]; then
 fi
 
 # Optionally override the conditions above with the below block:
-OVERRIDE=true
-echo "SHOULD_RUN_E2E=${OVERRIDE}" >> $GITHUB_ENV && export SHOULD_RUN_E2E=${OVERRIDE}
-echo "Overriding E2E. Temporarily forcing to be ${OVERRIDE}..."
+# OVERRIDE=true
+# echo "SHOULD_RUN_E2E=${OVERRIDE}" >> $GITHUB_ENV && export SHOULD_RUN_E2E=${OVERRIDE}
+# echo "Overriding E2E. Temporarily forcing to be ${OVERRIDE}..."

From 36db7b5f4423db4facca94079465e01a237ad640 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 6 Oct 2021 11:14:02 -0400
Subject: [PATCH 395/553] test(test-utils/utils): Remove console log.

---
 __tests__/test-utils/utils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/__tests__/test-utils/utils.js b/__tests__/test-utils/utils.js
index 1bfaf4e27..e7ca9774f 100644
--- a/__tests__/test-utils/utils.js
+++ b/__tests__/test-utils/utils.js
@@ -7,7 +7,6 @@ const {safeDump, safeLoad} = require('js-yaml')
 const request = require('request')
 
 const collectingCoverage = process.env.COLLECT_COVERAGE
-console.log(`CI: ${process.env.CI}`)
 const isCi = !!process.env.CI
 const isUiRepo = process.env.GITHUB_REPOSITORY === 'ibi-group/datatools-ui'
 const testFolderPath = 'e2e-test-results'

From bfa8e3de40ed2829eb3de080493f71ecbd29f503 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Wed, 6 Oct 2021 14:44:01 -0400
Subject: [PATCH 396/553] fix(EntityListButton): Fix `New Exception` button
 formatting

Avoid `New Exception` button being moved to new lines based on size. Fixes #725.

fix #725
---
 lib/editor/components/EntityListButtons.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/editor/components/EntityListButtons.js b/lib/editor/components/EntityListButtons.js
index 5687120a7..cb9a402c3 100644
--- a/lib/editor/components/EntityListButtons.js
+++ b/lib/editor/components/EntityListButtons.js
@@ -8,12 +8,12 @@ import * as activeActions from '../actions/active'
 import * as editorActions from '../actions/editor'
 import * as snapshotActions from '../actions/snapshots'
 import {componentToText, entityIsNew} from '../util/objects'
-import BulkEditorModal from './BulkEditorModal'
-
 import type {Entity, Feed} from '../../types'
 import type {EditorTables} from '../../types/reducers'
 import type {ImmutableList} from '../selectors/index'
 
+import BulkEditorModal from './BulkEditorModal'
+
 type State = {
   showBulkEditor: boolean
 }
@@ -169,7 +169,9 @@ export default class EntityListButtons extends Component<Props, State> {
             bsSize='small'
             data-test-id={`new-${activeComponent}-button`}
             disabled={entities && entities.findIndex(entityIsNew) !== -1}
-            onClick={this._onClickNew}>
+            onClick={this._onClickNew}
+            // Setting the max width to display value so the button does not move to new line
+            style={{maxWidth: '95.375px'}}>
             New {componentToText(activeComponent)}
           </Button>
         }

From 5856fcebbc8dd92577db31a20a79e62552606592 Mon Sep 17 00:00:00 2001
From: Phil Cline <philip.cline@ibigroup.com>
Date: Wed, 6 Oct 2021 15:15:14 -0400
Subject: [PATCH 397/553] refactor(address PR comments):

---
 lib/editor/components/EntityListButtons.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/editor/components/EntityListButtons.js b/lib/editor/components/EntityListButtons.js
index cb9a402c3..aaae2129c 100644
--- a/lib/editor/components/EntityListButtons.js
+++ b/lib/editor/components/EntityListButtons.js
@@ -170,7 +170,9 @@ export default class EntityListButtons extends Component<Props, State> {
             data-test-id={`new-${activeComponent}-button`}
             disabled={entities && entities.findIndex(entityIsNew) !== -1}
             onClick={this._onClickNew}
-            // Setting the max width to display value so the button does not move to new line
+            // Setting the max width based on the width of the 'New Calendar' button
+            // so the button does not move to a new line in deployed systems.
+            // Note the width of the button text varies depending on the font used.
             style={{maxWidth: '95.375px'}}>
             New {componentToText(activeComponent)}
           </Button>

From a097c55b200cbaad55c011c1a6b9e458a51f2f62 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 7 Oct 2021 11:19:08 +0100
Subject: [PATCH 398/553] feat(PeliasPanel): support dropping pelias db

---
 __tests__/test-utils/mock-data/manager.js     |  1 +
 .../__tests__/__snapshots__/projects.js.snap  |  1 +
 .../components/deployment/PeliasPanel.js      | 34 ++++++++++++++++---
 .../__snapshots__/DeploymentsPanel.js.snap    | 14 ++++++++
 .../__snapshots__/FeedSourceTable.js.snap     | 10 ++++++
 lib/types/index.js                            |  1 +
 6 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 2a67ec4a5..ec514179e 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -61,6 +61,7 @@ export function makeMockDeployment (
     skipOsmExtract: false,
     tripPlannerVersion: 'OTP_1',
     peliasUpdate: null,
+    peliasReset: null,
     peliasWebhookUrl: null,
     peliasCsvFiles: [],
     user: null
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index f9fe6a963..eff910400 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -115,6 +115,7 @@ Object {
           "otpCommit": null,
           "otpVersion": null,
           "peliasCsvFiles": Array [],
+          "peliasReset": null,
           "peliasUpdate": null,
           "peliasWebhookUrl": null,
           "pinnedfeedVersionIds": Array [],
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 540f73968..c1d6e8ec7 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -13,6 +13,7 @@ import {
 } from 'react-bootstrap'
 
 import SelectFileModal from '../../../common/components/SelectFileModal'
+import ConfirmModal from '../../../common/components/ConfirmModal'
 import { updateDeployment, uploadPeliasWebhookCsvFile } from '../../actions/deployments'
 import { setErrorMessage } from '../../actions/status'
 import type { Deployment, Project } from '../../../types'
@@ -52,6 +53,14 @@ class PeliasPanel extends Component<Props, State> {
       peliasUpdate: !this.props.deployment.peliasUpdate
     });
 
+  /**
+   *  Method fired when Pelias Update checkbox is checked
+   */
+  _onChangeResetPelias = () =>
+    this._updateDeployment({
+      peliasReset: !this.props.deployment.peliasReset
+    });
+
   /**
    * Updates state on input changes. Does not persist changes to deployment
    */
@@ -181,13 +190,13 @@ class PeliasPanel extends Component<Props, State> {
       <Panel
         header={
           <h3>
-            <Icon type='map-marker' /> Custom Geocoder Settings
+            <Icon type='map-marker' /> Local Places Index Settings
           </h3>
         }
       >
         <ListGroup fill>
           <ListGroupItem>
-            <h5>Custom Geocoder Webhook URL</h5>
+            <h5>Local Places Index Webhook URL</h5>
             <FormControl
               type='url'
               id='peliasWebhookUrl'
@@ -198,13 +207,26 @@ class PeliasPanel extends Component<Props, State> {
             />
           </ListGroupItem>
           <ListGroupItem>
-            <h5>Send GTFS feeds to custom geocoder</h5>
+            <h5>Send GTFS feeds to local places index when deploying</h5>
             <Checkbox
               disabled={!optionsEnabled}
               checked={deployment.peliasUpdate}
               onChange={this._onChangeUpdatePelias}
             >
-              Update Custom Geocoder
+              Update Local Places Index
+            </Checkbox>
+            <ConfirmModal
+              ref='reInitLpiModal'
+              title='Are you sure you want to re-initialize the LPI database?'
+              body='This will cause custom geocoder responses to be unavailable for about 1 - 5 minutes after deploying. Non-LPI responses will continue to be available. This will also cause any feeds not deployed to be deleted from the LPI.'
+              onConfirm={this._onChangeResetPelias}
+            />
+            <Checkbox
+              disabled={!optionsEnabled}
+              checked={deployment.peliasReset}
+              onClick={() => deployment.peliasReset ? this._onChangeResetPelias() : this.refs.reInitLpiModal.open()}
+            >
+              Re-initialize LPI Database
             </Checkbox>
           </ListGroupItem>
           <ListGroupItem>
@@ -214,7 +236,9 @@ class PeliasPanel extends Component<Props, State> {
               title='Upload CSV File'
               body='Select a CSV file of POIs to upload:'
               onConfirm={async (files) => this._onConfirmUpload(files)}
-              onCancel={() => this.setState({fileToDeleteOnSuccesfulUpload: null})}
+              onCancel={() =>
+                this.setState({ fileToDeleteOnSuccesfulUpload: null })
+              }
               errorMessage='Uploaded file must be a valid csv file (.csv).'
             />
             <ul>
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index e2e17dfd1..212158ac0 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -128,6 +128,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "otpCommit": null,
             "otpVersion": null,
             "peliasCsvFiles": Array [],
+            "peliasReset": null,
             "peliasUpdate": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
@@ -163,6 +164,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "otpCommit": null,
             "otpVersion": null,
             "peliasCsvFiles": Array [],
+            "peliasReset": null,
             "peliasUpdate": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
@@ -363,6 +365,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "otpCommit": null,
               "otpVersion": null,
               "peliasCsvFiles": Array [],
+              "peliasReset": null,
               "peliasUpdate": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
@@ -398,6 +401,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "otpCommit": null,
               "otpVersion": null,
               "peliasCsvFiles": Array [],
+              "peliasReset": null,
               "peliasUpdate": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
@@ -650,6 +654,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "otpCommit": null,
                       "otpVersion": null,
                       "peliasCsvFiles": Array [],
+                      "peliasReset": null,
                       "peliasUpdate": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
@@ -685,6 +690,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "otpCommit": null,
                       "otpVersion": null,
                       "peliasCsvFiles": Array [],
+                      "peliasReset": null,
                       "peliasUpdate": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
@@ -814,6 +820,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "otpCommit": null,
                         "otpVersion": null,
                         "peliasCsvFiles": Array [],
+                        "peliasReset": null,
                         "peliasUpdate": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
@@ -849,6 +856,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "otpCommit": null,
                         "otpVersion": null,
                         "peliasCsvFiles": Array [],
+                        "peliasReset": null,
                         "peliasUpdate": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
@@ -1191,6 +1199,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "otpCommit": null,
                                 "otpVersion": null,
                                 "peliasCsvFiles": Array [],
+                                "peliasReset": null,
                                 "peliasUpdate": null,
                                 "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
@@ -1320,6 +1329,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
+                                    "peliasReset": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
@@ -1355,6 +1365,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
+                                    "peliasReset": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
@@ -1602,6 +1613,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "otpCommit": null,
                                 "otpVersion": null,
                                 "peliasCsvFiles": Array [],
+                                "peliasReset": null,
                                 "peliasUpdate": null,
                                 "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
@@ -1731,6 +1743,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
+                                    "peliasReset": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
@@ -1766,6 +1779,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
+                                    "peliasReset": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index dd392a4ae..790626113 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -127,6 +127,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "otpCommit": null,
             "otpVersion": null,
             "peliasCsvFiles": Array [],
+            "peliasReset": null,
             "peliasUpdate": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
@@ -425,6 +426,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "otpCommit": null,
               "otpVersion": null,
               "peliasCsvFiles": Array [],
+              "peliasReset": null,
               "peliasUpdate": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
@@ -700,6 +702,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "otpCommit": null,
                     "otpVersion": null,
                     "peliasCsvFiles": Array [],
+                    "peliasReset": null,
                     "peliasUpdate": null,
                     "peliasWebhookUrl": null,
                     "pinnedfeedVersionIds": Array [],
@@ -906,6 +909,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "otpCommit": null,
                       "otpVersion": null,
                       "peliasCsvFiles": Array [],
+                      "peliasReset": null,
                       "peliasUpdate": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
@@ -1132,6 +1136,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "otpCommit": null,
                         "otpVersion": null,
                         "peliasCsvFiles": Array [],
+                        "peliasReset": null,
                         "peliasUpdate": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
@@ -3250,6 +3255,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "otpCommit": null,
                             "otpVersion": null,
                             "peliasCsvFiles": Array [],
+                            "peliasReset": null,
                             "peliasUpdate": null,
                             "peliasWebhookUrl": null,
                             "pinnedfeedVersionIds": Array [],
@@ -3520,6 +3526,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "otpCommit": null,
                               "otpVersion": null,
                               "peliasCsvFiles": Array [],
+                              "peliasReset": null,
                               "peliasUpdate": null,
                               "peliasWebhookUrl": null,
                               "pinnedfeedVersionIds": Array [],
@@ -3845,6 +3852,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
+                                    "peliasReset": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
@@ -4244,6 +4252,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                                   "otpCommit": null,
                                                   "otpVersion": null,
                                                   "peliasCsvFiles": Array [],
+                                                  "peliasReset": null,
                                                   "peliasUpdate": null,
                                                   "peliasWebhookUrl": null,
                                                   "pinnedfeedVersionIds": Array [],
@@ -4652,6 +4661,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
+                                    "peliasReset": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
diff --git a/lib/types/index.js b/lib/types/index.js
index 096bc7770..ebad15629 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -250,6 +250,7 @@ export type Deployment = {
   osmExtractUrl: ?string,
   otpVersion: ?string,
   peliasCsvFiles: ?Array<string>,
+  peliasReset: ?boolean,
   peliasUpdate: ?boolean,
   peliasWebhookUrl: ?string,
   pinnedfeedVersionIds: Array<string>,

From af5ff88ee597cc75b7305e8173fe50f691efdd63 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 8 Oct 2021 14:30:22 +0100
Subject: [PATCH 399/553] refactor: make peliasReset variable name clearer

---
 __tests__/test-utils/mock-data/manager.js     |  2 +-
 .../__tests__/__snapshots__/projects.js.snap  |  2 +-
 .../components/deployment/PeliasPanel.js      |  6 ++--
 .../__snapshots__/DeploymentsPanel.js.snap    | 28 +++++++++----------
 .../__snapshots__/FeedSourceTable.js.snap     | 20 ++++++-------
 lib/types/index.js                            |  2 +-
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index ec514179e..22f33982c 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -61,7 +61,7 @@ export function makeMockDeployment (
     skipOsmExtract: false,
     tripPlannerVersion: 'OTP_1',
     peliasUpdate: null,
-    peliasReset: null,
+    peliasResetDb: null,
     peliasWebhookUrl: null,
     peliasCsvFiles: [],
     user: null
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index eff910400..4c2daeba7 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -115,7 +115,7 @@ Object {
           "otpCommit": null,
           "otpVersion": null,
           "peliasCsvFiles": Array [],
-          "peliasReset": null,
+          "peliasResetDb": null,
           "peliasUpdate": null,
           "peliasWebhookUrl": null,
           "pinnedfeedVersionIds": Array [],
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index c1d6e8ec7..53e8a1d00 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -58,7 +58,7 @@ class PeliasPanel extends Component<Props, State> {
    */
   _onChangeResetPelias = () =>
     this._updateDeployment({
-      peliasReset: !this.props.deployment.peliasReset
+      peliasResetDb: !this.props.deployment.peliasResetDb
     });
 
   /**
@@ -223,8 +223,8 @@ class PeliasPanel extends Component<Props, State> {
             />
             <Checkbox
               disabled={!optionsEnabled}
-              checked={deployment.peliasReset}
-              onClick={() => deployment.peliasReset ? this._onChangeResetPelias() : this.refs.reInitLpiModal.open()}
+              checked={deployment.peliasResetDb}
+              onClick={() => deployment.peliasResetDb ? this._onChangeResetPelias() : this.refs.reInitLpiModal.open()}
             >
               Re-initialize LPI Database
             </Checkbox>
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index 212158ac0..dc3e76131 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -128,7 +128,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "otpCommit": null,
             "otpVersion": null,
             "peliasCsvFiles": Array [],
-            "peliasReset": null,
+            "peliasResetDb": null,
             "peliasUpdate": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
@@ -164,7 +164,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "otpCommit": null,
             "otpVersion": null,
             "peliasCsvFiles": Array [],
-            "peliasReset": null,
+            "peliasResetDb": null,
             "peliasUpdate": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
@@ -365,7 +365,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "otpCommit": null,
               "otpVersion": null,
               "peliasCsvFiles": Array [],
-              "peliasReset": null,
+              "peliasResetDb": null,
               "peliasUpdate": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
@@ -401,7 +401,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "otpCommit": null,
               "otpVersion": null,
               "peliasCsvFiles": Array [],
-              "peliasReset": null,
+              "peliasResetDb": null,
               "peliasUpdate": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
@@ -654,7 +654,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "otpCommit": null,
                       "otpVersion": null,
                       "peliasCsvFiles": Array [],
-                      "peliasReset": null,
+                      "peliasResetDb": null,
                       "peliasUpdate": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
@@ -690,7 +690,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "otpCommit": null,
                       "otpVersion": null,
                       "peliasCsvFiles": Array [],
-                      "peliasReset": null,
+                      "peliasResetDb": null,
                       "peliasUpdate": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
@@ -820,7 +820,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "otpCommit": null,
                         "otpVersion": null,
                         "peliasCsvFiles": Array [],
-                        "peliasReset": null,
+                        "peliasResetDb": null,
                         "peliasUpdate": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
@@ -856,7 +856,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "otpCommit": null,
                         "otpVersion": null,
                         "peliasCsvFiles": Array [],
-                        "peliasReset": null,
+                        "peliasResetDb": null,
                         "peliasUpdate": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
@@ -1199,7 +1199,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "otpCommit": null,
                                 "otpVersion": null,
                                 "peliasCsvFiles": Array [],
-                                "peliasReset": null,
+                                "peliasResetDb": null,
                                 "peliasUpdate": null,
                                 "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
@@ -1329,7 +1329,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasReset": null,
+                                    "peliasResetDb": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
@@ -1365,7 +1365,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasReset": null,
+                                    "peliasResetDb": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
@@ -1613,7 +1613,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "otpCommit": null,
                                 "otpVersion": null,
                                 "peliasCsvFiles": Array [],
-                                "peliasReset": null,
+                                "peliasResetDb": null,
                                 "peliasUpdate": null,
                                 "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
@@ -1743,7 +1743,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasReset": null,
+                                    "peliasResetDb": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
@@ -1779,7 +1779,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasReset": null,
+                                    "peliasResetDb": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 790626113..1ffc48316 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -127,7 +127,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "otpCommit": null,
             "otpVersion": null,
             "peliasCsvFiles": Array [],
-            "peliasReset": null,
+            "peliasResetDb": null,
             "peliasUpdate": null,
             "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
@@ -426,7 +426,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "otpCommit": null,
               "otpVersion": null,
               "peliasCsvFiles": Array [],
-              "peliasReset": null,
+              "peliasResetDb": null,
               "peliasUpdate": null,
               "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
@@ -702,7 +702,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "otpCommit": null,
                     "otpVersion": null,
                     "peliasCsvFiles": Array [],
-                    "peliasReset": null,
+                    "peliasResetDb": null,
                     "peliasUpdate": null,
                     "peliasWebhookUrl": null,
                     "pinnedfeedVersionIds": Array [],
@@ -909,7 +909,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "otpCommit": null,
                       "otpVersion": null,
                       "peliasCsvFiles": Array [],
-                      "peliasReset": null,
+                      "peliasResetDb": null,
                       "peliasUpdate": null,
                       "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
@@ -1136,7 +1136,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "otpCommit": null,
                         "otpVersion": null,
                         "peliasCsvFiles": Array [],
-                        "peliasReset": null,
+                        "peliasResetDb": null,
                         "peliasUpdate": null,
                         "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
@@ -3255,7 +3255,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "otpCommit": null,
                             "otpVersion": null,
                             "peliasCsvFiles": Array [],
-                            "peliasReset": null,
+                            "peliasResetDb": null,
                             "peliasUpdate": null,
                             "peliasWebhookUrl": null,
                             "pinnedfeedVersionIds": Array [],
@@ -3526,7 +3526,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "otpCommit": null,
                               "otpVersion": null,
                               "peliasCsvFiles": Array [],
-                              "peliasReset": null,
+                              "peliasResetDb": null,
                               "peliasUpdate": null,
                               "peliasWebhookUrl": null,
                               "pinnedfeedVersionIds": Array [],
@@ -3852,7 +3852,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasReset": null,
+                                    "peliasResetDb": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
@@ -4252,7 +4252,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                                   "otpCommit": null,
                                                   "otpVersion": null,
                                                   "peliasCsvFiles": Array [],
-                                                  "peliasReset": null,
+                                                  "peliasResetDb": null,
                                                   "peliasUpdate": null,
                                                   "peliasWebhookUrl": null,
                                                   "pinnedfeedVersionIds": Array [],
@@ -4661,7 +4661,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "otpCommit": null,
                                     "otpVersion": null,
                                     "peliasCsvFiles": Array [],
-                                    "peliasReset": null,
+                                    "peliasResetDb": null,
                                     "peliasUpdate": null,
                                     "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
diff --git a/lib/types/index.js b/lib/types/index.js
index ebad15629..988fa44ba 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -250,7 +250,7 @@ export type Deployment = {
   osmExtractUrl: ?string,
   otpVersion: ?string,
   peliasCsvFiles: ?Array<string>,
-  peliasReset: ?boolean,
+  peliasResetDb: ?boolean,
   peliasUpdate: ?boolean,
   peliasWebhookUrl: ?string,
   pinnedfeedVersionIds: Array<string>,

From e7c873b2b62edad9e11670645247678ff138343e Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 12 Oct 2021 10:20:35 +0100
Subject: [PATCH 400/553] refactor(PeliasPanel): update wording

---
 lib/manager/components/deployment/PeliasPanel.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 53e8a1d00..f44b6cd11 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -207,7 +207,7 @@ class PeliasPanel extends Component<Props, State> {
             />
           </ListGroupItem>
           <ListGroupItem>
-            <h5>Send GTFS feeds to local places index when deploying</h5>
+            <h5>Send GTFS feeds to Local Places Index when deploying</h5>
             <Checkbox
               disabled={!optionsEnabled}
               checked={deployment.peliasUpdate}
@@ -217,8 +217,8 @@ class PeliasPanel extends Component<Props, State> {
             </Checkbox>
             <ConfirmModal
               ref='reInitLpiModal'
-              title='Are you sure you want to re-initialize the LPI database?'
-              body='This will cause custom geocoder responses to be unavailable for about 1 - 5 minutes after deploying. Non-LPI responses will continue to be available. This will also cause any feeds not deployed to be deleted from the LPI.'
+              title='Are you sure you want to re-initialize the Local Places Index database?'
+              body='This will cause custom geocoder responses to be unavailable for about 1 - 5 minutes after deploying. Regular addresses and landmarks will continue to be available. Stops and stations from feeds that are not part of this deployment will be removed from the suggestions.'
               onConfirm={this._onChangeResetPelias}
             />
             <Checkbox
@@ -226,7 +226,7 @@ class PeliasPanel extends Component<Props, State> {
               checked={deployment.peliasResetDb}
               onClick={() => deployment.peliasResetDb ? this._onChangeResetPelias() : this.refs.reInitLpiModal.open()}
             >
-              Re-initialize LPI Database
+              Rebuild the Local Places Index database
             </Checkbox>
           </ListGroupItem>
           <ListGroupItem>
@@ -234,7 +234,7 @@ class PeliasPanel extends Component<Props, State> {
             <SelectFileModal
               ref='uploadModal'
               title='Upload CSV File'
-              body='Select a CSV file of POIs to upload:'
+              body='Select a CSV file of local places/points of interest to upload:'
               onConfirm={async (files) => this._onConfirmUpload(files)}
               onCancel={() =>
                 this.setState({ fileToDeleteOnSuccesfulUpload: null })

From 4e79e32baccaecb9ad9a542475abb3ba7a634bbf Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 14 Oct 2021 08:58:16 +0100
Subject: [PATCH 401/553] refactor(PeliasPanel): redesign to make usage clearer

---
 lib/manager/components/deployment/PeliasPanel.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index f44b6cd11..7e9dc3f6c 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -207,30 +207,30 @@ class PeliasPanel extends Component<Props, State> {
             />
           </ListGroupItem>
           <ListGroupItem>
-            <h5>Send GTFS feeds to Local Places Index when deploying</h5>
             <Checkbox
               disabled={!optionsEnabled}
-              checked={deployment.peliasUpdate}
+              checked={deployment.peliasUpdate && optionsEnabled}
               onChange={this._onChangeUpdatePelias}
             >
               Update Local Places Index
             </Checkbox>
+            <h5 style={{paddingLeft: 30}}>Send GTFS feeds to Local Places Index when deploying</h5>
             <ConfirmModal
               ref='reInitLpiModal'
-              title='Are you sure you want to re-initialize the Local Places Index database?'
+              title='Are you sure you want to rebuild the Local Places Index database?'
               body='This will cause custom geocoder responses to be unavailable for about 1 - 5 minutes after deploying. Regular addresses and landmarks will continue to be available. Stops and stations from feeds that are not part of this deployment will be removed from the suggestions.'
               onConfirm={this._onChangeResetPelias}
             />
             <Checkbox
-              disabled={!optionsEnabled}
               checked={deployment.peliasResetDb}
+              disabled={!optionsEnabled || !deployment.peliasUpdate}
               onClick={() => deployment.peliasResetDb ? this._onChangeResetPelias() : this.refs.reInitLpiModal.open()}
             >
-              Rebuild the Local Places Index database
+              Rebuild the Local Places Index database during update
             </Checkbox>
           </ListGroupItem>
-          <ListGroupItem>
-            <h5>Custom POI CSV Files</h5>
+          <ListGroupItem >
+            <h5>Custom Point Of Interest CSV Files</h5>
             <SelectFileModal
               ref='uploadModal'
               title='Upload CSV File'

From c5948f5f3d89a3e56567ca53b0a8b84a219e34de Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 14 Oct 2021 09:00:44 +0100
Subject: [PATCH 402/553] refactor(PeliasPanel): add note about csv
 functionality

---
 lib/manager/components/deployment/PeliasPanel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 7e9dc3f6c..a308e49bb 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -231,6 +231,7 @@ class PeliasPanel extends Component<Props, State> {
           </ListGroupItem>
           <ListGroupItem >
             <h5>Custom Point Of Interest CSV Files</h5>
+            <h6>These files are sent to the Local Places Index when it is updated</h6>
             <SelectFileModal
               ref='uploadModal'
               title='Upload CSV File'

From 8be13c35433702b695c06e01384dccd4898ea4c7 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 14 Oct 2021 15:40:48 +0100
Subject: [PATCH 403/553] refactor(PeliasPanel): address pr feedback

---
 lib/manager/components/deployment/PeliasPanel.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index a308e49bb..130d60df9 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -212,9 +212,8 @@ class PeliasPanel extends Component<Props, State> {
               checked={deployment.peliasUpdate && optionsEnabled}
               onChange={this._onChangeUpdatePelias}
             >
-              Update Local Places Index
+              Update Local Places Index (including places from GTFS feeds)
             </Checkbox>
-            <h5 style={{paddingLeft: 30}}>Send GTFS feeds to Local Places Index when deploying</h5>
             <ConfirmModal
               ref='reInitLpiModal'
               title='Are you sure you want to rebuild the Local Places Index database?'
@@ -225,13 +224,14 @@ class PeliasPanel extends Component<Props, State> {
               checked={deployment.peliasResetDb}
               disabled={!optionsEnabled || !deployment.peliasUpdate}
               onClick={() => deployment.peliasResetDb ? this._onChangeResetPelias() : this.refs.reInitLpiModal.open()}
+              style={{paddingLeft: 15}}
             >
               Rebuild the Local Places Index database during update
             </Checkbox>
           </ListGroupItem>
           <ListGroupItem >
             <h5>Custom Point Of Interest CSV Files</h5>
-            <h6>These files are sent to the Local Places Index when it is updated</h6>
+            <p>These files are sent to the Local Places Index when it is updated</p>
             <SelectFileModal
               ref='uploadModal'
               title='Upload CSV File'

From 28763012a4e1bf936b7b9e23418866f8b613bd1d Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Mon, 25 Oct 2021 15:45:49 +0100
Subject: [PATCH 404/553] feat(pelias): move webhook URL to project

---
 __tests__/test-utils/mock-data/manager.js     |   2 +-
 .../__tests__/__snapshots__/projects.js.snap  |   2 +-
 lib/manager/components/ProjectSettingsForm.js | 145 +++++++++---------
 .../components/deployment/DeploymentViewer.js |  48 +++---
 .../components/deployment/PeliasPanel.js      |  36 +----
 .../__snapshots__/ActiveProjectViewer.js.snap |   9 ++
 .../__snapshots__/DeploymentsPanel.js.snap    |  19 +--
 .../__snapshots__/FeedSourceTable.js.snap     |  20 +--
 lib/types/index.js                            |   6 +-
 9 files changed, 137 insertions(+), 150 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 22f33982c..834eeb9e7 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -62,7 +62,6 @@ export function makeMockDeployment (
     tripPlannerVersion: 'OTP_1',
     peliasUpdate: null,
     peliasResetDb: null,
-    peliasWebhookUrl: null,
     peliasCsvFiles: [],
     user: null
   }
@@ -94,6 +93,7 @@ export const mockProject = {
   organizationId: null,
   otpServers: [],
   pinnedDeploymentId: null,
+  peliasWebhookUrl: null,
   routerConfig: {
     carDropoffTime: null,
     numItineraries: null,
diff --git a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
index 4c2daeba7..8948f9151 100644
--- a/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
+++ b/lib/manager/actions/__tests__/__snapshots__/projects.js.snap
@@ -117,7 +117,6 @@ Object {
           "peliasCsvFiles": Array [],
           "peliasResetDb": null,
           "peliasUpdate": null,
-          "peliasWebhookUrl": null,
           "pinnedfeedVersionIds": Array [],
           "projectBounds": Object {
             "east": 0,
@@ -185,6 +184,7 @@ Object {
       "name": "mock-project-with-deployments",
       "organizationId": null,
       "otpServers": Array [],
+      "peliasWebhookUrl": null,
       "pinnedDeploymentId": null,
       "routerConfig": Object {
         "carDropoffTime": null,
diff --git a/lib/manager/components/ProjectSettingsForm.js b/lib/manager/components/ProjectSettingsForm.js
index 16775a4b9..cffbeb594 100644
--- a/lib/manager/components/ProjectSettingsForm.js
+++ b/lib/manager/components/ProjectSettingsForm.js
@@ -40,7 +40,8 @@ type ProjectModel = {
   bounds?: Bounds,
   defaultTimeZone?: string,
   id?: string,
-  name?: string
+  name?: string,
+  peliasWebhookUrl?: string
 }
 
 type Props = {
@@ -58,7 +59,8 @@ type State = {
   validation: {
     bounds: boolean,
     defaultLocation: boolean,
-    name: boolean
+    name: boolean,
+    webhookUrl: boolean
   }
 }
 
@@ -71,7 +73,8 @@ export default class ProjectSettingsForm extends Component<Props, State> {
     validation: {
       bounds: true,
       defaultLocation: true,
-      name: true
+      name: true,
+      webhookUrl: true
     }
   }
 
@@ -181,13 +184,16 @@ export default class ProjectSettingsForm extends Component<Props, State> {
     this.setState(update(this.state, {model: {$merge: {defaultTimeZone}}}))
   }
 
-  _onChangeName = ({target}: {target: HTMLInputElement}) => {
+  _onChangeTextInput = ({target}: {target: HTMLInputElement}) => {
     const {name, value} = target
     this.setState(
-      update(this.state, {
-        model: { $merge: {[name]: value} },
-        validation: { [name]: { $set: value && value.length > 0 } }
-      })
+      update(
+        this.state,
+        {
+          model: { $merge: { [ name ]: value } },
+          validation: { [ name ]: { $set: value && value.length > 0 } }
+        }
+      )
     )
   }
 
@@ -266,20 +272,19 @@ export default class ProjectSettingsForm extends Component<Props, State> {
       )
     }
     return (
-      <div>
+      (<div>
         <ConfirmModal ref='confirm' />
         <Panel header={<h4>{this.messages('title')}</h4>}>
           <ListGroup fill>
             <ListGroupItem>
               <FormGroup
                 data-test-id='project-name-input-container'
-                validationState={validationState(validation.name)}
-              >
+                validationState={validationState(validation.name)}>
                 <ControlLabel>{this.messages('fields.name')}</ControlLabel>
                 <FormControl
                   value={model.name || ''}
                   name={'name'}
-                  onChange={this._onChangeName}
+                  onChange={this._onChangeTextInput}
                 />
                 <FormControl.Feedback />
                 <HelpBlock>Required.</HelpBlock>
@@ -300,19 +305,17 @@ export default class ProjectSettingsForm extends Component<Props, State> {
                 </Checkbox>
                 {autoFetchChecked
                   ? <DateTimeField
-                    dateTime={(
-                      typeof autoFetchMinute === 'number' &&
-                      typeof autoFetchHour === 'number'
-                    )
-                      ? +moment().startOf('day')
-                        .add(autoFetchHour, 'hours')
-                        .add(autoFetchMinute, 'minutes')
-                      : DEFAULT_FETCH_TIME
-                    }
+                    dateTime={typeof autoFetchMinute === 'number' &&
+                typeof autoFetchHour === 'number'
+                      ? +moment().startOf('day').add(autoFetchHour, 'hours').add(
+                        autoFetchMinute,
+                        'minutes'
+                      )
+                      : DEFAULT_FETCH_TIME}
                     mode='time'
-                    onChange={this._onChangeDateTime} />
-                  : null
-                }
+                    onChange={this._onChangeDateTime}
+                  />
+                  : null}
               </FormGroup>
             </ListGroupItem>
           </ListGroup>
@@ -330,22 +333,18 @@ export default class ProjectSettingsForm extends Component<Props, State> {
                     type='text'
                     defaultValue={model.bounds
                       ? `${model.bounds.west},${model.bounds.south},${model.bounds.east},${model.bounds.north}`
-                      : ''
-                    }
+                      : ''}
                     ref='boundingBox'
-                    placeholder={this.messages('fields.location.boundingBoxPlaceHolder')}
-                    onChange={this._onChangeBounds} />
-                  {
-                    <InputGroup.Button>
-                      <Button
-                        // TODO: wait for react-leaflet-draw to update library
-                        // to re-enable bounds select
-                        disabled
-                        onClick={this._onOpenMapBoundsModal}>
-                        <Glyphicon glyph='fullscreen' />
-                      </Button>
-                    </InputGroup.Button>
-                  }
+                    placeholder={this.messages(
+                      'fields.location.boundingBoxPlaceHolder'
+                    )}
+                    onChange={this._onChangeBounds}
+                  />
+                  {<InputGroup.Button>
+                    <Button disabled onClick={this._onOpenMapBoundsModal}>
+                      <Glyphicon glyph='fullscreen' />
+                    </Button>
+                  </InputGroup.Button>}
                 </InputGroup>
               </FormGroup>
             </ListGroupItem>
@@ -356,53 +355,61 @@ export default class ProjectSettingsForm extends Component<Props, State> {
               </ControlLabel>
               <TimezoneSelect
                 value={model.defaultTimeZone}
-                onChange={this._onChangeTimeZone} />
+                onChange={this._onChangeTimeZone}
+              />
+            </ListGroupItem>
+          </ListGroup>
+        </Panel>
+        <Panel header={<h4>Local Places Index</h4>}>
+          <ListGroup fill>
+            <ListGroupItem>
+              <FormGroup validationState={validationState(validation.webhookUrl)}>
+                <ControlLabel>Webhook URL</ControlLabel>
+                <FormControl
+                  value={model.peliasWebhookUrl || ''}
+                  name={'peliasWebhookUrl'}
+                  onChange={this._onChangeTextInput}
+                />
+                <FormControl.Feedback />
+              </FormGroup>
             </ListGroupItem>
           </ListGroup>
         </Panel>
         {showDangerZone &&
-          <Panel bsStyle='danger' header={<h3>Danger zone</h3>}>
-            <ListGroup fill>
-              <ListGroupItem>
-                <Button
-                  bsStyle='danger'
-                  className='pull-right'
-                  data-test-id='delete-project-button'
-                  onClick={this._onDeleteProject}
-                >
-                  <Icon type='trash' /> Delete project
-                </Button>
-                <h4>Delete this project.</h4>
-                <p>Once you delete an project, the project and all feed sources it contains cannot be recovered.</p>
-              </ListGroupItem>
-            </ListGroup>
-          </Panel>
-        }
+        <Panel bsStyle='danger' header={<h3>Danger zone</h3>}>
+          <ListGroup fill>
+            <ListGroupItem>
+              <Button
+                bsStyle='danger'
+                className='pull-right'
+                data-test-id='delete-project-button'
+                onClick={this._onDeleteProject}>
+                <Icon type='trash' /> Delete project
+              </Button>
+              <h4>Delete this project.</h4>
+              <p>Once you delete an project, the project and all feed sources it contains cannot be recovered.</p>
+            </ListGroupItem>
+          </ListGroup>
+        </Panel>}
         <Row>
           <Col xs={12}>
-            {/* Cancel button */}
-            <Button
-              onClick={this._onCancel}
-              style={{marginRight: 10}}
-            >
+            {}
+            <Button onClick={this._onCancel} style={{ marginRight: 10 }}>
               {this.messages('cancel')}
             </Button>
-            {/* Save button */}
+            {}
             <Button
               bsStyle='primary'
               data-test-id='project-settings-form-save-button'
-              disabled={
-                editDisabled ||
-                this._settingsAreUnedited() ||
-                !this._formIsValid()
-              }
+              disabled={editDisabled || this._settingsAreUnedited() ||
+          !this._formIsValid()}
               onClick={this._onSaveSettings}>
               {this.messages('save')}
             </Button>
           </Col>
         </Row>
         <MapModal ref='mapModal' />
-      </div>
+      </div>)
     )
   }
 }
diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index 0d95dc9c7..db940ede3 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -365,39 +365,48 @@ export default class DeploymentViewer extends Component<Props, State> {
     return (
       <div>
         <Title>{title}</Title>
-        {target &&
+        {target && (
           <DeploymentConfirmModal
             deployToTarget={deployToTarget}
             deployment={deployment}
             oldDeployment={oldDeployment}
             onClose={this._onCloseModal}
             project={project}
-            target={target} />
-        }
+            target={target}
+          />
+        )}
         <Row>
           <Col sm={9}>
             <Panel header={this.renderHeader()}>
               <ListGroup fill>
-                <ListGroupItem style={{padding: '0px'}}>
+                <ListGroupItem style={{ padding: '0px' }}>
                   {this.renderMap()}
                 </ListGroupItem>
                 <ListGroupItem>
                   {this.renderDeployentVersionsTableHeader(versions)}
                 </ListGroupItem>
-                {versions.length === 0
-                  ? <p className='lead text-center margin-top-15'>
+                {versions.length === 0 ? (
+                  <p className='lead text-center margin-top-15'>
                     No feed sources found.
                   </p>
-                  : (
-                    <DeploymentVersionsTable
-                      deployment={deployment}
-                      project={project}
-                      versions={versions}
-                    />
-                  )
-                }
+                ) : (
+                  <DeploymentVersionsTable
+                    deployment={deployment}
+                    project={project}
+                    versions={versions}
+                  />
+                )}
               </ListGroup>
             </Panel>
+            {/* Pelias panel. Only show if deployment is pinned and webhook URL is set */}
+            {project.pinnedDeploymentId === deployment.id &&
+              project.peliasWebhookUrl && (
+              <PeliasPanel
+                deployment={deployment}
+                updateDeployment={updateDeployment}
+                project={project}
+              />
+            )}
           </Col>
           <Col sm={3}>
             {/* Current deployment panel */}
@@ -408,18 +417,15 @@ export default class DeploymentViewer extends Component<Props, State> {
               fetchDeployment={this.props.fetchDeployment}
               project={project}
               server={serverDeployedTo}
-              terminateEC2InstanceForDeployment={this.props.terminateEC2InstanceForDeployment} />
+              terminateEC2InstanceForDeployment={
+                this.props.terminateEC2InstanceForDeployment
+              }
+            />
             {/* Configurations panel */}
             <DeploymentConfigurationsPanel
               deployment={deployment}
               updateDeployment={updateDeployment}
             />
-            {/* Pelias panel. Only show if deployment is pinned */}
-            {project.pinnedDeploymentId === deployment.id && <PeliasPanel
-              deployment={deployment}
-              updateDeployment={updateDeployment}
-              project={project}
-            />}
           </Col>
         </Row>
       </div>
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 130d60df9..41c867891 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -6,7 +6,6 @@ import React, { Component } from 'react'
 import {
   Button,
   Checkbox,
-  FormControl,
   ListGroup,
   ListGroupItem,
   Panel
@@ -28,21 +27,11 @@ type Props = {
 
 type State = {
   fileToDeleteOnSuccesfulUpload: string | null,
-  peliasWebhookUrl: string
 }
 
 class PeliasPanel extends Component<Props, State> {
   state = {
-    fileToDeleteOnSuccesfulUpload: null,
-    peliasWebhookUrl: ''
-  };
-
-  componentDidMount = () => {
-    const { deployment } = this.props
-    this.setState({
-    // Auto-populate blank field if project has webhook URL in it
-      peliasWebhookUrl: deployment.peliasWebhookUrl || ''
-    })
+    fileToDeleteOnSuccesfulUpload: null
   };
 
   /**
@@ -182,9 +171,6 @@ class PeliasPanel extends Component<Props, State> {
 
   render () {
     const { deployment } = this.props
-    const { peliasWebhookUrl } = this.state
-
-    const optionsEnabled = peliasWebhookUrl !== ''
 
     return (
       <Panel
@@ -195,21 +181,10 @@ class PeliasPanel extends Component<Props, State> {
         }
       >
         <ListGroup fill>
-          <ListGroupItem>
-            <h5>Local Places Index Webhook URL</h5>
-            <FormControl
-              type='url'
-              id='peliasWebhookUrl'
-              placeholder='Update webhook URL'
-              value={peliasWebhookUrl}
-              onChange={this._onChangeTextInput}
-              onBlur={this._onBlurTextInput}
-            />
-          </ListGroupItem>
+
           <ListGroupItem>
             <Checkbox
-              disabled={!optionsEnabled}
-              checked={deployment.peliasUpdate && optionsEnabled}
+              checked={deployment.peliasUpdate}
               onChange={this._onChangeUpdatePelias}
             >
               Update Local Places Index (including places from GTFS feeds)
@@ -222,7 +197,7 @@ class PeliasPanel extends Component<Props, State> {
             />
             <Checkbox
               checked={deployment.peliasResetDb}
-              disabled={!optionsEnabled || !deployment.peliasUpdate}
+              disabled={!deployment.peliasUpdate}
               onClick={() => deployment.peliasResetDb ? this._onChangeResetPelias() : this.refs.reInitLpiModal.open()}
               style={{paddingLeft: 15}}
             >
@@ -245,12 +220,11 @@ class PeliasPanel extends Component<Props, State> {
             <ul>
               {deployment.peliasCsvFiles &&
                 deployment.peliasCsvFiles.map((url) =>
-                  this.renderCsvUrl(url, optionsEnabled)
+                  this.renderCsvUrl(url, true)
                 )}
             </ul>
             <Button
               style={{ marginTop: '5px' }}
-              disabled={!optionsEnabled}
               onClick={() => this.refs.uploadModal.open()}
             >
               Upload New CSV File
diff --git a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
index 60069eff1..450628d24 100644
--- a/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/ActiveProjectViewer.js.snap
@@ -72,6 +72,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
           "name": "mock-project",
           "organizationId": null,
           "otpServers": Array [],
+          "peliasWebhookUrl": null,
           "pinnedDeploymentId": null,
           "routerConfig": Object {
             "carDropoffTime": null,
@@ -1938,6 +1939,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
+                                                          "peliasWebhookUrl": null,
                                                           "pinnedDeploymentId": null,
                                                           "routerConfig": Object {
                                                             "carDropoffTime": null,
@@ -1984,6 +1986,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                             "name": "mock-project",
                                                             "organizationId": null,
                                                             "otpServers": Array [],
+                                                            "peliasWebhookUrl": null,
                                                             "pinnedDeploymentId": null,
                                                             "routerConfig": Object {
                                                               "carDropoffTime": null,
@@ -2103,6 +2106,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                   "name": "mock-project",
                                                                   "organizationId": null,
                                                                   "otpServers": Array [],
+                                                                  "peliasWebhookUrl": null,
                                                                   "pinnedDeploymentId": null,
                                                                   "routerConfig": Object {
                                                                     "carDropoffTime": null,
@@ -2153,6 +2157,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                     "name": "mock-project",
                                                                     "organizationId": null,
                                                                     "otpServers": Array [],
+                                                                    "peliasWebhookUrl": null,
                                                                     "pinnedDeploymentId": null,
                                                                     "routerConfig": Object {
                                                                       "carDropoffTime": null,
@@ -2222,6 +2227,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                                       "name": "mock-project",
                                                                       "organizationId": null,
                                                                       "otpServers": Array [],
+                                                                      "peliasWebhookUrl": null,
                                                                       "pinnedDeploymentId": null,
                                                                       "routerConfig": Object {
                                                                         "carDropoffTime": null,
@@ -4142,6 +4148,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
+                                                          "peliasWebhookUrl": null,
                                                           "pinnedDeploymentId": null,
                                                           "routerConfig": Object {
                                                             "carDropoffTime": null,
@@ -4257,6 +4264,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
+                                                          "peliasWebhookUrl": null,
                                                           "pinnedDeploymentId": null,
                                                           "routerConfig": Object {
                                                             "carDropoffTime": null,
@@ -4328,6 +4336,7 @@ exports[`lib > manager > ActiveProjectViewer should render with newly created pr
                                                           "name": "mock-project",
                                                           "organizationId": null,
                                                           "otpServers": Array [],
+                                                          "peliasWebhookUrl": null,
                                                           "pinnedDeploymentId": null,
                                                           "routerConfig": Object {
                                                             "carDropoffTime": null,
diff --git a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
index dc3e76131..36d05dd4e 100644
--- a/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/DeploymentsPanel.js.snap
@@ -130,7 +130,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "peliasCsvFiles": Array [],
             "peliasResetDb": null,
             "peliasUpdate": null,
-            "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
               "east": 0,
@@ -166,7 +165,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
             "peliasCsvFiles": Array [],
             "peliasResetDb": null,
             "peliasUpdate": null,
-            "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
               "east": 0,
@@ -234,6 +232,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
         "name": "mock-project-with-deployments",
         "organizationId": null,
         "otpServers": Array [],
+        "peliasWebhookUrl": null,
         "pinnedDeploymentId": "mock-deployment-id-0",
         "routerConfig": Object {
           "carDropoffTime": null,
@@ -367,7 +366,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "peliasCsvFiles": Array [],
               "peliasResetDb": null,
               "peliasUpdate": null,
-              "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
                 "east": 0,
@@ -403,7 +401,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
               "peliasCsvFiles": Array [],
               "peliasResetDb": null,
               "peliasUpdate": null,
-              "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
                 "east": 0,
@@ -471,6 +468,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
           "name": "mock-project-with-deployments",
           "organizationId": null,
           "otpServers": Array [],
+          "peliasWebhookUrl": null,
           "pinnedDeploymentId": "mock-deployment-id-0",
           "routerConfig": Object {
             "carDropoffTime": null,
@@ -656,7 +654,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "peliasCsvFiles": Array [],
                       "peliasResetDb": null,
                       "peliasUpdate": null,
-                      "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
                         "east": 0,
@@ -692,7 +689,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                       "peliasCsvFiles": Array [],
                       "peliasResetDb": null,
                       "peliasUpdate": null,
-                      "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
                         "east": 0,
@@ -822,7 +818,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "peliasCsvFiles": Array [],
                         "peliasResetDb": null,
                         "peliasUpdate": null,
-                        "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
                           "east": 0,
@@ -858,7 +853,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                         "peliasCsvFiles": Array [],
                         "peliasResetDb": null,
                         "peliasUpdate": null,
-                        "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
                           "east": 0,
@@ -926,6 +920,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                     "name": "mock-project-with-deployments",
                     "organizationId": null,
                     "otpServers": Array [],
+                    "peliasWebhookUrl": null,
                     "pinnedDeploymentId": "mock-deployment-id-0",
                     "routerConfig": Object {
                       "carDropoffTime": null,
@@ -1201,7 +1196,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "peliasCsvFiles": Array [],
                                 "peliasResetDb": null,
                                 "peliasUpdate": null,
-                                "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
                                   "east": 0,
@@ -1331,7 +1325,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "peliasCsvFiles": Array [],
                                     "peliasResetDb": null,
                                     "peliasUpdate": null,
-                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -1367,7 +1360,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "peliasCsvFiles": Array [],
                                     "peliasResetDb": null,
                                     "peliasUpdate": null,
-                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -1435,6 +1427,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
+                                "peliasWebhookUrl": null,
                                 "pinnedDeploymentId": "mock-deployment-id-0",
                                 "routerConfig": Object {
                                   "carDropoffTime": null,
@@ -1615,7 +1608,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "peliasCsvFiles": Array [],
                                 "peliasResetDb": null,
                                 "peliasUpdate": null,
-                                "peliasWebhookUrl": null,
                                 "pinnedfeedVersionIds": Array [],
                                 "projectBounds": Object {
                                   "east": 0,
@@ -1745,7 +1737,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "peliasCsvFiles": Array [],
                                     "peliasResetDb": null,
                                     "peliasUpdate": null,
-                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -1781,7 +1772,6 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                     "peliasCsvFiles": Array [],
                                     "peliasResetDb": null,
                                     "peliasUpdate": null,
-                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -1849,6 +1839,7 @@ exports[`lib > manager > DeploymentsPanel should render with the list of deploym
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
+                                "peliasWebhookUrl": null,
                                 "pinnedDeploymentId": "mock-deployment-id-0",
                                 "routerConfig": Object {
                                   "carDropoffTime": null,
diff --git a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
index 1ffc48316..f8a818fdc 100644
--- a/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
+++ b/lib/manager/containers/__tests__/__snapshots__/FeedSourceTable.js.snap
@@ -129,7 +129,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
             "peliasCsvFiles": Array [],
             "peliasResetDb": null,
             "peliasUpdate": null,
-            "peliasWebhookUrl": null,
             "pinnedfeedVersionIds": Array [],
             "projectBounds": Object {
               "east": 0,
@@ -197,6 +196,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
         "name": "mock-project-with-deployments",
         "organizationId": null,
         "otpServers": Array [],
+        "peliasWebhookUrl": null,
         "pinnedDeploymentId": null,
         "routerConfig": Object {
           "carDropoffTime": null,
@@ -428,7 +428,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
               "peliasCsvFiles": Array [],
               "peliasResetDb": null,
               "peliasUpdate": null,
-              "peliasWebhookUrl": null,
               "pinnedfeedVersionIds": Array [],
               "projectBounds": Object {
                 "east": 0,
@@ -496,6 +495,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
           "name": "mock-project-with-deployments",
           "organizationId": null,
           "otpServers": Array [],
+          "peliasWebhookUrl": null,
           "pinnedDeploymentId": null,
           "routerConfig": Object {
             "carDropoffTime": null,
@@ -704,7 +704,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "peliasCsvFiles": Array [],
                     "peliasResetDb": null,
                     "peliasUpdate": null,
-                    "peliasWebhookUrl": null,
                     "pinnedfeedVersionIds": Array [],
                     "projectBounds": Object {
                       "east": 0,
@@ -772,6 +771,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                 "name": "mock-project-with-deployments",
                 "organizationId": null,
                 "otpServers": Array [],
+                "peliasWebhookUrl": null,
                 "pinnedDeploymentId": null,
                 "routerConfig": Object {
                   "carDropoffTime": null,
@@ -911,7 +911,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                       "peliasCsvFiles": Array [],
                       "peliasResetDb": null,
                       "peliasUpdate": null,
-                      "peliasWebhookUrl": null,
                       "pinnedfeedVersionIds": Array [],
                       "projectBounds": Object {
                         "east": 0,
@@ -979,6 +978,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                   "name": "mock-project-with-deployments",
                   "organizationId": null,
                   "otpServers": Array [],
+                  "peliasWebhookUrl": null,
                   "pinnedDeploymentId": null,
                   "routerConfig": Object {
                     "carDropoffTime": null,
@@ -1138,7 +1138,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "peliasCsvFiles": Array [],
                         "peliasResetDb": null,
                         "peliasUpdate": null,
-                        "peliasWebhookUrl": null,
                         "pinnedfeedVersionIds": Array [],
                         "projectBounds": Object {
                           "east": 0,
@@ -1206,6 +1205,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                     "name": "mock-project-with-deployments",
                     "organizationId": null,
                     "otpServers": Array [],
+                    "peliasWebhookUrl": null,
                     "pinnedDeploymentId": null,
                     "routerConfig": Object {
                       "carDropoffTime": null,
@@ -3257,7 +3257,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                             "peliasCsvFiles": Array [],
                             "peliasResetDb": null,
                             "peliasUpdate": null,
-                            "peliasWebhookUrl": null,
                             "pinnedfeedVersionIds": Array [],
                             "projectBounds": Object {
                               "east": 0,
@@ -3325,6 +3324,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                         "name": "mock-project-with-deployments",
                         "organizationId": null,
                         "otpServers": Array [],
+                        "peliasWebhookUrl": null,
                         "pinnedDeploymentId": null,
                         "routerConfig": Object {
                           "carDropoffTime": null,
@@ -3528,7 +3528,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                               "peliasCsvFiles": Array [],
                               "peliasResetDb": null,
                               "peliasUpdate": null,
-                              "peliasWebhookUrl": null,
                               "pinnedfeedVersionIds": Array [],
                               "projectBounds": Object {
                                 "east": 0,
@@ -3596,6 +3595,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                           "name": "mock-project-with-deployments",
                           "organizationId": null,
                           "otpServers": Array [],
+                          "peliasWebhookUrl": null,
                           "pinnedDeploymentId": null,
                           "routerConfig": Object {
                             "carDropoffTime": null,
@@ -3854,7 +3854,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "peliasCsvFiles": Array [],
                                     "peliasResetDb": null,
                                     "peliasUpdate": null,
-                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -3922,6 +3921,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
+                                "peliasWebhookUrl": null,
                                 "pinnedDeploymentId": null,
                                 "routerConfig": Object {
                                   "carDropoffTime": null,
@@ -4254,7 +4254,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                                   "peliasCsvFiles": Array [],
                                                   "peliasResetDb": null,
                                                   "peliasUpdate": null,
-                                                  "peliasWebhookUrl": null,
                                                   "pinnedfeedVersionIds": Array [],
                                                   "projectBounds": Object {
                                                     "east": 0,
@@ -4322,6 +4321,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                               "name": "mock-project-with-deployments",
                                               "organizationId": null,
                                               "otpServers": Array [],
+                                              "peliasWebhookUrl": null,
                                               "pinnedDeploymentId": null,
                                               "routerConfig": Object {
                                                 "carDropoffTime": null,
@@ -4663,7 +4663,6 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                     "peliasCsvFiles": Array [],
                                     "peliasResetDb": null,
                                     "peliasUpdate": null,
-                                    "peliasWebhookUrl": null,
                                     "pinnedfeedVersionIds": Array [],
                                     "projectBounds": Object {
                                       "east": 0,
@@ -4731,6 +4730,7 @@ exports[`lib > manager > FeedSourceTable should render with a project with feeds
                                 "name": "mock-project-with-deployments",
                                 "organizationId": null,
                                 "otpServers": Array [],
+                                "peliasWebhookUrl": null,
                                 "pinnedDeploymentId": null,
                                 "routerConfig": Object {
                                   "carDropoffTime": null,
diff --git a/lib/types/index.js b/lib/types/index.js
index 988fa44ba..4516d1df5 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -252,7 +252,6 @@ export type Deployment = {
   peliasCsvFiles: ?Array<string>,
   peliasResetDb: ?boolean,
   peliasUpdate: ?boolean,
-  peliasWebhookUrl: ?string,
   pinnedfeedVersionIds: Array<string>,
   projectBounds: Bounds,
   projectId: string,
@@ -796,10 +795,11 @@ export type Project = {
   name: string,
   organizationId: ?string,
   otpServers?: Array<OtpServer>,
+  peliasWebhookUrl: ?string,
   pinnedDeploymentId: ?string,
   routerConfig: RouterConfig,
-  useCustomOsmBounds: boolean,
-  user: ?any // TODO: define more specific type
+  useCustomOsmBounds: boolean, // TODO: define more specific type
+  user: ?any
 }
 
 export type ReactSelectOption = {

From 8848d56bbfb81092a4538ca60af45a8ac86e1350 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 26 Oct 2021 17:29:58 -0700
Subject: [PATCH 405/553] update repository url in package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 62c49f0fc..96125ea9a 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/conveyal/datatools-ui.git"
+    "url": "https://github.com/ibi-group/datatools-ui.git"
   },
   "author": "Conveyal LLC",
   "license": "MIT",

From 3dd49b49118b845f461967e8feeb1e2ca816f252 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Wed, 27 Oct 2021 13:21:49 -0700
Subject: [PATCH 406/553] update author to include IBI Group

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 96125ea9a..10fb9ae4e 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/ibi-group/datatools-ui.git"
   },
-  "author": "Conveyal LLC",
+  "author": "Conveyal LLC, IBI Group",
   "license": "MIT",
   "scripts": {
     "build": "mastarm build --env production",

From e7a21f61ea33e1fa335f2363ec7337a4df93e8c4 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Wed, 27 Oct 2021 13:38:44 -0700
Subject: [PATCH 407/553] Update datatools description with IBI Group

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 10fb9ae4e..3c8342a4c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "datatools-manager",
   "version": "0.0.0-development",
-  "description": "Core application for the Conveyal transit data tools suite",
+  "description": "Core application for the IBI Group transit data tools suite",
   "jest": {
     "setupFilesAfterEnv": [
       "<rootDir>/__tests__/test-utils/setup-test-framework.js"

From 4abebf3d6204d5447cab6468507d9f886480d205 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Nov 2021 18:00:12 +0000
Subject: [PATCH 408/553] build(deps): bump validator from 7.0.0 to 13.7.0

Bumps [validator](https://github.com/validatorjs/validator.js) from 7.0.0 to 13.7.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/validatorjs/validator.js/compare/7.0.0...13.7.0)

---
updated-dependencies:
- dependency-name: validator
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 3c8342a4c..ae774542e 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
     "turf-point-on-line": "^3.0.11",
     "turf-polygon": "^1.0.3",
     "uuid": "^3.1.0",
-    "validator": "7.0.0"
+    "validator": "13.7.0"
   },
   "devDependencies": {
     "aggregate-error": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 57e2075fa..ad32c08af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14664,15 +14664,10 @@ validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-validator@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-7.0.0.tgz#c74deb8063512fac35547938e6f0b1504a282fd2"
-  integrity sha1-x03rgGNRL6w1VHk45vCxUEooL9I=
-
-validator@^13.6.0:
-  version "13.6.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059"
-  integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg==
+validator@13.7.0, validator@^13.6.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.7.0.tgz#4f9658ba13ba8f3d82ee881d3516489ea85c0857"
+  integrity sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==
 
 vary@~1.1.2:
   version "1.1.2"

From 1c1239097f50b08c9c2172d9de671f91ae96cc77 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 8 Nov 2021 17:52:39 -0500
Subject: [PATCH 409/553] improvement(getMergeFeedMocalContent): Improve
 rendering of merge outcome.

---
 i18n/english.yml              | 12 +++++-----
 lib/manager/actions/status.js | 42 +++++++++++++++++++++++------------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index b8cbece8d..d6988ad85 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -452,13 +452,13 @@ components:
     title: Log in
   MergeFeedsResult:
     body:
-      failure: Merge failed with $errorCount errors.
+      failure: Merge failed with %errorCount% errors.
       success: Merge was completed successfully. A new version will be processed/validated containing the resulting feed.
-    idConflicts: ID conflicts
-    remappedIdCount: Remapped ID count
-    remappedIds: Remapped IDs
-    skipped: Skipped records
-    strategyUsed: Strategy used
+    idConflicts: "ID conflicts:"
+    remappedIds: "Remapped IDs: %remappedIdCount%"
+    skipped: "Skipped records:"
+    skippedTableRecords: "%table%: %skippedCount%"
+    strategyUsed: "Strategy used: %strategy%"
     DEFAULT: 'Condition 1: Feeds had unique service IDs and trip IDs - future feed was appended to active feed'
     EXTEND_FUTURE: "Condition 2: Feeds had matching service IDs and trip IDs - future feed took precedence and was extended to the active feed's start date"
     CHECK_STOP_TIMES: 'Condition 3: Feeds had matching service IDs, but not all trip IDs were unique - matching trips will span the active and future service period and unique trips will be included under modified service IDs'
diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index 7849f71c5..d58f2e2ca 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -143,7 +143,6 @@ export async function fetchAppInfo () {
  * MTC).
  */
 function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
-  const SEPARATOR = ': '
   const {
     errorCount,
     failed,
@@ -157,21 +156,27 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
   const messages = getComponentMessages('MergeFeedsResult')
   const details = []
   details.push(
-    [messages('strategyUsed'), messages(mergeStrategy)].join(SEPARATOR)
+    <div>
+      {messages('strategyUsed').replace('%strategy%', messages(mergeStrategy))}
+    </div>
   )
   // Do nothing or show merged feed modal? Feed version is be created
-  details.push([messages('remappedIdCount'), remappedReferences].join(SEPARATOR))
+  details.push(
+    <div>
+      {messages('remappedIds').replace('%remappedIdCount%', remappedReferences.toString())}
+    </div>
+  )
   if (Object.keys(remappedIds).length > 0) {
     const remappedIdStrings = []
     for (const key in remappedIds) {
       // Modify key to remove feed name.
       const split = key.split(':')
       const tableAndId = split.splice(1, 1)
-      remappedIdStrings.push(`${tableAndId.join(':')} -> ${remappedIds[key]}`)
+      remappedIdStrings.push(
+        <li key={key}>{tableAndId.join(':')} -> {remappedIds[key]}</li>
+      )
     }
-    details.push(
-      [messages('remappedIds'), remappedIdStrings.join(', ')].join(SEPARATOR)
-    )
+    details.push(<ul>{remappedIdStrings}</ul>)
   }
   if (skippedIds.length > 0) {
     const skippedRecordsForTables = {}
@@ -182,15 +187,24 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
     })
     const skippedRecordsStrings = []
     for (const key in skippedRecordsForTables) {
-      skippedRecordsStrings.push(`${key} - ${skippedRecordsForTables[key]}`)
+      const tableItem = messages('skippedTableRecords')
+        .replace('%table%', key)
+        .replace('%skippedCount%', skippedRecordsForTables[key])
+      skippedRecordsStrings.push(<li key={key}>{tableItem}</li>)
     }
-    details.push(
-      [messages('skipped'), skippedRecordsStrings.join(', ')].join(SEPARATOR)
-    )
+    details.push(<div>{messages('skipped')}</div>)
+    details.push(<ul>{skippedRecordsStrings}</ul>)
   }
   if (idConflicts.length > 0) {
     details.push(
-      [messages('idConflicts'), idConflicts.join(', ')].join(SEPARATOR)
+      <div>
+        {messages('idConflicts')}
+      </div>
+    )
+    details.push(
+      <ul>
+        {idConflicts.map(id => <li key={id.toString()}>{id}</li>)}
+      </ul>
     )
   }
   return {
@@ -199,13 +213,13 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
       : messages('title.success'),
     body: failed
       ? <div>
-        {messages('body.failure').replace('$errorCount', errorCount.toString())}
+        {messages('body.failure').replace('%errorCount%', errorCount.toString())}
         <ul>
           {failureReasons.map((r, i) => <li key={i}>{r}</li>)}
         </ul>
       </div>
       : messages('body.success'),
-    detail: details.join('\n')
+    detail: details
   }
 }
 

From 8f4f79cee5ea259b7cbb742ee14d959c6bce4d00 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 10 Nov 2021 14:25:05 +0000
Subject: [PATCH 410/553] refactor(DeploymentViewer): add note about future
 work on this branch

---
 .../components/deployment/DeploymentViewer.js    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index db940ede3..c7c7f17dd 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -401,11 +401,17 @@ export default class DeploymentViewer extends Component<Props, State> {
             {/* Pelias panel. Only show if deployment is pinned and webhook URL is set */}
             {project.pinnedDeploymentId === deployment.id &&
               project.peliasWebhookUrl && (
-              <PeliasPanel
-                deployment={deployment}
-                updateDeployment={updateDeployment}
-                project={project}
-              />
+              <div>
+                <span>TODO: remove this PeliasPanel wrapper and instead make peliaspanel only show if a dpeloyment exists.
+                  need to adjust the server to have a new endpoint to launch pelias job and there
+                  needs to be a way to get the otpServer info in that new job
+                </span>
+                <PeliasPanel
+                  deployment={deployment}
+                  updateDeployment={updateDeployment}
+                  project={project}
+                />
+              </div>
             )}
           </Col>
           <Col sm={3}>

From 1f8f6ebf9af9dfe48e1bd136dc2ea3e8bb36526b Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 10 Nov 2021 14:32:16 +0000
Subject: [PATCH 411/553] chore(deps): update caniuse-lite

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 57e2075fa..a8025a8c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2870,9 +2870,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000941, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001219:
-  version "1.0.30001228"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
-  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
+  version "1.0.30001279"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001279.tgz"
+  integrity sha512-VfEHpzHEXj6/CxggTwSFoZBBYGQfQv9Cf42KPlO79sWXCD1QNKWKsKzFeWL7QpZHJQYAvocqV6Rty1yJMkqWLQ==
 
 capture-exit@^2.0.0:
   version "2.0.0"

From ee3f5d97b3fb589de1a9e366c476e96f35fc5e0b Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 12 Nov 2021 14:22:29 +0000
Subject: [PATCH 412/553] feat(i18n): add polish langauge

---
 i18n/polish.yml           | 931 ++++++++++++++++++++++++++++++++++++++
 lib/common/util/config.js |   4 +-
 2 files changed, 934 insertions(+), 1 deletion(-)
 create mode 100644 i18n/polish.yml

diff --git a/i18n/polish.yml b/i18n/polish.yml
new file mode 100644
index 000000000..31541efb7
--- /dev/null
+++ b/i18n/polish.yml
@@ -0,0 +1,931 @@
+rhs:
+  tmp:
+    _id: pl-PL
+    _name: Polski
+    components:
+      Breadcrumbs:
+        deployments: Wdrożenia
+        projects: Projekty
+        root: Eksploruj
+      CreateUser:
+        new: Utwórz użytkownika
+      CreateSnapshotModal:
+        cancel: Anuluj
+        description: >-
+          Migawki to zapisywanie punktów, na które możesz powrócić do powrotu do
+          Edytowanie paszy GTFS. Do Auto-Publikuj nowy plik GTFS (i proces jako
+          Nowa wersja pliku danych, stwórz migawkę za pomocą opcji poniżej.
+        fields:
+          name:
+            label: Nazwa
+            placeholder: Nazwa migawki (wymagana)
+          comment:
+            label: Komentarz
+            placeholder: Dodatkowe informacje (opcjonalnie)
+          publishNewVersion:
+            label: Publikuj migawkę jako nowa wersja pliku
+        missingNameAlert: Migawce należy nadać prawidłową nazwę!
+        ok: OK
+        title: Utwórz nową migawkę
+      DatatoolsNavbar:
+        account: Moje konto
+        alerts: Alerty
+        editor: Edytor
+        guide: Przewodnik
+        login: Logowanie
+        logout: Wylogowanie
+        manager: Manager
+        resetPassword: Reset hasła
+        signConfig: eTID Config
+        users: Użytkownicy
+      DeploymentConfirmModal:
+        alert:
+          alreadyDeployed: >-
+            is already deployed to this server at the same router. (Deploying
+            would evict the current graph.)
+          boundsTooLarge: >-
+            Bounds are much too large to successfully deploy to OpenTripPlanner.
+            Deployment is disabled.
+          expiredFeeds: >-
+            The following feeds have expired (all scheduled trips are for past
+            dates)
+          missingBounds: >-
+            There are no bounds defined for the set of feeds. Deployment is
+            disabled.
+          missingFeeds: >-
+            There are no feeds defined for this deployment. Deployment is
+            disabled.
+          success: Deployment successfully deployed.
+        cancel: Anuluj
+        close: Zamknij
+        danger: Uwaga!
+        deploy: Wdrożenie
+        invalidBounds: Granice są nieprawidłowe!
+        to: do
+        warning: Ostrzeżenie!
+        success: Sukces!
+      DeploymentConfirmModalAlert:
+        danger: Uwaga!
+        success: Sukces!
+        warning: Ostrzeżenie!
+      DeploymentSettings:
+        boundsPlaceholder: 'min_lon, min_lat, max_lon, max_lat'
+        buildConfig:
+          elevationBucket:
+            accessKey: Access Key
+            bucketName: S3 Bucket Name
+            secretKey: Secret Key
+          fares: Taryfy
+          fetchElevationUS: Fetch Elevation
+          save: Zapisz
+          stationTransfers: Transfery na stacji
+          subwayAccessTime: Godziny otwarcia metra
+          title: Build Config
+        clear: Wyczyść
+        manageServers: Manage deployment servers
+        osm:
+          bounds: Custom Extract Bounds
+          custom: Use Custom Extract Bounds
+          gtfs: Use GTFS-Derived Extract Bounds
+          title: Wyciąg z OSM
+        routerConfig:
+          brandingUrlRoot: Branding URL Root
+          carDropoffTime: Car Dropoff Time
+          numItineraries: '# of itineraries'
+          requestLogFile: Request log file
+          stairsReluctance: Stairs Reluctance
+          title: Router Config
+          updaters:
+            $index:
+              defaultAgencyId: Domyślny ID przewoźnika
+              frequencySec: Częstotliwość (w sekundach)
+              sourceType: Rodzaj źródła
+              type: Typ
+              url: URL
+            new: Add updater
+            title: Real-time updaters
+            placeholder: Updater name
+          walkSpeed: Walk Speed
+        save: Zapisz
+        title: Wdrożenie
+      DeploymentVersionsTable:
+        dateRetrieved: Data pozyskania
+        errorCount: Licznik błędów
+        expires: Wygasa
+        loadStatus: Załadowany prawidłowo
+        name: Nazwa
+        routeCount: Licznik linii
+        stopTimesCount: Licznik czasów przystankowych
+        tripCount: Licznik kursów
+        validFrom: Ważny od
+        version: Wersja
+      DeploymentViewer:
+        addFeedSource: Dodaj źródło kanału
+        allFeedsAdded: Dodano wszystkie kanały
+        deploy: Wdrażaj
+        download: Pobierz
+        noServers: Brak zdefiniowanych serwerów
+        search: Szukaj według nazwy
+        table:
+          dateRetrieved: Data pozyskania
+          errorCount: Licznik błędów
+          expires: Wygasa
+          loadStatus: Załadowany prawidłowo
+          name: Nazwa
+          routeCount: Licznik linii
+          stopTimesCount: Licznik czasów przystankowych
+          tripCount: Licznik kursów
+          validFrom: Ważny od
+          version: Wersja
+        to: do
+        versions: Wersje kanałów
+      DeploymentsList:
+        delete: Remove deployment
+        new: New Deployment
+        search: Search for deployments
+        table:
+          creationDate: Utworzony
+          lastDeployed: Ostatnio wdrożony
+          deployedTo: Wdrożony do
+          feedCount: '# of feeds'
+          testDeployment: Test?
+          name: Nazwa
+        title: Wdrożenia
+      DeploymentsPanel:
+        autoDeploy:
+          deployWithErrors:
+            checklabel: Deploy even if some feed versions have critical errors
+            help: >
+              If this is unchecked, an auto-deployment will halt if any of the
+              feed versions in the deployment have at least one critical error
+            title: Critical Errors Handling
+          help: >
+            A deployment will automatically be kicked off (assuming there are no
+            critical errors) whenever one of the above-defined events occurs.
+          label: Auto-deploy events
+          placeholder: Specify auto-deploy events
+          title: Auto-deployment
+          types:
+            ON_FEED_FETCH: A new version is fetched
+            ON_PROCESS_FEED: A new version is processed
+        config:
+          body: >
+            Deployments can use project-level configurations (e.g., for build or
+            router config files) or be configured individually.
+          editSettings: Edit deployment settings
+          manageServers: Manage deployment servers
+          title: Configuring deployments
+        delete: Remove deployment
+        new: New Deployment
+        pinnedDeployment:
+          help: >-
+            Pin a deployment (and deploy to a server at least once) to enable
+            auto-deployment.
+          label: Pinned deployment
+          placeholder: Select a deployment to pin
+        search: Search for deployments
+        table:
+          creationDate: Utworzony
+          lastDeployed: Ostatnio wdrożony
+          deployedTo: Wdrożony do
+          feedCount: '# kanałów'
+          testDeployment: Test?
+          name: Nazwa
+        title: Wdrożenia
+      EditorFeedSourcePanel:
+        active: Aktywny
+        confirmDelete: >-
+          Spowoduje to trwałe usunięcie tego zrzutu. Zapisane tutaj dane nie
+          mogą być odzyskane. Jesteś pewien, że chcesz kontynuować?
+        confirmLoad: >-
+          Spowoduje to zastąpienie wszystkich aktywnych danych edytora GTFS dla
+          tego źródła kanału danymi z tej wersji. Jeśli w Edytorze jest
+          niezapisana praca, którą chcesz zachować, musisz najpierw wykonać
+          zrzut bieżących danych Edytora. Jesteś pewien, że chcesz kontynuować?
+        created: utworzony
+        createFromScratch: Twórz GTFS od podstaw
+        date: Data
+        delete: Usuń
+        download: Pobierz
+        feed: Kanał
+        help:
+          body:
+            '0': >-
+              Migawki to punkty zapisu, do których zawsze można wrócić podczas
+              edytowania kanału GTFS.
+            '1': >-
+              Migawka może reprezentować pracę w toku, scenariusz przyszłego
+              planowania lub nawet różne wzorce usług (np. znaczniki
+              harmonogramu letniego).
+          title: Co to są migawki?
+        load: Wczytaj do edycji
+        loadLatest: Załaduj najnowszy do edycji
+        name: Nazwa
+        noSnapshotsExist: >-
+          Obecnie nie istnieją żadne zrzuty tego kanału. Migawki można tworzyć w
+          Edytorze. Kliknij „Edytuj kanał”, aby przejść do trybu edycji.
+        noVersions: (Brak wersji)
+        noVersionsExist: Brak wersji dla tego źródła kanału.
+        of: z
+        publish: Publikuj
+        restore: Przywróć
+        snapshot: migawka
+        title: Migawki
+        version: Wersja
+      FeedFetchFrequency:
+        DAYS: dni
+        fetchFeedEvery: Pobieraj kanał co
+        HOURS: godzin
+        MINUTES: minut
+      FeedInfoPanel:
+        uploadShapefile:
+          body: >-
+            Wybierz spakowany plik kształtu do wyświetlenia na mapie. Uwaga:
+            służy tylko jako pomoc wizualna.
+          error: Przesłany plik musi być prawidłowym plikiem zip (.zip).
+          title: Prześlij plik kształtu trasy
+      FeedSourceAttributes:
+        lastUpdated: Zaktualizowano
+      FeedSourcePanel:
+        search: Wyszukaj kanały
+      FeedSourceTable:
+        comparisonColumn:
+          DEPLOYED: Wdrożona wersja
+          PUBLISHED: Wersja opublikowana
+        createFirst: Utwórz pierwsze źródło kanału!
+      FeedSourceTableRow:
+        status:
+          active: Aktywny
+          all: Wszystkie
+          expired: Wygasłe
+          expiring-within-20-days: Wygasające w ciągu 20 dni
+          expiring-within-5-days: Wygasające w ciągu 5 dni
+          feedNotInDeployment: Kanały niebędące w wdrożeniu
+          feedNotPublished: Kanały nieopublikowane
+          future: W przyszłości
+          no-version: Brak wersji
+          same-as-deployed: Taki sam jak wdrożony
+          same-as-published: Taki sam jak opublikowany
+      FeedSourceViewer:
+        deploy: Wdrażaj
+        edit: Edytuj GTFS
+        gtfs: GTFS
+        notesTitle: Notatki
+        private: Widok prywatny
+        properties:
+          deployable: Do wdrożenia?
+          name: Nazwa
+          noneSelected: (Nie wybrano)
+          property: Właściwość
+          public: Publiczny?
+          retrievalMethod:
+            fetchedAutomatically: Fetched Automatically
+            manuallyUploaded: Manually Uploaded
+            producedInHouse: Produced In-house
+            producedInHouseGtfsPlus: Produced In-house (GTFS+)
+            regionalMerge: Regional Merge
+            servicePeriodMerge: Service Period Merge
+            versionClone: Version Clone
+            title: Retrieval Method
+          snapshot: Migawka edytora
+          title: Ustawienia
+          value: Wartość
+        snapshotsTitle: Migawki
+        update: Aktualizacja
+        upload: Upload
+        versions: Wersje
+        viewPublic: View public page
+      FeedTransformationDescriptions:
+        general:
+          fileDefined: below text
+          filePlaceholder: '[choose file]'
+          tablePlaceholder: '[choose table]'
+          table: table
+          version: version
+          versionPlaceholder: '[choose version]'
+        DeleteRecordsTransformation:
+          label: Delete records from %tablePlaceholder%
+          name: Delete records transformation
+        NormalizeFieldTransformation:
+          filePlaceholder: Choose file/table to normalize
+          label: Normalize field
+          name: Normalize field transformation
+        ReplaceFileFromStringTransformation:
+          filePlaceholder: Choose the file/table to replace
+          label: Replace %tablePlaceholder% from %filePlaceholder%
+          name: Replace file from string transformation
+        ReplaceFileFromVersionTransformation:
+          filePlaceholder: Choose the file/table to replace
+          label: Replace %tablePlaceholder% from %versionPlaceholder%
+          name: Replace file from version transformation
+      FeedVersionNavigator:
+        confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+        confirmLoad: >-
+          This will override all active GTFS Editor data for this Feed Source
+          with the data from this version. If there is unsaved work in the
+          Editor you want to keep, you must snapshot the current Editor data
+          first. Are you sure you want to continue?
+        delete: Delete
+        download: Download
+        feed: Feed
+        load: Load for Editing
+        next: Next
+        of: of
+        previous: Previous
+        version: Version
+      FeedVersionTabs:
+        agencyCount: Agency count
+        daysActive: Days active
+        routeCount: Route count
+        stopCount: Stop count
+        stopTimesCount: Stop time count
+        tripCount: Trip count
+        validDates: Valid Dates
+      FeedVersionViewer:
+        confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+        confirmLoad: >-
+          This will override all active GTFS Editor data for this Feed Source
+          with the data from this version. If there is unsaved work in the
+          Editor you want to keep, you must snapshot the current Editor data
+          first. Are you sure you want to continue?
+        delete: Delete
+        download: Download
+        feed: Feed
+        load: Load
+        noVersionsExist: No versions exist for this feed source.
+        status: Status
+        timestamp: File Timestamp
+        version: version
+      FormInput:
+        buildConfig:
+          elevationBucket:
+            accessKey: Access Key
+            bucketName: S3 Bucket Name
+            secretKey: Secret Key
+          fares: Fares
+          fetchElevationUS: Fetch Elevation
+          stationTransfers: Sta. Transfers
+          subwayAccessTime: Subway Access Time
+          title: Build Config
+        deployment:
+          osm:
+            bounds: Custom Extract Bounds
+            custom: Use Custom Extract Bounds
+            gtfs: Use GTFS-Derived Extract Bounds
+            title: OSM Extract
+          title: Deployment
+        routerConfig:
+          brandingUrlRoot: Branding URL Root
+          carDropoffTime: Car Dropoff Time
+          numItineraries: '# of itineraries'
+          requestLogFile: Request log file
+          stairsReluctance: Stairs Reluctance
+          title: Router Config
+          updaters:
+            $index:
+              defaultAgencyId: Default agency ID
+              frequencySec: Frequency (in seconds)
+              sourceType: Source type
+              type: Type
+              url: URL
+            new: Add updater
+            title: Real-time updaters
+            placeholder: Updater name
+          walkSpeed: Walk Speed
+        otpServers:
+          $index:
+            admin: Admin access only?
+            delete: Remove
+            ec2Info:
+              amiId: AMI ID
+              buildAmiId: Graph build AMI ID
+              buildImageDescription: New Image Description
+              buildImageName: New Image Name
+              buildInstanceType: Graph build instance type
+              instanceCount: Instance count
+              instanceType: Instance type
+              iamInstanceProfileArn: IAM Instance Profile ARN
+              keyName: Key file name
+              recreateBuildImage: Recreate Build Image after Graph Build?
+              region: Region name
+              securityGroupId: Security Group ID
+              subnetId: Subnet ID
+              targetGroupArn: Target Group ARN (load balancer)
+            internalUrl: Internal URLs
+            name: Name
+            namePlaceholder: Production
+            publicUrl: Public URL
+            role: AWS Role
+            s3Bucket: S3 bucket name
+            serverPlaceholder: Server name
+            title: Servers
+      GeneralSettings:
+        confirmDelete: >-
+          Are you sure you want to delete this project? This action cannot be
+          undone and all feed sources and their versions will be permanently
+          deleted.
+        deleteProject: Delete Project?
+        deployment:
+          buildConfig:
+            elevationBucket:
+              accessKey: Access Key
+              bucketName: S3 Bucket Name
+              secretKey: Secret Key
+            fares: Fares
+            fetchElevationUS: Fetch Elevation
+            stationTransfers: Sta. Transfers
+            subwayAccessTime: Subway Access Time
+            title: Build Config
+          osm:
+            bounds: Custom Extract Bounds
+            custom: Use Custom Extract Bounds
+            gtfs: Use GTFS-Derived Extract Bounds
+            title: OSM Extract
+          otpServers:
+            $index:
+              admin: Admin access only?
+              delete: Remove
+              internalUrl: Internal URLs
+              name: Name
+              namePlaceholder: Production
+              publicUrl: Public URL
+              s3Bucket: S3 bucket name
+            new: Add server
+            serverPlaceholder: Server name
+            title: Servers
+          routerConfig:
+            brandingUrlRoot: Branding URL Root
+            carDropoffTime: Car Dropoff Time
+            numItineraries: '# of itineraries'
+            requestLogFile: Request log file
+            stairsReluctance: Stairs Reluctance
+            title: Router Config
+            updaters:
+              $index:
+                defaultAgencyId: Default agency ID
+                frequencySec: Frequency (in seconds)
+                sourceType: Source type
+                type: Type
+                url: URL
+              new: Add updater
+              title: Real-time updaters
+              placeholder: Updater name
+            walkSpeed: Walk Speed
+          title: Deployment
+        general:
+          location:
+            boundingBox: 'Bounding box (W,S,E,N)'
+            defaultLanguage: Default language
+            defaultLocation: 'Default location (lat, lng)'
+            defaultTimeZone: Default time zone
+            title: Location
+          name: Project name
+          title: General
+          updates:
+            autoFetchFeeds: Auto fetch feed sources?
+            title: Updates
+        rename: Rename
+        save: Save
+        title: Settings
+      GtfsValidationExplorer:
+        accessibilityValidation: Accessibility Explorer
+        table:
+          count: Count
+          file: File
+          issue: Issue
+          priority: Priority
+        timeValidation: Time-based Validation
+        title: Validation Explorer
+        validationIssues: Validation Issues
+      GtfsValidationViewer:
+        explorer: Validation Explorer
+        issues:
+          other: Other issues
+          routes: Route issues
+          shapes: Shape issues
+          stop_times: Stop times issues
+          stops: Stop issues
+          trips: Trip issues
+        noResults: No validation results to show.
+        tips:
+          DATE_NO_SERVICE: >-
+            If the transit service does not operate on weekends, some or all of
+            these validation issue may be ignored. Similarly, holidays for which
+            there is no transit service running may appear in this list.
+          FEED_TRAVEL_TIMES_ROUNDED: >-
+            This is a common feature of GTFS feeds that do not use
+            down-to-the-second precision for arrival/departure times. However,
+            if this precision is expected, there may be an issue occurring
+            during feed export.
+          MISSING_TABLE: >-
+            Missing a required table is a major issue that must be resolved
+            before most GTFS consumers can make use of the data for trip
+            planning or in other applications.
+        title: Validation issues
+      LanguageSelect:
+        placeholder: Select language...
+      Login:
+        title: Log in
+      NormalizeStopTimesTip:
+        info: >-
+          Tip: when changing travel times, consider using the 'Normalize stop
+          times' button above to automatically update all stop times to the
+          updated travel time.
+      NotesViewer:
+        all: All Comments
+        feedSource: Feed Source
+        feedVersion: Version
+        new: Post
+        none: No comments.
+        postComment: Post a New Comment
+        refresh: Refresh
+        title: Comments
+      OrganizationList:
+        new: Create org
+        search: Search orgs
+      OrganizationSettings:
+        extensions: Extensions
+        logoUrl:
+          label: Logo URL
+          placeholder: 'http://example.com/logo_30x30.png'
+        name:
+          label: Name
+          placeholder: Big City Transit
+        orgDetails: Organization details
+        projects: Projects
+        subDetails: Subscription details
+        subscriptionBeginDate: Subscription begins
+        subscriptionEndDate: Subscription ends
+        usageTier:
+          high: High
+          low: Low
+          medium: Medium
+      ProjectAccessSettings:
+        admin: Admin
+        cannotFetchFeeds: Cannot fetch feeds
+        custom: Custom
+        feeds: Feed Sources
+        noAccess: No Access
+        permissions: Permissions
+        title: Project Settings for
+      ProjectSettings:
+        deployment:
+          buildConfig:
+            elevationBucket:
+              accessKey: Access Key
+              bucketName: S3 Bucket Name
+              secretKey: Secret Key
+            fares: Fares
+            fetchElevationUS: Fetch Elevation
+            stationTransfers: Sta. Transfers
+            subwayAccessTime: Subway Access Time
+            title: Build Config
+          osm:
+            bounds: Custom Extract Bounds
+            custom: Use Custom Extract Bounds
+            gtfs: Use GTFS-Derived Extract Bounds
+            title: OSM Extract
+          otpServers:
+            $index:
+              admin: Admin access only?
+              delete: Remove
+              internalUrl: Internal URLs
+              name: Name
+              namePlaceholder: Production
+              publicUrl: Public URL
+              r5: R5 Server?
+              s3Bucket: S3 bucket name
+              targetGroupArn: Target Group ARN
+            new: Add server
+            serverPlaceholder: Server name
+            title: Servers
+          routerConfig:
+            brandingUrlRoot: Branding URL Root
+            carDropoffTime: Car Dropoff Time
+            numItineraries: '# of itineraries'
+            requestLogFile: Request log file
+            stairsReluctance: Stairs Reluctance
+            title: Router Config
+            updaters:
+              $index:
+                defaultAgencyId: Default agency ID
+                frequencySec: Frequency (in seconds)
+                sourceType: Source type
+                type: Type
+                url: URL
+              new: Add updater
+              title: Real-time updaters
+              placeholder: Updater name
+            walkSpeed: Walk Speed
+          title: Deployment
+        project:
+          cannotFetchFeeds: Cannot fetch feeds
+          feeds: Feeds
+          permissions: Permissions
+        rename: Rename
+        save: Save
+        title: Settings
+      ProjectSettingsForm:
+        cancel: Cancel
+        confirmDelete: >-
+          Are you sure you want to delete this project? This action cannot be
+          undone and all feed sources and their versions will be permanently
+          deleted.
+        deleteProject: Delete Project?
+        fields:
+          location:
+            boundingBox: 'Bounding box (W,S,E,N)'
+            boundingBoxPlaceHolder: 'min_lon, min_lat, max_lon, max_lat'
+            defaultLanguage: Default language
+            defaultLocation: 'Default location (lat, lng)'
+            defaultTimeZone: Default time zone
+            title: Location
+          name: Project name
+          title: General
+          updates:
+            autoFetchFeeds: Auto fetch feed sources?
+            title: Updates
+        save: Save
+        title: Settings
+      ProjectViewer:
+        deployments: Deployments
+        feeds:
+          createFirst: Create first feed source!
+          new: New Feed Source
+          search: Search by name
+          table:
+            deployable: Deployable?
+            errorCount: Errors
+            lastUpdated: Updated
+            name: Name
+            public: Public?
+            retrievalMethod: Retrieval Method
+            validRange: Valid Range
+          title: Feed Sources
+          update: Fetch all
+        makePublic: Publish public feeds
+        mergeFeeds: Merge all
+        settings: Settings
+      ProjectFeedListToolbar:
+        comparison:
+          DEPLOYED: Deployed
+          LATEST: Latest
+          PUBLISHED: Published
+        deployments: Deployments
+        downloadCsv: Download Summary as CSV
+        feeds:
+          createFirst: Create first feed source!
+          new: New
+          search: Search by name
+          table:
+            deployable: Deployable?
+            errorCount: Errors
+            lastUpdated: Updated
+            name: Name
+            public: Public?
+            retrievalMethod: Retrieval Method
+            validRange: Valid Range
+          title: Feed Sources
+          update: Fetch all
+        filter:
+          active: Active
+          all: All
+          expired: Expired
+          expiring: Expiring
+          future: Future
+        makePublic: Publish public feeds
+        mergeFeeds: Merge all
+        settings: Settings
+        sort:
+          alphabetically:
+            title: Alphabetically
+            asc: A-Z
+            desc: Z-A
+          endDate:
+            title: Expiration Date
+            asc: Earliest-Latest
+            desc: Latest-Earliest
+          lastUpdated:
+            title: Last Update
+            asc: Stale-Recent
+            desc: Recent-Stale
+          numErrors:
+            title: Number of Issues
+            asc: Least-Most
+            desc: Most-Least
+          startDate:
+            title: Start Date
+            asc: Earliest-Latest
+            desc: Latest-Earliest
+        sync:
+          transitland: Sync from transit.land
+          transitfeeds: Sync from transitfeeds
+          mtc: Sync from MTC
+      ProjectsList:
+        createFirst: Create my first project
+        help:
+          content: >-
+            A project is used to group GTFS feeds. For example, the feeds in a
+            project may be in the same region or they may collectively define a
+            planning scenario.
+          title: What's a project?
+        new: New Project
+        noProjects: You currently do not have any projects.
+        search: Search by project name
+        table:
+          name: Project Name
+        title: Projects
+      PublicFeedsTable:
+        country: Country
+        lastUpdated: Last Updated
+        link: Link to GTFS
+        name: Feed Name
+        region: Region
+        search: Search
+        stateProvince: State or Province
+      PublicFeedsViewer:
+        title: Catalogue
+      RegionSearch:
+        placeholder: Search for regions or agencies
+      ResultTable:
+        affectedIds: Affected ID(s)
+        description: Description
+        line: Line
+        priority: Priority
+        problemType: Problem Type
+      ServerSettings:
+        deployment:
+          otpServers:
+            new: Add server
+            refresh: Refresh
+            serverPlaceholder: Server name
+            title: Deployment Server Management
+        save: Save
+        title: Settings
+      ShowAllRoutesOnMapFilter:
+        fetching: Fetching
+        showAllRoutesOnMap: Show all routes
+        tooManyShapeRecords: large shapes.txt may impact performance
+      Sidebar:
+        unknown: Unknown
+      SnapshotItem:
+        active: Active
+        confirmDelete: >-
+          This will permanently delete this snapshot. Any data saved here cannot
+          be recovered. Are you sure you want to continue?
+        confirmLoad: >-
+          This will override all active GTFS Editor data for this Feed Source
+          with the data from this version. If there is unsaved work in the
+          Editor you want to keep, you must snapshot the current Editor data
+          first. Are you sure you want to continue?
+        created: created
+        createFromScratch: Create GTFS from Scratch
+        date: Date
+        delete: Delete
+        download: Download
+        feed: Feed
+        load: Load for Editing
+        loadLatest: Load latest for editing
+        name: Name
+        noVersions: (No Versions)
+        noVersionsExist: No versions exist for this feed source.
+        of: of
+        publish: Publish
+        restore: Restore
+        snapshot: snapshot
+        title: Snapshots
+        version: Version
+      StarButton:
+        star: Star
+        unstar: Unstar
+      TimetableHelpModal:
+        title: Timetable editor keyboard shortcuts
+        shortcuts:
+          offset:
+            title: Offsetting times
+            desc:
+              '0': Offset selected trips' stop times by adding offset time
+              '1': Offset selected trips' stop times by subtracting offset time
+              '2': Offset only active cell's time by adding offset time
+              '3': Offset only active cell's time by subtracting offset time
+              '4': Decrease offset time by 1 minute
+              '5': Decrease offset time by 10 minutes
+              '6': Increase offset time by 1 minute
+              '7': Increase offset time by 10 minutes
+          navigate:
+            title: Navigating and selecting trips
+            desc:
+              '0': Previous/next trip
+              '1': Previous/next column
+              '2': Select trip
+              '3': Select all trips
+              '4': Deselect all trips
+          modify:
+            title: Modify trips
+            desc:
+              '0': Delete selected trip(s)
+              '1': New trip
+              '2': Clone selected trip(s)
+              '3': >-
+                Copy time value from adjacent cell (the cell immediately to the
+                left)
+              '4': Copy value from cell directly above
+      TimezoneSelect:
+        placeholder: Select timezone...
+      UserAccount:
+        account:
+          title: Account
+        billing:
+          title: Billing
+        notifications:
+          methods: Notification methods
+          subscriptions: Your subscriptions
+          title: Notifications
+          unsubscribeAll: Unsubscribe from all
+        organizationSettings: Organization settings
+        organizations:
+          title: Organizations
+        personalSettings: Personal settings
+        profile:
+          profileInformation: Profile information
+          title: Profile
+        title: My settings
+      AdminPage:
+        noAccess: You do not have sufficient user privileges to access this area.
+        title: Administration
+      UserHomePage:
+        createFirst: Create my first project
+        help:
+          content: >-
+            A project is used to group GTFS feeds. For example, the feeds in a
+            project may be in the same region or they may collectively define a
+            planning scenario.
+          title: What's a project?
+        new: New Project
+        noProjects: You currently do not have any projects.
+        table:
+          name: Project Name
+        title: Projects
+      UserList:
+        filterByOrg: Filter by org.
+        of: of
+        perPage: Users per page
+        search: Search by username
+        showing: Showing Users
+        title: User Management
+      UserRow:
+        appAdmin: App admin
+        cancel: Cancel
+        delete: Delete
+        deleteConfirm: Are you sure you want to permanently delete this user?
+        edit: Edit
+        missingProject: unknown
+        noProjectsFound: No projects
+        orgAdmin: Org admin
+        save: Save
+      UserSettings:
+        admin:
+          description: Application administrators have full access to all projects.
+          title: Application Admininistrator
+        application: Application Settings
+        cancel: Cancel
+        delete: Delete
+        edit: Edit
+        org:
+          admin: Organization administrator
+          billing: Billing admin
+          description: >-
+            Organization administrators have full access to projects within the
+            organization.
+        project:
+          admin: Admin
+          custom: Custom
+          noAccess: No Access
+        save: Save
+      VersionButtonToolbar:
+        confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+        confirmLoad: >-
+          This will override all active GTFS Editor data for this Feed Source
+          with the data from this version. If there is unsaved work in the
+          Editor you want to keep, you must snapshot the current Editor data
+          first. Are you sure you want to continue?
+        delete: Delete
+        download: Download
+        feed: Feed
+        load: Load
+        noVersionsExist: No versions exist for this feed source.
+        status: Status
+        timestamp: File Timestamp
+        version: version
+      WatchButton:
+        emailVerificationConfirm: >-
+          In order to receive email notification, you must first verify your
+          email address. Would you like to resend the email verification message
+          for your account?
+        unwatch: Unwatch
+        verificationSendError: There was an error sending the email verification!
+        verificationSent: >-
+          Please check your inbox and confirm your email address by clicking the
+          verify link. You will then need to refresh this page after a moment or
+          two and re-click the Watch button to subscribe to notifications.
+        watch: Watch
diff --git a/lib/common/util/config.js b/lib/common/util/config.js
index e0b8ee794..b0905b663 100644
--- a/lib/common/util/config.js
+++ b/lib/common/util/config.js
@@ -97,7 +97,9 @@ function initializeConfig () {
 
   const languages: Array<MessageFile> = [
     // $FlowFixMe - assume file exists and make flow happy
-    require('../../../i18n/english.yml')
+    require('../../../i18n/english.yml'),
+    // $FlowFixMe - assume file exists and make flow happy
+    require('../../../i18n/polish.yml')
     // Add additional language files once translation files are available here.
     // E.g., require('../../../i18n/espanol.yml')
   ]

From 7f4295465ab7c76a568f1338c306fbd5ab8f5952 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Fri, 12 Nov 2021 14:37:49 +0000
Subject: [PATCH 413/553] refactor(i18n/polish): re-format file, add missing
 strings

---
 i18n/polish.yml | 1861 ++++++++++++++++++++++++-----------------------
 1 file changed, 932 insertions(+), 929 deletions(-)

diff --git a/i18n/polish.yml b/i18n/polish.yml
index 31541efb7..20ff1f288 100644
--- a/i18n/polish.yml
+++ b/i18n/polish.yml
@@ -1,931 +1,934 @@
-rhs:
-  tmp:
-    _id: pl-PL
-    _name: Polski
-    components:
-      Breadcrumbs:
-        deployments: Wdrożenia
-        projects: Projekty
-        root: Eksploruj
-      CreateUser:
-        new: Utwórz użytkownika
-      CreateSnapshotModal:
-        cancel: Anuluj
-        description: >-
-          Migawki to zapisywanie punktów, na które możesz powrócić do powrotu do
-          Edytowanie paszy GTFS. Do Auto-Publikuj nowy plik GTFS (i proces jako
-          Nowa wersja pliku danych, stwórz migawkę za pomocą opcji poniżej.
-        fields:
-          name:
-            label: Nazwa
-            placeholder: Nazwa migawki (wymagana)
-          comment:
-            label: Komentarz
-            placeholder: Dodatkowe informacje (opcjonalnie)
-          publishNewVersion:
-            label: Publikuj migawkę jako nowa wersja pliku
-        missingNameAlert: Migawce należy nadać prawidłową nazwę!
-        ok: OK
-        title: Utwórz nową migawkę
-      DatatoolsNavbar:
-        account: Moje konto
-        alerts: Alerty
-        editor: Edytor
-        guide: Przewodnik
-        login: Logowanie
-        logout: Wylogowanie
-        manager: Manager
-        resetPassword: Reset hasła
-        signConfig: eTID Config
-        users: Użytkownicy
-      DeploymentConfirmModal:
-        alert:
-          alreadyDeployed: >-
-            is already deployed to this server at the same router. (Deploying
-            would evict the current graph.)
-          boundsTooLarge: >-
-            Bounds are much too large to successfully deploy to OpenTripPlanner.
-            Deployment is disabled.
-          expiredFeeds: >-
-            The following feeds have expired (all scheduled trips are for past
-            dates)
-          missingBounds: >-
-            There are no bounds defined for the set of feeds. Deployment is
-            disabled.
-          missingFeeds: >-
-            There are no feeds defined for this deployment. Deployment is
-            disabled.
-          success: Deployment successfully deployed.
-        cancel: Anuluj
-        close: Zamknij
-        danger: Uwaga!
-        deploy: Wdrożenie
-        invalidBounds: Granice są nieprawidłowe!
-        to: do
-        warning: Ostrzeżenie!
-        success: Sukces!
-      DeploymentConfirmModalAlert:
-        danger: Uwaga!
-        success: Sukces!
-        warning: Ostrzeżenie!
-      DeploymentSettings:
-        boundsPlaceholder: 'min_lon, min_lat, max_lon, max_lat'
-        buildConfig:
-          elevationBucket:
-            accessKey: Access Key
-            bucketName: S3 Bucket Name
-            secretKey: Secret Key
-          fares: Taryfy
-          fetchElevationUS: Fetch Elevation
-          save: Zapisz
-          stationTransfers: Transfery na stacji
-          subwayAccessTime: Godziny otwarcia metra
-          title: Build Config
-        clear: Wyczyść
-        manageServers: Manage deployment servers
-        osm:
-          bounds: Custom Extract Bounds
-          custom: Use Custom Extract Bounds
-          gtfs: Use GTFS-Derived Extract Bounds
-          title: Wyciąg z OSM
-        routerConfig:
-          brandingUrlRoot: Branding URL Root
-          carDropoffTime: Car Dropoff Time
-          numItineraries: '# of itineraries'
-          requestLogFile: Request log file
-          stairsReluctance: Stairs Reluctance
-          title: Router Config
-          updaters:
-            $index:
-              defaultAgencyId: Domyślny ID przewoźnika
-              frequencySec: Częstotliwość (w sekundach)
-              sourceType: Rodzaj źródła
-              type: Typ
-              url: URL
-            new: Add updater
-            title: Real-time updaters
-            placeholder: Updater name
-          walkSpeed: Walk Speed
-        save: Zapisz
-        title: Wdrożenie
-      DeploymentVersionsTable:
-        dateRetrieved: Data pozyskania
-        errorCount: Licznik błędów
-        expires: Wygasa
-        loadStatus: Załadowany prawidłowo
-        name: Nazwa
-        routeCount: Licznik linii
-        stopTimesCount: Licznik czasów przystankowych
-        tripCount: Licznik kursów
-        validFrom: Ważny od
-        version: Wersja
-      DeploymentViewer:
-        addFeedSource: Dodaj źródło kanału
-        allFeedsAdded: Dodano wszystkie kanały
-        deploy: Wdrażaj
-        download: Pobierz
-        noServers: Brak zdefiniowanych serwerów
-        search: Szukaj według nazwy
-        table:
-          dateRetrieved: Data pozyskania
-          errorCount: Licznik błędów
-          expires: Wygasa
-          loadStatus: Załadowany prawidłowo
-          name: Nazwa
-          routeCount: Licznik linii
-          stopTimesCount: Licznik czasów przystankowych
-          tripCount: Licznik kursów
-          validFrom: Ważny od
-          version: Wersja
-        to: do
-        versions: Wersje kanałów
-      DeploymentsList:
-        delete: Remove deployment
-        new: New Deployment
-        search: Search for deployments
-        table:
-          creationDate: Utworzony
-          lastDeployed: Ostatnio wdrożony
-          deployedTo: Wdrożony do
-          feedCount: '# of feeds'
-          testDeployment: Test?
-          name: Nazwa
-        title: Wdrożenia
-      DeploymentsPanel:
-        autoDeploy:
-          deployWithErrors:
-            checklabel: Deploy even if some feed versions have critical errors
-            help: >
-              If this is unchecked, an auto-deployment will halt if any of the
-              feed versions in the deployment have at least one critical error
-            title: Critical Errors Handling
-          help: >
-            A deployment will automatically be kicked off (assuming there are no
-            critical errors) whenever one of the above-defined events occurs.
-          label: Auto-deploy events
-          placeholder: Specify auto-deploy events
-          title: Auto-deployment
-          types:
-            ON_FEED_FETCH: A new version is fetched
-            ON_PROCESS_FEED: A new version is processed
-        config:
-          body: >
-            Deployments can use project-level configurations (e.g., for build or
-            router config files) or be configured individually.
-          editSettings: Edit deployment settings
-          manageServers: Manage deployment servers
-          title: Configuring deployments
-        delete: Remove deployment
-        new: New Deployment
-        pinnedDeployment:
-          help: >-
-            Pin a deployment (and deploy to a server at least once) to enable
-            auto-deployment.
-          label: Pinned deployment
-          placeholder: Select a deployment to pin
-        search: Search for deployments
-        table:
-          creationDate: Utworzony
-          lastDeployed: Ostatnio wdrożony
-          deployedTo: Wdrożony do
-          feedCount: '# kanałów'
-          testDeployment: Test?
-          name: Nazwa
-        title: Wdrożenia
-      EditorFeedSourcePanel:
-        active: Aktywny
-        confirmDelete: >-
-          Spowoduje to trwałe usunięcie tego zrzutu. Zapisane tutaj dane nie
-          mogą być odzyskane. Jesteś pewien, że chcesz kontynuować?
-        confirmLoad: >-
-          Spowoduje to zastąpienie wszystkich aktywnych danych edytora GTFS dla
-          tego źródła kanału danymi z tej wersji. Jeśli w Edytorze jest
-          niezapisana praca, którą chcesz zachować, musisz najpierw wykonać
-          zrzut bieżących danych Edytora. Jesteś pewien, że chcesz kontynuować?
-        created: utworzony
-        createFromScratch: Twórz GTFS od podstaw
-        date: Data
-        delete: Usuń
-        download: Pobierz
-        feed: Kanał
-        help:
-          body:
-            '0': >-
-              Migawki to punkty zapisu, do których zawsze można wrócić podczas
-              edytowania kanału GTFS.
-            '1': >-
-              Migawka może reprezentować pracę w toku, scenariusz przyszłego
-              planowania lub nawet różne wzorce usług (np. znaczniki
-              harmonogramu letniego).
-          title: Co to są migawki?
-        load: Wczytaj do edycji
-        loadLatest: Załaduj najnowszy do edycji
-        name: Nazwa
-        noSnapshotsExist: >-
-          Obecnie nie istnieją żadne zrzuty tego kanału. Migawki można tworzyć w
-          Edytorze. Kliknij „Edytuj kanał”, aby przejść do trybu edycji.
-        noVersions: (Brak wersji)
-        noVersionsExist: Brak wersji dla tego źródła kanału.
-        of: z
-        publish: Publikuj
-        restore: Przywróć
-        snapshot: migawka
-        title: Migawki
-        version: Wersja
-      FeedFetchFrequency:
-        DAYS: dni
-        fetchFeedEvery: Pobieraj kanał co
-        HOURS: godzin
-        MINUTES: minut
-      FeedInfoPanel:
-        uploadShapefile:
-          body: >-
-            Wybierz spakowany plik kształtu do wyświetlenia na mapie. Uwaga:
-            służy tylko jako pomoc wizualna.
-          error: Przesłany plik musi być prawidłowym plikiem zip (.zip).
-          title: Prześlij plik kształtu trasy
-      FeedSourceAttributes:
-        lastUpdated: Zaktualizowano
-      FeedSourcePanel:
-        search: Wyszukaj kanały
-      FeedSourceTable:
-        comparisonColumn:
-          DEPLOYED: Wdrożona wersja
-          PUBLISHED: Wersja opublikowana
-        createFirst: Utwórz pierwsze źródło kanału!
-      FeedSourceTableRow:
-        status:
-          active: Aktywny
-          all: Wszystkie
-          expired: Wygasłe
-          expiring-within-20-days: Wygasające w ciągu 20 dni
-          expiring-within-5-days: Wygasające w ciągu 5 dni
-          feedNotInDeployment: Kanały niebędące w wdrożeniu
-          feedNotPublished: Kanały nieopublikowane
-          future: W przyszłości
-          no-version: Brak wersji
-          same-as-deployed: Taki sam jak wdrożony
-          same-as-published: Taki sam jak opublikowany
-      FeedSourceViewer:
-        deploy: Wdrażaj
-        edit: Edytuj GTFS
-        gtfs: GTFS
-        notesTitle: Notatki
-        private: Widok prywatny
-        properties:
-          deployable: Do wdrożenia?
-          name: Nazwa
-          noneSelected: (Nie wybrano)
-          property: Właściwość
-          public: Publiczny?
-          retrievalMethod:
-            fetchedAutomatically: Fetched Automatically
-            manuallyUploaded: Manually Uploaded
-            producedInHouse: Produced In-house
-            producedInHouseGtfsPlus: Produced In-house (GTFS+)
-            regionalMerge: Regional Merge
-            servicePeriodMerge: Service Period Merge
-            versionClone: Version Clone
-            title: Retrieval Method
-          snapshot: Migawka edytora
-          title: Ustawienia
-          value: Wartość
-        snapshotsTitle: Migawki
-        update: Aktualizacja
-        upload: Upload
-        versions: Wersje
-        viewPublic: View public page
-      FeedTransformationDescriptions:
-        general:
-          fileDefined: below text
-          filePlaceholder: '[choose file]'
-          tablePlaceholder: '[choose table]'
-          table: table
-          version: version
-          versionPlaceholder: '[choose version]'
-        DeleteRecordsTransformation:
-          label: Delete records from %tablePlaceholder%
-          name: Delete records transformation
-        NormalizeFieldTransformation:
-          filePlaceholder: Choose file/table to normalize
-          label: Normalize field
-          name: Normalize field transformation
-        ReplaceFileFromStringTransformation:
-          filePlaceholder: Choose the file/table to replace
-          label: Replace %tablePlaceholder% from %filePlaceholder%
-          name: Replace file from string transformation
-        ReplaceFileFromVersionTransformation:
-          filePlaceholder: Choose the file/table to replace
-          label: Replace %tablePlaceholder% from %versionPlaceholder%
-          name: Replace file from version transformation
-      FeedVersionNavigator:
-        confirmDelete: Are you sure you want to delete this version? This cannot be undone.
-        confirmLoad: >-
-          This will override all active GTFS Editor data for this Feed Source
-          with the data from this version. If there is unsaved work in the
-          Editor you want to keep, you must snapshot the current Editor data
-          first. Are you sure you want to continue?
-        delete: Delete
-        download: Download
-        feed: Feed
-        load: Load for Editing
-        next: Next
-        of: of
-        previous: Previous
-        version: Version
-      FeedVersionTabs:
-        agencyCount: Agency count
-        daysActive: Days active
-        routeCount: Route count
-        stopCount: Stop count
-        stopTimesCount: Stop time count
-        tripCount: Trip count
-        validDates: Valid Dates
-      FeedVersionViewer:
-        confirmDelete: Are you sure you want to delete this version? This cannot be undone.
-        confirmLoad: >-
-          This will override all active GTFS Editor data for this Feed Source
-          with the data from this version. If there is unsaved work in the
-          Editor you want to keep, you must snapshot the current Editor data
-          first. Are you sure you want to continue?
-        delete: Delete
-        download: Download
-        feed: Feed
-        load: Load
-        noVersionsExist: No versions exist for this feed source.
-        status: Status
-        timestamp: File Timestamp
-        version: version
-      FormInput:
-        buildConfig:
-          elevationBucket:
-            accessKey: Access Key
-            bucketName: S3 Bucket Name
-            secretKey: Secret Key
-          fares: Fares
-          fetchElevationUS: Fetch Elevation
-          stationTransfers: Sta. Transfers
-          subwayAccessTime: Subway Access Time
-          title: Build Config
-        deployment:
-          osm:
-            bounds: Custom Extract Bounds
-            custom: Use Custom Extract Bounds
-            gtfs: Use GTFS-Derived Extract Bounds
-            title: OSM Extract
-          title: Deployment
-        routerConfig:
-          brandingUrlRoot: Branding URL Root
-          carDropoffTime: Car Dropoff Time
-          numItineraries: '# of itineraries'
-          requestLogFile: Request log file
-          stairsReluctance: Stairs Reluctance
-          title: Router Config
-          updaters:
-            $index:
-              defaultAgencyId: Default agency ID
-              frequencySec: Frequency (in seconds)
-              sourceType: Source type
-              type: Type
-              url: URL
-            new: Add updater
-            title: Real-time updaters
-            placeholder: Updater name
-          walkSpeed: Walk Speed
-        otpServers:
+_id: pl-PL
+_name: Polski
+components:
+  Breadcrumbs:
+    deployments: Wdrożenia
+    projects: Projekty
+    root: Eksploruj
+  CreateUser:
+    new: Utwórz użytkownika
+  CreateSnapshotModal:
+    cancel: Anuluj
+    description: >-
+      Migawki to zapisywanie punktów, na które możesz powrócić do powrotu do
+      Edytowanie paszy GTFS. Do Auto-Publikuj nowy plik GTFS (i proces jako
+      Nowa wersja pliku danych, stwórz migawkę za pomocą opcji poniżej.
+    fields:
+      name:
+        label: Nazwa
+        placeholder: Nazwa migawki (wymagana)
+      comment:
+        label: Komentarz
+        placeholder: Dodatkowe informacje (opcjonalnie)
+      publishNewVersion:
+        label: Publikuj migawkę jako nowa wersja pliku
+    missingNameAlert: Migawce należy nadać prawidłową nazwę!
+    ok: OK
+    title: Utwórz nową migawkę
+  DatatoolsNavbar:
+    account: Moje konto
+    alerts: Alerty
+    editor: Edytor
+    guide: Przewodnik
+    login: Logowanie
+    logout: Wylogowanie
+    manager: Manager
+    resetPassword: Reset hasła
+    signConfig: eTID Config
+    users: Użytkownicy
+  DeploymentConfirmModal:
+    alert:
+      alreadyDeployed: >-
+        is already deployed to this server at the same router. (Deploying
+        would evict the current graph.)
+      boundsTooLarge: >-
+        Bounds are much too large to successfully deploy to OpenTripPlanner.
+        Deployment is disabled.
+      expiredFeeds: >-
+        The following feeds have expired (all scheduled trips are for past
+        dates)
+      missingBounds: >-
+        There are no bounds defined for the set of feeds. Deployment is
+        disabled.
+      missingFeeds: >-
+        There are no feeds defined for this deployment. Deployment is
+        disabled.
+      success: Deployment successfully deployed.
+    cancel: Anuluj
+    close: Zamknij
+    danger: Uwaga!
+    deploy: Wdrożenie
+    invalidBounds: Granice są nieprawidłowe!
+    to: do
+    warning: Ostrzeżenie!
+    success: Sukces!
+  DeploymentConfirmModalAlert:
+    danger: Uwaga!
+    success: Sukces!
+    warning: Ostrzeżenie!
+  DeploymentSettings:
+    boundsPlaceholder: "min_lon, min_lat, max_lon, max_lat"
+    buildConfig:
+      elevationBucket:
+        accessKey: Access Key
+        bucketName: S3 Bucket Name
+        secretKey: Secret Key
+      fares: Taryfy
+      fetchElevationUS: Fetch Elevation
+      save: Zapisz
+      stationTransfers: Transfery na stacji
+      subwayAccessTime: Godziny otwarcia metra
+      title: Build Config
+    clear: Wyczyść
+    manageServers: Manage deployment servers
+    osm:
+      bounds: Custom Extract Bounds
+      custom: Use Custom Extract Bounds
+      gtfs: Use GTFS-Derived Extract Bounds
+      title: Wyciąg z OSM
+    routerConfig:
+      brandingUrlRoot: Branding URL Root
+      carDropoffTime: Car Dropoff Time
+      numItineraries: "# of itineraries"
+      requestLogFile: Request log file
+      stairsReluctance: Stairs Reluctance
+      title: Router Config
+      updaters:
+        $index:
+          defaultAgencyId: Domyślny ID przewoźnika
+          frequencySec: Częstotliwość (w sekundach)
+          sourceType: Rodzaj źródła
+          type: Typ
+          url: URL
+        new: Add updater
+        title: Real-time updaters
+        placeholder: Updater name
+      walkSpeed: Walk Speed
+    save: Zapisz
+    title: Wdrożenie
+  DeploymentVersionsTable:
+    dateRetrieved: Data pozyskania
+    errorCount: Licznik błędów
+    expires: Wygasa
+    loadStatus: Załadowany prawidłowo
+    name: Nazwa
+    routeCount: Licznik linii
+    stopTimesCount: Licznik czasów przystankowych
+    tripCount: Licznik kursów
+    validFrom: Ważny od
+    version: Wersja
+  DeploymentViewer:
+    addFeedSource: Dodaj źródło kanału
+    allFeedsAdded: Dodano wszystkie kanały
+    deploy: Wdrażaj
+    download: Pobierz
+    noServers: Brak zdefiniowanych serwerów
+    search: Szukaj według nazwy
+    table:
+      dateRetrieved: Data pozyskania
+      errorCount: Licznik błędów
+      expires: Wygasa
+      loadStatus: Załadowany prawidłowo
+      name: Nazwa
+      routeCount: Licznik linii
+      stopTimesCount: Licznik czasów przystankowych
+      tripCount: Licznik kursów
+      validFrom: Ważny od
+      version: Wersja
+    to: do
+    versions: Wersje kanałów
+  DeploymentsList:
+    delete: Remove deployment
+    new: New Deployment
+    search: Search for deployments
+    table:
+      creationDate: Utworzony
+      lastDeployed: Ostatnio wdrożony
+      deployedTo: Wdrożony do
+      feedCount: "# of feeds"
+      testDeployment: Test?
+      name: Nazwa
+    title: Wdrożenia
+  DeploymentsPanel:
+    autoDeploy:
+      deployWithErrors:
+        checklabel: Deploy even if some feed versions have critical errors
+        help: >
+          If this is unchecked, an auto-deployment will halt if any of the
+          feed versions in the deployment have at least one critical error
+        title: Critical Errors Handling
+      help: >
+        A deployment will automatically be kicked off (assuming there are no
+        critical errors) whenever one of the above-defined events occurs.
+      label: Auto-deploy events
+      placeholder: Specify auto-deploy events
+      title: Auto-deployment
+      types:
+        ON_FEED_FETCH: A new version is fetched
+        ON_PROCESS_FEED: A new version is processed
+    config:
+      body: >
+        Deployments can use project-level configurations (e.g., for build or
+        router config files) or be configured individually.
+      editSettings: Edit deployment settings
+      manageServers: Manage deployment servers
+      title: Configuring deployments
+    delete: Remove deployment
+    new: New Deployment
+    pinnedDeployment:
+      help: >-
+        Pin a deployment (and deploy to a server at least once) to enable
+        auto-deployment.
+      label: Pinned deployment
+      placeholder: Select a deployment to pin
+    search: Search for deployments
+    table:
+      creationDate: Utworzony
+      lastDeployed: Ostatnio wdrożony
+      deployedTo: Wdrożony do
+      feedCount: "# kanałów"
+      testDeployment: Test?
+      name: Nazwa
+    title: Wdrożenia
+  EditorFeedSourcePanel:
+    active: Aktywny
+    confirmDelete: >-
+      Spowoduje to trwałe usunięcie tego zrzutu. Zapisane tutaj dane nie
+      mogą być odzyskane. Jesteś pewien, że chcesz kontynuować?
+    confirmLoad: >-
+      Spowoduje to zastąpienie wszystkich aktywnych danych edytora GTFS dla
+      tego źródła kanału danymi z tej wersji. Jeśli w Edytorze jest
+      niezapisana praca, którą chcesz zachować, musisz najpierw wykonać
+      zrzut bieżących danych Edytora. Jesteś pewien, że chcesz kontynuować?
+    created: utworzony
+    createFromScratch: Twórz GTFS od podstaw
+    date: Data
+    delete: Usuń
+    download: Pobierz
+    feed: Kanał
+    help:
+      body:
+        "0": >-
+          Migawki to punkty zapisu, do których zawsze można wrócić podczas
+          edytowania kanału GTFS.
+        "1": >-
+          Migawka może reprezentować pracę w toku, scenariusz przyszłego
+          planowania lub nawet różne wzorce usług (np. znaczniki
+          harmonogramu letniego).
+      title: Co to są migawki?
+    load: Wczytaj do edycji
+    loadLatest: Załaduj najnowszy do edycji
+    name: Nazwa
+    noSnapshotsExist: >-
+      Obecnie nie istnieją żadne zrzuty tego kanału. Migawki można tworzyć w
+      Edytorze. Kliknij „Edytuj kanał”, aby przejść do trybu edycji.
+    noVersions: (Brak wersji)
+    noVersionsExist: Brak wersji dla tego źródła kanału.
+    of: z
+    publish: Publikuj
+    restore: Przywróć
+    snapshot: migawka
+    title: Migawki
+    version: Wersja
+  FeedFetchFrequency:
+    DAYS: dni
+    fetchFeedEvery: Pobieraj kanał co
+    HOURS: godzin
+    MINUTES: minut
+  FeedInfoPanel:
+    uploadShapefile:
+      body: >-
+        Wybierz spakowany plik kształtu do wyświetlenia na mapie. Uwaga:
+        służy tylko jako pomoc wizualna.
+      error: Przesłany plik musi być prawidłowym plikiem zip (.zip).
+      title: Prześlij plik kształtu trasy
+  FeedSourceAttributes:
+    lastUpdated: Zaktualizowano
+  FeedSourcePanel:
+    search: Wyszukaj kanały
+  FeedSourceTable:
+    comparisonColumn:
+      DEPLOYED: Wdrożona wersja
+      PUBLISHED: Wersja opublikowana
+    createFirst: Utwórz pierwsze źródło kanału!
+  FeedSourceTableRow:
+    status:
+      active: Aktywny
+      all: Wszystkie
+      expired: Wygasłe
+      expiring-within-20-days: Wygasające w ciągu 20 dni
+      expiring-within-5-days: Wygasające w ciągu 5 dni
+      feedNotInDeployment: Kanały niebędące w wdrożeniu
+      feedNotPublished: Kanały nieopublikowane
+      future: W przyszłości
+      no-version: Brak wersji
+      same-as-deployed: Taki sam jak wdrożony
+      same-as-published: Taki sam jak opublikowany
+  FeedSourceViewer:
+    deploy: Wdrażaj
+    edit: Edytuj GTFS
+    gtfs: GTFS
+    notesTitle: Notatki
+    private: Widok prywatny
+    properties:
+      deployable: Do wdrożenia?
+      name: Nazwa
+      noneSelected: (Nie wybrano)
+      property: Właściwość
+      public: Publiczny?
+      retrievalMethod:
+        fetchedAutomatically: Fetched Automatically
+        manuallyUploaded: Manually Uploaded
+        producedInHouse: Produced In-house
+        producedInHouseGtfsPlus: Produced In-house (GTFS+)
+        regionalMerge: Regional Merge
+        servicePeriodMerge: Service Period Merge
+        versionClone: Version Clone
+        title: Retrieval Method
+      snapshot: Migawka edytora
+      title: Ustawienia
+      value: Wartość
+    snapshotsTitle: Migawki
+    update: Aktualizacja
+    upload: Upload
+    versions: Wersje
+    viewPublic: View public page
+  FeedTransformationDescriptions:
+    general:
+      fileDefined: below text
+      filePlaceholder: "[choose file]"
+      tablePlaceholder: "[choose table]"
+      table: table
+      version: version
+      versionPlaceholder: "[choose version]"
+    DeleteRecordsTransformation:
+      label: Delete records from %tablePlaceholder%
+      name: Delete records transformation
+    NormalizeFieldTransformation:
+      filePlaceholder: Choose file/table to normalize
+      label: Normalize field
+      name: Normalize field transformation
+    ReplaceFileFromStringTransformation:
+      filePlaceholder: Choose the file/table to replace
+      label: Replace %tablePlaceholder% from %filePlaceholder%
+      name: Replace file from string transformation
+    ReplaceFileFromVersionTransformation:
+      filePlaceholder: Choose the file/table to replace
+      label: Replace %tablePlaceholder% from %versionPlaceholder%
+      name: Replace file from version transformation
+  FeedVersionNavigator:
+    confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+    confirmLoad: >-
+      This will override all active GTFS Editor data for this Feed Source
+      with the data from this version. If there is unsaved work in the
+      Editor you want to keep, you must snapshot the current Editor data
+      first. Are you sure you want to continue?
+    delete: Delete
+    download: Download
+    feed: Feed
+    load: Load for Editing
+    next: Next
+    of: of
+    previous: Previous
+    version: Version
+  FeedVersionTabs:
+    agencyCount: Agency count
+    daysActive: Days active
+    routeCount: Route count
+    stopCount: Stop count
+    stopTimesCount: Stop time count
+    tripCount: Trip count
+    validDates: Valid Dates
+  FeedVersionViewer:
+    confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+    confirmLoad: >-
+      This will override all active GTFS Editor data for this Feed Source
+      with the data from this version. If there is unsaved work in the
+      Editor you want to keep, you must snapshot the current Editor data
+      first. Are you sure you want to continue?
+    delete: Delete
+    download: Download
+    feed: Feed
+    load: Load
+    noVersionsExist: No versions exist for this feed source.
+    status: Status
+    timestamp: File Timestamp
+    version: version
+  FormInput:
+    buildConfig:
+      elevationBucket:
+        accessKey: Access Key
+        bucketName: S3 Bucket Name
+        secretKey: Secret Key
+      fares: Fares
+      fetchElevationUS: Fetch Elevation
+      stationTransfers: Sta. Transfers
+      subwayAccessTime: Subway Access Time
+      title: Build Config
+    deployment:
+      osm:
+        bounds: Custom Extract Bounds
+        custom: Use Custom Extract Bounds
+        gtfs: Use GTFS-Derived Extract Bounds
+        title: OSM Extract
+      title: Deployment
+    routerConfig:
+      brandingUrlRoot: Branding URL Root
+      carDropoffTime: Car Dropoff Time
+      numItineraries: "# of itineraries"
+      requestLogFile: Request log file
+      stairsReluctance: Stairs Reluctance
+      title: Router Config
+      updaters:
+        $index:
+          defaultAgencyId: Default agency ID
+          frequencySec: Frequency (in seconds)
+          sourceType: Source type
+          type: Type
+          url: URL
+        new: Add updater
+        title: Real-time updaters
+        placeholder: Updater name
+      walkSpeed: Walk Speed
+    otpServers:
+      $index:
+        admin: Admin access only?
+        delete: Remove
+        ec2Info:
+          amiId: AMI ID
+          buildAmiId: Graph build AMI ID
+          buildImageDescription: New Image Description
+          buildImageName: New Image Name
+          buildInstanceType: Graph build instance type
+          instanceCount: Instance count
+          instanceType: Instance type
+          iamInstanceProfileArn: IAM Instance Profile ARN
+          keyName: Key file name
+          recreateBuildImage: Recreate Build Image after Graph Build?
+          region: Region name
+          securityGroupId: Security Group ID
+          subnetId: Subnet ID
+          targetGroupArn: Target Group ARN (load balancer)
+        internalUrl: Internal URLs
+        name: Name
+        namePlaceholder: Production
+        publicUrl: Public URL
+        role: AWS Role
+        s3Bucket: S3 bucket name
+        serverPlaceholder: Server name
+        title: Servers
+  GeneralSettings:
+    confirmDelete: >-
+      Are you sure you want to delete this project? This action cannot be
+      undone and all feed sources and their versions will be permanently
+      deleted.
+    deleteProject: Delete Project?
+    deployment:
+      buildConfig:
+        elevationBucket:
+          accessKey: Access Key
+          bucketName: S3 Bucket Name
+          secretKey: Secret Key
+        fares: Fares
+        fetchElevationUS: Fetch Elevation
+        stationTransfers: Sta. Transfers
+        subwayAccessTime: Subway Access Time
+        title: Build Config
+      osm:
+        bounds: Custom Extract Bounds
+        custom: Use Custom Extract Bounds
+        gtfs: Use GTFS-Derived Extract Bounds
+        title: OSM Extract
+      otpServers:
+        $index:
+          admin: Admin access only?
+          delete: Remove
+          internalUrl: Internal URLs
+          name: Name
+          namePlaceholder: Production
+          publicUrl: Public URL
+          s3Bucket: S3 bucket name
+        new: Add server
+        serverPlaceholder: Server name
+        title: Servers
+      routerConfig:
+        brandingUrlRoot: Branding URL Root
+        carDropoffTime: Car Dropoff Time
+        numItineraries: "# of itineraries"
+        requestLogFile: Request log file
+        stairsReluctance: Stairs Reluctance
+        title: Router Config
+        updaters:
           $index:
-            admin: Admin access only?
-            delete: Remove
-            ec2Info:
-              amiId: AMI ID
-              buildAmiId: Graph build AMI ID
-              buildImageDescription: New Image Description
-              buildImageName: New Image Name
-              buildInstanceType: Graph build instance type
-              instanceCount: Instance count
-              instanceType: Instance type
-              iamInstanceProfileArn: IAM Instance Profile ARN
-              keyName: Key file name
-              recreateBuildImage: Recreate Build Image after Graph Build?
-              region: Region name
-              securityGroupId: Security Group ID
-              subnetId: Subnet ID
-              targetGroupArn: Target Group ARN (load balancer)
-            internalUrl: Internal URLs
-            name: Name
-            namePlaceholder: Production
-            publicUrl: Public URL
-            role: AWS Role
-            s3Bucket: S3 bucket name
-            serverPlaceholder: Server name
-            title: Servers
-      GeneralSettings:
-        confirmDelete: >-
-          Are you sure you want to delete this project? This action cannot be
-          undone and all feed sources and their versions will be permanently
-          deleted.
-        deleteProject: Delete Project?
-        deployment:
-          buildConfig:
-            elevationBucket:
-              accessKey: Access Key
-              bucketName: S3 Bucket Name
-              secretKey: Secret Key
-            fares: Fares
-            fetchElevationUS: Fetch Elevation
-            stationTransfers: Sta. Transfers
-            subwayAccessTime: Subway Access Time
-            title: Build Config
-          osm:
-            bounds: Custom Extract Bounds
-            custom: Use Custom Extract Bounds
-            gtfs: Use GTFS-Derived Extract Bounds
-            title: OSM Extract
-          otpServers:
-            $index:
-              admin: Admin access only?
-              delete: Remove
-              internalUrl: Internal URLs
-              name: Name
-              namePlaceholder: Production
-              publicUrl: Public URL
-              s3Bucket: S3 bucket name
-            new: Add server
-            serverPlaceholder: Server name
-            title: Servers
-          routerConfig:
-            brandingUrlRoot: Branding URL Root
-            carDropoffTime: Car Dropoff Time
-            numItineraries: '# of itineraries'
-            requestLogFile: Request log file
-            stairsReluctance: Stairs Reluctance
-            title: Router Config
-            updaters:
-              $index:
-                defaultAgencyId: Default agency ID
-                frequencySec: Frequency (in seconds)
-                sourceType: Source type
-                type: Type
-                url: URL
-              new: Add updater
-              title: Real-time updaters
-              placeholder: Updater name
-            walkSpeed: Walk Speed
-          title: Deployment
-        general:
-          location:
-            boundingBox: 'Bounding box (W,S,E,N)'
-            defaultLanguage: Default language
-            defaultLocation: 'Default location (lat, lng)'
-            defaultTimeZone: Default time zone
-            title: Location
-          name: Project name
-          title: General
-          updates:
-            autoFetchFeeds: Auto fetch feed sources?
-            title: Updates
-        rename: Rename
-        save: Save
-        title: Settings
-      GtfsValidationExplorer:
-        accessibilityValidation: Accessibility Explorer
-        table:
-          count: Count
-          file: File
-          issue: Issue
-          priority: Priority
-        timeValidation: Time-based Validation
-        title: Validation Explorer
-        validationIssues: Validation Issues
-      GtfsValidationViewer:
-        explorer: Validation Explorer
-        issues:
-          other: Other issues
-          routes: Route issues
-          shapes: Shape issues
-          stop_times: Stop times issues
-          stops: Stop issues
-          trips: Trip issues
-        noResults: No validation results to show.
-        tips:
-          DATE_NO_SERVICE: >-
-            If the transit service does not operate on weekends, some or all of
-            these validation issue may be ignored. Similarly, holidays for which
-            there is no transit service running may appear in this list.
-          FEED_TRAVEL_TIMES_ROUNDED: >-
-            This is a common feature of GTFS feeds that do not use
-            down-to-the-second precision for arrival/departure times. However,
-            if this precision is expected, there may be an issue occurring
-            during feed export.
-          MISSING_TABLE: >-
-            Missing a required table is a major issue that must be resolved
-            before most GTFS consumers can make use of the data for trip
-            planning or in other applications.
-        title: Validation issues
-      LanguageSelect:
-        placeholder: Select language...
-      Login:
-        title: Log in
-      NormalizeStopTimesTip:
-        info: >-
-          Tip: when changing travel times, consider using the 'Normalize stop
-          times' button above to automatically update all stop times to the
-          updated travel time.
-      NotesViewer:
-        all: All Comments
-        feedSource: Feed Source
-        feedVersion: Version
-        new: Post
-        none: No comments.
-        postComment: Post a New Comment
-        refresh: Refresh
-        title: Comments
-      OrganizationList:
-        new: Create org
-        search: Search orgs
-      OrganizationSettings:
-        extensions: Extensions
-        logoUrl:
-          label: Logo URL
-          placeholder: 'http://example.com/logo_30x30.png'
-        name:
-          label: Name
-          placeholder: Big City Transit
-        orgDetails: Organization details
-        projects: Projects
-        subDetails: Subscription details
-        subscriptionBeginDate: Subscription begins
-        subscriptionEndDate: Subscription ends
-        usageTier:
-          high: High
-          low: Low
-          medium: Medium
-      ProjectAccessSettings:
-        admin: Admin
-        cannotFetchFeeds: Cannot fetch feeds
-        custom: Custom
-        feeds: Feed Sources
-        noAccess: No Access
-        permissions: Permissions
-        title: Project Settings for
-      ProjectSettings:
-        deployment:
-          buildConfig:
-            elevationBucket:
-              accessKey: Access Key
-              bucketName: S3 Bucket Name
-              secretKey: Secret Key
-            fares: Fares
-            fetchElevationUS: Fetch Elevation
-            stationTransfers: Sta. Transfers
-            subwayAccessTime: Subway Access Time
-            title: Build Config
-          osm:
-            bounds: Custom Extract Bounds
-            custom: Use Custom Extract Bounds
-            gtfs: Use GTFS-Derived Extract Bounds
-            title: OSM Extract
-          otpServers:
-            $index:
-              admin: Admin access only?
-              delete: Remove
-              internalUrl: Internal URLs
-              name: Name
-              namePlaceholder: Production
-              publicUrl: Public URL
-              r5: R5 Server?
-              s3Bucket: S3 bucket name
-              targetGroupArn: Target Group ARN
-            new: Add server
-            serverPlaceholder: Server name
-            title: Servers
-          routerConfig:
-            brandingUrlRoot: Branding URL Root
-            carDropoffTime: Car Dropoff Time
-            numItineraries: '# of itineraries'
-            requestLogFile: Request log file
-            stairsReluctance: Stairs Reluctance
-            title: Router Config
-            updaters:
-              $index:
-                defaultAgencyId: Default agency ID
-                frequencySec: Frequency (in seconds)
-                sourceType: Source type
-                type: Type
-                url: URL
-              new: Add updater
-              title: Real-time updaters
-              placeholder: Updater name
-            walkSpeed: Walk Speed
-          title: Deployment
-        project:
-          cannotFetchFeeds: Cannot fetch feeds
-          feeds: Feeds
-          permissions: Permissions
-        rename: Rename
-        save: Save
-        title: Settings
-      ProjectSettingsForm:
-        cancel: Cancel
-        confirmDelete: >-
-          Are you sure you want to delete this project? This action cannot be
-          undone and all feed sources and their versions will be permanently
-          deleted.
-        deleteProject: Delete Project?
-        fields:
-          location:
-            boundingBox: 'Bounding box (W,S,E,N)'
-            boundingBoxPlaceHolder: 'min_lon, min_lat, max_lon, max_lat'
-            defaultLanguage: Default language
-            defaultLocation: 'Default location (lat, lng)'
-            defaultTimeZone: Default time zone
-            title: Location
-          name: Project name
-          title: General
-          updates:
-            autoFetchFeeds: Auto fetch feed sources?
-            title: Updates
-        save: Save
-        title: Settings
-      ProjectViewer:
-        deployments: Deployments
-        feeds:
-          createFirst: Create first feed source!
-          new: New Feed Source
-          search: Search by name
-          table:
-            deployable: Deployable?
-            errorCount: Errors
-            lastUpdated: Updated
-            name: Name
-            public: Public?
-            retrievalMethod: Retrieval Method
-            validRange: Valid Range
-          title: Feed Sources
-          update: Fetch all
-        makePublic: Publish public feeds
-        mergeFeeds: Merge all
-        settings: Settings
-      ProjectFeedListToolbar:
-        comparison:
-          DEPLOYED: Deployed
-          LATEST: Latest
-          PUBLISHED: Published
-        deployments: Deployments
-        downloadCsv: Download Summary as CSV
-        feeds:
-          createFirst: Create first feed source!
-          new: New
-          search: Search by name
-          table:
-            deployable: Deployable?
-            errorCount: Errors
-            lastUpdated: Updated
-            name: Name
-            public: Public?
-            retrievalMethod: Retrieval Method
-            validRange: Valid Range
-          title: Feed Sources
-          update: Fetch all
-        filter:
-          active: Active
-          all: All
-          expired: Expired
-          expiring: Expiring
-          future: Future
-        makePublic: Publish public feeds
-        mergeFeeds: Merge all
-        settings: Settings
-        sort:
-          alphabetically:
-            title: Alphabetically
-            asc: A-Z
-            desc: Z-A
-          endDate:
-            title: Expiration Date
-            asc: Earliest-Latest
-            desc: Latest-Earliest
-          lastUpdated:
-            title: Last Update
-            asc: Stale-Recent
-            desc: Recent-Stale
-          numErrors:
-            title: Number of Issues
-            asc: Least-Most
-            desc: Most-Least
-          startDate:
-            title: Start Date
-            asc: Earliest-Latest
-            desc: Latest-Earliest
-        sync:
-          transitland: Sync from transit.land
-          transitfeeds: Sync from transitfeeds
-          mtc: Sync from MTC
-      ProjectsList:
-        createFirst: Create my first project
-        help:
-          content: >-
-            A project is used to group GTFS feeds. For example, the feeds in a
-            project may be in the same region or they may collectively define a
-            planning scenario.
-          title: What's a project?
-        new: New Project
-        noProjects: You currently do not have any projects.
-        search: Search by project name
-        table:
-          name: Project Name
-        title: Projects
-      PublicFeedsTable:
-        country: Country
-        lastUpdated: Last Updated
-        link: Link to GTFS
-        name: Feed Name
-        region: Region
-        search: Search
-        stateProvince: State or Province
-      PublicFeedsViewer:
-        title: Catalogue
-      RegionSearch:
-        placeholder: Search for regions or agencies
-      ResultTable:
-        affectedIds: Affected ID(s)
-        description: Description
-        line: Line
-        priority: Priority
-        problemType: Problem Type
-      ServerSettings:
-        deployment:
-          otpServers:
-            new: Add server
-            refresh: Refresh
-            serverPlaceholder: Server name
-            title: Deployment Server Management
-        save: Save
-        title: Settings
-      ShowAllRoutesOnMapFilter:
-        fetching: Fetching
-        showAllRoutesOnMap: Show all routes
-        tooManyShapeRecords: large shapes.txt may impact performance
-      Sidebar:
-        unknown: Unknown
-      SnapshotItem:
-        active: Active
-        confirmDelete: >-
-          This will permanently delete this snapshot. Any data saved here cannot
-          be recovered. Are you sure you want to continue?
-        confirmLoad: >-
-          This will override all active GTFS Editor data for this Feed Source
-          with the data from this version. If there is unsaved work in the
-          Editor you want to keep, you must snapshot the current Editor data
-          first. Are you sure you want to continue?
-        created: created
-        createFromScratch: Create GTFS from Scratch
-        date: Date
-        delete: Delete
-        download: Download
-        feed: Feed
-        load: Load for Editing
-        loadLatest: Load latest for editing
+            defaultAgencyId: Default agency ID
+            frequencySec: Frequency (in seconds)
+            sourceType: Source type
+            type: Type
+            url: URL
+          new: Add updater
+          title: Real-time updaters
+          placeholder: Updater name
+        walkSpeed: Walk Speed
+      title: Deployment
+    general:
+      location:
+        boundingBox: "Bounding box (W,S,E,N)"
+        defaultLanguage: Default language
+        defaultLocation: "Default location (lat, lng)"
+        defaultTimeZone: Default time zone
+        title: Location
+      name: Project name
+      title: General
+      updates:
+        autoFetchFeeds: Auto fetch feed sources?
+        title: Updates
+    rename: Rename
+    save: Save
+    title: Settings
+  GtfsValidationExplorer:
+    accessibilityValidation: Accessibility Explorer
+    table:
+      count: Count
+      file: File
+      issue: Issue
+      priority: Priority
+    timeValidation: Time-based Validation
+    title: Validation Explorer
+    validationIssues: Validation Issues
+  GtfsValidationViewer:
+    explorer: Validation Explorer
+    issues:
+      other: Other issues
+      routes: Route issues
+      shapes: Shape issues
+      stop_times: Stop times issues
+      stops: Stop issues
+      trips: Trip issues
+    noResults: No validation results to show.
+    tips:
+      DATE_NO_SERVICE: >-
+        If the transit service does not operate on weekends, some or all of
+        these validation issue may be ignored. Similarly, holidays for which
+        there is no transit service running may appear in this list.
+      FEED_TRAVEL_TIMES_ROUNDED: >-
+        This is a common feature of GTFS feeds that do not use
+        down-to-the-second precision for arrival/departure times. However,
+        if this precision is expected, there may be an issue occurring
+        during feed export.
+      MISSING_TABLE: >-
+        Missing a required table is a major issue that must be resolved
+        before most GTFS consumers can make use of the data for trip
+        planning or in other applications.
+    title: Validation issues
+  LanguageSelect:
+    placeholder: Select language...
+  Login:
+    title: Log in
+  NormalizeStopTimesTip:
+    info: >-
+      Tip: when changing travel times, consider using the 'Normalize stop
+      times' button above to automatically update all stop times to the
+      updated travel time.
+  NoteForm:
+    postComment: "TODO: Translate"
+    new: "TODO: Translate"
+    adminOnly: "TODO: Translate"
+  NotesViewer:
+    all: All Comments
+    feedSource: Feed Source
+    feedVersion: Version
+    new: Post
+    none: No comments.
+    postComment: Post a New Comment
+    refresh: Refresh
+    title: Comments
+    adminOnly: "TODO: Translate"
+  OrganizationList:
+    new: Create org
+    search: Search orgs
+  OrganizationSettings:
+    extensions: Extensions
+    logoUrl:
+      label: Logo URL
+      placeholder: "http://example.com/logo_30x30.png"
+    name:
+      label: Name
+      placeholder: Big City Transit
+    orgDetails: Organization details
+    projects: Projects
+    subDetails: Subscription details
+    subscriptionBeginDate: Subscription begins
+    subscriptionEndDate: Subscription ends
+    usageTier:
+      high: High
+      low: Low
+      medium: Medium
+  ProjectAccessSettings:
+    admin: Admin
+    cannotFetchFeeds: Cannot fetch feeds
+    custom: Custom
+    feeds: Feed Sources
+    noAccess: No Access
+    permissions: Permissions
+    title: Project Settings for
+  ProjectSettings:
+    deployment:
+      buildConfig:
+        elevationBucket:
+          accessKey: Access Key
+          bucketName: S3 Bucket Name
+          secretKey: Secret Key
+        fares: Fares
+        fetchElevationUS: Fetch Elevation
+        stationTransfers: Sta. Transfers
+        subwayAccessTime: Subway Access Time
+        title: Build Config
+      osm:
+        bounds: Custom Extract Bounds
+        custom: Use Custom Extract Bounds
+        gtfs: Use GTFS-Derived Extract Bounds
+        title: OSM Extract
+      otpServers:
+        $index:
+          admin: Admin access only?
+          delete: Remove
+          internalUrl: Internal URLs
+          name: Name
+          namePlaceholder: Production
+          publicUrl: Public URL
+          r5: R5 Server?
+          s3Bucket: S3 bucket name
+          targetGroupArn: Target Group ARN
+        new: Add server
+        serverPlaceholder: Server name
+        title: Servers
+      routerConfig:
+        brandingUrlRoot: Branding URL Root
+        carDropoffTime: Car Dropoff Time
+        numItineraries: "# of itineraries"
+        requestLogFile: Request log file
+        stairsReluctance: Stairs Reluctance
+        title: Router Config
+        updaters:
+          $index:
+            defaultAgencyId: Default agency ID
+            frequencySec: Frequency (in seconds)
+            sourceType: Source type
+            type: Type
+            url: URL
+          new: Add updater
+          title: Real-time updaters
+          placeholder: Updater name
+        walkSpeed: Walk Speed
+      title: Deployment
+    project:
+      cannotFetchFeeds: Cannot fetch feeds
+      feeds: Feeds
+      permissions: Permissions
+    rename: Rename
+    save: Save
+    title: Settings
+  ProjectSettingsForm:
+    cancel: Cancel
+    confirmDelete: >-
+      Are you sure you want to delete this project? This action cannot be
+      undone and all feed sources and their versions will be permanently
+      deleted.
+    deleteProject: Delete Project?
+    fields:
+      location:
+        boundingBox: "Bounding box (W,S,E,N)"
+        boundingBoxPlaceHolder: "min_lon, min_lat, max_lon, max_lat"
+        defaultLanguage: Default language
+        defaultLocation: "Default location (lat, lng)"
+        defaultTimeZone: Default time zone
+        title: Location
+      name: Project name
+      title: General
+      updates:
+        autoFetchFeeds: Auto fetch feed sources?
+        title: Updates
+    save: Save
+    title: Settings
+  ProjectViewer:
+    deployments: Deployments
+    feeds:
+      createFirst: Create first feed source!
+      new: New Feed Source
+      search: Search by name
+      table:
+        deployable: Deployable?
+        errorCount: Errors
+        lastUpdated: Updated
         name: Name
-        noVersions: (No Versions)
-        noVersionsExist: No versions exist for this feed source.
-        of: of
-        publish: Publish
-        restore: Restore
-        snapshot: snapshot
-        title: Snapshots
-        version: Version
-      StarButton:
-        star: Star
-        unstar: Unstar
-      TimetableHelpModal:
-        title: Timetable editor keyboard shortcuts
-        shortcuts:
-          offset:
-            title: Offsetting times
-            desc:
-              '0': Offset selected trips' stop times by adding offset time
-              '1': Offset selected trips' stop times by subtracting offset time
-              '2': Offset only active cell's time by adding offset time
-              '3': Offset only active cell's time by subtracting offset time
-              '4': Decrease offset time by 1 minute
-              '5': Decrease offset time by 10 minutes
-              '6': Increase offset time by 1 minute
-              '7': Increase offset time by 10 minutes
-          navigate:
-            title: Navigating and selecting trips
-            desc:
-              '0': Previous/next trip
-              '1': Previous/next column
-              '2': Select trip
-              '3': Select all trips
-              '4': Deselect all trips
-          modify:
-            title: Modify trips
-            desc:
-              '0': Delete selected trip(s)
-              '1': New trip
-              '2': Clone selected trip(s)
-              '3': >-
-                Copy time value from adjacent cell (the cell immediately to the
-                left)
-              '4': Copy value from cell directly above
-      TimezoneSelect:
-        placeholder: Select timezone...
-      UserAccount:
-        account:
-          title: Account
-        billing:
-          title: Billing
-        notifications:
-          methods: Notification methods
-          subscriptions: Your subscriptions
-          title: Notifications
-          unsubscribeAll: Unsubscribe from all
-        organizationSettings: Organization settings
-        organizations:
-          title: Organizations
-        personalSettings: Personal settings
-        profile:
-          profileInformation: Profile information
-          title: Profile
-        title: My settings
-      AdminPage:
-        noAccess: You do not have sufficient user privileges to access this area.
-        title: Administration
-      UserHomePage:
-        createFirst: Create my first project
-        help:
-          content: >-
-            A project is used to group GTFS feeds. For example, the feeds in a
-            project may be in the same region or they may collectively define a
-            planning scenario.
-          title: What's a project?
-        new: New Project
-        noProjects: You currently do not have any projects.
-        table:
-          name: Project Name
-        title: Projects
-      UserList:
-        filterByOrg: Filter by org.
-        of: of
-        perPage: Users per page
-        search: Search by username
-        showing: Showing Users
-        title: User Management
-      UserRow:
-        appAdmin: App admin
-        cancel: Cancel
-        delete: Delete
-        deleteConfirm: Are you sure you want to permanently delete this user?
-        edit: Edit
-        missingProject: unknown
-        noProjectsFound: No projects
-        orgAdmin: Org admin
-        save: Save
-      UserSettings:
-        admin:
-          description: Application administrators have full access to all projects.
-          title: Application Admininistrator
-        application: Application Settings
-        cancel: Cancel
-        delete: Delete
-        edit: Edit
-        org:
-          admin: Organization administrator
-          billing: Billing admin
-          description: >-
-            Organization administrators have full access to projects within the
-            organization.
-        project:
-          admin: Admin
-          custom: Custom
-          noAccess: No Access
-        save: Save
-      VersionButtonToolbar:
-        confirmDelete: Are you sure you want to delete this version? This cannot be undone.
-        confirmLoad: >-
-          This will override all active GTFS Editor data for this Feed Source
-          with the data from this version. If there is unsaved work in the
-          Editor you want to keep, you must snapshot the current Editor data
-          first. Are you sure you want to continue?
-        delete: Delete
-        download: Download
-        feed: Feed
-        load: Load
-        noVersionsExist: No versions exist for this feed source.
-        status: Status
-        timestamp: File Timestamp
-        version: version
-      WatchButton:
-        emailVerificationConfirm: >-
-          In order to receive email notification, you must first verify your
-          email address. Would you like to resend the email verification message
-          for your account?
-        unwatch: Unwatch
-        verificationSendError: There was an error sending the email verification!
-        verificationSent: >-
-          Please check your inbox and confirm your email address by clicking the
-          verify link. You will then need to refresh this page after a moment or
-          two and re-click the Watch button to subscribe to notifications.
-        watch: Watch
+        public: Public?
+        retrievalMethod: Retrieval Method
+        validRange: Valid Range
+      title: Feed Sources
+      update: Fetch all
+    makePublic: Publish public feeds
+    mergeFeeds: Merge all
+    settings: Settings
+  ProjectFeedListToolbar:
+    comparison:
+      DEPLOYED: Deployed
+      LATEST: Latest
+      PUBLISHED: Published
+    deployments: Deployments
+    downloadCsv: Download Summary as CSV
+    feeds:
+      createFirst: Create first feed source!
+      new: New
+      search: Search by name
+      table:
+        deployable: Deployable?
+        errorCount: Errors
+        lastUpdated: Updated
+        name: Name
+        public: Public?
+        retrievalMethod: Retrieval Method
+        validRange: Valid Range
+      title: Feed Sources
+      update: Fetch all
+    filter:
+      active: Active
+      all: All
+      expired: Expired
+      expiring: Expiring
+      future: Future
+    makePublic: Publish public feeds
+    mergeFeeds: Merge all
+    settings: Settings
+    sort:
+      alphabetically:
+        title: Alphabetically
+        asc: A-Z
+        desc: Z-A
+      endDate:
+        title: Expiration Date
+        asc: Earliest-Latest
+        desc: Latest-Earliest
+      lastUpdated:
+        title: Last Update
+        asc: Stale-Recent
+        desc: Recent-Stale
+      numErrors:
+        title: Number of Issues
+        asc: Least-Most
+        desc: Most-Least
+      startDate:
+        title: Start Date
+        asc: Earliest-Latest
+        desc: Latest-Earliest
+    sync:
+      transitland: Sync from transit.land
+      transitfeeds: Sync from transitfeeds
+      mtc: Sync from MTC
+  ProjectsList:
+    createFirst: Create my first project
+    help:
+      content: >-
+        A project is used to group GTFS feeds. For example, the feeds in a
+        project may be in the same region or they may collectively define a
+        planning scenario.
+      title: What's a project?
+    new: New Project
+    noProjects: You currently do not have any projects.
+    search: Search by project name
+    table:
+      name: Project Name
+    title: Projects
+  PublicFeedsTable:
+    country: Country
+    lastUpdated: Last Updated
+    link: Link to GTFS
+    name: Feed Name
+    region: Region
+    search: Search
+    stateProvince: State or Province
+  PublicFeedsViewer:
+    title: Catalogue
+  RegionSearch:
+    placeholder: Search for regions or agencies
+  ResultTable:
+    affectedIds: Affected ID(s)
+    description: Description
+    line: Line
+    priority: Priority
+    problemType: Problem Type
+  ServerSettings:
+    deployment:
+      otpServers:
+        new: Add server
+        refresh: Refresh
+        serverPlaceholder: Server name
+        title: Deployment Server Management
+    save: Save
+    title: Settings
+  ShowAllRoutesOnMapFilter:
+    fetching: Fetching
+    showAllRoutesOnMap: Show all routes
+    tooManyShapeRecords: large shapes.txt may impact performance
+  Sidebar:
+    unknown: Unknown
+  SnapshotItem:
+    active: Active
+    confirmDelete: >-
+      This will permanently delete this snapshot. Any data saved here cannot
+      be recovered. Are you sure you want to continue?
+    confirmLoad: >-
+      This will override all active GTFS Editor data for this Feed Source
+      with the data from this version. If there is unsaved work in the
+      Editor you want to keep, you must snapshot the current Editor data
+      first. Are you sure you want to continue?
+    created: created
+    createFromScratch: Create GTFS from Scratch
+    date: Date
+    delete: Delete
+    download: Download
+    feed: Feed
+    load: Load for Editing
+    loadLatest: Load latest for editing
+    name: Name
+    noVersions: (No Versions)
+    noVersionsExist: No versions exist for this feed source.
+    of: of
+    publish: Publish
+    restore: Restore
+    snapshot: snapshot
+    title: Snapshots
+    version: Version
+  StarButton:
+    star: Star
+    unstar: Unstar
+  TimetableHelpModal:
+    title: Timetable editor keyboard shortcuts
+    shortcuts:
+      offset:
+        title: Offsetting times
+        desc:
+          "0": Offset selected trips' stop times by adding offset time
+          "1": Offset selected trips' stop times by subtracting offset time
+          "2": Offset only active cell's time by adding offset time
+          "3": Offset only active cell's time by subtracting offset time
+          "4": Decrease offset time by 1 minute
+          "5": Decrease offset time by 10 minutes
+          "6": Increase offset time by 1 minute
+          "7": Increase offset time by 10 minutes
+      navigate:
+        title: Navigating and selecting trips
+        desc:
+          "0": Previous/next trip
+          "1": Previous/next column
+          "2": Select trip
+          "3": Select all trips
+          "4": Deselect all trips
+      modify:
+        title: Modify trips
+        desc:
+          "0": Delete selected trip(s)
+          "1": New trip
+          "2": Clone selected trip(s)
+          "3": >-
+            Copy time value from adjacent cell (the cell immediately to the
+            left)
+          "4": Copy value from cell directly above
+  TimezoneSelect:
+    placeholder: Select timezone...
+  UserAccount:
+    account:
+      title: Account
+    billing:
+      title: Billing
+    notifications:
+      methods: Notification methods
+      subscriptions: Your subscriptions
+      title: Notifications
+      unsubscribeAll: Unsubscribe from all
+    organizationSettings: Organization settings
+    organizations:
+      title: Organizations
+    personalSettings: Personal settings
+    profile:
+      profileInformation: Profile information
+      title: Profile
+    title: My settings
+  AdminPage:
+    noAccess: You do not have sufficient user privileges to access this area.
+    title: Administration
+  UserHomePage:
+    createFirst: Create my first project
+    help:
+      content: >-
+        A project is used to group GTFS feeds. For example, the feeds in a
+        project may be in the same region or they may collectively define a
+        planning scenario.
+      title: What's a project?
+    new: New Project
+    noProjects: You currently do not have any projects.
+    table:
+      name: Project Name
+    title: Projects
+  UserList:
+    filterByOrg: Filter by org.
+    of: of
+    perPage: Users per page
+    search: Search by username
+    showing: Showing Users
+    title: User Management
+  UserRow:
+    appAdmin: App admin
+    cancel: Cancel
+    delete: Delete
+    deleteConfirm: Are you sure you want to permanently delete this user?
+    edit: Edit
+    missingProject: unknown
+    noProjectsFound: No projects
+    orgAdmin: Org admin
+    save: Save
+  UserSettings:
+    admin:
+      description: Application administrators have full access to all projects.
+      title: Application Admininistrator
+    application: Application Settings
+    cancel: Cancel
+    delete: Delete
+    edit: Edit
+    org:
+      admin: Organization administrator
+      billing: Billing admin
+      description: >-
+        Organization administrators have full access to projects within the
+        organization.
+    project:
+      admin: Admin
+      custom: Custom
+      noAccess: No Access
+    save: Save
+  VersionButtonToolbar:
+    confirmDelete: Are you sure you want to delete this version? This cannot be undone.
+    confirmLoad: >-
+      This will override all active GTFS Editor data for this Feed Source
+      with the data from this version. If there is unsaved work in the
+      Editor you want to keep, you must snapshot the current Editor data
+      first. Are you sure you want to continue?
+    delete: Delete
+    download: Download
+    feed: Feed
+    load: Load
+    noVersionsExist: No versions exist for this feed source.
+    status: Status
+    timestamp: File Timestamp
+    version: version
+  WatchButton:
+    emailVerificationConfirm: >-
+      In order to receive email notification, you must first verify your
+      email address. Would you like to resend the email verification message
+      for your account?
+    unwatch: Unwatch
+    verificationSendError: There was an error sending the email verification!
+    verificationSent: >-
+      Please check your inbox and confirm your email address by clicking the
+      verify link. You will then need to refresh this page after a moment or
+      two and re-click the Watch button to subscribe to notifications.
+    watch: Watch

From 809b3bd9d25a23fa047a0054ca22ec1e9f01311a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 15 Nov 2021 18:59:50 -0500
Subject: [PATCH 414/553] refactor(Job status): Update text for merge
 strategies, remove unused ones.

---
 i18n/english.yml              |   6 +-
 lib/manager/actions/status.js | 117 ++++++++++++++++++----------------
 2 files changed, 64 insertions(+), 59 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 741594ef6..0f04da8de 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -492,10 +492,8 @@ components:
     skipped: "Skipped records:"
     skippedTableRecords: "%table%: %skippedCount%"
     strategyUsed: "Strategy used: %strategy%"
-    DEFAULT: 'Condition 1: Feeds had unique service IDs and trip IDs - future feed was appended to active feed'
-    EXTEND_FUTURE: "Condition 2: Feeds had matching service IDs and trip IDs - future feed took precedence and was extended to the active feed's start date"
-    CHECK_STOP_TIMES: 'Condition 3: Feeds had matching service IDs, but not all trip IDs were unique - matching trips will span the active and future service period and unique trips will be included under modified service IDs'
-    FAIL_DUE_TO_MATCHING_TRIP_IDS: 'Condition 4: Merge failed due to unique service IDs, yet trip IDs that match exactly'
+    DEFAULT: Trip IDs were unique in the source feeds. The merged feed was successfully created.
+    CHECK_STOP_TIMES: Some trip IDs were found in both feeds. The merged feed was successfully created.
     title:
       failure: 'Warning: Errors encountered during feed merge!'
       success: 'Feed merge was successful!'
diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index d58f2e2ca..1fcf8a166 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -8,14 +8,14 @@ import { createAction, type ActionType } from 'redux-actions'
 import { createVoidPayloadAction, secureFetch } from '../../common/actions'
 import { API_PREFIX } from '../../common/constants'
 import { getComponentMessages, isExtensionEnabled } from '../../common/util/config'
-import { fetchDeployment } from './deployments'
-import { fetchFeedSource } from './feeds'
-import { fetchProjectWithFeeds } from './projects'
 import { downloadSnapshotViaCredentials } from '../../editor/actions/snapshots'
-
 import type {DataToolsConfig, Feed, MergeFeedsResult, ServerJob} from '../../types'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
 
+import { fetchDeployment } from './deployments'
+import { fetchFeedSource } from './feeds'
+import { fetchProjectWithFeeds } from './projects'
+
 type ErrorMessage = {
   action?: string,
   detail?: any,
@@ -155,69 +155,76 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
   } = result
   const messages = getComponentMessages('MergeFeedsResult')
   const details = []
-  details.push(
-    <div>
-      {messages('strategyUsed').replace('%strategy%', messages(mergeStrategy))}
-    </div>
-  )
-  // Do nothing or show merged feed modal? Feed version is be created
-  details.push(
-    <div>
-      {messages('remappedIds').replace('%remappedIdCount%', remappedReferences.toString())}
-    </div>
-  )
-  if (Object.keys(remappedIds).length > 0) {
-    const remappedIdStrings = []
-    for (const key in remappedIds) {
-      // Modify key to remove feed name.
-      const split = key.split(':')
-      const tableAndId = split.splice(1, 1)
-      remappedIdStrings.push(
-        <li key={key}>{tableAndId.join(':')} -> {remappedIds[key]}</li>
-      )
-    }
-    details.push(<ul>{remappedIdStrings}</ul>)
-  }
-  if (skippedIds.length > 0) {
-    const skippedRecordsForTables = {}
-    skippedIds.forEach(id => {
-      const table = id.split(':')[0]
-      // Increment count of skipped records for each value found per table.
-      skippedRecordsForTables[table] = (skippedRecordsForTables[table] || 0) + 1
-    })
-    const skippedRecordsStrings = []
-    for (const key in skippedRecordsForTables) {
-      const tableItem = messages('skippedTableRecords')
-        .replace('%table%', key)
-        .replace('%skippedCount%', skippedRecordsForTables[key])
-      skippedRecordsStrings.push(<li key={key}>{tableItem}</li>)
-    }
-    details.push(<div>{messages('skipped')}</div>)
-    details.push(<ul>{skippedRecordsStrings}</ul>)
-  }
-  if (idConflicts.length > 0) {
+
+  // Show details only if merge succeeded
+  if (!failed) {
     details.push(
       <div>
-        {messages('idConflicts')}
+        {messages('strategyUsed').replace('%strategy%', messages(mergeStrategy))}
       </div>
     )
+    // Do nothing or show merged feed modal? Feed version is be created
     details.push(
-      <ul>
-        {idConflicts.map(id => <li key={id.toString()}>{id}</li>)}
-      </ul>
+      <div>
+        {messages('remappedIds').replace('%remappedIdCount%', remappedReferences.toString())}
+      </div>
     )
+    if (Object.keys(remappedIds).length > 0) {
+      const remappedIdStrings = []
+      for (const key in remappedIds) {
+        // Modify key to remove feed name.
+        const split = key.split(':')
+        const tableAndId = split.splice(1, 1)
+        remappedIdStrings.push(
+          <li key={key}>{tableAndId.join(':')} -> {remappedIds[key]}</li>
+        )
+      }
+      details.push(<ul>{remappedIdStrings}</ul>)
+    }
+    if (skippedIds.length > 0) {
+      const skippedRecordsForTables = {}
+      skippedIds.forEach(id => {
+        const table = id.split(':')[0]
+        // Increment count of skipped records for each value found per table.
+        skippedRecordsForTables[table] = (skippedRecordsForTables[table] || 0) + 1
+      })
+      const skippedRecordsStrings = []
+      for (const key in skippedRecordsForTables) {
+        const tableItem = messages('skippedTableRecords')
+          .replace('%table%', key)
+          .replace('%skippedCount%', skippedRecordsForTables[key])
+        skippedRecordsStrings.push(<li key={key}>{tableItem}</li>)
+      }
+      details.push(<div>{messages('skipped')}</div>)
+      details.push(<ul>{skippedRecordsStrings}</ul>)
+    }
+    if (idConflicts.length > 0) {
+      details.push(
+        <div>
+          {messages('idConflicts')}
+        </div>
+      )
+      details.push(
+        <ul>
+          {idConflicts.map(id => <li key={id.toString()}>{id}</li>)}
+        </ul>
+      )
+    }
   }
+
   return {
     title: failed
       ? messages('title.failure')
       : messages('title.success'),
     body: failed
-      ? <div>
-        {messages('body.failure').replace('%errorCount%', errorCount.toString())}
-        <ul>
-          {failureReasons.map((r, i) => <li key={i}>{r}</li>)}
-        </ul>
-      </div>
+      ? (
+        <div>
+          {messages('body.failure').replace('%errorCount%', errorCount.toString())}
+          <ul>
+            {failureReasons.map((r, i) => <li key={i}>{r}</li>)}
+          </ul>
+        </div>
+      )
       : messages('body.success'),
     detail: details
   }

From 80ac70814d556e9cff9db05f65aade66690ced44 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 15 Nov 2021 16:17:39 -0800
Subject: [PATCH 415/553] feature(editor): set route status to in progress on
 edit

---
 lib/editor/reducers/data.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index 758e7620a..2aca4d382 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -10,7 +10,6 @@ import {ENTITY} from '../constants'
 import {generateNullProps, getTableById, getKeyForId} from '../util/gtfs'
 import {getMapToGtfsStrategy, entityIsNew} from '../util/objects'
 import {assignDistancesToPatternStops, constructShapePoints} from '../util/map'
-
 import type {Action} from '../../types/actions'
 import type {DataState} from '../../types/reducers'
 
@@ -211,11 +210,17 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
     case 'UPDATE_ACTIVE_GTFS_ENTITY': {
       const {component, props} = action.payload
       const {entityKey, editedKey} = getUpdateEntityKeys(component)
+
+      // When a route gets edited, set its status to "In Progress"
+      const additional = {}
+      if (component === 'route' && !props.status) {
+        additional.status = '0'
+      }
       // FIXME: Check for pattern stops props (what about other sequenced lists)
       // and update stop sequence.
       return update(state, {
         active: {
-          [entityKey]: {$merge: props},
+          [entityKey]: {$merge: {...props, ...additional}},
           [editedKey]: {$set: true}
         }
       })

From 47fa1ecbb6e31e728d25379a133c23517082d8cb Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 15 Nov 2021 18:29:20 -0800
Subject: [PATCH 416/553] feature(editor): confirmation box in save snapshot
 dialog for unapproved routes

---
 lib/editor/components/CreateSnapshotModal.js  | 40 +++++++++++++++++--
 .../components/EditorFeedSourcePanel.js       |  4 +-
 lib/editor/components/FeedInfoPanel.js        |  8 ++--
 lib/editor/containers/ActiveFeedInfoPanel.js  |  5 ++-
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index efb9bc068..69e8ee7d9 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -14,17 +14,18 @@ import {connect} from 'react-redux'
 import * as snapshotActions from '../actions/snapshots.js'
 import {getComponentMessages} from '../../common/util/config'
 import {formatTimestamp} from '../../common/util/date-time'
-
-import type {Feed} from '../../types'
+import type {Feed, GtfsRoute} from '../../types'
 import type {AppState} from '../../types/reducers'
 
 type Props = {
   createSnapshot: typeof snapshotActions.createSnapshot,
-  feedSource: Feed
+  feedSource: Feed,
+  routes: Array<GtfsRoute>
 }
 
 type State = {
   comment: ?string,
+  confirmPublishWithUnapproved: Boolean,
   name: ?string,
   publishNewVersion: boolean,
   showModal: boolean
@@ -35,6 +36,7 @@ function getDefaultState () {
     comment: null,
     name: formatTimestamp(),
     publishNewVersion: false,
+    confirmPublishWithUnapproved: false,
     showModal: false
   }
 }
@@ -48,6 +50,10 @@ class CreateSnapshotModal extends Component<Props, State> {
     this.setState({[e.target.name]: e.target.checked})
   }
 
+  _onTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({[e.target.name]: e.target.checked})
+  }
+
   _onChange = (e: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({[e.target.name]: e.target.value})
   }
@@ -72,7 +78,11 @@ class CreateSnapshotModal extends Component<Props, State> {
 
   render () {
     const {Body, Footer, Header, Title} = Modal
-    const {comment, name, publishNewVersion, showModal} = this.state
+    const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal} = this.state
+    const {routes} = this.props
+
+    const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== 2)
+
     return (
       <Modal show={showModal} onHide={this.close}>
         <Header>
@@ -112,6 +122,27 @@ class CreateSnapshotModal extends Component<Props, State> {
               {this.messages('fields.publishNewVersion.label')}
             </Checkbox>
           </FormGroup>
+          {!!unapprovedRoutes.length > 0 &&
+            <div>
+              <h4>The following routes are not approved.</h4>
+              <h5>These routes will not be included in the output.</h5>
+              <ul>
+                {
+                  unapprovedRoutes.map(route => (
+                    <li key={route.route_id}>{route.route_short_name} - {route.route_desc}</li>
+                  ))
+                }
+              </ul>
+              <FormGroup>
+                <Checkbox
+                  name='confirmPublishWithUnapproved'
+                  checked={confirmPublishWithUnapproved}
+                  onChange={this._onTogglePublishUnapproved}>
+                    Are you sure you want to publish with unapproved routes?
+                </Checkbox>
+              </FormGroup>
+            </div>
+          }
         </Body>
 
         <Footer>
@@ -119,6 +150,7 @@ class CreateSnapshotModal extends Component<Props, State> {
             bsStyle='primary'
             data-test-id='confirm-snapshot-create-button'
             onClick={this.ok}
+            disabled={unapprovedRoutes.length > 0 && !confirmPublishWithUnapproved}
           >
             {this.messages('ok')}
           </Button>
diff --git a/lib/editor/components/EditorFeedSourcePanel.js b/lib/editor/components/EditorFeedSourcePanel.js
index a83f0f7bd..75e1ea704 100644
--- a/lib/editor/components/EditorFeedSourcePanel.js
+++ b/lib/editor/components/EditorFeedSourcePanel.js
@@ -12,7 +12,6 @@ import {getComponentMessages, getConfigProperty} from '../../common/util/config'
 import CreateSnapshotModal from '../../editor/components/CreateSnapshotModal'
 import * as versionActions from '../../manager/actions/versions'
 import {isEditingDisabled} from '../../manager/util'
-
 import type {Props as ContainerProps} from '../containers/ActiveEditorFeedSourcePanel'
 import type {Feed, Snapshot} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
@@ -61,7 +60,8 @@ export default class EditorFeedSourcePanel extends Component<Props> {
       <Row>
         <CreateSnapshotModal
           feedSource={feedSource}
-          ref='snapshotModal' />
+          ref='snapshotModal'
+          routes={[]} />
         <ConfirmModal ref='confirmModal' />
         <Col xs={9}>
           {feedSource.editorSnapshots && feedSource.editorSnapshots.length
diff --git a/lib/editor/components/FeedInfoPanel.js b/lib/editor/components/FeedInfoPanel.js
index 2be0bf3a4..8384c409e 100644
--- a/lib/editor/components/FeedInfoPanel.js
+++ b/lib/editor/components/FeedInfoPanel.js
@@ -11,14 +11,14 @@ import * as snapshotActions from '../actions/snapshots'
 import SelectFileModal from '../../common/components/SelectFileModal.js'
 import {getComponentMessages} from '../../common/util/config'
 import {isValidZipFile} from '../../common/util/util'
-import CreateSnapshotModal from './CreateSnapshotModal'
 import { GTFS_ICONS } from '../util/ui'
 import {componentToText} from '../util/objects'
 import {ENTITY} from '../constants'
-
 import type {Props as ContainerProps} from '../containers/ActiveFeedInfoPanel'
 import type {Feed, FeedInfo, Project} from '../../types'
 
+import CreateSnapshotModal from './CreateSnapshotModal'
+
 type Props = ContainerProps & {
   displayRoutesShapefile: typeof mapActions.displayRoutesShapefile,
   feedInfo: FeedInfo,
@@ -26,6 +26,7 @@ type Props = ContainerProps & {
   fetchSnapshots: typeof snapshotActions.fetchSnapshots,
   project: Project,
   restoreSnapshot: typeof snapshotActions.restoreSnapshot,
+  routes: Array<GtfsRoute>,
   setActiveEntity: typeof activeActions.setActiveEntity
 }
 
@@ -106,7 +107,7 @@ export default class FeedInfoPanel extends Component<Props, State> {
   }
 
   render () {
-    const { feedSource, feedInfo } = this.props
+    const { feedSource, feedInfo, routes } = this.props
     if (!feedInfo) return null
     const panelStyle = {
       position: 'absolute',
@@ -133,6 +134,7 @@ export default class FeedInfoPanel extends Component<Props, State> {
           <CreateSnapshotModal
             ref='snapshotModal'
             feedSource={feedSource}
+            routes={routes}
           />
           <ButtonGroup>
             {/* Hide toolbar toggle */}
diff --git a/lib/editor/containers/ActiveFeedInfoPanel.js b/lib/editor/containers/ActiveFeedInfoPanel.js
index 9c2f32412..52fcf7f84 100644
--- a/lib/editor/containers/ActiveFeedInfoPanel.js
+++ b/lib/editor/containers/ActiveFeedInfoPanel.js
@@ -8,7 +8,6 @@ import {displayRoutesShapefile} from '../actions/map'
 import FeedInfoPanel from '../components/FeedInfoPanel'
 import {findProjectByFeedSource} from '../../manager/util'
 import {getTableById} from '../util/gtfs'
-
 import type {AppState} from '../../types/reducers'
 
 export type Props = {
@@ -21,11 +20,13 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
   const project = findProjectByFeedSource(state.projects.all, feedSourceId)
   const feedSource = project && project.feedSources && project.feedSources.find(fs => fs.id === feedSourceId)
   const feedInfo = getTableById(state.editor.data.tables, 'feedinfo')[0]
+  const routes = getTableById(state.editor.data.tables, 'route')
   return {
     feedInfo,
     feedSourceId,
     feedSource,
-    project
+    project,
+    routes
   }
 }
 

From 529dec19962581c1a3326987653e8dccac70d38d Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 16 Nov 2021 08:56:22 -0500
Subject: [PATCH 417/553] refactor(Merge status): Remove unused idConflict
 field.

---
 i18n/english.yml              |  1 -
 lib/manager/actions/status.js | 13 -------------
 lib/types/index.js            |  6 +-----
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 0f04da8de..5743cb719 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -487,7 +487,6 @@ components:
     body:
       failure: Merge failed with %errorCount% errors.
       success: Merge was completed successfully. A new version will be processed/validated containing the resulting feed.
-    idConflicts: "ID conflicts:"
     remappedIds: "Remapped IDs: %remappedIdCount%"
     skipped: "Skipped records:"
     skippedTableRecords: "%table%: %skippedCount%"
diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index 1fcf8a166..733f96375 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -147,7 +147,6 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
     errorCount,
     failed,
     failureReasons,
-    idConflicts,
     mergeStrategy,
     remappedIds,
     remappedReferences,
@@ -198,18 +197,6 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
       details.push(<div>{messages('skipped')}</div>)
       details.push(<ul>{skippedRecordsStrings}</ul>)
     }
-    if (idConflicts.length > 0) {
-      details.push(
-        <div>
-          {messages('idConflicts')}
-        </div>
-      )
-      details.push(
-        <ul>
-          {idConflicts.map(id => <li key={id.toString()}>{id}</li>)}
-        </ul>
-      )
-    }
   }
 
   return {
diff --git a/lib/types/index.js b/lib/types/index.js
index 4a2c65904..0699e36a5 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -1001,11 +1001,7 @@ export type MergeFeedsResult = {
   failed: boolean,
   failureReasons: String[],
   feedCount: number,
-  idConflicts: String[],
-  mergeStrategy: 'DEFAULT' |
-    'EXTEND_FUTURE' |
-    'FAIL_DUE_TO_MATCHING_TRIP_IDS' |
-    'CHECK_STOP_TIMES',
+  mergeStrategy: 'DEFAULT' | 'CHECK_STOP_TIMES',
   recordsSkipCount: number,
   remappedIds: { [string]: string },
   remappedReferences: number,

From 02d44bb4c49414f645e148f9fbcc00a3e7ebd85b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Nov 2021 21:47:10 +0000
Subject: [PATCH 418/553] build(deps): bump aws-sdk from 2.503.0 to 2.1030.0

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.503.0 to 2.1030.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.503.0...v2.1030.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 57e2075fa..5c5198662 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2101,13 +2101,13 @@ autoprefixer@^9.6.1:
     postcss-value-parser "^4.0.0"
 
 aws-sdk@^2.414.0:
-  version "2.503.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.503.0.tgz#983b8c03aa919060a81127cb9d94fbb1667f4cf2"
-  integrity sha512-DPwRxhPYCGNvKL9rUhpAoOVpMRyISbVMlXykLQknYo7wyOI+jYcyA7t8H7IFPAqj4ZG+R+Au9tO/KT4im+2gbg==
+  version "2.1030.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1030.0.tgz#24a856af3d2b8b37c14a8f59974993661c66fd82"
+  integrity sha512-to0STOb8DsSGuSsUb/WCbg/UFnMGfIYavnJH5ZlRCHzvCFjTyR+vfE8ku+qIZvfFM4+5MNTQC/Oxfun2X/TuyA==
   dependencies:
-    buffer "4.9.1"
+    buffer "4.9.2"
     events "1.1.1"
-    ieee754 "1.1.8"
+    ieee754 "1.1.13"
     jmespath "0.15.0"
     querystring "0.2.0"
     sax "1.2.1"
@@ -2254,7 +2254,12 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base64-js@^1.0.2, base64-js@^1.3.0:
+base64-js@^1.0.2:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
+
+base64-js@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
@@ -2674,10 +2679,10 @@ buffer-xor@^1.0.3:
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
   integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
-buffer@4.9.1:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
+buffer@4.9.2:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -6501,16 +6506,16 @@ idtoken-verifier@^2.1.2:
     unfetch "^4.1.0"
     url-join "^4.0.1"
 
-ieee754@1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-  integrity sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=
-
-ieee754@^1.1.4:
+ieee754@1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
 
+ieee754@^1.1.4:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
 iferr@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"

From d2cef8f1d10c15c72e88a3748a855b3486fde689 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 16 Nov 2021 14:31:37 -0800
Subject: [PATCH 419/553] refactor(editor): add current status to unapproved
 routes in snapshot window

---
 lib/editor/components/CreateSnapshotModal.js | 3 ++-
 lib/editor/util/index.js                     | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 69e8ee7d9..50255b770 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -13,6 +13,7 @@ import {connect} from 'react-redux'
 
 import * as snapshotActions from '../actions/snapshots.js'
 import {getComponentMessages} from '../../common/util/config'
+import { getRouteStatusText } from '../util/index.js'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState} from '../../types/reducers'
@@ -129,7 +130,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               <ul>
                 {
                   unapprovedRoutes.map(route => (
-                    <li key={route.route_id}>{route.route_short_name} - {route.route_desc}</li>
+                    <li key={route.route_id}>{route.route_short_name} - {route.route_desc}: {getRouteStatusText(route.status)}</li>
                   ))
                 }
               </ul>
diff --git a/lib/editor/util/index.js b/lib/editor/util/index.js
index b352662ce..46618eb91 100644
--- a/lib/editor/util/index.js
+++ b/lib/editor/util/index.js
@@ -1,7 +1,6 @@
 // @flow
 
 import {getGtfsSpec} from '../../common/util/config'
-
 import type {
   Feed,
   GtfsFare,
@@ -147,6 +146,12 @@ export function getEditorTable (component: string) {
   )
 }
 
+export function getRouteStatusText (statusCode: number) {
+  const fields = getEditorTable('route').fields
+  const statusField = fields.find(field => field.name === 'status')
+  return statusField.options.find(option => option.value === statusCode).text
+}
+
 export function canApproveGtfs (project: ?Project, feedSource: ?Feed, user: ?User | ?ManagerUserState): boolean {
   return !!(
     project &&

From 0d2a41564a739757144cad097be6cb4d9eb89c65 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 16 Nov 2021 17:43:30 -0800
Subject: [PATCH 420/553] refactor(editor): move text to i18n

---
 i18n/english.yml                             | 4 ++++
 lib/editor/components/CreateSnapshotModal.js | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index cf9c39c32..f36b80fdb 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -22,6 +22,10 @@ components:
         placeholder: Additional information (optional)
       publishNewVersion:
         label: Publish snapshot as new feed version
+      confirmPublishWithUnapproved:
+        label: Confirm publish with unapproved routes. 
+    unapprovedRoutesHeader: The following routes are not approved.
+    unapprovedRoutesDesc: These routes will not be included in the output.
     missingNameAlert: Must give snapshot a valid name!
     ok: OK
     title: Create a new snapshot
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 50255b770..08f3955f2 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -125,8 +125,8 @@ class CreateSnapshotModal extends Component<Props, State> {
           </FormGroup>
           {!!unapprovedRoutes.length > 0 &&
             <div>
-              <h4>The following routes are not approved.</h4>
-              <h5>These routes will not be included in the output.</h5>
+              <h4>{this.messages('unapprovedRoutesHeader')}</h4>
+              <h5>{this.messages('unapprovedRoutesDesc')}</h5>
               <ul>
                 {
                   unapprovedRoutes.map(route => (
@@ -139,7 +139,7 @@ class CreateSnapshotModal extends Component<Props, State> {
                   name='confirmPublishWithUnapproved'
                   checked={confirmPublishWithUnapproved}
                   onChange={this._onTogglePublishUnapproved}>
-                    Are you sure you want to publish with unapproved routes?
+                  {this.messages('fields.confirmPublishWithUnapproved.label')}
                 </Checkbox>
               </FormGroup>
             </div>

From 32703825600714ab4cc81a939b2f2fb93b032069 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 17 Nov 2021 10:18:25 -0500
Subject: [PATCH 421/553] improvement(Merge status): Display a bullet list of
 trip ids to check.

---
 i18n/english.yml              |  1 +
 lib/manager/actions/status.js | 16 ++++++++++++----
 lib/types/index.js            |  3 ++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 5743cb719..f213e25d1 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -491,6 +491,7 @@ components:
     skipped: "Skipped records:"
     skippedTableRecords: "%table%: %skippedCount%"
     strategyUsed: "Strategy used: %strategy%"
+    tripIdsToCheck: "Trip IDs to check: %tripIdCount%"
     DEFAULT: Trip IDs were unique in the source feeds. The merged feed was successfully created.
     CHECK_STOP_TIMES: Some trip IDs were found in both feeds. The merged feed was successfully created.
     title:
diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index 733f96375..e5716fe7e 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -150,19 +150,27 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
     mergeStrategy,
     remappedIds,
     remappedReferences,
-    skippedIds
+    skippedIds,
+    tripIdsToCheck
   } = result
   const messages = getComponentMessages('MergeFeedsResult')
   const details = []
 
-  // Show details only if merge succeeded
-  if (!failed) {
+  if (failed) {
+    if (tripIdsToCheck && tripIdsToCheck.length > 0) {
+      const tripIdListItems = []
+      tripIdsToCheck.map(id => {
+        tripIdListItems.push(<li key={id.toString()}>{id}</li>)
+      })
+      details.push(<div>{messages('tripIdsToCheck').replace('%tripIdCount%', tripIdsToCheck.length.toString())}</div>)
+      details.push(<ul>{tripIdListItems}</ul>)
+    }
+  } else {
     details.push(
       <div>
         {messages('strategyUsed').replace('%strategy%', messages(mergeStrategy))}
       </div>
     )
-    // Do nothing or show merged feed modal? Feed version is be created
     details.push(
       <div>
         {messages('remappedIds').replace('%remappedIdCount%', remappedReferences.toString())}
diff --git a/lib/types/index.js b/lib/types/index.js
index 0699e36a5..b2e64f0ab 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -1007,7 +1007,8 @@ export type MergeFeedsResult = {
   remappedReferences: number,
   skippedIds: String[],
   startTime: number,
-  tablesMissingKeyFields: String[]
+  tablesMissingKeyFields: String[],
+  tripIdsToCheck?: String[]
 }
 
 export type ServerJob = {

From 1f29c7ba1b22d97ccd05ce7de4f73b66ad849e45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Nov 2021 17:52:00 +0000
Subject: [PATCH 422/553] build(deps): bump jszip from 3.1.5 to 3.7.0

Bumps [jszip](https://github.com/Stuk/jszip) from 3.1.5 to 3.7.0.
- [Release notes](https://github.com/Stuk/jszip/releases)
- [Changelog](https://github.com/Stuk/jszip/blob/master/CHANGES.md)
- [Commits](https://github.com/Stuk/jszip/compare/v3.1.5...v3.7.0)

---
updated-dependencies:
- dependency-name: jszip
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 41 ++++++++++++++---------------------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 3c8342a4c..09d8e1fb2 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "iso-639-1": "^1.2.4",
     "isomorphic-fetch": "^2.2.1",
     "jju": "https://github.com/evansiroky/jju.git",
-    "jszip": "^3.0.0",
+    "jszip": "^3.7.0",
     "jwt-decode": "^2.1.0",
     "leaflet": "^1.3.4",
     "leaflet-textpath": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index a8025a8c1..6e9725f3f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3570,11 +3570,6 @@ core-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
   integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
 
-core-js@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
-  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
-
 core-util-is@1.0.2, "core-util-is@>=1.0.1 <1.1.0-0", core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -4717,11 +4712,6 @@ es6-promise@^4.0.3, es6-promise@^4.1.1, es6-promise@^4.2.8:
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
   integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
-es6-promise@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
-  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
-
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
@@ -7885,16 +7875,15 @@ jszip@^2.4.0:
   dependencies:
     pako "~1.0.2"
 
-jszip@^3.0.0:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
-  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
+jszip@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.0.tgz#9b8b995a4e7c9024653ce743e902076a82fdf4e6"
+  integrity sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==
   dependencies:
-    core-js "~2.3.0"
-    es6-promise "~3.0.2"
-    lie "~3.1.0"
+    lie "~3.3.0"
     pako "~1.0.2"
-    readable-stream "~2.0.6"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
 
 just-curry-it@^3.1.0:
   version "3.1.0"
@@ -8167,20 +8156,13 @@ libnpx@^10.2.4:
     y18n "^4.0.0"
     yargs "^14.2.3"
 
-lie@^3.0.1:
+lie@^3.0.1, lie@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
   integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
   dependencies:
     immediate "~3.0.5"
 
-lie@~3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
-  dependencies:
-    immediate "~3.0.5"
-
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -12144,7 +12126,7 @@ readable-stream@~1.1.10:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.0, readable-stream@~2.0.6:
+readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
@@ -12888,6 +12870,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"

From 94d5a259d0e914b5d2f2c02e71484993ca5a8da1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Nov 2021 17:52:06 +0000
Subject: [PATCH 423/553] build(deps): bump color-string from 1.5.3 to 1.6.0

Bumps [color-string](https://github.com/Qix-/color-string) from 1.5.3 to 1.6.0.
- [Release notes](https://github.com/Qix-/color-string/releases)
- [Changelog](https://github.com/Qix-/color-string/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Qix-/color-string/commits/1.6.0)

---
updated-dependencies:
- dependency-name: color-string
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a8025a8c1..b828d47b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3224,9 +3224,9 @@ color-name@^1.0.0, color-name@~1.1.4:
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-string@^1.5.2:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
-  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312"
+  integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"

From a578cc84265932525b2a9cbe23c0979c82a0f96e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Nov 2021 17:52:10 +0000
Subject: [PATCH 424/553] build(deps): bump ws from 5.2.2 to 5.2.3

Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/5.2.2...5.2.3)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a8025a8c1..2aab476ad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1993,9 +1993,9 @@ async-each@^1.0.1:
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-limiter@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
+  integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async@1.x:
   version "1.5.2"
@@ -14956,9 +14956,9 @@ write@1.0.3:
     mkdirp "^0.5.1"
 
 ws@^5.2.0:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
-  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d"
+  integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==
   dependencies:
     async-limiter "~1.0.0"
 

From aafcd16004c789b39cf011415f1dbadbe7747c33 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Sun, 21 Nov 2021 20:46:13 -0800
Subject: [PATCH 425/553] refactor(editor): Move unapproved routes into
 createSnapshotModal, handle lock management.

---
 lib/editor/actions/active.js                  | 50 ++++++++++++++++-
 lib/editor/components/CreateSnapshotModal.js  | 54 ++++++++++++++-----
 .../components/EditorFeedSourcePanel.js       | 25 +++++++--
 lib/editor/components/FeedInfoPanel.js        |  4 +-
 .../containers/ActiveEditorFeedSourcePanel.js | 11 ++--
 lib/editor/containers/ActiveFeedInfoPanel.js  |  4 +-
 6 files changed, 119 insertions(+), 29 deletions(-)

diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index f7bf8fc37..b2285bfb4 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -4,7 +4,7 @@ import clone from 'lodash/cloneDeep'
 import {browserHistory} from 'react-router'
 import {createAction, type ActionType} from 'redux-actions'
 
-import {createVoidPayloadAction, secureFetch} from '../../common/actions'
+import {fetchGraphQL, createVoidPayloadAction, secureFetch} from '../../common/actions'
 import {ENTITY} from '../constants'
 import {fetchFeedSourceAndProject} from '../../manager/actions/feeds'
 import {fetchGTFSEntities} from '../../manager/actions/versions'
@@ -18,6 +18,7 @@ import {
 import {getMapFromGtfsStrategy, entityIsNew} from '../util/objects'
 import type {Entity, Feed} from '../../types'
 import type {dispatchFn, getStateFn, AppState} from '../../types/reducers'
+import {getEntityGraphQLRoot} from '../../gtfs/util'
 
 import {saveTripPattern} from './tripPattern'
 import {newGtfsEntity, fetchBaseGtfs} from './editor'
@@ -190,6 +191,53 @@ function updateUrl (
   }
 }
 
+/**
+ * Fetches a list of routes from the backend for the editor.
+ * Requires a lock to function.
+ */
+export function fetchRouteEntities () {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    const namespace = getEditorNamespace(
+      getState().editor.data.lock.feedId,
+      getState()
+    )
+    if (!namespace) {
+      console.warn('namespace not defined, so not fetching gtfs entities')
+      return
+    }
+
+    const graphQLRoot = getEntityGraphQLRoot('route')
+    if (!graphQLRoot) {
+      console.warn(`No graphql table for route.`)
+    }
+
+    const query = `
+      query entityQuery($namespace: String) {
+        feed(namespace: $namespace) {
+          feed_id
+          feed_version
+          filename
+          ${graphQLRoot} (limit: -1) {
+            id
+            status
+            publicly_visible
+            route_id
+            route_short_name
+            route_long_name
+            route_desc
+          }
+        }
+      }
+    `
+    const variables = { namespace }
+    return dispatch(fetchGraphQL({ query, variables })).then(
+      data => {
+        return data
+      }
+    ).catch(err => console.log(err))
+  }
+}
+
 /**
  * This function is used to set the active components in the GTFS editor.
  * It also handles clearing GTFS content should the feed being edited change.
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 08f3955f2..81e85928d 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -16,20 +16,24 @@ import {getComponentMessages} from '../../common/util/config'
 import { getRouteStatusText } from '../util/index.js'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
-import type {AppState} from '../../types/reducers'
+import type {AppState, LockState} from '../../types/reducers'
+import {fetchRouteEntities} from '../actions/active'
 
 type Props = {
   createSnapshot: typeof snapshotActions.createSnapshot,
   feedSource: Feed,
-  routes: Array<GtfsRoute>
-}
+  fetchRouteEntities: typeof fetchRouteEntities,
+  lock: LockState
+};
 
 type State = {
   comment: ?string,
   confirmPublishWithUnapproved: Boolean,
+  loading: boolean,
   name: ?string,
   publishNewVersion: boolean,
-  showModal: boolean
+  showModal: boolean,
+  unapprovedRoutes: Array<GtfsRoute>
 }
 
 function getDefaultState () {
@@ -38,7 +42,9 @@ function getDefaultState () {
     name: formatTimestamp(),
     publishNewVersion: false,
     confirmPublishWithUnapproved: false,
-    showModal: false
+    showModal: false,
+    unapprovedRoutes: [],
+    loading: false
   }
 }
 
@@ -46,12 +52,13 @@ class CreateSnapshotModal extends Component<Props, State> {
   state = getDefaultState()
 
   messages = getComponentMessages('CreateSnapshotModal')
+  onClose = null
 
   _onTogglePublish = (e: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({[e.target.name]: e.target.checked})
   }
 
-  _onTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
+  _lockonTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({[e.target.name]: e.target.checked})
   }
 
@@ -60,10 +67,29 @@ class CreateSnapshotModal extends Component<Props, State> {
   }
 
   close = () => {
+    if (this.onClose) { this.onClose() }
     this.setState(getDefaultState())
   }
 
-  open () {
+  updateUnapprovedRoutes = () => {
+    const {fetchRouteEntities} = this.props
+    this.setState({loading: true})
+    // FixMe: type issue causing .then to have red underline.
+    fetchRouteEntities().then(data => {
+      this.setState({loading: false})
+      const routes = data.feed.routes
+      const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== 2)
+      this.setState({
+        unapprovedRoutes
+      })
+    })
+  }
+
+  open (onClose) {
+    this.onClose = onClose
+
+    this.updateUnapprovedRoutes()
+
     this.setState({
       showModal: true
     })
@@ -80,9 +106,7 @@ class CreateSnapshotModal extends Component<Props, State> {
   render () {
     const {Body, Footer, Header, Title} = Modal
     const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal} = this.state
-    const {routes} = this.props
-
-    const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== 2)
+    const {unapprovedRoutes, loading} = this.state
 
     return (
       <Modal show={showModal} onHide={this.close}>
@@ -123,7 +147,8 @@ class CreateSnapshotModal extends Component<Props, State> {
               {this.messages('fields.publishNewVersion.label')}
             </Checkbox>
           </FormGroup>
-          {!!unapprovedRoutes.length > 0 &&
+          {loading && <h5>Loading</h5>}
+          {unapprovedRoutes.length > 0 &&
             <div>
               <h4>{this.messages('unapprovedRoutesHeader')}</h4>
               <h5>{this.messages('unapprovedRoutesDesc')}</h5>
@@ -166,10 +191,13 @@ class CreateSnapshotModal extends Component<Props, State> {
 }
 
 const mapDispatchToProps = {
-  createSnapshot: snapshotActions.createSnapshot
+  createSnapshot: snapshotActions.createSnapshot,
+  fetchRouteEntities
 }
 
-const mapStateToProps = (state: AppState, ownProps: {}) => ({})
+const mapStateToProps = (state: AppState, ownProps: {}) => ({
+  lock: state.editor.data.lock
+})
 
 // $FlowFixMe - ignore connect missing additional args
 export default connect(
diff --git a/lib/editor/components/EditorFeedSourcePanel.js b/lib/editor/components/EditorFeedSourcePanel.js
index 75e1ea704..4d53dcaaa 100644
--- a/lib/editor/components/EditorFeedSourcePanel.js
+++ b/lib/editor/components/EditorFeedSourcePanel.js
@@ -14,13 +14,17 @@ import * as versionActions from '../../manager/actions/versions'
 import {isEditingDisabled} from '../../manager/util'
 import type {Props as ContainerProps} from '../containers/ActiveEditorFeedSourcePanel'
 import type {Feed, Snapshot} from '../../types'
-import type {ManagerUserState} from '../../types/reducers'
+import type {ManagerUserState, LockState} from '../../types/reducers'
+import * as editorActions from '../actions/editor'
 
 type Props = ContainerProps & {
   createFeedVersionFromSnapshot: typeof versionActions.createFeedVersionFromSnapshot,
   deleteSnapshot: typeof snapshotActions.deleteSnapshot,
   downloadSnapshot: typeof snapshotActions.downloadSnapshot,
   fetchSnapshots: typeof snapshotActions.fetchSnapshots,
+  lock: LockState,
+  lockEditorFeedSource: typeof editorActions.lockEditorFeedSource,
+  removeEditorLock: typeof editorActions.removeEditorLock,
   restoreSnapshot: typeof snapshotActions.restoreSnapshot,
   user: ManagerUserState
 }
@@ -33,9 +37,20 @@ export default class EditorFeedSourcePanel extends Component<Props> {
   }
 
   _openModal = () => {
-    // Note: this will need to change if react-redux is upgraded to v6+
-    // https://medium.com/octopus-labs-london/how-to-access-a-redux-components-methods-with-createref-ca28a96efd59
-    this.refs.snapshotModal.getWrappedInstance().open()
+    const {lock, feedSource, lockEditorFeedSource, removeEditorLock} = this.props
+    // Get lock if we don't have one.
+    // Snapshot Modal requires lock to fetch unapproved routes.
+    if (!lock.sessionId) {
+      lockEditorFeedSource(feedSource.id).then((data) => {
+        // Clean up lock on close.
+        const onClose = () => removeEditorLock(feedSource.id)
+        this.refs.snapshotModal.getWrappedInstance().open(onClose)
+      })
+    } else {
+      // Note: this will need to change if react-redux is upgraded to v6+
+      // https://medium.com/octopus-labs-london/how-to-access-a-redux-components-methods-with-createref-ca28a96efd59
+      this.refs.snapshotModal.getWrappedInstance().open()
+    }
   }
 
   _sortBySnapshotTime = (a: Snapshot, b: Snapshot) => b.snapshotTime - a.snapshotTime
@@ -61,7 +76,7 @@ export default class EditorFeedSourcePanel extends Component<Props> {
         <CreateSnapshotModal
           feedSource={feedSource}
           ref='snapshotModal'
-          routes={[]} />
+        />
         <ConfirmModal ref='confirmModal' />
         <Col xs={9}>
           {feedSource.editorSnapshots && feedSource.editorSnapshots.length
diff --git a/lib/editor/components/FeedInfoPanel.js b/lib/editor/components/FeedInfoPanel.js
index 8384c409e..82bd0815a 100644
--- a/lib/editor/components/FeedInfoPanel.js
+++ b/lib/editor/components/FeedInfoPanel.js
@@ -26,7 +26,6 @@ type Props = ContainerProps & {
   fetchSnapshots: typeof snapshotActions.fetchSnapshots,
   project: Project,
   restoreSnapshot: typeof snapshotActions.restoreSnapshot,
-  routes: Array<GtfsRoute>,
   setActiveEntity: typeof activeActions.setActiveEntity
 }
 
@@ -107,7 +106,7 @@ export default class FeedInfoPanel extends Component<Props, State> {
   }
 
   render () {
-    const { feedSource, feedInfo, routes } = this.props
+    const { feedSource, feedInfo } = this.props
     if (!feedInfo) return null
     const panelStyle = {
       position: 'absolute',
@@ -134,7 +133,6 @@ export default class FeedInfoPanel extends Component<Props, State> {
           <CreateSnapshotModal
             ref='snapshotModal'
             feedSource={feedSource}
-            routes={routes}
           />
           <ButtonGroup>
             {/* Hide toolbar toggle */}
diff --git a/lib/editor/containers/ActiveEditorFeedSourcePanel.js b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
index 82a0c7f8e..91b7be2f4 100644
--- a/lib/editor/containers/ActiveEditorFeedSourcePanel.js
+++ b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
@@ -1,6 +1,7 @@
 // @flow
 
 import {connect} from 'react-redux'
+
 import {
   deleteSnapshot,
   downloadSnapshot,
@@ -8,9 +9,8 @@ import {
   restoreSnapshot
 } from '../actions/snapshots.js'
 import {createFeedVersionFromSnapshot} from '../../manager/actions/versions'
-
+import {lockEditorFeedSource, removeEditorLock} from '../actions/editor'
 import EditorFeedSourcePanel from '../components/EditorFeedSourcePanel'
-
 import type {Feed, Project} from '../../types'
 import type {AppState} from '../../types/reducers'
 
@@ -21,8 +21,9 @@ export type Props = {
 
 const mapStateToProps = (state: AppState, ownProps: Props) => {
   const {user} = state
+  const {lock} = state.editor.data
   return {
-    user
+    user, lock
   }
 }
 
@@ -31,7 +32,9 @@ const mapDispatchToProps = {
   deleteSnapshot,
   downloadSnapshot,
   fetchSnapshots,
-  restoreSnapshot
+  restoreSnapshot,
+  lockEditorFeedSource,
+  removeEditorLock
 }
 
 const ActiveEditorFeedSourcePanel = connect(
diff --git a/lib/editor/containers/ActiveFeedInfoPanel.js b/lib/editor/containers/ActiveFeedInfoPanel.js
index 52fcf7f84..144c58fad 100644
--- a/lib/editor/containers/ActiveFeedInfoPanel.js
+++ b/lib/editor/containers/ActiveFeedInfoPanel.js
@@ -20,13 +20,11 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
   const project = findProjectByFeedSource(state.projects.all, feedSourceId)
   const feedSource = project && project.feedSources && project.feedSources.find(fs => fs.id === feedSourceId)
   const feedInfo = getTableById(state.editor.data.tables, 'feedinfo')[0]
-  const routes = getTableById(state.editor.data.tables, 'route')
   return {
     feedInfo,
     feedSourceId,
     feedSource,
-    project,
-    routes
+    project
   }
 }
 

From fca58ae67a8c6198579072c0de18f0ff3d83dd8f Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 22 Nov 2021 16:14:58 -0800
Subject: [PATCH 426/553] fix(gtfsplus): trim extra spaces from fields

---
 lib/gtfsplus/reducers/gtfsplus.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/gtfsplus/reducers/gtfsplus.js b/lib/gtfsplus/reducers/gtfsplus.js
index 99e7243a3..e99a409f0 100644
--- a/lib/gtfsplus/reducers/gtfsplus.js
+++ b/lib/gtfsplus/reducers/gtfsplus.js
@@ -3,7 +3,6 @@
 import update from 'react-addons-update'
 
 import {constructNewGtfsPlusRow} from '../util'
-
 import type {Action} from '../../types/actions'
 import type {GtfsPlusReducerState} from '../../types/reducers'
 
@@ -58,7 +57,7 @@ const gtfsplus = (
           continue
         }
         const fields = lines[0].split(',')
-        const COLUMN_REGEX = /,(?=(?:(?:[^"]*"){2})*[^"]*$)/
+        const COLUMN_REGEX = / *, *(?=(?:(?:[^"]*"){2})*[^"]*$)/
         const tableName = filename.split('.')[0]
         newTableData[tableName] = lines.slice(1)
         // Do not include blank lines (e.g., at the end of the file).

From 8f1fc357fe25ef18366aeafb5255e1c66679a1b1 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Wed, 24 Nov 2021 10:56:52 -0800
Subject: [PATCH 427/553] refactor(editor): PR Fixes part one

---
 i18n/english.yml                              |  4 +--
 lib/editor/actions/active.js                  | 11 +-------
 lib/editor/components/CreateSnapshotModal.js  |  9 ++++---
 .../containers/ActiveEditorFeedSourcePanel.js |  4 +--
 lib/editor/reducers/data.js                   |  3 ++-
 lib/editor/util/index.js                      | 26 ++++++++++++++++---
 6 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index f36b80fdb..a46d2713c 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -23,8 +23,8 @@ components:
       publishNewVersion:
         label: Publish snapshot as new feed version
       confirmPublishWithUnapproved:
-        label: Confirm publish with unapproved routes. 
-    unapprovedRoutesHeader: The following routes are not approved.
+        label: Confirm publish with unapproved routes 
+    unapprovedRoutesHeader: "The following routes are not approved:"
     unapprovedRoutesDesc: These routes will not be included in the output.
     missingNameAlert: Must give snapshot a valid name!
     ok: OK
diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index b2285bfb4..92a2c4d66 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -214,27 +214,18 @@ export function fetchRouteEntities () {
     const query = `
       query entityQuery($namespace: String) {
         feed(namespace: $namespace) {
-          feed_id
-          feed_version
-          filename
           ${graphQLRoot} (limit: -1) {
             id
             status
-            publicly_visible
             route_id
             route_short_name
-            route_long_name
             route_desc
           }
         }
       }
     `
     const variables = { namespace }
-    return dispatch(fetchGraphQL({ query, variables })).then(
-      data => {
-        return data
-      }
-    ).catch(err => console.log(err))
+    return dispatch(fetchGraphQL({ query, variables })).catch(console.log)
   }
 }
 
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 81e85928d..22247cc86 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -1,5 +1,6 @@
 // @flow
 
+import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import {
   Button,
@@ -13,7 +14,7 @@ import {connect} from 'react-redux'
 
 import * as snapshotActions from '../actions/snapshots.js'
 import {getComponentMessages} from '../../common/util/config'
-import { getRouteStatusText } from '../util/index.js'
+import { getRouteStatusText, routeStatusTextToValue } from '../util'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState, LockState} from '../../types/reducers'
@@ -58,7 +59,7 @@ class CreateSnapshotModal extends Component<Props, State> {
     this.setState({[e.target.name]: e.target.checked})
   }
 
-  _lockonTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
+  _onTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({[e.target.name]: e.target.checked})
   }
 
@@ -78,7 +79,7 @@ class CreateSnapshotModal extends Component<Props, State> {
     fetchRouteEntities().then(data => {
       this.setState({loading: false})
       const routes = data.feed.routes
-      const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== 2)
+      const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== routeStatusTextToValue('Approved'))
       this.setState({
         unapprovedRoutes
       })
@@ -147,7 +148,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               {this.messages('fields.publishNewVersion.label')}
             </Checkbox>
           </FormGroup>
-          {loading && <h5>Loading</h5>}
+          {loading && <Icon type='spinner' className='fa-pulse' />}
           {unapprovedRoutes.length > 0 &&
             <div>
               <h4>{this.messages('unapprovedRoutesHeader')}</h4>
diff --git a/lib/editor/containers/ActiveEditorFeedSourcePanel.js b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
index 91b7be2f4..9057b9f2e 100644
--- a/lib/editor/containers/ActiveEditorFeedSourcePanel.js
+++ b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
@@ -20,8 +20,8 @@ export type Props = {
 }
 
 const mapStateToProps = (state: AppState, ownProps: Props) => {
-  const {user} = state
-  const {lock} = state.editor.data
+  const {user, editor} = state
+  const {lock} = editor.data
   return {
     user, lock
   }
diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index 2aca4d382..f06f58e9a 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -12,6 +12,7 @@ import {getMapToGtfsStrategy, entityIsNew} from '../util/objects'
 import {assignDistancesToPatternStops, constructShapePoints} from '../util/map'
 import type {Action} from '../../types/actions'
 import type {DataState} from '../../types/reducers'
+import { routeStatusTextToValue } from '../util'
 
 // If updating a trip pattern, new props apply to sub entity and edited
 // boolean updated is patternEdited.
@@ -214,7 +215,7 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
       // When a route gets edited, set its status to "In Progress"
       const additional = {}
       if (component === 'route' && !props.status) {
-        additional.status = '0'
+        additional.status = routeStatusTextToValue('In Progress')
       }
       // FIXME: Check for pattern stops props (what about other sequenced lists)
       // and update stop sequence.
diff --git a/lib/editor/util/index.js b/lib/editor/util/index.js
index 46618eb91..c710baa64 100644
--- a/lib/editor/util/index.js
+++ b/lib/editor/util/index.js
@@ -147,9 +147,29 @@ export function getEditorTable (component: string) {
 }
 
 export function getRouteStatusText (statusCode: number) {
-  const fields = getEditorTable('route').fields
-  const statusField = fields.find(field => field.name === 'status')
-  return statusField.options.find(option => option.value === statusCode).text
+  const table = getEditorTable('route')
+  if (table) {
+    const statusField = table.fields.find(field => field.name === 'status')
+    if (statusField && statusField.options) {
+      const option = statusField.options.find(option => option.value === statusCode)
+      if (option) {
+        return option.text
+      }
+    }
+  }
+}
+
+export function routeStatusTextToValue (statusText: string) {
+  const table = getEditorTable('route')
+  if (table) {
+    const statusField = table.fields.find(field => field.name === 'status')
+    if (statusField && statusField.options) {
+      const option = statusField.options.find(option => option.text === statusText)
+      if (option) {
+        return option.value
+      }
+    }
+  }
 }
 
 export function canApproveGtfs (project: ?Project, feedSource: ?Feed, user: ?User | ?ManagerUserState): boolean {

From 2d18c481c29caec7cab4684f1c7d553b7a9ce5d2 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 29 Nov 2021 15:58:12 -0800
Subject: [PATCH 428/553] feature(FeedVersionViewer): Add summary of
 transformations applied to feed version.

---
 .../components/TransformationsViewer.js       | 58 +++++++++++++++++++
 .../components/version/FeedVersionViewer.js   | 32 +++++++++-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 lib/manager/components/TransformationsViewer.js

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
new file mode 100644
index 000000000..c4e0ad4d7
--- /dev/null
+++ b/lib/manager/components/TransformationsViewer.js
@@ -0,0 +1,58 @@
+// @flow
+
+import React, { Component } from 'react'
+import { Col, ListGroup, Panel, Row, ListGroupItem, Badge } from 'react-bootstrap'
+
+import type {FeedVersion} from '../../types'
+
+type Props = {
+  version: FeedVersion,
+}
+
+export default class TransformationsViewer extends Component<Props> {
+  render () {
+    const {
+      version
+    } = this.props
+
+    if (version.feedTransformResult && version.feedTransformResult.tableTransformResults) {
+      const {tableTransformResults} = version.feedTransformResult
+      tableTransformResults[1] = {...tableTransformResults[0]}
+      tableTransformResults[1].tableName = 'test'
+      const transformContent = tableTransformResults.map(res => {
+        const badge = res.transformType === 'TABLE_MODIFIED'
+          ? <Badge>Table Modified</Badge>
+          : res.transformType === 'TABLE_ADDED'
+            ? <Badge>Table Added</Badge>
+            : res.transformType === 'TABLE_REPLACED'
+              ? <Badge>Table Replaced</Badge>
+              : res.transformType === 'TABLE_DELETED'
+                ? <Badge>Table Deleted</Badge>
+                : null
+        return (
+          <ListGroupItem key={res.tableName}>
+            <div>
+              <h4 style={{marginTop: '5px'}}>{res.tableName} {badge}</h4>
+              <Row style={{textAlign: 'center'}}>
+                <Col xs={4}>Rows added: {res.addedCount}</Col>
+                <Col xs={4}>Rows deleted: {res.deletedCount}</Col>
+                <Col xs={4}>Rows updated: {res.updatedCount}</Col>
+              </Row>
+            </div>
+          </ListGroupItem>
+        )
+      })
+      return (
+        <div>
+          <Panel header={<h2>Transformations:</h2>}>
+            <ListGroup>
+              {transformContent}
+            </ListGroup>
+          </Panel>
+        </div>
+      )
+    } else {
+      return <div><h3>No transformations applied.</h3></div>
+    }
+  }
+}
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 7a8075f9b..0428a86df 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -22,6 +22,7 @@ import * as snapshotActions from '../../../editor/actions/snapshots'
 import * as plusActions from '../../../gtfsplus/actions/gtfsplus'
 import ActiveGtfsPlusVersionSummary from '../../../gtfsplus/containers/ActiveGtfsPlusVersionSummary'
 import NotesViewer from '../NotesViewer'
+import TransformationsViewer from '../TransformationsViewer'
 import {errorPriorityLevels, getTableFatalExceptions} from '../../util/version'
 import GtfsValidationViewer from '../validation/GtfsValidationViewer'
 import type {Feed, FeedVersion, GtfsPlusValidation, Note, Project} from '../../../types'
@@ -131,7 +132,10 @@ export default class FeedVersionViewer extends Component<Props> {
                     notes={version.notes}
                     notesRequested={notesRequested}
                     newNotePosted={newNotePosted} />
-                  : null
+                  : versionSection === 'transformations'
+                    ? <TransformationsViewer
+                      version={version} />
+                    : null
           }
         </Col>
       </Row>
@@ -218,6 +222,25 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : <span><BsLabel bsStyle={color}>{text}</BsLabel></span>
   }
 
+  _renderTransformResultsCount = (version: FeedVersion) => {
+    let totalCount
+    if (version.feedTransformResult) {
+      const {tableTransformResults} = version.feedTransformResult
+      totalCount = tableTransformResults.reduce((prev, cur) => {
+        return cur.deletedCount + cur.updatedCount + cur.addedCount + prev
+      }, 0)
+    } else {
+      totalCount = 0
+    }
+    return (
+      <div style={{display: 'inline'}}>
+        <BsLabel>
+          {totalCount}
+        </BsLabel>
+      </div>
+    )
+  }
+
   render () {
     const { feedVersionIndex, version, versionSection } = this.props
     const versionPath = `/feed/${version.feedSource.id}/version/${feedVersionIndex}`
@@ -236,6 +259,13 @@ class VersionSectionSelector extends Component<SelectorProps> {
               <Icon type='exclamation-triangle' /> Validation issues {this._renderIssuesLabel()}
             </ListGroupItem>
           </LinkContainer>
+          <LinkContainer
+            to={`${versionPath}/transformations`}
+            active={versionSection === 'transformations'}>
+            <ListGroupItem>
+              <Icon type='exclamation-triangle' /> Transformation Results {this._renderTransformResultsCount(version)}
+            </ListGroupItem>
+          </LinkContainer>
           {isModuleEnabled('gtfsplus')
             ? <LinkContainer
               to={`${versionPath}/gtfsplus`}

From 07f4661e36a084d63edae4283b4639fa4fb32990 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 29 Nov 2021 16:20:03 -0800
Subject: [PATCH 429/553] refactor(gtfsplus): Add comment clarifying regex
 change

---
 lib/gtfsplus/reducers/gtfsplus.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/gtfsplus/reducers/gtfsplus.js b/lib/gtfsplus/reducers/gtfsplus.js
index e99a409f0..11baf6d36 100644
--- a/lib/gtfsplus/reducers/gtfsplus.js
+++ b/lib/gtfsplus/reducers/gtfsplus.js
@@ -57,6 +57,7 @@ const gtfsplus = (
           continue
         }
         const fields = lines[0].split(',')
+        // Column selector includes extra spaces on either side of comma.
         const COLUMN_REGEX = / *, *(?=(?:(?:[^"]*"){2})*[^"]*$)/
         const tableName = filename.split('.')[0]
         newTableData[tableName] = lines.slice(1)

From 4216b48ede7f137a3b414efa84660bdc93f8c4f7 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 29 Nov 2021 17:18:50 -0800
Subject: [PATCH 430/553] refactor(TransformationsViewer): remove some testing
 code

---
 lib/manager/components/TransformationsViewer.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
index c4e0ad4d7..684ab49f2 100644
--- a/lib/manager/components/TransformationsViewer.js
+++ b/lib/manager/components/TransformationsViewer.js
@@ -17,8 +17,6 @@ export default class TransformationsViewer extends Component<Props> {
 
     if (version.feedTransformResult && version.feedTransformResult.tableTransformResults) {
       const {tableTransformResults} = version.feedTransformResult
-      tableTransformResults[1] = {...tableTransformResults[0]}
-      tableTransformResults[1].tableName = 'test'
       const transformContent = tableTransformResults.map(res => {
         const badge = res.transformType === 'TABLE_MODIFIED'
           ? <Badge>Table Modified</Badge>

From 7dba956259ecf903da844ae76b137a8b8c3a922f Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 30 Nov 2021 10:18:40 -0800
Subject: [PATCH 431/553] refactor(editor): Use getEntityName() in
 CreateSnapshotModal

---
 lib/editor/actions/active.js                 | 1 +
 lib/editor/components/CreateSnapshotModal.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index 92a2c4d66..2cb1f18b7 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -219,6 +219,7 @@ export function fetchRouteEntities () {
             status
             route_id
             route_short_name
+            route_long_name
             route_desc
           }
         }
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 22247cc86..15be092bf 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -12,14 +12,14 @@ import {
 } from 'react-bootstrap'
 import {connect} from 'react-redux'
 
-import * as snapshotActions from '../actions/snapshots.js'
+import * as snapshotActions from '../actions/snapshots'
 import {getComponentMessages} from '../../common/util/config'
 import { getRouteStatusText, routeStatusTextToValue } from '../util'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState, LockState} from '../../types/reducers'
 import {fetchRouteEntities} from '../actions/active'
-
+import {getEntityName} from '../util/gtfs'
 type Props = {
   createSnapshot: typeof snapshotActions.createSnapshot,
   feedSource: Feed,
@@ -156,7 +156,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               <ul>
                 {
                   unapprovedRoutes.map(route => (
-                    <li key={route.route_id}>{route.route_short_name} - {route.route_desc}: {getRouteStatusText(route.status)}</li>
+                    <li key={route.route_id}>{getEntityName(route)}: {getRouteStatusText(route.status)}</li>
                   ))
                 }
               </ul>

From d1881250f2deb7a44183a275b363cf1da2105fbb Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 30 Nov 2021 15:57:29 -0500
Subject: [PATCH 432/553] feat(auto-publish): Add auto-publish support (MTC
 ext. req'd)

---
 lib/manager/actions/versions.js               | 13 +++--
 lib/manager/components/CreateFeedSource.js    | 25 +++++++++-
 lib/manager/components/GeneralSettings.js     | 31 +++++++++++-
 .../components/version/FeedVersionDetails.js  | 47 ++++++++++++-------
 lib/types/index.js                            |  2 +
 5 files changed, 96 insertions(+), 22 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 9721bdef5..4ce158c6b 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -12,12 +12,12 @@ import {ENTITY} from '../../editor/constants'
 import {getKeyForId} from '../../editor/util/gtfs'
 import {getEntityGraphQLRoot, getEntityIdField, getGraphQLFieldsForEntity} from '../../gtfs/util'
 import {validateGtfsPlusFeed} from '../../gtfsplus/actions/gtfsplus'
-import {handleJobResponse, setErrorMessage, startJobMonitor} from './status'
-import {fetchFeedSource} from './feeds'
-
 import type {Feed, FeedVersion, ShapefileExportType} from '../../types'
 import type {dispatchFn, getStateFn, ValidationIssueCount} from '../../types/reducers'
 
+import {handleJobResponse, setErrorMessage, startJobMonitor} from './status'
+import {fetchFeedSource} from './feeds'
+
 const deletingFeedVersion = createVoidPayloadAction('DELETING_FEEDVERSION')
 const publishedFeedVersion = createAction(
   'PUBLISHED_FEEDVERSION',
@@ -160,6 +160,13 @@ export function fetchFeedVersion (feedVersionId: string) {
  */
 export function publishFeedVersion (feedVersion: FeedVersion) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
+    if (
+      feedVersion.feedSource.autoPublish &&
+      !window.confirm('Are you sure you want publish this feed version again?')
+    ) {
+      // For feed set to auto-publish, if the user does not confirm, do nothing.
+      return
+    }
     const url = `${SECURE_API_PREFIX}feedversion/${feedVersion.id}/publish`
     return dispatch(secureFetch(url, 'post'))
       .then(response => response.json())
diff --git a/lib/manager/components/CreateFeedSource.js b/lib/manager/components/CreateFeedSource.js
index 6022e6957..63fdf2bb7 100644
--- a/lib/manager/components/CreateFeedSource.js
+++ b/lib/manager/components/CreateFeedSource.js
@@ -21,11 +21,12 @@ import validator from 'validator'
 import {createFeedSource} from '../actions/feeds'
 import Loading from '../../common/components/Loading'
 import {FREQUENCY_INTERVALS} from '../../common/constants'
-import FeedFetchFrequency from './FeedFetchFrequency'
+import {isExtensionEnabled} from '../../common/util/config'
 import {validationState} from '../util'
-
 import type {FetchFrequency, NewFeed} from '../../types'
 
+import FeedFetchFrequency from './FeedFetchFrequency'
+
 type Props = {
   createFeedSource: typeof createFeedSource,
   onCancel: () => void,
@@ -235,6 +236,26 @@ export default class CreateFeedSource extends Component<Props, State> {
               </ListGroupItem>
             </ListGroup>
           </Panel>
+          {isExtensionEnabled('mtc') && (
+            <Panel header={<h3>Automatic publishing</h3>}>
+              <ListGroup fill>
+                <ListGroupItem>
+                  <FormGroup>
+                    <Checkbox
+                      checked={model.autoPublish}
+                      onChange={this._toggleCheckBox('autoPublish')}
+                    >
+                      <strong>Auto-publish this feed</strong>
+                    </Checkbox>
+                    <small>
+                      Set this feed source to be automatically published
+                      when a new version is created.
+                    </small>
+                  </FormGroup>
+                </ListGroupItem>
+              </ListGroup>
+            </Panel>
+          )}
         </Col>
         <Col xs={12}>
           <Button
diff --git a/lib/manager/components/GeneralSettings.js b/lib/manager/components/GeneralSettings.js
index ce3e17a07..971dba754 100644
--- a/lib/manager/components/GeneralSettings.js
+++ b/lib/manager/components/GeneralSettings.js
@@ -17,9 +17,10 @@ import {
 
 import * as feedsActions from '../actions/feeds'
 import { FREQUENCY_INTERVALS } from '../../common/constants'
+import { isExtensionEnabled } from '../../common/util/config'
+import LabelAssigner from '../components/LabelAssigner'
 import type { Feed, FetchFrequency, Project } from '../../types'
 import type { ManagerUserState } from '../../types/reducers'
-import LabelAssigner from '../components/LabelAssigner'
 
 import FeedFetchFrequency from './FeedFetchFrequency'
 
@@ -69,6 +70,12 @@ export default class GeneralSettings extends Component<Props, State> {
     updateFeedSource(feedSource, {retrievalMethod: value})
   }
 
+  // FIXME_QBD: refactor similar code (See CreateFeedSource).
+  _onToggleAutoPublish = () => {
+    const {feedSource, updateFeedSource} = this.props
+    updateFeedSource(feedSource, {autoPublish: !feedSource.autoPublish})
+  }
+
   _onSelectFetchInterval = (fetchInterval: number) => {
     const {feedSource, updateFeedSource} = this.props
     updateFeedSource(feedSource, {fetchInterval})
@@ -201,6 +208,28 @@ export default class GeneralSettings extends Component<Props, State> {
             </ListGroupItem>
           </ListGroup>
         </Panel>
+        {isExtensionEnabled('mtc') && (
+          <Panel header={<h3>Automatic publishing</h3>}>
+            <ListGroup fill>
+              <ListGroupItem>
+                <FormGroup>
+                  <Checkbox
+                    checked={feedSource.autoPublish}
+                    disabled={disabled}
+                    onChange={this._onToggleAutoPublish}
+                    bsStyle='danger'
+                  >
+                    <strong>Auto-publish this feed</strong>
+                  </Checkbox>
+                  <small>
+                    Set this feed source to be automatically published
+                    when a new version is created.
+                  </small>
+                </FormGroup>
+              </ListGroupItem>
+            </ListGroup>
+          </Panel>
+        )}
         <Panel header={<h3>Labels</h3>}>
           <LabelAssigner feedSource={feedSource} project={project} />
         </Panel>
diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index ea0c4ae27..47c4a3b48 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -15,13 +15,13 @@ import bboxPoly from 'turf-bbox-polygon'
 import * as versionsActions from '../../actions/versions'
 import {getConfigProperty, isExtensionEnabled} from '../../../common/util/config'
 import {BLOCKING_ERROR_TYPES} from '../../util/version'
+import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
+import type {ManagerUserState} from '../../../types/reducers'
+
 import FeedVersionSpanChart from './FeedVersionSpanChart'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
 
-import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
-import type {ManagerUserState} from '../../../types/reducers'
-
 type Props = {
   comparedVersion: ?FeedVersion,
   feedSource: Feed,
@@ -111,6 +111,28 @@ export default class FeedVersionDetails extends Component<Props> {
     const mergeButtonLabel = isMergedServicePeriods
       ? 'Cannot re-merge feed'
       : 'Merge with version'
+
+    const hasMtcExtension = isExtensionEnabled('mtc')
+    let publishWarningMessage
+    if (hasMtcExtension) {
+      if (hasBlockingIssue || hasGtfsPlusBlockingIssue) {
+        publishWarningMessage = (
+          <span>
+            Cannot publish version because it has a{' '}
+            {hasGtfsPlusBlockingIssue ? 'GTFS+ ' : ''}
+            blocking issue.
+            (See{' '}
+            <Link
+              to={`/feed/${feedSource.id}/version/${version.version}/${hasGtfsPlusBlockingIssue ? 'gtfsplus' : 'issues'}`}>
+              {hasGtfsPlusBlockingIssue ? 'GTFS+' : 'validation'} issues
+            </Link>.)
+          </span>
+        )
+      } else if (feedSource.autoPublish) {
+        publishWarningMessage = 'Reminder: this feed is already set to be auto-published!'
+      }
+    }
+
     return (
       <ListGroupItem>
         <h4 className='pull-left' style={{ marginBottom: '2px' }}>
@@ -119,7 +141,7 @@ export default class FeedVersionDetails extends Component<Props> {
             Feed validity dates
           </span>
         </h4>
-        {isExtensionEnabled('mtc') &&
+        {hasMtcExtension &&
           <ButtonToolbar className='pull-right' style={{ marginTop: '2px' }}>
             <VersionSelectorDropdown
               dropdownProps={{
@@ -155,8 +177,7 @@ export default class FeedVersionDetails extends Component<Props> {
             </Button>
           </ButtonToolbar>
         }
-        {(hasBlockingIssue || hasGtfsPlusBlockingIssue) &&
-          isExtensionEnabled('mtc') &&
+        {hasMtcExtension && (
           <div
             className='pull-right text-danger'
             style={{
@@ -165,17 +186,11 @@ export default class FeedVersionDetails extends Component<Props> {
               marginLeft: '5px',
               textAlign: 'right',
               width: '180px'
-            }}>
-            Cannot publish version because it has a{' '}
-            {hasGtfsPlusBlockingIssue ? 'GTFS+ ' : ''}
-            blocking issue.
-            (See{' '}
-            <Link
-              to={`/feed/${feedSource.id}/version/${version.version}/${hasGtfsPlusBlockingIssue ? 'gtfsplus' : 'issues'}`}>
-              {hasGtfsPlusBlockingIssue ? 'GTFS+' : 'validation'} issues
-            </Link>.)
+            }}
+          >
+            {publishWarningMessage}
           </div>
-        }
+        )}
 
         <FeedVersionSpanChart
           activeVersion={version}
diff --git a/lib/types/index.js b/lib/types/index.js
index 988fa44ba..3890788b0 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -378,6 +378,7 @@ export type FeedTransformRules = {
 }
 
 export type Feed = {
+  autoPublish?: boolean,
   dateCreated: number,
   deployable: boolean,
   deployments?: Array<Deployment>,
@@ -413,6 +414,7 @@ export type Feed = {
 
 export type NewFeed = {
   autoFetchFeed?: boolean,
+  autoPublish?: boolean,
   deployable?: boolean,
   fetchFrequency: FetchFrequency,
   fetchInterval: number,

From 3b65cc8b3edaf51e13fa0a6f10dc4bcd47f4c17e Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 2 Dec 2021 12:28:39 -0800
Subject: [PATCH 433/553] refactor(editor): Fix flow issues by using appstate
 for SnapshotModal

---
 lib/editor/actions/active.js                  | 22 ++++++++--
 lib/editor/actions/editor.js                  |  7 ++--
 lib/editor/components/CreateSnapshotModal.js  | 42 +++++++++----------
 .../components/EditorFeedSourcePanel.js       | 23 ++--------
 .../containers/ActiveEditorFeedSourcePanel.js | 10 ++---
 lib/editor/reducers/data.js                   |  5 +++
 6 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index 2cb1f18b7..7cd9f01c6 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -20,8 +20,8 @@ import type {Entity, Feed} from '../../types'
 import type {dispatchFn, getStateFn, AppState} from '../../types/reducers'
 import {getEntityGraphQLRoot} from '../../gtfs/util'
 
+import {lockEditorFeedSource, receiveBaseGtfs, removeEditorLock, newGtfsEntity, fetchBaseGtfs} from './editor'
 import {saveTripPattern} from './tripPattern'
-import {newGtfsEntity, fetchBaseGtfs} from './editor'
 
 export const clearGtfsContent = createVoidPayloadAction('CLEAR_GTFSEDITOR_CONTENT')
 const receivedNewEntity = createAction(
@@ -195,8 +195,18 @@ function updateUrl (
  * Fetches a list of routes from the backend for the editor.
  * Requires a lock to function.
  */
-export function fetchRouteEntities () {
-  return function (dispatch: dispatchFn, getState: getStateFn) {
+export function fetchRouteEntities (feedSource: Feed) {
+  return async function (dispatch: dispatchFn, getState: getStateFn) {
+    const state = getState()
+    const { lock } = state.editor.data
+    let lockCreated = false
+    // We need to get a lock if we do not already have one
+    if (!lock.sessionId) {
+      await dispatch(lockEditorFeedSource(feedSource.id))
+      // Save that lock was created so it can be removed when we are done.
+      lockCreated = true
+    }
+
     const namespace = getEditorNamespace(
       getState().editor.data.lock.feedId,
       getState()
@@ -226,7 +236,11 @@ export function fetchRouteEntities () {
       }
     `
     const variables = { namespace }
-    return dispatch(fetchGraphQL({ query, variables })).catch(console.log)
+    const data = await dispatch(fetchGraphQL({ query, variables }))
+    await dispatch(receiveBaseGtfs({...data, partial: true}))
+    if (lockCreated) {
+      await dispatch(removeEditorLock(feedSource.id, false, true))
+    }
   }
 }
 
diff --git a/lib/editor/actions/editor.js b/lib/editor/actions/editor.js
index 2b8ec900b..c954dc12c 100644
--- a/lib/editor/actions/editor.js
+++ b/lib/editor/actions/editor.js
@@ -37,7 +37,7 @@ const createGtfsEntity = createAction(
   'CREATE_GTFS_ENTITY',
   (payload: { component: string, props: Object }) => payload
 )
-const receiveBaseGtfs = createAction(
+export const receiveBaseGtfs = createAction(
   'RECEIVE_BASE_GTFS',
   (payload: { feed: EditorTables }) => payload
 )
@@ -225,7 +225,8 @@ function startEditorLockMaintenance (
  */
 export function removeEditorLock (
   feedId: ?string,
-  overwrite: ?boolean = false
+  overwrite: ?boolean = false,
+  keepEditorContent: ?boolean = false
 ): any {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     if (!feedId) {
@@ -262,7 +263,7 @@ export function removeEditorLock (
             // successful.
             return false
           }
-        } else {
+        } else if (!keepEditorContent) {
           // Otherwise, the intention is to exit the editor. Clear all GTFS
           // content. This must be done finally so as not to interfere with the
           // lock removal.
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 15be092bf..02af911c2 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -18,23 +18,23 @@ import { getRouteStatusText, routeStatusTextToValue } from '../util'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState, LockState} from '../../types/reducers'
-import {fetchRouteEntities} from '../actions/active'
+import * as activeActions from '../actions/active'
 import {getEntityName} from '../util/gtfs'
 type Props = {
   createSnapshot: typeof snapshotActions.createSnapshot,
   feedSource: Feed,
-  fetchRouteEntities: typeof fetchRouteEntities,
-  lock: LockState
+  fetchRouteEntities: typeof activeActions.fetchRouteEntities,
+  lock: LockState,
+  routes: Array<GtfsRoute>
 };
 
 type State = {
   comment: ?string,
-  confirmPublishWithUnapproved: Boolean,
+  confirmPublishWithUnapproved: boolean,
   loading: boolean,
   name: ?string,
   publishNewVersion: boolean,
   showModal: boolean,
-  unapprovedRoutes: Array<GtfsRoute>
 }
 
 function getDefaultState () {
@@ -44,7 +44,6 @@ function getDefaultState () {
     publishNewVersion: false,
     confirmPublishWithUnapproved: false,
     showModal: false,
-    unapprovedRoutes: [],
     loading: false
   }
 }
@@ -72,24 +71,21 @@ class CreateSnapshotModal extends Component<Props, State> {
     this.setState(getDefaultState())
   }
 
-  updateUnapprovedRoutes = () => {
-    const {fetchRouteEntities} = this.props
-    this.setState({loading: true})
-    // FixMe: type issue causing .then to have red underline.
-    fetchRouteEntities().then(data => {
-      this.setState({loading: false})
-      const routes = data.feed.routes
-      const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== routeStatusTextToValue('Approved'))
+  componentDidUpdate (prevProps) {
+    const {routes} = this.props
+    if (routes !== prevProps.routes) {
       this.setState({
-        unapprovedRoutes
+        loading: false
       })
-    })
+    }
   }
 
   open (onClose) {
     this.onClose = onClose
 
-    this.updateUnapprovedRoutes()
+    const {fetchRouteEntities, feedSource} = this.props
+    this.setState({loading: true})
+    fetchRouteEntities(feedSource)
 
     this.setState({
       showModal: true
@@ -106,8 +102,9 @@ class CreateSnapshotModal extends Component<Props, State> {
 
   render () {
     const {Body, Footer, Header, Title} = Modal
-    const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal} = this.state
-    const {unapprovedRoutes, loading} = this.state
+    const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal, loading} = this.state
+    const {routes} = this.props
+    const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== routeStatusTextToValue('Approved'))
 
     return (
       <Modal show={showModal} onHide={this.close}>
@@ -156,7 +153,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               <ul>
                 {
                   unapprovedRoutes.map(route => (
-                    <li key={route.route_id}>{getEntityName(route)}: {getRouteStatusText(route.status)}</li>
+                    <li key={route.route_id}>{getEntityName(route)}: {getRouteStatusText(parseInt(route.status))}</li>
                   ))
                 }
               </ul>
@@ -193,11 +190,12 @@ class CreateSnapshotModal extends Component<Props, State> {
 
 const mapDispatchToProps = {
   createSnapshot: snapshotActions.createSnapshot,
-  fetchRouteEntities
+  fetchRouteEntities: activeActions.fetchRouteEntities
 }
 
 const mapStateToProps = (state: AppState, ownProps: {}) => ({
-  lock: state.editor.data.lock
+  lock: state.editor.data.lock,
+  routes: state.editor.data.tables.routes
 })
 
 // $FlowFixMe - ignore connect missing additional args
diff --git a/lib/editor/components/EditorFeedSourcePanel.js b/lib/editor/components/EditorFeedSourcePanel.js
index 4d53dcaaa..4677e702b 100644
--- a/lib/editor/components/EditorFeedSourcePanel.js
+++ b/lib/editor/components/EditorFeedSourcePanel.js
@@ -14,17 +14,13 @@ import * as versionActions from '../../manager/actions/versions'
 import {isEditingDisabled} from '../../manager/util'
 import type {Props as ContainerProps} from '../containers/ActiveEditorFeedSourcePanel'
 import type {Feed, Snapshot} from '../../types'
-import type {ManagerUserState, LockState} from '../../types/reducers'
-import * as editorActions from '../actions/editor'
+import type {ManagerUserState} from '../../types/reducers'
 
 type Props = ContainerProps & {
   createFeedVersionFromSnapshot: typeof versionActions.createFeedVersionFromSnapshot,
   deleteSnapshot: typeof snapshotActions.deleteSnapshot,
   downloadSnapshot: typeof snapshotActions.downloadSnapshot,
   fetchSnapshots: typeof snapshotActions.fetchSnapshots,
-  lock: LockState,
-  lockEditorFeedSource: typeof editorActions.lockEditorFeedSource,
-  removeEditorLock: typeof editorActions.removeEditorLock,
   restoreSnapshot: typeof snapshotActions.restoreSnapshot,
   user: ManagerUserState
 }
@@ -37,20 +33,9 @@ export default class EditorFeedSourcePanel extends Component<Props> {
   }
 
   _openModal = () => {
-    const {lock, feedSource, lockEditorFeedSource, removeEditorLock} = this.props
-    // Get lock if we don't have one.
-    // Snapshot Modal requires lock to fetch unapproved routes.
-    if (!lock.sessionId) {
-      lockEditorFeedSource(feedSource.id).then((data) => {
-        // Clean up lock on close.
-        const onClose = () => removeEditorLock(feedSource.id)
-        this.refs.snapshotModal.getWrappedInstance().open(onClose)
-      })
-    } else {
-      // Note: this will need to change if react-redux is upgraded to v6+
-      // https://medium.com/octopus-labs-london/how-to-access-a-redux-components-methods-with-createref-ca28a96efd59
-      this.refs.snapshotModal.getWrappedInstance().open()
-    }
+    // Note: this will need to change if react-redux is upgraded to v6+
+    // https://medium.com/octopus-labs-london/how-to-access-a-redux-components-methods-with-createref-ca28a96efd59
+    this.refs.snapshotModal.getWrappedInstance().open()
   }
 
   _sortBySnapshotTime = (a: Snapshot, b: Snapshot) => b.snapshotTime - a.snapshotTime
diff --git a/lib/editor/containers/ActiveEditorFeedSourcePanel.js b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
index 9057b9f2e..66670e92c 100644
--- a/lib/editor/containers/ActiveEditorFeedSourcePanel.js
+++ b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
@@ -9,7 +9,6 @@ import {
   restoreSnapshot
 } from '../actions/snapshots.js'
 import {createFeedVersionFromSnapshot} from '../../manager/actions/versions'
-import {lockEditorFeedSource, removeEditorLock} from '../actions/editor'
 import EditorFeedSourcePanel from '../components/EditorFeedSourcePanel'
 import type {Feed, Project} from '../../types'
 import type {AppState} from '../../types/reducers'
@@ -20,10 +19,9 @@ export type Props = {
 }
 
 const mapStateToProps = (state: AppState, ownProps: Props) => {
-  const {user, editor} = state
-  const {lock} = editor.data
+  const {user} = state
   return {
-    user, lock
+    user
   }
 }
 
@@ -32,9 +30,7 @@ const mapDispatchToProps = {
   deleteSnapshot,
   downloadSnapshot,
   fetchSnapshots,
-  restoreSnapshot,
-  lockEditorFeedSource,
-  removeEditorLock
+  restoreSnapshot
 }
 
 const ActiveEditorFeedSourcePanel = connect(
diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index f06f58e9a..d21d6955b 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -57,6 +57,11 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
         console.warn('Could not fetch base GTFS!')
         return state
       }
+      if (action.payload.partial) {
+        return update(state, {
+          tables: {$merge: feed}
+        })
+      }
       if (feed.feed_info.length === 0) {
         console.warn(`No feed info found. Adding feed info with null values.`)
         feed.feed_info.push(generateNullProps('feedinfo'))

From 9e2d67442f0182a18afef50b06c3a1e7f044e3a8 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 15 Nov 2021 16:17:39 -0800
Subject: [PATCH 434/553] feature(editor): set route status to in progress on
 edit

---
 lib/editor/reducers/data.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index 758e7620a..2aca4d382 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -10,7 +10,6 @@ import {ENTITY} from '../constants'
 import {generateNullProps, getTableById, getKeyForId} from '../util/gtfs'
 import {getMapToGtfsStrategy, entityIsNew} from '../util/objects'
 import {assignDistancesToPatternStops, constructShapePoints} from '../util/map'
-
 import type {Action} from '../../types/actions'
 import type {DataState} from '../../types/reducers'
 
@@ -211,11 +210,17 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
     case 'UPDATE_ACTIVE_GTFS_ENTITY': {
       const {component, props} = action.payload
       const {entityKey, editedKey} = getUpdateEntityKeys(component)
+
+      // When a route gets edited, set its status to "In Progress"
+      const additional = {}
+      if (component === 'route' && !props.status) {
+        additional.status = '0'
+      }
       // FIXME: Check for pattern stops props (what about other sequenced lists)
       // and update stop sequence.
       return update(state, {
         active: {
-          [entityKey]: {$merge: props},
+          [entityKey]: {$merge: {...props, ...additional}},
           [editedKey]: {$set: true}
         }
       })

From f27cd2c8db0bf194633bf3455f3ba878f88f48e1 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 15 Nov 2021 18:29:20 -0800
Subject: [PATCH 435/553] feature(editor): confirmation box in save snapshot
 dialog for unapproved routes

---
 lib/editor/components/CreateSnapshotModal.js  | 40 +++++++++++++++++--
 .../components/EditorFeedSourcePanel.js       |  4 +-
 lib/editor/components/FeedInfoPanel.js        |  8 ++--
 lib/editor/containers/ActiveFeedInfoPanel.js  |  5 ++-
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index efb9bc068..69e8ee7d9 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -14,17 +14,18 @@ import {connect} from 'react-redux'
 import * as snapshotActions from '../actions/snapshots.js'
 import {getComponentMessages} from '../../common/util/config'
 import {formatTimestamp} from '../../common/util/date-time'
-
-import type {Feed} from '../../types'
+import type {Feed, GtfsRoute} from '../../types'
 import type {AppState} from '../../types/reducers'
 
 type Props = {
   createSnapshot: typeof snapshotActions.createSnapshot,
-  feedSource: Feed
+  feedSource: Feed,
+  routes: Array<GtfsRoute>
 }
 
 type State = {
   comment: ?string,
+  confirmPublishWithUnapproved: Boolean,
   name: ?string,
   publishNewVersion: boolean,
   showModal: boolean
@@ -35,6 +36,7 @@ function getDefaultState () {
     comment: null,
     name: formatTimestamp(),
     publishNewVersion: false,
+    confirmPublishWithUnapproved: false,
     showModal: false
   }
 }
@@ -48,6 +50,10 @@ class CreateSnapshotModal extends Component<Props, State> {
     this.setState({[e.target.name]: e.target.checked})
   }
 
+  _onTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
+    this.setState({[e.target.name]: e.target.checked})
+  }
+
   _onChange = (e: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({[e.target.name]: e.target.value})
   }
@@ -72,7 +78,11 @@ class CreateSnapshotModal extends Component<Props, State> {
 
   render () {
     const {Body, Footer, Header, Title} = Modal
-    const {comment, name, publishNewVersion, showModal} = this.state
+    const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal} = this.state
+    const {routes} = this.props
+
+    const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== 2)
+
     return (
       <Modal show={showModal} onHide={this.close}>
         <Header>
@@ -112,6 +122,27 @@ class CreateSnapshotModal extends Component<Props, State> {
               {this.messages('fields.publishNewVersion.label')}
             </Checkbox>
           </FormGroup>
+          {!!unapprovedRoutes.length > 0 &&
+            <div>
+              <h4>The following routes are not approved.</h4>
+              <h5>These routes will not be included in the output.</h5>
+              <ul>
+                {
+                  unapprovedRoutes.map(route => (
+                    <li key={route.route_id}>{route.route_short_name} - {route.route_desc}</li>
+                  ))
+                }
+              </ul>
+              <FormGroup>
+                <Checkbox
+                  name='confirmPublishWithUnapproved'
+                  checked={confirmPublishWithUnapproved}
+                  onChange={this._onTogglePublishUnapproved}>
+                    Are you sure you want to publish with unapproved routes?
+                </Checkbox>
+              </FormGroup>
+            </div>
+          }
         </Body>
 
         <Footer>
@@ -119,6 +150,7 @@ class CreateSnapshotModal extends Component<Props, State> {
             bsStyle='primary'
             data-test-id='confirm-snapshot-create-button'
             onClick={this.ok}
+            disabled={unapprovedRoutes.length > 0 && !confirmPublishWithUnapproved}
           >
             {this.messages('ok')}
           </Button>
diff --git a/lib/editor/components/EditorFeedSourcePanel.js b/lib/editor/components/EditorFeedSourcePanel.js
index a83f0f7bd..75e1ea704 100644
--- a/lib/editor/components/EditorFeedSourcePanel.js
+++ b/lib/editor/components/EditorFeedSourcePanel.js
@@ -12,7 +12,6 @@ import {getComponentMessages, getConfigProperty} from '../../common/util/config'
 import CreateSnapshotModal from '../../editor/components/CreateSnapshotModal'
 import * as versionActions from '../../manager/actions/versions'
 import {isEditingDisabled} from '../../manager/util'
-
 import type {Props as ContainerProps} from '../containers/ActiveEditorFeedSourcePanel'
 import type {Feed, Snapshot} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
@@ -61,7 +60,8 @@ export default class EditorFeedSourcePanel extends Component<Props> {
       <Row>
         <CreateSnapshotModal
           feedSource={feedSource}
-          ref='snapshotModal' />
+          ref='snapshotModal'
+          routes={[]} />
         <ConfirmModal ref='confirmModal' />
         <Col xs={9}>
           {feedSource.editorSnapshots && feedSource.editorSnapshots.length
diff --git a/lib/editor/components/FeedInfoPanel.js b/lib/editor/components/FeedInfoPanel.js
index 2be0bf3a4..8384c409e 100644
--- a/lib/editor/components/FeedInfoPanel.js
+++ b/lib/editor/components/FeedInfoPanel.js
@@ -11,14 +11,14 @@ import * as snapshotActions from '../actions/snapshots'
 import SelectFileModal from '../../common/components/SelectFileModal.js'
 import {getComponentMessages} from '../../common/util/config'
 import {isValidZipFile} from '../../common/util/util'
-import CreateSnapshotModal from './CreateSnapshotModal'
 import { GTFS_ICONS } from '../util/ui'
 import {componentToText} from '../util/objects'
 import {ENTITY} from '../constants'
-
 import type {Props as ContainerProps} from '../containers/ActiveFeedInfoPanel'
 import type {Feed, FeedInfo, Project} from '../../types'
 
+import CreateSnapshotModal from './CreateSnapshotModal'
+
 type Props = ContainerProps & {
   displayRoutesShapefile: typeof mapActions.displayRoutesShapefile,
   feedInfo: FeedInfo,
@@ -26,6 +26,7 @@ type Props = ContainerProps & {
   fetchSnapshots: typeof snapshotActions.fetchSnapshots,
   project: Project,
   restoreSnapshot: typeof snapshotActions.restoreSnapshot,
+  routes: Array<GtfsRoute>,
   setActiveEntity: typeof activeActions.setActiveEntity
 }
 
@@ -106,7 +107,7 @@ export default class FeedInfoPanel extends Component<Props, State> {
   }
 
   render () {
-    const { feedSource, feedInfo } = this.props
+    const { feedSource, feedInfo, routes } = this.props
     if (!feedInfo) return null
     const panelStyle = {
       position: 'absolute',
@@ -133,6 +134,7 @@ export default class FeedInfoPanel extends Component<Props, State> {
           <CreateSnapshotModal
             ref='snapshotModal'
             feedSource={feedSource}
+            routes={routes}
           />
           <ButtonGroup>
             {/* Hide toolbar toggle */}
diff --git a/lib/editor/containers/ActiveFeedInfoPanel.js b/lib/editor/containers/ActiveFeedInfoPanel.js
index 9c2f32412..52fcf7f84 100644
--- a/lib/editor/containers/ActiveFeedInfoPanel.js
+++ b/lib/editor/containers/ActiveFeedInfoPanel.js
@@ -8,7 +8,6 @@ import {displayRoutesShapefile} from '../actions/map'
 import FeedInfoPanel from '../components/FeedInfoPanel'
 import {findProjectByFeedSource} from '../../manager/util'
 import {getTableById} from '../util/gtfs'
-
 import type {AppState} from '../../types/reducers'
 
 export type Props = {
@@ -21,11 +20,13 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
   const project = findProjectByFeedSource(state.projects.all, feedSourceId)
   const feedSource = project && project.feedSources && project.feedSources.find(fs => fs.id === feedSourceId)
   const feedInfo = getTableById(state.editor.data.tables, 'feedinfo')[0]
+  const routes = getTableById(state.editor.data.tables, 'route')
   return {
     feedInfo,
     feedSourceId,
     feedSource,
-    project
+    project,
+    routes
   }
 }
 

From 7d8f2da54452f0ba1d5ac9fbe0f22237b3e0bc5e Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 16 Nov 2021 14:31:37 -0800
Subject: [PATCH 436/553] refactor(editor): add current status to unapproved
 routes in snapshot window

---
 lib/editor/components/CreateSnapshotModal.js | 3 ++-
 lib/editor/util/index.js                     | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 69e8ee7d9..50255b770 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -13,6 +13,7 @@ import {connect} from 'react-redux'
 
 import * as snapshotActions from '../actions/snapshots.js'
 import {getComponentMessages} from '../../common/util/config'
+import { getRouteStatusText } from '../util/index.js'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState} from '../../types/reducers'
@@ -129,7 +130,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               <ul>
                 {
                   unapprovedRoutes.map(route => (
-                    <li key={route.route_id}>{route.route_short_name} - {route.route_desc}</li>
+                    <li key={route.route_id}>{route.route_short_name} - {route.route_desc}: {getRouteStatusText(route.status)}</li>
                   ))
                 }
               </ul>
diff --git a/lib/editor/util/index.js b/lib/editor/util/index.js
index b352662ce..46618eb91 100644
--- a/lib/editor/util/index.js
+++ b/lib/editor/util/index.js
@@ -1,7 +1,6 @@
 // @flow
 
 import {getGtfsSpec} from '../../common/util/config'
-
 import type {
   Feed,
   GtfsFare,
@@ -147,6 +146,12 @@ export function getEditorTable (component: string) {
   )
 }
 
+export function getRouteStatusText (statusCode: number) {
+  const fields = getEditorTable('route').fields
+  const statusField = fields.find(field => field.name === 'status')
+  return statusField.options.find(option => option.value === statusCode).text
+}
+
 export function canApproveGtfs (project: ?Project, feedSource: ?Feed, user: ?User | ?ManagerUserState): boolean {
   return !!(
     project &&

From 468408c9285f37cd9ff98effdab62a695538823e Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 16 Nov 2021 17:43:30 -0800
Subject: [PATCH 437/553] refactor(editor): move text to i18n

---
 i18n/english.yml                             | 4 ++++
 lib/editor/components/CreateSnapshotModal.js | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index cf9c39c32..f36b80fdb 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -22,6 +22,10 @@ components:
         placeholder: Additional information (optional)
       publishNewVersion:
         label: Publish snapshot as new feed version
+      confirmPublishWithUnapproved:
+        label: Confirm publish with unapproved routes. 
+    unapprovedRoutesHeader: The following routes are not approved.
+    unapprovedRoutesDesc: These routes will not be included in the output.
     missingNameAlert: Must give snapshot a valid name!
     ok: OK
     title: Create a new snapshot
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 50255b770..08f3955f2 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -125,8 +125,8 @@ class CreateSnapshotModal extends Component<Props, State> {
           </FormGroup>
           {!!unapprovedRoutes.length > 0 &&
             <div>
-              <h4>The following routes are not approved.</h4>
-              <h5>These routes will not be included in the output.</h5>
+              <h4>{this.messages('unapprovedRoutesHeader')}</h4>
+              <h5>{this.messages('unapprovedRoutesDesc')}</h5>
               <ul>
                 {
                   unapprovedRoutes.map(route => (
@@ -139,7 +139,7 @@ class CreateSnapshotModal extends Component<Props, State> {
                   name='confirmPublishWithUnapproved'
                   checked={confirmPublishWithUnapproved}
                   onChange={this._onTogglePublishUnapproved}>
-                    Are you sure you want to publish with unapproved routes?
+                  {this.messages('fields.confirmPublishWithUnapproved.label')}
                 </Checkbox>
               </FormGroup>
             </div>

From a6ed4d0e26614d36efcac438e4eeae1faa6cbd1a Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Sun, 21 Nov 2021 20:46:13 -0800
Subject: [PATCH 438/553] refactor(editor): Move unapproved routes into
 createSnapshotModal, handle lock management.

---
 lib/editor/actions/active.js                  | 50 ++++++++++++++++-
 lib/editor/components/CreateSnapshotModal.js  | 54 ++++++++++++++-----
 .../components/EditorFeedSourcePanel.js       | 25 +++++++--
 lib/editor/components/FeedInfoPanel.js        |  4 +-
 .../containers/ActiveEditorFeedSourcePanel.js | 11 ++--
 lib/editor/containers/ActiveFeedInfoPanel.js  |  4 +-
 6 files changed, 119 insertions(+), 29 deletions(-)

diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index f7bf8fc37..b2285bfb4 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -4,7 +4,7 @@ import clone from 'lodash/cloneDeep'
 import {browserHistory} from 'react-router'
 import {createAction, type ActionType} from 'redux-actions'
 
-import {createVoidPayloadAction, secureFetch} from '../../common/actions'
+import {fetchGraphQL, createVoidPayloadAction, secureFetch} from '../../common/actions'
 import {ENTITY} from '../constants'
 import {fetchFeedSourceAndProject} from '../../manager/actions/feeds'
 import {fetchGTFSEntities} from '../../manager/actions/versions'
@@ -18,6 +18,7 @@ import {
 import {getMapFromGtfsStrategy, entityIsNew} from '../util/objects'
 import type {Entity, Feed} from '../../types'
 import type {dispatchFn, getStateFn, AppState} from '../../types/reducers'
+import {getEntityGraphQLRoot} from '../../gtfs/util'
 
 import {saveTripPattern} from './tripPattern'
 import {newGtfsEntity, fetchBaseGtfs} from './editor'
@@ -190,6 +191,53 @@ function updateUrl (
   }
 }
 
+/**
+ * Fetches a list of routes from the backend for the editor.
+ * Requires a lock to function.
+ */
+export function fetchRouteEntities () {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    const namespace = getEditorNamespace(
+      getState().editor.data.lock.feedId,
+      getState()
+    )
+    if (!namespace) {
+      console.warn('namespace not defined, so not fetching gtfs entities')
+      return
+    }
+
+    const graphQLRoot = getEntityGraphQLRoot('route')
+    if (!graphQLRoot) {
+      console.warn(`No graphql table for route.`)
+    }
+
+    const query = `
+      query entityQuery($namespace: String) {
+        feed(namespace: $namespace) {
+          feed_id
+          feed_version
+          filename
+          ${graphQLRoot} (limit: -1) {
+            id
+            status
+            publicly_visible
+            route_id
+            route_short_name
+            route_long_name
+            route_desc
+          }
+        }
+      }
+    `
+    const variables = { namespace }
+    return dispatch(fetchGraphQL({ query, variables })).then(
+      data => {
+        return data
+      }
+    ).catch(err => console.log(err))
+  }
+}
+
 /**
  * This function is used to set the active components in the GTFS editor.
  * It also handles clearing GTFS content should the feed being edited change.
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 08f3955f2..81e85928d 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -16,20 +16,24 @@ import {getComponentMessages} from '../../common/util/config'
 import { getRouteStatusText } from '../util/index.js'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
-import type {AppState} from '../../types/reducers'
+import type {AppState, LockState} from '../../types/reducers'
+import {fetchRouteEntities} from '../actions/active'
 
 type Props = {
   createSnapshot: typeof snapshotActions.createSnapshot,
   feedSource: Feed,
-  routes: Array<GtfsRoute>
-}
+  fetchRouteEntities: typeof fetchRouteEntities,
+  lock: LockState
+};
 
 type State = {
   comment: ?string,
   confirmPublishWithUnapproved: Boolean,
+  loading: boolean,
   name: ?string,
   publishNewVersion: boolean,
-  showModal: boolean
+  showModal: boolean,
+  unapprovedRoutes: Array<GtfsRoute>
 }
 
 function getDefaultState () {
@@ -38,7 +42,9 @@ function getDefaultState () {
     name: formatTimestamp(),
     publishNewVersion: false,
     confirmPublishWithUnapproved: false,
-    showModal: false
+    showModal: false,
+    unapprovedRoutes: [],
+    loading: false
   }
 }
 
@@ -46,12 +52,13 @@ class CreateSnapshotModal extends Component<Props, State> {
   state = getDefaultState()
 
   messages = getComponentMessages('CreateSnapshotModal')
+  onClose = null
 
   _onTogglePublish = (e: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({[e.target.name]: e.target.checked})
   }
 
-  _onTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
+  _lockonTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({[e.target.name]: e.target.checked})
   }
 
@@ -60,10 +67,29 @@ class CreateSnapshotModal extends Component<Props, State> {
   }
 
   close = () => {
+    if (this.onClose) { this.onClose() }
     this.setState(getDefaultState())
   }
 
-  open () {
+  updateUnapprovedRoutes = () => {
+    const {fetchRouteEntities} = this.props
+    this.setState({loading: true})
+    // FixMe: type issue causing .then to have red underline.
+    fetchRouteEntities().then(data => {
+      this.setState({loading: false})
+      const routes = data.feed.routes
+      const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== 2)
+      this.setState({
+        unapprovedRoutes
+      })
+    })
+  }
+
+  open (onClose) {
+    this.onClose = onClose
+
+    this.updateUnapprovedRoutes()
+
     this.setState({
       showModal: true
     })
@@ -80,9 +106,7 @@ class CreateSnapshotModal extends Component<Props, State> {
   render () {
     const {Body, Footer, Header, Title} = Modal
     const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal} = this.state
-    const {routes} = this.props
-
-    const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== 2)
+    const {unapprovedRoutes, loading} = this.state
 
     return (
       <Modal show={showModal} onHide={this.close}>
@@ -123,7 +147,8 @@ class CreateSnapshotModal extends Component<Props, State> {
               {this.messages('fields.publishNewVersion.label')}
             </Checkbox>
           </FormGroup>
-          {!!unapprovedRoutes.length > 0 &&
+          {loading && <h5>Loading</h5>}
+          {unapprovedRoutes.length > 0 &&
             <div>
               <h4>{this.messages('unapprovedRoutesHeader')}</h4>
               <h5>{this.messages('unapprovedRoutesDesc')}</h5>
@@ -166,10 +191,13 @@ class CreateSnapshotModal extends Component<Props, State> {
 }
 
 const mapDispatchToProps = {
-  createSnapshot: snapshotActions.createSnapshot
+  createSnapshot: snapshotActions.createSnapshot,
+  fetchRouteEntities
 }
 
-const mapStateToProps = (state: AppState, ownProps: {}) => ({})
+const mapStateToProps = (state: AppState, ownProps: {}) => ({
+  lock: state.editor.data.lock
+})
 
 // $FlowFixMe - ignore connect missing additional args
 export default connect(
diff --git a/lib/editor/components/EditorFeedSourcePanel.js b/lib/editor/components/EditorFeedSourcePanel.js
index 75e1ea704..4d53dcaaa 100644
--- a/lib/editor/components/EditorFeedSourcePanel.js
+++ b/lib/editor/components/EditorFeedSourcePanel.js
@@ -14,13 +14,17 @@ import * as versionActions from '../../manager/actions/versions'
 import {isEditingDisabled} from '../../manager/util'
 import type {Props as ContainerProps} from '../containers/ActiveEditorFeedSourcePanel'
 import type {Feed, Snapshot} from '../../types'
-import type {ManagerUserState} from '../../types/reducers'
+import type {ManagerUserState, LockState} from '../../types/reducers'
+import * as editorActions from '../actions/editor'
 
 type Props = ContainerProps & {
   createFeedVersionFromSnapshot: typeof versionActions.createFeedVersionFromSnapshot,
   deleteSnapshot: typeof snapshotActions.deleteSnapshot,
   downloadSnapshot: typeof snapshotActions.downloadSnapshot,
   fetchSnapshots: typeof snapshotActions.fetchSnapshots,
+  lock: LockState,
+  lockEditorFeedSource: typeof editorActions.lockEditorFeedSource,
+  removeEditorLock: typeof editorActions.removeEditorLock,
   restoreSnapshot: typeof snapshotActions.restoreSnapshot,
   user: ManagerUserState
 }
@@ -33,9 +37,20 @@ export default class EditorFeedSourcePanel extends Component<Props> {
   }
 
   _openModal = () => {
-    // Note: this will need to change if react-redux is upgraded to v6+
-    // https://medium.com/octopus-labs-london/how-to-access-a-redux-components-methods-with-createref-ca28a96efd59
-    this.refs.snapshotModal.getWrappedInstance().open()
+    const {lock, feedSource, lockEditorFeedSource, removeEditorLock} = this.props
+    // Get lock if we don't have one.
+    // Snapshot Modal requires lock to fetch unapproved routes.
+    if (!lock.sessionId) {
+      lockEditorFeedSource(feedSource.id).then((data) => {
+        // Clean up lock on close.
+        const onClose = () => removeEditorLock(feedSource.id)
+        this.refs.snapshotModal.getWrappedInstance().open(onClose)
+      })
+    } else {
+      // Note: this will need to change if react-redux is upgraded to v6+
+      // https://medium.com/octopus-labs-london/how-to-access-a-redux-components-methods-with-createref-ca28a96efd59
+      this.refs.snapshotModal.getWrappedInstance().open()
+    }
   }
 
   _sortBySnapshotTime = (a: Snapshot, b: Snapshot) => b.snapshotTime - a.snapshotTime
@@ -61,7 +76,7 @@ export default class EditorFeedSourcePanel extends Component<Props> {
         <CreateSnapshotModal
           feedSource={feedSource}
           ref='snapshotModal'
-          routes={[]} />
+        />
         <ConfirmModal ref='confirmModal' />
         <Col xs={9}>
           {feedSource.editorSnapshots && feedSource.editorSnapshots.length
diff --git a/lib/editor/components/FeedInfoPanel.js b/lib/editor/components/FeedInfoPanel.js
index 8384c409e..82bd0815a 100644
--- a/lib/editor/components/FeedInfoPanel.js
+++ b/lib/editor/components/FeedInfoPanel.js
@@ -26,7 +26,6 @@ type Props = ContainerProps & {
   fetchSnapshots: typeof snapshotActions.fetchSnapshots,
   project: Project,
   restoreSnapshot: typeof snapshotActions.restoreSnapshot,
-  routes: Array<GtfsRoute>,
   setActiveEntity: typeof activeActions.setActiveEntity
 }
 
@@ -107,7 +106,7 @@ export default class FeedInfoPanel extends Component<Props, State> {
   }
 
   render () {
-    const { feedSource, feedInfo, routes } = this.props
+    const { feedSource, feedInfo } = this.props
     if (!feedInfo) return null
     const panelStyle = {
       position: 'absolute',
@@ -134,7 +133,6 @@ export default class FeedInfoPanel extends Component<Props, State> {
           <CreateSnapshotModal
             ref='snapshotModal'
             feedSource={feedSource}
-            routes={routes}
           />
           <ButtonGroup>
             {/* Hide toolbar toggle */}
diff --git a/lib/editor/containers/ActiveEditorFeedSourcePanel.js b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
index 82a0c7f8e..91b7be2f4 100644
--- a/lib/editor/containers/ActiveEditorFeedSourcePanel.js
+++ b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
@@ -1,6 +1,7 @@
 // @flow
 
 import {connect} from 'react-redux'
+
 import {
   deleteSnapshot,
   downloadSnapshot,
@@ -8,9 +9,8 @@ import {
   restoreSnapshot
 } from '../actions/snapshots.js'
 import {createFeedVersionFromSnapshot} from '../../manager/actions/versions'
-
+import {lockEditorFeedSource, removeEditorLock} from '../actions/editor'
 import EditorFeedSourcePanel from '../components/EditorFeedSourcePanel'
-
 import type {Feed, Project} from '../../types'
 import type {AppState} from '../../types/reducers'
 
@@ -21,8 +21,9 @@ export type Props = {
 
 const mapStateToProps = (state: AppState, ownProps: Props) => {
   const {user} = state
+  const {lock} = state.editor.data
   return {
-    user
+    user, lock
   }
 }
 
@@ -31,7 +32,9 @@ const mapDispatchToProps = {
   deleteSnapshot,
   downloadSnapshot,
   fetchSnapshots,
-  restoreSnapshot
+  restoreSnapshot,
+  lockEditorFeedSource,
+  removeEditorLock
 }
 
 const ActiveEditorFeedSourcePanel = connect(
diff --git a/lib/editor/containers/ActiveFeedInfoPanel.js b/lib/editor/containers/ActiveFeedInfoPanel.js
index 52fcf7f84..144c58fad 100644
--- a/lib/editor/containers/ActiveFeedInfoPanel.js
+++ b/lib/editor/containers/ActiveFeedInfoPanel.js
@@ -20,13 +20,11 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
   const project = findProjectByFeedSource(state.projects.all, feedSourceId)
   const feedSource = project && project.feedSources && project.feedSources.find(fs => fs.id === feedSourceId)
   const feedInfo = getTableById(state.editor.data.tables, 'feedinfo')[0]
-  const routes = getTableById(state.editor.data.tables, 'route')
   return {
     feedInfo,
     feedSourceId,
     feedSource,
-    project,
-    routes
+    project
   }
 }
 

From 21d5b3c792ee9ff433086aa7621d6e53be050cf0 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Wed, 24 Nov 2021 10:56:52 -0800
Subject: [PATCH 439/553] refactor(editor): PR Fixes part one

---
 i18n/english.yml                              |  4 +--
 lib/editor/actions/active.js                  | 11 +-------
 lib/editor/components/CreateSnapshotModal.js  |  9 ++++---
 .../containers/ActiveEditorFeedSourcePanel.js |  4 +--
 lib/editor/reducers/data.js                   |  3 ++-
 lib/editor/util/index.js                      | 26 ++++++++++++++++---
 6 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index f36b80fdb..a46d2713c 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -23,8 +23,8 @@ components:
       publishNewVersion:
         label: Publish snapshot as new feed version
       confirmPublishWithUnapproved:
-        label: Confirm publish with unapproved routes. 
-    unapprovedRoutesHeader: The following routes are not approved.
+        label: Confirm publish with unapproved routes 
+    unapprovedRoutesHeader: "The following routes are not approved:"
     unapprovedRoutesDesc: These routes will not be included in the output.
     missingNameAlert: Must give snapshot a valid name!
     ok: OK
diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index b2285bfb4..92a2c4d66 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -214,27 +214,18 @@ export function fetchRouteEntities () {
     const query = `
       query entityQuery($namespace: String) {
         feed(namespace: $namespace) {
-          feed_id
-          feed_version
-          filename
           ${graphQLRoot} (limit: -1) {
             id
             status
-            publicly_visible
             route_id
             route_short_name
-            route_long_name
             route_desc
           }
         }
       }
     `
     const variables = { namespace }
-    return dispatch(fetchGraphQL({ query, variables })).then(
-      data => {
-        return data
-      }
-    ).catch(err => console.log(err))
+    return dispatch(fetchGraphQL({ query, variables })).catch(console.log)
   }
 }
 
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 81e85928d..22247cc86 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -1,5 +1,6 @@
 // @flow
 
+import Icon from '@conveyal/woonerf/components/icon'
 import React, {Component} from 'react'
 import {
   Button,
@@ -13,7 +14,7 @@ import {connect} from 'react-redux'
 
 import * as snapshotActions from '../actions/snapshots.js'
 import {getComponentMessages} from '../../common/util/config'
-import { getRouteStatusText } from '../util/index.js'
+import { getRouteStatusText, routeStatusTextToValue } from '../util'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState, LockState} from '../../types/reducers'
@@ -58,7 +59,7 @@ class CreateSnapshotModal extends Component<Props, State> {
     this.setState({[e.target.name]: e.target.checked})
   }
 
-  _lockonTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
+  _onTogglePublishUnapproved = (e: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({[e.target.name]: e.target.checked})
   }
 
@@ -78,7 +79,7 @@ class CreateSnapshotModal extends Component<Props, State> {
     fetchRouteEntities().then(data => {
       this.setState({loading: false})
       const routes = data.feed.routes
-      const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== 2)
+      const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== routeStatusTextToValue('Approved'))
       this.setState({
         unapprovedRoutes
       })
@@ -147,7 +148,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               {this.messages('fields.publishNewVersion.label')}
             </Checkbox>
           </FormGroup>
-          {loading && <h5>Loading</h5>}
+          {loading && <Icon type='spinner' className='fa-pulse' />}
           {unapprovedRoutes.length > 0 &&
             <div>
               <h4>{this.messages('unapprovedRoutesHeader')}</h4>
diff --git a/lib/editor/containers/ActiveEditorFeedSourcePanel.js b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
index 91b7be2f4..9057b9f2e 100644
--- a/lib/editor/containers/ActiveEditorFeedSourcePanel.js
+++ b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
@@ -20,8 +20,8 @@ export type Props = {
 }
 
 const mapStateToProps = (state: AppState, ownProps: Props) => {
-  const {user} = state
-  const {lock} = state.editor.data
+  const {user, editor} = state
+  const {lock} = editor.data
   return {
     user, lock
   }
diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index 2aca4d382..f06f58e9a 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -12,6 +12,7 @@ import {getMapToGtfsStrategy, entityIsNew} from '../util/objects'
 import {assignDistancesToPatternStops, constructShapePoints} from '../util/map'
 import type {Action} from '../../types/actions'
 import type {DataState} from '../../types/reducers'
+import { routeStatusTextToValue } from '../util'
 
 // If updating a trip pattern, new props apply to sub entity and edited
 // boolean updated is patternEdited.
@@ -214,7 +215,7 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
       // When a route gets edited, set its status to "In Progress"
       const additional = {}
       if (component === 'route' && !props.status) {
-        additional.status = '0'
+        additional.status = routeStatusTextToValue('In Progress')
       }
       // FIXME: Check for pattern stops props (what about other sequenced lists)
       // and update stop sequence.
diff --git a/lib/editor/util/index.js b/lib/editor/util/index.js
index 46618eb91..c710baa64 100644
--- a/lib/editor/util/index.js
+++ b/lib/editor/util/index.js
@@ -147,9 +147,29 @@ export function getEditorTable (component: string) {
 }
 
 export function getRouteStatusText (statusCode: number) {
-  const fields = getEditorTable('route').fields
-  const statusField = fields.find(field => field.name === 'status')
-  return statusField.options.find(option => option.value === statusCode).text
+  const table = getEditorTable('route')
+  if (table) {
+    const statusField = table.fields.find(field => field.name === 'status')
+    if (statusField && statusField.options) {
+      const option = statusField.options.find(option => option.value === statusCode)
+      if (option) {
+        return option.text
+      }
+    }
+  }
+}
+
+export function routeStatusTextToValue (statusText: string) {
+  const table = getEditorTable('route')
+  if (table) {
+    const statusField = table.fields.find(field => field.name === 'status')
+    if (statusField && statusField.options) {
+      const option = statusField.options.find(option => option.text === statusText)
+      if (option) {
+        return option.value
+      }
+    }
+  }
 }
 
 export function canApproveGtfs (project: ?Project, feedSource: ?Feed, user: ?User | ?ManagerUserState): boolean {

From 8688b3845f9d5c3621db4c0211cd209a6c8ff743 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 30 Nov 2021 10:18:40 -0800
Subject: [PATCH 440/553] refactor(editor): Use getEntityName() in
 CreateSnapshotModal

---
 lib/editor/actions/active.js                 | 1 +
 lib/editor/components/CreateSnapshotModal.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index 92a2c4d66..2cb1f18b7 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -219,6 +219,7 @@ export function fetchRouteEntities () {
             status
             route_id
             route_short_name
+            route_long_name
             route_desc
           }
         }
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 22247cc86..15be092bf 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -12,14 +12,14 @@ import {
 } from 'react-bootstrap'
 import {connect} from 'react-redux'
 
-import * as snapshotActions from '../actions/snapshots.js'
+import * as snapshotActions from '../actions/snapshots'
 import {getComponentMessages} from '../../common/util/config'
 import { getRouteStatusText, routeStatusTextToValue } from '../util'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState, LockState} from '../../types/reducers'
 import {fetchRouteEntities} from '../actions/active'
-
+import {getEntityName} from '../util/gtfs'
 type Props = {
   createSnapshot: typeof snapshotActions.createSnapshot,
   feedSource: Feed,
@@ -156,7 +156,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               <ul>
                 {
                   unapprovedRoutes.map(route => (
-                    <li key={route.route_id}>{route.route_short_name} - {route.route_desc}: {getRouteStatusText(route.status)}</li>
+                    <li key={route.route_id}>{getEntityName(route)}: {getRouteStatusText(route.status)}</li>
                   ))
                 }
               </ul>

From 9eb42a859142f40bb281c80c4567933fe26f0a48 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 2 Dec 2021 12:28:39 -0800
Subject: [PATCH 441/553] refactor(editor): Fix flow issues by using appstate
 for SnapshotModal

---
 lib/editor/actions/active.js                  | 22 ++++++++--
 lib/editor/actions/editor.js                  |  7 ++--
 lib/editor/components/CreateSnapshotModal.js  | 42 +++++++++----------
 .../components/EditorFeedSourcePanel.js       | 23 ++--------
 .../containers/ActiveEditorFeedSourcePanel.js | 10 ++---
 lib/editor/reducers/data.js                   |  5 +++
 6 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index 2cb1f18b7..7cd9f01c6 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -20,8 +20,8 @@ import type {Entity, Feed} from '../../types'
 import type {dispatchFn, getStateFn, AppState} from '../../types/reducers'
 import {getEntityGraphQLRoot} from '../../gtfs/util'
 
+import {lockEditorFeedSource, receiveBaseGtfs, removeEditorLock, newGtfsEntity, fetchBaseGtfs} from './editor'
 import {saveTripPattern} from './tripPattern'
-import {newGtfsEntity, fetchBaseGtfs} from './editor'
 
 export const clearGtfsContent = createVoidPayloadAction('CLEAR_GTFSEDITOR_CONTENT')
 const receivedNewEntity = createAction(
@@ -195,8 +195,18 @@ function updateUrl (
  * Fetches a list of routes from the backend for the editor.
  * Requires a lock to function.
  */
-export function fetchRouteEntities () {
-  return function (dispatch: dispatchFn, getState: getStateFn) {
+export function fetchRouteEntities (feedSource: Feed) {
+  return async function (dispatch: dispatchFn, getState: getStateFn) {
+    const state = getState()
+    const { lock } = state.editor.data
+    let lockCreated = false
+    // We need to get a lock if we do not already have one
+    if (!lock.sessionId) {
+      await dispatch(lockEditorFeedSource(feedSource.id))
+      // Save that lock was created so it can be removed when we are done.
+      lockCreated = true
+    }
+
     const namespace = getEditorNamespace(
       getState().editor.data.lock.feedId,
       getState()
@@ -226,7 +236,11 @@ export function fetchRouteEntities () {
       }
     `
     const variables = { namespace }
-    return dispatch(fetchGraphQL({ query, variables })).catch(console.log)
+    const data = await dispatch(fetchGraphQL({ query, variables }))
+    await dispatch(receiveBaseGtfs({...data, partial: true}))
+    if (lockCreated) {
+      await dispatch(removeEditorLock(feedSource.id, false, true))
+    }
   }
 }
 
diff --git a/lib/editor/actions/editor.js b/lib/editor/actions/editor.js
index 2b8ec900b..c954dc12c 100644
--- a/lib/editor/actions/editor.js
+++ b/lib/editor/actions/editor.js
@@ -37,7 +37,7 @@ const createGtfsEntity = createAction(
   'CREATE_GTFS_ENTITY',
   (payload: { component: string, props: Object }) => payload
 )
-const receiveBaseGtfs = createAction(
+export const receiveBaseGtfs = createAction(
   'RECEIVE_BASE_GTFS',
   (payload: { feed: EditorTables }) => payload
 )
@@ -225,7 +225,8 @@ function startEditorLockMaintenance (
  */
 export function removeEditorLock (
   feedId: ?string,
-  overwrite: ?boolean = false
+  overwrite: ?boolean = false,
+  keepEditorContent: ?boolean = false
 ): any {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     if (!feedId) {
@@ -262,7 +263,7 @@ export function removeEditorLock (
             // successful.
             return false
           }
-        } else {
+        } else if (!keepEditorContent) {
           // Otherwise, the intention is to exit the editor. Clear all GTFS
           // content. This must be done finally so as not to interfere with the
           // lock removal.
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 15be092bf..02af911c2 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -18,23 +18,23 @@ import { getRouteStatusText, routeStatusTextToValue } from '../util'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState, LockState} from '../../types/reducers'
-import {fetchRouteEntities} from '../actions/active'
+import * as activeActions from '../actions/active'
 import {getEntityName} from '../util/gtfs'
 type Props = {
   createSnapshot: typeof snapshotActions.createSnapshot,
   feedSource: Feed,
-  fetchRouteEntities: typeof fetchRouteEntities,
-  lock: LockState
+  fetchRouteEntities: typeof activeActions.fetchRouteEntities,
+  lock: LockState,
+  routes: Array<GtfsRoute>
 };
 
 type State = {
   comment: ?string,
-  confirmPublishWithUnapproved: Boolean,
+  confirmPublishWithUnapproved: boolean,
   loading: boolean,
   name: ?string,
   publishNewVersion: boolean,
   showModal: boolean,
-  unapprovedRoutes: Array<GtfsRoute>
 }
 
 function getDefaultState () {
@@ -44,7 +44,6 @@ function getDefaultState () {
     publishNewVersion: false,
     confirmPublishWithUnapproved: false,
     showModal: false,
-    unapprovedRoutes: [],
     loading: false
   }
 }
@@ -72,24 +71,21 @@ class CreateSnapshotModal extends Component<Props, State> {
     this.setState(getDefaultState())
   }
 
-  updateUnapprovedRoutes = () => {
-    const {fetchRouteEntities} = this.props
-    this.setState({loading: true})
-    // FixMe: type issue causing .then to have red underline.
-    fetchRouteEntities().then(data => {
-      this.setState({loading: false})
-      const routes = data.feed.routes
-      const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== routeStatusTextToValue('Approved'))
+  componentDidUpdate (prevProps) {
+    const {routes} = this.props
+    if (routes !== prevProps.routes) {
       this.setState({
-        unapprovedRoutes
+        loading: false
       })
-    })
+    }
   }
 
   open (onClose) {
     this.onClose = onClose
 
-    this.updateUnapprovedRoutes()
+    const {fetchRouteEntities, feedSource} = this.props
+    this.setState({loading: true})
+    fetchRouteEntities(feedSource)
 
     this.setState({
       showModal: true
@@ -106,8 +102,9 @@ class CreateSnapshotModal extends Component<Props, State> {
 
   render () {
     const {Body, Footer, Header, Title} = Modal
-    const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal} = this.state
-    const {unapprovedRoutes, loading} = this.state
+    const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal, loading} = this.state
+    const {routes} = this.props
+    const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== routeStatusTextToValue('Approved'))
 
     return (
       <Modal show={showModal} onHide={this.close}>
@@ -156,7 +153,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               <ul>
                 {
                   unapprovedRoutes.map(route => (
-                    <li key={route.route_id}>{getEntityName(route)}: {getRouteStatusText(route.status)}</li>
+                    <li key={route.route_id}>{getEntityName(route)}: {getRouteStatusText(parseInt(route.status))}</li>
                   ))
                 }
               </ul>
@@ -193,11 +190,12 @@ class CreateSnapshotModal extends Component<Props, State> {
 
 const mapDispatchToProps = {
   createSnapshot: snapshotActions.createSnapshot,
-  fetchRouteEntities
+  fetchRouteEntities: activeActions.fetchRouteEntities
 }
 
 const mapStateToProps = (state: AppState, ownProps: {}) => ({
-  lock: state.editor.data.lock
+  lock: state.editor.data.lock,
+  routes: state.editor.data.tables.routes
 })
 
 // $FlowFixMe - ignore connect missing additional args
diff --git a/lib/editor/components/EditorFeedSourcePanel.js b/lib/editor/components/EditorFeedSourcePanel.js
index 4d53dcaaa..4677e702b 100644
--- a/lib/editor/components/EditorFeedSourcePanel.js
+++ b/lib/editor/components/EditorFeedSourcePanel.js
@@ -14,17 +14,13 @@ import * as versionActions from '../../manager/actions/versions'
 import {isEditingDisabled} from '../../manager/util'
 import type {Props as ContainerProps} from '../containers/ActiveEditorFeedSourcePanel'
 import type {Feed, Snapshot} from '../../types'
-import type {ManagerUserState, LockState} from '../../types/reducers'
-import * as editorActions from '../actions/editor'
+import type {ManagerUserState} from '../../types/reducers'
 
 type Props = ContainerProps & {
   createFeedVersionFromSnapshot: typeof versionActions.createFeedVersionFromSnapshot,
   deleteSnapshot: typeof snapshotActions.deleteSnapshot,
   downloadSnapshot: typeof snapshotActions.downloadSnapshot,
   fetchSnapshots: typeof snapshotActions.fetchSnapshots,
-  lock: LockState,
-  lockEditorFeedSource: typeof editorActions.lockEditorFeedSource,
-  removeEditorLock: typeof editorActions.removeEditorLock,
   restoreSnapshot: typeof snapshotActions.restoreSnapshot,
   user: ManagerUserState
 }
@@ -37,20 +33,9 @@ export default class EditorFeedSourcePanel extends Component<Props> {
   }
 
   _openModal = () => {
-    const {lock, feedSource, lockEditorFeedSource, removeEditorLock} = this.props
-    // Get lock if we don't have one.
-    // Snapshot Modal requires lock to fetch unapproved routes.
-    if (!lock.sessionId) {
-      lockEditorFeedSource(feedSource.id).then((data) => {
-        // Clean up lock on close.
-        const onClose = () => removeEditorLock(feedSource.id)
-        this.refs.snapshotModal.getWrappedInstance().open(onClose)
-      })
-    } else {
-      // Note: this will need to change if react-redux is upgraded to v6+
-      // https://medium.com/octopus-labs-london/how-to-access-a-redux-components-methods-with-createref-ca28a96efd59
-      this.refs.snapshotModal.getWrappedInstance().open()
-    }
+    // Note: this will need to change if react-redux is upgraded to v6+
+    // https://medium.com/octopus-labs-london/how-to-access-a-redux-components-methods-with-createref-ca28a96efd59
+    this.refs.snapshotModal.getWrappedInstance().open()
   }
 
   _sortBySnapshotTime = (a: Snapshot, b: Snapshot) => b.snapshotTime - a.snapshotTime
diff --git a/lib/editor/containers/ActiveEditorFeedSourcePanel.js b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
index 9057b9f2e..66670e92c 100644
--- a/lib/editor/containers/ActiveEditorFeedSourcePanel.js
+++ b/lib/editor/containers/ActiveEditorFeedSourcePanel.js
@@ -9,7 +9,6 @@ import {
   restoreSnapshot
 } from '../actions/snapshots.js'
 import {createFeedVersionFromSnapshot} from '../../manager/actions/versions'
-import {lockEditorFeedSource, removeEditorLock} from '../actions/editor'
 import EditorFeedSourcePanel from '../components/EditorFeedSourcePanel'
 import type {Feed, Project} from '../../types'
 import type {AppState} from '../../types/reducers'
@@ -20,10 +19,9 @@ export type Props = {
 }
 
 const mapStateToProps = (state: AppState, ownProps: Props) => {
-  const {user, editor} = state
-  const {lock} = editor.data
+  const {user} = state
   return {
-    user, lock
+    user
   }
 }
 
@@ -32,9 +30,7 @@ const mapDispatchToProps = {
   deleteSnapshot,
   downloadSnapshot,
   fetchSnapshots,
-  restoreSnapshot,
-  lockEditorFeedSource,
-  removeEditorLock
+  restoreSnapshot
 }
 
 const ActiveEditorFeedSourcePanel = connect(
diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index f06f58e9a..d21d6955b 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -57,6 +57,11 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
         console.warn('Could not fetch base GTFS!')
         return state
       }
+      if (action.payload.partial) {
+        return update(state, {
+          tables: {$merge: feed}
+        })
+      }
       if (feed.feed_info.length === 0) {
         console.warn(`No feed info found. Adding feed info with null values.`)
         feed.feed_info.push(generateNullProps('feedinfo'))

From bf7d466ffa367135e4fe1d43d9ae672734fb91db Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 2 Dec 2021 14:11:39 -0800
Subject: [PATCH 442/553] refactor(i18n): add polish translation

---
 i18n/polish.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/i18n/polish.yml b/i18n/polish.yml
index 20ff1f288..9be66de4b 100644
--- a/i18n/polish.yml
+++ b/i18n/polish.yml
@@ -22,6 +22,10 @@ components:
         placeholder: Dodatkowe informacje (opcjonalnie)
       publishNewVersion:
         label: Publikuj migawkę jako nowa wersja pliku
+      confirmPublishWithUnapproved:
+        label: Potwierdź publikację z niezatwierdzonymi trasami 
+    unapprovedRoutesHeader: "Następujące trasy nie są akceptowane:"
+    unapprovedRoutesDesc: Trasy te nie zostaną uwzględnione w danych wyjściowych.
     missingNameAlert: Migawce należy nadać prawidłową nazwę!
     ok: OK
     title: Utwórz nową migawkę

From c22df05c787dcc93f270bc3ce5975e51ff0a4ef4 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 2 Dec 2021 15:56:07 -0800
Subject: [PATCH 443/553] refactor(TransformationViewer): add comments, add
 icons

---
 lib/manager/components/TransformationsViewer.js     | 9 +++++----
 lib/manager/components/version/FeedVersionViewer.js | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
index 684ab49f2..040de7bd6 100644
--- a/lib/manager/components/TransformationsViewer.js
+++ b/lib/manager/components/TransformationsViewer.js
@@ -1,5 +1,6 @@
 // @flow
 
+import Icon from '@conveyal/woonerf/components/icon'
 import React, { Component } from 'react'
 import { Col, ListGroup, Panel, Row, ListGroupItem, Badge } from 'react-bootstrap'
 
@@ -28,13 +29,13 @@ export default class TransformationsViewer extends Component<Props> {
                 ? <Badge>Table Deleted</Badge>
                 : null
         return (
-          <ListGroupItem key={res.tableName}>
+          <ListGroupItem key={res.tableName} style={{maxWidth: '720px'}}>
             <div>
               <h4 style={{marginTop: '5px'}}>{res.tableName} {badge}</h4>
               <Row style={{textAlign: 'center'}}>
-                <Col xs={4}>Rows added: {res.addedCount}</Col>
-                <Col xs={4}>Rows deleted: {res.deletedCount}</Col>
-                <Col xs={4}>Rows updated: {res.updatedCount}</Col>
+                <Col xs={4}><Icon type='plus-square' /> Rows added: {res.addedCount}</Col>
+                <Col xs={4}><Icon type='minus-square' />Rows deleted: {res.deletedCount}</Col>
+                <Col xs={4}><Icon type='exchange' />Rows updated: {res.updatedCount}</Col>
               </Row>
             </div>
           </ListGroupItem>
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 0428a86df..0ebad641b 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -222,6 +222,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : <span><BsLabel bsStyle={color}>{text}</BsLabel></span>
   }
 
+  // Render the number of transformations applied to the current feed version
   _renderTransformResultsCount = (version: FeedVersion) => {
     let totalCount
     if (version.feedTransformResult) {

From ad96581d25b66ec2deee3d7d7ad8929bb7f190f9 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 29 Nov 2021 15:58:12 -0800
Subject: [PATCH 444/553] feature(FeedVersionViewer): Add summary of
 transformations applied to feed version.

---
 .../components/TransformationsViewer.js       | 58 +++++++++++++++++++
 .../components/version/FeedVersionViewer.js   | 32 +++++++++-
 2 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 lib/manager/components/TransformationsViewer.js

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
new file mode 100644
index 000000000..c4e0ad4d7
--- /dev/null
+++ b/lib/manager/components/TransformationsViewer.js
@@ -0,0 +1,58 @@
+// @flow
+
+import React, { Component } from 'react'
+import { Col, ListGroup, Panel, Row, ListGroupItem, Badge } from 'react-bootstrap'
+
+import type {FeedVersion} from '../../types'
+
+type Props = {
+  version: FeedVersion,
+}
+
+export default class TransformationsViewer extends Component<Props> {
+  render () {
+    const {
+      version
+    } = this.props
+
+    if (version.feedTransformResult && version.feedTransformResult.tableTransformResults) {
+      const {tableTransformResults} = version.feedTransformResult
+      tableTransformResults[1] = {...tableTransformResults[0]}
+      tableTransformResults[1].tableName = 'test'
+      const transformContent = tableTransformResults.map(res => {
+        const badge = res.transformType === 'TABLE_MODIFIED'
+          ? <Badge>Table Modified</Badge>
+          : res.transformType === 'TABLE_ADDED'
+            ? <Badge>Table Added</Badge>
+            : res.transformType === 'TABLE_REPLACED'
+              ? <Badge>Table Replaced</Badge>
+              : res.transformType === 'TABLE_DELETED'
+                ? <Badge>Table Deleted</Badge>
+                : null
+        return (
+          <ListGroupItem key={res.tableName}>
+            <div>
+              <h4 style={{marginTop: '5px'}}>{res.tableName} {badge}</h4>
+              <Row style={{textAlign: 'center'}}>
+                <Col xs={4}>Rows added: {res.addedCount}</Col>
+                <Col xs={4}>Rows deleted: {res.deletedCount}</Col>
+                <Col xs={4}>Rows updated: {res.updatedCount}</Col>
+              </Row>
+            </div>
+          </ListGroupItem>
+        )
+      })
+      return (
+        <div>
+          <Panel header={<h2>Transformations:</h2>}>
+            <ListGroup>
+              {transformContent}
+            </ListGroup>
+          </Panel>
+        </div>
+      )
+    } else {
+      return <div><h3>No transformations applied.</h3></div>
+    }
+  }
+}
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 7a8075f9b..0428a86df 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -22,6 +22,7 @@ import * as snapshotActions from '../../../editor/actions/snapshots'
 import * as plusActions from '../../../gtfsplus/actions/gtfsplus'
 import ActiveGtfsPlusVersionSummary from '../../../gtfsplus/containers/ActiveGtfsPlusVersionSummary'
 import NotesViewer from '../NotesViewer'
+import TransformationsViewer from '../TransformationsViewer'
 import {errorPriorityLevels, getTableFatalExceptions} from '../../util/version'
 import GtfsValidationViewer from '../validation/GtfsValidationViewer'
 import type {Feed, FeedVersion, GtfsPlusValidation, Note, Project} from '../../../types'
@@ -131,7 +132,10 @@ export default class FeedVersionViewer extends Component<Props> {
                     notes={version.notes}
                     notesRequested={notesRequested}
                     newNotePosted={newNotePosted} />
-                  : null
+                  : versionSection === 'transformations'
+                    ? <TransformationsViewer
+                      version={version} />
+                    : null
           }
         </Col>
       </Row>
@@ -218,6 +222,25 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : <span><BsLabel bsStyle={color}>{text}</BsLabel></span>
   }
 
+  _renderTransformResultsCount = (version: FeedVersion) => {
+    let totalCount
+    if (version.feedTransformResult) {
+      const {tableTransformResults} = version.feedTransformResult
+      totalCount = tableTransformResults.reduce((prev, cur) => {
+        return cur.deletedCount + cur.updatedCount + cur.addedCount + prev
+      }, 0)
+    } else {
+      totalCount = 0
+    }
+    return (
+      <div style={{display: 'inline'}}>
+        <BsLabel>
+          {totalCount}
+        </BsLabel>
+      </div>
+    )
+  }
+
   render () {
     const { feedVersionIndex, version, versionSection } = this.props
     const versionPath = `/feed/${version.feedSource.id}/version/${feedVersionIndex}`
@@ -236,6 +259,13 @@ class VersionSectionSelector extends Component<SelectorProps> {
               <Icon type='exclamation-triangle' /> Validation issues {this._renderIssuesLabel()}
             </ListGroupItem>
           </LinkContainer>
+          <LinkContainer
+            to={`${versionPath}/transformations`}
+            active={versionSection === 'transformations'}>
+            <ListGroupItem>
+              <Icon type='exclamation-triangle' /> Transformation Results {this._renderTransformResultsCount(version)}
+            </ListGroupItem>
+          </LinkContainer>
           {isModuleEnabled('gtfsplus')
             ? <LinkContainer
               to={`${versionPath}/gtfsplus`}

From 3ae1392cfd1e7a66cd4b98dfad1bd5036f01fdc5 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 29 Nov 2021 17:18:50 -0800
Subject: [PATCH 445/553] refactor(TransformationsViewer): remove some testing
 code

---
 lib/manager/components/TransformationsViewer.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
index c4e0ad4d7..684ab49f2 100644
--- a/lib/manager/components/TransformationsViewer.js
+++ b/lib/manager/components/TransformationsViewer.js
@@ -17,8 +17,6 @@ export default class TransformationsViewer extends Component<Props> {
 
     if (version.feedTransformResult && version.feedTransformResult.tableTransformResults) {
       const {tableTransformResults} = version.feedTransformResult
-      tableTransformResults[1] = {...tableTransformResults[0]}
-      tableTransformResults[1].tableName = 'test'
       const transformContent = tableTransformResults.map(res => {
         const badge = res.transformType === 'TABLE_MODIFIED'
           ? <Badge>Table Modified</Badge>

From 62641057e5b016e9b5da39818545235eca7b768f Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 2 Dec 2021 15:56:07 -0800
Subject: [PATCH 446/553] refactor(TransformationViewer): add comments, add
 icons

---
 lib/manager/components/TransformationsViewer.js     | 9 +++++----
 lib/manager/components/version/FeedVersionViewer.js | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
index 684ab49f2..040de7bd6 100644
--- a/lib/manager/components/TransformationsViewer.js
+++ b/lib/manager/components/TransformationsViewer.js
@@ -1,5 +1,6 @@
 // @flow
 
+import Icon from '@conveyal/woonerf/components/icon'
 import React, { Component } from 'react'
 import { Col, ListGroup, Panel, Row, ListGroupItem, Badge } from 'react-bootstrap'
 
@@ -28,13 +29,13 @@ export default class TransformationsViewer extends Component<Props> {
                 ? <Badge>Table Deleted</Badge>
                 : null
         return (
-          <ListGroupItem key={res.tableName}>
+          <ListGroupItem key={res.tableName} style={{maxWidth: '720px'}}>
             <div>
               <h4 style={{marginTop: '5px'}}>{res.tableName} {badge}</h4>
               <Row style={{textAlign: 'center'}}>
-                <Col xs={4}>Rows added: {res.addedCount}</Col>
-                <Col xs={4}>Rows deleted: {res.deletedCount}</Col>
-                <Col xs={4}>Rows updated: {res.updatedCount}</Col>
+                <Col xs={4}><Icon type='plus-square' /> Rows added: {res.addedCount}</Col>
+                <Col xs={4}><Icon type='minus-square' />Rows deleted: {res.deletedCount}</Col>
+                <Col xs={4}><Icon type='exchange' />Rows updated: {res.updatedCount}</Col>
               </Row>
             </div>
           </ListGroupItem>
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 0428a86df..0ebad641b 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -222,6 +222,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
       : <span><BsLabel bsStyle={color}>{text}</BsLabel></span>
   }
 
+  // Render the number of transformations applied to the current feed version
   _renderTransformResultsCount = (version: FeedVersion) => {
     let totalCount
     if (version.feedTransformResult) {

From b535cfaab9649622a6d6dc647e92160cc4797855 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Fri, 3 Dec 2021 15:39:06 -0800
Subject: [PATCH 447/553] refactor(TransformationsViewer): PR refactor

---
 .../components/TransformationsViewer.js       | 51 ++++++++++---------
 .../components/version/FeedVersionViewer.js   | 14 +++--
 lib/types/index.js                            |  2 +-
 3 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
index 040de7bd6..874075b3c 100644
--- a/lib/manager/components/TransformationsViewer.js
+++ b/lib/manager/components/TransformationsViewer.js
@@ -4,13 +4,26 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React, { Component } from 'react'
 import { Col, ListGroup, Panel, Row, ListGroupItem, Badge } from 'react-bootstrap'
 
-import type {FeedVersion} from '../../types'
+import type { FeedVersion, TableTransformResult } from '../../types'
 
 type Props = {
   version: FeedVersion,
 }
 
 export default class TransformationsViewer extends Component<Props> {
+  _getBadge (transformResult: TableTransformResult) {
+    switch (transformResult.transformType) {
+      case 'TABLE_MODIFIED':
+        return <Badge>Table Modified</Badge>
+      case 'TABLE_ADDED':
+        return <Badge>Table Added</Badge>
+      case 'TABLE_REPLACED':
+        return <Badge>Table Replaced</Badge>
+      case 'TABLE_DELETED':
+        return <Badge>Table Deleted</Badge>
+    }
+  }
+
   render () {
     const {
       version
@@ -19,36 +32,24 @@ export default class TransformationsViewer extends Component<Props> {
     if (version.feedTransformResult && version.feedTransformResult.tableTransformResults) {
       const {tableTransformResults} = version.feedTransformResult
       const transformContent = tableTransformResults.map(res => {
-        const badge = res.transformType === 'TABLE_MODIFIED'
-          ? <Badge>Table Modified</Badge>
-          : res.transformType === 'TABLE_ADDED'
-            ? <Badge>Table Added</Badge>
-            : res.transformType === 'TABLE_REPLACED'
-              ? <Badge>Table Replaced</Badge>
-              : res.transformType === 'TABLE_DELETED'
-                ? <Badge>Table Deleted</Badge>
-                : null
+        const badge = this._getBadge(res)
         return (
           <ListGroupItem key={res.tableName} style={{maxWidth: '720px'}}>
-            <div>
-              <h4 style={{marginTop: '5px'}}>{res.tableName} {badge}</h4>
-              <Row style={{textAlign: 'center'}}>
-                <Col xs={4}><Icon type='plus-square' /> Rows added: {res.addedCount}</Col>
-                <Col xs={4}><Icon type='minus-square' />Rows deleted: {res.deletedCount}</Col>
-                <Col xs={4}><Icon type='exchange' />Rows updated: {res.updatedCount}</Col>
-              </Row>
-            </div>
+            <h4 style={{marginTop: '5px'}}>{res.tableName} {badge}</h4>
+            <Row style={{textAlign: 'center'}}>
+              <Col xs={4}><Icon type='plus-square' />Rows added: {res.addedCount}</Col>
+              <Col xs={4}><Icon type='minus-square' />Rows deleted: {res.deletedCount}</Col>
+              <Col xs={4}><Icon type='exchange' />Rows updated: {res.updatedCount}</Col>
+            </Row>
           </ListGroupItem>
         )
       })
       return (
-        <div>
-          <Panel header={<h2>Transformations:</h2>}>
-            <ListGroup>
-              {transformContent}
-            </ListGroup>
-          </Panel>
-        </div>
+        <Panel header={<h3>Transformations:</h3>}>
+          <ListGroup>
+            {transformContent}
+          </ListGroup>
+        </Panel>
       )
     } else {
       return <div><h3>No transformations applied.</h3></div>
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 0ebad641b..5541421cd 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -133,8 +133,7 @@ export default class FeedVersionViewer extends Component<Props> {
                     notesRequested={notesRequested}
                     newNotePosted={newNotePosted} />
                   : versionSection === 'transformations'
-                    ? <TransformationsViewer
-                      version={version} />
+                    ? <TransformationsViewer version={version} />
                     : null
           }
         </Col>
@@ -234,11 +233,9 @@ class VersionSectionSelector extends Component<SelectorProps> {
       totalCount = 0
     }
     return (
-      <div style={{display: 'inline'}}>
-        <BsLabel>
-          {totalCount}
-        </BsLabel>
-      </div>
+      <BsLabel>
+        {totalCount}
+      </BsLabel>
     )
   }
 
@@ -262,7 +259,8 @@ class VersionSectionSelector extends Component<SelectorProps> {
           </LinkContainer>
           <LinkContainer
             to={`${versionPath}/transformations`}
-            active={versionSection === 'transformations'}>
+            active={versionSection === 'transformations'}
+          >
             <ListGroupItem>
               <Icon type='exclamation-triangle' /> Transformation Results {this._renderTransformResultsCount(version)}
             </ListGroupItem>
diff --git a/lib/types/index.js b/lib/types/index.js
index 988fa44ba..21e5edb94 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -487,7 +487,7 @@ export type SummarizedFeedVersion = {|
   version: number
 |}
 
-type TableTransformResult = {
+export type TableTransformResult = {
   addedCount: number,
   deletedCount: number,
   tableName: string,

From 44fbb5db7760a47a39b3fe8f2ce1cd3efb97ad87 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Fri, 3 Dec 2021 16:24:34 -0800
Subject: [PATCH 448/553] refactor(TransformationsViewer): improve design of
 labels

---
 .../components/TransformationsViewer.js       | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
index 874075b3c..f0e238f1f 100644
--- a/lib/manager/components/TransformationsViewer.js
+++ b/lib/manager/components/TransformationsViewer.js
@@ -2,7 +2,7 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import React, { Component } from 'react'
-import { Col, ListGroup, Panel, Row, ListGroupItem, Badge } from 'react-bootstrap'
+import { Col, ListGroup, Panel, Row, ListGroupItem, Label } from 'react-bootstrap'
 
 import type { FeedVersion, TableTransformResult } from '../../types'
 
@@ -13,14 +13,16 @@ type Props = {
 export default class TransformationsViewer extends Component<Props> {
   _getBadge (transformResult: TableTransformResult) {
     switch (transformResult.transformType) {
+      // ESLint thinks that these are form labels
+      /* eslint jsx-a11y/label-has-for: "off" */
       case 'TABLE_MODIFIED':
-        return <Badge>Table Modified</Badge>
+        return <Label bsStyle='primary'>Table Modified</Label>
       case 'TABLE_ADDED':
-        return <Badge>Table Added</Badge>
+        return <Label bsStyle='success'>Table Added</Label>
       case 'TABLE_REPLACED':
-        return <Badge>Table Replaced</Badge>
+        return <Label bsStyle='warning'>Table Replaced</Label>
       case 'TABLE_DELETED':
-        return <Badge>Table Deleted</Badge>
+        return <Label bsStyle='danger'>Table Deleted</Label>
     }
   }
 
@@ -35,7 +37,14 @@ export default class TransformationsViewer extends Component<Props> {
         const badge = this._getBadge(res)
         return (
           <ListGroupItem key={res.tableName} style={{maxWidth: '720px'}}>
-            <h4 style={{marginTop: '5px'}}>{res.tableName} {badge}</h4>
+            <Row>
+              <Col sm={8}>
+                <h4 style={{marginTop: '5px'}}>{res.tableName}</h4>
+              </Col>
+              <Col sm={4} style={{textAlign: 'right'}}>
+                <h4>{badge}</h4>
+              </Col>
+            </Row>
             <Row style={{textAlign: 'center'}}>
               <Col xs={4}><Icon type='plus-square' />Rows added: {res.addedCount}</Col>
               <Col xs={4}><Icon type='minus-square' />Rows deleted: {res.deletedCount}</Col>

From 3f220c0b6145a266ee949bc347078cd309d266aa Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Mon, 6 Dec 2021 18:49:57 +0100
Subject: [PATCH 449/553] refactor(PeliasPanel): update pelias as seperate
 button

---
 lib/manager/actions/deployments.js            | 31 ++++++++
 .../components/deployment/DeploymentViewer.js | 21 ++----
 .../components/deployment/PeliasPanel.js      | 72 ++++++++++---------
 3 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 13ec46d9d..d20b71733 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -103,6 +103,37 @@ export function deployToTarget (deployment: Deployment, target: string) {
   }
 }
 
+export function updatePelias (deployment: Deployment, resetDb?: boolean) {
+  return async function (dispatch: dispatchFn, getState: getStateFn) {
+    if (resetDb) {
+      await dispatch(updateDeployment(deployment, {peliasResetDb: true}))
+    }
+    const {id} = deployment
+    return dispatch(secureFetch(`${DEPLOYMENT_URL}/${id}/updatepelias`, 'post'))
+      .then(response => {
+        // FIXME: Use standard handleJobResponse for deployment job
+        if (response.status >= 400 || response.status === 202) {
+          // If there is an issue with the deployment, return the JSON response
+          // (handled be below alert)
+          return response.json()
+        } else {
+          // If the deployment request succeeded, start monitoring the job.
+          dispatch(startJobMonitor())
+          dispatch(fetchProjectDeployments(deployment.projectId))
+        }
+
+        if (resetDb) {
+          // If peliasResetDb was set, un-set it after getting a response
+          dispatch(updateDeployment(deployment, {peliasResetDb: false}))
+        }
+      })
+      .then(json => {
+        // Show JSON message if there was an issue.
+        json && window.alert(json.message || 'Could not update Local Places Index')
+      })
+  }
+}
+
 export function fetchDeployment (id: ?string) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(requestingDeployment())
diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index c7c7f17dd..e71e14446 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -398,21 +398,12 @@ export default class DeploymentViewer extends Component<Props, State> {
                 )}
               </ListGroup>
             </Panel>
-            {/* Pelias panel. Only show if deployment is pinned and webhook URL is set */}
-            {project.pinnedDeploymentId === deployment.id &&
-              project.peliasWebhookUrl && (
-              <div>
-                <span>TODO: remove this PeliasPanel wrapper and instead make peliaspanel only show if a dpeloyment exists.
-                  need to adjust the server to have a new endpoint to launch pelias job and there
-                  needs to be a way to get the otpServer info in that new job
-                </span>
-                <PeliasPanel
-                  deployment={deployment}
-                  updateDeployment={updateDeployment}
-                  project={project}
-                />
-              </div>
-            )}
+            {/* Pelias panel */}
+            <PeliasPanel
+              deployment={deployment}
+              updateDeployment={updateDeployment}
+              project={project}
+            />
           </Col>
           <Col sm={3}>
             {/* Current deployment panel */}
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 41c867891..8ae6f1ff9 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -5,7 +5,8 @@ import { connect } from 'react-redux'
 import React, { Component } from 'react'
 import {
   Button,
-  Checkbox,
+  ButtonGroup,
+  ButtonToolbar,
   ListGroup,
   ListGroupItem,
   Panel
@@ -13,7 +14,7 @@ import {
 
 import SelectFileModal from '../../../common/components/SelectFileModal'
 import ConfirmModal from '../../../common/components/ConfirmModal'
-import { updateDeployment, uploadPeliasWebhookCsvFile } from '../../actions/deployments'
+import { updateDeployment, uploadPeliasWebhookCsvFile, updatePelias } from '../../actions/deployments'
 import { setErrorMessage } from '../../actions/status'
 import type { Deployment, Project } from '../../../types'
 
@@ -22,6 +23,7 @@ type Props = {
   project: Project,
   setErrorMessage: typeof setErrorMessage,
   updateDeployment: typeof updateDeployment,
+  updatePelias: typeof updatePelias,
   uploadPeliasWebhookCsvFile: typeof uploadPeliasWebhookCsvFile
 }
 
@@ -34,21 +36,17 @@ class PeliasPanel extends Component<Props, State> {
     fileToDeleteOnSuccesfulUpload: null
   };
 
+  _onClickPeliasUpdate = () => {
+    const {deployment, updatePelias} = this.props
+    updatePelias(deployment)
+  }
   /**
    *  Method fired when Pelias Update checkbox is checked
    */
-  _onChangeUpdatePelias = () =>
-    this._updateDeployment({
-      peliasUpdate: !this.props.deployment.peliasUpdate
-    });
-
-  /**
-   *  Method fired when Pelias Update checkbox is checked
-   */
-  _onChangeResetPelias = () =>
-    this._updateDeployment({
-      peliasResetDb: !this.props.deployment.peliasResetDb
-    });
+  _onClickPeliasReset = () => {
+    const {deployment, updatePelias} = this.props
+    updatePelias(deployment, true)
+  }
 
   /**
    * Updates state on input changes. Does not persist changes to deployment
@@ -170,7 +168,15 @@ class PeliasPanel extends Component<Props, State> {
   }
 
   render () {
-    const { deployment } = this.props
+    const { deployment, project } = this.props
+
+    // Don't show panel is no webhook url is set
+    if (!project.peliasWebhookUrl) {
+      return null
+    }
+
+    // const peliasButtonsDisabled = !deployment || (deployment.ec2Instances && deployment.ec2Instances.length === 0)
+    const peliasButtonsDisabled = false
 
     return (
       <Panel
@@ -183,30 +189,32 @@ class PeliasPanel extends Component<Props, State> {
         <ListGroup fill>
 
           <ListGroupItem>
-            <Checkbox
-              checked={deployment.peliasUpdate}
-              onChange={this._onChangeUpdatePelias}
-            >
-              Update Local Places Index (including places from GTFS feeds)
-            </Checkbox>
+            <ButtonToolbar>
+              <h5>Update Local Places Index</h5>
+              <ButtonGroup title={peliasButtonsDisabled ? 'Local Places Index can only be updated if there is a running OTP instance' : ''}>
+                {/* If there are no deployments don't allow user to update Pelias yet */}
+                <Button
+                  onClick={this._onClickPeliasUpdate}
+                  disabled={peliasButtonsDisabled}
+                >
+                  Update
+                </Button>
+                <Button
+                  onClick={() => this.refs.reInitLpiModal.open()}
+                  disabled={peliasButtonsDisabled}
+                >Reset</Button>
+              </ButtonGroup>
+            </ButtonToolbar>
             <ConfirmModal
               ref='reInitLpiModal'
               title='Are you sure you want to rebuild the Local Places Index database?'
               body='This will cause custom geocoder responses to be unavailable for about 1 - 5 minutes after deploying. Regular addresses and landmarks will continue to be available. Stops and stations from feeds that are not part of this deployment will be removed from the suggestions.'
-              onConfirm={this._onChangeResetPelias}
+              onConfirm={this._onClickPeliasReset}
             />
-            <Checkbox
-              checked={deployment.peliasResetDb}
-              disabled={!deployment.peliasUpdate}
-              onClick={() => deployment.peliasResetDb ? this._onChangeResetPelias() : this.refs.reInitLpiModal.open()}
-              style={{paddingLeft: 15}}
-            >
-              Rebuild the Local Places Index database during update
-            </Checkbox>
           </ListGroupItem>
           <ListGroupItem >
             <h5>Custom Point Of Interest CSV Files</h5>
-            <p>These files are sent to the Local Places Index when it is updated</p>
+            <p>These files are sent to the Local Places Index when it is updated or reset</p>
             <SelectFileModal
               ref='uploadModal'
               title='Upload CSV File'
@@ -236,7 +244,7 @@ class PeliasPanel extends Component<Props, State> {
   }
 }
 
-const mapDispatchToProps = {uploadPeliasWebhookCsvFile, setErrorMessage}
+const mapDispatchToProps = {uploadPeliasWebhookCsvFile, setErrorMessage, updatePelias}
 
 export default connect(
   null,

From dc3cd4d9965191c86bfb2874c801ada4eac68e91 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 6 Dec 2021 15:57:19 -0800
Subject: [PATCH 450/553] refactor(editor): PR fixes pt 2

---
 lib/editor/actions/active.js                 |  3 +-
 lib/editor/components/CreateSnapshotModal.js |  8 +++--
 lib/editor/reducers/data.js                  |  4 +--
 lib/editor/util/index.js                     | 32 +++++++++-----------
 4 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/lib/editor/actions/active.js b/lib/editor/actions/active.js
index 7cd9f01c6..e4fbf88c5 100644
--- a/lib/editor/actions/active.js
+++ b/lib/editor/actions/active.js
@@ -197,8 +197,7 @@ function updateUrl (
  */
 export function fetchRouteEntities (feedSource: Feed) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
-    const state = getState()
-    const { lock } = state.editor.data
+    const { lock } = getState().editor.data
     let lockCreated = false
     // We need to get a lock if we do not already have one
     if (!lock.sessionId) {
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 02af911c2..63668cbf6 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -14,7 +14,7 @@ import {connect} from 'react-redux'
 
 import * as snapshotActions from '../actions/snapshots'
 import {getComponentMessages} from '../../common/util/config'
-import { getRouteStatusText, routeStatusTextToValue } from '../util'
+import { getRouteStatusDict, ROUTE_STATUS_CODES } from '../util'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState, LockState} from '../../types/reducers'
@@ -73,6 +73,7 @@ class CreateSnapshotModal extends Component<Props, State> {
 
   componentDidUpdate (prevProps) {
     const {routes} = this.props
+    // assume that when the routes gets updated, it means that they have been loaded into the store
     if (routes !== prevProps.routes) {
       this.setState({
         loading: false
@@ -104,7 +105,8 @@ class CreateSnapshotModal extends Component<Props, State> {
     const {Body, Footer, Header, Title} = Modal
     const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal, loading} = this.state
     const {routes} = this.props
-    const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== routeStatusTextToValue('Approved'))
+    const routeStatusDict = getRouteStatusDict()
+    const unapprovedRoutes = routeStatusDict ? routes.filter(route => route.hasOwnProperty('status') && route.status !== ROUTE_STATUS_CODES.APPROVED) : []
 
     return (
       <Modal show={showModal} onHide={this.close}>
@@ -153,7 +155,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               <ul>
                 {
                   unapprovedRoutes.map(route => (
-                    <li key={route.route_id}>{getEntityName(route)}: {getRouteStatusText(parseInt(route.status))}</li>
+                    <li key={route.route_id}>{getEntityName(route)}: {routeStatusDict[parseInt(route.status)].text}</li>
                   ))
                 }
               </ul>
diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index d21d6955b..c5c101ef3 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -12,7 +12,7 @@ import {getMapToGtfsStrategy, entityIsNew} from '../util/objects'
 import {assignDistancesToPatternStops, constructShapePoints} from '../util/map'
 import type {Action} from '../../types/actions'
 import type {DataState} from '../../types/reducers'
-import { routeStatusTextToValue } from '../util'
+import { ROUTE_STATUS_CODES } from '../util'
 
 // If updating a trip pattern, new props apply to sub entity and edited
 // boolean updated is patternEdited.
@@ -220,7 +220,7 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
       // When a route gets edited, set its status to "In Progress"
       const additional = {}
       if (component === 'route' && !props.status) {
-        additional.status = routeStatusTextToValue('In Progress')
+        additional.status = ROUTE_STATUS_CODES.IN_PROGRESS
       }
       // FIXME: Check for pattern stops props (what about other sequenced lists)
       // and update stop sequence.
diff --git a/lib/editor/util/index.js b/lib/editor/util/index.js
index c710baa64..f2d099fb4 100644
--- a/lib/editor/util/index.js
+++ b/lib/editor/util/index.js
@@ -33,6 +33,12 @@ export const EXCEPTION_EXEMPLARS = {
   SWAP: 9
 }
 
+export const ROUTE_STATUS_CODES = {
+  IN_PROGRESS: 0,
+  PENDING_APPROVAL: 1,
+  APPROVED: 2
+}
+
 export function getStopsForPattern (pattern: Pattern, stops: Array<GtfsStop>): Array<GtfsStop> {
   return pattern && pattern.patternStops && stops
     ? pattern.patternStops.map(ps => {
@@ -146,28 +152,18 @@ export function getEditorTable (component: string) {
   )
 }
 
-export function getRouteStatusText (statusCode: number) {
-  const table = getEditorTable('route')
-  if (table) {
-    const statusField = table.fields.find(field => field.name === 'status')
-    if (statusField && statusField.options) {
-      const option = statusField.options.find(option => option.value === statusCode)
-      if (option) {
-        return option.text
-      }
-    }
-  }
-}
-
-export function routeStatusTextToValue (statusText: string) {
+/**
+ * Returns a dictionary from the table spec with the options for route status
+ */
+export function getRouteStatusDict (): any {
   const table = getEditorTable('route')
   if (table) {
     const statusField = table.fields.find(field => field.name === 'status')
     if (statusField && statusField.options) {
-      const option = statusField.options.find(option => option.text === statusText)
-      if (option) {
-        return option.value
-      }
+      return statusField.options.reduce((prevVal, curVal) => {
+        prevVal[curVal.value] = curVal
+        return prevVal
+      }, {})
     }
   }
 }

From 01a3cb92b5c8a826a1ac3ce77c0f92b2e5e0f766 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 6 Dec 2021 16:22:39 -0800
Subject: [PATCH 451/553] chore(TransformationsViewer): pr fixes

---
 .../components/TransformationsViewer.js       | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
index f0e238f1f..9770d1609 100644
--- a/lib/manager/components/TransformationsViewer.js
+++ b/lib/manager/components/TransformationsViewer.js
@@ -1,8 +1,8 @@
 // @flow
 
-import Icon from '@conveyal/woonerf/components/icon'
 import React, { Component } from 'react'
-import { Col, ListGroup, Panel, Row, ListGroupItem, Label } from 'react-bootstrap'
+import Icon from '@conveyal/woonerf/components/icon'
+import { Col, ListGroup, Panel, Row, ListGroupItem, Label as BsLabel } from 'react-bootstrap'
 
 import type { FeedVersion, TableTransformResult } from '../../types'
 
@@ -13,16 +13,14 @@ type Props = {
 export default class TransformationsViewer extends Component<Props> {
   _getBadge (transformResult: TableTransformResult) {
     switch (transformResult.transformType) {
-      // ESLint thinks that these are form labels
-      /* eslint jsx-a11y/label-has-for: "off" */
       case 'TABLE_MODIFIED':
-        return <Label bsStyle='primary'>Table Modified</Label>
+        return <BsLabel bsStyle='primary'>Table Modified</BsLabel>
       case 'TABLE_ADDED':
-        return <Label bsStyle='success'>Table Added</Label>
+        return <BsLabel bsStyle='success'>Table Added</BsLabel>
       case 'TABLE_REPLACED':
-        return <Label bsStyle='warning'>Table Replaced</Label>
+        return <BsLabel bsStyle='warning'>Table Replaced</BsLabel>
       case 'TABLE_DELETED':
-        return <Label bsStyle='danger'>Table Deleted</Label>
+        return <BsLabel bsStyle='danger'>Table Deleted</BsLabel>
     }
   }
 
@@ -37,14 +35,7 @@ export default class TransformationsViewer extends Component<Props> {
         const badge = this._getBadge(res)
         return (
           <ListGroupItem key={res.tableName} style={{maxWidth: '720px'}}>
-            <Row>
-              <Col sm={8}>
-                <h4 style={{marginTop: '5px'}}>{res.tableName}</h4>
-              </Col>
-              <Col sm={4} style={{textAlign: 'right'}}>
-                <h4>{badge}</h4>
-              </Col>
-            </Row>
+            <h4 style={{marginTop: '5px'}}>{res.tableName} {badge}</h4>
             <Row style={{textAlign: 'center'}}>
               <Col xs={4}><Icon type='plus-square' />Rows added: {res.addedCount}</Col>
               <Col xs={4}><Icon type='minus-square' />Rows deleted: {res.deletedCount}</Col>

From b6a46328c429f5b9509913fb15855478e6629fc9 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Mon, 6 Dec 2021 16:59:36 -0800
Subject: [PATCH 452/553] chore(TransformationViewer): PR Fixes round 3

---
 lib/manager/components/TransformationsViewer.js    |  2 +-
 .../components/version/FeedVersionViewer.js        | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
index 9770d1609..1a77bfcad 100644
--- a/lib/manager/components/TransformationsViewer.js
+++ b/lib/manager/components/TransformationsViewer.js
@@ -52,7 +52,7 @@ export default class TransformationsViewer extends Component<Props> {
         </Panel>
       )
     } else {
-      return <div><h3>No transformations applied.</h3></div>
+      return <h3>No transformations applied.</h3>
     }
   }
 }
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index 5541421cd..b44331f0c 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -246,20 +246,22 @@ class VersionSectionSelector extends Component<SelectorProps> {
       <Panel>
         <ListGroup fill>
           <LinkContainer
+            active={!versionSection}
             to={versionPath}
-            active={!versionSection}>
+          >
             <ListGroupItem><Icon type='info-circle' /> Version summary</ListGroupItem>
           </LinkContainer>
           <LinkContainer
+            active={versionSection === 'issues'}
             to={`${versionPath}/issues`}
-            active={versionSection === 'issues'}>
+          >
             <ListGroupItem>
               <Icon type='exclamation-triangle' /> Validation issues {this._renderIssuesLabel()}
             </ListGroupItem>
           </LinkContainer>
           <LinkContainer
-            to={`${versionPath}/transformations`}
             active={versionSection === 'transformations'}
+            to={`${versionPath}/transformations`}
           >
             <ListGroupItem>
               <Icon type='exclamation-triangle' /> Transformation Results {this._renderTransformResultsCount(version)}
@@ -267,8 +269,9 @@ class VersionSectionSelector extends Component<SelectorProps> {
           </LinkContainer>
           {isModuleEnabled('gtfsplus')
             ? <LinkContainer
+              active={versionSection === 'gtfsplus'}
               to={`${versionPath}/gtfsplus`}
-              active={versionSection === 'gtfsplus'}>
+            >
               <ListGroupItem>
                 <Icon type='plus' /> GTFS+ for this version {this._renderGtfsPlusIssuesLabel(version)}
               </ListGroupItem>
@@ -276,8 +279,9 @@ class VersionSectionSelector extends Component<SelectorProps> {
             : null
           }
           <LinkContainer
+            active={versionSection === 'comments'}
             to={`${versionPath}/comments`}
-            active={versionSection === 'comments'}>
+          >
             <ListGroupItem>
               <Glyphicon glyph='comment' /> Version comments{' '}
               <BsLabel>{version.noteCount}</BsLabel>

From 159e8d070eb68685496ea8effe5122bc842d2fc4 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 7 Dec 2021 15:01:00 +0100
Subject: [PATCH 453/553] revert: "Merge pull request #738 from
 ibi-group/dependabot/npm_and_yarn/jszip-3.7.0"

This reverts commit 1b3495ae4b4d258f4e6ae5f923bff1bdf9e6307d, reversing
changes made to 0717ca037380b63619ea5642a108d6cf6d4a0377.
---
 package.json |  2 +-
 yarn.lock    | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index a3d5162c1..ae774542e 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "iso-639-1": "^1.2.4",
     "isomorphic-fetch": "^2.2.1",
     "jju": "https://github.com/evansiroky/jju.git",
-    "jszip": "^3.7.0",
+    "jszip": "^3.0.0",
     "jwt-decode": "^2.1.0",
     "leaflet": "^1.3.4",
     "leaflet-textpath": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index f73d96e7a..486c63a5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3575,6 +3575,11 @@ core-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
   integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
 
+core-js@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
+  integrity sha1-+rg/uwstjchfpjbEudNMdUIMbWU=
+
 core-util-is@1.0.2, "core-util-is@>=1.0.1 <1.1.0-0", core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -4717,6 +4722,11 @@ es6-promise@^4.0.3, es6-promise@^4.1.1, es6-promise@^4.2.8:
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
   integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
+es6-promise@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
+  integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
+
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
@@ -7880,15 +7890,16 @@ jszip@^2.4.0:
   dependencies:
     pako "~1.0.2"
 
-jszip@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.0.tgz#9b8b995a4e7c9024653ce743e902076a82fdf4e6"
-  integrity sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==
+jszip@^3.0.0:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.1.5.tgz#e3c2a6c6d706ac6e603314036d43cd40beefdf37"
+  integrity sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==
   dependencies:
-    lie "~3.3.0"
+    core-js "~2.3.0"
+    es6-promise "~3.0.2"
+    lie "~3.1.0"
     pako "~1.0.2"
-    readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
+    readable-stream "~2.0.6"
 
 just-curry-it@^3.1.0:
   version "3.1.0"
@@ -8161,13 +8172,20 @@ libnpx@^10.2.4:
     y18n "^4.0.0"
     yargs "^14.2.3"
 
-lie@^3.0.1, lie@~3.3.0:
+lie@^3.0.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
   integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
   dependencies:
     immediate "~3.0.5"
 
+lie@~3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
+  dependencies:
+    immediate "~3.0.5"
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -12131,7 +12149,7 @@ readable-stream@~1.1.10:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.0:
+readable-stream@~2.0.0, readable-stream@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
@@ -12875,11 +12893,6 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"

From 1493d170fdb83ab9c0685e723e3ad60c62120a0a Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 7 Dec 2021 17:11:25 +0100
Subject: [PATCH 454/553] fix(editor/util/gtfs): include route_desc in entity
 name

---
 lib/editor/util/gtfs.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/editor/util/gtfs.js b/lib/editor/util/gtfs.js
index 19398d46a..078078267 100644
--- a/lib/editor/util/gtfs.js
+++ b/lib/editor/util/gtfs.js
@@ -1,6 +1,7 @@
 // @flow
 
 import {latLngBounds} from 'leaflet'
+
 import {getGtfsSpec} from '../../common/util/config'
 import {
   generateUID,
@@ -9,7 +10,6 @@ import {
   idealTextColor
 } from '../../common/util/util'
 import {getEntityTableString} from '../../gtfs/util'
-
 import type {
   // EditorTableData,
   Entity,
@@ -260,6 +260,9 @@ export function getEntityName (entity: any): string {
         route.route_long_name !== '""') {
         return `${route.route_short_name} - ${route.route_long_name}`
       } else if (route.route_short_name && route.route_short_name !== '""') {
+        if (route.route_desc && route.route_desc !== '""') {
+          return `${route.route_short_name} - ${route.route_desc}`
+        }
         return route.route_short_name
       } else if (route.route_long_name && route.route_long_name !== '""') {
         return route.route_long_name

From 05ba9b03562abe54400a5666d4c8bbc20290dbb8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 7 Dec 2021 11:19:19 -0500
Subject: [PATCH 455/553] refactor(FeedSourceSettings): Add autopublish tab,
 refactor.

---
 lib/manager/components/AutoPublishSettings.js |  70 +++++++++
 lib/manager/components/FeedSourceSettings.js  | 133 +++++++++++-------
 lib/manager/components/GeneralSettings.js     |  29 ----
 3 files changed, 153 insertions(+), 79 deletions(-)
 create mode 100644 lib/manager/components/AutoPublishSettings.js

diff --git a/lib/manager/components/AutoPublishSettings.js b/lib/manager/components/AutoPublishSettings.js
new file mode 100644
index 000000000..d130935ca
--- /dev/null
+++ b/lib/manager/components/AutoPublishSettings.js
@@ -0,0 +1,70 @@
+// @flow
+
+import React, { Component } from 'react'
+import {
+  Checkbox,
+  Col,
+  FormGroup,
+  ListGroup,
+  ListGroupItem,
+  Panel
+} from 'react-bootstrap'
+
+import * as feedsActions from '../actions/feeds'
+import type { Feed } from '../../types'
+
+type Props = {
+  disabled: ?boolean,
+  feedSource: Feed,
+  updateFeedSource: typeof feedsActions.updateFeedSource
+}
+
+/**
+ * This component displays auto-publish settings for a feed.
+ * Auto-publish settings are kept in a separate section per MTC request.
+ */
+export default class AutoPublishSettings extends Component<Props> {
+  _onToggleAutoPublish = () => {
+    const {feedSource, updateFeedSource} = this.props
+    updateFeedSource(feedSource, {autoPublish: !feedSource.autoPublish})
+  }
+
+  render () {
+    const {
+      disabled,
+      feedSource
+    } = this.props
+    // Do not allow users without manage-feed permission to modify auto-publish settings.
+    if (disabled) {
+      return (
+        <p className='lead'>
+          User is not authorized to modify auto-publish settings.
+        </p>
+      )
+    }
+    return (
+      <Col xs={7}>
+        {/* Settings */}
+        <Panel header={<h3>Auto-publish Settings</h3>}>
+          <ListGroup fill>
+            <ListGroupItem>
+              <FormGroup>
+                <Checkbox
+                  checked={feedSource.autoPublish}
+                  disabled={disabled}
+                  onChange={this._onToggleAutoPublish}
+                >
+                  <strong>Auto-publish this feed after auto-fetch</strong>
+                </Checkbox>
+                <small>
+                  Set this feed source to be automatically published
+                  when a new version is fetched automatically.
+                </small>
+              </FormGroup>
+            </ListGroupItem>
+          </ListGroup>
+        </Panel>
+      </Col>
+    )
+  }
+}
diff --git a/lib/manager/components/FeedSourceSettings.js b/lib/manager/components/FeedSourceSettings.js
index d00fcb6b8..46987f194 100644
--- a/lib/manager/components/FeedSourceSettings.js
+++ b/lib/manager/components/FeedSourceSettings.js
@@ -11,14 +11,16 @@ import {
 import {LinkContainer} from 'react-router-bootstrap'
 
 import * as feedsActions from '../actions/feeds'
+import {isExtensionEnabled} from '../../common/util/config'
 import toSentenceCase from '../../common/util/to-sentence-case'
+import type {Feed, Project} from '../../types'
+import type {ManagerUserState} from '../../types/reducers'
+
+import AutoPublishSettings from './AutoPublishSettings'
 import ExternalPropertiesTable from './ExternalPropertiesTable'
 import FeedTransformationSettings from './transform/FeedTransformationSettings'
 import GeneralSettings from './GeneralSettings'
 
-import type {Feed, Project} from '../../types'
-import type {ManagerUserState} from '../../types/reducers'
-
 type Props = {
   activeComponent: string,
   activeSubComponent: string,
@@ -35,9 +37,9 @@ export default class FeedSourceSettings extends Component<Props> {
     const {
       activeComponent,
       activeSubComponent,
-      updateExternalFeedResource,
       feedSource,
       project,
+      updateExternalFeedResource,
       user
     } = this.props
     const disabled = user.permissions && !user.permissions.hasFeedPermission(
@@ -46,8 +48,8 @@ export default class FeedSourceSettings extends Component<Props> {
     const isProjectAdmin = user.permissions && user.permissions.isProjectAdmin(
       project.id, project.organizationId
     )
-    const resourceType = activeComponent === 'settings' && activeSubComponent && activeSubComponent.toUpperCase()
-    const showTransformationsTab = resourceType === 'TRANSFORMATIONS'
+    const resourceType = activeComponent === 'settings' && activeSubComponent && activeSubComponent.toLowerCase()
+
     if (disabled) {
       return (
         <Row>
@@ -57,39 +59,12 @@ export default class FeedSourceSettings extends Component<Props> {
         </Row>
       )
     }
-    return (
-      <Row>
-        <Col xs={3}>
-          {/* Side panel */}
-          <Panel>
-            <ListGroup fill>
-              <LinkContainer
-                to={`/feed/${feedSource.id}/settings`}
-                active={!activeSubComponent}>
-                <ListGroupItem>General</ListGroupItem>
-              </LinkContainer>
-              <LinkContainer
-                to={`/feed/${feedSource.id}/settings/transformations`}
-                active={showTransformationsTab}>
-                <ListGroupItem>Feed Transformations</ListGroupItem>
-              </LinkContainer>
-              {Object.keys(feedSource.externalProperties || {}).map(resourceType => {
-                const resourceLowerCase = resourceType.toLowerCase()
-                return (
-                  <LinkContainer
-                    key={resourceType}
-                    to={`/feed/${feedSource.id}/settings/${resourceLowerCase}`}
-                    active={activeSubComponent === resourceLowerCase}>
-                    <ListGroupItem>{toSentenceCase(resourceType)} properties</ListGroupItem>
-                  </LinkContainer>
-                )
-              })}
-            </ListGroup>
-          </Panel>
-        </Col>
-        <Col xs={6} />
-        {!resourceType
-          ? <GeneralSettings
+
+    const tabs = [
+      {
+        condition: true,
+        render: () => (
+          <GeneralSettings
             confirmDeleteFeedSource={this.props.confirmDeleteFeedSource}
             disabled={disabled}
             feedSource={feedSource}
@@ -97,27 +72,85 @@ export default class FeedSourceSettings extends Component<Props> {
             updateFeedSource={this.props.updateFeedSource}
             user={user}
           />
-          : showTransformationsTab
-            ? <FeedTransformationSettings
-              disabled={disabled}
-              feedSource={feedSource}
-              project={project}
-              updateFeedSource={this.props.updateFeedSource}
-              user={user}
-            />
-            : <Col xs={7}>
+        ),
+        subPath: '',
+        title: 'General'
+      },
+      {
+        condition: true,
+        render: () => (
+          <FeedTransformationSettings
+            disabled={disabled}
+            feedSource={feedSource}
+            project={project}
+            updateFeedSource={this.props.updateFeedSource}
+            user={user}
+          />
+        ),
+        subPath: 'transformations',
+        title: 'Feed Transformations'
+      },
+      {
+        condition: isExtensionEnabled('mtc'),
+        render: () => (
+          <AutoPublishSettings
+            disabled={disabled}
+            feedSource={feedSource}
+            updateFeedSource={this.props.updateFeedSource}
+          />
+        ),
+        subPath: 'autopublish',
+        title: 'Auto-publish'
+      },
+      ...Object.keys(feedSource.externalProperties || {}).map(resourceType => {
+        const resourceLowerCase = resourceType.toLowerCase()
+        return {
+          condition: true,
+          render: () => (
+            <Col xs={7}>
               <ExternalPropertiesTable
-                resourceType={resourceType}
-                feedSource={feedSource}
                 editingIsDisabled={disabled}
+                feedSource={feedSource}
                 isProjectAdmin={isProjectAdmin}
                 resourceProps={feedSource.externalProperties
                   ? feedSource.externalProperties[resourceType]
                   : {}
                 }
+                resourceType={resourceType.toUpperCase()}
                 updateExternalFeedResource={updateExternalFeedResource} />
             </Col>
+          ),
+          subPath: resourceLowerCase,
+          title: `${toSentenceCase(resourceType)} properties`
         }
+      })
+    ]
+
+    const activeTab = tabs.find(tab => resourceType === tab.subPath) || tabs[0]
+
+    return (
+      <Row>
+        <Col xs={3}>
+          {/* Side panel */}
+          <Panel>
+            <ListGroup fill>
+              {tabs.map((tab, index) => {
+                return (
+                  <LinkContainer
+                    active={resourceType === tab.subPath}
+                    key={index}
+                    to={`/feed/${feedSource.id}/settings${tab.subPath === '' ? '' : `/${tab.subPath}`}`}
+                  >
+                    <ListGroupItem>{tab.title}</ListGroupItem>
+                  </LinkContainer>
+                )
+              })}
+            </ListGroup>
+          </Panel>
+        </Col>
+        <Col xs={6} />
+
+        {activeTab.render()}
       </Row>
     )
   }
diff --git a/lib/manager/components/GeneralSettings.js b/lib/manager/components/GeneralSettings.js
index 971dba754..59f0ad2ac 100644
--- a/lib/manager/components/GeneralSettings.js
+++ b/lib/manager/components/GeneralSettings.js
@@ -17,7 +17,6 @@ import {
 
 import * as feedsActions from '../actions/feeds'
 import { FREQUENCY_INTERVALS } from '../../common/constants'
-import { isExtensionEnabled } from '../../common/util/config'
 import LabelAssigner from '../components/LabelAssigner'
 import type { Feed, FetchFrequency, Project } from '../../types'
 import type { ManagerUserState } from '../../types/reducers'
@@ -70,12 +69,6 @@ export default class GeneralSettings extends Component<Props, State> {
     updateFeedSource(feedSource, {retrievalMethod: value})
   }
 
-  // FIXME_QBD: refactor similar code (See CreateFeedSource).
-  _onToggleAutoPublish = () => {
-    const {feedSource, updateFeedSource} = this.props
-    updateFeedSource(feedSource, {autoPublish: !feedSource.autoPublish})
-  }
-
   _onSelectFetchInterval = (fetchInterval: number) => {
     const {feedSource, updateFeedSource} = this.props
     updateFeedSource(feedSource, {fetchInterval})
@@ -208,28 +201,6 @@ export default class GeneralSettings extends Component<Props, State> {
             </ListGroupItem>
           </ListGroup>
         </Panel>
-        {isExtensionEnabled('mtc') && (
-          <Panel header={<h3>Automatic publishing</h3>}>
-            <ListGroup fill>
-              <ListGroupItem>
-                <FormGroup>
-                  <Checkbox
-                    checked={feedSource.autoPublish}
-                    disabled={disabled}
-                    onChange={this._onToggleAutoPublish}
-                    bsStyle='danger'
-                  >
-                    <strong>Auto-publish this feed</strong>
-                  </Checkbox>
-                  <small>
-                    Set this feed source to be automatically published
-                    when a new version is created.
-                  </small>
-                </FormGroup>
-              </ListGroupItem>
-            </ListGroup>
-          </Panel>
-        )}
         <Panel header={<h3>Labels</h3>}>
           <LabelAssigner feedSource={feedSource} project={project} />
         </Panel>

From e0489a8214fb20087fbef04f8508afa265a07c37 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 7 Dec 2021 11:03:20 -0800
Subject: [PATCH 456/553] chore(TransformationsViewer): subtle code cleanup

---
 lib/manager/components/TransformationsViewer.js     | 2 +-
 lib/manager/components/version/FeedVersionViewer.js | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/manager/components/TransformationsViewer.js b/lib/manager/components/TransformationsViewer.js
index 1a77bfcad..87a5bb2c2 100644
--- a/lib/manager/components/TransformationsViewer.js
+++ b/lib/manager/components/TransformationsViewer.js
@@ -45,7 +45,7 @@ export default class TransformationsViewer extends Component<Props> {
         )
       })
       return (
-        <Panel header={<h3>Transformations:</h3>}>
+        <Panel header={<h3>Transformations</h3>}>
           <ListGroup>
             {transformContent}
           </ListGroup>
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index b44331f0c..a2d648ad9 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -223,14 +223,12 @@ class VersionSectionSelector extends Component<SelectorProps> {
 
   // Render the number of transformations applied to the current feed version
   _renderTransformResultsCount = (version: FeedVersion) => {
-    let totalCount
+    let totalCount = 0
     if (version.feedTransformResult) {
       const {tableTransformResults} = version.feedTransformResult
       totalCount = tableTransformResults.reduce((prev, cur) => {
         return cur.deletedCount + cur.updatedCount + cur.addedCount + prev
       }, 0)
-    } else {
-      totalCount = 0
     }
     return (
       <BsLabel>
@@ -264,7 +262,7 @@ class VersionSectionSelector extends Component<SelectorProps> {
             to={`${versionPath}/transformations`}
           >
             <ListGroupItem>
-              <Icon type='exclamation-triangle' /> Transformation Results {this._renderTransformResultsCount(version)}
+              <Icon type='exchange' /> Transformation Results {this._renderTransformResultsCount(version)}
             </ListGroupItem>
           </LinkContainer>
           {isModuleEnabled('gtfsplus')

From a297c0036b0f1b8b1809e1298f50c85d23539b67 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 7 Dec 2021 11:04:55 -0800
Subject: [PATCH 457/553] chore(util): remove any type

---
 lib/editor/util/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/editor/util/index.js b/lib/editor/util/index.js
index f2d099fb4..d80b94ec5 100644
--- a/lib/editor/util/index.js
+++ b/lib/editor/util/index.js
@@ -155,7 +155,7 @@ export function getEditorTable (component: string) {
 /**
  * Returns a dictionary from the table spec with the options for route status
  */
-export function getRouteStatusDict (): any {
+export function getRouteStatusDict (): { [string]: string } {
   const table = getEditorTable('route')
   if (table) {
     const statusField = table.fields.find(field => field.name === 'status')

From 6b3475b79e7ad14161fa4a56f8f25a30d5871338 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 7 Dec 2021 11:26:29 -0800
Subject: [PATCH 458/553] chore(editor): attempt at cleaning up types

---
 lib/editor/components/CreateSnapshotModal.js | 4 ++--
 lib/editor/util/index.js                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 63668cbf6..d580fed1b 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -106,7 +106,7 @@ class CreateSnapshotModal extends Component<Props, State> {
     const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal, loading} = this.state
     const {routes} = this.props
     const routeStatusDict = getRouteStatusDict()
-    const unapprovedRoutes = routeStatusDict ? routes.filter(route => route.hasOwnProperty('status') && route.status !== ROUTE_STATUS_CODES.APPROVED) : []
+    const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== ROUTE_STATUS_CODES.APPROVED)
 
     return (
       <Modal show={showModal} onHide={this.close}>
@@ -155,7 +155,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               <ul>
                 {
                   unapprovedRoutes.map(route => (
-                    <li key={route.route_id}>{getEntityName(route)}: {routeStatusDict[parseInt(route.status)].text}</li>
+                    <li key={route.route_id}>{getEntityName(route)}: {routeStatusDict[parseInt(route.status)]}</li>
                   ))
                 }
               </ul>
diff --git a/lib/editor/util/index.js b/lib/editor/util/index.js
index d80b94ec5..a81d296bb 100644
--- a/lib/editor/util/index.js
+++ b/lib/editor/util/index.js
@@ -155,13 +155,13 @@ export function getEditorTable (component: string) {
 /**
  * Returns a dictionary from the table spec with the options for route status
  */
-export function getRouteStatusDict (): { [string]: string } {
+export function getRouteStatusDict (): { [number]: string } {
   const table = getEditorTable('route')
   if (table) {
     const statusField = table.fields.find(field => field.name === 'status')
     if (statusField && statusField.options) {
       return statusField.options.reduce((prevVal, curVal) => {
-        prevVal[curVal.value] = curVal
+        prevVal[curVal.value] = curVal.text
         return prevVal
       }, {})
     }

From 82744c7d0699c6c65b57ed31d45c97200a554fe8 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 7 Dec 2021 11:32:00 -0800
Subject: [PATCH 459/553] chore(editor): attempt at cleaning up types

---
 lib/editor/components/CreateSnapshotModal.js | 4 ++--
 lib/editor/util/index.js                     | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 63668cbf6..d580fed1b 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -106,7 +106,7 @@ class CreateSnapshotModal extends Component<Props, State> {
     const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal, loading} = this.state
     const {routes} = this.props
     const routeStatusDict = getRouteStatusDict()
-    const unapprovedRoutes = routeStatusDict ? routes.filter(route => route.hasOwnProperty('status') && route.status !== ROUTE_STATUS_CODES.APPROVED) : []
+    const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== ROUTE_STATUS_CODES.APPROVED)
 
     return (
       <Modal show={showModal} onHide={this.close}>
@@ -155,7 +155,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               <ul>
                 {
                   unapprovedRoutes.map(route => (
-                    <li key={route.route_id}>{getEntityName(route)}: {routeStatusDict[parseInt(route.status)].text}</li>
+                    <li key={route.route_id}>{getEntityName(route)}: {routeStatusDict[parseInt(route.status)]}</li>
                   ))
                 }
               </ul>
diff --git a/lib/editor/util/index.js b/lib/editor/util/index.js
index d80b94ec5..4f9f4d29b 100644
--- a/lib/editor/util/index.js
+++ b/lib/editor/util/index.js
@@ -155,16 +155,20 @@ export function getEditorTable (component: string) {
 /**
  * Returns a dictionary from the table spec with the options for route status
  */
-export function getRouteStatusDict (): { [string]: string } {
+export function getRouteStatusDict (): { [number]: string } {
   const table = getEditorTable('route')
   if (table) {
     const statusField = table.fields.find(field => field.name === 'status')
     if (statusField && statusField.options) {
       return statusField.options.reduce((prevVal, curVal) => {
-        prevVal[curVal.value] = curVal
+        prevVal[curVal.value] = curVal.text
         return prevVal
       }, {})
+    } else {
+      return {}
     }
+  } else {
+    return {}
   }
 }
 

From c00e7ad5da3feba99eefbb9d3121d4bc6ce06f25 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 8 Dec 2021 11:59:18 -0500
Subject: [PATCH 460/553] improvement(manager/actions/status): Display remapped
 tables and ids alphabetically.

---
 lib/manager/actions/status.js | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index e5716fe7e..74562912e 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -158,10 +158,7 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
 
   if (failed) {
     if (tripIdsToCheck && tripIdsToCheck.length > 0) {
-      const tripIdListItems = []
-      tripIdsToCheck.map(id => {
-        tripIdListItems.push(<li key={id.toString()}>{id}</li>)
-      })
+      const tripIdListItems = tripIdsToCheck.map(id => <li key={id.toString()}>{id}</li>)
       details.push(<div>{messages('tripIdsToCheck').replace('%tripIdCount%', tripIdsToCheck.length.toString())}</div>)
       details.push(<ul>{tripIdListItems}</ul>)
     }
@@ -177,15 +174,14 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
       </div>
     )
     if (Object.keys(remappedIds).length > 0) {
-      const remappedIdStrings = []
-      for (const key in remappedIds) {
+      // Sort remapped keys so that table names
+      // (the first portion of the keys) appear alphabetically.
+      const remappedIdStrings = Object.keys(remappedIds).sort().map(key => {
         // Modify key to remove feed name.
         const split = key.split(':')
-        const tableAndId = split.splice(1, 1)
-        remappedIdStrings.push(
-          <li key={key}>{tableAndId.join(':')} -> {remappedIds[key]}</li>
-        )
-      }
+        split.splice(1, 1) // Reminder: splice() modifies the original array.
+        return <li key={key}>{split.join(':')} -> {remappedIds[key]}</li>
+      })
       details.push(<ul>{remappedIdStrings}</ul>)
     }
     if (skippedIds.length > 0) {
@@ -195,13 +191,12 @@ function getMergeFeedModalContent (result: MergeFeedsResult): ModalContent {
         // Increment count of skipped records for each value found per table.
         skippedRecordsForTables[table] = (skippedRecordsForTables[table] || 0) + 1
       })
-      const skippedRecordsStrings = []
-      for (const key in skippedRecordsForTables) {
+      const skippedRecordsStrings = Object.keys(skippedRecordsForTables).map(key => {
         const tableItem = messages('skippedTableRecords')
           .replace('%table%', key)
           .replace('%skippedCount%', skippedRecordsForTables[key])
-        skippedRecordsStrings.push(<li key={key}>{tableItem}</li>)
-      }
+        return <li key={key}>{tableItem}</li>
+      })
       details.push(<div>{messages('skipped')}</div>)
       details.push(<ul>{skippedRecordsStrings}</ul>)
     }

From 8c18b7adf5ab59e5a6ca04298e6ff2aae40c244a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 8 Dec 2021 12:34:29 -0500
Subject: [PATCH 461/553] improvement(feed versions): Address PR comments

---
 lib/manager/actions/versions.js                      | 5 ++++-
 lib/manager/components/CreateFeedSource.js           | 2 +-
 lib/manager/components/FeedSourceSettings.js         | 2 +-
 lib/manager/components/version/FeedVersionDetails.js | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 4ce158c6b..b4dc133fb 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -162,9 +162,12 @@ export function publishFeedVersion (feedVersion: FeedVersion) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     if (
       feedVersion.feedSource.autoPublish &&
+      feedVersion.sentToExternalPublisher &&
       !window.confirm('Are you sure you want publish this feed version again?')
     ) {
-      // For feed set to auto-publish, if the user does not confirm, do nothing.
+      // For a feed source set to auto-publish,
+      // if the version has already been sent to publishing
+      // and the user does not confirm, do nothing.
       return
     }
     const url = `${SECURE_API_PREFIX}feedversion/${feedVersion.id}/publish`
diff --git a/lib/manager/components/CreateFeedSource.js b/lib/manager/components/CreateFeedSource.js
index 63fdf2bb7..755ff1034 100644
--- a/lib/manager/components/CreateFeedSource.js
+++ b/lib/manager/components/CreateFeedSource.js
@@ -249,7 +249,7 @@ export default class CreateFeedSource extends Component<Props, State> {
                     </Checkbox>
                     <small>
                       Set this feed source to be automatically published
-                      when a new version is created.
+                      when a new version is automatically fetched.
                     </small>
                   </FormGroup>
                 </ListGroupItem>
diff --git a/lib/manager/components/FeedSourceSettings.js b/lib/manager/components/FeedSourceSettings.js
index 46987f194..55e698e56 100644
--- a/lib/manager/components/FeedSourceSettings.js
+++ b/lib/manager/components/FeedSourceSettings.js
@@ -48,7 +48,7 @@ export default class FeedSourceSettings extends Component<Props> {
     const isProjectAdmin = user.permissions && user.permissions.isProjectAdmin(
       project.id, project.organizationId
     )
-    const resourceType = activeComponent === 'settings' && activeSubComponent && activeSubComponent.toLowerCase()
+    const resourceType = activeComponent === ('settings' && activeSubComponent && activeSubComponent.toLowerCase()) || ''
 
     if (disabled) {
       return (
diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index 47c4a3b48..5e6bb1f2f 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -129,7 +129,7 @@ export default class FeedVersionDetails extends Component<Props> {
           </span>
         )
       } else if (feedSource.autoPublish) {
-        publishWarningMessage = 'Reminder: this feed is already set to be auto-published!'
+        publishWarningMessage = 'Reminder: this feed is already set to be auto-published after auto-fetch!'
       }
     }
 

From 007ae6fff26e0b8c95278eaa293b7ebb9cf902ff Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Wed, 8 Dec 2021 14:23:19 -0800
Subject: [PATCH 462/553] refactor(editor): suggested PR changes for formatting

---
 i18n/english.yml                             |  4 +--
 i18n/polish.yml                              |  2 +-
 lib/editor/components/CreateSnapshotModal.js | 27 +++++++++++---------
 lib/editor/reducers/data.js                  |  8 +++---
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index a46d2713c..513138604 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -24,8 +24,8 @@ components:
         label: Publish snapshot as new feed version
       confirmPublishWithUnapproved:
         label: Confirm publish with unapproved routes 
-    unapprovedRoutesHeader: "The following routes are not approved:"
-    unapprovedRoutesDesc: These routes will not be included in the output.
+    unapprovedRoutesHeader: "The following routes are not approved"
+    unapprovedRoutesDesc: "These routes will not be included in the output:"
     missingNameAlert: Must give snapshot a valid name!
     ok: OK
     title: Create a new snapshot
diff --git a/i18n/polish.yml b/i18n/polish.yml
index 9be66de4b..131b3d31d 100644
--- a/i18n/polish.yml
+++ b/i18n/polish.yml
@@ -25,7 +25,7 @@ components:
       confirmPublishWithUnapproved:
         label: Potwierdź publikację z niezatwierdzonymi trasami 
     unapprovedRoutesHeader: "Następujące trasy nie są akceptowane:"
-    unapprovedRoutesDesc: Trasy te nie zostaną uwzględnione w danych wyjściowych.
+    unapprovedRoutesDesc: "Trasy te nie zostaną uwzględnione w danych wyjściowych:"
     missingNameAlert: Migawce należy nadać prawidłową nazwę!
     ok: OK
     title: Utwórz nową migawkę
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index d580fed1b..567074905 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -12,14 +12,14 @@ import {
 } from 'react-bootstrap'
 import {connect} from 'react-redux'
 
+import * as activeActions from '../actions/active'
 import * as snapshotActions from '../actions/snapshots'
-import {getComponentMessages} from '../../common/util/config'
 import { getRouteStatusDict, ROUTE_STATUS_CODES } from '../util'
+import {getComponentMessages} from '../../common/util/config'
+import {getEntityName} from '../util/gtfs'
 import {formatTimestamp} from '../../common/util/date-time'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState, LockState} from '../../types/reducers'
-import * as activeActions from '../actions/active'
-import {getEntityName} from '../util/gtfs'
 type Props = {
   createSnapshot: typeof snapshotActions.createSnapshot,
   feedSource: Feed,
@@ -52,7 +52,6 @@ class CreateSnapshotModal extends Component<Props, State> {
   state = getDefaultState()
 
   messages = getComponentMessages('CreateSnapshotModal')
-  onClose = null
 
   _onTogglePublish = (e: SyntheticInputEvent<HTMLInputElement>) => {
     this.setState({[e.target.name]: e.target.checked})
@@ -67,7 +66,6 @@ class CreateSnapshotModal extends Component<Props, State> {
   }
 
   close = () => {
-    if (this.onClose) { this.onClose() }
     this.setState(getDefaultState())
   }
 
@@ -81,9 +79,7 @@ class CreateSnapshotModal extends Component<Props, State> {
     }
   }
 
-  open (onClose) {
-    this.onClose = onClose
-
+  open () {
     const {fetchRouteEntities, feedSource} = this.props
     this.setState({loading: true})
     fetchRouteEntities(feedSource)
@@ -103,7 +99,14 @@ class CreateSnapshotModal extends Component<Props, State> {
 
   render () {
     const {Body, Footer, Header, Title} = Modal
-    const {comment, name, publishNewVersion, confirmPublishWithUnapproved, showModal, loading} = this.state
+    const {
+      comment,
+      confirmPublishWithUnapproved,
+      loading,
+      name,
+      publishNewVersion,
+      showModal
+    } = this.state
     const {routes} = this.props
     const routeStatusDict = getRouteStatusDict()
     const unapprovedRoutes = routes.filter(route => route.hasOwnProperty('status') && route.status !== ROUTE_STATUS_CODES.APPROVED)
@@ -151,7 +154,7 @@ class CreateSnapshotModal extends Component<Props, State> {
           {unapprovedRoutes.length > 0 &&
             <div>
               <h4>{this.messages('unapprovedRoutesHeader')}</h4>
-              <h5>{this.messages('unapprovedRoutesDesc')}</h5>
+              <p>{this.messages('unapprovedRoutesDesc')}</p>
               <ul>
                 {
                   unapprovedRoutes.map(route => (
@@ -161,8 +164,8 @@ class CreateSnapshotModal extends Component<Props, State> {
               </ul>
               <FormGroup>
                 <Checkbox
-                  name='confirmPublishWithUnapproved'
                   checked={confirmPublishWithUnapproved}
+                  name='confirmPublishWithUnapproved'
                   onChange={this._onTogglePublishUnapproved}>
                   {this.messages('fields.confirmPublishWithUnapproved.label')}
                 </Checkbox>
@@ -174,9 +177,9 @@ class CreateSnapshotModal extends Component<Props, State> {
         <Footer>
           <Button
             bsStyle='primary'
+            disabled={unapprovedRoutes.length > 0 && !confirmPublishWithUnapproved}
             data-test-id='confirm-snapshot-create-button'
             onClick={this.ok}
-            disabled={unapprovedRoutes.length > 0 && !confirmPublishWithUnapproved}
           >
             {this.messages('ok')}
           </Button>
diff --git a/lib/editor/reducers/data.js b/lib/editor/reducers/data.js
index c5c101ef3..b4811af8b 100644
--- a/lib/editor/reducers/data.js
+++ b/lib/editor/reducers/data.js
@@ -7,12 +7,12 @@ import SortDirection from 'react-virtualized/dist/commonjs/Table/SortDirection'
 import {decodeShapePolylines} from '../../common/util/gtfs'
 import {defaultSorter} from '../../common/util/util'
 import {ENTITY} from '../constants'
+import {ROUTE_STATUS_CODES} from '../util'
 import {generateNullProps, getTableById, getKeyForId} from '../util/gtfs'
 import {getMapToGtfsStrategy, entityIsNew} from '../util/objects'
 import {assignDistancesToPatternStops, constructShapePoints} from '../util/map'
 import type {Action} from '../../types/actions'
 import type {DataState} from '../../types/reducers'
-import { ROUTE_STATUS_CODES } from '../util'
 
 // If updating a trip pattern, new props apply to sub entity and edited
 // boolean updated is patternEdited.
@@ -218,15 +218,15 @@ const data = (state: DataState = defaultState, action: Action): DataState => {
       const {entityKey, editedKey} = getUpdateEntityKeys(component)
 
       // When a route gets edited, set its status to "In Progress"
-      const additional = {}
+      const additionalProps = {}
       if (component === 'route' && !props.status) {
-        additional.status = ROUTE_STATUS_CODES.IN_PROGRESS
+        additionalProps.status = ROUTE_STATUS_CODES.IN_PROGRESS
       }
       // FIXME: Check for pattern stops props (what about other sequenced lists)
       // and update stop sequence.
       return update(state, {
         active: {
-          [entityKey]: {$merge: {...props, ...additional}},
+          [entityKey]: {$merge: {...props, ...additionalProps}},
           [editedKey]: {$set: true}
         }
       })

From 5d7d02d645c39f1129bc1f283f55eda14fba2779 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Thu, 9 Dec 2021 14:11:55 +0100
Subject: [PATCH 463/553] refactor(PeliasPanel): clean up

---
 lib/manager/components/deployment/PeliasPanel.js | 14 +++++++-------
 lib/types/index.js                               |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index 8ae6f1ff9..c30696a6d 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -175,8 +175,7 @@ class PeliasPanel extends Component<Props, State> {
       return null
     }
 
-    // const peliasButtonsDisabled = !deployment || (deployment.ec2Instances && deployment.ec2Instances.length === 0)
-    const peliasButtonsDisabled = false
+    const peliasButtonsDisabled = !deployment || (deployment.ec2Instances && deployment.ec2Instances.length === 0)
 
     return (
       <Panel
@@ -189,8 +188,8 @@ class PeliasPanel extends Component<Props, State> {
         <ListGroup fill>
 
           <ListGroupItem>
-            <ButtonToolbar>
-              <h5>Update Local Places Index</h5>
+            <ButtonToolbar style={{display: 'flex', flexDirection: 'row'}}>
+              <h5>Local Places Index</h5>
               <ButtonGroup title={peliasButtonsDisabled ? 'Local Places Index can only be updated if there is a running OTP instance' : ''}>
                 {/* If there are no deployments don't allow user to update Pelias yet */}
                 <Button
@@ -200,13 +199,13 @@ class PeliasPanel extends Component<Props, State> {
                   Update
                 </Button>
                 <Button
-                  onClick={() => this.refs.reInitLpiModal.open()}
+                  onClick={() => this.refs.reInitPeliasModal.open()}
                   disabled={peliasButtonsDisabled}
                 >Reset</Button>
               </ButtonGroup>
             </ButtonToolbar>
             <ConfirmModal
-              ref='reInitLpiModal'
+              ref='reInitPeliasModal'
               title='Are you sure you want to rebuild the Local Places Index database?'
               body='This will cause custom geocoder responses to be unavailable for about 1 - 5 minutes after deploying. Regular addresses and landmarks will continue to be available. Stops and stations from feeds that are not part of this deployment will be removed from the suggestions.'
               onConfirm={this._onClickPeliasReset}
@@ -228,10 +227,11 @@ class PeliasPanel extends Component<Props, State> {
             <ul>
               {deployment.peliasCsvFiles &&
                 deployment.peliasCsvFiles.map((url) =>
-                  this.renderCsvUrl(url, true)
+                  this.renderCsvUrl(url, !peliasButtonsDisabled)
                 )}
             </ul>
             <Button
+              disabled={peliasButtonsDisabled}
               style={{ marginTop: '5px' }}
               onClick={() => this.refs.uploadModal.open()}
             >
diff --git a/lib/types/index.js b/lib/types/index.js
index 4516d1df5..ec2245735 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -798,8 +798,8 @@ export type Project = {
   peliasWebhookUrl: ?string,
   pinnedDeploymentId: ?string,
   routerConfig: RouterConfig,
-  useCustomOsmBounds: boolean, // TODO: define more specific type
-  user: ?any
+  useCustomOsmBounds: boolean,
+  user: ?any // TODO: define more specific type
 }
 
 export type ReactSelectOption = {

From f6d2673274b4a048983df551619d15b89de8b204 Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Tue, 4 Jan 2022 10:07:05 +0100
Subject: [PATCH 464/553] refactor: address pr comments

---
 lib/manager/actions/deployments.js               | 4 ++--
 lib/manager/components/ProjectSettingsForm.js    | 7 +++++--
 lib/manager/components/deployment/PeliasPanel.js | 6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index d20b71733..8a4e59872 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -88,7 +88,7 @@ export function deployToTarget (deployment: Deployment, target: string) {
         // FIXME: Use standard handleJobResponse for deployment job
         if (response.status >= 400 || response.status === 202) {
           // If there is an issue with the deployment, return the JSON response
-          // (handled be below alert)
+          // (handled below alert)
           return response.json()
         } else {
           // If the deployment request succeeded, start monitoring the job.
@@ -114,7 +114,7 @@ export function updatePelias (deployment: Deployment, resetDb?: boolean) {
         // FIXME: Use standard handleJobResponse for deployment job
         if (response.status >= 400 || response.status === 202) {
           // If there is an issue with the deployment, return the JSON response
-          // (handled be below alert)
+          // (handled below alert)
           return response.json()
         } else {
           // If the deployment request succeeded, start monitoring the job.
diff --git a/lib/manager/components/ProjectSettingsForm.js b/lib/manager/components/ProjectSettingsForm.js
index cffbeb594..8aa8058dd 100644
--- a/lib/manager/components/ProjectSettingsForm.js
+++ b/lib/manager/components/ProjectSettingsForm.js
@@ -341,6 +341,9 @@ export default class ProjectSettingsForm extends Component<Props, State> {
                     onChange={this._onChangeBounds}
                   />
                   {<InputGroup.Button>
+                    {/* TODO: wait for react-leaflet-draw to update library
+                    to re-enable bounds select. This button appears to be permanently
+                    disabled. The git blame history may provide more detail. */}
                     <Button disabled onClick={this._onOpenMapBoundsModal}>
                       <Glyphicon glyph='fullscreen' />
                     </Button>
@@ -393,11 +396,11 @@ export default class ProjectSettingsForm extends Component<Props, State> {
         </Panel>}
         <Row>
           <Col xs={12}>
-            {}
+            {/* Cancel Button */}
             <Button onClick={this._onCancel} style={{ marginRight: 10 }}>
               {this.messages('cancel')}
             </Button>
-            {}
+            {/* Save Button */}
             <Button
               bsStyle='primary'
               data-test-id='project-settings-form-save-button'
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index c30696a6d..bae72f65b 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -36,12 +36,16 @@ class PeliasPanel extends Component<Props, State> {
     fileToDeleteOnSuccesfulUpload: null
   };
 
+  /**
+   * Method fired when Pelias *Update* button is pressed
+   */
   _onClickPeliasUpdate = () => {
     const {deployment, updatePelias} = this.props
     updatePelias(deployment)
   }
   /**
-   *  Method fired when Pelias Update checkbox is checked
+   * Method fired when Pelias *Reset* button is pressed. The true
+   * flag tells the webhook to wipe the Pelias database before updating.
    */
   _onClickPeliasReset = () => {
     const {deployment, updatePelias} = this.props

From d805f719d297bdf3e8dfc36e0ad5103766c45072 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 4 Jan 2022 11:11:02 -0500
Subject: [PATCH 465/553] fix(FeedSourceSettings): Fix unresponsive tab
 selection.

---
 lib/manager/components/FeedSourceSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/manager/components/FeedSourceSettings.js b/lib/manager/components/FeedSourceSettings.js
index 55e698e56..6a4f2bf2b 100644
--- a/lib/manager/components/FeedSourceSettings.js
+++ b/lib/manager/components/FeedSourceSettings.js
@@ -48,7 +48,7 @@ export default class FeedSourceSettings extends Component<Props> {
     const isProjectAdmin = user.permissions && user.permissions.isProjectAdmin(
       project.id, project.organizationId
     )
-    const resourceType = activeComponent === ('settings' && activeSubComponent && activeSubComponent.toLowerCase()) || ''
+    const resourceType = (activeComponent === 'settings' && activeSubComponent && activeSubComponent.toLowerCase()) || ''
 
     if (disabled) {
       return (

From d54487d073e50a690bb2b86508e913d724186e8e Mon Sep 17 00:00:00 2001
From: miles-grant-ibigroup <miles.grant@ibigroup.com>
Date: Wed, 5 Jan 2022 11:49:07 +0100
Subject: [PATCH 466/553] refactor: address pr feedback

---
 __tests__/test-utils/mock-data/manager.js     |  8 +--
 lib/manager/actions/deployments.js            |  8 +--
 lib/manager/components/ProjectSettingsForm.js | 50 ++++++++++---------
 .../components/deployment/DeploymentViewer.js |  2 +-
 .../components/deployment/PeliasPanel.js      |  1 -
 5 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index 834eeb9e7..fc6d652c2 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -54,15 +54,15 @@ export function makeMockDeployment (
     osmExtractUrl: null,
     otpCommit: null,
     otpVersion: null,
+    peliasCsvFiles: [],
+    peliasResetDb: null,
+    peliasUpdate: null,
     pinnedfeedVersionIds: [],
-    projectId: project.id,
     projectBounds: {east: 0, west: 0, north: 0, south: 0},
+    projectId: project.id,
     routerId: null,
     skipOsmExtract: false,
     tripPlannerVersion: 'OTP_1',
-    peliasUpdate: null,
-    peliasResetDb: null,
-    peliasCsvFiles: [],
     user: null
   }
 }
diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 8a4e59872..52f490e77 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -109,13 +109,13 @@ export function updatePelias (deployment: Deployment, resetDb?: boolean) {
       await dispatch(updateDeployment(deployment, {peliasResetDb: true}))
     }
     const {id} = deployment
-    return dispatch(secureFetch(`${DEPLOYMENT_URL}/${id}/updatepelias`, 'post'))
+    dispatch(secureFetch(`${DEPLOYMENT_URL}/${id}/updatepelias`, 'post'))
       .then(response => {
         // FIXME: Use standard handleJobResponse for deployment job
         if (response.status >= 400 || response.status === 202) {
-          // If there is an issue with the deployment, return the JSON response
-          // (handled below alert)
-          return response.json()
+          // If there is an issue starting the update, don't launch the job monitor
+          // (instead handle the error in the next promise block)
+          return
         } else {
           // If the deployment request succeeded, start monitoring the job.
           dispatch(startJobMonitor())
diff --git a/lib/manager/components/ProjectSettingsForm.js b/lib/manager/components/ProjectSettingsForm.js
index 8aa8058dd..b5794e97e 100644
--- a/lib/manager/components/ProjectSettingsForm.js
+++ b/lib/manager/components/ProjectSettingsForm.js
@@ -272,7 +272,7 @@ export default class ProjectSettingsForm extends Component<Props, State> {
       )
     }
     return (
-      (<div>
+      <div>
         <ConfirmModal ref='confirm' />
         <Panel header={<h4>{this.messages('title')}</h4>}>
           <ListGroup fill>
@@ -305,13 +305,13 @@ export default class ProjectSettingsForm extends Component<Props, State> {
                 </Checkbox>
                 {autoFetchChecked
                   ? <DateTimeField
-                    dateTime={typeof autoFetchMinute === 'number' &&
-                typeof autoFetchHour === 'number'
-                      ? +moment().startOf('day').add(autoFetchHour, 'hours').add(
-                        autoFetchMinute,
-                        'minutes'
-                      )
-                      : DEFAULT_FETCH_TIME}
+                    dateTime={
+                      typeof autoFetchMinute === 'number' && typeof autoFetchHour === 'number'
+                        ? +moment().startOf('day').add(autoFetchHour, 'hours').add(
+                          autoFetchMinute,
+                          'minutes'
+                        )
+                        : DEFAULT_FETCH_TIME}
                     mode='time'
                     onChange={this._onChangeDateTime}
                   />
@@ -379,21 +379,23 @@ export default class ProjectSettingsForm extends Component<Props, State> {
           </ListGroup>
         </Panel>
         {showDangerZone &&
-        <Panel bsStyle='danger' header={<h3>Danger zone</h3>}>
-          <ListGroup fill>
-            <ListGroupItem>
-              <Button
-                bsStyle='danger'
-                className='pull-right'
-                data-test-id='delete-project-button'
-                onClick={this._onDeleteProject}>
-                <Icon type='trash' /> Delete project
-              </Button>
-              <h4>Delete this project.</h4>
-              <p>Once you delete an project, the project and all feed sources it contains cannot be recovered.</p>
-            </ListGroupItem>
-          </ListGroup>
-        </Panel>}
+          <Panel bsStyle='danger' header={<h3>Danger zone</h3>}>
+            <ListGroup fill>
+              <ListGroupItem>
+                <Button
+                  bsStyle='danger'
+                  className='pull-right'
+                  data-test-id='delete-project-button'
+                  onClick={this._onDeleteProject}
+                >
+                  <Icon type='trash' /> Delete project
+                </Button>
+                <h4>Delete this project.</h4>
+                <p>Once you delete an project, the project and all feed sources it contains cannot be recovered.</p>
+              </ListGroupItem>
+            </ListGroup>
+          </Panel>
+        }
         <Row>
           <Col xs={12}>
             {/* Cancel Button */}
@@ -412,7 +414,7 @@ export default class ProjectSettingsForm extends Component<Props, State> {
           </Col>
         </Row>
         <MapModal ref='mapModal' />
-      </div>)
+      </div>
     )
   }
 }
diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index e71e14446..919cf539f 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -401,8 +401,8 @@ export default class DeploymentViewer extends Component<Props, State> {
             {/* Pelias panel */}
             <PeliasPanel
               deployment={deployment}
-              updateDeployment={updateDeployment}
               project={project}
+              updateDeployment={updateDeployment}
             />
           </Col>
           <Col sm={3}>
diff --git a/lib/manager/components/deployment/PeliasPanel.js b/lib/manager/components/deployment/PeliasPanel.js
index bae72f65b..e73e2bc66 100644
--- a/lib/manager/components/deployment/PeliasPanel.js
+++ b/lib/manager/components/deployment/PeliasPanel.js
@@ -190,7 +190,6 @@ class PeliasPanel extends Component<Props, State> {
         }
       >
         <ListGroup fill>
-
           <ListGroupItem>
             <ButtonToolbar style={{display: 'flex', flexDirection: 'row'}}>
               <h5>Local Places Index</h5>

From 67615f84cc7d89949f8cd870aaa195c96db75041 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 6 Jan 2022 17:00:15 -0500
Subject: [PATCH 467/553] improvement(FeedSourceTableRow): Add indicator for
 autopublished feeds.

---
 i18n/english.yml                             | 29 ++++++++++++--------
 lib/manager/actions/versions.js              | 10 -------
 lib/manager/components/FeedSourceTableRow.js | 17 +++++++++---
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index cf9c39c32..259293a0f 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -225,18 +225,25 @@ components:
       PUBLISHED: Published Version
     createFirst: Create first feed source!
   FeedSourceTableRow:
+    badges:
+      autoFetch: Auto fetch
+      autoPublish: Auto publish
+      deployable: Deployable
+      edit: Edit
+      private: Private
+      public: Public
     status:
-        active: Active
-        all: All
-        expired: Expired
-        expiring-within-20-days: Expiring within 20 days
-        expiring-within-5-days: Expiring within 5 days
-        feedNotInDeployment: Feed not in deployment
-        feedNotPublished: Feed not published
-        future: Future
-        no-version: No version
-        same-as-deployed: Same as Deployed
-        same-as-published: Same as Published
+      active: Active
+      all: All
+      expired: Expired
+      expiring-within-20-days: Expiring within 20 days
+      expiring-within-5-days: Expiring within 5 days
+      feedNotInDeployment: Feed not in deployment
+      feedNotPublished: Feed not published
+      future: Future
+      no-version: No version
+      same-as-deployed: Same as Deployed
+      same-as-published: Same as Published
   FeedSourceViewer:
     deploy: Deploy
     edit: Edit GTFS
diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index b4dc133fb..bb699c1d8 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -160,16 +160,6 @@ export function fetchFeedVersion (feedVersionId: string) {
  */
 export function publishFeedVersion (feedVersion: FeedVersion) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
-    if (
-      feedVersion.feedSource.autoPublish &&
-      feedVersion.sentToExternalPublisher &&
-      !window.confirm('Are you sure you want publish this feed version again?')
-    ) {
-      // For a feed source set to auto-publish,
-      // if the version has already been sent to publishing
-      // and the user does not confirm, do nothing.
-      return
-    }
     const url = `${SECURE_API_PREFIX}feedversion/${feedVersion.id}/publish`
     return dispatch(secureFetch(url, 'post'))
       .then(response => response.json())
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 051e3a391..2ddb79326 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -13,6 +13,7 @@ import * as versionsActions from '../actions/versions'
 import { deStringifyLabels } from '../util'
 import {
   getComponentMessages,
+  isExtensionEnabled,
   isModuleEnabled,
   getConfigProperty
 } from '../../common/util/config'
@@ -248,6 +249,8 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
 }
 
 class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user: ManagerUserState }> {
+  messages = getComponentMessages('FeedSourceTableRow')
+
   render () {
     const { feedSource, project, user } = this.props
 
@@ -281,19 +284,25 @@ class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user:
           {feedSource.retrievalMethod === 'FETCHED_AUTOMATICALLY' && (
             <Col xs={6}>
               <Icon type='feed' />
-              Auto fetch
+              {this.messages('badges.autoFetch')}
             </Col>
           )}
           {feedSource.deployable && (
             <Col xs={6}>
               <Icon type='rocket' />
-              Deployable
+              {this.messages('badges.deployable')}
             </Col>
           )}
           <Col xs={6}>
             <Icon type={feedSource.isPublic ? 'globe' : 'lock'} />
-            {feedSource.isPublic ? 'Public' : 'Private'}
+            {this.messages(feedSource.isPublic ? 'badges.public' : 'badges.private')}
           </Col>
+          {isExtensionEnabled('mtc') && feedSource.autoPublish && (
+            <Col xs={6}>
+              <Icon type='cloud-upload' />
+              {this.messages('badges.autoPublish')}
+            </Col>
+          )}
           <Col xs={12}>
             <div className='feedSourceLabelRow'>
               {project.labels.length > 0 && (
@@ -310,7 +319,7 @@ class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user:
                   style={{ marginRight: '5px' }}
                   onClick={() => this.refs.labelAssignerModal.open()}
                 >
-                  Edit
+                  {this.messages('badges.edit')}
                 </button>)}
               <div className='feedLabelContainer'>
                 {deStringifyLabels(feedSource.labelIds, project).map((label) => (

From a060d541d0177dd663d39182b1d9ea6ebc39f118 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 6 Jan 2022 18:15:21 -0500
Subject: [PATCH 468/553] refactor(FeedSourceTableRow): Move i18n messages to
 the correct header.

---
 i18n/english.yml                             | 14 +++++++-------
 lib/manager/components/FeedSourceTableRow.js | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/i18n/english.yml b/i18n/english.yml
index 259293a0f..524678ebe 100644
--- a/i18n/english.yml
+++ b/i18n/english.yml
@@ -210,6 +210,13 @@ components:
     fetchFeedEvery: Fetch feed every
     HOURS: hours
     MINUTES: minutes
+  FeedInfo:
+    autoFetch: Auto fetch
+    autoPublish: Auto publish
+    deployable: Deployable
+    edit: Edit
+    private: Private
+    public: Public
   FeedInfoPanel:
     uploadShapefile:
       body: 'Select a zipped shapefile to display on map. Note: this is only for use as a visual aid.'
@@ -225,13 +232,6 @@ components:
       PUBLISHED: Published Version
     createFirst: Create first feed source!
   FeedSourceTableRow:
-    badges:
-      autoFetch: Auto fetch
-      autoPublish: Auto publish
-      deployable: Deployable
-      edit: Edit
-      private: Private
-      public: Public
     status:
       active: Active
       all: All
diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
index 2ddb79326..98a7a76ec 100644
--- a/lib/manager/components/FeedSourceTableRow.js
+++ b/lib/manager/components/FeedSourceTableRow.js
@@ -249,7 +249,7 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
 }
 
 class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user: ManagerUserState }> {
-  messages = getComponentMessages('FeedSourceTableRow')
+  messages = getComponentMessages('FeedInfo')
 
   render () {
     const { feedSource, project, user } = this.props
@@ -284,23 +284,23 @@ class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user:
           {feedSource.retrievalMethod === 'FETCHED_AUTOMATICALLY' && (
             <Col xs={6}>
               <Icon type='feed' />
-              {this.messages('badges.autoFetch')}
+              {this.messages('autoFetch')}
             </Col>
           )}
           {feedSource.deployable && (
             <Col xs={6}>
               <Icon type='rocket' />
-              {this.messages('badges.deployable')}
+              {this.messages('deployable')}
             </Col>
           )}
           <Col xs={6}>
             <Icon type={feedSource.isPublic ? 'globe' : 'lock'} />
-            {this.messages(feedSource.isPublic ? 'badges.public' : 'badges.private')}
+            {this.messages(feedSource.isPublic ? 'public' : 'private')}
           </Col>
           {isExtensionEnabled('mtc') && feedSource.autoPublish && (
             <Col xs={6}>
               <Icon type='cloud-upload' />
-              {this.messages('badges.autoPublish')}
+              {this.messages('autoPublish')}
             </Col>
           )}
           <Col xs={12}>
@@ -319,7 +319,7 @@ class FeedInfo extends PureComponent<{ feedSource: Feed, project: Project, user:
                   style={{ marginRight: '5px' }}
                   onClick={() => this.refs.labelAssignerModal.open()}
                 >
-                  {this.messages('badges.edit')}
+                  {this.messages('edit')}
                 </button>)}
               <div className='feedLabelContainer'>
                 {deStringifyLabels(feedSource.labelIds, project).map((label) => (

From 2f30c916726310375f86d1c951444a7bd319d7d7 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 6 Jan 2022 18:24:18 -0500
Subject: [PATCH 469/553] chore(i18n): Add matching polish messages.

---
 i18n/polish.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/i18n/polish.yml b/i18n/polish.yml
index 20ff1f288..db4f94736 100644
--- a/i18n/polish.yml
+++ b/i18n/polish.yml
@@ -235,6 +235,13 @@ components:
     fetchFeedEvery: Pobieraj kanał co
     HOURS: godzin
     MINUTES: minut
+  FeedInfo: # Need to check these translations.
+    autoFetch: Automatyczne pobieranie
+    autoPublish: Automatycznie publikuj
+    deployable: Rozmieszczany
+    edit: Edytować
+    private: Prywatny
+    public: Publiczny
   FeedInfoPanel:
     uploadShapefile:
       body: >-

From 85d03e6c06cdfc52b0be38fe1907dbcaef3c7e4d Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Wed, 12 Jan 2022 13:08:30 -0800
Subject: [PATCH 470/553] docs(managing-projects-feeds): describe how the
 transformations summary panel works

---
 docs/user/managing-projects-feeds.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/user/managing-projects-feeds.md b/docs/user/managing-projects-feeds.md
index 3e00ee3b0..34bd0d042 100644
--- a/docs/user/managing-projects-feeds.md
+++ b/docs/user/managing-projects-feeds.md
@@ -82,6 +82,7 @@ Once the Feed Transformations have all been configured, you can import a new GTF
 
 ![screenshot](../img/feed-transformation-summary.png)
 
+A more in depth summary is available under the Transformation Results tab on the left sidebar. This panel will show you the modifications made to each file in the feed, along with how many rows were added, deleted, or modified. 
 
 ## Viewing and Managing Feed Versions
 

From c87ad84aa2b694a15b73af4cf2ec96d8e1725c41 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Fri, 14 Jan 2022 12:06:18 -0800
Subject: [PATCH 471/553] chore(CreateSnapshotModal): fix import order

---
 lib/editor/components/CreateSnapshotModal.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index 567074905..a781df819 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -14,10 +14,10 @@ import {connect} from 'react-redux'
 
 import * as activeActions from '../actions/active'
 import * as snapshotActions from '../actions/snapshots'
-import { getRouteStatusDict, ROUTE_STATUS_CODES } from '../util'
 import {getComponentMessages} from '../../common/util/config'
-import {getEntityName} from '../util/gtfs'
 import {formatTimestamp} from '../../common/util/date-time'
+import { getRouteStatusDict, ROUTE_STATUS_CODES } from '../util'
+import {getEntityName} from '../util/gtfs'
 import type {Feed, GtfsRoute} from '../../types'
 import type {AppState, LockState} from '../../types/reducers'
 type Props = {

From fd0f58dfd8f3b89b1ba203d3ce1f244d905e8151 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 18 Jan 2022 10:47:12 -0500
Subject: [PATCH 472/553] fix(CreateFeedSource): Initialize autoPublish state
 (suppress un/controlled input warning).

---
 lib/manager/components/CreateFeedSource.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/manager/components/CreateFeedSource.js b/lib/manager/components/CreateFeedSource.js
index 755ff1034..9e3a3cedf 100644
--- a/lib/manager/components/CreateFeedSource.js
+++ b/lib/manager/components/CreateFeedSource.js
@@ -73,6 +73,7 @@ export default class CreateFeedSource extends Component<Props, State> {
     this.setState({
       model: {
         autoFetchFeed: false,
+        autoPublish: false,
         deployable: false,
         fetchFrequency: 'DAYS',
         fetchInterval: 1,

From 1afe47a5d22184d2af7f66a72eb54f6d52bb2104 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 20 Jan 2022 16:34:55 -0800
Subject: [PATCH 473/553] test(SnapshotModal): fix e2e test

---
 __tests__/end-to-end.js                      | 3 +++
 lib/editor/components/CreateSnapshotModal.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index 4596e378f..58fe6cacc 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -2629,6 +2629,9 @@ describe('end-to-end', () => {
         // wait for dialog to appear
         await waitForSelector('[data-test-id="snapshot-dialog-name"]')
 
+        // confirm that we want to publish with unapproved routes
+        await click('[data-test-id="confirmPublishWithUnapproved"]')
+
         // enter name
         await type('[data-test-id="snapshot-dialog-name"]', 'test-snapshot')
 
diff --git a/lib/editor/components/CreateSnapshotModal.js b/lib/editor/components/CreateSnapshotModal.js
index a781df819..2c74f2d25 100644
--- a/lib/editor/components/CreateSnapshotModal.js
+++ b/lib/editor/components/CreateSnapshotModal.js
@@ -164,6 +164,7 @@ class CreateSnapshotModal extends Component<Props, State> {
               </ul>
               <FormGroup>
                 <Checkbox
+                  data-test-id='confirmPublishWithUnapproved'
                   checked={confirmPublishWithUnapproved}
                   name='confirmPublishWithUnapproved'
                   onChange={this._onTogglePublishUnapproved}>

From 792285ca890f9c0f9b159757efeddabfb9edc530 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Jan 2022 14:45:28 +0000
Subject: [PATCH 474/553] build(deps): bump cached-path-relative from 1.0.2 to
 1.1.0

Bumps [cached-path-relative](https://github.com/ashaffer/cached-path-relative) from 1.0.2 to 1.1.0.
- [Release notes](https://github.com/ashaffer/cached-path-relative/releases)
- [Commits](https://github.com/ashaffer/cached-path-relative/commits)

---
updated-dependencies:
- dependency-name: cached-path-relative
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 486c63a5b..b82f091ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2785,9 +2785,9 @@ cache-base@^1.0.1:
     unset-value "^1.0.0"
 
 cached-path-relative@^1.0.0, cached-path-relative@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz#a13df4196d26776220cc3356eb147a52dba2c6db"
-  integrity sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz#865576dfef39c0d6a7defde794d078f5308e3ef3"
+  integrity sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==
 
 cachedir@2.1.0:
   version "2.1.0"

From 380ff1e650bca2d6aaa3733ada536b31b4e66aa8 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Fri, 4 Feb 2022 14:01:26 -0500
Subject: [PATCH 475/553] fix(TimetableEditor): Add continuousPickup and
 Dropoff values to StopTimes object

---
 lib/editor/components/timetable/TimetableEditor.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/editor/components/timetable/TimetableEditor.js b/lib/editor/components/timetable/TimetableEditor.js
index d3914661c..437cb9dff 100644
--- a/lib/editor/components/timetable/TimetableEditor.js
+++ b/lib/editor/components/timetable/TimetableEditor.js
@@ -1,26 +1,26 @@
 // @flow
 
-import {camelCaseKeys} from '../../../common/util/map-keys'
 import clone from 'lodash/cloneDeep'
 import objectPath from 'object-path'
 import React, {Component} from 'react'
 import {Button} from 'react-bootstrap'
 
+import {camelCaseKeys} from '../../../common/util/map-keys'
 import * as activeActions from '../../actions/active'
 import * as tripActions from '../../actions/trip'
 import {ENTITY} from '../../constants'
 import {generateNullProps} from '../../util/gtfs'
 import {entityIsNew} from '../../util/objects'
 import {isTimeFormat} from '../../util/timetable'
-import Timetable from './Timetable'
-import TimetableHeader from './TimetableHeader'
-import TimetableHelpModal from './TimetableHelpModal'
-
 import type {Props as ContainerProps} from '../../containers/ActiveTimetableEditor'
 import type {Feed, FetchStatus, Pattern, StopTime, TimetableColumn, Trip, TripCounts} from '../../../types'
 import type {TripValidationIssues} from '../../selectors/timetable'
 import type {EditorTables, TimetableState} from '../../../types/reducers'
 
+import TimetableHelpModal from './TimetableHelpModal'
+import TimetableHeader from './TimetableHeader'
+import Timetable from './Timetable'
+
 type Props = ContainerProps & {
   activeCell?: ?string,
   activePattern: Pattern,
@@ -192,6 +192,8 @@ export default class TimetableEditor extends Component<Props, State> {
         cumulativeTravelTime += +stop.defaultDwellTime
         // if (stop.timepoint === null || stop.timepoint) {
         objectPath.set(newRow, `stopTimes.${i}.departureTime`, cumulativeTravelTime)
+        objectPath.set(newRow, `stopTimes.${i}.continuousPickup`, stop.continuousPickup)
+        objectPath.set(newRow, `stopTimes.${i}.continuousDropOff`, stop.continuousDropOff)
         objectPath.set(newRow, `stopTimes.${i}.timepoint`, stop.timepoint || 0)
         objectPath.set(newRow, `stopTimes.${i}.shapeDistTraveled`, stop.shapeDistTraveled)
         // Use pattern stop index to set stop sequence. Stop sequences should all

From 0f2f66c6b6199e4f2f76b5fdc94d039a6c335b72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Feb 2022 00:34:14 +0000
Subject: [PATCH 476/553] build(deps): bump pathval from 1.1.0 to 1.1.1

Bumps [pathval](https://github.com/chaijs/pathval) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/chaijs/pathval/releases)
- [Changelog](https://github.com/chaijs/pathval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chaijs/pathval/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: pathval
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 486c63a5b..5be5a948a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10431,9 +10431,9 @@ path-type@^4.0.0:
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 pathval@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
+  integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
 
 pbkdf2@^3.0.3:
   version "3.0.17"

From 9b26e239624941be04f661e33545d36ce48c261d Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 11 Feb 2022 11:06:37 -0500
Subject: [PATCH 477/553] chore(gtfs.yml): Tweak route types.

---
 gtfs.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gtfs.yml b/gtfs.yml
index 9baf2d08c..96df93932 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -296,8 +296,6 @@
       text: Monorail
     - value: 100
       text: Railway Service
-    - value: 100
-      text: Railway Service
     - value: 101
       text: High Speed Rail Service
     - value: 102
@@ -362,6 +360,8 @@
       text: Urban Railway Service
     - value: 404
       text: All Urban Railway Services
+    - value: 405
+      text: Monorail
     - value: 700
       text: Bus Service
     - value: 701
@@ -418,6 +418,8 @@
       text: Ferry Service
     - value: 1300
       text: Aerial Lift Service
+    - value: 1400
+      text: Funicular Service
     - value: 1500
       text: Taxi Service
     - value: 1501

From 42fd0c4f489c684225bea91e1039fffa4044d59f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Feb 2022 16:45:26 +0000
Subject: [PATCH 478/553] build(deps): bump ajv from 6.10.2 to 6.12.6

Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.10.2 to 6.12.6.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](https://github.com/ajv-validator/ajv/compare/v6.10.2...v6.12.6)

---
updated-dependencies:
- dependency-name: ajv
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 486c63a5b..4dee53815 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1598,11 +1598,11 @@ airbnb-js-shims@^2.1.1:
     symbol.prototype.description "^1.0.0"
 
 ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
-    fast-deep-equal "^2.0.1"
+    fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
@@ -5342,10 +5342,10 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.1.1:
   version "3.2.4"
@@ -5360,9 +5360,9 @@ fast-glob@^3.1.1:
     picomatch "^2.2.1"
 
 fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
@@ -14538,9 +14538,9 @@ update-notifier@^2.2.0, update-notifier@^2.3.0, update-notifier@^2.5.0:
     xdg-basedir "^3.0.0"
 
 uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 

From 8b515471059b4ec2ae2c4c3222b69b82c7a0ef9c Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Fri, 11 Feb 2022 15:09:22 -0800
Subject: [PATCH 479/553] refactor(gtfsplus): add route_attributes

---
 gtfsplus.yml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/gtfsplus.yml b/gtfsplus.yml
index db9cc4341..5e748763e 100644
--- a/gtfsplus.yml
+++ b/gtfsplus.yml
@@ -340,3 +340,67 @@
     inputType: TEXT
     maxLength: 35
     helpContent: Public name of the fare zone, as it should appear on 511.org such as EastBay, WestBay, etc
+
+- id: route_attributes
+  name: route_attributes.txt
+  helpContent: foobar
+  fields:
+  - name: route_id
+    required: true
+    inputType: GTFS_ROUTE
+    columnWidth: 4
+    helpContent: From GTFS routes.txt file. This is necessary to maintain relationship between routes in this file and routes in the standard GTFS routes.txt file.
+  - name: category_id
+    required: true
+    inputType: DROPDOWN
+    options:
+    - value: '1'
+      text: Interregional / Intercity
+    - value: '2'
+      text: Regional
+    - value: '3'
+      text: Local
+    - value: '4'
+      text: Community
+    - value: '5'
+      text: Connector
+  - name: subcategory_id
+    required: true
+    inputType: DROPDOWN
+    options:
+    - value: '1'
+      text: Interregional / Intercity
+    - value: '2'
+      text: Regional All Day
+    - value: '3'
+      text: Regional Peak
+    - value: '4'
+      text: Regional Owl
+    - value: '5'
+      text: Local All Day
+    - value: '6'
+      text: Local Peak
+    - value: '7'
+      text: Local Owl
+    - value: '8'
+      text: Community All Day
+    - value: '9'
+      text: Community Special
+    - value: '10'
+      text: Community On Demand
+    - value: '11'
+      text: First / Last Mile Connector
+  - name: running_way_id
+    required: true
+    inputType: DROPDOWN
+    options:
+      - value: '1'
+        text: Fully / Primarily Dedicated
+      - value: '2'
+        text: "Limited Dedicated: Highway/HOV"
+      - value: '3'
+        text: "Limited Dedicated: Local Roadway"
+      - value: '4'
+        text: "Shared, With Signal Priority"
+      - value: '5'
+        text: "Shared, No Priority"
\ No newline at end of file

From 5509225a8286ecdea0e50963b2b8dac27fb094b5 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 14 Feb 2022 10:32:37 -0500
Subject: [PATCH 480/553] feat(RouteTypeSelect): Add route type selector with
 new extended GTFS route types.

---
 gtfs.yml                                 |  2 +-
 lib/editor/components/EditorInput.js     | 39 +++++++---
 lib/editor/components/RouteTypeSelect.js | 94 ++++++++++++++++++++++++
 lib/index.css                            |  1 +
 lib/style.css                            | 71 ++++++++++++++++++
 package.json                             |  1 +
 yarn.lock                                | 26 +++++--
 7 files changed, 215 insertions(+), 19 deletions(-)
 create mode 100644 lib/editor/components/RouteTypeSelect.js

diff --git a/gtfs.yml b/gtfs.yml
index 96df93932..8214c92d2 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -271,7 +271,7 @@
     helpContent: 'Contains a description of a route. Please provide useful, quality information. Do not simply duplicate the name of the route. For example, "A trains operate between Inwood-207 St, Manhattan and Far Rockaway-Mott Avenue, Queens at all times. Also from about 6AM until about midnight, additional A trains operate between Inwood-207 St and Lefferts Boulevard (trains typically alternate between Lefferts Blvd and Far Rockaway)."'
   - name: route_type
     required: true
-    inputType: DROPDOWN
+    inputType: GTFS_ROUTE_TYPE
     bulkEditEnabled: true
     options:
     - value: 3
diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index fd32a0886..fddffbc46 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -1,11 +1,13 @@
 // @flow
 
+import moment from 'moment'
 import * as React from 'react'
 import {Checkbox, FormControl, FormGroup, ControlLabel, Tooltip, OverlayTrigger} from 'react-bootstrap'
-import Select from 'react-select'
-import moment from 'moment'
 import DateTimeField from 'react-bootstrap-datetimepicker'
+import ReactDOM from 'react-dom'
+import DropdownTreeSelect from 'react-dropdown-tree-select'
 import Dropzone from 'react-dropzone'
+import Select from 'react-select'
 
 import * as activeActions from '../actions/active'
 import * as editorActions from '../actions/editor'
@@ -19,6 +21,7 @@ import type {Entity, Feed, GtfsSpecField, GtfsAgency, GtfsStop} from '../../type
 import type {EditorTables} from '../../types/reducers'
 
 import ColorField from './ColorField'
+import RouteTypeSelect from './RouteTypeSelect'
 import VirtualizedEntitySelect from './VirtualizedEntitySelect'
 import ZoneSelect from './ZoneSelect'
 
@@ -102,6 +105,18 @@ export default class EditorInput extends React.Component<Props> {
     })
   }
 
+  _onRouteTypeChange = (currentNode: any) => {
+    if (currentNode.value && currentNode.value !== 'extended-route-types-header') {
+      const {activeComponent, activeEntity, field, onChange, updateActiveGtfsEntity} = this.props
+      onChange && onChange(currentNode.value)
+      updateActiveGtfsEntity && activeEntity && updateActiveGtfsEntity({
+        component: activeComponent,
+        entity: activeEntity,
+        props: {[field.name]: currentNode.value}
+      })
+    }
+  }
+
   _onSelectChange = (option: any) => {
     const {onChange, updateActiveGtfsEntity, activeEntity, activeComponent, field} = this.props
     const val = option ? option.value : null
@@ -341,14 +356,6 @@ export default class EditorInput extends React.Component<Props> {
                 </option>
                 : null
               }
-              {field.name === 'route_type'
-                ? this._renderRouteTypeOptions(field)
-                : options.map(o => (
-                  <option value={o.value} key={o.value}>
-                    {o.text || o.value}
-                  </option>
-                ))
-              }
             </FormControl>
           </FormGroup>
         )
@@ -365,6 +372,18 @@ export default class EditorInput extends React.Component<Props> {
             onChange={this._onSelectChange} />
         )
       }
+      case 'GTFS_ROUTE_TYPE': {
+        return (
+          <FormGroup {...formProps}>
+            {basicLabel}
+            <RouteTypeSelect
+              field={field}
+              onRouteTypeChange={this._onRouteTypeChange}
+              routeType={currentValue}
+            />
+          </FormGroup>
+        )
+      }
       case 'GTFS_AGENCY':
         const agencies = getTableById(tableData, 'agency')
         const agency = agencies.find(a => a.agency_id === currentValue)
diff --git a/lib/editor/components/RouteTypeSelect.js b/lib/editor/components/RouteTypeSelect.js
new file mode 100644
index 000000000..7b21f3c3b
--- /dev/null
+++ b/lib/editor/components/RouteTypeSelect.js
@@ -0,0 +1,94 @@
+// @flow
+
+import React, { Component } from 'react'
+import DropdownTreeSelect from 'react-dropdown-tree-select'
+
+import type { GtfsSpecField } from '../../types'
+
+type Props = {
+  field: GtfsSpecField,
+  onRouteTypeChange: any => void,
+  routeType: string
+}
+
+type State = {
+  data: any
+}
+
+/**
+ * Creates the route types tree structure for the route type selector.
+ */
+function getRouteTypeOptions (field: GtfsSpecField, routeType: string) {
+  const routeTypes = field.options || []
+  const standardRouteTypes = routeTypes.filter(opt => parseInt(opt.value, 10) < 100)
+  const extendedRouteTypes = routeTypes.filter(opt => parseInt(opt.value, 10) >= 100)
+
+  const routeTypeData = [
+    // Show standard route types (< 100) at the top level
+    ...standardRouteTypes.map(({ text, value }) => ({
+      checked: value === routeType,
+      label: `${text} (${value})`,
+      value
+    })),
+    
+    // If any, show extended route types initially collapsed
+    ...(extendedRouteTypes.length > 0 ? [{
+      children: [
+        // Group children by type (e.g. all 101-199 route types fall under 100-Railway)
+        ...extendedRouteTypes
+          .filter(opt => parseInt(opt.value, 10) % 100 === 0)
+          .map(category => {
+            const routeTypesForCategory = extendedRouteTypes.filter(
+              opt => opt.value > category.value && opt.value < category.value + 100
+            )
+
+            return {
+              checked: category.value === routeType,
+              children: routeTypesForCategory.map(({ text, value }) => ({
+                checked: value === routeType,
+                label: `${text} (${value})`,
+                value
+              })),
+              label: `${category.text} (${category.value})`,
+              value: category.value
+            }
+          })
+      ],
+      label: 'Extended GTFS Route Types',
+      value: 'extended-route-types-header'
+    }] : [])
+  ]
+
+  return routeTypeData
+}
+
+/**
+ * Encapsulates a drop-down selector with a hierarchical (tree) list of choices.
+ */
+export default class RouteTypeSelect extends Component<Props, State> {
+  constructor(props: Props) {
+    super(props)
+    this.state = { data: getRouteTypeOptions(props.field, props.routeType) }
+  }
+
+  /**
+   * Prevent resetting of any expanded status of the tree hierarchy
+   * (datatools polls the backend every 10 seconds and that causes new props
+   * to be passed to the editor component).
+   */
+  shouldComponentUpdate(nextProps: Props) {
+    return nextProps.routeType !== this.props.routeType && nextProps.field !== this.props.field
+  }
+
+  render() {
+    return (
+      <DropdownTreeSelect
+        className='route-type-select'
+        data={this.state.data}
+        inlineSearchInput
+        mode='radioSelect'
+        onChange={this.props.onRouteTypeChange}
+      />
+    );
+  }
+}
diff --git a/lib/index.css b/lib/index.css
index f7ae2991e..0fd25073a 100644
--- a/lib/index.css
+++ b/lib/index.css
@@ -17,5 +17,6 @@
 @import url(node_modules/rc-slider/assets/index.css);
 @import url(node_modules/react-toggle/style.css);
 @import url(node_modules/react-toastify/dist/ReactToastify.min.css);
+@import url(node_modules/react-dropdown-tree-select/dist/styles.css);
 
 @import url(lib/style.css);
diff --git a/lib/style.css b/lib/style.css
index 7702c1676..1cd3cd7d5 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -747,3 +747,74 @@ h4.line:after {
 .recent-activity-inner {
   margin-left: 36;
 }
+
+
+/* Custom classes for the DropdownTreeSelect component that
+ * override CSS from 'react-dropdown-tree-select/dist/styles.css'.
+ * Modified from https://dowjones.github.io/react-dropdown-tree-select/#/story/with-bootstrap-styles.
+ */
+
+.route-type-select .dropdown {
+  display: block;
+}
+
+ /* Make some styles look like bootstrap. */
+.route-type-select .dropdown-trigger {
+  background-color: #fff;
+  border-color: #ccc!important;
+  border-radius: 4px;
+  color: #555;
+  padding: 0px 6px!important;
+  width: 100%;
+}
+
+/* Remove border and background of tags (a "tag" is a selected item). */
+.route-type-select .dropdown-trigger .tag {
+  background: none!important;
+  border: none!important;
+}
+
+/* Hide the search box and the mini "delete" button next to the value. */
+.route-type-select .dropdown-trigger .tag-item,
+.route-type-select .dropdown-trigger .tag-item .search,
+.route-type-select .dropdown-trigger .tag-remove {
+  display: none;
+}
+
+.route-type-select .dropdown-trigger .tag-item:first-of-type {
+  display: inherit;
+}
+
+/* Position the drop-down arrow. */
+.route-type-select .dropdown-trigger.arrow:after {
+  position: absolute;
+  right: 2px;
+}
+
+/* Hide the checkboxes in the tree list. */
+.route-type-select .dropdown-content input[type=radio] {
+  display: none;
+}
+
+/* Reduce v-space between tree items. */
+.route-type-select .dropdown-content .node {
+  padding: 2px;
+}
+
+.route-type-select .toggle {
+  font: normal normal normal 12px/1 FontAwesome;
+  color: #555;
+}
+
+.route-type-select .toggle.collapsed::after {
+  content: "\f067";
+}
+
+.route-type-select .toggle.expanded::after {
+  content: "\f068";
+}
+
+.route-type-select .root {
+  padding: 0px;
+  margin: 0px;
+}
diff --git a/package.json b/package.json
index 5ab1b4947..2fba576d0 100644
--- a/package.json
+++ b/package.json
@@ -78,6 +78,7 @@
     "react-dnd": "^2.1.4",
     "react-dnd-html5-backend": "^2.1.2",
     "react-dom": "^15.4.1",
+    "react-dropdown-tree-select": "^2.5.1",
     "react-dropzone": "^3.5.3",
     "react-ga": "^2.3.5",
     "react-leaflet": "1.1.0",
diff --git a/yarn.lock b/yarn.lock
index edfd31ac0..8971278a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1899,6 +1899,11 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+array.partial@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/array.partial/-/array.partial-1.0.5.tgz#f514595aacbf6a99ea20bbcffbcacc10316f0d56"
+  integrity sha512-nkHH1dU6JXrwppCqdUD5M1R85vihgBqhk9miq+3WFwwRayNY1ggpOT6l99PppqYQ1Hcjv2amFfUzhe25eAcYfA==
+
 array.prototype.find@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.0.tgz#56a9ab1edde2a7701ed6d9166acec338919d8430"
@@ -9695,7 +9700,6 @@ npm@^6.14.8:
     cmd-shim "^3.0.3"
     columnify "~1.5.4"
     config-chain "^1.1.12"
-    debuglog "*"
     detect-indent "~5.0.0"
     detect-newline "^2.1.0"
     dezalgo "~1.0.3"
@@ -9710,7 +9714,6 @@ npm@^6.14.8:
     has-unicode "~2.0.1"
     hosted-git-info "^2.8.8"
     iferr "^1.0.2"
-    imurmurhash "*"
     infer-owner "^1.0.4"
     inflight "~1.0.6"
     inherits "^2.0.4"
@@ -9729,14 +9732,8 @@ npm@^6.14.8:
     libnpx "^10.2.4"
     lock-verify "^2.1.0"
     lockfile "^1.0.4"
-    lodash._baseindexof "*"
     lodash._baseuniq "~4.6.0"
-    lodash._bindcallback "*"
-    lodash._cacheindexof "*"
-    lodash._createcache "*"
-    lodash._getnative "*"
     lodash.clonedeep "~4.5.0"
-    lodash.restparam "*"
     lodash.union "~4.6.0"
     lodash.uniq "~4.5.0"
     lodash.without "~4.4.0"
@@ -11794,6 +11791,14 @@ react-dom@^15.4.1, react-dom@^15.6.2:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
+react-dropdown-tree-select@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/react-dropdown-tree-select/-/react-dropdown-tree-select-2.5.1.tgz#071bef6193352cda8f3177d7f56e906a8fa175e3"
+  integrity sha512-9sN62pIci6EZ0Fni5fqB7b5e7UG/FQ/qSwYtcc0+P3VaE1bHnEYQ9XxTSkFqpbVsy9dfq94RGaECzWcErgB+jw==
+  dependencies:
+    array.partial "^1.0.5"
+    react-infinite-scroll-component "^4.0.2"
+
 react-dropzone@^3.5.3:
   version "3.13.4"
   resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-3.13.4.tgz#84da26815c40339691c49b4544c2ef7a16912ccc"
@@ -11807,6 +11812,11 @@ react-ga@^2.3.5:
   resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-2.5.6.tgz#5a2e2fa78ae298e5b0a4498210eeec631ef1b562"
   integrity sha512-g04dz6zrbdHRxVaURPWT3RUbjLflh74sS6dCuhGeZupj7ii+UEt9lwTjALb2ST2w+7wAmzG1YqYlNX4yvRXe1g==
 
+react-infinite-scroll-component@^4.0.2:
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/react-infinite-scroll-component/-/react-infinite-scroll-component-4.5.3.tgz#008c2ec358628b490117ffc4aa6ce6982b26f8be"
+  integrity sha512-8O0PIeYZx0xFVS1ChLlLl/1obn64vylzXeheLsm+t0qUibmet7U6kDaKFg6jVRQJwDikWBTcyqEFFsxrbFCO5w==
+
 react-input-autosize@^2.1.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8"

From 51f8848be054afe84d319eb68a8c8fc914019a64 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 14 Feb 2022 17:26:35 -0500
Subject: [PATCH 481/553] improvement(RouteTypeSelect): Improve rendering.

---
 gtfs.yml                                 |  2 +-
 lib/editor/components/RouteTypeSelect.js | 95 ++++++++++++++----------
 lib/style.css                            | 63 ++++++++++++----
 3 files changed, 107 insertions(+), 53 deletions(-)

diff --git a/gtfs.yml b/gtfs.yml
index e67945aca..d23c2126e 100644
--- a/gtfs.yml
+++ b/gtfs.yml
@@ -466,7 +466,7 @@
       text: Miscellaneous Service
     - value: 1702
       text: Horse-drawn Carriage
-    columnWidth: 6
+    columnWidth: 12
     helpContent: The route_type field describes the type of transportation used on a route. Valid values for this field are...
   - name: route_sort_order
     required: false
diff --git a/lib/editor/components/RouteTypeSelect.js b/lib/editor/components/RouteTypeSelect.js
index 7b21f3c3b..69e624fbb 100644
--- a/lib/editor/components/RouteTypeSelect.js
+++ b/lib/editor/components/RouteTypeSelect.js
@@ -7,7 +7,7 @@ import type { GtfsSpecField } from '../../types'
 
 type Props = {
   field: GtfsSpecField,
-  onRouteTypeChange: any => void,
+  onRouteTypeChange: (any, any) => void,
   routeType: string
 }
 
@@ -15,58 +15,74 @@ type State = {
   data: any
 }
 
+/**
+ * Determines whether a route is standard or not.
+ */
+function isStandardRouteType ({ value }: { value: string }) {
+  return parseInt(value, 10) < 100
+}
+
 /**
  * Creates the route types tree structure for the route type selector.
  */
 function getRouteTypeOptions (field: GtfsSpecField, routeType: string) {
   const routeTypes = field.options || []
-  const standardRouteTypes = routeTypes.filter(opt => parseInt(opt.value, 10) < 100)
-  const extendedRouteTypes = routeTypes.filter(opt => parseInt(opt.value, 10) >= 100)
+  const standardRouteTypes = routeTypes.filter(isStandardRouteType)
+  const extendedRouteTypes = routeTypes.filter(opt => !isStandardRouteType(opt))
+  // If a custom value was provided, show it.
+  // (at this time, entering non-standard values is not supported.)
+  const customRouteTypes = []
+  if (!routeTypes.find(opt => opt.value === routeType)) {
+    customRouteTypes.push({
+      text: 'Custom',
+      value: routeType
+    })
+  }
+
+  // Helper function that converts a field option to an entry for the tree selector.
+  // It is inline because it uses the routeType argument.
+  const toTreeOption = ({ text, value }: { text: string, value: string }) => ({
+    checked: value === routeType,
+    label: `${text} (${value})`,
+    value
+  })
 
-  const routeTypeData = [
-    // Show standard route types (< 100) at the top level
-    ...standardRouteTypes.map(({ text, value }) => ({
-      checked: value === routeType,
-      label: `${text} (${value})`,
-      value
-    })),
-    
-    // If any, show extended route types initially collapsed
+  // Display in this order:
+  // - non-standard/unknown route type used for this route, if applicable,
+  // - standard route types
+  // - extended route types, if configured.
+  return [
+    ...customRouteTypes.map(toTreeOption),
+    ...standardRouteTypes.map(toTreeOption),
     ...(extendedRouteTypes.length > 0 ? [{
       children: [
-        // Group children by type (e.g. all 101-199 route types fall under 100-Railway)
+        // Group children by category (e.g. all 101-199 route types fall under 100-Railway).
+        // Get all the categories here.
         ...extendedRouteTypes
           .filter(opt => parseInt(opt.value, 10) % 100 === 0)
-          .map(category => {
-            const routeTypesForCategory = extendedRouteTypes.filter(
-              opt => opt.value > category.value && opt.value < category.value + 100
-            )
-
-            return {
-              checked: category.value === routeType,
-              children: routeTypesForCategory.map(({ text, value }) => ({
-                checked: value === routeType,
-                label: `${text} (${value})`,
-                value
-              })),
-              label: `${category.text} (${category.value})`,
-              value: category.value
-            }
-          })
+          .map(category => ({
+            ...toTreeOption(category),
+            // Add the children for each category.
+            children: extendedRouteTypes
+              .filter(
+                opt => opt.value > category.value && opt.value < category.value + 100
+              )
+              .map(toTreeOption)
+          }))
       ],
-      label: 'Extended GTFS Route Types',
-      value: 'extended-route-types-header'
+      // Used for CSS no-pointer and font effects.
+      className: 'extended-values-node',
+      label: 'Extended GTFS Route Types'
     }] : [])
   ]
-
-  return routeTypeData
 }
 
 /**
- * Encapsulates a drop-down selector with a hierarchical (tree) list of choices.
+ * Encapsulates a drop-down selector with a hierarchical (tree) list of choices,
+ * and filters out unnecessary prop changes to prevent flicker.
  */
 export default class RouteTypeSelect extends Component<Props, State> {
-  constructor(props: Props) {
+  constructor (props: Props) {
     super(props)
     this.state = { data: getRouteTypeOptions(props.field, props.routeType) }
   }
@@ -76,11 +92,12 @@ export default class RouteTypeSelect extends Component<Props, State> {
    * (datatools polls the backend every 10 seconds and that causes new props
    * to be passed to the editor component).
    */
-  shouldComponentUpdate(nextProps: Props) {
-    return nextProps.routeType !== this.props.routeType && nextProps.field !== this.props.field
+  shouldComponentUpdate (nextProps: Props) {
+    return nextProps.routeType !== this.props.routeType &&
+      nextProps.field !== this.props.field
   }
 
-  render() {
+  render () {
     return (
       <DropdownTreeSelect
         className='route-type-select'
@@ -89,6 +106,6 @@ export default class RouteTypeSelect extends Component<Props, State> {
         mode='radioSelect'
         onChange={this.props.onRouteTypeChange}
       />
-    );
+    )
   }
 }
diff --git a/lib/style.css b/lib/style.css
index f8bbe74c8..af0b9a76b 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -884,6 +884,7 @@ h4.line:after {
 /* Custom classes for the DropdownTreeSelect component that
  * override CSS from 'react-dropdown-tree-select/dist/styles.css'.
  * Modified from https://dowjones.github.io/react-dropdown-tree-select/#/story/with-bootstrap-styles.
+ * !important tags are used because somehow the tree selector default styles are applied after this stylesheet.
  */
 
 .route-type-select .dropdown {
@@ -896,11 +897,16 @@ h4.line:after {
   border-color: #ccc!important;
   border-radius: 4px;
   color: #555;
-  padding: 0px 6px!important;
+  padding: 4px 6px!important;
   width: 100%;
 }
 
-/* Remove border and background of tags (a "tag" is a selected item). */
+.route-type-select .infinite-scroll-component {
+  overflow-x: hidden!important;
+}
+
+/* Remove border and background of tags
+ * (a "tag" is a selected item displayed inside the input portion of the selector). */
 .route-type-select .dropdown-trigger .tag {
   background: none!important;
   border: none!important;
@@ -919,34 +925,65 @@ h4.line:after {
 
 /* Position the drop-down arrow. */
 .route-type-select .dropdown-trigger.arrow:after {
+  border-style: solid;
+  height: 0;
   position: absolute;
-  right: 2px;
+  right: 5px;
+  top: 50%;
+  width: 0;
+}
+.route-type-select .dropdown-trigger.arrow.bottom:after {
+  border-color: #999 transparent transparent;
+  border-width: 5px 5px 2.5px;
+  content: ''!important;
+  margin-top: -5px;
+}
+.route-type-select .dropdown-trigger.arrow.top:after {
+  border-color: transparent transparent #999;
+  border-width: 2.5px 5px 5px;
+  content: ''!important;
+  margin-top: -7.5px;
 }
 
-/* Hide the checkboxes in the tree list. */
+/* Hide the radio boxes in the tree list. */
 .route-type-select .dropdown-content input[type=radio] {
   display: none;
 }
 
-/* Reduce v-space between tree items. */
+/* Highlight the selected item, using same color as react-select 1.x. */
+.route-type-select .dropdown-content .node.checked {
+  background-color: #f5faff;
+}
+.route-type-select .dropdown-content .node:focus,
+.route-type-select .dropdown-content .node:hover {
+  background-color: #ebf5ff;
+}
+
+/* Reduce v-space between tree items, adjust font color. */
 .route-type-select .dropdown-content .node {
+  color: #555;
   padding: 2px;
 }
 
+/* Make labels clickable on their entire width... */
+.route-type-select .dropdown-content .node > label {
+  width: 100%;
+}
+
+/* ... but disable clicks for the header (not the +/- sign) for the extended routes. */
+.route-type-select .dropdown-content .node.tree.extended-values-node > label {
+  color: #999;
+  pointer-events: none;
+}
+
+/* For the plus/minus symbols for the tree view. */
 .route-type-select .toggle {
-  font: normal normal normal 12px/1 FontAwesome;
   color: #555;
+  font: normal normal normal 12px/1 FontAwesome;
 }
-
 .route-type-select .toggle.collapsed::after {
   content: "\f067";
 }
-
 .route-type-select .toggle.expanded::after {
   content: "\f068";
 }
-
-.route-type-select .root {
-  padding: 0px;
-  margin: 0px;
-}

From 008d7e79c7526290d391f8f28a67c80a4c1377e7 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 14 Feb 2022 17:31:26 -0500
Subject: [PATCH 482/553] refactor(EditorInput): Do first refactor of class.

---
 lib/editor/components/EditorInput.js | 97 +++++++---------------------
 1 file changed, 24 insertions(+), 73 deletions(-)

diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index fddffbc46..570202e29 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -4,8 +4,6 @@ import moment from 'moment'
 import * as React from 'react'
 import {Checkbox, FormControl, FormGroup, ControlLabel, Tooltip, OverlayTrigger} from 'react-bootstrap'
 import DateTimeField from 'react-bootstrap-datetimepicker'
-import ReactDOM from 'react-dom'
-import DropdownTreeSelect from 'react-dropdown-tree-select'
 import Dropzone from 'react-dropzone'
 import Select from 'react-select'
 
@@ -56,14 +54,18 @@ const entityToOption = (entity: ?Entity, key: string) => {
     : null
 }
 
-const renderRouteTypeOption = ({text, value}: {text: string, value: string}) => (
-  <option key={value} value={value}>{text} ({value})</option>
-)
-
 export default class EditorInput extends React.Component<Props> {
-  _onColorChange = (color: any) => {
-    const {onChange, updateActiveGtfsEntity, activeEntity, activeComponent, field} = this.props
-    const val = color.hex.split('#')[1]
+  /**
+   * Helper method for processing field value changes.
+   */
+  _processFieldChange = (val: any) => {
+    const {
+      activeComponent,
+      activeEntity,
+      field,
+      onChange,
+      updateActiveGtfsEntity
+    } = this.props
     onChange && onChange(val)
     updateActiveGtfsEntity && activeEntity && updateActiveGtfsEntity({
       component: activeComponent,
@@ -72,60 +74,28 @@ export default class EditorInput extends React.Component<Props> {
     })
   }
 
+  _onColorChange = (color: any) => {
+    this._processFieldChange(color.hex.split('#')[1])
+  }
+
   _onDateChange = (millis: number) => {
-    const {onChange, updateActiveGtfsEntity, activeEntity, activeComponent, field} = this.props
-    const val = moment(+millis).format('YYYYMMDD')
-    onChange && onChange(val)
-    updateActiveGtfsEntity && activeEntity && updateActiveGtfsEntity({
-      component: activeComponent,
-      entity: activeEntity,
-      props: {[field.name]: val}
-    })
+    this._processFieldChange(moment(+millis).format('YYYYMMDD'))
   }
 
   _onDowChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const {onChange, updateActiveGtfsEntity, activeEntity, activeComponent, field} = this.props
-    const val = evt.target.checked ? 1 : 0
-    onChange && onChange(val)
-    updateActiveGtfsEntity && activeEntity && updateActiveGtfsEntity({
-      component: activeComponent,
-      entity: activeEntity,
-      props: {[field.name]: val}
-    })
+    this._processFieldChange(evt.target.checked ? 1 : 0)
   }
 
   _onInputChange = (evt: SyntheticInputEvent<HTMLInputElement>) => {
-    const {onChange, updateActiveGtfsEntity, activeEntity, activeComponent, field} = this.props
-    const val = evt.target.value
-    onChange && onChange(val)
-    updateActiveGtfsEntity && activeEntity && updateActiveGtfsEntity({
-      component: activeComponent,
-      entity: activeEntity,
-      props: {[field.name]: val}
-    })
+    this._processFieldChange(evt.target.value)
   }
 
   _onRouteTypeChange = (currentNode: any) => {
-    if (currentNode.value && currentNode.value !== 'extended-route-types-header') {
-      const {activeComponent, activeEntity, field, onChange, updateActiveGtfsEntity} = this.props
-      onChange && onChange(currentNode.value)
-      updateActiveGtfsEntity && activeEntity && updateActiveGtfsEntity({
-        component: activeComponent,
-        entity: activeEntity,
-        props: {[field.name]: currentNode.value}
-      })
-    }
+    this._processFieldChange(currentNode.value)
   }
 
   _onSelectChange = (option: any) => {
-    const {onChange, updateActiveGtfsEntity, activeEntity, activeComponent, field} = this.props
-    const val = option ? option.value : null
-    onChange && onChange(val)
-    updateActiveGtfsEntity && activeEntity && updateActiveGtfsEntity({
-      component: activeComponent,
-      entity: activeEntity,
-      props: {[field.name]: val}
-    })
+    this._processFieldChange(option ? option.value : null)
   }
 
   _uploadBranding = (files: Array<File>) => {
@@ -137,25 +107,6 @@ export default class EditorInput extends React.Component<Props> {
     }
   }
 
-  _renderRouteTypeOptions = (field: GtfsSpecField): Array<React.Node> => {
-    const options = field.options || []
-    // The first 10 options (types 0 - 12) are the standard types found in the
-    // GTFS specification. All others represent extended route types.
-    const routeTypes = [
-      {
-        label: 'Standard',
-        options: options.filter(opt => parseInt(opt.value, 10) < 100).map(renderRouteTypeOption)
-      },
-      {
-        label: 'Extended',
-        options: options.filter(opt => parseInt(opt.value, 10) >= 100).map(renderRouteTypeOption)
-      }
-    ]
-    return routeTypes.map(({label, options}) => (
-      <optgroup key={label} label={label}>{options}</optgroup>
-    ))
-  }
-
   render () {
     const {
       activeEntity,
@@ -350,12 +301,12 @@ export default class EditorInput extends React.Component<Props> {
               value={!doesNotExist(value) ? value : ''}
               disabled={approveGtfsDisabled && field.adminOnly}>
               {/* Add field for empty string value if that is not an allowable option so that user selection triggers onChange */}
-              {options.findIndex(option => option.value === '') === -1
-                ? <option disabled value=''>
+              {options.findIndex(option => option.value === '') === -1 && (
+                <option disabled value=''>
                   {field.required ? '-- select an option --' : '(optional)' }
                 </option>
-                : null
-              }
+              )}
+              {field.options && field.options.map(o => (<option value={o.value} key={o.value}>{o.text || o.value}</option>))}
             </FormControl>
           </FormGroup>
         )

From 73c48e0b73b3b73e45a5977c780aef4756e671f8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 14 Feb 2022 17:52:56 -0500
Subject: [PATCH 483/553] refactor(EditorInput): Do a light refactor.

---
 lib/editor/components/EditorInput.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 570202e29..6b1be10cd 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -297,16 +297,19 @@ export default class EditorInput extends React.Component<Props> {
             {basicLabel}
             <FormControl
               {...fieldProps}
+              disabled={approveGtfsDisabled && field.adminOnly}
               // set value to '' to allow for selection of disabled option
               value={!doesNotExist(value) ? value : ''}
-              disabled={approveGtfsDisabled && field.adminOnly}>
+            >
               {/* Add field for empty string value if that is not an allowable option so that user selection triggers onChange */}
               {options.findIndex(option => option.value === '') === -1 && (
                 <option disabled value=''>
                   {field.required ? '-- select an option --' : '(optional)' }
                 </option>
               )}
-              {field.options && field.options.map(o => (<option value={o.value} key={o.value}>{o.text || o.value}</option>))}
+              {field.options && field.options.map(o => (
+                <option value={o.value} key={o.value}>{o.text || o.value}</option>
+              ))}
             </FormControl>
           </FormGroup>
         )

From 7d7928fcc0c9110678c708fba729c480afe22db0 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 15 Feb 2022 12:00:38 -0500
Subject: [PATCH 484/553] test(e2e): Make e2e tests for route editing pass.

---
 __tests__/end-to-end.js                  | 17 +++++++++--
 lib/editor/components/EditorInput.js     |  2 +-
 lib/editor/components/RouteTypeSelect.js | 36 ++++++++++++++++++------
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index 58fe6cacc..aa340805e 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -564,6 +564,17 @@ async function pickColor (containerSelector: string, color: string) {
   await clearAndType(`${containerSelector} input`, color)
 }
 
+/**
+ * A helper method to choose a route type
+ * in the route editor (but not in the feed editor).
+ */
+async function pickRouteType (containerSelector: string, routeOptionId: string) {
+  await click(`${containerSelector} a`)
+  await waitForSelector(`${containerSelector} .dropdown-content`)
+  await waitForSelector(`[data-test-id="${routeOptionId}"]`)
+  await click(`[data-test-id="${routeOptionId}"] label`)
+}
+
 /**
  * A helper method to type in an autocomplete value and then select an option
  * from an react-select component.
@@ -1599,9 +1610,9 @@ describe('end-to-end', () => {
         )
 
         // route type
-        await page.select(
-          '[data-test-id="route-route_type-input-container"] select',
-          '3'
+        await pickRouteType(
+          '[data-test-id="route-route_type-input-container"]',
+          'route-type-option-3'
         )
 
         // route color
diff --git a/lib/editor/components/EditorInput.js b/lib/editor/components/EditorInput.js
index 6b1be10cd..e1083b3a1 100644
--- a/lib/editor/components/EditorInput.js
+++ b/lib/editor/components/EditorInput.js
@@ -333,7 +333,7 @@ export default class EditorInput extends React.Component<Props> {
             <RouteTypeSelect
               field={field}
               onRouteTypeChange={this._onRouteTypeChange}
-              routeType={currentValue}
+              routeType={parseInt(currentValue, 10)}
             />
           </FormGroup>
         )
diff --git a/lib/editor/components/RouteTypeSelect.js b/lib/editor/components/RouteTypeSelect.js
index 69e624fbb..5973a17ce 100644
--- a/lib/editor/components/RouteTypeSelect.js
+++ b/lib/editor/components/RouteTypeSelect.js
@@ -8,25 +8,38 @@ import type { GtfsSpecField } from '../../types'
 type Props = {
   field: GtfsSpecField,
   onRouteTypeChange: (any, any) => void,
-  routeType: string
+  routeType: number
 }
 
 type State = {
   data: any
 }
 
+type NumericalOption = {
+  text: string,
+  value: number
+}
+
+function convertValueToNumber ({ text, value }: { text: string, value: string }): NumericalOption {
+  return {
+    text,
+    value: parseInt(value, 10)
+  }
+}
 /**
  * Determines whether a route is standard or not.
  */
-function isStandardRouteType ({ value }: { value: string }) {
-  return parseInt(value, 10) < 100
+function isStandardRouteType ({ value }: { value: number }) {
+  return value < 100
 }
 
 /**
  * Creates the route types tree structure for the route type selector.
  */
-function getRouteTypeOptions (field: GtfsSpecField, routeType: string) {
-  const routeTypes = field.options || []
+function getRouteTypeOptions (field: GtfsSpecField, routeType: number) {
+  // Convert option values into numbers.
+  const routeTypes = (field.options || []).map(convertValueToNumber)
+
   const standardRouteTypes = routeTypes.filter(isStandardRouteType)
   const extendedRouteTypes = routeTypes.filter(opt => !isStandardRouteType(opt))
   // If a custom value was provided, show it.
@@ -41,25 +54,32 @@ function getRouteTypeOptions (field: GtfsSpecField, routeType: string) {
 
   // Helper function that converts a field option to an entry for the tree selector.
   // It is inline because it uses the routeType argument.
-  const toTreeOption = ({ text, value }: { text: string, value: string }) => ({
+  const toTreeOption = ({ text, value }: NumericalOption) => ({
     checked: value === routeType,
     label: `${text} (${value})`,
     value
   })
 
+  // Variant of the function above for standard route types
+  // that includes a data-test-id for e2e tests.
+  const toTreeOptionWithDataId = (opt: NumericalOption) => ({
+    ...toTreeOption(opt),
+    dataset: { testId: `route-type-option-${opt.value}` }
+  })
+
   // Display in this order:
   // - non-standard/unknown route type used for this route, if applicable,
   // - standard route types
   // - extended route types, if configured.
   return [
     ...customRouteTypes.map(toTreeOption),
-    ...standardRouteTypes.map(toTreeOption),
+    ...standardRouteTypes.map(toTreeOptionWithDataId),
     ...(extendedRouteTypes.length > 0 ? [{
       children: [
         // Group children by category (e.g. all 101-199 route types fall under 100-Railway).
         // Get all the categories here.
         ...extendedRouteTypes
-          .filter(opt => parseInt(opt.value, 10) % 100 === 0)
+          .filter(opt => opt.value % 100 === 0)
           .map(category => ({
             ...toTreeOption(category),
             // Add the children for each category.

From bc14fedc2b8390f387d73beb60777a528e0bf857 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 15 Feb 2022 15:24:21 -0500
Subject: [PATCH 485/553] refactor(lib/styles.css): Adjust styles for
 RouteTypeSelect.

---
 lib/style.css | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/style.css b/lib/style.css
index af0b9a76b..f6c2870e8 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -901,10 +901,6 @@ h4.line:after {
   width: 100%;
 }
 
-.route-type-select .infinite-scroll-component {
-  overflow-x: hidden!important;
-}
-
 /* Remove border and background of tags
  * (a "tag" is a selected item displayed inside the input portion of the selector). */
 .route-type-select .dropdown-trigger .tag {
@@ -928,7 +924,7 @@ h4.line:after {
   border-style: solid;
   height: 0;
   position: absolute;
-  right: 5px;
+  right: 8px;
   top: 50%;
   width: 0;
 }
@@ -945,6 +941,12 @@ h4.line:after {
   margin-top: -7.5px;
 }
 
+/* Adjust position and width of the dropdown content wrt the input itself. */
+.route-type-select .dropdown-content {
+  margin-top: -4px;
+  width: 100%;
+}
+
 /* Hide the radio boxes in the tree list. */
 .route-type-select .dropdown-content input[type=radio] {
   display: none;
@@ -965,8 +967,10 @@ h4.line:after {
   padding: 2px;
 }
 
-/* Make labels clickable on their entire width... */
 .route-type-select .dropdown-content .node > label {
+  /* Use regular font weight on labels rendered by the tree dropdown. */
+  font-weight: normal;
+  /* Make labels clickable on their entire width on their right... */
   width: 100%;
 }
 

From 8692018ec7ba79e8c3da9637ac817c68cbb6ddf2 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Tue, 15 Feb 2022 15:01:00 -0800
Subject: [PATCH 486/553] feat(gtfsplus): add route_attributes table

---
 gtfsplus.yml | 69 ++++++++++++++++++----------------------------------
 1 file changed, 24 insertions(+), 45 deletions(-)

diff --git a/gtfsplus.yml b/gtfsplus.yml
index 5e748763e..dfa813b8b 100644
--- a/gtfsplus.yml
+++ b/gtfsplus.yml
@@ -350,57 +350,36 @@
     inputType: GTFS_ROUTE
     columnWidth: 4
     helpContent: From GTFS routes.txt file. This is necessary to maintain relationship between routes in this file and routes in the standard GTFS routes.txt file.
-  - name: category_id
+  - name: category
     required: true
     inputType: DROPDOWN
     options:
-    - value: '1'
-      text: Interregional / Intercity
-    - value: '2'
-      text: Regional
-    - value: '3'
-      text: Local
-    - value: '4'
-      text: Community
-    - value: '5'
-      text: Connector
-  - name: subcategory_id
+    - value: 'Interregional / Intercity'
+    - value: 'Regional'
+    - value: Local
+    - value: Community
+    - value: Connector
+  - name: subcategory
     required: true
     inputType: DROPDOWN
     options:
-    - value: '1'
-      text: Interregional / Intercity
-    - value: '2'
-      text: Regional All Day
-    - value: '3'
-      text: Regional Peak
-    - value: '4'
-      text: Regional Owl
-    - value: '5'
-      text: Local All Day
-    - value: '6'
-      text: Local Peak
-    - value: '7'
-      text: Local Owl
-    - value: '8'
-      text: Community All Day
-    - value: '9'
-      text: Community Special
-    - value: '10'
-      text: Community On Demand
-    - value: '11'
-      text: First / Last Mile Connector
-  - name: running_way_id
+    - value: Interregional / Intercity
+    - value: Regional All Day
+    - value: Regional Peak
+    - value: Regional Owl
+    - value: Local All Day
+    - value: Local Peak
+    - value: Local Owl
+    - value: Community All Day
+    - value: Community Special
+    - value: Community On Demand
+    - value: First / Last Mile Connector
+  - name: running_way
     required: true
     inputType: DROPDOWN
     options:
-      - value: '1'
-        text: Fully / Primarily Dedicated
-      - value: '2'
-        text: "Limited Dedicated: Highway/HOV"
-      - value: '3'
-        text: "Limited Dedicated: Local Roadway"
-      - value: '4'
-        text: "Shared, With Signal Priority"
-      - value: '5'
-        text: "Shared, No Priority"
\ No newline at end of file
+      - value: Fully / Primarily Dedicated
+      - value: "Limited Dedicated: Highway/HOV"
+      - value: "Limited Dedicated: Local Roadway"
+      - value: "Shared, With Signal Priority"
+      - value: "Shared, No Priority"
\ No newline at end of file

From b2e810679e9c9296b3bf6f7a3517548891a6a4bc Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Fri, 18 Feb 2022 13:21:03 -0800
Subject: [PATCH 487/553] refactor(gtfsplus): change values for
 route-attributes

---
 gtfsplus.yml | 99 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 39 deletions(-)

diff --git a/gtfsplus.yml b/gtfsplus.yml
index dfa813b8b..c0cda9c8b 100644
--- a/gtfsplus.yml
+++ b/gtfsplus.yml
@@ -343,43 +343,64 @@
 
 - id: route_attributes
   name: route_attributes.txt
-  helpContent: foobar
+  helpContent: From GTFS+ route_attributes.txt file
   fields:
-  - name: route_id
-    required: true
-    inputType: GTFS_ROUTE
-    columnWidth: 4
-    helpContent: From GTFS routes.txt file. This is necessary to maintain relationship between routes in this file and routes in the standard GTFS routes.txt file.
-  - name: category
-    required: true
-    inputType: DROPDOWN
-    options:
-    - value: 'Interregional / Intercity'
-    - value: 'Regional'
-    - value: Local
-    - value: Community
-    - value: Connector
-  - name: subcategory
-    required: true
-    inputType: DROPDOWN
-    options:
-    - value: Interregional / Intercity
-    - value: Regional All Day
-    - value: Regional Peak
-    - value: Regional Owl
-    - value: Local All Day
-    - value: Local Peak
-    - value: Local Owl
-    - value: Community All Day
-    - value: Community Special
-    - value: Community On Demand
-    - value: First / Last Mile Connector
-  - name: running_way
-    required: true
-    inputType: DROPDOWN
-    options:
-      - value: Fully / Primarily Dedicated
-      - value: "Limited Dedicated: Highway/HOV"
-      - value: "Limited Dedicated: Local Roadway"
-      - value: "Shared, With Signal Priority"
-      - value: "Shared, No Priority"
\ No newline at end of file
+    - name: route_id
+      required: true
+      inputType: GTFS_ROUTE
+      columnWidth: 4
+      helpContent: From GTFS routes.txt file. This is necessary to maintain relationship between routes in this file and routes in the standard GTFS routes.txt file.
+    - name: category
+      required: true
+      inputType: DROPDOWN
+      options:
+        - value: '0'
+          text: 'Interregional / Intercity'
+        - value: '1'
+          text: 'Regional'
+        - value: '2'
+          text: Local
+        - value: '3'
+          text: Community
+        - value: '4'
+          text: Connector
+    - name: subcategory
+      required: true
+      inputType: DROPDOWN
+      options:
+        - value: '0'
+          text: Interregional / Intercity
+        - value: '1'
+          text: Regional All Day
+        - value: '2'
+          text: Regional Peak
+        - value: '3'
+          text: Regional Owl
+        - value: '4'
+          text: Local All Day
+        - value: '5'
+          text: Local Peak
+        - value: '6'
+          text: Local Owl
+        - value: '7'
+          text: Community All Day
+        - value: '8'
+          text: Community Special
+        - value: '9'
+          text: Community On Demand
+        - value: '10'
+          text: First / Last Mile Connector
+    - name: running_way
+      required: true
+      inputType: DROPDOWN
+      options:
+        - value: '0'
+          text: Fully / Primarily Dedicated
+        - value: '1'
+          text: "Limited Dedicated: Highway/HOV"
+        - value: '2'
+          text: "Limited Dedicated: Local Roadway"
+        - value: '3'
+          text: "Shared, With Signal Priority"
+        - value: '4'
+          text: "Shared, No Priority"

From b5b7255b9f653efbd2c4f8018155d85bf2591350 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Fri, 18 Feb 2022 13:41:42 -0800
Subject: [PATCH 488/553] refactor(gtfsplus): add _id to field names

---
 gtfsplus.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gtfsplus.yml b/gtfsplus.yml
index c0cda9c8b..9b22bebb1 100644
--- a/gtfsplus.yml
+++ b/gtfsplus.yml
@@ -350,7 +350,7 @@
       inputType: GTFS_ROUTE
       columnWidth: 4
       helpContent: From GTFS routes.txt file. This is necessary to maintain relationship between routes in this file and routes in the standard GTFS routes.txt file.
-    - name: category
+    - name: category_id
       required: true
       inputType: DROPDOWN
       options:
@@ -364,7 +364,7 @@
           text: Community
         - value: '4'
           text: Connector
-    - name: subcategory
+    - name: subcategory_id
       required: true
       inputType: DROPDOWN
       options:
@@ -390,7 +390,7 @@
           text: Community On Demand
         - value: '10'
           text: First / Last Mile Connector
-    - name: running_way
+    - name: running_way_id
       required: true
       inputType: DROPDOWN
       options:

From e78eb6535440ddd23d31e9e8840c6ee38c56e2bf Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 22 Feb 2022 17:27:53 -0500
Subject: [PATCH 489/553] improvement(editor/util/validation): Add GTFS route
 type UI validation.

---
 lib/editor/components/RouteTypeSelect.js | 16 +++++----
 lib/editor/util/__tests__/validation.js  | 41 ++++++++++++++++++++++++
 lib/editor/util/validation.js            | 33 +++++++++++++++++--
 lib/style.css                            |  5 +++
 lib/types/index.js                       |  1 +
 5 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/lib/editor/components/RouteTypeSelect.js b/lib/editor/components/RouteTypeSelect.js
index 5973a17ce..b9d1fbf8d 100644
--- a/lib/editor/components/RouteTypeSelect.js
+++ b/lib/editor/components/RouteTypeSelect.js
@@ -16,6 +16,7 @@ type State = {
 }
 
 type NumericalOption = {
+  disabled?: boolean,
   text: string,
   value: number
 }
@@ -42,20 +43,21 @@ function getRouteTypeOptions (field: GtfsSpecField, routeType: number) {
 
   const standardRouteTypes = routeTypes.filter(isStandardRouteType)
   const extendedRouteTypes = routeTypes.filter(opt => !isStandardRouteType(opt))
-  // If a custom value was provided, show it.
-  // (at this time, entering non-standard values is not supported.)
-  const customRouteTypes = []
+  // Show unknown value as invalid and prevent user from picking that value.
+  const unknownRouteTypes = []
   if (!routeTypes.find(opt => opt.value === routeType)) {
-    customRouteTypes.push({
-      text: 'Custom',
+    unknownRouteTypes.push({
+      disabled: true,
+      text: 'Invalid',
       value: routeType
     })
   }
 
   // Helper function that converts a field option to an entry for the tree selector.
   // It is inline because it uses the routeType argument.
-  const toTreeOption = ({ text, value }: NumericalOption) => ({
+  const toTreeOption = ({ disabled, text, value }: NumericalOption) => ({
     checked: value === routeType,
+    disabled,
     label: `${text} (${value})`,
     value
   })
@@ -72,7 +74,7 @@ function getRouteTypeOptions (field: GtfsSpecField, routeType: number) {
   // - standard route types
   // - extended route types, if configured.
   return [
-    ...customRouteTypes.map(toTreeOption),
+    ...unknownRouteTypes.map(toTreeOption),
     ...standardRouteTypes.map(toTreeOptionWithDataId),
     ...(extendedRouteTypes.length > 0 ? [{
       children: [
diff --git a/lib/editor/util/__tests__/validation.js b/lib/editor/util/__tests__/validation.js
index 083a454c3..6bb866167 100644
--- a/lib/editor/util/__tests__/validation.js
+++ b/lib/editor/util/__tests__/validation.js
@@ -10,6 +10,17 @@ const routeSortOrderField = {
   name: 'route_sort_order',
   required: false
 }
+const routeTypeField = {
+  columnWidth: 12,
+  inputType: 'GTFS_ROUTE_TYPE',
+  name: 'route_type',
+  options: [
+    { text: '0', value: '0' },
+    { text: '3', value: '3' },
+    { text: '101', value: '101' }
+  ],
+  required: true
+}
 const shapedDistTraveledField = {
   columnWidth: 6,
   inputType: 'POSITIVE_NUM',
@@ -132,5 +143,35 @@ describe('editor > util > gtfs >', () => {
         ).toEqual(false)
       })
     })
+
+    describe('GTFS_ROUTE_TYPE', () => {
+      it('36 should be invalid', () => {
+        expect(
+          validate(routeTypeField, '36', null, null, defaultTablesData)
+        ).toEqual({
+          field: 'route_type',
+          invalid: true,
+          reason: 'Field must be a valid route type'
+        })
+      })
+
+      it('0 (tram) should be valid', () => {
+        expect(
+          validate(routeTypeField, '0', null, null, defaultTablesData)
+        ).toEqual(false)
+      })
+
+      it('3 (bus) should be valid', () => {
+        expect(
+          validate(routeTypeField, '3', null, null, defaultTablesData)
+        ).toEqual(false)
+      })
+
+      it('101 (High Speed Rail) should be valid', () => {
+        expect(
+          validate(routeTypeField, '101', null, null, defaultTablesData)
+        ).toEqual(false)
+      })
+    })
   })
 })
diff --git a/lib/editor/util/validation.js b/lib/editor/util/validation.js
index d6ddd7601..a0525d0eb 100644
--- a/lib/editor/util/validation.js
+++ b/lib/editor/util/validation.js
@@ -4,11 +4,11 @@ import clone from 'lodash/cloneDeep'
 import moment from 'moment'
 import validator from 'validator'
 
-import {getTableById} from './gtfs'
-
 import type {Entity, GtfsSpecField, ScheduleException} from '../../types'
 import type {EditorTables} from '../../types/reducers'
 
+import {getTableById} from './gtfs'
+
 export type EditorValidationIssue = {
   field: string,
   invalid: boolean,
@@ -101,6 +101,33 @@ export function validate (
     }
   }
 
+  /**
+   * Checks whether value is a positive number
+   */
+  function checkGtfsRouteType (): CheckPositiveOutput {
+    // Route type should meet required/optional criteria and be positive.
+    const positiveNumberCheck = checkPositiveNumber()
+    const { num, result } = positiveNumberCheck
+
+    if (result !== false) return positiveNumberCheck
+
+    // Make sure positive number value is one of those defined for route type options.
+    // (force string comparison to avoid number/string ambiguities)
+    const isValid = num !== undefined && num !== null && field.options && field.options.find(
+      opt => opt.value.toString() === num.toString()
+    )
+    if (!isValid) {
+      return {
+        result: validationIssue('Field must be a valid route type')
+      }
+    }
+
+    return {
+      num,
+      result: false
+    }
+  }
+
   switch (inputType) {
     case 'GTFS_ID':
       // Indices contains list of all indexes of occurrences of the ID value.
@@ -337,6 +364,8 @@ export function validate (
       return false
     case 'POSITIVE_NUM':
       return checkPositiveNumber().result
+    case 'GTFS_ROUTE_TYPE':
+      return checkGtfsRouteType().result
     case 'GTFS_ROUTE':
     case 'GTFS_STOP':
     case 'DATE':
diff --git a/lib/style.css b/lib/style.css
index f6c2870e8..9bfd1a0e1 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -961,6 +961,11 @@ h4.line:after {
   background-color: #ebf5ff;
 }
 
+/* Don't show disabled itens (e.g. because they represent invalid values) */
+.route-type-select .dropdown-content .node.disabled {
+  display: none;
+}
+
 /* Reduce v-space between tree items, adjust font color. */
 .route-type-select .dropdown-content .node {
   color: #555;
diff --git a/lib/types/index.js b/lib/types/index.js
index 6b8860296..c71a8f256 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -26,6 +26,7 @@ type InputType =
   'GTFS_AGENCY' |
   'POSITIVE_INT' |
   'GTFS_ROUTE' |
+  'GTFS_ROUTE_TYPE' |
   'GTFS_SERVICE' |
   'GTFS_BLOCK' |
   'GTFS_SHAPE' |

From f8c2b04f59c3069fe90351e474b643af5c0f4b1c Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 23 Feb 2022 17:48:57 -0500
Subject: [PATCH 490/553] chore(gtfsplus.yml): Update fields.

---
 gtfsplus.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gtfsplus.yml b/gtfsplus.yml
index 9b22bebb1..71ce8c85c 100644
--- a/gtfsplus.yml
+++ b/gtfsplus.yml
@@ -350,7 +350,7 @@
       inputType: GTFS_ROUTE
       columnWidth: 4
       helpContent: From GTFS routes.txt file. This is necessary to maintain relationship between routes in this file and routes in the standard GTFS routes.txt file.
-    - name: category_id
+    - name: category
       required: true
       inputType: DROPDOWN
       options:
@@ -364,9 +364,9 @@
           text: Community
         - value: '4'
           text: Connector
-    - name: subcategory_id
+    - name: subcategory
       required: true
-      inputType: DROPDOWN
+      inputType: GTFS_PLUS_ROUTE_SUBCATEGORY
       options:
         - value: '0'
           text: Interregional / Intercity
@@ -390,7 +390,7 @@
           text: Community On Demand
         - value: '10'
           text: First / Last Mile Connector
-    - name: running_way_id
+    - name: running_way
       required: true
       inputType: DROPDOWN
       options:

From e939f9ac2c6775239aae461681366c986aa03518 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 23 Feb 2022 18:37:26 -0500
Subject: [PATCH 491/553] feat(GtfsPlusField): Add route_attributes subcategory
 editing by route category.

---
 lib/gtfsplus/components/GtfsPlusField.js | 34 +++++++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/lib/gtfsplus/components/GtfsPlusField.js b/lib/gtfsplus/components/GtfsPlusField.js
index 50a1daa4d..3d8eaa20a 100644
--- a/lib/gtfsplus/components/GtfsPlusField.js
+++ b/lib/gtfsplus/components/GtfsPlusField.js
@@ -6,9 +6,9 @@ import {FormControl} from 'react-bootstrap'
 import EditableTextField from '../../common/components/EditableTextField'
 import {getRouteName} from '../../editor/util/gtfs'
 import GtfsSearch from '../../gtfs/components/gtfs-search'
+import type {GtfsSpecField as GtfsPlusFieldType, GtfsRoute, GtfsStop} from '../../types'
 
 import type {Props as GtfsPlusTableProps} from './GtfsPlusTable'
-import type {GtfsSpecField as GtfsPlusFieldType, GtfsRoute, GtfsStop} from '../../types'
 
 type Props = GtfsPlusTableProps & {
   currentValue: any,
@@ -16,6 +16,21 @@ type Props = GtfsPlusTableProps & {
   row: number
 }
 
+// Maps subcategories to categories, shown as strings to avoid conversion ambiguities.
+const routeSubcategoryToCategory = {
+  '0': '0',
+  '1': '1',
+  '2': '1',
+  '3': '1',
+  '4': '2',
+  '5': '2',
+  '6': '2',
+  '7': '3',
+  '8': '3',
+  '9': '3',
+  '10': '4'
+}
+
 export default class GtfsPlusField extends Component<Props> {
   _onChangeRoute = ({route}: {route: GtfsRoute}) => {
     const {field, receiveGtfsEntities, row: rowIndex, table, updateGtfsPlusField} = this.props
@@ -42,7 +57,8 @@ export default class GtfsPlusField extends Component<Props> {
   }
 
   render () {
-    const {currentValue, feedVersion, field, getGtfsEntity} = this.props
+    const {currentValue, data, feedVersion, field, getGtfsEntity} = this.props
+    let filterOptions
     switch (field.inputType) {
       case 'TEXT':
       case 'GTFS_TRIP':
@@ -54,12 +70,22 @@ export default class GtfsPlusField extends Component<Props> {
             value={currentValue}
             onChange={this._onChangeValue} />
         )
+      case 'GTFS_PLUS_ROUTE_SUBCATEGORY':
+        filterOptions = (option) => routeSubcategoryToCategory[option.value] === data.category
+      // FIXME:
+      // eslint-disable-next-line no-fallthrough
       case 'DROPDOWN':
         const {options} = field
         if (!options) {
           console.warn(`GTFS+ field has no options defined.`, field)
           return null
         }
+
+        // console.log(options)
+        console.log(data)
+        const filteredOptions = filterOptions ? options.filter(filterOptions) : options
+        console.log(filteredOptions)
+
         // NOTE: client has requested that GTFS+ fields be case insensitive
         // (hence the toUpperCase call)
         const option = currentValue &&
@@ -69,7 +95,7 @@ export default class GtfsPlusField extends Component<Props> {
             value={option ? option.value : ''}
             onChange={this._onChange}>
             {/* Add field for empty string value if that is not an allowable option so that user selection triggers onChange */}
-            {options.findIndex(option => option.value === '') === -1
+            {filteredOptions.findIndex(option => option.value === '') === -1
               ? <option
                 disabled
                 value=''>
@@ -77,7 +103,7 @@ export default class GtfsPlusField extends Component<Props> {
               </option>
               : null
             }
-            {options.map(option => {
+            {filteredOptions.map(option => {
               // NOTE: client has requested that GTFS+ fields be case
               // insensitive (hence the toLowerCase call)
               return <option value={option.value} key={option.value}>

From f2a3df48a86f581d4aec27e5569b6793b3bf058a Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 24 Feb 2022 14:11:50 -0800
Subject: [PATCH 492/553] refactor(GtfsPlus): adds hierarchy support to
 gtfsplus.yml

---
 gtfsplus.yml                             | 36 ++++++++++++++++--------
 lib/gtfsplus/components/GtfsPlusField.js | 32 ++++-----------------
 lib/types/index.js                       |  3 +-
 3 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/gtfsplus.yml b/gtfsplus.yml
index 71ce8c85c..b7d1b9498 100644
--- a/gtfsplus.yml
+++ b/gtfsplus.yml
@@ -366,30 +366,42 @@
           text: Connector
     - name: subcategory
       required: true
-      inputType: GTFS_PLUS_ROUTE_SUBCATEGORY
+      inputType: DROPDOWN
+      parent: 'category'
       options:
-        - value: '0'
+        - parentValue: '0'
           text: Interregional / Intercity
-        - value: '1'
+          value: '0'
+        - parentValue: '1'
           text: Regional All Day
-        - value: '2'
+          value: '1'
+        - parentValue: '1'
           text: Regional Peak
-        - value: '3'
+          value: '2'
+        - parentValue: '1'
           text: Regional Owl
-        - value: '4'
+          value: '3'
+        - parentValue: '2'
           text: Local All Day
-        - value: '5'
+          value: '4'
+        - parentValue: '2'
           text: Local Peak
-        - value: '6'
+          value: '5'
+        - parentValue: '2'
           text: Local Owl
-        - value: '7'
+          value: '6'
+        - parentValue: '3'
           text: Community All Day
-        - value: '8'
+          value: '7'
+        - parentValue: '3'
           text: Community Special
-        - value: '9'
+          value: '8'
+        - parentValue: '3'
           text: Community On Demand
-        - value: '10'
+          value: '9'
+        - parentValue: '4'
           text: First / Last Mile Connector
+          value: '10'
     - name: running_way
       required: true
       inputType: DROPDOWN
diff --git a/lib/gtfsplus/components/GtfsPlusField.js b/lib/gtfsplus/components/GtfsPlusField.js
index 3d8eaa20a..14b8b2693 100644
--- a/lib/gtfsplus/components/GtfsPlusField.js
+++ b/lib/gtfsplus/components/GtfsPlusField.js
@@ -12,25 +12,10 @@ import type {Props as GtfsPlusTableProps} from './GtfsPlusTable'
 
 type Props = GtfsPlusTableProps & {
   currentValue: any,
+  data: any,
   field: GtfsPlusFieldType,
   row: number
 }
-
-// Maps subcategories to categories, shown as strings to avoid conversion ambiguities.
-const routeSubcategoryToCategory = {
-  '0': '0',
-  '1': '1',
-  '2': '1',
-  '3': '1',
-  '4': '2',
-  '5': '2',
-  '6': '2',
-  '7': '3',
-  '8': '3',
-  '9': '3',
-  '10': '4'
-}
-
 export default class GtfsPlusField extends Component<Props> {
   _onChangeRoute = ({route}: {route: GtfsRoute}) => {
     const {field, receiveGtfsEntities, row: rowIndex, table, updateGtfsPlusField} = this.props
@@ -58,7 +43,6 @@ export default class GtfsPlusField extends Component<Props> {
 
   render () {
     const {currentValue, data, feedVersion, field, getGtfsEntity} = this.props
-    let filterOptions
     switch (field.inputType) {
       case 'TEXT':
       case 'GTFS_TRIP':
@@ -70,10 +54,6 @@ export default class GtfsPlusField extends Component<Props> {
             value={currentValue}
             onChange={this._onChangeValue} />
         )
-      case 'GTFS_PLUS_ROUTE_SUBCATEGORY':
-        filterOptions = (option) => routeSubcategoryToCategory[option.value] === data.category
-      // FIXME:
-      // eslint-disable-next-line no-fallthrough
       case 'DROPDOWN':
         const {options} = field
         if (!options) {
@@ -81,15 +61,15 @@ export default class GtfsPlusField extends Component<Props> {
           return null
         }
 
-        // console.log(options)
-        console.log(data)
-        const filteredOptions = filterOptions ? options.filter(filterOptions) : options
-        console.log(filteredOptions)
-
         // NOTE: client has requested that GTFS+ fields be case insensitive
         // (hence the toUpperCase call)
         const option = currentValue &&
           options.find(o => o.value.toUpperCase() === currentValue.toUpperCase())
+
+        const filteredOptions = field.parent && option && option.parentValue
+          ? options.filter((option) => option.parentValue === data[field.parent])
+          : options
+
         return (
           <FormControl componentClass='select'
             value={option ? option.value : ''}
diff --git a/lib/types/index.js b/lib/types/index.js
index 6b8860296..6f67f6df2 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -655,7 +655,8 @@ export type GtfsSpecField = {
   helpContent?: string,
   inputType: InputType,
   name: string,
-  options?: Array<{text: string, value: string}>,
+  options?: Array<{parentValue?: string, text: string, value: string}>,
+  parent?: string,
   placeholder?: string,
   required: boolean
 }

From ec78b8af06c07cfb01dc12be33829ad786cde407 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 24 Feb 2022 15:17:22 -0800
Subject: [PATCH 493/553] refactor(GtfsPlus): small field change

---
 lib/gtfsplus/components/GtfsPlusField.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gtfsplus/components/GtfsPlusField.js b/lib/gtfsplus/components/GtfsPlusField.js
index 14b8b2693..b361f7f35 100644
--- a/lib/gtfsplus/components/GtfsPlusField.js
+++ b/lib/gtfsplus/components/GtfsPlusField.js
@@ -66,8 +66,8 @@ export default class GtfsPlusField extends Component<Props> {
         const option = currentValue &&
           options.find(o => o.value.toUpperCase() === currentValue.toUpperCase())
 
-        const filteredOptions = field.parent && option && option.parentValue
-          ? options.filter((option) => option.parentValue === data[field.parent])
+        const filteredOptions = field.parent
+          ? options.filter((option) => option.parentValue ? option.parentValue === data[field.parent] : true)
           : options
 
         return (

From 039f7fe6a6a42ac3752f45b408b30dda778b4399 Mon Sep 17 00:00:00 2001
From: Daniel Heppner <daniel.heppner@ibigroup.com>
Date: Thu, 24 Feb 2022 16:29:53 -0800
Subject: [PATCH 494/553] refactor(gtfsplus.yml): remove unneeded quotes

---
 gtfsplus.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gtfsplus.yml b/gtfsplus.yml
index b7d1b9498..6723d7de7 100644
--- a/gtfsplus.yml
+++ b/gtfsplus.yml
@@ -355,9 +355,9 @@
       inputType: DROPDOWN
       options:
         - value: '0'
-          text: 'Interregional / Intercity'
+          text: Interregional / Intercity
         - value: '1'
-          text: 'Regional'
+          text: Regional
         - value: '2'
           text: Local
         - value: '3'
@@ -413,6 +413,6 @@
         - value: '2'
           text: "Limited Dedicated: Local Roadway"
         - value: '3'
-          text: "Shared, With Signal Priority"
+          text: Shared, With Signal Priority
         - value: '4'
-          text: "Shared, No Priority"
+          text: Shared, No Priority

From 4bfe6620d097bd26d6fa345ae1af67bcb352878b Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Sun, 27 Feb 2022 13:41:04 -0500
Subject: [PATCH 495/553] fix(PatternStopCard): Display null continuous_pickup
 as 1 (no continuous pickup)

---
 lib/editor/components/pattern/PatternStopCard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index e5aa5d053..0ba0210ad 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -424,7 +424,7 @@ class PatternStopContents extends Component<Props, State> {
               selectType='continuousPickup'
               shouldHaveDisabledOption
               title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
-              value={patternStop.continuousPickup || ''}
+              value={patternStop.continuousPickup || 1}
             />
           </Col>
           <Col xs={6}>
@@ -435,7 +435,7 @@ class PatternStopContents extends Component<Props, State> {
               selectType='continuousDropOff'
               shouldHaveDisabledOption
               title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
-              value={patternStop.continuousDropOff || ''}
+              value={patternStop.continuousDropOff || 1}
             />
           </Col>
         </Row>

From e41a8fb40c7922f6176784a350ba00e05f9da796 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Fri, 4 Mar 2022 10:42:22 -0500
Subject: [PATCH 496/553] feat(config.js): Add "includes" to allow pl to match
 "pl-PL" lang code

---
 lib/common/util/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common/util/config.js b/lib/common/util/config.js
index b0905b663..6bdc5e2de 100644
--- a/lib/common/util/config.js
+++ b/lib/common/util/config.js
@@ -121,7 +121,7 @@ function initializeConfig () {
   const languageId = window.localStorage.getItem('lang')
     ? window.localStorage.getItem('lang')
     : navigator.language
-  const active = languages.find(l => l._id === languageId) ||
+  const active = languages.find(l => l._id.includes(languageId)) ||
     languages.find(l => l._id === 'en-US')
   if (!active) throw new Error('Language file is misconfigured!')
   // is an array containing all the matching modules

From f0c2107f1fe807427265d93968cb6339a6cc388f Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Fri, 4 Mar 2022 11:38:06 -0500
Subject: [PATCH 497/553] refactor(config.js, polish.yml): Check if browser
 language includes language file ID

---
 i18n/polish.yml           | 2 +-
 lib/common/util/config.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/polish.yml b/i18n/polish.yml
index 5efdb8b1d..8b8fe27b1 100644
--- a/i18n/polish.yml
+++ b/i18n/polish.yml
@@ -1,4 +1,4 @@
-_id: pl-PL
+_id: pl
 _name: Polski
 components:
   Breadcrumbs:
diff --git a/lib/common/util/config.js b/lib/common/util/config.js
index 6bdc5e2de..80edec14c 100644
--- a/lib/common/util/config.js
+++ b/lib/common/util/config.js
@@ -121,7 +121,7 @@ function initializeConfig () {
   const languageId = window.localStorage.getItem('lang')
     ? window.localStorage.getItem('lang')
     : navigator.language
-  const active = languages.find(l => l._id.includes(languageId)) ||
+  const active = languages.find(l => languageId.includes(l._id)) ||
     languages.find(l => l._id === 'en-US')
   if (!active) throw new Error('Language file is misconfigured!')
   // is an array containing all the matching modules

From 786f6906f7e76911dcce5ea0b42a1f7c58b91402 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Mon, 7 Mar 2022 10:58:24 -0500
Subject: [PATCH 498/553] feat(valhalla): allow graphhopper to avoid road
 classes

---
 lib/scenario-editor/utils/valhalla.js | 30 +++++++++++++++++++--------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/lib/scenario-editor/utils/valhalla.js b/lib/scenario-editor/utils/valhalla.js
index 1e85f46db..0f30e72b2 100644
--- a/lib/scenario-editor/utils/valhalla.js
+++ b/lib/scenario-editor/utils/valhalla.js
@@ -3,7 +3,6 @@
 import fetch from 'isomorphic-fetch'
 import {decode as decodePolyline} from 'polyline'
 import {isEqual as coordinatesAreEqual} from '@conveyal/lonlat'
-import qs from 'qs'
 import lineString from 'turf-linestring'
 
 // This can be used for logging line strings to geojson.io URLs for easy
@@ -204,14 +203,27 @@ export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopp
   }
   // Use custom url if it exists, otherwise default to the hosted service.
   const GRAPH_HOPPER_URL = process.env.GRAPH_HOPPER_URL || 'https://graphhopper.com/api/1/'
-  const params = {
-    key: process.env.GRAPH_HOPPER_KEY,
-    vehicle: 'car',
-    debug: true,
-    type: 'json'
-  }
-  const locations = points.map(p => (`point=${p.lat},${p.lng}`)).join('&')
+
   return fetch(
-    `${GRAPH_HOPPER_URL}route?${locations}&${qs.stringify(params)}`
+    `${GRAPH_HOPPER_URL}route?key=${process.env.GRAPH_HOPPER_KEY}`,
+    // New custom routing headers
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        'ch.disable': true,
+        custom_model: {
+          'priority': [{
+            'if': 'road_class == MOTORWAY',
+            'multiply_by': 0.1
+          }]
+        },
+        key: process.env.GRAPH_HOPPER_KEY,
+        points: points.map(p => [p.lng, p.lat]),
+        profile: 'car'
+      })
+    }
   ).then(res => res.json())
 }

From a6e06b228d58580bd945bda5ec72adc12c5e0890 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Mon, 7 Mar 2022 15:30:48 -0500
Subject: [PATCH 499/553] refactor(config): Move language matching to exact
 match w/ fallback as "startsWith"

---
 lib/common/util/config.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/common/util/config.js b/lib/common/util/config.js
index 80edec14c..f03836402 100644
--- a/lib/common/util/config.js
+++ b/lib/common/util/config.js
@@ -121,8 +121,9 @@ function initializeConfig () {
   const languageId = window.localStorage.getItem('lang')
     ? window.localStorage.getItem('lang')
     : navigator.language
-  const active = languages.find(l => languageId.includes(l._id)) ||
-    languages.find(l => l._id === 'en-US')
+  const active = languages.find(
+    l => l._id === languageId || languageId.startsWith(l._id)
+  ) || languages.find(l => l._id === 'en-US')
   if (!active) throw new Error('Language file is misconfigured!')
   // is an array containing all the matching modules
   config.messages = {

From 5c5c04bb1aae4bd77d402d5eaf33042ccb71d90d Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 8 Mar 2022 10:18:17 -0500
Subject: [PATCH 500/553] chore(gtfsplus.yml): Update route_attributes field
 values.

---
 gtfsplus.yml | 86 ++++++++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/gtfsplus.yml b/gtfsplus.yml
index 6723d7de7..8a568cdc4 100644
--- a/gtfsplus.yml
+++ b/gtfsplus.yml
@@ -343,7 +343,7 @@
 
 - id: route_attributes
   name: route_attributes.txt
-  helpContent: From GTFS+ route_attributes.txt file
+  helpContent: This file contains route attributes such as geographical extent, times of service, and right-of-way type.
   fields:
     - name: route_id
       required: true
@@ -354,65 +354,65 @@
       required: true
       inputType: DROPDOWN
       options:
-        - value: '0'
-          text: Interregional / Intercity
-        - value: '1'
-          text: Regional
-        - value: '2'
-          text: Local
-        - value: '3'
-          text: Community
-        - value: '4'
-          text: Connector
+        - text: Interregional / Intercity
+          value: '1'
+        - text: Regional
+          value: '2'
+        - text: Local
+          value: '3'
+        - text: Community
+          value: '4'
+        - text: Connector
+          value: '5'
     - name: subcategory
       required: true
       inputType: DROPDOWN
       parent: 'category'
       options:
-        - parentValue: '0'
-          text: Interregional / Intercity
-          value: '0'
         - parentValue: '1'
+          text: Interregional / Intercity
+          value: '101'
+        - parentValue: '2'
           text: Regional All Day
-          value: '1'
-        - parentValue: '1'
+          value: '201'
+        - parentValue: '2'
           text: Regional Peak
-          value: '2'
-        - parentValue: '1'
-          text: Regional Owl
-          value: '3'
+          value: '202'
         - parentValue: '2'
+          text: Regional Owl
+          value: '203'
+        - parentValue: '3'
           text: Local All Day
-          value: '4'
-        - parentValue: '2'
+          value: '301'
+        - parentValue: '3'
           text: Local Peak
-          value: '5'
-        - parentValue: '2'
-          text: Local Owl
-          value: '6'
+          value: '302'
         - parentValue: '3'
+          text: Local Owl
+          value: '303'
+        - parentValue: '4'
           text: Community All Day
-          value: '7'
-        - parentValue: '3'
+          value: '401'
+        - parentValue: '4'
           text: Community Special
-          value: '8'
-        - parentValue: '3'
-          text: Community On Demand
-          value: '9'
+          value: '402'
         - parentValue: '4'
+          text: Community On Demand
+          value: '403'
+        - parentValue: '5'
           text: First / Last Mile Connector
-          value: '10'
+          value: '501'
     - name: running_way
       required: true
       inputType: DROPDOWN
       options:
-        - value: '0'
-          text: Fully / Primarily Dedicated
-        - value: '1'
-          text: "Limited Dedicated: Highway/HOV"
-        - value: '2'
-          text: "Limited Dedicated: Local Roadway"
-        - value: '3'
-          text: Shared, With Signal Priority
-        - value: '4'
-          text: Shared, No Priority
+        - text: Fully / Primarily Dedicated
+          value: '1'
+        - text: "Limited Dedicated: Highway/HOV"
+          value: '2'
+        - text: "Limited Dedicated: Local Roadway"
+          value: '3'
+        - text: Shared, With Signal Priority
+          value: '4'
+        - text: Shared, No Priority
+          value: '5'

From 16d59c2d9b518ec326d0698d5990816d4248ca6d Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Wed, 9 Mar 2022 10:50:41 -0500
Subject: [PATCH 501/553] refactor(GraphHopper Routing): Add checkbox to avoid
 motorway routing

---
 lib/editor/components/pattern/EditSettings.js |  8 ++-
 .../components/pattern/EditShapePanel.js      |  8 +--
 lib/editor/reducers/settings.js               |  2 +-
 lib/scenario-editor/utils/valhalla.js         | 60 +++++++++++--------
 4 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/lib/editor/components/pattern/EditSettings.js b/lib/editor/components/pattern/EditSettings.js
index 47e598ecf..989ccd1eb 100644
--- a/lib/editor/components/pattern/EditSettings.js
+++ b/lib/editor/components/pattern/EditSettings.js
@@ -7,7 +7,6 @@ import Rcslider from 'rc-slider'
 import {updateEditSetting} from '../../actions/active'
 import {CLICK_OPTIONS} from '../../util'
 import toSentenceCase from '../../../common/util/to-sentence-case'
-
 import type {EditSettingsState} from '../../../types/reducers'
 
 type Props = {
@@ -60,11 +59,13 @@ export default class EditSettings extends Component<Props, State> {
     const {editSettings, patternSegment, updateEditSetting} = this.props
     const {
       editGeometry,
+      followStreets,
       onMapClick,
       stopInterval
     } = editSettings
     const SETTINGS = [
       {type: 'followStreets', label: 'Snap to streets'},
+      {type: 'avoidMotorways', label: 'Avoid motorways in routing'},
       {type: 'hideStopHandles', label: 'Hide stop handles'},
       {type: 'hideInactiveSegments', label: 'Hide inactive segments'},
       {type: 'showStops', label: 'Show stops'},
@@ -80,7 +81,10 @@ export default class EditSettings extends Component<Props, State> {
             key={s.type}
             // Disable hide inactive segments if no segment is selected (hiding in
             // this state would cause the entire shape to disappear).
-            disabled={s.type === 'hideInactiveSegments' && noSegmentIsActive}
+            disabled={
+              (s.type === 'hideInactiveSegments' && noSegmentIsActive) ||
+              (s.type === 'avoidMotorways' && !followStreets)
+            }
             name={s.type}
             style={{margin: '3px 0'}}
             onChange={this._onCheckboxChange}>
diff --git a/lib/editor/components/pattern/EditShapePanel.js b/lib/editor/components/pattern/EditShapePanel.js
index dc9bf0064..9f72213de 100644
--- a/lib/editor/components/pattern/EditShapePanel.js
+++ b/lib/editor/components/pattern/EditShapePanel.js
@@ -13,7 +13,6 @@ import * as mapActions from '../../actions/map'
 import {ARROW_MAGENTA, PATTERN_TO_STOP_DISTANCE_THRESHOLD_METERS} from '../../constants'
 import * as tripPatternActions from '../../actions/tripPattern'
 import OptionButton from '../../../common/components/OptionButton'
-import EditSettings from './EditSettings'
 import * as statusActions from '../../../manager/actions/status'
 import {polyline as getPolyline} from '../../../scenario-editor/utils/valhalla'
 import {
@@ -22,10 +21,11 @@ import {
   getPatternDistance,
   isValidStopControlPoint
 } from '../../util/map'
-
 import type {ControlPoint, LatLng, Pattern, GtfsStop} from '../../../types'
 import type {EditSettingsUndoState} from '../../../types/reducers'
 
+import EditSettings from './EditSettings'
+
 type Props = {
   activePattern: Pattern,
   controlPoints: Array<ControlPoint>,
@@ -49,10 +49,10 @@ export default class EditShapePanel extends Component<Props> {
    * Construct new pattern geometry from the pattern stop locations.
    */
   async drawPatternFromStops (pattern: Pattern, stopsCoordinates: Array<LatLng>, followStreets: boolean): Promise<any> {
-    const {saveActiveGtfsEntity, setErrorMessage, updatePatternGeometry} = this.props
+    const {editSettings, saveActiveGtfsEntity, setErrorMessage, updatePatternGeometry} = this.props
     let patternSegments = []
     if (followStreets) {
-      patternSegments = await getPolyline(stopsCoordinates, true)
+      patternSegments = await getPolyline(stopsCoordinates, true, editSettings.present.avoidMotorways)
     } else {
       // Construct straight-line segments using stop coordinates
       stopsCoordinates
diff --git a/lib/editor/reducers/settings.js b/lib/editor/reducers/settings.js
index 7451971d0..92d726367 100644
--- a/lib/editor/reducers/settings.js
+++ b/lib/editor/reducers/settings.js
@@ -10,12 +10,12 @@ import {
   updateTempPatternGeometry
 } from '../actions/map'
 import { CLICK_OPTIONS } from '../util'
-
 import type {EditSettingsState} from '../../types/reducers'
 
 export const defaultState = {
   addStops: false,
   afterIntersection: true,
+  avoidMotorways: false,
   controlPoints: null,
   currentDragId: null,
   distanceFromIntersection: 5,
diff --git a/lib/scenario-editor/utils/valhalla.js b/lib/scenario-editor/utils/valhalla.js
index 0f30e72b2..1f2621272 100644
--- a/lib/scenario-editor/utils/valhalla.js
+++ b/lib/scenario-editor/utils/valhalla.js
@@ -3,6 +3,7 @@
 import fetch from 'isomorphic-fetch'
 import {decode as decodePolyline} from 'polyline'
 import {isEqual as coordinatesAreEqual} from '@conveyal/lonlat'
+import qs from 'qs'
 import lineString from 'turf-linestring'
 
 // This can be used for logging line strings to geojson.io URLs for easy
@@ -104,7 +105,8 @@ function handleGraphHopperRouting (path: Path, individualLegs: boolean = false):
  */
 export async function polyline (
   points: Array<LatLng>,
-  individualLegs?: boolean = false
+  individualLegs?: boolean = false,
+  avoidMotorways?: boolean = false
 ): Promise<any> {
   let json
   const geometry = []
@@ -124,7 +126,7 @@ export async function polyline (
       const beginIndex = i + offset
       const endIndex = i + chunk + offset
       const chunkedPoints = points.slice(beginIndex, endIndex)
-      json = await routeWithGraphHopper(chunkedPoints)
+      json = await routeWithGraphHopper(chunkedPoints, avoidMotorways)
       const path = json && json.paths && json.paths[0]
       // Route between chunked list of points
       if (path) {
@@ -193,7 +195,7 @@ export async function getSegment (
  *
  * Example URL: https://graphhopper.com/api/1/route?point=49.932707,11.588051&point=50.3404,11.64705&vehicle=car&debug=true&&type=json
  */
-export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopperResponse> {
+export function routeWithGraphHopper (points: Array<LatLng>, avoidMotorways?: boolean): ?Promise<GraphHopperResponse> {
   if (points.length < 2) {
     console.warn('need at least two points to route with graphhopper', points)
     return null
@@ -203,27 +205,37 @@ export function routeWithGraphHopper (points: Array<LatLng>): ?Promise<GraphHopp
   }
   // Use custom url if it exists, otherwise default to the hosted service.
   const GRAPH_HOPPER_URL = process.env.GRAPH_HOPPER_URL || 'https://graphhopper.com/api/1/'
-
-  return fetch(
-    `${GRAPH_HOPPER_URL}route?key=${process.env.GRAPH_HOPPER_KEY}`,
-    // New custom routing headers
-    {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        'ch.disable': true,
-        custom_model: {
-          'priority': [{
-            'if': 'road_class == MOTORWAY',
-            'multiply_by': 0.1
-          }]
+  const params = {
+    key: process.env.GRAPH_HOPPER_KEY,
+    vehicle: 'car',
+    debug: true,
+    type: 'json'
+  }
+  const locations = points.map(p => (`point=${p.lat},${p.lng}`)).join('&')
+  // Avoiding motorways requires a POST request with a formatted body
+  console.log('avoidMotorways:', avoidMotorways)
+  const graphHopperRequest = avoidMotorways
+    ? fetch(`${GRAPH_HOPPER_URL}route?key=${params.key}`,
+      {
+        body: JSON.stringify({
+          'ch.disable': true,
+          // Custom model disincentives motorways
+          custom_model: {
+            'priority': [{
+              'if': 'road_class == MOTORWAY',
+              'multiply_by': 0.1
+            }]
+          },
+          debug: params.debug,
+          points: points.map(p => [p.lng, p.lat]),
+          profile: params.vehicle
+        }),
+        headers: {
+          'Content-Type': 'application/json'
         },
-        key: process.env.GRAPH_HOPPER_KEY,
-        points: points.map(p => [p.lng, p.lat]),
-        profile: 'car'
+        method: 'POST'
       })
-    }
-  ).then(res => res.json())
+    : fetch(`${GRAPH_HOPPER_URL}route?${locations}&${qs.stringify(params)}`)
+
+  return graphHopperRequest.then(res => res.json())
 }

From a856203191e2774cee534f162480f155dcba0dc4 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Wed, 9 Mar 2022 10:57:25 -0500
Subject: [PATCH 502/553] refactor(EditSettingsState type): Add avoidMotorways
 to flow edit state type

---
 lib/types/reducers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/types/reducers.js b/lib/types/reducers.js
index b84f0c5b9..010b8a233 100644
--- a/lib/types/reducers.js
+++ b/lib/types/reducers.js
@@ -209,6 +209,7 @@ export type DataState = {
 export type EditSettingsState = {
   addStops: boolean,
   afterIntersection: boolean,
+  avoidMotorways: boolean,
   controlPoints: null | Array<ControlPoint>,
   currentDragId: null | string,
   distanceFromIntersection: number,

From 857676f6c40876cfe41d5d95c7d37fd3a72eb5a6 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Wed, 9 Mar 2022 11:41:24 -0500
Subject: [PATCH 503/553] refactor(Valhalla, stopStrategies): Support avoiding
 motorways in adding, editing patterns

---
 lib/editor/actions/map/index.js          | 10 ++++++----
 lib/editor/actions/map/stopStrategies.js | 14 ++++++++------
 lib/editor/util/map.js                   |  9 ++++++---
 lib/scenario-editor/utils/valhalla.js    |  8 +++++---
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/lib/editor/actions/map/index.js b/lib/editor/actions/map/index.js
index 664ffad12..f79304923 100644
--- a/lib/editor/actions/map/index.js
+++ b/lib/editor/actions/map/index.js
@@ -19,7 +19,6 @@ import {
   newControlPoint,
   shapePointsToSimpleCoordinates
 } from '../../util/map'
-
 import type {Feed, LatLng, Pattern, ControlPoint} from '../../../types'
 import type {dispatchFn, getStateFn} from '../../../types/reducers'
 
@@ -163,8 +162,9 @@ export function handleControlPointDrag (
   patternCoordinates: any
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
-    const {currentDragId, followStreets} = getState().editor.editSettings.present
+    const {avoidMotorways, currentDragId, followStreets} = getState().editor.editSettings.present
     recalculateShape({
+      avoidMotorways,
       controlPoints,
       defaultToStraightLine: false,
       dragId: currentDragId,
@@ -204,8 +204,9 @@ export function handleControlPointDragEnd (
     dispatch(controlPointDragOrEnd())
 
     // recalculate shape for final position
-    const {followStreets} = getState().editor.editSettings.present
+    const {avoidMotorways, followStreets} = getState().editor.editSettings.present
     recalculateShape({
+      avoidMotorways,
       controlPoints,
       defaultToStraightLine: false,
       editType: 'update',
@@ -243,11 +244,12 @@ export function handleControlPointDragStart (controlPoint: ControlPoint) {
 
 export function removeControlPoint (controlPoints: Array<ControlPoint>, index: number, pattern: Pattern, patternCoordinates: any) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
-    const {followStreets} = getState().editor.editSettings.present
+    const {avoidMotorways, followStreets} = getState().editor.editSettings.present
     const {
       coordinates,
       updatedControlPoints
     } = await recalculateShape({
+      avoidMotorways,
       controlPoints,
       editType: 'delete',
       index,
diff --git a/lib/editor/actions/map/stopStrategies.js b/lib/editor/actions/map/stopStrategies.js
index 33f4dcc88..c66e43e45 100644
--- a/lib/editor/actions/map/stopStrategies.js
+++ b/lib/editor/actions/map/stopStrategies.js
@@ -32,7 +32,6 @@ import {
   constructPoint
 } from '../../util/map'
 import {coordinatesFromShapePoints} from '../../util/objects'
-
 import type {ControlPoint, GtfsStop, LatLng, Pattern} from '../../../types'
 import type {dispatchFn, getStateFn} from '../../../types/reducers'
 
@@ -223,7 +222,7 @@ export function addStopAtInterval (latlng: LatLng, activePattern: Pattern, contr
 export function addStopToPattern (pattern: Pattern, stop: GtfsStop, index?: ?number) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
     const {data, editSettings} = getState().editor
-    const {followStreets} = editSettings.present
+    const {avoidMotorways, followStreets} = editSettings.present
     const {patternStops: currentPatternStops, shapePoints} = pattern
     const patternStops = clone(currentPatternStops)
     const {controlPoints, patternSegments} = getControlPoints(getState())
@@ -273,7 +272,7 @@ export function addStopToPattern (pattern: Pattern, stop: GtfsStop, index?: ?num
           }
           const points = [previousStop, stop]
             .map((stop, index) => ({lng: stop.stop_lon, lat: stop.stop_lat}))
-          const patternSegments = await getPolyline(points, true)
+          const patternSegments = await getPolyline(points, true, avoidMotorways)
           // Update pattern stops and geometry.
           const controlPoints = controlPointsFromSegments(patternStops, patternSegments)
           dispatch(updatePatternGeometry({controlPoints, patternSegments}))
@@ -332,6 +331,7 @@ export function addStopToPattern (pattern: Pattern, stop: GtfsStop, index?: ?num
         let result
         try {
           result = await recalculateShape({
+            avoidMotorways,
             controlPoints: clonedControlPoints,
             defaultToStraightLine: false,
             editType: 'update',
@@ -372,6 +372,7 @@ export function addStopToPattern (pattern: Pattern, stop: GtfsStop, index?: ?num
         clonedPatternSegments.splice(0, 0, [])
         try {
           result = await recalculateShape({
+            avoidMotorways: avoidMotorways,
             controlPoints: clonedControlPoints,
             defaultToStraightLine: false,
             editType: 'update',
@@ -405,12 +406,12 @@ export function addStopToPattern (pattern: Pattern, stop: GtfsStop, index?: ?num
  */
 function extendPatternToPoint (pattern, endPoint, newEndPoint, stop = null, splitInterval = 0) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
-    const {followStreets} = getState().editor.editSettings.present
+    const {avoidMotorways, followStreets} = getState().editor.editSettings.present
     const {controlPoints, patternSegments} = getControlPoints(getState())
     const clonedControlPoints = clone(controlPoints)
     let newShape
     if (followStreets) {
-      newShape = await getPolyline([endPoint, newEndPoint])
+      newShape = await getPolyline([endPoint, newEndPoint], false, avoidMotorways)
     }
     if (!newShape) {
       // Get single coordinate for straight line if polyline fails or if not
@@ -502,10 +503,11 @@ export function removeStopFromPattern (pattern: Pattern, stop: GtfsStop, index:
       // If pattern has no shape points, don't attempt to refactor pattern shape
       console.log('pattern coordinates do not exist')
     } else {
-      const {followStreets} = getState().editor.editSettings.present
+      const {avoidMotorways, followStreets} = getState().editor.editSettings.present
       let result
       try {
         result = await recalculateShape({
+          avoidMotorways,
           controlPoints: clonedControlPoints,
           editType: 'delete',
           index: cpIndex,
diff --git a/lib/editor/util/map.js b/lib/editor/util/map.js
index 3abb91bfe..6fd0bd0b5 100644
--- a/lib/editor/util/map.js
+++ b/lib/editor/util/map.js
@@ -16,9 +16,7 @@ import {ENTITY, POINT_TYPE} from '../constants'
 import {getSegment} from '../../scenario-editor/utils/valhalla'
 import {generateUID} from '../../common/util/util'
 import {getConfigProperty} from '../../common/util/config'
-import {coordinatesFromShapePoints} from './objects'
 import {reverseEsri as reverse} from '../../scenario-editor/utils/reverse'
-
 import type {
   ControlPoint,
   Coordinate,
@@ -34,6 +32,8 @@ import type {
   StopTime
 } from '../../types'
 
+import {coordinatesFromShapePoints} from './objects'
+
 type R5Response = {
   data: {
     features: Array<GeoJsonLinestring & {properties: {toVertex: number}}>
@@ -258,6 +258,7 @@ export function getPatternEndPoint (pattern: Pattern, controlPoints?: Array<Cont
 
 /* eslint-disable complexity */
 export async function recalculateShape ({
+  avoidMotorways = false,
   controlPoints,
   defaultToStraightLine = true,
   dragId,
@@ -268,6 +269,7 @@ export async function recalculateShape ({
   patternCoordinates,
   snapControlPointToNewSegment = false
 }: {
+  avoidMotorways?: boolean,
   controlPoints: Array<ControlPoint>,
   defaultToStraightLine?: boolean,
   dragId?: null | string,
@@ -391,7 +393,8 @@ export async function recalculateShape ({
   const newSegment = await getSegment(
     pointsToRoute,
     followStreets,
-    defaultToStraightLine
+    defaultToStraightLine,
+    avoidMotorways
   )
   if (!newSegment || !newSegment.coordinates) {
     // If new segment calculation is unsuccessful, return null for coordinates and
diff --git a/lib/scenario-editor/utils/valhalla.js b/lib/scenario-editor/utils/valhalla.js
index 1f2621272..c76a382c0 100644
--- a/lib/scenario-editor/utils/valhalla.js
+++ b/lib/scenario-editor/utils/valhalla.js
@@ -149,7 +149,8 @@ export async function polyline (
 export async function getSegment (
   points: Coordinates,
   followRoad: boolean,
-  defaultToStraightLine: boolean = true
+  defaultToStraightLine: boolean = true,
+  avoidMotorways: boolean = false
 ): Promise<?{
   coordinates: Coordinates,
   type: 'LineString'
@@ -159,7 +160,9 @@ export async function getSegment (
   if (followRoad) {
     // if snapping to streets, use routing service.
     const coordinates = await polyline(
-      points.map(p => ({lng: p[0], lat: p[1]}))
+      points.map(p => ({lng: p[0], lat: p[1]})),
+      false,
+      avoidMotorways
     )
     if (!coordinates) {
       // If routing was unsuccessful, default to straight line (if desired by
@@ -213,7 +216,6 @@ export function routeWithGraphHopper (points: Array<LatLng>, avoidMotorways?: bo
   }
   const locations = points.map(p => (`point=${p.lat},${p.lng}`)).join('&')
   // Avoiding motorways requires a POST request with a formatted body
-  console.log('avoidMotorways:', avoidMotorways)
   const graphHopperRequest = avoidMotorways
     ? fetch(`${GRAPH_HOPPER_URL}route?key=${params.key}`,
       {

From f922f58a954acc5180d18ba25b0b3fd9f65df362 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Wed, 9 Mar 2022 12:07:25 -0500
Subject: [PATCH 504/553] refactor(EditSettings): Change "motorway" to
 "highway" in checkbox desc.

---
 lib/editor/components/pattern/EditSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/editor/components/pattern/EditSettings.js b/lib/editor/components/pattern/EditSettings.js
index 989ccd1eb..d353495fe 100644
--- a/lib/editor/components/pattern/EditSettings.js
+++ b/lib/editor/components/pattern/EditSettings.js
@@ -65,7 +65,7 @@ export default class EditSettings extends Component<Props, State> {
     } = editSettings
     const SETTINGS = [
       {type: 'followStreets', label: 'Snap to streets'},
-      {type: 'avoidMotorways', label: 'Avoid motorways in routing'},
+      {type: 'avoidMotorways', label: 'Avoid highways in routing'},
       {type: 'hideStopHandles', label: 'Hide stop handles'},
       {type: 'hideInactiveSegments', label: 'Hide inactive segments'},
       {type: 'showStops', label: 'Show stops'},

From 0de00c68fe018bba753f8f1886e6a22d11544eb9 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Wed, 16 Mar 2022 11:59:07 -0400
Subject: [PATCH 505/553] feat(Timetable Validation): Fix timetable previous
 stop time checks from checking text columns.

---
 .gitignore                        | 3 +++
 lib/editor/selectors/timetable.js | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 57afa319e..9790d1902 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ env.yml-original
 .env
 !configurations/test/env.yml
 scripts/*client.json
+
+# Vs code settings
+.vscode
diff --git a/lib/editor/selectors/timetable.js b/lib/editor/selectors/timetable.js
index 33bdb205f..9fbde8054 100644
--- a/lib/editor/selectors/timetable.js
+++ b/lib/editor/selectors/timetable.js
@@ -4,14 +4,12 @@ import objectPath from 'object-path'
 
 import { getAbbreviatedStopName, getTableById } from '../util/gtfs'
 import { isTimeFormat } from '../util/timetable'
-
 import type {
   GtfsStop,
   Pattern,
   TimetableColumn,
   Trip
 } from '../../types'
-
 import type { AppState } from '../../types/reducers'
 import type { EditorValidationIssue } from '../util/validation'
 
@@ -152,7 +150,7 @@ const isCellValueInvalid = (
       let previousValue = null
       let previousIndex = colIndex - 1
       // Find previous stop time
-      while (previousValue === null && previousIndex >= 0) {
+      while (previousValue === null && previousIndex >= 0 && columns[previousIndex].type !== 'TEXT') {
         const previousCol = columns[previousIndex]
         previousValue = previousCol && row && objectPath.get(row, previousCol.key)
         previousIndex--

From da2ba045945c8b64d06d0c3f207b8d38b89759f2 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Wed, 16 Mar 2022 12:28:23 -0400
Subject: [PATCH 506/553] refactor(.gitignore): Add trailing slash to show
 vscode folder

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9790d1902..9706b9000 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,4 @@ env.yml-original
 scripts/*client.json
 
 # Vs code settings
-.vscode
+.vscode/

From 896ebe0fcff0da1e7ffe91adf90d7915fdd232fe Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Tue, 22 Mar 2022 12:47:47 -0400
Subject: [PATCH 507/553] refactor(timetable.js): Only validate arrival or
 depature time columns (more strict check)

---
 lib/editor/selectors/timetable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/editor/selectors/timetable.js b/lib/editor/selectors/timetable.js
index 9fbde8054..75f6a7463 100644
--- a/lib/editor/selectors/timetable.js
+++ b/lib/editor/selectors/timetable.js
@@ -150,7 +150,7 @@ const isCellValueInvalid = (
       let previousValue = null
       let previousIndex = colIndex - 1
       // Find previous stop time
-      while (previousValue === null && previousIndex >= 0 && columns[previousIndex].type !== 'TEXT') {
+      while (previousValue === null && previousIndex >= 0 && (columns[previousIndex].type === 'ARRIVAL_TIME' || columns[previousIndex].type === 'DEPARTURE_TIME')) {
         const previousCol = columns[previousIndex]
         previousValue = previousCol && row && objectPath.get(row, previousCol.key)
         previousIndex--

From 09c9f444447f303598c95a0f17ae9c29faa1cca8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Apr 2022 12:33:41 -0400
Subject: [PATCH 508/553] perf(FeedVersionNavigator): Use new FeedSummaries
 endpoint.

---
 lib/manager/actions/versions.js               | 27 ++++++++++++++-----
 .../version/FeedVersionNavigator.js           | 27 ++++++++++---------
 .../version/VersionRetrievalBadge.js          |  4 +--
 .../version/VersionSelectorDropdown.js        | 12 ++++-----
 .../containers/ActiveFeedVersionNavigator.js  | 17 +++++++-----
 lib/manager/reducers/projects.js              |  6 +++--
 lib/manager/util/index.js                     |  4 +--
 lib/manager/util/version.js                   |  4 +--
 lib/types/index.js                            | 12 +++++++++
 9 files changed, 74 insertions(+), 39 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index bb699c1d8..6c5a656cf 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -129,7 +129,7 @@ export function fetchFeedVersions (feedSource: Feed, unsecured: ?boolean = false
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(requestingFeedVersions())
     const apiRoot = unsecured ? 'public' : 'secure'
-    const url = `/api/manager/${apiRoot}/feedversion?feedSourceId=${feedSource.id}`
+    const url = `/api/manager/${apiRoot}/feedversionsummaries?feedSourceId=${feedSource.id}`
     return dispatch(secureFetch(url))
       .then(response => response.json())
       .then(versions => {
@@ -583,11 +583,26 @@ export function setVersionIndex (
   isPublic?: boolean
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
-    if (feed.feedVersions) {
-      dispatch(setActiveVersion(feed.feedVersions[index - 1]))
-
-      if (push) {
-        browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${index}`)
+    console.log('trying to set active version', index)
+    if (feed.feedVersionSummaries) {
+      const newActiveVersion = feed.feedVersions && feed.feedVersions[index - 1]
+      if (!newActiveVersion) {
+        // If the requested version has not been fetched yet, async fetch it.
+        const versionId = feed.feedVersionSummaries[index - 1].id
+        dispatch(fetchFeedVersion(versionId))
+          .then((version) => {
+            // TODO: Refactor
+            dispatch(setActiveVersion(version))
+            if (push) {
+              browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${index}`)
+            }
+          })
+      } else {
+        // TODO: Refactor
+        dispatch(setActiveVersion(newActiveVersion))
+        if (push) {
+          browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${index}`)
+        }
       }
     } else {
       console.warn('No feed versions for feed were found.', feed)
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 11296f90e..5a977d5f5 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -17,14 +17,14 @@ import * as snapshotActions from '../../../editor/actions/snapshots'
 import * as gtfsPlusActions from '../../../gtfsplus/actions/gtfsplus'
 import * as deploymentActions from '../../../manager/actions/deployments'
 import DeploymentPreviewButton from '../deployment/DeploymentPreviewButton'
+import type {Props as ContainerProps} from '../../containers/ActiveFeedVersionNavigator'
+import type {FeedVersion, FeedVersionSummary, GtfsPlusValidation, Note} from '../../../types'
+import type {GtfsState, ManagerUserState} from '../../../types/reducers'
+
 import FeedVersionViewer from './FeedVersionViewer'
 import VersionComparisonDropdown from './VersionComparisonDropdown'
 import VersionSelectorDropdown from './VersionSelectorDropdown'
 
-import type {Props as ContainerProps} from '../../containers/ActiveFeedVersionNavigator'
-import type {FeedVersion, GtfsPlusValidation, Note} from '../../../types'
-import type {GtfsState, ManagerUserState} from '../../../types/reducers'
-
 type Props = ContainerProps & {
   comparedVersion?: FeedVersion,
   createDeploymentFromFeedSource: typeof deploymentActions.createDeploymentFromFeedSource,
@@ -51,7 +51,8 @@ type Props = ContainerProps & {
   user: ManagerUserState,
   version: FeedVersion,
   versionIndexDoesNotExist: boolean,
-  versionSection: ?string
+  versionSection: ?string,
+  versionSummaries: Array<FeedVersionSummary>,
 }
 
 type State = {
@@ -162,7 +163,8 @@ export default class FeedVersionNavigator extends Component<Props, State> {
       sortedVersions,
       user,
       version,
-      versionSection
+      versionSection,
+      versionSummaries
     } = this.props
     // Grab the feed-source-specific deployment that is both actively deployed
     // and contains the selected version's GTFS.
@@ -173,7 +175,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
         d.deployedTo &&
         d.feedVersions.findIndex(v => v.id === version.id) !== -1
       )
-    const dropdownTitle = `${this.messages('version')} ${feedVersionIndex} ${this.messages('of')} ${sortedVersions.length}`
+    const dropdownTitle = `${this.messages('version')} ${feedVersionIndex} ${this.messages('of')} ${versionSummaries.length}`
 
     return (
       <div>
@@ -206,14 +208,14 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                   {/* Previous Version Button */}
                   <Button
                     data-test-id='decrement-feed-version-button'
-                    disabled={!hasVersions || !sortedVersions[feedVersionIndex - 2]}
+                    disabled={!hasVersions || !versionSummaries[feedVersionIndex - 2]}
                     href='#'
                     onClick={this._decrementVersion}>
                     <Glyphicon glyph='arrow-left' />
                   </Button>
 
                   {/* Version Selector Dropdown */}
-                  {sortedVersions.length > 0 &&
+                  {versionSummaries.length > 0 &&
                     <VersionSelectorDropdown
                       dropdownProps={{
                         id: 'versionSelector',
@@ -222,12 +224,12 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                       header='Select a version to view summary'
                       title={dropdownTitle}
                       version={version}
-                      versions={sortedVersions}
+                      versions={versionSummaries}
                     />
                   }
                   {/* Next Version Button */}
                   <Button href='#'
-                    disabled={!hasVersions || !sortedVersions[feedVersionIndex]}
+                    disabled={!hasVersions || !versionSummaries[feedVersionIndex]}
                     onClick={this._incrementVersion}>
                     <Glyphicon glyph='arrow-right' />
                   </Button>
@@ -344,7 +346,8 @@ export default class FeedVersionNavigator extends Component<Props, State> {
               user={user}
               version={this.props.version}
               versionSection={versionSection || null}
-              versions={sortedVersions} />
+              versions={sortedVersions}
+            />
           </Col>
         </Row>
       </div>
diff --git a/lib/manager/components/version/VersionRetrievalBadge.js b/lib/manager/components/version/VersionRetrievalBadge.js
index ce0143cdd..cdba8b31c 100644
--- a/lib/manager/components/version/VersionRetrievalBadge.js
+++ b/lib/manager/components/version/VersionRetrievalBadge.js
@@ -4,11 +4,11 @@ import Icon from '@conveyal/woonerf/components/icon'
 import React from 'react'
 
 import toSentenceCase from '../../../common/util/to-sentence-case'
-import type { FeedVersion, RetrievalMethod } from '../../../types'
+import type { FeedVersionSummary, RetrievalMethod } from '../../../types'
 
 type Props = {
   retrievalMethod?: RetrievalMethod,
-  version?: FeedVersion
+  version?: FeedVersionSummary
 }
 
 const iconForRetrievalMethod = (retrievalMethod: RetrievalMethod | 'UNKNOWN') => {
diff --git a/lib/manager/components/version/VersionSelectorDropdown.js b/lib/manager/components/version/VersionSelectorDropdown.js
index 1f8881814..00a4e589b 100644
--- a/lib/manager/components/version/VersionSelectorDropdown.js
+++ b/lib/manager/components/version/VersionSelectorDropdown.js
@@ -5,22 +5,22 @@ import * as React from 'react'
 import { Dropdown } from 'react-bootstrap'
 
 import MenuItem from '../../../common/components/MenuItem'
-import VersionRetrievalBadge from './VersionRetrievalBadge'
+import type { FeedVersion, FeedVersionSummary } from '../../../types'
 
-import type { FeedVersion } from '../../../types'
+import VersionRetrievalBadge from './VersionRetrievalBadge'
 
 type Props = {
   dropdownProps: any,
   extraOptions?: ?Array<{onClick: () => void, text: string}>,
   header?: string,
-  itemFormatter: (FeedVersion, ?FeedVersion) => React.Node,
+  itemFormatter: (FeedVersionSummary, ?FeedVersionSummary) => React.Node,
   title: React.Node,
   // Indicates which version is active in the feed version navigator.
-  version?: FeedVersion,
-  versions: ?Array<FeedVersion>
+  version?: FeedVersionSummary,
+  versions: ?Array<FeedVersionSummary>
 }
 
-export const DefaultItemFormatter = (version: FeedVersion, activeVersion: ?FeedVersion) => (
+export const DefaultItemFormatter = (version: FeedVersionSummary, activeVersion: ?FeedVersion) => (
   <MenuItem
     eventKey={version.version}
     key={version.id}
diff --git a/lib/manager/containers/ActiveFeedVersionNavigator.js b/lib/manager/containers/ActiveFeedVersionNavigator.js
index d018526e2..ef855c98f 100644
--- a/lib/manager/containers/ActiveFeedVersionNavigator.js
+++ b/lib/manager/containers/ActiveFeedVersionNavigator.js
@@ -23,7 +23,6 @@ import {createDeploymentFromFeedSource} from '../../manager/actions/deployments'
 import {loadFeedVersionForEditing} from '../../editor/actions/snapshots'
 import {downloadGtfsPlusFeed} from '../../gtfsplus/actions/gtfsplus'
 import {versionsLastUpdatedComparator} from '../util/version'
-
 import type {Feed, Project} from '../../types'
 import type {AppState, RouteParams} from '../../types/reducers'
 
@@ -41,27 +40,30 @@ export type Props = {
 const mapStateToProps = (state: AppState, ownProps: Props) => {
   let feedVersionIndex
   const {routeParams, feedSource} = ownProps
-  const {feedVersions} = feedSource
+  const {feedVersions, feedVersionSummaries} = feedSource
   const {feedVersionIndex: fvi, subpage} = routeParams
   const routeVersionIndex = parseInt(fvi, 10)
   const hasVersionIndex = typeof fvi !== 'undefined'
   let versionIndexDoesNotExist = false
-  if (feedSource && typeof feedVersions !== 'undefined') {
+  if (feedSource && typeof feedVersionSummaries !== 'undefined') {
     if ((hasVersionIndex && isNaN(routeVersionIndex)) ||
-        routeVersionIndex > feedVersions.length ||
+        routeVersionIndex > feedVersionSummaries.length ||
         routeVersionIndex < 0) {
       versionIndexDoesNotExist = true
     } else {
       feedVersionIndex = hasVersionIndex
         ? routeVersionIndex
-        : feedVersions.length
+        : feedVersionSummaries.length
     }
   }
   const {gtfs} = state
-  const hasVersions = feedVersions && feedVersions.length > 0
+  const hasVersions = feedVersionSummaries && feedVersionSummaries.length > 0
   const sortedVersions = (hasVersions && feedVersions)
     ? feedVersions.sort(versionsLastUpdatedComparator)
     : []
+  const sortedSummaries = (hasVersions && feedVersionSummaries)
+    ? feedVersionSummaries.sort(versionsLastUpdatedComparator)
+    : []
 
   let comparedVersion, version
 
@@ -88,7 +90,8 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
     version,
     comparedVersion,
     versionIndexDoesNotExist,
-    versionSection: subpage
+    versionSection: subpage,
+    versionSummaries: sortedSummaries
   }
 }
 
diff --git a/lib/manager/reducers/projects.js b/lib/manager/reducers/projects.js
index 8f2583b62..33076b67f 100644
--- a/lib/manager/reducers/projects.js
+++ b/lib/manager/reducers/projects.js
@@ -224,7 +224,8 @@ const projects = (state: ProjectsState = defaultState, action: Action): Projects
       }
       return update(state, {
         all: {[projectIndex]: {feedSources: {[sourceIndex]: {$merge: {
-          feedVersions: versions.sort(versionSort)
+          feedVersions: [], // versions.sort(versionSort), // TODO remove
+          feedVersionSummaries: versions.sort(versionSort)
         }}}}}
       })
     }
@@ -242,7 +243,8 @@ const projects = (state: ProjectsState = defaultState, action: Action): Projects
       return update(state, {
         all: {[projectIndex]: {feedSources: {[sourceIndex]: {
           feedVersions: updatedVersions
-        }}}}
+        }}}},
+        isFetching: { $set: false }
       })
     }
     case 'PUBLISHED_FEEDVERSION': {
diff --git a/lib/manager/util/index.js b/lib/manager/util/index.js
index 2fe98ab85..28c1309a5 100644
--- a/lib/manager/util/index.js
+++ b/lib/manager/util/index.js
@@ -382,10 +382,10 @@ export function getIndexesFromFeed ({
     return { projectIndex, sourceIndex, versionIndex: -2, errorIndex: -2 }
   }
   const feedSource = project.feedSources[sourceIndex]
-  if (!feedSource.feedVersions) {
+  if (!feedSource.feedVersionSummaries) {
     return { projectIndex, sourceIndex, versionIndex: -2, errorIndex: -2 }
   }
-  const versionIndex = feedSource.feedVersions.findIndex(v => v.id === feedVersionId)
+  const versionIndex = feedSource.feedVersionSummaries.findIndex(v => v.id === feedVersionId)
   if (!errorType || !feedSource.feedVersions || versionIndex < 0) {
     return { projectIndex, sourceIndex, versionIndex, errorIndex: -2 }
   }
diff --git a/lib/manager/util/version.js b/lib/manager/util/version.js
index 3f5467068..4f5b7aadc 100644
--- a/lib/manager/util/version.js
+++ b/lib/manager/util/version.js
@@ -4,11 +4,11 @@ import moment from 'moment'
 import numeral from 'numeral'
 
 import { isExtensionEnabled } from '../../common/util/config'
-
 import type {
   Deployment,
   Feed,
   FeedVersion,
+  FeedVersionSummary,
   Project,
   SummarizedFeedVersion,
   ValidationResult,
@@ -182,7 +182,7 @@ export function getVersionValidationSummaryByFilterStrategy (
   }
 }
 
-export const versionsLastUpdatedComparator = (a: FeedVersion, b: FeedVersion) => {
+export const versionsLastUpdatedComparator = (a: FeedVersionSummary, b: FeedVersionSummary) => {
   return a.updated - b.updated
 }
 
diff --git a/lib/types/index.js b/lib/types/index.js
index c71a8f256..da19e6b1e 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -385,6 +385,7 @@ export type Feed = {
   editorNamespace: ?string,
   editorSnapshots?: Array<Snapshot>,
   externalProperties?: any, // TODO: add more exact type
+  feedVersionSummaries?: Array<FeedVersionSummary>,
   feedVersions?: Array<FeedVersion>,
   fetchFrequency?: FetchFrequency,
   fetchInterval?: number,
@@ -501,6 +502,17 @@ export type FeedTransformResult = {
   tableTransformResults: Array<TableTransformResult>
 }
 
+// TODO: Refactor
+export type FeedVersionSummary = {|
+  dateCreated: number,
+  id: string,
+  lastUpdated: number,
+  name: string,
+  namespace: string,
+  retrievalMethod: ?RetrievalMethod,
+  version: number
+|}
+
 export type FeedVersion = {|
   dateCreated: number,
   feedLoadResult: FeedLoadResult,

From 15a92cd308536d421350409d56776cec4521c9a9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Apr 2022 14:06:18 -0400
Subject: [PATCH 509/553] refactor(FeedVersionNavigator): Use
 feed.versionSummaries for version selectors.

---
 .../components/transform/ReplaceFileFromVersion.js  |  3 +--
 .../components/version/FeedVersionDetails.js        |  2 +-
 .../components/version/FeedVersionNavigator.js      |  2 +-
 .../components/version/VersionComparisonDropdown.js | 13 +++++++------
 lib/manager/reducers/projects.js                    |  2 +-
 lib/manager/util/version.js                         |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/manager/components/transform/ReplaceFileFromVersion.js b/lib/manager/components/transform/ReplaceFileFromVersion.js
index ebfaaea16..d0b91aa71 100644
--- a/lib/manager/components/transform/ReplaceFileFromVersion.js
+++ b/lib/manager/components/transform/ReplaceFileFromVersion.js
@@ -3,7 +3,6 @@
 import React, { Component } from 'react'
 
 import VersionSelectorDropdown from '../version/VersionSelectorDropdown'
-
 import type { TransformProps } from '../../../types'
 
 /**
@@ -65,7 +64,7 @@ export default class ReplaceFileFromVersion extends Component<TransformProps<{}>
           : 'Select a source version'
         }
         version={version}
-        versions={feedSource.feedVersions}
+        versions={feedSource.feedVersionSummaries}
       />
     )
   }
diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index 5e6bb1f2f..17222be9d 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -152,7 +152,7 @@ export default class FeedVersionDetails extends Component<Props> {
               title={<span><Icon type='code-fork' /> {mergeButtonLabel}</span>}
               itemFormatter={this._mergeItemFormatter}
               version={version}
-              versions={feedSource.feedVersions}
+              versions={feedSource.feedVersionSummaries}
             />
             <Button
               disabled={
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 5a977d5f5..760664e25 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -242,7 +242,7 @@ export default class FeedVersionNavigator extends Component<Props, State> {
                     <VersionComparisonDropdown
                       comparedVersion={comparedVersion}
                       version={version}
-                      versions={feedSource.feedVersions}
+                      versions={feedSource.feedVersionSummaries}
                     />
                   </ButtonGroup>
                 }
diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
index cd3e922d2..3d7345cf8 100644
--- a/lib/manager/components/version/VersionComparisonDropdown.js
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -5,16 +5,16 @@ import {MenuItem} from 'react-bootstrap'
 import {connect} from 'react-redux'
 
 import * as versionsActions from '../../actions/versions'
-import VersionSelectorDropdown, {DefaultItemFormatter} from './VersionSelectorDropdown'
-
-import type {FeedVersion} from '../../../types'
+import type {FeedVersion, FeedVersionSummary} from '../../../types'
 import type {AppState} from '../../../types/reducers'
 
+import VersionSelectorDropdown, {DefaultItemFormatter} from './VersionSelectorDropdown'
+
 type Props = {
   comparedVersion?: FeedVersion,
   setComparedVersion: typeof versionsActions.setComparedVersion,
   version: FeedVersion,
-  versions: Array<FeedVersion>
+  versions: Array<FeedVersionSummary>
 }
 
 /**
@@ -27,6 +27,7 @@ class VersionComparisonDropdown extends Component<Props> {
     const comparedVersionIndex = comparedVersion ? comparedVersion.version : -1
     // Note: index is 1-based (the menu item at index 0 is a caption).
     if (index !== comparedVersionIndex) {
+      // FIXME
       setComparedVersion(versions.find(v => v.version === index))
     }
   }
@@ -48,8 +49,8 @@ class VersionComparisonDropdown extends Component<Props> {
 
     // This custom formatter adds and hides the active version in the list to
     // preserve version indexes.
-    const itemFormatter = (itemVersion: FeedVersion, activeVersion: ?FeedVersion) => (
-      itemVersion === version
+    const itemFormatter = (itemVersion: FeedVersionSummary, activeVersion: ?FeedVersion) => (
+      itemVersion.id === version.id
         ? <MenuItem key={itemVersion.id} style={{display: 'none'}} />
         : DefaultItemFormatter(itemVersion, activeVersion)
     )
diff --git a/lib/manager/reducers/projects.js b/lib/manager/reducers/projects.js
index 33076b67f..1f946d6d7 100644
--- a/lib/manager/reducers/projects.js
+++ b/lib/manager/reducers/projects.js
@@ -224,7 +224,7 @@ const projects = (state: ProjectsState = defaultState, action: Action): Projects
       }
       return update(state, {
         all: {[projectIndex]: {feedSources: {[sourceIndex]: {$merge: {
-          feedVersions: [], // versions.sort(versionSort), // TODO remove
+          feedVersions: versions.map(() => null), // versions.sort(versionSort), // TODO remove
           feedVersionSummaries: versions.sort(versionSort)
         }}}}}
       })
diff --git a/lib/manager/util/version.js b/lib/manager/util/version.js
index 4f5b7aadc..67b2b080e 100644
--- a/lib/manager/util/version.js
+++ b/lib/manager/util/version.js
@@ -183,7 +183,7 @@ export function getVersionValidationSummaryByFilterStrategy (
 }
 
 export const versionsLastUpdatedComparator = (a: FeedVersionSummary, b: FeedVersionSummary) => {
-  return a.updated - b.updated
+  return a && b ? a.updated - b.updated : 0
 }
 
 /**

From f5387978dec834fe7a844946485eab152c1e81b1 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Apr 2022 16:11:38 -0400
Subject: [PATCH 510/553] refactor(VersionComparison): Fix version comparison
 selection.

---
 lib/manager/actions/versions.js               | 78 ++++++++++++-------
 .../version/FeedVersionNavigator.js           |  5 +-
 .../version/VersionComparisonDropdown.js      | 44 +++++------
 .../containers/ActiveFeedVersionNavigator.js  |  2 +-
 4 files changed, 76 insertions(+), 53 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 6c5a656cf..200593cc2 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -100,11 +100,6 @@ export function setActiveVersion (version: FeedVersion) {
     }
   }
 }
-// Sets the compared feed version.
-export const setComparedVersion = createAction(
-  'SET_COMPARED_FEEDVERSION',
-  (payload: ?FeedVersion) => payload
-)
 
 const uploadingFeed = createVoidPayloadAction('UPLOADING_FEED')
 
@@ -576,33 +571,41 @@ export function renameFeedVersion (
   }
 }
 
+/**
+ * Ensures that the requested feed version has been fetched,
+ * and fetches the version if necessary.
+ * This method can be called using await.
+ */
+export function ensureVersionIndexIsFetched (
+  feed: Feed,
+  oneBasedIndex: number
+) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    const requestedVersion = feed.feedVersions && feed.feedVersions[oneBasedIndex - 1]
+    console.log('Requesting version ', oneBasedIndex)
+    if (!requestedVersion) {
+      if (feed.feedVersionSummaries) {
+        // If the requested version has not been fetched yet, async fetch it.
+        const versionId = feed.feedVersionSummaries[oneBasedIndex - 1].id
+        return dispatch(fetchFeedVersion(versionId))
+      }
+    }
+    return requestedVersion
+  }
+}
+
 export function setVersionIndex (
   feed: Feed,
-  index: number,
+  oneBasedIndex: number,
   push?: boolean = true,
   isPublic?: boolean
 ) {
-  return function (dispatch: dispatchFn, getState: getStateFn) {
-    console.log('trying to set active version', index)
+  return async function (dispatch: dispatchFn, getState: getStateFn) {
     if (feed.feedVersionSummaries) {
-      const newActiveVersion = feed.feedVersions && feed.feedVersions[index - 1]
-      if (!newActiveVersion) {
-        // If the requested version has not been fetched yet, async fetch it.
-        const versionId = feed.feedVersionSummaries[index - 1].id
-        dispatch(fetchFeedVersion(versionId))
-          .then((version) => {
-            // TODO: Refactor
-            dispatch(setActiveVersion(version))
-            if (push) {
-              browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${index}`)
-            }
-          })
-      } else {
-        // TODO: Refactor
-        dispatch(setActiveVersion(newActiveVersion))
-        if (push) {
-          browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${index}`)
-        }
+      const { payload: newActiveVersion } = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
+      dispatch(setActiveVersion(newActiveVersion))
+      if (push) {
+        browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${oneBasedIndex}`)
       }
     } else {
       console.warn('No feed versions for feed were found.', feed)
@@ -610,6 +613,29 @@ export function setVersionIndex (
   }
 }
 
+// Sets the compared feed version.
+export const settingComparedVersion = createAction(
+  'SET_COMPARED_FEEDVERSION',
+  (payload: FeedVersion) => payload
+)
+export function setComparedVersion (
+  feed: Feed,
+  oneBasedIndex: number
+) {
+  return async function (dispatch: dispatchFn, getState: getStateFn) {
+    const { payload: newComparedVersion } = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
+    // Dispatch action to set value in reducer.
+    dispatch(settingComparedVersion(newComparedVersion))
+    if (newComparedVersion) {
+      // Fetch validation issue count. NOTE: future version-specific data fetching
+      // could also be triggered here.
+      dispatch(fetchValidationIssueCount(newComparedVersion))
+      // Also, fetch GTFS+ validation if module enabled.
+      if (isModuleEnabled('gtfsplus')) dispatch(validateGtfsPlusFeed(newComparedVersion.id))
+    }
+  }
+}
+
 /**
  * Starts the export shapes server job for a particular feed version.
  *
diff --git a/lib/manager/components/version/FeedVersionNavigator.js b/lib/manager/components/version/FeedVersionNavigator.js
index 760664e25..f6295e11b 100644
--- a/lib/manager/components/version/FeedVersionNavigator.js
+++ b/lib/manager/components/version/FeedVersionNavigator.js
@@ -237,12 +237,13 @@ export default class FeedVersionNavigator extends Component<Props, State> {
               }
 
               <ButtonToolbar className='pull-right'>
-                {feedSource.feedVersions &&
+                {versionSummaries &&
                   <ButtonGroup>
                     <VersionComparisonDropdown
                       comparedVersion={comparedVersion}
+                      feedSource={feedSource}
                       version={version}
-                      versions={feedSource.feedVersionSummaries}
+                      versionSummaries={versionSummaries}
                     />
                   </ButtonGroup>
                 }
diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
index 3d7345cf8..e5b61c086 100644
--- a/lib/manager/components/version/VersionComparisonDropdown.js
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -5,16 +5,16 @@ import {MenuItem} from 'react-bootstrap'
 import {connect} from 'react-redux'
 
 import * as versionsActions from '../../actions/versions'
-import type {FeedVersion, FeedVersionSummary} from '../../../types'
-import type {AppState} from '../../../types/reducers'
+import type {Feed, FeedVersion, FeedVersionSummary} from '../../../types'
 
 import VersionSelectorDropdown, {DefaultItemFormatter} from './VersionSelectorDropdown'
 
 type Props = {
   comparedVersion?: FeedVersion,
+  feedSource: Feed,
   setComparedVersion: typeof versionsActions.setComparedVersion,
   version: FeedVersion,
-  versions: Array<FeedVersionSummary>
+  versionSummaries: Array<FeedVersionSummary>
 }
 
 /**
@@ -23,12 +23,11 @@ type Props = {
  */
 class VersionComparisonDropdown extends Component<Props> {
   _onSelectComparedVersion = (index: number) => {
-    const {comparedVersion, setComparedVersion, versions} = this.props
+    const {comparedVersion, feedSource, setComparedVersion} = this.props
     const comparedVersionIndex = comparedVersion ? comparedVersion.version : -1
     // Note: index is 1-based (the menu item at index 0 is a caption).
     if (index !== comparedVersionIndex) {
-      // FIXME
-      setComparedVersion(versions.find(v => v.version === index))
+      setComparedVersion(feedSource, index)
     }
   }
 
@@ -36,25 +35,26 @@ class VersionComparisonDropdown extends Component<Props> {
     this.props.setComparedVersion(null)
   }
 
+  /**
+   * This custom formatter adds and hides the active version in the list to
+   * preserve version indexes.
+   */
+  itemFormatter = (itemVersion: FeedVersionSummary, activeVersion: ?FeedVersion) => (
+    this.props.version && itemVersion.id === this.props.version.id
+      ? <MenuItem key={itemVersion.id} style={{display: 'none'}} />
+      : DefaultItemFormatter(itemVersion, activeVersion)
+  )
+
   render () {
     const {
       comparedVersion,
-      version,
-      versions
+      versionSummaries // FIXME prop drilling redundant with feedSource
     } = this.props
     let title = 'Compare versions'
     if (comparedVersion) {
       title = `Comparing to version ${comparedVersion.version}`
     }
 
-    // This custom formatter adds and hides the active version in the list to
-    // preserve version indexes.
-    const itemFormatter = (itemVersion: FeedVersionSummary, activeVersion: ?FeedVersion) => (
-      itemVersion.id === version.id
-        ? <MenuItem key={itemVersion.id} style={{display: 'none'}} />
-        : DefaultItemFormatter(itemVersion, activeVersion)
-    )
-
     return (
       <VersionSelectorDropdown
         dropdownProps={{
@@ -65,25 +65,21 @@ class VersionComparisonDropdown extends Component<Props> {
           onClick: this._onClearComparedVersion,
           text: 'Exit compare mode'
         }]}
-        header={versions.length < 2
+        header={versionSummaries.length < 2
           ? 'Load another version to enable comparison'
           : 'Select a version to compare with'
         }
-        itemFormatter={itemFormatter}
+        itemFormatter={this.itemFormatter}
         title={title}
         version={comparedVersion}
-        versions={versions}
+        versions={versionSummaries}
       />
     )
   }
 }
 
-const mapStateToProps = (state: AppState, ownProps: {}) => {
-  return {}
-}
-
 const mapDispatchToProps = {
   setComparedVersion: versionsActions.setComparedVersion
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(VersionComparisonDropdown)
+export default connect(null, mapDispatchToProps)(VersionComparisonDropdown)
diff --git a/lib/manager/containers/ActiveFeedVersionNavigator.js b/lib/manager/containers/ActiveFeedVersionNavigator.js
index ef855c98f..7508b51cd 100644
--- a/lib/manager/containers/ActiveFeedVersionNavigator.js
+++ b/lib/manager/containers/ActiveFeedVersionNavigator.js
@@ -76,7 +76,7 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
     version = sortedVersions[feedVersionIndex - 1]
 
     if (gtfs.filter.comparedVersion) {
-      comparedVersion = sortedVersions.find(feedVer => feedVer.id === gtfs.filter.comparedVersion)
+      comparedVersion = sortedVersions.find(feedVer => feedVer && feedVer.id === gtfs.filter.comparedVersion)
     }
   }
   // FIXME: prop drilling.

From 5e857d5fc83307fa22fad6490c189b379c3964ce Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Apr 2022 16:36:40 -0400
Subject: [PATCH 511/553] fix(actions/versions): Fix clearing compared feed
 version.

---
 lib/manager/actions/versions.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 200593cc2..950c3cd16 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -580,14 +580,17 @@ export function ensureVersionIndexIsFetched (
   feed: Feed,
   oneBasedIndex: number
 ) {
-  return function (dispatch: dispatchFn, getState: getStateFn) {
-    const requestedVersion = feed.feedVersions && feed.feedVersions[oneBasedIndex - 1]
+  return async function (dispatch: dispatchFn, getState: getStateFn) {
     console.log('Requesting version ', oneBasedIndex)
+    if (!oneBasedIndex || oneBasedIndex < 1) return null
+
+    const requestedVersion = feed.feedVersions && feed.feedVersions[oneBasedIndex - 1]
     if (!requestedVersion) {
       if (feed.feedVersionSummaries) {
         // If the requested version has not been fetched yet, async fetch it.
         const versionId = feed.feedVersionSummaries[oneBasedIndex - 1].id
-        return dispatch(fetchFeedVersion(versionId))
+        const { payload } = await dispatch(fetchFeedVersion(versionId))
+        return payload
       }
     }
     return requestedVersion
@@ -602,7 +605,7 @@ export function setVersionIndex (
 ) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
     if (feed.feedVersionSummaries) {
-      const { payload: newActiveVersion } = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
+      const newActiveVersion = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
       dispatch(setActiveVersion(newActiveVersion))
       if (push) {
         browserHistory.push(`${isPublic ? '/public' : ''}/feed/${feed.id}/version/${oneBasedIndex}`)
@@ -623,7 +626,7 @@ export function setComparedVersion (
   oneBasedIndex: number
 ) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
-    const { payload: newComparedVersion } = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
+    const newComparedVersion = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
     // Dispatch action to set value in reducer.
     dispatch(settingComparedVersion(newComparedVersion))
     if (newComparedVersion) {

From 0b35d17c4ee1e95dcae0c79214bf49af7df1e434 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Apr 2022 16:41:50 -0400
Subject: [PATCH 512/553] refactor(VersionSelectorDropDown): Remove error msg
 regarding rendering divider children.

---
 lib/manager/components/version/VersionSelectorDropdown.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/manager/components/version/VersionSelectorDropdown.js b/lib/manager/components/version/VersionSelectorDropdown.js
index 00a4e589b..46db107de 100644
--- a/lib/manager/components/version/VersionSelectorDropdown.js
+++ b/lib/manager/components/version/VersionSelectorDropdown.js
@@ -2,7 +2,7 @@
 
 import Icon from '@conveyal/woonerf/components/icon'
 import * as React from 'react'
-import { Dropdown } from 'react-bootstrap'
+import { Dropdown, MenuItem as BsMenuItem } from 'react-bootstrap'
 
 import MenuItem from '../../../common/components/MenuItem'
 import type { FeedVersion, FeedVersionSummary } from '../../../types'
@@ -67,7 +67,7 @@ export default function VersionSelectorDropdown (props: Props) {
           ? versionsSorted.map((v, i) => itemFormatter(v, version))
           : <MenuItem disabled>No versions available</MenuItem>}
 
-        {extraOptions && <MenuItem divider />}
+        {extraOptions && <BsMenuItem divider />}
         {extraOptions && extraOptions.map((option, i) => (
           <MenuItem key={i} onClick={option.onClick}>{option.text}</MenuItem>
         ))}

From e1a28b1a70229f14e1deb7c8b6e5c6b101dd0b91 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:13:07 -0400
Subject: [PATCH 513/553] refactor(ReplaceFileFromVersion): Use
 FeedVersionSummary.

---
 .../transform/FeedTransformation.js           | 10 ++++-----
 .../transform/ReplaceFileFromVersion.js       | 22 +++++++++++--------
 lib/manager/util/transform.js                 |  7 +++---
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/lib/manager/components/transform/FeedTransformation.js b/lib/manager/components/transform/FeedTransformation.js
index 77e33f8d9..78b523c0b 100644
--- a/lib/manager/components/transform/FeedTransformation.js
+++ b/lib/manager/components/transform/FeedTransformation.js
@@ -7,16 +7,16 @@ import Select from 'react-select'
 
 import {getGtfsSpec, getGtfsPlusSpec, isModuleEnabled} from '../../../common/util/config'
 import {getTransformationName, getTransformationPlaceholder} from '../../util/transform'
-import NormalizeField from './NormalizeField'
-import ReplaceFileFromString from './ReplaceFileFromString'
-import ReplaceFileFromVersion from './ReplaceFileFromVersion'
-
 import type {
   Feed,
   FeedTransformation as FeedTransformationType,
   ReactSelectOption
 } from '../../../types'
 
+import NormalizeField from './NormalizeField'
+import ReplaceFileFromString from './ReplaceFileFromString'
+import ReplaceFileFromVersion from './ReplaceFileFromVersion'
+
 type Props = {
   feedSource: Feed,
   index: number,
@@ -117,7 +117,7 @@ export default class FeedTransformation extends Component<Props, {errors: Array<
             onClick={this._onRemoveTransformation}>
             Delete step
           </Button>
-          Step {index + 1} - {getTransformationName(transformationType, transformation, feedSource.feedVersions)}
+          Step {index + 1} - {getTransformationName(transformationType, transformation, feedSource.feedVersionSummaries)}
         </h5>
         <div className='feed-transformation-body'>
           <Select
diff --git a/lib/manager/components/transform/ReplaceFileFromVersion.js b/lib/manager/components/transform/ReplaceFileFromVersion.js
index d0b91aa71..e013469ea 100644
--- a/lib/manager/components/transform/ReplaceFileFromVersion.js
+++ b/lib/manager/components/transform/ReplaceFileFromVersion.js
@@ -15,23 +15,28 @@ export default class ReplaceFileFromVersion extends Component<TransformProps<{}>
 
   _onSelectVersion = (versionIndex: number) => {
     const {feedSource, onSave} = this.props
-    if (feedSource.feedVersions) {
-      const version = feedSource.feedVersions[versionIndex - 1]
+    if (feedSource.feedVersionSummaries) {
+      const version = feedSource.feedVersionSummaries[versionIndex - 1]
       onSave({sourceVersionId: version.id}, this.props.index)
     } else {
       console.warn('Feed source does not have list of feed versions')
     }
   }
 
-  _getValidationErrors (): Array<string> {
+  _findFeedVersion = () => {
     const { feedSource, transformation } = this.props
+    return feedSource.feedVersionSummaries &&
+      feedSource.feedVersionSummaries.find(v => v.id === transformation.sourceVersionId)
+  }
+
+  _getValidationErrors (): Array<string> {
+    const { feedSource } = this.props
     // Get selected version (if applicable).
-    const version = feedSource.feedVersions &&
-      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
+    const version = this._findFeedVersion()
     const issues: Array<string> = []
 
     // Only trigger validation issue if versions have been loaded.
-    if (!version && feedSource.feedVersions) {
+    if (!version && feedSource.feedVersionSummaries) {
       issues.push('Version must be defined')
     }
 
@@ -48,10 +53,9 @@ export default class ReplaceFileFromVersion extends Component<TransformProps<{}>
   }
 
   render () {
-    const {feedSource, transformation} = this.props
+    const {feedSource} = this.props
     // Get selected version (if applicable).
-    const version = feedSource.feedVersions &&
-      feedSource.feedVersions.find(v => v.id === transformation.sourceVersionId)
+    const version = this._findFeedVersion()
 
     return (
       <VersionSelectorDropdown
diff --git a/lib/manager/util/transform.js b/lib/manager/util/transform.js
index 039f18ad4..e6e5ccd2b 100644
--- a/lib/manager/util/transform.js
+++ b/lib/manager/util/transform.js
@@ -1,9 +1,8 @@
 // @flow
 import {getComponentMessages} from '../../common/util/config'
-
 import type {
   FeedTransformation,
-  FeedVersion,
+  FeedVersionSummary,
   Substitution
 } from '../../types'
 
@@ -15,7 +14,7 @@ import type {
 export function getTransformationName (
   type: string,
   transformation?: FeedTransformation,
-  versions?: Array<FeedVersion>
+  versionSummaries?: Array<FeedVersionSummary>
 ) {
   // Get the base component messages.
   const messages = getComponentMessages('FeedTransformationDescriptions')
@@ -44,7 +43,7 @@ export function getTransformationName (
         if (table) replacementText = `${table} ${messages(`general.table`)}`
         break
       case 'versionPlaceholder':
-        const version = versions && versions.find(v => v.id === sourceVersionId)
+        const version = versionSummaries && versionSummaries.find(v => v.id === sourceVersionId)
         if (version) replacementText = `${messages(`general.version`)} ${version.version}`
         break
       default:

From cc71f10081e23c94aac694834b6f00533d9d6c08 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:47:36 -0400
Subject: [PATCH 514/553] refactor(ManagerHeader): Use FeedVersionSummaries.

---
 lib/manager/components/ManagerHeader.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/manager/components/ManagerHeader.js b/lib/manager/components/ManagerHeader.js
index d8e3d18b7..2ee21b334 100644
--- a/lib/manager/components/ManagerHeader.js
+++ b/lib/manager/components/ManagerHeader.js
@@ -10,8 +10,7 @@ import numeral from 'numeral'
 import WatchButton from '../../common/containers/WatchButton'
 import StarButton from '../../common/containers/StarButton'
 import { getConfigProperty } from '../../common/util/config'
-
-import type {Feed, FeedVersion, Project} from '../../types'
+import type {Feed, FeedVersionSummary, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
 type Props = {
@@ -21,15 +20,15 @@ type Props = {
 }
 
 export default class ManagerHeader extends Component<Props> {
-  getAverageFileSize (feedVersions: ?Array<FeedVersion>) {
-    // if (!feedVersions) return
+  getAverageFileSize (feedVersionSummaries: ?Array<FeedVersionSummary>) {
+    // if (!feedVersionSummaries) return
     let sum = 0
     let avg
-    if (feedVersions) {
-      for (var i = 0; i < feedVersions.length; i++) {
-        sum += feedVersions[i].fileSize
+    if (feedVersionSummaries) {
+      for (let i = 0; i < feedVersionSummaries.length; i++) {
+        sum += feedVersionSummaries[i].fileSize
       }
-      avg = sum / feedVersions.length
+      avg = sum / feedVersionSummaries.length
     }
     return numeral(avg || 0).format('0 b')
   }
@@ -98,7 +97,7 @@ export default class ManagerHeader extends Component<Props> {
             </li>
             <li>
               <Icon type='file-archive-o' />{' '}
-              {this.getAverageFileSize(feedSource.feedVersions)}
+              {this.getAverageFileSize(feedSource.feedVersionSummaries)}
             </li>
           </ul>
         </Col>

From e55cd81e5527684c77f4d5a90bd4d3f88f5da9f0 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 5 Apr 2022 11:05:33 -0400
Subject: [PATCH 515/553] refactor: Fix flow checks.

---
 .../components/version/FeedVersionDetails.js  |  4 +--
 .../version/VersionComparisonDropdown.js      |  4 +--
 .../version/VersionSelectorDropdown.js        |  4 +--
 lib/types/index.js                            | 26 ++++++++-----------
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/lib/manager/components/version/FeedVersionDetails.js b/lib/manager/components/version/FeedVersionDetails.js
index 17222be9d..9dc88f274 100644
--- a/lib/manager/components/version/FeedVersionDetails.js
+++ b/lib/manager/components/version/FeedVersionDetails.js
@@ -15,7 +15,7 @@ import bboxPoly from 'turf-bbox-polygon'
 import * as versionsActions from '../../actions/versions'
 import {getConfigProperty, isExtensionEnabled} from '../../../common/util/config'
 import {BLOCKING_ERROR_TYPES} from '../../util/version'
-import type {FeedVersion, GtfsPlusValidation, Bounds, Feed} from '../../../types'
+import type {FeedVersion, FeedVersionSummary, GtfsPlusValidation, Bounds, Feed} from '../../../types'
 import type {ManagerUserState} from '../../../types/reducers'
 
 import FeedVersionSpanChart from './FeedVersionSpanChart'
@@ -50,7 +50,7 @@ export default class FeedVersionDetails extends Component<Props> {
       !!(errorCounts.find(ec => BLOCKING_ERROR_TYPES.indexOf(ec.type) !== -1))
   }
 
-  _mergeItemFormatter = (v: FeedVersion, activeVersion: ?FeedVersion) => {
+  _mergeItemFormatter = (v: FeedVersionSummary, activeVersion: ?FeedVersionSummary) => {
     let name = v.name
     let disabled = false
     if (v.retrievalMethod === 'SERVICE_PERIOD_MERGE') {
diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
index e5b61c086..8662976a3 100644
--- a/lib/manager/components/version/VersionComparisonDropdown.js
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -32,14 +32,14 @@ class VersionComparisonDropdown extends Component<Props> {
   }
 
   _onClearComparedVersion = () => {
-    this.props.setComparedVersion(null)
+    this.props.setComparedVersion(this.props.feedSource, -1)
   }
 
   /**
    * This custom formatter adds and hides the active version in the list to
    * preserve version indexes.
    */
-  itemFormatter = (itemVersion: FeedVersionSummary, activeVersion: ?FeedVersion) => (
+  itemFormatter = (itemVersion: FeedVersionSummary, activeVersion: ?FeedVersionSummary) => (
     this.props.version && itemVersion.id === this.props.version.id
       ? <MenuItem key={itemVersion.id} style={{display: 'none'}} />
       : DefaultItemFormatter(itemVersion, activeVersion)
diff --git a/lib/manager/components/version/VersionSelectorDropdown.js b/lib/manager/components/version/VersionSelectorDropdown.js
index 46db107de..612c30502 100644
--- a/lib/manager/components/version/VersionSelectorDropdown.js
+++ b/lib/manager/components/version/VersionSelectorDropdown.js
@@ -5,7 +5,7 @@ import * as React from 'react'
 import { Dropdown, MenuItem as BsMenuItem } from 'react-bootstrap'
 
 import MenuItem from '../../../common/components/MenuItem'
-import type { FeedVersion, FeedVersionSummary } from '../../../types'
+import type { FeedVersionSummary } from '../../../types'
 
 import VersionRetrievalBadge from './VersionRetrievalBadge'
 
@@ -20,7 +20,7 @@ type Props = {
   versions: ?Array<FeedVersionSummary>
 }
 
-export const DefaultItemFormatter = (version: FeedVersionSummary, activeVersion: ?FeedVersion) => (
+export const DefaultItemFormatter = (version: FeedVersionSummary, activeVersion: ?FeedVersionSummary) => (
   <MenuItem
     eventKey={version.version}
     key={version.id}
diff --git a/lib/types/index.js b/lib/types/index.js
index da19e6b1e..41445e209 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -502,45 +502,41 @@ export type FeedTransformResult = {
   tableTransformResults: Array<TableTransformResult>
 }
 
-// TODO: Refactor
-export type FeedVersionSummary = {|
+/**
+ * Subset of the attributes of a feed version,
+ * used when retrieveing all summaries for all feed versions in a feed source.
+ */
+export type FeedVersionSummary = {
   dateCreated: number,
+  fileSize: number,
   id: string,
   lastUpdated: number,
   name: string,
   namespace: string,
   retrievalMethod: ?RetrievalMethod,
+  updated: number,
   version: number
-|}
+}
 
-export type FeedVersion = {|
-  dateCreated: number,
+export type FeedVersion = FeedVersionSummary & {
   feedLoadResult: FeedLoadResult,
   feedSource: Feed,
   feedSourceId?: string,
   feedTransformResult?: FeedTransformResult,
-  fileSize: number,
   fileTimestamp: number,
-  id: string,
   isCreating?: boolean,
   isochrones?: any,
-  lastUpdated: number,
-  name: string,
-  namespace: string,
   nextVersionId: ?string,
   noteCount: number,
   notes: Array<Note>,
   originNamespace: ?string,
   previousVersionId: ?string,
   processedByExternalPublisher: ?number,
-  retrievalMethod: ?RetrievalMethod,
   sentToExternalPublisher: ?number,
-  updated: number,
   user: string,
   validationResult: ValidationResult,
-  validationSummary: ValidationSummary,
-  version: number
-|}
+  validationSummary: ValidationSummary
+}
 
 export type Label = {
   adminOnly: boolean,

From a215ba6b2a7251685e573040a3c82c81351cb483 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 5 Apr 2022 12:55:03 -0400
Subject: [PATCH 516/553] refactor(manager/actions/versions): Remove fetching
 gtfs+ and val. errors for the compared version.

---
 lib/manager/actions/versions.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 950c3cd16..5b1f65227 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -616,26 +616,24 @@ export function setVersionIndex (
   }
 }
 
-// Sets the compared feed version.
+/**
+ * Sets the compared feed version.
+ */
 export const settingComparedVersion = createAction(
   'SET_COMPARED_FEEDVERSION',
   (payload: FeedVersion) => payload
 )
+
+/**
+ * Sets the compared feed version based on the provided index.
+ */
 export function setComparedVersion (
   feed: Feed,
   oneBasedIndex: number
 ) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
     const newComparedVersion = await dispatch(ensureVersionIndexIsFetched(feed, oneBasedIndex))
-    // Dispatch action to set value in reducer.
     dispatch(settingComparedVersion(newComparedVersion))
-    if (newComparedVersion) {
-      // Fetch validation issue count. NOTE: future version-specific data fetching
-      // could also be triggered here.
-      dispatch(fetchValidationIssueCount(newComparedVersion))
-      // Also, fetch GTFS+ validation if module enabled.
-      if (isModuleEnabled('gtfsplus')) dispatch(validateGtfsPlusFeed(newComparedVersion.id))
-    }
   }
 }
 

From c186c5b450430b9f03d42e0fee962604228c40a0 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 5 Apr 2022 12:56:56 -0400
Subject: [PATCH 517/553] chore(mkdocs.yml): Update config for mkdocs buiid.

---
 mkdocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 5650c298b..2de7184df 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -6,7 +6,7 @@ site_dir: target/mkdocs
 theme: readthedocs
 extra_css: [style.css]
 
-pages:
+nav:
 - Home: 'index.md'
 - Data Manager:
   - 'Introduction': 'user/introduction.md'

From bef4b6a55f757e6f23f41288ed45df6ac76cda43 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Thu, 7 Apr 2022 10:31:30 -0400
Subject: [PATCH 518/553] fix(timetable): Allow offsetting by 24hrs or more

---
 lib/editor/reducers/timetable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/reducers/timetable.js b/lib/editor/reducers/timetable.js
index a996570b5..b6ebe05e4 100644
--- a/lib/editor/reducers/timetable.js
+++ b/lib/editor/reducers/timetable.js
@@ -7,7 +7,6 @@ import clone from 'lodash/cloneDeep'
 import { sortAndFilterTrips } from '../util'
 import { isTimeFormat } from '../util/timetable'
 import {resequenceStops} from '../util/map'
-
 import type {Action} from '../../types/actions'
 import type {TimetableState} from '../../types/reducers'
 
@@ -98,7 +97,8 @@ const timetable = (state: TimetableState = defaultState, action: Action): Timeta
           const path = `${action.payload.rowIndexes[i]}.${col.key}`
           if (isTimeFormat(col.type)) {
             const currentVal = objectPath.get(trips, path)
-            const value = currentVal + (action.payload.offset % 86399) // ensure seconds does not exceed 24 hours
+            // Arrival time can be > 24 hours for service day, so do not block offsetting by 24 hours.
+            const value = currentVal + action.payload.offset
             objectPath.set(trips, path, value)
           }
         }

From 0ce316a2a47261d6690897583c5e05626859e9da Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 7 Apr 2022 10:51:59 -0400
Subject: [PATCH 519/553] refactor: Clean up code

---
 lib/manager/actions/versions.js                          | 1 -
 lib/manager/components/ManagerHeader.js                  | 1 -
 .../components/version/VersionComparisonDropdown.js      | 9 ++++-----
 lib/manager/reducers/projects.js                         | 5 ++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index 5b1f65227..d02c5519a 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -581,7 +581,6 @@ export function ensureVersionIndexIsFetched (
   oneBasedIndex: number
 ) {
   return async function (dispatch: dispatchFn, getState: getStateFn) {
-    console.log('Requesting version ', oneBasedIndex)
     if (!oneBasedIndex || oneBasedIndex < 1) return null
 
     const requestedVersion = feed.feedVersions && feed.feedVersions[oneBasedIndex - 1]
diff --git a/lib/manager/components/ManagerHeader.js b/lib/manager/components/ManagerHeader.js
index 2ee21b334..0c15c1d24 100644
--- a/lib/manager/components/ManagerHeader.js
+++ b/lib/manager/components/ManagerHeader.js
@@ -21,7 +21,6 @@ type Props = {
 
 export default class ManagerHeader extends Component<Props> {
   getAverageFileSize (feedVersionSummaries: ?Array<FeedVersionSummary>) {
-    // if (!feedVersionSummaries) return
     let sum = 0
     let avg
     if (feedVersionSummaries) {
diff --git a/lib/manager/components/version/VersionComparisonDropdown.js b/lib/manager/components/version/VersionComparisonDropdown.js
index 8662976a3..fae6a9f5a 100644
--- a/lib/manager/components/version/VersionComparisonDropdown.js
+++ b/lib/manager/components/version/VersionComparisonDropdown.js
@@ -48,12 +48,11 @@ class VersionComparisonDropdown extends Component<Props> {
   render () {
     const {
       comparedVersion,
-      versionSummaries // FIXME prop drilling redundant with feedSource
+      versionSummaries
     } = this.props
-    let title = 'Compare versions'
-    if (comparedVersion) {
-      title = `Comparing to version ${comparedVersion.version}`
-    }
+    const title = comparedVersion
+      ? `Comparing to version ${comparedVersion.version}`
+      : 'Compare versions'
 
     return (
       <VersionSelectorDropdown
diff --git a/lib/manager/reducers/projects.js b/lib/manager/reducers/projects.js
index 1f946d6d7..541af48d5 100644
--- a/lib/manager/reducers/projects.js
+++ b/lib/manager/reducers/projects.js
@@ -224,7 +224,7 @@ const projects = (state: ProjectsState = defaultState, action: Action): Projects
       }
       return update(state, {
         all: {[projectIndex]: {feedSources: {[sourceIndex]: {$merge: {
-          feedVersions: versions.map(() => null), // versions.sort(versionSort), // TODO remove
+          feedVersions: versions.map(() => null),
           feedVersionSummaries: versions.sort(versionSort)
         }}}}}
       })
@@ -243,8 +243,7 @@ const projects = (state: ProjectsState = defaultState, action: Action): Projects
       return update(state, {
         all: {[projectIndex]: {feedSources: {[sourceIndex]: {
           feedVersions: updatedVersions
-        }}}},
-        isFetching: { $set: false }
+        }}}}
       })
     }
     case 'PUBLISHED_FEEDVERSION': {

From 95d96dc39d196dd59ee393993bc7aca6fccc4901 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 7 Apr 2022 11:26:11 -0400
Subject: [PATCH 520/553] refactor(GtfsPlusVersionSummary): Use
 FeedVersionSummary in props instead of FeedVersion

---
 lib/gtfsplus/components/GtfsPlusVersionSummary.js       | 7 +++----
 lib/gtfsplus/containers/ActiveGtfsPlusVersionSummary.js | 6 ++----
 lib/manager/components/version/FeedVersionViewer.js     | 7 +++----
 lib/types/index.js                                      | 2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lib/gtfsplus/components/GtfsPlusVersionSummary.js b/lib/gtfsplus/components/GtfsPlusVersionSummary.js
index 460bfe156..53b8577a9 100644
--- a/lib/gtfsplus/components/GtfsPlusVersionSummary.js
+++ b/lib/gtfsplus/components/GtfsPlusVersionSummary.js
@@ -15,7 +15,6 @@ import {
 import {browserHistory, Link} from 'react-router'
 
 import * as gtfsPlusActions from '../actions/gtfsplus'
-
 import {getGtfsPlusSpec} from '../../common/util/config'
 import type {Props as ContainerProps} from '../containers/ActiveGtfsPlusVersionSummary'
 import type {GtfsPlusValidationIssue} from '../../types'
@@ -110,7 +109,7 @@ export default class GtfsPlusVersionSummary extends Component<Props, State> {
       gtfsplus,
       user,
       version,
-      versions
+      versionSummaries = []
     } = this.props
     const { feedSource } = version
     const editingIsDisabled = !user.permissions ||
@@ -133,7 +132,7 @@ export default class GtfsPlusVersionSummary extends Component<Props, State> {
       </h3>
     )
 
-    const derivedVersions = versions.filter(v => v.originNamespace === version.namespace)
+    const derivedVersions = versionSummaries.filter(v => v.originNamespace === version.namespace)
     return (
       <Panel header={header}>
         <Row>
@@ -145,7 +144,7 @@ export default class GtfsPlusVersionSummary extends Component<Props, State> {
                   Versions created from this version of GTFS+:
                   <ul>
                     {derivedVersions.map(v => {
-                      const url = `/feed/${v.feedSource.id}/version/${v.version}`
+                      const url = `/feed/${feedSource.id}/version/${v.version}`
                       return (
                         <li key={v.id}>
                           <Link to={url}>
diff --git a/lib/gtfsplus/containers/ActiveGtfsPlusVersionSummary.js b/lib/gtfsplus/containers/ActiveGtfsPlusVersionSummary.js
index 7d9c3c715..e58edb750 100644
--- a/lib/gtfsplus/containers/ActiveGtfsPlusVersionSummary.js
+++ b/lib/gtfsplus/containers/ActiveGtfsPlusVersionSummary.js
@@ -3,16 +3,14 @@
 import {connect} from 'react-redux'
 
 import GtfsPlusVersionSummary from '../components/GtfsPlusVersionSummary'
-
 import {deleteGtfsPlusFeed, downloadGtfsPlusFeed, publishGtfsPlusFeed} from '../actions/gtfsplus'
 import {getValidationIssuesForTable} from '../selectors'
-
-import type {FeedVersion} from '../../types'
+import type {FeedVersion, FeedVersionSummary} from '../../types'
 import type {AppState} from '../../types/reducers'
 
 export type Props = {
   version: FeedVersion,
-  versions: Array<FeedVersion>
+  versionSummaries?: Array<FeedVersionSummary>
 }
 
 const mapStateToProps = (state: AppState, ownProps: Props) => {
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index a2d648ad9..e3a3b86a2 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -42,7 +42,6 @@ export type Props = {
   editDisabled: ?boolean,
   exportVersionShapes: typeof versionsActions.exportVersionShapes,
   feedSource: Feed,
-  feedSource: Feed,
   feedVersionIndex: number,
   fetchGTFSEntities: typeof versionsActions.fetchGTFSEntities,
   fetchValidationErrors: typeof versionsActions.fetchValidationErrors,
@@ -77,7 +76,6 @@ export default class FeedVersionViewer extends Component<Props> {
       notesRequested,
       user,
       version,
-      versions,
       versionSection
     } = this.props
 
@@ -122,8 +120,9 @@ export default class FeedVersionViewer extends Component<Props> {
                 validationResult={version.validationResult} />
               : versionSection === 'gtfsplus' && isModuleEnabled('gtfsplus')
                 ? <ActiveGtfsPlusVersionSummary
-                  versions={versions}
-                  version={version} />
+                  version={version}
+                  versionSummaries={feedSource.feedVersionSummaries}
+                />
                 : versionSection === 'comments'
                   ? <NotesViewer
                     feedSource={feedSource}
diff --git a/lib/types/index.js b/lib/types/index.js
index 41445e209..07250ec1c 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -513,6 +513,7 @@ export type FeedVersionSummary = {
   lastUpdated: number,
   name: string,
   namespace: string,
+  originNamespace: ?string,
   retrievalMethod: ?RetrievalMethod,
   updated: number,
   version: number
@@ -529,7 +530,6 @@ export type FeedVersion = FeedVersionSummary & {
   nextVersionId: ?string,
   noteCount: number,
   notes: Array<Note>,
-  originNamespace: ?string,
   previousVersionId: ?string,
   processedByExternalPublisher: ?number,
   sentToExternalPublisher: ?number,

From 08c640aedaf04acc4dd9a780a7e2140379623a7c Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Fri, 8 Apr 2022 11:50:41 -0400
Subject: [PATCH 521/553] feat(Changelog): Add changelog

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..f254d1d32
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,8 @@
+# CHANGELOG
+----------------------
+ * Fix timetable previous stop time checks from checking text columns.
+ * Add feature allowing routing to avoid highways.
+ * Support Polish language and add initial translations.
+ * Fix bug displaying null continuous_pickup as '0'.
+ * Add route type selector with new extended GTFS route types.
+ * Fix bug to update continuous_pickup/dropoff values correctly.
\ No newline at end of file

From b8fb2168a85c4b376d08106791e49a0249138a74 Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Fri, 25 Mar 2022 09:35:27 +0100
Subject: [PATCH 522/553] docs: adjust deployment prerequisites

---
 docs/dev/deployment.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/dev/deployment.md b/docs/dev/deployment.md
index 457c8ae5e..946ec2a2b 100644
--- a/docs/dev/deployment.md
+++ b/docs/dev/deployment.md
@@ -4,8 +4,11 @@
 
 The application consists of two repositories: a [Spark-powered Java backend](https://github.com/ibi-group/datatools-server)
 and a [Javascript frontend written with React and Redux](https://github.com/ibi-group/datatools-ui).
-To install and deploy the application, you will need Java 8, Maven, Node/npm,
-yarn, and [mastarm](https://github.com/conveyal/mastarm).
+To install and deploy the application, you will need Java 8 and Maven for the
+[datatools-server](https://github.com/ibi-group/datatools-server)
+and Node (>= v10 required, >= v14 recommended), npm, yarn and
+[mastarm](https://github.com/conveyal/mastarm) for the
+[datatools-ui](https://github.com/ibi-group/datatools-ui).
 
 User authentication is done via [Auth0](http://auth0.com). You will need an
 Auth0 account and application to use the Data Manager.

From 1f61b289afc93ea2baaa0e93ebb3713fe2f63eb4 Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Fri, 25 Mar 2022 09:51:03 +0100
Subject: [PATCH 523/553] docs: adjust deployment installation and basic
 configuration

---
 docs/dev/deployment.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/dev/deployment.md b/docs/dev/deployment.md
index 946ec2a2b..40d68323d 100644
--- a/docs/dev/deployment.md
+++ b/docs/dev/deployment.md
@@ -37,10 +37,12 @@ $ cp datatools-server/configurations/default/env.yml.tmp datatools-server/config
 You'll then need to supply Auth0 account information (see below) and API keys
 for various services used in the application.
 
-The default `server.yml` (for `datatools-server`) and `settings.yml` (for
-`datatools-ui`) should work out of the box, but you may want to specify
-alternative settings files outside of these repositories. These can be specified
-as a directory during `datatools-ui` build with mastarm:
+The default
+[server.yml](https://github.com/ibi-group/datatools-server/blob/dev/configurations/default/server.yml.tmp) for `datatools-server` and
+[settings.yml](https://github.com/ibi-group/datatools-ui/blob/dev/configurations/default/settings.yml) for
+`datatools-ui` should work out of the box, but you may want to specify
+alternative settings files outside of these repositories.
+These can be specified as a directory during `datatools-ui` build with mastarm:
 
 ```bash
 $ mastarm build --config /path/to/configurations/dir

From 9de59ffabc26d09060c6e373f3c40e49dc669494 Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Fri, 25 Mar 2022 09:53:28 +0100
Subject: [PATCH 524/553] docs: adjust deployment installation and basic
 configuration

---
 docs/dev/deployment.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/dev/deployment.md b/docs/dev/deployment.md
index 40d68323d..521f4d2ca 100644
--- a/docs/dev/deployment.md
+++ b/docs/dev/deployment.md
@@ -53,8 +53,7 @@ AND as individual file args for `datatools-server`:
 ```bash
 $ java -jar target/dt-v1.0.0.jar /path/to/env.yml /path/to/server.yml
 ```
-In `datatools-server:server.yml`, be sure to update the paths for where the
-databases will be stored:
+In `datatools-server:server.yml`, be sure to update the paths for the place where databases will be stored:
 
 ```yaml
 application:

From a4af090cc8d0ed50d545471ff93945b134776a6e Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Fri, 25 Mar 2022 10:08:59 +0100
Subject: [PATCH 525/553] docs: adjust deployment installation and basic
 configuration

---
 docs/dev/deployment.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/dev/deployment.md b/docs/dev/deployment.md
index 521f4d2ca..c728c595c 100644
--- a/docs/dev/deployment.md
+++ b/docs/dev/deployment.md
@@ -69,7 +69,7 @@ the application has been significantly tuned and optimized for PostgreSQL 9, so
 we highly recommend using PostgreSQL.
 
 Once PostgreSQL is installed and the service has been started, create the
-database:
+database for instance by using the CLI [createdb](https://www.postgresql.org/docs/9.1/app-createdb.html):
 ```bash
 $ createdb gtfs_storage_db
 ```

From e0b6c4b8edecbc7e156fbb7e99b28e6c7f6163b8 Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Fri, 25 Mar 2022 10:11:05 +0100
Subject: [PATCH 526/553] docs: adjust deployment installation and basic
 configuration

---
 docs/dev/deployment.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/dev/deployment.md b/docs/dev/deployment.md
index c728c595c..4f700bd62 100644
--- a/docs/dev/deployment.md
+++ b/docs/dev/deployment.md
@@ -73,8 +73,9 @@ database for instance by using the CLI [createdb](https://www.postgresql.org/doc
 ```bash
 $ createdb gtfs_storage_db
 ```
-Pass the URL of the database in the server's `env.yml` (and optionally add
-additional connection variables):
+Pass the URL of the database in the `datatools-server`'s
+[env.yml](https://github.com/ibi-group/datatools-server/blob/dev/configurations/default/env.yml.tmp)
+(and optionally add additional connection variables):
 ```yaml
 GTFS_DATABASE_URL: jdbc:postgresql://localhost/gtfs_storage_db
 # GTFS_DATABASE_USER:

From 408ac758d954429f5458b87b023d88bb0d57ed15 Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Fri, 25 Mar 2022 10:12:35 +0100
Subject: [PATCH 527/553] docs: adjust deployment installation and basic
 configuration

---
 docs/dev/deployment.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/dev/deployment.md b/docs/dev/deployment.md
index 4f700bd62..156f4ad51 100644
--- a/docs/dev/deployment.md
+++ b/docs/dev/deployment.md
@@ -86,7 +86,8 @@ GTFS_DATABASE_URL: jdbc:postgresql://localhost/gtfs_storage_db
 Application data storage (i.e., where projects, feed sources, and feed versions
 are stored) is handled by MongoDB. There is no need to manually initialize a
 database in MongoDB (MongoDB will handle this automatically if you prefer).
-Connection details for MongoDB are also set in the server's `env.yml`:
+Connection details for MongoDB are also set in the `datatools-server`'s
+[env.yml](https://github.com/ibi-group/datatools-server/blob/dev/configurations/default/env.yml.tmp):
 ```yaml
 MONGO_URI: # defaults to localhost:27017 (MongoDB default) if empty
 MONGO_DB_NAME: application_db

From 381ecff2f5b55f1276c564723af848a77e2ef89d Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Fri, 25 Mar 2022 10:16:23 +0100
Subject: [PATCH 528/553] docs: adjust deployment building and running the
 application

---
 docs/dev/deployment.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/dev/deployment.md b/docs/dev/deployment.md
index 156f4ad51..0c348b1c3 100644
--- a/docs/dev/deployment.md
+++ b/docs/dev/deployment.md
@@ -182,9 +182,10 @@ function (user, context, callback) {
 
 ## Building and Running the Application
 
-Install the Javascript dependencies using yarn:
+Install the Javascript dependencies for `datatools-ui` using yarn:
 
 ```bash
+$ cd datatools-ui
 $ yarn
 ```
 

From 6ed150ca91b01beebfdf53198a2390eda4239cba Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Fri, 25 Mar 2022 10:26:46 +0100
Subject: [PATCH 529/553] docs: adjust deployment building and running the
 application

---
 docs/dev/deployment.md | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/docs/dev/deployment.md b/docs/dev/deployment.md
index 0c348b1c3..cde4c3ffb 100644
--- a/docs/dev/deployment.md
+++ b/docs/dev/deployment.md
@@ -189,26 +189,33 @@ $ cd datatools-ui
 $ yarn
 ```
 
-Build and deploy the frontend to s3 using npm script (which calls [mastarm](https://github.com/conveyal/mastarm)):
+Build and deploy `datatools-ui` to s3 using npm script
+(which calls [mastarm](https://github.com/conveyal/mastarm)):
 
 ```bash
 $ npm run deploy -- s3://$S3_BUCKET_NAME/dist
 ```
 
-Package the application using Maven:
+Package `datatools-server` using Maven:
 
 ```bash
+$ cd datatools-server
 $ mvn package
 ```
 
-Deploy the application with Java:
+Deploy `datatools-server` with Java:
 
 ```bash
 $ java -jar target/dt-v1.0.0.jar /path/to/env.yml /path/to/server.yml
 ```
 
-
-The application back-end should now be running at `http://localhost:9000` (or whatever port you specified in `server.yml`). The front-end assets are obtained from the `dist` folder relative the url specified in `server.yml` at `application.client_assets_url`. While running a development server of datatools-ui, these assets are delivered to the client using budo, so the links defined in the backend `server.yml` are only used in a production setting.
+`Datatools-server` should now be running at `http://localhost:9000`
+(or whatever port you specified in `server.yml`).
+`Datatools-ui` assets are obtained from the `dist`
+folder relative the url specified in `server.yml` at `application.client_assets_url`.
+While running a development server of datatools-ui,
+these assets are delivered to the client using budo,
+so the links defined in the backend `server.yml` are only used in a production setting.
 
 ## Configuring Modules
 

From 27f81838a69c968d226a2adce448b7847df70ff3 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Mon, 11 Apr 2022 12:59:16 -0400
Subject: [PATCH 530/553] fix(PatternStopCard): Fix 0 value continuous
 pickup/dropoff being displayed as '1'

---
 lib/editor/components/pattern/PatternStopCard.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
index 0ba0210ad..4b632a7c7 100644
--- a/lib/editor/components/pattern/PatternStopCard.js
+++ b/lib/editor/components/pattern/PatternStopCard.js
@@ -424,7 +424,7 @@ class PatternStopContents extends Component<Props, State> {
               selectType='continuousPickup'
               shouldHaveDisabledOption
               title='Indicates whether a rider can board the transit vehicle anywhere along the vehicle’s travel path.'
-              value={patternStop.continuousPickup || 1}
+              value={(patternStop.continuousPickup || patternStop.continuousPickup === 0) ? patternStop.continuousPickup : 1}
             />
           </Col>
           <Col xs={6}>
@@ -435,7 +435,7 @@ class PatternStopContents extends Component<Props, State> {
               selectType='continuousDropOff'
               shouldHaveDisabledOption
               title='Indicates whether a rider can alight from the transit vehicle at any point along the vehicle’s travel path.'
-              value={patternStop.continuousDropOff || 1}
+              value={(patternStop.continuousDropOff || patternStop.continuousDropOff === 0) ? patternStop.continuousDropOff : 1}
             />
           </Col>
         </Row>

From ef95f5f7579e9a7ff346b3ab520fc5297782e0d9 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:12:02 -0400
Subject: [PATCH 531/553] refactor(GtfsPlusField): Rename var per PR comment.

---
 lib/gtfsplus/components/GtfsPlusField.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/gtfsplus/components/GtfsPlusField.js b/lib/gtfsplus/components/GtfsPlusField.js
index b361f7f35..9ebfdacc8 100644
--- a/lib/gtfsplus/components/GtfsPlusField.js
+++ b/lib/gtfsplus/components/GtfsPlusField.js
@@ -42,7 +42,7 @@ export default class GtfsPlusField extends Component<Props> {
   }
 
   render () {
-    const {currentValue, data, feedVersion, field, getGtfsEntity} = this.props
+    const {currentValue, data: rowData, feedVersion, field, getGtfsEntity} = this.props
     switch (field.inputType) {
       case 'TEXT':
       case 'GTFS_TRIP':
@@ -67,7 +67,11 @@ export default class GtfsPlusField extends Component<Props> {
           options.find(o => o.value.toUpperCase() === currentValue.toUpperCase())
 
         const filteredOptions = field.parent
-          ? options.filter((option) => option.parentValue ? option.parentValue === data[field.parent] : true)
+          ? options.filter(
+            option => option.parentValue
+              ? option.parentValue === rowData[field.parent]
+              : true
+          )
           : options
 
         return (

From ac009427a8cb0540dc1d59841ee03bff088baa83 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 13 Apr 2022 14:00:26 -0400
Subject: [PATCH 532/553] refactor(lib/types/index) Fix typo per PR comment

Co-authored-by: Philip Cline  <63798641+philip-cline@users.noreply.github.com>
---
 lib/types/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types/index.js b/lib/types/index.js
index 07250ec1c..85764327f 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -504,7 +504,7 @@ export type FeedTransformResult = {
 
 /**
  * Subset of the attributes of a feed version,
- * used when retrieveing all summaries for all feed versions in a feed source.
+ * used when retrieving all summaries for all feed versions in a feed source.
  */
 export type FeedVersionSummary = {
   dateCreated: number,

From 80895f8d9a3b3e918e29b767d5ce1e7c9fcccc7c Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Thu, 14 Apr 2022 10:02:10 -0400
Subject: [PATCH 533/553] refactor(timetable): Do not overwrite empty
 arrival/departure times when offesetting

---
 lib/editor/reducers/timetable.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/editor/reducers/timetable.js b/lib/editor/reducers/timetable.js
index b6ebe05e4..415f7838f 100644
--- a/lib/editor/reducers/timetable.js
+++ b/lib/editor/reducers/timetable.js
@@ -98,7 +98,8 @@ const timetable = (state: TimetableState = defaultState, action: Action): Timeta
           if (isTimeFormat(col.type)) {
             const currentVal = objectPath.get(trips, path)
             // Arrival time can be > 24 hours for service day, so do not block offsetting by 24 hours.
-            const value = currentVal + action.payload.offset
+            // Maintain empty cells (null) when offsetting.
+            const value = currentVal !== null ? currentVal + action.payload.offset : null
             objectPath.set(trips, path, value)
           }
         }

From 7f761894d43c8db93479d78bcae5da5e4190d736 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Tue, 19 Apr 2022 15:14:24 -0400
Subject: [PATCH 534/553] style(Job Monitor Popover): Fix exception overflow,
 allow scrolling in CSS

---
 lib/style.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/style.css b/lib/style.css
index 9bfd1a0e1..c7e8aa99e 100644
--- a/lib/style.css
+++ b/lib/style.css
@@ -996,3 +996,8 @@ h4.line:after {
 .route-type-select .toggle.expanded::after {
   content: "\f068";
 }
+
+/* Datatools backend exception in popover overflows the container */
+.popover-content {
+  overflow-x: scroll;
+}
\ No newline at end of file

From 22e9085ac02a18e69d6bff3fe5f782f517f7a941 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Mon, 25 Apr 2022 15:39:34 -0400
Subject: [PATCH 535/553] fix(stopStrategies): Allow two point shapePoint
 arrays to be extended to the next stop

---
 lib/editor/actions/map/stopStrategies.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/editor/actions/map/stopStrategies.js b/lib/editor/actions/map/stopStrategies.js
index c66e43e45..1add5ecf0 100644
--- a/lib/editor/actions/map/stopStrategies.js
+++ b/lib/editor/actions/map/stopStrategies.js
@@ -227,7 +227,7 @@ export function addStopToPattern (pattern: Pattern, stop: GtfsStop, index?: ?num
     const patternStops = clone(currentPatternStops)
     const {controlPoints, patternSegments} = getControlPoints(getState())
     const patternLine = lineString(coordinatesFromShapePoints(shapePoints))
-    const hasShapePoints = shapePoints && shapePoints.length > 2
+    const hasShapePoints = shapePoints && shapePoints.length >= 2
     const newStop = stopToPatternStop(
       stop,
       (typeof index === 'undefined' || index === null)

From 085be76a9823ac6159aad7a9afb7af745ba64ea7 Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Mon, 25 Apr 2022 22:06:08 -0400
Subject: [PATCH 536/553] refactor(stopStrategies): Match hasShapePoints
 definition in other functions (such as getControlPoin

---
 lib/editor/actions/map/stopStrategies.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/editor/actions/map/stopStrategies.js b/lib/editor/actions/map/stopStrategies.js
index 1add5ecf0..bc19e3236 100644
--- a/lib/editor/actions/map/stopStrategies.js
+++ b/lib/editor/actions/map/stopStrategies.js
@@ -227,7 +227,7 @@ export function addStopToPattern (pattern: Pattern, stop: GtfsStop, index?: ?num
     const patternStops = clone(currentPatternStops)
     const {controlPoints, patternSegments} = getControlPoints(getState())
     const patternLine = lineString(coordinatesFromShapePoints(shapePoints))
-    const hasShapePoints = shapePoints && shapePoints.length >= 2
+    const hasShapePoints = shapePoints && shapePoints.length > 1
     const newStop = stopToPatternStop(
       stop,
       (typeof index === 'undefined' || index === null)

From d1b933e3c57611b924df668c1c6f1b415da7f5da Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 2 May 2022 11:10:48 -0400
Subject: [PATCH 537/553] fix(ActiveGtfsPlusEditor): Pass feed version summary
 to child components.

---
 lib/gtfsplus/actions/gtfsplus.js                |  6 +++---
 lib/gtfsplus/components/GtfsPlusEditor.js       | 16 ++++++++--------
 lib/gtfsplus/components/GtfsPlusField.js        |  7 ++++---
 lib/gtfsplus/containers/ActiveGtfsPlusEditor.js |  7 +++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/gtfsplus/actions/gtfsplus.js b/lib/gtfsplus/actions/gtfsplus.js
index e14a9a44e..53a9e019b 100644
--- a/lib/gtfsplus/actions/gtfsplus.js
+++ b/lib/gtfsplus/actions/gtfsplus.js
@@ -10,9 +10,9 @@ import {stopsAndRoutes} from '../../gtfs/util/graphql'
 import {getHeaders} from '../../common/util/util'
 import {VISIBILITY} from '../components/GtfsPlusTable'
 import {startJobMonitor} from '../../manager/actions/status'
-
 import type {
   FeedVersion,
+  FeedVersionSummary,
   GtfsRoute,
   GtfsStop,
   GtfsPlusValidation,
@@ -205,7 +205,7 @@ export function uploadGtfsPlusFeed (feedVersionId: string, file: File) {
 export function loadGtfsEntities (
   tableId: string,
   rows: Array<GTFSPlusEntity>,
-  feedVersion: FeedVersion,
+  feedVersionSummary: FeedVersionSummary,
   validation: GtfsPlusValidation
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
@@ -227,7 +227,7 @@ export function loadGtfsEntities (
         return row
       })
       : rows
-    const {namespace} = feedVersion
+    const {namespace} = feedVersionSummary
     const {routesToLoad, stopsToLoad} = lookupMissingEntities(filteredRows, getState().gtfsplus.gtfsEntityLookup)
     if (routesToLoad.length === 0 && stopsToLoad.length === 0) {
       return
diff --git a/lib/gtfsplus/components/GtfsPlusEditor.js b/lib/gtfsplus/components/GtfsPlusEditor.js
index fce0b8578..34d5bf31a 100644
--- a/lib/gtfsplus/components/GtfsPlusEditor.js
+++ b/lib/gtfsplus/components/GtfsPlusEditor.js
@@ -8,14 +8,14 @@ import {Link} from 'react-router'
 import ManagerPage from '../../common/components/ManagerPage'
 import OptionButton from '../../common/components/OptionButton'
 import * as gtfsPlusActions from '../actions/gtfsplus'
-import GtfsPlusTable from './GtfsPlusTable'
 import {getGtfsPlusSpec} from '../../common/util/config'
 import * as feedsActions from '../../manager/actions/feeds'
-
 import type {Props as ContainerProps} from '../containers/ActiveGtfsPlusEditor'
-import type {Feed, FeedVersion, GtfsPlusValidation, Project} from '../../types'
+import type {Feed, FeedVersionSummary, GtfsPlusValidation, Project} from '../../types'
 import type {ManagerUserState} from '../../types/reducers'
 
+import GtfsPlusTable from './GtfsPlusTable'
+
 export type Props = ContainerProps & {
   activeTableId: string,
   addGtfsPlusRow: typeof gtfsPlusActions.addGtfsPlusRow,
@@ -24,8 +24,8 @@ export type Props = ContainerProps & {
   downloadGtfsPlusFeed: typeof gtfsPlusActions.downloadGtfsPlusFeed,
   feedSource: Feed,
   feedSourceId: string,
-  feedVersion: FeedVersion,
   feedVersionId: string,
+  feedVersionSummary: FeedVersionSummary,
   fetchFeedSourceAndProject: typeof feedsActions.fetchFeedSourceAndProject,
   gtfsEntityLookup: Object,
   loadGtfsEntities: typeof gtfsPlusActions.loadGtfsEntities,
@@ -100,8 +100,8 @@ export default class GtfsPlusEditor extends Component<Props> {
   _getGtfsEntity = (type: string, id: string) => this.props.gtfsEntityLookup[`${type}_${id}`]
 
   _newRowsDisplayed = (rows: Array<any>) => {
-    const {activeTableId, feedVersion, loadGtfsEntities, validation} = this.props
-    if (feedVersion) loadGtfsEntities(activeTableId, rows, feedVersion, validation)
+    const {activeTableId, feedVersionSummary, loadGtfsEntities, validation} = this.props
+    if (feedVersionSummary) loadGtfsEntities(activeTableId, rows, feedVersionSummary, validation)
   }
 
   _selectTable = (activeTableId: string) => this.props.setActiveTable({activeTableId})
@@ -127,7 +127,7 @@ export default class GtfsPlusEditor extends Component<Props> {
     const {
       activeTableId,
       feedSource,
-      feedVersion,
+      feedVersionSummary,
       project,
       tableData,
       user,
@@ -157,7 +157,7 @@ export default class GtfsPlusEditor extends Component<Props> {
                 <li><Link to='/'>Explore</Link></li>
                 <li><Link to='/project'>Projects</Link></li>
                 <li><Link to={`/project/${project.id}`}>{project.name}</Link></li>
-                <li><Link to={`/feed/${feedSource.id}/version/${feedVersion.version}/gtfsplus`}>{feedSource.name}</Link></li>
+                <li><Link to={`/feed/${feedSource.id}/version/${feedVersionSummary.version}/gtfsplus`}>{feedSource.name}</Link></li>
                 <li className='active'>Edit GTFS+</li>
               </ul>
             </Col>
diff --git a/lib/gtfsplus/components/GtfsPlusField.js b/lib/gtfsplus/components/GtfsPlusField.js
index 9ebfdacc8..bb894e769 100644
--- a/lib/gtfsplus/components/GtfsPlusField.js
+++ b/lib/gtfsplus/components/GtfsPlusField.js
@@ -42,7 +42,8 @@ export default class GtfsPlusField extends Component<Props> {
   }
 
   render () {
-    const {currentValue, data: rowData, feedVersion, field, getGtfsEntity} = this.props
+    const {currentValue, data: rowData, feedVersionSummary, field, getGtfsEntity} = this.props
+    const namespace = feedVersionSummary && feedVersionSummary.namespace
     switch (field.inputType) {
       case 'TEXT':
       case 'GTFS_TRIP':
@@ -108,7 +109,7 @@ export default class GtfsPlusField extends Component<Props> {
         return (
           <GtfsSearch
             feeds={[]}
-            namespace={feedVersion && feedVersion.namespace}
+            namespace={namespace}
             limit={100}
             entities={['routes']}
             minimumInput={1}
@@ -124,7 +125,7 @@ export default class GtfsPlusField extends Component<Props> {
         return (
           <GtfsSearch
             feeds={[]}
-            namespace={feedVersion && feedVersion.namespace}
+            namespace={namespace}
             limit={100}
             entities={['stops']}
             clearable={false}
diff --git a/lib/gtfsplus/containers/ActiveGtfsPlusEditor.js b/lib/gtfsplus/containers/ActiveGtfsPlusEditor.js
index 245ffdbf6..1551b19d5 100644
--- a/lib/gtfsplus/containers/ActiveGtfsPlusEditor.js
+++ b/lib/gtfsplus/containers/ActiveGtfsPlusEditor.js
@@ -17,7 +17,6 @@ import {
   setVisibilityFilter
 } from '../actions/gtfsplus'
 import {getValidationIssuesForTable, getVisibleRows, getFilteredPageCount} from '../selectors'
-
 import type {AppState, RouterProps} from '../../types/reducers'
 
 export type Props = RouterProps
@@ -43,16 +42,16 @@ const mapStateToProps = (state: AppState, ownProps: Props) => {
   const feedSource = project && project.feedSources
     ? project.feedSources.find(fs => fs.id === feedSourceId)
     : null
-  const feedVersion = feedSource && feedSource.feedVersions
-    ? feedSource.feedVersions.find(v => v.id === feedVersionId)
+  const feedVersionSummary = feedSource && feedSource.feedVersionSummaries
+    ? feedSource.feedVersionSummaries.find(v => v.id === feedVersionId)
     : null
   return {
     activeTableId,
     currentPage,
     feedSource,
     feedSourceId,
-    feedVersion,
     feedVersionId,
+    feedVersionSummary,
     gtfsEntityLookup,
     pageCount: getFilteredPageCount(state),
     project,

From 67dea2e8ec80e61315ced8970575ae71e1d21cc8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 2 May 2022 15:29:39 -0400
Subject: [PATCH 538/553] refactor(GtfsPlusEditor): Fix comment fo
 componentWillMount

---
 lib/gtfsplus/components/GtfsPlusEditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gtfsplus/components/GtfsPlusEditor.js b/lib/gtfsplus/components/GtfsPlusEditor.js
index 34d5bf31a..4dd0db2e1 100644
--- a/lib/gtfsplus/components/GtfsPlusEditor.js
+++ b/lib/gtfsplus/components/GtfsPlusEditor.js
@@ -57,7 +57,7 @@ export default class GtfsPlusEditor extends Component<Props> {
       fetchFeedSourceAndProject,
       tableData
     } = this.props
-    // Fetch feed soure (which will also fetch versions) and containing project.
+    // Fetch feed source (which will also fetch version summaries) and containing project.
     if (!feedSource) fetchFeedSourceAndProject(feedSourceId)
     if (!tableData) downloadGtfsPlusFeed(feedVersionId)
   }

From 7390b6b34e5f1b1584bdefb71f64f1de7f245962 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 2 May 2022 15:33:39 -0400
Subject: [PATCH 539/553] fix(GtfsPlusEditor): Skip rendering if feed version
 summary is not fetched.

---
 lib/gtfsplus/components/GtfsPlusEditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gtfsplus/components/GtfsPlusEditor.js b/lib/gtfsplus/components/GtfsPlusEditor.js
index 4dd0db2e1..6ade3094c 100644
--- a/lib/gtfsplus/components/GtfsPlusEditor.js
+++ b/lib/gtfsplus/components/GtfsPlusEditor.js
@@ -134,7 +134,7 @@ export default class GtfsPlusEditor extends Component<Props> {
       validation,
       visibleRows
     } = this.props
-    if (!feedSource) return null
+    if (!feedSource || !feedVersionSummary) return null
     const editingIsDisabled = !user.permissions ||
       !user.permissions.hasFeedPermission(
         feedSource.organizationId,

From 718c00b41fe342cea1f9ef2d5f2a2cc745d5db77 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 2 May 2022 15:39:35 -0400
Subject: [PATCH 540/553] Revert "fix(GtfsPlusEditor): Skip rendering if feed
 version summary is not fetched."

This reverts commit 7390b6b34e5f1b1584bdefb71f64f1de7f245962.
---
 lib/gtfsplus/components/GtfsPlusEditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gtfsplus/components/GtfsPlusEditor.js b/lib/gtfsplus/components/GtfsPlusEditor.js
index 6ade3094c..4dd0db2e1 100644
--- a/lib/gtfsplus/components/GtfsPlusEditor.js
+++ b/lib/gtfsplus/components/GtfsPlusEditor.js
@@ -134,7 +134,7 @@ export default class GtfsPlusEditor extends Component<Props> {
       validation,
       visibleRows
     } = this.props
-    if (!feedSource || !feedVersionSummary) return null
+    if (!feedSource) return null
     const editingIsDisabled = !user.permissions ||
       !user.permissions.hasFeedPermission(
         feedSource.organizationId,

From 8a91747a8e93c9c7de2092fc18ffa1bb9287b602 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Tue, 10 May 2022 17:41:07 -0400
Subject: [PATCH 541/553] fix(PatternLayout): Fix call to
 patternDateTimeFilterChange.

Fix #789
---
 .../components/reporter/components/PatternLayout.js  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/manager/components/reporter/components/PatternLayout.js b/lib/manager/components/reporter/components/PatternLayout.js
index 50e4a71c8..230d34582 100644
--- a/lib/manager/components/reporter/components/PatternLayout.js
+++ b/lib/manager/components/reporter/components/PatternLayout.js
@@ -19,13 +19,13 @@ import * as filterActions from '../../../../gtfs/actions/filter'
 import * as patternsActions from '../../../../gtfs/actions/patterns'
 import * as routesActions from '../../../../gtfs/actions/routes'
 import * as timetablesActions from '../../../../gtfs/actions/timetables'
-import TripsPerHourChart from './TripsPerHourChart'
-
 import type {Props as ContainerProps} from '../containers/Patterns'
 import type {FetchStatus} from '../../../../types'
 import type {AllRoutesSubState, RouteListItem} from '../../../../types/reducers'
 import type {PatternRowData} from '../../../selectors'
 
+import TripsPerHourChart from './TripsPerHourChart'
+
 type Props = ContainerProps & {
   fetchRoutes: typeof routesActions.fetchRoutes,
   fetchStatus: FetchStatus,
@@ -47,6 +47,11 @@ export default class PatternLayout extends Component<Props> {
     }
   }
 
+  _onDateTimeFilterChange = () => {
+    const {namespace, patternDateTimeFilterChange} = this.props
+    patternDateTimeFilterChange(namespace)
+  }
+
   _onSelectRoute = (newRoute: ?RouteListItem) => {
     const {namespace, patternRouteFilterChange} = this.props
     patternRouteFilterChange(namespace, newRoute ? newRoute.route_id : undefined)
@@ -60,7 +65,6 @@ export default class PatternLayout extends Component<Props> {
         fetching
       },
       patternData,
-      patternDateTimeFilterChange,
       routeFilter,
       routes,
       selectTab,
@@ -97,7 +101,7 @@ export default class PatternLayout extends Component<Props> {
             </Row>
             <ActiveDateTimeFilter
               hideDateTimeField
-              onChange={patternDateTimeFilterChange}
+              onChange={this._onDateTimeFilterChange}
               version={version} />
           </div>
         }

From ddb1f6be12c2ed7a28920e953406e19a78cbf91b Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Wed, 11 May 2022 12:10:23 -0400
Subject: [PATCH 542/553] fix(FeedVersionViewer.VersionList): Fix rendering of
 feed versions.

---
 __tests__/test-utils/mock-data/manager.js     |  1 +
 lib/manager/actions/versions.js               | 10 +++----
 .../components/version/FeedVersionReport.js   |  6 ++---
 .../components/version/FeedVersionViewer.js   |  8 +++---
 .../version/VersionButtonToolbar.js           | 26 ++++++++++++-------
 .../components/version/VersionDateLabel.js    | 10 +++----
 lib/types/index.js                            |  4 +--
 7 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/__tests__/test-utils/mock-data/manager.js b/__tests__/test-utils/mock-data/manager.js
index fc6d652c2..5db2d031a 100644
--- a/__tests__/test-utils/mock-data/manager.js
+++ b/__tests__/test-utils/mock-data/manager.js
@@ -267,6 +267,7 @@ export const mockFeedVersion = {
     uniqueIdentifier: 'ugez_nbyelwgcecgmjjabppvknj'
   },
   feedSource: mockFeedWithVersion,
+  feedSourceId: mockFeedWithVersion.id,
   fileSize: 126865,
   fileTimestamp: 1533824462000,
   id: 'mock-feed-version-id',
diff --git a/lib/manager/actions/versions.js b/lib/manager/actions/versions.js
index d02c5519a..a89fdb7df 100644
--- a/lib/manager/actions/versions.js
+++ b/lib/manager/actions/versions.js
@@ -12,7 +12,7 @@ import {ENTITY} from '../../editor/constants'
 import {getKeyForId} from '../../editor/util/gtfs'
 import {getEntityGraphQLRoot, getEntityIdField, getGraphQLFieldsForEntity} from '../../gtfs/util'
 import {validateGtfsPlusFeed} from '../../gtfsplus/actions/gtfsplus'
-import type {Feed, FeedVersion, ShapefileExportType} from '../../types'
+import type {Feed, FeedVersion, FeedVersionSummary, ShapefileExportType} from '../../types'
 import type {dispatchFn, getStateFn, ValidationIssueCount} from '../../types/reducers'
 
 import {handleJobResponse, setErrorMessage, startJobMonitor} from './status'
@@ -228,14 +228,14 @@ export function uploadFeed (feedSource: Feed, file: File) {
  * Permanently delete the feed version object and the loaded GTFS data in the
  * SQL database.
  */
-export function deleteFeedVersion (feedVersion: FeedVersion) {
+export function deleteFeedVersion (feedVersion: FeedVersionSummary) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(deletingFeedVersion())
     const url = `${SECURE_API_PREFIX}feedversion/${feedVersion.id}`
     return dispatch(secureFetch(url, 'delete'))
       .then((res) => {
         // Re-fetch feed source with versions + snapshots
-        return dispatch(fetchFeedSource(feedVersion.feedSource.id))
+        return dispatch(fetchFeedSource(feedVersion.feedSourceId))
       })
   }
 }
@@ -508,13 +508,13 @@ export function fetchFeedVersionIsochrones (
  * Download a GTFS file for a a given feed version.
  */
 export function downloadFeedViaToken (
-  feedVersion: FeedVersion,
+  feedVersionId: string,
   isPublic: ?boolean,
   prefix: ?string = 'gtfs'
 ) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     const route = isPublic ? 'public' : 'secure'
-    const url = `/api/manager/${route}/feedversion/${feedVersion.id}/downloadtoken`
+    const url = `/api/manager/${route}/feedversion/${feedVersionId}/downloadtoken`
     return dispatch(secureFetch(url))
       .then(response => response.json())
       .then(json => {
diff --git a/lib/manager/components/version/FeedVersionReport.js b/lib/manager/components/version/FeedVersionReport.js
index 1422cc915..15ea77bb0 100644
--- a/lib/manager/components/version/FeedVersionReport.js
+++ b/lib/manager/components/version/FeedVersionReport.js
@@ -8,13 +8,13 @@ import numeral from 'numeral'
 
 import EditableTextField from '../../../common/components/EditableTextField'
 import {getProfileLink} from '../../../common/util/util'
+import TransformationsIndicatorBadge from '../transform/TransformationsIndicatorBadge'
+
 import FeedVersionDetails from './FeedVersionDetails'
 import FeedVersionMap from './FeedVersionMap'
 import FeedVersionTabs from './FeedVersionTabs'
-import TransformationsIndicatorBadge from '../transform/TransformationsIndicatorBadge'
 import VersionButtonToolbar from './VersionButtonToolbar'
 import VersionRetrievalBadge from './VersionRetrievalBadge'
-
 import type {Props as FeedVersionViewerProps} from './FeedVersionViewer'
 
 const dateFormat = 'MMM. DD, YYYY'
@@ -112,7 +112,7 @@ export default class FeedVersionReport extends Component<Props, State> {
                   disabled={isPublic}
                   onChange={this._onVersionNameChange} />
               }
-              <VersionButtonToolbar size='small' {...this.props} />
+              <VersionButtonToolbar size='small' versionSummary={version} {...this.props} />
             </h4>
             <small>
               <VersionRetrievalBadge version={version} />
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index e3a3b86a2..86d0b61f0 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -294,10 +294,12 @@ export type ListProps = Props
 
 class VersionList extends Component<ListProps> {
   render () {
+    const { feedSource } = this.props
+    const { feedVersionSummaries } = feedSource
     return <Panel header={<h3>List of feed versions</h3>}>
       <ListGroup fill>
-        {this.props.versions
-          ? this.props.versions.map(v => {
+        {feedVersionSummaries
+          ? feedVersionSummaries.map(v => {
             return (
               <ListGroupItem key={v.id}>
                 {v.name}
@@ -306,7 +308,7 @@ class VersionList extends Component<ListProps> {
                   <VersionDateLabel version={v} />
                 </small>
                 <VersionButtonToolbar
-                  version={v}
+                  versionSummary={v}
                   size='xsmall'
                   {...this.props} />
               </ListGroupItem>
diff --git a/lib/manager/components/version/VersionButtonToolbar.js b/lib/manager/components/version/VersionButtonToolbar.js
index a05500532..88fec5fd9 100644
--- a/lib/manager/components/version/VersionButtonToolbar.js
+++ b/lib/manager/components/version/VersionButtonToolbar.js
@@ -6,41 +6,47 @@ import {Button, Glyphicon, ButtonGroup, DropdownButton, MenuItem} from 'react-bo
 
 import ConfirmModal from '../../../common/components/ConfirmModal'
 import {getComponentMessages, isModuleEnabled} from '../../../common/util/config'
+import type {FeedVersionSummary, ShapefileExportType} from '../../../types'
 
 import type {ListProps} from './FeedVersionViewer'
-import type {ShapefileExportType} from '../../../types'
 
-type ToolbarProps = ListProps & {size: string}
+type ToolbarProps = ListProps & {
+  size: string,
+  versionSummary: FeedVersionSummary
+}
 
 export default class VersionButtonToolbar extends Component<ToolbarProps> {
   messages = getComponentMessages('VersionButtonToolbar')
 
-  _onClickDownload = () =>
-    this.props.downloadFeedViaToken(this.props.version, this.props.isPublic)
+  _onClickDownload = () => {
+    const { downloadFeedViaToken, isPublic, versionSummary } = this.props
+    downloadFeedViaToken(versionSummary.id, isPublic)
+  }
 
   _onClickLoadIntoEditor = (evt: SyntheticMouseEvent<HTMLInputElement>) => {
-    const {loadFeedVersionForEditing, version} = this.props
+    const {loadFeedVersionForEditing, versionSummary} = this.props
 
-    const {id: feedVersionId, feedSource} = version
+    const {id: feedVersionId, feedSourceId} = versionSummary
     this.refs.confirm.open({
       title: this.messages('load'),
       body: this.messages('confirmLoad'),
       onConfirm: () =>
-        loadFeedVersionForEditing({feedSourceId: feedSource.id, feedVersionId})
+        loadFeedVersionForEditing({feedSourceId, feedVersionId})
     })
   }
 
   _onClickDeleteVersion = (evt: SyntheticMouseEvent<HTMLInputElement>) => {
-    const {deleteFeedVersion, version} = this.props
+    const {deleteFeedVersion, versionSummary} = this.props
     this.refs.confirm.open({
       title: `${this.messages('delete')} ${this.messages('version')}`,
       body: this.messages('confirmDelete'),
-      onConfirm: () => deleteFeedVersion(version)
+      onConfirm: () => deleteFeedVersion(versionSummary)
     })
   }
 
   _onDownloadShapes = (type: ShapefileExportType) => {
-    this.props.exportVersionShapes(this.props.version.id, type)
+    const { exportVersionShapes, versionSummary } = this.props
+    exportVersionShapes(versionSummary.id, type)
   }
 
   render () {
diff --git a/lib/manager/components/version/VersionDateLabel.js b/lib/manager/components/version/VersionDateLabel.js
index 3c6456601..1e605ca21 100644
--- a/lib/manager/components/version/VersionDateLabel.js
+++ b/lib/manager/components/version/VersionDateLabel.js
@@ -4,20 +4,20 @@ import React, {Component} from 'react'
 import {Label as BsLabel} from 'react-bootstrap'
 import moment from 'moment'
 
-import type {FeedVersion} from '../../../types'
+import type {FeedVersionSummary} from '../../../types'
 
 type Props = {
-  version: FeedVersion
+  version: FeedVersionSummary
 }
 
 export default class VersionDateLabel extends Component<Props> {
   render () {
     const {version} = this.props
-    const {validationSummary: summary} = version
+    const {validationResult: summary} = version
     if (!summary) return null
     const now = +moment().startOf('day')
-    const start = +moment(summary.startDate)
-    const end = +moment(summary.endDate)
+    const start = +moment(summary.firstCalendarDate)
+    const end = +moment(summary.lastCalendarDate)
     const future = start > now
     const expired = end < now
     const bsStyle = future ? 'info' : expired ? 'danger' : 'success'
diff --git a/lib/types/index.js b/lib/types/index.js
index 670a8af39..aed722651 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -508,6 +508,7 @@ export type FeedTransformResult = {
  */
 export type FeedVersionSummary = {
   dateCreated: number,
+  feedSourceId: string,
   fileSize: number,
   id: string,
   lastUpdated: number,
@@ -516,13 +517,13 @@ export type FeedVersionSummary = {
   originNamespace: ?string,
   retrievalMethod: ?RetrievalMethod,
   updated: number,
+  validationResult: ValidationResult,
   version: number
 }
 
 export type FeedVersion = FeedVersionSummary & {
   feedLoadResult: FeedLoadResult,
   feedSource: Feed,
-  feedSourceId?: string,
   feedTransformResult?: FeedTransformResult,
   fileTimestamp: number,
   isCreating?: boolean,
@@ -534,7 +535,6 @@ export type FeedVersion = FeedVersionSummary & {
   processedByExternalPublisher: ?number,
   sentToExternalPublisher: ?number,
   user: string,
-  validationResult: ValidationResult,
   validationSummary: ValidationSummary
 }
 

From 915e5afeacebe24b76934b2a3855715baa1bbbfb Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 13 May 2022 17:02:04 -0400
Subject: [PATCH 543/553] refactor(VersionDateLabel): Use validationSummary
 from FeedVersionSummary.

---
 lib/manager/components/version/VersionDateLabel.js | 6 +++---
 lib/types/index.js                                 | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/manager/components/version/VersionDateLabel.js b/lib/manager/components/version/VersionDateLabel.js
index 1e605ca21..068a8c036 100644
--- a/lib/manager/components/version/VersionDateLabel.js
+++ b/lib/manager/components/version/VersionDateLabel.js
@@ -13,11 +13,11 @@ type Props = {
 export default class VersionDateLabel extends Component<Props> {
   render () {
     const {version} = this.props
-    const {validationResult: summary} = version
+    const {validationSummary: summary} = version
     if (!summary) return null
     const now = +moment().startOf('day')
-    const start = +moment(summary.firstCalendarDate)
-    const end = +moment(summary.lastCalendarDate)
+    const start = +moment(summary.startDate)
+    const end = +moment(summary.endDate)
     const future = start > now
     const expired = end < now
     const bsStyle = future ? 'info' : expired ? 'danger' : 'success'
diff --git a/lib/types/index.js b/lib/types/index.js
index aed722651..cd619a9b3 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -517,7 +517,9 @@ export type FeedVersionSummary = {
   originNamespace: ?string,
   retrievalMethod: ?RetrievalMethod,
   updated: number,
-  validationResult: ValidationResult,
+  // HACK: validationSummary is fully populated in FeedVersion.
+  // Only startDate and endDate are available in FeedVersionSummary.
+  validationSummary: ValidationSummary,
   version: number
 }
 
@@ -535,7 +537,7 @@ export type FeedVersion = FeedVersionSummary & {
   processedByExternalPublisher: ?number,
   sentToExternalPublisher: ?number,
   user: string,
-  validationSummary: ValidationSummary
+  validationResult: ValidationResult
 }
 
 export type Label = {

From c80496dafadba9778a930090cc07438703a05693 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 23 May 2022 18:05:35 -0400
Subject: [PATCH 544/553] improvement(GtfsPlusField): Add a
 GTFS_ROUTE_NOT_ADDED type that hides route_ids alreadyin use.

---
 gtfsplus.yml                             |  2 +-
 lib/gtfs/components/gtfs-search.js       | 24 +++++++++++++++++++++---
 lib/gtfsplus/components/GtfsPlusField.js | 19 ++++++++++++++-----
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/gtfsplus.yml b/gtfsplus.yml
index 8a568cdc4..f92b0187d 100644
--- a/gtfsplus.yml
+++ b/gtfsplus.yml
@@ -347,7 +347,7 @@
   fields:
     - name: route_id
       required: true
-      inputType: GTFS_ROUTE
+      inputType: GTFS_ROUTE_NOT_ADDED
       columnWidth: 4
       helpContent: From GTFS routes.txt file. This is necessary to maintain relationship between routes in this file and routes in the standard GTFS routes.txt file.
     - name: category
diff --git a/lib/gtfs/components/gtfs-search.js b/lib/gtfs/components/gtfs-search.js
index da82b4984..6a8e26faa 100644
--- a/lib/gtfs/components/gtfs-search.js
+++ b/lib/gtfs/components/gtfs-search.js
@@ -7,7 +7,6 @@ import {Async} from 'react-select'
 
 import {getRouteName} from '../../editor/util/gtfs'
 import {searchEntitiesWithString} from '../util'
-
 import type {Feed, GtfsRoute, GtfsStop, User} from '../../types'
 import type {AppState} from '../../types/reducers'
 
@@ -21,6 +20,7 @@ export type GtfsOption = {
 
 type Props = {
   entities: Array<string>,
+  excludedEntityIds: Array<string>,
   feeds: Array<Feed>,
   filterByRoute?: GtfsRoute,
   filterByStop?: GtfsStop,
@@ -109,7 +109,16 @@ class GtfsSearch extends Component<Props, State> {
    * @param  {String} input text string to search
    */
   _loadOptions = (input: string) => {
-    const {entities, feeds, filterByRoute, filterByStop, namespace, user} = this.props
+    const {
+      entities,
+      excludedEntityIds,
+      feeds,
+      filterByRoute,
+      filterByStop,
+      namespace,
+      user,
+      value: currentOption
+    } = this.props
     // $FlowFixMe kind of cryptic error, ignoring for now
     let queries = []
     if (namespace) {
@@ -142,7 +151,16 @@ class GtfsSearch extends Component<Props, State> {
             // Entities must be mapped to options here in order to make use of
             // feed references.
             stops && stopOptions.push(...stops.map(s => _entityToOption(s, feed)))
-            routes && routeOptions.push(...routes.map(r => _entityToOption(r, feed)))
+            routes && routeOptions.push(
+              ...routes
+                // Remove specified entity ids (route ids in this case) to exclude, except the current value.
+                .filter(route =>
+                  !excludedEntityIds.includes(route.route_id) ||
+                  // (Extended type checks are for flow validation.)
+                  (route.route_id === (typeof currentOption === 'object' ? currentOption && currentOption.value : currentOption))
+                )
+                .map(r => _entityToOption(r, feed))
+            )
           } else {
             const feedName = feed ? feed.name : responseNamespace
             console.warn(`Could not search GTFS entities (query: "${input}") for ${feedName}`, results)
diff --git a/lib/gtfsplus/components/GtfsPlusField.js b/lib/gtfsplus/components/GtfsPlusField.js
index bb894e769..30b7669cb 100644
--- a/lib/gtfsplus/components/GtfsPlusField.js
+++ b/lib/gtfsplus/components/GtfsPlusField.js
@@ -42,7 +42,7 @@ export default class GtfsPlusField extends Component<Props> {
   }
 
   render () {
-    const {currentValue, data: rowData, feedVersionSummary, field, getGtfsEntity} = this.props
+    const {currentValue, data: rowData, feedVersionSummary, field, getGtfsEntity, rows} = this.props
     const namespace = feedVersionSummary && feedVersionSummary.namespace
     switch (field.inputType) {
       case 'TEXT':
@@ -98,6 +98,7 @@ export default class GtfsPlusField extends Component<Props> {
           </FormControl>
         )
       case 'GTFS_ROUTE':
+      case 'GTFS_ROUTE_NOT_ADDED':
         const routeEntity = ((getGtfsEntity('route', currentValue): any): GtfsRoute)
         const routeValue = routeEntity
           ? {
@@ -106,16 +107,24 @@ export default class GtfsPlusField extends Component<Props> {
           }
           : null
 
+        // If this field is of type GTFS_ROUTE_NOT_ADDED, only display in the dropdown route ids
+        // that are not already used as route_id in other rows in the table.
+        const excludedEntityIds = field.inputType === 'GTFS_ROUTE_NOT_ADDED'
+          ? rows.map(row => row.route_id)
+          : []
+
         return (
           <GtfsSearch
+            clearable={false}
+            entities={['routes']}
+            excludedEntityIds={excludedEntityIds}
             feeds={[]}
-            namespace={namespace}
             limit={100}
-            entities={['routes']}
             minimumInput={1}
-            clearable={false}
+            namespace={namespace}
             onChange={this._onChangeRoute}
-            value={routeValue} />
+            value={routeValue}
+          />
         )
       case 'GTFS_STOP':
         const stopEntity = ((getGtfsEntity('stop', currentValue): any): GtfsStop)

From 9dee4be05cbbc4378bc6431226a48fb144fa57e8 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 26 May 2022 15:42:59 -0400
Subject: [PATCH 545/553] refactor(GtfsPlusField): Display unused routes using
 entries from entire table.

---
 lib/gtfsplus/components/GtfsPlusField.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/gtfsplus/components/GtfsPlusField.js b/lib/gtfsplus/components/GtfsPlusField.js
index 30b7669cb..5946e185e 100644
--- a/lib/gtfsplus/components/GtfsPlusField.js
+++ b/lib/gtfsplus/components/GtfsPlusField.js
@@ -42,7 +42,14 @@ export default class GtfsPlusField extends Component<Props> {
   }
 
   render () {
-    const {currentValue, data: rowData, feedVersionSummary, field, getGtfsEntity, rows} = this.props
+    const {
+      currentValue,
+      data: rowData,
+      feedVersionSummary,
+      field,
+      getGtfsEntity,
+      tableData
+    } = this.props
     const namespace = feedVersionSummary && feedVersionSummary.namespace
     switch (field.inputType) {
       case 'TEXT':
@@ -108,9 +115,9 @@ export default class GtfsPlusField extends Component<Props> {
           : null
 
         // If this field is of type GTFS_ROUTE_NOT_ADDED, only display in the dropdown route ids
-        // that are not already used as route_id in other rows in the table.
-        const excludedEntityIds = field.inputType === 'GTFS_ROUTE_NOT_ADDED'
-          ? rows.map(row => row.route_id)
+        // that are not already used as route_id in other rows in the entire table.
+        const excludedEntityIds = field.inputType === 'GTFS_ROUTE_NOT_ADDED' && tableData
+          ? tableData.route_attributes.map(row => row.route_id)
           : []
 
         return (

From 7c7c5997f0ecc9c6f5c722af3324e86766859223 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Thu, 26 May 2022 17:12:19 -0400
Subject: [PATCH 546/553] fix(gtfs/util): Remove the hardcoded limit of 30 to
 make it work with GTFS_ROUTE_NOT_ADDED dropdown.

---
 lib/gtfs/util/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/gtfs/util/index.js b/lib/gtfs/util/index.js
index a65575e91..296219720 100644
--- a/lib/gtfs/util/index.js
+++ b/lib/gtfs/util/index.js
@@ -6,7 +6,6 @@ import {GTFS_GRAPHQL_PREFIX} from '../../common/constants'
 import {getGtfsSpec} from '../../common/util/config'
 import {routeSearch, stopSearch} from '../util/graphql'
 import {getHeaders} from '../../common/util/util'
-
 import type {GtfsRoute, GtfsStop, User} from '../../types'
 
 export function getEntityIdField (type: string): string {
@@ -229,6 +228,8 @@ export function searchEntitiesWithString (
   const includeStopSubQuery = !!filterByRoute
   // Build routes/stops query based on entities searching and whether we're
   // filtering by a specific route or stop ID.
+  // FIXME: Removed the hardcoded limit of 30 on the route search so it works with the GTFS_ROUTE_NOT_ADDED field,
+  // but does removing that negatively affect anything else?
   const body = JSON.stringify({
     query: `
 query (
@@ -239,7 +240,7 @@ query (
 ) {
   feed(namespace: $namespace) {
     ${queryForRoutes && includeRouteSubQuery ? stopSearch(true, 30) : ''}
-    ${queryForRoutes && !includeRouteSubQuery ? routeSearch(false, 30) : ''}
+    ${queryForRoutes && !includeRouteSubQuery ? routeSearch(false) : ''}
     ${queryForStops && includeStopSubQuery ? routeSearch(true, 30) : ''}
     ${queryForStops && !includeStopSubQuery ? stopSearch(false, 30) : ''}
   }

From 0d3b7bc870c79961f317e663ce52e1dc9f581b40 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 6 Jun 2022 14:35:39 -0400
Subject: [PATCH 547/553] ci(node-ci): Temporarily enable e2e tests.

---
 .github/workflows/node-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 258b9e2f4..4759a307f 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -57,22 +57,22 @@ jobs:
       - name: Build docs
         run: mkdocs build
       - name: Start MongoDB
-        if: env.SHOULD_RUN_E2E == 'true'
+        # if: env.SHOULD_RUN_E2E == 'true'
         uses: supercharge/mongodb-github-action@1.3.0
         with:
           mongodb-version: 4.2
       - name: Add aws credentials for datatools-server
-        if: env.SHOULD_RUN_E2E == 'true'
+        # if: env.SHOULD_RUN_E2E == 'true'
         run: mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=${AWS_REGION}' > ~/.aws/config
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Install otp-runner
-        if: env.SHOULD_RUN_E2E == 'true'
+        # if: env.SHOULD_RUN_E2E == 'true'
         run: yarn global add https://github.com/ibi-group/otp-runner.git
       - name: Run e2e tests
-        if: env.SHOULD_RUN_E2E == 'true'
+        # if: env.SHOULD_RUN_E2E == 'true'
         run: yarn test-end-to-end
         env:
           AUTH0_API_CLIENT: ${{ secrets.AUTH0_API_CLIENT }}

From d63dc8d0b8b6b9ea95bbfcff2d44337fbf58822a Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 6 Jun 2022 14:37:51 -0400
Subject: [PATCH 548/553] test(e2e): Approve route before saving changes in
 GTFS editor.

---
 __tests__/end-to-end.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/__tests__/end-to-end.js b/__tests__/end-to-end.js
index aa340805e..7b0280bdd 100644
--- a/__tests__/end-to-end.js
+++ b/__tests__/end-to-end.js
@@ -1573,11 +1573,6 @@ describe('end-to-end', () => {
         await waitForSelector('[data-test-id="route-route_id-input-container"]')
 
         // fill out form
-        // set status to approved
-        await page.select(
-          '[data-test-id="route-status-input-container"] select',
-          '2'
-        )
 
         // set public to yes
         await page.select(
@@ -1639,6 +1634,13 @@ describe('end-to-end', () => {
           'example.branding.test'
         )
 
+        // Set status to approved so the route is exported to a snapshot.
+        // Do this last, otherwise the approved status will change back to in-progress.
+        await page.select(
+          '[data-test-id="route-status-input-container"] select',
+          '2'
+        )
+
         // save
         await click('[data-test-id="save-entity-button"]')
         await wait(2000, 'for save to happen')
@@ -1665,6 +1667,13 @@ describe('end-to-end', () => {
           ' updated'
         )
 
+        // Set status to approved so the route is exported to a snapshot.
+        // Do this last, otherwise the approved status will change back to in-progress.
+        await page.select(
+          '[data-test-id="route-status-input-container"] select',
+          '2'
+        )
+
         // save
         await click('[data-test-id="save-entity-button"]')
         await wait(2000, 'for save to happen')
@@ -2640,9 +2649,6 @@ describe('end-to-end', () => {
         // wait for dialog to appear
         await waitForSelector('[data-test-id="snapshot-dialog-name"]')
 
-        // confirm that we want to publish with unapproved routes
-        await click('[data-test-id="confirmPublishWithUnapproved"]')
-
         // enter name
         await type('[data-test-id="snapshot-dialog-name"]', 'test-snapshot')
 

From 2b70cb5a1b27b0c861244ad2cc92c7f87218f999 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Mon, 6 Jun 2022 15:29:50 -0400
Subject: [PATCH 549/553] Revert "ci(node-ci): Temporarily enable e2e tests."

This reverts commit 0d3b7bc870c79961f317e663ce52e1dc9f581b40.
---
 .github/workflows/node-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 4759a307f..258b9e2f4 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -57,22 +57,22 @@ jobs:
       - name: Build docs
         run: mkdocs build
       - name: Start MongoDB
-        # if: env.SHOULD_RUN_E2E == 'true'
+        if: env.SHOULD_RUN_E2E == 'true'
         uses: supercharge/mongodb-github-action@1.3.0
         with:
           mongodb-version: 4.2
       - name: Add aws credentials for datatools-server
-        # if: env.SHOULD_RUN_E2E == 'true'
+        if: env.SHOULD_RUN_E2E == 'true'
         run: mkdir ~/.aws && printf '%s\n' '[default]' 'aws_access_key_id=${AWS_ACCESS_KEY_ID}' 'aws_secret_access_key=${AWS_SECRET_ACCESS_KEY}' 'region=${AWS_REGION}' > ~/.aws/config
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_REGION: ${{ secrets.AWS_REGION }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Install otp-runner
-        # if: env.SHOULD_RUN_E2E == 'true'
+        if: env.SHOULD_RUN_E2E == 'true'
         run: yarn global add https://github.com/ibi-group/otp-runner.git
       - name: Run e2e tests
-        # if: env.SHOULD_RUN_E2E == 'true'
+        if: env.SHOULD_RUN_E2E == 'true'
         run: yarn test-end-to-end
         env:
           AUTH0_API_CLIENT: ${{ secrets.AUTH0_API_CLIENT }}

From a4826e866cb9c19cdfa58e2be2e6a6a5cd3cc2fe Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Mon, 6 Jun 2022 21:27:04 -0400
Subject: [PATCH 550/553] feat(Deployment): Add shapefile export for
 deployments

---
 lib/manager/actions/deployments.js              | 14 ++++++++++++--
 lib/manager/actions/status.js                   | 10 +++++++++-
 .../components/deployment/DeploymentViewer.js   | 17 +++++++++++++++++
 .../containers/ActiveDeploymentViewer.js        |  3 ++-
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/lib/manager/actions/deployments.js b/lib/manager/actions/deployments.js
index 52f490e77..a4f1a5122 100644
--- a/lib/manager/actions/deployments.js
+++ b/lib/manager/actions/deployments.js
@@ -6,10 +6,10 @@ import { createAction, type ActionType } from 'redux-actions'
 
 import { createVoidPayloadAction, postFormData, secureFetch } from '../../common/actions'
 import fileDownload from '../../common/util/file-download'
-import type {Deployment, Feed, SummarizedFeedVersion} from '../../types'
+import type {Deployment, Feed, ShapefileExportType, SummarizedFeedVersion} from '../../types'
 import type {dispatchFn, getStateFn} from '../../types/reducers'
 
-import { startJobMonitor } from './status'
+import { handleJobResponse, startJobMonitor } from './status'
 import { receiveProject } from './projects'
 
 const DEPLOYMENT_URL = `/api/manager/secure/deployments`
@@ -188,6 +188,16 @@ export function downloadDeployment (deployment: Deployment) {
   }
 }
 
+export function downloadDeploymentShapes (deployment: Deployment, type: ShapefileExportType) {
+  return function (dispatch: dispatchFn, getState: getStateFn) {
+    const url = `${DEPLOYMENT_URL}/${deployment.id}/shapes?type=${type}`
+    return dispatch(secureFetch(url, 'post'))
+      .then(res => {
+        dispatch(handleJobResponse(res, 'Error exporting GIS'))
+      })
+  }
+}
+
 export function fetchDeploymentAndProject (id: string) {
   return function (dispatch: dispatchFn, getState: getStateFn) {
     dispatch(requestingDeployment())
diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index 74562912e..cee216ec9 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -282,6 +282,10 @@ export function handleFinishedJob (job: ServerJob) {
         // download via S3 (it never uploads the file to S3).
         window.location.assign(`${API_PREFIX}downloadshapes/${job.jobId}`)
         break
+      case 'EXPORT_DEPLOYMENT_GIS':
+        // Download shapefiles for deployment. See note above about temporary files.
+        window.location.assign(`${API_PREFIX}downloadshapes/${job.jobId}`)
+        break
       case 'EXPORT_SNAPSHOT_TO_GTFS':
         if (job.parentJobId) {
           console.log('Not downloading snapshot GTFS. Export job part of feed version creation.')
@@ -326,8 +330,12 @@ export function handleJobResponse (response: Response, message: string) {
         : response.json()
       return dispatch(setErrorMessage(props))
     } else {
-      // Resulting JSON contains message and job ID wich which to monitor job.
+      response.json().then((data) => {
+        console.log(data)
+      })
+      // Resulting JSON contains message and job ID with which to monitor job.
       const json: {jobId: number, message: string} = (response.json(): any)
+
       dispatch(startJobMonitor())
       // Return json with job ID in case it is needed upstream
       return json
diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index 919cf539f..d077dce0a 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -34,6 +34,7 @@ import {getServerDeployedTo} from '../../util/deployment'
 import type {Props as ContainerProps} from '../../containers/ActiveDeploymentViewer'
 import type {
   ServerJob,
+  ShapefileExportType,
   SummarizedFeedVersion
 } from '../../../types'
 import type {ManagerUserState} from '../../../types/reducers'
@@ -50,6 +51,7 @@ type Props = ContainerProps & {
   deployToTarget: typeof deploymentActions.deployToTarget,
   downloadBuildArtifact: typeof deploymentActions.downloadBuildArtifact,
   downloadDeployment: typeof deploymentActions.downloadDeployment,
+  downloadDeploymentShapes: typeof deploymentActions.downloadDeploymentShapes,
   fetchDeployment: typeof deploymentActions.fetchDeployment,
   incrementAllVersionsToLatest: typeof deploymentActions.incrementAllVersionsToLatest,
   terminateEC2InstanceForDeployment: typeof deploymentActions.terminateEC2InstanceForDeployment,
@@ -114,6 +116,8 @@ export default class DeploymentViewer extends Component<Props, State> {
 
   _onClickDownload = () => this.props.downloadDeployment(this.props.deployment)
 
+  _onClickDownloadShapes = (type: ShapefileExportType) => this.props.downloadDeploymentShapes(this.props.deployment, type)
+
   _onCloseModal = () => this.setState({target: null})
 
   _onSelectTarget = (target: string) => this.setState({target})
@@ -164,6 +168,19 @@ export default class DeploymentViewer extends Component<Props, State> {
               onClick={this._onClickDownload}>
               <span><Glyphicon glyph='download' /> {this.messages('download')}</span>
             </Button>
+            <DropdownButton
+              // bsSize={size}
+              id='shp-export'
+              title={
+                <span>
+                  <Icon type='file-zip-o' />
+                  <span className='hidden-xs'> Export (.shp)</span>
+                </span>
+              }
+              onSelect={this._onClickDownloadShapes}>
+              <MenuItem eventKey='STOPS'><Icon type='map-marker' /> Stops</MenuItem>
+              <MenuItem eventKey='ROUTES'><Icon type='ellipsis-h' /> Routes</MenuItem>
+            </DropdownButton>
             <DropdownButton
               bsStyle='primary'
               id='deploy-server-dropdown'
diff --git a/lib/manager/containers/ActiveDeploymentViewer.js b/lib/manager/containers/ActiveDeploymentViewer.js
index 5eab417fc..bcd1bdd89 100644
--- a/lib/manager/containers/ActiveDeploymentViewer.js
+++ b/lib/manager/containers/ActiveDeploymentViewer.js
@@ -7,13 +7,13 @@ import {
   deployToTarget,
   downloadBuildArtifact,
   downloadDeployment,
+  downloadDeploymentShapes,
   fetchDeployment,
   incrementAllVersionsToLatest,
   terminateEC2InstanceForDeployment,
   updateDeployment
 } from '../actions/deployments'
 import DeploymentViewer from '../components/deployment/DeploymentViewer'
-
 import type {Deployment, Feed, Project} from '../../types'
 import type {AppState} from '../../types/reducers'
 
@@ -38,6 +38,7 @@ const mapDispatchToProps = {
   deployToTarget,
   downloadBuildArtifact,
   downloadDeployment,
+  downloadDeploymentShapes,
   fetchDeployment,
   incrementAllVersionsToLatest,
   terminateEC2InstanceForDeployment,

From 05a75a15197ed098495cbd859cd568d53605916c Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Tue, 7 Jun 2022 10:26:26 -0400
Subject: [PATCH 551/553] refactor(status.js): Remove console log

---
 lib/manager/actions/status.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/manager/actions/status.js b/lib/manager/actions/status.js
index cee216ec9..6bf8e61a7 100644
--- a/lib/manager/actions/status.js
+++ b/lib/manager/actions/status.js
@@ -330,9 +330,6 @@ export function handleJobResponse (response: Response, message: string) {
         : response.json()
       return dispatch(setErrorMessage(props))
     } else {
-      response.json().then((data) => {
-        console.log(data)
-      })
       // Resulting JSON contains message and job ID with which to monitor job.
       const json: {jobId: number, message: string} = (response.json(): any)
 

From b8ada937257acbfc65a0fa146758e846b9a5e16b Mon Sep 17 00:00:00 2001
From: "philip.cline" <philip.cline@ibigroup.com>
Date: Mon, 13 Jun 2022 11:03:52 -0400
Subject: [PATCH 552/553] refactor(DeploymentViewer): Sort props, remove
 comment

---
 lib/manager/components/deployment/DeploymentViewer.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/manager/components/deployment/DeploymentViewer.js b/lib/manager/components/deployment/DeploymentViewer.js
index d077dce0a..da30a0557 100644
--- a/lib/manager/components/deployment/DeploymentViewer.js
+++ b/lib/manager/components/deployment/DeploymentViewer.js
@@ -169,15 +169,14 @@ export default class DeploymentViewer extends Component<Props, State> {
               <span><Glyphicon glyph='download' /> {this.messages('download')}</span>
             </Button>
             <DropdownButton
-              // bsSize={size}
               id='shp-export'
+              onSelect={this._onClickDownloadShapes}
               title={
                 <span>
                   <Icon type='file-zip-o' />
                   <span className='hidden-xs'> Export (.shp)</span>
                 </span>
-              }
-              onSelect={this._onClickDownloadShapes}>
+              }>
               <MenuItem eventKey='STOPS'><Icon type='map-marker' /> Stops</MenuItem>
               <MenuItem eventKey='ROUTES'><Icon type='ellipsis-h' /> Routes</MenuItem>
             </DropdownButton>

From 2e796057012896e16350c1ec419a5d716f682992 Mon Sep 17 00:00:00 2001
From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com>
Date: Fri, 17 Jun 2022 17:34:51 -0400
Subject: [PATCH 553/553] test(setup-e2e): Add checks for folder permissions
 and OTP binary.

---
 __tests__/test-utils/setup-e2e.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/__tests__/test-utils/setup-e2e.js b/__tests__/test-utils/setup-e2e.js
index e31da0712..995892a19 100644
--- a/__tests__/test-utils/setup-e2e.js
+++ b/__tests__/test-utils/setup-e2e.js
@@ -20,6 +20,8 @@ const {
 } = require('./utils')
 
 const serverJarFilename = 'dt-latest-dev.jar'
+const otpJarMavenUrl = 'https://repo1.maven.org/maven2/org/opentripplanner/otp/1.4.0/otp-1.4.0-shaded.jar'
+const otpJarForOtpRunner = '/opt/otp/otp-v1.4.0'
 const ENV_YML_VARIABLES = [
   'AUTH0_CLIENT_ID',
   'AUTH0_DOMAIN',
@@ -333,10 +335,7 @@ async function startOtp () {
   console.log('downloading otp jar')
 
   // download otp
-  await downloadFile(
-    'https://repo1.maven.org/maven2/org/opentripplanner/otp/1.4.0/otp-1.4.0-shaded.jar',
-    otpJarFilename
-  )
+  await downloadFile(otpJarMavenUrl, otpJarFilename)
 
   console.log('starting otp')
   // Ensure default folder for graphs exists.
@@ -407,6 +406,19 @@ async function verifySetupForLocalEnvironment () {
     }
   ]
 
+  // Make sure that certain e2e folders have permissions (assumes running on Linux/MacOS).
+  const desiredMode = 0o2777
+  await fs.ensureDir('/tmp/otp', desiredMode) // For otp-runner manifest files
+  await fs.ensureDir('/tmp/otp/graphs', desiredMode) // For OTP graph
+  await fs.ensureDir('/var/log', desiredMode) // For otp-runner log
+  await fs.ensureDir('/opt/otp', desiredMode) // For OTP jar referenced by otp-runner
+
+  // Download OTP jar into /opt/otp/ if not already present.
+  const otpJarExists = await fs.exists(otpJarForOtpRunner)
+  if (!otpJarExists) {
+    await downloadFile(otpJarMavenUrl, otpJarForOtpRunner)
+  }
+
   await Promise.all(
     endpointChecks.map(
       endpoint => (