Merge branch 'main' into 4395-rework-landing-page-with-bootstrap-2

Author: Sukhpreet-s

Gemfile

@@ -10,7 +10,7 @@ end
 # User management and login workflow.
 gem "devise", '>= 4.7.1'
 # Postgres database adapter.
-gem "pg", "~> 1.5.7"
+gem "pg", "~> 1.5.9"
 # Web server.
 gem "puma"
 # Rails web framework.
@@ -24,7 +24,7 @@ gem 'azure-storage-blob'
 # Adds soft delete functionality for models.
 gem 'discard', '~> 1.3'
 # Adds grouping by date/month/etc to queries.
-gem "groupdate", "~> 6.4"
+gem "groupdate", "~> 6.5"
 # Treats attributes like money, which knows about dollars and cents.
 gem "money-rails"
 # Tracks history / audits models.
@@ -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"
@@ -182,6 +184,12 @@ group :development do
   gem "rails-erd"
   # Allows to create a console in the browser.
   gem "web-console"
+  # Middleware that displays speed badge for every HTML page
+  gem "rack-mini-profiler"
+  # Adds memory profiling to rack-mini-profiler
+  gem "memory_profiler"
+  # Adds call-stack profiling flamegraphs to rack-mini-profiler
+  gem "stackprof"
 end
 
 group :test do
@@ -197,8 +205,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

Gemfile.lock

@@ -115,12 +115,12 @@ GEM
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.6, < 3)
       sassc-rails (>= 2.0.0)
-    brakeman (6.2.1)
+    brakeman (7.0.0)
       racc
     bugsnag (6.27.1)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
-    bullet (7.2.0)
+    bullet (8.0.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     capybara (3.40.0)
@@ -141,13 +141,13 @@ GEM
       activesupport
       tzinfo
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
     crack (1.0.0)
       bigdecimal
       rexml
     crass (1.0.6)
-    csv (3.3.0)
+    csv (3.3.2)
     cuprite (0.15.1)
       capybara (~> 3.0)
       ferrum (~> 0.15.0)
@@ -272,13 +272,13 @@ GEM
       sanitize (< 7)
     foreman (0.88.1)
     formatador (1.1.0)
-    geocoder (1.8.3)
+    geocoder (1.8.5)
       base64 (>= 0.1.0)
       csv (>= 3.0.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    groupdate (6.4.0)
-      activesupport (>= 6.1)
+    groupdate (6.5.1)
+      activesupport (>= 7)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -300,7 +300,7 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     icalendar (2.10.3)
       ice_cube (~> 0.16)
@@ -338,7 +338,7 @@ GEM
     kaminari-core (1.2.2)
     knapsack_pro (7.13.1)
       rake
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.4)
     launchy (3.0.0)
       addressable (~> 2.8)
       childprocess (~> 5.0)
@@ -348,7 +348,7 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.4)
+    logger (1.6.5)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -370,6 +370,7 @@ GEM
       net-smtp
     marcel (1.0.4)
     matrix (0.4.2)
+    memory_profiler (1.1.0)
     method_source (1.1.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
@@ -447,7 +448,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.6.0)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
       racc
     pdf-core (0.10.0)
@@ -457,7 +458,7 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.5.7)
+    pg (1.5.9)
     popper_js (2.11.8)
     prawn (2.5.0)
       matrix (~> 0.4)
@@ -490,10 +491,12 @@ GEM
       date
       stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.1.8)
+    rack-mini-profiler (3.3.1)
+      rack (>= 1.2.0)
     rack-protection (4.0.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0, < 4)
@@ -548,8 +551,8 @@ GEM
       ffi (~> 1.0)
     rdoc (6.10.0)
       psych (>= 4.0.0)
-    recaptcha (5.17.0)
-    regexp_parser (2.9.3)
+    recaptcha (5.19.0)
+    regexp_parser (2.10.0)
     reline (0.6.0)
       io-console (~> 0.5)
     request_store (1.7.0)
@@ -581,7 +584,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.69.2)
+    rubocop (1.70.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -591,9 +594,9 @@ GEM
       rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
+    rubocop-ast (1.38.0)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.23.0)
+    rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.25.1)
@@ -657,10 +660,11 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    standard (1.43.0)
+    stackprof (0.2.27)
+    standard (1.44.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.69.1)
+      rubocop (~> 1.70.0)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.6)
     standard-custom (1.0.2)
@@ -677,7 +681,7 @@ GEM
     stringio (3.1.2)
     strong_migrations (1.8.0)
       activerecord (>= 5.2)
-    terser (1.2.4)
+    terser (1.2.5)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
     tilt (2.2.0)
@@ -689,7 +693,7 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.2)
+    unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uniform_notifier (1.16.0)
@@ -760,7 +764,7 @@ DEPENDENCIES
   flipper-ui
   foreman
   geocoder
-  groupdate (~> 6.4)
+  groupdate (~> 6.5)
   guard-rspec
   httparty
   icalendar
@@ -775,6 +779,7 @@ DEPENDENCIES
   lograge
   magic_test
   matrix
+  memory_profiler
   money-rails
   newrelic_rpm
   nokogiri (>= 1.10.4)
@@ -784,13 +789,14 @@ DEPENDENCIES
   orderly (~> 0.1)
   paper_trail
   pdf-reader
-  pg (~> 1.5.7)
+  pg (~> 1.5.9)
   prawn-rails
   pry-doc
   pry-nav
   pry-rails
   pry-remote
   puma
+  rack-mini-profiler
   rails (= 7.2.2)
   rails-controller-testing
   rails-erd
@@ -806,6 +812,7 @@ DEPENDENCIES
   simplecov
   solid_cache (~> 1.0)
   sprockets (~> 4.2.1)
+  stackprof
   standard (~> 1.40)
   standard-performance
   standard-rails

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