Merge branch 'main' into 5249-inventory-flow-tab

Author: awwaiid

.prettierignore

@@ -0,0 +1 @@
+**

Gemfile.lock

@@ -76,27 +76,28 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     afm (0.2.2)
-    annotaterb (4.16.0)
+    annotaterb (4.19.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     ast (2.4.3)
     autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     awesome_print (1.9.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1123.0)
-    aws-sdk-core (3.226.1)
+    aws-partitions (1.1168.0)
+    aws-sdk-core (3.233.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.106.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-kms (1.113.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.191.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.199.1)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -123,7 +124,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.2.2)
+    bigdecimal (3.2.3)
     bindex (0.8.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -169,9 +170,9 @@ GEM
     cuprite (0.17)
       capybara (~> 3.0)
       ferrum (~> 0.17.0)
-    database_cleaner-active_record (2.2.0)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
     debug (1.11.0)
@@ -238,9 +239,9 @@ GEM
       smart_properties
     erubi (1.13.1)
     execjs (2.10.0)
-    factory_bot (6.5.4)
+    factory_bot (6.5.5)
       activesupport (>= 6.1.0)
-    factory_bot_rails (6.5.0)
+    factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
     faker (3.5.1)
@@ -340,7 +341,7 @@ GEM
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.12.2)
+    json (2.15.1)
     jwt (3.1.2)
       base64
     kaminari (1.2.2)
@@ -355,7 +356,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    knapsack_pro (8.3.3)
+    knapsack_pro (8.4.0)
       rake
     language_server-protocol (3.17.0.5)
     launchy (3.0.0)
@@ -394,7 +395,6 @@ GEM
     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)
@@ -423,11 +423,8 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    newrelic_rpm (9.20.0)
+    newrelic_rpm (9.21.0)
     nio4r (2.7.4)
-    nokogiri (1.18.9)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
     nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.18.9-x86_64-darwin)
@@ -469,7 +466,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
@@ -496,7 +493,7 @@ GEM
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     prettyprint (0.2.0)
-    prism (1.4.0)
+    prism (1.5.2)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -517,7 +514,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (6.6.0)
+    puma (7.0.4)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.2.1)
@@ -581,7 +578,7 @@ GEM
       erb
       psych (>= 4.0.0)
     recaptcha (5.20.1)
-    regexp_parser (2.11.2)
+    regexp_parser (2.11.3)
     reline (0.6.2)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -613,18 +610,18 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.4)
-    rubocop (1.75.8)
+    rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.47.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-performance (1.25.0)
@@ -692,10 +689,10 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stackprof (0.2.27)
-    standard (1.50.0)
+    standard (1.51.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.5)
+      rubocop (~> 1.80.2)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
@@ -718,14 +715,14 @@ GEM
     tilt (2.2.0)
     timeout (0.4.3)
     ttfunk (1.7.0)
-    turbo-rails (2.0.16)
+    turbo-rails (2.0.17)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     uniform_notifier (1.17.0)
     uri (1.0.3)
     useragent (0.16.11)
@@ -753,7 +750,6 @@ GEM
 
 PLATFORMS
   arm64-darwin
-  ruby
   x86_64-darwin
   x86_64-linux
   x86_64-linux-gnu

app/assets/stylesheets/custom.scss

@@ -112,3 +112,7 @@
     max-width: 100%;
   }
 }
+
+.cursor-default {
+    cursor: default !important;
+}

app/controllers/admin/users_controller.rb

@@ -87,6 +87,12 @@ def add_role
     redirect_back(fallback_location: admin_users_path, notice: "Role added!")
   end
 
+  def resend_invitation
+    user = User.find(params[:user_id])
+    user.invite!
+    redirect_back(fallback_location: admin_users_path, notice: "#{user.name} reinvited!")
+  end
+
   def remove_role
     RemoveRoleService.call(user_id: params[:user_id], role_id: params[:role_id])
     redirect_back(fallback_location: admin_users_path, notice: "Role removed!")

app/controllers/audits_controller.rb

@@ -7,6 +7,13 @@ def index
     @selected_location = filter_params[:at_location]
     @audits = current_organization.audits.includes(:line_items, :storage_location).class_filter(filter_params)
     @storage_locations = StorageLocation.with_audits_for(current_organization).select(:id, :name)
+
+    respond_to do |format|
+      format.html
+      format.csv do
+        send_data Audit.generate_csv(@audits), filename: "Audits-#{Time.zone.today}.csv"
+      end
+    end
   end
 
   def show

app/controllers/distributions_controller.rb

@@ -27,12 +27,13 @@ def print
   end
 
   def destroy
-    result = DistributionDestroyService.new(params[:id]).call
+    service = DistributionDestroyService.new(params[:id])
+    result = service.call
 
     if result.success?
       flash[:notice] = "Distribution #{params[:id]} has been reclaimed!"
     else
-      flash[:error] = "Could not destroy distribution #{params[:id]}. Please contact technical support."
+      flash[:error] = result.error.message
     end
 
     redirect_to distributions_path
