Merge branch 'feature/import-2023-10-01-2'

Gemfile

@@ -121,7 +121,6 @@ group :test do
 end
 
 group :development do
-  gem 'annotate'
   gem 'brakeman', require: false
   gem 'haml-lint'
   gem 'letter_opener_web'

Gemfile.lock

@@ -101,9 +101,6 @@ GEM
     aes_key_wrap (1.1.0)
     after_party (1.11.2)
     anchored (1.1.0)
-    annotate (3.2.0)
-      activerecord (>= 3.2, < 8.0)
-      rake (>= 10.4, < 14.0)
     ast (2.4.2)
     attr_required (1.0.1)
     aws-eventstream (1.1.0)
@@ -839,7 +836,6 @@ DEPENDENCIES
   administrate-field-enum
   after_party
   anchored
-  annotate
   aws-sdk-s3
   axe-core-rspec
   bcrypt

app/assets/stylesheets/02_utils.scss

@@ -102,6 +102,10 @@
   white-space: nowrap;
 }
 
+.width-max-content {
+  width: max-content;
+}
+
 // sizing
 .width-100 {
   width: 100%;

app/assets/stylesheets/invites_form.scss

@@ -1,34 +1,6 @@
-@import "constants";
 
 #invites-form {
-  padding: $default-padding;
-  text-align: left;
-
-  form {
-    display: flex;
-    margin-top: $default-padding;
-  }
-
-  h4 {
-    font-weight: bold;
-    margin-bottom: $default-spacer;
-  }
-
-  p {
-    margin-bottom: $default-spacer;
-  }
-
-  ul {
-    list-style-position: inside;
-    list-style-type: disc;
-    margin-bottom: $default-padding;
-  }
-
-  input[type=email] {
-    margin-bottom: $default-spacer;
-  }
-
-  .button {
-    margin-left: $default-spacer;
+  @media (min-width: 48em) {
+    min-width: 400px;
   }
 }

app/components/dsfr/input_errorable.rb

@@ -1,10 +1,13 @@
 module Dsfr
   module InputErrorable
     extend ActiveSupport::Concern
+
     included do
       delegate :object, to: :@form
       delegate :errors, to: :object
 
+      renders_one :hint
+
       private
 
       # lookup for edge case from `form.rich_text_area`
@@ -89,6 +92,10 @@ def map_array_to_hash_with_true(array_or_string_or_nil)
       end
 
       def hint
+        get_slot(:hint).presence || default_hint
+      end
+
+      def default_hint
         I18n.t("activerecord.attributes.#{object.class.name.underscore}.hints.#{@attribute}")
       end
 
@@ -101,6 +108,8 @@ def email?
       end
 
       def hint?
+        return true if get_slot(:hint).present?
+
         I18n.exists?("activerecord.attributes.#{object.class.name.underscore}.hints.#{@attribute}")
       end
     end

app/components/procedure/one_groupe_management_component.rb

@@ -60,6 +60,6 @@ def available_values_for_select(targeted_champ)
     return [] if targeted_champ.is_a?(Logic::Empty)
     targeted_champ
       .options(@revision.types_de_champ_public)
-      .map { |tdc| [tdc.first, constant(tdc.first).to_json] }
+      .map { |(label, value)| [label, constant(value).to_json] }
   end
 end

app/components/procedure/revision_changes_component/revision_changes_component.fr.yml

@@ -9,6 +9,7 @@ fr:
     other: "%{count} dossiers en cours de traitement portent ce champ. Les <strong>données</strong> associées avec ce champ seront <strong>supprimées</strong>."
   add_option: "ajoutés : %{items}"
   remove_option: "supprimés : %{items}"
+  invalid_routing_rules_alert: "Certains groupes d'instructeurs ont une règle de routage invalide. Veuillez mettre à jour la configuration des groupes d'instructeurs après avoir publié les modifications."
   public:
     add: Le champ « %{label} » a été ajouté.
     add_mandatory: Le champ obligatoire « %{label} » a été ajouté.

app/components/procedure/revision_changes_component/revision_changes_component.html.haml

@@ -74,7 +74,7 @@
           - if !total_dossiers.zero? && !change.can_rebase?
             .fr-alert.fr-alert--warning.fr-mt-1v
               %p= t('.breaking_change', count: total_dossiers)
-          - if removed.present? && change.type_de_champ.used_by_routing_rules?
+          - if (removed.present? || added.present? ) && change.type_de_champ.used_by_routing_rules?
             .fr-alert.fr-alert--warning.fr-mt-1v
               = t(".#{prefix}.update_drop_down_options_alert", label: change.label)
       - when :drop_down_other
@@ -165,3 +165,7 @@
   - if @private_move_changes.present?
     - list.with_item do
       = t(".private.move", count: @private_move_changes.size)
+  - if @previous_revision.procedure.groupe_instructeurs.any?(&:invalid_rule?)
+    - list.with_item do
+      .fr-alert.fr-alert--warning.fr-mt-1v
+        = t(".invalid_routing_rules_alert")

app/components/procedure/search_component/search_component.html.haml

@@ -1,11 +1,10 @@
-= form_tag(search_admin_procedures_path, data: { turbo: true }, method: :post, class: 'form') do
-  = label_tag :query, 'Rechercher une procédure'
+= form_tag(search_admin_procedures_path, data: { turbo: true }, method: :post) do
+  .fr-input-group
+    = label_tag :query, class: "fr-label" do
+      Rechercher une démarche
+      %span.fr-hint-text Saisissez au moins 3 lettres
 
-  .notice
-    %p Entrez au minimum 3 lettres
-
-
-  = text_field_tag :query, params[:query], required: true, placeholder: 'politique de la ville', minlength: "3"
+    = text_field_tag :query, params[:query], required: true, placeholder: 'politique de la ville', minlength: "3", class: "fr-input"
 
   = submit_tag 'Rechercher', class: 'fr-btn'
 

app/controllers/administrateurs/groupe_instructeurs_controller.rb

@@ -40,12 +40,22 @@ def create_simple_routing
 
       tdc = @procedure.active_revision.routable_types_de_champ.find { |tdc| tdc.stable_id == stable_id }
 
-      tdc_options = tdc.options["drop_down_options"].reject(&:empty?)
+      tdc_options = tdc.drop_down_options.reject(&:empty?)
 
       tdc_options.each do |option_label|
-        gi = @procedure.groupe_instructeurs.find_by({ label: option_label }) || @procedure.groupe_instructeurs
-          .create({ label: option_label, instructeurs: [current_administrateur.instructeur] })
-        gi.update(routing_rule: ds_eq(champ_value(stable_id), constant(gi.label)))
+        routing_rule = ds_eq(champ_value(stable_id), constant(option_label))
+        @procedure
+          .groupe_instructeurs
+          .find_or_create_by(label: option_label)
+          .update(instructeurs: [current_administrateur.instructeur], routing_rule:)
+      end
+
+      if tdc.drop_down_other?
+        routing_rule = ds_eq(champ_value(stable_id), constant(Champs::DropDownListChamp::OTHER))
+        @procedure
+          .groupe_instructeurs
+          .find_or_create_by(label: 'Autre')
+          .update(instructeurs: [current_administrateur.instructeur], routing_rule:)
       end
 
       @procedure.toggle_routing

app/controllers/api/v2/base_controller.rb

@@ -39,7 +39,9 @@ def authenticate_administrateur_from_token
 
   def api_token
     if @api_token.nil?
-      @api_token = APIToken.find_and_verify(authorization_bearer_token) || false
+      @api_token = APIToken
+        .find_and_verify(authorization_bearer_token)
+        &.tap { _1.touch(:last_v2_authenticated_at) } || false
     end
     @api_token
   end

app/controllers/api_controller.rb

@@ -6,6 +6,7 @@ class APIController < ApplicationController
   def find_administrateur_for_token(procedure)
     api_token = APIToken.find_and_verify(authorization_bearer_token, procedure.administrateurs)
     if api_token.present? && api_token.context.fetch(:procedure_ids).include?(procedure.id)
+      api_token.touch(:last_v1_authenticated_at)
       api_token.administrateur
     end
   end

app/controllers/champs/options_controller.rb

@@ -1,8 +1,12 @@
 class Champs::OptionsController < ApplicationController
+  include TurboChampsConcern
+
   before_action :authenticate_logged_user!
 
   def remove
-    @champ = policy_scope(Champ).includes(:champs).find(params[:champ_id])
-    @champ.remove_option([params[:option]].compact)
+    champ = policy_scope(Champ).includes(:champs).find(params[:champ_id])
+    champ.remove_option([params[:option]].compact)
+    champs = champ.private? ? champ.dossier.champs_private_all : champ.dossier.champs_public_all
+    @to_show, @to_hide, @to_update = champs_to_turbo_update({ params[:champ_id] => true }, champs)
   end
 end

app/controllers/users/commencer_controller.rb

@@ -23,6 +23,8 @@ def commencer
         store_user_location!(@procedure, @prefilled_dossier)
       end
 
+      @usual_traitement_time = @procedure.stats_usual_traitement_time
+
       render 'commencer/show'
     end
 

app/dashboards/user_dashboard.rb

@@ -13,6 +13,8 @@ class UserDashboard < Administrate::BaseDashboard
     confirmed?: Field::Boolean,
     created_at: Field::DateTime,
     updated_at: Field::DateTime,
+    blocked_at: Field::DateTime,
+    blocked_reason: Field::String,
     current_sign_in_at: Field::DateTime,
     dossiers: Field::HasMany
   }.freeze
