Skip to content

Commit 237e677

Browse files
committed
fixed lag in showing active session dot
1 parent 11d2e6b commit 237e677

File tree

7 files changed

+21
-12
lines changed

7 files changed

+21
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Leapp",
3-
"version": "0.2.6",
3+
"version": "0.2.7",
44
"author": {
55
"name": "noovolari",
66
"email": "info@noovolari.com"

src/app/services/azure-account.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {ConfigurationService} from '../services-system/configuration.service';
44
import {AzureAccount} from '../models/azure-account';
55
import {Session} from '../models/session';
66
import {v4 as uuidv4} from 'uuid';
7-
import {AppService, ToastLevel} from '../services-system/app.service';
7+
import {AppService, LoggerLevel, ToastLevel} from '../services-system/app.service';
88
import {AccountType} from '../models/AccountType';
99

1010
@Injectable({
@@ -79,6 +79,7 @@ export class AzureAccountService extends NativeService {
7979
const workspace = this.configurationService.getDefaultWorkspaceSync();
8080
return workspace.sessions.filter(sess => ((sess.account as AzureAccount).subscriptionId === subscriptionId))[0] as AzureAccount;
8181
} catch (err) {
82+
this.appService.logger(err, LoggerLevel.ERROR, this, err.stack);
8283
return null;
8384
}
8485
}

src/app/services/provider-manager.service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ export class ProviderManagerService {
220220

221221
return created;
222222
} catch (err) {
223+
this.appService.logger(err, LoggerLevel.ERROR, this, err.stack);
223224
this.appService.toast(err, ToastLevel.ERROR);
224225
return false;
225226
}
@@ -248,6 +249,7 @@ export class ProviderManagerService {
248249

249250
return created;
250251
} catch (err) {
252+
this.appService.logger(err, LoggerLevel.ERROR, this, err.stack);
251253
this.appService.toast(err, ToastLevel.ERROR);
252254
return false;
253255
}

src/app/services/workspace.service.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,13 @@ export class WorkspaceService extends NativeService {
9393
try {
9494
this.idpWindow.close();
9595
} catch (e) {
96-
this.appService.logger(e, LoggerLevel.ERROR, this);
96+
this.appService.logger(e, LoggerLevel.ERROR, this, e.stack);
9797
}
9898
}
9999

100100
// Sometimes it can arrive here (tested) so the REAL way to block everything is to use the credential emit element!!!
101101
this.credentialEmit.emit({status: err.stack, accountName: session.account.accountName});
102+
this.appService.logger(err, LoggerLevel.ERROR, this, err.stack);
102103
throw new Error(err);
103104
});
104105
}
@@ -162,6 +163,8 @@ export class WorkspaceService extends NativeService {
162163
err.error.text.indexOf('net::ERR_NAME_NOT_RESOLVED') > -1 ||
163164
err.error.text.indexOf('net::ERR_INTERNET_DISCONNECTED') > -1 ||
164165
err.error.text.indexOf('net::ERR_NETWORK_IO_SUSPENDED') > -1) {
166+
167+
this.appService.logger('There was a problem with your connection', LoggerLevel.ERROR, this, err.error.text);
165168
observer.error('There was a problem with your connection. Please retry.');
166169
observer.complete();
167170
} else {
@@ -339,7 +342,7 @@ export class WorkspaceService extends NativeService {
339342
// Save the federated one
340343
this.configurationService.updateWorkspaceSync(workspace);
341344
} catch (err) {
342-
this.appService.logger(err, LoggerLevel.ERROR, this);
345+
this.appService.logger(err, LoggerLevel.ERROR, this, err.stack);
343346
this.appService.toast(err, ToastLevel.ERROR);
344347

345348
// Emit ko
@@ -387,7 +390,7 @@ export class WorkspaceService extends NativeService {
387390
this.credentialEmit.emit({status: 'ok', accountName: account.accountName});
388391
}
389392
} catch (err) {
390-
this.appService.logger(err, LoggerLevel.ERROR,this);
393+
this.appService.logger(err, LoggerLevel.ERROR, this, err.stack);
391394
this.appService.toast(err, ToastLevel.ERROR);
392395

393396
// Emit ko
@@ -453,7 +456,7 @@ export class WorkspaceService extends NativeService {
453456

454457
// Catch any error show it and return false
455458
this.appService.toast(err, ToastLevel.WARN, 'Create new workspace');
456-
this.appService.logger(err, LoggerLevel.WARN, this);
459+
this.appService.logger('create new workspace error:', LoggerLevel.WARN, this, err.stack);
457460
return false;
458461
}
459462
}

src/app/session/session-card/session-card.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</span>
99

1010
<ng-container dropdown placement="right" [autoClose]="true">
11-
<a dropdownToggle class="drop-list-container" aria-controls="drop-list" (click)="openDropDown($event);" >
11+
<a dropdownToggle class="drop-list-container" aria-controls="drop-list">
1212
<i class="fa fa-ellipsis-v"></i>
1313
</a>
1414
<div id="drop-list" *dropdownMenu class="dropdown-menu drop-list dropdown-menu-right" role="menu" aria-labelledby="button-basic">

src/app/session/session-card/session-card.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ export class SessionCardComponent implements OnInit {
151151
}
152152

153153
openDropDown(event) {
154-
//event.stopPropagation();
154+
event.stopPropagation();
155155
}
156156

157157
// ============================== //

src/app/session/session/session.component.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, OnDestroy, OnInit} from '@angular/core';
1+
import {Component, NgZone, OnDestroy, OnInit} from '@angular/core';
22
import {WorkspaceService} from '../../services/workspace.service';
33
import {ConfigurationService} from '../../services-system/configuration.service';
44
import {ActivatedRoute, Router} from '@angular/router';
@@ -52,7 +52,8 @@ export class SessionComponent extends AntiMemLeak implements OnInit, OnDestroy {
5252
private fileService: FileService,
5353
private credentialsService: CredentialsService,
5454
private sessionService: SessionService,
55-
private menuService: MenuService
55+
private menuService: MenuService,
56+
private zone: NgZone
5657
) { super(); }
5758

5859
ngOnInit() {
@@ -104,8 +105,10 @@ export class SessionComponent extends AntiMemLeak implements OnInit, OnDestroy {
104105
* getSession
105106
*/
106107
getSessions() {
107-
this.activeSessions = this.sessionService.listSessions().filter( session => session.active === true);
108-
this.notActiveSessions = this.sessionService.listSessions().filter( session => session.active === false);
108+
this.zone.run(() => {
109+
this.activeSessions = this.sessionService.listSessions().filter( session => session.active === true);
110+
this.notActiveSessions = this.sessionService.listSessions().filter( session => session.active === false);
111+
});
109112
}
110113

111114
/**

0 commit comments

Comments
 (0)