From 13356f26c353a7b823f2d27b298026b818518bf0 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Fri, 25 Oct 2024 13:51:19 +0200 Subject: [PATCH] remove procedure from component signature --- .../instructeurs/column_filter_component.rb | 4 ++-- .../column_filter_component.html.haml | 5 ++++- .../procedures/_dossiers_filter_dropdown.html.haml | 2 +- .../procedures/update_filter.turbo_stream.haml | 2 +- .../instructeurs/column_filter_component_spec.rb | 13 +++++++++---- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/components/instructeurs/column_filter_component.rb b/app/components/instructeurs/column_filter_component.rb index 5016b4bc5..ee354340a 100644 --- a/app/components/instructeurs/column_filter_component.rb +++ b/app/components/instructeurs/column_filter_component.rb @@ -3,9 +3,9 @@ class Instructeurs::ColumnFilterComponent < ApplicationComponent attr_reader :procedure, :procedure_presentation, :statut, :column - def initialize(procedure:, procedure_presentation:, statut:, column: nil) - @procedure = procedure + def initialize(procedure_presentation:, statut:, column: nil) @procedure_presentation = procedure_presentation + @procedure = procedure_presentation.procedure @statut = statut @column = column end diff --git a/app/components/instructeurs/column_filter_component/column_filter_component.html.haml b/app/components/instructeurs/column_filter_component/column_filter_component.html.haml index f30f700e0..d1077f04b 100644 --- a/app/components/instructeurs/column_filter_component/column_filter_component.html.haml +++ b/app/components/instructeurs/column_filter_component/column_filter_component.html.haml @@ -1,4 +1,7 @@ -= form_with model: [:instructeur, @procedure_presentation], class: 'dropdown-form large', id: 'filter-component', data: { turbo: true, controller: 'autosubmit' } do += form_with model: [:instructeur, @procedure_presentation], + class: 'dropdown-form large', + id: 'filter-component', + data: { turbo: true, controller: 'autosubmit' } do = current_filter_tags .fr-select-group diff --git a/app/views/instructeurs/procedures/_dossiers_filter_dropdown.html.haml b/app/views/instructeurs/procedures/_dossiers_filter_dropdown.html.haml index 2fe1a3065..56c08315b 100644 --- a/app/views/instructeurs/procedures/_dossiers_filter_dropdown.html.haml +++ b/app/views/instructeurs/procedures/_dossiers_filter_dropdown.html.haml @@ -3,4 +3,4 @@ = t('views.instructeurs.dossiers.filters.title') - menu.with_form do - = render Instructeurs::ColumnFilterComponent.new(procedure:, procedure_presentation:, statut:) + = render Instructeurs::ColumnFilterComponent.new(procedure_presentation:, statut:) diff --git a/app/views/instructeurs/procedures/update_filter.turbo_stream.haml b/app/views/instructeurs/procedures/update_filter.turbo_stream.haml index 790b268bf..efc3ed43b 100644 --- a/app/views/instructeurs/procedures/update_filter.turbo_stream.haml +++ b/app/views/instructeurs/procedures/update_filter.turbo_stream.haml @@ -1,2 +1,2 @@ = turbo_stream.replace 'filter-component' do - = render Instructeurs::ColumnFilterComponent.new(procedure: @procedure, procedure_presentation: @procedure_presentation, statut: @statut, column: @column) + = render Instructeurs::ColumnFilterComponent.new(procedure_presentation: @procedure_presentation, statut: @statut, column: @column) diff --git a/spec/components/instructeurs/column_filter_component_spec.rb b/spec/components/instructeurs/column_filter_component_spec.rb index b1dc597ae..02cf8a6d2 100644 --- a/spec/components/instructeurs/column_filter_component_spec.rb +++ b/spec/components/instructeurs/column_filter_component_spec.rb @@ -1,12 +1,17 @@ # frozen_string_literal: true describe Instructeurs::ColumnFilterComponent, type: :component do - let(:component) { described_class.new(procedure:, procedure_presentation:, statut:, column:) } + let(:component) { described_class.new(procedure_presentation:, statut:, column:) } let(:instructeur) { create(:instructeur) } - let(:procedure) { create(:procedure, instructeurs: [instructeur]) } + let(:procedure) { create(:procedure) } let(:procedure_id) { procedure.id } - let(:procedure_presentation) { nil } + let(:procedure_presentation) do + groupe_instructeur = procedure.defaut_groupe_instructeur + assign_to = create(:assign_to, instructeur:, groupe_instructeur:) + assign_to.procedure_presentation_or_default_and_errors.first + end + let(:statut) { nil } let(:column) { nil } @@ -19,7 +24,7 @@ describe Instructeurs::ColumnFilterComponent, type: :component do let(:non_filterable_column) { Column.new(procedure_id:, label: 'depose_since', table: 'self', column: 'depose_since', filterable: false) } let(:mocked_columns) { [filterable_column, non_filterable_column] } - before { allow(procedure).to receive(:columns).and_return(mocked_columns) } + before { allow_any_instance_of(Procedure).to receive(:columns).and_return(mocked_columns) } subject { component.filterable_columns_options }