Refs #2507: Fix select2s in filters for preloaded state and clear

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>

6 files changed, 23 insertions, 11 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js
index b2777cb7b..77284210a 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Filters.js
@@ -10,6 +10,8 @@ const Filters = ({filters, onFilter, onResetFilters, onUpdateStartTimeFilter, on
         <span>
           <MissionSelect2
             onSelect2JourneyPattern={onSelect2JourneyPattern}
+            filters= {filters}
+            isFilter={true}
           />
         </span>
       </div>
@@ -52,6 +54,8 @@ const Filters = ({filters, onFilter, onResetFilters, onUpdateStartTimeFilter, on
             onSelect2Timetable={onSelect2Timetable}
             hasRoute={true}
             chunkURL= {("/autocomplete_time_tables.json?route_id=" + String(window.route_id))}
+            filters= {filters}
+            isFilter= {true}
           />
         </span>
       </div>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CalendarsEditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CalendarsEditVehicleJourney.js
index 412c52611..f488c9d4e 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CalendarsEditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CalendarsEditVehicleJourney.js
@@ -65,6 +65,7 @@ class CalendarsEditVehicleJourney extends Component {
                               <TimetableSelect2
                                 onSelect2Timetable={this.props.onSelect2Timetable}
                                 chunkURL={'/autocomplete_time_tables.json'}
+                                isFilter={false}
                               />
                               <button
                                 onClick={this.props.onAddSelectedTimetable}
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
index 89b4207ab..61b4047d7 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
@@ -59,7 +59,10 @@ class CreateModal extends Component {
                           <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
                             <div className='form-group'>
                               <label className='control-label is-required'>ID de la mission</label>
-                              <MissionSelect2 onSelect2JourneyPattern={this.props.onSelect2JourneyPattern} />
+                              <MissionSelect2
+                                onSelect2JourneyPattern={this.props.onSelect2JourneyPattern}
+                                isFilter={false}
+                              />
                             </div>
                           </div>
                         </div>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
index 823f20c8e..bde4acba8 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
@@ -15,13 +15,13 @@ class BSelect4 extends React.Component{
   render() {
     return (
       <Select2
-        defaultValue=''
-        onSelect={(e) => this.props.onSelect2JourneyPattern(e) }
+        data={(this.props.isFilter) ? [this.props.filters.query.journeyPattern.published_name] : undefined}
+        value={(this.props.isFilter) ? this.props.filters.query.journeyPattern.published_name : undefined}
+        onSelect={(e) => this.props.onSelect2JourneyPattern(e)}
+        multiple={false}
         ref='journey_pattern_id'
         options={{
-          placeholder: 'Nom d\'une mission existante',
           allowClear: false,
-          language: 'fr', /* Doesn't seem to work... :( */
           theme: 'bootstrap',
           width: '100%',
           ajax: {
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
index ccf711806..5ef8c4fd8 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/TimetableSelect2.js
@@ -15,13 +15,13 @@ class BSelect4 extends React.Component{
   render() {
     return (
       <Select2
-        defaultValue=''
+        data={(this.props.isFilter) ? [this.props.filters.query.timetable.comment] : undefined}
+        value={(this.props.isFilter) ? this.props.filters.query.timetable.comment : undefined}
         onSelect={(e) => this.props.onSelect2Timetable(e) }
-        ref='journey_pattern_id'
+        multiple={false}
+        ref='timetable_id'
         options={{
-          placeholder: 'Nom d\'un calendrier existant',
           allowClear: false,
-          language: 'fr', /* Doesn't seem to work... :( */
           theme: 'bootstrap',
           width: '100%',
           ajax: {
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
index e0a68cbc3..04f8a3710 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
@@ -32,8 +32,12 @@ var initialState = {
           minute: '59'
         }
       },
-      journeyPattern: {},
-      timetable: {},
+      journeyPattern: {
+        published_name: ''
+      },
+      timetable: {
+        comment: ''
+      },
       withoutSchedule: false
     }