Fixes #5138 - Reporting: Worse performance because UI always request …

…all aggregation data instead of the selection. Co-authored-by: Florian Liebe <fl@zammad.com>
zammad · Apr 19, 2024 · f430093 · f430093
1 parent f09d27e
commit f430093
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/app/assets/javascripts/app/controllers/report.coffee b/app/assets/javascripts/app/controllers/report.coffee
@@ -361,21 +361,25 @@ class Download extends App.Controller
       @table.update(objects: tickets)
 
   tableUpdate: =>
+    state = {
+      metric:                  @params.metric
+      year:                    @params.year
+      month:                   @params.month
+      week:                    @params.week
+      day:                     @params.day
+      timeRange:               @params.timeRange
+      profiles:                @params.profileSelected
+      backends:                @params.backendSelected
+      downloadBackendSelected: @params.downloadBackendSelected
+    }
+    return if _.isEqual(@lastState, state)
+    @lastState = state
+
     @ajax(
       id: 'report_download'
       type:  'POST'
       url:   @apiPath + '/reports/sets'
-      data: JSON.stringify(
-        metric:                  @params.metric
-        year:                    @params.year
-        month:                   @params.month
-        week:                    @params.week
-        day:                     @params.day
-        timeRange:               @params.timeRange
-        profiles:                @params.profileSelected
-        backends:                @params.backendSelected
-        downloadBackendSelected: @params.downloadBackendSelected
-      )
+      data: JSON.stringify(state)
       processData: true
       success: (data) =>
         App.Collection.loadAssets(data.assets)

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
@@ -31,6 +31,7 @@ def generate
         backend[:condition] = condition
       end
       next if !backend[:adapter]
+      next if params['backends'][backend[:name]].blank?
 
       result[backend[:name]] = backend[:adapter].aggs(
         range_start:     get_params[:start],