[KNOWAGE-9583] set widget name in single widget xls export

Author: eng-dedalus

knowage-core/src/main/java/it/eng/knowage/dashboardexport/DashboardExportResource.java

@@ -8,6 +8,7 @@
 import it.eng.spagobi.utilities.mime.MimeUtils;
 import it.eng.spagobi.utilities.rest.RestUtilities;
 import org.apache.log4j.Logger;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import javax.servlet.http.HttpServletRequest;
@@ -60,6 +61,7 @@ public void downloadExcel(@Context HttpServletRequest req) {
                 } else {
                     String widgetName = body.getJSONObject("settings").getJSONObject("style").getJSONObject("title")
                             .optString("text");
+                    widgetName = getWidgetName(widgetName, body);
                     response.setHeader("Content-Disposition", "attachment; fileName=" + widgetName + "." + "xlsx");
                 }
                 response.setContentType(MediaType.APPLICATION_OCTET_STREAM);
@@ -78,6 +80,32 @@ public void downloadExcel(@Context HttpServletRequest req) {
         }
     }
 
+    private static String getWidgetName(String widgetName, JSONObject body) throws JSONException {
+
+        if (widgetName == null || widgetName.trim().isEmpty()) {
+            switch (body.getString("type")) {
+                case "highcharts":
+                    widgetName = "chart";
+                    break;
+                case "static-pivot-table":
+                    widgetName = "pivot";
+                    break;
+                case "map":
+                    widgetName = "map";
+                    break;
+                case "table":
+                    widgetName = "table";
+                    break;
+                case "customchart":
+                    widgetName = "custom_chart";
+                    break;
+                default:
+                    widgetName = "widget";
+            }
+        }
+        return widgetName;
+    }
+
     @POST
     @Path("/pdf")
     public void downloadPdf(@Context HttpServletRequest req) {

knowage-export/src/main/java/it/eng/knowage/engine/api/export/dashboard/DashboardExporter.java

@@ -458,8 +458,10 @@ protected void replaceWithThemeSettingsIfPresent(JSONObject settings) throws JSO
         Optional<SbiDashboardTheme> optionalTheme = dao.readByThemeName(settings.getJSONObject("style").optString("themeName"));
         if (optionalTheme.isPresent()) {
             SbiDashboardTheme dashboardTheme = optionalTheme.get();
+            String widgetName = settings.getJSONObject("style").optJSONObject("title").optString("text");
             settings.remove("style");
             settings.put("style", dashboardTheme.getConfig().getJSONObject("table").getJSONObject("style"));
+            settings.getJSONObject("style").getJSONObject("title").put("text", widgetName);
         }
     }
 
@@ -495,7 +497,6 @@ protected Locale getLocaleFromBody(JSONObject body) {
             String country = body.getString(SpagoBIConstants.SBI_COUNTRY);
             return new Locale(language, country);
         } catch (Exception e) {
-            LOGGER.warn("Cannot get locale information from input parameters body", e);
             return Locale.ENGLISH;
         }
 

knowageutils/src/main/java/it/eng/spagobi/utilities/rest/RestUtilities.java

@@ -186,7 +186,7 @@ public static String readBodyXSSUnsafe(HttpServletRequest request) throws IOExce
 	 */
 	public static JSONObject readBodyAsJSONObject(HttpServletRequest request) throws IOException, JSONException {
 		String requestBody = RestUtilities.readBodyXSSUnsafe(request);
-		if (requestBody == null || requestBody.equals("")) {
+		if (requestBody.isEmpty()) {
 			return new JSONObject();
 		}
 		final JSONObject jsonObject = new JSONObject(requestBody);