Add My Tasks view & dashboard widget

CHANGELOG

@@ -1,5 +1,8 @@
 [v#.#.#] ([month] [YYYY])
   - Kit Import: Use file name sequencing when a template file with the same name exists
+  - Tasks:
+    - Add view with user assigned tasks
+    - Add dashboard widget for quick access to assigned tasks
   - Upgraded gems:
     - rexml
   - Bugs fixes:

app/assets/stylesheets/tylium/base.scss

@@ -33,6 +33,10 @@ a {
   background-color: $primaryColor !important;
 }
 
+.bg-warning {
+  color: $defaultText;
+}
+
 blockquote {
   border-left: 3px solid $primaryColor;
   padding-left: 1rem;

app/assets/stylesheets/tylium/modules/projects.scss

@@ -3,11 +3,11 @@ body.projects {
     #boards-summary {
       display: flex;
       flex-wrap: wrap;
-  
+
       .pie-chart {
         width: 50%;
       }
-  
+
       &.loading {
         background: image_url('loading.gif') no-repeat center;
       }
@@ -35,7 +35,7 @@ body.projects {
       display: flex;
       justify-content: center;
       align-items: center;
-  
+
       svg text {
         font-size: 14px;
       }
@@ -48,7 +48,6 @@ body.projects {
         margin-bottom: 1rem;
 
         .card-body {
-
           .list-group-item {
             border: none;
             transition: background-color 0.2s ease-in-out;
@@ -65,7 +64,7 @@ body.projects {
 
         .card-header {
           color: $white;
-  
+
           h5 {
             margin-bottom: 0;
           }
@@ -80,7 +79,7 @@ body.projects {
 
           .card-body li {
             color: #222;
-          };
+          }
 
           .card-header {
             background-color: #222;
@@ -89,4 +88,40 @@ body.projects {
       }
     }
   }
+
+  .tasks {
+    .list-group-item {
+      border: 1px solid $borderColor;
+      border-radius: 0.5rem;
+      margin-bottom: 1rem;
+      padding: 1rem;
+      pointer-events: none;
+
+      .badge {
+        margin-top: 0.5rem;
+        width: max-content;
+      }
+
+      &:hover {
+        background-color: $secondaryBgColor;
+      }
+
+      &:last-of-type {
+        margin-bottom: 0;
+      }
+
+      .list-group-item-action {
+        color: $linkColor;
+        padding-bottom: 0.5rem;
+        pointer-events: auto;
+
+        &:active,
+        &:focus,
+        &:hover {
+          background-color: $secondaryBgColor;
+          color: $linkColorHover;
+        }
+      }
+    }
+  }
 }

app/controllers/projects_controller.rb

@@ -1,5 +1,6 @@
 class ProjectsController < AuthenticatedController
   include NotificationsReader
+  include TasksHelper
 
   before_action :set_project
 
@@ -16,12 +17,13 @@ def show
     @authors       = [current_user]
     @boards        = current_project.methodology_library.boards
     @issues        = current_project.issues.includes(:tags).sort
-    @methodologies = current_project.methodology_library.notes.map{|n| Methodology.new(filename: n.id, content: n.text)}
+    @methodologies = current_project.methodology_library.notes.map { |n| Methodology.new(filename: n.id, content: n.text) }
     @nodes         = current_project.nodes.in_tree
     @tags          = current_project.tags
+    @tasks         = assigned_cards(current_project.id)
 
     @count_by_tag  = { unassigned: 0 }
-    @issues_by_tag = Hash.new{|h,k| h[k] = [] }
+    @issues_by_tag = Hash.new { |h, k| h[k] = [] }
 
     @tag_names = @tags.map do |tag|
       @count_by_tag[tag.name] = 0
@@ -41,7 +43,7 @@ def show
     end
 
     respond_to do |format|
-      format.html { render layout: 'tylium' if !request.xhr?}
+      format.html { render layout: 'tylium' if !request.xhr? }
       format.json { render json: @boards }
     end
   end

app/controllers/tasks_controller.rb

@@ -0,0 +1,26 @@
+class TasksController < AuthenticatedController
+  include ProjectScoped
+  include TasksHelper
+
+  skip_before_action :set_project, unless: -> { current_project }
+  skip_before_action :set_nodes, unless: -> { current_project }
+
+  def index
+    @default_columns = ['Title', 'Methodology', 'List', 'Due Date', 'Assigned']
+
+    if current_project
+      @local_storage_key = "project.ce.project_#{current_project.id}.tasks_datatable"
+      @tasks = assigned_cards(current_project.id)
+    end
+  end
+
+  private
+
+  # ProjectScoped always calls current_project. We are overwriting it here to
+  # prevent errors in Pro when viewing tasks outside of projects.
+  def current_project
+    return if params[:project_id].blank?
+
+    super
+  end
+end

app/helpers/tasks_helper.rb

@@ -0,0 +1,42 @@
+module TasksHelper
+  TASKS_LIMIT = 5
+
+  def assigned_cards(project_id = nil)
+    @assigned_cards ||= begin
+      # Using Arel.sql to sort the records by due_date with null due_date records last
+      cards = current_user.cards.order(Arel.sql('due_date IS NULL, due_date ASC'))
+
+      if project_id
+        cards.select { |card| card.project.id == current_project.id }
+      else
+        valid_project_ids = Project.kept.current.accessible_by(current_ability).ids
+        cards.select { |card| card.project.id.in? valid_project_ids }
+      end
+    end
+  end
+
+  def overflow_tasks_count(tasks)
+    return 0 unless tasks.size > TASKS_LIMIT
+
+    tasks.size - TASKS_LIMIT
+  end
+
+  def due_date_badge(task)
+    return unless task.due_date
+
+    badge_class =
+      case task.due_date
+      when Date.today
+        'bg-warning'
+      when ->(date) { date < Date.today }
+        'bg-danger'
+      else
+        'bg-success'
+      end
+
+    content_tag(:span, class: "badge-due-date badge #{badge_class}") do
+      content_tag(:i, nil, class: 'fa-regular fa-clock me-1') +
+      content_tag(:span, task.due_date.strftime('%b %e'))
+    end
+  end
+end

app/jobs/notifications_reader_job.rb

@@ -9,7 +9,7 @@ def perform(notifiable_id:, notifiable_type:, user_id:)
     Notification.transaction do
       @notifiable = notifiable_type.constantize.find_by(id: notifiable_id)
 
-      mark_notifications_from_assignments if NOTIFIABLE_TYPES.include?(notifiable_type)
+      mark_notifications_from_tasks if NOTIFIABLE_TYPES.include?(notifiable_type)
       mark_notifications_from_comments
 
       if Notification.unread.where(recipient_id: user_id).count == 0
@@ -20,8 +20,8 @@ def perform(notifiable_id:, notifiable_type:, user_id:)
 
   private
 
-  # Mark all assignment notifications from the notifiable as read
-  def mark_notifications_from_assignments
+  # Mark all task notifications from the notifiable as read
+  def mark_notifications_from_tasks
     @notifiable.notifications.unread.where(recipient_id: @user_id, action: :assign).
       mark_all_as_read!
   end

app/models/user.rb

@@ -5,6 +5,8 @@ class User < ApplicationRecord
   validates_associated :preferences
 
   # -- Relationships --------------------------------------------------------
+  has_and_belongs_to_many :cards
+
   has_many :activities
   has_many :comments, dependent: :nullify
   has_many :notifications, foreign_key: 'recipient_id', dependent: :destroy

app/views/layouts/tylium/_sidebar.html.erb

@@ -4,22 +4,27 @@
 
   <div class="scrollable-content">
     <ul id="main-menu" class="main-menu">
-      <%= content_tag :li, :class => controller_path == 'projects' ? 'active' : '' do %>
+      <%= content_tag :li, class: controller_path == 'projects' ? 'active' : '' do %>
         <%= link_to main_app.project_path(current_project), class: 'sidebar-link', data: { behavior: 'sidebar-link' } do %>
           <i class="fa-solid fa-tachometer sidebar-link-icon"></i> <span class="sidebar-link-label">Dashboard</span>
         <% end %>
       <% end %>
-      <%= content_tag :li, :class => controller_path.include?('issues') ? 'active' : '' do %>
+      <%= content_tag :li, class: controller_path.include?('issues') ? 'active' : '' do %>
         <%= link_to main_app.project_issues_path(current_project), class: 'sidebar-link', data: { behavior: 'sidebar-link' } do %>
           <i class="fa-solid fa-bug sidebar-link-icon"></i> <span class="sidebar-link-label">All issues</span>
         <% end %>
       <% end %>
-      <%= content_tag :li, :class => controller_path == 'boards' || controller_path == 'cards' ? 'active' : '' do %>
+      <%= content_tag :li, class: controller_path == 'boards' || controller_path == 'cards' ? 'active' : '' do %>
         <%= link_to main_app.project_boards_path(current_project), class: 'sidebar-link', data: { behavior: 'sidebar-link' } do %>
           <i class="fa-brands fa-trello sidebar-link-icon"></i> <span class="sidebar-link-label">Methodologies</span>
         <% end %>
       <% end %>
-      <%= content_tag :li, :class => action_name == 'trash' ? 'active' : '' do %>
+      <%= content_tag :li, class: controller_path == 'tasks' ? 'active' : '' do %>
+        <%= link_to main_app.project_tasks_path(current_project), class: 'sidebar-link', data: { behavior: 'sidebar-link' } do %>
+          <i class="fa-solid fa-tasks sidebar-link-icon"></i> <span class="sidebar-link-label">My Tasks</span>
+        <% end %>
+      <% end %>
+      <%= content_tag :li, class: action_name == 'trash' ? 'active' : '' do %>
         <%= link_to main_app.project_trash_path(current_project), class: 'sidebar-link', data: { behavior: 'sidebar-link' } do %>
           <i class="fa-solid fa-trash sidebar-link-icon" aria-hidden="true"></i> <span class="sidebar-link-label">Trash</span>
         <% end %>

app/views/projects/show.html.erb

@@ -10,6 +10,9 @@
   <div class="col-12 col-lg-6 col-xxl-8 p-0">
     <div class="row m-0">
       <div class="col-xxl-6 p-0">
+        <div class="content-container mt-0 mt-lg-3 ms-lg-3 mx-xxl-3 pb-2">
+          <%= render partial: 'projects/tasks/summary' %>
+        </div>
         <div class="content-container mt-0 mt-lg-3 ms-lg-3 mx-xxl-3">
           <%= render partial: 'projects/boards/summary' %>
         </div>

app/views/projects/tasks/_summary.html.erb

@@ -0,0 +1,38 @@
+<section class="summary-panel">
+  <h4 class="header-underline">My Tasks
+    <span class="actions pt-1">
+      <div class="action">
+        <%= link_to project_tasks_path(current_project) do %>
+          <i class="fa-solid fa-tasks sidebar-link-icon"></i> All Tasks
+        <% end %>
+      </div>
+    </span>
+  </h4>
+  <% if @tasks.any? %>
+    <ul class="list-group tasks">
+      <% @tasks.first(TasksHelper::TASKS_LIMIT).each do |task| %>
+        <li class="d-flex flex-column list-group-item">
+          <%= link_to project_board_list_card_path(current_project, task.board, task.list, task), class: "list-group-item-action text-truncate" do %>
+            <%= task.name %>
+          <% end %>
+          <span class="small text-muted"><%= task.board.name %></span>
+          <%= due_date_badge(task) %>
+        </li>
+      <% end %>
+    </ul>
+
+    <p class="small mt-2 mb-0 text-center">&nbsp;
+      <% if overflow_tasks_count(@tasks) > 0 %>
+        + <%= overflow_tasks_count(@tasks) %> more
+      <% end %>
+    </p>
+  <% else %>
+    <div class="mb-3">
+      <%= render 'shared/empty_state',
+        name: 'task',
+        docs_link: 'https://dradis.com/support/guides/projects/methodologies.html#task',
+        text: "Use this space to stay on top of tasks once they're assigned."
+      %>
+    </div>
+  <% end %>
+</section>

app/views/tasks/index.html.erb

@@ -0,0 +1,53 @@
+<% content_for :title, 'My Tasks' %>
+
+<div class="content-container mt-3">
+  <% if @tasks.any? %>
+    <table class="table table-striped align-middle"
+            data-behavior="dradis-datatable"
+            data-default-columns="<%= @default_columns %>"
+            data-local-storage-key="<%= @local_storage_key %>">
+      <thead>
+        <tr>
+          <th>Title</th>
+          <% unless params[:project_id] %>
+            <th>Project</th>
+          <% end %>
+          <th>Methodology</th>
+          <th>List</th>
+          <th>Due Date</th>
+          <th>Assigned</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @tasks.each do |task| %>
+          <tr>
+            <td data-sort="<%= task.name %>">
+              <%= link_to task.name, project_board_list_card_path(task.project, task.board, task.list, task) %>
+            </td>
+            <% unless params[:project_id] %>
+              <td data-sort="<%= task.project.name %>"><%= task.project.name %></td>
+            <% end %>
+            <td data-sort="<%= task.board.name %>"><%= task.board.name %></td>
+            <td data-sort="<%= task.list.name %>"><%= task.list.name %></td>
+            <td data-sort="<%= task.due_date || 'no-due-date' %>"><%= due_date_badge(task) %></td>
+            <td>
+              <ul class="d-flex flex-wrap m-0 p-0">
+                <% task.assignees.each do |assignee| %>
+                  <li class="d-inline-flex" data-bs-toggle="tooltip" data-bs-placement="top" title="<%= assignee.name %>">
+                    <%= avatar_image(assignee, size: 30) %>
+                  </li>
+                <% end %>
+              </ul>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% else %>
+    <%= render 'shared/empty_state',
+      name: 'task',
+      docs_link: 'https://dradis.com/support/guides/projects/methodologies.html#task',
+      text: "Use this space to stay on top of tasks once they're assigned."
+    %>
+  <% end %>
+</div>

config/routes.rb

@@ -109,6 +109,8 @@
 
     resources :tags, except: [:show]
 
+    resources :tasks, only: :index
+
     namespace :qa do
       resources :issues, only: [:edit, :index, :show, :update], concerns: [:multiple_update, :previewable]
     end