changed the way the tray menu works showing actual active sessions an…

…d last used
Noovolari · Oct 5, 2020 · 1398551 · 1398551
1 parent e8cefdb
commit 1398551
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 14 deletions.
diff --git a/electron/dist/electron/main.js b/electron/dist/electron/main.js
diff --git a/electron/dist/electron/main.js.map b/electron/dist/electron/main.js.map
diff --git a/electron/main.ts b/electron/main.ts
@@ -161,15 +161,19 @@ const generateMainWindow = () => {
 const initWorkspace = () => {
 
   // Remove unused voices from contextual menu
-  Menu.setApplicationMenu(Menu.buildFromTemplate([
+  const template = [
     {
       label: 'Leapp',
       submenu: [
         { label: 'About',  role: 'about' },
         { label: 'Quit',  role: 'quit' }
       ]
     }
-  ]));
+  ];
+  if (!environment.production) {
+    template[0].submenu.push({ label: 'Open DevTool', role: 'toggledevtools' });
+  }
+  Menu.setApplicationMenu(Menu.buildFromTemplate(template));
 
   if (process.platform === 'linux' && ['Pantheon', 'Unity:Unity7'].indexOf(process.env.XDG_CURRENT_DESKTOP) !== -1) {
     process.env.XDG_CURRENT_DESKTOP = 'Unity';

diff --git a/src/app/services-system/configuration.service.ts b/src/app/services-system/configuration.service.ts
@@ -9,6 +9,7 @@ import {Workspace} from '../models/workspace';
 import {Configuration} from '../models/configuration';
 import {_} from '../core/translation-marker';
 import {Session} from '../models/session';
+import {MenuService} from '../services/menu.service';
 
 
 @Injectable({

diff --git a/src/app/services/menu.service.ts b/src/app/services/menu.service.ts
@@ -39,22 +39,24 @@ export class MenuService extends NativeService {
     const version = this.appService.getApp().getVersion();
 
     let voices = [];
-    this.sessionService.listSessions().slice(0, 5).forEach((session: Session) => {
+    const activeSessions = this.sessionService.listSessions().filter(s => s.active);
+    const allSessions = activeSessions.concat(this.sessionService.listSessions().filter(s => !s.active).slice(0, 5 - activeSessions.length));
+    allSessions.forEach((session: Session) => {
       let icon = '';
       let label = '';
       switch (session.account.type) {
         case AccountType.AWS_PLAIN_USER:
-          icon = session.active ? __dirname + `/assets/images/icon-online-aws.png` : __dirname + `/assets/images/icon-offline.png`;
+          icon = (session.active && !session.loading) ? __dirname + `/assets/images/icon-online-aws.png` : __dirname + `/assets/images/icon-offline.png`;
           label = '  ' + session.account.accountName + ' - ' + (session.account as AwsPlainAccount).user;
           break;
         case AccountType.AWS:
         case AccountType.AWS_TRUSTER:
-          icon = session.active ? __dirname + `/assets/images/icon-online-aws.png` : __dirname + `/assets/images/icon-offline.png`;
+          icon = (session.active && !session.loading) ? __dirname + `/assets/images/icon-online-aws.png` : __dirname + `/assets/images/icon-offline.png`;
           label = '  ' + session.account.accountName + ' - ' + (session.account as AwsAccount).role.name;
           break;
 
         case AccountType.AZURE:
-          icon = session.active ? __dirname + `/assets/images/icon-online-azure.png` : __dirname + `/assets/images/icon-offline.png`;
+          icon = (session.active && !session.loading) ? __dirname + `/assets/images/icon-online-azure.png` : __dirname + `/assets/images/icon-offline.png`;
           label = '  ' + session.account.accountName;
       }
       voices.push(
@@ -71,9 +73,7 @@ export class MenuService extends NativeService {
               this.sessionService.stopSession(session);
             }
             this.appService.redrawList.emit(true);
-            //  this.currentTray.destroy();
             this.generateMenu();
-
         } },
       );
     });

diff --git a/src/app/services/session.service.ts b/src/app/services/session.service.ts
@@ -35,7 +35,7 @@ export class SessionService extends NativeService {
     const workspace = this.configurationService.getDefaultWorkspaceSync();
     if (workspace.sessions) {
       workspace.sessions.sort((a, b) => {
-        return (a as Session).lastStopDate <= (b as Session).lastStopDate ? 1 : -1;
+        return (a as Session).lastStopDate < (b as Session).lastStopDate ? 1 : -1;
       });
       return workspace.sessions;
     }

diff --git a/src/app/session/session/session.component.ts b/src/app/session/session/session.component.ts
@@ -11,6 +11,7 @@ import {AntiMemLeak} from '../../core/anti-mem-leak';
 import {FileService} from '../../services-system/file.service';
 import {CredentialsService} from '../../services/credentials.service';
 import {SessionService} from '../../services/session.service';
+import {MenuService} from '../../services/menu.service';
 
 @Component({
   selector: 'app-session',
@@ -25,7 +26,6 @@ export class SessionComponent extends AntiMemLeak implements OnInit, OnDestroy {
 
   // Data for the select
   modalAccounts = [];
-  modalRoles = [];
   currentSelectedColor;
   currentSelectedAccountNumber;
 
@@ -51,7 +51,8 @@ export class SessionComponent extends AntiMemLeak implements OnInit, OnDestroy {
     private ssmService: SsmService,
     private fileService: FileService,
     private credentialsService: CredentialsService,
-    private sessionService: SessionService
+    private sessionService: SessionService,
+    private menuService: MenuService
   ) { super(); }
 
   ngOnInit() {
@@ -77,6 +78,7 @@ export class SessionComponent extends AntiMemLeak implements OnInit, OnDestroy {
 
     this.appService.redrawList.subscribe(r => {
       this.getSessions();
+      this.menuService.generateMenu();
     });
   }