Skip to content

Commit e5564ad

Browse files
committed
Upgrade to Angular 16
1 parent 8435b72 commit e5564ad

File tree

5 files changed

+10
-22
lines changed

5 files changed

+10
-22
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
This repository contains the code of the [Angular Testing Course](https://angular-university.io/course/angular-testing-course).
55

6-
This course repository is updated to Angular v15, and there is a package-lock.json file available, for avoiding semantic versioning installation issues.
6+
This course repository is updated to Angular v16, and there is a package-lock.json file available, for avoiding semantic versioning installation issues.
77

88
![Angular Testing Course](https://s3-us-west-1.amazonaws.com/angular-university/course-images/angular-testing-small.png)
99

src/app/app-routing.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Routes, RouterModule } from '@angular/router';
33
import {HomeComponent} from "./courses/home/home.component";
44
import {AboutComponent} from "./about/about.component";
55
import {CourseComponent} from "./courses/course/course.component";
6-
import {CourseResolver} from "./courses/services/course.resolver";
6+
import {courseResolver} from "./courses/services/course.resolver";
77

88
const routes: Routes = [
99
{
@@ -19,7 +19,7 @@ const routes: Routes = [
1919
path: 'courses/:id',
2020
component: CourseComponent,
2121
resolve: {
22-
course: CourseResolver
22+
course: courseResolver
2323
}
2424
},
2525
{

src/app/app.module.ts

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import { MatTableModule } from "@angular/material/table";
2626
import { MatToolbarModule } from "@angular/material/toolbar";
2727
import {CoursesService} from "./courses/services/courses.service";
2828
import {HttpClientModule} from "@angular/common/http";
29-
import {CourseResolver} from "./courses/services/course.resolver";
3029
import { CourseDialogComponent } from './courses/course-dialog/course-dialog.component';
3130
import {ReactiveFormsModule} from "@angular/forms";
3231
import {MatMomentDateModule} from "@angular/material-moment-adapter";

src/app/courses/courses.module.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {AppRoutingModule} from '../app-routing.module';
2727
import {MatMomentDateModule} from '@angular/material-moment-adapter';
2828
import {ReactiveFormsModule} from '@angular/forms';
2929
import {CoursesService} from './services/courses.service';
30-
import {CourseResolver} from './services/course.resolver';
30+
import {courseResolver} from './services/course.resolver';
3131

3232
@NgModule({
3333
declarations: [
@@ -67,8 +67,7 @@ import {CourseResolver} from './services/course.resolver';
6767
CourseDialogComponent
6868
],
6969
providers: [
70-
CoursesService,
71-
CourseResolver
70+
CoursesService
7271
]
7372
})export class CoursesModule {
7473

+5-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
1-
2-
3-
4-
import {Injectable} from "@angular/core";
5-
import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from "@angular/router";
1+
import {inject} from '@angular/core';
2+
import { ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router";
63
import {Course} from "../model/course";
74
import {Observable} from "rxjs";
85
import {CoursesService} from "./courses.service";
96

107

8+
export function courseResolver(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Course> {
119

12-
@Injectable()
13-
export class CourseResolver implements Resolve<Course> {
10+
const coursesService = inject(CoursesService);
1411

15-
constructor(private coursesService:CoursesService) {
16-
17-
}
18-
19-
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Course> {
20-
return this.coursesService.findCourseById(route.params['id']);
21-
}
12+
return coursesService.findCourseById(route.params['id']);
2213

2314
}
24-

0 commit comments

Comments
 (0)