summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk
diff options
context:
space:
mode:
authorSudarshan Kumar <sudarshan.kumar@att.com>2020-08-14 15:36:06 +0530
committerSudarshan Kumar <sudarshan.kumar@att.com>2020-08-18 17:51:38 +0530
commitb55e954e91727085aeb1d7d2e7ba1c5b31485847 (patch)
tree3849ddfea4dfca1b7ac24885ee8c4ab1e2be4224 /ecomp-sdk
parent540bb3f27c23498653791cd140c10bf8722e4028 (diff)
Changed Display Area Report Link URL
Changed Display Area Report Link URL Issue-ID: PORTAL-902 Change-Id: I3972ec67d330fcd7db21cc4282126d96dade18bd Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>
Diffstat (limited to 'ecomp-sdk')
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java2
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java3
-rw-r--r--ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/CustomReportType.java4
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/definition.component.ts4
4 files changed, 8 insertions, 5 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java
index ae2e2184..d3c21b6f 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java
@@ -491,7 +491,7 @@ public class ReportLoader extends org.onap.portalsdk.analytics.RaptorObject {
//link.append(AppUtils.getReportExecuteActionURLNG() + "c_master=" + ds.getString(i, 0));
//if (b)
//link.append("&PAGE_ID=" + menuId + "&refresh=Y");
- link.append("v2/run/"+ ds.getString(i, 0));
+ link.append("v2/app/run/"+ ds.getString(i, 0));
quickLink.setReportURL(link.toString());
quickLink.setReportName(ds.getString(i, 1));
quickLink.setShowDescr(Globals.getShowDescrAtRuntime());
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java
index 35509900..c5bb9c5b 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportWrapper.java
@@ -37,6 +37,7 @@
*/
package org.onap.portalsdk.analytics.model.base;
+import java.io.Serializable;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Calendar;
@@ -141,7 +142,7 @@ import org.springframework.stereotype.Component;
*/
@Component
-public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject {
+public class ReportWrapper extends org.onap.portalsdk.analytics.RaptorObject implements Serializable{
private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ReportWrapper.class);
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/CustomReportType.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/CustomReportType.java
index b043327a..86dfa72a 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/CustomReportType.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/CustomReportType.java
@@ -45,6 +45,8 @@
package org.onap.portalsdk.analytics.xmlobj;
+import java.io.Serializable;
+
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
@@ -219,7 +221,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
"isMonthlyScheduleAllowed",
"reportMap"
})
-public class CustomReportType {
+public class CustomReportType implements Serializable {
@XmlElement(required = true)
protected String reportName;
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/definition.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/definition.component.ts
index 33e298d2..0259fdef 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/definition.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/definition/definition.component.ts
@@ -385,7 +385,7 @@ export class DefinitionComponent implements OnInit, OnDestroy {
];
this.finalPostObj['runtimeColSortDisabled'] = this.disableColumnSort;
this.finalPostObj['numFormCols'] = this.runTimeFormNum;
- if (this.reportTitle.length > 0) {
+ if (this.reportTitle && this.reportTitle.length > 0) {
this.finalPostObj['reportTitle'] = this.reportTitle;
} else {
this.finalPostObj['reportTitle'] = this.reportName;
@@ -514,7 +514,7 @@ export class DefinitionComponent implements OnInit, OnDestroy {
];
this.finalPostObj['runtimeColSortDisabled'] = this.disableColumnSort;
this.finalPostObj['numFormCols'] = this.runTimeFormNum;
- if ( this.reportTitle.length > 0) {
+ if ( this.reportTitle && this.reportTitle.length > 0) {
this.finalPostObj['reportTitle'] = this.reportTitle;
} else {
this.finalPostObj['reportTitle'] = this.reportName;;