Merge branch 'main' into dependabot/bundler/sqlite3-2.8.0

Author: stefan-burke

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

@@ -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)

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/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)
@@ -383,11 +383,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/models/inspection.rb

@@ -225,19 +225,23 @@ def complete?
 
   sig { returns(T::Hash[Symbol, T.class_of(ApplicationRecord)]) }
   def assessment_types
-    case
-    when pat_testable? then PAT_TESTABLE_ASSESSMENT_TYPES
-    when bouncing_pillow? then PILLOW_ASSESSMENT_TYPES
-    else CASTLE_ASSESSMENT_TYPES
+    if pat_testable?
+      PAT_TESTABLE_ASSESSMENT_TYPES
+    elsif bouncing_pillow?
+      PILLOW_ASSESSMENT_TYPES
+    else
+      CASTLE_ASSESSMENT_TYPES
     end
   end
 
   sig { returns(T::Hash[Symbol, T.class_of(ApplicationRecord)]) }
   def applicable_assessments
-    case
-    when pat_testable? then pat_testable_applicable_assessments
-    when bouncing_pillow? then pillow_applicable_assessments
-    else castle_applicable_assessments
+    if pat_testable?
+      pat_testable_applicable_assessments
+    elsif bouncing_pillow?
+      pillow_applicable_assessments
+    else
+      castle_applicable_assessments
     end
   end
 
@@ -420,7 +424,7 @@ def inspection_tab_incomplete_fields
     fields = REQUIRED_TO_COMPLETE_FIELDS - [:passed]
 
     # PAT testable only needs inspection_date
-    fields = fields & [:inspection_date] if pat_testable?
+    fields &= [:inspection_date] if pat_testable?
 
     fields
       .reject { |f| f.end_with?("_comment") }

app/models/unit.rb

@@ -241,7 +241,7 @@ def badge_id_valid
     # Check if badge exists
     unless Badge.exists?(id: id)
       error_msg = I18n.t("units.validations.invalid_badge_id")
-      errors.add(:id, error_msg)
+      errors.add(:base, error_msg)
     end
   end
 end

app/views/shared/_save_message.html.erb

@@ -7,7 +7,7 @@
 
 <% if message_type == "error" %>
   <div class="error" id="<%= local_assigns[:dom_id] || 'form_save_message' %>">
-    <%= message_text || t('shared.messages.save_failed') %>
+    <strong><%= message_text || t('shared.messages.save_failed') %></strong>
     <% if local_assigns[:errors].present? %>
       <ul>
         <% local_assigns[:errors].each do |error| %>

app/views/users/index.html.erb

@@ -6,6 +6,7 @@
   <!-- Header row -->
   <div class="table-list-header">
     <%= render 'shared/table_column', field: :email, model: :user_edit, header: true %>
+    <%= render 'shared/table_column', field: :status, model: :user_edit, header: true %>
     <%= render 'shared/table_column', field: :admin, model: :user_edit, header: true %>
     <%= render 'shared/table_column', field: :registered, model: :user_edit, header: true %>
     <%= render 'shared/table_column', field: :last_active, model: :user_edit, header: true %>
@@ -20,6 +21,9 @@
           <%= render 'shared/table_column', field: :email, model: :user_edit do %>
             <%= user.email %>
           <% end %>
+          <%= render 'shared/table_column', field: :status, model: :user_edit do %>
+            <%= user_activity_indicator(user) %>
+          <% end %>
           <%= render 'shared/table_column', field: :admin, model: :user_edit do %>
             <%= user.admin? ? t('shared.yes') : t('shared.no') %>
           <% end %>

attributions.json

@@ -1,5 +1,5 @@
 {
-  "generated_at": "2025-12-01T03:47:38",
+  "generated_at": "2026-02-09T04:24:14",
   "total_dependencies": 151,
   "dependencies": [
     {