fix(webapp): add tooltip to menu warning icon when session is closed (#…

…852) Issue: DGW-145
Devolutions · May 14, 2024 · b4ed845 · b4ed845
1 parent 199bb89
commit b4ed845
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/.../app/modules/base/menu/menu-list-active-sessions/menu-list-active-sessions.component.html b/.../app/modules/base/menu/menu-list-active-sessions/menu-list-active-sessions.component.html
@@ -1,15 +1,18 @@
 <ng-container *ngFor="let activeWebSession of activeWebSessions;">
   <div class="menu-list-item-container">
     <div class="menu-list-item"
-         [pTooltip]="activeWebSession.name"
          [class.selected]="activeWebSessionIndex === activeWebSession.tabIndex"
          (click)="onMenuListItemClick($event, activeWebSession)">
 
       <div class="left-content">
-        <i *ngIf="activeWebSession.icon" class="dvl-icon" [ngClass]="activeWebSession.icon"></i>
+        <i *ngIf="activeWebSession.icon"
+           class="dvl-icon"
+           [pTooltip]="activeWebSession.iconTooltip"
+           [ngClass]="activeWebSession.icon"></i>
         <span class="menu-list-item-label" tooltipEllipsis>{{activeWebSession.name}}</span>
       </div>
       <p-button (onClick)="onCloseButtonClick($event, activeWebSession)"
+                [pTooltip]="'Close Session'"
                 aria-label="Close session"
                 icon="dvl-icon dvl-icon-close"
                 iconPos="left"></p-button>

diff --git a/webapp/src/client/app/shared/models/web-session.model.ts b/webapp/src/client/app/shared/models/web-session.model.ts
@@ -24,6 +24,7 @@ export class WebSession<WebSessionComponentType, TData> {
   public tabIndex?: number;
   public data?: TData;
   public icon?: string = '';
+  public iconTooltip?: string = '';
   public status: ComponentStatus;
   public desktopSize: DesktopSize;
 
@@ -42,6 +43,7 @@ export class WebSession<WebSessionComponentType, TData> {
     this.component = component;
     this.data = data;
     this.icon = icon;
+    this.iconTooltip = name;
     this.tabIndex = tabIndex;
     this.id = id;
     this.sessionId = sessionId;

diff --git a/webapp/src/client/app/shared/services/web-session.service.ts b/webapp/src/client/app/shared/services/web-session.service.ts
@@ -120,13 +120,18 @@ export class WebSessionService {
     this.setWebSessionCurrentIndex(this.NEW_SESSION_IDX);
   }
 
+  //For translation ConnectionHasBeenTerminatedEllipsis
   async updateWebSessionIcon(updateWebSessionId: string, icon: string): Promise<void> {
-    const currentSessions = this.webSessionDataSubject.value;
+    const currentSessions: WebSession<any, any>[] = this.webSessionDataSubject.value;
     const index: number = currentSessions.findIndex(session => session.id === updateWebSessionId);
     const webSession: WebSession<any, any> = currentSessions[index];
 
     if (index !== -1) {
       webSession.icon = icon;
+      if (icon === WebClientRdpComponent.DVL_WARNING_ICON) {
+        webSession.iconTooltip = 'Connection has been terminated.';
+      }
+
       currentSessions[index] = webSession;
       this.webSessionDataSubject.next(currentSessions);
     } else {