Merge branch 'main' into 4241-change-agency-type-to-enum

Author: Benjamin-Couey

Gemfile

@@ -10,7 +10,7 @@ end
 # User management and login workflow.
 gem "devise", '>= 4.7.1'
 # Postgres database adapter.
-gem "pg", "~> 1.5.7"
+gem "pg", "~> 1.5.9"
 # Web server.
 gem "puma"
 # Rails web framework.
@@ -24,7 +24,7 @@ gem 'azure-storage-blob'
 # Adds soft delete functionality for models.
 gem 'discard', '~> 1.3'
 # Adds grouping by date/month/etc to queries.
-gem "groupdate", "~> 6.4"
+gem "groupdate", "~> 6.5"
 # Treats attributes like money, which knows about dollars and cents.
 gem "money-rails"
 # Tracks history / audits models.
@@ -184,6 +184,12 @@ group :development do
   gem "rails-erd"
   # Allows to create a console in the browser.
   gem "web-console"
+  # Middleware that displays speed badge for every HTML page
+  gem "rack-mini-profiler"
+  # Adds memory profiling to rack-mini-profiler
+  gem "memory_profiler"
+  # Adds call-stack profiling flamegraphs to rack-mini-profiler
+  gem "stackprof"
 end
 
 group :test do

Gemfile.lock

@@ -115,12 +115,12 @@ GEM
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.6, < 3)
       sassc-rails (>= 2.0.0)
-    brakeman (6.2.1)
+    brakeman (7.0.0)
       racc
     bugsnag (6.27.1)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
-    bullet (7.2.0)
+    bullet (8.0.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     capybara (3.40.0)
@@ -141,13 +141,13 @@ GEM
       activesupport
       tzinfo
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
-    csv (3.3.0)
+    csv (3.3.2)
     cuprite (0.15.1)
       capybara (~> 3.0)
       ferrum (~> 0.15.0)
@@ -272,13 +272,13 @@ GEM
       sanitize (< 7)
     foreman (0.88.1)
     formatador (1.1.0)
-    geocoder (1.8.3)
+    geocoder (1.8.5)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    groupdate (6.4.0)
-      activesupport (>= 6.1)
+    groupdate (6.5.1)
+      activesupport (>= 7)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -300,7 +300,7 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     icalendar (2.10.3)
       ice_cube (~> 0.16)
@@ -338,7 +338,7 @@ GEM
     kaminari-core (1.2.2)
     knapsack_pro (7.13.1)
       rake
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.4)
     launchy (3.0.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
@@ -348,7 +348,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.4)
+    logger (1.6.5)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -370,6 +370,7 @@ GEM
       net-smtp
     marcel (1.0.4)
     matrix (0.4.2)
+    memory_profiler (1.1.0)
     method_source (1.1.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
@@ -447,7 +448,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     pdf-core (0.10.0)
@@ -457,7 +458,7 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.5.7)
+    pg (1.5.9)
     popper_js (2.11.8)
     prawn (2.5.0)
       matrix (~> 0.4)
@@ -490,10 +491,12 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.1.8)
+    rack-mini-profiler (3.3.1)
+      rack (>= 1.2.0)
     rack-protection (4.0.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0, < 4)
@@ -548,8 +551,8 @@ GEM
       ffi (~> 1.0)
     rdoc (6.10.0)
       psych (>= 4.0.0)
-    recaptcha (5.17.0)
-    regexp_parser (2.9.3)
+    recaptcha (5.19.0)
+    regexp_parser (2.10.0)
     reline (0.6.0)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -581,7 +584,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.69.2)
+    rubocop (1.70.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -591,9 +594,9 @@ 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.0)
+    rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.25.1)
@@ -657,10 +660,11 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    standard (1.43.0)
+    stackprof (0.2.27)
+    standard (1.44.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.69.1)
+      rubocop (~> 1.70.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.6)
     standard-custom (1.0.2)