@@ -185,9 +186,10 @@ def edit
       @request = @distribution.request
       @items = current_organization.items.active.alphabetized
       @partner_list = current_organization.partners.alphabetized
+      @changes_disallowed = SnapshotEvent.intervening(@distribution).present?
       @audit_warning = current_organization.audits
         .where(storage_location_id: @distribution.storage_location_id)
-        .where("updated_at > ?", @distribution.created_at).any?
+        .where("updated_at > ?", @distribution.created_at).any? && !@changes_disallowed
       inventory = View::Inventory.new(@distribution.organization_id)
       @storage_locations = current_organization.storage_locations.active.alphabetized.select do |storage_loc|
         !inventory.quantity_for(storage_location: storage_loc.id).negative?

app/controllers/donation_sites_controller.rb

@@ -18,13 +18,18 @@ def create
     @donation_site = current_organization.donation_sites.new(donation_site_params)
     respond_to do |format|
       if @donation_site.save
+        format.turbo_stream
         format.html do
           redirect_to donation_sites_path,
                       notice: "Donation site #{@donation_site.name} added!"
         end
       else
+        flash.now[:error] = "Something didn't work quite right -- try again?"
+        if request.format.turbo_stream?
+          format.html { render partial: "donation_sites/new_modal", status: :unprocessable_entity }
+        end
+
         format.html do
-          flash.now[:error] = "Something didn't work quite right -- try again?"
           render action: :new
         end
       end
@@ -33,6 +38,11 @@ def create
 
   def new
     @donation_site = current_organization.donation_sites.new
+    if turbo_frame_request?
+      render partial: "donation_sites/new_modal", layout: false
+    else
+      render :new
+    end
   end
 
   def edit

app/controllers/donations_controller.rb

@@ -18,40 +18,14 @@ def print
   def index
     setup_date_range_picker
 
-    @donations = current_organization.donations
-                                     .includes(:storage_location, :donation_site, :product_drive, :product_drive_participant, :manufacturer, line_items: [:item])
-                                     .order(created_at: :desc)
-                                     .class_filter(filter_params)
-                                     .during(helpers.selected_range)
-    @item_categories = current_organization.item_categories.pluck(:name).uniq
-    @paginated_donations = @donations.page(params[:page])
-
-    @product_drives = current_organization.product_drives.alphabetized
-    @product_drive_participants = current_organization.product_drive_participants.alphabetized
-
-    # Are these going to be inefficient with large datasets?
-    # Using the @donations allows drilling down instead of always starting with the total dataset
-    @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]
-    @sources = @donations.collect(&:source).uniq.sort
-    @selected_source = filter_params[:by_source]
-    @selected_item_category = filter_params[:by_category]
-    @donation_sites = @donations.collect(&:donation_site).compact.uniq.sort_by { |site| site.name.downcase }
-    @selected_donation_site = filter_params[:from_donation_site]
-    @selected_product_drive = filter_params[:by_product_drive]
-    @selected_product_drive_participant = filter_params[:by_product_drive_participant]
-    @manufacturers = @donations.collect(&:manufacturer).compact.uniq.sort
-    @selected_manufacturer = filter_params[:from_manufacturer]
+    @donation_info = View::Donations.from_params(params: params, organization: current_organization, helpers: helpers)
 
     respond_to do |format|
       format.html
       format.csv do
-        send_data Exports::ExportDonationsCSVService.new(donation_ids: @donations.map(&:id), organization: current_organization).generate_csv, filename: "Donations-#{Time.zone.today}.csv"
+        send_data Exports::ExportDonationsCSVService.new(donation_ids: @donation_info.donations.map(&:id),
+          organization: current_organization).generate_csv,
+          filename: "Donations-#{Time.zone.today}.csv"
       end
     end
   end
@@ -81,7 +55,9 @@ def new
   def edit
     @donation = Donation.find(params[:id])
     @donation.line_items.build
-    @audit_performed_and_finalized = Audit.finalized_since?(@donation, @donation.storage_location_id)
+    @changes_disallowed = SnapshotEvent.intervening(@donation).present?
+    @audit_performed_and_finalized = Audit.finalized_since?(@donation, @donation.storage_location_id) &&
+      !@changes_disallowed
 
     load_form_collections
   end
@@ -117,7 +93,7 @@ def destroy
     if service.success?
       flash[:notice] = "Donation #{params[:id]} has been removed!"
     else
-      flash[:error] = "Donation #{params[:id]} failed to be removed because #{service.error}"
+      flash[:error] = service.error.message
     end
 
     redirect_to donations_path
@@ -177,16 +153,4 @@ def compact_line_items
     params[:donation][:line_items_attributes].delete_if { |_row, data| data["quantity"].blank? && data["item_id"].blank? }
     params
   end
-
-  def total_value(donations)
-    total_value_all_donations = 0
-    donations.each do |donation|
-      total_value_all_donations += donation.value_per_itemizable
-    end
-    total_value_all_donations
-  end
-
-  def total_money_raised(donations)
-    donations.sum { |d| d.money_raised.to_i }
-  end
 end

app/controllers/partners/family_requests_controller.rb

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