@@ -36,7 +38,9 @@ class UserDashboard < Administrate::BaseDashboard
     :email,
     :confirmed?,
     :current_sign_in_at,
-    :created_at
+    :created_at,
+    :blocked_at,
+    :blocked_reason
   ].freeze
 
   # FORM_ATTRIBUTES

app/graphql/api/v2/context.rb

@@ -59,20 +59,28 @@ def query_info
     {
       graphql_query: query.query_string,
       graphql_variables: query.provided_variables&.to_json,
+      graphql_mutation: mutation?,
       graphql_null_error: errors.any? { _1.is_a? GraphQL::InvalidNullError }.presence,
       graphql_timeout_error: errors.any? { _1.is_a? GraphQL::Schema::Timeout::TimeoutError }.presence
     }.compact
   end
 
   private
 
+  def mutation?
+    query.lookahead.selections.any? { _1.field.type.respond_to?(:mutation) }.presence
+  rescue
+    false
+  end
+
   def compute_demarche_authorization(demarche)
     # procedure_ids and token are passed from graphql controller
     if self[:procedure_ids].present?
       self[:procedure_ids].include?(demarche.id)
     elsif self[:token].present?
       token = APIToken.find_and_verify(self[:token], demarche.administrateurs)
       if token.present?
+        token.touch(:last_v2_authenticated_at)
         Current.user = token.administrateur.user
         true
       else