@@ -677,7 +681,7 @@ GEM
     stringio (3.1.2)
     strong_migrations (1.8.0)
       activerecord (>= 5.2)
-    terser (1.2.4)
+    terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.2.0)
@@ -689,7 +693,7 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.2)
+    unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uniform_notifier (1.16.0)
@@ -760,7 +764,7 @@ DEPENDENCIES
   flipper-ui
   foreman
   geocoder
-  groupdate (~> 6.4)
+  groupdate (~> 6.5)
   guard-rspec
   httparty
   icalendar
@@ -775,6 +779,7 @@ DEPENDENCIES
   lograge
   magic_test
   matrix
+  memory_profiler
   money-rails
   newrelic_rpm
   nokogiri (>= 1.10.4)
@@ -784,13 +789,14 @@ DEPENDENCIES
   orderly (~> 0.1)
   paper_trail
   pdf-reader
-  pg (~> 1.5.7)
+  pg (~> 1.5.9)
   prawn-rails
   pry-doc
   pry-nav
   pry-rails
   pry-remote
   puma
+  rack-mini-profiler
   rails (= 7.2.2)
   rails-controller-testing
   rails-erd
@@ -806,6 +812,7 @@ DEPENDENCIES
   simplecov
   solid_cache (~> 1.0)
   sprockets (~> 4.2.1)
+  stackprof
   standard (~> 1.40)
   standard-performance
   standard-rails

app/javascript/application.js

@@ -35,6 +35,11 @@ import 'utils/purchases'
 
 import Rails from "@rails/ujs"
 Rails.start()
+
+// Initialize Active Storage
+import * as ActiveStorage from "@rails/activestorage";
+ActiveStorage.start();
+
 // Disable turbo by default to avoid issues with turbolinks
 Turbo.session.drive = false
 
@@ -107,4 +112,3 @@ $(document).ready(function(){
     });
     picker.setDateRange(startDate, endDate);
 });
-

app/javascript/controllers/file_input_label_controller.js

@@ -0,0 +1,49 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="file-input-label"
+//
+// Reproduces the native browser behavior of updating a file input label
+// to show the selected file's name. This is necessary when using a custom
+// file input, such as with Bootstrap, that does not update automatically.
+//
+// Key Features:
+// 1. Handles initial display of a default label text (e.g., "Choose file..." or
+//    the previously selected file name if present).
+// 2. Updates the label dynamically when a new file is selected.
+//
+// How it works:
+// - When a file is selected, the `fileSelected` method updates the text of the
+//   label to reflect the name of the selected file.
+// - On page load, the `connect` method ensures the label is initialized to the
+//   correct state (default text or file name, if a file was previously selected).
+//
+// This controller is used in coordination with direct uploads in Active Storage.
+// When a validation error occurs, previously selected files persist on the server
+// (via direct upload), and the file name can be displayed to the user.
+export default class extends Controller {
+  static targets = ["input", "label"];
+  static values = {
+    defaultText: { type: String, default: 'Choose file...' }
+  }
+
+  connect() {
+    this.updateLabel();
+  }
+
+  updateLabel() {
+    const input = this.inputTarget;
+    const label = this.labelTarget;
+
+    // Check if the file input has a file selected
+    if (input.files.length > 0) {
+      label.textContent = input.files[0].name;
+    } else {
+      label.textContent = this.defaultTextValue;
+    }
+  }
+
+  // Update the label when a file is selected
+  fileSelected() {
+    this.updateLabel();
+  }
+}

app/views/partners/_documents.html.erb

@@ -1,6 +1,6 @@
 <div class="card card-info card-outline">
   <div class="card-header">
-    <h2 class="card-title">Documents</h2>
+    <h2 class="card-title fs-3">Documents</h2>
   </div>
   <div class="card-body p-0">
     <div class="tab-content" id="custom-tabs-three-tabContent">

app/views/partners/_show_header.html.erb

