Merge pull request #8 from hove-io/arb_feat-del

Suppression de features
hove-io · Oct 4, 2024 · d0828aa · d0828aa
2 parents 69025fc + 56280eb
commit d0828aa
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 396 deletions.
diff --git a/gtfs.yml b/gtfs.yml
@@ -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
@@ -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

diff --git a/lib/common/components/Sidebar.js b/lib/common/components/Sidebar.js
@@ -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}

diff --git a/lib/common/util/maps.js b/lib/common/util/maps.js
@@ -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'
   },
@@ -26,7 +26,7 @@ export const EDITOR_MAP_LAYERS: Array<MapLayer> = [
   {
     name: 'Satellite',
     id: 'mapbox/satellite-streets-v11'
-  }
+  }*/
 ]
 
 /**

diff --git a/lib/editor/components/EntityListButtons.js b/lib/editor/components/EntityListButtons.js
@@ -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={

diff --git a/lib/editor/components/FeedInfoPanel.js b/lib/editor/components/FeedInfoPanel.js
@@ -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
@@ -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
@@ -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>

diff --git a/lib/editor/components/pattern/CalculateDefaultTimesForm.js b/lib/editor/components/pattern/CalculateDefaultTimesForm.js
@@ -126,9 +126,6 @@ export default class CalculateDefaultTimesForm extends Component<Props, State> {
           </InputGroup.Button>
         </InputGroup>
         <br />
-        <Well style={{padding: '8px'}}>
-          <NormalizeStopTimesTip />
-        </Well>
       </Form>
     )
   }

diff --git a/lib/editor/components/pattern/PatternStopCard.js b/lib/editor/components/pattern/PatternStopCard.js
@@ -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 */}
@@ -480,7 +473,6 @@ class PatternStopContents extends Component<Props, State> {
             </FormGroup>
           </Col >
         </Row>
-        <NormalizeStopTimesTip />
       </div>
     }
     return (

diff --git a/lib/editor/components/pattern/PatternStopsPanel.js b/lib/editor/components/pattern/PatternStopsPanel.js
@@ -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%'}}>

diff --git a/lib/editor/util/ui.js b/lib/editor/util/ui.js
@@ -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',
@@ -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')
-  }
+  }*/
 ]
 
 /**

diff --git a/lib/manager/components/CreateFeedSource.js b/lib/manager/components/CreateFeedSource.js
@@ -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

diff --git a/lib/manager/components/FeedSourceTable.js b/lib/manager/components/FeedSourceTable.js
@@ -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 />
@@ -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>

diff --git a/lib/manager/components/FeedSourceTableRow.js b/lib/manager/components/FeedSourceTableRow.js
@@ -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>

diff --git a/lib/manager/components/FeedSourceViewer.js b/lib/manager/components/FeedSourceViewer.js
@@ -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}

diff --git a/lib/manager/components/HomeProjectDropdown.js b/lib/manager/components/HomeProjectDropdown.js
@@ -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

diff --git a/lib/manager/components/ManagerHeader.js b/lib/manager/components/ManagerHeader.js
@@ -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)}