Merge branch 'main' into claude/migrate-operator-field-01NuJoaKJx2xbdJKFTCXeiWE

Author: stefan-burke

.github/workflows/coverage.yml

@@ -45,7 +45,7 @@ jobs:
           bundle exec rake coverage:parallel
   
       - name: Deploy to Bunny
-        uses: R-J-dev/bunny-deploy@v2.0.6
+        uses: R-J-dev/bunny-deploy@v2.1.1
         with:
           access-key: ${{ secrets.BUNNY_ACCESS_KEY }}
           directory-to-upload: coverage

.github/workflows/security-scan.yml

@@ -5,6 +5,7 @@ permissions:
 
 on:
   pull_request:
+  merge_group:
   schedule:
     - cron: '0 0 * * 0'  # Weekly scan on Sundays
 

.github/workflows/test-ruby.yml

@@ -2,6 +2,7 @@ name: "Test: Ruby"
 
 on:
   pull_request:
+  merge_group:
   workflow_call:
 
 jobs:

ATTRIBUTIONS.md

@@ -2,7 +2,7 @@
 
 This project uses the following open source dependencies:
 
-Generated on: 2025-12-01
+Generated on: 2026-02-09
 Total dependencies: 151
 
 ## Dependencies by License

Gemfile.lock

@@ -85,19 +85,19 @@ GEM
       activesupport (>= 6.0.0)
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1180.0)
-    aws-sdk-core (3.236.0)
+    aws-partitions (1.1196.0)
+    aws-sdk-core (3.240.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.116.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.202.0)
+    aws-sdk-s3 (1.208.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -116,7 +116,7 @@ GEM
     bigdecimal (3.3.1)
     bindata (2.5.1)
     blueprinter (1.2.1)
-    brakeman (7.1.1)
+    brakeman (8.0.2)
       racc
     builder (3.3.0)
     capybara (3.40.0)
@@ -134,7 +134,7 @@ GEM
       sorbet-runtime (~> 0.5)
     chronic (0.10.2)
     chunky_png (1.4.0)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
     connection_pool (2.5.4)
     cose (1.3.1)
       cbor (~> 0.5.9)
@@ -470,10 +470,10 @@ GEM
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
-    sentry-rails (6.1.0)
+    sentry-rails (6.2.0)
       railties (>= 5.2.0)
-      sentry-ruby (~> 6.1.0)
-    sentry-ruby (6.1.0)
+      sentry-ruby (~> 6.2.0)
+    sentry-ruby (6.2.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
     simplecov (0.22.0)
@@ -516,7 +516,7 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    sqlite3 (2.7.4-x86_64-linux-gnu)
+    sqlite3 (2.8.1-x86_64-linux-gnu)
     standard (1.51.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)

app/assets/stylesheets/users.css

@@ -8,3 +8,12 @@
     text-align: center;
   }
 }
+
+.users-list data[value="active"] {
+  color: #2e7d32;
+  font-weight: bold;
+}
+
+.users-list data[value="inactive"] {
+  color: #c62828;
+}

app/controllers/concerns/safety_standards_turbo_streams.rb

@@ -2,14 +2,13 @@
 # frozen_string_literal: true
 
 module SafetyStandardsTurboStreams
+  # Extends InspectionTurboStreams to add safety standards streams
   extend ActiveSupport::Concern
   extend T::Sig
 
   private
 
-  sig do
-    params(additional_info: T.nilable(String)).returns(T::Array[T.untyped])
-  end
+  sig { params(additional_info: T.nilable(String)).returns(T::Array[T.untyped]) }
   def success_turbo_streams(additional_info: nil)
     super + safety_standards_turbo_streams
   end

app/controllers/units_controller.rb

@@ -160,9 +160,9 @@ def validate_badge_id_param
 
     normalized_id = normalize_unit_id(id_param)
     return redirect_to_existing_unit(normalized_id) if unit_exists?(normalized_id)
-    return redirect_to_invalid_badge unless badge_exists?(normalized_id)
 
-    @validated_badge_id = normalized_id
+    # Only set validated badge ID if it exists, otherwise let model validation handle it
+    @validated_badge_id = normalized_id if badge_exists?(normalized_id)
   end
 
   def log_unit_event(action, unit, details = nil, changed_data = nil)
@@ -380,11 +380,6 @@ def redirect_to_existing_unit(normalized_id)
     redirect_to Unit.find(normalized_id)
   end
 
-  def redirect_to_invalid_badge
-    flash[:alert] = I18n.t("units.validations.invalid_badge_id")
-    redirect_to units_path
-  end
-
   def log_resource_event(action, unit, details, changed_data)
     Event.log(
       user: current_user,

app/helpers/users_helper.rb

@@ -20,4 +20,17 @@ def format_job_time(time)
     return "Never" unless time
     "#{time_ago_in_words(time)} ago"
   end
+
+  sig { params(user: User).returns(String) }
+  def user_activity_indicator(user)
+    if user.is_active?
+      days = (Date.current - user.created_at.to_date).to_i
+      label = I18n.t("users.status.active", days:)
+      tag.data(label, value: "active")
+    else
+      days = (Date.current - user.active_until).to_i
+      label = I18n.t("users.status.inactive", days:)
+      tag.data(label, value: "inactive")
+    end
+  end
 end

app/javascript/passkey_login.js

@@ -1,5 +1,9 @@
 // Passkey login functionality
-import { base64ToArrayBuffer, arrayBufferToBase64 } from "./webauthn_utils";
+import {
+  base64ToArrayBuffer,
+  arrayBufferToBase64,
+  postJson,
+} from "./webauthn_utils";
 
 document.addEventListener("turbo:load", () => {
   const loginButtons = document.querySelectorAll(
@@ -115,16 +119,11 @@ document.addEventListener("turbo:load", () => {
           },
         };
 
-        const callbackResponse = await fetch("/passkey_callback", {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-            Accept: "application/json",
-            "X-CSRF-Token": csrfToken,
-          },
-          body: JSON.stringify(credentialData),
-          credentials: "same-origin",
-        });
+        const callbackResponse = await postJson(
+          "/passkey_callback",
+          credentialData,
+          csrfToken,
+        );
 
         if (callbackResponse.ok) {
           window.location.href = "/inspections";