DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

add procedure_id to column.id

Browse source
This commit is contained in:
simon lehericey 2024-10-07 21:46:59 +02:00
parent 3c7521a428
commit 3740a79219
No known key found for this signature in database
GPG key ID: CDE670D827C7B3C5
14 changed files with 65 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

9
spec/components/instructeurs/column_filter_component_spec.rb
View file

@ -5,6 +5,7 @@ describe Instructeurs::ColumnFilterComponent, type: :component do
let(:instructeur) { create(:instructeur) }
let(:procedure) { create(:procedure, instructeurs: [instructeur]) }
let(:procedure_id) { procedure.id }
let(:procedure_presentation) { nil }
let(:statut) { nil }
@ -17,8 +18,8 @@ describe Instructeurs::ColumnFilterComponent, type: :component do
let(:column) { nil }
let(:included_displayable_field) do
[
Column.new(label: 'email', table: 'user', column: 'email'),
Column.new(label: "depose_since", table: "self", column: "depose_since", displayable: false)
Column.new(procedure_id:, label: 'email', table: 'user', column: 'email'),
Column.new(procedure_id:, label: "depose_since", table: "self", column: "depose_since", displayable: false)
]
end
@ -26,7 +27,7 @@ describe Instructeurs::ColumnFilterComponent, type: :component do
subject { component.filterable_columns_options }
it { is_expected.to eq([["email", "user/email"], ["depose_since", "self/depose_since"]]) }
it { is_expected.to eq([["email", Column.make_id(procedure_id, "user", "email")], ["depose_since", Column.make_id(procedure_id, "self", "depose_since")]]) }
end
end
@ -45,7 +46,7 @@ describe Instructeurs::ColumnFilterComponent, type: :component do
let(:types_de_champ_public) { [{ type: :drop_down_list, libelle: 'Votre ville', options: ['Paris', 'Lyon', 'Marseille'] }] }
let(:procedure) { create(:procedure, :published, types_de_champ_public:) }
let(:drop_down_stable_id) { procedure.active_revision.types_de_champ.first.stable_id }
let(:column) { Column.new(table: 'type_de_champ', scope: nil, column: drop_down_stable_id) }
let(:column) { Column.new(procedure_id:, table: 'type_de_champ', scope: nil, column: drop_down_stable_id) }
it 'find most recent tdc' do
is_expected.to eq(['Paris', 'Lyon', 'Marseille'])

8
spec/components/instructeurs/column_picker_component_spec.rb
View file

@ -4,13 +4,15 @@ describe Instructeurs::ColumnPickerComponent, type: :component do
let(:component) { described_class.new(procedure:, procedure_presentation:) }
let(:procedure) { create(:procedure) }
let(:procedure_id) { procedure.id }
let(:instructeur) { create(:instructeur) }
let(:assign_to) { create(:assign_to, procedure: procedure, instructeur: instructeur) }
let(:procedure_presentation) { create(:procedure_presentation, assign_to: assign_to) }
describe "#displayable_columns_for_select" do
let(:default_user_email) { Column.new(label: 'email', table: 'user', column: 'email') }
let(:excluded_displayable_field) { Column.new(label: "label1", table: "table1", column: "column1", displayable: false) }
let(:default_user_email) { Column.new(procedure_id:, label: 'email', table: 'user', column: 'email') }
let(:excluded_displayable_field) { Column.new(procedure_id:, label: "label1", table: "table1", column: "column1", displayable: false) }
let(:email_column_id) { Column.make_id(procedure_id, 'user', 'email') }
subject { component.displayable_columns_for_select }
@ -21,6 +23,6 @@ describe Instructeurs::ColumnPickerComponent, type: :component do
])
end
it { is_expected.to eq([[["email", "user/email"]], ["user/email"]]) }
it { is_expected.to eq([[["email", email_column_id]], [email_column_id]]) }
end
end