Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit 6170057

Browse files
rafaelss95jelbourn
authored andcommitted
Fix exception being thrown on invalid routes (#218)
1 parent 101aeff commit 6170057

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

src/app/pages/component-list/component-list.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
DocumentationItems,
44
DocCategory
55
} from '../../shared/documentation-items/documentation-items';
6-
import {ActivatedRoute, RouterModule} from '@angular/router';
6+
import {ActivatedRoute, Router, RouterModule} from '@angular/router';
77
import {ComponentPageTitle} from '../page-title/page-title';
88
import {SvgViewerModule} from '../../shared/svg-viewer/svg-viewer';
99
import {CommonModule} from '@angular/common';
@@ -19,10 +19,16 @@ export class ComponentList {
1919

2020
constructor(public docItems: DocumentationItems,
2121
private _componentPageTitle: ComponentPageTitle,
22-
private _route: ActivatedRoute) {
22+
private _route: ActivatedRoute,
23+
private router: Router) {
2324
_route.params.subscribe(p => {
2425
this.category = docItems.getCategoryById(p['id']);
25-
this._componentPageTitle.title = this.category.name;
26+
27+
if (this.category) {
28+
this._componentPageTitle.title = this.category.name;
29+
} else {
30+
this.router.navigate(['/categories']);
31+
}
2632
});
2733
}
2834
}

src/app/pages/guide-viewer/guide-viewer.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, NgModule} from '@angular/core';
2-
import {ActivatedRoute, RouterModule} from '@angular/router';
2+
import {ActivatedRoute, Router, RouterModule} from '@angular/router';
33
import {GuideItem, GuideItems} from '../../shared/guide-items/guide-items';
44
import {FooterModule} from '../../shared/footer/footer';
55
import {DocViewerModule} from '../../shared/doc-viewer/doc-viewer-module';
@@ -13,9 +13,15 @@ import {DocViewerModule} from '../../shared/doc-viewer/doc-viewer-module';
1313
export class GuideViewer {
1414
guide: GuideItem;
1515

16-
constructor(private _route: ActivatedRoute, public guideItems: GuideItems) {
16+
constructor(private _route: ActivatedRoute,
17+
private router: Router,
18+
public guideItems: GuideItems) {
1719
_route.params.subscribe(p => {
1820
this.guide = guideItems.getItemById(p['id']);
21+
22+
if (!this.guide) {
23+
this.router.navigate(['/guides']);
24+
}
1925
});
2026
}
2127
}

0 commit comments

Comments
 (0)