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

Author: Benjamin-Couey

Gemfile

@@ -155,6 +155,8 @@ group :development, :test do
   # Rails add-on for static analysis.
   gem 'rubocop-performance'
   gem "rubocop-rails", "~> 2.25.1"
+  # More concise test ("should") matchers
+  gem "shoulda-matchers", "~> 6.2"
   # Default rules for Rubocop.
   gem "standard", "~> 1.40"
   gem "standard-rails"
@@ -197,8 +199,6 @@ group :test do
   gem "rails-controller-testing"
   # Show code coverage.
   gem 'simplecov'
-  # More concise test ("should") matchers
-  gem 'shoulda-matchers', '~> 6.2'
   # Mock HTTP requests and ensure they are not called during tests.
   gem "webmock", "~> 3.24"
   # Interface capybara to chrome headless

app/assets/stylesheets/AdminLTE.css

@@ -20,8 +20,8 @@
  @import 'resources/*';
 
  // import other stylesheets after variables
-@import 'AdminLTE';
 @import 'bootstrap';
+@import 'AdminLTE';
 @import 'simple_form-bootstrap/simple_form-bootstrap';
 @import 'progress_stepper';
 @import 'audits';
@@ -188,6 +188,12 @@ select.selectpicker + .dropdown-toggle::after {
   background-color: #8282df
 }
 
