Activity filters #1207

skliask · 2023-11-29T11:40:54Z

Spec

Problem

Dradis has an activity feed on the Dashboard, with a link to view all activities in the project. With the current implementation, users don’t have a way to narrow down the activities that are listed in the all activities view.

Solution

We can implement a set of filters that will allow users to narrow down the activities by date range, type (Issue, Evidence, etc), and user.

The result should allow users to easily determine which activities:
were performed by a specific user
were performed during a certain date range
were performed on a certain date
are related to Issues, Evidence, Notes, Nodes, etc

Check List

Added a CHANGELOG entry

CHANGELOG

app/views/activities/_filters.html.erb

spec/features/activity_pages/activity_pages_spec.rb

app/assets/javascripts/tylium/pages/activities.js

app/controllers/activities_controller.rb

app/models/activity.rb

app/views/activities/_filters.html.erb

spec/features/activity_pages/activity_pages_spec.rb

spec/models/activity_spec.rb

CHANGELOG

app/controllers/activities_controller.rb

app/views/activities/_filters.html.erb

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

…dates

app/controllers/activities_controller.rb

spec/features/activity_pages/activity_pages_spec.rb

caitmich · 2024-08-16T20:14:42Z

CHANGELOG

@@ -1,6 +1,5 @@
 [v#.#.#] ([month] [YYYY])
-  - [entity]:
-    - [future tense verb] [feature]
+  - Activity: Filter activities by user, type, and date


Suggested change

- Activity: Filter activities by user, type, and date

- Activities: Filter activities by user, type, and date

caitmich · 2024-08-16T20:26:24Z

app/controllers/activities_controller.rb

@@ -6,11 +6,11 @@ class ActivitiesController < AuthenticatedController

  def index
    @page = params[:page].present? ? params[:page].to_i : 1
+    @users_for_select = current_project.activities.map(&:user).union(current_project.authors.enabled)


Do we want to include users that have no activities?

With the first part of this query we're also including users who have activities in the project even if they're no longer on the project. Do we want to include these?

caitmich · 2024-08-16T20:52:17Z

app/controllers/activities_controller.rb

+  end
+
+  def valid_date?(date_string)
+    Date.parse(date_string)


This will allow dates in the future. Do we want to prevent this?

caitmich · 2024-08-16T21:06:37Z

app/controllers/activities_controller.rb

+
+  def filter_activities(activities)
+    if params[:since].present? && valid_date?(params[:since])
+      activities = activities.since(DateTime.parse(params[:since]).beginning_of_day)


We don't need beginning_of_day since DateTime.parse on a date like 2024-08-01 will return beginning of day: Thu, 01 Aug 2024 00:00:00 +0000

caitmich · 2024-08-16T21:31:21Z

app/views/activities/_filters.html.erb

+      <%= f.select :user_id, options_from_collection_for_select(@users_for_select, :id, :name, params[:user_id]), { include_blank: 'All users' }, { class: 'form-select' } %>
+    </div>
+    <div class="w-100">
+      <%= f.label :trackable_type, class: 'form-label' %>


Can we label this something more user-friendly?

caitmich · 2024-08-16T21:32:26Z

app/views/activities/_filters.html.erb

+    </div>
+    <div class="w-100">
+      <%= f.label :trackable_type, class: 'form-label' %>
+      <%= f.select :trackable_type, options_from_collection_for_select(current_project.activities.pluck(:trackable_type).uniq, :to_s, :demodulize, params[:trackable_type] ), { include_blank: 'All types', selected: params[:type] }, { class: 'form-select' } %>


Can we get the collection of trackable types in the controller?

caitmich · 2024-08-16T21:33:31Z

app/views/activities/_filters.html.erb

+    </div>
+    <div class="w-100">
+      <%= f.label :trackable_type, class: 'form-label' %>
+      <%= f.select :trackable_type, options_from_collection_for_select(current_project.activities.pluck(:trackable_type).uniq, :to_s, :demodulize, params[:trackable_type] ), { include_blank: 'All types', selected: params[:type] }, { class: 'form-select' } %>


Suggested change

<%= f.select :trackable_type, options_from_collection_for_select(current_project.activities.pluck(:trackable_type).uniq, :to_s, :demodulize, params[:trackable_type] ), { include_blank: 'All types', selected: params[:type] }, { class: 'form-select' } %>

<%= f.select :trackable_type, options_from_collection_for_select(current_project.activities.pluck(:trackable_type).uniq, :to_s, :demodulize, params[:trackable_type] ), { include_blank: 'All types' }, { class: 'form-select' } %>

caitmich · 2024-08-16T21:34:15Z

app/views/activities/_filters.html.erb

+    <span class="form-label mb-2 d-block">Date range</span>
+    <div class="d-flex flex-column flex-sm-row gap-3 w-100">
+      <div class="input-group">
+        <%= f.date_field :since, max: params[:before] || Date.today, min: "01-01-2016", placeholder: 'From date', value: params[:since], class: 'form-control', data: { behavior: 'since' } %>


Any reason for the min date choice?

caitmich · 2024-08-16T21:37:03Z

app/views/activities/_filters.html.erb

+        <%= f.date_field :before, max: Date.today, min: params[:since], placeholder: 'To date', value: params[:before] || Date.today, class: 'form-control' %>
+      </div>
+
+      <%= link_to project_activities_path(current_project.id), class: 'text-error-hover text-nowrap d-flex align-items-center' do %>


Suggested change

<%= link_to project_activities_path(current_project.id), class: 'text-error-hover text-nowrap d-flex align-items-center' do %>

<%= link_to project_activities_path(current_project), class: 'text-error-hover text-nowrap d-flex align-items-center' do %>

caitmich · 2024-08-16T21:43:10Z

app/controllers/activities_controller.rb

+
+  private
+
+  def filtering_params


we're not using this anywhere but probably a good idea

caitmich · 2024-08-16T21:51:05Z

app/views/activities/_filters.html.erb

+    </div>
+    <div class="w-100">
+      <%= f.label :trackable_type, class: 'form-label' %>
+      <%= f.select :trackable_type, options_from_collection_for_select(current_project.activities.pluck(:trackable_type).uniq, :to_s, :demodulize, params[:trackable_type] ), { include_blank: 'All types', selected: params[:type] }, { class: 'form-select' } %>


Can we split this across multiple lines? ditto for the other fields

MattBudz requested changes Dec 5, 2023

View reviewed changes

skliask force-pushed the activity_filters branch 5 times, most recently from e31cbcd to 065f478 Compare December 6, 2023 16:57

MattBudz reviewed Dec 7, 2023

View reviewed changes

app/assets/javascripts/tylium/pages/activities.js Outdated Show resolved Hide resolved

caitmich reviewed Dec 11, 2023

View reviewed changes

app/controllers/activities_controller.rb Outdated Show resolved Hide resolved

caitmich reviewed Dec 11, 2023

View reviewed changes

app/models/activity.rb Outdated Show resolved Hide resolved

caitmich reviewed Dec 11, 2023

View reviewed changes

app/models/activity.rb Outdated Show resolved Hide resolved

caitmich reviewed Dec 11, 2023

View reviewed changes

app/views/activities/_filters.html.erb Outdated Show resolved Hide resolved

caitmich reviewed Dec 11, 2023

View reviewed changes

app/views/activities/_filters.html.erb Outdated Show resolved Hide resolved

caitmich reviewed Dec 11, 2023

View reviewed changes

spec/features/activity_pages/activity_pages_spec.rb Outdated Show resolved Hide resolved

caitmich reviewed Dec 11, 2023

View reviewed changes

spec/models/activity_spec.rb Outdated Show resolved Hide resolved

skliask force-pushed the activity_filters branch 5 times, most recently from 48108ee to 023b765 Compare December 12, 2023 16:00

caitmich reviewed Dec 12, 2023

View reviewed changes

spec/models/activity_spec.rb Outdated Show resolved Hide resolved

skliask force-pushed the activity_filters branch 2 times, most recently from e760489 to bfedcb5 Compare December 14, 2023 12:48

MattBudz reviewed Dec 14, 2023

View reviewed changes

CHANGELOG Outdated Show resolved Hide resolved

MattBudz reviewed Dec 14, 2023

View reviewed changes

app/controllers/activities_controller.rb Outdated Show resolved Hide resolved

MattBudz reviewed Dec 14, 2023

View reviewed changes

app/views/activities/_filters.html.erb Outdated Show resolved Hide resolved

MattBudz reviewed Dec 14, 2023

View reviewed changes

app/views/activities/_filters.html.erb Outdated Show resolved Hide resolved

MattBudz reviewed Dec 14, 2023

View reviewed changes

app/assets/stylesheets/tylium/modules/activities.scss Outdated Show resolved Hide resolved

skliask force-pushed the activity_filters branch 3 times, most recently from 22928f0 to 1edc807 Compare December 14, 2023 15:03

Kostas Sklias and others added 12 commits February 6, 2024 19:13

UI responsiveness for filters

e3498f6

Improves clear button UI

ee31c64

design consistency and responsive design changes

21d0dd4

DRYs up activities controller

752970f

Improves population to project specific inputs

6ac1df3

Prevents date fields to be submitted manually

bd27d00

Includes users that have interacted or are on the project

67c5b4d

Remove unnecessary function wrapping from activities.js

41b6096

Rename Activity scoping methods to read better

370d0fd

Remove ActivitiesHelper and move its logic in ActivitiesController

d0c8a7c

Replace Activerecord's create with FactoryBot's create_list()

704b8b1

Prevent throwing server error when filtering activities with invalid …

cc678cd

…dates

skliask force-pushed the activity_filters branch from 45d57ad to cc678cd Compare February 6, 2024 17:14

aapomm reviewed Feb 22, 2024

View reviewed changes

app/controllers/activities_controller.rb Outdated Show resolved Hide resolved

aapomm reviewed Feb 22, 2024

View reviewed changes

app/controllers/activities_controller.rb Outdated Show resolved Hide resolved

aapomm reviewed Feb 22, 2024

View reviewed changes

app/controllers/activities_controller.rb Outdated Show resolved Hide resolved

aapomm reviewed Feb 22, 2024

View reviewed changes

spec/features/activity_pages/activity_pages_spec.rb Show resolved Hide resolved

aapomm added 2 commits August 15, 2024 19:38

Merge branch 'develop' into activity_filters

0ed1bfe

Improve filtering and add spec cases

826d1cc

caitmich reviewed Aug 16, 2024

View reviewed changes

app/controllers/activities_controller.rb

private

def filtering_params

Copy link

Contributor

caitmich Aug 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're not using this anywhere but probably a good idea

caitmich reviewed Aug 16, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Activity filters #1207

Activity filters #1207

skliask commented Nov 29, 2023 •

edited

Loading

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

caitmich Aug 16, 2024

	- Activity: Filter activities by user, type, and date
	- Activities: Filter activities by user, type, and date

	<%= f.select :trackable_type, options_from_collection_for_select(current_project.activities.pluck(:trackable_type).uniq, :to_s, :demodulize, params[:trackable_type] ), { include_blank: 'All types', selected: params[:type] }, { class: 'form-select' } %>
	<%= f.select :trackable_type, options_from_collection_for_select(current_project.activities.pluck(:trackable_type).uniq, :to_s, :demodulize, params[:trackable_type] ), { include_blank: 'All types' }, { class: 'form-select' } %>

	<%= link_to project_activities_path(current_project.id), class: 'text-error-hover text-nowrap d-flex align-items-center' do %>
	<%= link_to project_activities_path(current_project), class: 'text-error-hover text-nowrap d-flex align-items-center' do %>

Activity filters #1207

Are you sure you want to change the base?

Activity filters #1207

Conversation

skliask commented Nov 29, 2023 • edited Loading

Spec

Problem

Solution

Check List

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

skliask commented Nov 29, 2023 •

edited

Loading