From 3c7c58623f426aacc4c0e9c470b8916b91187fe1 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Mon, 2 Sep 2024 17:22:48 +0200 Subject: [PATCH 1/3] replace `virtual: true` by `displayable: false` --- app/models/concerns/addressable_column_concern.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/concerns/addressable_column_concern.rb b/app/models/concerns/addressable_column_concern.rb index 196f34e75..98cdab56d 100644 --- a/app/models/concerns/addressable_column_concern.rb +++ b/app/models/concerns/addressable_column_concern.rb @@ -8,7 +8,7 @@ module AddressableColumnConcern super.concat([ Columns::JSONPathColumn.new( table:, - virtual: true, + displayable: false, column: stable_id, label: "#{libelle} – code postal (5 chiffres)", type: :text, @@ -16,7 +16,7 @@ module AddressableColumnConcern ), Columns::JSONPathColumn.new( table:, - virtual: true, + displayable: false, column: stable_id, label: "#{libelle} – commune", type: :text, @@ -24,7 +24,7 @@ module AddressableColumnConcern ), Columns::JSONPathColumn.new( table:, - virtual: true, + displayable: false, column: stable_id, label: "#{libelle} – département", type: :enum, @@ -32,7 +32,7 @@ module AddressableColumnConcern ), Columns::JSONPathColumn.new( table:, - virtual: true, + displayable: false, column: stable_id, label: "#{libelle} – region", type: :enum, From 245f7bb97520deb3a5d4b131bca1b47fda0c553b Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Mon, 2 Sep 2024 17:25:46 +0200 Subject: [PATCH 2/3] remove column.virtual params --- app/models/column.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/column.rb b/app/models/column.rb index c286bc098..0c97e9217 100644 --- a/app/models/column.rb +++ b/app/models/column.rb @@ -3,7 +3,7 @@ class Column attr_reader :table, :column, :label, :classname, :type, :scope, :value_column, :filterable, :displayable - def initialize(table:, column:, label: nil, type: :text, value_column: :value, filterable: true, displayable: true, classname: '', scope: '', virtual: nil) + def initialize(table:, column:, label: nil, type: :text, value_column: :value, filterable: true, displayable: true, classname: '', scope: '') @table = table @column = column @label = label || I18n.t(column, scope: [:activerecord, :attributes, :procedure_presentation, :fields, table]) @@ -13,7 +13,7 @@ class Column @value_column = value_column @filterable = filterable # We need this for backward compatibility - @displayable = virtual ? false : displayable + @displayable = displayable end def id From e0daf1032db53fc88a9a3a516712469d25bc08f8 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Mon, 2 Sep 2024 17:27:35 +0200 Subject: [PATCH 3/3] rename virtual_dates by non_displayable_dates --- app/models/concerns/columns_concern.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/columns_concern.rb b/app/models/concerns/columns_concern.rb index ac0f23cf1..1fb72c2af 100644 --- a/app/models/concerns/columns_concern.rb +++ b/app/models/concerns/columns_concern.rb @@ -22,12 +22,12 @@ module ColumnsConcern dates = ['created_at', 'updated_at', 'depose_at', 'en_construction_at', 'en_instruction_at', 'processed_at'] .map { |column| Column.new(table: 'self', column:, type: :date) } - virtual_dates = ['updated_since', 'depose_since', 'en_construction_since', 'en_instruction_since', 'processed_since'] + non_displayable_dates = ['updated_since', 'depose_since', 'en_construction_since', 'en_instruction_since', 'processed_since'] .map { |column| Column.new(table: 'self', column:, type: :date, displayable: false) } states = [Column.new(table: 'self', column: 'state', type: :enum, scope: 'instructeurs.dossiers.filterable_state', displayable: false)] - [common, dates, sva_svr_columns(for_filters: true), virtual_dates, states].flatten.compact + [common, dates, sva_svr_columns(for_filters: true), non_displayable_dates, states].flatten.compact end def sva_svr_columns(for_filters: false)