Merge branch 'main' into sqlite

Dockerfile

@@ -59,6 +59,9 @@ RUN useradd rails --create-home --shell /bin/bash && \
     chown -R rails:rails db log storage tmp
 USER rails:rails
 
+# Entrypoint prepares the database.
+ENTRYPOINT ["/rails/bin/docker-entrypoint"]
+
 # Ruby GC tuning values pulled from Autotuner recommendations
 ENV RUBY_GC_HEAP_0_INIT_SLOTS=692636 \
     RUBY_GC_HEAP_1_INIT_SLOTS=175943 \

app/assets/stylesheets/events.css

@@ -19,6 +19,33 @@
     --events-day-header-height: 1.75rem;
   }
 
+  .events--grid {
+    --events-grid-gap: 1rem;
+    --events-grid-columns: 1;
+
+    container-type: inline-size;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: var(--events-grid-gap);
+    justify-content: center;
+    margin: var(--block-space) auto;
+    max-inline-size: var(--main-width);
+
+    @media (min-width: 640px) {
+      --events-grid-columns: 2;
+    }
+
+    @media (min-width: 960px) {
+      --events-grid-columns: 3;
+    }
+
+    .event {
+      inline-size: calc((100% - var(--events-grid-gap) * (var(--events-grid-columns) - 1) ) / var(--events-grid-columns)) !important;
+      margin: 0 !important;
+    }
+  }
+
   .events__activity-summary {
     border: solid var(--color-ink-lighter);
     border-width: 1px 1px 0 1px;
@@ -206,6 +233,23 @@
     padding: var(--block-space-half) var(--inline-space);
   }
 
+  .events__maximize-button {
+    inset: calc(var(--events-gap) * 3) 0 auto auto;
+    outline-offset: -2px;
+    position: absolute;
+    transform: translateY(-10%);
+    z-index: 1;
+
+    @media (any-hover: hover ) {
+      opacity: 0;
+
+      .events__column-header:hover &,
+      &:focus-visible {
+        opacity: 1;
+      }
+    }
+  }
+
   .events__time-block {
     align-content: end;
     display: grid;

app/controllers/events/day_timeline/columns_controller.rb

@@ -0,0 +1,21 @@
+class Events::DayTimeline::ColumnsController < ApplicationController
+  include DayTimelinesScoped
+
+  before_action :ensure_valid_column
+  before_action :set_column
+
+  def show
+    fresh_when @day_timeline
+  end
+
+  private
+    VALID_COLUMNS = %w[ added updated closed ]
+
+    def ensure_valid_column
+      head :not_found unless VALID_COLUMNS.include?(params[:id])
+    end
+
+    def set_column
+      @column = @day_timeline.public_send("#{params[:id]}_column")
+    end
+end

app/javascript/controllers/form_controller.js

@@ -61,4 +61,8 @@ export default class extends Controller {
   select(event) {
     event.target.select()
   }
+
+  blurActiveInput() {
+    document.activeElement?.blur()
+  }
 }

app/models/user/day_timeline/column.rb

@@ -1,7 +1,7 @@
 class User::DayTimeline::Column
   include ActionView::Helpers::TagHelper, ActionView::Helpers::OutputSafetyHelper, TimeHelper
 
-  attr_reader :index
+  attr_reader :index, :base_title, :day_timeline, :events
 
   def initialize(day_timeline, base_title, index, events)
     @day_timeline = day_timeline
@@ -30,8 +30,6 @@ class User::DayTimeline::Column
   end
 
   private
-    attr_reader :base_title, :day_timeline, :events
-
     def limited_events
       @limited_events ||= events.limit(100).load
     end

app/views/cards/comments/_new.html.erb

@@ -8,7 +8,7 @@
       <%= form_with model: Comment.new, url: card_comments_path(card), class: "flex flex-column gap full-width",
             data: { controller: "form local-save",
                   local_save_key_value: "comment-#{card.id}",
-                  action: "turbo:submit-end->local-save#submit keydown.ctrl+enter->form#debouncedSubmit:prevent keydown.meta+enter->form#debouncedSubmit:prevent keydown.esc->form#cancel:stop" } do |form| %>
+                  action: "turbo:submit-end->local-save#submit turbo:submit-end->form#blur keydown.ctrl+enter->form#debouncedSubmit:prevent keydown.meta+enter->form#debouncedSubmit:prevent keydown.esc->form#cancel:stop" } do |form| %>
         <%= form.rich_textarea :body, required: true, placeholder: new_comment_placeholder(card),
               data: { local_save_target: "input", action: "lexxy:change->form#disableSubmitWhenInvalid lexxy:change->local-save#save turbo:morph-element->local-save#restoreContent" } do %>
           <%= general_prompts(@card.board) %>

