diff --git a/app/views/users/dossiers/_dossiers_list.html.erb b/app/views/users/dossiers/_dossiers_list.html.erb
index 8c42155458e..a66110743db 100644
--- a/app/views/users/dossiers/_dossiers_list.html.erb
+++ b/app/views/users/dossiers/_dossiers_list.html.erb
@@ -1,7 +1,12 @@
<% if dossiers.present? %>
<% dossiers.each do |dossier| %>
- <%= render partial: 'dossier_card_content', locals: { dossier: dossier, linkable: @statut != "dossiers-supprimes" } %>
+ <%= render partial: 'dossier_card_content', locals: {
+ dossier: dossier,
+ linkable: @statut != "dossiers-supprimes",
+ personnalisation: @personnalisations_by_procedure_id&.[](dossier.procedure.id),
+ champs_by_stable_id: @champs_by_dossier_id&.[](dossier.id) || {}
+ } %>
<% if dossier.procedure.close? %>
<%= render Dsfr::AlertComponent.new(state: :info, size: :sm, extra_class_names: "fr-mb-2w") do |c| %>
diff --git a/spec/components/users/dossier_card_champs_component_spec.rb b/spec/components/users/dossier_card_champs_component_spec.rb
new file mode 100644
index 00000000000..9e82b55b801
--- /dev/null
+++ b/spec/components/users/dossier_card_champs_component_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+RSpec.describe Users::DossierCardChampsComponent, type: :component do
+ let(:procedure) { create(:procedure, :published, types_de_champ_public: [{ type: :text, libelle: 'Titre' }]) }
+ let(:dossier) { create(:dossier, :en_construction, procedure:, populate_champs: true) }
+ let(:column) { procedure.personnalisable_columns.first }
+
+ it 'renders the formatted value with an info icon when the champ has a value' do
+ champ = dossier.champs.find { _1.stable_id == column.stable_id }
+ champ.update(value: 'Presse Océan')
+
+ render_inline(described_class.new(columns: [column], champs_by_stable_id: { column.stable_id => champ.reload }))
+
+ expect(page).to have_css('.fr-icon-info-i')
+ expect(page).to have_text('Presse Océan')
+ end
+
+ it 'renders the formatted value for a brouillon dossier' do
+ brouillon = create(:dossier, :brouillon, procedure:, populate_champs: true)
+ champ = brouillon.champs.find { _1.stable_id == column.stable_id }
+ champ.update(value: 'Valeur brouillon')
+
+ render_inline(described_class.new(columns: [column], champs_by_stable_id: { column.stable_id => champ.reload }))
+
+ expect(page).to have_css('.fr-icon-info-i')
+ expect(page).to have_text('Valeur brouillon')
+ end
+
+ it 'renders nothing when the champ is missing or empty' do
+ render_inline(described_class.new(columns: [column], champs_by_stable_id: {}))
+
+ expect(page).not_to have_css('.fr-icon-info-i')
+ end
+end
diff --git a/spec/controllers/users/dossiers_controller_spec.rb b/spec/controllers/users/dossiers_controller_spec.rb
index 1a54da44caa..cb471fe9221 100644
--- a/spec/controllers/users/dossiers_controller_spec.rb
+++ b/spec/controllers/users/dossiers_controller_spec.rb
@@ -2788,6 +2788,67 @@ def announced_region(body)
end
end
+ describe 'GET #index with personnalisation values' do
+ render_views
+
+ let(:user) { create(:user) }
+ let(:procedure) { create(:procedure, :published, types_de_champ_public: [{ type: :text, libelle: 'Titre' }]) }
+ let(:column) { procedure.personnalisable_columns.first }
+
+ before do
+ Flipper.enable(:dossiers_list_personnalisation, user)
+ create(:dossiers_list_personnalisation, user:, procedure:, displayed_columns: [column])
+ sign_in(user)
+ end
+
+ def query_count
+ count = 0
+ callback = -> (*) { count += 1 }
+ ActiveSupport::Notifications.subscribed(callback, 'sql.active_record') { get :index }
+ count
+ end
+
+ it 'does not issue more queries as more dossiers are added (no N+1)' do
+ create_list(:dossier, 6, :en_construction, user:, procedure:, populate_champs: true)
+ baseline = query_count
+
+ create_list(:dossier, 6, :en_construction, user:, procedure:, populate_champs: true)
+ expect(query_count).to be <= baseline + 3
+ end
+ end
+
+ describe 'GET #index with personnalisation values – multi-procedure N+1 guard' do
+ render_views
+
+ let(:user) { create(:user) }
+ let(:procedure1) { create(:procedure, :published, types_de_champ_public: [{ type: :text, libelle: 'Titre' }]) }
+ let(:procedure2) { create(:procedure, :published, types_de_champ_public: [{ type: :text, libelle: 'Intitulé' }]) }
+
+ before do
+ Flipper.enable(:dossiers_list_personnalisation, user)
+ create(:dossiers_list_personnalisation, user:, procedure: procedure1, displayed_columns: [procedure1.personnalisable_columns.first])
+ create(:dossiers_list_personnalisation, user:, procedure: procedure2, displayed_columns: [procedure2.personnalisable_columns.first])
+ sign_in(user)
+ end
+
+ def query_count
+ count = 0
+ callback = -> (*) { count += 1 }
+ ActiveSupport::Notifications.subscribed(callback, 'sql.active_record') { get :index }
+ count
+ end
+
+ it 'does not issue more queries per dossier with multiple procedures (no N+1 on Column.find)' do
+ create_list(:dossier, 3, :en_construction, user:, procedure: procedure1, populate_champs: true)
+ create_list(:dossier, 3, :en_construction, user:, procedure: procedure2, populate_champs: true)
+ baseline = query_count
+
+ create_list(:dossier, 3, :en_construction, user:, procedure: procedure1, populate_champs: true)
+ create_list(:dossier, 3, :en_construction, user:, procedure: procedure2, populate_champs: true)
+ expect(query_count).to be <= baseline + 3
+ end
+ end
+
private
def find_champ_by_stable_id(dossier, stable_id)
diff --git a/spec/lib/column_value_formatter_spec.rb b/spec/lib/column_value_formatter_spec.rb
new file mode 100644
index 00000000000..66855e4d82b
--- /dev/null
+++ b/spec/lib/column_value_formatter_spec.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe ColumnValueFormatter do
+ let(:procedure) { create(:procedure, :published, types_de_champ_public: [{ type: :text, libelle: 'Ville' }, { type: :date, libelle: 'Date' }]) }
+ let(:text_column) { procedure.columns.find { |c| c.respond_to?(:tdc_type) && c.tdc_type == 'text' } }
+ let(:date_column) { procedure.columns.find { |c| c.respond_to?(:tdc_type) && c.tdc_type == 'date' } }
+
+ it 'formats a date with the short format' do
+ expect(described_class.format(column: date_column, raw_value: Date.new(2026, 3, 18))).to eq(I18n.l(Date.new(2026, 3, 18), format: :short))
+ end
+
+ it 'escapes and returns text values' do
+ expect(described_class.format(column: text_column, raw_value: 'Presse Océan')).to eq('Presse Océan')
+ end
+
+ it 'returns nil when raw_value is nil' do
+ expect(described_class.format(column: text_column, raw_value: nil)).to be_nil
+ end
+
+ describe 'format_enums' do
+ let(:enums_column) { double('column', type: :enums) }
+
+ it 'returns an html_safe SafeBuffer and escapes HTML chars in labels' do
+ allow(enums_column).to receive(:label_for_value).with('a').and_return('A & B')
+ allow(enums_column).to receive(:label_for_value).with('b').and_return('C')
+
+ result = described_class.format(column: enums_column, raw_value: ['a', 'b'])
+
+ expect(result).to be_html_safe
+ expect(result).to include('A & B')
+ expect(result).to include('C')
+ end
+ end
+end
diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb
index 91437754a2c..c8d91357295 100644
--- a/spec/models/procedure_spec.rb
+++ b/spec/models/procedure_spec.rb
@@ -2388,6 +2388,26 @@
end
end
+ describe '#columns' do
+ it 'does not raise and skips champs with unknown type_champ (legacy value)' do
+ procedure = create(:procedure, :published, types_de_champ_public: [
+ { type: :text, libelle: 'Champ valide' },
+ { type: :text, libelle: 'Champ legacy' },
+ ])
+ valid_tdc = procedure.published_revision.types_de_champ_public.find { _1.libelle == 'Champ valide' }
+ legacy_tdc_id = procedure.published_revision.types_de_champ_public.find { _1.libelle == 'Champ legacy' }.id
+ TypeDeChamp.where(id: legacy_tdc_id).update_all(type_champ: 'titre_identite')
+ expect(TypeDeChamp.find(legacy_tdc_id).dynamic_type).to be_nil
+ procedure.reload
+ Current.procedure_columns = nil
+
+ expect { procedure.columns }.not_to raise_error
+ expect(procedure.columns.map(&:label)).not_to include('Champ legacy')
+ h_id = { procedure_id: procedure.id, column_id: "type_de_champ/#{valid_tdc.stable_id}" }
+ expect { procedure.find_column(h_id:) }.not_to raise_error
+ end
+ end
+
private
def create_dossier_with_pj_of_size(size, procedure)
diff --git a/spec/system/users/dossiers_personnalisation_spec.rb b/spec/system/users/dossiers_personnalisation_spec.rb
index 33a27c05449..f037fafb03f 100644
--- a/spec/system/users/dossiers_personnalisation_spec.rb
+++ b/spec/system/users/dossiers_personnalisation_spec.rb
@@ -16,6 +16,20 @@
login_as user, scope: :user
end
+ it 'shows the chosen champ values on the dossier cards' do
+ perso_procedure = create(:procedure, :published, types_de_champ_public: [{ type: :text, libelle: 'Titre de la publication' }])
+ column = perso_procedure.personnalisable_columns.first
+ create(:dossiers_list_personnalisation, user:, procedure: perso_procedure, displayed_columns: [column])
+ dossiers = create_list(:dossier, 6, :en_construction, user:, procedure: perso_procedure, populate_champs: true)
+ champ = dossiers.first.champs.find { _1.stable_id == column.stable_id }
+ champ.update(value: 'Presse Océan')
+
+ visit dossiers_path
+
+ expect(page).to have_css('.fr-icon-info-i')
+ expect(page).to have_text('Presse Océan')
+ end
+
it 'lets the user pick fields and persists the personnalisation' do
visit dossiers_path