Skip to content

Commit

Permalink
feature delete
Browse files Browse the repository at this point in the history
  • Loading branch information
aboivert committed Sep 30, 2024
1 parent 69025fc commit 56280eb
Show file tree
Hide file tree
Showing 22 changed files with 53 additions and 396 deletions.
14 changes: 1 addition & 13 deletions gtfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,7 @@
helpContent: "Contient l'adresse mail du service client de l'agence opérant le flux."
- name: agency_branding_url
required: false
displayName: URL du branding de l'agence
datatools: false
placeholder: https://agence.fr/branding
inputType: URL
columnWidth: 12
helpContent:


- id: stop
name: stops.txt
helpContent: Emplacements de dépôt et de récupération des usagers par le véhicule
Expand Down Expand Up @@ -543,12 +537,6 @@
text: Non (2)
- name: route_branding_url
required: false
displayName: Route branding URL
datatools: false
placeholder: https://agence.fr/branding/itineraire/31
inputType: URL
columnWidth: 12
helpContent:

- id: trip
name: trips.txt
Expand Down
7 changes: 0 additions & 7 deletions lib/common/components/Sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,6 @@ export default class Sidebar extends PureComponent<Props, State> {
finished={jobMonitor.jobs.length === 0 && jobMonitor.retired.length > 0}
label={this.messages('serverJobs')}
onClick={this._select} />
<SidebarNavItem
ref='userNav'
expanded={expanded}
keyName={POPOVER.USER}
icon='user'
label={this.messages('account')}
onClick={this._select} />
<SidebarNavItem
ref='settingsNav'
keyName={POPOVER.HELP}
Expand Down
4 changes: 2 additions & 2 deletions lib/common/util/maps.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const EDITOR_MAP_LAYERS: Array<MapLayer> = [
name: 'Vue par défaut',
id: DEFAULT_MAP_ID
},
{
/*{
name: 'Clair',
id: 'mapbox/light-v10'
},
Expand All @@ -26,7 +26,7 @@ export const EDITOR_MAP_LAYERS: Array<MapLayer> = [
{
name: 'Satellite',
id: 'mapbox/satellite-streets-v11'
}
}*/
]

/**
Expand Down
9 changes: 0 additions & 9 deletions lib/editor/components/EntityListButtons.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,6 @@ export default class EntityListButtons extends Component<Props, State> {
<div>
<ButtonGroup
className='pull-right'>
<Button
bsSize='small'
// TODO: Enable for schedule exceptions?
disabled={activeComponent === 'scheduleexception'}
title={`Bulk edit ${activeComponent} records`}
data-test-id={`bulk-${activeComponent}-button`}
onClick={this._onClickBulk}>
<Icon type='pencil' />
</Button>
<OverlayTrigger
placement='bottom'
overlay={
Expand Down
42 changes: 1 addition & 41 deletions lib/editor/components/FeedInfoPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type State = {
right: number
}

const PANEL_WIDTH = 400
const PANEL_WIDTH = 350 //400

/**
* This is a hideable menu of shortcut buttons that is displayed within the
Expand Down Expand Up @@ -157,23 +157,6 @@ export default class FeedInfoPanel extends Component<Props, State> {
onClick={this.showUploadFileModal}>
<Icon type='upload' />
</Button>
{/* Add entity dropdown */}
<DropdownButton
pullRight dropup
title={<span><Icon type='plus' /></span>}
id='add-entity-dropdown'
onSelect={this._onAddSelect}>
{GTFS_ICONS.map(c => {
if (!c.addable) return null
return (
<MenuItem
key={c.id}
eventKey={c.id}>
<Icon type={c.icon} /> {this.messages('add').replace('%id%', componentToText(c.id))}
</MenuItem>
)
})}
</DropdownButton>
{/* Snapshot dropdown */}
{
<Dropdown
Expand All @@ -191,29 +174,6 @@ export default class FeedInfoPanel extends Component<Props, State> {
<Icon type='camera' />
</Button>
</OverlayTrigger>
<Dropdown.Toggle
bsStyle='primary'
onClick={this._onDropdownArrowClick} />
<Dropdown.Menu style={{maxHeight: '200px', overflowY: 'scroll'}}>
{feedSource &&
feedSource.editorSnapshots &&
feedSource.editorSnapshots.length > 0
? feedSource.editorSnapshots.map(snapshot => {
return (
<MenuItem
key={snapshot.id}
eventKey={snapshot.id}>
<Icon type='reply' /> {this.messages('revert').replace('%snapshot%', snapshot.name)}
</MenuItem>
)
})
: <MenuItem
disabled
eventKey={null}>
<em>{this.messages('noSnapshot')}</em>
</MenuItem>
}
</Dropdown.Menu>
</Dropdown>
}
</ButtonGroup>
Expand Down
3 changes: 0 additions & 3 deletions lib/editor/components/pattern/CalculateDefaultTimesForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ export default class CalculateDefaultTimesForm extends Component<Props, State> {
</InputGroup.Button>
</InputGroup>
<br />
<Well style={{padding: '8px'}}>
<NormalizeStopTimesTip />
</Well>
</Form>
)
}
Expand Down
12 changes: 2 additions & 10 deletions lib/editor/components/pattern/PatternStopCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -368,19 +368,12 @@ class PatternStopContents extends Component<Props, State> {
innerDiv = <div>
{/* Remove from pattern button */}
<Row>
<Col xs={4}>
<Checkbox
checked={patternStop.timepoint}
onChange={this._onChangeTimepoint}>
{patternStopCardMessages('PatternStopContents.timepoint')}
</Checkbox>
</Col>
<Col xs={8}>
<Col xs={9}>
<PatternStopButtons
{...this.props}
patternEdited={isEdited}
size='xsmall'
style={{marginTop: '10px'}} />
/>
</Col>
</Row>
{/* default travel time inputs */}
Expand Down Expand Up @@ -480,7 +473,6 @@ class PatternStopContents extends Component<Props, State> {
</FormGroup>
</Col >
</Row>
<NormalizeStopTimesTip />
</div>
}
return (
Expand Down
29 changes: 0 additions & 29 deletions lib/editor/components/pattern/PatternStopsPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,35 +120,6 @@ export default class PatternStopsPanel extends Component<Props, State> {
{' '}
({activePattern.patternStops ? activePattern.patternStops.length : 0})
</h4>
<div style={{width: '100%'}}>
<Button
disabled={!patternHasStops}
onClick={this._clickNormalizeStopTimes}
style={{marginBottom: '5px'}}
className='pull-right'
block
bsSize='small'
title={!patternHasStops ? 'Vous devez ajouter des arrêts avant de normaliser.' : ''}
>
<Icon type='clock-o' />{' '}
Normaliser les temps d'arrêt
</Button>
<Button
onClick={this._toggleAddStopsMode}
className='pull-right'
bsSize='small'>
{addStops
? <span><Icon type='times' /> Annuler</span>
: <span><Icon type='plus' /> Ajouter un arrêt</span>
}
</Button>
<small className='pull-right' style={{margin: '5px'}}>
{addStops && mapState.zoom && mapState.zoom <= 14
? 'Zoomer pour voir les arrêts'
: `Ajouter des arrêts depuis la carte`
}
</small>
</div>
{/* List of pattern stops */}
<div id='pattern-stop-list-header'>
<div className='pull-left' style={{width: '50%'}}>
Expand Down
8 changes: 4 additions & 4 deletions lib/editor/util/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ export type GtfsIcon = {
const messages = getComponentMessages('GtfsIcons')

export const GTFS_ICONS = [
{
/*{
id: 'feedinfo',
tableName: 'feedinfo',
icon: 'info',
addable: false,
title: messages('feedinfo.title'),
label: messages('feedinfo.label')
},
},*/
{
id: 'agency',
tableName: 'agency',
Expand Down Expand Up @@ -66,14 +66,14 @@ export const GTFS_ICONS = [
title: messages('scheduleexception.title'),
label: messages('scheduleexception.label')
},
{
/*{
id: 'fare',
tableName: 'fare',
icon: 'ticket',
addable: true,
title: messages('fare.title'),
label: messages('fare.label')
}
}*/
]

/**
Expand Down
22 changes: 0 additions & 22 deletions lib/manager/components/CreateFeedSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,28 +239,6 @@ export default class CreateFeedSource extends Component<Props, State> {
</ListGroupItem>
</ListGroup>
</Panel>
{isExtensionEnabled('mtc') && (
<Panel>
<Panel.Heading><Panel.Title componentClass='h3'>Publication automatique</Panel.Title></Panel.Heading>
<ListGroup>
<ListGroupItem>
<FormGroup>
<Checkbox
checked={model.autoPublish}
onChange={this._toggleCheckBox('autoPublish')}
>
<strong>Auto-publier ce flux</strong>
</Checkbox>
<small>
Configurer cette source de flux pour qu'elle soit
automatiquement publiée lorsqu'une nouvelle version
est automatiquement récupérée.
</small>
</FormGroup>
</ListGroupItem>
</ListGroup>
</Panel>
)}
</Col>
<Col xs={12}>
<Button
Expand Down
9 changes: 1 addition & 8 deletions lib/manager/components/FeedSourceTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default class FeedSourceTable extends PureComponent<Props> {
<h4>{this.messages(`comparisonColumn.${comparisonColumn}`)}</h4>
</th>
}
<th className='feed-version-column top-row' colSpan={3}>
<th className='feed-version-column top-row' colSpan={2}>
<h4>{this.messages('latestVersion')}</h4>
</th>
<th />
Expand Down Expand Up @@ -72,13 +72,6 @@ export default class FeedSourceTable extends PureComponent<Props> {
{this.messages('datesValid')}
</h4>
</th>
<th className='feed-version-column'>
<h4>
<Icon type='exclamation-triangle' />
{this.messages('issues')}
</h4>
</th>
<th />
</tr>
</thead>
<tbody>
Expand Down
1 change: 0 additions & 1 deletion lib/manager/components/FeedSourceTableRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@ export default class FeedSourceTableRow extends PureComponent<Props> {
{currentVersionData.endDate && <br />}
{currentVersionData.endDate}
</td>
<td className='feed-version-column'>{currentVersionData.errorCount}</td>
<td>
<FeedActionsDropdown {...this.props} />
</td>
Expand Down
9 changes: 1 addition & 8 deletions lib/manager/components/FeedSourceViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,7 @@ export default class FeedSourceViewer extends Component<Props> {
<Tab
disabled={disabled}
eventKey='settings'
title={
<span>
<Glyphicon className='icon-link' glyph='cog' />
<span className='hidden-xs'>
{this.messages('properties.title')}
</span>
</span>
}>
>
<FeedSourceSettings
activeComponent={activeComponent}
activeSubComponent={activeSubComponent}
Expand Down
9 changes: 0 additions & 9 deletions lib/manager/components/HomeProjectDropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,6 @@ export default class HomeProjectDropdown extends Component<Props> {
)
return (
<div style={{marginBottom: '20px'}}>
{
isAdmin && (
<LinkContainer to='/project/new'>
<Button bsStyle='link' style={{paddingLeft: 0}}>
<Icon type='plus' /> {this.messages('new')}
</Button>
</LinkContainer>
)
}
<div style={{display: 'flex'}}>
<div style={{paddingRight: '10px', width: '70%'}}>
<Select
Expand Down
2 changes: 0 additions & 2 deletions lib/manager/components/ManagerHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ export default class ManagerHeader extends Component<Props> {
: this.messages('noUpdateYet')
}
</li>
<li><Icon type='link' /> {feedSource.url || this.messages('noUrl')}
</li>
<li>
<Icon type='file-archive-o' />{' '}
{this.getAverageFileSize(feedSource.feedVersionSummaries)}
Expand Down
Loading

0 comments on commit 56280eb

Please sign in to comment.