Skip to content

Commit 3d23502

Browse files
committed
style(manager): formatting, removing unused functions, alphabetizing
1 parent 3b39c98 commit 3d23502

File tree

2 files changed

+22
-35
lines changed

2 files changed

+22
-35
lines changed

lib/manager/components/ProjectViewer.js

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import ProjectSettings from './ProjectSettings'
1010
import ProjectViewerHeader from './ProjectViewerHeader'
1111
import DeploymentsPanel from './DeploymentsPanel'
1212
import FeedSourceTable from './FeedSourceTable'
13-
import {defaultSorter} from '../../common/util/util'
1413
import {isModuleEnabled, getComponentMessages, getMessage, getConfigProperty} from '../../common/util/config'
14+
import {defaultSorter} from '../../common/util/util'
1515

1616
export default class ProjectViewer extends Component {
1717
static propTypes = {
@@ -25,6 +25,7 @@ export default class ProjectViewer extends Component {
2525
searchTextChanged: PropTypes.func,
2626
thirdPartySync: PropTypes.func,
2727
updateAllFeeds: PropTypes.func,
28+
uploadFeed: PropTypes.func,
2829
user: PropTypes.object,
2930
visibilityFilter: PropTypes.object,
3031
visibilityFilterChanged: PropTypes.func
@@ -51,23 +52,6 @@ export default class ProjectViewer extends Component {
5152
}
5253
}
5354

54-
showUploadFeedModal (feedSource) {
55-
this.refs.page.showSelectFileModal({
56-
title: 'Upload Feed',
57-
body: 'Select a GTFS feed to upload:',
58-
onConfirm: (files) => {
59-
const nameArray = files[0].name.split('.')
60-
if (files[0].type !== 'application/zip' || nameArray[nameArray.length - 1] !== 'zip') {
61-
return false
62-
} else {
63-
this.props.uploadFeedClicked(feedSource, files[0])
64-
return true
65-
}
66-
},
67-
errorMessage: 'Uploaded file must be a valid zip file (.zip).'
68-
})
69-
}
70-
7155
shouldComponentUpdate (newProps) {
7256
return !shallowEqual(newProps, this.props)
7357
}
@@ -164,7 +148,10 @@ export default class ProjectViewer extends Component {
164148
<Col xs={12} sm={9}>
165149
<Panel
166150
header={<ProjectViewerHeader {...this.props} />}>
167-
<FeedSourceTable fill {...this.props} feedSources={filteredFeedSources} />
151+
<FeedSourceTable
152+
fill
153+
{...this.props}
154+
feedSources={filteredFeedSources} />
168155
</Panel>
169156
</Col>
170157
<Col xs={12} sm={3}>

lib/manager/containers/ActiveProjectViewer.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,29 +62,29 @@ const mapDispatchToProps = (dispatch, ownProps) => {
6262
dispatch(fetchProjectFeeds(projectId))
6363
}
6464
},
65-
onNewFeedSourceClick: () => dispatch(createFeedSource(projectId)),
66-
updateProjectSettings: (project, newSettings) => dispatch(updateProject(project, newSettings, true)),
67-
thirdPartySync: (type) => dispatch(thirdPartySync(projectId, type)),
68-
updateAllFeeds: (project) => dispatch(fetchFeedsForProject(project)),
69-
saveFeedSource: (name) => dispatch(saveFeedSource({ projectId, name })),
70-
updateFeedSourceProperty: (feedSource, propName, newValue) => dispatch(updateFeedSource(feedSource, { [propName]: newValue })),
71-
deploymentsRequested: () => dispatch(fetchProjectDeployments(projectId)),
72-
deployPublic: (project) => dispatch(deployPublic(project)),
7365
createDeploymentFromFeedSource: (feedSource) => dispatch(createDeploymentFromFeedSource(feedSource)),
74-
onNewDeploymentClick: () => dispatch(createDeployment(projectId)),
75-
newDeploymentNamed: (name) => dispatch(saveDeployment({ projectId, name })),
76-
updateDeployment: (deployment, changes) => dispatch(updateDeployment(deployment, changes)),
77-
searchTextChanged: (text) => dispatch(setVisibilitySearchText(text)),
78-
visibilityFilterChanged: (filter) => dispatch(setVisibilityFilter(filter)),
79-
uploadFeed: (feedSource, file) => dispatch(uploadFeed(feedSource, file)),
80-
fetchFeed: (feedSource) => dispatch(runFetchFeed(feedSource)),
8166
deleteFeedSource: (feedSource) => dispatch(deleteFeedSource(feedSource)),
8267
deleteProject: (project) => {
8368
return dispatch(deleteProject(project))
8469
.then(() => browserHistory.push('/home'))
8570
},
8671
deleteDeploymentConfirmed: (deployment) => dispatch(deleteDeployment(deployment)),
87-
downloadMergedFeed: (project) => dispatch(downloadFeedForProject(project))
72+
deploymentsRequested: () => dispatch(fetchProjectDeployments(projectId)),
73+
deployPublic: (project) => dispatch(deployPublic(project)),
74+
downloadMergedFeed: (project) => dispatch(downloadFeedForProject(project)),
75+
fetchFeed: (feedSource) => dispatch(runFetchFeed(feedSource)),
76+
newDeploymentNamed: (name) => dispatch(saveDeployment({ projectId, name })),
77+
onNewDeploymentClick: () => dispatch(createDeployment(projectId)),
78+
onNewFeedSourceClick: () => dispatch(createFeedSource(projectId)),
79+
saveFeedSource: (name) => dispatch(saveFeedSource({ projectId, name })),
80+
searchTextChanged: (text) => dispatch(setVisibilitySearchText(text)),
81+
thirdPartySync: (type) => dispatch(thirdPartySync(projectId, type)),
82+
updateFeedSourceProperty: (feedSource, propName, newValue) => dispatch(updateFeedSource(feedSource, { [propName]: newValue })),
83+
updateAllFeeds: (project) => dispatch(fetchFeedsForProject(project)),
84+
updateDeployment: (deployment, changes) => dispatch(updateDeployment(deployment, changes)),
85+
updateProjectSettings: (project, newSettings) => dispatch(updateProject(project, newSettings, true)),
86+
uploadFeed: (feedSource, file) => dispatch(uploadFeed(feedSource, file)),
87+
visibilityFilterChanged: (filter) => dispatch(setVisibilityFilter(filter))
8888
}
8989
}
9090

0 commit comments

Comments
 (0)