Merge pull request #889 from GNS3/Strange-behavior-with-Firefox

Strange behavior with firefox

src/app/components/direct-link/direct-link.component.ts

@@ -25,21 +25,25 @@ export class DirectLinkComponent implements OnInit {
     const serverPort = +this.route.snapshot.paramMap.get('server_port');
     const projectId = this.route.snapshot.paramMap.get('project_id');
 
-    const servers = await this.serverService.findAll();
+    this.serverService.serviceInitialized.subscribe(async (value: boolean) => {
-    const server = servers.filter(server => server.host === serverIp && server.port === serverPort)[0];
+      if (value) {
+        const servers = await this.serverService.findAll();
+        const server = servers.filter(server => server.host === serverIp && server.port === serverPort)[0];
     
-    if (server) {
+        if (server) {
-        this.router.navigate(['/server', server.id, 'project', projectId]);
+            this.router.navigate(['/server', server.id, 'project', projectId]);
-    } else { 
+        } else { 
-        let serverToAdd: Server = new Server();
+            let serverToAdd: Server = new Server();
-        serverToAdd.host = serverIp;
+            serverToAdd.host = serverIp;
-        serverToAdd.port = serverPort;
+            serverToAdd.port = serverPort;
-        serverToAdd.location = 'bundled';
+            serverToAdd.location = 'bundled';
-        serverToAdd.name = serverIp;
+            serverToAdd.name = serverIp;
     
-        this.serverService.create(serverToAdd).then((addedServer: Server) => {
+            this.serverService.create(serverToAdd).then((addedServer: Server) => {
-            this.router.navigate(['/server', addedServer.id, 'project', projectId]);
+                this.router.navigate(['/server', addedServer.id, 'project', projectId]);
-        });
+            });
-    }
+        }
+      }
+    });
   }
 }

src/app/components/servers/add-server-dialog/add-server-dialog.component.ts

