Merge branch 'main' into 5103-Catch-bad-date-ranges

Author: wjwb-us

.gitignore

@@ -88,3 +88,4 @@ package-lock.json
 out/
 
 .vscode/
+.aider*

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.1.1)
+    Ascii85 (2.0.1)
     actioncable (8.0.1)
       actionpack (= 8.0.1)
       activesupport (= 8.0.1)
@@ -77,7 +77,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     afm (0.2.2)
     annotaterb (4.14.0)
-    ast (2.4.2)
+    ast (2.4.3)
     autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     awesome_print (1.9.2)
@@ -191,7 +191,7 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_invitable (2.0.9)
+    devise_invitable (2.0.10)
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.5.1)
@@ -222,7 +222,7 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erb_lint (0.7.0)
+    erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -273,18 +273,18 @@ GEM
     ffi (1.17.0-x86_64-darwin)
     ffi (1.17.0-x86_64-linux-gnu)
     filterrific (5.2.7)
-    flipper (1.3.2)
+    flipper (1.3.4)
       concurrent-ruby (< 2)
-    flipper-active_record (1.3.2)
+    flipper-active_record (1.3.4)
       activerecord (>= 4.2, < 9)
-      flipper (~> 1.3.2)
-    flipper-ui (1.3.2)
+      flipper (~> 1.3.4)
+    flipper-ui (1.3.4)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 1.3.2)
+      flipper (~> 1.3.4)
       rack (>= 1.4, < 4)
       rack-protection (>= 1.5.3, < 5.0.0)
       rack-session (>= 1.0.2, < 3.0.0)
-      sanitize (< 7)
+      sanitize (< 8)
     foreman (0.88.1)
     formatador (1.1.0)
     geocoder (1.8.5)
@@ -329,7 +329,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.9.1)
+    json (2.10.2)
     jwt (2.9.1)
       base64
     kaminari (1.2.2)
@@ -344,7 +344,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    knapsack_pro (7.13.1)
+    knapsack_pro (8.1.0)
       rake
     language_server-protocol (3.17.0.4)
     launchy (3.0.0)
@@ -356,7 +356,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.6)
+    logger (1.7.0)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -382,7 +382,7 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
-    minitest (5.25.4)
+    minitest (5.25.5)
     monetize (1.12.0)
       money (~> 6.12)
     money (6.16.0)
@@ -412,14 +412,14 @@ GEM
       net-protocol
     newrelic_rpm (9.16.0)
     nio4r (2.7.4)
-    nokogiri (1.18.3)
+    nokogiri (1.18.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.3-arm64-darwin)
+    nokogiri (1.18.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-darwin)
+    nokogiri (1.18.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.3-x86_64-linux-gnu)
+    nokogiri (1.18.7-x86_64-linux-gnu)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -455,12 +455,12 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.7.0)
+    parser (3.3.7.4)
       ast (~> 2.4.1)
       racc
     pdf-core (0.10.0)
-    pdf-reader (2.12.0)
-      Ascii85 (~> 1.0)
+    pdf-reader (2.14.1)
+      Ascii85 (>= 1.0, < 3.0, != 2.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
@@ -481,6 +481,7 @@ GEM
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     prettyprint (0.2.0)
+    prism (1.4.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -504,7 +505,7 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.10)
+    rack (3.1.12)
     rack-mini-profiler (3.3.1)
       rack (>= 1.2.0)
     rack-protection (4.0.0)
@@ -560,7 +561,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.12.0)
+    rdoc (6.13.1)
       psych (>= 4.0.0)
     recaptcha (5.19.0)
     regexp_parser (2.10.0)
@@ -605,8 +606,9 @@ GEM
       rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.43.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
@@ -620,9 +622,9 @@ GEM
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
     ruby2_keywords (0.0.5)
-    sanitize (6.1.3)
+    sanitize (7.0.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
+      nokogiri (>= 1.16.8)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -657,7 +659,7 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    solid_cache (1.0.6)
+    solid_cache (1.0.7)
       activejob (>= 7.2)
       activerecord (>= 7.2)
       railties (>= 7.2)
@@ -686,8 +688,8 @@ GEM
       rubocop-rails (~> 2.25.0)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.1.2)
-    strong_migrations (2.2.0)
+    stringio (3.1.6)
+    strong_migrations (2.2.1)
       activerecord (>= 7)
     terser (1.2.5)
       execjs (>= 0.3.0, < 3)
@@ -696,9 +698,9 @@ GEM
     timeout (0.4.3)
     ttfunk (1.8.0)
       bigdecimal (~> 3.1)
-    turbo-rails (2.0.10)
-      actionpack (>= 6.0.0)
-      railties (>= 6.0.0)
+    turbo-rails (2.0.13)
+      actionpack (>= 7.1.0)
+      railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
@@ -831,4 +833,4 @@ DEPENDENCIES
   webmock (~> 3.24)
 
 BUNDLED WITH
-   2.6.5
+   2.6.6

app/assets/stylesheets/simple_form-bootstrap/_form_multi_select.scss

@@ -16,4 +16,10 @@
     margin-left: 0 !important;
     margin-right: 0 !important;
   }
