remove procedure from component signature
This commit is contained in:
parent
d421d41e16
commit
13356f26c3
5 changed files with 17 additions and 9 deletions
|
@ -3,9 +3,9 @@
|
||||||
class Instructeurs::ColumnFilterComponent < ApplicationComponent
|
class Instructeurs::ColumnFilterComponent < ApplicationComponent
|
||||||
attr_reader :procedure, :procedure_presentation, :statut, :column
|
attr_reader :procedure, :procedure_presentation, :statut, :column
|
||||||
|
|
||||||
def initialize(procedure:, procedure_presentation:, statut:, column: nil)
|
def initialize(procedure_presentation:, statut:, column: nil)
|
||||||
@procedure = procedure
|
|
||||||
@procedure_presentation = procedure_presentation
|
@procedure_presentation = procedure_presentation
|
||||||
|
@procedure = procedure_presentation.procedure
|
||||||
@statut = statut
|
@statut = statut
|
||||||
@column = column
|
@column = column
|
||||||
end
|
end
|
||||||
|
|
|
@ -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
|
= current_filter_tags
|
||||||
|
|
||||||
.fr-select-group
|
.fr-select-group
|
||||||
|
|
|
@ -3,4 +3,4 @@
|
||||||
= t('views.instructeurs.dossiers.filters.title')
|
= t('views.instructeurs.dossiers.filters.title')
|
||||||
|
|
||||||
- menu.with_form do
|
- menu.with_form do
|
||||||
= render Instructeurs::ColumnFilterComponent.new(procedure:, procedure_presentation:, statut:)
|
= render Instructeurs::ColumnFilterComponent.new(procedure_presentation:, statut:)
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
= turbo_stream.replace 'filter-component' do
|
= 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)
|
||||||
|
|
|
@ -1,12 +1,17 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
describe Instructeurs::ColumnFilterComponent, type: :component do
|
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(:instructeur) { create(:instructeur) }
|
||||||
let(:procedure) { create(:procedure, instructeurs: [instructeur]) }
|
let(:procedure) { create(:procedure) }
|
||||||
let(:procedure_id) { procedure.id }
|
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(:statut) { nil }
|
||||||
let(:column) { 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(: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] }
|
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 }
|
subject { component.filterable_columns_options }
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue