feat: add url property to RouteNavigation

- cleanup unused parameters of constructors in tests
- safety checks

src/app/core/store/checkout/basket/basket.effects.spec.ts

@@ -423,26 +423,22 @@ describe('Basket Effects', () => {
 
   describe('routeListenerForResettingBasketErrors$', () => {
     it('should fire ResetBasketErrors when route basket or checkout/* is navigated', () => {
-      const action = new RouteNavigation({
-        path: 'checkout/payment',
-        params: {},
-        queryParams: {},
-      });
+      const action = new RouteNavigation({ path: 'checkout/payment' });
       const expected = new basketActions.ResetBasketErrors();
 
       actions$ = hot('a', { a: action });
       expect(effects.routeListenerForResettingBasketErrors$).toBeObservable(cold('a', { a: expected }));
     });
 
     it('should not fire ResetBasketErrors when route basket or checkout/* is navigated with query param error=true', () => {
-      const action = new RouteNavigation({ path: 'checkout/payment', params: {}, queryParams: { error: true } });
+      const action = new RouteNavigation({ path: 'checkout/payment', queryParams: { error: true } });
 
       actions$ = hot('a', { a: action });
       expect(effects.routeListenerForResettingBasketErrors$).toBeObservable(cold('-'));
     });
 
     it('should not fire ResetBasketErrors when route /something is navigated', () => {
-      const action = new RouteNavigation({ path: 'something', params: {}, queryParams: {} });
+      const action = new RouteNavigation({ path: 'something' });
 
       actions$ = hot('a', { a: action });
       expect(effects.routeListenerForResettingBasketErrors$).toBeObservable(cold('-'));

src/app/core/store/checkout/viewconf/viewconf.integration.spec.ts

@@ -30,7 +30,7 @@ describe('Viewconf Integration', () => {
 
     expect(getCheckoutStep(store$.state)).toBe(2);
 
-    store$.dispatch(new RouteNavigation({ path: 'checkout', data: {} }));
+    store$.dispatch(new RouteNavigation({ path: 'checkout' }));
 
     expect(getCheckoutStep(store$.state)).toBeUndefined();
   });

src/app/core/store/error/error.reducer.spec.ts

@@ -46,7 +46,7 @@ describe('Error Reducer', () => {
       },
       {
         state: { current: {}, type: ErrorActionTypes.TimeoutError },
-        action: new RouteNavigation({ path: 'error', params: {}, queryParams: {} }),
+        action: new RouteNavigation({ path: 'error' }),
         expected: { current: {}, type: ErrorActionTypes.TimeoutError },
       },
     ];

src/app/core/store/orders/orders.effects.spec.ts

@@ -290,7 +290,6 @@ describe('Orders Effects', () => {
       const action = new RouteNavigation({
         path: 'account/orders/:orderId',
         params: { orderId },
-        queryParams: {},
       });
       const expected = new orderActions.SelectOrder({ orderId });
 
@@ -299,7 +298,7 @@ describe('Orders Effects', () => {
     });
 
     it('should not fire SelectOrder when route /something is navigated', () => {
-      const action = new RouteNavigation({ path: 'something', params: {}, queryParams: {} });
+      const action = new RouteNavigation({ path: 'something' });
 
       actions$ = hot('a', { a: action });
       expect(effects.routeListenerForSelectingOrder$).toBeObservable(cold('-'));

src/app/core/store/shopping/categories/categories.effects.spec.ts

@@ -79,7 +79,6 @@ describe('Categories Effects', () => {
       const action = new RouteNavigation({
         path: 'category/:categoryUniqueId',
         params: { categoryUniqueId: 'dummy' },
-        queryParams: {},
       });
       const expected = new fromActions.SelectCategory({ categoryId: 'dummy' });
 
@@ -91,7 +90,6 @@ describe('Categories Effects', () => {
       const action = new RouteNavigation({
         path: 'category/:categoryUniqueId/product/:sku',
         params: { categoryUniqueId: 'dummy', sku: 'foobar' },
-        queryParams: {},
       });
       const expected = new fromActions.SelectCategory({ categoryId: 'dummy' });
 
@@ -100,11 +98,7 @@ describe('Categories Effects', () => {
     });
 
     it('should not trigger SelectCategory when /something is visited', () => {
-      const action = new RouteNavigation({
-        path: 'something',
-        params: {},
-        queryParams: {},
-      });
+      const action = new RouteNavigation({ path: 'something' });
 
       actions$ = hot('a', { a: action });
       expect(effects.routeListenerForSelectingCategory$).toBeObservable(cold('-'));
@@ -114,7 +108,6 @@ describe('Categories Effects', () => {
       const action = new RouteNavigation({
         path: 'category/:categoryUniqueId',
         params: { categoryUniqueId: 'dummy' },
-        queryParams: {},
       });
       const expected = new fromActions.SelectCategory({ categoryId: 'dummy' });
 
@@ -342,7 +335,6 @@ describe('Categories Effects', () => {
           a: new RouteNavigation({
             path: 'category/:categoryUniqueId',
             params: { categoryUniqueId: category.uniqueId },
-            queryParams: {},
           }),
         });
 
@@ -359,7 +351,6 @@ describe('Categories Effects', () => {
           a: new RouteNavigation({
             path: 'category/:categoryUniqueId/product/:sku',
             params: { categoryUniqueId: category.uniqueId, sku: 'dummy' },
-            queryParams: {},
           }),
           b: new fromActions.SelectedCategoryAvailable({ categoryId: category.uniqueId }),
         });

src/app/core/store/shopping/products/products.effects.spec.ts

@@ -307,7 +307,6 @@ describe('Products Effects', () => {
       const action = new RouteNavigation({
         path: 'category/:categoryUniqueId/product/:sku',
         params: { categoryUniqueId: 'dummy', sku: 'foobar' },
-        queryParams: {},
       });
       const expected = new fromActions.SelectProduct({ sku: 'foobar' });
 
@@ -319,7 +318,6 @@ describe('Products Effects', () => {
       const action = new RouteNavigation({
         path: 'product/:sku',
         params: { sku: 'foobar' },
-        queryParams: {},
       });
       const expected = new fromActions.SelectProduct({ sku: 'foobar' });
 
@@ -328,7 +326,7 @@ describe('Products Effects', () => {
     });
 
     it('should not fire SelectProduct when route /something is navigated', () => {
-      const action = new RouteNavigation({ path: 'something', params: {}, queryParams: {} });
+      const action = new RouteNavigation({ path: 'something' });
 
       actions$ = hot('a', { a: action });
       expect(effects.routeListenerForSelectingProducts$).toBeObservable(cold('-'));

src/app/core/store/shopping/search/search.effects.spec.ts

@@ -93,7 +93,6 @@ describe('Search Effects', () => {
         const action = new RouteNavigation({
           path: 'search/:searchTerm',
           params: { searchTerm: 'dummy' },
-          queryParams: [],
         });
         actions$ = hot('a-a-|', { a: action });
 

src/app/core/store/shopping/shopping-store.spec.ts

@@ -234,6 +234,7 @@ describe('Shopping Store', () => {
           params: {}
           queryParams: {}
           data: {}
+          url: "/home"
           path: "home"
         [Viewconf Internal] Set Device Type:
           deviceType: "pc"
@@ -269,6 +270,7 @@ describe('Shopping Store', () => {
             params: {"categoryUniqueId":"A.123"}
             queryParams: {}
             data: {}
+            url: "/category/A.123"
             path: "category/:categoryUniqueId"
           [Shopping] Select Category:
             categoryId: "A.123"
@@ -321,6 +323,7 @@ describe('Shopping Store', () => {
             params: {"searchTerm":"something"}
             queryParams: {}
             data: {}
+            url: "/search/something"
             path: "search/:searchTerm"
           [Shopping] Set Search Term:
             searchTerm: "something"
@@ -364,6 +367,7 @@ describe('Shopping Store', () => {
               params: {"sku":"P2"}
               queryParams: {}
               data: {}
+              url: "/product/P2"
               path: "product/:sku"
             [Shopping] Select Product:
               sku: "P2"
@@ -398,6 +402,7 @@ describe('Shopping Store', () => {
           params: {"categoryUniqueId":"A.123"}
           queryParams: {}
           data: {}
+          url: "/category/A.123"
           path: "category/:categoryUniqueId"
         [Viewconf Internal] Set Device Type:
           deviceType: "pc"
@@ -441,6 +446,7 @@ describe('Shopping Store', () => {
             params: {}
             queryParams: {}
             data: {}
+            url: "/compare"
             path: "compare"
           [Shopping] Deselect Category
         `);
@@ -471,6 +477,7 @@ describe('Shopping Store', () => {
           params: {"categoryUniqueId":"A.123.456"}
           queryParams: {}
           data: {}
+          url: "/category/A.123.456"
           path: "category/:categoryUniqueId"
         [Viewconf Internal] Set Device Type:
           deviceType: "pc"
@@ -546,6 +553,7 @@ describe('Shopping Store', () => {
             params: {"categoryUniqueId":"A.123.456","sku":"P1"}
             queryParams: {}
             data: {}
+            url: "/category/A.123.456/product/P1"
             path: "category/:categoryUniqueId/product/:sku"
           [Shopping] Select Product:
             sku: "P1"
@@ -576,6 +584,7 @@ describe('Shopping Store', () => {
               params: {"categoryUniqueId":"A.123.456"}
               queryParams: {}
               data: {}
+              url: "/category/A.123.456"
               path: "category/:categoryUniqueId"
             [ProductListing] Load More Products:
               id: {"type":"category","value":"A.123.456"}
@@ -599,6 +608,7 @@ describe('Shopping Store', () => {
             params: {"searchTerm":"something"}
             queryParams: {}
             data: {}
+            url: "/search/something"
             path: "search/:searchTerm"
           [Shopping] Deselect Category
           [Shopping] Set Search Term:
@@ -643,6 +653,7 @@ describe('Shopping Store', () => {
               params: {"categoryUniqueId":"A.123.456"}
               queryParams: {}
               data: {}
+              url: "/category/A.123.456"
               path: "category/:categoryUniqueId"
             [Shopping] Select Category:
               categoryId: "A.123.456"
@@ -683,6 +694,7 @@ describe('Shopping Store', () => {
             params: {}
             queryParams: {}
             data: {}
+            url: "/compare"
             path: "compare"
           [Shopping] Deselect Category
         `);
@@ -713,6 +725,7 @@ describe('Shopping Store', () => {
           params: {"categoryUniqueId":"A.123.456","sku":"P1"}
           queryParams: {}
           data: {}
+          url: "/category/A.123.456/product/P1"
           path: "category/:categoryUniqueId/product/:sku"
         [Viewconf Internal] Set Device Type:
           deviceType: "pc"
@@ -773,6 +786,7 @@ describe('Shopping Store', () => {
             params: {"categoryUniqueId":"A.123.456"}
             queryParams: {}
             data: {}
+            url: "/category/A.123.456"
             path: "category/:categoryUniqueId"
           [ProductListing] Load More Products:
             id: {"type":"category","value":"A.123.456"}
@@ -829,6 +843,7 @@ describe('Shopping Store', () => {
             params: {}
             queryParams: {}
             data: {}
+            url: "/compare"
             path: "compare"
           [Shopping] Deselect Category
           [Shopping] Select Product:
@@ -861,6 +876,7 @@ describe('Shopping Store', () => {
           params: {"sku":"P1"}
           queryParams: {}
           data: {}
+          url: "/product/P1"
           path: "product/:sku"
         [Viewconf Internal] Set Device Type:
           deviceType: "pc"
@@ -901,6 +917,7 @@ describe('Shopping Store', () => {
             params: {}
             queryParams: {}
             data: {}
+            url: "/compare"
             path: "compare"
           [Shopping] Select Product:
             sku: undefined
@@ -932,6 +949,7 @@ describe('Shopping Store', () => {
           params: {"categoryUniqueId":"A.123.456","sku":"P3"}
           queryParams: {}
           data: {}
+          url: "/category/A.123.456/product/P3"
           path: "category/:categoryUniqueId/product/:sku"
         [Viewconf Internal] Set Device Type:
           deviceType: "pc"
@@ -968,6 +986,7 @@ describe('Shopping Store', () => {
           params: {}
           queryParams: {}
           data: {}
+          url: "/error"
           path: "error"
         [Shopping] Deselect Category
         [Shopping] Select Product:
@@ -1003,6 +1022,7 @@ describe('Shopping Store', () => {
           params: {"categoryUniqueId":"A.123.XXX"}
           queryParams: {}
           data: {}
+          url: "/category/A.123.XXX"
           path: "category/:categoryUniqueId"
         [Viewconf Internal] Set Device Type:
           deviceType: "pc"
@@ -1022,6 +1042,7 @@ describe('Shopping Store', () => {
           params: {}
           queryParams: {}
           data: {}
+          url: "/error"
           path: "error"
         [Shopping] Deselect Category
       `);
@@ -1049,6 +1070,7 @@ describe('Shopping Store', () => {
           params: {"searchTerm":"something"}
           queryParams: {}
           data: {}
+          url: "/search/something"
           path: "search/:searchTerm"
         [Viewconf Internal] Set Device Type:
           deviceType: "pc"

src/app/core/store/user/user.effects.spec.ts

@@ -218,7 +218,7 @@ describe('User Effects', () => {
 
       store$.dispatch(new ua.LoginUserSuccess(loginResponseData));
 
-      actions$ = of(new RouteNavigation({ path: 'login', queryParams: {} }));
+      actions$ = of(new RouteNavigation({ path: 'login' }));
 
       effects.redirectAfterLogin$.subscribe(noop, fail, noop);
 
@@ -234,7 +234,7 @@ describe('User Effects', () => {
 
       store$.dispatch(new ua.LoginUserSuccess(loginResponseData));
 
-      actions$ = of(new RouteNavigation({ path: 'home', queryParams: {} }));
+      actions$ = of(new RouteNavigation({ path: 'home' }));
 
       effects.redirectAfterLogin$.subscribe(noop, fail, noop);
 
@@ -493,15 +493,15 @@ describe('User Effects', () => {
 
   describe('resetUserError$', () => {
     it('should not dispatch UserErrorReset action on router navigation if error is not set', () => {
-      actions$ = hot('a', { a: new RouteNavigation({ path: 'any', params: {}, queryParams: {} }) });
+      actions$ = hot('a', { a: new RouteNavigation({ path: 'any' }) });
 
       expect(effects.resetUserError$).toBeObservable(cold('-'));
     });
 
     it('should dispatch UserErrorReset action on router navigation if error was set', () => {
       store$.dispatch(new ua.LoginUserFail({ error: { message: 'error' } as HttpError }));
 
-      actions$ = hot('a', { a: new RouteNavigation({ path: 'any', params: {}, queryParams: {} }) });
+      actions$ = hot('a', { a: new RouteNavigation({ path: 'any' }) });
 
       expect(effects.resetUserError$).toBeObservable(cold('a', { a: new ua.UserErrorReset() }));
     });

src/app/core/store/viewconf/viewconf.integration.spec.ts

@@ -46,7 +46,7 @@ describe('Viewconf Integration', () => {
 
     expect(getWrapperClass(store$.state)).toEqual('something');
 
-    store$.dispatch(new RouteNavigation({ path: 'any', data: {} }));
+    store$.dispatch(new RouteNavigation({ path: 'any' }));
 
     expect(getWrapperClass(store$.state)).toBeUndefined();
   });

src/app/extensions/quoting/store/quote-request/quote-request.effects.spec.ts

@@ -1012,7 +1012,6 @@ describe('Quote Request Effects', () => {
       const action = new RouteNavigation({
         path: 'quote-request/:quoteRequestId',
         params: { quoteRequestId: 'QRID' },
-        queryParams: {},
       });
       const expected = new quoteRequestActions.SelectQuoteRequest({ id: 'QRID' });
 
@@ -1021,7 +1020,7 @@ describe('Quote Request Effects', () => {
     });
 
     it('should not fire SelectQuoteRequest when route /something is navigated', () => {
-      const action = new RouteNavigation({ path: 'something', params: {}, queryParams: {} });
+      const action = new RouteNavigation({ path: 'something' });
 
       actions$ = hot('a', { a: action });
       expect(effects.routeListenerForSelectingQuote$).toBeObservable(cold('-'));

src/ngrx-router/actions.ts

@@ -5,5 +5,9 @@ export const ROUTER_NAVIGATION_TYPE = '[Router] Navigation';
 export class RouteNavigation implements Action {
   readonly type = ROUTER_NAVIGATION_TYPE;
   // tslint:disable-next-line:no-any
-  constructor(public payload: { path: string; params?: any; queryParams?: any; data?: any }) {}
+  constructor(public payload: { path: string; url?: string; params?: any; queryParams?: any; data?: any }) {
+    if (!this.payload.url) {
+      this.payload.url = '/' + this.payload.path;
+    }
+  }
 }