Skip to content

Commit c0978ca

Browse files
committed
fix: migrate changes to data-resolvers routing guide
- Remove filter import from rxjs - Move NavigationError type guard from filter to map operator - Add empty string return for non-error events
1 parent 69e459d commit c0978ca

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

adev-ja/src/content/guide/routing/data-resolvers.en.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ You can also handle resolver errors by subscribing to router events and listenin
182182
import { Component, inject, signal } from '@angular/core';
183183
import { Router, NavigationError } from '@angular/router';
184184
import { toSignal } from '@angular/core/rxjs-interop';
185-
import { filter, map } from 'rxjs';
185+
import { map } from 'rxjs';
186186
187187
@Component({
188188
selector: 'app-root',
@@ -202,15 +202,17 @@ export class App {
202202
203203
private navigationErrors = toSignal(
204204
this.router.events.pipe(
205-
filter((event): event is NavigationError => event instanceof NavigationError),
206205
map(event => {
207-
this.lastFailedUrl.set(event.url);
208-
209-
if (event.error) {
210-
console.error('Navigation error', event.error)
206+
if (event instanceof NavigationError) {
207+
this.lastFailedUrl.set(event.url);
208+
209+
if (event.error) {
210+
console.error('Navigation error', event.error)
211+
}
212+
213+
return 'Navigation failed. Please try again.';
211214
}
212-
213-
return 'Navigation failed. Please try again.';
215+
return '';
214216
})
215217
),
216218
{ initialValue: '' }

adev-ja/src/content/guide/routing/data-resolvers.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export const userResolver: ResolveFn<User> = (route) => {
182182
import { Component, inject, signal } from '@angular/core';
183183
import { Router, NavigationError } from '@angular/router';
184184
import { toSignal } from '@angular/core/rxjs-interop';
185-
import { filter, map } from 'rxjs';
185+
import { map } from 'rxjs';
186186
187187
@Component({
188188
selector: 'app-root',
@@ -202,15 +202,17 @@ export class App {
202202
203203
private navigationErrors = toSignal(
204204
this.router.events.pipe(
205-
filter((event): event is NavigationError => event instanceof NavigationError),
206205
map(event => {
207-
this.lastFailedUrl.set(event.url);
206+
if (event instanceof NavigationError) {
207+
this.lastFailedUrl.set(event.url);
208208
209-
if (event.error) {
210-
console.error('Navigation error', event.error)
211-
}
209+
if (event.error) {
210+
console.error('Navigation error', event.error)
211+
}
212212
213-
return 'Navigation failed. Please try again.';
213+
return 'Navigation failed. Please try again.';
214+
}
215+
return '';
214216
})
215217
),
216218
{ initialValue: '' }

origin

0 commit comments

Comments
 (0)