[ACS-8991] Fix sidenav issue when clicking on manage saved searches (#…

…4238)
Alfresco · Nov 18, 2024 · baaa8ca · baaa8ca
1 parent 726d9ce
commit baaa8ca
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/...-content/src/lib/components/search/search-save/sidenav/save-search-sidenav.component.html b/...-content/src/lib/components/search/search-save/sidenav/save-search-sidenav.component.html
@@ -1 +1 @@
-<app-expand-menu *ngIf="item" [item]="item" (actionClicked)="onActionClick()" />
+<app-expand-menu *ngIf="item" [item]="item" (actionClicked)="onActionClick($event)" />
diff --git a/...ca-content/src/lib/components/search/search-save/sidenav/save-search-sidenav.component.ts b/...ca-content/src/lib/components/search/search-save/sidenav/save-search-sidenav.component.ts
@@ -63,8 +63,10 @@ export class SaveSearchSidenavComponent implements OnInit, OnDestroy {
     this.destroy$.complete();
   }
 
-  onActionClick(): void {
-    this.appService.appNavNarMode$.next('collapsed');
+  onActionClick(el: NavBarLinkRef): void {
+    if (el.id !== this.manageSearchesId) {
+      this.appService.appNavNarMode$.next('collapsed');
+    }
   }
 
   private createNavBarLinkRef(children: SavedSearch[]): NavBarLinkRef {

diff --git a/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html b/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.html
@@ -43,7 +43,7 @@
         <button
           acaActiveLink="aca-action-button--active"
           [action]="child"
-          (actionClicked)="actionClicked.emit()"
+          (actionClicked)="actionClicked.emit($event)"
           [attr.aria-label]="child.title | translate"
           [id]="child.id"
           [attr.data-automation-id]="child.id"

diff --git a/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.ts b/projects/aca-content/src/lib/components/sidenav/components/expand-menu.component.ts
@@ -55,7 +55,7 @@ export class ExpandMenuComponent implements OnInit {
   item: NavBarLinkRef;
 
   @Output()
-  actionClicked = new EventEmitter<void>();
+  actionClicked = new EventEmitter<NavBarLinkRef>();
 
   constructor(private cd: ChangeDetectorRef) {}
 

diff --git a/projects/aca-content/src/lib/components/sidenav/directives/action.directive.ts b/projects/aca-content/src/lib/components/sidenav/directives/action.directive.ts
@@ -26,6 +26,7 @@ import { Directive, EventEmitter, HostListener, Input, Output } from '@angular/c
 import { Params, PRIMARY_OUTLET, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { AppStore } from '@alfresco/aca-shared/store';
+import { NavBarLinkRef } from '@alfresco/adf-extensions';
 
 @Directive({
   standalone: true,
@@ -36,7 +37,7 @@ import { AppStore } from '@alfresco/aca-shared/store';
 export class ActionDirective {
   @Input() action;
 
-  @Output() actionClicked = new EventEmitter<void>();
+  @Output() actionClicked = new EventEmitter<NavBarLinkRef>();
 
   @HostListener('click')
   onClick() {
@@ -48,7 +49,7 @@ export class ActionDirective {
         payload: this.getNavigationCommands(this.action.click.payload)
       });
     }
-    this.actionClicked.next();
+    this.actionClicked.next(this.action);
   }
 
   constructor(private router: Router, private store: Store<AppStore>) {}