Merge "Fixed Logout, Empty White Page, Session Timeout"

1 files changed, 5 insertions, 1 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts
index fc34cccd..e3bab3bb 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/form-fields/form-fields.component.ts
@@ -76,16 +76,20 @@ export class FormFieldsComponent implements OnInit {
   }
 
   ngOnInit() {
+    this.showSpinner = true;
     this._formFieldsService.getListOfFormFields()
       .subscribe((responseFormFields) => {
+        this.showSpinner = true;
         for (let m = 0; m < responseFormFields.length; m++) {
           responseFormFields[m]["orderSeq"] = m + 1;
           this.formFieldsListObj.push(responseFormFields[m]);
         }
-
+        this.showSpinner = false;
         this._formFieldsService.getFormFieldGroupsData(this.reportId1)
           .subscribe((responseGroupsData) => {
+            this.showSpinner = true;
             this.Groups = JSON.parse(responseGroupsData["formFieldGroupsJSON"]);
+            this.showSpinner = false;
           });     
     });
   }