+// Fix select2 tagging search box to be inline with tags.
+// This is the default for select2 but adminLTE overwrites it.
+.select2-search.select2-search--inline {
+  display: inline-block;
+}
+
 div.low_priority_warning {
   margin: 5px;
   text-align: center;

app/assets/stylesheets/AdminLTE.css.map

@@ -1,5 +1,4 @@
 @import 'base/_variables';
-@import 'AdminLTE';
 
 @mixin for-desktop {
     @media (min-width: 992px) and (min-height: 769px) {
@@ -53,15 +52,6 @@
     }
 }
 
-.wrapper-form-feedback {
-    @extend .dropdown-item;
-
-    &:active {
-        color: inherit;
-        background-color: #f8f9fa;
-    }
-}
-
 .login-page--user {
   background: linear-gradient(135deg, #3023AE, #C86DD7);
   background-attachment: fixed;
@@ -108,3 +98,17 @@
   width: 3rem;
   cursor: not-allowed;
 }
+
+// The account request form is placed inside the default devise container which
+// is too narrow for the desired form width, so we have to apply a negative
+// margin to center it (except on mobile where text would get cut off).
+.account-request {
+  $inner-width: 35rem;
+  $outer-width: 360px;
+  width: $inner-width;
+  margin-left: calc((#{$outer-width} - #{$inner-width}) / 2);
+  @media (max-width: 620px) {
+    margin-left: 0;
+    max-width: 100%;
+  }
+}

app/assets/stylesheets/application.scss

@@ -33,7 +33,7 @@ def show
   def new
     @adjustment = current_organization.adjustments.new
     @adjustment.line_items.build
-    @storage_locations = current_organization.storage_locations.active_locations
+    @storage_locations = current_organization.storage_locations.active
     @items = current_organization.items.loose.active.alphabetized
   end
 
@@ -54,7 +54,7 @@ def create
   private
 
   def load_form_collections
-    @storage_locations = current_organization.storage_locations.active_locations
+    @storage_locations = current_organization.storage_locations.active
     @items = current_organization.items.loose.alphabetized
   end
 

app/assets/stylesheets/custom.scss

@@ -89,7 +89,7 @@ def set_audit
   end
 
   def set_storage_locations
-    @storage_locations = current_organization.storage_locations.active_locations
+    @storage_locations = current_organization.storage_locations.active
   end
 
   def set_items

app/controllers/adjustments_controller.rb

@@ -3,7 +3,7 @@ class DashboardController < ApplicationController
   respond_to :html, :js
 
   def index
-    @org_stats = OrganizationStats.new(current_organization)
+    @org_stats = OrganizationStats.new(current_organization, inventory)
     @partners_awaiting_review = current_organization.partners.awaiting_review
     @outstanding_requests = current_organization
       .ordered_requests
@@ -12,9 +12,15 @@ def index
       .order(:created_at)
       .limit(25)
 
-    @low_inventory_report = LowInventoryQuery.call(current_organization)
+    @low_inventory_report = LowInventoryQuery.call(current_organization, inventory)
 
     # passing nil here filters the announcements that didn't come from an organization
     @broadcast_announcements = BroadcastAnnouncement.filter_announcements(nil)
   end
+
+  private
+
+  def inventory
+    @inventory ||= View::Inventory.new(current_organization.id)
+  end
 end

app/controllers/audits_controller.rb

@@ -49,7 +49,7 @@ def index
     @paginated_distributions = @distributions.page(params[:page])
     @items = current_organization.items.alphabetized.select(:id, :name)
     @item_categories = current_organization.item_categories.select(:id, :name)
-    @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select(:id, :name)
+    @storage_locations = current_organization.storage_locations.active.alphabetized.select(:id, :name)
     @partners = current_organization.partners.active.alphabetized.select(:id, :name)
     @selected_item = filter_params[:by_item_id].presence
     @distribution_totals = DistributionTotalsService.new(current_organization.distributions, scope_filters)
@@ -69,7 +69,7 @@ def index
     respond_to do |format|
       format.html
       format.csv do
-        send_data Exports::ExportDistributionsCSVService.new(distributions: @distributions, organization: current_organization, filters: scope_filters).generate_csv, filename: "Distributions-#{Time.zone.today}.csv"
+        send_data Exports::ExportDistributionsCSVService.new(distributions: @distributions.includes(line_items: :item), organization: current_organization, filters: scope_filters).generate_csv, filename: "Distributions-#{Time.zone.today}.csv"
       end
     end
   end
@@ -122,7 +122,7 @@ def create
       @partner_list = current_organization.partners.where.not(status: 'deactivated').alphabetized
 
       inventory = View::Inventory.new(@distribution.organization_id)
-      @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select do |storage_loc|
+      @storage_locations = current_organization.storage_locations.active.alphabetized.select do |storage_loc|
         inventory.quantity_for(storage_location: storage_loc.id).positive?
       end
       if @distribution.storage_location.present?
@@ -157,7 +157,7 @@ def new
     @partner_list = current_organization.partners.where.not(status: 'deactivated').alphabetized
 
     inventory = View::Inventory.new(current_organization.id)
-    @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select do |storage_loc|
+    @storage_locations = current_organization.storage_locations.active.alphabetized.select do |storage_loc|
       inventory.quantity_for(storage_location: storage_loc.id).positive?
     end
   end
@@ -185,7 +185,7 @@ def edit
         .where(storage_location_id: @distribution.storage_location_id)
         .where("updated_at > ?", @distribution.created_at).any?
       inventory = View::Inventory.new(@distribution.organization_id)
-      @storage_locations = current_organization.storage_locations.active_locations.alphabetized.select do |storage_loc|
+      @storage_locations = current_organization.storage_locations.active.alphabetized.select do |storage_loc|
         !inventory.quantity_for(storage_location: storage_loc.id).negative?
       end
     else
@@ -212,7 +212,7 @@ def update
       @distribution.initialize_request_items
       @items = current_organization.items.active.alphabetized
       @partner_list = current_organization.partners.alphabetized
-      @storage_locations = current_organization.storage_locations.active_locations.alphabetized
+      @storage_locations = current_organization.storage_locations.active.alphabetized
       render :edit
     end
   end

app/controllers/dashboard_controller.rb

@@ -123,7 +123,7 @@ def destroy
   private
 
   def load_form_collections
-    @storage_locations = current_organization.storage_locations.active_locations.alphabetized
+    @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