Merge branch 'main' into 4517-inactive-items-in-distribution-reports

Author: awwaiid

.devcontainer/docker-compose.yml

@@ -28,9 +28,7 @@ services:
       POSTGRES_USER: postgres
       POSTGRES_DB: postgres
       POSTGRES_PASSWORD: postgres
-    # Note that these ports are ignored by the devcontainer.
-    # Instead, the ports are specified in .devcontainer/devcontainer.json.
-    # ports:
-    #  - "5432:5432"
+    ports:
+     - "5432:5432" # For non-devcontainer local usage
 volumes:
   postgres-data:

.github/workflows/rspec-system.yml

@@ -86,7 +86,7 @@ jobs:
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
-          name: failed-browser-tests
+          name: failed-browser-tests-${{ matrix.ci_node_index }}
           path: |
             tmp/screenshots
             tmp/capybara

Gemfile

@@ -151,7 +151,7 @@ group :development, :test do
   # Debugger which supports rdbg and Shopify Ruby LSP VSCode extension
   gem "debug", ">= 1.0.0"
   # RSpec behavioral testing framework for Rails.
-  gem "rspec-rails", "~> 8.0.0"
+  gem "rspec-rails", "~> 8.0.2"
   # Static analysis / linter.
   gem "rubocop"
   # Rails add-on for static analysis.
@@ -208,7 +208,7 @@ group :test do
   # Show code coverage.
   gem 'simplecov'
   # Mock HTTP requests and ensure they are not called during tests.
-  gem "webmock", "~> 3.25"
+  gem "webmock", "~> 3.26"
   # Interface capybara to chrome headless
   gem "cuprite"
   # Read PDF files for tests

Gemfile.lock

@@ -76,28 +76,28 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     afm (0.2.2)
-    annotaterb (4.19.0)
+    annotaterb (4.20.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.1168.0)
-    aws-sdk-core (3.233.0)
+    aws-partitions (1.1187.0)
+    aws-sdk-core (3.239.1)
       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.113.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.199.1)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-s3 (1.205.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -112,7 +112,7 @@ GEM
       nokogiri (~> 1, >= 1.10.8)
     base64 (0.3.0)
     bcrypt (3.1.20)
-    benchmark (0.4.1)
+    benchmark (0.5.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
@@ -124,7 +124,7 @@ GEM
       erubi (~> 1.4)
       parser (>= 2.4)
       smart_properties
-    bigdecimal (3.2.3)
+    bigdecimal (3.3.1)
     bindex (0.8.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -139,7 +139,7 @@ GEM
     bugsnag (6.28.0)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
-    bullet (8.0.8)
+    bullet (8.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     capybara (3.40.0)
@@ -162,7 +162,7 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
-    crack (1.0.0)
+    crack (1.0.1)
       bigdecimal
       rexml
     crass (1.0.6)
@@ -174,7 +174,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
-    date (3.4.1)
+    date (3.5.0)
     debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -229,7 +229,7 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    erb (5.0.2)
+    erb (6.0.0)
     erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
@@ -316,12 +316,12 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (1.2.0)
+    hashdiff (1.2.1)
     hashery (2.1.2)
     hashie (5.0.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    icalendar (2.11.2)
+    icalendar (2.12.1)
       base64
       ice_cube (~> 0.16)
       logger
@@ -333,7 +333,7 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.8.1)
-    irb (1.15.2)
+    irb (1.15.3)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
@@ -395,7 +395,7 @@ GEM
     memory_profiler (1.1.0)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.25.5)
+    minitest (5.26.2)
     monetize (1.12.0)
       money (~> 6.12)
     money (6.16.0)
@@ -423,13 +423,13 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    newrelic_rpm (9.21.0)
+    newrelic_rpm (9.23.0)
     nio4r (2.7.4)
-    nokogiri (1.18.9-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-darwin)
+    nokogiri (1.18.10-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.9-x86_64-linux-gnu)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -480,7 +480,7 @@ GEM
     pg (1.6.1-x86_64-darwin)
     pg (1.6.1-x86_64-linux)
     popper_js (2.11.8)
-    pp (0.6.2)
+    pp (0.6.3)
       prettyprint
     prawn (2.4.0)
       pdf-core (~> 0.9.0)
@@ -517,7 +517,7 @@ GEM
     puma (7.0.4)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.1)
+    rack (3.2.4)
     rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
     rack-protection (4.1.1)
@@ -570,46 +570,47 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.3.0)
+    rake (13.3.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.14.2)
+    rdoc (6.15.1)
       erb
       psych (>= 4.0.0)
-    recaptcha (5.20.1)
+      tsort
+    recaptcha (5.21.1)
     regexp_parser (2.11.3)
-    reline (0.6.2)
+    reline (0.6.3)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.4.1)
+    rexml (3.4.4)
     rolify (6.0.1)
     rouge (4.1.2)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.4)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.0)
