From e4358a31aeef3cd33dc21ccc07726f502c78444e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Sun, 26 Jan 2025 15:15:21 +0000
Subject: [PATCH 01/31] Add location management to contribution form

- Implemented OsblLocations component for managing organization locations
- Created Location and Address models with polymorphic associations
- Added database migrations for locations and addresses
- Updated Osbl model to support nested location attributes
- Integrated location input with address autocomplete using French address API
- Enhanced contribution form to include location details with type selection and optional information

This commit introduces comprehensive location management for organizations, improving data collection and representation in the contribution form.
---
 .../users/contributions_controller.rb         |  15 ++
 .../pages/contribution/new/OsblLocations.tsx  | 186 ++++++++++++++++++
 .../components/shared/MyAsyncSelect.tsx       |  97 +++++++++
 app/frontend/pages/Contribution/New.tsx       |   2 +
 app/frontend/pages/Contribution/types.ts      |  43 +++-
 app/models/address.rb                         |   3 +
 app/models/location.rb                        |  18 ++
 app/models/osbl.rb                            |   3 +
 db/migrate/20250126104700_create_locations.rb |  19 ++
 db/migrate/20250126140903_create_addresses.rb |  22 +++
 db/schema.rb                                  |  32 ++-
 spec/factories/addresses.rb                   |  12 ++
 spec/factories/locations.rb                   |   8 +
 spec/models/address_spec.rb                   |   5 +
 spec/models/location_spec.rb                  |   5 +
 15 files changed, 461 insertions(+), 9 deletions(-)
 create mode 100644 app/frontend/components/pages/contribution/new/OsblLocations.tsx
 create mode 100644 app/frontend/components/shared/MyAsyncSelect.tsx
 create mode 100644 app/models/address.rb
 create mode 100644 app/models/location.rb
 create mode 100644 db/migrate/20250126104700_create_locations.rb
 create mode 100644 db/migrate/20250126140903_create_addresses.rb
 create mode 100644 spec/factories/addresses.rb
 create mode 100644 spec/factories/locations.rb
 create mode 100644 spec/models/address_spec.rb
 create mode 100644 spec/models/location_spec.rb

diff --git a/app/controllers/users/contributions_controller.rb b/app/controllers/users/contributions_controller.rb
index b6ca8b5..d27b211 100644
--- a/app/controllers/users/contributions_controller.rb
+++ b/app/controllers/users/contributions_controller.rb
@@ -77,6 +77,21 @@ def osbl_params
             :year,
             :description
           ]}
+        ]},
+        {locations_attributes: [
+          :type,
+          :name,
+          :description,
+          :website,
+          {address_attributes: [
+            :street_number,
+            :street_name,
+            :additional_info,
+            :postal_code,
+            :city,
+            :latitude,
+            :longitude
+          ]}
         ]}
       )
     end
diff --git a/app/frontend/components/pages/contribution/new/OsblLocations.tsx b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
new file mode 100644
index 0000000..69a98ef
--- /dev/null
+++ b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
@@ -0,0 +1,186 @@
+import { ReactElement } from 'react'
+import { FormProps, Location } from '@/pages/Contribution/types'
+import { Button } from '@/components/ui/button'
+import { PlusIcon, TrashIcon, ChevronDown } from 'lucide-react'
+import MyInput from '@/components/forms/MyInput'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue
+} from '@/components/ui/select'
+import { Textarea } from '@/components/ui/textarea'
+import { Card, CardContent, CardHeader } from '@/components/ui/card'
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
+import MyAsyncSelect from '@/components/shared/MyAsyncSelect'
+
+const LocationTypeList = [
+  { value: 'siege_social', label: 'Siège social' },
+  { value: 'antenne_locale', label: 'Antenne locale' },
+  { value: 'lieux_d_activite', label: 'Lieux d\'activité' },
+  { value: 'autre', label: 'Autre' }
+]
+
+export default function OsblLocations ({ data, setData, clearErrors }: FormProps): ReactElement {
+  const locations = data.locations_attributes ?? []
+
+  const hasSiegeSocial = locations.some(loc => loc.type === 'siege_social')
+
+  function handleLocationChange (
+    index: number,
+    field: keyof Location,
+    value: Location[typeof field]
+  ): void {
+    const updatedLocations = locations.map((loc, i: number) =>
+      i === index
+        ? {
+            ...loc,
+            [field]: value
+          }
+        : loc
+    )
+
+    setData('locations_attributes', updatedLocations)
+    clearErrors(`locations_attributes.${index}.${field}`)
+  }
+
+  function handleAddressChange (index: number, value: any, field?: string): void {
+    const updatedLocations = locations.map((loc, i) =>
+      i === index
+        ? {
+            ...loc,
+            address_attributes: field
+              ? { ...loc.address_attributes, [field]: value }
+              : value
+          }
+        : loc
+    )
+    setData('locations_attributes', updatedLocations)
+  }
+
+  function handleLocationAdd (e: React.MouseEvent<HTMLButtonElement>): void {
+    e.preventDefault()
+    setData('locations_attributes', [...locations, {}])
+  }
+
+  function handleLocationRemove (
+    e: React.MouseEvent<HTMLButtonElement>,
+    index: number
+  ): void {
+    e.preventDefault()
+    const updatedDocuments = locations.filter((_, i) => i !== index)
+    setData('locations_attributes', updatedDocuments)
+  }
+
+  return (
+    <div className='flex flex-wrap gap-16 mx-auto justify-center'>
+      <div className='bg-white w-full sm:w-auto rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col'>
+        <div className='flex gap-16 items-center justify-between'>
+          <h2 className='text-2xl font-semibold'>Implantation</h2>
+          <Button onClick={handleLocationAdd}>
+            <PlusIcon className='w-4 h-4 mr-2' />
+            Ajouter
+          </Button>
+        </div>
+
+        <div className='flex flex-col gap-4'>
+          {locations?.map((loc, index) => (
+            <Card
+              key={`location-${loc.type ?? 'new'}-${index}`}
+              className='bg-background'
+            >
+              <CardHeader className='flex flex-row items-center justify-between space-y-0 pb-2'>
+                <div className='flex items-center gap-16 flex-1'>
+                  <Select
+                    value={loc.type}
+                    onValueChange={(value) => handleLocationChange(index, 'type', value)}
+                    required
+                  >
+                    <SelectTrigger className='w-60 data-[placeholder]:text-muted-foreground'>
+                      <SelectValue placeholder='Type de lieu *' />
+                    </SelectTrigger>
+                    <SelectContent>
+                      {LocationTypeList
+                        .filter(type =>
+                          type.value !== 'siege_social' || !hasSiegeSocial || loc.type === 'siege_social'
+                        )
+                        .map((type) => (
+                          <SelectItem key={type.value} value={type.value}>
+                            {type.label}
+                          </SelectItem>
+                        ))}
+                    </SelectContent>
+                  </Select>
+
+                  <Button
+                    onClick={(e) => handleLocationRemove(e, index)}
+                    variant='ghost'
+                    className='text-red-500 hover:text-red-700 p-0 h-auto'
+                  >
+                    <TrashIcon className='w-4 h-4' />
+                  </Button>
+                </div>
+              </CardHeader>
+
+              <CardContent className='flex flex-col gap-4'>
+                <MyAsyncSelect
+                  setData={(_, value) => handleAddressChange(index, value)}
+                  attributeName='address_attributes'
+                  placeholder='Adresse *'
+                  required
+                />
+
+                <Collapsible>
+                  <CollapsibleTrigger className='flex items-center gap-2 text-sm text-muted-foreground hover:text-foreground transition-colors'>
+                    <ChevronDown className='h-4 w-4' />
+                    Informations additionnelles
+                  </CollapsibleTrigger>
+
+                  <CollapsibleContent className='space-y-4 pt-4'>
+                    <MyInput
+                      type='text'
+                      id={`location-name-${index}`}
+                      value={loc.name ?? ''}
+                      onChange={(e) => handleLocationChange(index, 'name', e.target.value)}
+                      placeholder='Nom du lieu'
+                    />
+
+                    <MyInput
+                      type='text'
+                      id={`location-additional-address-info-${index}`}
+                      value={loc.address_attributes?.additional_info ?? ''}
+                      onChange={(e) => handleAddressChange(index, e.target.value, 'additional_info')}
+                      placeholder="Complément d'adresse"
+                    />
+
+                    <MyInput
+                      type='url'
+                      id={`location-website-${index}`}
+                      value={loc.website ?? ''}
+                      onChange={(e) => handleLocationChange(index, 'website', e.target.value)}
+                      placeholder='Site web'
+                    />
+
+                    <div className='flex flex-col gap-2'>
+                      <Textarea
+                        id={`location-description-${index}`}
+                        placeholder='Description du lieu'
+                        value={loc.description?.toString() ?? ''}
+                        onChange={(e) => handleLocationChange(index, 'description', e.target.value)}
+                        className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-full h-40'
+                      />
+                      <div className={`text-xs text-right ${(loc.description?.toString().length ?? 0) > 300 ? 'text-red-600' : 'text-gray-500'}`}>
+                        {(loc.description?.toString().length ?? 0)}/300 caractères
+                      </div>
+                    </div>
+                  </CollapsibleContent>
+                </Collapsible>
+              </CardContent>
+            </Card>
+          ))}
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/app/frontend/components/shared/MyAsyncSelect.tsx b/app/frontend/components/shared/MyAsyncSelect.tsx
new file mode 100644
index 0000000..b88a56f
--- /dev/null
+++ b/app/frontend/components/shared/MyAsyncSelect.tsx
@@ -0,0 +1,97 @@
+import { ReactElement, useCallback } from 'react'
+import AsyncSelect from 'react-select/async'
+import debounce from 'lodash.debounce'
+import { Address } from '@/pages/Contribution/types'
+
+interface Option {
+  readonly label: string
+  readonly value: Address
+}
+
+interface MyAsyncCreatableSelectProps {
+  setData: (key: string, value: any) => void
+  attributeName: string
+  minInputLength?: number
+  placeholder: string
+  required?: boolean
+}
+
+const createOption = (feature: any): Option => ({
+  label: feature.properties.label,
+  value: {
+    street_number: feature.properties.housenumber,
+    street_name: feature.properties.street,
+    postal_code: feature.properties.postcode,
+    city: feature.properties.city,
+    latitude: feature.geometry.coordinates[1],
+    longitude: feature.geometry.coordinates[0]
+  }
+})
+
+export default function MyAsyncCreatableSelect ({
+  setData,
+  attributeName,
+  minInputLength = 3,
+  placeholder,
+  required = false
+}: MyAsyncCreatableSelectProps): ReactElement {
+  const fetchOptions = async (inputValue: string): Promise<Option[]> => {
+    if (inputValue.trim().length < minInputLength) return []
+
+    const response = await fetch(`https://api-adresse.data.gouv.fr/search/?q=${inputValue}`)
+    const data = await response.json()
+    console.log(data)
+    return data.features.map((feature: any) => createOption(feature))
+  }
+
+  const debouncedFetchOptions = useCallback(
+    debounce((inputValue: string, callback: (options: Option[]) => void) => {
+      void fetchOptions(inputValue).then(callback)
+    }, 300),
+    []
+  )
+
+  const promiseOptions = async (inputValue: string): Promise<Option[]> => {
+    return await new Promise((resolve) => {
+      debouncedFetchOptions(inputValue, resolve)
+    })
+  }
+  return (
+    <AsyncSelect
+      required={required}
+      loadOptions={promiseOptions}
+      onChange={(newValue: Option | null) => {
+        if (newValue === null) return
+        setData(attributeName, newValue.value)
+      }}
+      styles={{
+        control: (base, state) => ({
+          ...base,
+          borderRadius: '0.375rem', // border-radius-md
+          border: state.isFocused ? 'none' : '1px solid hsl(var(--border))',
+          outline: state.isFocused ? '1px solid hsl(var(--primary))' : 'none',
+          '&:hover': {
+            borderColor: 'hsl(var(--border))'
+          }
+        }),
+        // singleValue: (base) => ({
+        //   ...base,
+        //   border: '1px solid hsla(var(--foreground) / 0.1)',
+        //   borderRadius: '9999px',
+        //   backgroundColor: 'hsl(var(--white))',
+        //   padding: '0rem 0.3rem',
+        //   fontWeight: 600,
+        //   fontSize: '0.825rem',
+        //   lineHeight: '1rem'
+        // }),
+        placeholder: (base) => ({
+          ...base,
+          fontSize: '0.875rem'
+        })
+      }}
+      placeholder={placeholder}
+      loadingMessage={() => 'Recherche...'}
+      noOptionsMessage={() => 'Aucune suggestion'}
+    />
+  )
+}
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index 524777c..8f7408a 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -9,6 +9,7 @@ import OsblHeader from '@/components/pages/contribution/new/OsblHeader'
 import OsblDataSheet from '@/components/pages/contribution/new/OsblDataSheet'
 import OsblFinance from '@/components/pages/contribution/new/OsblFinance'
 import OsblDocuments from '@/components/pages/contribution/new/OsblDocuments'
+import OsblLocations from '@/components/pages/contribution/new/OsblLocations'
 import { CurrentUserType } from '@/types/types'
 import { FormData } from './types'
 import z from 'zod'
@@ -152,6 +153,7 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
             clearErrors={clearErrors}
           />
           <OsblDocuments data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
+          <OsblLocations data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
           <Button type='submit' disabled={processing} className='mx-auto'>
             <Save />
             Enregistrer
diff --git a/app/frontend/pages/Contribution/types.ts b/app/frontend/pages/Contribution/types.ts
index fcaaeb0..8edd344 100644
--- a/app/frontend/pages/Contribution/types.ts
+++ b/app/frontend/pages/Contribution/types.ts
@@ -31,6 +31,40 @@ export interface AnnualFinance {
   certified?: boolean
 }
 
+export interface DocumentRecord {
+  type?: string
+  file?: File
+  name?: string
+  year?: number
+  description?: string
+}
+
+export interface Address {
+  street_number?: string
+  street_name?: string
+  additional_info?: string
+  postal_code?: string
+  city?: string
+  latitude?: number
+  longitude?: number
+}
+
+export interface Location {
+  type?: string
+  name?: string
+  address_attributes?: Address
+  // opening_hours?: Record<string, { open: string; close: string }>
+  //  is_accessible?: boolean // Accessibilité PMR
+  // contact_info?: {
+  //   email?: string
+  //   phone?: string
+  //   contact_person?: string
+  // }
+  // services?: string[] // Liste des services proposés
+  description?: Text
+  website?: string
+}
+
 export interface FormData {
   name: string
   website?: string
@@ -47,14 +81,7 @@ export interface FormData {
   creation_year?: number
   contact_email?: string
   document_attachments_attributes?: Array<{ document_attributes: DocumentRecord }>
-}
-
-export interface DocumentRecord {
-  type?: string
-  file?: File
-  name?: string
-  year?: number
-  description?: string
+  locations_attributes?: Location[]
 }
 
 export interface FormProps {
diff --git a/app/models/address.rb b/app/models/address.rb
new file mode 100644
index 0000000..d80b237
--- /dev/null
+++ b/app/models/address.rb
@@ -0,0 +1,3 @@
+class Address < ApplicationRecord
+  belongs_to :addressable, polymorphic: true
+end
diff --git a/app/models/location.rb b/app/models/location.rb
new file mode 100644
index 0000000..cd10bbc
--- /dev/null
+++ b/app/models/location.rb
@@ -0,0 +1,18 @@
+class Location < ApplicationRecord
+  self.inheritance_column = nil
+
+  belongs_to :osbl
+  has_one :address, as: :addressable
+
+  enum :type, {
+    siege_social: 0,
+    antenne_locale: 1,
+    lieux_d_activite: 2,
+    autre: 3
+  }.freeze
+
+  # validates :type, presence: true
+  # validates :name, uniqueness: {scope: :osbl_id}, if: -> { type == "siege_social" }
+
+  accepts_nested_attributes_for :address
+end
diff --git a/app/models/osbl.rb b/app/models/osbl.rb
index d8c943d..29b3623 100644
--- a/app/models/osbl.rb
+++ b/app/models/osbl.rb
@@ -21,6 +21,8 @@ class Osbl < ApplicationRecord
   has_many :document_attachments, as: :attachable, dependent: :destroy # join table
   has_many :documents, through: :document_attachments
 
+  has_many :locations, dependent: :destroy
+
   TAX_REDUCTION_VALUES = {
     "intérêt_général" => 0.66,
     "aide_aux_personnes_en_difficulté" => 0.75
@@ -61,4 +63,5 @@ class Osbl < ApplicationRecord
   accepts_nested_attributes_for :osbls_intervention_areas # , allow_destroy: true
   accepts_nested_attributes_for :annual_finances
   accepts_nested_attributes_for :document_attachments
+  accepts_nested_attributes_for :locations
 end
diff --git a/db/migrate/20250126104700_create_locations.rb b/db/migrate/20250126104700_create_locations.rb
new file mode 100644
index 0000000..ed9802c
--- /dev/null
+++ b/db/migrate/20250126104700_create_locations.rb
@@ -0,0 +1,19 @@
+class CreateLocations < ActiveRecord::Migration[8.0]
+  def change
+    create_table :locations do |t|
+      t.integer :type, null: false
+      t.string :name
+      t.text :description
+      t.string :website
+
+      t.timestamps
+
+      t.references :osbl, null: false, foreign_key: true
+    end
+
+    # Add a partial unique index for siege_social type
+    add_index :locations, :osbl_id, unique: true,
+      where: "type = 0",
+      name: "index_locations_on_osbl_id_siege_social"
+  end
+end
diff --git a/db/migrate/20250126140903_create_addresses.rb b/db/migrate/20250126140903_create_addresses.rb
new file mode 100644
index 0000000..d708cdd
--- /dev/null
+++ b/db/migrate/20250126140903_create_addresses.rb
@@ -0,0 +1,22 @@
+class CreateAddresses < ActiveRecord::Migration[8.0]
+  def change
+    create_table :addresses do |t|
+      t.string :street_number
+      t.string :street_name, null: false
+      t.string :additional_info
+      t.string :postal_code, null: false
+      t.string :city, null: false
+      t.string :country, null: false, default: "France"
+      t.decimal :latitude, precision: 10, scale: 6, null: false
+      t.decimal :longitude, precision: 10, scale: 6, null: false
+      # t.references :addressable, polymorphic: true, null: false
+      t.string "addressable_type", null: false
+      t.integer "addressable_id", null: false, index: false # Disable automatic index
+
+      t.timestamps
+    end
+
+    add_index :addresses, [:addressable_type, :addressable_id], unique: true
+    add_index :addresses, [:latitude, :longitude], where: "addressable_type = 'Location'"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 78b44b1..a0aa37c 100644
--- 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[8.0].define(version: 2025_01_25_061231) do
+ActiveRecord::Schema[8.0].define(version: 2025_01_26_140903) do
   create_table "accounts", force: :cascade do |t|
   end
 
@@ -42,6 +42,23 @@
     t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
   end
 
+  create_table "addresses", force: :cascade do |t|
+    t.string "street_number"
+    t.string "street_name", null: false
+    t.string "additional_info"
+    t.string "postal_code", null: false
+    t.string "city", null: false
+    t.string "country", default: "France", null: false
+    t.decimal "latitude", precision: 10, scale: 6, null: false
+    t.decimal "longitude", precision: 10, scale: 6, null: false
+    t.string "addressable_type", null: false
+    t.integer "addressable_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["addressable_type", "addressable_id"], name: "index_addresses_on_addressable_type_and_addressable_id", unique: true
+    t.index ["latitude", "longitude"], name: "index_addresses_on_latitude_and_longitude", where: "addressable_type = 'Location'"
+  end
+
   create_table "annual_finances", force: :cascade do |t|
     t.integer "year", null: false
     t.decimal "treasury", precision: 15, scale: 2
@@ -145,6 +162,18 @@
     t.index ["name"], name: "index_labels_on_name", unique: true
   end
 
+  create_table "locations", force: :cascade do |t|
+    t.integer "type", null: false
+    t.string "name"
+    t.text "description"
+    t.string "website"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "osbl_id", null: false
+    t.index ["osbl_id"], name: "index_locations_on_osbl_id"
+    t.index ["osbl_id"], name: "index_locations_on_osbl_id_siege_social", unique: true, where: "type = 0"
+  end
+
   create_table "osbls", force: :cascade do |t|
     t.string "name", null: false
     t.datetime "created_at", null: false
@@ -232,6 +261,7 @@
   add_foreign_key "document_attachments", "documents"
   add_foreign_key "fund_allocations", "annual_finances"
   add_foreign_key "fund_sources", "annual_finances"
+  add_foreign_key "locations", "osbls"
   add_foreign_key "osbls_causes", "causes", on_delete: :cascade
   add_foreign_key "osbls_causes", "osbls", on_delete: :cascade
   add_foreign_key "osbls_intervention_areas", "intervention_areas", on_delete: :cascade
diff --git a/spec/factories/addresses.rb b/spec/factories/addresses.rb
new file mode 100644
index 0000000..e5aad49
--- /dev/null
+++ b/spec/factories/addresses.rb
@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :address do
+    street_number { "MyString" }
+    street_name { "MyString" }
+    postal_code { "MyString" }
+    city { "MyString" }
+    country { "MyString" }
+    latitude { 1.5 }
+    longitude { 1.5 }
+    addressable { nil }
+  end
+end
diff --git a/spec/factories/locations.rb b/spec/factories/locations.rb
new file mode 100644
index 0000000..a56d1ca
--- /dev/null
+++ b/spec/factories/locations.rb
@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :location do
+    type { 1 }
+    name { "MyString" }
+    description { "MyText" }
+    website { "MyString" }
+  end
+end
diff --git a/spec/models/address_spec.rb b/spec/models/address_spec.rb
new file mode 100644
index 0000000..5531d0d
--- /dev/null
+++ b/spec/models/address_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Address, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb
new file mode 100644
index 0000000..f581f2a
--- /dev/null
+++ b/spec/models/location_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Location, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 4dda1476e566a34934dda8aaa05a7dba701da840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Sun, 26 Jan 2025 18:15:57 +0000
Subject: [PATCH 02/31] Remove osbl.contact_email attribute & misc

---
 app/controllers/users/contributions_controller.rb    |  1 -
 .../pages/contribution/new/OsblDataSheet.tsx         | 12 ------------
 .../pages/contribution/new/OsblDocuments.tsx         |  6 +++---
 .../pages/contribution/new/OsblLocations.tsx         |  7 +++----
 app/frontend/pages/Contribution/New.tsx              |  2 +-
 app/frontend/pages/Contribution/types.ts             |  4 ++--
 app/models/location.rb                               |  2 +-
 .../20250126180000_remove_contact_email_from_osbl.rb | 11 +++++++++++
 db/schema.rb                                         |  4 +---
 9 files changed, 22 insertions(+), 27 deletions(-)
 create mode 100644 db/migrate/20250126180000_remove_contact_email_from_osbl.rb

diff --git a/app/controllers/users/contributions_controller.rb b/app/controllers/users/contributions_controller.rb
index d27b211..83c27fd 100644
--- a/app/controllers/users/contributions_controller.rb
+++ b/app/controllers/users/contributions_controller.rb
@@ -51,7 +51,6 @@ def osbl_params
         :public_utility,
         :creation_year,
         {osbls_labels_attributes: [:label_id]},
-        :contact_email,
         {annual_finances_attributes: [
           :year,
           :certified,
diff --git a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
index 54f6b6d..6244ee7 100644
--- a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
@@ -201,18 +201,6 @@ export default function OsblDataSheet ({ data, setData, errors, clearErrors }: F
               maxCount={2}
             />
           </div>
-
-          <MyInput
-            id='osbl_email'
-            type='email'
-            labelText='Email de contact :'
-            value={data.contact_email ?? ''}
-            onChange={(e) => {
-              setData('contact_email', e.target.value)
-              clearErrors('contact_email')
-            }}
-            error={errors.contact_email}
-          />
         </div>
       </div>
     </div>
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index 2273e8c..c2ae098 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -1,5 +1,5 @@
 import { ReactElement } from 'react'
-import { FormProps, DocumentRecord } from '@/pages/Contribution/types'
+import { FormProps, Document } from '@/pages/Contribution/types'
 import { Button } from '@/components/ui/button'
 import { PlusIcon, TrashIcon, ChevronDown } from 'lucide-react'
 import MyInput from '@/components/forms/MyInput'
@@ -29,8 +29,8 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors }: F
 
   function handleDocumentChange (
     index: number,
-    field: keyof DocumentRecord,
-    value: DocumentRecord[typeof field]
+    field: keyof Document,
+    value: Document[typeof field]
   ): void {
     const updatedDocuments = documents.map((doc, i: number) =>
       i === index
diff --git a/app/frontend/components/pages/contribution/new/OsblLocations.tsx b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
index 69a98ef..67a956d 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocations.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
@@ -18,11 +18,11 @@ import MyAsyncSelect from '@/components/shared/MyAsyncSelect'
 const LocationTypeList = [
   { value: 'siege_social', label: 'Siège social' },
   { value: 'antenne_locale', label: 'Antenne locale' },
-  { value: 'lieux_d_activite', label: 'Lieux d\'activité' },
+  { value: 'lieu_d_activite', label: 'Lieu d\'activité' },
   { value: 'autre', label: 'Autre' }
 ]
 
-export default function OsblLocations ({ data, setData, clearErrors }: FormProps): ReactElement {
+export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data' | 'setData'>): ReactElement {
   const locations = data.locations_attributes ?? []
 
   const hasSiegeSocial = locations.some(loc => loc.type === 'siege_social')
@@ -42,7 +42,6 @@ export default function OsblLocations ({ data, setData, clearErrors }: FormProps
     )
 
     setData('locations_attributes', updatedLocations)
-    clearErrors(`locations_attributes.${index}.${field}`)
   }
 
   function handleAddressChange (index: number, value: any, field?: string): void {
@@ -50,7 +49,7 @@ export default function OsblLocations ({ data, setData, clearErrors }: FormProps
       i === index
         ? {
             ...loc,
-            address_attributes: field
+            address_attributes: field != null
               ? { ...loc.address_attributes, [field]: value }
               : value
           }
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index 8f7408a..40d054c 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -153,7 +153,7 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
             clearErrors={clearErrors}
           />
           <OsblDocuments data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
-          <OsblLocations data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
+          <OsblLocations data={data} setData={setData} />
           <Button type='submit' disabled={processing} className='mx-auto'>
             <Save />
             Enregistrer
diff --git a/app/frontend/pages/Contribution/types.ts b/app/frontend/pages/Contribution/types.ts
index 8edd344..d22ec5a 100644
--- a/app/frontend/pages/Contribution/types.ts
+++ b/app/frontend/pages/Contribution/types.ts
@@ -31,7 +31,7 @@ export interface AnnualFinance {
   certified?: boolean
 }
 
-export interface DocumentRecord {
+export interface Document {
   type?: string
   file?: File
   name?: string
@@ -80,7 +80,7 @@ export interface FormData {
   public_utility?: boolean
   creation_year?: number
   contact_email?: string
-  document_attachments_attributes?: Array<{ document_attributes: DocumentRecord }>
+  document_attachments_attributes?: Array<{ document_attributes: Document }>
   locations_attributes?: Location[]
 }
 
diff --git a/app/models/location.rb b/app/models/location.rb
index cd10bbc..2cf9b61 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -7,7 +7,7 @@ class Location < ApplicationRecord
   enum :type, {
     siege_social: 0,
     antenne_locale: 1,
-    lieux_d_activite: 2,
+    lieu_d_activite: 2,
     autre: 3
   }.freeze
 
diff --git a/db/migrate/20250126180000_remove_contact_email_from_osbl.rb b/db/migrate/20250126180000_remove_contact_email_from_osbl.rb
new file mode 100644
index 0000000..b8121b7
--- /dev/null
+++ b/db/migrate/20250126180000_remove_contact_email_from_osbl.rb
@@ -0,0 +1,11 @@
+class RemoveContactEmailFromOsbl < ActiveRecord::Migration[8.0]
+  def up
+    remove_check_constraint :osbls, name: "contact_email_format_check"
+    remove_column :osbls, :contact_email, :string
+  end
+
+  def down
+    add_column :osbls, :contact_email, :string
+    add_check_constraint :osbls, "contact_email IS NULL OR (contact_email IS NOT NULL AND contact_email LIKE '%_@_%._%')", name: "contact_email_format_check"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a0aa37c..c892fd8 100644
--- 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[8.0].define(version: 2025_01_26_140903) do
+ActiveRecord::Schema[8.0].define(version: 2025_01_26_180000) do
   create_table "accounts", force: :cascade do |t|
   end
 
@@ -184,11 +184,9 @@
     t.integer "geographical_scale"
     t.integer "osbl_type"
     t.integer "creation_year"
-    t.string "contact_email"
     t.boolean "public_utility", default: false, null: false
     t.index ["name"], name: "index_osbls_on_name", unique: true
     t.index ["website"], name: "index_osbls_on_website", unique: true
-    t.check_constraint "contact_email IS NULL OR (contact_email IS NOT NULL AND contact_email LIKE '%_@_%._%')", name: "contact_email_format_check"
     t.check_constraint "creation_year >= 1000", name: "creation_year_as_4_digits"
   end
 

From 110e2d0d15a692680f486f4bffd862ab87724177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Tue, 28 Jan 2025 16:23:52 +0000
Subject: [PATCH 03/31] Implement multiple annual finance entries with dynamic
 management

- Added support for multiple annual finance entries in the contribution form
- Introduced add and remove functionality for finance records
- Updated OsblFinance component to handle dynamic finance entries
- Improved error handling for multiple finance records
- Enhanced UI with card-based layout and action buttons for finance entries
---
 .../pages/contribution/new/OsblFinance.tsx    | 247 ++++++++++--------
 1 file changed, 143 insertions(+), 104 deletions(-)

diff --git a/app/frontend/components/pages/contribution/new/OsblFinance.tsx b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
index a012311..80f95c9 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinance.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
@@ -1,10 +1,13 @@
-import { ReactElement } from 'react'
+import React, { ReactElement } from 'react'
 import { FormProps, AnnualFinance } from '@/pages/Contribution/types'
 import MyNumberInput from '@/components/forms/MyNumberInput'
 import HelpTooltip from '@/components/shared/HelpTooltip'
 import FundManagementSection from './FundManagementSection'
 import MyCheckbox from '@/components/forms/MyCheckbox'
 import { Separator } from '@/components/ui/separator'
+import { Button } from '@/components/ui/button'
+import { PlusIcon, TrashIcon } from 'lucide-react'
+import { Card, CardContent, CardHeader } from '@/components/ui/card'
 
 const FundSourceTypeList = [
   { value: 'dons', label: 'Dons', group: 'main' },
@@ -25,122 +28,158 @@ const FundAllocationTypeList = [
 ]
 
 export default function OsblFinance ({ data, setData, errors, clearErrors }: FormProps): ReactElement {
-  const currentFinance = (data.annual_finances_attributes?.[0] ?? {})
+  const finances = data.annual_finances_attributes ?? []
 
-  function updateFinanceAttribute (attribute: keyof AnnualFinance, value: any): void {
-    const shouldReset = Object.values(currentFinance).filter(v => v !== '').length <= 1 && (value.length === 0)
+  function updateFinanceAttribute (index: number, attribute: keyof AnnualFinance, value: any): void {
+    const updatedFinances = finances.map((finance, i) =>
+      i === index
+        ? {
+            ...finance,
+            [attribute]: value
+          }
+        : finance
+    )
 
-    setData('annual_finances_attributes', shouldReset
-      ? []
-      : [{
-          ...currentFinance,
-          [attribute]: value
-        }])
+    setData('annual_finances_attributes', updatedFinances)
 
     // Je rentre une information, je veux que le message d'erreur soit supprimé
     if (attribute !== 'year' && value !== '') {
-      clearErrors('annual_finances_attributes.0.missing_information')
+      clearErrors(`annual_finances_attributes.${index}.missing_information`)
     }
+  }
 
-    // Je rentre une année, je veux que le message d'erreur soit supprimé
-    if (attribute === 'year' && value !== '') {
-      clearErrors('annual_finances_attributes.0.year')
-    }
+  function handleFinanceAdd (e: React.MouseEvent<HTMLButtonElement>): void {
+    e.preventDefault()
+    setData('annual_finances_attributes', [...finances, {}])
+  }
 
-    // Je reset tout, je veux que les messages d'erreur soient supprimés
-    if (shouldReset) {
-      clearErrors('annual_finances_attributes.0.year')
-      clearErrors('annual_finances_attributes.0.missing_information')
-      clearErrors('annual_finances_attributes.0.fund_sources_attributes.total_percent')
-    }
+  function handleFinanceRemove (
+    e: React.MouseEvent<HTMLButtonElement>,
+    index: number
+  ): void {
+    e.preventDefault()
+    const updatedFinances = finances.filter((_, i) => i !== index)
+    setData('annual_finances_attributes', updatedFinances)
+
+    clearErrors(`annual_finances_attributes.${index}.missing_information`)
+    clearErrors(`annual_finances_attributes.${index}.fund_sources_attributes.total_percent`)
   }
 
   return (
     <div className='flex flex-wrap gap-16 mx-auto justify-center'>
       <div className='bg-white w-full sm:w-auto rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col'>
-        <h2 className='text-2xl font-semibold'>Comptes</h2>
-        <div className='flex flex-col gap-8'>
-          <MyNumberInput
-            id='year'
-            labelText={
-              <>
-                Année
-                <HelpTooltip size='small' className='mx-2'>
-                  <p>Année du bilan comptable.</p>
-                  <p>Si à cheval sur deux ans, entrez la dernière année.</p>
-                </HelpTooltip>
-                :
-              </>
-            }
-            min={1000}
-            max={new Date().getFullYear()}
-            placeholder={String(new Date().getFullYear() - 1)}
-            value={currentFinance.year ?? ''}
-            onChange={(e) => updateFinanceAttribute('year', e.target.value)}
-            error={errors['annual_finances_attributes.0.year'] !== undefined ? errors['annual_finances_attributes.0.year'] : errors['annual_finances_attributes.0.missing_information']}
-          />
-
-          <MyCheckbox
-            id='certified'
-            checked={currentFinance.certified ?? false}
-            onCheckedChange={(checked) => updateFinanceAttribute('certified', checked)}
-          >
-            <div className='flex items-center'>
-              Comptes certifiés
-              <HelpTooltip className='ml-2'>
-                Un commissaire aux comptes a validé la comptabilité de l'OSBL.
-              </HelpTooltip>
-            </div>
-          </MyCheckbox>
-
-          <MyNumberInput
-            id='budget'
-            labelText='Budget'
-            min={0}
-            step={0.01}
-            value={currentFinance.budget ?? ''}
-            onChange={(e) => updateFinanceAttribute('budget', e.target.value)}
-            suffix='€'
-          />
-
-          <MyNumberInput
-            id='treasury'
-            labelText='Trésorerie'
-            step={0.01}
-            value={currentFinance.treasury ?? ''}
-            onChange={(e) => updateFinanceAttribute('treasury', e.target.value)}
-            suffix='€'
-          />
-
-          <FundManagementSection
-            title='Sources de financement'
-            items={currentFinance.fund_sources_attributes ?? []}
-            typeList={FundSourceTypeList}
-            baseErrorPath='annual_finances_attributes.0.fund_sources_attributes'
-            errors={errors}
-            onUpdate={(items) => updateFinanceAttribute('fund_sources_attributes', items)}
-            clearErrors={clearErrors}
-          />
-
-          <FundManagementSection
-            title='Allocation des fonds'
-            items={currentFinance.fund_allocations_attributes ?? []}
-            typeList={FundAllocationTypeList}
-            baseErrorPath='annual_finances_attributes.0.fund_allocations_attributes'
-            errors={errors}
-            onUpdate={(items) => updateFinanceAttribute('fund_allocations_attributes', items)}
-            clearErrors={clearErrors}
-          />
-
-          <Separator />
-
-          <MyNumberInput
-            id='employees_count'
-            labelText="Nombre d'employé"
-            min={0}
-            value={currentFinance.employees_count ?? ''}
-            onChange={(e) => updateFinanceAttribute('employees_count', e.target.value)}
-          />
+        <div className='flex gap-16 items-center justify-between'>
+          <h2 className='text-2xl font-semibold'>Comptes</h2>
+          <Button onClick={handleFinanceAdd}>
+            <PlusIcon className='w-4 h-4 mr-2' />
+            Ajouter
+          </Button>
+        </div>
+
+        <div className='flex flex-col gap-4'>
+          {finances.map((finance, index) => (
+            <Card
+              key={`finance-${index}`}
+              className='bg-background'
+            >
+              <CardHeader className='flex flex-row items-center pb-2'>
+                <div className='ml-auto'>
+                  <Button
+                    onClick={(e) => handleFinanceRemove(e, index)}
+                    variant='ghost'
+                    className='text-red-500 hover:text-red-700 p-0 h-auto'
+                  >
+                    <TrashIcon className='w-4 h-4' />
+                  </Button>
+                </div>
+              </CardHeader>
+
+              <CardContent className='flex flex-col gap-8'>
+                <MyNumberInput
+                  id={`year-${index}`}
+                  labelText={
+                    <>
+                      Année *
+                      <HelpTooltip size='small' className='mx-2'>
+                        <p>Année du bilan comptable.</p>
+                        <p>Si à cheval sur deux ans, entrez la dernière année.</p>
+                      </HelpTooltip>
+                      :
+                    </>
+                  }
+                  min={1000}
+                  max={new Date().getFullYear()}
+                  placeholder={String(new Date().getFullYear() - 1)}
+                  value={finance.year ?? ''}
+                  onChange={(e) => updateFinanceAttribute(index, 'year', e.target.value)}
+                  required
+                  error={errors[`annual_finances_attributes.${index}.missing_information`]}
+                />
+
+                <MyCheckbox
+                  id={`certified-${index}`}
+                  checked={finance.certified ?? false}
+                  onCheckedChange={(checked) => updateFinanceAttribute(index, 'certified', checked)}
+                >
+                  <div className='flex items-center'>
+                    Comptes certifiés
+                    <HelpTooltip className='ml-2'>
+                      Un commissaire aux comptes a validé la comptabilité de l'OSBL.
+                    </HelpTooltip>
+                  </div>
+                </MyCheckbox>
+
+                <MyNumberInput
+                  id={`budget-${index}`}
+                  labelText='Budget'
+                  min={0}
+                  step={0.01}
+                  value={finance.budget ?? ''}
+                  onChange={(e) => updateFinanceAttribute(index, 'budget', e.target.value)}
+                  suffix='€'
+                />
+
+                <MyNumberInput
+                  id={`treasury-${index}`}
+                  labelText='Trésorerie'
+                  step={0.01}
+                  value={finance.treasury ?? ''}
+                  onChange={(e) => updateFinanceAttribute(index, 'treasury', e.target.value)}
+                  suffix='€'
+                />
+
+                <FundManagementSection
+                  title='Sources de financement'
+                  items={finance.fund_sources_attributes ?? []}
+                  typeList={FundSourceTypeList}
+                  baseErrorPath={`annual_finances_attributes.${index}.fund_sources_attributes`}
+                  errors={errors}
+                  onUpdate={(items) => updateFinanceAttribute(index, 'fund_sources_attributes', items)}
+                  clearErrors={clearErrors}
+                />
+
+                <FundManagementSection
+                  title='Allocation des fonds'
+                  items={finance.fund_allocations_attributes ?? []}
+                  typeList={FundAllocationTypeList}
+                  baseErrorPath={`annual_finances_attributes.${index}.fund_allocations_attributes`}
+                  errors={errors}
+                  onUpdate={(items) => updateFinanceAttribute(index, 'fund_allocations_attributes', items)}
+                  clearErrors={clearErrors}
+                />
+
+                <Separator />
+
+                <MyNumberInput
+                  id={`employees_count-${index}`}
+                  labelText="Nombre d'employé"
+                  min={0}
+                  value={finance.employees_count ?? ''}
+                  onChange={(e) => updateFinanceAttribute(index, 'employees_count', e.target.value)}
+                />
+              </CardContent>
+            </Card>
+          ))}
         </div>
       </div>
     </div>

From 4b916c1c106e559bd0d007d544517ee1af5ca39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Wed, 29 Jan 2025 11:02:08 +0000
Subject: [PATCH 04/31] Refactor contribution form layout and styling for
 improved responsiveness

- Updated OsblHeader, OsblDataSheet, OsblDocuments, OsblFinance, and OsblLocations components with consistent layout and styling
- Simplified container structure and removed unnecessary wrapper divs
- Improved responsive design with grid layout in the main contribution form
- Enhanced button styling and added responsive text visibility
- Removed unused imports and simplified component structure
- Updated button variant to improve hover state
---
 .../pages/contribution/new/OsblDataSheet.tsx  | 260 +++++++++---------
 .../pages/contribution/new/OsblDocuments.tsx  |  23 +-
 .../pages/contribution/new/OsblFinance.tsx    |  20 +-
 .../pages/contribution/new/OsblHeader.tsx     | 126 +++++----
 .../pages/contribution/new/OsblLocations.tsx  |  22 +-
 app/frontend/components/ui/button.tsx         |   2 +-
 app/frontend/pages/Contribution/New.tsx       |  47 ++--
 7 files changed, 246 insertions(+), 254 deletions(-)

diff --git a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
index 6244ee7..8487c7c 100644
--- a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
@@ -1,6 +1,5 @@
 import { ReactElement } from 'react'
 import { Label } from '@/components/ui/label'
-import MyInput from '@/components/forms/MyInput'
 import {
   MultiSelect
 } from '@/components/ui/multi-select'
@@ -61,146 +60,145 @@ export default function OsblDataSheet ({ data, setData, errors, clearErrors }: F
   }))
 
   return (
-    <div className='flex flex-wrap gap-16 mx-auto justify-center'>
-      <div className='bg-white w-full sm:w-auto rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col'>
-        <h2 className='text-2xl font-semibold'>Fiche technique</h2>
+    <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full'>
+      <h2 className='text-2xl font-semibold'>Fiche technique</h2>
 
-        <div className='flex flex-col gap-8'>
-          <div className='flex flex-col gap-4'>
-            <Label>Causes * :</Label>
-            <MultiSelect
-              options={syncedCausesList}
-              onValueChange={(value) => {
-                setData('osbls_causes_attributes', value.map(cause => ({ cause_id: cause })))
-                clearErrors('osbls_causes_attributes')
-              }}
-              placeholder=''
-              variant='secondary'
-              animation={0}
-              maxCount={1}
-            />
-            {Boolean(errors.osbls_causes_attributes) && <InputError>{errors.osbls_causes_attributes}</InputError>}
-          </div>
+      <div className='flex flex-col gap-8'>
+        <div className='flex flex-col gap-4'>
+          <Label>Causes * :</Label>
+          <MultiSelect
+            options={syncedCausesList}
+            onValueChange={(value) => {
+              setData('osbls_causes_attributes', value.map(cause => ({ cause_id: cause })))
+              clearErrors('osbls_causes_attributes')
+            }}
+            placeholder=''
+            variant='secondary'
+            animation={0}
+            maxCount={1}
+          />
+          {Boolean(errors.osbls_causes_attributes) && <InputError>{errors.osbls_causes_attributes}</InputError>}
+        </div>
 
-          <div className='flex flex-col gap-4'>
-            <Label>Réduction d'impôt * :</Label>
-            <RadioGroup
-              required
-              value={String(data.tax_reduction)} onValueChange={(value) => {
-                setData('tax_reduction', value)
-                clearErrors('tax_reduction')
-              }}
-            >
-              <div className='flex items-center justify-between'>
-                <Label htmlFor='option-one' className='flex items-center justify-between w-16'>
-                  66 %
-                  <HelpTooltip>
-                    <h2 className='font-semibold mb-4'>Les associations d'intérêt général, ou reconnues d'utilité publique (ARUP).</h2>
-                    <p>Elles ouvrent le droit à une réduction d'impôt de 66 %.</p>
-                  </HelpTooltip>
-                </Label>
-                <RadioGroupItem value='intérêt_général' />
-              </div>
-              <div className='flex items-center justify-between'>
-                <Label htmlFor='option-two' className='flex items-center justify-between w-16'>
-                  75 %
-                  <HelpTooltip>
-                    <h2 className='font-semibold mb-4'>Les organismes d'aide aux personnes en difficulté.</h2>
-                    <p>Elles ouvrent le droit à une réduction d'impôt de 75 %, jusqu'à 1 000 € de dons.</p>
-                    <p>Le régime standard de réduction à 66 % s'applique ensuite.</p>
-                  </HelpTooltip>
-                </Label>
-                <RadioGroupItem value='aide_aux_personnes_en_difficulté' />
-              </div>
-            </RadioGroup>
-            {Boolean(errors.tax_reduction) && <InputError>{errors.tax_reduction}</InputError>}
-          </div>
+        <div className='flex flex-col gap-4'>
+          <Label>Réduction d'impôt * :</Label>
+          <RadioGroup
+            required // doesn't work as expected
+            value={String(data.tax_reduction)}
+            onValueChange={(value) => {
+              setData('tax_reduction', value)
+              clearErrors('tax_reduction')
+            }}
+          >
+            <div className='flex items-center justify-between'>
+              <Label htmlFor='option-one' className='flex items-center justify-between w-16'>
+                66 %
+                <HelpTooltip>
+                  <h2 className='font-semibold mb-4'>Les associations d'intérêt général, ou reconnues d'utilité publique (ARUP).</h2>
+                  <p>Elles ouvrent le droit à une réduction d'impôt de 66 %.</p>
+                </HelpTooltip>
+              </Label>
+              <RadioGroupItem value='intérêt_général' />
+            </div>
+            <div className='flex items-center justify-between'>
+              <Label htmlFor='option-two' className='flex items-center justify-between w-16'>
+                75 %
+                <HelpTooltip>
+                  <h2 className='font-semibold mb-4'>Les organismes d'aide aux personnes en difficulté.</h2>
+                  <p>Elles ouvrent le droit à une réduction d'impôt de 75 %, jusqu'à 1 000 € de dons.</p>
+                  <p>Le régime standard de réduction à 66 % s'applique ensuite.</p>
+                </HelpTooltip>
+              </Label>
+              <RadioGroupItem value='aide_aux_personnes_en_difficulté' />
+            </div>
+          </RadioGroup>
+          {Boolean(errors.tax_reduction) && <InputError>{errors.tax_reduction}</InputError>}
+        </div>
 
-          <div className='flex flex-col gap-4'>
-            <Label>Mots-clés :</Label>
-            <KeywordAsyncCreatableSelect
-              data={data}
-              setData={setData}
-            />
-          </div>
+        <div className='flex flex-col gap-4'>
+          <Label>Mots-clés :</Label>
+          <KeywordAsyncCreatableSelect
+            data={data}
+            setData={setData}
+          />
+        </div>
 
-          <div className='flex flex-col gap-4'>
-            <Label>Échelle :</Label>
-            <Select onValueChange={(value) => setData('geographical_scale', value)}>
-              <SelectTrigger>
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                {GeographicalScaleList.map((item) => (
-                  <SelectItem key={item.value} value={item.value}>{item.label}</SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
+        <div className='flex flex-col gap-4'>
+          <Label>Échelle :</Label>
+          <Select onValueChange={(value) => setData('geographical_scale', value)}>
+            <SelectTrigger>
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {GeographicalScaleList.map((item) => (
+                <SelectItem key={item.value} value={item.value}>{item.label}</SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
 
-          <div className='flex flex-col gap-4'>
-            <Label>Zones d'action :</Label>
-            <InterventionAreaAsyncCreatableSelect
-              data={data}
-              setData={setData}
-            />
-          </div>
+        <div className='flex flex-col gap-4'>
+          <Label>Zones d'action :</Label>
+          <InterventionAreaAsyncCreatableSelect
+            data={data}
+            setData={setData}
+          />
+        </div>
 
-          <div className='flex flex-col gap-4'>
-            <Label className='flex items-center gap-2'>
-              Type d'OSBL
-              <HelpTooltip size='small'>
-                <p>Organisation Sans But Lucratif.</p>
-              </HelpTooltip>
-              :
-            </Label>
-            <Select onValueChange={(value) => setData('osbl_type', value)}>
-              <SelectTrigger>
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent>
-                {OsblTypeList.map((item) => (
-                  <SelectItem key={item.value} value={item.value}>{item.label}</SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
+        <div className='flex flex-col gap-4'>
+          <Label className='flex items-center gap-2'>
+            Type d'OSBL
+            <HelpTooltip size='small'>
+              <p>Organisation Sans But Lucratif.</p>
+            </HelpTooltip>
+            :
+          </Label>
+          <Select onValueChange={(value) => setData('osbl_type', value)}>
+            <SelectTrigger>
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {OsblTypeList.map((item) => (
+                <SelectItem key={item.value} value={item.value}>{item.label}</SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
 
-            {data.osbl_type === 'association' && (
-              <MyCheckbox
-                id='public_utility'
-                checked={data.public_utility ?? false}
-                onCheckedChange={checked => setData('public_utility', checked)}
-              >
-                Reconnue d'utilité publique (ARUP)
-              </MyCheckbox>
-            )}
-          </div>
+          {data.osbl_type === 'association' && (
+            <MyCheckbox
+              id='public_utility'
+              checked={data.public_utility ?? false}
+              onCheckedChange={checked => setData('public_utility', checked)}
+            >
+              Reconnue d'utilité publique (ARUP)
+            </MyCheckbox>
+          )}
+        </div>
+
+        <MyNumberInput
+          id='creation_year'
+          labelText='Année de création :'
+          min={1000}
+          max={new Date().getFullYear()}
+          value={data.creation_year ?? ''}
+          onChange={(e) => {
+            setData('creation_year', e.target.value)
+          }}
+        />
 
-          <MyNumberInput
-            id='creation_year'
-            labelText='Année de création :'
-            min={1000}
-            max={new Date().getFullYear()}
-            value={data.creation_year ?? ''}
-            onChange={(e) => {
-              setData('creation_year', e.target.value)
+        <div className='flex flex-col gap-4'>
+          <Label>Labels :</Label>
+          <MultiSelect
+            options={labels}
+            onValueChange={(value) => {
+              setData('osbls_labels_attributes', value.map(label => ({ label_id: label })))
+              clearErrors('osbls_labels_attributes')
             }}
+            placeholder=''
+            variant='default'
+            animation={0}
+            maxCount={2}
           />
-
-          <div className='flex flex-col gap-4'>
-            <Label>Labels :</Label>
-            <MultiSelect
-              options={labels}
-              onValueChange={(value) => {
-                setData('osbls_labels_attributes', value.map(label => ({ label_id: label })))
-                clearErrors('osbls_labels_attributes')
-              }}
-              placeholder=''
-              variant='default'
-              animation={0}
-              maxCount={2}
-            />
-          </div>
         </div>
       </div>
     </div>
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index c2ae098..2f06894 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -66,18 +66,18 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors }: F
   }
 
   return (
-    <div className='flex flex-wrap gap-16 mx-auto justify-center'>
-      <div className='bg-white w-full sm:w-auto rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col'>
-        <div className='flex gap-16 items-center justify-between'>
-          <h2 className='text-2xl font-semibold'>Documents</h2>
-          <Button onClick={handleAdd}>
-            <PlusIcon className='w-4 h-4 mr-2' />
-            Ajouter
-          </Button>
-        </div>
+    <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full h-full'>
+      <div className='flex flex-wrap gap-4 items-center justify-between'>
+        <h2 className='text-2xl font-semibold w-[145px]'>Documents</h2>
+        <Button onClick={handleAdd} variant='outline'>
+          <PlusIcon className='w-4 h-4' />
+          <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
+        </Button>
+      </div>
 
+      {documents.length > 0 && (
         <div className='flex flex-col gap-4'>
-          {documents?.map((doc, index) => (
+          {documents.map((doc, index) => (
             <Card
               key={`document-${doc.document_attributes?.type ?? 'new'}-${index}`}
               className='bg-background'
@@ -191,8 +191,7 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors }: F
             </Card>
           ))}
         </div>
-      </div>
+      )}
     </div>
-
   )
 }
diff --git a/app/frontend/components/pages/contribution/new/OsblFinance.tsx b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
index 80f95c9..99f3142 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinance.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
@@ -66,16 +66,16 @@ export default function OsblFinance ({ data, setData, errors, clearErrors }: For
   }
 
   return (
-    <div className='flex flex-wrap gap-16 mx-auto justify-center'>
-      <div className='bg-white w-full sm:w-auto rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col'>
-        <div className='flex gap-16 items-center justify-between'>
-          <h2 className='text-2xl font-semibold'>Comptes</h2>
-          <Button onClick={handleFinanceAdd}>
-            <PlusIcon className='w-4 h-4 mr-2' />
-            Ajouter
-          </Button>
-        </div>
+    <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full h-full'>
+      <div className='flex items-center gap-4 justify-between flex-wrap'>
+        <h2 className='text-2xl font-semibold w-[145px]'>Comptes</h2>
+        <Button onClick={handleFinanceAdd} variant='outline'>
+          <PlusIcon className='w-4 h-4' />
+          <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
+        </Button>
+      </div>
 
+      {finances.length > 0 && (
         <div className='flex flex-col gap-4'>
           {finances.map((finance, index) => (
             <Card
@@ -181,7 +181,7 @@ export default function OsblFinance ({ data, setData, errors, clearErrors }: For
             </Card>
           ))}
         </div>
-      </div>
+      )}
     </div>
   )
 }
diff --git a/app/frontend/components/pages/contribution/new/OsblHeader.tsx b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
index b3ce5f7..0e73db1 100644
--- a/app/frontend/components/pages/contribution/new/OsblHeader.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
@@ -8,73 +8,71 @@ import MyFileInput from '@/components/shared/MyFileInput'
 
 export default function OsblHeader ({ data, setData, errors, clearErrors }: FormProps): ReactElement {
   return (
-    <div className='flex flex-wrap gap-16 mx-auto justify-center'>
-      <div className='bg-white w-full sm:w-auto rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col'>
-        <h2 className='text-2xl font-semibold'>En-tête</h2>
-        <div className='flex flex-col gap-8'>
-          <MyInput
-            id='name'
-            type='text'
-            labelText="Nom de l'association * :"
-            required
-            value={data.name}
-            onChange={(e) => {
-              setData('name', e.target.value)
-              clearErrors('name')
-            }}
-            error={errors.name}
-          />
+    <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full'>
+      <h2 className='text-2xl font-semibold'>En-tête</h2>
+      <div className='flex flex-col gap-8'>
+        <MyInput
+          id='name'
+          type='text'
+          labelText="Nom de l'association * :"
+          required
+          value={data.name}
+          onChange={(e) => {
+            setData('name', e.target.value)
+            clearErrors('name')
+          }}
+          error={errors.name}
+        />
 
-          <MyInput
-            id='website'
-            type='text'
-            labelText='Site internet :'
-            value={data.website ?? ''}
-            onChange={(e) => {
-              setData('website', e.target.value)
-              clearErrors('website')
-            }}
-            error={errors.website}
-          />
+        <MyInput
+          id='website'
+          type='text'
+          labelText='Site internet :'
+          value={data.website ?? ''}
+          onChange={(e) => {
+            setData('website', e.target.value)
+            clearErrors('website')
+          }}
+          error={errors.website}
+        />
 
-          <MyFileInput
-            id='logo'
-            accept='image/png, image/svg, image/webp'
-            labelText={
-              <p className='flex items-center gap-2'>
-                Logo
-                <HelpTooltip size='small'>
-                  <p>Le format SVG est à privilégier.</p>
-                  <p>Préférez des images avec des fonds transparents.</p>
-                </HelpTooltip>
-                :
-              </p>
-            }
-            onChange={(e) => {
-              setData('logo', e.target.files?.[0])
-              clearErrors('logo')
-            }}
-            error={errors.logo}
-          />
+        <MyFileInput
+          id='logo'
+          accept='image/png, image/svg, image/webp'
+          labelText={
+            <p className='flex items-center gap-2'>
+              Logo
+              <HelpTooltip size='small'>
+                <p>Le format SVG est à privilégier.</p>
+                <p>Préférez des images avec des fonds transparents.</p>
+              </HelpTooltip>
+              :
+            </p>
+          }
+          onChange={(e) => {
+            setData('logo', e.target.files?.[0])
+            clearErrors('logo')
+          }}
+          error={errors.logo}
+        />
 
-          <div>
-            <div className='flex flex-col gap-4'>
-              <Label htmlFor='description' className=''>
-                Description de l'association :
-              </Label>
-              <Textarea
-                id='description'
-                placeholder='Mission, actions, ...'
-                value={data.description}
-                onChange={(e) => {
-                  setData('description', e.target.value)
-                  clearErrors('description')
-                }}
-                className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-auto flex-grow h-40'
-              />
-              <div className={`text-xs text-right ${(data.description ?? '').length > 300 ? 'text-red-600' : 'text-gray-500'}`}>
-                {(data.description ?? '').length}/300 caractères
-              </div>
+        <div>
+          <div className='flex flex-col gap-4'>
+            <Label htmlFor='description' className=''>
+              Description de l'association :
+            </Label>
+            <Textarea
+              id='description'
+              placeholder='Mission, actions, ...'
+              value={data.description}
+              onChange={(e) => {
+                setData('description', e.target.value)
+                clearErrors('description')
+              }}
+              className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-auto flex-grow h-40'
+            />
+            <div className={`text-xs text-right ${(data.description ?? '').length > 300 ? 'text-red-600' : 'text-gray-500'}`}>
+              {(data.description ?? '').length}/300 caractères
             </div>
           </div>
         </div>
diff --git a/app/frontend/components/pages/contribution/new/OsblLocations.tsx b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
index 67a956d..2872ae2 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocations.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
@@ -73,18 +73,18 @@ export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data'
   }
 
   return (
-    <div className='flex flex-wrap gap-16 mx-auto justify-center'>
-      <div className='bg-white w-full sm:w-auto rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col'>
-        <div className='flex gap-16 items-center justify-between'>
-          <h2 className='text-2xl font-semibold'>Implantation</h2>
-          <Button onClick={handleLocationAdd}>
-            <PlusIcon className='w-4 h-4 mr-2' />
-            Ajouter
-          </Button>
-        </div>
+    <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full h-full'>
+      <div className='flex items-center gap-4 justify-between flex-wrap'>
+        <h2 className='text-2xl font-semibold w-[145px]'>Lieux</h2>
+        <Button onClick={handleLocationAdd} variant='outline'>
+          <PlusIcon className='w-4 h-4' />
+          <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
+        </Button>
+      </div>
 
+      {locations.length > 0 && (
         <div className='flex flex-col gap-4'>
-          {locations?.map((loc, index) => (
+          {locations.map((loc, index) => (
             <Card
               key={`location-${loc.type ?? 'new'}-${index}`}
               className='bg-background'
@@ -179,7 +179,7 @@ export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data'
             </Card>
           ))}
         </div>
-      </div>
+      )}
     </div>
   )
 }
diff --git a/app/frontend/components/ui/button.tsx b/app/frontend/components/ui/button.tsx
index f374123..96c2a2d 100644
--- a/app/frontend/components/ui/button.tsx
+++ b/app/frontend/components/ui/button.tsx
@@ -13,7 +13,7 @@ const buttonVariants = cva(
         destructive:
           "bg-destructive text-destructive-foreground hover:bg-destructive/90",
         outline:
-          "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
+          "border border-input bg-background hover:bg-white hover:text-accent-foreground hover:border-primary",
         secondary:
           "bg-secondary text-secondary-foreground hover:bg-secondary/80",
         ghost: "hover:bg-accent hover:text-accent-foreground",
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index 40d054c..b2ce3d6 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -128,38 +128,35 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
     <>
       <Head title='Ajouter une association' />
 
-      <div className='2xl:container mx-auto flex flex-col px-2 sm:px-8 md:px-16 pt-8 pb-16 gap-8'>
-        <h1 className='font-semibold text-3xl'>Ajouter une association</h1>
-        <Alert>
+      <form onKeyDown={avoidUnintentionalSubmission} onSubmit={submit} className='2xl:container mx-auto flex flex-col px-2 sm:px-8 md:px-16 pt-8 pb-16 gap-8'>
+        <div className='flex gap-16 items-center flex-wrap justify-center md:justify-start'>
+          <h1 className='font-semibold text-3xl'>Ajouter une association</h1>
+          <Button type='submit' disabled={processing} className='text-lg'>
+            <Save className='mr-2' />
+            Enregistrer
+          </Button>
+        </div>
+        {/* <Alert>
           <GoodIdea className='min-w-8 min-h-8' />
           <AlertDescription>
             Pour que votre contribution soit validée, le modérateur doit pouvoir
             vérifier les informations fournies. Facilitez son travail en
             indiquant clairement vos sources !
           </AlertDescription>
-        </Alert>
+        </Alert> */}
 
-        <form onKeyDown={avoidUnintentionalSubmission} onSubmit={submit} className='flex flex-col pt-4 gap-16'>
-          <Button type='submit' disabled={processing} className='mx-auto'>
-            <Save />
-            Enregistrer
-          </Button>
-          <OsblHeader data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
-          <OsblDataSheet data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
-          <OsblFinance
-            data={data}
-            setData={setData}
-            errors={errors}
-            clearErrors={clearErrors}
-          />
-          <OsblDocuments data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
-          <OsblLocations data={data} setData={setData} />
-          <Button type='submit' disabled={processing} className='mx-auto'>
-            <Save />
-            Enregistrer
-          </Button>
-        </form>
-      </div>
+        <div className='flex flex-col pt-4 gap-8'>
+          <div className='grid grid-cols-1 lg:grid-cols-2 gap-8'>
+            <OsblHeader data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
+            <OsblDataSheet data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
+          </div>
+          <div className='grid grid-cols-1 lg:grid-cols-3 gap-8'>
+            <OsblFinance data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
+            <OsblDocuments data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
+            <OsblLocations data={data} setData={setData} />
+          </div>
+        </div>
+      </form>
     </>
   )
 }

From eec70b11a3d51a78315297971ce3e3ccbcf199d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Thu, 30 Jan 2025 14:33:43 +0000
Subject: [PATCH 05/31] Enhance annual finance form with dynamic sheet-based
 editing and improved validation

- Introduced OsblFinanceSheet component for detailed finance entry management
- Added dynamic sheet-based editing for annual finance records
- Improved form validation with more granular year and percentage checks
- Enhanced error handling for finance entries with better error propagation
- Updated MyNumberInput to support optional error message display
- Refactored finance form to support more robust data entry and validation
---
 .../components/forms/MyNumberInput.tsx        |   6 +-
 .../new/FundManagementSection.tsx             |  34 ++-
 .../pages/contribution/new/OsblDataSheet.tsx  |  22 +-
 .../pages/contribution/new/OsblFinance.tsx    | 264 +++++++++---------
 .../contribution/new/OsblFinanceSheet.tsx     | 171 ++++++++++++
 .../components/shared/MyAsyncSelect.tsx       |   1 -
 app/frontend/components/ui/sheet.tsx          |   2 -
 app/frontend/lib/deepCleanData.ts             |  12 +-
 app/frontend/pages/Contribution/New.tsx       | 121 ++++----
 app/frontend/pages/Contribution/types.ts      |   1 +
 package.json                                  |   2 +-
 yarn.lock                                     |  50 +++-
 12 files changed, 480 insertions(+), 206 deletions(-)
 create mode 100644 app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx

diff --git a/app/frontend/components/forms/MyNumberInput.tsx b/app/frontend/components/forms/MyNumberInput.tsx
index 7324d86..6682d6c 100644
--- a/app/frontend/components/forms/MyNumberInput.tsx
+++ b/app/frontend/components/forms/MyNumberInput.tsx
@@ -16,6 +16,7 @@ interface BaseMyNumberInputProps {
   step?: number
   hideIncrementor?: boolean
   suffix?: string
+  noErrorMessage?: boolean
 }
 
 interface WithLabel extends BaseMyNumberInputProps {
@@ -45,7 +46,8 @@ export default function MyNumberInput (props: MyNumberInputProps): ReactElement
     max,
     step,
     hideIncrementor = true,
-    suffix
+    suffix,
+    noErrorMessage = false
   } = props
 
   const errorClass = error != null ? 'border-red-600' : ''
@@ -81,7 +83,7 @@ export default function MyNumberInput (props: MyNumberInputProps): ReactElement
           </span>
         )}
       </div>
-      {Boolean(error) && <InputError>{error}</InputError>}
+      {Boolean(error) && !noErrorMessage && <InputError>{error}</InputError>}
     </div>
   )
 }
diff --git a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
index 354e94d..465b983 100644
--- a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
+++ b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
@@ -22,6 +22,7 @@ interface FundManagementSectionProps {
   errors: Record<string, string>
   onUpdate: (items: FundRecord[]) => void
   clearErrors: (path: string) => void
+  setError: (field: string, message: string) => void
 }
 
 export default function FundManagementSection ({
@@ -31,7 +32,8 @@ export default function FundManagementSection ({
   baseErrorPath,
   errors,
   onUpdate,
-  clearErrors
+  clearErrors,
+  setError
 }: FundManagementSectionProps): ReactElement {
   function handleFundChange (
     index: number,
@@ -44,6 +46,10 @@ export default function FundManagementSection ({
 
     onUpdate(updatedItems)
 
+    if (value !== '') {
+      clearErrors(`${baseErrorPath}.${index}.${field}`)
+    }
+
     if (field === 'percent' && value !== '') {
       clearErrors(`${baseErrorPath}.total_percent`)
     }
@@ -61,6 +67,21 @@ export default function FundManagementSection ({
     e.preventDefault()
     const updatedItems = items.filter((_, i) => i !== index)
     onUpdate(updatedItems)
+
+    clearErrors(`${baseErrorPath}.${index}.type`)
+    clearErrors(`${baseErrorPath}.${index}.percent`)
+    clearErrors(`${baseErrorPath}.total_percent`)
+
+    for (let i = index + 1; i < items.length; i++) {
+      ['type', 'percent'].forEach(field => {
+        const errorPath = `${baseErrorPath}.${i}.${field}`
+        const error = errors?.[errorPath]
+        if (error !== undefined) {
+          setError(`${baseErrorPath}.${i - 1}.${field}`, error)
+          clearErrors(errorPath)
+        }
+      })
+    }
   }
 
   return (
@@ -69,6 +90,8 @@ export default function FundManagementSection ({
         <Label>{title}</Label>
         <Button
           onClick={handleAdd}
+          variant='outline'
+          className='bg-white'
           disabled={Boolean((items?.length ?? 0) >= typeList.length)}
         >
           <PlusIcon className='w-4 h-4' />
@@ -93,7 +116,9 @@ export default function FundManagementSection ({
             required
           >
             <SelectTrigger
-              className='w-60 data-[placeholder]:text-muted-foreground mt-4'
+              className={`w-60 data-[placeholder]:text-muted-foreground mt-4 ${
+                errors[`${baseErrorPath}.${index}.type`] !== undefined ? 'border-red-600' : ''
+              }`}
             >
               <SelectValue placeholder='Type *' />
             </SelectTrigger>
@@ -121,7 +146,7 @@ export default function FundManagementSection ({
 
           <MyNumberInput
             id='percent'
-            min={0}
+            min={0.01}
             max={100}
             step={0.01}
             value={item.percent ?? ''}
@@ -129,6 +154,9 @@ export default function FundManagementSection ({
             placeholder='% *'
             suffix='%'
             required
+            error={errors[`${baseErrorPath}.${index}.percent`]}
+            noErrorMessage
+
           />
 
           <MyNumberInput
diff --git a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
index 8487c7c..82ad2e5 100644
--- a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
@@ -91,17 +91,31 @@ export default function OsblDataSheet ({ data, setData, errors, clearErrors }: F
             }}
           >
             <div className='flex items-center justify-between'>
-              <Label htmlFor='option-one' className='flex items-center justify-between w-16'>
+              <Label
+                htmlFor='interet-general'
+                className='flex items-center justify-between w-16 cursor-pointer'
+                onClick={() => {
+                  setData('tax_reduction', 'intérêt_général')
+                  clearErrors('tax_reduction')
+                }}
+              >
                 66 %
                 <HelpTooltip>
                   <h2 className='font-semibold mb-4'>Les associations d'intérêt général, ou reconnues d'utilité publique (ARUP).</h2>
                   <p>Elles ouvrent le droit à une réduction d'impôt de 66 %.</p>
                 </HelpTooltip>
               </Label>
-              <RadioGroupItem value='intérêt_général' />
+              <RadioGroupItem value='intérêt_général' id='interet-general' />
             </div>
             <div className='flex items-center justify-between'>
-              <Label htmlFor='option-two' className='flex items-center justify-between w-16'>
+              <Label
+                htmlFor='aide-difficulte'
+                className='flex items-center justify-between w-16 cursor-pointer'
+                onClick={() => {
+                  setData('tax_reduction', 'aide_aux_personnes_en_difficulté')
+                  clearErrors('tax_reduction')
+                }}
+              >
                 75 %
                 <HelpTooltip>
                   <h2 className='font-semibold mb-4'>Les organismes d'aide aux personnes en difficulté.</h2>
@@ -109,7 +123,7 @@ export default function OsblDataSheet ({ data, setData, errors, clearErrors }: F
                   <p>Le régime standard de réduction à 66 % s'applique ensuite.</p>
                 </HelpTooltip>
               </Label>
-              <RadioGroupItem value='aide_aux_personnes_en_difficulté' />
+              <RadioGroupItem value='aide_aux_personnes_en_difficulté' id='aide-difficulte' />
             </div>
           </RadioGroup>
           {Boolean(errors.tax_reduction) && <InputError>{errors.tax_reduction}</InputError>}
diff --git a/app/frontend/components/pages/contribution/new/OsblFinance.tsx b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
index 99f3142..fbf5d6e 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinance.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
@@ -1,34 +1,17 @@
 import React, { ReactElement } from 'react'
 import { FormProps, AnnualFinance } from '@/pages/Contribution/types'
-import MyNumberInput from '@/components/forms/MyNumberInput'
-import HelpTooltip from '@/components/shared/HelpTooltip'
-import FundManagementSection from './FundManagementSection'
-import MyCheckbox from '@/components/forms/MyCheckbox'
-import { Separator } from '@/components/ui/separator'
 import { Button } from '@/components/ui/button'
-import { PlusIcon, TrashIcon } from 'lucide-react'
-import { Card, CardContent, CardHeader } from '@/components/ui/card'
-
-const FundSourceTypeList = [
-  { value: 'dons', label: 'Dons', group: 'main' },
-  { value: 'aides_publiques', label: 'Aides publiques', group: 'main' },
-  { value: 'revenus_d_activites', label: 'Revenus d\'activités', group: 'main' },
-  { value: 'autre', label: 'Autre', group: 'main' }
-  // { value: 'dons_des_particuliers', label: 'Dons des particuliers', group: 'detailed' },
-  // { value: 'mécénat', label: 'Mécénat d\'entreprises', group: 'detailed' },
-  // { value: 'fonds_dédiés', label: 'Reprise sur fonds dédiés', group: 'detailed' },
-  // { value: 'activité_commerciale', label: 'Activité commerciale', group: 'detailed' }
-]
-
-const FundAllocationTypeList = [
-  { value: 'missions_sociales', label: 'Missions sociales', group: 'main' },
-  { value: 'frais_de_fonctionnement', label: 'Frais de fonctionnement', group: 'main' },
-  { value: 'frais_de_recherche_de_fonds', label: 'Frais de recherche de fonds', group: 'main' },
-  { value: 'autre', label: 'Autre', group: 'main' }
-]
-
-export default function OsblFinance ({ data, setData, errors, clearErrors }: FormProps): ReactElement {
+import { PencilIcon, PlusIcon, TrashIcon } from 'lucide-react'
+import {
+  Sheet,
+  SheetTrigger
+} from '@/components/ui/sheet'
+import OsblFinanceSheet from './OsblFinanceSheet'
+import InputError from '@/components/forms/InputError'
+
+export default function OsblFinance ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
   const finances = data.annual_finances_attributes ?? []
+  const newFinanceIndex = finances.length - 1
 
   function updateFinanceAttribute (index: number, attribute: keyof AnnualFinance, value: any): void {
     const updatedFinances = finances.map((finance, i) =>
@@ -42,15 +25,29 @@ export default function OsblFinance ({ data, setData, errors, clearErrors }: For
 
     setData('annual_finances_attributes', updatedFinances)
 
-    // Je rentre une information, je veux que le message d'erreur soit supprimé
-    if (attribute !== 'year' && value !== '') {
+    if (attribute !== 'year') {
       clearErrors(`annual_finances_attributes.${index}.missing_information`)
     }
+
+    if (attribute === 'year') {
+      clearErrors(`annual_finances_attributes.${index}.year`)
+      clearErrors(`annual_finances_attributes.${index}.missing_information`)
+
+      const modifiedYear = finances[index]?.year
+      const remainingYears = finances.filter((_, i) => i !== index).map(f => f.year)
+      if (Number(modifiedYear) > 0 && remainingYears.includes(modifiedYear)) {
+        clearErrors('annual_finances_attributes.duplicate_years')
+      }
+    }
   }
 
-  function handleFinanceAdd (e: React.MouseEvent<HTMLButtonElement>): void {
-    e.preventDefault()
-    setData('annual_finances_attributes', [...finances, {}])
+  function handleFinanceAdd (): void {
+    const lastFinance = finances[newFinanceIndex]
+    const isLastFinanceEmpty = lastFinance !== undefined && Object.keys(lastFinance).length === 0
+
+    if (!isLastFinanceEmpty) {
+      setData('annual_finances_attributes', [...finances, {}])
+    }
   }
 
   function handleFinanceRemove (
@@ -63,123 +60,112 @@ export default function OsblFinance ({ data, setData, errors, clearErrors }: For
 
     clearErrors(`annual_finances_attributes.${index}.missing_information`)
     clearErrors(`annual_finances_attributes.${index}.fund_sources_attributes.total_percent`)
+    clearErrors(`annual_finances_attributes.${index}.year`)
+
+    const removedYear = finances[index]?.year
+    const remainingYears = finances.filter((_, i) => i !== index).map(f => f.year)
+    if (removedYear != null && remainingYears.includes(removedYear)) {
+      clearErrors('annual_finances_attributes.duplicate_years')
+    }
+
+    // Update error indices for remaining items after the removed index
+    Object.keys(errors).forEach(errorKey => {
+      if (errorKey.startsWith('annual_finances_attributes.')) {
+        const match = errorKey.match(/annual_finances_attributes\.(\d+)/)
+        if (match != null) {
+          const errorIndex = parseInt(match[1])
+          if (errorIndex > index) {
+            const newKey = errorKey.replace(
+              `annual_finances_attributes.${errorIndex}`,
+              `annual_finances_attributes.${errorIndex - 1}`
+            )
+            setError?.(newKey, errors[errorKey])
+            clearErrors(errorKey)
+          }
+        }
+      }
+    })
   }
 
   return (
     <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full h-full'>
       <div className='flex items-center gap-4 justify-between flex-wrap'>
         <h2 className='text-2xl font-semibold w-[145px]'>Comptes</h2>
-        <Button onClick={handleFinanceAdd} variant='outline'>
-          <PlusIcon className='w-4 h-4' />
-          <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
-        </Button>
+        {/* <Sheet open={open} onOpenChange={(open) => handleValidation(open, newFinanceIndex)}> */}
+        <Sheet>
+          <SheetTrigger asChild>
+            <Button variant='outline' onClick={handleFinanceAdd}>
+              <PlusIcon className='w-4 h-4' />
+              <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
+            </Button>
+          </SheetTrigger>
+          <OsblFinanceSheet
+            finance={finances[newFinanceIndex] ?? {}}
+            index={newFinanceIndex}
+            errors={errors}
+            onUpdate={(attribute, value) => updateFinanceAttribute(newFinanceIndex, attribute, value)}
+            clearErrors={clearErrors}
+            setError={(field: string, message: string) => setError?.(field, message)}
+          />
+        </Sheet>
       </div>
+      {errors['annual_finances_attributes.duplicate_years'] !== undefined && (
+        <InputError>
+          {errors['annual_finances_attributes.duplicate_years']}
+        </InputError>
+      )}
 
-      {finances.length > 0 && (
+      {finances.filter(finance => Object.keys(finance).length > 0).length > 0 && (
         <div className='flex flex-col gap-4'>
-          {finances.map((finance, index) => (
-            <Card
-              key={`finance-${index}`}
-              className='bg-background'
-            >
-              <CardHeader className='flex flex-row items-center pb-2'>
-                <div className='ml-auto'>
-                  <Button
-                    onClick={(e) => handleFinanceRemove(e, index)}
-                    variant='ghost'
-                    className='text-red-500 hover:text-red-700 p-0 h-auto'
-                  >
-                    <TrashIcon className='w-4 h-4' />
-                  </Button>
-                </div>
-              </CardHeader>
-
-              <CardContent className='flex flex-col gap-8'>
-                <MyNumberInput
-                  id={`year-${index}`}
-                  labelText={
-                    <>
-                      Année *
-                      <HelpTooltip size='small' className='mx-2'>
-                        <p>Année du bilan comptable.</p>
-                        <p>Si à cheval sur deux ans, entrez la dernière année.</p>
-                      </HelpTooltip>
-                      :
-                    </>
-                  }
-                  min={1000}
-                  max={new Date().getFullYear()}
-                  placeholder={String(new Date().getFullYear() - 1)}
-                  value={finance.year ?? ''}
-                  onChange={(e) => updateFinanceAttribute(index, 'year', e.target.value)}
-                  required
-                  error={errors[`annual_finances_attributes.${index}.missing_information`]}
-                />
-
-                <MyCheckbox
-                  id={`certified-${index}`}
-                  checked={finance.certified ?? false}
-                  onCheckedChange={(checked) => updateFinanceAttribute(index, 'certified', checked)}
-                >
-                  <div className='flex items-center'>
-                    Comptes certifiés
-                    <HelpTooltip className='ml-2'>
-                      Un commissaire aux comptes a validé la comptabilité de l'OSBL.
-                    </HelpTooltip>
+          {finances
+            .filter(finance => Object.keys(finance).length > 0)
+            // .sort((a, b) => (b.year ?? 0) - (a.year ?? 0))
+            .map((finance, index) => {
+              const hasError = errors[`annual_finances_attributes.${index}.missing_information`] != null ||
+                           errors[`annual_finances_attributes.${index}.fund_sources_attributes.total_percent`] != null ||
+                           (finance.fund_sources_attributes?.some((_, i) =>
+                             errors[`annual_finances_attributes.${index}.fund_sources_attributes.${i}.percent`] != null ||
+                             errors[`annual_finances_attributes.${index}.fund_sources_attributes.${i}.type`] != null
+                           ) ?? false) ||
+                           errors[`annual_finances_attributes.${index}.fund_allocations_attributes.total_percent`] != null ||
+                           (finance.fund_allocations_attributes?.some((_, i) =>
+                             errors[`annual_finances_attributes.${index}.fund_allocations_attributes.${i}.percent`] != null ||
+                             errors[`annual_finances_attributes.${index}.fund_allocations_attributes.${i}.type`] != null
+                           ) ?? false) ||
+                           finance.year == null ||
+                           errors[`annual_finances_attributes.${index}.year`] !== undefined
+
+              return (
+                <Sheet key={`finance-${index}`}>
+                  <div className={`flex items-center justify-between p-4 border rounded-lg ${hasError ? 'bg-red-50 border-red-500' : 'bg-white'}`}>
+                    <p>{finance.year}</p>
+                    <div className='flex gap-2'>
+                      <SheetTrigger asChild>
+                        <Button variant='outline' className='bg-white text-primary border-none'>
+                          <PencilIcon />
+                        </Button>
+                      </SheetTrigger>
+                      <Button
+                        onClick={(e) => handleFinanceRemove(e, index)}
+                        variant='outline'
+                        className='bg-white text-red-500 border-none'
+                      >
+                        <TrashIcon className='w-4 h-4' />
+                      </Button>
+                    </div>
                   </div>
-                </MyCheckbox>
-
-                <MyNumberInput
-                  id={`budget-${index}`}
-                  labelText='Budget'
-                  min={0}
-                  step={0.01}
-                  value={finance.budget ?? ''}
-                  onChange={(e) => updateFinanceAttribute(index, 'budget', e.target.value)}
-                  suffix='€'
-                />
-
-                <MyNumberInput
-                  id={`treasury-${index}`}
-                  labelText='Trésorerie'
-                  step={0.01}
-                  value={finance.treasury ?? ''}
-                  onChange={(e) => updateFinanceAttribute(index, 'treasury', e.target.value)}
-                  suffix='€'
-                />
-
-                <FundManagementSection
-                  title='Sources de financement'
-                  items={finance.fund_sources_attributes ?? []}
-                  typeList={FundSourceTypeList}
-                  baseErrorPath={`annual_finances_attributes.${index}.fund_sources_attributes`}
-                  errors={errors}
-                  onUpdate={(items) => updateFinanceAttribute(index, 'fund_sources_attributes', items)}
-                  clearErrors={clearErrors}
-                />
-
-                <FundManagementSection
-                  title='Allocation des fonds'
-                  items={finance.fund_allocations_attributes ?? []}
-                  typeList={FundAllocationTypeList}
-                  baseErrorPath={`annual_finances_attributes.${index}.fund_allocations_attributes`}
-                  errors={errors}
-                  onUpdate={(items) => updateFinanceAttribute(index, 'fund_allocations_attributes', items)}
-                  clearErrors={clearErrors}
-                />
-
-                <Separator />
-
-                <MyNumberInput
-                  id={`employees_count-${index}`}
-                  labelText="Nombre d'employé"
-                  min={0}
-                  value={finance.employees_count ?? ''}
-                  onChange={(e) => updateFinanceAttribute(index, 'employees_count', e.target.value)}
-                />
-              </CardContent>
-            </Card>
-          ))}
+
+                  <OsblFinanceSheet
+                    finance={finance}
+                    index={index}
+                    errors={errors}
+                    onUpdate={(attribute, value) => updateFinanceAttribute(index, attribute, value)}
+                    clearErrors={clearErrors}
+                    setError={(field: string, message: string) => setError?.(field, message)}
+                  />
+                </Sheet>
+              )
+            })}
         </div>
       )}
     </div>
diff --git a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
new file mode 100644
index 0000000..3e4b242
--- /dev/null
+++ b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
@@ -0,0 +1,171 @@
+import React, { ReactElement, useRef } from 'react'
+import { AnnualFinance } from '@/pages/Contribution/types'
+import MyNumberInput from '@/components/forms/MyNumberInput'
+import HelpTooltip from '@/components/shared/HelpTooltip'
+import FundManagementSection from './FundManagementSection'
+import MyCheckbox from '@/components/forms/MyCheckbox'
+import { Separator } from '@/components/ui/separator'
+import { Button } from '@/components/ui/button'
+import { CheckIcon } from 'lucide-react'
+import {
+  SheetClose,
+  SheetContent,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetDescription
+} from '@/components/ui/sheet'
+
+interface Props {
+  finance: Partial<AnnualFinance>
+  index: number
+  errors: Record<string, string>
+  onUpdate: (attribute: keyof AnnualFinance, value: any) => void
+  clearErrors: (path: string) => void
+  submitLabel?: string
+  title?: string
+  setError: (field: string, message: string) => void
+}
+
+const FundSourceTypeList = [
+  { value: 'dons', label: 'Dons', group: 'main' },
+  { value: 'aides_publiques', label: 'Aides publiques', group: 'main' },
+  { value: 'revenus_d_activites', label: 'Revenus d\'activités', group: 'main' },
+  { value: 'autre', label: 'Autre', group: 'main' }
+]
+
+const FundAllocationTypeList = [
+  { value: 'missions_sociales', label: 'Missions sociales', group: 'main' },
+  { value: 'frais_de_fonctionnement', label: 'Frais de fonctionnement', group: 'main' },
+  { value: 'frais_de_recherche_de_fonds', label: 'Frais de recherche de fonds', group: 'main' },
+  { value: 'autre', label: 'Autre', group: 'main' }
+]
+
+export default function OsblFinanceSheet ({
+  finance,
+  index,
+  errors,
+  onUpdate,
+  clearErrors,
+  setError,
+  submitLabel = 'Valider',
+  title = 'Comptes annuels'
+}: Props): ReactElement {
+  const formRef = useRef<HTMLFormElement>(null) as React.RefObject<HTMLFormElement>
+
+  function handleSubmit (e: React.MouseEvent<HTMLButtonElement>): void {
+    if (formRef.current.reportValidity() === false) {
+      e.preventDefault()
+    }
+  }
+
+  return (
+    <SheetContent className='w-full sm:max-w-[600px] overflow-y-auto'>
+      <form ref={formRef}>
+        <SheetHeader>
+          <SheetTitle>{title}</SheetTitle>
+          <SheetDescription>
+            Renseignez les informations financières pour cette année.
+          </SheetDescription>
+        </SheetHeader>
+
+        <div className='flex flex-col gap-8 mt-6'>
+          <MyNumberInput
+            autoFocus
+            id={`year-${index}`}
+            labelText={
+              <>
+                Année *
+                <HelpTooltip size='small' className='mx-2'>
+                  <p>Année du bilan comptable.</p>
+                  <p>Si à cheval sur deux ans, entrez la dernière année.</p>
+                </HelpTooltip>
+                :
+              </>
+          }
+            min={1000}
+            max={new Date().getFullYear()}
+            placeholder={String(new Date().getFullYear() - 1)}
+            value={finance.year ?? ''}
+            onChange={(e) => onUpdate('year', e.target.value)}
+            required
+            error={errors[`annual_finances_attributes.${index}.year`] ?? errors[`annual_finances_attributes.${index}.missing_information`]}
+          />
+
+          <MyCheckbox
+            id={`certified-${index}`}
+            checked={finance.certified ?? false}
+            onCheckedChange={(checked) => onUpdate('certified', checked)}
+          >
+            <div className='flex items-center'>
+              Comptes certifiés
+              <HelpTooltip className='ml-2'>
+                Un commissaire aux comptes a validé la comptabilité de l'OSBL.
+              </HelpTooltip>
+            </div>
+          </MyCheckbox>
+
+          <MyNumberInput
+            id={`budget-${index}`}
+            labelText='Budget'
+            min={0}
+            step={0.01}
+            value={finance.budget ?? ''}
+            onChange={(e) => onUpdate('budget', e.target.value)}
+            suffix='€'
+          />
+
+          <MyNumberInput
+            id={`treasury-${index}`}
+            labelText='Trésorerie'
+            step={0.01}
+            value={finance.treasury ?? ''}
+            onChange={(e) => onUpdate('treasury', e.target.value)}
+            suffix='€'
+          />
+
+          <FundManagementSection
+            title='Sources de financement'
+            items={finance.fund_sources_attributes ?? []}
+            typeList={FundSourceTypeList}
+            baseErrorPath={`annual_finances_attributes.${index}.fund_sources_attributes`}
+            errors={errors}
+            onUpdate={(items) => onUpdate('fund_sources_attributes', items)}
+            clearErrors={clearErrors}
+            setError={setError}
+          />
+
+          <FundManagementSection
+            title='Allocation des fonds'
+            items={finance.fund_allocations_attributes ?? []}
+            typeList={FundAllocationTypeList}
+            baseErrorPath={`annual_finances_attributes.${index}.fund_allocations_attributes`}
+            errors={errors}
+            onUpdate={(items) => onUpdate('fund_allocations_attributes', items)}
+            clearErrors={clearErrors}
+            setError={setError}
+          />
+
+          <Separator />
+
+          <MyNumberInput
+            id={`employees_count-${index}`}
+            labelText="Nombre d'employé"
+            min={0}
+            value={finance.employees_count ?? ''}
+            onChange={(e) => onUpdate('employees_count', e.target.value)}
+          />
+        </div>
+
+        <SheetFooter>
+          <SheetClose asChild>
+            <Button onClick={(e) => handleSubmit(e)} variant='default' size='xl' className='mx-auto mt-32'>
+              <CheckIcon className='mr-2' />
+              {submitLabel}
+            </Button>
+          </SheetClose>
+        </SheetFooter>
+      </form>
+    </SheetContent>
+  )
+}
diff --git a/app/frontend/components/shared/MyAsyncSelect.tsx b/app/frontend/components/shared/MyAsyncSelect.tsx
index b88a56f..8cc4b88 100644
--- a/app/frontend/components/shared/MyAsyncSelect.tsx
+++ b/app/frontend/components/shared/MyAsyncSelect.tsx
@@ -40,7 +40,6 @@ export default function MyAsyncCreatableSelect ({
 
     const response = await fetch(`https://api-adresse.data.gouv.fr/search/?q=${inputValue}`)
     const data = await response.json()
-    console.log(data)
     return data.features.map((feature: any) => createOption(feature))
   }
 
diff --git a/app/frontend/components/ui/sheet.tsx b/app/frontend/components/ui/sheet.tsx
index a37f17b..d64a6fa 100644
--- a/app/frontend/components/ui/sheet.tsx
+++ b/app/frontend/components/ui/sheet.tsx
@@ -1,5 +1,3 @@
-"use client"
-
 import * as React from "react"
 import * as SheetPrimitive from "@radix-ui/react-dialog"
 import { cva, type VariantProps } from "class-variance-authority"
diff --git a/app/frontend/lib/deepCleanData.ts b/app/frontend/lib/deepCleanData.ts
index f955deb..60de150 100644
--- a/app/frontend/lib/deepCleanData.ts
+++ b/app/frontend/lib/deepCleanData.ts
@@ -3,7 +3,11 @@ export default function deepCleanData (obj: any): any {
     // Recursively clean arrays and remove empty values
     return obj
       .map(deepCleanData)
-      .filter((item) => item !== undefined && !(typeof item === 'object' && !isFile(item) && Object.keys(item).length === 0))
+      .filter((item) =>
+        item !== undefined &&
+        item !== '' &&
+        !(typeof item === 'object' && !isFile(item) && Object.keys(item).length === 0)
+      )
   } else if (typeof obj === 'object' && obj !== null) {
     // Don't process File objects
     if (isFile(obj)) {
@@ -13,7 +17,11 @@ export default function deepCleanData (obj: any): any {
     const cleanedObject = Object.fromEntries(
       Object.entries(obj)
         .map(([key, value]) => [key, deepCleanData(value)])
-        .filter(([_, value]) => value !== undefined && !(typeof value === 'object' && !isFile(value) && Object.keys(value).length === 0))
+        .filter(([_, value]) =>
+          value !== undefined &&
+          value !== '' &&
+          !(typeof value === 'object' && !isFile(value) && Object.keys(value).length === 0)
+        )
     )
     return Object.keys(cleanedObject).length === 0 ? undefined : cleanedObject // Remove empty objects
   }
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index b2ce3d6..9fc8e46 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -31,57 +31,81 @@ const validation = z.object({
     }, 'Le type de fichier est invalide. Format accepté : SVG, PNG, WEBP.')
     .optional(),
   description: z.string().max(300).optional(),
-  osbls_causes_attributes: z.array(z.object({ cause_id: z.string() })).min(1, { message: 'Au moins une cause est requise.' }),
+  osbls_causes_attributes: z.array(z.object({ cause_id: z.string() }), { message: 'Au moins une cause est requise.' }),
   contact_email: z.string().email({ message: 'Veuillez entrer une adresse email valide.' }).optional(),
   tax_reduction: z.enum(['intérêt_général', 'aide_aux_personnes_en_difficulté'], { message: 'La réduction d\'impôt accordée doit être de 66 % ou 75 %.' }),
-  annual_finances_attributes: z.array(z.object({
-    year: z.string({ message: 'Veuillez entrer une année.' }).min(1, { message: 'Veuillez entrer une année.' }),
-    budget: z.string().optional(),
-    treasury: z.string().optional(),
-    employees_count: z.string().optional(),
-    fund_sources_attributes: z.array(z.object({
-      type: z.string(),
-      percent: z.string().min(1),
-      amount: z.string().optional()
-    })).optional()
-      .refine((sources): sources is typeof sources => {
-        if (sources === undefined || sources.length === 0) return true
+  annual_finances_attributes: z.array(
+    z.object({
+      year: z.string({ message: 'Veuillez entrer une année.' })
+        .regex(/^\d{4}$/, { message: 'L\'année doit contenir exactement 4 chiffres.' })
+        .min(1, { message: 'Veuillez entrer une année.' })
+        .refine((year) => {
+          const yearNum = Number(year)
+          return yearNum <= new Date().getFullYear()
+        }, { message: 'L\'année ne peut pas être dans le futur.' }),
+      certified: z.boolean().optional(),
+      budget: z.string().optional(),
+      treasury: z.string().optional(),
+      employees_count: z.string().optional(),
+      fund_sources_attributes: z.array(z.object({
+        type: z.string(),
+        percent: z.string().min(1)
+          .refine((percent) => {
+            const percentNum = Number(percent)
+            return percentNum >= 0.01 && percentNum <= 100
+          }, { message: 'Le pourcentage doit être compris entre 0.01 et 100.' }),
+        amount: z.string().optional()
+      })).optional()
+        .refine((sources): sources is typeof sources => {
+          if (sources === undefined || sources.length === 0) return true
 
-        const sum = sources.reduce((acc: number, source) => {
-          const percent = source.percent !== undefined ? Number(source.percent) : 0
-          return acc + percent
-        }, 0)
-        return sum === 100
-      }, {
-        message: 'La somme des pourcentages doit être égale à 100%.',
-        path: ['total_percent']
-      }),
-    fund_allocations_attributes: z.array(z.object({
-      type: z.string(),
-      percent: z.string().min(1),
-      amount: z.string().optional()
-    })).optional()
-      .refine((allocations): allocations is typeof allocations => {
-        if (allocations === undefined || allocations.length === 0) return true
+          const sum = sources.reduce((acc: number, source) => {
+            const percent = source.percent !== undefined ? Number(source.percent) : 0
+            return acc + percent
+          }, 0)
+          return sum === 100
+        }, {
+          message: 'La somme des pourcentages doit être égale à 100%.',
+          path: ['total_percent']
+        }),
+      fund_allocations_attributes: z.array(z.object({
+        type: z.string(),
+        percent: z.string().min(1)
+          .refine((percent) => {
+            const percentNum = Number(percent)
+            return percentNum >= 0.01 && percentNum <= 100
+          }, { message: 'Le pourcentage doit être compris entre 0.01 et 100.' }),
+        amount: z.string().optional()
+      })).optional()
+        .refine((allocations): allocations is typeof allocations => {
+          if (allocations === undefined || allocations.length === 0) return true
 
-        const sum = allocations.reduce((acc: number, allocation) => {
-          const percent = allocation.percent !== undefined ? Number(allocation.percent) : 0
-          return acc + percent
-        }, 0)
-        return sum === 100
-      }, {
-        message: 'La somme des pourcentages doit être égale à 100%.',
-        path: ['total_percent']
-      })
-  }).refine((data): data is typeof data => {
-    if (Object.values(data).filter(v => v.length > 0).length === 1 && data.year !== '') {
-      return false
-    }
-    return true
+          const sum = allocations.reduce((acc: number, allocation) => {
+            const percent = allocation.percent !== undefined ? Number(allocation.percent) : 0
+            return acc + percent
+          }, 0)
+          return sum === 100
+        }, {
+          message: 'La somme des pourcentages doit être égale à 100%.',
+          path: ['total_percent']
+        })
+    }).refine((finance) => {
+      if (finance === undefined || Object.keys(finance).length === 0) return true
+      // If only year is present, Object.keys will return length of 1
+      // We want at least one other field besides year
+      return !(Object.keys(finance).length === 1 && finance.year !== undefined)
+    }, {
+      message: 'Complétez les comptes pour cette année.',
+      path: ['missing_information']
+    })
+  ).refine((finances) => {
+    if (finances === undefined || finances.length === 0) return true
+    const years = finances.map(f => f.year)
+    return new Set(years).size === years.length
   }, {
-    message: 'Complétez les comptes pour cette année.',
-    path: ['missing_information']
-  })).optional(),
+    message: 'Une année ne peut être ajoutée qu\'une seule fois.',
+    path: ['duplicate_years']
+  }),
   document_attachments_attributes: z.array(z.object({
     document_attributes: z.object({
       file: z.instanceof(File)
@@ -106,7 +130,8 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
     e.preventDefault()
 
     transform((data) => (deepCleanData(data)))
-    const result = validation.safeParse(data) as { success: boolean, error: z.ZodError }
+    // const result = validation.safeParse(data) as { success: boolean, error: z.ZodError }
+    const result = validation.safeParse(deepCleanData(data)) as { success: boolean, error: z.ZodError }
     if (!result.success) {
       const issues = result.error.issues
       issues.forEach(issue => {
@@ -151,7 +176,7 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
             <OsblDataSheet data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
           </div>
           <div className='grid grid-cols-1 lg:grid-cols-3 gap-8'>
-            <OsblFinance data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
+            <OsblFinance data={data} setData={setData} errors={errors} clearErrors={clearErrors} setError={(field, message) => setError(field as keyof FormData, message)} />
             <OsblDocuments data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
             <OsblLocations data={data} setData={setData} />
           </div>
diff --git a/app/frontend/pages/Contribution/types.ts b/app/frontend/pages/Contribution/types.ts
index d22ec5a..0cb1509 100644
--- a/app/frontend/pages/Contribution/types.ts
+++ b/app/frontend/pages/Contribution/types.ts
@@ -89,4 +89,5 @@ export interface FormProps {
   setData: (key: keyof FormData | string, value: FormData[keyof FormData] | any) => void
   errors: Record<keyof FormData | string, string>
   clearErrors: (...fields: Array<keyof FormData | any>) => void
+  setError?: (field: string, error: any) => void
 }
diff --git a/package.json b/package.json
index 8f08be3..58b4ec1 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "@radix-ui/react-aspect-ratio": "^1.1.0",
     "@radix-ui/react-checkbox": "^1.1.2",
     "@radix-ui/react-collapsible": "^1.1.2",
-    "@radix-ui/react-dialog": "^1.1.4",
+    "@radix-ui/react-dialog": "^1.1.5",
     "@radix-ui/react-dropdown-menu": "^2.1.2",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-navigation-menu": "^1.2.1",
diff --git a/yarn.lock b/yarn.lock
index 5b9e970..b94c0bb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -812,7 +812,7 @@
     aria-hidden "^1.1.1"
     react-remove-scroll "2.5.5"
 
-"@radix-ui/react-dialog@1.1.4", "@radix-ui/react-dialog@^1.1.4":
+"@radix-ui/react-dialog@1.1.4":
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.4.tgz#d68e977acfcc0d044b9dab47b6dd2c179d2b3191"
   integrity sha512-Ur7EV1IwQGCyaAuyDRiOLA5JIUZxELJljF+MbM/2NC0BYwfuRrbpS30BiQBJrVruscgUkieKkqXYDOoByaxIoA==
@@ -832,6 +832,26 @@
     aria-hidden "^1.1.1"
     react-remove-scroll "^2.6.1"
 
+"@radix-ui/react-dialog@^1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.5.tgz#1bb2880e6b0ef9d9d0d9f440e1414c94bbacb55b"
+  integrity sha512-LaO3e5h/NOEL4OfXjxD43k9Dx+vn+8n+PCFt6uhX/BADFflllyv3WJG6rgvvSVBxpTch938Qq/LGc2MMxipXPw==
+  dependencies:
+    "@radix-ui/primitive" "1.1.1"
+    "@radix-ui/react-compose-refs" "1.1.1"
+    "@radix-ui/react-context" "1.1.1"
+    "@radix-ui/react-dismissable-layer" "1.1.4"
+    "@radix-ui/react-focus-guards" "1.1.1"
+    "@radix-ui/react-focus-scope" "1.1.1"
+    "@radix-ui/react-id" "1.1.0"
+    "@radix-ui/react-portal" "1.1.3"
+    "@radix-ui/react-presence" "1.1.2"
+    "@radix-ui/react-primitive" "2.0.1"
+    "@radix-ui/react-slot" "1.1.1"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+    aria-hidden "^1.2.4"
+    react-remove-scroll "^2.6.2"
+
 "@radix-ui/react-direction@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.1.0.tgz#a7d39855f4d077adc2a1922f9c353c5977a09cdc"
@@ -860,6 +880,17 @@
     "@radix-ui/react-use-callback-ref" "1.1.0"
     "@radix-ui/react-use-escape-keydown" "1.1.0"
 
+"@radix-ui/react-dismissable-layer@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.4.tgz#6e31ad92e7d9e77548001fd8c04f8561300c02a9"
+  integrity sha512-XDUI0IVYVSwjMXxM6P4Dfti7AH+Y4oS/TB+sglZ/EXc7cqLwGAmp1NlMrcUjj7ks6R5WTZuWKv44FBbLpwU3sA==
+  dependencies:
+    "@radix-ui/primitive" "1.1.1"
+    "@radix-ui/react-compose-refs" "1.1.1"
+    "@radix-ui/react-primitive" "2.0.1"
+    "@radix-ui/react-use-callback-ref" "1.1.0"
+    "@radix-ui/react-use-escape-keydown" "1.1.0"
+
 "@radix-ui/react-dropdown-menu@^2.1.2":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.4.tgz#5e1f453296dd9ae99224a26c36851832d26cf507"
@@ -1859,7 +1890,7 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-hidden@^1.1.1:
+aria-hidden@^1.1.1, aria-hidden@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.2.4.tgz#b78e383fdbc04d05762c78b4a25a501e736c4522"
   integrity sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==
@@ -4422,6 +4453,17 @@ react-remove-scroll@^2.6.1:
     use-callback-ref "^1.3.3"
     use-sidecar "^1.1.2"
 
+react-remove-scroll@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz#df02cde56d5f2731e058531f8ffd7f9adec91ac2"
+  integrity sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==
+  dependencies:
+    react-remove-scroll-bar "^2.3.7"
+    react-style-singleton "^2.2.3"
+    tslib "^2.1.0"
+    use-callback-ref "^1.3.3"
+    use-sidecar "^1.1.3"
+
 react-select@^5.9.0:
   version "5.9.0"
   resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.9.0.tgz#41325b7bfe8452a8d401b82fc4fb7d44a03e29c5"
@@ -4437,7 +4479,7 @@ react-select@^5.9.0:
     react-transition-group "^4.3.0"
     use-isomorphic-layout-effect "^1.2.0"
 
-react-style-singleton@^2.2.1, react-style-singleton@^2.2.2:
+react-style-singleton@^2.2.1, react-style-singleton@^2.2.2, react-style-singleton@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.3.tgz#4265608be69a4d70cfe3047f2c6c88b2c3ace388"
   integrity sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==
@@ -5243,7 +5285,7 @@ use-isomorphic-layout-effect@^1.2.0:
   resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz#afb292eb284c39219e8cb8d3d62d71999361a21d"
   integrity sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==
 
-use-sidecar@^1.1.2:
+use-sidecar@^1.1.2, use-sidecar@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.3.tgz#10e7fd897d130b896e2c546c63a5e8233d00efdb"
   integrity sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==

From 95a64573cc2d81586464712a9ea732bb13c95cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Thu, 30 Jan 2025 14:53:06 +0000
Subject: [PATCH 06/31] Add sorting functionality to annual finance entries

- Implemented year-based sorting for annual finance records
- Added a toggle button to sort finance entries in ascending or descending order
- Introduced state management for sorting direction
- Disabled sorting when there are validation errors
- Updated OsblFinance component to support dynamic sorting of finance entries
---
 .../pages/contribution/new/OsblFinance.tsx    | 41 ++++++++++++++++---
 app/frontend/pages/Contribution/New.tsx       | 17 ++++----
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/app/frontend/components/pages/contribution/new/OsblFinance.tsx b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
index fbf5d6e..d081ea8 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinance.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
@@ -1,7 +1,7 @@
-import React, { ReactElement } from 'react'
+import React, { ReactElement, useState } from 'react'
 import { FormProps, AnnualFinance } from '@/pages/Contribution/types'
 import { Button } from '@/components/ui/button'
-import { PencilIcon, PlusIcon, TrashIcon } from 'lucide-react'
+import { PencilIcon, PlusIcon, TrashIcon, ArrowUpDown } from 'lucide-react'
 import {
   Sheet,
   SheetTrigger
@@ -10,6 +10,7 @@ import OsblFinanceSheet from './OsblFinanceSheet'
 import InputError from '@/components/forms/InputError'
 
 export default function OsblFinance ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
+  const [sortAscending, setSortAscending] = useState(false)
   const finances = data.annual_finances_attributes ?? []
   const newFinanceIndex = finances.length - 1
 
@@ -87,11 +88,42 @@ export default function OsblFinance ({ data, setData, errors, clearErrors, setEr
     })
   }
 
+  function handleSort (): void {
+    setSortAscending(!sortAscending)
+    const sortedFinances = [...finances]
+      .filter(finance => Object.keys(finance).length > 0)
+      .sort((a, b) => sortAscending
+        ? (a.year ?? 0) - (b.year ?? 0)
+        : (b.year ?? 0) - (a.year ?? 0))
+    setData('annual_finances_attributes', sortedFinances)
+  }
+
+  const hasFinanceErrors = Object.keys(errors).some(key =>
+    key.startsWith('annual_finances_attributes')
+  )
+
   return (
     <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full h-full'>
       <div className='flex items-center gap-4 justify-between flex-wrap'>
-        <h2 className='text-2xl font-semibold w-[145px]'>Comptes</h2>
-        {/* <Sheet open={open} onOpenChange={(open) => handleValidation(open, newFinanceIndex)}> */}
+        <div className='flex items-center gap-4'>
+          <div className='flex items-center gap-2 w-[145px]'>
+
+            <h2 className='text-2xl font-semibold'>Comptes</h2>
+            {finances.filter(finance => Object.keys(finance).length > 1).length > 1 && (
+              <Button
+                variant='ghost'
+                size='icon'
+                onClick={(e) => {
+                  e.preventDefault()
+                  handleSort()
+                }}
+                disabled={hasFinanceErrors}
+              >
+                <ArrowUpDown />
+              </Button>
+            )}
+          </div>
+        </div>
         <Sheet>
           <SheetTrigger asChild>
             <Button variant='outline' onClick={handleFinanceAdd}>
@@ -119,7 +151,6 @@ export default function OsblFinance ({ data, setData, errors, clearErrors, setEr
         <div className='flex flex-col gap-4'>
           {finances
             .filter(finance => Object.keys(finance).length > 0)
-            // .sort((a, b) => (b.year ?? 0) - (a.year ?? 0))
             .map((finance, index) => {
               const hasError = errors[`annual_finances_attributes.${index}.missing_information`] != null ||
                            errors[`annual_finances_attributes.${index}.fund_sources_attributes.total_percent`] != null ||
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index 9fc8e46..ccf60fd 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -98,14 +98,15 @@ const validation = z.object({
       message: 'Complétez les comptes pour cette année.',
       path: ['missing_information']
     })
-  ).refine((finances) => {
-    if (finances === undefined || finances.length === 0) return true
-    const years = finances.map(f => f.year)
-    return new Set(years).size === years.length
-  }, {
-    message: 'Une année ne peut être ajoutée qu\'une seule fois.',
-    path: ['duplicate_years']
-  }),
+  ).optional()
+    .refine((finances) => {
+      if (finances === undefined || finances.length === 0) return true
+      const years = finances.map(f => f.year)
+      return new Set(years).size === years.length
+    }, {
+      message: 'Une année ne peut être ajoutée qu\'une seule fois.',
+      path: ['duplicate_years']
+    }),
   document_attachments_attributes: z.array(z.object({
     document_attributes: z.object({
       file: z.instanceof(File)

From efbd8ecf79839f6939bc4f79d95c0871ea98dce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Thu, 30 Jan 2025 15:26:52 +0000
Subject: [PATCH 07/31] Adjust sidebar layout and styling for improved
 responsiveness

- Modified sidebar component to use relative positioning
- Updated inset and height classes for better layout
- Removed top border in sidebar to improve visual consistency
- Fine-tuned transition and positioning classes
---
 app/frontend/components/ui/sidebar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/frontend/components/ui/sidebar.tsx b/app/frontend/components/ui/sidebar.tsx
index d8ec970..674e153 100644
--- a/app/frontend/components/ui/sidebar.tsx
+++ b/app/frontend/components/ui/sidebar.tsx
@@ -213,7 +213,7 @@ const Sidebar = React.forwardRef<
     return (
       <div
         ref={ref}
-        className="group peer hidden md:block text-sidebar-foreground"
+        className="group peer hidden relative md:block text-sidebar-foreground"
         data-state={state}
         data-collapsible={state === "collapsed" ? collapsible : ""}
         data-variant={variant}
@@ -232,14 +232,14 @@ const Sidebar = React.forwardRef<
         />
         <div
           className={cn(
-            "duration-200 absolute inset-y-16 z-10 hidden h-svh w-[--sidebar-width] transition-[left,right,width] ease-linear md:flex",
+            "duration-200 absolute inset-y-0 z-10 hidden h-full w-[--sidebar-width] transition-[left,right,width] ease-linear md:flex",
             side === "left"
               ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
               : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
             // Adjust the padding for floating and inset variants.
             variant === "floating" || variant === "inset"
               ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4)_+2px)]"
-              : "group-data-[collapsible=icon]:w-[--sidebar-width-icon] group-data-[side=left]:border-r group-data-[side=right]:border-l border-t",
+              : "group-data-[collapsible=icon]:w-[--sidebar-width-icon] group-data-[side=left]:border-r group-data-[side=right]:border-l",
             className
           )}
           {...props}

From 42412e8bb78be0ea2273751e0fd2d5233fbd7766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Thu, 30 Jan 2025 15:53:15 +0000
Subject: [PATCH 08/31] Replace Inertia Link with custom MyLink component for
 enhanced navigation control

- Created a new MyLink component to wrap Inertia Link
- Added onBefore handler to prevent unnecessary page reloads
- Replaced all Link components with MyLink in Header, Footer, and AppSidebar
- Imported MyLink in layout and navigation components
---
 app/frontend/components/layout/AppSidebar.tsx |  7 +--
 app/frontend/components/layout/Footer.tsx     | 19 ++++---
 app/frontend/components/layout/Header.tsx     | 51 ++++++++++---------
 app/frontend/components/shared/MyLink.tsx     | 14 +++++
 4 files changed, 53 insertions(+), 38 deletions(-)
 create mode 100644 app/frontend/components/shared/MyLink.tsx

diff --git a/app/frontend/components/layout/AppSidebar.tsx b/app/frontend/components/layout/AppSidebar.tsx
index 6c266a2..9c25d41 100644
--- a/app/frontend/components/layout/AppSidebar.tsx
+++ b/app/frontend/components/layout/AppSidebar.tsx
@@ -1,6 +1,7 @@
 import { FilePlus2, Library, NotebookPen } from 'lucide-react'
-import { Link, usePage } from '@inertiajs/react'
+import { usePage } from '@inertiajs/react'
 import { ReactElement } from 'react'
+import MyLink from '@/components/shared/MyLink'
 
 import {
   Sidebar,
@@ -42,7 +43,7 @@ export default function AppSidebar (): ReactElement {
               {items.map((item) => (
                 <SidebarMenuItem key={item.title}>
                   <SidebarMenuButton asChild>
-                    <Link
+                    <MyLink
                       href={item.url}
                       className={
                         url === item.url
@@ -52,7 +53,7 @@ export default function AppSidebar (): ReactElement {
                     >
                       <item.icon />
                       <span className='font-semibold'>{item.title}</span>
-                    </Link>
+                    </MyLink>
                   </SidebarMenuButton>
                 </SidebarMenuItem>
               ))}
diff --git a/app/frontend/components/layout/Footer.tsx b/app/frontend/components/layout/Footer.tsx
index 5586331..dc8f142 100644
--- a/app/frontend/components/layout/Footer.tsx
+++ b/app/frontend/components/layout/Footer.tsx
@@ -1,6 +1,5 @@
-import { Link } from '@inertiajs/react'
 import { ReactElement } from 'react'
-
+import MyLink from '@/components/shared/MyLink'
 import {
   NavigationMenu,
   NavigationMenuItem,
@@ -58,7 +57,7 @@ export default function Footer (): ReactElement {
   return (
     <footer className='flex flex-col bg-foreground text-white'>
       <div className='2xl:container 2xl:mx-auto flex flex-col lg:flex-row gap-8 items-center px-8 py-8 lg:py-2 justify-center sm:justify-between'>
-        <Link href='/' className='flex gap-2 items-center'>
+        <MyLink href='/' className='flex gap-2 items-center'>
           <div className='text-right'>
             <h1 className='text-2xl sm:text-3xl font-bold leading-none sm:leading-none'>
               Benefactorum
@@ -67,19 +66,19 @@ export default function Footer (): ReactElement {
               Association de bienfaiteurs
             </h2>
           </div>
-        </Link>
+        </MyLink>
         <NavigationMenu>
           <NavigationMenuList className='flex flex-col sm:flex-row gap-2 sm:gap-4 lg:gap-16'>
             {navLinks.map((link) => (
               <NavigationMenuItem key={link.href}>
                 <NavigationMenuLink asChild>
-                  <Link
+                  <MyLink
                     href={link.href}
                     className='flex gap-2 items-center hover:underline'
                   >
                     <link.icon className='invert' />
                     {link.title}
-                  </Link>
+                  </MyLink>
                 </NavigationMenuLink>
               </NavigationMenuItem>
             ))}
@@ -103,13 +102,13 @@ export default function Footer (): ReactElement {
       </div>
       <p className='mx-auto flex text-center text-xs text-slate-200'>
         {new Date().getFullYear()} - &nbsp;
-        <Link href='/mentions-legales' className='hover:underline'>
+        <MyLink href='/mentions-legales' className='hover:underline'>
           Mentions légales
-        </Link>
+        </MyLink>
         &nbsp;-&nbsp;
-        <Link href='/donnees-personnelles' className='hover:underline'>
+        <MyLink href='/donnees-personnelles' className='hover:underline'>
           Données personnelles
-        </Link>
+        </MyLink>
       </p>
     </footer>
   )
diff --git a/app/frontend/components/layout/Header.tsx b/app/frontend/components/layout/Header.tsx
index 4c4f77d..914b3b8 100644
--- a/app/frontend/components/layout/Header.tsx
+++ b/app/frontend/components/layout/Header.tsx
@@ -1,4 +1,5 @@
-import { Link, router, usePage } from '@inertiajs/react'
+import { router, usePage } from '@inertiajs/react'
+import MyLink from '@/components/shared/MyLink'
 import { ReactElement, useState, useEffect, useRef } from 'react'
 import { Spin as Hamburger } from 'hamburger-react'
 import {
@@ -89,7 +90,7 @@ export default function Header (): ReactElement {
         id='mainHeader'
         className='2xl:container 2xl:mx-auto flex items-center px-2 justify-between'
       >
-        <Link
+        <MyLink
           href='/'
           className='flex gap-2 items-center'
           onClick={handleLinkClick}
@@ -103,12 +104,12 @@ export default function Header (): ReactElement {
               Association de bienfaiteurs
             </h2>
           </div>
-        </Link>
+        </MyLink>
         <NavigationMenu className='hidden min-[1100px]:flex'>
           <NavigationMenuList className='xl:gap-8'>
             <NavigationMenuItem>
               <NavigationMenuLink asChild>
-                <Link
+                <MyLink
                   href='/trouver-une-association'
                   className={
                     'flex gap-2 items-center py-2 px-4 rounded-md' +
@@ -120,13 +121,13 @@ export default function Header (): ReactElement {
                 >
                   <Search className='w-4 h-4 text-foreground' />
                   Trouver une association
-                </Link>
+                </MyLink>
               </NavigationMenuLink>
             </NavigationMenuItem>
             {user != null && (
               <NavigationMenuItem>
                 <NavigationMenuLink asChild>
-                  <Link
+                  <MyLink
                     href='/mes-contributions'
                     className={
                       'flex gap-2 items-center py-2 px-4 rounded-md' +
@@ -138,14 +139,14 @@ export default function Header (): ReactElement {
                   >
                     <HandHeart className='w-4 h-4 text-foreground' />
                     Mes contributions
-                  </Link>
+                  </MyLink>
                 </NavigationMenuLink>
               </NavigationMenuItem>
             )}
             {user === null && (
               <NavigationMenuItem>
                 <NavigationMenuLink asChild>
-                  <Link
+                  <MyLink
                     href='/qui-nous-sommes'
                     className={
                       'flex gap-2 items-center py-2 px-4 rounded-md' +
@@ -157,7 +158,7 @@ export default function Header (): ReactElement {
                   >
                     <HandMetal className='w-4 h-4 text-foreground' />
                     Qui sommes-nous ?
-                  </Link>
+                  </MyLink>
                 </NavigationMenuLink>
               </NavigationMenuItem>
             )}
@@ -171,7 +172,7 @@ export default function Header (): ReactElement {
                   {user !== null && (
                     <DropdownMenuItem className='focus:bg-white'>
                       <NavigationMenuLink asChild>
-                        <Link
+                        <MyLink
                           href='/qui-nous-sommes'
                           className={
                             'flex gap-2 items-centertext-base py-2 px-4 rounded-md' +
@@ -183,14 +184,14 @@ export default function Header (): ReactElement {
                         >
                           <HandMetal className='w-4 h-4 text-foreground' />
                           Qui sommes-nous ?
-                        </Link>
+                        </MyLink>
                       </NavigationMenuLink>
                     </DropdownMenuItem>
                   )}
                   {subNavLinks.map((link) => (
                     <DropdownMenuItem key={link.href} className='focus:bg-white'>
                       <NavigationMenuLink asChild>
-                        <Link
+                        <MyLink
                           href={link.href}
                           className={
                             'flex gap-2 items-center text-base py-2 px-4 rounded-md w-full' +
@@ -202,7 +203,7 @@ export default function Header (): ReactElement {
                         >
                           <link.icon className='text-foreground' />
                           {link.title}
-                        </Link>
+                        </MyLink>
                       </NavigationMenuLink>
                     </DropdownMenuItem>
                   ))}
@@ -217,12 +218,12 @@ export default function Header (): ReactElement {
           </div>
           <div className='hidden sm:flex'>
             {user === null && !isExcluded && (
-              <Link href='/connexion' onClick={handleLinkClick}>
+              <MyLink href='/connexion' onClick={handleLinkClick}>
                 <Button>
                   <LogIn />
                   Se connecter
                 </Button>
-              </Link>
+              </MyLink>
             )}
             {user !== null && (
               <Button variant='secondary' onClick={logOut}>
@@ -243,7 +244,7 @@ export default function Header (): ReactElement {
       >
         <ul className='flex flex-col mt-4'>
           <li>
-            <Link
+            <MyLink
               href='/trouver-une-association'
               className={
                 'flex items-center justify-center gap-2 px-4 py-2 mb-2 rounded-md' +
@@ -255,10 +256,10 @@ export default function Header (): ReactElement {
             >
               <Search className='w-4 h-4 text-foreground' />
               Trouver une association
-            </Link>
+            </MyLink>
           </li>
           <li>
-            <Link
+            <MyLink
               href='/qui-nous-sommes'
               className={
                 'flex items-center justify-center gap-2 px-4 py-2 mb-2 rounded-md' +
@@ -270,11 +271,11 @@ export default function Header (): ReactElement {
             >
               <HandMetal className='w-4 h-4 text-foreground' />
               Qui sommes-nous ?
-            </Link>
+            </MyLink>
           </li>
           {user !== null && (
             <li>
-              <Link
+              <MyLink
                 href='/mes-contributions'
                 className={
                   'flex items-center justify-center gap-2 px-4 py-2 mb-2 rounded-md' +
@@ -286,13 +287,13 @@ export default function Header (): ReactElement {
               >
                 <HandHeart className='w-4 h-4 text-foreground' />
                 Mes contributions
-              </Link>
+              </MyLink>
             </li>
           )}
           <hr className='border-t border-gray-300 my-2' />
           {subNavLinks.map((link) => (
             <li key={link.href}>
-              <Link
+              <MyLink
                 href={link.href}
                 className={
                   'flex items-center justify-center gap-2 px-4 py-1 mb-1 rounded-md text-sm text-muted-foreground' +
@@ -304,7 +305,7 @@ export default function Header (): ReactElement {
               >
                 <link.icon className='w-4 h-4 text-muted-foreground' />
                 {link.title}
-              </Link>
+              </MyLink>
             </li>
           ))}
           {user === null && !isExcluded && (
@@ -312,12 +313,12 @@ export default function Header (): ReactElement {
               <hr className='border-t border-gray-300 my-2' />
               <li className='sm:hidden flex justify-center'>
                 <div className='py-4 flex sm:hidden'>
-                  <Link href='/connexion' onClick={handleLinkClick}>
+                  <MyLink href='/connexion' onClick={handleLinkClick}>
                     <Button>
                       <LogIn />
                       Se connecter
                     </Button>
-                  </Link>
+                  </MyLink>
                 </div>
               </li>
             </>
diff --git a/app/frontend/components/shared/MyLink.tsx b/app/frontend/components/shared/MyLink.tsx
new file mode 100644
index 0000000..b72ac29
--- /dev/null
+++ b/app/frontend/components/shared/MyLink.tsx
@@ -0,0 +1,14 @@
+import { Link, usePage } from '@inertiajs/react'
+import { ComponentProps, ReactElement } from 'react'
+
+type MyLinkProps = ComponentProps<typeof Link>
+
+export default function MyLink ({ href, ...props }: MyLinkProps): ReactElement {
+  const { url } = usePage()
+
+  const handleBefore = (): boolean => {
+    return !(href === url)
+  }
+
+  return <Link href={href} onBefore={handleBefore} {...props} />
+}

From d39492c90cbf7952ff23e9ce239ef05af4f33b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Thu, 30 Jan 2025 16:06:17 +0000
Subject: [PATCH 09/31] Add mobile sidebar close functionality to improve
 navigation UX

- Integrated useSidebar hook in AppSidebar component
- Implemented handleClick method to close mobile sidebar when menu item is selected
- Ensured sidebar closes automatically on mobile devices after navigation
---
 app/frontend/components/layout/AppSidebar.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/frontend/components/layout/AppSidebar.tsx b/app/frontend/components/layout/AppSidebar.tsx
index 9c25d41..39bfc58 100644
--- a/app/frontend/components/layout/AppSidebar.tsx
+++ b/app/frontend/components/layout/AppSidebar.tsx
@@ -10,7 +10,8 @@ import {
   SidebarGroupContent,
   SidebarMenu,
   SidebarMenuButton,
-  SidebarMenuItem
+  SidebarMenuItem,
+  useSidebar
 } from '@/components/ui/sidebar'
 
 const items = [
@@ -33,6 +34,13 @@ const items = [
 
 export default function AppSidebar (): ReactElement {
   const { url } = usePage()
+  const { setOpenMobile, isMobile } = useSidebar()
+
+  const handleClick = (): void => {
+    if (isMobile) {
+      setOpenMobile(false)
+    }
+  }
 
   return (
     <Sidebar>
@@ -50,6 +58,7 @@ export default function AppSidebar (): ReactElement {
                           ? ' bg-secondary'
                           : ' hover:bg-secondary/50'
                       }
+                      onClick={handleClick}
                     >
                       <item.icon />
                       <span className='font-semibold'>{item.title}</span>

From 171bed17ee6368014037b8ad2fd7311455f4eb4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Thu, 30 Jan 2025 16:11:29 +0000
Subject: [PATCH 10/31] Add accessibility labels to mobile sidebar for improved
 screen reader support

- Added SheetTitle with screen reader-only class to provide a descriptive title
- Included SheetDescription with screen reader-only class to explain sidebar navigation purpose
- Imported additional components from sheet UI component
---
 app/frontend/components/ui/sidebar.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/frontend/components/ui/sidebar.tsx b/app/frontend/components/ui/sidebar.tsx
index 674e153..b038dd3 100644
--- a/app/frontend/components/ui/sidebar.tsx
+++ b/app/frontend/components/ui/sidebar.tsx
@@ -8,7 +8,7 @@ import { cn } from "@/lib/utils"
 import { Button } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
 import { Separator } from "@/components/ui/separator"
-import { Sheet, SheetContent } from "@/components/ui/sheet"
+import { Sheet, SheetContent, SheetTitle, SheetDescription } from "@/components/ui/sheet"
 import { Skeleton } from "@/components/ui/skeleton"
 import {
   Tooltip,
@@ -204,6 +204,10 @@ const Sidebar = React.forwardRef<
             }
             side={side}
           >
+            <SheetTitle className="sr-only">Sidebar Navigation</SheetTitle>
+            <SheetDescription className="sr-only">
+              Navigation menu for accessing different sections of the application
+            </SheetDescription>
             <div className="flex h-full w-full flex-col">{children}</div>
           </SheetContent>
         </Sheet>

From e05a2acdcc2c19de1de660c2a4fc1943ed339498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Thu, 30 Jan 2025 16:43:40 +0000
Subject: [PATCH 11/31] Improve fund management section layout and add
 separators

- Refactored FundManagementSection component for better responsiveness
- Added Separator component between fund management entries
- Adjusted layout classes for improved mobile and desktop display
- Simplified icon rendering and button styling
- Made sheet description screen reader-only in OsblFinanceSheet
- Updated button size and margin in finance sheet footer
---
 .../new/FundManagementSection.tsx             | 130 +++++++++---------
 .../contribution/new/OsblFinanceSheet.tsx     |   6 +-
 2 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
index 465b983..9a35360 100644
--- a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
+++ b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
@@ -13,6 +13,7 @@ import { PlusIcon, TrashIcon } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import MyNumberInput from '@/components/forms/MyNumberInput'
 import InputError from '@/components/forms/InputError'
+import { Separator } from '@/components/ui/separator'
 
 interface FundManagementSectionProps {
   title: string
@@ -94,7 +95,7 @@ export default function FundManagementSection ({
           className='bg-white'
           disabled={Boolean((items?.length ?? 0) >= typeList.length)}
         >
-          <PlusIcon className='w-4 h-4' />
+          <PlusIcon />
           Ajouter
         </Button>
       </div>
@@ -106,76 +107,77 @@ export default function FundManagementSection ({
       )}
 
       {items?.map((item, index) => (
-        <div
-          key={`${baseErrorPath}-${item.type ?? 'new'}-${index}`}
-          className='flex items-center space-x-4'
-        >
-          <Select
-            value={item.type}
-            onValueChange={(value) => handleFundChange(index, 'type', value)}
-            required
+        <Fragment key={`${baseErrorPath}-${item.type ?? 'new'}-${index}`}>
+          <div
+            className='flex flex-wrap items-center gap-x-4 sm:flex-nowrap sm:items-center sm:space-x-4'
           >
-            <SelectTrigger
-              className={`w-60 data-[placeholder]:text-muted-foreground mt-4 ${
+            <Select
+              value={item.type}
+              onValueChange={(value) => handleFundChange(index, 'type', value)}
+              required
+            >
+              <SelectTrigger
+                className={`w-60 data-[placeholder]:text-muted-foreground mt-4 ${
                 errors[`${baseErrorPath}.${index}.type`] !== undefined ? 'border-red-600' : ''
               }`}
-            >
-              <SelectValue placeholder='Type *' />
-            </SelectTrigger>
-            <SelectContent>
-              {typeList.filter(type =>
-                item.type === type.value ||
+              >
+                <SelectValue placeholder='Type *' />
+              </SelectTrigger>
+              <SelectContent>
+                {typeList.filter(type =>
+                  item.type === type.value ||
                 !items.some(source => source.type === type.value)
-              ).map((type, i) => (
-                <Fragment key={type.value}>
-                  {i > 0 &&
+                ).map((type, i) => (
+                  <Fragment key={type.value}>
+                    {i > 0 &&
                     type.group === 'detailed' &&
                     typeList[i - 1]?.group === 'main' && (
                       <SelectSeparator className='my-2' />
-                  )}
-                  <SelectItem
-                    value={type.value}
-                    className={type.group === 'detailed' ? 'text-muted-foreground' : ''}
-                  >
-                    {type.label}
-                  </SelectItem>
-                </Fragment>
-              ))}
-            </SelectContent>
-          </Select>
-
-          <MyNumberInput
-            id='percent'
-            min={0.01}
-            max={100}
-            step={0.01}
-            value={item.percent ?? ''}
-            onChange={(e) => handleFundChange(index, 'percent', e.target.value)}
-            placeholder='% *'
-            suffix='%'
-            required
-            error={errors[`${baseErrorPath}.${index}.percent`]}
-            noErrorMessage
-
-          />
-
-          <MyNumberInput
-            id='amount'
-            step={0.01}
-            value={item.amount ?? ''}
-            onChange={(e) => handleFundChange(index, 'amount', e.target.value)}
-            placeholder='Montant'
-            suffix='€'
-          />
-
-          <Button
-            onClick={(e) => handleRemove(e, index)}
-            variant='ghost'
-            className='text-red-500 hover:text-red-700 p-0 h-auto mt-4'
-          >
-            <TrashIcon className='w-4 h-4' />
-          </Button>
-        </div>
+                    )}
+                    <SelectItem
+                      value={type.value}
+                      className={type.group === 'detailed' ? 'text-muted-foreground' : ''}
+                    >
+                      {type.label}
+                    </SelectItem>
+                  </Fragment>
+                ))}
+              </SelectContent>
+            </Select>
+
+            <MyNumberInput
+              id='percent'
+              min={0.01}
+              max={100}
+              step={0.01}
+              value={item.percent ?? ''}
+              onChange={(e) => handleFundChange(index, 'percent', e.target.value)}
+              placeholder='% *'
+              suffix='%'
+              required
+              error={errors[`${baseErrorPath}.${index}.percent`]}
+              noErrorMessage
+            />
+
+            <MyNumberInput
+              id='amount'
+              step={0.01}
+              value={item.amount ?? ''}
+              onChange={(e) => handleFundChange(index, 'amount', e.target.value)}
+              placeholder='Montant'
+              suffix='€'
+            />
+
+            <Button
+              onClick={(e) => handleRemove(e, index)}
+              variant='ghost'
+              className='text-red-500 hover:text-red-700 p-0 h-auto mt-4'
+            >
+              <TrashIcon className='w-4 h-4' />
+            </Button>
+          </div>
+          <Separator className='mt-4' />
+        </Fragment>
       ))}
     </div>
   )
diff --git a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
index 3e4b242..9f56eec 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
@@ -64,7 +64,7 @@ export default function OsblFinanceSheet ({
       <form ref={formRef}>
         <SheetHeader>
           <SheetTitle>{title}</SheetTitle>
-          <SheetDescription>
+          <SheetDescription className='sr-only'>
             Renseignez les informations financières pour cette année.
           </SheetDescription>
         </SheetHeader>
@@ -155,11 +155,13 @@ export default function OsblFinanceSheet ({
             value={finance.employees_count ?? ''}
             onChange={(e) => onUpdate('employees_count', e.target.value)}
           />
+
+          <Separator />
         </div>
 
         <SheetFooter>
           <SheetClose asChild>
-            <Button onClick={(e) => handleSubmit(e)} variant='default' size='xl' className='mx-auto mt-32'>
+            <Button onClick={(e) => handleSubmit(e)} variant='default' size='lg' className='mx-auto mt-8'>
               <CheckIcon className='mr-2' />
               {submitLabel}
             </Button>

From 9dbe572739ab02f9e4555b3ee20addd9784d4fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Thu, 30 Jan 2025 16:45:46 +0000
Subject: [PATCH 12/31] Add error toast notification for form validation in
 contribution form

- Integrated Sonner toast library for displaying validation error messages
- Added error toast when form validation fails
- Improved user feedback for form submission errors
---
 app/frontend/pages/Contribution/New.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index ccf60fd..b906f83 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -14,6 +14,7 @@ import { CurrentUserType } from '@/types/types'
 import { FormData } from './types'
 import z from 'zod'
 import deepCleanData from '@/lib/deepCleanData'
+import { toast } from 'sonner'
 
 const MAX_LOGO_SIZE = 1 * 1024 * 1024 // 1MB
 const MAX_DOCUMENT_SIZE = 5 * 1024 * 1024 // 5MB
@@ -138,6 +139,8 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
       issues.forEach(issue => {
         setError(issue.path.join('.') as keyof FormData, issue.message)
       })
+
+      toast.error('Veuillez corriger les erreurs avant de continuer.')
       return
     }
 

From bd621d70dfffcea974f3a13796a99ae10737c96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Thu, 30 Jan 2025 19:39:56 +0000
Subject: [PATCH 13/31] Improve contribution form layout and add alert for
 better user guidance

- Adjusted header and button layout for improved responsiveness
- Uncommented and added an informative alert for contribution submission
- Added a second submit button at the bottom of the form for easier access
- Fine-tuned text and gap sizes for better mobile and desktop display
---
 app/frontend/pages/Contribution/New.tsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index b906f83..479be19 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -158,21 +158,21 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
       <Head title='Ajouter une association' />
 
       <form onKeyDown={avoidUnintentionalSubmission} onSubmit={submit} className='2xl:container mx-auto flex flex-col px-2 sm:px-8 md:px-16 pt-8 pb-16 gap-8'>
-        <div className='flex gap-16 items-center flex-wrap justify-center md:justify-start'>
-          <h1 className='font-semibold text-3xl'>Ajouter une association</h1>
+        <div className='flex gap-8 sm:gap-16 items-center flex-wrap justify-center md:justify-start'>
+          <h1 className='font-semibold text-2xl sm:text-3xl'>Ajouter une association</h1>
           <Button type='submit' disabled={processing} className='text-lg'>
             <Save className='mr-2' />
             Enregistrer
           </Button>
         </div>
-        {/* <Alert>
+        <Alert>
           <GoodIdea className='min-w-8 min-h-8' />
           <AlertDescription>
             Pour que votre contribution soit validée, le modérateur doit pouvoir
             vérifier les informations fournies. Facilitez son travail en
             indiquant clairement vos sources !
           </AlertDescription>
-        </Alert> */}
+        </Alert>
 
         <div className='flex flex-col pt-4 gap-8'>
           <div className='grid grid-cols-1 lg:grid-cols-2 gap-8'>
@@ -185,6 +185,10 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
             <OsblLocations data={data} setData={setData} />
           </div>
         </div>
+        <Button type='submit' disabled={processing} className='text-lg ml-auto mt-4 sm:mt-8'>
+          <Save className='mr-2' />
+          Enregistrer
+        </Button>
       </form>
     </>
   )

From f228b150b7e271bb993785ad6cf40fee6472d549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Fri, 31 Jan 2025 11:06:58 +0000
Subject: [PATCH 14/31] Improve form validation and error handling in
 contribution form

- Updated validation schema for more precise error messages
- Added visual error indicators for description length and cause selection
- Modified AnnualFinance model to exclude 'certified' field from validation
- Added validation for causes presence in Osbl model
- Refined error styling across various form components
---
 .../pages/contribution/new/OsblDataSheet.tsx      |  1 +
 .../pages/contribution/new/OsblFinance.tsx        |  2 +-
 .../pages/contribution/new/OsblHeader.tsx         |  8 +++++---
 app/frontend/pages/Contribution/New.tsx           | 15 ++++++---------
 app/models/annual_finance.rb                      |  2 +-
 app/models/osbl.rb                                |  3 ++-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
index 82ad2e5..0e4340d 100644
--- a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
@@ -76,6 +76,7 @@ export default function OsblDataSheet ({ data, setData, errors, clearErrors }: F
             variant='secondary'
             animation={0}
             maxCount={1}
+            className={errors.osbls_causes_attributes !== undefined ? 'border-red-600' : ''}
           />
           {Boolean(errors.osbls_causes_attributes) && <InputError>{errors.osbls_causes_attributes}</InputError>}
         </div>
diff --git a/app/frontend/components/pages/contribution/new/OsblFinance.tsx b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
index d081ea8..0a8bc83 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinance.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
@@ -168,7 +168,7 @@ export default function OsblFinance ({ data, setData, errors, clearErrors, setEr
 
               return (
                 <Sheet key={`finance-${index}`}>
-                  <div className={`flex items-center justify-between p-4 border rounded-lg ${hasError ? 'bg-red-50 border-red-500' : 'bg-white'}`}>
+                  <div className={`flex items-center justify-between p-4 border rounded-lg ${hasError ? 'bg-red-50 border-red-600' : 'bg-white'}`}>
                     <p>{finance.year}</p>
                     <div className='flex gap-2'>
                       <SheetTrigger asChild>
diff --git a/app/frontend/components/pages/contribution/new/OsblHeader.tsx b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
index 0e73db1..6aca378 100644
--- a/app/frontend/components/pages/contribution/new/OsblHeader.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
@@ -7,6 +7,8 @@ import HelpTooltip from '@/components/shared/HelpTooltip'
 import MyFileInput from '@/components/shared/MyFileInput'
 
 export default function OsblHeader ({ data, setData, errors, clearErrors }: FormProps): ReactElement {
+  const descriptionLength = (data.description ?? '').length
+
   return (
     <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full'>
       <h2 className='text-2xl font-semibold'>En-tête</h2>
@@ -69,10 +71,10 @@ export default function OsblHeader ({ data, setData, errors, clearErrors }: Form
                 setData('description', e.target.value)
                 clearErrors('description')
               }}
-              className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-auto flex-grow h-40'
+              className={`bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-auto flex-grow h-40 ${descriptionLength > 300 ? 'border-red-600' : ''}`}
             />
-            <div className={`text-xs text-right ${(data.description ?? '').length > 300 ? 'text-red-600' : 'text-gray-500'}`}>
-              {(data.description ?? '').length}/300 caractères
+            <div className={`text-xs text-right ${descriptionLength > 300 ? 'text-red-600' : 'text-gray-500'}`}>
+              {descriptionLength}/300 caractères
             </div>
           </div>
         </div>
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index 479be19..6253383 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -32,9 +32,8 @@ const validation = z.object({
     }, 'Le type de fichier est invalide. Format accepté : SVG, PNG, WEBP.')
     .optional(),
   description: z.string().max(300).optional(),
-  osbls_causes_attributes: z.array(z.object({ cause_id: z.string() }), { message: 'Au moins une cause est requise.' }),
-  contact_email: z.string().email({ message: 'Veuillez entrer une adresse email valide.' }).optional(),
-  tax_reduction: z.enum(['intérêt_général', 'aide_aux_personnes_en_difficulté'], { message: 'La réduction d\'impôt accordée doit être de 66 % ou 75 %.' }),
+  osbls_causes_attributes: z.array(z.object({ cause_id: z.string() })).min(1, { message: 'Au moins une cause est requise.' }),
+  tax_reduction: z.enum(['intérêt_général', 'aide_aux_personnes_en_difficulté'], { message: 'Veuillez sélectionner un pourcentage.' }),
   annual_finances_attributes: z.array(
     z.object({
       year: z.string({ message: 'Veuillez entrer une année.' })
@@ -44,7 +43,6 @@ const validation = z.object({
           const yearNum = Number(year)
           return yearNum <= new Date().getFullYear()
         }, { message: 'L\'année ne peut pas être dans le futur.' }),
-      certified: z.boolean().optional(),
       budget: z.string().optional(),
       treasury: z.string().optional(),
       employees_count: z.string().optional(),
@@ -91,10 +89,9 @@ const validation = z.object({
           path: ['total_percent']
         })
     }).refine((finance) => {
-      if (finance === undefined || Object.keys(finance).length === 0) return true
-      // If only year is present, Object.keys will return length of 1
+      const financeCleaned = deepCleanData(finance)
       // We want at least one other field besides year
-      return !(Object.keys(finance).length === 1 && finance.year !== undefined)
+      return !(Object.keys(financeCleaned).length === 1 && financeCleaned.year !== undefined)
     }, {
       message: 'Complétez les comptes pour cette année.',
       path: ['missing_information']
@@ -132,8 +129,8 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
     e.preventDefault()
 
     transform((data) => (deepCleanData(data)))
-    // const result = validation.safeParse(data) as { success: boolean, error: z.ZodError }
-    const result = validation.safeParse(deepCleanData(data)) as { success: boolean, error: z.ZodError }
+    const result = validation.safeParse(data) as { success: boolean, error: z.ZodError }
+    // const result = validation.safeParse(deepCleanData(data)) as { success: boolean, error: z.ZodError }
     if (!result.success) {
       const issues = result.error.issues
       issues.forEach(issue => {
diff --git a/app/models/annual_finance.rb b/app/models/annual_finance.rb
index 5ae4b30..dbf1deb 100644
--- a/app/models/annual_finance.rb
+++ b/app/models/annual_finance.rb
@@ -18,7 +18,7 @@ def at_least_one_information
     return if fund_sources.any?
     return if fund_allocations.any?
 
-    attributes_to_check = attributes.except("id", "year", "osbl_id", "created_at", "updated_at")
+    attributes_to_check = attributes.except("id", "year", "osbl_id", "created_at", "updated_at", "certified")
     if attributes_to_check.values.all?(&:blank?)
       errors.add(:base, "Au moins une information est requise en plus de l'année.")
     end
diff --git a/app/models/osbl.rb b/app/models/osbl.rb
index 29b3623..eed86c3 100644
--- a/app/models/osbl.rb
+++ b/app/models/osbl.rb
@@ -48,7 +48,7 @@ class Osbl < ApplicationRecord
 
   validates :name, presence: true, uniqueness: true
   validates :website, uniqueness: true, allow_nil: true
-  validates :description, length: {maximum: 300}, allow_nil: true
+  validates :description, length: {maximum: 300}, allow_nil: true # TODO: enforce this at db level once we're sure it's enough
   validates :creation_year, numericality: {less_than_or_equal_to: Time.current.year}, allow_nil: true
   # validates :contact_email, format: { with: URI::MailTo::EMAIL_REGEXP }, allow_nil: true
   validates_attachment(
@@ -56,6 +56,7 @@ class Osbl < ApplicationRecord
     max_size: 1.megabytes,
     content_types: %w[image/png image/svg image/webp]
   )
+  validates :osbls_causes, presence: {message: "Au moins une cause est requise."}
 
   accepts_nested_attributes_for :osbls_causes # , allow_destroy: true
   accepts_nested_attributes_for :osbls_labels # , allow_destroy: true

From 6e6048aa0f5967d575f8b2524a0f4f03694ad2c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Sat, 1 Feb 2025 17:12:07 +0000
Subject: [PATCH 15/31] Refactor OSBL documents section with dynamic
 sheet-based editing

- Introduced OsblDocumentSheet component for detailed document management
- Replaced complex card-based document form with a more user-friendly sheet interface
- Improved document type handling and validation
- Added dynamic document display with edit and remove functionality
- Enhanced file input and additional information sections
- Updated form validation to support more precise document entry requirements
---
 .../contribution/new/OsblDocumentSheet.tsx    | 206 ++++++++++++++++
 .../pages/contribution/new/OsblDocuments.tsx  | 233 +++++++-----------
 .../pages/contribution/new/OsblFinance.tsx    |   8 +-
 .../contribution/new/OsblFinanceSheet.tsx     |   2 +-
 .../components/shared/MyFileInput.tsx         |   6 +-
 app/frontend/pages/Contribution/New.tsx       |  26 +-
 6 files changed, 327 insertions(+), 154 deletions(-)
 create mode 100644 app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx

diff --git a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
new file mode 100644
index 0000000..5f573de
--- /dev/null
+++ b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
@@ -0,0 +1,206 @@
+import { ReactElement, RefObject, useRef } from 'react'
+import { Document } from '@/pages/Contribution/types'
+import { Button } from '@/components/ui/button'
+import MyInput from '@/components/forms/MyInput'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue
+} from '@/components/ui/select'
+import MyNumberInput from '@/components/forms/MyNumberInput'
+import { Textarea } from '@/components/ui/textarea'
+import MyFileInput from '@/components/shared/MyFileInput'
+import { CheckIcon, ChevronDown } from 'lucide-react'
+import {
+  SheetClose,
+  SheetContent,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetDescription
+} from '@/components/ui/sheet'
+import InputError from '@/components/forms/InputError'
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger
+} from '@/components/ui/collapsible'
+import { Label } from '@/components/ui/label'
+
+interface Props {
+  document: Partial<Document>
+  index: number
+  errors: Record<string, string>
+  onUpdate: (attribute: keyof Document, value: any) => void
+  submitLabel?: string
+  title?: string
+}
+
+const DocumentTypeList = [
+  { value: 'statuts', label: 'Statuts' },
+  { value: 'rapport_activite', label: "Rapport d'activité" },
+  { value: 'rapport_financier', label: 'Rapport financier' },
+  { value: 'proces_verbal', label: 'Procès verbal' },
+  { value: 'autre', label: 'Autre' }
+]
+
+export default function OsblDocumentSheet ({
+  document,
+  index,
+  errors,
+  onUpdate,
+  submitLabel = 'Valider',
+  title = 'Document'
+}: Props): ReactElement {
+  const formRef = useRef<HTMLFormElement>(null) as React.RefObject<HTMLFormElement>
+  const inputRef = useRef<HTMLInputElement>(null)
+
+  function handleSubmit (e: React.MouseEvent<HTMLButtonElement>): void {
+    if (!formRef.current.reportValidity()) {
+      e.preventDefault()
+    }
+  }
+
+  return (
+    <SheetContent className='w-full sm:max-w-[600px] overflow-y-auto'>
+      <form ref={formRef}>
+        <SheetHeader>
+          <SheetTitle>{title}</SheetTitle>
+          <SheetDescription className='sr-only'>
+            Renseignez les informations du document.
+          </SheetDescription>
+        </SheetHeader>
+
+        <div className='flex flex-col gap-8 mt-8'>
+          <div className='flex flex-col gap-4'>
+            <Label>Type de document *</Label>
+            <Select
+              value={document.type}
+              onValueChange={(value) => onUpdate('type', value)}
+              required
+            >
+              <SelectTrigger className='w-full'>
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                {DocumentTypeList.map((type) => (
+                  <SelectItem key={type.value} value={type.value}>
+                    {type.label}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+            {errors[`document_attachments_attributes.${index}.document_attributes.type`] !== undefined && (
+              <InputError>
+                {errors[`document_attachments_attributes.${index}.document_attributes.type`]}
+              </InputError>
+            )}
+          </div>
+
+          {['rapport_activite', 'rapport_financier'].includes(document.type ?? '') && (
+            <MyNumberInput
+              labelText='Année *'
+              id={`document-year-${index}`}
+              min={1000}
+              max={new Date().getFullYear()}
+              value={document.year ?? ''}
+              onChange={(e) => onUpdate('year', e.target.value)}
+              required
+              error={errors[`document_attachments_attributes.${index}.document_attributes.year`]}
+            />
+          )}
+
+          {['proces_verbal', 'autre'].includes(document.type ?? '') && (
+            <MyInput
+              labelText='Nom du document *'
+              id={`document-name-${index}`}
+              type='string'
+              value={document.name ?? ''}
+              onChange={(e) => onUpdate('name', e.target.value)}
+              required
+              error={errors[`document_attachments_attributes.${index}.document_attributes.name`]}
+            />
+          )}
+
+          <div className='flex flex-col gap-2'>
+            <MyFileInput
+              ref={inputRef as RefObject<HTMLInputElement>}
+              labelText='Fichier *'
+              id={`document-file-${index}`}
+              placeholder='Sélectionner un fichier *'
+              onChange={(e) => onUpdate('file', e.target.files?.[0])}
+              accept='.pdf'
+              required
+              error={errors[`document_attachments_attributes.${index}.document_attributes.file`]}
+            />
+            {
+              document.file !== undefined && (inputRef.current?.files?.[0] === undefined) && (
+                <div className='flex items-center gap-2 justify-center'>
+                  <CheckIcon className='text-primary' />
+                  <p className='text-sm text-muted-foreground'>{document.file.name}</p>
+                </div>
+              )
+            }
+          </div>
+
+          <Collapsible>
+            <CollapsibleTrigger asChild>
+              <div className='flex justify-between items-center cursor-pointer text-muted-foreground hover:text-muted-foreground/80'>
+                <span>Informations additionnelles</span>
+                <ChevronDown className='h-4 w-4' />
+              </div>
+            </CollapsibleTrigger>
+            <CollapsibleContent className='mt-8 flex flex-col gap-8'>
+              {!['proces_verbal', 'autre'].includes(document.type ?? '') && (
+                <MyInput
+                  labelText='Nom du document'
+                  id={`document-name-${index}`}
+                  type='string'
+                  value={document.name ?? ''}
+                  onChange={(e) => onUpdate('name', e.target.value)}
+                />
+              )}
+
+              {!['rapport_activite', 'rapport_financier'].includes(document.type ?? '') && (
+                <MyNumberInput
+                  id={`document-year-${index}`}
+                  labelText='Année'
+                  min={1000}
+                  max={new Date().getFullYear()}
+                  value={document.year ?? ''}
+                  onChange={(e) => onUpdate('year', e.target.value)}
+                />
+              )}
+
+              <div className='space-y-2'>
+                <label htmlFor={`document-description-${index}`} className='text-sm font-medium'>
+                  Description du document
+                </label>
+                <Textarea
+                  id={`document-description-${index}`}
+                  value={document.description ?? ''}
+                  onChange={(e) => onUpdate('description', e.target.value)}
+                  className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-full h-40'
+                />
+                <div className={`text-xs text-right ${(document.description ?? '').length > 300 ? 'text-red-600' : 'text-gray-500'}`}>
+                  {(document.description ?? '').length}/300 caractères
+                </div>
+              </div>
+            </CollapsibleContent>
+          </Collapsible>
+        </div>
+
+        <SheetFooter>
+          <SheetClose asChild>
+            <Button onClick={(e) => handleSubmit(e)} variant='default' size='lg' className='mx-auto mt-8'>
+              <CheckIcon className='mr-2' />
+              {submitLabel}
+            </Button>
+          </SheetClose>
+        </SheetFooter>
+      </form>
+    </SheetContent>
+  )
+}
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index 2f06894..7897dd1 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -1,38 +1,31 @@
 import { ReactElement } from 'react'
 import { FormProps, Document } from '@/pages/Contribution/types'
 import { Button } from '@/components/ui/button'
-import { PlusIcon, TrashIcon, ChevronDown } from 'lucide-react'
-import MyInput from '@/components/forms/MyInput'
+import { PlusIcon, TrashIcon, PencilIcon } from 'lucide-react'
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue
-} from '@/components/ui/select'
-import MyNumberInput from '@/components/forms/MyNumberInput'
-import { Textarea } from '@/components/ui/textarea'
-import { Card, CardContent, CardHeader } from '@/components/ui/card'
-import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
-import MyFileInput from '@/components/shared/MyFileInput'
+  Sheet,
+  SheetTrigger
+} from '@/components/ui/sheet'
+import OsblDocumentSheet from './OsblDocumentSheet'
 
 const DocumentTypeList = [
   { value: 'statuts', label: 'Statuts' },
-  { value: 'rapport_activite', label: 'Rapport d\'activité' },
+  { value: 'rapport_activite', label: "Rapport d'activité" },
   { value: 'rapport_financier', label: 'Rapport financier' },
   { value: 'proces_verbal', label: 'Procès verbal' },
   { value: 'autre', label: 'Autre' }
 ]
 
-export default function OsblDocuments ({ data, setData, errors, clearErrors }: FormProps): ReactElement {
+export default function OsblDocuments ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
   const documents = data.document_attachments_attributes ?? []
+  const newDocumentIndex = documents.length - 1
 
-  function handleDocumentChange (
+  function updateDocumentAttribute (
     index: number,
     field: keyof Document,
     value: Document[typeof field]
   ): void {
-    const updatedDocuments = documents.map((doc, i: number) =>
+    const updatedDocuments = documents.map((doc, i) =>
       i === index
         ? {
             ...doc,
@@ -46,17 +39,27 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors }: F
 
     setData('document_attachments_attributes', updatedDocuments)
 
-    if (field === 'file' && value instanceof File) {
-      clearErrors(`document_attachments_attributes.${index}.document_attributes.file`)
-    }
+    clearErrors(`document_attachments_attributes.${index}.document_attributes.${field}`)
+    // if (field === 'file') {
+    //   clearErrors(`document_attachments_attributes.${index}.document_attributes.file`)
+    // }
+
+    // if (field === 'type') {
+    //   clearErrors(`document_attachments_attributes.${index}.document_attributes.type`)
+    // }
   }
 
-  function handleAdd (e: React.MouseEvent<HTMLButtonElement>): void {
-    e.preventDefault()
-    setData('document_attachments_attributes', [...documents, { document_attributes: {} }])
+  function handleDocumentAdd (): void {
+    const lastDocument = documents[newDocumentIndex]
+    const isLastDocumentEmpty = lastDocument !== undefined &&
+      (!lastDocument.document_attributes || Object.keys(lastDocument.document_attributes).length === 0)
+
+    if (!isLastDocumentEmpty) {
+      setData('document_attachments_attributes', [...documents, { document_attributes: {} }])
+    }
   }
 
-  function handleRemove (
+  function handleDocumentRemove (
     e: React.MouseEvent<HTMLButtonElement>,
     index: number
   ): void {
@@ -65,131 +68,79 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors }: F
     setData('document_attachments_attributes', updatedDocuments)
   }
 
+  function getDocumentDisplayName (document: Document): string {
+    if (['rapport_activite', 'rapport_financier'].includes(document?.type ?? '')) {
+      return `${DocumentTypeList.find(type => type.value === document?.type)?.label ?? ''} ${document?.year ?? ''}`
+    }
+
+    if (document?.name !== undefined && document?.name !== '') {
+      return document?.name
+    }
+
+    return document?.type ?? ''
+  }
+
   return (
     <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full h-full'>
       <div className='flex flex-wrap gap-4 items-center justify-between'>
         <h2 className='text-2xl font-semibold w-[145px]'>Documents</h2>
-        <Button onClick={handleAdd} variant='outline'>
-          <PlusIcon className='w-4 h-4' />
-          <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
-        </Button>
+        <Sheet>
+          <SheetTrigger asChild>
+            <Button onClick={handleDocumentAdd} variant='outline'>
+              <PlusIcon className='w-4 h-4' />
+              <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
+            </Button>
+          </SheetTrigger>
+          <OsblDocumentSheet
+            document={documents[newDocumentIndex]?.document_attributes ?? {}}
+            index={newDocumentIndex}
+            errors={errors}
+            onUpdate={(attribute, value) => updateDocumentAttribute(newDocumentIndex, attribute, value)}
+          />
+        </Sheet>
       </div>
 
-      {documents.length > 0 && (
+      {documents.filter(doc => Object.keys(doc.document_attributes).length > 0).length > 0 && (
         <div className='flex flex-col gap-4'>
-          {documents.map((doc, index) => (
-            <Card
-              key={`document-${doc.document_attributes?.type ?? 'new'}-${index}`}
-              className='bg-background'
-            >
-              <CardHeader className='flex flex-row items-center justify-between space-y-0 pb-2'>
-                <div className='flex items-center gap-16 flex-1'>
-                  <Select
-                    value={doc.document_attributes?.type}
-                    onValueChange={(value) => handleDocumentChange(index, 'type', value)}
-                    required
-                  >
-                    <SelectTrigger className='w-60 data-[placeholder]:text-muted-foreground'>
-                      <SelectValue placeholder='Type de document *' />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {DocumentTypeList.map((type) => (
-                        <SelectItem key={type.value} value={type.value}>
-                          {type.label}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </Select>
-
-                  <Button
-                    onClick={(e) => handleRemove(e, index)}
-                    variant='ghost'
-                    className='text-red-500 hover:text-red-700 p-0 h-auto'
-                  >
-                    <TrashIcon className='w-4 h-4' />
-                  </Button>
-                </div>
-              </CardHeader>
-
-              <CardContent className='flex flex-col gap-4'>
-                {['rapport_activite', 'rapport_financier'].includes(doc.document_attributes?.type ?? '') && (
-                  <MyNumberInput
-                    id={`document-year-${index}`}
-                    min={1000}
-                    max={new Date().getFullYear()}
-                    value={doc.document_attributes?.year ?? ''}
-                    onChange={(e) => handleDocumentChange(index, 'year', e.target.value)}
-                    placeholder='Année *'
-                    required
-                  />
-                )}
-
-                {['proces_verbal', 'autre'].includes(doc.document_attributes?.type ?? '') && (
-                  <MyInput
-                    type='string'
-                    id={`document-name-${index}`}
-                    placeholder='Nom du document *'
-                    value={doc.document_attributes?.name ?? ''}
-                    onChange={(e) => handleDocumentChange(index, 'name', e.target.value)}
-                    required
-                  />
-                )}
-
-                <MyFileInput
-                  id={`document-file-${index}`}
-                  placeholder='Sélectionner un fichier *'
-                  onChange={(e) => handleDocumentChange(index, 'file', e.target.files?.[0])}
-                  accept='.pdf'
-                  required
-                  error={errors[`document_attachments_attributes.${index}.document_attributes.file`]}
-                />
-                <Collapsible>
-                  <CollapsibleTrigger className='flex items-center gap-2 text-sm text-muted-foreground hover:text-foreground transition-colors'>
-                    <ChevronDown className='h-4 w-4' />
-                    Informations additionnelles
-                  </CollapsibleTrigger>
-
-                  <CollapsibleContent className='space-y-4 pt-4'>
-                    {!['proces_verbal', 'autre'].includes(doc.document_attributes?.type ?? '') && (
-                      <MyInput
-                        type='string'
-                        id={`document-name-${index}`}
-                        value={doc.document_attributes?.name ?? ''}
-                        onChange={(e) => handleDocumentChange(index, 'name', e.target.value)}
-                        placeholder='Nom du document'
-                      />
-                    )}
-
-                    {!['rapport_activite', 'rapport_financier'].includes(doc.document_attributes?.type ?? '') && (
-                      <MyNumberInput
-                        id={`document-year-${index}`}
-                        min={1000}
-                        max={new Date().getFullYear()}
-                        value={doc.document_attributes?.year ?? ''}
-                        onChange={(e) => handleDocumentChange(index, 'year', e.target.value)}
-                        placeholder='Année'
-                      />
-                    )}
-
-                    <div className='flex flex-col gap-2'>
-                      <Textarea
-                        id={`document-description-${index}`}
-                        placeholder='Description du document'
-                        value={doc.document_attributes?.description ?? ''}
-                        onChange={(e) => {
-                          handleDocumentChange(index, 'description', e.target.value)
-                        }}
-                        className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-full h-40'
-                      />
-                      <div className={`text-xs text-right ${(doc.document_attributes?.description ?? '').length > 300 ? 'text-red-600' : 'text-gray-500'}`}>
-                        {(doc.document_attributes?.description ?? '').length}/300 caractères
-                      </div>
+          {documents
+            .filter(doc => Object.keys(doc.document_attributes).length > 0)
+            .map((doc, index) => {
+              const hasError = errors[`document_attachments_attributes.${index}.document_attributes.type`] != null ||
+                           errors[`document_attachments_attributes.${index}.document_attributes.file`] != null ||
+                           doc.document_attributes.type === undefined ||
+                           doc.document_attributes.file === undefined ||
+                           errors[`document_attachments_attributes.${index}.document_attributes.year`] != null ||
+                           errors[`document_attachments_attributes.${index}.document_attributes.missing_name`] != null
+
+              return (
+                <Sheet key={`document-${index}`}>
+                  <div className={`flex items-center justify-between p-4 border rounded-lg ${hasError ? 'bg-red-50 border-red-600' : 'bg-white'}`}>
+                    <p>{getDocumentDisplayName(doc.document_attributes)}</p>
+                    <div className='flex gap-2 '>
+                      <SheetTrigger asChild>
+                        <Button variant='outline' className='bg-white text-primary border-none'>
+                          <PencilIcon />
+                        </Button>
+                      </SheetTrigger>
+                      <Button
+                        onClick={(e) => handleDocumentRemove(e, index)}
+                        variant='outline'
+                        className='bg-white text-red-500 border-none'
+                      >
+                        <TrashIcon className='w-4 h-4' />
+                      </Button>
                     </div>
-                  </CollapsibleContent>
-                </Collapsible>
-              </CardContent>
-            </Card>
-          ))}
+                  </div>
+
+                  <OsblDocumentSheet
+                    document={doc.document_attributes ?? {}}
+                    index={index}
+                    errors={errors}
+                    onUpdate={(attribute, value) => updateDocumentAttribute(index, attribute, value)}
+                  />
+                </Sheet>
+              )
+            })}
         </div>
       )}
     </div>
diff --git a/app/frontend/components/pages/contribution/new/OsblFinance.tsx b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
index 0a8bc83..b5982f3 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinance.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
@@ -14,23 +14,23 @@ export default function OsblFinance ({ data, setData, errors, clearErrors, setEr
   const finances = data.annual_finances_attributes ?? []
   const newFinanceIndex = finances.length - 1
 
-  function updateFinanceAttribute (index: number, attribute: keyof AnnualFinance, value: any): void {
+  function updateFinanceAttribute (index: number, field: keyof AnnualFinance, value: any): void {
     const updatedFinances = finances.map((finance, i) =>
       i === index
         ? {
             ...finance,
-            [attribute]: value
+            [field]: value
           }
         : finance
     )
 
     setData('annual_finances_attributes', updatedFinances)
 
-    if (attribute !== 'year') {
+    if (field !== 'year') {
       clearErrors(`annual_finances_attributes.${index}.missing_information`)
     }
 
-    if (attribute === 'year') {
+    if (field === 'year') {
       clearErrors(`annual_finances_attributes.${index}.year`)
       clearErrors(`annual_finances_attributes.${index}.missing_information`)
 
diff --git a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
index 9f56eec..6b81bd9 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
@@ -69,7 +69,7 @@ export default function OsblFinanceSheet ({
           </SheetDescription>
         </SheetHeader>
 
-        <div className='flex flex-col gap-8 mt-6'>
+        <div className='flex flex-col gap-8 mt-8'>
           <MyNumberInput
             autoFocus
             id={`year-${index}`}
diff --git a/app/frontend/components/shared/MyFileInput.tsx b/app/frontend/components/shared/MyFileInput.tsx
index 82aa8f5..a98ae05 100644
--- a/app/frontend/components/shared/MyFileInput.tsx
+++ b/app/frontend/components/shared/MyFileInput.tsx
@@ -10,6 +10,7 @@ interface MyFileInputProps {
   error?: string
   onChange: (e: React.ChangeEvent<HTMLInputElement>) => void
   placeholder?: string
+  ref?: React.RefObject<HTMLInputElement>
 }
 
 export default function MyFileInput ({
@@ -19,9 +20,10 @@ export default function MyFileInput ({
   required,
   error,
   onChange,
-  placeholder = 'Sélectionner un fichier'
+  placeholder = 'Sélectionner un fichier',
+  ref
 }: MyFileInputProps): ReactElement {
-  const inputRef = useRef<HTMLInputElement>(null)
+  const inputRef = ref ?? useRef<HTMLInputElement>(null)
 
   const handleReset = (): void => {
     if (inputRef.current != null) {
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index 6253383..12c7daf 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -34,7 +34,7 @@ const validation = z.object({
   description: z.string().max(300).optional(),
   osbls_causes_attributes: z.array(z.object({ cause_id: z.string() })).min(1, { message: 'Au moins une cause est requise.' }),
   tax_reduction: z.enum(['intérêt_général', 'aide_aux_personnes_en_difficulté'], { message: 'Veuillez sélectionner un pourcentage.' }),
-  annual_finances_attributes: z.array(
+  annual_finances_attributes: z.preprocess((finances) => deepCleanData(finances), z.array(
     z.object({
       year: z.string({ message: 'Veuillez entrer une année.' })
         .regex(/^\d{4}$/, { message: 'L\'année doit contenir exactement 4 chiffres.' })
@@ -104,16 +104,30 @@ const validation = z.object({
     }, {
       message: 'Une année ne peut être ajoutée qu\'une seule fois.',
       path: ['duplicate_years']
-    }),
+    })),
   document_attachments_attributes: z.array(z.object({
-    document_attributes: z.object({
-      file: z.instanceof(File)
+    document_attributes: z.preprocess((document) => deepCleanData(document), z.object({
+      type: z.string({ message: 'Champs requis.' }),
+      file: z.instanceof(File, { message: 'Champs requis.' })
         .refine((file) => {
           return file.size <= MAX_DOCUMENT_SIZE
         }, 'La taille du fichier doit être inférieure à 5 MB.')
         .refine((file) => {
           return ALLOWED_DOCUMENT_TYPES.includes(file.type)
-        }, 'Le type de fichier est invalide. Format accepté : PDF.')
+        }, 'Le type de fichier est invalide. Format accepté : PDF.'),
+      year: z.string().optional()
+    }).optional()).refine((document) => {
+      if (document === undefined) return true
+      return !['rapport_activite', 'rapport_financier'].includes(document.type) || document.year !== undefined
+    }, {
+      message: 'L\'année est requise pour ce type de document.',
+      path: ['year']
+    }).refine((document) => {
+      if (document === undefined) return true
+      return !['autre', 'proces_verbal'].includes(document.type) || document.name !== undefined
+    }, {
+      message: 'Le nom du document est requis pour ce type de document.',
+      path: ['name']
     })
   })).optional()
 })
@@ -178,7 +192,7 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
           </div>
           <div className='grid grid-cols-1 lg:grid-cols-3 gap-8'>
             <OsblFinance data={data} setData={setData} errors={errors} clearErrors={clearErrors} setError={(field, message) => setError(field as keyof FormData, message)} />
-            <OsblDocuments data={data} setData={setData} errors={errors} clearErrors={clearErrors} />
+            <OsblDocuments data={data} setData={setData} errors={errors} clearErrors={clearErrors} setError={(field, message) => setError(field as keyof FormData, message)} />
             <OsblLocations data={data} setData={setData} />
           </div>
         </div>

From 250b724fc6669e444ee70bb80e47565238a8638e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Sun, 2 Feb 2025 14:32:02 +0000
Subject: [PATCH 16/31] Enhance MyInput and file input components with improved
 type safety and UX

- Refactored MyInput to support more flexible input attributes
- Updated MyFileInput to use new MyInput component
- Added reset button functionality for file and text inputs
- Extracted document type list to a constants file
- Improved type definitions for form components
- Simplified document handling in various form sections
---
 app/frontend/components/forms/MyInput.tsx     |  60 ++++---
 .../pages/contribution/new/OsblDataSheet.tsx  |   2 +-
 .../contribution/new/OsblDocumentSheet.tsx    | 157 ++++++++++--------
 .../pages/contribution/new/OsblDocuments.tsx  | 101 ++++-------
 .../pages/contribution/new/OsblHeader.tsx     |   6 +-
 .../pages/user/show/UserAvatarEdit.tsx        |   6 +-
 .../components/shared/MyFileInput.tsx         |  86 +++++-----
 app/frontend/lib/constants.ts                 |   7 +
 app/frontend/pages/Contribution/New.tsx       |  29 +---
 app/frontend/pages/Contribution/types.ts      |   6 +-
 10 files changed, 216 insertions(+), 244 deletions(-)
 create mode 100644 app/frontend/lib/constants.ts

diff --git a/app/frontend/components/forms/MyInput.tsx b/app/frontend/components/forms/MyInput.tsx
index b295e7f..30ecf37 100644
--- a/app/frontend/components/forms/MyInput.tsx
+++ b/app/frontend/components/forms/MyInput.tsx
@@ -2,16 +2,13 @@ import { ReactElement, ReactNode } from 'react'
 import { Label } from '@/components/ui/label'
 import { Input } from '@/components/ui/input'
 import InputError from '@/components/forms/InputError'
+import { X } from 'lucide-react'
 
-interface BaseMyInputProps {
-  type: string
-  required?: boolean
-  disabled?: boolean
-  value?: string
-  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void
-  autoFocus?: boolean
+interface BaseMyInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
   error?: string
-  id: string
+  ref?: React.Ref<HTMLInputElement>
+  showResetButton?: boolean
+  onReset?: () => void
 }
 
 interface WithLabel extends BaseMyInputProps {
@@ -20,35 +17,52 @@ interface WithLabel extends BaseMyInputProps {
 }
 
 interface WithoutLabel extends BaseMyInputProps {
-  labelText?: undefined
+  labelText: never
   placeholder: string
 }
 
 type MyInputProps = WithLabel | WithoutLabel
 
-export default function MyInput (props: MyInputProps): ReactElement {
-  const { id, labelText, type, required, disabled, value, onChange, placeholder, autoFocus, error } = props
+export default function MyInput ({
+  id,
+  labelText,
+  error,
+  placeholder,
+  className,
+  ref,
+  showResetButton = false,
+  onReset,
+  ...props
+}: MyInputProps): ReactElement {
   const errorClass = (error !== null && error !== undefined && error !== '') ? 'border-red-600' : ''
 
   return (
-    <div className='flex flex-col'>
+    <div className='flex flex-col gap-4'>
       {
         (labelText !== undefined && labelText !== '')
           ? <Label htmlFor={id}>{labelText}</Label>
           : <Label htmlFor={id} className='sr-only'>{placeholder}</Label>
       }
 
-      <Input
-        id={id}
-        type={type}
-        required={required}
-        disabled={disabled}
-        value={value}
-        onChange={onChange}
-        placeholder={placeholder}
-        autoFocus={autoFocus}
-        className={`bg-white mt-4 focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 ${errorClass}`}
-      />
+      <div className='relative'>
+        <Input
+          id={id}
+          placeholder={placeholder}
+          className={`bg-white focus-visible:ring-0 focus-visible:border-primary focus:border-primary focus:outline-none placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 ${errorClass} ${className ?? ''} ${showResetButton ? 'pr-10' : ''}`}
+          {...props}
+          ref={ref}
+        />
+        {showResetButton && (onReset != null) && (
+          <button
+            type='button'
+            onClick={onReset}
+            className='absolute right-2 top-1/2 -translate-y-1/2 rounded-full p-1 hover:bg-gray-100'
+            aria-label='Reset input value'
+          >
+            <X className='h-4 w-4 text-gray-500' />
+          </button>
+        )}
+      </div>
       {Boolean(error) && <InputError>{error}</InputError>}
     </div>
   )
diff --git a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
index 0e4340d..08d4aab 100644
--- a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
@@ -50,7 +50,7 @@ const OsblTypeList = [
   { value: 'fondation', label: 'Fondation' }
 ]
 
-export default function OsblDataSheet ({ data, setData, errors, clearErrors }: FormProps): ReactElement {
+export default function OsblDataSheet ({ data, setData, errors, clearErrors }: Omit<FormProps, 'setError'>): ReactElement {
   const causes = usePage().props.causes as Record<string, number>
   const labels = usePage().props.labels as Array<{ value: string, label: string }>
 
diff --git a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
index 5f573de..da8c291 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
@@ -1,5 +1,5 @@
-import { ReactElement, RefObject, useRef } from 'react'
-import { Document } from '@/pages/Contribution/types'
+import { ReactElement, useRef, useState } from 'react'
+import { Document, FormProps } from '@/pages/Contribution/types'
 import { Button } from '@/components/ui/button'
 import MyInput from '@/components/forms/MyInput'
 import {
@@ -21,53 +21,84 @@ import {
   SheetTitle,
   SheetDescription
 } from '@/components/ui/sheet'
-import InputError from '@/components/forms/InputError'
 import {
   Collapsible,
   CollapsibleContent,
   CollapsibleTrigger
 } from '@/components/ui/collapsible'
 import { Label } from '@/components/ui/label'
+import deepCleanData from '@/lib/deepCleanData'
+import { z } from 'zod'
+import { DocumentTypeList } from '@/lib/constants'
 
-interface Props {
+interface Props extends Omit<FormProps, 'data' | 'setData'> {
   document: Partial<Document>
   index: number
-  errors: Record<string, string>
-  onUpdate: (attribute: keyof Document, value: any) => void
-  submitLabel?: string
-  title?: string
+  onUpdate: (document: Document) => void
 }
 
-const DocumentTypeList = [
-  { value: 'statuts', label: 'Statuts' },
-  { value: 'rapport_activite', label: "Rapport d'activité" },
-  { value: 'rapport_financier', label: 'Rapport financier' },
-  { value: 'proces_verbal', label: 'Procès verbal' },
-  { value: 'autre', label: 'Autre' }
-]
+const MAX_DOCUMENT_SIZE = 5 * 1024 * 1024 // 5MB
+const ALLOWED_DOCUMENT_TYPES = ['application/pdf']
+
+const documentValidation = z.object({
+  file: z.instanceof(File)
+    .refine((file) => {
+      return file.size <= MAX_DOCUMENT_SIZE
+    }, 'La taille du fichier doit être inférieure à 5 MB.')
+    .refine((file) => {
+      return ALLOWED_DOCUMENT_TYPES.includes(file.type)
+    }, 'Le type de fichier est invalide. Format accepté : PDF.')
+})
 
 export default function OsblDocumentSheet ({
   document,
   index,
-  errors,
   onUpdate,
-  submitLabel = 'Valider',
-  title = 'Document'
+  errors,
+  clearErrors,
+  setError
 }: Props): ReactElement {
-  const formRef = useRef<HTMLFormElement>(null) as React.RefObject<HTMLFormElement>
-  const inputRef = useRef<HTMLInputElement>(null)
+  const formRef = useRef<HTMLFormElement>(null)
+  const [sheetDocument, setSheetDocument] = useState<Partial<Document>>(document)
+  const [isOpen, setIsOpen] = useState(() => {
+    const checks = [
+      (!['rapport_activite', 'rapport_financier'].includes(sheetDocument.type ?? '') && sheetDocument.year !== undefined),
+      (!['proces_verbal', 'autre'].includes(sheetDocument.type ?? '') && sheetDocument.name !== undefined),
+      sheetDocument.description !== undefined
+    ]
+    return checks.some(check => check)
+  })
+
+  function updateSheetDocument (field: keyof Document, value: any): void {
+    setSheetDocument(prev => ({
+      ...prev,
+      [field]: value
+    }))
+  }
 
   function handleSubmit (e: React.MouseEvent<HTMLButtonElement>): void {
-    if (!formRef.current.reportValidity()) {
+    if (formRef.current === null || !formRef.current.reportValidity()) {
       e.preventDefault()
+      return
     }
+
+    // Add file validation
+    const result = documentValidation.safeParse({ file: sheetDocument.file })
+    if (!result.success) {
+      e.preventDefault()
+      const errorMessage = result.error.issues[0].message
+      setError(`document_attachments_attributes.${index}.document_attributes.file`, errorMessage)
+      return
+    }
+
+    onUpdate(deepCleanData(sheetDocument))
   }
 
   return (
-    <SheetContent className='w-full sm:max-w-[600px] overflow-y-auto'>
+    <SheetContent onInteractOutside={(e) => e.preventDefault()} className='w-full sm:max-w-[600px] overflow-y-auto'>
       <form ref={formRef}>
         <SheetHeader>
-          <SheetTitle>{title}</SheetTitle>
+          <SheetTitle>Document</SheetTitle>
           <SheetDescription className='sr-only'>
             Renseignez les informations du document.
           </SheetDescription>
@@ -77,14 +108,14 @@ export default function OsblDocumentSheet ({
           <div className='flex flex-col gap-4'>
             <Label>Type de document *</Label>
             <Select
-              value={document.type}
-              onValueChange={(value) => onUpdate('type', value)}
+              value={sheetDocument.type}
+              onValueChange={(value) => updateSheetDocument('type', value)}
               required
             >
               <SelectTrigger className='w-full'>
                 <SelectValue />
               </SelectTrigger>
-              <SelectContent>
+              <SelectContent id={`document-type-${index}`}>
                 {DocumentTypeList.map((type) => (
                   <SelectItem key={type.value} value={type.value}>
                     {type.label}
@@ -92,100 +123,89 @@ export default function OsblDocumentSheet ({
                 ))}
               </SelectContent>
             </Select>
-            {errors[`document_attachments_attributes.${index}.document_attributes.type`] !== undefined && (
-              <InputError>
-                {errors[`document_attachments_attributes.${index}.document_attributes.type`]}
-              </InputError>
-            )}
           </div>
 
-          {['rapport_activite', 'rapport_financier'].includes(document.type ?? '') && (
+          {['rapport_activite', 'rapport_financier'].includes(sheetDocument.type ?? '') && (
             <MyNumberInput
               labelText='Année *'
               id={`document-year-${index}`}
               min={1000}
               max={new Date().getFullYear()}
-              value={document.year ?? ''}
-              onChange={(e) => onUpdate('year', e.target.value)}
+              value={sheetDocument.year ?? ''}
+              onChange={(e) => updateSheetDocument('year', e.target.value)}
               required
-              error={errors[`document_attachments_attributes.${index}.document_attributes.year`]}
             />
           )}
 
-          {['proces_verbal', 'autre'].includes(document.type ?? '') && (
+          {['proces_verbal', 'autre'].includes(sheetDocument.type ?? '') && (
             <MyInput
               labelText='Nom du document *'
               id={`document-name-${index}`}
               type='string'
-              value={document.name ?? ''}
-              onChange={(e) => onUpdate('name', e.target.value)}
+              value={sheetDocument.name ?? ''}
+              onChange={(e) => updateSheetDocument('name', e.target.value)}
               required
-              error={errors[`document_attachments_attributes.${index}.document_attributes.name`]}
             />
           )}
 
           <div className='flex flex-col gap-2'>
             <MyFileInput
-              ref={inputRef as RefObject<HTMLInputElement>}
+              file={sheetDocument.file ?? undefined}
               labelText='Fichier *'
               id={`document-file-${index}`}
-              placeholder='Sélectionner un fichier *'
-              onChange={(e) => onUpdate('file', e.target.files?.[0])}
+              onChange={(file) => {
+                updateSheetDocument('file', file)
+                clearErrors(`document_attachments_attributes.${index}.document_attributes.file`)
+              }}
               accept='.pdf'
-              required
               error={errors[`document_attachments_attributes.${index}.document_attributes.file`]}
+              required
             />
-            {
-              document.file !== undefined && (inputRef.current?.files?.[0] === undefined) && (
-                <div className='flex items-center gap-2 justify-center'>
-                  <CheckIcon className='text-primary' />
-                  <p className='text-sm text-muted-foreground'>{document.file.name}</p>
-                </div>
-              )
-            }
           </div>
 
-          <Collapsible>
+          {/* Collapsible section with isOpen state */}
+          <Collapsible open={isOpen} onOpenChange={setIsOpen}>
             <CollapsibleTrigger asChild>
               <div className='flex justify-between items-center cursor-pointer text-muted-foreground hover:text-muted-foreground/80'>
                 <span>Informations additionnelles</span>
-                <ChevronDown className='h-4 w-4' />
+                <ChevronDown className={`transition-transform duration-200 ${isOpen ? 'rotate-180' : ''}`} />
               </div>
             </CollapsibleTrigger>
             <CollapsibleContent className='mt-8 flex flex-col gap-8'>
-              {!['proces_verbal', 'autre'].includes(document.type ?? '') && (
+              {!['proces_verbal', 'autre'].includes(sheetDocument.type ?? '') && (
                 <MyInput
                   labelText='Nom du document'
                   id={`document-name-${index}`}
                   type='string'
-                  value={document.name ?? ''}
-                  onChange={(e) => onUpdate('name', e.target.value)}
+                  value={sheetDocument.name ?? ''}
+                  onChange={(e) => updateSheetDocument('name', e.target.value)}
                 />
               )}
 
-              {!['rapport_activite', 'rapport_financier'].includes(document.type ?? '') && (
+              {!['rapport_activite', 'rapport_financier'].includes(sheetDocument.type ?? '') && (
                 <MyNumberInput
                   id={`document-year-${index}`}
                   labelText='Année'
                   min={1000}
                   max={new Date().getFullYear()}
-                  value={document.year ?? ''}
-                  onChange={(e) => onUpdate('year', e.target.value)}
+                  value={sheetDocument.year ?? ''}
+                  onChange={(e) => updateSheetDocument('year', e.target.value)}
                 />
               )}
 
-              <div className='space-y-2'>
+              <div className='flex flex-col gap-4'>
                 <label htmlFor={`document-description-${index}`} className='text-sm font-medium'>
                   Description du document
                 </label>
                 <Textarea
                   id={`document-description-${index}`}
-                  value={document.description ?? ''}
-                  onChange={(e) => onUpdate('description', e.target.value)}
+                  value={sheetDocument.description ?? ''}
+                  maxLength={300}
+                  onChange={(e) => updateSheetDocument('description', e.target.value)}
                   className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-full h-40'
                 />
-                <div className={`text-xs text-right ${(document.description ?? '').length > 300 ? 'text-red-600' : 'text-gray-500'}`}>
-                  {(document.description ?? '').length}/300 caractères
+                <div className='text-xs text-right'>
+                  {(sheetDocument.description ?? '').length}/300 caractères
                 </div>
               </div>
             </CollapsibleContent>
@@ -194,9 +214,14 @@ export default function OsblDocumentSheet ({
 
         <SheetFooter>
           <SheetClose asChild>
-            <Button onClick={(e) => handleSubmit(e)} variant='default' size='lg' className='mx-auto mt-8'>
+            <Button
+              onClick={handleSubmit}
+              variant='default'
+              size='lg'
+              className='mx-auto mt-8'
+            >
               <CheckIcon className='mr-2' />
-              {submitLabel}
+              Valider
             </Button>
           </SheetClose>
         </SheetFooter>
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index 7897dd1..120c37a 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -1,4 +1,4 @@
-import { ReactElement } from 'react'
+import { ReactElement, useState } from 'react'
 import { FormProps, Document } from '@/pages/Contribution/types'
 import { Button } from '@/components/ui/button'
 import { PlusIcon, TrashIcon, PencilIcon } from 'lucide-react'
@@ -7,77 +7,36 @@ import {
   SheetTrigger
 } from '@/components/ui/sheet'
 import OsblDocumentSheet from './OsblDocumentSheet'
-
-const DocumentTypeList = [
-  { value: 'statuts', label: 'Statuts' },
-  { value: 'rapport_activite', label: "Rapport d'activité" },
-  { value: 'rapport_financier', label: 'Rapport financier' },
-  { value: 'proces_verbal', label: 'Procès verbal' },
-  { value: 'autre', label: 'Autre' }
-]
+import { DocumentTypeList } from '@/lib/constants'
 
 export default function OsblDocuments ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
+  const [sheetKey, setSheetKey] = useState(0)
   const documents = data.document_attachments_attributes ?? []
-  const newDocumentIndex = documents.length - 1
 
-  function updateDocumentAttribute (
-    index: number,
-    field: keyof Document,
-    value: Document[typeof field]
-  ): void {
-    const updatedDocuments = documents.map((doc, i) =>
-      i === index
-        ? {
-            ...doc,
-            document_attributes: {
-              ...(doc.document_attributes ?? {}),
-              [field]: value
-            }
-          }
-        : doc
-    )
+  function addDocument (document: Document, index: number): void {
+    const updatedDocuments = [...documents]
+    updatedDocuments[index] = { document_attributes: document }
 
+    setSheetKey((prev) => prev + 1)
     setData('document_attachments_attributes', updatedDocuments)
-
-    clearErrors(`document_attachments_attributes.${index}.document_attributes.${field}`)
-    // if (field === 'file') {
-    //   clearErrors(`document_attachments_attributes.${index}.document_attributes.file`)
-    // }
-
-    // if (field === 'type') {
-    //   clearErrors(`document_attachments_attributes.${index}.document_attributes.type`)
-    // }
   }
 
-  function handleDocumentAdd (): void {
-    const lastDocument = documents[newDocumentIndex]
-    const isLastDocumentEmpty = lastDocument !== undefined &&
-      (!lastDocument.document_attributes || Object.keys(lastDocument.document_attributes).length === 0)
-
-    if (!isLastDocumentEmpty) {
-      setData('document_attachments_attributes', [...documents, { document_attributes: {} }])
-    }
-  }
-
-  function handleDocumentRemove (
-    e: React.MouseEvent<HTMLButtonElement>,
-    index: number
-  ): void {
-    e.preventDefault()
-    const updatedDocuments = documents.filter((_, i) => i !== index)
-    setData('document_attachments_attributes', updatedDocuments)
+  function handleDocumentRemove (e: React.MouseEvent<HTMLButtonElement>, index: number): void {
+    e.preventDefault() // prevent the form from being submitted
+    setData('document_attachments_attributes', documents.filter((_, i) => i !== index))
   }
 
   function getDocumentDisplayName (document: Document): string {
-    if (['rapport_activite', 'rapport_financier'].includes(document?.type ?? '')) {
-      return `${DocumentTypeList.find(type => type.value === document?.type)?.label ?? ''} ${document?.year ?? ''}`
+    if (document.name !== undefined) {
+      return document.name
     }
 
-    if (document?.name !== undefined && document?.name !== '') {
-      return document?.name
+    if (['rapport_activite', 'rapport_financier'].includes(document.type)) {
+      const documentType = DocumentTypeList.find(type => type.value === document.type) as { label: string }
+      return `${documentType.label} ${document.year as number}`
     }
 
-    return document?.type ?? ''
+    return document.type
   }
 
   return (
@@ -86,35 +45,31 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors, set
         <h2 className='text-2xl font-semibold w-[145px]'>Documents</h2>
         <Sheet>
           <SheetTrigger asChild>
-            <Button onClick={handleDocumentAdd} variant='outline'>
+            <Button variant='outline'>
               <PlusIcon className='w-4 h-4' />
               <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
             </Button>
           </SheetTrigger>
           <OsblDocumentSheet
-            document={documents[newDocumentIndex]?.document_attributes ?? {}}
-            index={newDocumentIndex}
+            key={sheetKey}
+            document={{}}
+            index={documents.length}
+            onUpdate={(doc) => addDocument(doc, documents.length)}
             errors={errors}
-            onUpdate={(attribute, value) => updateDocumentAttribute(newDocumentIndex, attribute, value)}
+            clearErrors={clearErrors}
+            setError={setError as (field: string, error: string) => void}
           />
         </Sheet>
       </div>
 
-      {documents.filter(doc => Object.keys(doc.document_attributes).length > 0).length > 0 && (
+      {documents.length > 0 && (
         <div className='flex flex-col gap-4'>
           {documents
-            .filter(doc => Object.keys(doc.document_attributes).length > 0)
             .map((doc, index) => {
-              const hasError = errors[`document_attachments_attributes.${index}.document_attributes.type`] != null ||
-                           errors[`document_attachments_attributes.${index}.document_attributes.file`] != null ||
-                           doc.document_attributes.type === undefined ||
-                           doc.document_attributes.file === undefined ||
-                           errors[`document_attachments_attributes.${index}.document_attributes.year`] != null ||
-                           errors[`document_attachments_attributes.${index}.document_attributes.missing_name`] != null
-
+              const hasError = errors[`document_attachments_attributes.${index}.document_attributes.file`]
               return (
                 <Sheet key={`document-${index}`}>
-                  <div className={`flex items-center justify-between p-4 border rounded-lg ${hasError ? 'bg-red-50 border-red-600' : 'bg-white'}`}>
+                  <div className={`flex items-center justify-between p-4 border rounded-lg bg-white ${hasError !== undefined ? 'border-red-600' : ''}`}>
                     <p>{getDocumentDisplayName(doc.document_attributes)}</p>
                     <div className='flex gap-2 '>
                       <SheetTrigger asChild>
@@ -135,8 +90,10 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors, set
                   <OsblDocumentSheet
                     document={doc.document_attributes ?? {}}
                     index={index}
+                    onUpdate={(doc) => addDocument(doc, index)}
                     errors={errors}
-                    onUpdate={(attribute, value) => updateDocumentAttribute(index, attribute, value)}
+                    clearErrors={clearErrors}
+                    setError={setError as (field: string, error: string) => void}
                   />
                 </Sheet>
               )
diff --git a/app/frontend/components/pages/contribution/new/OsblHeader.tsx b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
index 6aca378..54f317a 100644
--- a/app/frontend/components/pages/contribution/new/OsblHeader.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
@@ -6,7 +6,7 @@ import { FormProps } from '@/pages/Contribution/types'
 import HelpTooltip from '@/components/shared/HelpTooltip'
 import MyFileInput from '@/components/shared/MyFileInput'
 
-export default function OsblHeader ({ data, setData, errors, clearErrors }: FormProps): ReactElement {
+export default function OsblHeader ({ data, setData, errors, clearErrors }: Omit<FormProps, 'setError'>): ReactElement {
   const descriptionLength = (data.description ?? '').length
 
   return (
@@ -51,8 +51,8 @@ export default function OsblHeader ({ data, setData, errors, clearErrors }: Form
               :
             </p>
           }
-          onChange={(e) => {
-            setData('logo', e.target.files?.[0])
+          onChange={(file) => {
+            setData('logo', file)
             clearErrors('logo')
           }}
           error={errors.logo}
diff --git a/app/frontend/components/pages/user/show/UserAvatarEdit.tsx b/app/frontend/components/pages/user/show/UserAvatarEdit.tsx
index 653a987..0ab4069 100644
--- a/app/frontend/components/pages/user/show/UserAvatarEdit.tsx
+++ b/app/frontend/components/pages/user/show/UserAvatarEdit.tsx
@@ -147,10 +147,8 @@ export default function UserAvatarEdit ({
               id='profile_picture'
               required
               accept='image/png, image/webp, image/jpg'
-              onChange={(e) => {
-                const files = e.target.files
-                if (files == null) return
-                setData('profile_picture', files[0])
+              onChange={(file) => {
+                setData('profile_picture', file ?? '')
                 clearErrors('profile_picture')
               }}
               error={errors.profile_picture}
diff --git a/app/frontend/components/shared/MyFileInput.tsx b/app/frontend/components/shared/MyFileInput.tsx
index a98ae05..e5567cc 100644
--- a/app/frontend/components/shared/MyFileInput.tsx
+++ b/app/frontend/components/shared/MyFileInput.tsx
@@ -1,6 +1,5 @@
-import { ReactElement, useRef } from 'react'
-import { Input } from '@/components/ui/input'
-import { X } from 'lucide-react'
+import { ReactElement, useRef, useState } from 'react'
+import MyInput from '../forms/MyInput'
 
 interface MyFileInputProps {
   id: string
@@ -8,67 +7,66 @@ interface MyFileInputProps {
   accept?: string
   required?: boolean
   error?: string
-  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void
-  placeholder?: string
-  ref?: React.RefObject<HTMLInputElement>
+  onChange: (file: File | undefined) => void
+  file?: File
 }
 
 export default function MyFileInput ({
   id,
   labelText,
   accept,
-  required,
+  required = false,
   error,
   onChange,
-  placeholder = 'Sélectionner un fichier',
-  ref
+  file
 }: MyFileInputProps): ReactElement {
-  const inputRef = ref ?? useRef<HTMLInputElement>(null)
+  const inputRef = useRef<HTMLInputElement>(null)
+  const [hasFile, setHasFile] = useState(false)
+
+  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
+    const fileAttached = (e.target.files != null) && e.target.files.length > 0
+    setHasFile(!!fileAttached)
+    onChange(e.target.files?.[0] ?? undefined)
+  }
 
   const handleReset = (): void => {
     if (inputRef.current != null) {
       inputRef.current.value = ''
+      setHasFile(false)
       // Trigger onChange with a fake event to notify parent component
       const event = new Event('change', { bubbles: true }) as unknown as React.ChangeEvent<HTMLInputElement>
       Object.defineProperty(event, 'target', { value: { value: '', files: null } })
-      onChange(event)
     }
+    onChange(undefined)
   }
 
   return (
-    <div className='space-y-2'>
-      {Boolean(labelText) && (
-        <label htmlFor={id} className='text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70'>
-          {labelText}
-        </label>
-      )}
-      <div className='relative'>
-        <Input
-          ref={inputRef}
-          id={id}
-          type='file'
-          required={required}
-          accept={accept}
-          onChange={onChange}
-          placeholder={placeholder}
-          className={`${
-            error !== undefined
-              ? 'border-red-600'
-              : ''
-          } pr-10 bg-white focus-visible:ring-offset-0 focus-visible:ring-0 focus-visible:border-primary focus:border-primary focus:outline-none`}
-        />
-        {((inputRef.current?.files) != null) && inputRef.current.files.length > 0 && (
-          <button
-            type='button'
-            onClick={handleReset}
-            className='absolute right-2 top-1/2 -translate-y-1/2 rounded-full p-1 hover:bg-gray-100'
-            aria-label='Reset file input'
-          >
-            <X className='h-4 w-4 text-gray-500' />
-          </button>
-        )}
-      </div>
-      {error !== undefined && <p className='text-sm text-red-500'>{error}</p>}
+    <div className='flex flex-col'>
+      {file !== undefined && !hasFile
+        ? (
+          <MyInput
+            labelText={labelText}
+            value={file.name}
+            readOnly
+            showResetButton
+            onReset={handleReset}
+            error={error}
+          />
+          )
+        : (
+          <MyInput
+            labelText={labelText}
+            ref={inputRef}
+            id={id}
+            type='file'
+            required={required && file === undefined}
+            accept={accept}
+            onChange={handleFileChange}
+            error={error}
+            showResetButton={hasFile}
+            onReset={handleReset}
+          />
+          )}
     </div>
   )
 }
diff --git a/app/frontend/lib/constants.ts b/app/frontend/lib/constants.ts
new file mode 100644
index 0000000..19b1ecf
--- /dev/null
+++ b/app/frontend/lib/constants.ts
@@ -0,0 +1,7 @@
+export const DocumentTypeList = [
+  { value: 'statuts', label: 'Statuts' },
+  { value: 'rapport_activite', label: "Rapport d'activité" },
+  { value: 'rapport_financier', label: 'Rapport financier' },
+  { value: 'proces_verbal', label: 'Procès verbal' },
+  { value: 'autre', label: 'Autre' }
+] as const
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index 12c7daf..c0ca555 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -17,9 +17,7 @@ import deepCleanData from '@/lib/deepCleanData'
 import { toast } from 'sonner'
 
 const MAX_LOGO_SIZE = 1 * 1024 * 1024 // 1MB
-const MAX_DOCUMENT_SIZE = 5 * 1024 * 1024 // 5MB
 const ALLOWED_LOGO_TYPES = ['image/svg', 'image/png', 'image/webp']
-const ALLOWED_DOCUMENT_TYPES = ['application/pdf']
 
 const validation = z.object({
   website: z.string().url({ message: 'Veuillez entrer une URL valide.' }).optional(),
@@ -104,32 +102,7 @@ const validation = z.object({
     }, {
       message: 'Une année ne peut être ajoutée qu\'une seule fois.',
       path: ['duplicate_years']
-    })),
-  document_attachments_attributes: z.array(z.object({
-    document_attributes: z.preprocess((document) => deepCleanData(document), z.object({
-      type: z.string({ message: 'Champs requis.' }),
-      file: z.instanceof(File, { message: 'Champs requis.' })
-        .refine((file) => {
-          return file.size <= MAX_DOCUMENT_SIZE
-        }, 'La taille du fichier doit être inférieure à 5 MB.')
-        .refine((file) => {
-          return ALLOWED_DOCUMENT_TYPES.includes(file.type)
-        }, 'Le type de fichier est invalide. Format accepté : PDF.'),
-      year: z.string().optional()
-    }).optional()).refine((document) => {
-      if (document === undefined) return true
-      return !['rapport_activite', 'rapport_financier'].includes(document.type) || document.year !== undefined
-    }, {
-      message: 'L\'année est requise pour ce type de document.',
-      path: ['year']
-    }).refine((document) => {
-      if (document === undefined) return true
-      return !['autre', 'proces_verbal'].includes(document.type) || document.name !== undefined
-    }, {
-      message: 'Le nom du document est requis pour ce type de document.',
-      path: ['name']
-    })
-  })).optional()
+    }))
 })
 
 export default function New ({ currentUser }: { currentUser: CurrentUserType }): ReactElement {
diff --git a/app/frontend/pages/Contribution/types.ts b/app/frontend/pages/Contribution/types.ts
index 0cb1509..fa7d41d 100644
--- a/app/frontend/pages/Contribution/types.ts
+++ b/app/frontend/pages/Contribution/types.ts
@@ -32,8 +32,8 @@ export interface AnnualFinance {
 }
 
 export interface Document {
-  type?: string
-  file?: File
+  type: string
+  file: File
   name?: string
   year?: number
   description?: string
@@ -89,5 +89,5 @@ export interface FormProps {
   setData: (key: keyof FormData | string, value: FormData[keyof FormData] | any) => void
   errors: Record<keyof FormData | string, string>
   clearErrors: (...fields: Array<keyof FormData | any>) => void
-  setError?: (field: string, error: any) => void
+  setError: (field: string, error: any) => void
 }

From fb4783dc757dad55386c0ddf182e4cd6145e37f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Mon, 3 Feb 2025 09:31:08 +0000
Subject: [PATCH 17/31] Refactor fund management and finance sections for
 improved form handling

- Simplified FundManagementSection component by removing redundant error handling
- Updated OsblFinanceSheet to use local state and improved validation
- Moved fund type lists to constants file
- Removed unnecessary error tracking and simplified sheet interactions
- Enhanced type safety and reduced complexity in finance-related components
---
 .../new/FundManagementSection.tsx             |  50 ++---
 .../contribution/new/OsblDocumentSheet.tsx    |  95 +++++-----
 .../pages/contribution/new/OsblDocuments.tsx  |  15 +-
 .../pages/contribution/new/OsblFinance.tsx    | 150 ++++-----------
 .../contribution/new/OsblFinanceSheet.tsx     | 172 ++++++++++++------
 .../pages/contribution/new/OsblHeader.tsx     |   9 +-
 app/frontend/lib/constants.ts                 |  14 ++
 app/frontend/pages/Contribution/New.tsx       |  75 +-------
 app/frontend/pages/Contribution/types.ts      |   2 +-
 9 files changed, 235 insertions(+), 347 deletions(-)

diff --git a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
index 9a35360..0b9e308 100644
--- a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
+++ b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
@@ -20,10 +20,9 @@ interface FundManagementSectionProps {
   items: FundRecord[]
   typeList: Array<{ value: string, label: string, group: string }>
   baseErrorPath: string
-  errors: Record<string, string>
   onUpdate: (items: FundRecord[]) => void
+  errors: Record<string, string>
   clearErrors: (path: string) => void
-  setError: (field: string, message: string) => void
 }
 
 export default function FundManagementSection ({
@@ -31,58 +30,31 @@ export default function FundManagementSection ({
   items,
   typeList,
   baseErrorPath,
-  errors,
   onUpdate,
-  clearErrors,
-  setError
+  errors,
+  clearErrors
 }: FundManagementSectionProps): ReactElement {
-  function handleFundChange (
-    index: number,
-    field: keyof FundRecord,
-    value: any
-  ): void {
+  function handleFundChange (index: number, field: keyof FundRecord, value: any): void {
     const updatedItems = items.map((item: FundRecord, i: number) =>
       i === index ? { ...item, [field]: value } : item
     )
 
     onUpdate(updatedItems)
 
-    if (value !== '') {
-      clearErrors(`${baseErrorPath}.${index}.${field}`)
-    }
-
-    if (field === 'percent' && value !== '') {
+    if (field === 'percent') {
       clearErrors(`${baseErrorPath}.total_percent`)
     }
   }
 
   function handleAdd (e: React.MouseEvent<HTMLButtonElement>): void {
-    e.preventDefault()
+    e.preventDefault() // prevent form submission
     onUpdate([...items, {}])
   }
 
-  function handleRemove (
-    e: React.MouseEvent<HTMLButtonElement>,
-    index: number
-  ): void {
+  function handleRemove (e: React.MouseEvent<HTMLButtonElement>, index: number): void {
     e.preventDefault()
-    const updatedItems = items.filter((_, i) => i !== index)
-    onUpdate(updatedItems)
-
-    clearErrors(`${baseErrorPath}.${index}.type`)
-    clearErrors(`${baseErrorPath}.${index}.percent`)
+    onUpdate(items.filter((_, i) => i !== index))
     clearErrors(`${baseErrorPath}.total_percent`)
-
-    for (let i = index + 1; i < items.length; i++) {
-      ['type', 'percent'].forEach(field => {
-        const errorPath = `${baseErrorPath}.${i}.${field}`
-        const error = errors?.[errorPath]
-        if (error !== undefined) {
-          setError(`${baseErrorPath}.${i - 1}.${field}`, error)
-          clearErrors(errorPath)
-        }
-      })
-    }
   }
 
   return (
@@ -93,7 +65,7 @@ export default function FundManagementSection ({
           onClick={handleAdd}
           variant='outline'
           className='bg-white'
-          disabled={Boolean((items?.length ?? 0) >= typeList.length)}
+          disabled={items.length >= typeList.length}
         >
           <PlusIcon />
           Ajouter
@@ -106,8 +78,8 @@ export default function FundManagementSection ({
         </InputError>
       )}
 
-      {items?.map((item, index) => (
-        <Fragment key={`${baseErrorPath}-${item.type ?? 'new'}-${index}`}>
+      {items.map((item, index) => (
+        <Fragment key={`${baseErrorPath}-${index}`}>
           <div
             className='flex flex-wrap items-center gap-x-4 sm:flex-nowrap sm:items-center sm:space-x-4'
           >
diff --git a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
index da8c291..74e19f8 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
@@ -12,7 +12,7 @@ import {
 import MyNumberInput from '@/components/forms/MyNumberInput'
 import { Textarea } from '@/components/ui/textarea'
 import MyFileInput from '@/components/shared/MyFileInput'
-import { CheckIcon, ChevronDown } from 'lucide-react'
+import { CheckIcon, ChevronDown, X } from 'lucide-react'
 import {
   SheetClose,
   SheetContent,
@@ -77,12 +77,11 @@ export default function OsblDocumentSheet ({
   }
 
   function handleSubmit (e: React.MouseEvent<HTMLButtonElement>): void {
-    if (formRef.current === null || !formRef.current.reportValidity()) {
+    if (formRef.current?.reportValidity() === false) {
       e.preventDefault()
       return
     }
 
-    // Add file validation
     const result = documentValidation.safeParse({ file: sheetDocument.file })
     if (!result.success) {
       e.preventDefault()
@@ -95,7 +94,7 @@ export default function OsblDocumentSheet ({
   }
 
   return (
-    <SheetContent onInteractOutside={(e) => e.preventDefault()} className='w-full sm:max-w-[600px] overflow-y-auto'>
+    <SheetContent className='w-full sm:max-w-[600px] overflow-y-auto'>
       <form ref={formRef}>
         <SheetHeader>
           <SheetTitle>Document</SheetTitle>
@@ -171,55 +170,59 @@ export default function OsblDocumentSheet ({
                 <ChevronDown className={`transition-transform duration-200 ${isOpen ? 'rotate-180' : ''}`} />
               </div>
             </CollapsibleTrigger>
-            <CollapsibleContent className='mt-8 flex flex-col gap-8'>
-              {!['proces_verbal', 'autre'].includes(sheetDocument.type ?? '') && (
-                <MyInput
-                  labelText='Nom du document'
-                  id={`document-name-${index}`}
-                  type='string'
-                  value={sheetDocument.name ?? ''}
-                  onChange={(e) => updateSheetDocument('name', e.target.value)}
-                />
-              )}
-
-              {!['rapport_activite', 'rapport_financier'].includes(sheetDocument.type ?? '') && (
-                <MyNumberInput
-                  id={`document-year-${index}`}
-                  labelText='Année'
-                  min={1000}
-                  max={new Date().getFullYear()}
-                  value={sheetDocument.year ?? ''}
-                  onChange={(e) => updateSheetDocument('year', e.target.value)}
-                />
-              )}
-
-              <div className='flex flex-col gap-4'>
-                <label htmlFor={`document-description-${index}`} className='text-sm font-medium'>
-                  Description du document
-                </label>
-                <Textarea
-                  id={`document-description-${index}`}
-                  value={sheetDocument.description ?? ''}
-                  maxLength={300}
-                  onChange={(e) => updateSheetDocument('description', e.target.value)}
-                  className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-full h-40'
-                />
-                <div className='text-xs text-right'>
-                  {(sheetDocument.description ?? '').length}/300 caractères
+            <CollapsibleContent>
+              <div className='flex flex-col gap-8 mt-8'>
+                {!['proces_verbal', 'autre'].includes(sheetDocument.type ?? '') && (
+                  <MyInput
+                    labelText='Nom du document'
+                    id={`document-name-${index}`}
+                    type='string'
+                    value={sheetDocument.name ?? ''}
+                    onChange={(e) => updateSheetDocument('name', e.target.value)}
+                  />
+                )}
+
+                {!['rapport_activite', 'rapport_financier'].includes(sheetDocument.type ?? '') && (
+                  <MyNumberInput
+                    id={`document-year-${index}`}
+                    labelText='Année'
+                    min={1000}
+                    max={new Date().getFullYear()}
+                    value={sheetDocument.year ?? ''}
+                    onChange={(e) => updateSheetDocument('year', e.target.value)}
+                  />
+                )}
+
+                <div className='flex flex-col gap-4'>
+                  <label htmlFor={`document-description-${index}`} className='text-sm font-medium'>
+                    Description du document
+                  </label>
+                  <Textarea
+                    id={`document-description-${index}`}
+                    value={sheetDocument.description ?? ''}
+                    maxLength={300}
+                    onChange={(e) => updateSheetDocument('description', e.target.value)}
+                    className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-full h-40'
+                  />
+                  <div className='text-xs text-right'>
+                    {(sheetDocument.description ?? '').length}/300 caractères
+                  </div>
                 </div>
               </div>
             </CollapsibleContent>
           </Collapsible>
         </div>
 
-        <SheetFooter>
+        <SheetFooter className='mt-16'>
           <SheetClose asChild>
-            <Button
-              onClick={handleSubmit}
-              variant='default'
-              size='lg'
-              className='mx-auto mt-8'
-            >
+            <Button variant='ghost' size='lg'>
+              <X className='mr-2' />
+              Annuler
+            </Button>
+          </SheetClose>
+
+          <SheetClose asChild>
+            <Button onClick={handleSubmit} variant='default' size='lg'>
               <CheckIcon className='mr-2' />
               Valider
             </Button>
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index 120c37a..141d9f7 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -1,4 +1,4 @@
-import { ReactElement, useState } from 'react'
+import { ReactElement } from 'react'
 import { FormProps, Document } from '@/pages/Contribution/types'
 import { Button } from '@/components/ui/button'
 import { PlusIcon, TrashIcon, PencilIcon } from 'lucide-react'
@@ -10,14 +10,12 @@ import OsblDocumentSheet from './OsblDocumentSheet'
 import { DocumentTypeList } from '@/lib/constants'
 
 export default function OsblDocuments ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
-  const [sheetKey, setSheetKey] = useState(0)
   const documents = data.document_attachments_attributes ?? []
 
   function addDocument (document: Document, index: number): void {
     const updatedDocuments = [...documents]
     updatedDocuments[index] = { document_attributes: document }
 
-    setSheetKey((prev) => prev + 1)
     setData('document_attachments_attributes', updatedDocuments)
   }
 
@@ -51,13 +49,13 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors, set
             </Button>
           </SheetTrigger>
           <OsblDocumentSheet
-            key={sheetKey}
+            key={`document-${documents.length}`}
             document={{}}
             index={documents.length}
             onUpdate={(doc) => addDocument(doc, documents.length)}
             errors={errors}
             clearErrors={clearErrors}
-            setError={setError as (field: string, error: string) => void}
+            setError={setError}
           />
         </Sheet>
       </div>
@@ -66,10 +64,9 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors, set
         <div className='flex flex-col gap-4'>
           {documents
             .map((doc, index) => {
-              const hasError = errors[`document_attachments_attributes.${index}.document_attributes.file`]
               return (
                 <Sheet key={`document-${index}`}>
-                  <div className={`flex items-center justify-between p-4 border rounded-lg bg-white ${hasError !== undefined ? 'border-red-600' : ''}`}>
+                  <div className='flex items-center justify-between p-4 border rounded-lg bg-white'>
                     <p>{getDocumentDisplayName(doc.document_attributes)}</p>
                     <div className='flex gap-2 '>
                       <SheetTrigger asChild>
@@ -88,12 +85,12 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors, set
                   </div>
 
                   <OsblDocumentSheet
-                    document={doc.document_attributes ?? {}}
+                    document={doc.document_attributes}
                     index={index}
                     onUpdate={(doc) => addDocument(doc, index)}
                     errors={errors}
                     clearErrors={clearErrors}
-                    setError={setError as (field: string, error: string) => void}
+                    setError={setError}
                   />
                 </Sheet>
               )
diff --git a/app/frontend/components/pages/contribution/new/OsblFinance.tsx b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
index b5982f3..58e8105 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinance.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinance.tsx
@@ -7,101 +7,32 @@ import {
   SheetTrigger
 } from '@/components/ui/sheet'
 import OsblFinanceSheet from './OsblFinanceSheet'
-import InputError from '@/components/forms/InputError'
 
 export default function OsblFinance ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
   const [sortAscending, setSortAscending] = useState(false)
   const finances = data.annual_finances_attributes ?? []
-  const newFinanceIndex = finances.length - 1
 
-  function updateFinanceAttribute (index: number, field: keyof AnnualFinance, value: any): void {
-    const updatedFinances = finances.map((finance, i) =>
-      i === index
-        ? {
-            ...finance,
-            [field]: value
-          }
-        : finance
-    )
+  function addFinance (finance: AnnualFinance, index: number): void {
+    const updatedFinances = [...finances]
+    updatedFinances[index] = finance
 
     setData('annual_finances_attributes', updatedFinances)
-
-    if (field !== 'year') {
-      clearErrors(`annual_finances_attributes.${index}.missing_information`)
-    }
-
-    if (field === 'year') {
-      clearErrors(`annual_finances_attributes.${index}.year`)
-      clearErrors(`annual_finances_attributes.${index}.missing_information`)
-
-      const modifiedYear = finances[index]?.year
-      const remainingYears = finances.filter((_, i) => i !== index).map(f => f.year)
-      if (Number(modifiedYear) > 0 && remainingYears.includes(modifiedYear)) {
-        clearErrors('annual_finances_attributes.duplicate_years')
-      }
-    }
-  }
-
-  function handleFinanceAdd (): void {
-    const lastFinance = finances[newFinanceIndex]
-    const isLastFinanceEmpty = lastFinance !== undefined && Object.keys(lastFinance).length === 0
-
-    if (!isLastFinanceEmpty) {
-      setData('annual_finances_attributes', [...finances, {}])
-    }
   }
 
-  function handleFinanceRemove (
-    e: React.MouseEvent<HTMLButtonElement>,
-    index: number
-  ): void {
+  function handleFinanceRemove (e: React.MouseEvent<HTMLButtonElement>, index: number): void {
     e.preventDefault()
-    const updatedFinances = finances.filter((_, i) => i !== index)
-    setData('annual_finances_attributes', updatedFinances)
-
-    clearErrors(`annual_finances_attributes.${index}.missing_information`)
-    clearErrors(`annual_finances_attributes.${index}.fund_sources_attributes.total_percent`)
-    clearErrors(`annual_finances_attributes.${index}.year`)
-
-    const removedYear = finances[index]?.year
-    const remainingYears = finances.filter((_, i) => i !== index).map(f => f.year)
-    if (removedYear != null && remainingYears.includes(removedYear)) {
-      clearErrors('annual_finances_attributes.duplicate_years')
-    }
-
-    // Update error indices for remaining items after the removed index
-    Object.keys(errors).forEach(errorKey => {
-      if (errorKey.startsWith('annual_finances_attributes.')) {
-        const match = errorKey.match(/annual_finances_attributes\.(\d+)/)
-        if (match != null) {
-          const errorIndex = parseInt(match[1])
-          if (errorIndex > index) {
-            const newKey = errorKey.replace(
-              `annual_finances_attributes.${errorIndex}`,
-              `annual_finances_attributes.${errorIndex - 1}`
-            )
-            setError?.(newKey, errors[errorKey])
-            clearErrors(errorKey)
-          }
-        }
-      }
-    })
+    setData('annual_finances_attributes', finances.filter((_, i) => i !== index))
   }
 
   function handleSort (): void {
     setSortAscending(!sortAscending)
     const sortedFinances = [...finances]
-      .filter(finance => Object.keys(finance).length > 0)
       .sort((a, b) => sortAscending
-        ? (a.year ?? 0) - (b.year ?? 0)
-        : (b.year ?? 0) - (a.year ?? 0))
+        ? (a.year) - (b.year)
+        : (b.year) - (a.year))
     setData('annual_finances_attributes', sortedFinances)
   }
 
-  const hasFinanceErrors = Object.keys(errors).some(key =>
-    key.startsWith('annual_finances_attributes')
-  )
-
   return (
     <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full h-full'>
       <div className='flex items-center gap-4 justify-between flex-wrap'>
@@ -109,66 +40,46 @@ export default function OsblFinance ({ data, setData, errors, clearErrors, setEr
           <div className='flex items-center gap-2 w-[145px]'>
 
             <h2 className='text-2xl font-semibold'>Comptes</h2>
-            {finances.filter(finance => Object.keys(finance).length > 1).length > 1 && (
-              <Button
-                variant='ghost'
-                size='icon'
-                onClick={(e) => {
-                  e.preventDefault()
-                  handleSort()
-                }}
-                disabled={hasFinanceErrors}
-              >
-                <ArrowUpDown />
-              </Button>
-            )}
+            <Button
+              variant='ghost'
+              size='icon'
+              onClick={(e) => {
+                e.preventDefault()
+                handleSort()
+              }}
+              disabled={finances.length < 2}
+            >
+              <ArrowUpDown />
+            </Button>
           </div>
         </div>
         <Sheet>
           <SheetTrigger asChild>
-            <Button variant='outline' onClick={handleFinanceAdd}>
+            <Button variant='outline'>
               <PlusIcon className='w-4 h-4' />
               <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
             </Button>
           </SheetTrigger>
           <OsblFinanceSheet
-            finance={finances[newFinanceIndex] ?? {}}
-            index={newFinanceIndex}
+            data={data}
+            key={`finance-${finances.length}`}
+            finance={{}}
+            index={finances.length}
+            onUpdate={(finance) => addFinance(finance, finances.length)}
             errors={errors}
-            onUpdate={(attribute, value) => updateFinanceAttribute(newFinanceIndex, attribute, value)}
             clearErrors={clearErrors}
-            setError={(field: string, message: string) => setError?.(field, message)}
+            setError={setError}
           />
         </Sheet>
       </div>
-      {errors['annual_finances_attributes.duplicate_years'] !== undefined && (
-        <InputError>
-          {errors['annual_finances_attributes.duplicate_years']}
-        </InputError>
-      )}
 
-      {finances.filter(finance => Object.keys(finance).length > 0).length > 0 && (
+      {finances.length > 0 && (
         <div className='flex flex-col gap-4'>
           {finances
-            .filter(finance => Object.keys(finance).length > 0)
             .map((finance, index) => {
-              const hasError = errors[`annual_finances_attributes.${index}.missing_information`] != null ||
-                           errors[`annual_finances_attributes.${index}.fund_sources_attributes.total_percent`] != null ||
-                           (finance.fund_sources_attributes?.some((_, i) =>
-                             errors[`annual_finances_attributes.${index}.fund_sources_attributes.${i}.percent`] != null ||
-                             errors[`annual_finances_attributes.${index}.fund_sources_attributes.${i}.type`] != null
-                           ) ?? false) ||
-                           errors[`annual_finances_attributes.${index}.fund_allocations_attributes.total_percent`] != null ||
-                           (finance.fund_allocations_attributes?.some((_, i) =>
-                             errors[`annual_finances_attributes.${index}.fund_allocations_attributes.${i}.percent`] != null ||
-                             errors[`annual_finances_attributes.${index}.fund_allocations_attributes.${i}.type`] != null
-                           ) ?? false) ||
-                           finance.year == null ||
-                           errors[`annual_finances_attributes.${index}.year`] !== undefined
-
               return (
-                <Sheet key={`finance-${index}`}>
-                  <div className={`flex items-center justify-between p-4 border rounded-lg ${hasError ? 'bg-red-50 border-red-600' : 'bg-white'}`}>
+                <Sheet key={`finance-${finance.year}`}>
+                  <div className='flex items-center justify-between p-4 border rounded-lg bg-white'>
                     <p>{finance.year}</p>
                     <div className='flex gap-2'>
                       <SheetTrigger asChild>
@@ -187,12 +98,13 @@ export default function OsblFinance ({ data, setData, errors, clearErrors, setEr
                   </div>
 
                   <OsblFinanceSheet
+                    data={data}
                     finance={finance}
                     index={index}
+                    onUpdate={(finance) => addFinance(finance, index)}
                     errors={errors}
-                    onUpdate={(attribute, value) => updateFinanceAttribute(index, attribute, value)}
                     clearErrors={clearErrors}
-                    setError={(field: string, message: string) => setError?.(field, message)}
+                    setError={setError}
                   />
                 </Sheet>
               )
diff --git a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
index 6b81bd9..39a599e 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
@@ -1,12 +1,12 @@
-import React, { ReactElement, useRef } from 'react'
-import { AnnualFinance } from '@/pages/Contribution/types'
+import React, { ReactElement, useRef, useState } from 'react'
+import { AnnualFinance, FormProps } from '@/pages/Contribution/types'
 import MyNumberInput from '@/components/forms/MyNumberInput'
 import HelpTooltip from '@/components/shared/HelpTooltip'
 import FundManagementSection from './FundManagementSection'
 import MyCheckbox from '@/components/forms/MyCheckbox'
 import { Separator } from '@/components/ui/separator'
 import { Button } from '@/components/ui/button'
-import { CheckIcon } from 'lucide-react'
+import { CheckIcon, X } from 'lucide-react'
 import {
   SheetClose,
   SheetContent,
@@ -15,55 +15,116 @@ import {
   SheetTitle,
   SheetDescription
 } from '@/components/ui/sheet'
+import deepCleanData from '@/lib/deepCleanData'
+import { FundSourceTypeList, FundAllocationTypeList } from '@/lib/constants'
+import { z } from 'zod'
 
-interface Props {
+interface Props extends Omit<FormProps, 'setData'> {
   finance: Partial<AnnualFinance>
   index: number
-  errors: Record<string, string>
-  onUpdate: (attribute: keyof AnnualFinance, value: any) => void
-  clearErrors: (path: string) => void
-  submitLabel?: string
-  title?: string
-  setError: (field: string, message: string) => void
+  onUpdate: (finance: AnnualFinance) => void
 }
 
-const FundSourceTypeList = [
-  { value: 'dons', label: 'Dons', group: 'main' },
-  { value: 'aides_publiques', label: 'Aides publiques', group: 'main' },
-  { value: 'revenus_d_activites', label: 'Revenus d\'activités', group: 'main' },
-  { value: 'autre', label: 'Autre', group: 'main' }
-]
-
-const FundAllocationTypeList = [
-  { value: 'missions_sociales', label: 'Missions sociales', group: 'main' },
-  { value: 'frais_de_fonctionnement', label: 'Frais de fonctionnement', group: 'main' },
-  { value: 'frais_de_recherche_de_fonds', label: 'Frais de recherche de fonds', group: 'main' },
-  { value: 'autre', label: 'Autre', group: 'main' }
-]
+// Fix the return type and validation
+const financeValidation = (data: AnnualFinance[], currentIndex: number): z.ZodType<any> => z.object({
+  year: z.string().refine(
+    (year) =>
+      !data.some((f, i) => i !== currentIndex && f.year === Number(year)),
+    { message: 'Un bilan comptable est déjà enregistré pour cette année.', path: ['annual_finances_attributes', currentIndex, 'year'] }
+  ),
+  fund_sources_attributes: z.array(z.object({
+    percent: z.string()
+  })).optional()
+    .refine((sources): sources is typeof sources => {
+      if (sources === undefined || sources.length === 0) return true
+
+      const sum = sources?.reduce((acc: number, source) => {
+        const percent = source.percent !== undefined ? Number(source.percent) : 0
+        return acc + percent
+      }, 0)
+      return sum === 100
+    }, {
+      message: 'La somme des pourcentages doit être égale à 100%.',
+      path: ['total_percent']
+    }),
+  fund_allocations_attributes: z.array(z.object({
+    percent: z.string()
+  })).optional()
+    .refine((allocations): allocations is typeof allocations => {
+      if (allocations === undefined || allocations.length === 0) return true
+
+      const sum = allocations?.reduce((acc: number, allocation) => {
+        const percent = allocation.percent !== undefined ? Number(allocation.percent) : 0
+        return acc + percent
+      }, 0)
+      return sum === 100
+    }, {
+      message: 'La somme des pourcentages doit être égale à 100%.',
+      path: ['total_percent']
+    })
+}).passthrough()
+  .refine(
+    (finance) => {
+      const financeCleaned = deepCleanData(finance)
+      return !(Object.keys(financeCleaned).length === 1)
+    },
+    { message: 'Complétez les comptes pour cette année.', path: ['annual_finances_attributes', currentIndex, 'missing_information'] }
+  )
 
 export default function OsblFinanceSheet ({
   finance,
+  data,
   index,
   errors,
   onUpdate,
   clearErrors,
-  setError,
-  submitLabel = 'Valider',
-  title = 'Comptes annuels'
+  setError
 }: Props): ReactElement {
-  const formRef = useRef<HTMLFormElement>(null) as React.RefObject<HTMLFormElement>
+  const formRef = useRef<HTMLFormElement>(null)
+  const [sheetFinance, setSheetFinance] = useState<Partial<AnnualFinance>>(finance)
+
+  function updateSheetFinance (field: keyof AnnualFinance, value: any): void {
+    setSheetFinance(prev => ({
+      ...prev,
+      [field]: value
+    }))
+
+    if (field === 'year' && value === '') {
+      clearErrors(`annual_finances_attributes.${index}.missing_information`)
+    }
+    if (field !== 'year' && value !== '') {
+      clearErrors(`annual_finances_attributes.${index}.missing_information`)
+    }
+
+    if (field === 'year') {
+      clearErrors(`annual_finances_attributes.${index}.year`)
+    }
+  }
 
   function handleSubmit (e: React.MouseEvent<HTMLButtonElement>): void {
-    if (formRef.current.reportValidity() === false) {
+    if (formRef.current?.reportValidity() === false) {
       e.preventDefault()
+      return
     }
+
+    const result = financeValidation(data.annual_finances_attributes ?? [], index).safeParse(sheetFinance)
+    if (!result.success) {
+      e.preventDefault()
+      const issues = result.error.issues
+      issues.forEach(issue => {
+        setError(issue.path.join('.'), issue.message)
+      })
+      return
+    }
+
+    onUpdate(deepCleanData(sheetFinance) as AnnualFinance)
   }
 
   return (
     <SheetContent className='w-full sm:max-w-[600px] overflow-y-auto'>
       <form ref={formRef}>
         <SheetHeader>
-          <SheetTitle>{title}</SheetTitle>
+          <SheetTitle>Comptes annuels</SheetTitle>
           <SheetDescription className='sr-only'>
             Renseignez les informations financières pour cette année.
           </SheetDescription>
@@ -86,16 +147,16 @@ export default function OsblFinanceSheet ({
             min={1000}
             max={new Date().getFullYear()}
             placeholder={String(new Date().getFullYear() - 1)}
-            value={finance.year ?? ''}
-            onChange={(e) => onUpdate('year', e.target.value)}
+            value={sheetFinance.year ?? ''}
+            onChange={(e) => updateSheetFinance('year', e.target.value)}
             required
             error={errors[`annual_finances_attributes.${index}.year`] ?? errors[`annual_finances_attributes.${index}.missing_information`]}
           />
 
           <MyCheckbox
             id={`certified-${index}`}
-            checked={finance.certified ?? false}
-            onCheckedChange={(checked) => onUpdate('certified', checked)}
+            checked={sheetFinance.certified ?? false}
+            onCheckedChange={(checked) => updateSheetFinance('certified', checked)}
           >
             <div className='flex items-center'>
               Comptes certifiés
@@ -110,8 +171,8 @@ export default function OsblFinanceSheet ({
             labelText='Budget'
             min={0}
             step={0.01}
-            value={finance.budget ?? ''}
-            onChange={(e) => onUpdate('budget', e.target.value)}
+            value={sheetFinance.budget ?? ''}
+            onChange={(e) => updateSheetFinance('budget', e.target.value)}
             suffix='€'
           />
 
@@ -119,31 +180,29 @@ export default function OsblFinanceSheet ({
             id={`treasury-${index}`}
             labelText='Trésorerie'
             step={0.01}
-            value={finance.treasury ?? ''}
-            onChange={(e) => onUpdate('treasury', e.target.value)}
+            value={sheetFinance.treasury ?? ''}
+            onChange={(e) => updateSheetFinance('treasury', e.target.value)}
             suffix='€'
           />
 
           <FundManagementSection
             title='Sources de financement'
-            items={finance.fund_sources_attributes ?? []}
-            typeList={FundSourceTypeList}
-            baseErrorPath={`annual_finances_attributes.${index}.fund_sources_attributes`}
+            items={sheetFinance.fund_sources_attributes ?? []}
+            typeList={[...FundSourceTypeList] as Array<{ value: string, label: string, group: string }>}
+            baseErrorPath='fund_sources_attributes'
+            onUpdate={(items) => updateSheetFinance('fund_sources_attributes', items)}
             errors={errors}
-            onUpdate={(items) => onUpdate('fund_sources_attributes', items)}
             clearErrors={clearErrors}
-            setError={setError}
           />
 
           <FundManagementSection
             title='Allocation des fonds'
-            items={finance.fund_allocations_attributes ?? []}
-            typeList={FundAllocationTypeList}
-            baseErrorPath={`annual_finances_attributes.${index}.fund_allocations_attributes`}
+            items={sheetFinance.fund_allocations_attributes ?? []}
+            typeList={[...FundAllocationTypeList] as Array<{ value: string, label: string, group: string }>}
+            baseErrorPath='fund_allocations_attributes'
+            onUpdate={(items) => updateSheetFinance('fund_allocations_attributes', items)}
             errors={errors}
-            onUpdate={(items) => onUpdate('fund_allocations_attributes', items)}
             clearErrors={clearErrors}
-            setError={setError}
           />
 
           <Separator />
@@ -152,18 +211,23 @@ export default function OsblFinanceSheet ({
             id={`employees_count-${index}`}
             labelText="Nombre d'employé"
             min={0}
-            value={finance.employees_count ?? ''}
-            onChange={(e) => onUpdate('employees_count', e.target.value)}
+            value={sheetFinance.employees_count ?? ''}
+            onChange={(e) => updateSheetFinance('employees_count', e.target.value)}
           />
-
-          <Separator />
         </div>
 
-        <SheetFooter>
+        <SheetFooter className='mt-16'>
+          <SheetClose asChild>
+            <Button variant='ghost' size='lg'>
+              <X className='mr-2' />
+              Annuler
+            </Button>
+          </SheetClose>
+
           <SheetClose asChild>
-            <Button onClick={(e) => handleSubmit(e)} variant='default' size='lg' className='mx-auto mt-8'>
+            <Button onClick={handleSubmit} variant='default' size='lg'>
               <CheckIcon className='mr-2' />
-              {submitLabel}
+              Valider
             </Button>
           </SheetClose>
         </SheetFooter>
diff --git a/app/frontend/components/pages/contribution/new/OsblHeader.tsx b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
index 54f317a..b752a72 100644
--- a/app/frontend/components/pages/contribution/new/OsblHeader.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
@@ -7,8 +7,6 @@ import HelpTooltip from '@/components/shared/HelpTooltip'
 import MyFileInput from '@/components/shared/MyFileInput'
 
 export default function OsblHeader ({ data, setData, errors, clearErrors }: Omit<FormProps, 'setError'>): ReactElement {
-  const descriptionLength = (data.description ?? '').length
-
   return (
     <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full'>
       <h2 className='text-2xl font-semibold'>En-tête</h2>
@@ -67,14 +65,15 @@ export default function OsblHeader ({ data, setData, errors, clearErrors }: Omit
               id='description'
               placeholder='Mission, actions, ...'
               value={data.description}
+              maxLength={300}
               onChange={(e) => {
                 setData('description', e.target.value)
                 clearErrors('description')
               }}
-              className={`bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-auto flex-grow h-40 ${descriptionLength > 300 ? 'border-red-600' : ''}`}
+              className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-auto flex-grow h-40'
             />
-            <div className={`text-xs text-right ${descriptionLength > 300 ? 'text-red-600' : 'text-gray-500'}`}>
-              {descriptionLength}/300 caractères
+            <div className='text-xs text-right'>
+              {(data.description ?? '').length}/300 caractères
             </div>
           </div>
         </div>
diff --git a/app/frontend/lib/constants.ts b/app/frontend/lib/constants.ts
index 19b1ecf..3204eeb 100644
--- a/app/frontend/lib/constants.ts
+++ b/app/frontend/lib/constants.ts
@@ -5,3 +5,17 @@ export const DocumentTypeList = [
   { value: 'proces_verbal', label: 'Procès verbal' },
   { value: 'autre', label: 'Autre' }
 ] as const
+
+export const FundSourceTypeList = [
+  { value: 'dons', label: 'Dons', group: 'main' },
+  { value: 'aides_publiques', label: 'Aides publiques', group: 'main' },
+  { value: 'revenus_d_activites', label: 'Revenus d\'activités', group: 'main' },
+  { value: 'autre', label: 'Autre', group: 'main' }
+] as const
+
+export const FundAllocationTypeList = [
+  { value: 'missions_sociales', label: 'Missions sociales', group: 'main' },
+  { value: 'frais_de_fonctionnement', label: 'Frais de fonctionnement', group: 'main' },
+  { value: 'frais_de_recherche_de_fonds', label: 'Frais de recherche de fonds', group: 'main' },
+  { value: 'autre', label: 'Autre', group: 'main' }
+] as const
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index c0ca555..e545983 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -29,80 +29,8 @@ const validation = z.object({
       return ALLOWED_LOGO_TYPES.includes(file.type)
     }, 'Le type de fichier est invalide. Format accepté : SVG, PNG, WEBP.')
     .optional(),
-  description: z.string().max(300).optional(),
   osbls_causes_attributes: z.array(z.object({ cause_id: z.string() })).min(1, { message: 'Au moins une cause est requise.' }),
-  tax_reduction: z.enum(['intérêt_général', 'aide_aux_personnes_en_difficulté'], { message: 'Veuillez sélectionner un pourcentage.' }),
-  annual_finances_attributes: z.preprocess((finances) => deepCleanData(finances), z.array(
-    z.object({
-      year: z.string({ message: 'Veuillez entrer une année.' })
-        .regex(/^\d{4}$/, { message: 'L\'année doit contenir exactement 4 chiffres.' })
-        .min(1, { message: 'Veuillez entrer une année.' })
-        .refine((year) => {
-          const yearNum = Number(year)
-          return yearNum <= new Date().getFullYear()
-        }, { message: 'L\'année ne peut pas être dans le futur.' }),
-      budget: z.string().optional(),
-      treasury: z.string().optional(),
-      employees_count: z.string().optional(),
-      fund_sources_attributes: z.array(z.object({
-        type: z.string(),
-        percent: z.string().min(1)
-          .refine((percent) => {
-            const percentNum = Number(percent)
-            return percentNum >= 0.01 && percentNum <= 100
-          }, { message: 'Le pourcentage doit être compris entre 0.01 et 100.' }),
-        amount: z.string().optional()
-      })).optional()
-        .refine((sources): sources is typeof sources => {
-          if (sources === undefined || sources.length === 0) return true
-
-          const sum = sources.reduce((acc: number, source) => {
-            const percent = source.percent !== undefined ? Number(source.percent) : 0
-            return acc + percent
-          }, 0)
-          return sum === 100
-        }, {
-          message: 'La somme des pourcentages doit être égale à 100%.',
-          path: ['total_percent']
-        }),
-      fund_allocations_attributes: z.array(z.object({
-        type: z.string(),
-        percent: z.string().min(1)
-          .refine((percent) => {
-            const percentNum = Number(percent)
-            return percentNum >= 0.01 && percentNum <= 100
-          }, { message: 'Le pourcentage doit être compris entre 0.01 et 100.' }),
-        amount: z.string().optional()
-      })).optional()
-        .refine((allocations): allocations is typeof allocations => {
-          if (allocations === undefined || allocations.length === 0) return true
-
-          const sum = allocations.reduce((acc: number, allocation) => {
-            const percent = allocation.percent !== undefined ? Number(allocation.percent) : 0
-            return acc + percent
-          }, 0)
-          return sum === 100
-        }, {
-          message: 'La somme des pourcentages doit être égale à 100%.',
-          path: ['total_percent']
-        })
-    }).refine((finance) => {
-      const financeCleaned = deepCleanData(finance)
-      // We want at least one other field besides year
-      return !(Object.keys(financeCleaned).length === 1 && financeCleaned.year !== undefined)
-    }, {
-      message: 'Complétez les comptes pour cette année.',
-      path: ['missing_information']
-    })
-  ).optional()
-    .refine((finances) => {
-      if (finances === undefined || finances.length === 0) return true
-      const years = finances.map(f => f.year)
-      return new Set(years).size === years.length
-    }, {
-      message: 'Une année ne peut être ajoutée qu\'une seule fois.',
-      path: ['duplicate_years']
-    }))
+  tax_reduction: z.enum(['intérêt_général', 'aide_aux_personnes_en_difficulté'], { message: 'Veuillez sélectionner un pourcentage.' })
 })
 
 export default function New ({ currentUser }: { currentUser: CurrentUserType }): ReactElement {
@@ -117,7 +45,6 @@ export default function New ({ currentUser }: { currentUser: CurrentUserType }):
 
     transform((data) => (deepCleanData(data)))
     const result = validation.safeParse(data) as { success: boolean, error: z.ZodError }
-    // const result = validation.safeParse(deepCleanData(data)) as { success: boolean, error: z.ZodError }
     if (!result.success) {
       const issues = result.error.issues
       issues.forEach(issue => {
diff --git a/app/frontend/pages/Contribution/types.ts b/app/frontend/pages/Contribution/types.ts
index fa7d41d..1375931 100644
--- a/app/frontend/pages/Contribution/types.ts
+++ b/app/frontend/pages/Contribution/types.ts
@@ -22,7 +22,7 @@ export interface FundRecord {
 }
 
 export interface AnnualFinance {
-  year?: number
+  year: number
   budget?: number
   treasury?: number
   employees_count?: number

From dac71fee888d2178da56ec5833bbb33424775c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Mon, 3 Feb 2025 09:59:35 +0000
Subject: [PATCH 18/31] Improve OsblDocumentSheet UI with smoother collapsible
 animations

- Added custom CSS animations for CollapsibleContent
- Increased transition duration for ChevronDown icon
- Added class to CollapsibleContent for better overflow handling
- Implemented slide up and down animations for collapsible section
---
 .../contribution/new/OsblDocumentSheet.tsx    |  6 ++--
 app/frontend/entrypoints/application.css      | 29 +++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
index 74e19f8..3d14218 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
@@ -167,10 +167,10 @@ export default function OsblDocumentSheet ({
             <CollapsibleTrigger asChild>
               <div className='flex justify-between items-center cursor-pointer text-muted-foreground hover:text-muted-foreground/80'>
                 <span>Informations additionnelles</span>
-                <ChevronDown className={`transition-transform duration-200 ${isOpen ? 'rotate-180' : ''}`} />
+                <ChevronDown className={`transition-transform duration-300 ${isOpen ? 'rotate-180' : ''}`} />
               </div>
             </CollapsibleTrigger>
-            <CollapsibleContent>
+            <CollapsibleContent className='CollapsibleContent'>
               <div className='flex flex-col gap-8 mt-8'>
                 {!['proces_verbal', 'autre'].includes(sheetDocument.type ?? '') && (
                   <MyInput
@@ -213,7 +213,7 @@ export default function OsblDocumentSheet ({
           </Collapsible>
         </div>
 
-        <SheetFooter className='mt-16'>
+        <SheetFooter className='mt-16 gap-y-2'>
           <SheetClose asChild>
             <Button variant='ghost' size='lg'>
               <X className='mr-2' />
diff --git a/app/frontend/entrypoints/application.css b/app/frontend/entrypoints/application.css
index 05c7d2d..5a1a851 100644
--- a/app/frontend/entrypoints/application.css
+++ b/app/frontend/entrypoints/application.css
@@ -167,3 +167,32 @@
 body {
   @apply font-montserrat;
 }
+
+.CollapsibleContent {
+	overflow: hidden;
+}
+.CollapsibleContent[data-state="open"] {
+	animation: slideDown 300ms ease-out;
+}
+.CollapsibleContent[data-state="closed"] {
+	animation: slideUp 300ms ease-out;
+}
+
+@keyframes slideDown {
+	from {
+		height: 0;
+	}
+	to {
+		height: var(--radix-collapsible-content-height);
+	}
+}
+
+@keyframes slideUp {
+	from {
+		height: var(--radix-collapsible-content-height);
+	}
+	to {
+		height: 0;
+	}
+}
+

From 66a06f39ffdcab8f3cf125c2204451ed119d7b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Mon, 3 Feb 2025 12:01:39 +0000
Subject: [PATCH 19/31] Refactor locations section with dynamic sheet-based
 editing and improved validation

- Introduced OsblLocationSheet component for detailed location management
- Replaced complex card-based location form with a more user-friendly sheet interface
- Added dynamic location display with edit and remove functionality
- Improved location type and address validation
- Extracted location type list to constants file
- Updated location model and database constraints for more precise validation
- Enhanced MyAsyncSelect component to support pre-filled values
---
 .../contribution/new/OsblDocumentSheet.tsx    |   6 +-
 .../pages/contribution/new/OsblDocuments.tsx  |  61 +++--
 .../contribution/new/OsblLocationSheet.tsx    | 220 ++++++++++++++++++
 .../pages/contribution/new/OsblLocations.tsx  | 199 +++++-----------
 .../components/shared/MyAsyncSelect.tsx       |  21 +-
 app/frontend/lib/constants.ts                 |   7 +
 app/frontend/pages/Contribution/types.ts      |  37 +--
 app/models/location.rb                        |   2 +
 ...3115228_add_more_constraint_to_location.rb |   5 +
 db/schema.rb                                  |   3 +-
 10 files changed, 338 insertions(+), 223 deletions(-)
 create mode 100644 app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx
 create mode 100644 db/migrate/20250203115228_add_more_constraint_to_location.rb

diff --git a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
index 3d14218..e04eabb 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
@@ -114,7 +114,7 @@ export default function OsblDocumentSheet ({
               <SelectTrigger className='w-full'>
                 <SelectValue />
               </SelectTrigger>
-              <SelectContent id={`document-type-${index}`}>
+              <SelectContent>
                 {DocumentTypeList.map((type) => (
                   <SelectItem key={type.value} value={type.value}>
                     {type.label}
@@ -140,7 +140,7 @@ export default function OsblDocumentSheet ({
             <MyInput
               labelText='Nom du document *'
               id={`document-name-${index}`}
-              type='string'
+              type='text'
               value={sheetDocument.name ?? ''}
               onChange={(e) => updateSheetDocument('name', e.target.value)}
               required
@@ -176,7 +176,7 @@ export default function OsblDocumentSheet ({
                   <MyInput
                     labelText='Nom du document'
                     id={`document-name-${index}`}
-                    type='string'
+                    type='text'
                     value={sheetDocument.name ?? ''}
                     onChange={(e) => updateSheetDocument('name', e.target.value)}
                   />
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index 141d9f7..2a3a3d4 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -62,39 +62,36 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors, set
 
       {documents.length > 0 && (
         <div className='flex flex-col gap-4'>
-          {documents
-            .map((doc, index) => {
-              return (
-                <Sheet key={`document-${index}`}>
-                  <div className='flex items-center justify-between p-4 border rounded-lg bg-white'>
-                    <p>{getDocumentDisplayName(doc.document_attributes)}</p>
-                    <div className='flex gap-2 '>
-                      <SheetTrigger asChild>
-                        <Button variant='outline' className='bg-white text-primary border-none'>
-                          <PencilIcon />
-                        </Button>
-                      </SheetTrigger>
-                      <Button
-                        onClick={(e) => handleDocumentRemove(e, index)}
-                        variant='outline'
-                        className='bg-white text-red-500 border-none'
-                      >
-                        <TrashIcon className='w-4 h-4' />
-                      </Button>
-                    </div>
-                  </div>
+          {documents.map((doc, index) => (
+            <Sheet key={`document-${index}`}>
+              <div className='flex items-center justify-between p-4 border rounded-lg bg-white'>
+                <p>{getDocumentDisplayName(doc.document_attributes)}</p>
+                <div className='flex gap-2 '>
+                  <SheetTrigger asChild>
+                    <Button variant='outline' className='bg-white text-primary border-none'>
+                      <PencilIcon />
+                    </Button>
+                  </SheetTrigger>
+                  <Button
+                    onClick={(e) => handleDocumentRemove(e, index)}
+                    variant='outline'
+                    className='bg-white text-red-500 border-none'
+                  >
+                    <TrashIcon className='w-4 h-4' />
+                  </Button>
+                </div>
+              </div>
 
-                  <OsblDocumentSheet
-                    document={doc.document_attributes}
-                    index={index}
-                    onUpdate={(doc) => addDocument(doc, index)}
-                    errors={errors}
-                    clearErrors={clearErrors}
-                    setError={setError}
-                  />
-                </Sheet>
-              )
-            })}
+              <OsblDocumentSheet
+                document={doc.document_attributes}
+                index={index}
+                onUpdate={(doc) => addDocument(doc, index)}
+                errors={errors}
+                clearErrors={clearErrors}
+                setError={setError}
+              />
+            </Sheet>
+          ))}
         </div>
       )}
     </div>
diff --git a/app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx b/app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx
new file mode 100644
index 0000000..785378c
--- /dev/null
+++ b/app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx
@@ -0,0 +1,220 @@
+import { ReactElement, useRef, useState } from 'react'
+import { Location } from '@/pages/Contribution/types'
+import { Button } from '@/components/ui/button'
+import MyInput from '@/components/forms/MyInput'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue
+} from '@/components/ui/select'
+import { Textarea } from '@/components/ui/textarea'
+import { CheckIcon, ChevronDown, X } from 'lucide-react'
+import {
+  SheetClose,
+  SheetContent,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+  SheetDescription
+} from '@/components/ui/sheet'
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger
+} from '@/components/ui/collapsible'
+import MyAsyncSelect from '@/components/shared/MyAsyncSelect'
+import deepCleanData from '@/lib/deepCleanData'
+import { LocationTypeList } from '@/lib/constants'
+import { Label } from '@/components/ui/label'
+
+interface Props {
+  location: Partial<Location>
+  index: number
+  onUpdate: (location: Location) => void
+  hasSiegeSocial: boolean
+}
+
+export default function OsblLocationSheet ({
+  location,
+  index,
+  onUpdate,
+  hasSiegeSocial
+}: Props): ReactElement {
+  const formRef = useRef<HTMLFormElement>(null)
+  const [sheetLocation, setSheetLocation] = useState<Partial<Location>>(location)
+  const [isOpen, setIsOpen] = useState(() => {
+    const checks = [
+      sheetLocation.name !== undefined,
+      sheetLocation.address_attributes?.additional_info !== undefined,
+      sheetLocation.website !== undefined,
+      sheetLocation.description !== undefined
+    ]
+    return checks.some(check => check)
+  })
+
+  function updateSheetLocation (field: keyof Location, value: any): void {
+    setSheetLocation(prev => ({
+      ...prev,
+      [field]: value
+    }))
+  }
+
+  function handleAddressChange (value: any, field?: string): void {
+    setSheetLocation(prev => ({
+      ...prev,
+      address_attributes: field != null
+        ? { ...prev.address_attributes, [field]: value }
+        : value
+    }))
+  }
+
+  function handleSubmit (e: React.MouseEvent<HTMLButtonElement>): void {
+    if (formRef.current?.reportValidity() === false) {
+      e.preventDefault()
+      return
+    }
+
+    onUpdate(deepCleanData(sheetLocation))
+  }
+
+  function getLabel (): string {
+    return [
+      sheetLocation.address_attributes?.street_number,
+      sheetLocation.address_attributes?.street_name,
+      sheetLocation.address_attributes?.postal_code,
+      sheetLocation.address_attributes?.city
+    ].filter(Boolean).join(' ')
+  }
+
+  return (
+    <SheetContent className='w-full sm:max-w-[600px] overflow-y-auto'>
+      <form ref={formRef}>
+        <SheetHeader>
+          <SheetTitle>Lieu</SheetTitle>
+          <SheetDescription className='sr-only'>
+            Renseignez les informations du lieu.
+          </SheetDescription>
+        </SheetHeader>
+
+        <div className='flex flex-col gap-8 mt-8'>
+          <div className='flex flex-col gap-4'>
+            <Label>Type de lieu *</Label>
+            <Select
+              value={sheetLocation.type}
+              onValueChange={(value) => updateSheetLocation('type', value)}
+              required
+            >
+              <SelectTrigger className='w-full'>
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                {LocationTypeList
+                  .filter(type =>
+                    type.value !== 'siege_social' || !hasSiegeSocial || location.type === 'siege_social'
+                  )
+                  .map((type) => (
+                    <SelectItem key={type.value} value={type.value}>
+                      {type.label}
+                    </SelectItem>
+                  ))}
+              </SelectContent>
+            </Select>
+          </div>
+
+          {['antenne_locale', 'lieu_d_activite', 'autre'].includes(sheetLocation.type ?? '') && (
+            <MyInput
+              labelText='Nom du lieu *'
+              id={`location-name-${index}`}
+              type='text'
+              value={sheetLocation.name ?? ''}
+              onChange={(e) => updateSheetLocation('name', e.target.value)}
+              required
+            />
+          )}
+
+          <div className='flex flex-col gap-4'>
+            <Label>Adresse *</Label>
+            <MyAsyncSelect
+              setData={(_, value) => handleAddressChange(value)}
+              attributeName='address_attributes'
+              required
+              value={getLabel()}
+            />
+          </div>
+
+          <Collapsible open={isOpen} onOpenChange={setIsOpen}>
+            <CollapsibleTrigger asChild>
+              <div className='flex justify-between items-center cursor-pointer text-muted-foreground hover:text-muted-foreground/80'>
+                <span>Informations additionnelles</span>
+                <ChevronDown className={`transition-transform duration-300 ${isOpen ? 'rotate-180' : ''}`} />
+              </div>
+            </CollapsibleTrigger>
+            <CollapsibleContent className='CollapsibleContent'>
+              <div className='flex flex-col gap-8 mt-8'>
+                {sheetLocation.type === 'siege_social' && (
+                  <MyInput
+                    labelText='Nom du lieu'
+                    id={`location-name-${index}`}
+                    type='text'
+                    value={sheetLocation.name ?? ''}
+                    onChange={(e) => updateSheetLocation('name', e.target.value)}
+                  />
+                )}
+
+                <MyInput
+                  labelText="Complément d'adresse"
+                  type='text'
+                  id={`location-additional-address-info-${index}`}
+                  value={sheetLocation.address_attributes?.additional_info ?? ''}
+                  onChange={(e) => handleAddressChange(e.target.value, 'additional_info')}
+                />
+
+                <MyInput
+                  labelText='Site web'
+                  type='url'
+                  id={`location-website-${index}`}
+                  value={sheetLocation.website ?? ''}
+                  onChange={(e) => updateSheetLocation('website', e.target.value)}
+                />
+
+                <div className='flex flex-col gap-4'>
+                  <label htmlFor={`location-description-${index}`} className='text-sm font-medium'>
+                    Description du lieu
+                  </label>
+                  <Textarea
+                    id={`location-description-${index}`}
+                    value={sheetLocation.description ?? ''}
+                    maxLength={300}
+                    onChange={(e) => updateSheetLocation('description', e.target.value)}
+                    className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-full h-40'
+                  />
+                  <div className='text-xs text-right'>
+                    {sheetLocation.description?.length ?? 0}/300 caractères
+                  </div>
+                </div>
+              </div>
+            </CollapsibleContent>
+          </Collapsible>
+        </div>
+
+        <SheetFooter className='mt-16 gap-y-2'>
+          <SheetClose asChild>
+            <Button variant='ghost' size='lg'>
+              <X className='mr-2' />
+              Annuler
+            </Button>
+          </SheetClose>
+
+          <SheetClose asChild>
+            <Button onClick={handleSubmit} variant='default' size='lg'>
+              <CheckIcon className='mr-2' />
+              Valider
+            </Button>
+          </SheetClose>
+        </SheetFooter>
+      </form>
+    </SheetContent>
+  )
+}
diff --git a/app/frontend/components/pages/contribution/new/OsblLocations.tsx b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
index 2872ae2..6e06bea 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocations.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
@@ -1,182 +1,87 @@
 import { ReactElement } from 'react'
 import { FormProps, Location } from '@/pages/Contribution/types'
 import { Button } from '@/components/ui/button'
-import { PlusIcon, TrashIcon, ChevronDown } from 'lucide-react'
-import MyInput from '@/components/forms/MyInput'
+import { PlusIcon, TrashIcon, PencilIcon } from 'lucide-react'
 import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue
-} from '@/components/ui/select'
-import { Textarea } from '@/components/ui/textarea'
-import { Card, CardContent, CardHeader } from '@/components/ui/card'
-import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
-import MyAsyncSelect from '@/components/shared/MyAsyncSelect'
-
-const LocationTypeList = [
-  { value: 'siege_social', label: 'Siège social' },
-  { value: 'antenne_locale', label: 'Antenne locale' },
-  { value: 'lieu_d_activite', label: 'Lieu d\'activité' },
-  { value: 'autre', label: 'Autre' }
-]
+  Sheet,
+  SheetTrigger
+} from '@/components/ui/sheet'
+import OsblLocationSheet from './OsblLocationSheet'
+import { LocationTypeList } from '@/lib/constants'
 
 export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data' | 'setData'>): ReactElement {
   const locations = data.locations_attributes ?? []
-
   const hasSiegeSocial = locations.some(loc => loc.type === 'siege_social')
 
-  function handleLocationChange (
-    index: number,
-    field: keyof Location,
-    value: Location[typeof field]
-  ): void {
-    const updatedLocations = locations.map((loc, i: number) =>
-      i === index
-        ? {
-            ...loc,
-            [field]: value
-          }
-        : loc
-    )
+  function addLocation (location: Location, index: number): void {
+    const updatedLocations = [...locations]
+    updatedLocations[index] = location
 
     setData('locations_attributes', updatedLocations)
   }
 
-  function handleAddressChange (index: number, value: any, field?: string): void {
-    const updatedLocations = locations.map((loc, i) =>
-      i === index
-        ? {
-            ...loc,
-            address_attributes: field != null
-              ? { ...loc.address_attributes, [field]: value }
-              : value
-          }
-        : loc
-    )
-    setData('locations_attributes', updatedLocations)
+  function handleLocationRemove (e: React.MouseEvent<HTMLButtonElement>, index: number): void {
+    e.preventDefault() // prevent the form from being submitted
+    setData('locations_attributes', locations.filter((_, i) => i !== index))
   }
 
-  function handleLocationAdd (e: React.MouseEvent<HTMLButtonElement>): void {
-    e.preventDefault()
-    setData('locations_attributes', [...locations, {}])
-  }
+  function getLocationDisplayName (location: Location): string {
+    if (location.name !== undefined) return location.name
 
-  function handleLocationRemove (
-    e: React.MouseEvent<HTMLButtonElement>,
-    index: number
-  ): void {
-    e.preventDefault()
-    const updatedDocuments = locations.filter((_, i) => i !== index)
-    setData('locations_attributes', updatedDocuments)
+    const type = LocationTypeList.find(t => t.value === location.type)
+    return type?.label as string
   }
 
   return (
     <div className='bg-white rounded-lg border p-4 sm:px-8 sm:py-8 gap-8 flex flex-col w-full h-full'>
-      <div className='flex items-center gap-4 justify-between flex-wrap'>
+      <div className='flex flex-wrap gap-4 items-center justify-between'>
         <h2 className='text-2xl font-semibold w-[145px]'>Lieux</h2>
-        <Button onClick={handleLocationAdd} variant='outline'>
-          <PlusIcon className='w-4 h-4' />
-          <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
-        </Button>
+        <Sheet>
+          <SheetTrigger asChild>
+            <Button variant='outline'>
+              <PlusIcon className='w-4 h-4' />
+              <span className='ml-2 hidden sm:block lg:hidden xl:block'>Ajouter</span>
+            </Button>
+          </SheetTrigger>
+          <OsblLocationSheet
+            key={`location-${locations.length}`}
+            location={{}}
+            index={locations.length}
+            onUpdate={(loc) => addLocation(loc, locations.length)}
+            hasSiegeSocial={hasSiegeSocial}
+          />
+        </Sheet>
       </div>
 
       {locations.length > 0 && (
         <div className='flex flex-col gap-4'>
           {locations.map((loc, index) => (
-            <Card
-              key={`location-${loc.type ?? 'new'}-${index}`}
-              className='bg-background'
-            >
-              <CardHeader className='flex flex-row items-center justify-between space-y-0 pb-2'>
-                <div className='flex items-center gap-16 flex-1'>
-                  <Select
-                    value={loc.type}
-                    onValueChange={(value) => handleLocationChange(index, 'type', value)}
-                    required
-                  >
-                    <SelectTrigger className='w-60 data-[placeholder]:text-muted-foreground'>
-                      <SelectValue placeholder='Type de lieu *' />
-                    </SelectTrigger>
-                    <SelectContent>
-                      {LocationTypeList
-                        .filter(type =>
-                          type.value !== 'siege_social' || !hasSiegeSocial || loc.type === 'siege_social'
-                        )
-                        .map((type) => (
-                          <SelectItem key={type.value} value={type.value}>
-                            {type.label}
-                          </SelectItem>
-                        ))}
-                    </SelectContent>
-                  </Select>
-
+            <Sheet key={`location-${index}`}>
+              <div className='flex items-center justify-between p-4 border rounded-lg bg-white'>
+                <p>{getLocationDisplayName(loc)}</p>
+                <div className='flex gap-2'>
+                  <SheetTrigger asChild>
+                    <Button variant='outline' className='bg-white text-primary border-none'>
+                      <PencilIcon />
+                    </Button>
+                  </SheetTrigger>
                   <Button
                     onClick={(e) => handleLocationRemove(e, index)}
-                    variant='ghost'
-                    className='text-red-500 hover:text-red-700 p-0 h-auto'
+                    variant='outline'
+                    className='bg-white text-red-500 border-none'
                   >
                     <TrashIcon className='w-4 h-4' />
                   </Button>
                 </div>
-              </CardHeader>
-
-              <CardContent className='flex flex-col gap-4'>
-                <MyAsyncSelect
-                  setData={(_, value) => handleAddressChange(index, value)}
-                  attributeName='address_attributes'
-                  placeholder='Adresse *'
-                  required
-                />
-
-                <Collapsible>
-                  <CollapsibleTrigger className='flex items-center gap-2 text-sm text-muted-foreground hover:text-foreground transition-colors'>
-                    <ChevronDown className='h-4 w-4' />
-                    Informations additionnelles
-                  </CollapsibleTrigger>
-
-                  <CollapsibleContent className='space-y-4 pt-4'>
-                    <MyInput
-                      type='text'
-                      id={`location-name-${index}`}
-                      value={loc.name ?? ''}
-                      onChange={(e) => handleLocationChange(index, 'name', e.target.value)}
-                      placeholder='Nom du lieu'
-                    />
-
-                    <MyInput
-                      type='text'
-                      id={`location-additional-address-info-${index}`}
-                      value={loc.address_attributes?.additional_info ?? ''}
-                      onChange={(e) => handleAddressChange(index, e.target.value, 'additional_info')}
-                      placeholder="Complément d'adresse"
-                    />
-
-                    <MyInput
-                      type='url'
-                      id={`location-website-${index}`}
-                      value={loc.website ?? ''}
-                      onChange={(e) => handleLocationChange(index, 'website', e.target.value)}
-                      placeholder='Site web'
-                    />
-
-                    <div className='flex flex-col gap-2'>
-                      <Textarea
-                        id={`location-description-${index}`}
-                        placeholder='Description du lieu'
-                        value={loc.description?.toString() ?? ''}
-                        onChange={(e) => handleLocationChange(index, 'description', e.target.value)}
-                        className='bg-white focus-visible:ring-0 focus-visible:border-primary placeholder:text-ellipsis placeholder:text-xs md:placeholder:text-sm focus-visible:ring-offset-0 w-full h-40'
-                      />
-                      <div className={`text-xs text-right ${(loc.description?.toString().length ?? 0) > 300 ? 'text-red-600' : 'text-gray-500'}`}>
-                        {(loc.description?.toString().length ?? 0)}/300 caractères
-                      </div>
-                    </div>
-                  </CollapsibleContent>
-                </Collapsible>
-              </CardContent>
-            </Card>
+              </div>
+
+              <OsblLocationSheet
+                location={loc}
+                index={index}
+                onUpdate={(loc) => addLocation(loc, index)}
+                hasSiegeSocial={hasSiegeSocial}
+              />
+            </Sheet>
           ))}
         </div>
       )}
diff --git a/app/frontend/components/shared/MyAsyncSelect.tsx b/app/frontend/components/shared/MyAsyncSelect.tsx
index 8cc4b88..f88798c 100644
--- a/app/frontend/components/shared/MyAsyncSelect.tsx
+++ b/app/frontend/components/shared/MyAsyncSelect.tsx
@@ -12,8 +12,9 @@ interface MyAsyncCreatableSelectProps {
   setData: (key: string, value: any) => void
   attributeName: string
   minInputLength?: number
-  placeholder: string
+  placeholder?: string
   required?: boolean
+  value: string
 }
 
 const createOption = (feature: any): Option => ({
@@ -33,9 +34,11 @@ export default function MyAsyncCreatableSelect ({
   attributeName,
   minInputLength = 3,
   placeholder,
-  required = false
+  required = false,
+  value
 }: MyAsyncCreatableSelectProps): ReactElement {
   const fetchOptions = async (inputValue: string): Promise<Option[]> => {
+    console.log('inputValue', inputValue)
     if (inputValue.trim().length < minInputLength) return []
 
     const response = await fetch(`https://api-adresse.data.gouv.fr/search/?q=${inputValue}`)
@@ -55,14 +58,16 @@ export default function MyAsyncCreatableSelect ({
       debouncedFetchOptions(inputValue, resolve)
     })
   }
+
   return (
     <AsyncSelect
-      required={required}
+      required={required && value === undefined}
       loadOptions={promiseOptions}
       onChange={(newValue: Option | null) => {
         if (newValue === null) return
         setData(attributeName, newValue.value)
       }}
+      defaultInputValue={value}
       styles={{
         control: (base, state) => ({
           ...base,
@@ -73,16 +78,6 @@ export default function MyAsyncCreatableSelect ({
             borderColor: 'hsl(var(--border))'
           }
         }),
-        // singleValue: (base) => ({
-        //   ...base,
-        //   border: '1px solid hsla(var(--foreground) / 0.1)',
-        //   borderRadius: '9999px',
-        //   backgroundColor: 'hsl(var(--white))',
-        //   padding: '0rem 0.3rem',
-        //   fontWeight: 600,
-        //   fontSize: '0.825rem',
-        //   lineHeight: '1rem'
-        // }),
         placeholder: (base) => ({
           ...base,
           fontSize: '0.875rem'
diff --git a/app/frontend/lib/constants.ts b/app/frontend/lib/constants.ts
index 3204eeb..50e0247 100644
--- a/app/frontend/lib/constants.ts
+++ b/app/frontend/lib/constants.ts
@@ -19,3 +19,10 @@ export const FundAllocationTypeList = [
   { value: 'frais_de_recherche_de_fonds', label: 'Frais de recherche de fonds', group: 'main' },
   { value: 'autre', label: 'Autre', group: 'main' }
 ] as const
+
+export const LocationTypeList = [
+  { value: 'siege_social', label: 'Siège social' },
+  { value: 'antenne_locale', label: 'Antenne locale' },
+  { value: 'lieu_d_activite', label: "Lieu d'activité" },
+  { value: 'autre', label: 'Autre' }
+] as const
diff --git a/app/frontend/pages/Contribution/types.ts b/app/frontend/pages/Contribution/types.ts
index 1375931..cde9f92 100644
--- a/app/frontend/pages/Contribution/types.ts
+++ b/app/frontend/pages/Contribution/types.ts
@@ -6,18 +6,9 @@ export interface ContributionType {
   contributable_type: string
 }
 
-export type ContributionFormType = Omit<ContributionType, 'id'>
-
-export interface OsblType {
-  id: number
-  name: string
-}
-
-export type OsblFormType = Omit<OsblType, 'id'>
-
 export interface FundRecord {
-  type?: string
-  percent?: number
+  type: string
+  percent: number
   amount?: number
 }
 
@@ -41,27 +32,19 @@ export interface Document {
 
 export interface Address {
   street_number?: string
-  street_name?: string
+  street_name: string
   additional_info?: string
-  postal_code?: string
-  city?: string
-  latitude?: number
-  longitude?: number
+  postal_code: string
+  city: string
+  latitude: number
+  longitude: number
 }
 
 export interface Location {
-  type?: string
+  type: string
+  address_attributes: Address
   name?: string
-  address_attributes?: Address
-  // opening_hours?: Record<string, { open: string; close: string }>
-  //  is_accessible?: boolean // Accessibilité PMR
-  // contact_info?: {
-  //   email?: string
-  //   phone?: string
-  //   contact_person?: string
-  // }
-  // services?: string[] // Liste des services proposés
-  description?: Text
+  description?: string
   website?: string
 }
 
diff --git a/app/models/location.rb b/app/models/location.rb
index 2cf9b61..acacb91 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -11,8 +11,10 @@ class Location < ApplicationRecord
     autre: 3
   }.freeze
 
+  validates :address, presence: true
   # validates :type, presence: true
   # validates :name, uniqueness: {scope: :osbl_id}, if: -> { type == "siege_social" }
+  validates :name, presence: true, if: -> { type.in?(%i[antenne_locale lieu_d_activite autre]) }
 
   accepts_nested_attributes_for :address
 end
diff --git a/db/migrate/20250203115228_add_more_constraint_to_location.rb b/db/migrate/20250203115228_add_more_constraint_to_location.rb
new file mode 100644
index 0000000..e528726
--- /dev/null
+++ b/db/migrate/20250203115228_add_more_constraint_to_location.rb
@@ -0,0 +1,5 @@
+class AddMoreConstraintToLocation < ActiveRecord::Migration[8.0]
+  def change
+    add_check_constraint :locations, "type NOT IN (1, 2, 3) OR (type IN (1, 2, 3) AND name IS NOT NULL)", name: "name_required_for_specific_types"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c892fd8..7287ddd 100644
--- 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[8.0].define(version: 2025_01_26_180000) do
+ActiveRecord::Schema[8.0].define(version: 2025_02_03_115228) do
   create_table "accounts", force: :cascade do |t|
   end
 
@@ -172,6 +172,7 @@
     t.integer "osbl_id", null: false
     t.index ["osbl_id"], name: "index_locations_on_osbl_id"
     t.index ["osbl_id"], name: "index_locations_on_osbl_id_siege_social", unique: true, where: "type = 0"
+    t.check_constraint "type NOT IN (1, 2, 3) OR (type IN (1, 2, 3) AND name IS NOT NULL)", name: "name_required_for_specific_types"
   end
 
   create_table "osbls", force: :cascade do |t|

From 170deb7b70224b4dd83c222bc333d79ae76c9f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Mon, 3 Feb 2025 13:13:53 +0000
Subject: [PATCH 20/31] Add test mocks and factories for improved testing
 infrastructure

- Mocked Inertia components and sessionStorage in frontend tests
- Created factory for Cause model to support OSBL factory
- Updated OSBL factory to automatically add a cause
- Minor formatting updates in model spec files
---
 app/frontend/tests/Layout.test.tsx           | 15 ++++++++++++++-
 app/frontend/tests/forms/SignInForm.test.tsx | 15 +++++++++++++++
 spec/factories/causes.rb                     |  5 +++++
 spec/factories/osbls.rb                      |  4 ++++
 spec/models/address_spec.rb                  |  2 +-
 spec/models/location_spec.rb                 |  2 +-
 6 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 spec/factories/causes.rb

diff --git a/app/frontend/tests/Layout.test.tsx b/app/frontend/tests/Layout.test.tsx
index a0496b8..26b0430 100644
--- a/app/frontend/tests/Layout.test.tsx
+++ b/app/frontend/tests/Layout.test.tsx
@@ -17,7 +17,20 @@ Object.defineProperty(window, 'matchMedia', {
   }))
 })
 
-// Error: usePage must be used within the Inertia component
+// Mock Inertia components
+vi.mock('@inertiajs/react', async () => {
+  const actual = await vi.importActual('@inertiajs/react')
+  return {
+    ...actual,
+    usePage: () => ({
+      props: {
+        // Mock your page props here
+      }
+    }),
+    Head: ({ children }: { children: React.ReactNode }) => <>{children}</>
+  }
+})
+
 vi.mock('@/components/layout/Header', () => ({
   default: () => <div>Mock Header</div>
 }))
diff --git a/app/frontend/tests/forms/SignInForm.test.tsx b/app/frontend/tests/forms/SignInForm.test.tsx
index 5c25882..d43807a 100644
--- a/app/frontend/tests/forms/SignInForm.test.tsx
+++ b/app/frontend/tests/forms/SignInForm.test.tsx
@@ -3,6 +3,21 @@ import { render, screen, fireEvent } from '@testing-library/react'
 import SignInForm from '@/components/forms/SignInForm'
 import useFormHandler from '@/hooks/useFormHandler'
 
+// Mock sessionStorage
+const mockSessionStorage = {
+  getItem: vi.fn(),
+  setItem: vi.fn(),
+  clear: vi.fn(),
+  removeItem: vi.fn(),
+  key: vi.fn(),
+  length: 0
+}
+
+// Mock window object before tests
+Object.defineProperty(window, 'sessionStorage', {
+  value: mockSessionStorage
+})
+
 vi.mock('@inertiajs/react', async () => {
   const actual = await vi.importActual('@inertiajs/react')
   return {
diff --git a/spec/factories/causes.rb b/spec/factories/causes.rb
new file mode 100644
index 0000000..f88364d
--- /dev/null
+++ b/spec/factories/causes.rb
@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :cause do
+    sequence(:name) { |n| "Cause #{n}" }
+  end
+end
diff --git a/spec/factories/osbls.rb b/spec/factories/osbls.rb
index 714695e..6fca3af 100644
--- a/spec/factories/osbls.rb
+++ b/spec/factories/osbls.rb
@@ -3,5 +3,9 @@
     sequence(:name) { |n| "OSBL #{n}" }
     sequence(:website) { |n| "https://osbl#{n}.example.com" }
     tax_reduction { "intérêt_général" }
+
+    after(:build) do |osbl|
+      osbl.causes << build(:cause) if osbl.causes.empty?
+    end
   end
 end
diff --git a/spec/models/address_spec.rb b/spec/models/address_spec.rb
index 5531d0d..b0ee7ca 100644
--- a/spec/models/address_spec.rb
+++ b/spec/models/address_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
 
 RSpec.describe Address, type: :model do
   pending "add some examples to (or delete) #{__FILE__}"
diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb
index f581f2a..5e3e8e6 100644
--- a/spec/models/location_spec.rb
+++ b/spec/models/location_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
 
 RSpec.describe Location, type: :model do
   pending "add some examples to (or delete) #{__FILE__}"

From 8b82dab8ea30f0c0c70d0c35e07c002f05678d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Mon, 3 Feb 2025 13:16:13 +0000
Subject: [PATCH 21/31] update dependencies

---
 .github/workflows/ci.yml             | 10 +++----
 .github/workflows/deploy-review.yml  |  2 +-
 .github/workflows/deploy-staging.yml |  2 +-
 .github/workflows/deploy.yml         |  2 +-
 .github/workflows/remove-review.yml  |  2 +-
 Gemfile                              |  2 +-
 Gemfile.lock                         | 40 +++++++++++++++-------------
 7 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7ca311..bd71a71 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.213.0
+        uses: ruby/setup-ruby@v1.215.0
         with:
           ruby-version: .ruby-version
           bundler-cache: true
@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.213.0
+        uses: ruby/setup-ruby@v1.215.0
         with:
           ruby-version: .ruby-version
           bundler-cache: true
@@ -52,7 +52,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Setup node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version: 20
 
@@ -74,13 +74,13 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.213.0
+        uses: ruby/setup-ruby@v1.215.0
         with:
           ruby-version: .ruby-version
           bundler-cache: true
 
       - name: Setup node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version: 20
 
diff --git a/.github/workflows/deploy-review.yml b/.github/workflows/deploy-review.yml
index 0311ce0..67dbfe0 100644
--- a/.github/workflows/deploy-review.yml
+++ b/.github/workflows/deploy-review.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.213.0
+        uses: ruby/setup-ruby@v1.215.0
         with:
           ruby-version: .ruby-version
           bundler-cache: true
diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
index 1da1c5e..5017fe6 100644
--- a/.github/workflows/deploy-staging.yml
+++ b/.github/workflows/deploy-staging.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.213.0
+        uses: ruby/setup-ruby@v1.215.0
         with:
           ruby-version: .ruby-version
           bundler-cache: true
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0fe1147..65f804b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.213.0
+        uses: ruby/setup-ruby@v1.215.0
         with:
           ruby-version: .ruby-version
           bundler-cache: true
diff --git a/.github/workflows/remove-review.yml b/.github/workflows/remove-review.yml
index 4fcf443..0578d0d 100644
--- a/.github/workflows/remove-review.yml
+++ b/.github/workflows/remove-review.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.213.0
+        uses: ruby/setup-ruby@v1.215.0
         with:
           ruby-version: .ruby-version
           bundler-cache: true
diff --git a/Gemfile b/Gemfile
index 84388c9..bc7f9f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem "vite_rails", "~> 3.0.19"
 # Use sqlite3 as the database for Active Record
 gem "sqlite3"
 # Use the Puma web server [https://github.com/puma/puma]
-gem "puma", ">= 6.5.0"
+gem "puma", ">= 6.6.0"
 
 # Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
 gem "bcrypt", "~> 3.1.20"
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ca2334..9967da7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,8 +77,8 @@ GEM
     ast (2.4.2)
     authentication-zero (4.0.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1040.0)
-    aws-sdk-core (3.216.0)
+    aws-partitions (1.1044.0)
+    aws-sdk-core (3.217.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -86,7 +86,7 @@ GEM
     aws-sdk-kms (1.97.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.178.0)
+    aws-sdk-s3 (1.179.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -129,8 +129,8 @@ GEM
     erubi (1.13.1)
     et-orbi (1.2.11)
       tzinfo
-    factory_bot (6.5.0)
-      activesupport (>= 5.0.0)
+    factory_bot (6.5.1)
+      activesupport (>= 6.1.0)
     factory_bot_rails (6.4.4)
       factory_bot (~> 6.5)
       railties (>= 5.0.0)
@@ -150,7 +150,8 @@ GEM
     inertia_rails (3.6.0)
       railties (>= 6)
     io-console (0.8.0)
-    irb (1.14.3)
+    irb (1.15.1)
+      pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -166,7 +167,7 @@ GEM
       sshkit (>= 1.23.0, < 2.0)
       thor (~> 1.3)
       zeitwerk (>= 2.6.18, < 3.0)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     logger (1.6.5)
     loofah (2.24.0)
@@ -198,7 +199,7 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-scp (4.0.0)
+    net-scp (4.1.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
@@ -236,16 +237,19 @@ GEM
     parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
     prism (1.3.0)
     psych (5.2.3)
       date
       stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.8)
+    rack (3.1.9)
     rack-proxy (0.7.7)
       rack
     rack-session (2.1.0)
@@ -322,7 +326,7 @@ GEM
       rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
@@ -332,14 +336,14 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    ruby-lsp (0.23.6)
+    ruby-lsp (0.23.8)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
       rbs (>= 3, < 4)
       sorbet-runtime (>= 0.5.10782)
-    ruby-lsp-rails (0.3.30)
+    ruby-lsp-rails (0.3.31)
       ruby-lsp (>= 0.23.0, < 0.24.0)
-    ruby-lsp-rspec (0.1.20)
+    ruby-lsp-rspec (0.1.21)
       ruby-lsp (~> 0.23.0)
     ruby-progressbar (1.13.0)
     rubyzip (2.4.1)
@@ -350,7 +354,7 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    solid_cable (3.0.5)
+    solid_cable (3.0.7)
       actioncable (>= 7.2)
       activejob (>= 7.2)
       activerecord (>= 7.2)
@@ -359,14 +363,14 @@ GEM
       activejob (>= 7.2)
       activerecord (>= 7.2)
       railties (>= 7.2)
-    solid_queue (1.1.2)
+    solid_queue (1.1.3)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
       fugit (~> 1.11.0)
       railties (>= 7.1)
       thor (~> 1.3.1)
-    sorbet-runtime (0.5.11766)
+    sorbet-runtime (0.5.11798)
     sqlite3 (2.5.0-aarch64-linux-gnu)
     sqlite3 (2.5.0-aarch64-linux-musl)
     sqlite3 (2.5.0-arm-linux-gnu)
@@ -466,7 +470,7 @@ DEPENDENCIES
   kamal
   mailjet (~> 1.8)
   overmind
-  puma (>= 6.5.0)
+  puma (>= 6.6.0)
   rails
   rotp (~> 6.3)
   rspec-rails

From 0071a295d7c3bb3c97e6aa96bfa463706f90c67b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Mon, 3 Feb 2025 13:28:14 +0000
Subject: [PATCH 22/31] Simplify fund management section error handling and
 input validation

---
 .../new/FundManagementSection.tsx             |    6 +-
 yarn.lock                                     | 1525 +++++++++--------
 2 files changed, 784 insertions(+), 747 deletions(-)

diff --git a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
index 0b9e308..0c9917d 100644
--- a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
+++ b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
@@ -89,9 +89,7 @@ export default function FundManagementSection ({
               required
             >
               <SelectTrigger
-                className={`w-60 data-[placeholder]:text-muted-foreground mt-4 ${
-                errors[`${baseErrorPath}.${index}.type`] !== undefined ? 'border-red-600' : ''
-              }`}
+                className='w-60 data-[placeholder]:text-muted-foreground mt-4'
               >
                 <SelectValue placeholder='Type *' />
               </SelectTrigger>
@@ -127,8 +125,6 @@ export default function FundManagementSection ({
               placeholder='% *'
               suffix='%'
               required
-              error={errors[`${baseErrorPath}.${index}.percent`]}
-              noErrorMessage
             />
 
             <MyNumberInput
diff --git a/yarn.lock b/yarn.lock
index b94c0bb..ceb547e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20,7 +20,18 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.26.2":
+"@asamuzakjp/css-color@^2.8.2":
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-2.8.3.tgz#665f0f5e8edb95d8f543847529e30fe5cc437ef7"
+  integrity sha512-GIc76d9UI1hCvOATjZPyHFmE5qhRccp3/zGfMPapK3jBi+yocEzp6BBB0UnfRYP9NP4FANqUZYb0hnfs3TM3hw==
+  dependencies:
+    "@csstools/css-calc" "^2.1.1"
+    "@csstools/css-color-parser" "^3.0.7"
+    "@csstools/css-parser-algorithms" "^3.0.4"
+    "@csstools/css-tokenizer" "^3.0.3"
+    lru-cache "^10.4.3"
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
   integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
@@ -29,49 +40,49 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.25.9":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.3.tgz#99488264a56b2aded63983abd6a417f03b92ed02"
-  integrity sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==
+"@babel/compat-data@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.5.tgz#df93ac37f4417854130e21d72c66ff3d4b897fc7"
+  integrity sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==
 
 "@babel/core@^7.21.3", "@babel/core@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40"
-  integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.7.tgz#0439347a183b97534d52811144d763a17f9d2b24"
+  integrity sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.26.0"
-    "@babel/generator" "^7.26.0"
-    "@babel/helper-compilation-targets" "^7.25.9"
+    "@babel/code-frame" "^7.26.2"
+    "@babel/generator" "^7.26.5"
+    "@babel/helper-compilation-targets" "^7.26.5"
     "@babel/helper-module-transforms" "^7.26.0"
-    "@babel/helpers" "^7.26.0"
-    "@babel/parser" "^7.26.0"
+    "@babel/helpers" "^7.26.7"
+    "@babel/parser" "^7.26.7"
     "@babel/template" "^7.25.9"
-    "@babel/traverse" "^7.25.9"
-    "@babel/types" "^7.26.0"
+    "@babel/traverse" "^7.26.7"
+    "@babel/types" "^7.26.7"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.26.0", "@babel/generator@^7.26.3":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.3.tgz#ab8d4360544a425c90c248df7059881f4b2ce019"
-  integrity sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==
+"@babel/generator@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.5.tgz#e44d4ab3176bbcaf78a5725da5f1dc28802a9458"
+  integrity sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==
   dependencies:
-    "@babel/parser" "^7.26.3"
-    "@babel/types" "^7.26.3"
+    "@babel/parser" "^7.26.5"
+    "@babel/types" "^7.26.5"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^3.0.2"
 
-"@babel/helper-compilation-targets@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875"
-  integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==
+"@babel/helper-compilation-targets@^7.26.5":
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz#75d92bb8d8d51301c0d49e52a65c9a7fe94514d8"
+  integrity sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==
   dependencies:
-    "@babel/compat-data" "^7.25.9"
+    "@babel/compat-data" "^7.26.5"
     "@babel/helper-validator-option" "^7.25.9"
     browserslist "^4.24.0"
     lru-cache "^5.1.1"
@@ -95,9 +106,9 @@
     "@babel/traverse" "^7.25.9"
 
 "@babel/helper-plugin-utils@^7.25.9":
-  version "7.25.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz#9cbdd63a9443a2c92a725cca7ebca12cc8dd9f46"
-  integrity sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==
+  version "7.26.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz#18580d00c9934117ad719392c4f6585c9333cc35"
+  integrity sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==
 
 "@babel/helper-string-parser@^7.25.9":
   version "7.25.9"
@@ -114,20 +125,20 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72"
   integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==
 
-"@babel/helpers@^7.26.0":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4"
-  integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==
+"@babel/helpers@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.7.tgz#fd1d2a7c431b6e39290277aacfd8367857c576a4"
+  integrity sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==
   dependencies:
     "@babel/template" "^7.25.9"
-    "@babel/types" "^7.26.0"
+    "@babel/types" "^7.26.7"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
-  integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.25.9", "@babel/parser@^7.26.5", "@babel/parser@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.7.tgz#e114cd099e5f7d17b05368678da0fb9f69b3385c"
+  integrity sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==
   dependencies:
-    "@babel/types" "^7.26.3"
+    "@babel/types" "^7.26.7"
 
 "@babel/plugin-transform-react-jsx-self@^7.25.9":
   version "7.25.9"
@@ -144,9 +155,9 @@
     "@babel/helper-plugin-utils" "^7.25.9"
 
 "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.18.3", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
-  version "7.26.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
-  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.7.tgz#f4e7fe527cd710f8dc0618610b61b4b060c3c341"
+  integrity sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -159,27 +170,55 @@
     "@babel/parser" "^7.25.9"
     "@babel/types" "^7.25.9"
 
-"@babel/traverse@^7.25.9":
-  version "7.26.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.4.tgz#ac3a2a84b908dde6d463c3bfa2c5fdc1653574bd"
-  integrity sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==
+"@babel/traverse@^7.25.9", "@babel/traverse@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.7.tgz#99a0a136f6a75e7fb8b0a1ace421e0b25994b8bb"
+  integrity sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==
   dependencies:
     "@babel/code-frame" "^7.26.2"
-    "@babel/generator" "^7.26.3"
-    "@babel/parser" "^7.26.3"
+    "@babel/generator" "^7.26.5"
+    "@babel/parser" "^7.26.7"
     "@babel/template" "^7.25.9"
-    "@babel/types" "^7.26.3"
+    "@babel/types" "^7.26.7"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3":
-  version "7.26.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
-  integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.25.9", "@babel/types@^7.26.5", "@babel/types@^7.26.7":
+  version "7.26.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.7.tgz#5e2b89c0768e874d4d061961f3a5a153d71dc17a"
+  integrity sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==
   dependencies:
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
 
+"@csstools/color-helpers@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.0.1.tgz#829f1c76f5800b79c51c709e2f36821b728e0e10"
+  integrity sha512-MKtmkA0BX87PKaO1NFRTFH+UnkgnmySQOvNxJubsadusqPEC2aJ9MOQiMceZJJ6oitUl/i0L6u0M1IrmAOmgBA==
+
+"@csstools/css-calc@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.1.tgz#a7dbc66627f5cf458d42aed14bda0d3860562383"
+  integrity sha512-rL7kaUnTkL9K+Cvo2pnCieqNpTKgQzy5f+N+5Iuko9HAoasP+xgprVh7KN/MaJVvVL1l0EzQq2MoqBHKSrDrag==
+
+"@csstools/css-color-parser@^3.0.7":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.7.tgz#442d61d58e54ad258d52c309a787fceb33906484"
+  integrity sha512-nkMp2mTICw32uE5NN+EsJ4f5N+IGFeCFu4bGpiKgb2Pq/7J/MpyLBeQ5ry4KKtRFZaYs6sTmcMYrSRIyj5DFKA==
+  dependencies:
+    "@csstools/color-helpers" "^5.0.1"
+    "@csstools/css-calc" "^2.1.1"
+
+"@csstools/css-parser-algorithms@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
+  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
+
+"@csstools/css-tokenizer@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
+  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
+
 "@emotion/babel-plugin@^11.13.5":
   version "11.13.5"
   resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz#eab8d65dbded74e0ecfd28dc218e75607c4e7bc0"
@@ -273,235 +312,240 @@
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
   integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
 
-"@esbuild/aix-ppc64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz#b57697945b50e99007b4c2521507dc613d4a648c"
-  integrity sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==
+"@esbuild/aix-ppc64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz#38848d3e25afe842a7943643cbcd387cc6e13461"
+  integrity sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==
 
 "@esbuild/android-arm64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
   integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
 
-"@esbuild/android-arm64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz#1add7e0af67acefd556e407f8497e81fddad79c0"
-  integrity sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==
+"@esbuild/android-arm64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz#f592957ae8b5643129fa889c79e69cd8669bb894"
+  integrity sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==
 
 "@esbuild/android-arm@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
   integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
 
-"@esbuild/android-arm@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.24.0.tgz#ab7263045fa8e090833a8e3c393b60d59a789810"
-  integrity sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==
+"@esbuild/android-arm@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.24.2.tgz#72d8a2063aa630308af486a7e5cbcd1e134335b3"
+  integrity sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==
 
 "@esbuild/android-x64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
   integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
 
-"@esbuild/android-x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.24.0.tgz#e8f8b196cfdfdd5aeaebbdb0110983460440e705"
-  integrity sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==
+"@esbuild/android-x64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.24.2.tgz#9a7713504d5f04792f33be9c197a882b2d88febb"
+  integrity sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==
 
 "@esbuild/darwin-arm64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
   integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
 
-"@esbuild/darwin-arm64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz#2d0d9414f2acbffd2d86e98253914fca603a53dd"
-  integrity sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==
+"@esbuild/darwin-arm64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz#02ae04ad8ebffd6e2ea096181b3366816b2b5936"
+  integrity sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==
 
 "@esbuild/darwin-x64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
   integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
 
-"@esbuild/darwin-x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz#33087aab31a1eb64c89daf3d2cf8ce1775656107"
-  integrity sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==
+"@esbuild/darwin-x64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz#9ec312bc29c60e1b6cecadc82bd504d8adaa19e9"
+  integrity sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==
 
 "@esbuild/freebsd-arm64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
   integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
 
-"@esbuild/freebsd-arm64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz#bb76e5ea9e97fa3c753472f19421075d3a33e8a7"
-  integrity sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==
+"@esbuild/freebsd-arm64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz#5e82f44cb4906d6aebf24497d6a068cfc152fa00"
+  integrity sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==
 
 "@esbuild/freebsd-x64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
   integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
 
-"@esbuild/freebsd-x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz#e0e2ce9249fdf6ee29e5dc3d420c7007fa579b93"
-  integrity sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==
+"@esbuild/freebsd-x64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz#3fb1ce92f276168b75074b4e51aa0d8141ecce7f"
+  integrity sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==
 
 "@esbuild/linux-arm64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
   integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
 
-"@esbuild/linux-arm64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz#d1b2aa58085f73ecf45533c07c82d81235388e75"
-  integrity sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==
+"@esbuild/linux-arm64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz#856b632d79eb80aec0864381efd29de8fd0b1f43"
+  integrity sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==
 
 "@esbuild/linux-arm@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
   integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
 
-"@esbuild/linux-arm@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz#8e4915df8ea3e12b690a057e77a47b1d5935ef6d"
-  integrity sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==
+"@esbuild/linux-arm@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz#c846b4694dc5a75d1444f52257ccc5659021b736"
+  integrity sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==
 
 "@esbuild/linux-ia32@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
   integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
 
-"@esbuild/linux-ia32@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz#8200b1110666c39ab316572324b7af63d82013fb"
-  integrity sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==
+"@esbuild/linux-ia32@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz#f8a16615a78826ccbb6566fab9a9606cfd4a37d5"
+  integrity sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==
 
 "@esbuild/linux-loong64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
   integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
 
-"@esbuild/linux-loong64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz#6ff0c99cf647504df321d0640f0d32e557da745c"
-  integrity sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==
+"@esbuild/linux-loong64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz#1c451538c765bf14913512c76ed8a351e18b09fc"
+  integrity sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==
 
 "@esbuild/linux-mips64el@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
   integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
 
-"@esbuild/linux-mips64el@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz#3f720ccd4d59bfeb4c2ce276a46b77ad380fa1f3"
-  integrity sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==
+"@esbuild/linux-mips64el@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz#0846edeefbc3d8d50645c51869cc64401d9239cb"
+  integrity sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==
 
 "@esbuild/linux-ppc64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
   integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
 
-"@esbuild/linux-ppc64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz#9d6b188b15c25afd2e213474bf5f31e42e3aa09e"
-  integrity sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==
+"@esbuild/linux-ppc64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz#8e3fc54505671d193337a36dfd4c1a23b8a41412"
+  integrity sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==
 
 "@esbuild/linux-riscv64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
   integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
 
-"@esbuild/linux-riscv64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz#f989fdc9752dfda286c9cd87c46248e4dfecbc25"
-  integrity sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==
+"@esbuild/linux-riscv64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz#6a1e92096d5e68f7bb10a0d64bb5b6d1daf9a694"
+  integrity sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==
 
 "@esbuild/linux-s390x@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
   integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
 
-"@esbuild/linux-s390x@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz#29ebf87e4132ea659c1489fce63cd8509d1c7319"
-  integrity sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==
+"@esbuild/linux-s390x@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz#ab18e56e66f7a3c49cb97d337cd0a6fea28a8577"
+  integrity sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==
 
 "@esbuild/linux-x64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
   integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
 
-"@esbuild/linux-x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz#4af48c5c0479569b1f359ffbce22d15f261c0cef"
-  integrity sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==
+"@esbuild/linux-x64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz#8140c9b40da634d380b0b29c837a0b4267aff38f"
+  integrity sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==
+
+"@esbuild/netbsd-arm64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz#65f19161432bafb3981f5f20a7ff45abb2e708e6"
+  integrity sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==
 
 "@esbuild/netbsd-x64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
   integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
 
-"@esbuild/netbsd-x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz#1ae73d23cc044a0ebd4f198334416fb26c31366c"
-  integrity sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==
+"@esbuild/netbsd-x64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz#7a3a97d77abfd11765a72f1c6f9b18f5396bcc40"
+  integrity sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==
 
-"@esbuild/openbsd-arm64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz#5d904a4f5158c89859fd902c427f96d6a9e632e2"
-  integrity sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==
+"@esbuild/openbsd-arm64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz#58b00238dd8f123bfff68d3acc53a6ee369af89f"
+  integrity sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==
 
 "@esbuild/openbsd-x64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
   integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
 
-"@esbuild/openbsd-x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz#4c8aa88c49187c601bae2971e71c6dc5e0ad1cdf"
-  integrity sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==
+"@esbuild/openbsd-x64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz#0ac843fda0feb85a93e288842936c21a00a8a205"
+  integrity sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==
 
 "@esbuild/sunos-x64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
   integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
 
-"@esbuild/sunos-x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz#8ddc35a0ea38575fa44eda30a5ee01ae2fa54dd4"
-  integrity sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==
+"@esbuild/sunos-x64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz#8b7aa895e07828d36c422a4404cc2ecf27fb15c6"
+  integrity sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==
 
 "@esbuild/win32-arm64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
   integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
 
-"@esbuild/win32-arm64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz#6e79c8543f282c4539db684a207ae0e174a9007b"
-  integrity sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==
+"@esbuild/win32-arm64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz#c023afb647cabf0c3ed13f0eddfc4f1d61c66a85"
+  integrity sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==
 
 "@esbuild/win32-ia32@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
   integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
 
-"@esbuild/win32-ia32@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz#057af345da256b7192d18b676a02e95d0fa39103"
-  integrity sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==
+"@esbuild/win32-ia32@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz#96c356132d2dda990098c8b8b951209c3cd743c2"
+  integrity sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==
 
 "@esbuild/win32-x64@0.21.5":
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
   integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
 
-"@esbuild/win32-x64@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz#168ab1c7e1c318b922637fad8f339d48b01e1244"
-  integrity sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==
+"@esbuild/win32-x64@0.24.2":
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz#34aa0b52d0fbb1a654b596acfa595f0c7b77a77b"
+  integrity sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==
 
 "@eslint-community/eslint-utils@^4.2.0":
   version "4.4.1"
@@ -536,21 +580,13 @@
   integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
 "@floating-ui/core@^1.6.0":
-  version "1.6.8"
-  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.8.tgz#aa43561be075815879305965020f492cdb43da12"
-  integrity sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==
-  dependencies:
-    "@floating-ui/utils" "^0.2.8"
-
-"@floating-ui/dom@^1.0.0":
-  version "1.6.12"
-  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.12.tgz#6333dcb5a8ead3b2bf82f33d6bc410e95f54e556"
-  integrity sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==
+  version "1.6.9"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.9.tgz#64d1da251433019dafa091de9b2886ff35ec14e6"
+  integrity sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==
   dependencies:
-    "@floating-ui/core" "^1.6.0"
-    "@floating-ui/utils" "^0.2.8"
+    "@floating-ui/utils" "^0.2.9"
 
-"@floating-ui/dom@^1.0.1":
+"@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.0.1":
   version "1.6.13"
   resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.13.tgz#a8a938532aea27a95121ec16e667a7cbe8c59e34"
   integrity sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==
@@ -565,11 +601,6 @@
   dependencies:
     "@floating-ui/dom" "^1.0.0"
 
-"@floating-ui/utils@^0.2.8":
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.8.tgz#21a907684723bbbaa5f0974cf7730bd797eb8e62"
-  integrity sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==
-
 "@floating-ui/utils@^0.2.9":
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.9.tgz#50dea3616bc8191fb8e112283b49eaff03e78429"
@@ -594,21 +625,21 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
-"@inertiajs/core@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@inertiajs/core/-/core-2.0.0.tgz#0cb8df763fead54f57a70ad3c7fcba48d07557e8"
-  integrity sha512-2kvlk731NjwfXUku/ZoXsZNcOzx985icHtTC1dgN+8sAZtJfEg9QBrQ7sBjeLYiWtKgobJdwwpeDaexEneAtLQ==
+"@inertiajs/core@2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@inertiajs/core/-/core-2.0.3.tgz#528cb22aeb2131288e5bd4fda42c3b0dbaf80303"
+  integrity sha512-JvXzqc2XAt3WgEDMyxCyXO6bDLMCsBjFsYREU1/+3wtNTib7QKwK71+aF+MrhILpz+kRTi29TsLqnbkPHBAZjw==
   dependencies:
     axios "^1.6.0"
     deepmerge "^4.0.0"
     qs "^6.9.0"
 
 "@inertiajs/react@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@inertiajs/react/-/react-2.0.0.tgz#6e0477e8ea7e038a508bb1e3779d43ee2280fa2d"
-  integrity sha512-7X6TMYe7FcjG05UjRBkPYjTw/U+CrMeVDxxRolncuNYp6LmifPs1xOjTOC5M7gbpKaDEL/LuxNAX7ePJC3cbPg==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@inertiajs/react/-/react-2.0.3.tgz#914cf5e9d0a5654fd93ad0e8cdf0b838954b30ff"
+  integrity sha512-eUMywEY+w4jcROiNjD7Vm+2GFapqOQmMh3OGlSat9XJB5+H7vtsQI+cvDa7oQXvt3CCv9Y/+HrKDHC/m969peA==
   dependencies:
-    "@inertiajs/core" "2.0.0"
+    "@inertiajs/core" "2.0.3"
     lodash.isequal "^4.5.0"
 
 "@isaacs/cliui@^8.0.2":
@@ -704,14 +735,14 @@
   integrity sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==
 
 "@radix-ui/react-alert-dialog@^1.1.2":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.4.tgz#1049b8765b3db16b2a992e2fb3d4afbef0c451ad"
-  integrity sha512-A6Kh23qZDLy3PSU4bh2UJZznOrUdHImIXqF8YtUa6CN73f8EOO9XlXSCd9IHyPvIquTaa/kwaSWzZTtUvgXVGw==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.5.tgz#d937512a727d8b7afa8959d43dbd7e557d52a1eb"
+  integrity sha512-1Y2sI17QzSZP58RjGtrklfSGIf3AF7U/HkD3aAcAnhOUJrm7+7GG1wRDFaUlSe0nW5B/t4mYd/+7RNbP2Wexug==
   dependencies:
     "@radix-ui/primitive" "1.1.1"
     "@radix-ui/react-compose-refs" "1.1.1"
     "@radix-ui/react-context" "1.1.1"
-    "@radix-ui/react-dialog" "1.1.4"
+    "@radix-ui/react-dialog" "1.1.5"
     "@radix-ui/react-primitive" "2.0.1"
     "@radix-ui/react-slot" "1.1.1"
 
@@ -812,27 +843,7 @@
     aria-hidden "^1.1.1"
     react-remove-scroll "2.5.5"
 
-"@radix-ui/react-dialog@1.1.4":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.4.tgz#d68e977acfcc0d044b9dab47b6dd2c179d2b3191"
-  integrity sha512-Ur7EV1IwQGCyaAuyDRiOLA5JIUZxELJljF+MbM/2NC0BYwfuRrbpS30BiQBJrVruscgUkieKkqXYDOoByaxIoA==
-  dependencies:
-    "@radix-ui/primitive" "1.1.1"
-    "@radix-ui/react-compose-refs" "1.1.1"
-    "@radix-ui/react-context" "1.1.1"
-    "@radix-ui/react-dismissable-layer" "1.1.3"
-    "@radix-ui/react-focus-guards" "1.1.1"
-    "@radix-ui/react-focus-scope" "1.1.1"
-    "@radix-ui/react-id" "1.1.0"
-    "@radix-ui/react-portal" "1.1.3"
-    "@radix-ui/react-presence" "1.1.2"
-    "@radix-ui/react-primitive" "2.0.1"
-    "@radix-ui/react-slot" "1.1.1"
-    "@radix-ui/react-use-controllable-state" "1.1.0"
-    aria-hidden "^1.1.1"
-    react-remove-scroll "^2.6.1"
-
-"@radix-ui/react-dialog@^1.1.5":
+"@radix-ui/react-dialog@1.1.5", "@radix-ui/react-dialog@^1.1.5":
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.5.tgz#1bb2880e6b0ef9d9d0d9f440e1414c94bbacb55b"
   integrity sha512-LaO3e5h/NOEL4OfXjxD43k9Dx+vn+8n+PCFt6uhX/BADFflllyv3WJG6rgvvSVBxpTch938Qq/LGc2MMxipXPw==
@@ -869,17 +880,6 @@
     "@radix-ui/react-use-callback-ref" "1.0.1"
     "@radix-ui/react-use-escape-keydown" "1.0.3"
 
-"@radix-ui/react-dismissable-layer@1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.3.tgz#4ee0f0f82d53bf5bd9db21665799bb0d1bad5ed8"
-  integrity sha512-onrWn/72lQoEucDmJnr8uczSNTujT0vJnA/X5+3AkChVPowr8n1yvIKIabhWyMQeMvvmdpsvcyDqx3X1LEXCPg==
-  dependencies:
-    "@radix-ui/primitive" "1.1.1"
-    "@radix-ui/react-compose-refs" "1.1.1"
-    "@radix-ui/react-primitive" "2.0.1"
-    "@radix-ui/react-use-callback-ref" "1.1.0"
-    "@radix-ui/react-use-escape-keydown" "1.1.0"
-
 "@radix-ui/react-dismissable-layer@1.1.4":
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.4.tgz#6e31ad92e7d9e77548001fd8c04f8561300c02a9"
@@ -892,15 +892,15 @@
     "@radix-ui/react-use-escape-keydown" "1.1.0"
 
 "@radix-ui/react-dropdown-menu@^2.1.2":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.4.tgz#5e1f453296dd9ae99224a26c36851832d26cf507"
-  integrity sha512-iXU1Ab5ecM+yEepGAWK8ZhMyKX4ubFdCNtol4sT9D0OVErG9PNElfx3TQhjw7n7BC5nFVz68/5//clWy+8TXzA==
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.5.tgz#82293e6a7572f77c18f3aebb943676019a7872da"
+  integrity sha512-50ZmEFL1kOuLalPKHrLWvPFMons2fGx9TqQCWlPwDVpbAnaUJ1g4XNcKqFNMQymYU0kKWR4MDDi+9vUQBGFgcQ==
   dependencies:
     "@radix-ui/primitive" "1.1.1"
     "@radix-ui/react-compose-refs" "1.1.1"
     "@radix-ui/react-context" "1.1.1"
     "@radix-ui/react-id" "1.1.0"
-    "@radix-ui/react-menu" "2.1.4"
+    "@radix-ui/react-menu" "2.1.5"
     "@radix-ui/react-primitive" "2.0.1"
     "@radix-ui/react-use-controllable-state" "1.1.0"
 
@@ -957,17 +957,17 @@
   dependencies:
     "@radix-ui/react-primitive" "2.0.1"
 
-"@radix-ui/react-menu@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-2.1.4.tgz#ac7aec296f29608206a7c6ef6335d8f102edaa95"
-  integrity sha512-BnOgVoL6YYdHAG6DtXONaR29Eq4nvbi8rutrV/xlr3RQCMMb3yqP85Qiw/3NReozrSW+4dfLkK+rc1hb4wPU/A==
+"@radix-ui/react-menu@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-menu/-/react-menu-2.1.5.tgz#0c2e7a368771b6061e7f3692f18240917547ef7f"
+  integrity sha512-uH+3w5heoMJtqVCgYOtYVMECk1TOrkUn0OG0p5MqXC0W2ppcuVeESbou8PTHoqAjbdTEK19AGXBWcEtR5WpEQg==
   dependencies:
     "@radix-ui/primitive" "1.1.1"
     "@radix-ui/react-collection" "1.1.1"
     "@radix-ui/react-compose-refs" "1.1.1"
     "@radix-ui/react-context" "1.1.1"
     "@radix-ui/react-direction" "1.1.0"
-    "@radix-ui/react-dismissable-layer" "1.1.3"
+    "@radix-ui/react-dismissable-layer" "1.1.4"
     "@radix-ui/react-focus-guards" "1.1.1"
     "@radix-ui/react-focus-scope" "1.1.1"
     "@radix-ui/react-id" "1.1.0"
@@ -978,20 +978,20 @@
     "@radix-ui/react-roving-focus" "1.1.1"
     "@radix-ui/react-slot" "1.1.1"
     "@radix-ui/react-use-callback-ref" "1.1.0"
-    aria-hidden "^1.1.1"
-    react-remove-scroll "^2.6.1"
+    aria-hidden "^1.2.4"
+    react-remove-scroll "^2.6.2"
 
 "@radix-ui/react-navigation-menu@^1.2.1":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.3.tgz#b76b243235acd229b4e00fa61619547d3edf7c99"
-  integrity sha512-IQWAsQ7dsLIYDrn0WqPU+cdM7MONTv9nqrLVYoie3BPiabSfUVDe6Fr+oEt0Cofsr9ONDcDe9xhmJbL1Uq1yKg==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.4.tgz#aba3ac0d343b1842924fdaf403d8922240fcfef6"
+  integrity sha512-wUi01RrTDTOoGtjEPHsxlzPtVzVc3R/AZ5wfh0dyqMAqolhHAHvG5iQjBCTi2AjQqa77FWWbA3kE3RkD+bDMgQ==
   dependencies:
     "@radix-ui/primitive" "1.1.1"
     "@radix-ui/react-collection" "1.1.1"
     "@radix-ui/react-compose-refs" "1.1.1"
     "@radix-ui/react-context" "1.1.1"
     "@radix-ui/react-direction" "1.1.0"
-    "@radix-ui/react-dismissable-layer" "1.1.3"
+    "@radix-ui/react-dismissable-layer" "1.1.4"
     "@radix-ui/react-id" "1.1.0"
     "@radix-ui/react-presence" "1.1.2"
     "@radix-ui/react-primitive" "2.0.1"
@@ -1002,14 +1002,14 @@
     "@radix-ui/react-visually-hidden" "1.1.1"
 
 "@radix-ui/react-popover@^1.1.4":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-popover/-/react-popover-1.1.4.tgz#d83104e5fb588870a673b55f3387da4844e5836e"
-  integrity sha512-aUACAkXx8LaFymDma+HQVji7WhvEhpFJ7+qPz17Nf4lLZqtreGOFRiNQWQmhzp7kEWg9cOyyQJpdIMUMPc/CPw==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-popover/-/react-popover-1.1.5.tgz#d5ad80f0643368e4ed680832c819b4fb47a1fce5"
+  integrity sha512-YXkTAftOIW2Bt3qKH8vYr6n9gCkVrvyvfiTObVjoHVTHnNj26rmvO87IKa3VgtgCjb8FAQ6qOjNViwl+9iIzlg==
   dependencies:
     "@radix-ui/primitive" "1.1.1"
     "@radix-ui/react-compose-refs" "1.1.1"
     "@radix-ui/react-context" "1.1.1"
-    "@radix-ui/react-dismissable-layer" "1.1.3"
+    "@radix-ui/react-dismissable-layer" "1.1.4"
     "@radix-ui/react-focus-guards" "1.1.1"
     "@radix-ui/react-focus-scope" "1.1.1"
     "@radix-ui/react-id" "1.1.0"
@@ -1019,8 +1019,8 @@
     "@radix-ui/react-primitive" "2.0.1"
     "@radix-ui/react-slot" "1.1.1"
     "@radix-ui/react-use-controllable-state" "1.1.0"
-    aria-hidden "^1.1.1"
-    react-remove-scroll "^2.6.1"
+    aria-hidden "^1.2.4"
+    react-remove-scroll "^2.6.2"
 
 "@radix-ui/react-popper@1.2.1":
   version "1.2.1"
@@ -1126,9 +1126,9 @@
     "@radix-ui/react-use-controllable-state" "1.1.0"
 
 "@radix-ui/react-select@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-select/-/react-select-2.1.4.tgz#8957050203640b668a883a225260c403514b3772"
-  integrity sha512-pOkb2u8KgO47j/h7AylCj7dJsm69BXcjkrvTqMptFqsE2i0p8lHkfgneXKjAgPzBMivnoMyt8o4KiV4wYzDdyQ==
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-select/-/react-select-2.1.5.tgz#f005e61f7c04e9d6105baa271569868fd08db41a"
+  integrity sha512-eVV7N8jBXAXnyrc+PsOF89O9AfVgGnbLxUtBb0clJ8y8ENMWLARGMI/1/SBRLz7u4HqxLgN71BJ17eono3wcjA==
   dependencies:
     "@radix-ui/number" "1.1.0"
     "@radix-ui/primitive" "1.1.1"
@@ -1136,7 +1136,7 @@
     "@radix-ui/react-compose-refs" "1.1.1"
     "@radix-ui/react-context" "1.1.1"
     "@radix-ui/react-direction" "1.1.0"
-    "@radix-ui/react-dismissable-layer" "1.1.3"
+    "@radix-ui/react-dismissable-layer" "1.1.4"
     "@radix-ui/react-focus-guards" "1.1.1"
     "@radix-ui/react-focus-scope" "1.1.1"
     "@radix-ui/react-id" "1.1.0"
@@ -1149,8 +1149,8 @@
     "@radix-ui/react-use-layout-effect" "1.1.0"
     "@radix-ui/react-use-previous" "1.1.0"
     "@radix-ui/react-visually-hidden" "1.1.1"
-    aria-hidden "^1.1.1"
-    react-remove-scroll "^2.6.1"
+    aria-hidden "^1.2.4"
+    react-remove-scroll "^2.6.2"
 
 "@radix-ui/react-separator@^1.1.1":
   version "1.1.1"
@@ -1175,14 +1175,14 @@
     "@radix-ui/react-compose-refs" "1.1.1"
 
 "@radix-ui/react-tooltip@^1.1.4":
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-1.1.6.tgz#eab98e9a5c876ef0abfae3cfeee229870528ed06"
-  integrity sha512-TLB5D8QLExS1uDn7+wH/bjEmRurNMTzNrtq7IjaS4kjion9NtzsTGkvR5+i7yc9q01Pi2KMM2cN3f8UG4IvvXA==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-tooltip/-/react-tooltip-1.1.7.tgz#2984dc0374874029b7ea8a1987f23247b3334b2a"
+  integrity sha512-ss0s80BC0+g0+Zc53MvilcnTYSOi4mSuFWBPYPuTOFGjx+pUU+ZrmamMNwS56t8MTFlniA5ocjd4jYm/CdhbOg==
   dependencies:
     "@radix-ui/primitive" "1.1.1"
     "@radix-ui/react-compose-refs" "1.1.1"
     "@radix-ui/react-context" "1.1.1"
-    "@radix-ui/react-dismissable-layer" "1.1.3"
+    "@radix-ui/react-dismissable-layer" "1.1.4"
     "@radix-ui/react-id" "1.1.0"
     "@radix-ui/react-popper" "1.2.1"
     "@radix-ui/react-portal" "1.1.3"
@@ -1293,100 +1293,100 @@
     estree-walker "^2.0.2"
     picomatch "^4.0.2"
 
-"@rollup/rollup-android-arm-eabi@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz#7f4c4d8cd5ccab6e95d6750dbe00321c1f30791e"
-  integrity sha512-2aZp8AES04KI2dy3Ss6/MDjXbwBzj+i0GqKtWXgw2/Ma6E4jJvujryO6gJAghIRVz7Vwr9Gtl/8na3nDUKpraQ==
-
-"@rollup/rollup-android-arm64@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.28.1.tgz#17ea71695fb1518c2c324badbe431a0bd1879f2d"
-  integrity sha512-EbkK285O+1YMrg57xVA+Dp0tDBRB93/BZKph9XhMjezf6F4TpYjaUSuPt5J0fZXlSag0LmZAsTmdGGqPp4pQFA==
-
-"@rollup/rollup-darwin-arm64@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.28.1.tgz#dac0f0d0cfa73e7d5225ae6d303c13c8979e7999"
-  integrity sha512-prduvrMKU6NzMq6nxzQw445zXgaDBbMQvmKSJaxpaZ5R1QDM8w+eGxo6Y/jhT/cLoCvnZI42oEqf9KQNYz1fqQ==
-
-"@rollup/rollup-darwin-x64@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.28.1.tgz#8f63baa1d31784904a380d2e293fa1ddf53dd4a2"
-  integrity sha512-WsvbOunsUk0wccO/TV4o7IKgloJ942hVFK1CLatwv6TJspcCZb9umQkPdvB7FihmdxgaKR5JyxDjWpCOp4uZlQ==
-
-"@rollup/rollup-freebsd-arm64@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.28.1.tgz#30ed247e0df6e8858cdc6ae4090e12dbeb8ce946"
-  integrity sha512-HTDPdY1caUcU4qK23FeeGxCdJF64cKkqajU0iBnTVxS8F7H/7BewvYoG+va1KPSL63kQ1PGNyiwKOfReavzvNA==
-
-"@rollup/rollup-freebsd-x64@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.28.1.tgz#57846f382fddbb508412ae07855b8a04c8f56282"
-  integrity sha512-m/uYasxkUevcFTeRSM9TeLyPe2QDuqtjkeoTpP9SW0XxUWfcYrGDMkO/m2tTw+4NMAF9P2fU3Mw4ahNvo7QmsQ==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.28.1.tgz#378ca666c9dae5e6f94d1d351e7497c176e9b6df"
-  integrity sha512-QAg11ZIt6mcmzpNE6JZBpKfJaKkqTm1A9+y9O+frdZJEuhQxiugM05gnCWiANHj4RmbgeVJpTdmKRmH/a+0QbA==
-
-"@rollup/rollup-linux-arm-musleabihf@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.28.1.tgz#a692eff3bab330d5c33a5d5813a090c15374cddb"
-  integrity sha512-dRP9PEBfolq1dmMcFqbEPSd9VlRuVWEGSmbxVEfiq2cs2jlZAl0YNxFzAQS2OrQmsLBLAATDMb3Z6MFv5vOcXg==
-
-"@rollup/rollup-linux-arm64-gnu@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.28.1.tgz#6b1719b76088da5ac1ae1feccf48c5926b9e3db9"
-  integrity sha512-uGr8khxO+CKT4XU8ZUH1TTEUtlktK6Kgtv0+6bIFSeiSlnGJHG1tSFSjm41uQ9sAO/5ULx9mWOz70jYLyv1QkA==
-
-"@rollup/rollup-linux-arm64-musl@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.28.1.tgz#865baf5b6f5ff67acb32e5a359508828e8dc5788"
-  integrity sha512-QF54q8MYGAqMLrX2t7tNpi01nvq5RI59UBNx+3+37zoKX5KViPo/gk2QLhsuqok05sSCRluj0D00LzCwBikb0A==
-
-"@rollup/rollup-linux-loongarch64-gnu@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.28.1.tgz#23c6609ba0f7fa7a7f2038b6b6a08555a5055a87"
-  integrity sha512-vPul4uodvWvLhRco2w0GcyZcdyBfpfDRgNKU+p35AWEbJ/HPs1tOUrkSueVbBS0RQHAf/A+nNtDpvw95PeVKOA==
-
-"@rollup/rollup-linux-powerpc64le-gnu@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.28.1.tgz#652ef0d9334a9f25b9daf85731242801cb0fc41c"
-  integrity sha512-pTnTdBuC2+pt1Rmm2SV7JWRqzhYpEILML4PKODqLz+C7Ou2apEV52h19CR7es+u04KlqplggmN9sqZlekg3R1A==
-
-"@rollup/rollup-linux-riscv64-gnu@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.28.1.tgz#1eb6651839ee6ebca64d6cc64febbd299e95e6bd"
-  integrity sha512-vWXy1Nfg7TPBSuAncfInmAI/WZDd5vOklyLJDdIRKABcZWojNDY0NJwruY2AcnCLnRJKSaBgf/GiJfauu8cQZA==
-
-"@rollup/rollup-linux-s390x-gnu@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.28.1.tgz#015c52293afb3ff2a293cf0936b1d43975c1e9cd"
-  integrity sha512-/yqC2Y53oZjb0yz8PVuGOQQNOTwxcizudunl/tFs1aLvObTclTwZ0JhXF2XcPT/zuaymemCDSuuUPXJJyqeDOg==
-
-"@rollup/rollup-linux-x64-gnu@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.28.1.tgz#b83001b5abed2bcb5e2dbeec6a7e69b194235c1e"
-  integrity sha512-fzgeABz7rrAlKYB0y2kSEiURrI0691CSL0+KXwKwhxvj92VULEDQLpBYLHpF49MSiPG4sq5CK3qHMnb9tlCjBw==
-
-"@rollup/rollup-linux-x64-musl@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.28.1.tgz#6cc7c84cd4563737f8593e66f33b57d8e228805b"
-  integrity sha512-xQTDVzSGiMlSshpJCtudbWyRfLaNiVPXt1WgdWTwWz9n0U12cI2ZVtWe/Jgwyv/6wjL7b66uu61Vg0POWVfz4g==
-
-"@rollup/rollup-win32-arm64-msvc@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.28.1.tgz#631ffeee094d71279fcd1fe8072bdcf25311bc11"
-  integrity sha512-wSXmDRVupJstFP7elGMgv+2HqXelQhuNf+IS4V+nUpNVi/GUiBgDmfwD0UGN3pcAnWsgKG3I52wMOBnk1VHr/A==
-
-"@rollup/rollup-win32-ia32-msvc@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.28.1.tgz#06d1d60d5b9f718e8a6c4a43f82e3f9e3254587f"
-  integrity sha512-ZkyTJ/9vkgrE/Rk9vhMXhf8l9D+eAhbAVbsGsXKy2ohmJaWg0LPQLnIxRdRp/bKyr8tXuPlXhIoGlEB5XpJnGA==
-
-"@rollup/rollup-win32-x64-msvc@4.28.1":
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.28.1.tgz#4dff5c4259ebe6c5b4a8f2c5bc3829b7a8447ff0"
-  integrity sha512-ZvK2jBafvttJjoIdKm/Q/Bh7IJ1Ose9IBOwpOXcOvW3ikGTQGmKDgxTC6oCAzW6PynbkKP8+um1du81XJHZ0JA==
+"@rollup/rollup-android-arm-eabi@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.1.tgz#a09cb0718297a2f0cc7f9b4dfca4d08753ea5c9b"
+  integrity sha512-kwctwVlswSEsr4ljpmxKrRKp1eG1v2NAhlzFzDf1x1OdYaMjBYjDCbHkzWm57ZXzTwqn8stMXgROrnMw8dJK3w==
+
+"@rollup/rollup-android-arm64@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.1.tgz#cbb3cad15748794b8dfec7f1e427e633f8f06d61"
+  integrity sha512-4H5ZtZitBPlbPsTv6HBB8zh1g5d0T8TzCmpndQdqq20Ugle/nroOyDMf9p7f88Gsu8vBLU78/cuh8FYHZqdXxw==
+
+"@rollup/rollup-darwin-arm64@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.1.tgz#7f5127bca8892d0287a53fb17be9c7af32748234"
+  integrity sha512-f2AJ7Qwx9z25hikXvg+asco8Sfuc5NCLg8rmqQBIOUoWys5sb/ZX9RkMZDPdnnDevXAMJA5AWLnRBmgdXGEUiA==
+
+"@rollup/rollup-darwin-x64@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.1.tgz#bbf8aa9fe655d75b5fb858b5bdbb1c790c36a3cd"
+  integrity sha512-+/2JBrRfISCsWE4aEFXxd+7k9nWGXA8+wh7ZUHn/u8UDXOU9LN+QYKKhd57sIn6WRcorOnlqPMYFIwie/OHXWw==
+
+"@rollup/rollup-freebsd-arm64@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.1.tgz#43f75cb686a23fc0aef3ce6bfe44501bf934e412"
+  integrity sha512-SUeB0pYjIXwT2vfAMQ7E4ERPq9VGRrPR7Z+S4AMssah5EHIilYqjWQoTn5dkDtuIJUSTs8H+C9dwoEcg3b0sCA==
+
+"@rollup/rollup-freebsd-x64@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.1.tgz#1d0377ef7a06bb3a6543bbbf18b6d65b55074802"
+  integrity sha512-L3T66wAZiB/ooiPbxz0s6JEX6Sr2+HfgPSK+LMuZkaGZFAFCQAHiP3dbyqovYdNaiUXcl9TlgnIbcsIicAnOZg==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.1.tgz#1ca88b1244678e74984efe89b1e39b9ae74671c7"
+  integrity sha512-UBXdQ4+ATARuFgsFrQ+tAsKvBi/Hly99aSVdeCUiHV9dRTTpMU7OrM3WXGys1l40wKVNiOl0QYY6cZQJ2xhKlQ==
+
+"@rollup/rollup-linux-arm-musleabihf@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.1.tgz#33cdcac1befc32d7217b94b78c56fa5c194660cc"
+  integrity sha512-m/yfZ25HGdcCSwmopEJm00GP7xAUyVcBPjttGLRAqZ60X/bB4Qn6gP7XTwCIU6bITeKmIhhwZ4AMh2XLro+4+w==
+
+"@rollup/rollup-linux-arm64-gnu@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.1.tgz#4de1e8ade39d0da1e981ab05f94a69f3de72725a"
+  integrity sha512-Wy+cUmFuvziNL9qWRRzboNprqSQ/n38orbjRvd6byYWridp5TJ3CD+0+HUsbcWVSNz9bxkDUkyASGP0zS7GAvg==
+
+"@rollup/rollup-linux-arm64-musl@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.1.tgz#314f56ea347323d94107b8eb0dc6cb60ba4e0a35"
+  integrity sha512-CQ3MAGgiFmQW5XJX5W3wnxOBxKwFlUAgSXFA2SwgVRjrIiVt5LHfcQLeNSHKq5OEZwv+VCBwlD1+YKCjDG8cpg==
+
+"@rollup/rollup-linux-loongarch64-gnu@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.1.tgz#64f7871f5718a086786485b9c4d22fd263a37b44"
+  integrity sha512-rSzb1TsY4lSwH811cYC3OC2O2mzNMhM13vcnA7/0T6Mtreqr3/qs6WMDriMRs8yvHDI54qxHgOk8EV5YRAHFbw==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.1.tgz#ad5902358a0d91bda75b3cbd45d61d1f6698b6f5"
+  integrity sha512-fwr0n6NS0pG3QxxlqVYpfiY64Fd1Dqd8Cecje4ILAV01ROMp4aEdCj5ssHjRY3UwU7RJmeWd5fi89DBqMaTawg==
+
+"@rollup/rollup-linux-riscv64-gnu@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.1.tgz#1d917841458ccc34dcc34be32ea0a4b33437370f"
+  integrity sha512-4uJb9qz7+Z/yUp5RPxDGGGUcoh0PnKF33QyWgEZ3X/GocpWb6Mb+skDh59FEt5d8+Skxqs9mng6Swa6B2AmQZg==
+
+"@rollup/rollup-linux-s390x-gnu@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.1.tgz#0c224baa3e1823f2b7b0e45dfaf43a99a18e8248"
+  integrity sha512-QlIo8ndocWBEnfmkYqj8vVtIUpIqJjfqKggjy7IdUncnt8BGixte1wDON7NJEvLg3Kzvqxtbo8tk+U1acYEBlw==
+
+"@rollup/rollup-linux-x64-gnu@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.1.tgz#f5fba18eda523cbe04f82cbf3e0685e461e71613"
+  integrity sha512-hzpleiKtq14GWjz3ahWvJXgU1DQC9DteiwcsY4HgqUJUGxZThlL66MotdUEK9zEo0PK/2ADeZGM9LIondE302A==
+
+"@rollup/rollup-linux-x64-musl@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.1.tgz#7439d15ffe62ac0468ef2d539d4c39b4686e1276"
+  integrity sha512-jqtKrO715hDlvUcEsPn55tZt2TEiBvBtCMkUuU0R6fO/WPT7lO9AONjPbd8II7/asSiNVQHCMn4OLGigSuxVQA==
+
+"@rollup/rollup-win32-arm64-msvc@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.1.tgz#125f09f40719ea7a02a76607428a0366ff9dca4d"
+  integrity sha512-RnHy7yFf2Wz8Jj1+h8klB93N0NHNHXFhNwAmiy9zJdpY7DE01VbEVtPdrK1kkILeIbHGRJjvfBDBhnxBr8kD4g==
+
+"@rollup/rollup-win32-ia32-msvc@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.1.tgz#04e36410a55fa36278a627ed769a60576c882d1d"
+  integrity sha512-i7aT5HdiZIcd7quhzvwQ2oAuX7zPYrYfkrd1QFfs28Po/i0q6kas/oRrzGlDhAEyug+1UfUtkWdmoVlLJj5x9Q==
+
+"@rollup/rollup-win32-x64-msvc@4.34.1":
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.1.tgz#37cddc33f8cd961a615f5f854d2b1994c90fe547"
+  integrity sha512-k3MVFD9Oq+laHkw2N2v7ILgoa9017ZMF/inTtHzyTVZjYs9cSH18sdyAf6spBAJIGwJ5UaC7et2ZH1WCdlhkMw==
 
 "@rtsao/scc@^1.1.0":
   version "1.1.0"
@@ -1482,16 +1482,16 @@
   integrity sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==
 
 "@tailwindcss/forms@^0.5.9":
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.5.9.tgz#b495c12575d6eae5865b2cbd9876b26d89f16f61"
-  integrity sha512-tM4XVr2+UVTxXJzey9Twx48c1gcxFStqn1pQz0tRsX8o3DvxhN5oY5pvyAbUx7VTaZxpej4Zzvc6h+1RJBzpIg==
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.5.10.tgz#0a1cd67b6933402f1985a04595bd24f9785aa302"
+  integrity sha512-utI1ONF6uf/pPNO68kmN1b8rEwNXv3czukalo8VtJH8ksIkZXr3Q3VYudZLkCsDd4Wku120uF02hYK25XGPorw==
   dependencies:
     mini-svg-data-uri "^1.2.3"
 
 "@tailwindcss/typography@^0.5.15":
-  version "0.5.15"
-  resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.15.tgz#007ab9870c86082a1c76e5b3feda9392c7c8d648"
-  integrity sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.16.tgz#a926c8f44d5c439b2915e231cad80058850047c6"
+  integrity sha512-0wDLwCVF5V3x3b1SGXPCDcdsbDHMBe+lkFzBRaHeLvNi+nrrnZ1lA18u+OTWO8iSWU2GxUOCvlXtDuqftc1oiA==
   dependencies:
     lodash.castarray "^4.4.0"
     lodash.isplainobject "^4.0.6"
@@ -1526,9 +1526,9 @@
     redent "^3.0.0"
 
 "@testing-library/react@^16.0.1":
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-16.1.0.tgz#aa0c61398bac82eaf89776967e97de41ac742d71"
-  integrity sha512-Q2ToPvg0KsVL0ohND9A3zLJWcOXXcO8IDu3fj11KhNt0UlCWyFyvnCIBkd12tidB2lkiVRG8VFqdhcqhqnAQtg==
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-16.2.0.tgz#c96126ee01a49cdb47175721911b4a9432afc601"
+  integrity sha512-2cSskAvA1QNtKc8Y9VJQRv0tm3hLVgxRGDB+KYhIaPQJ1I+RHbhIXcM+zClKXzMes/wshsMVzf4B9vS4IZpqDQ==
   dependencies:
     "@babel/runtime" "^7.12.5"
 
@@ -1593,14 +1593,14 @@
     "@types/lodash" "*"
 
 "@types/lodash@*":
-  version "4.17.14"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.14.tgz#bafc053533f4cdc5fcc9635af46a963c1f3deaff"
-  integrity sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.15.tgz#12d4af0ed17cc7600ce1f9980cec48fc17ad1e89"
+  integrity sha512-w/P33JFeySuhN6JLkysYUK2gEmy9kHHFN7E8ro0tkfmlDOgxBDzWEZ/J8cWA+fHqFevpswDTFZnDx+R9lbL6xw==
 
 "@types/node@^22.10.2":
-  version "22.10.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.10.2.tgz#a485426e6d1fdafc7b0d4c7b24e2c78182ddabb9"
-  integrity sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==
+  version "22.13.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.0.tgz#d376dd9a0ee2f9382d86c2d5d7beb4d198b4ea8c"
+  integrity sha512-ClIbNe36lawluuvq3+YYhnIN2CELi+6q8NpnM7PYp4hBn/TatfboPgVSm2rwKRfnV2M+Ty9GWDFI64KEe+kysA==
   dependencies:
     undici-types "~6.20.0"
 
@@ -1615,9 +1615,9 @@
   integrity sha512-raNFQ08xlqHvSYkoJ1T8pPPeARj5EzV28L4zFNj09jVz0HprVAhLknl0a51lhXDeb6va2jAFXpwOeYSY6TAjUg==
 
 "@types/react-dom@^19.0.0":
-  version "19.0.2"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.0.2.tgz#ad21f9a1ee881817995fd3f7fd33659c87e7b1b7"
-  integrity sha512-c1s+7TKFaDRRxr1TxccIX2u7sfCnc3RxkVyBIUA2lCpyqCF+QoAwQ/CBg7bsMdVwP120HEH143VQezKtef5nCg==
+  version "19.0.3"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.0.3.tgz#0804dfd279a165d5a0ad8b53a5b9e65f338050a4"
+  integrity sha512-0Knk+HJiMP/qOZgMyNFamlIjw9OFCsyC2ZbigmEEyXXixgre6IQpm/4V+r3qH4GC1JPvRJKInw+on2rV6YZLeA==
 
 "@types/react-google-recaptcha@^2.1.9":
   version "2.1.9"
@@ -1632,9 +1632,9 @@
   integrity sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==
 
 "@types/react@*", "@types/react@^19.0.0":
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.0.1.tgz#a000d5b78f473732a08cecbead0f3751e550b3df"
-  integrity sha512-YW6614BDhqbpR5KtUYzTA+zlA7nayzJRA9ljz9CQoxthR0sDisYZLuvSMsil36t4EH/uAt8T52Xb4sVw17G+SQ==
+  version "19.0.8"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.0.8.tgz#7098e6159f2a61e4f4cef2c1223c044a9bec590e"
+  integrity sha512-9P/o1IGdfmQxrujGbIMDyYaaCykhLKc0NGCtYcECNUr9UAaDe4gwvV9bR6tvd5Br1SG0j+PBpbKr2UYY8CwqSw==
   dependencies:
     csstype "^3.0.2"
 
@@ -1728,9 +1728,9 @@
     eslint-visitor-keys "^3.3.0"
 
 "@ungap/structured-clone@^1.2.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.1.tgz#28fa185f67daaf7b7a1a8c1d445132c5d979f8bd"
-  integrity sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
+  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
 
 "@vitejs/plugin-react@^4.3.4":
   version "4.3.4"
@@ -1909,13 +1909,13 @@ aria-query@^5.0.0:
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.2.tgz#93f81a43480e33a338f19163a3d10a50c01dcd59"
   integrity sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==
 
-array-buffer-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
-  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
+array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b"
+  integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==
   dependencies:
-    call-bind "^1.0.5"
-    is-array-buffer "^3.0.4"
+    call-bound "^1.0.3"
+    is-array-buffer "^3.0.5"
 
 array-includes@^3.1.6, array-includes@^3.1.8:
   version "3.1.8"
@@ -1968,7 +1968,7 @@ array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2:
     es-abstract "^1.23.5"
     es-shim-unscopables "^1.0.2"
 
-array.prototype.flatmap@^1.3.2:
+array.prototype.flatmap@^1.3.2, array.prototype.flatmap@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b"
   integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==
@@ -2007,6 +2007,11 @@ assertion-error@^2.0.1:
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-2.0.1.tgz#f641a196b335690b1070bf00b6e7593fec190bf7"
   integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==
 
+async-function@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
+  integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -2082,9 +2087,9 @@ braces@^3.0.3, braces@~3.0.2:
     fill-range "^7.1.1"
 
 browserslist@^4.23.3, browserslist@^4.24.0:
-  version "4.24.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.3.tgz#5fc2725ca8fb3c1432e13dac278c7cc103e026d2"
-  integrity sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==
+  version "4.24.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
+  integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
   dependencies:
     caniuse-lite "^1.0.30001688"
     electron-to-chromium "^1.5.73"
@@ -2111,7 +2116,7 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1:
     es-errors "^1.3.0"
     function-bind "^1.1.2"
 
-call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7, call-bind@^1.0.8:
+call-bind@^1.0.7, call-bind@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
   integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
@@ -2145,9 +2150,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001688:
-  version "1.0.30001689"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001689.tgz#67ca960dd5f443903e19949aeacc9d28f6e10910"
-  integrity sha512-CmeR2VBycfa+5/jOfnp/NpWPGd06nf1XYiefUvhXFfZE4GkRc9jv+eGPS4nT558WS/8lYCzV8SlANCIPvbWP1g==
+  version "1.0.30001696"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz#00c30a2fc11e3c98c25e5125418752af3ae2f49f"
+  integrity sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==
 
 chai@^5.1.2:
   version "5.1.2"
@@ -2296,11 +2301,12 @@ cssesc@^3.0.0:
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
 cssstyle@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.1.0.tgz#161faee382af1bafadb6d3867a92a19bcb4aea70"
-  integrity sha512-h66W1URKpBS5YMI/V8PyXvTMFT8SupJ1IzoIV8IeBC/ji8WVmrO8dGlTi+2dh6whmdk6BiKJLD/ZBkhWbcg6nA==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.2.1.tgz#5142782410fea95db66fb68147714a652a7c2381"
+  integrity sha512-9+vem03dMXG7gDmZ62uqmRiMRNtinIZ9ZyuF6BdxzfOD+FdN5hretzynkn0ReS2DO2GSw76RWHs0UmJPI2zUjw==
   dependencies:
-    rrweb-cssom "^0.7.1"
+    "@asamuzakjp/css-color" "^2.8.2"
+    rrweb-cssom "^0.8.0"
 
 csstype@^3.0.2:
   version "3.1.3"
@@ -2315,30 +2321,30 @@ data-urls@^5.0.0:
     whatwg-mimetype "^4.0.0"
     whatwg-url "^14.0.0"
 
-data-view-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2"
-  integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==
+data-view-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"
+  integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==
   dependencies:
-    call-bind "^1.0.6"
+    call-bound "^1.0.3"
     es-errors "^1.3.0"
-    is-data-view "^1.0.1"
+    is-data-view "^1.0.2"
 
-data-view-byte-length@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2"
-  integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==
+data-view-byte-length@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735"
+  integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==
   dependencies:
-    call-bind "^1.0.7"
+    call-bound "^1.0.3"
     es-errors "^1.3.0"
-    is-data-view "^1.0.1"
+    is-data-view "^1.0.2"
 
-data-view-byte-offset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a"
-  integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==
+data-view-byte-offset@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191"
+  integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==
   dependencies:
-    call-bind "^1.0.6"
+    call-bound "^1.0.2"
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
@@ -2357,9 +2363,9 @@ debug@^3.2.7:
     ms "^2.1.1"
 
 decimal.js@^10.4.3:
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
-  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22"
+  integrity sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==
 
 deep-eql@^5.0.1:
   version "5.0.2"
@@ -2466,7 +2472,7 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-dunder-proto@^1.0.0:
+dunder-proto@^1.0.0, dunder-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
   integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
@@ -2481,32 +2487,32 @@ eastasianwidth@^0.2.0:
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
 electron-to-chromium@^1.5.73:
-  version "1.5.74"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.74.tgz#cb886b504a6467e4c00bea3317edb38393c53413"
-  integrity sha512-ck3//9RC+6oss/1Bh9tiAVFy5vfSKbRHAFh7Z3/eTRkEqJeWgymloShB17Vg3Z4nmDNp35vAd1BZ6CMW4Wt6Iw==
+  version "1.5.90"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz#4717e5a5413f95bbb12d0af14c35057e9c65e0b6"
+  integrity sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==
 
 embla-carousel-autoplay@^8.5.1:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/embla-carousel-autoplay/-/embla-carousel-autoplay-8.5.1.tgz#d0213ab6d7beeafcfcb8f7b1fa023a4d3882f0a2"
-  integrity sha512-FnZklFpePfp8wbj177UwVaGFehgs+ASVcJvYLWTtHuYKURynCc3IdDn2qrn0E5Qpa3g9yeGwCS4p8QkrZmO8xg==
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/embla-carousel-autoplay/-/embla-carousel-autoplay-8.5.2.tgz#b24f2b5523282113ad2f2289a8e9a0bee7877e4e"
+  integrity sha512-27emJ0px3q/c0kCHCjwRrEbYcyYUPfGO3g5IBWF1i7714TTzE6L9P81V6PHLoSMAKJ1aHoT2e7YFOsuFKCbyag==
 
 embla-carousel-react@^8.5.1:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/embla-carousel-react/-/embla-carousel-react-8.5.1.tgz#e06ff28cb53698d453ffad89423c23d725e9b010"
-  integrity sha512-z9Y0K84BJvhChXgqn2CFYbfEi6AwEr+FFVVKm/MqbTQ2zIzO1VQri6w67LcfpVF0AjbhwVMywDZqY4alYkjW5w==
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/embla-carousel-react/-/embla-carousel-react-8.5.2.tgz#f79f6c36690596fe2aceec994372ab84bfbfd9cc"
+  integrity sha512-Tmx+uY3MqseIGdwp0ScyUuxpBgx5jX1f7od4Cm5mDwg/dptEiTKf9xp6tw0lZN2VA9JbnVMl/aikmbc53c6QFA==
   dependencies:
-    embla-carousel "8.5.1"
-    embla-carousel-reactive-utils "8.5.1"
+    embla-carousel "8.5.2"
+    embla-carousel-reactive-utils "8.5.2"
 
-embla-carousel-reactive-utils@8.5.1:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.5.1.tgz#3059ab2f72f04988a96694f700a772a72bb75ffb"
-  integrity sha512-n7VSoGIiiDIc4MfXF3ZRTO59KDp820QDuyBDGlt5/65+lumPHxX2JLz0EZ23hZ4eg4vZGUXwMkYv02fw2JVo/A==
+embla-carousel-reactive-utils@8.5.2:
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/embla-carousel-reactive-utils/-/embla-carousel-reactive-utils-8.5.2.tgz#914bf99c3d91e0809282fc1d14df3d1453f222c1"
+  integrity sha512-QC8/hYSK/pEmqEdU1IO5O+XNc/Ptmmq7uCB44vKplgLKhB/l0+yvYx0+Cv0sF6Ena8Srld5vUErZkT+yTahtDg==
 
-embla-carousel@8.5.1:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/embla-carousel/-/embla-carousel-8.5.1.tgz#8d83217e831666f6df573b0d3727ff0ae9208002"
-  integrity sha512-JUb5+FOHobSiWQ2EJNaueCNT/cQU9L6XWBbWmorWPQT9bkbk+fhsuLr8wWrzXKagO3oWszBO7MSx+GfaRk4E6A==
+embla-carousel@8.5.2:
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/embla-carousel/-/embla-carousel-8.5.2.tgz#95eb936d14a1b9a67b9207a0fde1f25259a5d692"
+  integrity sha512-xQ9oVLrun/eCG/7ru3R+I5bJ7shsD8fFwLEY7yPe27/+fDHCNj0OT5EoG5ZbFyOxOcG6yTwW8oTz/dWyFnyGpg==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -2530,27 +2536,28 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5:
-  version "1.23.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.6.tgz#55f0e1ce7128995cc04ace0a57d7dca348345108"
-  integrity sha512-Ifco6n3yj2tMZDWNLyloZrytt9lqqlwvS83P3HtaETR0NUOYnIULGGHpktqYGObGy+8wc1okO25p8TjemhImvA==
+es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9:
+  version "1.23.9"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.9.tgz#5b45994b7de78dada5c1bebf1379646b32b9d606"
+  integrity sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==
   dependencies:
-    array-buffer-byte-length "^1.0.1"
+    array-buffer-byte-length "^1.0.2"
     arraybuffer.prototype.slice "^1.0.4"
     available-typed-arrays "^1.0.7"
     call-bind "^1.0.8"
     call-bound "^1.0.3"
-    data-view-buffer "^1.0.1"
-    data-view-byte-length "^1.0.1"
-    data-view-byte-offset "^1.0.0"
+    data-view-buffer "^1.0.2"
+    data-view-byte-length "^1.0.2"
+    data-view-byte-offset "^1.0.1"
     es-define-property "^1.0.1"
     es-errors "^1.3.0"
     es-object-atoms "^1.0.0"
-    es-set-tostringtag "^2.0.3"
+    es-set-tostringtag "^2.1.0"
     es-to-primitive "^1.3.0"
-    function.prototype.name "^1.1.7"
-    get-intrinsic "^1.2.6"
-    get-symbol-description "^1.0.2"
+    function.prototype.name "^1.1.8"
+    get-intrinsic "^1.2.7"
+    get-proto "^1.0.0"
+    get-symbol-description "^1.1.0"
     globalthis "^1.0.4"
     gopd "^1.2.0"
     has-property-descriptors "^1.0.2"
@@ -2558,31 +2565,33 @@ es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23
     has-symbols "^1.1.0"
     hasown "^2.0.2"
     internal-slot "^1.1.0"
-    is-array-buffer "^3.0.4"
+    is-array-buffer "^3.0.5"
     is-callable "^1.2.7"
     is-data-view "^1.0.2"
-    is-negative-zero "^2.0.3"
     is-regex "^1.2.1"
-    is-shared-array-buffer "^1.0.3"
+    is-shared-array-buffer "^1.0.4"
     is-string "^1.1.1"
-    is-typed-array "^1.1.13"
+    is-typed-array "^1.1.15"
     is-weakref "^1.1.0"
-    math-intrinsics "^1.0.0"
+    math-intrinsics "^1.1.0"
     object-inspect "^1.13.3"
     object-keys "^1.1.1"
-    object.assign "^4.1.5"
+    object.assign "^4.1.7"
+    own-keys "^1.0.1"
     regexp.prototype.flags "^1.5.3"
     safe-array-concat "^1.1.3"
+    safe-push-apply "^1.0.0"
     safe-regex-test "^1.1.0"
+    set-proto "^1.0.0"
     string.prototype.trim "^1.2.10"
     string.prototype.trimend "^1.0.9"
     string.prototype.trimstart "^1.0.8"
-    typed-array-buffer "^1.0.2"
-    typed-array-byte-length "^1.0.1"
-    typed-array-byte-offset "^1.0.3"
+    typed-array-buffer "^1.0.3"
+    typed-array-byte-length "^1.0.3"
+    typed-array-byte-offset "^1.0.4"
     typed-array-length "^1.0.7"
-    unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.16"
+    unbox-primitive "^1.1.0"
+    which-typed-array "^1.1.18"
 
 es-define-property@^1.0.0, es-define-property@^1.0.1:
   version "1.0.1"
@@ -2594,47 +2603,49 @@ es-errors@^1.3.0:
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es-iterator-helpers@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.0.tgz#2f1a3ab998b30cb2d10b195b587c6d9ebdebf152"
-  integrity sha512-tpxqxncxnpw3c93u8n3VOzACmRFoVmWJqbWXvX/JfKbkhBw1oslgPrUfeSt2psuqyEJFD6N/9lg5i7bsKpoq+Q==
+es-iterator-helpers@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz#d1dd0f58129054c0ad922e6a9a1e65eef435fe75"
+  integrity sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     define-properties "^1.2.1"
-    es-abstract "^1.23.3"
+    es-abstract "^1.23.6"
     es-errors "^1.3.0"
     es-set-tostringtag "^2.0.3"
     function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
+    get-intrinsic "^1.2.6"
     globalthis "^1.0.4"
-    gopd "^1.0.1"
+    gopd "^1.2.0"
     has-property-descriptors "^1.0.2"
-    has-proto "^1.0.3"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.7"
-    iterator.prototype "^1.1.3"
-    safe-array-concat "^1.1.2"
+    has-proto "^1.2.0"
+    has-symbols "^1.1.0"
+    internal-slot "^1.1.0"
+    iterator.prototype "^1.1.4"
+    safe-array-concat "^1.1.3"
 
 es-module-lexer@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78"
-  integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.6.0.tgz#da49f587fd9e68ee2404fe4e256c0c7d3a81be21"
+  integrity sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==
 
 es-object-atoms@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941"
-  integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
   dependencies:
     es-errors "^1.3.0"
 
-es-set-tostringtag@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
-  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
+es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
+  integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
   dependencies:
-    get-intrinsic "^1.2.4"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
     has-tostringtag "^1.0.2"
-    hasown "^2.0.1"
+    hasown "^2.0.2"
 
 es-shim-unscopables@^1.0.2:
   version "1.0.2"
@@ -2681,35 +2692,36 @@ esbuild@^0.21.3:
     "@esbuild/win32-ia32" "0.21.5"
     "@esbuild/win32-x64" "0.21.5"
 
-esbuild@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.24.0.tgz#f2d470596885fcb2e91c21eb3da3b3c89c0b55e7"
-  integrity sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==
+esbuild@^0.24.2:
+  version "0.24.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.24.2.tgz#b5b55bee7de017bff5fb8a4e3e44f2ebe2c3567d"
+  integrity sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.24.0"
-    "@esbuild/android-arm" "0.24.0"
-    "@esbuild/android-arm64" "0.24.0"
-    "@esbuild/android-x64" "0.24.0"
-    "@esbuild/darwin-arm64" "0.24.0"
-    "@esbuild/darwin-x64" "0.24.0"
-    "@esbuild/freebsd-arm64" "0.24.0"
-    "@esbuild/freebsd-x64" "0.24.0"
-    "@esbuild/linux-arm" "0.24.0"
-    "@esbuild/linux-arm64" "0.24.0"
-    "@esbuild/linux-ia32" "0.24.0"
-    "@esbuild/linux-loong64" "0.24.0"
-    "@esbuild/linux-mips64el" "0.24.0"
-    "@esbuild/linux-ppc64" "0.24.0"
-    "@esbuild/linux-riscv64" "0.24.0"
-    "@esbuild/linux-s390x" "0.24.0"
-    "@esbuild/linux-x64" "0.24.0"
-    "@esbuild/netbsd-x64" "0.24.0"
-    "@esbuild/openbsd-arm64" "0.24.0"
-    "@esbuild/openbsd-x64" "0.24.0"
-    "@esbuild/sunos-x64" "0.24.0"
-    "@esbuild/win32-arm64" "0.24.0"
-    "@esbuild/win32-ia32" "0.24.0"
-    "@esbuild/win32-x64" "0.24.0"
+    "@esbuild/aix-ppc64" "0.24.2"
+    "@esbuild/android-arm" "0.24.2"
+    "@esbuild/android-arm64" "0.24.2"
+    "@esbuild/android-x64" "0.24.2"
+    "@esbuild/darwin-arm64" "0.24.2"
+    "@esbuild/darwin-x64" "0.24.2"
+    "@esbuild/freebsd-arm64" "0.24.2"
+    "@esbuild/freebsd-x64" "0.24.2"
+    "@esbuild/linux-arm" "0.24.2"
+    "@esbuild/linux-arm64" "0.24.2"
+    "@esbuild/linux-ia32" "0.24.2"
+    "@esbuild/linux-loong64" "0.24.2"
+    "@esbuild/linux-mips64el" "0.24.2"
+    "@esbuild/linux-ppc64" "0.24.2"
+    "@esbuild/linux-riscv64" "0.24.2"
+    "@esbuild/linux-s390x" "0.24.2"
+    "@esbuild/linux-x64" "0.24.2"
+    "@esbuild/netbsd-arm64" "0.24.2"
+    "@esbuild/netbsd-x64" "0.24.2"
+    "@esbuild/openbsd-arm64" "0.24.2"
+    "@esbuild/openbsd-x64" "0.24.2"
+    "@esbuild/sunos-x64" "0.24.2"
+    "@esbuild/win32-arm64" "0.24.2"
+    "@esbuild/win32-ia32" "0.24.2"
+    "@esbuild/win32-x64" "0.24.2"
 
 escalade@^3.2.0:
   version "3.2.0"
@@ -2808,27 +2820,27 @@ eslint-plugin-promise@^6.0.0:
   integrity sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ==
 
 eslint-plugin-react@^7.28.0:
-  version "7.37.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz#cd0935987876ba2900df2f58339f6d92305acc7a"
-  integrity sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==
+  version "7.37.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz#1b6c80b6175b6ae4b26055ae4d55d04c414c7181"
+  integrity sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==
   dependencies:
     array-includes "^3.1.8"
     array.prototype.findlast "^1.2.5"
-    array.prototype.flatmap "^1.3.2"
+    array.prototype.flatmap "^1.3.3"
     array.prototype.tosorted "^1.1.4"
     doctrine "^2.1.0"
-    es-iterator-helpers "^1.1.0"
+    es-iterator-helpers "^1.2.1"
     estraverse "^5.3.0"
     hasown "^2.0.2"
     jsx-ast-utils "^2.4.1 || ^3.0.0"
     minimatch "^3.1.2"
     object.entries "^1.1.8"
     object.fromentries "^2.0.8"
-    object.values "^1.2.0"
+    object.values "^1.2.1"
     prop-types "^15.8.1"
     resolve "^2.0.0-next.5"
     semver "^6.3.1"
-    string.prototype.matchall "^4.0.11"
+    string.prototype.matchall "^4.0.12"
     string.prototype.repeat "^1.0.0"
 
 eslint-scope@^5.1.1:
@@ -2981,15 +2993,15 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.2.9, fast-glob@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
-  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
+  integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
     glob-parent "^5.1.2"
     merge2 "^1.3.0"
-    micromatch "^4.0.4"
+    micromatch "^4.0.8"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -3002,16 +3014,16 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
-  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.0.tgz#a82c6b7c2bb4e44766d865f07997785fecfdcb89"
+  integrity sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==
   dependencies:
     reusify "^1.0.4"
 
 fdir@^6.4.2:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
-  integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.3.tgz#011cdacf837eca9b811c89dbb902df714273db72"
+  integrity sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==
 
 fflate@^0.8.2:
   version "0.8.2"
@@ -3080,11 +3092,11 @@ follow-redirects@^1.15.6:
   integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
 
 for-each@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.4.tgz#814517ffc303d1399b2564d8165318e735d0341c"
+  integrity sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw==
   dependencies:
-    is-callable "^1.1.3"
+    is-callable "^1.2.7"
 
 foreground-child@^3.1.0:
   version "3.3.0"
@@ -3123,12 +3135,13 @@ function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.6, function.prototype.name@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.7.tgz#9df48ea5f746bf577d7e15b5da89df8952a98e7b"
-  integrity sha512-2g4x+HqTJKM9zcJqBSpjoRmdcPFtJM60J3xJisTQSXBWka5XqyBN/2tNUgma1mztTXyDuUsEtYe5qcs7xYzYQA==
+function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
+  integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==
   dependencies:
     call-bind "^1.0.8"
+    call-bound "^1.0.3"
     define-properties "^1.2.1"
     functions-have-names "^1.2.3"
     hasown "^2.0.2"
@@ -3144,33 +3157,41 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.6.tgz#43dd3dd0e7b49b82b2dfcad10dc824bf7fc265d5"
-  integrity sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==
+get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.7.tgz#dcfcb33d3272e15f445d15124bc0a216189b9044"
+  integrity sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==
   dependencies:
     call-bind-apply-helpers "^1.0.1"
-    dunder-proto "^1.0.0"
     es-define-property "^1.0.1"
     es-errors "^1.3.0"
     es-object-atoms "^1.0.0"
     function-bind "^1.1.2"
+    get-proto "^1.0.0"
     gopd "^1.2.0"
     has-symbols "^1.1.0"
     hasown "^2.0.2"
-    math-intrinsics "^1.0.0"
+    math-intrinsics "^1.1.0"
 
 get-nonce@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-nonce/-/get-nonce-1.0.1.tgz#fdf3f0278073820d2ce9426c18f07481b1e0cdf3"
   integrity sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==
 
+get-proto@^1.0.0, get-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-object-atoms "^1.0.0"
+
 get-stdin@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
   integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
-get-symbol-description@^1.0.2:
+get-symbol-description@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
   integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==
@@ -3265,14 +3286,14 @@ graphemer@^1.4.0:
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
 hamburger-react@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/hamburger-react/-/hamburger-react-2.5.1.tgz#a15973cacabbc414f490ab0aa13340e260fc6ec1"
-  integrity sha512-XlTIinYeYzLu76q4Vd9olwOJP0hFgAeZfJFX6tTT/ufTLhmOjI77CGFYIwGc6gcDeeT86660ZoKx3/L67vdZEw==
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/hamburger-react/-/hamburger-react-2.5.2.tgz#6224277593a03904b315d32a18a5fba0c04d8dc1"
+  integrity sha512-xsv/I7wQX1RDaulDnvMVCXMMRXnkwnUnkE8seD5eNVZJ4nIrjtK5LLA20l5x/pJ+mPWOzlFxW32VJ86Gbo2Njw==
 
 has-bigints@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
-  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.1.0.tgz#28607e965ac967e03cd2a2c70a2636a1edad49fe"
+  integrity sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==
 
 has-flag@^4.0.0:
   version "4.0.0"
@@ -3286,7 +3307,7 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   dependencies:
     es-define-property "^1.0.0"
 
-has-proto@^1.0.3, has-proto@^1.2.0:
+has-proto@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5"
   integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==
@@ -3298,14 +3319,14 @@ has-symbols@^1.0.3, has-symbols@^1.1.0:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
   integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
 
-has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
+has-tostringtag@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
   integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
   dependencies:
     has-symbols "^1.0.3"
 
-hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
+hasown@^2.0.0, hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -3355,9 +3376,9 @@ ignore@^5.1.1, ignore@^5.2.0:
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
 import-fresh@^3.2.1, import-fresh@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
+  integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -3386,11 +3407,11 @@ inherits@2:
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 input-otp@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/input-otp/-/input-otp-1.4.1.tgz#bc22e68b14b1667219d54adf74243e37ea79cf84"
-  integrity sha512-+yvpmKYKHi9jIGngxagY9oWiiblPB7+nEO75F2l2o4vs+6vpPZZmUl4tBNYuTCvQjhvEIbdNeJu70bhfYP2nbw==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/input-otp/-/input-otp-1.4.2.tgz#f4d3d587d0f641729e55029b3b8c4870847f4f07"
+  integrity sha512-l3jWwYNvrEa6NTCt7BECfCm48GvwuZzkoeG3gBL2w4CHeOXW3eKFmf9UNYkNfYc3mxMrthMnxjIE07MT0zLBQA==
 
-internal-slot@^1.0.7, internal-slot@^1.1.0:
+internal-slot@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
   integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==
@@ -3399,7 +3420,7 @@ internal-slot@^1.0.7, internal-slot@^1.1.0:
     hasown "^2.0.2"
     side-channel "^1.1.0"
 
-is-array-buffer@^3.0.4:
+is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280"
   integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==
@@ -3414,11 +3435,15 @@ is-arrayish@^0.2.1:
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-async-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646"
-  integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523"
+  integrity sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==
   dependencies:
-    has-tostringtag "^1.0.0"
+    async-function "^1.0.0"
+    call-bound "^1.0.3"
+    get-proto "^1.0.1"
+    has-tostringtag "^1.0.2"
+    safe-regex-test "^1.1.0"
 
 is-bigint@^1.1.0:
   version "1.1.0"
@@ -3442,15 +3467,15 @@ is-boolean-object@^1.2.1:
     call-bound "^1.0.2"
     has-tostringtag "^1.0.2"
 
-is-callable@^1.1.3, is-callable@^1.2.7:
+is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
 is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.0.tgz#6c01ffdd5e33c49c1d2abfa93334a85cb56bd81c"
-  integrity sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
+  integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
   dependencies:
     hasown "^2.0.2"
 
@@ -3489,11 +3514,14 @@ is-fullwidth-code-point@^3.0.0:
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-generator-function@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
-  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"
+  integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==
   dependencies:
-    has-tostringtag "^1.0.0"
+    call-bound "^1.0.3"
+    get-proto "^1.0.0"
+    has-tostringtag "^1.0.2"
+    safe-regex-test "^1.1.0"
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
@@ -3507,11 +3535,6 @@ is-map@^2.0.3:
   resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e"
   integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==
 
-is-negative-zero@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
-  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
-
 is-number-object@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
@@ -3550,12 +3573,12 @@ is-set@^2.0.3:
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
   integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
 
-is-shared-array-buffer@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688"
-  integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==
+is-shared-array-buffer@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f"
+  integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==
   dependencies:
-    call-bind "^1.0.7"
+    call-bound "^1.0.3"
 
 is-string@^1.0.7, is-string@^1.1.1:
   version "1.1.1"
@@ -3574,10 +3597,10 @@ is-symbol@^1.0.4, is-symbol@^1.1.1:
     has-symbols "^1.1.0"
     safe-regex-test "^1.1.0"
 
-is-typed-array@^1.1.13, is-typed-array@^1.1.14:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.14.tgz#205d51d499d5e336f4a3aa480c8ead5ff9e2e3e8"
-  integrity sha512-lQUsHzcTb7rH57dajbOuZEuMDXjs9f04ZloER4QOpjpKcaw4f98BRUrs8aiO9Z4G7i7B0Xhgarg6SCgYcYi8Nw==
+is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
+  integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
   dependencies:
     which-typed-array "^1.1.16"
 
@@ -3611,16 +3634,16 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-iterator.prototype@^1.1.3:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.4.tgz#4ae6cf98b97fdc717b7e159d79dc25f8fc9482f1"
-  integrity sha512-x4WH0BWmrMmg4oHHl+duwubhrvczGlyuGAZu3nvrf0UXOfPu8IhZObFEr7DE/iv01YgVZrsOiRcqw2srkKEDIA==
+iterator.prototype@^1.1.4:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.5.tgz#12c959a29de32de0aa3bbbb801f4d777066dae39"
+  integrity sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==
   dependencies:
     define-data-property "^1.1.4"
     es-object-atoms "^1.0.0"
     get-intrinsic "^1.2.6"
+    get-proto "^1.0.0"
     has-symbols "^1.1.0"
-    reflect.getprototypeof "^1.0.8"
     set-function-name "^2.0.2"
 
 jackspeak@^3.1.2:
@@ -3829,9 +3852,9 @@ loose-envify@^1.4.0:
     js-tokens "^3.0.0 || ^4.0.0"
 
 loupe@^3.1.0, loupe@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.1.2.tgz#c86e0696804a02218f2206124c45d8b15291a240"
-  integrity sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.1.3.tgz#042a8f7986d77f3d0f98ef7990a2b2fef18b0fd2"
+  integrity sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==
 
 lower-case@^2.0.2:
   version "2.0.2"
@@ -3840,7 +3863,7 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lru-cache@^10.2.0:
+lru-cache@^10.2.0, lru-cache@^10.4.3:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
   integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
@@ -3869,10 +3892,10 @@ magic-string@^0.30.12:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.5.0"
 
-math-intrinsics@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.0.0.tgz#4e04bf87c85aa51e90d078dac2252b4eb5260817"
-  integrity sha512-4MqMiKP90ybymYvsut0CH2g4XWbfLtmlCkXmtmdcDCxNB+mQcu1w/1+L/VD7vi/PSv7X2JYV7SCcR+jiPXnQtA==
+math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
 
 memoize-one@^6.0.0:
   version "6.0.0"
@@ -3884,7 +3907,7 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@^4.0.4, micromatch@^4.0.8:
+micromatch@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
   integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -3957,7 +3980,7 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nanoid@^3.3.7:
+nanoid@^3.3.8:
   version "3.3.8"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
   integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
@@ -4025,14 +4048,16 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.4, object.assign@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
-  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
+object.assign@^4.1.4, object.assign@^4.1.7:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
+  integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
   dependencies:
-    call-bind "^1.0.5"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     define-properties "^1.2.1"
-    has-symbols "^1.0.3"
+    es-object-atoms "^1.0.0"
+    has-symbols "^1.1.0"
     object-keys "^1.1.1"
 
 object.entries@^1.1.8:
@@ -4063,12 +4088,13 @@ object.groupby@^1.0.3:
     define-properties "^1.2.1"
     es-abstract "^1.23.2"
 
-object.values@^1.1.6, object.values@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b"
-  integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==
+object.values@^1.1.6, object.values@^1.2.0, object.values@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216"
+  integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     define-properties "^1.2.1"
     es-object-atoms "^1.0.0"
 
@@ -4091,6 +4117,15 @@ optionator@^0.9.3:
     type-check "^0.4.0"
     word-wrap "^1.2.5"
 
+own-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"
+  integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==
+  dependencies:
+    get-intrinsic "^1.2.6"
+    object-keys "^1.1.1"
+    safe-push-apply "^1.0.0"
+
 p-limit@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -4228,7 +4263,7 @@ pathval@^2.0.0:
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.0.tgz#7e2550b422601d4f6b8e26f1301bc8f15a741a25"
   integrity sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==
 
-picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0, picocolors@^1.1.1:
+picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
@@ -4332,11 +4367,11 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0:
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
 postcss@^8.4.43, postcss@^8.4.47, postcss@^8.4.49:
-  version "8.4.49"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
-  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+  version "8.5.1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.1.tgz#e2272a1f8a807fafa413218245630b5db10a3214"
+  integrity sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==
   dependencies:
-    nanoid "^3.3.7"
+    nanoid "^3.3.8"
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
@@ -4374,11 +4409,11 @@ punycode@^2.1.0, punycode@^2.3.1:
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
 qs@^6.9.0:
-  version "6.13.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e"
-  integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
+  integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
   dependencies:
-    side-channel "^1.0.6"
+    side-channel "^1.1.0"
 
 queue-microtask@^1.2.2:
   version "1.2.3"
@@ -4442,17 +4477,6 @@ react-remove-scroll@2.5.5:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
-react-remove-scroll@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.6.2.tgz#2518d2c5112e71ea8928f1082a58459b5c7a2a97"
-  integrity sha512-KmONPx5fnlXYJQqC62Q+lwIeAk64ws/cUw6omIumRzMRPqgnYqhSSti99nbj0Ry13bv7dF+BKn7NB+OqkdZGTw==
-  dependencies:
-    react-remove-scroll-bar "^2.3.7"
-    react-style-singleton "^2.2.1"
-    tslib "^2.1.0"
-    use-callback-ref "^1.3.3"
-    use-sidecar "^1.1.2"
-
 react-remove-scroll@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz#df02cde56d5f2731e058531f8ffd7f9adec91ac2"
@@ -4465,9 +4489,9 @@ react-remove-scroll@^2.6.2:
     use-sidecar "^1.1.3"
 
 react-select@^5.9.0:
-  version "5.9.0"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.9.0.tgz#41325b7bfe8452a8d401b82fc4fb7d44a03e29c5"
-  integrity sha512-nwRKGanVHGjdccsnzhFte/PULziueZxGD8LL2WojON78Mvnq7LdAMEtu2frrwld1fr3geixg3iiMBIc/LLAZpw==
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.10.0.tgz#9b5f4544cfecdfc744184b87651468ee0fb6e172"
+  integrity sha512-k96gw+i6N3ExgDwPIg0lUPmexl1ygPe6u5BdQFNBhkpbwroIgCNXdubtIzHfThYXYYTubwOBafoMnn7ruEP1xA==
   dependencies:
     "@babel/runtime" "^7.12.0"
     "@emotion/cache" "^11.4.0"
@@ -4524,33 +4548,35 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.8.tgz#c58afb17a4007b4d1118c07b92c23fca422c5d82"
-  integrity sha512-B5dj6usc5dkk8uFliwjwDHM8To5/QwdKz9JcBZ8Ic4G1f0YmeeJTtE/ZTdgRFPAfxZFiUaPhZ1Jcs4qeagItGQ==
+reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9"
+  integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==
   dependencies:
     call-bind "^1.0.8"
     define-properties "^1.2.1"
-    dunder-proto "^1.0.0"
-    es-abstract "^1.23.5"
+    es-abstract "^1.23.9"
     es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-    gopd "^1.2.0"
-    which-builtin-type "^1.2.0"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.7"
+    get-proto "^1.0.1"
+    which-builtin-type "^1.2.1"
 
 regenerator-runtime@^0.14.0:
   version "0.14.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
   integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
-regexp.prototype.flags@^1.5.2, regexp.prototype.flags@^1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42"
-  integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==
+regexp.prototype.flags@^1.5.3:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
+  integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
     define-properties "^1.2.1"
     es-errors "^1.3.0"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
     set-function-name "^2.0.2"
 
 regexpp@^3.0.0:
@@ -4563,16 +4589,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve@^1.1.7, resolve@^1.22.1, resolve@^1.22.4, resolve@^1.22.8:
-  version "1.22.9"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.9.tgz#6da76e4cdc57181fa4471231400e8851d0a924f3"
-  integrity sha512-QxrmX1DzraFIi9PxdG5VkRfRwIgjwyud+z/iBwfRRrVmHc+P9Q7u2lSSpQ6bjr2gy5lrqIiU9vb6iAeGf2400A==
-  dependencies:
-    is-core-module "^2.16.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.19.0:
+resolve@^1.1.7, resolve@^1.19.0, resolve@^1.22.1, resolve@^1.22.4, resolve@^1.22.8:
   version "1.22.10"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
   integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
@@ -4603,31 +4620,31 @@ rimraf@^3.0.2:
     glob "^7.1.3"
 
 rollup@^4.20.0, rollup@^4.23.0:
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.28.1.tgz#7718ba34d62b449dfc49adbfd2f312b4fe0df4de"
-  integrity sha512-61fXYl/qNVinKmGSTHAZ6Yy8I3YIJC/r2m9feHo6SwVAVcLT5MPwOUFe7EuURA/4m0NR8lXG4BBXuo/IZEsjMg==
+  version "4.34.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.34.1.tgz#dcc318abee12e23dae4003af733c1987d7baca8e"
+  integrity sha512-iYZ/+PcdLYSGfH3S+dGahlW/RWmsqDhLgj1BT9DH/xXJ0ggZN7xkdP9wipPNjjNLczI+fmMLmTB9pye+d2r4GQ==
   dependencies:
     "@types/estree" "1.0.6"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.28.1"
-    "@rollup/rollup-android-arm64" "4.28.1"
-    "@rollup/rollup-darwin-arm64" "4.28.1"
-    "@rollup/rollup-darwin-x64" "4.28.1"
-    "@rollup/rollup-freebsd-arm64" "4.28.1"
-    "@rollup/rollup-freebsd-x64" "4.28.1"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.28.1"
-    "@rollup/rollup-linux-arm-musleabihf" "4.28.1"
-    "@rollup/rollup-linux-arm64-gnu" "4.28.1"
-    "@rollup/rollup-linux-arm64-musl" "4.28.1"
-    "@rollup/rollup-linux-loongarch64-gnu" "4.28.1"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.28.1"
-    "@rollup/rollup-linux-riscv64-gnu" "4.28.1"
-    "@rollup/rollup-linux-s390x-gnu" "4.28.1"
-    "@rollup/rollup-linux-x64-gnu" "4.28.1"
-    "@rollup/rollup-linux-x64-musl" "4.28.1"
-    "@rollup/rollup-win32-arm64-msvc" "4.28.1"
-    "@rollup/rollup-win32-ia32-msvc" "4.28.1"
-    "@rollup/rollup-win32-x64-msvc" "4.28.1"
+    "@rollup/rollup-android-arm-eabi" "4.34.1"
+    "@rollup/rollup-android-arm64" "4.34.1"
+    "@rollup/rollup-darwin-arm64" "4.34.1"
+    "@rollup/rollup-darwin-x64" "4.34.1"
+    "@rollup/rollup-freebsd-arm64" "4.34.1"
+    "@rollup/rollup-freebsd-x64" "4.34.1"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.34.1"
+    "@rollup/rollup-linux-arm-musleabihf" "4.34.1"
+    "@rollup/rollup-linux-arm64-gnu" "4.34.1"
+    "@rollup/rollup-linux-arm64-musl" "4.34.1"
+    "@rollup/rollup-linux-loongarch64-gnu" "4.34.1"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.34.1"
+    "@rollup/rollup-linux-riscv64-gnu" "4.34.1"
+    "@rollup/rollup-linux-s390x-gnu" "4.34.1"
+    "@rollup/rollup-linux-x64-gnu" "4.34.1"
+    "@rollup/rollup-linux-x64-musl" "4.34.1"
+    "@rollup/rollup-win32-arm64-msvc" "4.34.1"
+    "@rollup/rollup-win32-ia32-msvc" "4.34.1"
+    "@rollup/rollup-win32-x64-msvc" "4.34.1"
     fsevents "~2.3.2"
 
 rrweb-cssom@^0.7.1:
@@ -4635,6 +4652,11 @@ rrweb-cssom@^0.7.1:
   resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz#c73451a484b86dd7cfb1e0b2898df4b703183e4b"
   integrity sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==
 
+rrweb-cssom@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz#3021d1b4352fbf3b614aaeed0bc0d5739abe0bc2"
+  integrity sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -4642,7 +4664,7 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-array-concat@^1.1.2, safe-array-concat@^1.1.3:
+safe-array-concat@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
   integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
@@ -4653,6 +4675,14 @@ safe-array-concat@^1.1.2, safe-array-concat@^1.1.3:
     has-symbols "^1.1.0"
     isarray "^2.0.5"
 
+safe-push-apply@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5"
+  integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==
+  dependencies:
+    es-errors "^1.3.0"
+    isarray "^2.0.5"
+
 safe-regex-test@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
@@ -4685,9 +4715,9 @@ semver@^6.3.1:
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.0.0, semver@^7.3.7, semver@^7.3.8:
-  version "7.6.3"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
-  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.0.tgz#9c6fe61d0c6f9fa9e26575162ee5a9180361b09c"
+  integrity sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==
 
 set-function-length@^1.2.2:
   version "1.2.2"
@@ -4711,6 +4741,15 @@ set-function-name@^2.0.2:
     functions-have-names "^1.2.3"
     has-property-descriptors "^1.0.2"
 
+set-proto@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e"
+  integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -4752,7 +4791,7 @@ side-channel-weakmap@^1.0.2:
     object-inspect "^1.13.3"
     side-channel-map "^1.0.1"
 
-side-channel@^1.0.6, side-channel@^1.1.0:
+side-channel@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
   integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
@@ -4796,9 +4835,9 @@ snake-case@^3.0.4:
     tslib "^2.0.3"
 
 sonner@^1.7.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/sonner/-/sonner-1.7.1.tgz#737110a3e6211d8d766442076f852ddde1725205"
-  integrity sha512-b6LHBfH32SoVasRFECrdY8p8s7hXPDn3OHUFbZZbiB1ctLS9Gdh6rpX2dVrpQA0kiL5jcRzDDldwwLkSKk3+QQ==
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/sonner/-/sonner-1.7.4.tgz#4c39820db86623800a17115c8970796aa862133a"
+  integrity sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==
 
 source-map-js@^1.2.1:
   version "1.2.1"
@@ -4862,23 +4901,24 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-string.prototype.matchall@^4.0.11:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a"
-  integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==
+string.prototype.matchall@^4.0.12:
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz#6c88740e49ad4956b1332a911e949583a275d4c0"
+  integrity sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==
   dependencies:
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     define-properties "^1.2.1"
-    es-abstract "^1.23.2"
+    es-abstract "^1.23.6"
     es-errors "^1.3.0"
     es-object-atoms "^1.0.0"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.7"
-    regexp.prototype.flags "^1.5.2"
+    get-intrinsic "^1.2.6"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    internal-slot "^1.1.0"
+    regexp.prototype.flags "^1.5.3"
     set-function-name "^2.0.2"
-    side-channel "^1.0.6"
+    side-channel "^1.1.0"
 
 string.prototype.repeat@^1.0.0:
   version "1.0.0"
@@ -4999,9 +5039,9 @@ symbol-tree@^3.2.4:
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 tailwind-merge@^2.5.5:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.5.tgz#98167859b856a2a6b8d2baf038ee171b9d814e39"
-  integrity sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.6.0.tgz#ac5fb7e227910c038d458f396b7400d93a3142d5"
+  integrity sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==
 
 tailwindcss-animate@^1.0.7:
   version "1.0.7"
@@ -5061,9 +5101,9 @@ tinybench@^2.9.0:
   integrity sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==
 
 tinyexec@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.1.tgz#0ab0daf93b43e2c211212396bdb836b468c97c98"
-  integrity sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
+  integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
 
 tinyglobby@^0.2.10:
   version "0.2.10"
@@ -5088,17 +5128,17 @@ tinyspy@^3.0.2:
   resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-3.0.2.tgz#86dd3cf3d737b15adcf17d7887c84a75201df20a"
   integrity sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==
 
-tldts-core@^6.1.68:
-  version "6.1.68"
-  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.68.tgz#65f683a1100b3de9385184572ad68c6b8c337442"
-  integrity sha512-85TdlS/DLW/gVdf2oyyzqp3ocS30WxjaL4la85EArl9cHUR/nizifKAJPziWewSZjDZS71U517/i6ciUeqtB5Q==
+tldts-core@^6.1.76:
+  version "6.1.76"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.76.tgz#1ea632bbf11b288645dd7e2f3fb9cb6fa41e6bd7"
+  integrity sha512-uzhJ02RaMzgQR3yPoeE65DrcHI6LoM4saUqXOt/b5hmb3+mc4YWpdSeAQqVqRUlQ14q8ZuLRWyBR1ictK1dzzg==
 
 tldts@^6.1.32:
-  version "6.1.68"
-  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.68.tgz#38e82b7ce9673c464c16c7952f007c3d7ab52b94"
-  integrity sha512-JKF17jROiYkjJPT73hUTEiTp2OBCf+kAlB+1novk8i6Q6dWjHsgEjw9VLiipV4KTJavazXhY1QUXyQFSem2T7w==
+  version "6.1.76"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.76.tgz#c8b60fba55ca78e1c228bead4f69d18731526079"
+  integrity sha512-6U2ti64/nppsDxQs9hw8ephA3nO6nSQvVVfxwRw8wLQPFtLI1cFI1a1eP22g+LUP+1TA2pKKjUTwWB+K2coqmQ==
   dependencies:
-    tldts-core "^6.1.68"
+    tldts-core "^6.1.76"
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -5113,9 +5153,9 @@ totalist@^3.0.0:
   integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
 tough-cookie@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.0.0.tgz#6b6518e2b5c070cf742d872ee0f4f92d69eac1af"
-  integrity sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.1.0.tgz#0667b0f2fbb5901fe6f226c3e0b710a9a4292f87"
+  integrity sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==
   dependencies:
     tldts "^6.1.32"
 
@@ -5193,16 +5233,16 @@ type-fest@^0.3.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
   integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
 
-typed-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
-  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
+typed-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
+  integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
   dependencies:
-    call-bind "^1.0.7"
+    call-bound "^1.0.3"
     es-errors "^1.3.0"
-    is-typed-array "^1.1.13"
+    is-typed-array "^1.1.14"
 
-typed-array-byte-length@^1.0.1:
+typed-array-byte-length@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce"
   integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==
@@ -5213,18 +5253,18 @@ typed-array-byte-length@^1.0.1:
     has-proto "^1.2.0"
     is-typed-array "^1.1.14"
 
-typed-array-byte-offset@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.3.tgz#3fa9f22567700cc86aaf86a1e7176f74b59600f2"
-  integrity sha512-GsvTyUHTriq6o/bHcTd0vM7OQ9JEdlvluu9YISaA7+KzDzPaIzEeDFNkTfhdE3MYcNhNi0vq/LlegYgIs5yPAw==
+typed-array-byte-offset@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355"
+  integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==
   dependencies:
     available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
     for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-proto "^1.0.3"
-    is-typed-array "^1.1.13"
-    reflect.getprototypeof "^1.0.6"
+    gopd "^1.2.0"
+    has-proto "^1.2.0"
+    is-typed-array "^1.1.15"
+    reflect.getprototypeof "^1.0.9"
 
 typed-array-length@^1.0.7:
   version "1.0.7"
@@ -5239,11 +5279,11 @@ typed-array-length@^1.0.7:
     reflect.getprototypeof "^1.0.6"
 
 typescript@^5.7.2:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
-  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.3.tgz#919b44a7dbb8583a9b856d162be24a54bf80073e"
+  integrity sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==
 
-unbox-primitive@^1.0.2:
+unbox-primitive@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"
   integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==
@@ -5259,12 +5299,12 @@ undici-types@~6.20.0:
   integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
 
 update-browserslist-db@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5"
-  integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz#97e9c96ab0ae7bcac08e9ae5151d26e6bc6b5580"
+  integrity sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==
   dependencies:
     escalade "^3.2.0"
-    picocolors "^1.1.0"
+    picocolors "^1.1.1"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -5327,9 +5367,9 @@ vite-plugin-svgr@^4.3.0:
     "@svgr/plugin-jsx" "^8.1.0"
 
 vite@^5.0.0:
-  version "5.4.11"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.11.tgz#3b415cd4aed781a356c1de5a9ebafb837715f6e5"
-  integrity sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==
+  version "5.4.14"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.14.tgz#ff8255edb02134df180dcfca1916c37a6abe8408"
+  integrity sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==
   dependencies:
     esbuild "^0.21.3"
     postcss "^8.4.43"
@@ -5338,11 +5378,11 @@ vite@^5.0.0:
     fsevents "~2.3.3"
 
 vite@^6.0.1:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-6.0.3.tgz#cc01f403e326a9fc1e064235df8a6de084c8a491"
-  integrity sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-6.0.11.tgz#224497e93e940b34c3357c9ebf2ec20803091ed8"
+  integrity sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==
   dependencies:
-    esbuild "^0.24.0"
+    esbuild "^0.24.2"
     postcss "^8.4.49"
     rollup "^4.23.0"
   optionalDependencies:
@@ -5417,7 +5457,7 @@ which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
     is-string "^1.1.1"
     is-symbol "^1.1.1"
 
-which-builtin-type@^1.2.0:
+which-builtin-type@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e"
   integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==
@@ -5446,15 +5486,16 @@ which-collection@^1.0.2:
     is-weakmap "^2.0.2"
     is-weakset "^2.0.3"
 
-which-typed-array@^1.1.16:
-  version "1.1.16"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.16.tgz#db4db429c4706feca2f01677a144278e4a8c216b"
-  integrity sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ==
+which-typed-array@^1.1.16, which-typed-array@^1.1.18:
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.18.tgz#df2389ebf3fbb246a71390e90730a9edb6ce17ad"
+  integrity sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==
   dependencies:
     available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
     for-each "^0.3.3"
-    gopd "^1.0.1"
+    gopd "^1.2.0"
     has-tostringtag "^1.0.2"
 
 which@^2.0.1:
@@ -5531,9 +5572,9 @@ yaml@^1.10.0:
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yaml@^2.3.4:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"
-  integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.7.0.tgz#aef9bb617a64c937a9a748803786ad8d3ffe1e98"
+  integrity sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==
 
 yocto-queue@^0.1.0:
   version "0.1.0"

From 4e4f9893838b821cf8853af2cb4948e6070b1991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Mon, 3 Feb 2025 16:24:31 +0000
Subject: [PATCH 23/31] Add database constraints for addresses, keywords, and
 intervention areas

- Added latitude and longitude range check constraints for addresses
- Implemented name length constraints for keywords and intervention areas
- Created new migration files to add these database-level validations
- Ensures data integrity by enforcing stricter input validation at the database level
---
 app/frontend/components/forms/MyInput.tsx     |  2 +-
 .../new/FundManagementSection.tsx             |  2 +-
 .../pages/contribution/new/OsblDocuments.tsx  |  3 +-
 .../pages/contribution/new/OsblLocations.tsx  |  5 +-
 .../pages/user/show/UserAvatarEdit.tsx        |  2 +-
 .../shared/MyAsyncCreatableSelect.tsx         | 72 +++++++++++--------
 .../components/shared/MyAsyncSelect.tsx       | 34 +++++++--
 app/frontend/types/types.ts                   |  5 ++
 app/models/intervention_area.rb               |  2 +-
 app/models/keyword.rb                         |  2 +-
 ...03140445_add_more_constraint_to_address.rb |  6 ++
 ...160027_add_check_constraint_to_keywords.rb |  5 ++
 ..._check_constraint_to_intervention_areas.rb |  5 ++
 db/schema.rb                                  |  6 +-
 14 files changed, 108 insertions(+), 43 deletions(-)
 create mode 100644 db/migrate/20250203140445_add_more_constraint_to_address.rb
 create mode 100644 db/migrate/20250203160027_add_check_constraint_to_keywords.rb
 create mode 100644 db/migrate/20250203160100_add_check_constraint_to_intervention_areas.rb

diff --git a/app/frontend/components/forms/MyInput.tsx b/app/frontend/components/forms/MyInput.tsx
index 30ecf37..5e36823 100644
--- a/app/frontend/components/forms/MyInput.tsx
+++ b/app/frontend/components/forms/MyInput.tsx
@@ -52,7 +52,7 @@ export default function MyInput ({
           {...props}
           ref={ref}
         />
-        {showResetButton && (onReset != null) && (
+        {showResetButton && (onReset !== undefined) && (
           <button
             type='button'
             onClick={onReset}
diff --git a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
index 0c9917d..e9d2a12 100644
--- a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
+++ b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
@@ -20,7 +20,7 @@ interface FundManagementSectionProps {
   items: FundRecord[]
   typeList: Array<{ value: string, label: string, group: string }>
   baseErrorPath: string
-  onUpdate: (items: FundRecord[]) => void
+  onUpdate: (items: Array<Partial<FundRecord>>) => void
   errors: Record<string, string>
   clearErrors: (path: string) => void
 }
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index 2a3a3d4..e65d882 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -8,6 +8,7 @@ import {
 } from '@/components/ui/sheet'
 import OsblDocumentSheet from './OsblDocumentSheet'
 import { DocumentTypeList } from '@/lib/constants'
+import { SelectOption } from '@/types/types'
 
 export default function OsblDocuments ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
   const documents = data.document_attachments_attributes ?? []
@@ -30,7 +31,7 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors, set
     }
 
     if (['rapport_activite', 'rapport_financier'].includes(document.type)) {
-      const documentType = DocumentTypeList.find(type => type.value === document.type) as { label: string }
+      const documentType = DocumentTypeList.find(type => type.value === document.type) as SelectOption
       return `${documentType.label} ${document.year as number}`
     }
 
diff --git a/app/frontend/components/pages/contribution/new/OsblLocations.tsx b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
index 6e06bea..4e6d85a 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocations.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
@@ -8,6 +8,7 @@ import {
 } from '@/components/ui/sheet'
 import OsblLocationSheet from './OsblLocationSheet'
 import { LocationTypeList } from '@/lib/constants'
+import { SelectOption } from '@/types/types'
 
 export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data' | 'setData'>): ReactElement {
   const locations = data.locations_attributes ?? []
@@ -28,8 +29,8 @@ export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data'
   function getLocationDisplayName (location: Location): string {
     if (location.name !== undefined) return location.name
 
-    const type = LocationTypeList.find(t => t.value === location.type)
-    return type?.label as string
+    const type = LocationTypeList.find(t => t.value === location.type) as SelectOption
+    return type.label
   }
 
   return (
diff --git a/app/frontend/components/pages/user/show/UserAvatarEdit.tsx b/app/frontend/components/pages/user/show/UserAvatarEdit.tsx
index 0ab4069..e603ed7 100644
--- a/app/frontend/components/pages/user/show/UserAvatarEdit.tsx
+++ b/app/frontend/components/pages/user/show/UserAvatarEdit.tsx
@@ -20,7 +20,7 @@ import { Pencil, Trash2 } from 'lucide-react'
 import { z } from 'zod'
 import MyFileInput from '@/components/shared/MyFileInput'
 
-const ALLOWED_CONTENT_TYPES = ['image/png', 'image/jpg', 'image/webp']
+const ALLOWED_CONTENT_TYPES = ['image/png', 'image/jpg', 'image/webp', 'image/jpeg']
 const MAX_PROFILE_PICTURE_SIZE = 1 * 1024 * 1024 // 1MB
 
 const profilePicSchema = z.object({
diff --git a/app/frontend/components/shared/MyAsyncCreatableSelect.tsx b/app/frontend/components/shared/MyAsyncCreatableSelect.tsx
index 39f2497..48b429c 100644
--- a/app/frontend/components/shared/MyAsyncCreatableSelect.tsx
+++ b/app/frontend/components/shared/MyAsyncCreatableSelect.tsx
@@ -2,12 +2,9 @@ import { ReactElement, useState, useCallback } from 'react'
 import AsyncCreatableSelect from 'react-select/async-creatable'
 import axios from 'axios'
 import debounce from 'lodash.debounce'
-
-interface Option {
-  readonly label: string
-  readonly value: string
-}
-
+import { SelectOption } from '@/types/types'
+import { MultiValue } from 'node_modules/react-select/dist/declarations/src/types'
+import { toast } from 'sonner'
 interface MyAsyncCreatableSelectProps {
   data: any
   setData: (key: string, value: any) => void
@@ -17,9 +14,14 @@ interface MyAsyncCreatableSelectProps {
   placeholder: string
 }
 
-const createOption = (data: { id: number, name: string }): Option => ({
+interface BackendData {
+  id: number
+  name: string
+}
+
+const createOption = (data: BackendData): SelectOption => ({
   label: data.name,
-  value: String(data.id)
+  value: data.id
 })
 
 export default function MyAsyncCreatableSelect ({
@@ -30,25 +32,35 @@ export default function MyAsyncCreatableSelect ({
   minInputLength = 3,
   placeholder
 }: MyAsyncCreatableSelectProps): ReactElement {
-  const [isLoading, setIsLoading] = useState(false)
-  const [value, setValue] = useState<Option[]>([])
+  const [value, setValue] = useState<MultiValue<SelectOption>>([])
+  const [options, setOptions] = useState<SelectOption[]>([])
 
-  const fetchOptions = async (inputValue: string): Promise<Option[]> => {
+  const fetchOptions = async (inputValue: string): Promise<SelectOption[]> => {
     if (inputValue.length < minInputLength) return []
 
-    const response = await fetch(`/${resource}?query=${encodeURIComponent(inputValue)}`)
-    const data = await response.json()
-    return data.map((data: { id: number, name: string }) => createOption(data))
+    try {
+      const response = await fetch(`/${resource}?query=${encodeURIComponent(inputValue)}`)
+      if (!response.ok) {
+        throw new Error('Network response was not ok')
+      }
+      const data = await response.json() as BackendData[]
+      const options = data.map((data) => createOption(data))
+      setOptions(options)
+      return options
+    } catch (error) {
+      console.error(error)
+      return []
+    }
   }
 
   const debouncedFetchOptions = useCallback(
-    debounce((inputValue: string, callback: (options: Option[]) => void) => {
+    debounce((inputValue: string, callback: (options: SelectOption[]) => void) => {
       void fetchOptions(inputValue).then(callback)
     }, 300),
     []
   )
 
-  const promiseOptions = async (inputValue: string): Promise<Option[]> => {
+  const promiseOptions = async (inputValue: string): Promise<SelectOption[]> => {
     return await new Promise((resolve) => {
       debouncedFetchOptions(inputValue, resolve)
     })
@@ -56,7 +68,6 @@ export default function MyAsyncCreatableSelect ({
 
   const handleCreate = (inputValue: string): void => {
     void (async () => {
-      setIsLoading(true)
       try {
         const csrfToken = document.querySelector('meta[name="csrf-token"]')?.getAttribute('content')
         const response = await axios.post(
@@ -68,20 +79,24 @@ export default function MyAsyncCreatableSelect ({
             }
           }
         )
+        if (response.status !== 201) {
+          throw new Error('Network response was not 201')
+        }
         const newOption = createOption(response.data)
         setValue((prev) => [...prev, newOption])
         setData(attributeName, [...(data[attributeName] ?? []), {
           [`${resource.slice(0, -1)}_id`]: newOption.value
-        }] as any)
-      } finally {
-        setIsLoading(false)
+        }])
+      } catch (error) {
+        console.log(error)
+        toast.error(`Une erreur est survenue lors de la création de ${inputValue}`)
       }
     })()
   }
 
-  const isValidNewOption = (inputValue: string): boolean => {
+  function isValidNewOption (inputValue: string): boolean {
     const normalizedInput = inputValue.trim().toLowerCase().replace(/^./, char => char.toUpperCase())
-    return inputValue.length >= 3 && inputValue.length <= 30 && !value.some(option => option.label === normalizedInput)
+    return inputValue.length >= 3 && inputValue.length <= 100 && value.some(option => option.label === normalizedInput) === false && !options.some(option => option.label === normalizedInput)
   }
 
   return (
@@ -90,15 +105,15 @@ export default function MyAsyncCreatableSelect ({
       // cacheOptions
       value={value}
       loadOptions={promiseOptions}
+      options={options}
+      isValidNewOption={isValidNewOption}
       onCreateOption={handleCreate}
       onChange={(value) => {
-        setValue(value as Option[])
-        setData(attributeName, (value as Option[]).map(option => ({
+        setValue(value)
+        setData(attributeName, value.map((option) => ({
           [`${resource.slice(0, -1)}_id`]: option.value
-        })) as any)
+        })))
       }}
-      isDisabled={isLoading}
-      isLoading={isLoading}
       styles={{
         control: (base, state) => ({
           ...base,
@@ -132,8 +147,7 @@ export default function MyAsyncCreatableSelect ({
         })
       }}
       placeholder={placeholder}
-      formatCreateLabel={(inputValue: string) => `Ajouter "${inputValue}"`}
-      isValidNewOption={isValidNewOption}
+      formatCreateLabel={(inputValue) => `Ajouter "${inputValue}"`}
       loadingMessage={() => 'Recherche...'}
       noOptionsMessage={() => 'Aucune suggestion'}
     />
diff --git a/app/frontend/components/shared/MyAsyncSelect.tsx b/app/frontend/components/shared/MyAsyncSelect.tsx
index f88798c..726a7c5 100644
--- a/app/frontend/components/shared/MyAsyncSelect.tsx
+++ b/app/frontend/components/shared/MyAsyncSelect.tsx
@@ -3,6 +3,23 @@ import AsyncSelect from 'react-select/async'
 import debounce from 'lodash.debounce'
 import { Address } from '@/pages/Contribution/types'
 
+interface AddressApiResponse {
+  features: AddressFeature[]
+}
+
+interface AddressFeature {
+  properties: {
+    label: string
+    housenumber: string
+    street: string
+    postcode: string
+    city: string
+  }
+  geometry: {
+    coordinates: [number, number]
+  }
+}
+
 interface Option {
   readonly label: string
   readonly value: Address
@@ -17,7 +34,7 @@ interface MyAsyncCreatableSelectProps {
   value: string
 }
 
-const createOption = (feature: any): Option => ({
+const createOption = (feature: AddressFeature): Option => ({
   label: feature.properties.label,
   value: {
     street_number: feature.properties.housenumber,
@@ -38,12 +55,19 @@ export default function MyAsyncCreatableSelect ({
   value
 }: MyAsyncCreatableSelectProps): ReactElement {
   const fetchOptions = async (inputValue: string): Promise<Option[]> => {
-    console.log('inputValue', inputValue)
     if (inputValue.trim().length < minInputLength) return []
 
-    const response = await fetch(`https://api-adresse.data.gouv.fr/search/?q=${inputValue}`)
-    const data = await response.json()
-    return data.features.map((feature: any) => createOption(feature))
+    try {
+      const response = await fetch(`https://api-adresse.data.gouv.fr/search/?q=${inputValue}`)
+      if (!response.ok) {
+        throw new Error(`Failed to fetch addresses: ${inputValue} / ${response.statusText}`)
+      }
+      const data = await response.json() as AddressApiResponse
+      return data.features.map((feature: AddressFeature) => createOption(feature))
+    } catch (error) {
+      console.error(error)
+      return []
+    }
   }
 
   const debouncedFetchOptions = useCallback(
diff --git a/app/frontend/types/types.ts b/app/frontend/types/types.ts
index db47f37..a4a0fc4 100644
--- a/app/frontend/types/types.ts
+++ b/app/frontend/types/types.ts
@@ -4,3 +4,8 @@ export interface CurrentUserType {
 }
 
 export type ProfilePictureUrlType = string | null
+
+export interface SelectOption {
+  readonly label: string
+  readonly value: any
+}
diff --git a/app/models/intervention_area.rb b/app/models/intervention_area.rb
index 23f2589..5975449 100644
--- a/app/models/intervention_area.rb
+++ b/app/models/intervention_area.rb
@@ -2,7 +2,7 @@ class InterventionArea < ApplicationRecord
   has_many :osbls_intervention_areas, dependent: :destroy # join table
   has_many :osbls, through: :osbls_intervention_areas
 
-  # validates :name, presence: true, uniqueness: true, length: {minimum: 3, maximum: 30}
+  # validates :name, presence: true, uniqueness: true, length: {minimum: 3, maximum: 100}
 
   normalizes :name, with: ->(name) { name.strip.downcase.capitalize }
 end
diff --git a/app/models/keyword.rb b/app/models/keyword.rb
index 3083663..5532f54 100644
--- a/app/models/keyword.rb
+++ b/app/models/keyword.rb
@@ -2,7 +2,7 @@ class Keyword < ApplicationRecord
   has_many :osbls_keywords, dependent: :destroy # join table
   has_many :osbls, through: :osbls_keywords
 
-  # validates :name, presence: true, uniqueness: true, length: {minimum: 3, maximum: 30}
+  # validates :name, presence: true, uniqueness: true, length: {minimum: 3, maximum: 100}
 
   normalizes :name, with: ->(name) { name.strip.downcase.capitalize }
 end
diff --git a/db/migrate/20250203140445_add_more_constraint_to_address.rb b/db/migrate/20250203140445_add_more_constraint_to_address.rb
new file mode 100644
index 0000000..01f593c
--- /dev/null
+++ b/db/migrate/20250203140445_add_more_constraint_to_address.rb
@@ -0,0 +1,6 @@
+class AddMoreConstraintToAddress < ActiveRecord::Migration[8.0]
+  def change
+    add_check_constraint :addresses, "latitude >= -90 AND latitude <= 90", name: "check_latitude_range"
+    add_check_constraint :addresses, "longitude >= -180 AND longitude <= 180", name: "check_longitude_range"
+  end
+end
diff --git a/db/migrate/20250203160027_add_check_constraint_to_keywords.rb b/db/migrate/20250203160027_add_check_constraint_to_keywords.rb
new file mode 100644
index 0000000..619b2ba
--- /dev/null
+++ b/db/migrate/20250203160027_add_check_constraint_to_keywords.rb
@@ -0,0 +1,5 @@
+class AddCheckConstraintToKeywords < ActiveRecord::Migration[8.0]
+  def change
+    add_check_constraint :keywords, "length(name) >= 3 AND length(name) <= 100", name: "keywords_name_length_check"
+  end
+end
diff --git a/db/migrate/20250203160100_add_check_constraint_to_intervention_areas.rb b/db/migrate/20250203160100_add_check_constraint_to_intervention_areas.rb
new file mode 100644
index 0000000..6cc3d61
--- /dev/null
+++ b/db/migrate/20250203160100_add_check_constraint_to_intervention_areas.rb
@@ -0,0 +1,5 @@
+class AddCheckConstraintToInterventionAreas < ActiveRecord::Migration[8.0]
+  def change
+    add_check_constraint :intervention_areas, "length(name) >= 3 AND length(name) <= 100", name: "intervention_areas_name_length_check"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7287ddd..a554477 100644
--- 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[8.0].define(version: 2025_02_03_115228) do
+ActiveRecord::Schema[8.0].define(version: 2025_02_03_160100) do
   create_table "accounts", force: :cascade do |t|
   end
 
@@ -57,6 +57,8 @@
     t.datetime "updated_at", null: false
     t.index ["addressable_type", "addressable_id"], name: "index_addresses_on_addressable_type_and_addressable_id", unique: true
     t.index ["latitude", "longitude"], name: "index_addresses_on_latitude_and_longitude", where: "addressable_type = 'Location'"
+    t.check_constraint "latitude >= -90 AND latitude <= 90", name: "check_latitude_range"
+    t.check_constraint "longitude >= -180 AND longitude <= 180", name: "check_longitude_range"
   end
 
   create_table "annual_finances", force: :cascade do |t|
@@ -144,6 +146,7 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["name"], name: "index_intervention_areas_on_name", unique: true
+    t.check_constraint "length(name) >= 3 AND length(name) <= 100", name: "intervention_areas_name_length_check"
   end
 
   create_table "keywords", force: :cascade do |t|
@@ -151,6 +154,7 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["name"], name: "index_keywords_on_name", unique: true
+    t.check_constraint "length(name) >= 3 AND length(name) <= 100", name: "keywords_name_length_check"
   end
 
   create_table "labels", force: :cascade do |t|

From 50e8901477ad312824221b588696a289ffd71e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Tue, 4 Feb 2025 11:16:19 +0000
Subject: [PATCH 24/31] Enhance document and location models with improved
 validations and test coverage

- Updated MyAsyncCreatableSelect to fix option validation logic
- Modified SelectOption type to use number for value
- Updated Document model with year validation and commented out associations
- Added dependent destroy for Location's address
- Created comprehensive test suites for Document, Location, InterventionArea, and Keyword models
- Added sample PDF fixture for testing
- Improved database constraints and validation checks
- Updated foreign key constraint for locations to cascade on delete
---
 .../shared/MyAsyncCreatableSelect.tsx         |   4 +-
 app/frontend/types/types.ts                   |   2 +-
 app/models/document.rb                        |  10 +-
 app/models/location.rb                        |   7 +-
 ...4104735_modify_foreign_key_on_locations.rb |   6 +
 db/schema.rb                                  |   4 +-
 spec/factories/create_documents.rb            |   8 --
 spec/factories/document.rb                    |   6 +
 spec/factories/locations.rb                   |  33 ++++-
 spec/fixtures/files/sample.pdf                | Bin 0 -> 9212 bytes
 spec/models/document_spec.rb                  | 125 ++++++++++++++++++
 spec/models/intervention_area.rb              |  56 ++++++++
 spec/models/keyword_spec.rb                   |  56 ++++++++
 spec/models/location_spec.rb                  |  75 ++++++++++-
 spec/rails_helper.rb                          |   1 +
 spec/support/factory_bot.rb                   |  11 ++
 16 files changed, 379 insertions(+), 25 deletions(-)
 create mode 100644 db/migrate/20250204104735_modify_foreign_key_on_locations.rb
 delete mode 100644 spec/factories/create_documents.rb
 create mode 100644 spec/factories/document.rb
 create mode 100644 spec/fixtures/files/sample.pdf
 create mode 100644 spec/models/document_spec.rb
 create mode 100644 spec/models/intervention_area.rb
 create mode 100644 spec/models/keyword_spec.rb

diff --git a/app/frontend/components/shared/MyAsyncCreatableSelect.tsx b/app/frontend/components/shared/MyAsyncCreatableSelect.tsx
index 48b429c..828a088 100644
--- a/app/frontend/components/shared/MyAsyncCreatableSelect.tsx
+++ b/app/frontend/components/shared/MyAsyncCreatableSelect.tsx
@@ -3,7 +3,7 @@ import AsyncCreatableSelect from 'react-select/async-creatable'
 import axios from 'axios'
 import debounce from 'lodash.debounce'
 import { SelectOption } from '@/types/types'
-import { MultiValue } from 'node_modules/react-select/dist/declarations/src/types'
+import { MultiValue } from 'react-select'
 import { toast } from 'sonner'
 interface MyAsyncCreatableSelectProps {
   data: any
@@ -96,7 +96,7 @@ export default function MyAsyncCreatableSelect ({
 
   function isValidNewOption (inputValue: string): boolean {
     const normalizedInput = inputValue.trim().toLowerCase().replace(/^./, char => char.toUpperCase())
-    return inputValue.length >= 3 && inputValue.length <= 100 && value.some(option => option.label === normalizedInput) === false && !options.some(option => option.label === normalizedInput)
+    return inputValue.length >= 3 && inputValue.length <= 100 && !value.some(option => option.label === normalizedInput) && !options.some(option => option.label === normalizedInput)
   }
 
   return (
diff --git a/app/frontend/types/types.ts b/app/frontend/types/types.ts
index a4a0fc4..545d9f9 100644
--- a/app/frontend/types/types.ts
+++ b/app/frontend/types/types.ts
@@ -7,5 +7,5 @@ export type ProfilePictureUrlType = string | null
 
 export interface SelectOption {
   readonly label: string
-  readonly value: any
+  readonly value: number
 }
diff --git a/app/models/document.rb b/app/models/document.rb
index 42dda88..f72c8d5 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -6,7 +6,7 @@ class Document < ApplicationRecord
   has_one_attached :file
 
   has_many :document_attachments, dependent: :destroy # join table
-  has_many :attachables, through: :document_attachments
+  # has_many :attachables, through: :document_attachments, source_type: "Osbl"
 
   enum :type, {
     statuts: 0,
@@ -17,12 +17,14 @@ class Document < ApplicationRecord
   }.freeze
 
   validates :file, presence: true
-  # validates :type, presence: true
-  # validates :year, presence: true, if: -> { type.in?(%i[rapport_activite rapport_financier]) }
-  # validates :name, presence: true, if: -> { type.in?(%i[proces_verbal autre]) }
   validates_attachment(
     name: :file,
     max_size: 5.megabytes,
     content_types: %w[application/pdf]
   )
+  validates :year, numericality: {less_than_or_equal_to: Time.current.year}, if: -> { year.present? }
+  # validates :year, numericality: {greater_than: 999}, if: -> { year.present? }
+  # validates :type, presence: true
+  # validates :year, presence: true, if: -> { type.in?(%i[rapport_activite rapport_financier]) }
+  # validates :name, presence: true, if: -> { type.in?(%i[proces_verbal autre]) }
 end
diff --git a/app/models/location.rb b/app/models/location.rb
index acacb91..bbf969e 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -2,7 +2,7 @@ class Location < ApplicationRecord
   self.inheritance_column = nil
 
   belongs_to :osbl
-  has_one :address, as: :addressable
+  has_one :address, as: :addressable, dependent: :destroy
 
   enum :type, {
     siege_social: 0,
@@ -13,8 +13,9 @@ class Location < ApplicationRecord
 
   validates :address, presence: true
   # validates :type, presence: true
-  # validates :name, uniqueness: {scope: :osbl_id}, if: -> { type == "siege_social" }
-  validates :name, presence: true, if: -> { type.in?(%i[antenne_locale lieu_d_activite autre]) }
+  # validates :name, exclusion: {in: [""]}, allow_nil: true
+  # validates :name, presence: true, if: -> { type.in?(%i[antenne_locale lieu_d_activite autre]) }
+  # validates :osbl, uniqueness: {scope: :type, if: -> { type == "siege_social" }}
 
   accepts_nested_attributes_for :address
 end
diff --git a/db/migrate/20250204104735_modify_foreign_key_on_locations.rb b/db/migrate/20250204104735_modify_foreign_key_on_locations.rb
new file mode 100644
index 0000000..b4d33fb
--- /dev/null
+++ b/db/migrate/20250204104735_modify_foreign_key_on_locations.rb
@@ -0,0 +1,6 @@
+class ModifyForeignKeyOnLocations < ActiveRecord::Migration[8.0]
+  def change
+    remove_foreign_key :locations, :osbls
+    add_foreign_key :locations, :osbls, on_delete: :cascade
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a554477..df5265a 100644
--- 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[8.0].define(version: 2025_02_03_160100) do
+ActiveRecord::Schema[8.0].define(version: 2025_02_04_104735) do
   create_table "accounts", force: :cascade do |t|
   end
 
@@ -264,7 +264,7 @@
   add_foreign_key "document_attachments", "documents"
   add_foreign_key "fund_allocations", "annual_finances"
   add_foreign_key "fund_sources", "annual_finances"
-  add_foreign_key "locations", "osbls"
+  add_foreign_key "locations", "osbls", on_delete: :cascade
   add_foreign_key "osbls_causes", "causes", on_delete: :cascade
   add_foreign_key "osbls_causes", "osbls", on_delete: :cascade
   add_foreign_key "osbls_intervention_areas", "intervention_areas", on_delete: :cascade
diff --git a/spec/factories/create_documents.rb b/spec/factories/create_documents.rb
deleted file mode 100644
index e2f44fa..0000000
--- a/spec/factories/create_documents.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :create_document do
-    contribution { nil }
-    osbl { nil }
-    type { 0 }
-    # name { "Document" }
-  end
-end
diff --git a/spec/factories/document.rb b/spec/factories/document.rb
new file mode 100644
index 0000000..fd81dee
--- /dev/null
+++ b/spec/factories/document.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :document do
+    type { "statuts" }
+    file { fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf") }
+  end
+end
diff --git a/spec/factories/locations.rb b/spec/factories/locations.rb
index a56d1ca..fde56e9 100644
--- a/spec/factories/locations.rb
+++ b/spec/factories/locations.rb
@@ -1,8 +1,33 @@
 FactoryBot.define do
   factory :location do
-    type { 1 }
-    name { "MyString" }
-    description { "MyText" }
-    website { "MyString" }
+    association :osbl
+    type { :siege_social }
+
+    after(:build) do |location|
+      location.address ||= build(:address, addressable: location)
+    end
+
+    trait :with_name do
+      name { "Location name" }
+    end
+
+    trait :siege_social do
+      type { :siege_social }
+    end
+
+    trait :antenne_locale do
+      type { :antenne_locale }
+      with_name
+    end
+
+    trait :lieu_d_activite do
+      type { :lieu_d_activite }
+      with_name
+    end
+
+    trait :autre do
+      type { :autre }
+      with_name
+    end
   end
 end
diff --git a/spec/fixtures/files/sample.pdf b/spec/fixtures/files/sample.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..418f9ee5aa9d436da54ef70563178e05f7d15649
GIT binary patch
literal 9212
zcmb7q2{@GP_kUSZlf5h<M)q|!W|4g-TXxAZ7>sQ&V;5zM$eJa)gpeYXUDjkto2*%i
zC?R|H|1<Tz-|xHpe%J5%KiBoleLv?p_vb$6+@EuX>x_Vbs=5SB5(N_IxZly#@w6ik
z1P4RG1UnaytSm$a=ix+h1|tB8Aw(VTM#6bR)ZMTooGQ+q;DD2t2N6l$IIKI!KU*Tc
z4b%>0R9)G*B^RVAh=0d#0Mg}XQ(>@sPOLKBFsMAce~m2(dyc!BlCtzGpK<HbAg*EQ
z><j)$s<4Pvhw#*Hi?!OcmNzvYyEYZed-jVY_iA3fLq4nEc!vj*thf%{KWs5pogCNH
ze`NyysfZKwd4HcSwJ0)5smrY6-i>e##f0ci*-B=jBPv_)6<vzTa_^<t3$I$4oOUT7
z`eGkJI1h(Ej0I+7|3GB7$P*Y6PJa7KhWeND=>Ns}KY{}T!=NZ>_+LXY7Z6I~97;WE
zL?jE0KM~luDXx(uwbog6-XhI?l$T!X;ZMKHGksM#+Q;o)rn#MR(@JtEIfe5|r`X9X
zrg9c3z+6g$%vDNRbw`AtaHDp<1$*H|uiYCDj*kWozO7c!*47qjyeY6Yx$Sr#jdvbg
z9zAN|8|-i1{unfMEiY&#D=AxRKqER{oH^IO<cqSFU#%86Vqb#S09l*J<V$Zh8NDIO
zJ29mz<n)DmFU3+Gthy=7n>p{~n4lLLynOn_$v0}JL@?)XN3`1yFf^PT%~$5JEEHxR
z<Q@XIQts%!sqZfd%`fxNkdNMvAMG?2c9AoU*~iaD*1s-Eu{3VxT7wwMb7#ixzu?(d
zW8ZmpN<>fS%vYTZE*n0F>V$Y9qomo__9>4q<nc!+#K503$dNQz4RSx5e51JiwDN(u
znW6UK(Z%;dngZtxR`>&x9fr&455-FbOHNt@rF)w_8ZD?zI7Ah`?tP~5(r7loJ8VB=
zqKtNfi6<s0;Lbw@Yr!cs5xL-5a6pv!wXpH(S=so$K&7=~Rxf=Rcy{0zjl;Dvi(rTN
zi5peH;rr}YdTi`V`Fr;A1@Z(Q-y7b({B%3;5&DYiySQv?p=+_hk&Ss1oz3C>A~Nmu
z7|MXi>?oB5O!%T~lFe%TlxHAM{h7yw{MxLEjyD76UnuZKy0*5PeAM!|(5mm7GU~$$
zY5yF|^o0;78=ukA@31_P?|8lS_FgEL-wxJ+n;+pHb!_-m&a_`Bh4Rr-IFFFP>*vGC
z?Tfd)-Bt4rqFt@_u1~4n>iIcVl<ns3xnveB%xR|k09oc&X1(W5JS+PkQ^obkR`vJu
zqm_YqyCVG`-bMKD5#-r_BqZEk=2@j%8NVpy|1S5&VasIh@}rNFudFWmP1H5pkJDL>
zTV{ULebl|%Fi@M-$#L`JRjky)rAxPBLA99_wYTQ4OM#fFf&^Mjp<9ui)-b7Qm$QKb
zZ@A6uACIuziAV&`=+;_rvD;pN@t;ys8jE}OTE@#@?cSFS=}c>jcUi+!;g#Xv^Npgz
zHUblbvu}p;h1}QQh(4~=(6i7SXX@^#a|%vRbEWcubB*%j_s<xuzR}smRbIXNUcy)7
z*45h%^$*xz+TFh&2&<>vY`o5N_1el7F5dalLQUP<Ndxn>+dqSX#OXDj57lXivILDV
zesz>A3iHtFxC(-C$kf}Idt9~H-4CF=ODp4pg>f}>K~{NdtUd*$r!A+%>6I#dPvVGg
zw(m~WxUXJSV&-l5IDBt?o!0s;Grv!T(%G~ST~ExXF2BcV5ofiODrSZwl9`7k+Co~x
zxzpr31M#K$XLr-WE)}f1#-`k}WlT@=X()1lwCe_kki0^cBKIT=r{*b>dD$bEj^n;w
z+oLI3OUgQ6HX9dGRS|A$)q7Jl@Co|GCpb?^hmn<vhRGK#OuL=8ovh_>zl*80|Fpx~
zHLlf$oZ~U4-zKF_XwIR}TlC+a9SFbh#n<zFD}SlWc0`x8>i%J34LWAXhf_DsIZ<1o
z2HjZ%FMK^i54Ad8ICdufRB|99EW&h=uF~Vd%j6rdBA(u7v8>s))m1tRjBn^R--&IV
zNNtULaPIuclN;BKBqLz0vr9_toQCiZjT7J1V+|P3ur6X>-kGp7EMsh38!f_acB>!s
ztHM%58w8lM4IlFRK^Dad{6t3hZYo}j;X5QS4~~8F&a%bK^SblDR!P<UXpYMYO5dNs
zzvQlos9GteZtda?pv;)LzK}rWJj$y~SI%n6b=*|U{;=(`m*;GLXclv{tm4N~m!QX9
ze7h1)IK>sUEX!H;vm+Vu?;WRB=3%xQrf<^Dydsf%f+|}JKjXW^xNpmgai>*rVGQJx
zyTv{C*t@KF?!8>%x~ZbY#ydG%FDkCJ8JAg4a|1#3(-PD^U{u8TS$gLx`9_+IXghqd
z8sukJG&^Hq*zD%c*D+yPS{yZPRDE)JRe7C{Ew4`JjSfsyn8+qZVzDiC_gtP6&7*UZ
zDV(fnHJ_#zn0+Kg=})P*Xk4g?XdaJaeaiMaiq&g{g?8la!-Dj*X6v#3H%sqh>V%s3
z<9Gd_?i2dUHC%<n)FdT#u0?O@Pai(iinp&O;UHW*atlYr$EQvwB<$pUzP?EBOPz+A
z$vDcQkeAB1Q)no9KTh%7H@pJ;N-<%lI6YAfS!PGkt)D~F?l6{3+w(p^FYVlH46-_=
zDWZcZRrb>WzTBWV6&I`19gkDyU1u$AzCtK4dy(pyhReS<Z?Hzu@`9BDQxeWxDPA}f
zA}G%g+ZSma`>-mS!y426`LkIux59!#Nk>U_q?Ok_$w1rsjKU1J;D;L^>=og>Q>y7<
z$H&|{BTCy85)~&R@yvc$FttpnW*kYY%Z@G8&oH1w9Fp%%mnNKXY=8~6Eq}_Hdg8mE
z?IjTB;n)+0I!y%2b6woa9|*RP);g~xzM;LJ^ko7#2Sok!wYthEH{<j)Q`0fjhX>yl
zUFg~r-S1je7%he!Z|1laP&;<j1F1{ZUuOHfKiy1^s<-de`;M1^<_~W=$Wbk}Su&Jw
z{y?XI7wwq~xI?Zmi0QoTH#cM$pR(<U3asnA%ILV`D3^_Gap<!g_4@f^##q!xc#tcN
z+CNcG2<9h~(+z)%_0{KUFe#Q<Jz;WQJz*b@k9s<w2MxUPEDg~fai`(nguPXx3e?2(
zth1YeMS=JGwW+}Gi-e}l&eEP(!qqD>2enS}$UM0|wI3||ZH=v~OWz+4Yx>3=C0tCl
z*tGjV`n22^YWZV&a7?01VdVAUoDf^?nEB!6XULJjL0SjX)L3IM&yi@$B7tA1iKhJc
z24_v`u6B7v=1+=Ummukq&*kMlIGmtOet*7E0u`y4g;NuWwhvE1n%5}3J)y+;(@oK>
z@-)GkQ)*nX@<!W<^bBs%xkQ8KZ7Me$<Sx9vVKAHc;9=!)$)l)VLq=C5=lIh=Dtm$V
zXN_gXkl`-#RtU@1k%|2wN<#BiPC7X4z+37#!$%4QNlTeIF|kQULLl3Fo|e3vNrsZV
zkhKYsT{?y-;!bF1tp~r@<VCH3`g-${cNx;A<J~ScwuLQR=Tb)5gyAM>1%iYTo@qM$
zvFY=iO?H&D>bP)vhZg7XIJ$Nud$m#m-I!bD%M+}~xCfq#FeU!U8YS*WP5U2wSl|W5
zn%vnPC*zX9C%))02*`5R>&Sdae<>N!ZH#|dMzZy(ac6av0^LrfkPABU->VwD|K!;e
z1|ITbx$()f^YXMZ@*^Xwk$aK~hD+Wi#KSkI7U#UR*OY5dSAFfY^H)Ehs(Nm^lF+Lo
zIB8cZ3Nf@mWr`26+T=GR8{aYeNfBIcZS?K*S=Z-w)Tu1;mF;;~W{9Re=DcpyB_>Hz
zhw&^egh;c8KblxtdZax4J#z+zGxi-FjoM}(&&@8l_JiawJ6m}O4gD)Kvkj$V4=ZEv
zjAEYY4=Y_FQ5BxupjcDQD{ZdSZJ-lknsL(5W*@7Vx{^n2*A5mo)lU|O3u9n?BFRDN
zxcgV#S_{s**3_06KI{lSYu;ug(yO)eLMZp=xAZOF+B%oai{tXU3$+iwg-lKv4sU*O
z*;({67Ua1ox3zkcKE3b80s8uZe@5tCb4`i6>%JVdwY8#3CFQ28KYi{OKXBx?eI&(!
zvUBBFQg_oWOmdFZ;Yfw#m-45!9D|8}Xj47!zj!Rhl40JDn<KzNBV^u!P5$6@vf;PV
zM~V+&PnW{<oJ)L)XsWJ>Icry)$0OSPc!E6Tvn2E-j=Tr&YUpoFo#n0=-J(itT*>jz
zcPdK_-PsN~T9X@kq#^?4X|P8<4n&h;gARRQu12K{T>_1Fw`Sz8ewP2Pa^_T^ANx?3
zU~Osd!=XJ2nTj^!HnTV?|1+=-$;an12f!I^wo#WH{om0#^;bHdxTD}2bqXQ8lf2IF
zN7twS$m~j{tJex+oVbK~CTpAd4a;wI`z>kJG}Wm6#e|iM#Bici%E9ze$Wp;*ye{33
zzC4?!P6~m&Ik!WOIO#cDyT%%`FKt@H)lONO8DA+Ancoqu);4>%P7RXo+65`c@g27d
zoS;oUCo?czjQyC|tMU1A;<E6fvwIP5sVnjsXV;dVIKvgNIQPUSTN}?$@fZ1W6!vFs
z4~%Pc4Vv6{th;IDqwuqBWUkTI@0@Sel3Q!>h}_K)7OX17Um<pZNm^;6Ql$0-{lz;7
zUfbx&vU9<-3g?<kqNYHx%$H?fUf0Rw?U}x#>k*tC6RdMbBloI1q(l+fu}C2Gryj@+
z>+djMO=p9m8Bb)gr9_!pC<%07#g4A}PVXt~z8McaN|_H`nQWX-2;L&b{xJQJaWDsw
zKisxCSQxZ1KPXWMiVSI^d3)Vf_7>VWk?C>YgE!ap%<!U6=EAm~)Uw;MW?1N*pA;vW
z)y*PGMa#0GH$GBXpXpick<-a)|J;@f{bI<k5YX9>8Ro<3!m|8yqVUyH#Zk#7L$#Gg
zyrRWS{IK7T$Bv&_-_1Rmkd&DUjOEIrCX#L_#Gczt_6xg{`oK667ir??Q(ww8{{Ft%
zO!?HIVock8vChoLvK_CjUf%dv)j%KG&YU)wa;L*4?WChQ!}=~wPwH(^o9pLyZqoR|
zE!kZCc1aZ{c1IS_>vu;X*XK32*v1aoWFXf#-10BF&L7r~ZLZo6Jt}CRe=uFVidPz5
z;J=^Gu}Zix-{h)p)z*ER-q0o?C?kHm=Bd;Ug~V>)3-!WRbEF*#-{$Hk4f*+%m3E=|
zuMISK9@TElG)&*1<R1BULzf#GkpG;LCvf^aL+}*k)YkJ9ZvRfo6z*erG=Z|O`!_^o
z^VbwN4E0t67#w7$Hx)TKyQ>&vf27fv%7S4$dFzTJg>{KOw3u3y+>cu{EnjY==q&j%
zOe`GdMZG`<gdw<32HJ|FG^neCZ(4-Bp^Qa057&E4w7X4Vk9#s3X+HVtW!g+rqaCXA
zFo@ZzHGrO{C0_a4tsR*nF$nDr8_nDR@Ak6i9Lsv|IAz7R4=x7Qyq%ebdh0QSv)97)
zgM#KOf~FSgNm3UNcMzO`K^Mht3q7&gPDt2Wkx!Dlu6y|vP0skZOt#f%-uxu|l}oI)
zv8CU<jSR(yzM-9T`lorACn`-5KE`TXv)n7ux{pQ0%HeD#EJM*II2K%sVq}r(4{B{4
z)7Wk}vjLt~wk3Tn@bSsm3ye%MnQG=N*vM5Srl!ROz13d6ybI|KWw2SfuVs_@gKgeL
zGpk<aZ86e5g5|VKJsH!;&4s1>xu@A9>-*&j!An0#Z7CKjOp?L#R_l8d&#v{`hfh?N
zt`>#{LH3gH`Mj>ajRX5FsR}+<yM?5;2H55GTW&5^2puP6sTfriP(7=Rk`SP8DeL`m
z+PsW580Nv;g!ekl|4h;I^v|c)E2(ooQk=20^*=rPfjH+*mG|YmnRSju=x4rQqE%xF
zDBPVuR5{}}lyz#k)&!ZmH@P;vclcm*2>$b{f&xqQ#M@mBA*Ys4lW%i5&P_G0%!Ehh
zY^@7b;Esa*28~{fJ&eySZ5foc4ZZeiY4PjGvx3^vy<_7v(3?Xg+QYq^f*Th@bic2y
zY=#c4fAM>?&yjUr^g%c3(yqOHN%U*I&plho`g5t%nR%X@)aN4}FeGyBoarpN&^aKd
zB9p}ZoX9h*Bx>-K0Y~TmEdNnTgZfyT<xBSUA1^9T<$h+Z3!U*>-7dRj95OWZAhh66
zt&P;?H{urf_STfdoT${aALT?-ed~1VZMcj}xW9Zc<<8Gz(hR~<8d45d3Ic*{vW%Qr
zzHym3ON;O(h?0)K`e_pRA<=#|Ao4>p$k}i~*$`v}vZC_(Awq(U_FNM?;wckc76Mr*
zj|EgHrzg|x>v1&SI(!n6c63LXlF7J9nRwq=KvYWqY1x&tS0ZH)pb9}w<82Yr@v728
zg97PU%Arf33W3dUM37bVRM(W@!i8n`%~ml0y!aqjd9g<#vI_wB5bGZ>(H;Y}j-Sbj
z!P&jIfaT@tjff~!U2_&io*6i~X+)>&O1xD4I#08|Up-=3RrIcAB)m$ssr13#m0DA*
zLIe9r97m+wYH4x7h=b|}7InVTk&VNi{(U#$+KX~5F*o@{+61nadr5?XleLYCYfFnt
z4|=C-8>(s;nc<}dXgHhpM@jzT$MGtfYL0eab@(IO&9AZ(INX_o3v~E%nUq&6p=l_t
z+}wCwwG2<u<lYDaOj3;9{bvIuc3(Z+ZoNwL=!Mvx=P10}qpUi@+3RrOt7?<jo$h+*
zlPYuBB#*Q4s`f^gXEcQ+BKW?J=y1^pC4kJvPog>6Ydb&3P?PEz@tt)gMoA<o);y-S
zq?fm96Jw&_q&LJQ9Z@7pW{%t~k*rJihWNiMXo{cdikZKF$J)$BS1Q2RZYjLuzZo{7
z!&j{ACV5v|yprAOYpF3m^NW|tGp`-okZDSUHwL0ok<q+vRi#oYR5uut3+l@K<Wn`(
zp>Op!8LTdM9>Yn!iy5WPzU%UWFA18%)L|Xne~(E|HcN9tZy1rIiOrwUd0#8J_El9j
zy!aIFS^CfIOckB)_qhhnv}eDhX3NwT@D#^z_U5P8lZ>QNv^@M86Sy#M&l(ycBJbjr
z2bZUiX_(A7;T_G(5Ms4T#vxkwqii3<s&gTi7mJShxq<ZzyZ2gnR<ydPRP8PWHckNX
zwV34gR3s_Wi(#8CiJO@Z;qUlER{a9M4wbA*&&|Zl3#XF#HMDNw)h>%ptKdO452+{E
zv$Rg<Qhe2@po$;7*R0r(q*uVw9F;Le6_X;k4}W`bvAOm_txb&GbqmymTAHPj*By*w
zx}O#TTPe=rlG#0~-+M>(+jH^W`7VgBxs|V%fj`+9Ilr>D+Stti70uznchz0_;nw<S
zZe@*AMV~@NrbFHNK2dyk{BoLN<5bkm>w!#Z%~J8I>}-zKr7K?V*>P9o9kr5rDn~!*
zxPF&G(0`75=d92LzxyuRt_82wlY2%}gGGm+(qtqa2CeR^khqOFay;?KhO<z-ff_k)
zEm#tqdE19K&-8<UJ+k|rX8s*JFDkx*b@g-S?fj$eN>^0X*<oT#g!VrKP<0{i&kDTy
zVs3EnKJqqb^4<4L$MtS6`WszBPCMV~siTad3nZNa=`|2KexSMPpO`YzDA&CUgVLoN
zZ<s!$UdDA1`yVTA%^aL8zeUw&IdQqeJD8fK-lI5Gh9$$D`74#B8odTvADxv}gqn6K
z<Kn(nO$LtGSEXj*6JhSbr~L@wMvZA|@72b?*AnzfvNmO_nc@Q#=e1w6TWH|MQ4J3Z
z4!jhPMK!<j%U0uj_4u-Smdk)B;-y$FZtu;~&c04{U<wl*g78THd2l8+<+7u0Wpw+`
zB!uL!DTVvIh5T$taye$5vnP_h<y4pCOW&e6=02{)1mW`M{G;)ZG>^FWkWBOQk5)28
zikvd<WPCibzsO;h%v;x@V7O!c1=`J9wD)=EQI^ecYrRg~CvK_Et=Rj93fDm1?b6)N
z!&e)fo>t1Oe>3SBVpoyx_@spp&l=%y^bBTqV!zPah_+~?QE7Npb#-A}?i3RRW8^tQ
zz3+_td$wV59Uf24H2H6TGH07?Oe)zH9MNLEOc3hz<87s!Lw%aWzi<`G?eLesUINm$
zC_E=U;qNEbbb3d<#-H->b3M@|RgvbYi2Y-ed#OP@y+Ny!<v)TFUtByD7Ipai)g#D_
z-XMBYNC#)SQXQ?|fzZ#xGpthzJM!Com*}>fAkCy0&Je<<W~ZsoSyPk;LHPn~bZpny
z!r4;T2Cs?>zimA&vqpp-zWavU)AzGxKf0MiNJu$d_vG{dTQD0dM3e13+jXAMEYv8S
zSiAPRwl~geZXk6i^^(|F7a?b#b=wKju(Zpz1o7S?cFZr!yr9WDaqw=d1T$q8W;3Ig
zd*T4Uhu_8@RvGDT866<^(s@d&AIp1xWm?`J>#f(&j=KhFhtekHM9;Jk_cIShKc-f)
zr5C*@Kd+AhA|m)B_?Z6wtMG5WvLB(dAG`H~Pu=2qB0C$r5Px$yR5Pc^Z*?+ddo6Z5
zyXj_-?@ST3<dSQp&?mj1rqI~tF?;S||DUTA*(aQ~m+wBTSUIidzjWpSX}!&HukG+e
zP<@Hp)!U~{3-0AUThG~t=1ucV+kBE9JCM)1Mm1<MCBQSk$?|P?qhkxZ4Gj%(AL2Ym
z%72!XjFOn_T>0u+$*@7FUff$cSUyDUhK?OshqkFI$i|0W8{BGs{~~CQW8&JRd{!ah
z^L5<BY$+EiEM#K(O#<<H%vPe;vk=|EubXFf8#kJANz5K^s9ewtLg_Emb6&NrXVxBs
zCx7s(rg~8{b~$h}p6d=M{*uG~^uQtRI)rK&;}u4-peg!rx%F(#i4#RoW@~Nn3)o7@
zEKM_T&MWljaXq28>;3|-0)#*eML3a{31^%*-qxuV-DN_ThV@fg=a6Wr-_yU|HOPE@
z`aG#u{k=>@oqhLOB-0m_BkJ|e0E+*ii9&9VkUJ+x1XAihT@=iJyC}v1o;Zj)!GolV
zBiei8JxK(hg#<k6Vcl^MWhL?@rh~V`d1Fa<f`<{#8}A4r_n4fBU@2e%Xeuic{4FJ<
zr4V2V1QY>=!BJ>11`W4@XpyjPczY!eCpR1z3W6vR?QtF?Fd72`LCBktA0*%~BnYB{
z_0+`Sot#O)I^d-d3FmGKMgvR8@IYG&2M3e;K87Hmi}PnA2nPMH4}Y}5;ArIk(FC(f
z>htITGpcO|Q}>aWcJAI!6~9!PqG`QR&~R{!)}F1j`(#SwQA>Z~Q$x0VM1M119lvgn
z%k8a~<yknIT!t}Wn!aEkW`Bl4q<CNb+qYAqV{`oCm%^S|vN0IBM%9;@udxQk`iV_(
z4NY{Mzhs?FQ8Lhj;?ZUMw(PRRreiCsZ(&8GR>@fB|6ZK|<{f@&Qc!WwK$oV_w&!wV
z-q>kX)Z4VuoVV>1f};Fw&6lA$Lj?4j4MeQ4h-bFMQz?@gpP3eL9xXJvk{H|LGz(wj
z4q(HmOln9bGIZW#-jUC>N#yy28BkC!-buJjRQ8BoKf7~Qx^upVT5i_YKA73@@C-}3
z*}SsO2J8-lU?JW9VNQ-jgYz}YVM5%g|A9L&*neaEAD%#reC$YM(inUD;C@M!u|ypC
zr2coh;Jt|?6=$qBnFc!8KjtuiKW2Cbk~7f~3PvK4U@3q?(oiTEfk6D4lb_)z)PH2;
zcPQW)E)D%HLu0^Jze)06@`B0SHUvS82__zRauXEj|NV<Qe`%qr0}Vp5n|~+QpRGq(
z+28m8tAE29coXc6a3o6z(3gc6<NQfhe<LNJL{2uKHTx?v23RK?!~p9}raF=g05QZ7
z2|nKTI3gJKyKAe9bHHQC8AP^H8Y3+U<PZjdf<jSfloS{(1(QUhF(@Pgg~CX~(N+*+
ztQ`?zL{1WKAA8boY$7?XD!>T<`w+puEd5KSNdLpA-z(MJaP9yKfP?jLz<N7?AO>J5
zvWdXN3H&=E5G63+i9T>-0R$fs#J~+}k8=n1fGE2W>|M!@LoNY!|1AV$jK7B9@4KlI
z?0v`x<lSKZ+U}Ai*;YgF-w}W5{TtHQ8;3I_5Xex!0!)4e!+rsPAch1toG#WAu>Mc~
zAO?Tf`)k*KZt<5G>G`-5EkRJQCHS{7!2d~q2`2dz|7r{Qgo(g@|2S44Fn9-|<?lF>
zNvcBd0XP8r3li*~P%2oUUJ{%DcL2!WbRqlZgwq9B3^5_%^nFNfcn|V+`kpusC3|u~
zw)}NcV2HWJ6|jeoo7?XXD6r%2!2cPg|3q5{>)|Af^N=tx5&=PUvEHs)9*zVcPUI=h
z0SvH;{Ih|-+WD83y9)4Q0^kcmR$Wb99SW5uvlI@6A~C=y1&ly~qTm22fFyD7vB&+X
zC#CXR2MOr@(g*aUfb~e^A2+Zbi2!au4yZs8zy|`rgR21}`j7F?XW$)K2M)-kft&mu
z0pLgjc;xZdIsosN4j?0s|G)c7k!>N{r~3Ow0d^q)TmJMDg#mp06$;=0RDoYx2&>A#
zp+HrFL#1F)Aa|w3pfDjQR7m76Vf6RLIRdPLp+SH}e_UXsv@}8*><IothLXkrU)SUd
z?D3}z3WWg`?H@9@G?3(fm!Z(oz(M^(hLZZ13=KsCmFDkyP&n#ect{i+pw{2@kSM8t
z>jA~;pL!@b1}JWSUke2BUw)vZ|BZ*jApWI?29Eikcxae3kja1F1C4<H#XgcZ7WmV_
zn_P^I@PR;WKm%og03_kBN(_RKi4TU6*$vb@Ema`lWzlFPP<3IzDXOATsu(4>v=Ukx
zrUsQpppfcnDpK;G|67He?Le7RamLxZ5`Emk5EM!sj#h%hp$K&(6pc|<LSR(XQ7Q;!
fHC1V}iV}jHY(x^)oAiq!XrvSdBp{%suMYZukt)LA

literal 0
HcmV?d00001

diff --git a/spec/models/document_spec.rb b/spec/models/document_spec.rb
new file mode 100644
index 0000000..9408501
--- /dev/null
+++ b/spec/models/document_spec.rb
@@ -0,0 +1,125 @@
+require "rails_helper"
+
+RSpec.describe Document, type: :model do
+  describe "factory" do
+    it "is valid" do
+      expect(create(:document)).to be_valid
+    end
+  end
+
+  describe "database constraints" do
+    it "raises error when type is null" do
+      expect {
+        Document.create!(type: nil, file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf"))
+      }.to raise_error(ActiveRecord::NotNullViolation)
+    end
+
+    it "raises error when year is null for rapport_activite type" do
+      expect {
+        Document.create!(
+          type: :rapport_activite,
+          year: nil,
+          file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
+        )
+      }.to raise_error(ActiveRecord::StatementInvalid, /year_required_for_specific_types/)
+    end
+
+    it "raises error when year is null for rapport_financier type" do
+      expect {
+        Document.create!(
+          type: :rapport_financier,
+          year: nil,
+          file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
+        )
+      }.to raise_error(ActiveRecord::StatementInvalid, /year_required_for_specific_types/)
+    end
+
+    it "raises error when year is less than 1000" do
+      expect {
+        Document.create!(
+          type: :rapport_activite,
+          year: 999,
+          file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
+        )
+      }.to raise_error(ActiveRecord::StatementInvalid, /year_as_4_digits/)
+    end
+  end
+
+  describe "validations" do
+    it "is invalid when year is greater than the current year" do
+      document = build(:document, year: Time.current.year + 1)
+      expect(document).not_to be_valid
+      expect(document.errors[:year]).to be_present
+    end
+  end
+
+  describe "active storage attachment" do
+    it "is invalid without a file" do
+      document = Document.new(type: :statuts)
+      expect(document).not_to be_valid
+      expect(document.errors[:file]).to be_present
+    end
+
+    it "is invalid with non-PDF file" do
+      document = Document.new(
+        type: :statuts,
+        file: fixture_file_upload("spec/fixtures/files/invalid_file_type.svg", "image/svg")
+      )
+      expect(document).not_to be_valid
+      expect(document.errors[:file]).to be_present
+    end
+
+    it "is invalid with file larger than 5MB" do
+      allow_any_instance_of(ActiveStorage::Blob).to receive(:byte_size).and_return(6.megabytes)
+
+      document = Document.new(
+        type: :statuts,
+        file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
+      )
+      expect(document).not_to be_valid
+      expect(document.errors[:file]).to be_present
+    end
+  end
+
+  describe "associations" do
+    # it "has many attachables through document_attachments" do
+    #   expect(Document.new).to respond_to(:attachables)
+    # end
+
+    it "destroys dependent document_attachments when deleted" do
+      document = Document.create!(
+        type: :statuts,
+        file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
+      )
+      osbl = create(:osbl)
+      osbl.documents << document
+
+      expect { document.destroy }.to change { DocumentAttachment.count }.by(-1)
+    end
+  end
+
+  describe "validations" do
+    subject(:document) do
+      Document.new(
+        type: :statuts,
+        file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
+      )
+    end
+
+    it "is valid with valid attributes" do
+      expect(document).to be_valid
+    end
+
+    it "is valid with year for rapport_activite" do
+      document.type = :rapport_activite
+      document.year = 2024
+      expect(document).to be_valid
+    end
+
+    it "is valid with year for rapport_financier" do
+      document.type = :rapport_financier
+      document.year = 2024
+      expect(document).to be_valid
+    end
+  end
+end
diff --git a/spec/models/intervention_area.rb b/spec/models/intervention_area.rb
new file mode 100644
index 0000000..97704c1
--- /dev/null
+++ b/spec/models/intervention_area.rb
@@ -0,0 +1,56 @@
+require "rails_helper"
+
+RSpec.describe InterventionArea, type: :model do
+  describe "factory" do
+    it "is valid" do
+      expect(create(:intervention_area)).to be_valid
+    end
+  end
+
+  describe "database constraints" do
+    # Test name presence constraint
+    it "raises error when name is null" do
+      expect {
+        InterventionArea.create!(name: nil)
+      }.to raise_error(ActiveRecord::NotNullViolation)
+    end
+
+    # Test name uniqueness constraint
+    it "raises error on duplicate name" do
+      InterventionArea.create!(name: "Asia")
+      expect {
+        InterventionArea.create!(name: "Asia")
+      }.to raise_error(ActiveRecord::RecordNotUnique)
+    end
+
+    # Test name length constraints
+    it "raises error when name is shorter than 3 characters" do
+      expect {
+        InterventionArea.create!(name: "ab")
+      }.to raise_error(ActiveRecord::StatementInvalid, /intervention_areas_name_length_check/)
+    end
+
+    it "raises error when name is longer than 100 characters" do
+      expect {
+        InterventionArea.create!(name: "a" * 101)
+      }.to raise_error(ActiveRecord::StatementInvalid, /intervention_areas_name_length_check/)
+    end
+  end
+
+  describe "associations" do
+    it "cascades deletion of osbls_intervention_areas when deleted" do
+      intervention_area = InterventionArea.create!(name: "Asia")
+      osbl = create(:osbl)
+      intervention_area.osbls << osbl
+
+      expect { intervention_area.destroy }.to change { OsblsInterventionArea.count }.by(-1)
+    end
+  end
+
+  describe "normalization" do
+    it "normalizes the name" do
+      intervention_area = InterventionArea.create!(name: "  ASIA LoL YoLo  ")
+      expect(intervention_area.name).to eq("Asia lol yolo")
+    end
+  end
+end
diff --git a/spec/models/keyword_spec.rb b/spec/models/keyword_spec.rb
new file mode 100644
index 0000000..47ebfa8
--- /dev/null
+++ b/spec/models/keyword_spec.rb
@@ -0,0 +1,56 @@
+require "rails_helper"
+
+RSpec.describe Keyword, type: :model do
+  describe "factory" do
+    it "is valid" do
+      expect(create(:keyword)).to be_valid
+    end
+  end
+
+  describe "database constraints" do
+    # Test name presence constraint
+    it "raises error when name is null" do
+      expect {
+        Keyword.create!(name: nil)
+      }.to raise_error(ActiveRecord::NotNullViolation)
+    end
+
+    # Test name uniqueness constraint
+    it "raises error on duplicate name" do
+      Keyword.create!(name: "Technology")
+      expect {
+        Keyword.create!(name: "Technology")
+      }.to raise_error(ActiveRecord::RecordNotUnique)
+    end
+
+    # Test name length constraints
+    it "raises error when name is shorter than 3 characters" do
+      expect {
+        Keyword.create!(name: "ab")
+      }.to raise_error(ActiveRecord::StatementInvalid, /keywords_name_length_check/)
+    end
+
+    it "raises error when name is longer than 100 characters" do
+      expect {
+        Keyword.create!(name: "a" * 101)
+      }.to raise_error(ActiveRecord::StatementInvalid, /keywords_name_length_check/)
+    end
+  end
+
+  describe "associations" do
+    it "cascades deletion of osbls_keywords when deleted" do
+      keyword = Keyword.create!(name: "Technology")
+      osbl = create(:osbl)
+      keyword.osbls << osbl
+
+      expect { keyword.destroy }.to change { OsblsKeyword.count }.by(-1)
+    end
+  end
+
+  describe "normalization" do
+    it "normalizes the name" do
+      keyword = Keyword.create!(name: "  TECHNOLOGY LoL YoLo  ")
+      expect(keyword.name).to eq("Technology lol yolo")
+    end
+  end
+end
diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb
index 5e3e8e6..2460185 100644
--- a/spec/models/location_spec.rb
+++ b/spec/models/location_spec.rb
@@ -1,5 +1,78 @@
 require "rails_helper"
 
 RSpec.describe Location, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  describe "factory" do
+    it "is valid" do
+      expect(create(:location)).to be_valid
+    end
+  end
+
+  describe "database constraints" do
+    it "raises error when type is null" do
+      expect {
+        Location.create!(type: nil, osbl: create(:osbl), address_attributes: attributes_for(:address))
+      }.to raise_error(ActiveRecord::NotNullViolation)
+    end
+
+    it "raises error when name is null for antenne_locale type" do
+      expect {
+        Location.create!(
+          type: :antenne_locale,
+          name: nil,
+          osbl: create(:osbl),
+          address_attributes: attributes_for(:address)
+        )
+      }.to raise_error(ActiveRecord::StatementInvalid, /name_required_for_specific_types/)
+    end
+
+    it "raises error when name is null for lieu_d_activite type" do
+      expect {
+        Location.create!(
+          type: :lieu_d_activite,
+          name: nil,
+          osbl: create(:osbl),
+          address_attributes: attributes_for(:address)
+        )
+      }.to raise_error(ActiveRecord::StatementInvalid, /name_required_for_specific_types/)
+    end
+
+    it "raises error when name is null for autre type" do
+      expect {
+        Location.create!(
+          type: :autre,
+          name: nil,
+          osbl: create(:osbl),
+          address_attributes: attributes_for(:address)
+        )
+      }.to raise_error(ActiveRecord::StatementInvalid, /name_required_for_specific_types/)
+    end
+
+    it "enforces unique siege_social per osbl" do
+      osbl = create(:osbl)
+      create(:location, type: :siege_social, osbl: osbl)
+
+      expect {
+        create(:location, type: :siege_social, osbl: osbl)
+      }.to raise_error(ActiveRecord::RecordNotUnique)
+    end
+  end
+
+  describe "associations" do
+    it "destroys address when location is destroyed" do
+      location = create(:location)
+      address = location.address
+      expect { location.destroy }.to change(Address, :count).by(-1)
+      expect(address).to be_destroyed
+    end
+  end
+
+  describe "validations" do
+    subject(:location) { build(:location) }
+
+    it "is invalid without an address" do
+      location.address = nil
+      expect(location).not_to be_valid
+      expect(location.errors[:address]).to be_present
+    end
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c199f85..3af4779 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -38,6 +38,7 @@
   abort e.to_s.strip
 end
 RSpec.configure do |config|
+  # config.include ActionDispatch::TestProcess # for fixture_file_upload
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_paths = [
     Rails.root.join("spec/fixtures")
diff --git a/spec/support/factory_bot.rb b/spec/support/factory_bot.rb
index c7890e4..235475a 100644
--- a/spec/support/factory_bot.rb
+++ b/spec/support/factory_bot.rb
@@ -1,3 +1,14 @@
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods
 end
+
+module FactoryBotFileUploadHelper
+  def fixture_file_upload(path, mime_type)
+    Rack::Test::UploadedFile.new(
+      Rails.root.join(path),
+      mime_type
+    )
+  end
+end
+
+FactoryBot::SyntaxRunner.include FactoryBotFileUploadHelper

From c4ecb581c9f46991541975d25cb27699a45bf66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Tue, 4 Feb 2025 13:55:47 +0000
Subject: [PATCH 25/31] Add cascade delete and document attachment cleanup

- Added cascade delete to foreign keys for annual finances, documents, users, and related tables
- Implemented cleanup mechanism for orphaned documents in DocumentAttachment model
- Created factory and spec for DocumentAttachment to test document deletion behavior
- Updated User model to add contributions association
- Improved Address factory with more realistic data and dynamic addressable creation
- Added comprehensive tests for Address and DocumentAttachment models
---
 app/models/document_attachment.rb             |  8 +++
 app/models/user.rb                            |  1 +
 ...5521_add_cascade_delete_to_foreign_keys.rb | 27 ++++++++++
 db/schema.rb                                  | 14 ++---
 spec/factories/addresses.rb                   | 19 ++++---
 spec/factories/document_attachments.rb        |  6 +++
 spec/models/address_spec.rb                   | 40 +++++++++++++-
 spec/models/document_attachment_spec.rb       | 52 +++++++++++++++++++
 spec/requests/keywords_spec.rb                |  2 +-
 9 files changed, 152 insertions(+), 17 deletions(-)
 create mode 100644 db/migrate/20250204105521_add_cascade_delete_to_foreign_keys.rb
 create mode 100644 spec/factories/document_attachments.rb
 create mode 100644 spec/models/document_attachment_spec.rb

diff --git a/app/models/document_attachment.rb b/app/models/document_attachment.rb
index 180a6ba..6c9261e 100644
--- a/app/models/document_attachment.rb
+++ b/app/models/document_attachment.rb
@@ -5,4 +5,12 @@ class DocumentAttachment < ApplicationRecord
   # validates :document_id, uniqueness: {scope: [:attachable_type, :attachable_id]}
 
   accepts_nested_attributes_for :document
+
+  after_destroy :cleanup_orphaned_document
+
+  private
+
+  def cleanup_orphaned_document
+    document.destroy! if document.document_attachments.empty?
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 7278bb5..7714e78 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,6 +3,7 @@ class User < ApplicationRecord
 
   has_one :otp, dependent: :destroy
   has_one_attached :profile_picture
+  has_many :contributions, dependent: :nullify
 
   validates_attachment(
     name: :profile_picture,
diff --git a/db/migrate/20250204105521_add_cascade_delete_to_foreign_keys.rb b/db/migrate/20250204105521_add_cascade_delete_to_foreign_keys.rb
new file mode 100644
index 0000000..133cfc4
--- /dev/null
+++ b/db/migrate/20250204105521_add_cascade_delete_to_foreign_keys.rb
@@ -0,0 +1,27 @@
+class AddCascadeDeleteToForeignKeys < ActiveRecord::Migration[8.0]
+  def change
+    # Remove and re-add foreign keys with cascade delete
+
+    # When OSBL is deleted, its annual finances should be removed
+    remove_foreign_key "annual_finances", "osbls"
+    add_foreign_key "annual_finances", "osbls", on_delete: :cascade
+
+    # When annual finances are deleted, related records should be removed
+    remove_foreign_key "fund_allocations", "annual_finances"
+    add_foreign_key "fund_allocations", "annual_finances", on_delete: :cascade
+
+    remove_foreign_key "fund_sources", "annual_finances"
+    add_foreign_key "fund_sources", "annual_finances", on_delete: :cascade
+
+    # When document is deleted, its attachments should be removed
+    remove_foreign_key "document_attachments", "documents"
+    add_foreign_key "document_attachments", "documents", on_delete: :cascade
+
+    # When user is deleted, their OTPs and sessions should be removed
+    remove_foreign_key "otps", "users"
+    add_foreign_key "otps", "users", on_delete: :cascade
+
+    remove_foreign_key "sessions", "users"
+    add_foreign_key "sessions", "users", on_delete: :cascade
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index df5265a..7709fbb 100644
--- 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[8.0].define(version: 2025_02_04_104735) do
+ActiveRecord::Schema[8.0].define(version: 2025_02_04_105521) do
   create_table "accounts", force: :cascade do |t|
   end
 
@@ -259,11 +259,11 @@
 
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
-  add_foreign_key "annual_finances", "osbls"
+  add_foreign_key "annual_finances", "osbls", on_delete: :cascade
   add_foreign_key "contributions", "users"
-  add_foreign_key "document_attachments", "documents"
-  add_foreign_key "fund_allocations", "annual_finances"
-  add_foreign_key "fund_sources", "annual_finances"
+  add_foreign_key "document_attachments", "documents", on_delete: :cascade
+  add_foreign_key "fund_allocations", "annual_finances", on_delete: :cascade
+  add_foreign_key "fund_sources", "annual_finances", on_delete: :cascade
   add_foreign_key "locations", "osbls", on_delete: :cascade
   add_foreign_key "osbls_causes", "causes", on_delete: :cascade
   add_foreign_key "osbls_causes", "osbls", on_delete: :cascade
@@ -273,7 +273,7 @@
   add_foreign_key "osbls_keywords", "osbls", on_delete: :cascade
   add_foreign_key "osbls_labels", "labels", on_delete: :cascade
   add_foreign_key "osbls_labels", "osbls", on_delete: :cascade
-  add_foreign_key "otps", "users"
-  add_foreign_key "sessions", "users"
+  add_foreign_key "otps", "users", on_delete: :cascade
+  add_foreign_key "sessions", "users", on_delete: :cascade
   add_foreign_key "users", "accounts"
 end
diff --git a/spec/factories/addresses.rb b/spec/factories/addresses.rb
index e5aad49..6b47c41 100644
--- a/spec/factories/addresses.rb
+++ b/spec/factories/addresses.rb
@@ -1,12 +1,15 @@
 FactoryBot.define do
   factory :address do
-    street_number { "MyString" }
-    street_name { "MyString" }
-    postal_code { "MyString" }
-    city { "MyString" }
-    country { "MyString" }
-    latitude { 1.5 }
-    longitude { 1.5 }
-    addressable { nil }
+    street_name { "Rue de la Paix" }
+    postal_code { "75002" }
+    city { "Paris" }
+    latitude { 48.8566 }
+    longitude { 2.3522 }
+
+    # create(:address)  # Creates with new location
+    # create(:address, addressable: user)  # Uses existing addressable
+    after(:build) do |address, evaluator|
+      address.addressable = evaluator.addressable || create(:location, address: address)
+    end
   end
 end
diff --git a/spec/factories/document_attachments.rb b/spec/factories/document_attachments.rb
new file mode 100644
index 0000000..2e90afb
--- /dev/null
+++ b/spec/factories/document_attachments.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :document_attachment do
+    document
+    attachable { create(:osbl) }
+  end
+end
diff --git a/spec/models/address_spec.rb b/spec/models/address_spec.rb
index b0ee7ca..4c2e595 100644
--- a/spec/models/address_spec.rb
+++ b/spec/models/address_spec.rb
@@ -1,5 +1,43 @@
 require "rails_helper"
 
 RSpec.describe Address, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  describe "factory" do
+    it "is valid" do
+      expect(create(:address)).to be_valid
+    end
+  end
+
+  describe "database constraints" do
+    it "raises error when latitude is less than -90" do
+      expect {
+        create(:address, latitude: -91)
+      }.to raise_error(ActiveRecord::StatementInvalid, /check_latitude_range/)
+    end
+
+    it "raises error when latitude is greater than 90" do
+      expect {
+        create(:address, latitude: 91)
+      }.to raise_error(ActiveRecord::StatementInvalid, /check_latitude_range/)
+    end
+
+    it "raises error when longitude is less than -180" do
+      expect {
+        create(:address, longitude: -181)
+      }.to raise_error(ActiveRecord::StatementInvalid, /check_longitude_range/)
+    end
+
+    it "raises error when longitude is greater than 180" do
+      expect {
+        create(:address, longitude: 181)
+      }.to raise_error(ActiveRecord::StatementInvalid, /check_longitude_range/)
+    end
+
+    it "enforces unique addressable per record" do
+      first_address = create(:address)
+
+      expect {
+        create(:address, addressable: first_address.addressable)
+      }.to raise_error(ActiveRecord::RecordNotUnique)
+    end
+  end
 end
diff --git a/spec/models/document_attachment_spec.rb b/spec/models/document_attachment_spec.rb
new file mode 100644
index 0000000..34dd5b6
--- /dev/null
+++ b/spec/models/document_attachment_spec.rb
@@ -0,0 +1,52 @@
+require "rails_helper"
+
+RSpec.describe DocumentAttachment, type: :model do
+  describe "callbacks" do
+    describe "after_destroy" do
+      let(:document) { create(:document) }
+
+      context "when document is attached to multiple records" do
+        let!(:document_attachment1) { create(:document_attachment, document: document) }
+        let!(:document_attachment2) { create(:document_attachment, document: document) }
+
+        it "does not destroy the document when one attachment is destroyed" do
+          expect {
+            document_attachment1.destroy
+          }.not_to change(Document, :count)
+        end
+      end
+
+      context "when document is attached to single record" do
+        let!(:document_attachment) { create(:document_attachment) }
+
+        it "destroys the document when the last attachment is destroyed" do
+          expect {
+            document_attachment.destroy
+          }.to change(Document, :count).by(-1)
+        end
+      end
+    end
+  end
+
+  describe "db constraints" do
+    describe "uniqueness of document per attachable" do
+      let(:osbl) { create(:osbl) }
+      let(:document) { create(:document) }
+      let!(:existing_attachment) { create(:document_attachment, document: document, attachable: osbl) }
+
+      it "prevents attaching the same document twice to the same record" do
+        expect {
+          duplicate_attachment = create(:document_attachment, document: document, attachable: osbl)
+        }.to raise_error(ActiveRecord::RecordNotUnique)
+      end
+
+      it "allows attaching the same document to different records" do
+        different_osbl = create(:osbl)
+        new_attachment = build(:document_attachment, document: document, attachable: different_osbl)
+
+        expect(new_attachment).to be_valid
+        expect { new_attachment.save! }.not_to raise_error
+      end
+    end
+  end
+end
diff --git a/spec/requests/keywords_spec.rb b/spec/requests/keywords_spec.rb
index 294e18d..45b1cc6 100644
--- a/spec/requests/keywords_spec.rb
+++ b/spec/requests/keywords_spec.rb
@@ -20,7 +20,7 @@
         let(:params) { {query: "tes"} }
 
         it "returns first 3 keywords matching the query" do
-          create_list(:keyword, 4)
+          4.times { |i| create(:keyword, name: "Test#{i + 1}") }
           subject
           expect(response).to have_http_status(:ok)
           expect(JSON.parse(response.body)).to eq([

From 4da141ce55eccb050d1906bd5c5c5b5698eac834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Tue, 4 Feb 2025 14:14:10 +0000
Subject: [PATCH 26/31] Migrate type enums to human-readable strings across
 models and components

- Updated Document, Location, FundSource, FundAllocation models to use human-readable enum types
- Removed constants file and replaced type lists with dynamic prop fetching from backend
- Modified frontend components to work with new string-based type system
- Updated factories and specs to use new type representations
- Simplified type selection and filtering logic in various form components
---
 .../users/contributions_controller.rb         |  6 +++-
 .../new/FundManagementSection.tsx             | 30 +++++++----------
 .../contribution/new/OsblDocumentSheet.tsx    | 22 ++++++-------
 .../pages/contribution/new/OsblDocuments.tsx  |  7 ++--
 .../contribution/new/OsblFinanceSheet.tsx     |  8 +++--
 .../contribution/new/OsblLocationSheet.tsx    | 16 +++++-----
 .../pages/contribution/new/OsblLocations.tsx  |  7 ++--
 app/frontend/lib/constants.ts                 | 28 ----------------
 app/models/document.rb                        | 10 +++---
 app/models/fund_allocation.rb                 |  8 ++---
 app/models/fund_source.rb                     |  8 ++---
 app/models/location.rb                        |  8 ++---
 spec/factories/document.rb                    |  2 +-
 spec/factories/fund_allocation.rb             |  2 +-
 spec/factories/fund_sources.rb                |  2 +-
 spec/factories/locations.rb                   | 10 +++---
 spec/models/annual_finance_spec.rb            | 32 +++++++++----------
 spec/models/document_spec.rb                  | 32 ++++++-------------
 spec/models/location_spec.rb                  | 10 +++---
 19 files changed, 100 insertions(+), 148 deletions(-)
 delete mode 100644 app/frontend/lib/constants.ts

diff --git a/app/controllers/users/contributions_controller.rb b/app/controllers/users/contributions_controller.rb
index 83c27fd..6c1d357 100644
--- a/app/controllers/users/contributions_controller.rb
+++ b/app/controllers/users/contributions_controller.rb
@@ -16,7 +16,11 @@ def index
     def new
       render inertia: "Contribution/New", props: {
         causes: Cause.pluck(:name, :id).to_h,
-        labels: Label.pluck(:id, :name).map { |id, name| {value: id, label: name} }
+        labels: Label.pluck(:id, :name).map { |id, name| {value: id, label: name} },
+        location_types: Location.types.keys,
+        document_types: Document.types.keys,
+        fund_source_types: FundSource.types.keys,
+        fund_allocation_types: FundAllocation.types.keys
       }
     end
 
diff --git a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
index e9d2a12..6a00490 100644
--- a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
+++ b/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
@@ -6,8 +6,7 @@ import {
   SelectContent,
   SelectItem,
   SelectTrigger,
-  SelectValue,
-  SelectSeparator
+  SelectValue
 } from '@/components/ui/select'
 import { PlusIcon, TrashIcon } from 'lucide-react'
 import { Button } from '@/components/ui/button'
@@ -18,7 +17,7 @@ import { Separator } from '@/components/ui/separator'
 interface FundManagementSectionProps {
   title: string
   items: FundRecord[]
-  typeList: Array<{ value: string, label: string, group: string }>
+  typeList: string[]
   baseErrorPath: string
   onUpdate: (items: Array<Partial<FundRecord>>) => void
   errors: Record<string, string>
@@ -95,22 +94,15 @@ export default function FundManagementSection ({
               </SelectTrigger>
               <SelectContent>
                 {typeList.filter(type =>
-                  item.type === type.value ||
-                !items.some(source => source.type === type.value)
-                ).map((type, i) => (
-                  <Fragment key={type.value}>
-                    {i > 0 &&
-                    type.group === 'detailed' &&
-                    typeList[i - 1]?.group === 'main' && (
-                      <SelectSeparator className='my-2' />
-                    )}
-                    <SelectItem
-                      value={type.value}
-                      className={type.group === 'detailed' ? 'text-muted-foreground' : ''}
-                    >
-                      {type.label}
-                    </SelectItem>
-                  </Fragment>
+                  item.type === type ||
+                !items.some(source => source.type === type)
+                ).map((type) => (
+                  <SelectItem
+                    key={type}
+                    value={type}
+                  >
+                    {type}
+                  </SelectItem>
                 ))}
               </SelectContent>
             </Select>
diff --git a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
index e04eabb..3ef2acc 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
@@ -29,8 +29,7 @@ import {
 import { Label } from '@/components/ui/label'
 import deepCleanData from '@/lib/deepCleanData'
 import { z } from 'zod'
-import { DocumentTypeList } from '@/lib/constants'
-
+import { usePage } from '@inertiajs/react'
 interface Props extends Omit<FormProps, 'data' | 'setData'> {
   document: Partial<Document>
   index: number
@@ -58,12 +57,13 @@ export default function OsblDocumentSheet ({
   clearErrors,
   setError
 }: Props): ReactElement {
+  const documentTypes = usePage().props.document_types as string[]
   const formRef = useRef<HTMLFormElement>(null)
   const [sheetDocument, setSheetDocument] = useState<Partial<Document>>(document)
   const [isOpen, setIsOpen] = useState(() => {
     const checks = [
-      (!['rapport_activite', 'rapport_financier'].includes(sheetDocument.type ?? '') && sheetDocument.year !== undefined),
-      (!['proces_verbal', 'autre'].includes(sheetDocument.type ?? '') && sheetDocument.name !== undefined),
+      (!['Rapport d\'activité', 'Rapport financier'].includes(sheetDocument.type ?? '') && sheetDocument.year !== undefined),
+      (!['Procès verbal', 'Autre'].includes(sheetDocument.type ?? '') && sheetDocument.name !== undefined),
       sheetDocument.description !== undefined
     ]
     return checks.some(check => check)
@@ -115,16 +115,16 @@ export default function OsblDocumentSheet ({
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {DocumentTypeList.map((type) => (
-                  <SelectItem key={type.value} value={type.value}>
-                    {type.label}
+                {documentTypes.map((type) => (
+                  <SelectItem key={type} value={type}>
+                    {type}
                   </SelectItem>
                 ))}
               </SelectContent>
             </Select>
           </div>
 
-          {['rapport_activite', 'rapport_financier'].includes(sheetDocument.type ?? '') && (
+          {['Rapport d\'activité', 'Rapport financier'].includes(sheetDocument.type ?? '') && (
             <MyNumberInput
               labelText='Année *'
               id={`document-year-${index}`}
@@ -136,7 +136,7 @@ export default function OsblDocumentSheet ({
             />
           )}
 
-          {['proces_verbal', 'autre'].includes(sheetDocument.type ?? '') && (
+          {['Procès verbal', 'Autre'].includes(sheetDocument.type ?? '') && (
             <MyInput
               labelText='Nom du document *'
               id={`document-name-${index}`}
@@ -172,7 +172,7 @@ export default function OsblDocumentSheet ({
             </CollapsibleTrigger>
             <CollapsibleContent className='CollapsibleContent'>
               <div className='flex flex-col gap-8 mt-8'>
-                {!['proces_verbal', 'autre'].includes(sheetDocument.type ?? '') && (
+                {!['Procès verbal', 'Autre'].includes(sheetDocument.type ?? '') && (
                   <MyInput
                     labelText='Nom du document'
                     id={`document-name-${index}`}
@@ -182,7 +182,7 @@ export default function OsblDocumentSheet ({
                   />
                 )}
 
-                {!['rapport_activite', 'rapport_financier'].includes(sheetDocument.type ?? '') && (
+                {!['Rapport d\'activité', 'Rapport financier'].includes(sheetDocument.type ?? '') && (
                   <MyNumberInput
                     id={`document-year-${index}`}
                     labelText='Année'
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index e65d882..90e53b6 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -7,8 +7,6 @@ import {
   SheetTrigger
 } from '@/components/ui/sheet'
 import OsblDocumentSheet from './OsblDocumentSheet'
-import { DocumentTypeList } from '@/lib/constants'
-import { SelectOption } from '@/types/types'
 
 export default function OsblDocuments ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
   const documents = data.document_attachments_attributes ?? []
@@ -30,9 +28,8 @@ export default function OsblDocuments ({ data, setData, errors, clearErrors, set
       return document.name
     }
 
-    if (['rapport_activite', 'rapport_financier'].includes(document.type)) {
-      const documentType = DocumentTypeList.find(type => type.value === document.type) as SelectOption
-      return `${documentType.label} ${document.year as number}`
+    if (["Rapport d'activité", 'Rapport financier'].includes(document.type)) {
+      return `${document.type} ${document.year as number}`
     }
 
     return document.type
diff --git a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
index 39a599e..348dbbd 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
@@ -16,8 +16,8 @@ import {
   SheetDescription
 } from '@/components/ui/sheet'
 import deepCleanData from '@/lib/deepCleanData'
-import { FundSourceTypeList, FundAllocationTypeList } from '@/lib/constants'
 import { z } from 'zod'
+import { usePage } from '@inertiajs/react'
 
 interface Props extends Omit<FormProps, 'setData'> {
   finance: Partial<AnnualFinance>
@@ -80,6 +80,8 @@ export default function OsblFinanceSheet ({
   clearErrors,
   setError
 }: Props): ReactElement {
+  const fundSourceTypes = usePage().props.fund_source_types as string[]
+  const fundAllocationTypes = usePage().props.fund_allocation_types as string[]
   const formRef = useRef<HTMLFormElement>(null)
   const [sheetFinance, setSheetFinance] = useState<Partial<AnnualFinance>>(finance)
 
@@ -188,7 +190,7 @@ export default function OsblFinanceSheet ({
           <FundManagementSection
             title='Sources de financement'
             items={sheetFinance.fund_sources_attributes ?? []}
-            typeList={[...FundSourceTypeList] as Array<{ value: string, label: string, group: string }>}
+            typeList={fundSourceTypes}
             baseErrorPath='fund_sources_attributes'
             onUpdate={(items) => updateSheetFinance('fund_sources_attributes', items)}
             errors={errors}
@@ -198,7 +200,7 @@ export default function OsblFinanceSheet ({
           <FundManagementSection
             title='Allocation des fonds'
             items={sheetFinance.fund_allocations_attributes ?? []}
-            typeList={[...FundAllocationTypeList] as Array<{ value: string, label: string, group: string }>}
+            typeList={fundAllocationTypes}
             baseErrorPath='fund_allocations_attributes'
             onUpdate={(items) => updateSheetFinance('fund_allocations_attributes', items)}
             errors={errors}
diff --git a/app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx b/app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx
index 785378c..5036355 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx
@@ -26,9 +26,8 @@ import {
 } from '@/components/ui/collapsible'
 import MyAsyncSelect from '@/components/shared/MyAsyncSelect'
 import deepCleanData from '@/lib/deepCleanData'
-import { LocationTypeList } from '@/lib/constants'
 import { Label } from '@/components/ui/label'
-
+import { usePage } from '@inertiajs/react'
 interface Props {
   location: Partial<Location>
   index: number
@@ -42,6 +41,7 @@ export default function OsblLocationSheet ({
   onUpdate,
   hasSiegeSocial
 }: Props): ReactElement {
+  const locationTypes = usePage().props.location_types as string[]
   const formRef = useRef<HTMLFormElement>(null)
   const [sheetLocation, setSheetLocation] = useState<Partial<Location>>(location)
   const [isOpen, setIsOpen] = useState(() => {
@@ -110,20 +110,20 @@ export default function OsblLocationSheet ({
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                {LocationTypeList
+                {locationTypes
                   .filter(type =>
-                    type.value !== 'siege_social' || !hasSiegeSocial || location.type === 'siege_social'
+                    type !== 'Siège social' || !hasSiegeSocial || location.type === 'Siège social'
                   )
                   .map((type) => (
-                    <SelectItem key={type.value} value={type.value}>
-                      {type.label}
+                    <SelectItem key={type} value={type}>
+                      {type}
                     </SelectItem>
                   ))}
               </SelectContent>
             </Select>
           </div>
 
-          {['antenne_locale', 'lieu_d_activite', 'autre'].includes(sheetLocation.type ?? '') && (
+          {['Antenne locale', 'Lieu d\'activité', 'Autre'].includes(sheetLocation.type ?? '') && (
             <MyInput
               labelText='Nom du lieu *'
               id={`location-name-${index}`}
@@ -153,7 +153,7 @@ export default function OsblLocationSheet ({
             </CollapsibleTrigger>
             <CollapsibleContent className='CollapsibleContent'>
               <div className='flex flex-col gap-8 mt-8'>
-                {sheetLocation.type === 'siege_social' && (
+                {sheetLocation.type === 'Siège social' && (
                   <MyInput
                     labelText='Nom du lieu'
                     id={`location-name-${index}`}
diff --git a/app/frontend/components/pages/contribution/new/OsblLocations.tsx b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
index 4e6d85a..7a9918e 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocations.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
@@ -7,12 +7,10 @@ import {
   SheetTrigger
 } from '@/components/ui/sheet'
 import OsblLocationSheet from './OsblLocationSheet'
-import { LocationTypeList } from '@/lib/constants'
-import { SelectOption } from '@/types/types'
 
 export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data' | 'setData'>): ReactElement {
   const locations = data.locations_attributes ?? []
-  const hasSiegeSocial = locations.some(loc => loc.type === 'siege_social')
+  const hasSiegeSocial = locations.some(loc => loc.type === 'Siège social')
 
   function addLocation (location: Location, index: number): void {
     const updatedLocations = [...locations]
@@ -29,8 +27,7 @@ export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data'
   function getLocationDisplayName (location: Location): string {
     if (location.name !== undefined) return location.name
 
-    const type = LocationTypeList.find(t => t.value === location.type) as SelectOption
-    return type.label
+    return location.type
   }
 
   return (
diff --git a/app/frontend/lib/constants.ts b/app/frontend/lib/constants.ts
deleted file mode 100644
index 50e0247..0000000
--- a/app/frontend/lib/constants.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-export const DocumentTypeList = [
-  { value: 'statuts', label: 'Statuts' },
-  { value: 'rapport_activite', label: "Rapport d'activité" },
-  { value: 'rapport_financier', label: 'Rapport financier' },
-  { value: 'proces_verbal', label: 'Procès verbal' },
-  { value: 'autre', label: 'Autre' }
-] as const
-
-export const FundSourceTypeList = [
-  { value: 'dons', label: 'Dons', group: 'main' },
-  { value: 'aides_publiques', label: 'Aides publiques', group: 'main' },
-  { value: 'revenus_d_activites', label: 'Revenus d\'activités', group: 'main' },
-  { value: 'autre', label: 'Autre', group: 'main' }
-] as const
-
-export const FundAllocationTypeList = [
-  { value: 'missions_sociales', label: 'Missions sociales', group: 'main' },
-  { value: 'frais_de_fonctionnement', label: 'Frais de fonctionnement', group: 'main' },
-  { value: 'frais_de_recherche_de_fonds', label: 'Frais de recherche de fonds', group: 'main' },
-  { value: 'autre', label: 'Autre', group: 'main' }
-] as const
-
-export const LocationTypeList = [
-  { value: 'siege_social', label: 'Siège social' },
-  { value: 'antenne_locale', label: 'Antenne locale' },
-  { value: 'lieu_d_activite', label: "Lieu d'activité" },
-  { value: 'autre', label: 'Autre' }
-] as const
diff --git a/app/models/document.rb b/app/models/document.rb
index f72c8d5..f53fb1f 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -9,11 +9,11 @@ class Document < ApplicationRecord
   # has_many :attachables, through: :document_attachments, source_type: "Osbl"
 
   enum :type, {
-    statuts: 0,
-    rapport_activite: 1,
-    rapport_financier: 2,
-    proces_verbal: 3,
-    autre: 4
+    "Statuts" => 0,
+    "Rapport d'activité" => 1,
+    "Rapport financier" => 2,
+    "Procès verbal" => 3,
+    "Autre" => 4
   }.freeze
 
   validates :file, presence: true
diff --git a/app/models/fund_allocation.rb b/app/models/fund_allocation.rb
index 8a38f6c..276d23b 100644
--- a/app/models/fund_allocation.rb
+++ b/app/models/fund_allocation.rb
@@ -4,10 +4,10 @@ class FundAllocation < ApplicationRecord
   belongs_to :annual_finance
 
   enum :type, {
-    missions_sociales: 0,
-    frais_de_fonctionnement: 1,
-    frais_de_recherche_de_fonds: 2,
-    autre: 3
+    "Missions sociales" => 0,
+    "Frais de fonctionnement" => 1,
+    "Frais de recherche de fonds" => 2,
+    "Autre" => 3
     # dons_des_particuliers: 4,
     # mécénat: 5,
     # fonds_dédiés: 6,
diff --git a/app/models/fund_source.rb b/app/models/fund_source.rb
index 2bb3c42..a6597b6 100644
--- a/app/models/fund_source.rb
+++ b/app/models/fund_source.rb
@@ -4,10 +4,10 @@ class FundSource < ApplicationRecord
   belongs_to :annual_finance
 
   enum :type, {
-    dons: 0,
-    aides_publiques: 1,
-    revenus_d_activites: 2,
-    autre: 3
+    "Dons" => 0,
+    "Aides publiques" => 1,
+    "Revenus d'activités" => 2,
+    "Autre" => 3
     # dons_des_particuliers: 4,
     # mécénat: 5,
     # fonds_dédiés: 6,
diff --git a/app/models/location.rb b/app/models/location.rb
index bbf969e..e087fb6 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -5,10 +5,10 @@ class Location < ApplicationRecord
   has_one :address, as: :addressable, dependent: :destroy
 
   enum :type, {
-    siege_social: 0,
-    antenne_locale: 1,
-    lieu_d_activite: 2,
-    autre: 3
+    "Siège social" => 0,
+    "Antenne locale" => 1,
+    "Lieu d'activité" => 2,
+    "Autre" => 3
   }.freeze
 
   validates :address, presence: true
diff --git a/spec/factories/document.rb b/spec/factories/document.rb
index fd81dee..777e9b4 100644
--- a/spec/factories/document.rb
+++ b/spec/factories/document.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :document do
-    type { "statuts" }
+    type { "Statuts" }
     file { fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf") }
   end
 end
diff --git a/spec/factories/fund_allocation.rb b/spec/factories/fund_allocation.rb
index 4837b24..526cede 100644
--- a/spec/factories/fund_allocation.rb
+++ b/spec/factories/fund_allocation.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :fund_allocation do
     association :annual_finance
-    type { "missions_sociales" }
+    type { "Missions sociales" }
     percent { 100 }
   end
 end
diff --git a/spec/factories/fund_sources.rb b/spec/factories/fund_sources.rb
index df0893c..61ddca8 100644
--- a/spec/factories/fund_sources.rb
+++ b/spec/factories/fund_sources.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :fund_source do
     association :annual_finance
-    type { "dons" }
+    type { "Dons" }
     percent { 100 }
   end
 end
diff --git a/spec/factories/locations.rb b/spec/factories/locations.rb
index fde56e9..f52a1ce 100644
--- a/spec/factories/locations.rb
+++ b/spec/factories/locations.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :location do
     association :osbl
-    type { :siege_social }
+    type { "Siège social" }
 
     after(:build) do |location|
       location.address ||= build(:address, addressable: location)
@@ -12,21 +12,21 @@
     end
 
     trait :siege_social do
-      type { :siege_social }
+      type { "Siège social" }
     end
 
     trait :antenne_locale do
-      type { :antenne_locale }
+      type { "Antenne locale" }
       with_name
     end
 
     trait :lieu_d_activite do
-      type { :lieu_d_activite }
+      type { "Lieu d'activité" }
       with_name
     end
 
     trait :autre do
-      type { :autre }
+      type { "Autre" }
       with_name
     end
   end
diff --git a/spec/models/annual_finance_spec.rb b/spec/models/annual_finance_spec.rb
index 043d95a..e0759f0 100644
--- a/spec/models/annual_finance_spec.rb
+++ b/spec/models/annual_finance_spec.rb
@@ -22,7 +22,7 @@
           before do
             annual_finance.fund_sources.build(
               percent: 100,
-              type: "dons"
+              type: "Dons"
             )
           end
 
@@ -35,7 +35,7 @@
           before do
             annual_finance.fund_allocations.build(
               percent: 100,
-              type: "missions_sociales"
+              type: "Missions sociales"
             )
           end
 
@@ -64,7 +64,7 @@
         it "allows creating 1 fund_source with 100%" do
           annual_finance.fund_sources.build(
             percent: 100,
-            type: "dons"
+            type: "Dons"
           )
           expect {
             annual_finance.save!
@@ -74,11 +74,11 @@
         it "allows creating several fund_sources with 100%" do
           annual_finance.fund_sources.build(
             percent: 49.9,
-            type: "dons"
+            type: "Dons"
           )
           annual_finance.fund_sources.build(
             percent: 50.1,
-            type: "aides_publiques"
+            type: "Aides publiques"
           )
           expect {
             annual_finance.save!
@@ -88,11 +88,11 @@
         it "prevents creating sources that exceed 100%" do
           annual_finance.fund_sources.build(
             percent: 50.1,
-            type: "dons"
+            type: "Dons"
           )
           annual_finance.fund_sources.build(
             percent: 50,
-            type: "aides_publiques"
+            type: "Aides publiques"
           )
 
           expect {
@@ -103,11 +103,11 @@
         it "prevents creating sources that sum below 100%" do
           annual_finance.fund_sources.build(
             percent: 49.9,
-            type: "dons"
+            type: "Dons"
           )
           annual_finance.fund_sources.build(
             percent: 50,
-            type: "aides_publiques"
+            type: "Aides publiques"
           )
 
           expect {
@@ -122,7 +122,7 @@
         it "allows creating 1 fund_allocation with 100%" do
           annual_finance.fund_allocations.build(
             percent: 100,
-            type: "missions_sociales"
+            type: "Missions sociales"
           )
           expect {
             annual_finance.save!
@@ -132,11 +132,11 @@
         it "allows creating several fund_allocations with 100%" do
           annual_finance.fund_allocations.build(
             percent: 49.9,
-            type: "missions_sociales"
+            type: "Missions sociales"
           )
           annual_finance.fund_allocations.build(
             percent: 50.1,
-            type: "frais_de_fonctionnement"
+            type: "Frais de fonctionnement"
           )
           expect {
             annual_finance.save!
@@ -146,11 +146,11 @@
         it "prevents creating sources that exceed 100%" do
           annual_finance.fund_allocations.build(
             percent: 50.1,
-            type: "missions_sociales"
+            type: "Missions sociales"
           )
           annual_finance.fund_allocations.build(
             percent: 50,
-            type: "frais_de_fonctionnement"
+            type: "Frais de fonctionnement"
           )
 
           expect {
@@ -161,11 +161,11 @@
         it "prevents creating sources that sum below 100%" do
           annual_finance.fund_allocations.build(
             percent: 49.9,
-            type: "missions_sociales"
+            type: "Missions sociales"
           )
           annual_finance.fund_allocations.build(
             percent: 50,
-            type: "frais_de_fonctionnement"
+            type: "Frais de fonctionnement"
           )
 
           expect {
diff --git a/spec/models/document_spec.rb b/spec/models/document_spec.rb
index 9408501..4c2ab13 100644
--- a/spec/models/document_spec.rb
+++ b/spec/models/document_spec.rb
@@ -17,7 +17,7 @@
     it "raises error when year is null for rapport_activite type" do
       expect {
         Document.create!(
-          type: :rapport_activite,
+          type: "Rapport d'activité",
           year: nil,
           file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
         )
@@ -27,7 +27,7 @@
     it "raises error when year is null for rapport_financier type" do
       expect {
         Document.create!(
-          type: :rapport_financier,
+          type: "Rapport financier",
           year: nil,
           file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
         )
@@ -37,7 +37,7 @@
     it "raises error when year is less than 1000" do
       expect {
         Document.create!(
-          type: :rapport_activite,
+          type: "Rapport d'activité",
           year: 999,
           file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
         )
@@ -55,16 +55,13 @@
 
   describe "active storage attachment" do
     it "is invalid without a file" do
-      document = Document.new(type: :statuts)
+      document = build(:document, file: nil)
       expect(document).not_to be_valid
       expect(document.errors[:file]).to be_present
     end
 
     it "is invalid with non-PDF file" do
-      document = Document.new(
-        type: :statuts,
-        file: fixture_file_upload("spec/fixtures/files/invalid_file_type.svg", "image/svg")
-      )
+      document = build(:document, file: fixture_file_upload("spec/fixtures/files/invalid_file_type.svg", "image/svg"))
       expect(document).not_to be_valid
       expect(document.errors[:file]).to be_present
     end
@@ -72,10 +69,7 @@
     it "is invalid with file larger than 5MB" do
       allow_any_instance_of(ActiveStorage::Blob).to receive(:byte_size).and_return(6.megabytes)
 
-      document = Document.new(
-        type: :statuts,
-        file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
-      )
+      document = build(:document, file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf"))
       expect(document).not_to be_valid
       expect(document.errors[:file]).to be_present
     end
@@ -87,10 +81,7 @@
     # end
 
     it "destroys dependent document_attachments when deleted" do
-      document = Document.create!(
-        type: :statuts,
-        file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
-      )
+      document = create(:document, file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf"))
       osbl = create(:osbl)
       osbl.documents << document
 
@@ -100,10 +91,7 @@
 
   describe "validations" do
     subject(:document) do
-      Document.new(
-        type: :statuts,
-        file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf")
-      )
+      build(:document, file: fixture_file_upload("spec/fixtures/files/sample.pdf", "application/pdf"))
     end
 
     it "is valid with valid attributes" do
@@ -111,13 +99,13 @@
     end
 
     it "is valid with year for rapport_activite" do
-      document.type = :rapport_activite
+      document.type = "Rapport d'activité"
       document.year = 2024
       expect(document).to be_valid
     end
 
     it "is valid with year for rapport_financier" do
-      document.type = :rapport_financier
+      document.type = "Rapport financier"
       document.year = 2024
       expect(document).to be_valid
     end
diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb
index 2460185..921e32d 100644
--- a/spec/models/location_spec.rb
+++ b/spec/models/location_spec.rb
@@ -17,7 +17,7 @@
     it "raises error when name is null for antenne_locale type" do
       expect {
         Location.create!(
-          type: :antenne_locale,
+          type: "Antenne locale",
           name: nil,
           osbl: create(:osbl),
           address_attributes: attributes_for(:address)
@@ -28,7 +28,7 @@
     it "raises error when name is null for lieu_d_activite type" do
       expect {
         Location.create!(
-          type: :lieu_d_activite,
+          type: "Lieu d'activité",
           name: nil,
           osbl: create(:osbl),
           address_attributes: attributes_for(:address)
@@ -39,7 +39,7 @@
     it "raises error when name is null for autre type" do
       expect {
         Location.create!(
-          type: :autre,
+          type: "Autre",
           name: nil,
           osbl: create(:osbl),
           address_attributes: attributes_for(:address)
@@ -49,10 +49,10 @@
 
     it "enforces unique siege_social per osbl" do
       osbl = create(:osbl)
-      create(:location, type: :siege_social, osbl: osbl)
+      create(:location, type: "Siège social", osbl: osbl)
 
       expect {
-        create(:location, type: :siege_social, osbl: osbl)
+        create(:location, type: "Siège social", osbl: osbl)
       }.to raise_error(ActiveRecord::RecordNotUnique)
     end
   end

From a541070bc282d200d0a098e9611ec19a07c6d688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Tue, 4 Feb 2025 14:58:54 +0000
Subject: [PATCH 27/31] Add comprehensive model validations and database
 constraints

- Enhanced AnnualFinance, FundAllocation, FundSource, and Osbl models with detailed validations
- Added database-level constraints for year, percent, and amount fields
- Improved test coverage for model validations and uniqueness constraints
- Removed pending specs and added meaningful test scenarios
- Updated factories to support new validation requirements
---
 app/models/annual_finance.rb            |  7 +-
 app/models/fund_allocation.rb           |  4 +-
 spec/factories/fund_sources.rb          |  2 +-
 spec/factories/osbls.rb                 |  1 -
 spec/models/annual_finance_spec.rb      | 32 +++++++++
 spec/models/create_document_spec.rb     |  5 --
 spec/models/document_attachment_spec.rb |  2 +-
 spec/models/fund_allocation_spec.rb     | 38 +++++++++-
 spec/models/fund_source_spec.rb         | 32 ++++++++-
 spec/models/osbl_spec.rb                | 96 ++++++++++++++++++++++++-
 10 files changed, 204 insertions(+), 15 deletions(-)
 delete mode 100644 spec/models/create_document_spec.rb

diff --git a/app/models/annual_finance.rb b/app/models/annual_finance.rb
index dbf1deb..cfa914f 100644
--- a/app/models/annual_finance.rb
+++ b/app/models/annual_finance.rb
@@ -2,12 +2,15 @@ class AnnualFinance < ApplicationRecord
   belongs_to :osbl
   has_many :fund_sources, dependent: :destroy
   has_many :fund_allocations, dependent: :destroy
-  validates :year, numericality: {less_than_or_equal_to: Time.current.year}
-  # validates :employees_count, numericality: { greater_than: 0 }, allow_nil: true
 
   accepts_nested_attributes_for :fund_sources
   accepts_nested_attributes_for :fund_allocations
 
+  validates :year, numericality: {less_than_or_equal_to: Time.current.year}
+  # validates :employees_count, numericality: { greater_than: 0 }, allow_nil: true
+  # validates :budget, numericality: { greater_than: 0 }, allow_nil: true
+  # validates :year, numericality: { equal_or_greater_than: 1000 }, allow_nil: true
+
   validate :at_least_one_information
   validate :fund_sources_total_percentage_is_100
   validate :fund_allocations_total_percentage_is_100
diff --git a/app/models/fund_allocation.rb b/app/models/fund_allocation.rb
index 276d23b..780bbff 100644
--- a/app/models/fund_allocation.rb
+++ b/app/models/fund_allocation.rb
@@ -14,8 +14,8 @@ class FundAllocation < ApplicationRecord
     # activité_commerciale: 7
   }.freeze
 
-  # validates :type, presence: true
+  # validates :type, :percent, presence: true
   # validates :percent, presence: true, numericality: { greater_than: 0, less_than_or_equal_to: 100 }
-  # validates :value, numericality: { greater_than: 0 }, allow_nil: true
+  # validates :amount, numericality: { greater_than: 0 }, allow_nil: true
   # validates :annual_finance_id, uniqueness: { scope: :type }
 end
diff --git a/spec/factories/fund_sources.rb b/spec/factories/fund_sources.rb
index 61ddca8..f10926e 100644
--- a/spec/factories/fund_sources.rb
+++ b/spec/factories/fund_sources.rb
@@ -2,6 +2,6 @@
   factory :fund_source do
     association :annual_finance
     type { "Dons" }
-    percent { 100 }
+    percent { 100.00 }
   end
 end
diff --git a/spec/factories/osbls.rb b/spec/factories/osbls.rb
index 6fca3af..05a02c5 100644
--- a/spec/factories/osbls.rb
+++ b/spec/factories/osbls.rb
@@ -1,7 +1,6 @@
 FactoryBot.define do
   factory :osbl do
     sequence(:name) { |n| "OSBL #{n}" }
-    sequence(:website) { |n| "https://osbl#{n}.example.com" }
     tax_reduction { "intérêt_général" }
 
     after(:build) do |osbl|
diff --git a/spec/models/annual_finance_spec.rb b/spec/models/annual_finance_spec.rb
index e0759f0..636143f 100644
--- a/spec/models/annual_finance_spec.rb
+++ b/spec/models/annual_finance_spec.rb
@@ -1,9 +1,24 @@
 require "rails_helper"
 
 RSpec.describe AnnualFinance, type: :model do
+  describe "factory" do
+    it "has a valid factory" do
+      expect(build(:annual_finance)).to be_valid
+    end
+  end
+
   describe "validations" do
     let(:osbl) { create(:osbl) }
     subject(:annual_finance) { build(:annual_finance, osbl: osbl) }
+
+    describe "year validation" do
+      it "is invalid with a future year" do
+        annual_finance.year = Time.current.year + 1
+        expect(annual_finance).not_to be_valid
+        expect(annual_finance.errors[:year]).to be_present
+      end
+    end
+
     context "#at_least_one_information" do
       context "when only year is present" do
         before do
@@ -174,5 +189,22 @@
         end
       end
     end
+
+    describe "database constraints" do
+      it "enforces year >= 1000" do
+        annual_finance.year = 999
+        expect { annual_finance.save }.to raise_error(ActiveRecord::StatementInvalid)
+      end
+
+      it "enforces employees_count >= 0" do
+        annual_finance.employees_count = -1
+        expect { annual_finance.save }.to raise_error(ActiveRecord::StatementInvalid)
+      end
+
+      it "enforces budget >= 0" do
+        annual_finance.budget = -1
+        expect { annual_finance.save }.to raise_error(ActiveRecord::StatementInvalid)
+      end
+    end
   end
 end
diff --git a/spec/models/create_document_spec.rb b/spec/models/create_document_spec.rb
deleted file mode 100644
index 626f484..0000000
--- a/spec/models/create_document_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Document, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/document_attachment_spec.rb b/spec/models/document_attachment_spec.rb
index 34dd5b6..63cddce 100644
--- a/spec/models/document_attachment_spec.rb
+++ b/spec/models/document_attachment_spec.rb
@@ -36,7 +36,7 @@
 
       it "prevents attaching the same document twice to the same record" do
         expect {
-          duplicate_attachment = create(:document_attachment, document: document, attachable: osbl)
+          create(:document_attachment, document: document, attachable: osbl)
         }.to raise_error(ActiveRecord::RecordNotUnique)
       end
 
diff --git a/spec/models/fund_allocation_spec.rb b/spec/models/fund_allocation_spec.rb
index 440a924..ab5d762 100644
--- a/spec/models/fund_allocation_spec.rb
+++ b/spec/models/fund_allocation_spec.rb
@@ -1,5 +1,41 @@
 require "rails_helper"
 
 RSpec.describe FundAllocation, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  let(:annual_finance) { create(:annual_finance) }
+
+  describe "factory" do
+    it "is valid" do
+      expect(create(:fund_allocation)).to be_valid
+    end
+  end
+
+  describe "database constraints" do
+    describe "percent constraints" do
+      it "enforces percent > 0" do
+        fund_allocation = build(:fund_allocation, annual_finance: annual_finance, percent: 0)
+        expect { fund_allocation.save }.to raise_error(ActiveRecord::StatementInvalid, /percent_within_range/)
+      end
+
+      it "enforces percent <= 100" do
+        fund_allocation = build(:fund_allocation, annual_finance: annual_finance, percent: 101)
+        expect { fund_allocation.save }.to raise_error(ActiveRecord::StatementInvalid, /percent_within_range/)
+      end
+    end
+
+    describe "amount constraints" do
+      it "enforces amount > 0" do
+        fund_allocation = build(:fund_allocation, annual_finance: annual_finance, amount: 0)
+        expect { fund_allocation.save }.to raise_error(ActiveRecord::StatementInvalid, /amount_positive/)
+      end
+    end
+
+    describe "uniqueness constraints" do
+      it "enforces unique annual_finance_id and type combination" do
+        create(:fund_allocation, annual_finance: annual_finance, type: "Missions sociales")
+        duplicate = build(:fund_allocation, annual_finance: annual_finance, type: "Missions sociales")
+
+        expect { duplicate.save }.to raise_error(ActiveRecord::RecordNotUnique)
+      end
+    end
+  end
 end
diff --git a/spec/models/fund_source_spec.rb b/spec/models/fund_source_spec.rb
index 1380098..6c811ef 100644
--- a/spec/models/fund_source_spec.rb
+++ b/spec/models/fund_source_spec.rb
@@ -1,5 +1,35 @@
 require "rails_helper"
 
 RSpec.describe FundSource, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  let(:annual_finance) { create(:annual_finance) }
+
+  describe "database constraints" do
+    describe "percent constraints" do
+      it "enforces percent > 0" do
+        fund_source = build(:fund_source, annual_finance: annual_finance, percent: 0)
+        expect { fund_source.save }.to raise_error(ActiveRecord::StatementInvalid, /percent_within_range/)
+      end
+
+      it "enforces percent <= 100" do
+        fund_source = build(:fund_source, annual_finance: annual_finance, percent: 101)
+        expect { fund_source.save }.to raise_error(ActiveRecord::StatementInvalid, /percent_within_range/)
+      end
+    end
+
+    describe "amount constraints" do
+      it "enforces amount > 0" do
+        fund_source = build(:fund_source, annual_finance: annual_finance, amount: 0)
+        expect { fund_source.save }.to raise_error(ActiveRecord::StatementInvalid, /amount_positive/)
+      end
+    end
+
+    describe "uniqueness constraints" do
+      it "enforces unique annual_finance_id and type combination" do
+        create(:fund_source, annual_finance: annual_finance, type: "Dons")
+        duplicate = build(:fund_source, annual_finance: annual_finance, type: "Dons")
+
+        expect { duplicate.save }.to raise_error(ActiveRecord::RecordNotUnique)
+      end
+    end
+  end
 end
diff --git a/spec/models/osbl_spec.rb b/spec/models/osbl_spec.rb
index dc5d631..8851895 100644
--- a/spec/models/osbl_spec.rb
+++ b/spec/models/osbl_spec.rb
@@ -1,5 +1,99 @@
 require "rails_helper"
 
 RSpec.describe Osbl, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  subject(:osbl) { build(:osbl) }
+
+  # Factory tests
+  describe "factory" do
+    it "has a valid factory" do
+      expect(osbl).to be_valid
+    end
+  end
+
+  # Validation tests
+  describe "validations" do
+    describe "name" do
+      it "requires name" do
+        osbl.name = nil
+        expect(osbl).not_to be_valid
+        expect(osbl.errors[:name]).to be_present
+      end
+
+      it "requires unique name" do
+        existing_osbl = create(:osbl)
+        osbl.name = existing_osbl.name
+        expect(osbl).not_to be_valid
+        expect(osbl.errors[:name]).to be_present
+      end
+    end
+
+    describe "website" do
+      it "requires unique website if present" do
+        existing_osbl = create(:osbl, website: "https://example.com")
+        osbl.website = existing_osbl.website
+        expect(osbl).not_to be_valid
+        expect(osbl.errors[:website]).to be_present
+      end
+    end
+
+    describe "description" do
+      it "limits description to 300 characters" do
+        osbl.description = "a" * 301
+        expect(osbl).not_to be_valid
+        expect(osbl.errors[:description]).to be_present
+      end
+    end
+
+    it "validates creation_year is not in the future" do
+      osbl.creation_year = Time.current.year + 1
+      expect(osbl).not_to be_valid
+      expect(osbl.errors[:creation_year]).to be_present
+    end
+
+    it "requires at least one cause" do
+      osbl.causes = []
+      expect(osbl).not_to be_valid
+      expect(osbl.errors[:osbls_causes]).to be_present
+    end
+  end
+
+  # Association tests
+  describe "associations" do
+    it "destroys dependent associations" do
+      osbl = create(:osbl)
+      expect { osbl.destroy }.to change { OsblsCause.count }.by(-1)
+    end
+  end
+
+  # Logo attachment validation tests
+  describe "logo attachment" do
+    it "validates logo file size" do
+      osbl.logo.attach(
+        io: StringIO.new("a" * 2.megabytes),
+        filename: "large_logo.png",
+        content_type: "image/png"
+      )
+      expect(osbl).not_to be_valid
+      expect(osbl.errors[:logo]).to be_present
+    end
+
+    it "validates logo content type" do
+      osbl.logo.attach(
+        io: StringIO.new("fake pdf content"),
+        filename: "logo.pdf",
+        content_type: "application/pdf"
+      )
+      expect(osbl).not_to be_valid
+      expect(osbl.errors[:logo]).to be_present
+    end
+  end
+
+  describe "db constraints" do
+    it "creation_year must be 4 digits" do
+      osbl.creation_year = 123
+      expect {
+        osbl.save!
+      }.to raise_error(ActiveRecord::StatementInvalid, /creation_year_as_4_digits/)
+    end
+  end
 end

From 542d2f145f50c7bc3b09b91e805cd30408040ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Tue, 4 Feb 2025 15:19:57 +0000
Subject: [PATCH 28/31] Restructure frontend components and improve file
 organization

- Moved authentication and contribution form components to more organized directory structure
- Refactored shared components like MyInput, MyCheckbox, and InputError
- Updated import paths across frontend files to reflect new component locations
- Improved type safety and component reusability
- Cleaned up test files to match new component paths
---
 .../auth/connection}/ConnectionForm.tsx              |  2 +-
 .../{forms => pages/auth/signIn}/SignInForm.tsx      |  2 +-
 .../{forms => pages/auth/signUp}/SignUpForm.tsx      |  4 ++--
 .../new/{OsblDataSheet.tsx => OsblDatasheet.tsx}     | 12 ++++++------
 .../InterventionAreaAsyncCreatableSelect.tsx         |  0
 .../KeywordAsyncCreatableSelect.tsx                  |  0
 .../pages/contribution/new/OsblDocuments.tsx         |  2 +-
 .../new/{ => OsblDocuments}/OsblDocumentSheet.tsx    |  4 ++--
 .../new/{OsblFinance.tsx => OsblFinances.tsx}        |  4 ++--
 .../new/{ => OsblFinances}/FundManagementSection.tsx |  4 ++--
 .../new/{ => OsblFinances}/OsblFinanceSheet.tsx      |  6 +++---
 .../components/pages/contribution/new/OsblHeader.tsx |  2 +-
 .../pages/contribution/new/OsblLocations.tsx         |  2 +-
 .../new/{ => OsblLocations}/OsblLocationSheet.tsx    |  2 +-
 .../components/{forms => shared}/InputError.tsx      |  0
 .../components/{forms => shared}/MyCheckbox.tsx      |  2 +-
 app/frontend/components/shared/MyFileInput.tsx       |  2 +-
 .../components/{forms => shared}/MyInput.tsx         |  2 +-
 .../components/{forms => shared}/MyNumberInput.tsx   |  2 +-
 app/frontend/pages/Auth/Connection.tsx               |  2 +-
 app/frontend/pages/Auth/SignIn.tsx                   |  2 +-
 app/frontend/pages/Auth/SignUp.tsx                   |  2 +-
 app/frontend/pages/Contribution/New.tsx              |  4 ++--
 app/frontend/tests/components/InputError.test.tsx    |  2 +-
 app/frontend/tests/forms/ConnectionForm.test.tsx     |  2 +-
 app/frontend/tests/forms/SignInForm.test.tsx         |  2 +-
 26 files changed, 35 insertions(+), 35 deletions(-)
 rename app/frontend/components/{forms => pages/auth/connection}/ConnectionForm.tsx (96%)
 rename app/frontend/components/{forms => pages/auth/signIn}/SignInForm.tsx (97%)
 rename app/frontend/components/{forms => pages/auth/signUp}/SignUpForm.tsx (97%)
 rename app/frontend/components/pages/contribution/new/{OsblDataSheet.tsx => OsblDatasheet.tsx} (95%)
 rename app/frontend/components/pages/contribution/new/{ => OsblDatasheet}/InterventionAreaAsyncCreatableSelect.tsx (100%)
 rename app/frontend/components/pages/contribution/new/{ => OsblDatasheet}/KeywordAsyncCreatableSelect.tsx (100%)
 rename app/frontend/components/pages/contribution/new/{ => OsblDocuments}/OsblDocumentSheet.tsx (98%)
 rename app/frontend/components/pages/contribution/new/{OsblFinance.tsx => OsblFinances.tsx} (95%)
 rename app/frontend/components/pages/contribution/new/{ => OsblFinances}/FundManagementSection.tsx (97%)
 rename app/frontend/components/pages/contribution/new/{ => OsblFinances}/OsblFinanceSheet.tsx (97%)
 rename app/frontend/components/pages/contribution/new/{ => OsblLocations}/OsblLocationSheet.tsx (99%)
 rename app/frontend/components/{forms => shared}/InputError.tsx (100%)
 rename app/frontend/components/{forms => shared}/MyCheckbox.tsx (94%)
 rename app/frontend/components/{forms => shared}/MyInput.tsx (97%)
 rename app/frontend/components/{forms => shared}/MyNumberInput.tsx (97%)

diff --git a/app/frontend/components/forms/ConnectionForm.tsx b/app/frontend/components/pages/auth/connection/ConnectionForm.tsx
similarity index 96%
rename from app/frontend/components/forms/ConnectionForm.tsx
rename to app/frontend/components/pages/auth/connection/ConnectionForm.tsx
index a9fa490..f0e2d59 100644
--- a/app/frontend/components/forms/ConnectionForm.tsx
+++ b/app/frontend/components/pages/auth/connection/ConnectionForm.tsx
@@ -1,7 +1,7 @@
 import { ReactElement } from 'react'
 import useFormHandler from '@/hooks/useFormHandler'
 import { z } from 'zod'
-import MyInput from './MyInput'
+import MyInput from '../../../shared/MyInput'
 import { Button } from '@/components/ui/button'
 import { StepForward } from 'lucide-react'
 
diff --git a/app/frontend/components/forms/SignInForm.tsx b/app/frontend/components/pages/auth/signIn/SignInForm.tsx
similarity index 97%
rename from app/frontend/components/forms/SignInForm.tsx
rename to app/frontend/components/pages/auth/signIn/SignInForm.tsx
index e6db47c..2cf170e 100644
--- a/app/frontend/components/forms/SignInForm.tsx
+++ b/app/frontend/components/pages/auth/signIn/SignInForm.tsx
@@ -9,7 +9,7 @@ import {
 } from '@/components/ui/input-otp'
 import { REGEXP_ONLY_DIGITS } from 'input-otp'
 import { z } from 'zod'
-import InputError from '@/components/forms/InputError'
+import InputError from '@/components/shared/InputError'
 import { Button } from '@/components/ui/button'
 import { StepForward } from 'lucide-react'
 import ResendCode from '@/components/pages/auth/signIn/ResendCode'
diff --git a/app/frontend/components/forms/SignUpForm.tsx b/app/frontend/components/pages/auth/signUp/SignUpForm.tsx
similarity index 97%
rename from app/frontend/components/forms/SignUpForm.tsx
rename to app/frontend/components/pages/auth/signUp/SignUpForm.tsx
index cda691c..8f66e4c 100644
--- a/app/frontend/components/forms/SignUpForm.tsx
+++ b/app/frontend/components/pages/auth/signUp/SignUpForm.tsx
@@ -2,8 +2,8 @@ import { useRef, ReactElement, FormEvent } from 'react'
 import { Link } from '@inertiajs/react'
 import useFormHandler from '@/hooks/useFormHandler'
 import { KeysWithStringValues } from '@/types/utilityTypes'
-import MyInput from './MyInput'
-import MyCheckbox from './MyCheckbox'
+import MyInput from '../shared/MyInput'
+import MyCheckbox from '../shared/MyCheckbox'
 import ReCAPTCHA from 'react-google-recaptcha'
 import { Button } from '@/components/ui/button'
 import { StepForward } from 'lucide-react'
diff --git a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx
similarity index 95%
rename from app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
rename to app/frontend/components/pages/contribution/new/OsblDatasheet.tsx
index 08d4aab..117ef81 100644
--- a/app/frontend/components/pages/contribution/new/OsblDataSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx
@@ -5,7 +5,7 @@ import {
 } from '@/components/ui/multi-select'
 import { FormProps } from '@/pages/Contribution/types'
 import { Baby, Stethoscope, Coins, BookMarked, PawPrint, Trees, Church, Microscope, Globe, Accessibility, Scale, Shuffle, Brush } from 'lucide-react'
-import InputError from '@/components/forms/InputError'
+import InputError from '@/components/shared/InputError'
 import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
 import {
   Select,
@@ -15,11 +15,11 @@ import {
   SelectValue
 } from '@/components/ui/select'
 import { usePage } from '@inertiajs/react'
-import KeywordAsyncCreatableSelect from './KeywordAsyncCreatableSelect'
+import KeywordAsyncCreatableSelect from './OsblDatasheet/KeywordAsyncCreatableSelect'
 import HelpTooltip from '@/components/shared/HelpTooltip'
-import InterventionAreaAsyncCreatableSelect from './InterventionAreaAsyncCreatableSelect'
-import MyNumberInput from '@/components/forms/MyNumberInput'
-import MyCheckbox from '@/components/forms/MyCheckbox'
+import InterventionAreaAsyncCreatableSelect from './OsblDatasheet/InterventionAreaAsyncCreatableSelect'
+import MyNumberInput from '@/components/shared/MyNumberInput'
+import MyCheckbox from '@/components/shared/MyCheckbox'
 
 const CausesList = [
   { value: 'environnement', label: 'Environnement', icon: Trees },
@@ -50,7 +50,7 @@ const OsblTypeList = [
   { value: 'fondation', label: 'Fondation' }
 ]
 
-export default function OsblDataSheet ({ data, setData, errors, clearErrors }: Omit<FormProps, 'setError'>): ReactElement {
+export default function OsblDatasheet ({ data, setData, errors, clearErrors }: Omit<FormProps, 'setError'>): ReactElement {
   const causes = usePage().props.causes as Record<string, number>
   const labels = usePage().props.labels as Array<{ value: string, label: string }>
 
diff --git a/app/frontend/components/pages/contribution/new/InterventionAreaAsyncCreatableSelect.tsx b/app/frontend/components/pages/contribution/new/OsblDatasheet/InterventionAreaAsyncCreatableSelect.tsx
similarity index 100%
rename from app/frontend/components/pages/contribution/new/InterventionAreaAsyncCreatableSelect.tsx
rename to app/frontend/components/pages/contribution/new/OsblDatasheet/InterventionAreaAsyncCreatableSelect.tsx
diff --git a/app/frontend/components/pages/contribution/new/KeywordAsyncCreatableSelect.tsx b/app/frontend/components/pages/contribution/new/OsblDatasheet/KeywordAsyncCreatableSelect.tsx
similarity index 100%
rename from app/frontend/components/pages/contribution/new/KeywordAsyncCreatableSelect.tsx
rename to app/frontend/components/pages/contribution/new/OsblDatasheet/KeywordAsyncCreatableSelect.tsx
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index 90e53b6..2e3be84 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -6,7 +6,7 @@ import {
   Sheet,
   SheetTrigger
 } from '@/components/ui/sheet'
-import OsblDocumentSheet from './OsblDocumentSheet'
+import OsblDocumentSheet from './OsblDocuments/OsblDocumentSheet'
 
 export default function OsblDocuments ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
   const documents = data.document_attachments_attributes ?? []
diff --git a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments/OsblDocumentSheet.tsx
similarity index 98%
rename from app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
rename to app/frontend/components/pages/contribution/new/OsblDocuments/OsblDocumentSheet.tsx
index 3ef2acc..cc8dcbc 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocumentSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments/OsblDocumentSheet.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, useRef, useState } from 'react'
 import { Document, FormProps } from '@/pages/Contribution/types'
 import { Button } from '@/components/ui/button'
-import MyInput from '@/components/forms/MyInput'
+import MyInput from '@/components/shared/MyInput'
 import {
   Select,
   SelectContent,
@@ -9,7 +9,7 @@ import {
   SelectTrigger,
   SelectValue
 } from '@/components/ui/select'
-import MyNumberInput from '@/components/forms/MyNumberInput'
+import MyNumberInput from '@/components/shared/MyNumberInput'
 import { Textarea } from '@/components/ui/textarea'
 import MyFileInput from '@/components/shared/MyFileInput'
 import { CheckIcon, ChevronDown, X } from 'lucide-react'
diff --git a/app/frontend/components/pages/contribution/new/OsblFinance.tsx b/app/frontend/components/pages/contribution/new/OsblFinances.tsx
similarity index 95%
rename from app/frontend/components/pages/contribution/new/OsblFinance.tsx
rename to app/frontend/components/pages/contribution/new/OsblFinances.tsx
index 58e8105..559e6b7 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinance.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinances.tsx
@@ -6,9 +6,9 @@ import {
   Sheet,
   SheetTrigger
 } from '@/components/ui/sheet'
-import OsblFinanceSheet from './OsblFinanceSheet'
+import OsblFinanceSheet from './OsblFinances/OsblFinanceSheet'
 
-export default function OsblFinance ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
+export default function OsblFinances ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
   const [sortAscending, setSortAscending] = useState(false)
   const finances = data.annual_finances_attributes ?? []
 
diff --git a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx b/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx
similarity index 97%
rename from app/frontend/components/pages/contribution/new/FundManagementSection.tsx
rename to app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx
index 6a00490..0fcf255 100644
--- a/app/frontend/components/pages/contribution/new/FundManagementSection.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx
@@ -10,8 +10,8 @@ import {
 } from '@/components/ui/select'
 import { PlusIcon, TrashIcon } from 'lucide-react'
 import { Button } from '@/components/ui/button'
-import MyNumberInput from '@/components/forms/MyNumberInput'
-import InputError from '@/components/forms/InputError'
+import MyNumberInput from '@/components/shared/MyNumberInput'
+import InputError from '@/components/shared/InputError'
 import { Separator } from '@/components/ui/separator'
 
 interface FundManagementSectionProps {
diff --git a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx b/app/frontend/components/pages/contribution/new/OsblFinances/OsblFinanceSheet.tsx
similarity index 97%
rename from app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
rename to app/frontend/components/pages/contribution/new/OsblFinances/OsblFinanceSheet.tsx
index 348dbbd..a1b577c 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinanceSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinances/OsblFinanceSheet.tsx
@@ -1,9 +1,9 @@
 import React, { ReactElement, useRef, useState } from 'react'
 import { AnnualFinance, FormProps } from '@/pages/Contribution/types'
-import MyNumberInput from '@/components/forms/MyNumberInput'
+import MyNumberInput from '@/components/shared/MyNumberInput'
 import HelpTooltip from '@/components/shared/HelpTooltip'
-import FundManagementSection from './FundManagementSection'
-import MyCheckbox from '@/components/forms/MyCheckbox'
+import FundManagementSection from '@/components/pages/contribution/new/OsblFinances/FundManagementSection'
+import MyCheckbox from '@/components/shared/MyCheckbox'
 import { Separator } from '@/components/ui/separator'
 import { Button } from '@/components/ui/button'
 import { CheckIcon, X } from 'lucide-react'
diff --git a/app/frontend/components/pages/contribution/new/OsblHeader.tsx b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
index b752a72..8e691a6 100644
--- a/app/frontend/components/pages/contribution/new/OsblHeader.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
@@ -1,6 +1,6 @@
 import { ReactElement } from 'react'
 import { Label } from '@/components/ui/label'
-import MyInput from '@/components/forms/MyInput'
+import MyInput from '@/components/shared/MyInput'
 import { Textarea } from '@/components/ui/textarea'
 import { FormProps } from '@/pages/Contribution/types'
 import HelpTooltip from '@/components/shared/HelpTooltip'
diff --git a/app/frontend/components/pages/contribution/new/OsblLocations.tsx b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
index 7a9918e..dcb9c0b 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocations.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
@@ -6,7 +6,7 @@ import {
   Sheet,
   SheetTrigger
 } from '@/components/ui/sheet'
-import OsblLocationSheet from './OsblLocationSheet'
+import OsblLocationSheet from './OsblLocations/OsblLocationSheet'
 
 export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data' | 'setData'>): ReactElement {
   const locations = data.locations_attributes ?? []
diff --git a/app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx b/app/frontend/components/pages/contribution/new/OsblLocations/OsblLocationSheet.tsx
similarity index 99%
rename from app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx
rename to app/frontend/components/pages/contribution/new/OsblLocations/OsblLocationSheet.tsx
index 5036355..8d2e563 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocationSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocations/OsblLocationSheet.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, useRef, useState } from 'react'
 import { Location } from '@/pages/Contribution/types'
 import { Button } from '@/components/ui/button'
-import MyInput from '@/components/forms/MyInput'
+import MyInput from '@/components/shared/MyInput'
 import {
   Select,
   SelectContent,
diff --git a/app/frontend/components/forms/InputError.tsx b/app/frontend/components/shared/InputError.tsx
similarity index 100%
rename from app/frontend/components/forms/InputError.tsx
rename to app/frontend/components/shared/InputError.tsx
diff --git a/app/frontend/components/forms/MyCheckbox.tsx b/app/frontend/components/shared/MyCheckbox.tsx
similarity index 94%
rename from app/frontend/components/forms/MyCheckbox.tsx
rename to app/frontend/components/shared/MyCheckbox.tsx
index e6f2230..f0ddf91 100644
--- a/app/frontend/components/forms/MyCheckbox.tsx
+++ b/app/frontend/components/shared/MyCheckbox.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, ReactNode } from 'react'
 import { Checkbox } from '@/components/ui/checkbox'
 import { Label } from '@/components/ui/label'
-import InputError from '@/components/forms/InputError'
+import InputError from '@/components/shared/InputError'
 
 interface MyCheckboxProps {
   id?: string
diff --git a/app/frontend/components/shared/MyFileInput.tsx b/app/frontend/components/shared/MyFileInput.tsx
index e5567cc..aae3ae0 100644
--- a/app/frontend/components/shared/MyFileInput.tsx
+++ b/app/frontend/components/shared/MyFileInput.tsx
@@ -1,5 +1,5 @@
 import { ReactElement, useRef, useState } from 'react'
-import MyInput from '../forms/MyInput'
+import MyInput from './MyInput'
 
 interface MyFileInputProps {
   id: string
diff --git a/app/frontend/components/forms/MyInput.tsx b/app/frontend/components/shared/MyInput.tsx
similarity index 97%
rename from app/frontend/components/forms/MyInput.tsx
rename to app/frontend/components/shared/MyInput.tsx
index 5e36823..2237404 100644
--- a/app/frontend/components/forms/MyInput.tsx
+++ b/app/frontend/components/shared/MyInput.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, ReactNode } from 'react'
 import { Label } from '@/components/ui/label'
 import { Input } from '@/components/ui/input'
-import InputError from '@/components/forms/InputError'
+import InputError from '@/components/shared/InputError'
 import { X } from 'lucide-react'
 
 interface BaseMyInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
diff --git a/app/frontend/components/forms/MyNumberInput.tsx b/app/frontend/components/shared/MyNumberInput.tsx
similarity index 97%
rename from app/frontend/components/forms/MyNumberInput.tsx
rename to app/frontend/components/shared/MyNumberInput.tsx
index 6682d6c..d2b4a3b 100644
--- a/app/frontend/components/forms/MyNumberInput.tsx
+++ b/app/frontend/components/shared/MyNumberInput.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, ReactNode } from 'react'
 import { Label } from '@/components/ui/label'
 import { Input } from '@/components/ui/input'
-import InputError from '@/components/forms/InputError'
+import InputError from '@/components/shared/InputError'
 
 interface BaseMyNumberInputProps {
   required?: boolean
diff --git a/app/frontend/pages/Auth/Connection.tsx b/app/frontend/pages/Auth/Connection.tsx
index 2451d4c..91ddeca 100644
--- a/app/frontend/pages/Auth/Connection.tsx
+++ b/app/frontend/pages/Auth/Connection.tsx
@@ -1,6 +1,6 @@
 import { Head } from '@inertiajs/react'
 import { ReactElement } from 'react'
-import ConnectionForm from '@/components/forms/ConnectionForm'
+import ConnectionForm from '@/components/pages/auth/connection/ConnectionForm'
 import QuoteSection from '@/components/pages/QuoteSection'
 // @ts-expect-error
 import Superwoman from '@/assets/images/auth/superwoman.svg?react'
diff --git a/app/frontend/pages/Auth/SignIn.tsx b/app/frontend/pages/Auth/SignIn.tsx
index e8997ee..1394cc8 100644
--- a/app/frontend/pages/Auth/SignIn.tsx
+++ b/app/frontend/pages/Auth/SignIn.tsx
@@ -1,7 +1,7 @@
 import { ReactElement, useEffect } from 'react'
 import { router, Head } from '@inertiajs/react'
 import QuoteSection from '@/components/pages/QuoteSection'
-import SignInForm from '@/components/forms/SignInForm'
+import SignInForm from '@/components/pages/auth/signIn/SignInForm'
 
 export default function SignIn (): ReactElement {
   const email = sessionStorage.getItem('email') ?? ''
diff --git a/app/frontend/pages/Auth/SignUp.tsx b/app/frontend/pages/Auth/SignUp.tsx
index 6ac44e1..ce9ecf3 100644
--- a/app/frontend/pages/Auth/SignUp.tsx
+++ b/app/frontend/pages/Auth/SignUp.tsx
@@ -1,6 +1,6 @@
 import { Head, router } from '@inertiajs/react'
 import { ReactElement, useEffect } from 'react'
-import SignUpForm from '@/components/forms/SignUpForm'
+import SignUpForm from '@/components/pages/auth/signUp/SignUpForm'
 import QuoteSection from '@/components/pages/QuoteSection'
 // @ts-expect-error
 import Vomi from '@/assets/images/auth/vomi.svg?react'
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index e545983..b055643 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -6,8 +6,8 @@ import GoodIdea from '@/assets/icons/good-idea.svg?react'
 import { Button } from '@/components/ui/button'
 import { Save } from 'lucide-react'
 import OsblHeader from '@/components/pages/contribution/new/OsblHeader'
-import OsblDataSheet from '@/components/pages/contribution/new/OsblDataSheet'
-import OsblFinance from '@/components/pages/contribution/new/OsblFinance'
+import OsblDataSheet from '@/components/pages/contribution/new/OsblDatasheet'
+import OsblFinance from '@/components/pages/contribution/new/OsblFinances'
 import OsblDocuments from '@/components/pages/contribution/new/OsblDocuments'
 import OsblLocations from '@/components/pages/contribution/new/OsblLocations'
 import { CurrentUserType } from '@/types/types'
diff --git a/app/frontend/tests/components/InputError.test.tsx b/app/frontend/tests/components/InputError.test.tsx
index 3a2a7d8..878e7cb 100644
--- a/app/frontend/tests/components/InputError.test.tsx
+++ b/app/frontend/tests/components/InputError.test.tsx
@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react'
-import InputError from '@/components/forms/InputError'
+import InputError from '@/components/shared/InputError'
 import { describe, it, expect } from 'vitest'
 
 describe('InputError', () => {
diff --git a/app/frontend/tests/forms/ConnectionForm.test.tsx b/app/frontend/tests/forms/ConnectionForm.test.tsx
index 90968b7..b1edcd8 100644
--- a/app/frontend/tests/forms/ConnectionForm.test.tsx
+++ b/app/frontend/tests/forms/ConnectionForm.test.tsx
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach, Mock } from 'vitest'
 import { render, screen, fireEvent, waitFor } from '@testing-library/react'
-import ConnectionForm from '@/components/forms/ConnectionForm'
+import ConnectionForm from '@/components/pages/auth/connection/ConnectionForm'
 import useFormHandler from '@/hooks/useFormHandler'
 
 // Mock useFormHandler hook
diff --git a/app/frontend/tests/forms/SignInForm.test.tsx b/app/frontend/tests/forms/SignInForm.test.tsx
index d43807a..2ae0f28 100644
--- a/app/frontend/tests/forms/SignInForm.test.tsx
+++ b/app/frontend/tests/forms/SignInForm.test.tsx
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach, Mock } from 'vitest'
 import { render, screen, fireEvent } from '@testing-library/react'
-import SignInForm from '@/components/forms/SignInForm'
+import SignInForm from '@/components/pages/auth/signIn/SignInForm'
 import useFormHandler from '@/hooks/useFormHandler'
 
 // Mock sessionStorage

From 65be67f9101ee3c6c2007cc9b645b0fd96aeadf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Tue, 4 Feb 2025 15:20:13 +0000
Subject: [PATCH 29/31] Improve type safety for form errors and data handling

- Updated type definitions for form errors to use Partial<Record>
- Added StrictForm type to enforce FormDataConvertible constraints
- Refined type annotations in contribution form and related components
---
 .../new/OsblFinances/FundManagementSection.tsx           | 2 +-
 app/frontend/pages/Contribution/New.tsx                  | 9 ++++++++-
 app/frontend/pages/Contribution/types.ts                 | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx b/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx
index 0fcf255..c2887d5 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx
@@ -20,7 +20,7 @@ interface FundManagementSectionProps {
   typeList: string[]
   baseErrorPath: string
   onUpdate: (items: Array<Partial<FundRecord>>) => void
-  errors: Record<string, string>
+  errors: Partial<Record<string, string>>
   clearErrors: (path: string) => void
 }
 
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index b055643..11bd145 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -15,6 +15,7 @@ import { FormData } from './types'
 import z from 'zod'
 import deepCleanData from '@/lib/deepCleanData'
 import { toast } from 'sonner'
+import { FormDataConvertible } from '@inertiajs/core'
 
 const MAX_LOGO_SIZE = 1 * 1024 * 1024 // 1MB
 const ALLOWED_LOGO_TYPES = ['image/svg', 'image/png', 'image/webp']
@@ -33,8 +34,14 @@ const validation = z.object({
   tax_reduction: z.enum(['intérêt_général', 'aide_aux_personnes_en_difficulté'], { message: 'Veuillez sélectionner un pourcentage.' })
 })
 
+type StrictForm<T> = T & {
+  [K in keyof T]: T[K] extends FormDataConvertible ? T[K] : never
+} & {
+  [key: string]: FormDataConvertible
+}
+
 export default function New ({ currentUser }: { currentUser: CurrentUserType }): ReactElement {
-  const { data, setData, post, processing, errors, clearErrors, setError, transform } = useForm<FormData>({
+  const { data, setData, post, processing, errors, clearErrors, setError, transform } = useForm<StrictForm<FormData>>({
     name: '',
     osbls_causes_attributes: [],
     tax_reduction: ''
diff --git a/app/frontend/pages/Contribution/types.ts b/app/frontend/pages/Contribution/types.ts
index cde9f92..dd8ce13 100644
--- a/app/frontend/pages/Contribution/types.ts
+++ b/app/frontend/pages/Contribution/types.ts
@@ -70,7 +70,7 @@ export interface FormData {
 export interface FormProps {
   data: FormData
   setData: (key: keyof FormData | string, value: FormData[keyof FormData] | any) => void
-  errors: Record<keyof FormData | string, string>
+  errors: Partial<Record<keyof FormData | string, string>>
   clearErrors: (...fields: Array<keyof FormData | any>) => void
   setError: (field: string, error: any) => void
 }

From 4aa773874e0107b26b22bf872afced178b58dd25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Tue, 4 Feb 2025 16:01:40 +0000
Subject: [PATCH 30/31] Refactor frontend imports and improve type definitions

- Updated import paths to use absolute imports with @/ prefix
- Simplified and improved type definitions in Layout and inertiaConfig
- Adjusted component props and type annotations for better type safety
- Cleaned up import statements across multiple frontend components
---
 app/frontend/Layout.tsx                       |  6 ++--
 .../pages/auth/connection/ConnectionForm.tsx  |  2 +-
 .../pages/auth/signUp/SignUpForm.tsx          |  4 +--
 .../pages/contribution/new/OsblDatasheet.tsx  |  4 +--
 .../pages/contribution/new/OsblDocuments.tsx  |  2 +-
 .../pages/contribution/new/OsblFinances.tsx   |  2 +-
 .../pages/contribution/new/OsblLocations.tsx  |  2 +-
 .../components/shared/MyFileInput.tsx         |  2 +-
 app/frontend/components/shared/MyInput.tsx    |  2 +-
 app/frontend/lib/inertiaConfig.ts             | 36 ++++++++++---------
 app/frontend/pages/Contribution/New.tsx       |  2 +-
 11 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/app/frontend/Layout.tsx b/app/frontend/Layout.tsx
index 9e0673d..c070103 100644
--- a/app/frontend/Layout.tsx
+++ b/app/frontend/Layout.tsx
@@ -9,9 +9,9 @@ import { SidebarProvider, SidebarTrigger } from '@/components/ui/sidebar'
 const flashTypes = ['message', 'success', 'info', 'warning', 'error'] as const
 
 interface LayoutProps {
-  children: ReactElement
-  showSidebar?: boolean
-  flash: { [key in typeof flashTypes[number]]?: string }
+  showSidebar: boolean
+  flash: any
+  children?: ReactElement
 }
 
 export default function Layout ({
diff --git a/app/frontend/components/pages/auth/connection/ConnectionForm.tsx b/app/frontend/components/pages/auth/connection/ConnectionForm.tsx
index f0e2d59..f46ce24 100644
--- a/app/frontend/components/pages/auth/connection/ConnectionForm.tsx
+++ b/app/frontend/components/pages/auth/connection/ConnectionForm.tsx
@@ -1,7 +1,7 @@
 import { ReactElement } from 'react'
 import useFormHandler from '@/hooks/useFormHandler'
 import { z } from 'zod'
-import MyInput from '../../../shared/MyInput'
+import MyInput from '@/components/shared/MyInput'
 import { Button } from '@/components/ui/button'
 import { StepForward } from 'lucide-react'
 
diff --git a/app/frontend/components/pages/auth/signUp/SignUpForm.tsx b/app/frontend/components/pages/auth/signUp/SignUpForm.tsx
index 8f66e4c..2d383b0 100644
--- a/app/frontend/components/pages/auth/signUp/SignUpForm.tsx
+++ b/app/frontend/components/pages/auth/signUp/SignUpForm.tsx
@@ -2,8 +2,8 @@ import { useRef, ReactElement, FormEvent } from 'react'
 import { Link } from '@inertiajs/react'
 import useFormHandler from '@/hooks/useFormHandler'
 import { KeysWithStringValues } from '@/types/utilityTypes'
-import MyInput from '../shared/MyInput'
-import MyCheckbox from '../shared/MyCheckbox'
+import MyInput from '@/components/shared/MyInput'
+import MyCheckbox from '@/components/shared/MyCheckbox'
 import ReCAPTCHA from 'react-google-recaptcha'
 import { Button } from '@/components/ui/button'
 import { StepForward } from 'lucide-react'
diff --git a/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx b/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx
index 117ef81..bbd1fa8 100644
--- a/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx
@@ -15,9 +15,9 @@ import {
   SelectValue
 } from '@/components/ui/select'
 import { usePage } from '@inertiajs/react'
-import KeywordAsyncCreatableSelect from './OsblDatasheet/KeywordAsyncCreatableSelect'
+import KeywordAsyncCreatableSelect from '@/components/pages/contribution/new/OsblDatasheet/KeywordAsyncCreatableSelect'
 import HelpTooltip from '@/components/shared/HelpTooltip'
-import InterventionAreaAsyncCreatableSelect from './OsblDatasheet/InterventionAreaAsyncCreatableSelect'
+import InterventionAreaAsyncCreatableSelect from '@/components/pages/contribution/new/OsblDatasheet/InterventionAreaAsyncCreatableSelect'
 import MyNumberInput from '@/components/shared/MyNumberInput'
 import MyCheckbox from '@/components/shared/MyCheckbox'
 
diff --git a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
index 2e3be84..bb29cc6 100644
--- a/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDocuments.tsx
@@ -6,7 +6,7 @@ import {
   Sheet,
   SheetTrigger
 } from '@/components/ui/sheet'
-import OsblDocumentSheet from './OsblDocuments/OsblDocumentSheet'
+import OsblDocumentSheet from '@/components/pages/contribution/new/OsblDocuments/OsblDocumentSheet'
 
 export default function OsblDocuments ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
   const documents = data.document_attachments_attributes ?? []
diff --git a/app/frontend/components/pages/contribution/new/OsblFinances.tsx b/app/frontend/components/pages/contribution/new/OsblFinances.tsx
index 559e6b7..1e26534 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinances.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinances.tsx
@@ -6,7 +6,7 @@ import {
   Sheet,
   SheetTrigger
 } from '@/components/ui/sheet'
-import OsblFinanceSheet from './OsblFinances/OsblFinanceSheet'
+import OsblFinanceSheet from '@/components/pages/contribution/new/OsblFinances/OsblFinanceSheet'
 
 export default function OsblFinances ({ data, setData, errors, clearErrors, setError }: FormProps): ReactElement {
   const [sortAscending, setSortAscending] = useState(false)
diff --git a/app/frontend/components/pages/contribution/new/OsblLocations.tsx b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
index dcb9c0b..5686375 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocations.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocations.tsx
@@ -6,7 +6,7 @@ import {
   Sheet,
   SheetTrigger
 } from '@/components/ui/sheet'
-import OsblLocationSheet from './OsblLocations/OsblLocationSheet'
+import OsblLocationSheet from '@/components/pages/contribution/new/OsblLocations/OsblLocationSheet'
 
 export default function OsblLocations ({ data, setData }: Pick<FormProps, 'data' | 'setData'>): ReactElement {
   const locations = data.locations_attributes ?? []
diff --git a/app/frontend/components/shared/MyFileInput.tsx b/app/frontend/components/shared/MyFileInput.tsx
index aae3ae0..9a8df6c 100644
--- a/app/frontend/components/shared/MyFileInput.tsx
+++ b/app/frontend/components/shared/MyFileInput.tsx
@@ -1,5 +1,5 @@
 import { ReactElement, useRef, useState } from 'react'
-import MyInput from './MyInput'
+import MyInput from '@/components/shared/MyInput'
 
 interface MyFileInputProps {
   id: string
diff --git a/app/frontend/components/shared/MyInput.tsx b/app/frontend/components/shared/MyInput.tsx
index 2237404..f6d4fcc 100644
--- a/app/frontend/components/shared/MyInput.tsx
+++ b/app/frontend/components/shared/MyInput.tsx
@@ -17,7 +17,7 @@ interface WithLabel extends BaseMyInputProps {
 }
 
 interface WithoutLabel extends BaseMyInputProps {
-  labelText: never
+  labelText?: never
   placeholder: string
 }
 
diff --git a/app/frontend/lib/inertiaConfig.ts b/app/frontend/lib/inertiaConfig.ts
index 194092e..14090e2 100644
--- a/app/frontend/lib/inertiaConfig.ts
+++ b/app/frontend/lib/inertiaConfig.ts
@@ -1,29 +1,31 @@
-import { createElement } from 'react'
-import type { ResolvedComponent } from '@inertiajs/react'
+import { createElement, ReactElement } from 'react'
+import type { PageResolver } from '@inertiajs/core'
 import Layout from '@/Layout'
 
+interface ResolvedComponent {
+  default: {
+    layout: (pageContent: ReactElement & { props: { flash?: any } }) => ReactElement
+  }
+}
+
 export const getTitle = (title: string | null): string =>
-  title ? `${title} | Benefactorum` : 'Benefactorum'
+  title !== null ? `${title} | Benefactorum` : 'Benefactorum'
 
-export const resolvePage = (name: string): ResolvedComponent => {
+export const resolvePage: PageResolver = (name) => {
   const pages = import.meta.glob<ResolvedComponent>(
     '../pages/**/!(*.test).tsx',
     { eager: true }
   )
-  const page = pages[`../pages/${name}.tsx`] as {
-    default: { layout?: (page: JSX.Element) => JSX.Element }
-  }
-  if (!page) {
+  const page = pages[`../pages/${name}.tsx`]
+
+  if (page === undefined) {
     console.error(`Missing Inertia page component: '${name}.tsx'`)
   }
-  page.default.layout = (page) =>
-    createElement(
-      Layout,
-      {
-        showSidebar: name.startsWith('Contribution/'),
-        flash: page.props.flash
-      },
-      page
-    )
+
+  page.default.layout = (pageContent) =>
+    createElement(Layout, {
+      showSidebar: name.startsWith('Contribution/'),
+      flash: pageContent.props?.flash
+    }, pageContent)
   return page
 }
diff --git a/app/frontend/pages/Contribution/New.tsx b/app/frontend/pages/Contribution/New.tsx
index 11bd145..9da44db 100644
--- a/app/frontend/pages/Contribution/New.tsx
+++ b/app/frontend/pages/Contribution/New.tsx
@@ -11,7 +11,7 @@ import OsblFinance from '@/components/pages/contribution/new/OsblFinances'
 import OsblDocuments from '@/components/pages/contribution/new/OsblDocuments'
 import OsblLocations from '@/components/pages/contribution/new/OsblLocations'
 import { CurrentUserType } from '@/types/types'
-import { FormData } from './types'
+import { FormData } from '@/pages/Contribution/types'
 import z from 'zod'
 import deepCleanData from '@/lib/deepCleanData'
 import { toast } from 'sonner'

From 9ee774bdbef6253a586ef8a154d8f67583ef3014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilien=20Pressens=C3=A9?= <maximilien.pressense@hey.com>
Date: Tue, 4 Feb 2025 16:55:50 +0000
Subject: [PATCH 31/31] Improve type safety and input validation across
 frontend components

- Enhanced type definitions in Layout, OsblDatasheet, and other components
- Updated input types for website and URL fields with placeholders
- Refined type annotations in MyAsyncSelect and other shared components
- Improved error handling and type safety in various form input methods
- Updated Inertia page resolution to throw an error for missing pages
- Cleaned up commented-out validation and code comments
---
 app/frontend/Layout.tsx                                  | 4 ++--
 .../components/pages/contribution/new/OsblDatasheet.tsx  | 4 ++--
 .../new/OsblFinances/FundManagementSection.tsx           | 2 +-
 .../contribution/new/OsblFinances/OsblFinanceSheet.tsx   | 1 -
 .../components/pages/contribution/new/OsblHeader.tsx     | 3 ++-
 .../contribution/new/OsblLocations/OsblLocationSheet.tsx | 9 ++++++---
 app/frontend/components/shared/MyAsyncSelect.tsx         | 2 +-
 app/frontend/components/shared/MyFileInput.tsx           | 3 ---
 app/frontend/lib/inertiaConfig.ts                        | 2 +-
 app/models/location.rb                                   | 1 -
 spec/rails_helper.rb                                     | 1 -
 11 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/frontend/Layout.tsx b/app/frontend/Layout.tsx
index c070103..ed6a8dd 100644
--- a/app/frontend/Layout.tsx
+++ b/app/frontend/Layout.tsx
@@ -10,13 +10,13 @@ const flashTypes = ['message', 'success', 'info', 'warning', 'error'] as const
 
 interface LayoutProps {
   showSidebar: boolean
-  flash: any
+  flash: { [key in typeof flashTypes[number]]?: string }
   children?: ReactElement
 }
 
 export default function Layout ({
   children,
-  showSidebar = false,
+  showSidebar,
   flash = {}
 }: LayoutProps): ReactElement {
   useEffect(() => {
diff --git a/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx b/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx
index bbd1fa8..21009fc 100644
--- a/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblDatasheet.tsx
@@ -84,8 +84,8 @@ export default function OsblDatasheet ({ data, setData, errors, clearErrors }: O
         <div className='flex flex-col gap-4'>
           <Label>Réduction d'impôt * :</Label>
           <RadioGroup
-            required // doesn't work as expected
-            value={String(data.tax_reduction)}
+            required // doesn't work. Comment kept for reference
+            value={data.tax_reduction}
             onValueChange={(value) => {
               setData('tax_reduction', value)
               clearErrors('tax_reduction')
diff --git a/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx b/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx
index c2887d5..91ee99c 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinances/FundManagementSection.tsx
@@ -33,7 +33,7 @@ export default function FundManagementSection ({
   errors,
   clearErrors
 }: FundManagementSectionProps): ReactElement {
-  function handleFundChange (index: number, field: keyof FundRecord, value: any): void {
+  function handleFundChange (index: number, field: keyof FundRecord, value: FundRecord[keyof FundRecord]): void {
     const updatedItems = items.map((item: FundRecord, i: number) =>
       i === index ? { ...item, [field]: value } : item
     )
diff --git a/app/frontend/components/pages/contribution/new/OsblFinances/OsblFinanceSheet.tsx b/app/frontend/components/pages/contribution/new/OsblFinances/OsblFinanceSheet.tsx
index a1b577c..324932a 100644
--- a/app/frontend/components/pages/contribution/new/OsblFinances/OsblFinanceSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblFinances/OsblFinanceSheet.tsx
@@ -25,7 +25,6 @@ interface Props extends Omit<FormProps, 'setData'> {
   onUpdate: (finance: AnnualFinance) => void
 }
 
-// Fix the return type and validation
 const financeValidation = (data: AnnualFinance[], currentIndex: number): z.ZodType<any> => z.object({
   year: z.string().refine(
     (year) =>
diff --git a/app/frontend/components/pages/contribution/new/OsblHeader.tsx b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
index 8e691a6..67a507f 100644
--- a/app/frontend/components/pages/contribution/new/OsblHeader.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblHeader.tsx
@@ -26,8 +26,9 @@ export default function OsblHeader ({ data, setData, errors, clearErrors }: Omit
 
         <MyInput
           id='website'
-          type='text'
+          type='url'
           labelText='Site internet :'
+          placeholder='https://'
           value={data.website ?? ''}
           onChange={(e) => {
             setData('website', e.target.value)
diff --git a/app/frontend/components/pages/contribution/new/OsblLocations/OsblLocationSheet.tsx b/app/frontend/components/pages/contribution/new/OsblLocations/OsblLocationSheet.tsx
index 8d2e563..22ee815 100644
--- a/app/frontend/components/pages/contribution/new/OsblLocations/OsblLocationSheet.tsx
+++ b/app/frontend/components/pages/contribution/new/OsblLocations/OsblLocationSheet.tsx
@@ -54,7 +54,7 @@ export default function OsblLocationSheet ({
     return checks.some(check => check)
   })
 
-  function updateSheetLocation (field: keyof Location, value: any): void {
+  function updateSheetLocation<K extends keyof Location> (field: K, value: Location[K]): void {
     setSheetLocation(prev => ({
       ...prev,
       [field]: value
@@ -79,13 +79,15 @@ export default function OsblLocationSheet ({
     onUpdate(deepCleanData(sheetLocation))
   }
 
-  function getLabel (): string {
-    return [
+  function getLabel (): string | undefined {
+    const label = [
       sheetLocation.address_attributes?.street_number,
       sheetLocation.address_attributes?.street_name,
       sheetLocation.address_attributes?.postal_code,
       sheetLocation.address_attributes?.city
     ].filter(Boolean).join(' ')
+
+    return label.length > 0 ? label : undefined
   }
 
   return (
@@ -174,6 +176,7 @@ export default function OsblLocationSheet ({
                 <MyInput
                   labelText='Site web'
                   type='url'
+                  placeholder='https://'
                   id={`location-website-${index}`}
                   value={sheetLocation.website ?? ''}
                   onChange={(e) => updateSheetLocation('website', e.target.value)}
diff --git a/app/frontend/components/shared/MyAsyncSelect.tsx b/app/frontend/components/shared/MyAsyncSelect.tsx
index 726a7c5..9a5dfec 100644
--- a/app/frontend/components/shared/MyAsyncSelect.tsx
+++ b/app/frontend/components/shared/MyAsyncSelect.tsx
@@ -31,7 +31,7 @@ interface MyAsyncCreatableSelectProps {
   minInputLength?: number
   placeholder?: string
   required?: boolean
-  value: string
+  value: string | undefined
 }
 
 const createOption = (feature: AddressFeature): Option => ({
diff --git a/app/frontend/components/shared/MyFileInput.tsx b/app/frontend/components/shared/MyFileInput.tsx
index 9a8df6c..a53ff61 100644
--- a/app/frontend/components/shared/MyFileInput.tsx
+++ b/app/frontend/components/shared/MyFileInput.tsx
@@ -33,9 +33,6 @@ export default function MyFileInput ({
     if (inputRef.current != null) {
       inputRef.current.value = ''
       setHasFile(false)
-      // Trigger onChange with a fake event to notify parent component
-      const event = new Event('change', { bubbles: true }) as unknown as React.ChangeEvent<HTMLInputElement>
-      Object.defineProperty(event, 'target', { value: { value: '', files: null } })
     }
     onChange(undefined)
   }
diff --git a/app/frontend/lib/inertiaConfig.ts b/app/frontend/lib/inertiaConfig.ts
index 14090e2..d4ad4b1 100644
--- a/app/frontend/lib/inertiaConfig.ts
+++ b/app/frontend/lib/inertiaConfig.ts
@@ -19,7 +19,7 @@ export const resolvePage: PageResolver = (name) => {
   const page = pages[`../pages/${name}.tsx`]
 
   if (page === undefined) {
-    console.error(`Missing Inertia page component: '${name}.tsx'`)
+    throw new Error(`Page ${name}.tsx not found`)
   }
 
   page.default.layout = (pageContent) =>
diff --git a/app/models/location.rb b/app/models/location.rb
index e087fb6..b40c890 100644
--- a/app/models/location.rb
+++ b/app/models/location.rb
@@ -13,7 +13,6 @@ class Location < ApplicationRecord
 
   validates :address, presence: true
   # validates :type, presence: true
-  # validates :name, exclusion: {in: [""]}, allow_nil: true
   # validates :name, presence: true, if: -> { type.in?(%i[antenne_locale lieu_d_activite autre]) }
   # validates :osbl, uniqueness: {scope: :type, if: -> { type == "siege_social" }}
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 3af4779..c199f85 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -38,7 +38,6 @@
   abort e.to_s.strip
 end
 RSpec.configure do |config|
-  # config.include ActionDispatch::TestProcess # for fixture_file_upload
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_paths = [
     Rails.root.join("spec/fixtures")