Merge branch 'develop' into sidebar/collapse-conditionally

MattBudz · web-flow · commit 53d6df2b93c6 · 2026-01-27T14:22:51.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,5 @@
 [v#.#.#] ([month] [YYYY])
+  - Activities: remove ActivityTracking for Issues and use EventPublisher
   - Profile: update default user avatar
   - Forms: Improve visibility of form actions
   - Docker:
diff --git a/app/controllers/issues/merge_controller.rb b/app/controllers/issues/merge_controller.rb
@@ -1,5 +1,4 @@
 class Issues::MergeController < IssuesController
-
   def new
     @issues = []
 
@@ -22,8 +21,8 @@ def create
       if @issue.new_record?
         @issue.author ||= current_user.email
         if @issue.save && @issue.update(issue_params)
-          track_created(@issue)
           @issue.tag_from_field_content!
+          publish_event('issue.created', @issue.to_event_payload)
         end
       end
 
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
@@ -1,8 +1,8 @@
 class IssuesController < AuthenticatedController
-  include ActivityTracking
   include ConflictResolver
   include ContentFromTemplate
   include DynamicFieldNamesCacher
+  include EventPublisher
   include IssuesHelper
   include LiquidEnabledResource
   include Mentioned
@@ -47,22 +47,21 @@ def create
 
     respond_to do |format|
       if @issue.save &&
-          # FIXME: need to fix Taggable concern.
-          #
-          # For some reason we can't save the :tags before we save the model,
-          # so first we save it, then we apply the tags.
-          #
-          # See #set_or_initialize_issue()
-          #
-          @issue.update(issue_params)
-
-        track_created(@issue)
+        # FIXME: need to fix Taggable concern.
+        #
+        # For some reason we can't save the :tags before we save the model,
+        # so first we save it, then we apply the tags.
+        #
+        # See #set_or_initialize_issue()
+        #
+        @issue.update(issue_params)
 
         # Only after we save the issue, we can create valid taggings (w/ valid
         # taggable IDs)
         @issue.tag_from_field_content!
 
         format.html { redirect_to [current_project, @issue], notice: 'Issue added.' }
+        publish_event('issue.created', @issue.to_event_payload)
       else
         format.html do
           flash.now[:alert] = 'Issue couldn\'t be added.'
@@ -84,8 +83,8 @@ def update
       if @issue.update(issue_params)
         @modified = true
         check_for_edit_conflicts(@issue, updated_at_before_save)
-        track_updated(@issue)
         format.html { redirect_to_main_or_qa }
+        publish_event('issue.updated', @issue.to_event_payload)
       else
         format.html do
           flash.now[:alert] = 'Issue couldn\'t be updated.'
@@ -100,9 +99,9 @@ def update
   def destroy
     respond_to do |format|
       if @issue.destroy
-        track_destroyed(@issue)
         format.html { redirect_to project_issues_path(current_project), notice: 'Issue deleted.' }
         format.json
+        publish_event('issue.destroyed', @issue.to_event_payload)
       else
         format.html { redirect_to project_issues_path(current_project), notice: "Error while deleting issue: #{@issue.errors}" }
         format.json
diff --git a/app/models/issue.rb b/app/models/issue.rb
@@ -1,5 +1,6 @@
 class Issue < Note
   include Commentable
+  include Eventable
   # FIXME - ISSUE/NOTE INHERITANCE
   # Commentable.allowed_types << base.name doesn't work for Issue because it's
   # an STI model, so we manually allow the class here.
@@ -116,6 +117,21 @@ def evidence_by_node()
     end
   end
 
+  # Returns a hash that will be used as part of event notification workflows.
+  def local_event_payload
+    {
+      author: author,
+      project: {
+        id: project.id,
+        name: project.name
+      },
+      state: state,
+      tag: tags.first,
+      fields: fields,
+      title: title
+    }
+  end
+
   # Move all Evidence attached to issues with ids in issue_ids
   # array to current issue.
   # Then delete those issues without Evidence.
diff --git a/app/views/layouts/hera/navbar/_main_nav.html.erb b/app/views/layouts/hera/navbar/_main_nav.html.erb
@@ -1,17 +1,19 @@
+<% cache('navbar') do %>
   <nav class="navbar navbar-expand-lg main-nav">
-  <div class="container-fluid">
-    <%= navbar_brand %>
+    <div class="container-fluid">
+      <%= navbar_brand %>
 
-    <button class="navbar-toggler" type="button" data-behavior="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".dual-nav" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-      <i class="fa-solid fa-bars"></i>
-    </button>
+      <button class="navbar-toggler" type="button" data-behavior="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".dual-nav" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+        <i class="fa-solid fa-bars"></i>
+      </button>
 
-    <div class="collapse navbar-collapse justify-content-end dual-nav" data-behavior="navbar-collapse">
-      <ul class="navbar-nav navbar-nav-scroll me-auto pb-0">
-        <%= render "layouts/hera/navbar/main_nav/#{Dradis.edition}" %>
-      </ul>
+      <div class="collapse navbar-collapse justify-content-end dual-nav" data-behavior="navbar-collapse">
+        <ul class="navbar-nav navbar-nav-scroll me-auto pb-0">
+          <%= render "layouts/hera/navbar/main_nav/#{Dradis.edition}" %>
+        </ul>
 
-      <%= render 'layouts/hera/navbar/main_nav/utility_nav' %>
+        <%= render 'layouts/hera/navbar/main_nav/utility_nav' %>
+      </div>
     </div>
-  </div>
-</nav>
+  </nav>
+<% end %>
diff --git a/app/views/layouts/hera/navbar/main_nav/_ce.html.erb b/app/views/layouts/hera/navbar/main_nav/_ce.html.erb
@@ -6,4 +6,7 @@
     <span>Projects</span>
   <% end %>
 </li>
-<%= render 'layouts/hera/navbar/main_nav/tools_menu' %>
+
+<% cache(['navbar-tools', Dradis::Plugins.with_feature(:addon)]) do %>
+  <%= render 'layouts/hera/navbar/main_nav/tools_menu' %>
+<% end %>
diff --git a/app/views/layouts/hera/navbar/main_nav/utility_nav/_ce.html.erb b/app/views/layouts/hera/navbar/main_nav/utility_nav/_ce.html.erb
@@ -7,23 +7,26 @@
 
 <%= render partial: 'layouts/hera/navbar/main_nav/utility_nav/configuration_menu' %>
 
-<li class="nav-item notifications dropdown">
-  <%= link_to main_app.project_notifications_path(current_project), 
-    class: 'nav-link dropdown-toggle no-caret', 
-    data: { 
-      id: 'notifications',
-      bs_toggle: 'dropdown',
-      behavior: 'notifications-dropdown close-collapse',
-      project_id: current_project.id 
-    }, 
-    role: 'button', 
-    'aria-expanded': 'false' do %>
-    <i class="notifications-bell fa-solid fa-bell d-none d-lg-inline" title="Notifications"><i class="notifications-dot d-none" data-behavior="notifications-dot"></i></i>
-    <span class="d-inline d-lg-none">Notifications</span>
-  <% end %>
-  <div class="dropdown-menu dropdown-menu-end" data-url="<%= main_app.notifications_path %>" aria-labelledby="notifications">
-  </div>
-</li>
+<% cache(['navbar-notifications', current_user.notifications.unread]) do %>
+  <li class="nav-item notifications dropdown">
+    <%= link_to main_app.project_notifications_path(current_project),
+      class: 'nav-link dropdown-toggle no-caret',
+      data: {
+        id: 'notifications',
+        bs_toggle: 'dropdown',
+        behavior: 'notifications-dropdown close-collapse',
+        project_id: current_project.id
+      },
+      role: 'button',
+      'aria-expanded': 'false' do %>
+      <i class="notifications-bell fa-solid fa-bell d-none d-lg-inline" title="Notifications"><i class="notifications-dot d-none" data-behavior="notifications-dot"></i></i>
+      <span class="d-inline d-lg-none">Notifications</span>
+    <% end %>
+    <div class="dropdown-menu dropdown-menu-end" data-url="<%= main_app.notifications_path %>" aria-labelledby="notifications">
+    </div>
+  </li>
+<% end %>
+
 <%= render partial: 'layouts/hera/navbar/main_nav/help_menu' %>
 
 <li class="nav-item dropdown me-0 mb-3 mb-lg-0">
diff --git a/config/initializers/activity_service.rb b/config/initializers/activity_service.rb
@@ -0,0 +1,5 @@
+Rails.application.reloader.to_prepare do
+  ActivityService.configure do |activity_service|
+    activity_service.subscribe_namespace 'issue'
+  end
+end
diff --git a/engines/dradis-api/CHANGELOG b/engines/dradis-api/CHANGELOG
@@ -1,2 +1,3 @@
 v3 (Aug 2023)
   - Add Boards, Lists, Cards endpoints.
+  - Track activities using published events
diff --git a/engines/dradis-api/app/controllers/dradis/ce/api/v3/issues_controller.rb b/engines/dradis-api/app/controllers/dradis/ce/api/v3/issues_controller.rb
@@ -1,7 +1,7 @@
 module Dradis::CE::API
   module V3
     class IssuesController < Dradis::CE::API::APIController
-      include ActivityTracking
+      include EventPublisher
       include Dradis::CE::API::ProjectScoped
 
       before_action :set_issue, except: [:index]
@@ -23,8 +23,8 @@ def create
         @issue.node     = current_project.issue_library
 
         if @issue.save
-          track_created(@issue)
           @issue.tag_from_field_content!
+          publish_event('issue.created', @issue.to_event_payload)
           render status: 201, location: dradis_api.issue_url(@issue)
         else
           render_validation_errors(@issue)
@@ -33,7 +33,7 @@ def create
 
       def update
         if @issue.update(issue_params)
-          track_updated(@issue)
+          publish_event('issue.updated', @issue.to_event_payload)
           render node: @node
         else
           render_validation_errors(@issue)
@@ -42,7 +42,7 @@ def update
 
       def destroy
         @issue.destroy
-        track_destroyed(@issue)
+        publish_event('issue.destroyed', @issue.to_event_payload)
         render_successful_destroy_message
       end
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`[v#.#.#] ([month] [YYYY])`
	`2`	`+ - Activities: remove ActivityTracking for Issues and use EventPublisher`
`2`	`3`	`- Profile: update default user avatar`
`3`	`4`	`- Forms: Improve visibility of form actions`
`4`	`5`	`- Docker:`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`v3 (Aug 2023)`
`2`	`2`	`- Add Boards, Lists, Cards endpoints.`
	`3`	`+ - Track activities using published events`