From 68f40378ca7ff57da38af3fa8ef9b045caeff7e0 Mon Sep 17 00:00:00 2001
From: kurilova <kurilova@google.com>
Date: Mon, 29 Jul 2024 09:03:01 +0000
Subject: [PATCH 1/2] Fix focus after profile delete - track by name

---
 .../pages/risk-assessment/risk-assessment.component.html    | 6 +-----
 .../app/pages/risk-assessment/risk-assessment.component.ts  | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
index af1bbd8a4..0a72e6f70 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
@@ -42,11 +42,7 @@ <h2 class="profiles-drawer-header-title">Saved profiles</h2>
     </div>
     <div class="profiles-drawer-content">
       <app-profile-item
-        *ngFor="
-          let profile of vm.profiles;
-          let i = index;
-          trackBy: trackByIndex
-        "
+        *ngFor="let profile of vm.profiles; let i = index; trackBy: trackByName"
         [profile]="profile"
         class="profile-item-{{ i }}"
         [ngClass]="{ selected: profile.name === vm.selectedProfile?.name }"
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
index 1f703f81f..0b895f693 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
@@ -140,8 +140,8 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
     }
   }
 
-  trackByIndex = (index: number): number => {
-    return index;
+  trackByName = (index: number, item: Profile): string => {
+    return item.name;
   };
 
   private closeFormAfterDelete(name: string, selectedProfile: Profile | null) {

From cd23f42710f28cf257665c1cbc963787b5eb9cb8 Mon Sep 17 00:00:00 2001
From: Sofia Kurilova <kurilova@google.com>
Date: Fri, 26 Jul 2024 15:29:27 +0200
Subject: [PATCH 2/2] Adds tooltip (#638)

Adds tooltip
---
 modules/ui/src/app/app.component.html    | 1 +
 modules/ui/src/app/app.component.spec.ts | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index d9d1c59cf..a5e14e9bd 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -266,6 +266,7 @@ <h1 class="main-heading">Testrun</h1>
     mat-button
     routerLink="{{ route }}"
     routerLinkActive="app-sidebar-button-active"
+    [matTooltip]="label"
     (keydown.enter)="onNavigationClick()">
     <mat-icon *ngIf="svgIcon" svgIcon="{{ svgIcon }}"></mat-icon>
     <mat-icon *ngIf="icon">{{ icon }}</mat-icon>
diff --git a/modules/ui/src/app/app.component.spec.ts b/modules/ui/src/app/app.component.spec.ts
index e7e0c4f7c..2cfb60aed 100644
--- a/modules/ui/src/app/app.component.spec.ts
+++ b/modules/ui/src/app/app.component.spec.ts
@@ -71,6 +71,7 @@ import { LiveAnnouncer } from '@angular/cdk/a11y';
 import { HISTORY } from './mocks/reports.mock';
 import { TestRunMqttService } from './services/test-run-mqtt.service';
 import { MOCK_ADAPTERS } from './mocks/settings.mock';
+import { MatTooltipModule } from '@angular/material/tooltip';
 
 const windowMock = {
   location: {
@@ -138,6 +139,7 @@ describe('AppComponent', () => {
         CalloutComponent,
         MatIconTestingModule,
         CertificatesComponent,
+        MatTooltipModule,
       ],
       providers: [
         { provide: TestRunService, useValue: mockService },