From 237e6772d22d1c285237a242fc9110dfb999a42b Mon Sep 17 00:00:00 2001 From: Alessandro Gaggia Date: Thu, 22 Oct 2020 12:45:01 +0200 Subject: [PATCH] fixed lag in showing active session dot --- package.json | 2 +- src/app/services/azure-account.service.ts | 3 ++- src/app/services/provider-manager.service.ts | 2 ++ src/app/services/workspace.service.ts | 11 +++++++---- .../session/session-card/session-card.component.html | 2 +- .../session/session-card/session-card.component.ts | 2 +- src/app/session/session/session.component.ts | 11 +++++++---- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index d75b79991..bfff6c6d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Leapp", - "version": "0.2.6", + "version": "0.2.7", "author": { "name": "noovolari", "email": "info@noovolari.com" diff --git a/src/app/services/azure-account.service.ts b/src/app/services/azure-account.service.ts index ec23cb2ff..de6131d96 100644 --- a/src/app/services/azure-account.service.ts +++ b/src/app/services/azure-account.service.ts @@ -4,7 +4,7 @@ import {ConfigurationService} from '../services-system/configuration.service'; import {AzureAccount} from '../models/azure-account'; import {Session} from '../models/session'; import {v4 as uuidv4} from 'uuid'; -import {AppService, ToastLevel} from '../services-system/app.service'; +import {AppService, LoggerLevel, ToastLevel} from '../services-system/app.service'; import {AccountType} from '../models/AccountType'; @Injectable({ @@ -79,6 +79,7 @@ export class AzureAccountService extends NativeService { const workspace = this.configurationService.getDefaultWorkspaceSync(); return workspace.sessions.filter(sess => ((sess.account as AzureAccount).subscriptionId === subscriptionId))[0] as AzureAccount; } catch (err) { + this.appService.logger(err, LoggerLevel.ERROR, this, err.stack); return null; } } diff --git a/src/app/services/provider-manager.service.ts b/src/app/services/provider-manager.service.ts index 62148993b..0bb973717 100644 --- a/src/app/services/provider-manager.service.ts +++ b/src/app/services/provider-manager.service.ts @@ -220,6 +220,7 @@ export class ProviderManagerService { return created; } catch (err) { + this.appService.logger(err, LoggerLevel.ERROR, this, err.stack); this.appService.toast(err, ToastLevel.ERROR); return false; } @@ -248,6 +249,7 @@ export class ProviderManagerService { return created; } catch (err) { + this.appService.logger(err, LoggerLevel.ERROR, this, err.stack); this.appService.toast(err, ToastLevel.ERROR); return false; } diff --git a/src/app/services/workspace.service.ts b/src/app/services/workspace.service.ts index ef78548e3..3f9193ed5 100644 --- a/src/app/services/workspace.service.ts +++ b/src/app/services/workspace.service.ts @@ -93,12 +93,13 @@ export class WorkspaceService extends NativeService { try { this.idpWindow.close(); } catch (e) { - this.appService.logger(e, LoggerLevel.ERROR, this); + this.appService.logger(e, LoggerLevel.ERROR, this, e.stack); } } // Sometimes it can arrive here (tested) so the REAL way to block everything is to use the credential emit element!!! this.credentialEmit.emit({status: err.stack, accountName: session.account.accountName}); + this.appService.logger(err, LoggerLevel.ERROR, this, err.stack); throw new Error(err); }); } @@ -162,6 +163,8 @@ export class WorkspaceService extends NativeService { err.error.text.indexOf('net::ERR_NAME_NOT_RESOLVED') > -1 || err.error.text.indexOf('net::ERR_INTERNET_DISCONNECTED') > -1 || err.error.text.indexOf('net::ERR_NETWORK_IO_SUSPENDED') > -1) { + + this.appService.logger('There was a problem with your connection', LoggerLevel.ERROR, this, err.error.text); observer.error('There was a problem with your connection. Please retry.'); observer.complete(); } else { @@ -339,7 +342,7 @@ export class WorkspaceService extends NativeService { // Save the federated one this.configurationService.updateWorkspaceSync(workspace); } catch (err) { - this.appService.logger(err, LoggerLevel.ERROR, this); + this.appService.logger(err, LoggerLevel.ERROR, this, err.stack); this.appService.toast(err, ToastLevel.ERROR); // Emit ko @@ -387,7 +390,7 @@ export class WorkspaceService extends NativeService { this.credentialEmit.emit({status: 'ok', accountName: account.accountName}); } } catch (err) { - this.appService.logger(err, LoggerLevel.ERROR,this); + this.appService.logger(err, LoggerLevel.ERROR, this, err.stack); this.appService.toast(err, ToastLevel.ERROR); // Emit ko @@ -453,7 +456,7 @@ export class WorkspaceService extends NativeService { // Catch any error show it and return false this.appService.toast(err, ToastLevel.WARN, 'Create new workspace'); - this.appService.logger(err, LoggerLevel.WARN, this); + this.appService.logger('create new workspace error:', LoggerLevel.WARN, this, err.stack); return false; } } diff --git a/src/app/session/session-card/session-card.component.html b/src/app/session/session-card/session-card.component.html index 430bbb1b7..e9564d5e1 100644 --- a/src/app/session/session-card/session-card.component.html +++ b/src/app/session/session-card/session-card.component.html @@ -8,7 +8,7 @@ - +