From 77fa5fa487fe12edec8270b9acda7f715402ac80 Mon Sep 17 00:00:00 2001 From: Cilibiu Bogdan Date: Mon, 8 Jul 2019 16:22:52 +0300 Subject: [PATCH] ReloadDocumentListAction over SetSelectedNodesAction --- .../layout/app-layout/app-layout.component.spec.ts | 13 ------------- .../layout/app-layout/app-layout.component.ts | 12 ++++-------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/app/components/layout/app-layout/app-layout.component.spec.ts b/src/app/components/layout/app-layout/app-layout.component.spec.ts index 95398bf0a..16cc576e0 100644 --- a/src/app/components/layout/app-layout/app-layout.component.spec.ts +++ b/src/app/components/layout/app-layout/app-layout.component.spec.ts @@ -152,19 +152,6 @@ describe('AppLayoutComponent', () => { }); }); - it('should not reset selection if route is `/search`', done => { - fixture.detectChanges(); - const selection = [{ entry: { id: 'nodeId', name: 'name' } }]; - store.dispatch(new SetSelectedNodesAction(selection)); - - router.navigateByUrl('/search;q='); - fixture.detectChanges(); - store.select(getAppSelection).subscribe(state => { - expect(state.isEmpty).toBe(false); - done(); - }); - }); - it('should close menu on mobile screen size', () => { component.minimizeSidenav = false; component.layout.container = { diff --git a/src/app/components/layout/app-layout/app-layout.component.ts b/src/app/components/layout/app-layout/app-layout.component.ts index 103defa4a..7d44e2dce 100644 --- a/src/app/components/layout/app-layout/app-layout.component.ts +++ b/src/app/components/layout/app-layout/app-layout.component.ts @@ -43,8 +43,8 @@ import { NodePermissionService } from '@alfresco/aca-shared'; import { BreakpointObserver } from '@angular/cdk/layout'; import { AppStore, - SetSelectedNodesAction, - getCurrentFolder + getCurrentFolder, + ReloadDocumentListAction } from '@alfresco/aca-shared/store'; import { Directionality } from '@angular/cdk/bidi'; @@ -140,15 +140,11 @@ export class AppLayoutComponent implements OnInit, OnDestroy { this.router.events .pipe( filter(event => { - return ( - event instanceof NavigationStart && - // search employs reuse route strategy - !event.url.startsWith('/search;') - ); + return event instanceof NavigationStart; }), takeUntil(this.onDestroy$) ) - .subscribe(() => this.store.dispatch(new SetSelectedNodesAction([]))); + .subscribe(() => this.store.dispatch(new ReloadDocumentListAction())); } ngOnDestroy() {