From b2ae972ce0299f938d4843c9edf7303f3e971b3e Mon Sep 17 00:00:00 2001
From: Sean <sean.f.t.engelhardt@gmail.com>
Date: Mon, 9 Aug 2021 12:13:12 +0200
Subject: [PATCH] Show Helpdesk without live streams

---
 .../action-bar/action-bar.component.html      | 24 +++++++++----------
 .../action-bar/action-bar.component.ts        | 13 +++++++---
 .../interaction-container.component.ts        |  4 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/client/src/app/site/interaction/components/action-bar/action-bar.component.html b/client/src/app/site/interaction/components/action-bar/action-bar.component.html
index 86f27a510..cc367d8de 100644
--- a/client/src/app/site/interaction/components/action-bar/action-bar.component.html
+++ b/client/src/app/site/interaction/components/action-bar/action-bar.component.html
@@ -33,20 +33,20 @@
         >
             <mat-icon color="primary"> phone </mat-icon>
         </button>
-
-        <!-- Call support button -->
-        <button
-            mat-mini-fab
-            class="action-bar-shadow background-default"
-            (click)="enterSupportRoom()"
-            matTooltip="{{ 'Help desk' | translate }}"
-            *ngIf="isSupportEnabled | async"
-            @fade
-        >
-            <mat-icon color="primary">help_outline</mat-icon>
-        </button>
     </ng-container>
 
+    <!-- Call support button -->
+    <button
+        mat-mini-fab
+        class="action-bar-shadow background-default"
+        (click)="enterSupportRoom()"
+        matTooltip="{{ 'Help desk' | translate }}"
+        *ngIf="showHelpDesk | async"
+        @fade
+    >
+        <mat-icon color="primary">help_outline</mat-icon>
+    </button>
+
     <!-- applause button -->
     <button
         mat-mini-fab
diff --git a/client/src/app/site/interaction/components/action-bar/action-bar.component.ts b/client/src/app/site/interaction/components/action-bar/action-bar.component.ts
index b064907ae..794ae0100 100644
--- a/client/src/app/site/interaction/components/action-bar/action-bar.component.ts
+++ b/client/src/app/site/interaction/components/action-bar/action-bar.component.ts
@@ -5,7 +5,8 @@ import { Router } from '@angular/router';
 
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs';
+import { combineLatest, Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { fadeAnimation, fadeInOut } from 'app/shared/animations';
 import { BaseViewComponentDirective } from 'app/site/base/base-view';
@@ -34,8 +35,6 @@ export class ActionBarComponent extends BaseViewComponentDirective {
     public showCallDialog: Observable<boolean> = this.rtcService.showCallDialogObservable;
     public showLiveConf: Observable<boolean> = this.interactionService.showLiveConfObservable;
 
-    public isSupportEnabled: Observable<boolean> = this.rtcService.isSupportEnabled;
-
     private canEnterCallObservable: Observable<boolean> = this.callRestrictionService.canEnterCallObservable;
     public canEnterCall = false;
 
@@ -65,6 +64,14 @@ export class ActionBarComponent extends BaseViewComponentDirective {
         }
     }
 
+    public get showHelpDesk(): Observable<boolean> {
+        return combineLatest([this.rtcService.isSupportEnabled, this.isJoined]).pipe(
+            map(([isSupportEnabled, isJoined]) => {
+                return isSupportEnabled && !isJoined;
+            })
+        );
+    }
+
     public constructor(
         titleService: Title,
         translate: TranslateService,
diff --git a/client/src/app/site/interaction/components/interaction-container/interaction-container.component.ts b/client/src/app/site/interaction/components/interaction-container/interaction-container.component.ts
index 1eee55a27..6e6a37b9b 100644
--- a/client/src/app/site/interaction/components/interaction-container/interaction-container.component.ts
+++ b/client/src/app/site/interaction/components/interaction-container/interaction-container.component.ts
@@ -3,8 +3,8 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { Title } from '@angular/platform-browser';
 
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest, forkJoin, merge, Observable } from 'rxjs';
-import { distinctUntilChanged, filter, mergeAll, mergeMap, withLatestFrom } from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { distinctUntilChanged } from 'rxjs/operators';
 
 import { BaseViewComponentDirective } from 'app/site/base/base-view';
 import { ApplauseService } from '../../services/applause.service';