@@ -1,6 +1,6 @@
 <div class="card card-info card-outline">
   <div class="card-header">
-    <h2 class="card-title"><%= partner.name %></h2>
+    <h2 class="card-title fs-3"><%= partner.name %></h2>
   </div>
   <div class="card-body p-0">
     <div class="row">

app/views/partners/_uninvited_header.html.erb

@@ -1,6 +1,6 @@
 <div class="card card-info card-outline">
   <div class="card-header">
-    <h2 class="card-title"><%= partner.name %></h2>
+    <h2 class="card-title fs-3"><%= partner.name %></h2>
   </div>
   <div class="card-body p-0">
   </div>

app/views/partners/profiles/edit/_agency_information.html.erb

@@ -16,20 +16,14 @@
               class: "form-control",
               wrapper: :input_group %>
             <%= profile_form.input :other_agency_type, label: "Other Agency Type", class: "form-control", wrapper: :input_group %>
-            <div class="form-group row">
-              <label class="control-label col-md-3">501(c)(3) IRS Determination Letter or other Proof of Agency Status</label>
-              <% if profile.proof_of_partner_status.attached? %>
-                <div class="col-md-8">
-                  Attached
-                  file: <%= link_to profile.proof_of_partner_status.blob['filename'], rails_blob_path(profile.proof_of_partner_status), class: "font-weight-bold" %>
-                  <%= profile_form.file_field :proof_of_partner_status, class: "form-control-file form-control" %>
-                </div>
-              <% else %>
-                <div class="col-md-8">
-                  <%= profile_form.file_field :proof_of_partner_status, class: "form-control-file" %>
-                </div>
-              <% end %>
-            </div>
+
+            <%= render "shared/custom_file_input",
+              form_builder: profile_form,
+              attachment: profile.proof_of_partner_status,
+              attachment_name: :proof_of_partner_status,
+              label_for: "partner_profile_proof_of_partner_status",
+              label_text: "501(c)(3) IRS Determination Letter or other Proof of Agency Status" %>
+
             <%= profile_form.input :agency_mission, label: "Agency Mission", class: "form-control", wrapper: :input_group %>
             <%= profile_form.input :address1, label: "Address (line 1)", class: "form-control", wrapper: :input_group %>
             <%= profile_form.input :address2, label: "Address (line 2)", class: "form-control", wrapper: :input_group %>

app/views/partners/profiles/edit/_agency_stability.html.erb

@@ -10,18 +10,14 @@
             <%= form.input :founded, label: "Year Founded", class: "form-control", wrapper: :input_group %>
             <%= form.input :form_990, label: "Form 990 Filed", as: :radio_buttons, class: "form-control",
                            wrapper: :input_group, wrapper_html: {class: "form-yesno"}, input_html: {class: "radio-yesno"} %>
-            <label class="control-label col-md-3">Form 990</label>
-            <% if profile.proof_of_form_990.attached? %>
-              <div class="col-md-8">
-                Attached
-                file: <%= link_to profile.proof_of_form_990.blob['filename'], rails_blob_path(profile.proof_of_form_990), class: "font-weight-bold" %>
-                <%= form.file_field :proof_of_form_990, class: "form-control-file form-control" %>
-              </div>
-            <% else %>
-              <div class="col-md-8">
-                <%= form.file_field :proof_of_form_990, class: "form-control-file" %>
-              </div>
-            <% end %>
+
+            <%= render "shared/custom_file_input",
+              form_builder: form,
+              attachment: profile.proof_of_form_990,
+              attachment_name: :proof_of_form_990,
+              label_for: "partner_profile_proof_of_form_990",
+              label_text: "Form 990" %>
+
             <%= form.input :program_name, label: "Program Name(s)", class: "form-control", wrapper: :input_group %>
             <%= form.input :program_description, label: "Program Description(s)", class: "form-control", wrapper: :input_group %>
             <%= form.input :program_age, label: "Agency Age", class: "form-control", wrapper: :input_group %>