+    rspec-rails (8.0.2)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.4)
+    rspec-support (3.13.6)
     rubocop (1.80.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -706,14 +707,15 @@ GEM
       rubocop-rails (~> 2.25.0)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.1.7)
+    stringio (3.1.8)
     strong_migrations (2.5.0)
       activerecord (>= 7.1)
     terser (1.2.6)
       execjs (>= 0.3.0, < 3)
     thor (1.4.0)
     tilt (2.2.0)
-    timeout (0.4.3)
+    timeout (0.4.4)
+    tsort (0.2.0)
     ttfunk (1.7.0)
     turbo-rails (2.0.17)
       actionpack (>= 7.1.0)
@@ -723,8 +725,8 @@ GEM
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.1.0)
-    uniform_notifier (1.17.0)
-    uri (1.0.3)
+    uniform_notifier (1.18.0)
+    uri (1.1.1)
     useragent (0.16.11)
     version_gem (1.1.8)
     warden (1.2.9)
@@ -734,7 +736,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.25.1)
+    webmock (3.26.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -826,7 +828,7 @@ DEPENDENCIES
   rails-erd
   recaptcha
   rolify (~> 6.0)
-  rspec-rails (~> 8.0.0)
+  rspec-rails (~> 8.0.2)
   rubocop
   rubocop-performance
   rubocop-rails (~> 2.25.1)
@@ -846,7 +848,7 @@ DEPENDENCIES
   ttfunk (~> 1.7.0)
   turbo-rails
   web-console
-  webmock (~> 3.25)
+  webmock (~> 3.26)
 
 BUNDLED WITH
    2.7.1

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/vendors_controller.rb

@@ -47,6 +47,7 @@ def edit
 
   def show
     @vendor = current_organization.vendors.includes(:purchases).find(params[:id])
+    @purchases = @vendor.purchases.order(issued_at: :desc)
   end
 
   def update

app/events/kit_allocate_event.rb

@@ -20,7 +20,7 @@ def self.event_line_items(kit, storage_location, quantity)
   end
 
   def self.publish(kit, storage_location, quantity)
-    create(
+    create!(
       eventable: kit,
       group_id: "kit-allocate-#{kit.id}-#{SecureRandom.hex}",
       organization_id: kit.organization_id,

app/javascript/application.js

@@ -8,7 +8,11 @@ import "startup"
 import "jquery-ui"
 import 'admin-lte'
 import 'filterrific'
-import { Turbo } from "@hotwired/turbo-rails"
+import("@hotwired/turbo-rails").then(({ Turbo }) => {
+  // Disable turbo by default to avoid issues with turbolinks
+  Turbo.session.drive = false
+})
+
 import "trix"
 import "@rails/actiontext"
 import "bootstrap-select"
@@ -39,9 +43,6 @@ Rails.start()
 import * as ActiveStorage from "@rails/activestorage";
 ActiveStorage.start();
 
-// Disable turbo by default to avoid issues with turbolinks
-Turbo.session.drive = false
-
 // Global toastr options
 window.toastr = toastr;
 toastr.options = {

app/javascript/controllers/deadline_day_controller.js

@@ -44,13 +44,14 @@ export default class extends Controller {
     let today = new Date();
     let untilDate = new Date( today );
     untilDate.setMonth( untilDate.getMonth() + monthlyInterval + 1 )
-
+    
     if (this.byDayOfMonthTarget.checked && this.dayOfMonthTarget.value) {
       const rule = new RRule({
         dtstart: new Date(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate(), 12)),
         freq: RRule.MONTHLY,
         interval: monthlyInterval,
         bymonthday: parseInt(this.dayOfMonthTarget.value),
+        byhour: 11, // Force RRule to calculate an occurrance after today
         until: untilDate
       })
       reminder_date = this.getFirstOccurrenceAfterToday( rule.all(), today )
@@ -61,6 +62,7 @@ export default class extends Controller {
         freq: RRule.MONTHLY,
         interval: monthlyInterval,
         byweekday: WEEKDAY_NUM_TO_OBJ[ parseInt(this.dayOfWeekTarget.value) ].nth( parseInt(this.everyNthDayTarget.value) ),
+        byhour: 11, // Force RRule to calculate an occurrance after today
         wkst: RRule.SU,
         until: untilDate
       })