Merge branch 'main' into 3689-check-double-clicks-on-submit

Author: Benjamin-Couey

Gemfile

@@ -51,7 +51,7 @@ gem "turbo-rails"
 # Sprinkle a little JS to add interactivity
 gem "stimulus-rails"
 # Use JS import maps to manage JS without transpiling or bundling.
-gem "importmap-rails", "~> 2.1"
+gem "importmap-rails", "~> 2.2"
 
 ##### VIEWS/CONTROLLERS #####
 
@@ -61,6 +61,8 @@ gem "filterrific"
 gem "jbuilder"
 # Pagination of models for use in views.
 gem "kaminari"
+# Prevents cookie overflow errors when storing large flash messages.
+gem 'memflash'
 # Web-based authorization framework.
 gem "omniauth"
 # Required to avoid authentication issues with Rails.

Gemfile.lock

@@ -133,9 +133,9 @@ GEM
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.6, < 3)
       sassc-rails (>= 2.0.0)
-    brakeman (7.0.2)
+    brakeman (7.1.0)
       racc
-    bugsnag (6.27.1)
+    bugsnag (6.28.0)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
     bullet (8.0.8)
@@ -174,7 +174,7 @@ GEM
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
-    debug (1.9.2)
+    debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
     debug_inspector (1.2.0)
@@ -194,7 +194,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_invitable (2.0.10)
+    devise_invitable (2.0.11)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.6.2)
@@ -228,7 +228,7 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erb (5.0.1)
+    erb (5.0.2)
     erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
@@ -292,7 +292,8 @@ GEM
       rack-protection (>= 1.5.3, < 5.0.0)
       rack-session (>= 1.0.2, < 3.0.0)
       sanitize (< 8)
-    foreman (0.88.1)
+    foreman (0.90.0)
+      thor (~> 1.4)
     formatador (1.1.0)
     geocoder (1.8.5)
       base64 (>= 0.1.0)
@@ -323,11 +324,11 @@ GEM
       ostruct
     ice_cube (0.17.0)
     ice_nine (0.11.2)
-    importmap-rails (2.1.0)
+    importmap-rails (2.2.2)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
-    io-console (0.8.0)
+    io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
@@ -385,10 +386,11 @@ GEM
       net-smtp
     marcel (1.0.4)
     matrix (0.4.2)
+    memflash (2.6.0)
+      actionpack (>= 7.0)
     memory_profiler (1.1.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
     minitest (5.25.5)
     monetize (1.12.0)
       money (~> 6.12)
@@ -408,7 +410,7 @@ GEM
     nenv (0.3.0)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.5.8)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -417,16 +419,13 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    newrelic_rpm (9.16.0)
+    newrelic_rpm (9.20.0)
     nio4r (2.7.4)
-    nokogiri (1.18.8)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -512,8 +511,8 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.16)
-    rack-mini-profiler (4.0.0)
+    rack (3.2.0)
+    rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
@@ -569,12 +568,12 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.14.1)
+    rdoc (6.14.2)
       erb
       psych (>= 4.0.0)
-    recaptcha (5.19.0)
+    recaptcha (5.20.1)
     regexp_parser (2.10.0)
-    reline (0.6.1)
+    reline (0.6.2)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
@@ -706,7 +705,7 @@ GEM
       activerecord (>= 7)
     terser (1.2.5)
       execjs (>= 0.3.0, < 3)
-    thor (1.3.2)
+    thor (1.4.0)
     tilt (2.2.0)
     timeout (0.4.3)
     ttfunk (1.7.0)
@@ -745,7 +744,6 @@ GEM
 
 PLATFORMS
   arm64-darwin
-  ruby
   x86_64-darwin
   x86_64-linux
   x86_64-linux-gnu
@@ -786,7 +784,7 @@ DEPENDENCIES
   geocoder
   guard-rspec
   icalendar
-  importmap-rails (~> 2.1)
+  importmap-rails (~> 2.2)
   jbuilder
   jwt
   kaminari
@@ -796,6 +794,7 @@ DEPENDENCIES
   lograge
   magic_test
   matrix
+  memflash
   memory_profiler
   money-rails
   newrelic_rpm
@@ -843,4 +842,4 @@ DEPENDENCIES
   webmock (~> 3.25)
 
 BUNDLED WITH
-   2.6.9
+   2.7.0

app/controllers/donations_controller.rb

@@ -127,11 +127,12 @@ def destroy
 
   def load_form_collections
     @storage_locations = current_organization.storage_locations.active.alphabetized
-    @donation_sites = current_organization.donation_sites.active.alphabetized
     @product_drives = current_organization.product_drives.alphabetized
     @product_drive_participants = current_organization.product_drive_participants.alphabetized
     @manufacturers = current_organization.manufacturers.alphabetized
     @items = current_organization.items.active.alphabetized
+    # Return all active donation sites, or the donation site that was selected for the donation if it's inactive
+    @donation_sites = current_organization.donation_sites.active.or(DonationSite.where(id: @donation.donation_site_id)).alphabetized
   end
 
   def clean_donation_money_raised

