Remove set_counted_notifications method from NotificationController

Author: krauselukas

src/api/app/components/notification_action_bar_component.html.haml

@@ -11,7 +11,7 @@
         - if state != 'unread'
           = button_tag("Mark selected as 'Unread'", type: 'submit', class: 'btn btn-sm btn-outline-success px-3', id: 'unread-button',
                        disabled: 'disabled', 'data-disable-with': disable_with_content, value: 'unread')
-      - if counted_notifications['all'] > Notification.max_per_page
+      - if total_count_notifications > Notification.max_per_page
         .ms-4
           = link_to(button_text(all: true), @update_path, method: :put, remote: true,
                     class: 'btn btn-sm btn-outline-secondary px-3', 'data-disable-with': disable_with_content(all: true))

src/api/app/components/notification_action_bar_component.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
 class NotificationActionBarComponent < ApplicationComponent
-  attr_accessor :state, :update_path, :counted_notifications
+  attr_accessor :state, :update_path, :total_count_notifications
 
-  def initialize(state:, update_path:, counted_notifications:)
+  def initialize(state:, update_path:, total_count_notifications:)
     super()
-
     @state = state
     @update_path = toggle_update_path_states(update_path)
-    @counted_notifications = counted_notifications
+    @total_count_notifications = total_count_notifications
   end
 
   def button_text(all: false)

src/api/app/controllers/webui/users/notifications_controller.rb

@@ -26,7 +26,6 @@ class Webui::Users::NotificationsController < Webui::WebuiController
                 :set_filter_project, :set_filter_group, :set_filter_request_state, :set_filter_label
   before_action :set_notifications
   before_action :set_notifications_to_be_updated, only: :update
-  before_action :set_counted_notifications, only: :index
   before_action :filter_notifications, only: :index
   before_action :set_selected_filter
   before_action :set_preloaded_notifications, only: :index
@@ -46,7 +45,6 @@ def update
 
     # manually update the count and the filtered subset after the update
     set_unread_notifications_count # before_action filter method defined in the Webui controller
-    set_counted_notifications
     filter_notifications
     set_preloaded_notifications
     set_ordered_notifications
@@ -59,7 +57,7 @@ def update
           notifications: @notifications,
           unread_notifications_count: @unread_notifications_count,
           selected_filter: @selected_filter,
-          counted_notifications: @counted_notifications,
+          total_count_notifications: @notifications.count,
           user: User.session
         }
       end
@@ -158,26 +156,6 @@ def set_notifications
     @notifications = User.session.notifications.for_web
   end
 
-  def set_counted_notifications
-    @counted_notifications = {}
-    @counted_notifications['all'] = @notifications.count
-    @counted_notifications['unread'] = @unread_notifications_count # Variable set in the Webui controller
-    @counted_notifications['incoming_requests'] = @notifications.unread.for_incoming_requests(User.session).count
-    @counted_notifications['outgoing_requests'] = @notifications.unread.for_outgoing_requests(User.session).count
-
-    # event_type: 'Event::RelationshipCreate', 'Event::RelationshipDelete', 'Event::BuildFail',
-    counted_event_types = @notifications.unread.group(:event_type).count
-    EVENT_TYPES_KEY_MAP.each do |notifications_key, event_types_key|
-      @counted_notifications[notifications_key] = counted_event_types[event_types_key] || 0
-    end
-
-    # notifiable_type: 'Report', 'WorkflowRun', 'Decision', 'Comment', 'BsRequest', 'Group'
-    counted_notifiable_types = @notifications.unread.group(:notifiable_type).count
-    NOTIFICATION_TYPES_KEY_MAP.each do |notifications_key, notification_types_key|
-      @counted_notifications[notifications_key] = counted_notifiable_types[notification_types_key] || 0
-    end
-  end
-
   def filter_notifications
     @notifications = filter_notifications_by_project(@notifications, @filter_project)
     @notifications = filter_notifications_by_group(@notifications, @filter_group)

src/api/app/views/webui/users/notifications/_notifications_list.html.haml

@@ -13,8 +13,8 @@
     .card
       .card-body.pt-1
         = render(NotificationActionBarComponent.new(state: selected_filter[:state],
-                                                update_path: update_path,
-                                                counted_notifications: counted_notifications))
+                                                    update_path: update_path,
+                                                    total_count_notifications: notifications.count))
         .text-center
           %span.ms-3= page_entries_info notifications, entry_name: ''
           - if notifications.total_count > Notification::THRESHOLD_TO_RECOMMEND_NOTIFICATION_MANAGEMENT

src/api/app/views/webui/users/notifications/_update.js.erb

@@ -1,4 +1,4 @@
 $('#content-selector-filters').html("<%= j(render partial: 'notification_filter', locals: { selected_filter: selected_filter, projects_for_filter: @projects_for_filter, groups_for_filter: @groups_for_filter }) %>");
-$('#notifications-list').html("<%= j(render partial: 'notifications_list', locals: { notifications: notifications, selected_filter: selected_filter, counted_notifications: @counted_notifications }) %>");
+$('#notifications-list').html("<%= j(render partial: 'notifications_list', locals: { notifications: notifications, selected_filter: selected_filter, total_count_notifications: total_count_notifications }) %>");
 $('#flash').html("<%= escape_javascript(render(layout: false, partial: 'layouts/webui/flash', object: flash)) %>");
 $('#top-notifications-counter, #bottom-notifications-counter').html("<%= escape_javascript(render partial: 'layouts/webui/unread_notifications_counter', locals: { unread_notifications_count: unread_notifications_count }) %>");

src/api/app/views/webui/users/notifications/index.html.haml

@@ -20,5 +20,4 @@
     = render partial: 'webui/shared/loading', locals: { text: 'Loading...', wrapper_css: ['loading'] }
   .col-md-8.col-lg-9.px-0.px-md-3.content-list#notifications-list
     = render partial: 'notifications_list', locals: { notifications: @notifications,
-                                                      counted_notifications: @counted_notifications,
                                                       selected_filter: @selected_filter }