Correct the order of groups and panels

- Order groups by descending order of priority.
- Order panels by descending order of weight.
- Perform sorting after adding project/custom metrics.

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/metrics_dashboard/processor.rb b/lib/gitlab/metrics_dashboard/processor.rb
index cfeb0ddb468..518e0123220 100644
--- a/lib/gitlab/metrics_dashboard/processor.rb
+++ b/lib/gitlab/metrics_dashboard/processor.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module MetricsDashboard
     class Processor
-      STAGES = [CommonMetricsInserter, Sorter, ProjectMetricsInserter].freeze
+      STAGES = [CommonMetricsInserter, ProjectMetricsInserter, Sorter].freeze
 
       def initialize(dashboard, project)
         @dashboard = dashboard.deep_transform_keys(&:to_sym)
diff --git a/lib/gitlab/metrics_dashboard/sorter.rb b/lib/gitlab/metrics_dashboard/sorter.rb
index 1d28fc8bd3a..9a8f87fcb6e 100644
--- a/lib/gitlab/metrics_dashboard/sorter.rb
+++ b/lib/gitlab/metrics_dashboard/sorter.rb
@@ -13,13 +13,13 @@ module Gitlab
 
         # Sorts the groups in the dashboard by the :priority key
         def sort_groups!(dashboard)
-          dashboard[:panel_groups] = dashboard[:panel_groups].sort_by { |group| group[:priority] }
+          dashboard[:panel_groups] = dashboard[:panel_groups].sort_by { |group| group[:priority] }.reverse
         end
 
         # Sorts the panels in the dashboard by the :weight key
         def sort_panels!(dashboard)
           dashboard[:panel_groups].each do |group|
-            group[:panels] = group[:panels].sort_by { |panel| panel[:weight] }
+            group[:panels] = group[:panels].sort_by { |panel| panel[:weight] }.reverse
           end
         end
       end