app/graphql/api/v2/schema.rb

@@ -146,7 +146,7 @@ def handle_timeout(error, query)
     end
   end
 
-  use Timeout, max_seconds: 10
+  use Timeout, max_seconds: 30
   use GraphQL::Batch
   use GraphQL::Backtrace
 

app/graphql/api/v2/stored_query.rb

@@ -43,6 +43,7 @@ def self.get(query_id)
     $includeInstructeurs: Boolean = true
     $includeAvis: Boolean = false
     $includeMessages: Boolean = false
+    $includeCorrections: Boolean = false
     $includeGeometry: Boolean = false
   ) {
     demarche(number: $demarcheNumber) {
@@ -135,6 +136,7 @@ def self.get(query_id)
     $includeInstructeurs: Boolean = true
     $includeAvis: Boolean = false
     $includeMessages: Boolean = false
+    $includeCorrections: Boolean = false
     $includeGeometry: Boolean = false
   ) {
     groupeInstructeur(number: $groupeInstructeurNumber) {
@@ -201,6 +203,7 @@ def self.get(query_id)
     $includeInstructeurs: Boolean = true
     $includeAvis: Boolean = false
     $includeMessages: Boolean = false
+    $includeCorrections: Boolean = false
     $includeGeometry: Boolean = false
   ) {
     dossier(number: $dossierNumber) {
@@ -239,6 +242,7 @@ def self.get(query_id)
   }
 
   fragment DossierFragment on Dossier {
+    __typename
     id
     number
     archived
@@ -250,6 +254,7 @@ def self.get(query_id)
     dateTraitement
     dateExpiration
     dateSuppressionParUsager
+    dateDerniereCorrectionEnAttente @include(if: $includeCorrections)
     motivation
     motivationAttachment {
       ...FileFragment
@@ -318,8 +323,8 @@ def self.get(query_id)
     dateFermeture
     notice { url }
     deliberation { url }
-    demarcheUrl
-    cadreJuridiqueUrl
+    demarcheURL
+    cadreJuridiqueURL
     service @include(if: $includeService) {
       ...ServiceFragment
     }
@@ -409,6 +414,10 @@ def self.get(query_id)
     attachments {
       ...FileFragment
     }
+    correction @include(if: $includeCorrections) {
+      reason
+      dateResolution
+    }
   }
 
   fragment GeoAreaFragment on GeoArea {
@@ -455,6 +464,7 @@ def self.get(query_id)
     __typename
     label
     stringValue
+    updatedAt
     ... on DateChamp {
       date
     }
@@ -584,11 +594,13 @@ def self.get(query_id)
 
 
   fragment FileFragment on File {
+    __typename
     filename
     contentType
     checksum
     byteSize: byteSizeBigInt
     url
+    createdAt
   }
 
   fragment AddressFragment on Address {
@@ -635,6 +647,7 @@ def self.get(query_id)
   fragment PageInfoFragment on PageInfo {
     hasPreviousPage
     hasNextPage
+    startCursor
     endCursor
   }
   GRAPHQL

app/graphql/extensions/attachment.rb

@@ -35,7 +35,7 @@ def resolve(object:, **_rest)
     # is a lazy value (e.g., a Promise – like in our case)
     def after_resolve(value:, **_rest)
       if value.respond_to?(:map)
-        attachments = value.map { after_resolve_attachment(_1) }
+        attachments = value.map { after_resolve_attachment(_1) }.compact
 
         if options[:as] == :single
           attachments.first