fix(planet): should reroute once when start planet

worktile · Oct 15, 2019 · 7f1bb3b · 7f1bb3b
1 parent 4a43110
commit 7f1bb3b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/packages/planet/src/planet.spec.ts b/packages/planet/src/planet.spec.ts
@@ -114,21 +114,21 @@ describe('Planet', () => {
         expect(setOptionsSpy).toHaveBeenCalledWith(options);
     });
 
-    it('should reroute when navigateByUrl', fakeAsync(() => {
+    it('should reroute when start or navigateByUrl', fakeAsync(() => {
         const router: Router = TestBed.get(Router);
         const ngZone: NgZone = TestBed.get(NgZone);
         const rerouteSpy = spyOn(planetApplicationLoader, 'reroute');
         expect(rerouteSpy).not.toHaveBeenCalled();
         planet.start();
-        expect(rerouteSpy).not.toHaveBeenCalled();
+        expect(rerouteSpy).toHaveBeenCalledTimes(1);
 
         ngZone.run(() => {
             router.navigateByUrl('/app1/dashboard');
         });
 
         tick();
 
-        expect(rerouteSpy).toHaveBeenCalledTimes(1);
+        expect(rerouteSpy).toHaveBeenCalledTimes(2);
         expect(rerouteSpy).toHaveBeenCalledWith({
             url: '/app1/dashboard'
         });
@@ -138,7 +138,7 @@ describe('Planet', () => {
         });
         tick();
 
-        expect(rerouteSpy).toHaveBeenCalledTimes(2);
+        expect(rerouteSpy).toHaveBeenCalledTimes(3);
         expect(rerouteSpy).toHaveBeenCalledWith({
             url: '/app1/users'
         });

diff --git a/packages/planet/src/planet.ts b/packages/planet/src/planet.ts
@@ -9,6 +9,7 @@ import {
     AppStatusChangeEvent
 } from './application/planet-application-loader';
 import { Observable } from 'rxjs';
+import { filter, startWith, distinctUntilChanged, map } from 'rxjs/operators';
 
 @Injectable({
     providedIn: 'root'
@@ -62,12 +63,21 @@ export class Planet {
     }
 
     start() {
-        this.router.events.subscribe((event: RouterEvent) => {
-            if (event instanceof NavigationEnd) {
+        this.router.events
+            .pipe(
+                filter(event => {
+                    return event instanceof NavigationEnd;
+                }),
+                map((event: NavigationEnd) => {
+                    return event.url;
+                }),
+                startWith(location.pathname),
+                distinctUntilChanged()
+            )
+            .subscribe((url: string) => {
                 this.planetApplicationLoader.reroute({
-                    url: event.url
+                    url: url
                 });
-            }
-        });
+            });
     }
 }