Merge pull request #4483 from tchak/fix-sentry-errors

Fix sentry errors

app/controllers/api/v1/dossiers_controller.rb

@@ -2,6 +2,7 @@ class API::V1::DossiersController < APIController
   before_action :fetch_procedure_and_check_token
 
   DEFAULT_PAGE_SIZE = 100
+  MAX_PAGE_SIZE = 1000
   ORDER_DIRECTIONS = { 'asc' => :asc, 'desc' => :desc }
 
   def index
@@ -33,7 +34,12 @@ class API::V1::DossiersController < APIController
   end
 
   def per_page # inherited value from will_paginate
-    [params[:resultats_par_page]&.to_i || DEFAULT_PAGE_SIZE, 1000].min
+    resultats_par_page = params[:resultats_par_page]&.to_i
+    if resultats_par_page && resultats_par_page > 0
+      [resultats_par_page, MAX_PAGE_SIZE].min
+    else
+      DEFAULT_PAGE_SIZE
+    end
   end
 
   def fetch_procedure_and_check_token

app/controllers/users/dossiers_controller.rb

@@ -48,8 +48,11 @@ module Users
     end
 
     def attestation
-      if dossier.attestation.pdf.attached?
+      if dossier.attestation&.pdf&.attached?
         redirect_to url_for(dossier.attestation.pdf)
+      else
+        flash.notice = "L'attestation n'est plus disponible sur ce dossier."
+        redirect_to dossier_path(dossier)
       end
     end
 

app/models/procedure.rb

@@ -595,14 +595,18 @@ class Procedure < ApplicationRecord
 
   def move_type_de_champ_attributes(types_de_champ, type_de_champ, new_index)
     old_index = types_de_champ.index(type_de_champ)
-    types_de_champ.insert(new_index, types_de_champ.delete_at(old_index))
+    if types_de_champ.delete_at(old_index)
-      .map.with_index do |type_de_champ, index|
+      types_de_champ.insert(new_index, type_de_champ)
-        {
+        .map.with_index do |type_de_champ, index|
-          id: type_de_champ.id,
+          {
-          libelle: type_de_champ.libelle,
+            id: type_de_champ.id,
-          order_place: index
+            libelle: type_de_champ.libelle,
-        }
+            order_place: index
-      end
+          }
+        end
+    else
+      []
+    end
   end
 
   def before_publish

app/models/types_de_champ/linked_drop_down_list_type_de_champ.rb

@@ -53,7 +53,7 @@ class TypesDeChamp::LinkedDropDownListTypeDeChamp < TypesDeChamp::TypeDeChampBas
 
   def check_presence_of_primary_options
     if !PRIMARY_PATTERN.match?(drop_down_list.options.second)
-      errors.add(libelle, "doit commencer par une entrée de menu primaire de la forme <code style='white-space: pre-wrap;'>--texte--</code>")
+      errors.add(libelle.presence || "La liste", "doit commencer par une entrée de menu primaire de la forme <code style='white-space: pre-wrap;'>--texte--</code>")
     end
   end
 

app/views/champs/repetition/_show.html.haml

@@ -1,10 +1,11 @@
 - champs = champ.rows.last
-- index = (champ.rows.size - 1) * champs.size
+- if champs.present?
-%div{ class: "row row-#{champs.first.row}" }
+  - index = (champ.rows.size - 1) * champs.size
-  - champs.each.with_index(index) do |champ, index|
+  %div{ class: "row row-#{champs.first.row}" }
-    = fields_for "#{attribute}[#{index}]", champ do |form|
+    - champs.each.with_index(index) do |champ, index|
-      = render partial: "shared/dossiers/editable_champs/editable_champ", locals: { champ: champ, form: form }
+      = fields_for "#{attribute}[#{index}]", champ do |form|
-      = form.hidden_field :id
+        = render partial: "shared/dossiers/editable_champs/editable_champ", locals: { champ: champ, form: form }
-      = form.hidden_field :_destroy, disabled: true
+        = form.hidden_field :id
-  %button.button.danger.remove-row
+        = form.hidden_field :_destroy, disabled: true
-    Supprimer
+    %button.button.danger.remove-row
+      Supprimer

spec/models/type_de_champ_shared_example.rb

@@ -148,4 +148,22 @@ shared_examples 'type_de_champ_spec' do
       expect(cloned_procedure.types_de_champ.first.types_de_champ).not_to be_empty
     end
   end
+
+  describe "linked_drop_down_list" do
+    let(:type_de_champ) { create(:type_de_champ_linked_drop_down_list) }
+
+    it 'should validate without label' do
+      type_de_champ.drop_down_list_value = 'toto'
+      expect(type_de_champ.validate).to be_falsey
+      messages = type_de_champ.errors.full_messages
+      expect(messages.size).to eq(1)
+      expect(messages.first.starts_with?("#{type_de_champ.libelle} doit commencer par")).to be_truthy
+
+      type_de_champ.libelle = ''
+      expect(type_de_champ.validate).to be_falsey
+      messages = type_de_champ.errors.full_messages
+      expect(messages.size).to eq(2)
+      expect(messages.last.starts_with?("La liste doit commencer par")).to be_truthy
+    end
+  end
 end