@@ -57,6 +57,7 @@ export class AddServerDialogComponent implements OnInit {
 
   async numberOfLocalServers() {
     const servers = await this.serverService.findAll();
+
     return servers.filter((server) => server.location === 'local').length;
   }
 

src/app/components/servers/server-discovery/server-discovery.component.ts

@@ -32,7 +32,11 @@ export class ServerDiscoveryComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.discoverFirstAvailableServer();
+    this.serverService.serviceInitialized.subscribe(async (value: boolean) => {
+      if (value) {
+        this.discoverFirstAvailableServer();
+      }
+    });
   }
 
   discoverFirstAvailableServer() {

src/app/components/servers/servers.component.ts

@@ -40,24 +40,28 @@ export class ServersComponent implements OnInit, OnDestroy {
     this.isElectronApp = this.electronService.isElectronApp;
     const runningServersNames = this.serverManagement.getRunningServers();
 
-    this.serverService.findAll().then((servers: Server[]) => {
+    this.serverService.serviceInitialized.subscribe(async (value: boolean) => {
-      servers.forEach((server) => {
+      if (value) {
-        const serverIndex = runningServersNames.findIndex((serverName) => server.name === serverName);
+        this.serverService.findAll().then((servers: Server[]) => {
-        if(serverIndex >= 0) {
+          servers.forEach((server) => {
-          server.status = 'running';
+            const serverIndex = runningServersNames.findIndex((serverName) => server.name === serverName);
-        }
+            if(serverIndex >= 0) {
-      });
+              server.status = 'running';
-
-      servers.forEach((server) => {
-        this.serverService.checkServerVersion(server).subscribe(
-          (serverInfo) => {
-            if ((serverInfo.version.split('.')[1]>=2) && (serverInfo.version.split('.')[0]>=2)) {
-              if (!this.serverDatabase.find(server.name)) this.serverDatabase.addServer(server);
             }
-          },
+          });
-          error => {}
+
-          );
+          servers.forEach((server) => {
-      });
+            this.serverService.checkServerVersion(server).subscribe(
+              (serverInfo) => {
+                if ((serverInfo.version.split('.')[1]>=2) && (serverInfo.version.split('.')[0]>=2)) {
+                  if (!this.serverDatabase.find(server.name)) this.serverDatabase.addServer(server);
+                }
+              },
+              error => {}
+              );
+          });
+        });
+      }
     });
 
     this.dataSource = new ServerDataSource(this.serverDatabase);

src/app/services/server.service.ts

@@ -1,28 +1,58 @@
-import { Injectable } from '@angular/core';
+import { Injectable, EventEmitter } from '@angular/core';
 import { IndexedDbService } from './indexed-db.service';
 import { Server } from '../models/server';
 import { Observable } from 'rxjs';
 import { HttpServer } from './http-server.service';
+import { ToasterService } from './toaster.service';
 
 @Injectable()
 export class ServerService {
   private tablename = 'servers';
   private ready: Promise<any>;
+  private isIncognitoMode: boolean = false;
+  private serverIdsInIncognitoMode: string[] = [];
+  public serviceInitialized: EventEmitter<boolean> = new EventEmitter<boolean>();
 
   constructor(
     private indexedDbService: IndexedDbService,
-    private httpServer: HttpServer
+    private httpServer: HttpServer,
+    private toasterService: ToasterService
   ) {
-    this.ready = indexedDbService.get().openDatabase(1, evt => {
+    this.indexedDbService.get().openDatabase(1).then(() => {
-      evt.currentTarget.result.createObjectStore(this.tablename, { keyPath: 'id', autoIncrement: true });
+      this.ready = indexedDbService.get().openDatabase(1, evt => {
+        evt.currentTarget.result.createObjectStore(this.tablename, { keyPath: 'id', autoIncrement: true });
+      });
+    }).catch(() => {
+      this.isIncognitoMode = true;
+    }).finally(() => {
+      this.serviceInitialized.emit(true);
     });
   }
 
   public get(id: number): Promise<Server> {
+    if (this.isIncognitoMode) {
+      let server: Server = JSON.parse(localStorage.getItem(`server-${id}`));
+      let promise = new Promise<Server>(resolve => {
+        resolve(server);
+      });
+      return promise;
+    }
+
     return this.onReady(() => this.indexedDbService.get().getByKey(this.tablename, id)) as Promise<Server>;
   }
 
   public create(server: Server) {
+    if (this.isIncognitoMode) {
+      server.id = this.serverIdsInIncognitoMode.length + 1;
+      localStorage.setItem(`server-${server.id}`, JSON.stringify(server));
+      this.serverIdsInIncognitoMode.push(`server-${server.id}`);
+
+      let promise = new Promise<Server>(resolve => {
+        resolve(server);
+      });
+      return promise;
+    }
+
     return this.onReady(() => {
       const promise = new Promise((resolve, reject) => {
         this.indexedDbService
@@ -38,6 +68,16 @@ export class ServerService {
   }
 
   public update(server: Server) {
+    if (this.isIncognitoMode) {
+      localStorage.removeItem(`server-${server.id}`);
+      localStorage.setItem(`server-${server.id}`, JSON.stringify(server));
+
+      let promise = new Promise<Server>(resolve => {
+        resolve(server);
+      });
+      return promise;
+    }
+
     return this.onReady(() => {
       const promise = new Promise((resolve, reject) => {
         this.indexedDbService
@@ -52,10 +92,32 @@ export class ServerService {
   }
 
   public findAll() {
+    if (this.isIncognitoMode) {
+      let promise = new Promise<Server[]>(resolve => {
+        let servers: Server[] = [];
+        this.serverIdsInIncognitoMode.forEach(n => {
+          let server: Server = JSON.parse(localStorage.getItem(n));
+          servers.push(server);
+        });
+        resolve(servers);
+      });
+      return promise;
+    }
+
     return this.onReady(() => this.indexedDbService.get().getAll(this.tablename)) as Promise<Server[]>;
   }
 
   public delete(server: Server) {
+    if (this.isIncognitoMode) {
+      localStorage.removeItem(`server-${server.id}`);
+      this.serverIdsInIncognitoMode = this.serverIdsInIncognitoMode.filter(n => n !== `server-${server.id}`);
+
+      let promise = new Promise(resolve => {
+        resolve(server.id);
+      });
+      return promise;
+    }
+
     return this.onReady(() => this.indexedDbService.get().delete(this.tablename, server.id));
   }