feat(admin): dynamic SIRET columns list

demarches-simplifiees · Dec 6, 2024 · 3b67345 · 3b67345
1 parent c031201
commit 3b67345
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 49 deletions.
diff --git a/app/controllers/administrateurs/procedures_controller.rb b/app/controllers/administrateurs/procedures_controller.rb
@@ -424,26 +424,22 @@ def administrateurs
 
     def api_champ_columns
       _, @type_de_champ = @procedure.draft_revision.coordinate_and_tdc(params[:stable_id])
-      @columns = [
-        "Raison sociale",
-        "Adresse du siège social",
-        "Code NAF",
-        "Libellé NAF",
-        "Date de création",
-        "Numéro TVA intracommunautaire",
-        "Attestation sociale",
-        "Attestation fiscale",
-        "Raison sociale",
-        "Adresse du siège social",
-        "Code NAF",
-        "Libellé NAF",
-        "Date de création",
-        "Numéro TVA intracommunautaire",
-        "Attestation sociale",
-        "Attestation fiscale"
-      ].map do |label|
-        Column.new(procedure_id: @procedure.id, table: :etablissement, column: nil, label:)
-      end.sort_by(&:label)
+      regex_prefix = /^#{Regexp.escape(@type_de_champ.libelle)}([^\p{L}]+SIRET)?[^\p{L}]+/
+
+      @column_labels = @type_de_champ
+        .columns(procedure: @procedure)
+        .filter_map do |column|
+          # Remove tdc libelle prefix added in columns:
+          # Numéro SIRET - Entreprise SIREN => Entreprise SIREN
+          column.label.sub(regex_prefix, '')
+        end
+
+      if @type_de_champ.type_champ == "siret"
+        @column_labels.concat Etablissement::EXPORTABLE_COLUMNS.dup.map { I18n.t(_1, scope: [:activerecord, :attributes, :procedure_presentation, :fields, :etablissement]) }
+
+        # Hardcode non columns data
+        @column_labels << "Bilans BDF"
+      end
     end
 
     private

diff --git a/app/models/concerns/columns_concern.rb b/app/models/concerns/columns_concern.rb
@@ -162,31 +162,7 @@ def moral_columns
 
       others = %w[code_postal].map { |column| dossier_col(table: 'etablissement', column:) }
 
-      for_export = %w[
-        siege_social
-        code_naf
-        adresse
-        numero_voie
-        type_voie
-        nom_voie
-        complement_adresse
-        localite
-        code_insee_localite
-        entreprise_capital_social
-        entreprise_numero_tva_intracommunautaire
-        entreprise_forme_juridique_code
-        entreprise_code_effectif_entreprise
-        entreprise_etat_administratif
-        entreprise_siret_siege_social
-        entreprise_nom
-        entreprise_prenom
-        association_rna
-        association_titre
-        association_objet
-        association_date_creation
-        association_date_declaration
-        association_date_publication
-      ].map { |column| dossier_col(table: 'etablissement', column:, displayable: false, filterable: false) }
+      for_export = Etablissement::EXPORTABLE_COLUMNS.map { |column| dossier_col(table: 'etablissement', column:) }
 
       [siret_column, etablissements, others, for_export].flatten
     end

diff --git a/app/models/etablissement.rb b/app/models/etablissement.rb
@@ -34,6 +34,32 @@ class Etablissement < ApplicationRecord
     "libelle_naf" => { type: :text }
   }.freeze
 
+  EXPORTABLE_COLUMNS = %w[
+    siege_social
+    code_naf
+    adresse
+    numero_voie
+    type_voie
+    nom_voie
+    complement_adresse
+    localite
+    code_insee_localite
+    entreprise_capital_social
+    entreprise_numero_tva_intracommunautaire
+    entreprise_forme_juridique_code
+    entreprise_code_effectif_entreprise
+    entreprise_etat_administratif
+    entreprise_siret_siege_social
+    entreprise_nom
+    entreprise_prenom
+    association_rna
+    association_titre
+    association_objet
+    association_date_creation
+    association_date_declaration
+    association_date_publication
+  ].freeze
+
   def entreprise_raison_sociale
     read_attribute(:entreprise_raison_sociale).presence || raison_sociale_for_ei
   end

diff --git a/app/views/administrateurs/procedures/api_champ_columns.html.haml b/app/views/administrateurs/procedures/api_champ_columns.html.haml
@@ -6,8 +6,8 @@
     = t('.hint_html')
 
   %ul.two-column-list.fr-mb-3w
-    - @columns.each do |column|
-      %li= column.label
+    - @column_labels.each do |label|
+      %li= label.upcase_first
 
   - if @type_de_champ.type_champ == "siret"
     %p.fr-hint-text

diff --git a/spec/system/administrateurs/types_de_champ_spec.rb b/spec/system/administrateurs/types_de_champ_spec.rb
@@ -415,7 +415,7 @@
   end
 
   context "SIRET field modal" do
-    let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :siret }]) }
+    let(:procedure) { create(:procedure, types_de_champ_public: [{ type: :siret, libelle: "SIRET de test" }]) }
 
     scenario "loads modal content only when clicked" do
       visit champs_admin_procedure_path(procedure)
@@ -426,7 +426,8 @@
 
       within "#api-champ-columns-modal" do
         expect(page).to have_content("Informations complémentaires au champ Numéro Siret")
-        expect(page).to have_content("Adresse du siège social")
+        expect(page).to have_content("Entreprise raison sociale")
+        expect(page).not_to have_content("SIRET de test – Commune") # no champ libelle
 
         click_button "Fermer"
       end