From c9e0770a14d1e91f5cf0df65787786400dfb5568 Mon Sep 17 00:00:00 2001 From: mravula Date: Tue, 15 Dec 2020 16:00:49 -0500 Subject: Raptor Crosstab report UI Changes Issue-ID: PORTAL-902 Change-Id: I02f1e5651251a8c26d6c524d659617e5941343a2 Signed-off-by: mravula (cherry picked from commit efb31c8139526215182dda47b949ddc11dfca534) --- .../analytics/controller/ActionHandler.java | 26 ++++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java') diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java index b1e02fbc..152db54e 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/controller/ActionHandler.java @@ -748,21 +748,20 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject { rr.logReportExecutionTime(userId, String.valueOf(totalTime), AppConstants.RLA_EXECUTION_TIME, formFields); - if(rd!=null && !action.equals("report.run.container")) - rr.logReportExecutionTime(userId, String.valueOf(totalTime),AppConstants.RLA_EXECUTION_TIME, formFields); } } } else { - rr.logReportExecutionTimeFromLogList(userId, String.valueOf(totalTime),formFields); + rr.logReportExecutionTimeFromLogList(userId, String.valueOf(totalTime), ""); } - if(rr.isDrillDownURLInPopupPresent()) { request.getSession().setAttribute(PARENT+rr.getReportID()+"_rr", rr); request.getSession().setAttribute(PARENT+rr.getReportID()+"_rd", rd); } if(rr.getReportType().equals(AppConstants.RT_CROSSTAB)) { - return "raptor/report_crosstab_run_container.jsp"; + ObjectMapper mapper = new ObjectMapper(); + mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } else if (rr.getReportType().equals(AppConstants.RT_HIVE) && !isEmailAttachment) { return "raptor/report_hive_run_container.jsp"; } @@ -796,8 +795,13 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject { request.getSession().setAttribute(AppConstants.EMBEDDED_REPORTDATA_MAP, embeddedReportsDataMap); } - - ReportJSONRuntime reportJSONRuntime = rr.createReportJSONRuntime(request, rd); + ReportJSONRuntime reportJSONRuntime = new ReportJSONRuntime(); + + if(rr.getReportType().equals(AppConstants.RT_CROSSTAB)) { + reportJSONRuntime = rr.createCrossTabReportJSONRuntime(request, rd); + } else { + reportJSONRuntime = rr.createReportJSONRuntime(request, rd); + } Set keys = rr.getReportParamValues().keySet(); String ffValue = ""; for (String key : keys) { @@ -966,7 +970,15 @@ public class ActionHandler extends org.onap.portalsdk.analytics.RaptorObject { } // reportSearchFavorites public String reportSearchExecute(HttpServletRequest request, String nextPage) { + String str = request.getParameter("fromEdit"); + if(str != null && !str.equalsIgnoreCase("null")) { + if(!str.equalsIgnoreCase("true")) { + removeVariablesFromSession(request); + } + }else { removeVariablesFromSession(request); + } + try { SearchHandler sh = new SearchHandler(); ReportSearchResultJSON sr = sh.loadReportSearchResult(request); -- cgit 1.2.3-korg