From e576dc9621732bd9675adcf210226ff69569ee42 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Wed, 24 May 2023 14:26:20 +0300
Subject: [PATCH] RED-6713: remove stored tenant on logout

---
 .../src/app/components/base-screen/base-screen.component.html | 4 +++-
 .../app/components/tenants-menu/tenants-menu.component.html   | 1 +
 .../src/app/components/user-menu/user-menu.component.html     | 4 +++-
 apps/red-ui/src/app/modules/icons/icons.module.ts             | 1 +
 apps/red-ui/src/assets/icons/general/open-in-new.svg          | 4 ++++
 libs/common-ui                                                | 2 +-
 6 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 apps/red-ui/src/assets/icons/general/open-in-new.svg

diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
index 00385ac90..a92bc2c52 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
@@ -36,7 +36,9 @@
         <iqser-user-button [attr.help-mode-key]="'open_usermenu'" [matMenuTriggerFor]="userMenu" id="userMenu"></iqser-user-button>
 
         <mat-menu #userMenu="matMenu" xPosition="before">
-            <app-user-menu></app-user-menu>
+            <ng-template matMenuContent>
+                <app-user-menu></app-user-menu>
+            </ng-template>
         </mat-menu>
     </div>
 </div>
diff --git a/apps/red-ui/src/app/components/tenants-menu/tenants-menu.component.html b/apps/red-ui/src/app/components/tenants-menu/tenants-menu.component.html
index 1fcae0254..84fcd6ae4 100644
--- a/apps/red-ui/src/app/components/tenants-menu/tenants-menu.component.html
+++ b/apps/red-ui/src/app/components/tenants-menu/tenants-menu.component.html
@@ -9,6 +9,7 @@
     </ng-container>
 
     <a (click)="selectTenant()" mat-menu-item>
+        <mat-icon svgIcon="red:open-in-new"></mat-icon>
         <span translate="top-bar.navigation-items.my-account.children.join-another-tenant"> </span>
     </a>
 </div>
diff --git a/apps/red-ui/src/app/components/user-menu/user-menu.component.html b/apps/red-ui/src/app/components/user-menu/user-menu.component.html
index a768c0b38..5bdf0637e 100644
--- a/apps/red-ui/src/app/components/user-menu/user-menu.component.html
+++ b/apps/red-ui/src/app/components/user-menu/user-menu.component.html
@@ -16,5 +16,7 @@
 </div>
 
 <mat-menu #tenantsMenu="matMenu" xPosition="before">
-    <app-tenants-menu></app-tenants-menu>
+    <ng-template matMenuContent>
+        <app-tenants-menu></app-tenants-menu>
+    </ng-template>
 </mat-menu>
diff --git a/apps/red-ui/src/app/modules/icons/icons.module.ts b/apps/red-ui/src/app/modules/icons/icons.module.ts
index 3d43160b4..6ae4652ec 100644
--- a/apps/red-ui/src/app/modules/icons/icons.module.ts
+++ b/apps/red-ui/src/app/modules/icons/icons.module.ts
@@ -58,6 +58,7 @@ export class IconsModule {
             'needs-work',
             'new-tab',
             'notification',
+            'open-in-new',
             'padding-left-right',
             'padding-top-bottom',
             'page',
diff --git a/apps/red-ui/src/assets/icons/general/open-in-new.svg b/apps/red-ui/src/assets/icons/general/open-in-new.svg
new file mode 100644
index 000000000..5c88f2b5a
--- /dev/null
+++ b/apps/red-ui/src/assets/icons/general/open-in-new.svg
@@ -0,0 +1,4 @@
+<svg height="48" viewBox="0 -960 960 960" width="48" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M180-120q-24 0-42-18t-18-42v-600q0-24 18-42t42-18h279v60H180v600h600v-279h60v279q0 24-18 42t-42 18H180Zm202-219-42-43 398-398H519v-60h321v321h-60v-218L382-339Z" />
+</svg>
diff --git a/libs/common-ui b/libs/common-ui
index 5449cacc2..a06124ab4 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 5449cacc2bb388b84767f2872893cf094d7a15f4
+Subproject commit a06124ab4e50ea4d5304e0070b167956908bd5df