X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fapp%2Futilities%2Fswitch-project%2FSwitchProjectComponent.ts;h=b7bc9a4705753e67dee5c4a81493c1f9346af579;hb=382448fed3f9d4d4cf9ac614e1275208d18b752f;hp=1df6a1691588de2c6ed4f32855268d48076fe443;hpb=3b4814aa2d3dec621dadb52f058ba95a3dc3a86a;p=osm%2FNG-UI.git

diff --git a/src/app/utilities/switch-project/SwitchProjectComponent.ts b/src/app/utilities/switch-project/SwitchProjectComponent.ts
index 1df6a16..b7bc9a4 100644
--- a/src/app/utilities/switch-project/SwitchProjectComponent.ts
+++ b/src/app/utilities/switch-project/SwitchProjectComponent.ts
@@ -21,6 +21,7 @@
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Component, Injector, Input, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Router } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { APIURLHEADER, ERRORDATA, LOCALSTORAGE, URLPARAMS } from 'CommonModel';
 import { DataService } from 'DataService';
@@ -73,12 +74,16 @@ export class SwitchProjectComponent implements OnInit {
   /** FormBuilder instance added to the formBuilder @private */
   private formBuilder: FormBuilder;
 
+  /** Service holds the router information @private */
+  private router: Router;
+
   constructor(injector: Injector) {
     this.injector = injector;
     this.dataService = this.injector.get(DataService);
     this.restService = this.injector.get(RestService);
     this.activeModal = this.injector.get(NgbActiveModal);
     this.formBuilder = this.injector.get(FormBuilder);
+    this.router = this.injector.get(Router);
   }
 
   /** convenience getter for easy access to form fields */
@@ -119,17 +124,25 @@ export class SwitchProjectComponent implements OnInit {
       };
       this.restService.postResource(apiURLHeader, payLoad).subscribe((data: LOCALSTORAGE) => {
         if (data) {
-          localStorage.setItem('id_token', data.id);
-          localStorage.setItem('project_id', this.params.projectID);
-          localStorage.setItem('expires', data.expires.toString());
-          localStorage.setItem('username', data.username);
-          localStorage.setItem('project', data.project_name);
-          localStorage.setItem('token_state', data.id);
+          sessionStorage.setItem('id_token', data.id);
+          sessionStorage.setItem('project_id', this.params.projectID);
+          sessionStorage.setItem('expires', data.expires.toString());
+          sessionStorage.setItem('username', data.username);
+          sessionStorage.setItem('project', data.project_name);
+          sessionStorage.setItem('token_state', data.id);
           this.activeModal.close();
-          location.reload();
+          if (this.router.url.includes('history-operations')) {
+            this.router.navigate(['/instances/ns']).then((): void => {
+              location.reload();
+            }).catch((): void => {
+              // Catch Navigation Error
+          });
+          } else {
+            location.reload();
+          }
           this.isLoadingResults = false;
         }
-      }, (error: ERRORDATA) => {
+      }, (error: ERRORDATA): void => {
         this.isLoadingResults = false;
         this.restService.handleError(error, 'post');
         this.activeModal.close();