Rename/split modalities with or without france connect

Better that way, clearer. Make a symlink for the display block, in order to keep the same code, drying things.
etalab · Jan 22, 2025 · 42c7060 · 42c7060
1 parent 65ffbb2
commit 42c7060
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/..._modalite_impot_particulier_controller.js → ...odalite_with_france_connect_controller.js b/..._modalite_impot_particulier_controller.js → ...odalite_with_france_connect_controller.js
diff --git a/app/views/authorization_request_forms/blocks/api_impot_particulier/_modalities.html.erb b/app/views/authorization_request_forms/blocks/api_impot_particulier/_modalities.html.erb
diff --git a/..._particulier_sandbox/_modalities.html.erb → .../_modalities_with_france_connect.html.erb b/..._particulier_sandbox/_modalities.html.erb → .../_modalities_with_france_connect.html.erb
@@ -4,24 +4,24 @@
 
 <%= f.info_for(:modalities) %>
 
-<div data-controller="choose-modalite-impot-particulier">
+<div data-controller="choose-modalite-with-france-connect">
   <div class="fr-col-lg-9">
-    <%= 
-      f.dsfr_radio_buttons :modalities, 
-        @authorization_request.available_modalities, 
+    <%=
+      f.dsfr_radio_buttons :modalities,
+        @authorization_request.available_modalities,
         required: true,
         multiple: true,
-        radio_group_class: "fr-radio-rich", 
+        radio_group_class: "fr-radio-rich",
         fieldset_element_class: "small",
         checked: ->(value) { @authorization_request.modalities.include?(value) },
-        input_options: { 
-          "data-action": "click->choose-modalite-impot-particulier#trigger",
-          "data-choose-modalite-impot-particulier-target": "modality"
+        input_options: {
+          "data-action": "click->choose-modalite-with-france-connect#trigger",
+          "data-choose-modalite-with-france-connect-target": "modality"
         }
     %>
   </div>
 
-  <div class="fr-col-lg-9 fr-mb-5w <%= 'fr-hidden' unless @authorization_request.with_france_connect? %>" data-choose-modalite-impot-particulier-target="franceConnectContainer">
+  <div class="fr-col-lg-9 fr-mb-5w <%= 'fr-hidden' unless @authorization_request.with_france_connect? %>" data-choose-modalite-with-france-connect-target="franceConnectContainer">
     <% france_connect_authorizations = current_organization.valid_authorizations_of(AuthorizationRequest::FranceConnect).map(&:decorate) %>
 
     <% if france_connect_authorizations.empty? %>
@@ -38,7 +38,7 @@
     <% else %>
       <% options = france_connect_authorizations.map{ |authorization| [authorization.name_for_select, authorization.id] } %>
       <% selected_option = @authorization_request.france_connect_authorization_id || france_connect_authorizations.first.id %>
-      <%= f.dsfr_select :france_connect_authorization_id, options_for_select(options, selected_option), class: %w[fr-select], include_blank: "Sélectionner une option", required: true, input_options: { "data-choose-modalite-impot-particulier-target": "franceConnectSelector" } %>
+      <%= f.dsfr_select :france_connect_authorization_id, options_for_select(options, selected_option), class: %w[fr-select], include_blank: "Sélectionner une option", required: true, input_options: { "data-choose-modalite-with-france-connect-target": "franceConnectSelector" } %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/authorization_requests/blocks/default/_modalities.html.erb b/app/views/authorization_requests/blocks/default/_modalities.html.erb
@@ -2,7 +2,7 @@
   <% if f.wording_for('modalities.intro') %>
     <%= f.wording_for('modalities.intro').html_safe %>
   <% end %>
-  
+
   <% modalities = @authorization_request.modalities.is_a?(Array) ? @authorization_request.modalities : [@authorization_request.modalities] %>
   <ul>
     <% modalities.each do |modality| %>

diff --git a/app/views/authorization_requests/blocks/default/_modalities_with_france_connect.html.erb b/app/views/authorization_requests/blocks/default/_modalities_with_france_connect.html.erb
@@ -0,0 +1 @@
+_modalities.html.erb
diff --git a/config/authorization_definitions.yml b/config/authorization_definitions.yml
@@ -339,7 +339,7 @@ shared:
       - name: basic_infos
       - name: personal_data
       - name: legal
-      - name: modalities
+      - name: modalities_with_france_connect
       - name: scopes
       - name: contacts
       - name: operational_acceptance
@@ -482,7 +482,7 @@ shared:
       - name: basic_infos
       - name: personal_data
       - name: legal
-      - name: modalities
+      - name: modalities_with_france_connect
       - name: scopes
       - name: contacts
     scopes: *api_impot_particulier_scopes

diff --git a/config/authorization_request_forms/api_impot_particulier.yml b/config/authorization_request_forms/api_impot_particulier.yml
@@ -36,7 +36,7 @@ api-impot-particulier-sandbox:
     - name: basic_infos
     - name: personal_data
     - name: legal
-    - name: modalities
+    - name: modalities_with_france_connect
     - name: scopes
     - name: contacts
 
@@ -89,7 +89,7 @@ api-impot-particulier-production-editeur:
     - name: basic_infos
     - name: personal_data
     - name: legal
-    - name: modalities
+    - name: modalities_with_france_connect
     - name: scopes
     - name: contacts
     - name: operational_acceptance