Merge branch 'main' into 5086/rename-executive-director

Author: edwinthinks

Gemfile

@@ -106,7 +106,7 @@ gem 'bootsnap', require: false
 # Technically they don't need to be in this Gemfile at all, but we are pinning them to
 # specific versions for compatibility reasons.
 gem "nokogiri", ">= 1.10.4"
-gem "sprockets", "~> 4.2.1"
+gem "sprockets", "~> 4.2.2"
 
 group :production, :staging do
   # Reduce the noise of logs and include custom fields to it for easier access

Gemfile.lock

@@ -130,12 +130,12 @@ GEM
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.6, < 3)
       sassc-rails (>= 2.0.0)
-    brakeman (7.0.0)
+    brakeman (7.0.2)
       racc
     bugsnag (6.27.1)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
-    bullet (8.0.0)
+    bullet (8.0.5)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     capybara (3.40.0)
@@ -157,7 +157,7 @@ GEM
       tzinfo
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.3)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -330,7 +330,7 @@ GEM
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
     json (2.10.2)
-    jwt (2.9.1)
+    jwt (2.10.1)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -344,7 +344,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    knapsack_pro (8.1.0)
+    knapsack_pro (8.1.2)
       rake
     language_server-protocol (3.17.0.4)
     launchy (3.0.0)
@@ -412,14 +412,14 @@ GEM
       net-protocol
     newrelic_rpm (9.16.0)
     nio4r (2.7.4)
-    nokogiri (1.18.7)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.7-arm64-darwin)
+    nokogiri (1.18.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-darwin)
+    nokogiri (1.18.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.7-x86_64-linux-gnu)
+    nokogiri (1.18.8-x86_64-linux-gnu)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -431,7 +431,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    omniauth (2.1.2)
+    omniauth (2.1.3)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -505,7 +505,7 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.12)
+    rack (3.1.13)
     rack-mini-profiler (3.3.1)
       rack (>= 1.2.0)
     rack-protection (4.0.0)
@@ -663,8 +663,9 @@ GEM
       activejob (>= 7.2)
       activerecord (>= 7.2)
       railties (>= 7.2)
-    sprockets (4.2.1)
+    sprockets (4.2.2)
       concurrent-ruby (~> 1.0)
+      logger
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
@@ -689,7 +690,7 @@ GEM
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.6)
-    strong_migrations (2.2.1)
+    strong_migrations (2.3.0)
       activerecord (>= 7)
     terser (1.2.5)
       execjs (>= 0.3.0, < 3)
@@ -820,7 +821,7 @@ DEPENDENCIES
   simple_form
   simplecov
   solid_cache (~> 1.0)
-  sprockets (~> 4.2.1)
+  sprockets (~> 4.2.2)
   stackprof
   standard (~> 1.40)
   standard-performance

app/controllers/application_controller.rb

@@ -15,7 +15,9 @@ class ApplicationController < ActionController::Base
 
   rescue_from ActiveRecord::RecordNotFound, with: :not_found!
 
-  rescue_from ActionController::InvalidAuthenticityToken do
+  rescue_from ActionController::InvalidAuthenticityToken, with: :session_expired
+
+  def session_expired
     flash[:error] = "Your session expired. This could be due to leaving a page open for a long time, or having multiple tabs open. Try resubmitting."
     redirect_back fallback_location: root_path
   end

app/controllers/concerns/validatable.rb

@@ -0,0 +1,13 @@
+module Validatable
+  extend ActiveSupport::Concern
+
+  included do
+    rescue_from ActionController::InvalidAuthenticityToken do
+      if action_name == "validate"
+        render json: {valid: false}
+      else
+        session_expired
+      end
+    end
+  end
+end

app/controllers/distributions_controller.rb

@@ -6,6 +6,7 @@
 class DistributionsController < ApplicationController
   include DateRangeHelper
   include DistributionHelper
+  include Validatable
 
   before_action :enable_turbo!, only: %i[new show]
   skip_before_action :authenticate_user!, only: %i(calendar)

app/controllers/partners/family_requests_controller.rb

@@ -1,5 +1,6 @@
 module Partners
   class FamilyRequestsController < BaseController
+    include Validatable
     before_action :verify_partner_is_active
     before_action :authorize_verified_partners
 

app/controllers/partners/individuals_requests_controller.rb

@@ -1,5 +1,6 @@
 module Partners
   class IndividualsRequestsController < BaseController
+    include Validatable
     before_action :verify_partner_is_active
     before_action :authorize_verified_partners
 

app/controllers/partners/requests_controller.rb

@@ -1,5 +1,6 @@
 module Partners
   class RequestsController < BaseController
+    include Validatable
     skip_before_action :require_partner, only: [:new, :create, :validate]
     before_action :require_partner_or_org_admin, only: [:new, :create, :validate]
     layout :layout

app/controllers/partners_controller.rb

@@ -15,7 +15,7 @@ def index
 
     respond_to do |format|
       format.html
-      format.csv { send_data Exports::ExportPartnersCSVService.new(@partners.unscope(:includes)).generate_csv, filename: "Partners-#{Time.zone.today}.csv" }
+      format.csv { send_data Exports::ExportPartnersCSVService.new(@partners.unscope(:includes), current_organization).generate_csv, filename: "Partners-#{Time.zone.today}.csv" }
     end
   end
 

app/helpers/donations_helper.rb

@@ -16,6 +16,11 @@ def total_received_from_product_drives(range = selected_range)
     number_with_delimiter total_received_from_product_drives_unformatted(range)
   end
 
+  def total_number_of_drives(range = selected_range)
+    formatted_range = format_date_range_to_iso(range)
+    current_organization.product_drives.within_date_range(formatted_range).count
+  end
+
   private
 
   def total_received_donations_unformatted(range = selected_range)
@@ -25,4 +30,8 @@ def total_received_donations_unformatted(range = selected_range)
   def total_received_from_product_drives_unformatted(range = selected_range)
     LineItem.active.where(itemizable: current_organization.donations.by_source(:product_drive).during(range)).sum(:quantity)
   end
+
+  def format_date_range_to_iso(range)
+    "#{range.begin.to_date.iso8601} - #{range.end.to_date.iso8601}"
+  end
 end