From b4f73938223359203d00e318b2e39dbe526820b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-=C3=89tienne=20Lord?=
 <pierre-etienne.lord@transports.gouv.qc.ca>
Date: Mon, 5 Feb 2024 17:09:14 -0500
Subject: [PATCH] refactor(portal): delegate the close responsability to the
 widget itself

---
 src/app/pages/portal/portal.component.html | 13 +------------
 src/app/pages/portal/portal.component.scss | 15 ---------------
 src/app/pages/portal/portal.component.ts   | 22 +++-------------------
 3 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/src/app/pages/portal/portal.component.html b/src/app/pages/portal/portal.component.html
index 4fe952c59..818ef10b1 100644
--- a/src/app/pages/portal/portal.component.html
+++ b/src/app/pages/portal/portal.component.html
@@ -189,7 +189,7 @@
 
 <app-expansion-panel
   *ngIf="expansionPanelExpanded"
-  [backdropShown]="expansionPanelBackdropShown"
+  [backdropShown]="workspaceState.activeWorkspaceWidget$ | async"
   [(expanded)]="expansionPanelExpanded"
   [maximized]="workspaceState.workspaceMaximize$ | async"
   [@expansionPanelSize]="getExpansionPanelStatus()"
@@ -336,20 +336,9 @@
   [withHeader]="false"
   [(opened)]="toastPanelForExpansionOpened"
 >
-  <div class="toast-panel-for-expansion-close-button-container">
-    <button
-      mat-icon-button
-      color="warn"
-      (click)="toastPanelForExpansionOpened = false"
-    >
-      <mat-icon svgIcon="close"></mat-icon>
-    </button>
-  </div>
-
   <igo-workspace-widget-outlet
     *ngIf="selectedWorkspace$ | async as workspace"
     [workspace]="workspace"
-    (deactivateWidget)="onDeactivateWorkspaceWidget()"
   >
   </igo-workspace-widget-outlet>
 </app-toast-panel-for-expansion>
diff --git a/src/app/pages/portal/portal.component.scss b/src/app/pages/portal/portal.component.scss
index a4916fb64..ea4b11ed9 100644
--- a/src/app/pages/portal/portal.component.scss
+++ b/src/app/pages/portal/portal.component.scss
@@ -422,21 +422,6 @@ toast-panel-for-expansion.toast-panel-for-expansion-opened {
   background: none;
 }
 
-/*** Info panel close/open buttons ***/
-app-toast-panel-for-expansion
-  .toast-panel-for-expansion-close-button-container {
-  position: absolute;
-  top: -10px;
-  right: -15px;
-  z-index: 6;
-  padding: 4px;
-
-  button {
-    height: 24px;
-    line-height: 24px;
-  }
-}
-
 .actionbar-workspace {
   padding-left: 0px;
 }
diff --git a/src/app/pages/portal/portal.component.ts b/src/app/pages/portal/portal.component.ts
index 8076d2bf6..013aec1e9 100644
--- a/src/app/pages/portal/portal.component.ts
+++ b/src/app/pages/portal/portal.component.ts
@@ -165,7 +165,7 @@ export class PortalComponent implements OnInit, OnDestroy {
   public igoSearchPointerSummaryEnabled: boolean;
   public igoReverseSearchCoordsFormatEnabled: boolean;
 
-  public toastPanelForExpansionOpened = true;
+  public toastPanelForExpansionOpened = false;
   private activeWidget$$: Subscription;
   public showToastPanelForExpansionToggle = false;
   public selectedWorkspace$: BehaviorSubject<Workspace> = new BehaviorSubject(
@@ -249,10 +249,6 @@ export class PortalComponent implements OnInit, OnDestroy {
       : undefined;
   }
 
-  get expansionPanelBackdropShown(): boolean {
-    return this.expansionPanelExpanded && this.toastPanelForExpansionOpened;
-  }
-
   get actionbarMode(): ActionbarMode {
     return ActionbarMode.Overlay;
   }
@@ -478,10 +474,10 @@ export class PortalComponent implements OnInit, OnDestroy {
     this.activeWidget$$ = this.workspaceState.activeWorkspaceWidget$.subscribe(
       (widget: Widget) => {
         if (widget !== undefined) {
-          this.openToastPanelForExpansion();
+          this.toastPanelForExpansionOpened = true;
           this.showToastPanelForExpansionToggle = true;
         } else {
-          this.closeToastPanelForExpansion();
+          this.toastPanelForExpansionOpened = false;
           this.showToastPanelForExpansionToggle = false;
         }
       }
@@ -681,18 +677,6 @@ export class PortalComponent implements OnInit, OnDestroy {
     this.toggleSidenav();
   }
 
-  onDeactivateWorkspaceWidget() {
-    this.closeToastPanelForExpansion();
-  }
-
-  closeToastPanelForExpansion() {
-    this.toastPanelForExpansionOpened = false;
-  }
-
-  openToastPanelForExpansion() {
-    this.toastPanelForExpansionOpened = true;
-  }
-
   onMapQuery(event: { features: Feature[]; event: MapBrowserEvent<any> }) {
     const baseQuerySearchSource = this.getQuerySearchSource();
     const querySearchSourceArray: QuerySearchSource[] = [];