fix(state): Update URL in response to ignored transition due to redirect

ui-router · Aug 28, 2018 · c64c252 · c64c252
1 parent 8ed691b
commit c64c252
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/src/state/stateService.ts b/src/state/stateService.ts
@@ -349,7 +349,7 @@ export class StateService {
      */
     const rejectedTransitionHandler = (trans: Transition) => (error: any): Promise<any> => {
       if (error instanceof Rejection) {
-        const isLatest = router.globals.lastStartedTransitionId === trans.$id;
+        const isLatest = router.globals.lastStartedTransitionId <= trans.$id;
 
         if (error.type === RejectType.IGNORED) {
           isLatest && router.urlRouter.update();

diff --git a/test/transitionSpec.ts b/test/transitionSpec.ts
@@ -955,6 +955,41 @@ describe('transition', function() {
         router.urlService.url('/urlRedirect');
       });
 
+      it('should replace the current url when redirecting a url sync transition, even if the redirect is ignored', async done => {
+        router.stateRegistry.register({
+          name: 'queryparam',
+          url: '/?param',
+        });
+
+        await router.stateService.go('queryparam', { param: undefined });
+        expect(router.globals.params.param).toEqual(undefined);
+
+        router.transitionService.onStart({}, trans => {
+          // redirect transition removing ?param=foo
+          if (trans.params().param === 'foo') {
+            return trans.targetState().withParams({ param: undefined });
+          }
+        });
+
+        router.urlService.url('/?param=foo');
+        const url = spyOn(router.locationService, 'url').and.callThrough();
+        const update = spyOn(router.urlRouter, 'update').and.callThrough();
+
+        router.transitionService.onError({}, trans => {
+          if (trans.error().type === RejectType.IGNORED) {
+            setTimeout(() => {
+              expect(update.calls.count()).toBe(1);
+              expect(url.calls.count()).toBe(2);
+              expect(url.calls.argsFor(0)).toEqual([]);
+              expect(url.calls.argsFor(1)).toEqual(['/', true]);
+              expect(router.urlService.url()).toBe('/');
+              expect(router.globals.params.param).toEqual(undefined);
+              done();
+            });
+          }
+        });
+      });
+
       it('should not replace the current url when redirecting a url sync with { location: false }', done => {
         router.transitionService.onBefore({ to: 'requiresAuth' }, trans => {
           return router.stateService.target('redirectTarget', null, { location: false });