v0.12.1

Author: ArtOfCode-

app/assets/javascripts/audit_logs.js

@@ -0,0 +1,5 @@
+document.addEventListener('DOMContentLoaded', () => {
+  document.querySelectorAll('.js-log-type-select, .js-event-type-select').forEach((el) => {
+    $(el).select2();
+  });
+});

app/assets/javascripts/comments.js

@@ -313,7 +313,8 @@ $(() => {
     ev.preventDefault();
     const $tgt = $(ev.target);
     const postId = $tgt.attr('data-post');
-    const $reply = $(`#reply-to-thread-form-${postId}`);
+    const threadId = $tgt.attr('data-thread');
+    const $reply = $(`#reply-to-thread-form-${postId}-${threadId}`);
 
     if ($reply.is(':hidden')) {
       $reply.show();

app/assets/stylesheets/audit_logs.scss

@@ -0,0 +1,21 @@
+@import 'variables';
+
+.audit-log-filters {
+  .select2-container {
+    height: 37px;
+    margin: 4px 0px;
+
+    .selection {
+      .select2-selection {
+        border-color: $muted-graphic;
+        height: 100%;
+        padding: 4px 0;
+      }
+
+      .select2-selection__arrow {
+        top: 50%;
+        translate: 0 -50%;
+      }
+    }
+  }
+}

app/assets/stylesheets/forms.scss

@@ -20,17 +20,23 @@ select.form-element {
   }
 
   & > .form-group {
-    margin: 0.5em 0;
+    margin: 0 0 1em 0;
 
     @media screen and (min-width: $screen-md) {
-      margin: 0 0.5em;
+      margin: 0 1em 0 0;
       flex: 1;
     }
   }
 
   & > .actions {
     display: flex;
     align-items: flex-end;
+    margin-bottom: 4px; // to match bottom margin on .form-element
+
+    button, input[type="submit"] {
+      margin: unset;
+      padding: 9.5px 12px; // because for some reason it has to be 9.5px to match .form-elements' height
+    }
   }
 }
 
@@ -49,6 +55,10 @@ select.form-element {
   z-index: 8999;
 }
 
+.select2-results__option {
+  min-height: 2em;
+}
+
 @for $i from 1 through 25 {
   textarea.has-rows[rows="#{$i}"] {
     min-height: (1.2em * $i) + 1.2em;

app/controllers/admin_controller.rb

@@ -83,14 +83,33 @@ def audit_log
     @page = helpers.safe_page(params)
     @per_page = helpers.safe_per_page(params)
 
+    @log_types = AuditLog.unscoped.select(:log_type).distinct.map(&:log_type) - ['user_annotation', 'user_history']
+    @event_types = AuditLog.unscoped.select(:event_type).distinct.map(&:event_type)
+
     @logs = if current_user.is_global_admin
               AuditLog.unscoped.where.not(log_type: ['user_annotation', 'user_history'])
             else
               AuditLog.where.not(log_type: ['block_log', 'user_annotation', 'user_history'])
-            end.user_sort({ term: params[:sort], default: :created_at },
-                          age: :created_at, type: :log_type, event: :event_type,
-                          related: Arel.sql('related_type DESC, related_id DESC'), user: :user_id)
-            .paginate(page: @page, per_page: @per_page)
+            end
+
+    [:log_type, :event_type].each do |key|
+      if params[key].present?
+        @logs = @logs.where(key => params[key])
+      end
+    end
+
+    if params[:from].present?
+      @logs = @logs.where('date(created_at) >= ?', params[:from])
+    end
+
+    if params[:to].present?
+      @logs = @logs.where('date(created_at) <= ?', params[:to])
+    end
+
+    @logs = @logs.user_sort({ term: params[:sort], default: :created_at },
+                            age: :created_at, type: :log_type, event: :event_type,
+                            related: Arel.sql('related_type DESC, related_id DESC'), user: :user_id)
+                 .paginate(page: @page, per_page: @per_page)
 
     render layout: 'without_sidebar'
   end

app/views/admin/audit_log.html.erb

@@ -1,7 +1,38 @@
 <h1><%= t 'admin.tools.audit_log' %></h1>
 
+<div>
+  <h3>Filters</h3>
+  <%= form_tag audit_log_path, method: :get, class: 'form-inline audit-log-filters' do %>
+    <div class="form-group-horizontal">
+      <div class="form-group">
+        <%= label_tag :log_type, 'Log category', class: 'form-element' %>
+        <%= select_tag :log_type, options_for_select(@log_types.map { |lt| [lt, lt] }, selected: params[:log_type]),
+                       include_blank: true, class: 'form-element js-log-type-select' %>
+      </div>
+      <div class="form-group">
+        <%= label_tag :event_type, 'Event', class: 'form-element' %>
+        <%= select_tag :event_type, options_for_select(@event_types.map { |et| [et, et] },
+                                                       selected: params[:event_type]),
+                       include_blank: true, class: 'form-element js-event-type-select' %>
+      </div>
+      <div class="form-group">
+        <%= label_tag :from, 'From date', class: 'form-element' %>
+        <%= date_field_tag :from, params[:from], class: 'form-element' %>
+      </div>
+      <div class="form-group">
+        <%= label_tag :to, 'To date', class: 'form-element' %>
+        <%= date_field_tag :to, params[:to], class: 'form-element' %>
+      </div>
+      <div class="actions">
+        <%= submit_tag 'Filter', class: 'button is-filled' %>
+      </div>
+    </div>
+  <% end %>
+</div>
+
 <div class="category-meta">
   <h3><%= pluralize(@logs.count, t('g.log')) %></h3>
+
   <div class="button-list is-gutterless">
     <% classes = 'button is-outlined is-muted' %>
     <%= link_to t('g.age'), request.params.merge(sort: 'age'),

app/views/comments/_new_thread_modal.html.erb

@@ -31,8 +31,8 @@
                         required: true,
                         data: { post: post.id,
                                 thread: '-1',
-                                character_count: ".js-character-count-#{post.id}" } %>
-      <%= render 'shared/char_count', type: post.id, min: min_chars, max: max_chars %>
+                                character_count: ".js-character-count-new-thread-#{post.id}" } %>
+      <%= render 'shared/char_count', type: "new-thread-#{post.id}", min: min_chars, max: max_chars %>
 
       <%= label_tag :title, 'Comment thread title (optional)', class: 'form-element' %>
       <span class="form-caption">

app/views/comments/_reply_to_thread.html.erb

@@ -10,6 +10,10 @@
 %>
 
 <%
+  # TODO: make configurable
+  min_chars = 15
+  max_chars = 1000
+
   can_comment = user.can_reply_to?(thread)
   is_rate_limited, rate_limit_message = comment_rate_limited?(user, post, create_audit_log: false)
   text ||= defined?(text) && text.present? ? text : t('comments.labels.reply_to_thread')
@@ -28,7 +32,7 @@
 
 <div class="reply-to-thread-wrapper">
   <%= link_to 'javascript:void(0)', class: 'button is-outlined is-small js-reply-to-thread-link',
-                                    data: { post: post.id },
+                                    data: { post: post.id, thread: thread.id },
                                     disabled: !can_comment,
                                     role: 'button',
                                     title: is_exempt ? '' : title do %>
@@ -40,16 +44,20 @@
 </div>
 
 <% if can_comment %>
-  <%= form_tag create_comment_path(thread.id), class: 'reply-to-thread-form', id: "reply-to-thread-form-#{post.id}" do %>
+  <%= form_tag create_comment_path(thread.id), class: 'reply-to-thread-form',
+                                               id: "reply-to-thread-form-#{post.id}-#{thread.id}" do %>
     <%= hidden_field_tag :post_id, post.id %>
     <%= hidden_field_tag :inline, inline %>
     <%= label_tag :content, 'Your message', class: 'form-element' %>
     <%= text_area_tag :content, '',
                       class: 'form-element js-comment-field',
+                      minlength: min_chars,
+                      maxlength: max_chars,
+                      required: true,
                       data: { thread: thread.id,
                               post: thread.post_id,
-                              character_count: ".js-character-count-#{post.id}" } %>
-    <%= render 'shared/char_count', type: post.id, min: 15, max: 1000 %>
+                              character_count: ".js-character-count-thread-reply-#{post.id}-#{thread.id}" } %>
+    <%= render 'shared/char_count', type: "thread-reply-#{post.id}-#{thread.id}", min: min_chars, max: max_chars %>
     <%= submit_tag 'Add reply', class: 'button is-muted is-filled', disabled:true %>
   <% end %>
 <% end %>

test/controllers/admin_controller_test.rb

@@ -157,4 +157,12 @@ class AdminControllerTest < ActionController::TestCase
       assert_not_nil flash[:success]
     end
   end
+
+  test 'audit log should work with filter params' do
+    sign_in users(:admin)
+    get :audit_log, params: { log_type: 'admin_audit', event_type: 'setting_update', from: '2025-04-13',
+                              to: '2025-04-13' }
+    assert_response(:success)
+    assert_not_nil assigns(:logs)
+  end
 end