Merge pull request #11193 from demarches-simplifiees/fix-10788

ETQ instructeur, sur la liste des démarches, je peux accéder directement à une démarche via une dropdown

app/components/instructeurs/select_procedure_drop_down_list_component.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class Instructeurs::SelectProcedureDropDownListComponent < Dsfr::InputComponent
+  def initialize(procedures:)
+    @procedures = procedures
+  end
+
+  def render?
+    @procedures.count > 3
+  end
+
+  def react_props
+    {
+      items:,
+      placeholder: t('.placeholder'),
+      name: "procedure_id",
+      id: 'select-procedure-drop-down-list',
+      'aria-describedby': 'select-procedure-drop-down-list-label',
+      form: 'select-procedure-drop-down-list-component',
+      data: { no_autosubmit: 'input blur', no_autosubmit_on_empty: 'true', autosubmit_target: 'input' }
+    }
+  end
+
+  def items
+    @procedures.map { ["n°#{_1.id} - #{_1.libelle}", _1.id] }
+  end
+end

app/components/instructeurs/select_procedure_drop_down_list_component/select_procedure_drop_down_list_component.en.yml

@@ -0,0 +1,4 @@
+---
+en:
+  label: Direct access
+  placeholder: Select a procedure

app/components/instructeurs/select_procedure_drop_down_list_component/select_procedure_drop_down_list_component.fr.yml

@@ -0,0 +1,4 @@
+---
+fr:
+  label: Accès direct
+  placeholder: Sélectionner une démarche

app/components/instructeurs/select_procedure_drop_down_list_component/select_procedure_drop_down_list_component.html.haml

@@ -0,0 +1,17 @@
+= form_with url: url_for([:select_procedure, :instructeur, :procedures]),
+  class: 'ml-auto',
+  id: 'select-procedure-drop-down-list-component',
+  data: { turbo: false, controller: 'autosubmit' } do
+
+  .flex.align-center
+    = label_tag :procedure_id, t('.label'), class: 'fr-label font-weight-bold fr-mr-2w', id: 'select-procedure-drop-down-list-label', for: 'select-procedure-drop-down-list'
+    %react-fragment
+      = render ReactComponent.new "ComboBox/SingleComboBox", **react_props
+
+    %input.hidden{
+      type: 'submit',
+      formmethod: 'get',
+      formaction: url_for([:select_procedure, :instructeur, :procedures]),
+      formnovalidate: 'true',
+      data: { autosubmit_target: 'submitter' }
+    }

app/controllers/instructeurs/procedures_controller.rb

@@ -2,7 +2,7 @@
 
 module Instructeurs
   class ProceduresController < InstructeurController
-    before_action :ensure_ownership!, except: [:index, :order_positions, :update_order_positions]
+    before_action :ensure_ownership!, except: [:index, :order_positions, :update_order_positions, :select_procedure]
     before_action :ensure_not_super_admin!, only: [:download_export, :exports]
 
     ITEMS_PER_PAGE = 100
@@ -74,6 +74,12 @@ def update_order_positions
       redirect_to instructeur_procedures_path, notice: "L'ordre des démarches a été mis à jour."
     end
 
+    def select_procedure
+      return redirect_to instructeur_procedure_path(procedure_id: params[:procedure_id]) if params[:procedure_id].present?
+
+      redirect_to instructeur_procedures_path
+    end
+
     def show
       @procedure = procedure
       # Technically, procedure_presentation already sets the attribute.

app/javascript/components/ComboBox.tsx

