Merge pull request #2249 from betagouv/dev

mep

app/assets/javascripts/new_design/champs/linked_drop_down_list.js

@@ -1,15 +1,15 @@
 document.addEventListener('turbolinks:load', function() {
-  var primaries, i, primary, secondary, secondaryOptions;
+  var primaries, i;
 
   primaries = document.querySelectorAll('select[data-secondary-options]');
   for (i = 0; i < primaries.length; i++) {
-    primary = primaries[i];
+    primaries[i].addEventListener('change', function(e) {
+      var option, options, element, primary, secondary, secondaryOptions;
+
+      primary = e.target;
       secondary = document.querySelector('select[data-secondary-id="' + primary.dataset.primaryId + '"]');
       secondaryOptions = JSON.parse(primary.dataset.secondaryOptions);
 
-    primary.addEventListener('change', function(e) {
-      var option, options, element;
-
       while ((option = secondary.firstChild)) {
         secondary.removeChild(option);
       }

app/controllers/new_gestionnaire/dossiers_controller.rb

@@ -187,7 +187,7 @@ module NewGestionnaire
 
     def champs_private_params
       params.require(:dossier).permit(champs_private_attributes: [
-        :id, :piece_justificative_file, :value, value: [],
+        :id, :primary_value, :secondary_value, :piece_justificative_file, :value, value: [],
         etablissement_attributes: Champs::SiretChamp::ETABLISSEMENT_ATTRIBUTES
       ])
     end

app/models/champs/linked_drop_down_list_champ.rb

@@ -1,27 +1,28 @@
 class Champs::LinkedDropDownListChamp < Champ
-  attr_reader :primary_value, :secondary_value
   delegate :primary_options, :secondary_options, to: :type_de_champ
 
-  after_initialize :unpack_value
+  def primary_value
-
-  def unpack_value
     if value.present?
-      primary, secondary = JSON.parse(value)
+      JSON.parse(value)[0]
     else
-      primary = secondary = ''
+      ''
+    end
+  end
+
+  def secondary_value
+    if value.present?
+      JSON.parse(value)[1]
+    else
+      ''
     end
-    @primary_value ||= primary
-    @secondary_value ||= secondary
   end
 
   def primary_value=(value)
-    @primary_value = value
+    pack_value(value, secondary_value)
-    pack_value
   end
 
   def secondary_value=(value)
-    @secondary_value = value
+    pack_value(primary_value, value)
-    pack_value
   end
 
   def main_value_name
@@ -46,7 +47,7 @@ class Champs::LinkedDropDownListChamp < Champ
     "#{primary_value || ''};#{secondary_value || ''}"
   end
 
-  def pack_value
+  def pack_value(primary, secondary)
-    self.value = JSON.generate([ primary_value, secondary_value ])
+    self.value = JSON.generate([ primary, secondary ])
   end
 end

spec/controllers/new_gestionnaire/dossiers_controller_spec.rb

@@ -350,12 +350,16 @@ describe NewGestionnaire::DossiersController, type: :controller do
       create(:type_de_champ_multiple_drop_down_list, :private, libelle: 'libelle').champ.create
     end
 
+    let(:champ_linked_drop_down_list) do
+      create(:type_de_champ_linked_drop_down_list, :private, libelle: 'libelle').champ.create
+    end
+
     let(:champ_datetime) do
       create(:type_de_champ_datetime, :private, libelle: 'libelle').champ.create
     end
 
     let(:dossier) do
-      create(:dossier, :en_construction, procedure: procedure, champs_private: [champ_multiple_drop_down_list, champ_datetime])
+      create(:dossier, :en_construction, procedure: procedure, champs_private: [champ_multiple_drop_down_list, champ_linked_drop_down_list, champ_datetime])
     end
 
     before do
@@ -375,16 +379,24 @@ describe NewGestionnaire::DossiersController, type: :controller do
               'value(3i)': 21,
               'value(4i)': 13,
               'value(5i)': 17
+            },
+            '2': {
+              id: champ_linked_drop_down_list.id,
+              primary_value: 'primary',
+              secondary_value: 'secondary'
             }
           }
         }
       }
 
       champ_multiple_drop_down_list.reload
+      champ_linked_drop_down_list.reload
       champ_datetime.reload
     end
 
     it { expect(champ_multiple_drop_down_list.value).to eq('["un", "deux"]') }
+    it { expect(champ_linked_drop_down_list.primary_value).to eq('primary') }
+    it { expect(champ_linked_drop_down_list.secondary_value).to eq('secondary') }
     it { expect(champ_datetime.value).to eq('21/12/2019 13:17') }
     it { expect(response).to redirect_to(annotations_privees_gestionnaire_dossier_path(dossier.procedure, dossier)) }
   end