-}
+}
+
+.input-group, .form-group {
+  select {
+    @extend .form-select;
+  }
+}

app/controllers/admin/users_controller.rb

@@ -1,6 +1,6 @@
 # [Super Admin] This is for administrating users at a global level. We can create, view, modify, etc.
 class Admin::UsersController < AdminController
-  before_action :load_organizations, only: %i[new create edit update]
+  before_action :load_organizations, only: %i[create edit update]
   before_action :user_params, only: %i[create update]
 
   def index
@@ -34,15 +34,19 @@ def new
 
   def edit
     @user = User.find_by(id: params[:id])
-    @resources = Role.resources_for_select
   end
 
   def create
     @user = User.new(user_params)
-    UserInviteService.invite(name: user_params[:name],
+    validate_role_resource_params
+    klass = Role::TITLE_TO_RESOURCE[params[:resource_type].to_sym]
+    resource = klass&.find(params[:resource_id])
+    UserInviteService.invite(
+      name: user_params[:name],
       email: user_params[:email],
-      roles: [Role::ORG_USER],
-      resource: Organization.find(organization_id_param))
+      roles: [params[:resource_type].to_sym],
+      resource: resource
+    )
     flash[:notice] = "Created a new user!"
     redirect_to admin_users_path
   rescue => e
@@ -95,12 +99,9 @@ def user_params
     params.require(:user).permit(:name, :email)
   end
 
-  def organization_id_param
-    organization_id = params[:user][:organization_id]
-
-    raise "Please select an organization for the user." if organization_id.blank?
-
-    organization_id
+  def validate_role_resource_params
+    raise "Please select a role for the user." if params[:resource_type].blank?
+    raise "Please select an associated resource for the role." if !Role::ROLES_WITHOUT_RESOURCE.map(&:to_s).include?(params[:resource_type]) && params[:resource_id].blank?
   end
 
   def load_organizations

app/controllers/concerns/importable.rb

@@ -25,7 +25,7 @@ module Importable
   def import_csv
     if params[:file].present?
       data = File.read(params[:file].path, encoding: "BOM|UTF-8")
-      csv = CSV.parse(data, headers: true).reject { |row| row.to_hash.values.any?(&:nil?) }
+      csv = CSV.parse(data, headers: true)
       if csv.count.positive? && csv.first.headers.all? { |header| !header.nil? }
         errors = resource_model.import_csv(csv, current_organization.id)
         if errors.empty?

app/controllers/donations_controller.rb

@@ -33,6 +33,7 @@ def index
     @donations_quantity = @donations.collect(&:total_quantity).sum
     @paginated_donations_quantity = @paginated_donations.collect(&:total_quantity).sum
     @total_value_all_donations = total_value(@donations)
+    @paginated_in_kind_value = total_value(@paginated_donations)
     @total_money_raised = total_money_raised(@donations)
     @storage_locations = @donations.filter_map { |donation| donation.storage_location if !donation.storage_location.discarded_at }.compact.uniq.sort
     @selected_storage_location = filter_params[:at_storage_location]

app/controllers/organizations_controller.rb

@@ -94,7 +94,7 @@ def organization_params
     params.require(:organization).permit(
       :name, :short_name, :street, :city, :state,
       :zipcode, :email, :url, :logo, :intake_location,
-      :default_storage_location, :default_email_text,
+      :default_storage_location, :default_email_text, :reminder_email_text,
       :invitation_text, :reminder_day, :deadline_day,
       :repackage_essentials, :distribute_monthly,
       :ndbn_member_id, :enable_child_based_requests,

app/controllers/partner_users_controller.rb

@@ -24,6 +24,9 @@ def create
       @users = @partner.users
       render :index
     end
+  rescue => e
+    flash[:error] = e.message
+    redirect_to partner_users_path(@partner)
   end
 
   def destroy

app/controllers/partners/requests_controller.rb

@@ -81,8 +81,11 @@ def fetch_items
       @requestable_items = PartnerFetchRequestableItemsService.new(partner_id: partner.id).call
       if Flipper.enabled?(:enable_packs)
         # hash of (item ID => hash of (request unit name => request unit plural name))
-        @item_units = Item.where(id: @requestable_items.to_h.values).to_h do |i|
-          [i.id, i.request_units.to_h { |u| [u.name, u.name.pluralize] }]
+        item_ids = @requestable_items.to_h.values
+        if item_ids.present?
+          @item_units = Item.where(id: item_ids).to_h do |i|
+            [i.id, i.request_units.to_h { |u| [u.name, u.name.pluralize] }]
+          end
         end
       end
     end

app/controllers/vendors_controller.rb

@@ -88,6 +88,18 @@ def reactivate
     redirect_to vendors_path, notice: "#{vendor.business_name} has been reactivated."
   end
 
+  def destroy
+    vendor = current_organization.vendors.find(params[:id])
+    vendor.destroy
+    if vendor.errors.any?
+      errors = vendor.errors.full_messages.join("\n")
+      redirect_to vendors_path, error: "#{vendor.business_name} could not be removed. \n#{errors}"
+      return
+    end
+
+    redirect_to vendors_path, notice: "#{vendor.business_name} has been removed."
+  end
+
   private
 
   def vendor_params