app/controllers/product_drives_controller.rb

@@ -88,10 +88,18 @@ def update
   end
 
   def destroy
-    current_organization.product_drives.find(params[:id]).destroy
+    product_drive = current_organization.product_drives.find(params[:id])
+    success = product_drive.destroy
+
     respond_to do |format|
-      format.html { redirect_to product_drives_url, notice: 'Product drive was successfully destroyed.' }
-      format.json { head :no_content }
+      if success
+        format.html { redirect_to product_drives_url, notice: 'Product drive was successfully destroyed.' }
+        format.json { head :no_content }
+      else
+        error_message = product_drive.errors.full_messages.to_sentence
+        format.html { redirect_to product_drive_path(product_drive), error: error_message }
+        format.json { render json: {error: error_message}, status: :unprocessable_entity }
+      end
     end
   end
 

app/controllers/transfers_controller.rb

@@ -21,6 +21,7 @@ def index
 
   def create
     @transfer = current_organization.transfers.new(transfer_params)
+    @transfer.line_items.combine!
 
     TransferCreateService.call(@transfer)
     redirect_to transfers_path, notice: "#{@transfer.line_items.total} items have been transferred from #{@transfer.from.name} to #{@transfer.to.name}!"
@@ -57,6 +58,18 @@ def destroy
     redirect_to transfers_path
   end
 
+  def validate
+    @transfer = current_organization.transfers.new(transfer_params)
+    @transfer.line_items.combine!
+
+    if @transfer.valid?
+      body = render_to_string(partial: "transfers/validate_modal", formats: [:html], layout: false)
+      render json: {valid: true, body: body}
+    else
+      render json: {valid: false}, status: :unprocessable_entity
+    end
+  end
+
   private
 
   def load_form_collections

app/models/product_drive.rb

@@ -31,7 +31,7 @@ class ProductDrive < ApplicationRecord
           search_dates[:end_date])
   }
 
-  has_many :donations, dependent: :nullify
+  has_many :donations, dependent: :restrict_with_error
   has_many :product_drive_participants, -> { distinct }, through: :donations
   validates :name, presence:
     { message: "A name must be chosen." }

app/models/purchase.rb

@@ -60,6 +60,11 @@ class Purchase < ApplicationRecord
   validates :amount_spent_in_cents, numericality: { greater_than: 0 }
   validate :total_equal_to_all_categories
 
+  validates :amount_spent_on_diapers_cents, numericality: { greater_than_or_equal_to: 0 }
+  validates :amount_spent_on_adult_incontinence_cents, numericality: { greater_than_or_equal_to: 0 }
+  validates :amount_spent_on_period_supplies_cents, numericality: { greater_than_or_equal_to: 0 }
+  validates :amount_spent_on_other_cents, numericality: { greater_than_or_equal_to: 0 }
+
   SummaryByDates = Data.define(
     :amount_spent,
     :recent_purchases,

app/views/account_requests/new.html.erb

@@ -28,6 +28,7 @@
       <div class='card-text' id='partner_info'>
         <p class='p-2'>Are you a current partner to diaper and/or period supply banks? If so please go <a href='https://humanessentials.app/users/sign_in'>here</a> to login.</p>
         <p class='p-2'>If you are wishing to receive diapers/period supplies and partner to a local diaper/period supply bank please contact your local bank. They are the only ones able create your account.</p>
+        <p class='p-2'>If you are looking for an essentials bank that distributes diapers, please refer to the <a href='https://nationaldiaperbanknetwork.org/member-directory/'>NDBN member directory</a>. If you are, instead, looking for an essentials bank that deals in period supplies, please refer to the <a href='https://allianceforperiodsupplies.org/allied-programs/'>Alliance for Period Supplies directory</a>.</p>
       </div>
 
       <div class='card-text' id='create_bank'>

app/views/partners/_form.html.erb

@@ -53,6 +53,7 @@
                       <% if doc.persisted? %>
                         <li class="attached-document d-flex justify-content-between align-items-center p-2 border rounded mb-2" data-document-id="<%= doc.signed_id %>">
                           <%= link_to doc.blob.filename.to_s, rails_blob_path(doc), class: "font-weight-bold w-75 text-truncate" %>
+                          <%= f.hidden_field :documents, multiple: true, value: doc.signed_id %>
                           <%= delete_button_to attachment_path(doc), { text: "Remove", size: "md", confirm: "Are you sure you want to permanently remove this document?" } %>
                         </li>
                       <% end %>

app/views/shared/_flash.html.erb

@@ -1,8 +1,8 @@
 <%= turbo_frame_tag "flash" do %>
-  <% flash.each do |key, message| %>
+  <% flash.keys.each do |key| %>
     <div
       class="<%= flash_class(key) %> alert-dismissible"
       role="alert"
-      style="white-space: pre-line;"><%= message %></div>
+      style="white-space: pre-line;"><%= flash[key] %></div>
   <% end %>
 <% end %>