Osbl creation fourth panel locations

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/[email protected]
 
       - 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/[email protected]
 
       - 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/[email protected]
 
       - 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/[email protected]
 
       - 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
 

.github/workflows/deploy-review.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/[email protected]
 
       - 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

.github/workflows/deploy-staging.yml

@@ -25,7 +25,7 @@ jobs:
         uses: actions/[email protected]
 
       - 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

.github/workflows/deploy.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/[email protected]
 
       - 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

.github/workflows/remove-review.yml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/[email protected]
 
       - 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

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"

Gemfile.lock

@@ -77,16 +77,16 @@ 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)
       jmespath (~> 1, >= 1.6.1)
     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

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
 
@@ -51,7 +55,6 @@ def osbl_params
         :public_utility,
         :creation_year,
         {osbls_labels_attributes: [:label_id]},
-        :contact_email,
         {annual_finances_attributes: [
           :year,
           :certified,
@@ -77,6 +80,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

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 ({

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,
@@ -9,7 +10,8 @@ import {
   SidebarGroupContent,
   SidebarMenu,
   SidebarMenuButton,
-  SidebarMenuItem
+  SidebarMenuItem,
+  useSidebar
 } from '@/components/ui/sidebar'
 
 const items = [
@@ -32,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>
@@ -42,17 +51,18 @@ export default function AppSidebar (): ReactElement {
               {items.map((item) => (
                 <SidebarMenuItem key={item.title}>
                   <SidebarMenuButton asChild>
-                    <Link
+                    <MyLink
                       href={item.url}
                       className={
                         url === item.url
                           ? ' bg-secondary'
                           : ' hover:bg-secondary/50'
                       }
+                      onClick={handleClick}
                     >
                       <item.icon />
                       <span className='font-semibold'>{item.title}</span>
-                    </Link>
+                    </MyLink>
                   </SidebarMenuButton>
                 </SidebarMenuItem>
               ))}