Merge branch 'main' into CamilyaDellali-patch-2

2024-09-20 17:10:24 +02:00 · 2024-09-20 17:10:24 +02:00 · d1eb4b3343
commit d1eb4b3343
parent 6713da67c0 eee7f32c69
11 changed files with 33 additions and 17 deletions
--- a/app/components/instructeurs/activate_account_form_component/activate_account_form_component.html.haml
+++ b/app/components/instructeurs/activate_account_form_component/activate_account_form_component.html.haml
@ -16,7 +16,7 @@

      .fr-fieldset__element
        = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
-          opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }})
+          opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})

        #password_complexity
          = render PasswordComplexityComponent.new
--- a/app/components/password_complexity_component/password_complexity_component.html.haml
+++ b/app/components/password_complexity_component/password_complexity_component.html.haml
@ -1,6 +1,7 @@
-%div{ class: complexity_classes }
+%div{ "aria-hidden":"true", class: complexity_classes }

-%div{ class: alert_classes }
-  %h3.fr-alert__title= title
+#password_hint{ class: alert_classes }
+  %h3.fr-alert__title{ "aria-live": "polite", "aria-atomic": "true" }
+    = title
  - if !success?
    = t(".hint_html")
--- a/app/dashboards/procedure_dashboard.rb
+++ b/app/dashboards/procedure_dashboard.rb
@ -53,6 +53,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
    replaced_by_procedure_id: Field::String,
    tags: Field::Text,
    template: Field::Boolean,
+    opendata: Field::Boolean,
    hide_instructeurs_email: Field::Boolean
  }.freeze

@ -117,6 +118,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
    :piece_justificative_multiple,
    :for_tiers_enabled,
    :hide_instructeurs_email,
+    :opendata,
    :replaced_by_procedure_id
  ].freeze

--- a/app/views/administrateurs/activate/new.html.haml
+++ b/app/views/administrateurs/activate/new.html.haml
@ -18,7 +18,7 @@

          .fr-fieldset__element
            = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
-              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }})
+              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})

            #password_complexity
              = render PasswordComplexityComponent.new
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@ -12,15 +12,17 @@
        = f.hidden_field :reset_password_token


-        %fieldset.fr-mb-0.fr-fieldset{ aria: { labelledby: 'edit-password-legend' } }
-          %legend.fr-fieldset__legend#edit-password-legend
+        %fieldset.fr-mb-0.fr-fieldset
+          %legend.fr-fieldset__legend
            %h1.fr-h2= I18n.t('views.users.passwords.edit.subtitle')

+          .fr-fieldset__element
+            %p.fr-text--sm= t('utils.asterisk_html')
+
          .fr-fieldset__element
            = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
-              opts: { autofocus: 'true', autocomplete: 'new-password', minlength: PASSWORD_MIN_LENGTH, data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }}) do |c|
-              - c.with_describedby do
-                %div{ id: c.describedby_id }
+              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})
+
            #password_complexity
              = render PasswordComplexityComponent.new

--- a/app/views/experts/avis/sign_up.html.haml
+++ b/app/views/experts/avis/sign_up.html.haml
@ -14,7 +14,7 @@

          .fr-fieldset__element
            = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
-              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }})
+              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})

            #password_complexity
              = render PasswordComplexityComponent.new
--- a/app/views/gestionnaires/activate/new.html.haml
+++ b/app/views/gestionnaires/activate/new.html.haml
@ -18,7 +18,7 @@

          .fr-fieldset__element
            = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
-              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }})
+              opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})

            #password_complexity
              = render PasswordComplexityComponent.new
--- a/app/views/users/registrations/new.html.haml
+++ b/app/views/users/registrations/new.html.haml
@ -19,7 +19,7 @@

      .fr-fieldset__element
        = render Dsfr::InputComponent.new(form: f, attribute: :password, input_type: :password_field,
-          opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }})
+          opts: { autofocus: 'true', autocomplete: 'new-password', data: { controller: 'turbo-input', turbo_input_url_value: show_password_complexity_path }, aria: {describedby: 'password_hint'}})

        #password_complexity
          = render PasswordComplexityComponent.new
--- a/db/migrate/20240919145757_drop_unused_index.rb
+++ b/db/migrate/20240919145757_drop_unused_index.rb
@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class DropUnusedIndex < ActiveRecord::Migration[7.0]
+  disable_ddl_transaction!
+
+  def change
+    remove_index :champs, :type_de_champ_id
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema[7.0].define(version: 2024_09_19_130351) do
+ActiveRecord::Schema[7.0].define(version: 2024_09_19_145757) do
  # These are extensions that must be enabled in order to support this database
  enable_extension "pg_buffercache"
  enable_extension "pg_stat_statements"
@ -275,7 +275,6 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_19_130351) do
    t.index ["row_id"], name: "index_champs_on_row_id"
    t.index ["stable_id"], name: "index_champs_on_stable_id"
    t.index ["type"], name: "index_champs_on_type"
-    t.index ["type_de_champ_id"], name: "index_champs_on_type_de_champ_id"
  end

  create_table "closed_mails", id: :serial, force: :cascade do |t|
--- a/doc/faqs/usager/mon-dossier-a-ete-depose-par-un-tiers-et-je-souhaite-y-acceder.fr.md
+++ b/doc/faqs/usager/mon-dossier-a-ete-depose-par-un-tiers-et-je-souhaite-y-acceder.fr.md
@ -19,3 +19,6 @@ Pour cela, la personne doit cliquer sur le bouton **« Action »** (ou _« Au
 Et ensuite cliquer sur **« Transférer le dossier »** en indiquant votre adresse mail.

 ![Image illustration l’interface de transfert de dossier vers un autre compte {aria-hidden="true"}](faq/usager-transfer-dossier.png)
+
+Vous recevrez alors un mail de transfert de dossier que vous pourrez accepter ou rejeter depuis votre interface usager. 
+> **Une fois la demande de transfert acceptée, vous serez propriétaire du dossier.**