app/views/events/day_timeline/_column.html.erb

@@ -1,5 +1,14 @@
 <div class="events__column">
-  <h3 class="events__column-header"><%= column.title %></h3>
+  <h3 class="events__column-header">
+    <%= column.title %>
+
+    <% if column.events_by_hour.any? %>
+      <%= link_to events_day_timeline_column_path(id: column.base_title.downcase, day: column.day_timeline.day.to_date), class: "events__maximize-button btn btn--circle txt-x-small borderless", data: { turbo_frame: "_top" } do %>
+        <%= icon_tag "grid", class: "translucent" %>
+        <span class="for-screen-reader">Expand column</span>
+      <% end %>
+    <% end %>
+  </h3>
   <% column.events_by_hour.each do |hour, events| %>
     <%= events_at_hour_container(column, hour) do %>
       <%= render partial: "events/event", collection: events, cached: true %>

app/views/events/day_timeline/columns/_events.html.erb

@@ -0,0 +1,7 @@
+<div class="events--grid">
+  <% column.events_by_hour.each do |hour, events| %>
+    <% if events.any? %>
+      <%= render partial: "events/event", collection: events, cached: true %>
+    <% end %>
+  <% end %>
+</div>

app/views/events/day_timeline/columns/show.html.erb

@@ -0,0 +1,19 @@
+<% @page_title = @column.base_title %>
+
+<% content_for :header do %>
+  <div class="header__actions header__actions--start">
+    <%= link_to events_path, class: "btn btn--back", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
+      <span class="overflow-ellipsis flex align-center">
+        <%= icon_tag "arrow-left" %>
+        <strong>Back to Actvity</strong>
+        <kbd class="txt-x-small margin-inline-start hide-on-touch">&larr;</kbd>
+      </span>
+    <% end %>
+  </div>
+
+  <h1 class="header__title">
+    <%= @column.title %>
+  </h1>
+<% end %>
+
+<%= render "events/day_timeline/columns/events", column: @column %>

config/brakeman.ignore

@@ -23,6 +23,29 @@
       ],
       "note": "No user input allowed"
     },
+    {
+      "warning_type": "Dangerous Send",
+      "warning_code": 23,
+      "fingerprint": "746ab8227e04231f0002e099e2f670bcc2b8927af85cdc69fab1440002d5c2a6",
+      "check_name": "Send",
+      "message": "User controlled method execution",
+      "file": "app/controllers/events/day_timeline/columns_controller.rb",
+      "line": 19,
+      "link": "https://brakemanscanner.org/docs/warning_types/dangerous_send/",
+      "code": "Current.user.timeline_for(day, :filter => ((Current.user.filters.find(params[:filter_id]) or Current.user.filters.from_params(filter_params)))).public_send(\"#{params[:id]}_column\")",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Events::DayTimeline::ColumnsController",
+        "method": "set_column"
+      },
+      "user_input": "params[:id]",
+      "confidence": "High",
+      "cwe_id": [
+        77
+      ],
+      "note": ""
+    },
     {
       "warning_type": "Mass Assignment",
       "warning_code": 70,

config/routes.rb

@@ -130,6 +130,9 @@ Rails.application.routes.draw do
   resources :events, only: :index
   namespace :events do
     resources :days
+    namespace :day_timeline do
+      resources :columns, only: :show
+    end
   end
 
   resources :qr_codes

test/controllers/events/day_timeline/columns_controller_test.rb

@@ -0,0 +1,30 @@
+require "test_helper"
+
+class Events::DayTimeline::ColumnsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "show added column" do
+    get events_day_timeline_column_path("added")
+    assert_response :success
+    assert_select "h1", text: /Added/
+  end
+
+  test "show updated column" do
+    get events_day_timeline_column_path("updated")
+    assert_response :success
+    assert_select "h1", text: /Updated/
+  end
+
+  test "show closed column" do
+    get events_day_timeline_column_path("closed")
+    assert_response :success
+    assert_select "h1", text: /Closed/
+  end
+
+  test "show returns not found for invalid column" do
+    get events_day_timeline_column_path("invalid")
+    assert_response :not_found
+  end
+end