Revert "refactor(router): Retain original navigateEvent across redirects"

This reverts commit 53d3ae0.

Author: atscott

packages/router/src/statemanager/navigation_state_manager.ts

@@ -199,17 +199,8 @@ export class NavigationStateManager extends StateManager {
         resolve();
       });
     } else if (e instanceof NavigationCancel || e instanceof NavigationError) {
-      // If redirecting and the URL hasn't been committed yet (via precommmitHandler),
-      // the redirect will be handled by `commitUrl` using `controller.redirect` and
-      // we should retain the current NavigateEvent.
-      // Otherwise, a full cancellation and rollback is needed.
-      const redirectingBeforeUrlCommit =
-        e instanceof NavigationCancel &&
-        e.code === NavigationCancellationCode.Redirect &&
-        !!this.currentNavigation.commitUrl;
-      if (redirectingBeforeUrlCommit) {
-        return;
-      }
+      // TODO(atscott): We want to keep the navigation event on redirects if
+      // the URL wasn't committed yet rather than cancelling it.
       void this.cancel(transition, e);
     } else if (e instanceof NavigationEnd) {
       const {resolveHandler, removeAbortListener} = this.currentNavigation;

packages/router/test/with_platform_navigation.spec.ts

@@ -7,24 +7,21 @@
  */
 
 import {TestBed} from '@angular/core/testing';
-import {NavigationEnd, NavigationStart, provideRouter, Router} from '../src';
+import {provideRouter, Router} from '../src';
 import {withPlatformNavigation, withRouterConfig} from '../src/provide_router';
 import {withBody} from '@angular/private/testing';
 import {
   PlatformLocation,
   Location,
   PlatformNavigation,
   BrowserPlatformLocation,
-  ɵPRECOMMIT_HANDLER_SUPPORTED as PRECOMMIT_HANDLER_SUPPORTED,
 } from '@angular/common';
 import {
   ɵFakeNavigation as FakeNavigation,
   ɵFakeNavigationPlatformLocation as FakeNavigationPlatformLocation,
   provideLocationMocks,
 } from '@angular/common/testing';
 import {timeout, useAutoTick} from './helpers';
-import {} from '../../common/src/navigation/platform_navigation';
-import {inject} from '@angular/core';
 
 /// <reference types="dom-navigation" />
 
@@ -160,26 +157,6 @@ describe('withPlatformNavigation feature', () => {
       expect(navigateEvents.length).toBe(1);
       expect(navigateEvents[0].navigationType).toBe('traverse');
     });
-
-    it('retains a single NavigateEvent across redirects', async () => {
-      const navigateEvents: NavigateEvent[] = [];
-      navigation.addEventListener('navigate', (e: NavigateEvent) => navigateEvents.push(e));
-
-      router.resetConfig([
-        {path: 'first', canActivate: [() => inject(Router).parseUrl('/redirected')], children: []},
-        {path: '**', children: []},
-      ]);
-      const navPromise = router.navigateByUrl('/first');
-      if (TestBed.inject(PRECOMMIT_HANDLER_SUPPORTED)) {
-        router.events.subscribe((e) => {
-          if (e instanceof NavigationStart) {
-            expect(navigateEvents.length).toBe(1);
-          }
-        });
-      }
-      await navPromise;
-      expect(navigateEvents.length).toBe(1);
-    });
   });
 
   describe('eager url update', () => {