@@ -43,10 +43,12 @@ export function ComboBox({
   inputRef,
   isLoading,
   isOpen,
+  placeholder,
   ...props
 }: ComboBoxProps & {
   inputRef?: RefObject<HTMLInputElement>;
   isOpen?: boolean;
+  placeholder?: string;
 }) {
   return (
     <AriaComboBox
@@ -69,6 +71,7 @@ export function ComboBox({
           className="fr-select fr-autocomplete"
           ref={inputRef}
           aria-busy={isLoading}
+          placeholder={placeholder || undefined}
         />
         <Button
           aria-haspopup="false"
@@ -107,6 +110,7 @@ export function SingleComboBox({
   const {
     items: defaultItems,
     selectedKey: defaultSelectedKey,
+    placeholder,
     emptyFilterKey,
     name,
     formValue,
@@ -128,7 +132,12 @@ export function SingleComboBox({
 
   return (
     <>
-      <ComboBox menuTrigger="focus" {...comboBoxProps} {...props}>
+      <ComboBox
+        menuTrigger="focus"
+        placeholder={placeholder}
+        {...comboBoxProps}
+        {...props}
+      >
         {(item) => <ComboBoxItem id={item.value}>{item.label}</ComboBoxItem>}
       </ComboBox>
       {children || name ? (

app/javascript/components/react-aria/props.ts

@@ -14,10 +14,7 @@ const ArrayOfTuples = s.coerce(
   s.array(Item),
   s.array(s.tuple([s.string(), s.union([s.string(), s.number()])])),
   (items) =>
-    items.map<Item>(([label, value]) => ({
-      label,
-      value: String(value)
-    }))
+    items.map<Item>(([label, value]) => ({ label, value: String(value) }))
 );
 
 const ArrayOfStrings = s.coerce(s.array(Item), s.array(s.string()), (items) =>
@@ -47,7 +44,8 @@ export const SingleComboBoxProps = s.assign(
     s.object({
       selectedKey: s.nullable(s.string()),
       emptyFilterKey: s.nullable(s.string()),
-      maxItemsDisplay: s.number()
+      maxItemsDisplay: s.number(),
+      placeholder: s.string()
     })
   )
 );

app/views/instructeurs/procedures/index.html.haml

@@ -5,6 +5,7 @@
     .flex.fr-mb-2v
       %h1.fr-h3.fr-mb-0 Démarches
       = render Instructeurs::TabsExplanationsComponent.new
+      = render Instructeurs::SelectProcedureDropDownListComponent.new(procedures: @procedures)
     = render partial: 'instructeurs/procedures/synthese', locals: { procedures: @procedures, all_dossiers_counts: @all_dossiers_counts }
 
     %nav.fr-tabs{ role: 'navigation', 'aria-label': t('views.users.dossiers.secondary_menu') }

config/routes.rb

@@ -461,6 +461,7 @@
       collection do
         get 'order_positions'
         patch 'update_order_positions'
+        get 'select_procedure'
       end
     end
 

spec/components/instructeurs/select_procedure_drop_down_list_component_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe Instructeurs::SelectProcedureDropDownListComponent, type: :component do
+  subject do
+    render_inline(described_class.new(procedures:))
+  end
+
+  let(:procedures) {
+    [
+      create(:procedure, libelle: "Procedure importante", id: 1001),
+      create(:procedure, libelle: "Procedure facile", id: 1002),
+      create(:procedure, libelle: "Procedure terminée", id: 1003),
+      create(:procedure, libelle: "Procedure terminée 2", id: 1004),
+      create(:procedure, libelle: "Procedure terminée 3", id: 1005)
+    ]
+  }
+
+  it "renders the label" do
+    expect(subject).to have_text("Accès direct")
+  end
+
+  let(:react_component) { page.find('react-component') }
+  let(:react_props_items) { JSON.parse(react_component['props']) }
+
+  it "renders the procedures" do
+    subject
+    expect(react_props_items["items"]).to eq([
+      ["n°1001 - Procedure importante", 1001],
+      ["n°1002 - Procedure facile", 1002],
+      ["n°1003 - Procedure terminée", 1003],
+      ["n°1004 - Procedure terminée 2", 1004],
+      ["n°1005 - Procedure terminée 3", 1005]
+    ])
+  end
+end

spec/components/previews/instructeurs/select_procedure_drop_down_list_component_preview.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Instructeurs::SelectProcedureDropDownListComponentPreview < ViewComponent::Preview
+  def default
+    @procedures = Procedure.limit(10)
+    render(Instructeurs::SelectProcedureDropDownListComponent.new(procedures: @procedures))
+  end
+end

spec/controllers/instructeurs/procedures_controller_spec.rb

@@ -1017,4 +1017,47 @@
       expect(response.body).not_to include("Déposer")
     end
   end
+
+  describe '#select_procedure' do
+    let(:instructeur) { create(:instructeur) }
+
+    before do
+      sign_in(instructeur.user)
+    end
+
+    context 'when procedure_id is present' do
+      let(:procedure) { create(:procedure) }
+
+      it 'redirects to the procedure path' do
+        puts "procedure.id: #{procedure.id}"
+        get :select_procedure, params: { procedure_id: procedure.id }
+
+        expect(response).to redirect_to(instructeur_procedure_path(procedure_id: procedure.id))
+      end
+    end
+
+    context 'when procedure_id is not present' do
+      it 'redirects to procedures index' do
+        get :select_procedure
+
+        expect(response).to redirect_to(instructeur_procedures_path)
+      end
+    end
+
+    context 'when procedure_id is empty string' do
+      it 'redirects to procedures index' do
+        get :select_procedure, params: { procedure_id: '' }
+
+        expect(response).to redirect_to(instructeur_procedures_path)
+      end
+    end
+
+    context 'when procedure_id is nil' do
+      it 'redirects to procedures index' do
+        get :select_procedure, params: { procedure_id: nil }
+
+        expect(response).to redirect_to(instructeur_procedures_path)
+      end
+    end
+  end
 end