1 files changed, 9 insertions, 3 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component.ts
index d4baba66..c0856b44 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component.ts
@@ -60,6 +60,7 @@ export class RunReportFormFieldsComponent implements OnInit, OnDestroy {
     commonFormFields: any[];
     formFieldListValueMap: any;
     saveFormFieldListValueMap: any;
+    chartType = '';
 
     constructor(private _runService: RunService, private _route: ActivatedRoute, private _router: Router) {
         this.formFieldListValueArr = [];
@@ -79,6 +80,7 @@ export class RunReportFormFieldsComponent implements OnInit, OnDestroy {
         this.commonFormFields = [];
         this.formFieldListValueMap = new Map<any, any>();
         this.saveFormFieldListValueMap = new Map<any, any>();
+        this.chartType = '';
     }
 
     ngOnDestroy(): void {
@@ -126,6 +128,7 @@ export class RunReportFormFieldsComponent implements OnInit, OnDestroy {
         this.commonFormFields = [];
         this.formFieldListValueMap = new Map<any, any>();
         this.saveFormFieldListValueMap = new Map<any, any>();
+        this.chartType = '';
     }
 
     ngOnInit() {
@@ -165,6 +168,7 @@ export class RunReportFormFieldsComponent implements OnInit, OnDestroy {
             .subscribe((responseDefPage) => {
                 this.reportName = responseDefPage['reportName'];
                 this.reportSubTitle = responseDefPage['reportSubTitle'];
+                this.chartType = responseDefPage['chartType'];
                 if (responseDefPage['reportType'] !== 'Dashboard') {
                     if (this.calledWithFormFields == false) {
                         this._runService.getReportData(this.reportId)
@@ -733,7 +737,7 @@ export class RunReportFormFieldsComponent implements OnInit, OnDestroy {
     }
 
     editReport(reportId: string) {
-        this._router.navigate(['v2/reports', 'Edit', reportId]);
+        this._router.navigate(['v2/app/reports', 'Edit', reportId]);
     }
 
     showLabelFn() {
@@ -762,8 +766,8 @@ export class RunReportFormFieldsComponent implements OnInit, OnDestroy {
         localStorage.clear();
         localStorage.setItem('id', myItem);
         if (this.formFieldGroupObjList != null) {
-            this._router.navigateByUrl('v2/refresh', {skipLocationChange: true}).then(() =>
-                this._router.navigate(['v2/run', this.reportId]));
+            this._router.navigateByUrl('v2/app/refresh', {skipLocationChange: true}).then(() =>
+                this._router.navigate(['v2/app/run', this.reportId]));
         } else {
             this.avoidDoCheck = true;
             this.formFieldListValueMap = new Map<any, any>();
@@ -785,7 +789,9 @@ export class RunReportFormFieldsComponent implements OnInit, OnDestroy {
                 for (let ffGrpValue = 0; ffGrpValue < formFieldGroupObjItem['formFieldList'].length; ffGrpValue++) {
                     this.finalQueryParamsObj[formFieldGroupObjItem['formFieldList'][ffGrpValue]['fieldId']] = '-1';
                     this.formFieldListValueMap.delete(formFieldGroupObjItem['formFieldList'][ffGrpValue]['fieldId']);
+                    this.triggerFormFieldArr= [];
                 }
+
             }
         }
     }