From 68dc1588fb0d872bfb82c7dcf0c718893719cf69 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <Giancarlo Panichi@panichipc>
Date: Wed, 8 Apr 2020 18:48:15 +0200
Subject: [PATCH] ref 18754: Dashboard: Alphabetically sort the tabs

https://support.d4science.org/issues/18754

Added the alphabetically sort of the tabs
---
 changelog.xml                                              | 5 ++++-
 .../client/application/mainarea/report/ReportAreaView.java | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changelog.xml b/changelog.xml
index e30161e..1a66224 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,7 +1,10 @@
 <ReleaseNotes>
 	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-2-0"
-		date="2019-11-12">
+		date="2020-04-08">
 		<Change>Updated export csv support with Firefox and Safari [ticket #18034]</Change>
+		<Change>Added Core Services support [ticket #18291]</Change>
+		<Change>Added Detached REs support [ticket #18815]</Change>
+		<Change>Added the alphabetically sort of the tabs [ticket #18754]</Change>
 	</Changeset>
 	<Changeset component="org.gcube.portlets.user.accounting-dashboard.1-1-0"
 		date="2019-10-01">
diff --git a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/ReportAreaView.java b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/ReportAreaView.java
index cc57ad3..42e2d23 100644
--- a/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/ReportAreaView.java
+++ b/src/main/java/org/gcube/portlets/user/accountingdashboard/client/application/mainarea/report/ReportAreaView.java
@@ -1,6 +1,7 @@
 package org.gcube.portlets.user.accountingdashboard.client.application.mainarea.report;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.logging.Logger;
 
@@ -87,7 +88,11 @@ public class ReportAreaView extends ViewWithUiHandlers<ReportAreaPresenter>
 			TabPanel tabPanel = new TabPanel();
 			tabPanel.addStyleName(resources.uiDataCss().uiDataReportTabPanel());
 			boolean first = true;
-			for (String category : categories.keySet()) {
+			ArrayList<String> sortedKeys = 
+                    new ArrayList<String>(categories.keySet());         
+			Collections.sort(sortedKeys);  
+  
+			for (String category : sortedKeys) {
 				Tab tab = new Tab();
 				tab.setHeading(category);
 				HTMLPanel tabContent = new HTMLPanel("");