From c608fa85df3261fa834a826a87e8d24482c9499a Mon Sep 17 00:00:00 2001
From: Arman Ozak <arman@armanozak.com>
Date: Fri, 29 Jan 2021 23:07:47 +0300
Subject: [PATCH] rename methods that get all router/navigation events

---
 .../core/src/lib/services/router-events.service.ts         | 7 ++++---
 .../packages/core/src/lib/services/router-wait.service.ts  | 2 +-
 .../core/src/lib/tests/router-events.service.spec.ts       | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/services/router-events.service.ts b/npm/ng-packs/packages/core/src/lib/services/router-events.service.ts
index 22981c641c..9acee09aa7 100644
--- a/npm/ng-packs/packages/core/src/lib/services/router-events.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/router-events.service.ts
@@ -42,11 +42,11 @@ export class RouterEvents {
     return this.router.events.pipe(filter(filterNavigationEvents));
   }
 
-  getAnyEvent() {
+  getAllEvents() {
     return this.router.events;
   }
 
-  getAnyNavigationEvent() {
+  getAllNavigationEvents() {
     const keys = Object.keys(NavigationEvent) as NavigationEventKeys;
     return this.getNavigationEvents(...keys);
   }
@@ -56,5 +56,6 @@ type RouterEventConstructors = [Type<RouterEvent>, ...Type<RouterEvent>[]];
 
 type NavigationEventKeys = [NavigationEventKey, ...NavigationEventKey[]];
 
-export type NavigationEventType = typeof NavigationEvent;
+type NavigationEventType = typeof NavigationEvent;
+
 export type NavigationEventKey = keyof NavigationEventType;
diff --git a/npm/ng-packs/packages/core/src/lib/services/router-wait.service.ts b/npm/ng-packs/packages/core/src/lib/services/router-wait.service.ts
index 10c0100997..e53ca3a1b1 100644
--- a/npm/ng-packs/packages/core/src/lib/services/router-wait.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/router-wait.service.ts
@@ -24,7 +24,7 @@ export class RouterWaitService {
 
   private updateLoadingStatusOnNavigationEvents() {
     this.routerEvents
-      .getAnyNavigationEvent()
+      .getAllNavigationEvents()
       .pipe(
         map(event => event instanceof NavigationStart),
         switchMap(condition =>
diff --git a/npm/ng-packs/packages/core/src/lib/tests/router-events.service.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/router-events.service.spec.ts
index 2fff89fd88..0226c09d1e 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/router-events.service.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/router-events.service.spec.ts
@@ -67,7 +67,7 @@ describe('RouterEvents', () => {
 
   describe('getAnyNavigationEvent', () => {
     it('should return a stream of any navigation event', () => {
-      const stream = service.getAnyNavigationEvent();
+      const stream = service.getAllNavigationEvents();
       const collected: number[] = [];
 
       stream.pipe(take(4)).subscribe(event => collected.push(event.id));
@@ -93,7 +93,7 @@ describe('RouterEvents', () => {
 
   describe('getAnyEvent', () => {
     it('should return a stream of any router event', () => {
-      const stream = service.getAnyEvent();
+      const stream = service.getAllEvents();
       const collected: number[] = [];
 
       stream.pipe(take(8)).subscribe((event: RouterEvent) => collected.push(event.id));