Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Merge Warning For Externally Merged Feeds #958

Merged
merged 6 commits into from
Jul 4, 2023
Merged

Add Merge Warning For Externally Merged Feeds #958

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5a7e24
feat(file upload): add warning for external feeds
philip-cline Jun 27, 2023
1ae6a5f
refactor(flow): type new state var
philip-cline Jun 27, 2023
4e0f3ed
refactor(polish): add keys to polish.yml
philip-cline Jun 27, 2023
6380a61
refactor(file upload): sort props
philip-cline Jun 29, 2023
72dcf1f
refactor(SelectFileModal): respond to PR comment
philip-cline Jul 4, 2023
2c4c12e
refactor(SelectFileModal): adjust state update
philip-cline Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions i18n/english.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,9 @@ components:
next: Next
of: of
previous: Previous
uploadBody: "Select a GTFS feed to upload:"
uploadError: Uploaded file must be a valid zip file (.zip).
uploadTitle: Upload Feed
version: Version
FeedVersionTabs:
agencyCount: Agency count
Expand Down Expand Up @@ -732,6 +735,8 @@ components:
line: Line
priority: Priority
problemType: Problem Type
SelectFileModal:
mtcMergeWarning: Warning! Feeds merged outside of TDM are not recognized as a merged feed within TDM.
ServerSettings:
deployment:
otpServers:
Expand Down
5 changes: 5 additions & 0 deletions i18n/polish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,9 @@ components:
next: Next
of: of
previous: Previous
uploadBody: "Select a GTFS feed to upload:"
uploadError: Uploaded file must be a valid zip file (.zip).
uploadTitle: Upload Feed
version: Version
FeedVersionTabs:
agencyCount: Agency count
Expand Down Expand Up @@ -767,6 +770,8 @@ components:
line: Line
priority: Priority
problemType: Problem Type
SelectFileModal:
mtcMergeWarning: Warning! Feeds merged outside of TDM are not recognized as a merged feed within TDM.
ServerSettings:
deployment:
otpServers:
Expand Down
26 changes: 22 additions & 4 deletions lib/common/components/SelectFileModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import React, { Component } from 'react'
import { Modal, Button, FormControl } from 'react-bootstrap'
import ReactDOM from 'react-dom'

import { getComponentMessages, isExtensionEnabled } from '../util/config'

type Props = {
body?: string,
errorMessage?: string,
Expand All @@ -18,16 +20,19 @@ type State = {
errorMessage?: string,
onClose?: () => void,
onConfirm?: (any) => Promise<boolean> | boolean,
showMTCMergeWarning: boolean,
philip-cline marked this conversation as resolved.
Show resolved Hide resolved
showModal: boolean,
title?: string
}

export default class SelectFileModal extends Component<Props, State> {
messages = getComponentMessages('SelectFileModal')
state = {
disabled: false,
errorMessage: '',
onConfirm: (args: any) => false,
showModal: false
showModal: false,
showMTCMergeWarning: false
}

close = () => {
Expand All @@ -46,10 +51,11 @@ export default class SelectFileModal extends Component<Props, State> {
onClose: props.onClose,
onConfirm: props.onConfirm,
showModal: true,
showMTCMergeWarning: false,
title: props.title
})
} else {
this.setState({ disabled: false, showModal: true })
this.setState({ disabled: false, showModal: true, showMTCMergeWarning: false })
philip-cline marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down Expand Up @@ -82,9 +88,16 @@ export default class SelectFileModal extends Component<Props, State> {
}
}

onFileChangeCapture = () => {
if (isExtensionEnabled('mtc')) {
this.setState({...this.state, showMTCMergeWarning: true})
}
philip-cline marked this conversation as resolved.
Show resolved Hide resolved
}

render () {
const {Body, Footer, Header, Title} = Modal
const {disabled, errorMessage} = this.state
const {disabled, errorMessage, showMTCMergeWarning} = this.state

return (
<Modal show={this.state.showModal} onHide={this.close}>
<Header>
Expand All @@ -93,11 +106,16 @@ export default class SelectFileModal extends Component<Props, State> {

<Body>
<p>{this.props.body || this.state.body || ''}</p>
{showMTCMergeWarning &&
<p style={{color: 'red'}}>
{this.messages('mtcMergeWarning')}
</p>
}
{errorMessage
? <p>{errorMessage}</p>
: null
}
<FormControl ref='fileInput' type='file' />
<FormControl ref='fileInput' type='file' onChangeCapture={this.onFileChangeCapture} />
philip-cline marked this conversation as resolved.
Show resolved Hide resolved
</Body>

<Footer>
Expand Down
6 changes: 3 additions & 3 deletions lib/manager/components/version/FeedVersionNavigator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@ export default class FeedVersionNavigator extends Component<Props, State> {
return (
<div>
<SelectFileModal ref='uploadModal'
title='Upload Feed'
body='Select a GTFS feed to upload:'
title={this.messages('uploadTitle')}
body={this.messages('uploadBody')}
philip-cline marked this conversation as resolved.
Show resolved Hide resolved
onConfirm={this._onConfirmUpload}
errorMessage='Uploaded file must be a valid zip file (.zip).' />
errorMessage={this.messages('uploadError')} />
<Row style={{marginBottom: '20px'}}>
{/* Version Navigation Widget and Name Editor */}
<Col xs={12} style={versionTitleStyle}>
Expand Down