Chore: Updated resolvers from Class to ResolveFn

overlord/src/app/employee-attendance/employee-attendance-resolver.service.ts

@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/internal/Observable';
-
-import { EmployeeAttendance } from './employee-attendance';
-import { EmployeeAttendanceService } from './employee-attendance.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class EmployeeAttendanceResolver {
-  constructor(private ser: EmployeeAttendanceService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<EmployeeAttendance> {
-    const id = route.paramMap.get('id');
-    const startDate = route.queryParamMap.get('startDate') || null;
-    const finishDate = route.queryParamMap.get('finishDate') || null;
-    return this.ser.get(id, startDate, finishDate);
-  }
-}

overlord/src/app/employee-attendance/employee-attendance-routing.module.ts

@@ -2,11 +2,11 @@ import { CommonModule } from '@angular/common';
 import { NgModule, inject } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
-import { AttendanceTypeResolver } from '../attendance/attendance-type-resolver.service';
+import { attendanceTypeResolver } from '../attendance/attendance-type.resolver';
 import { AuthGuard } from '../auth/auth-guard.service';
 
-import { EmployeeAttendanceResolver } from './employee-attendance-resolver.service';
 import { EmployeeAttendanceComponent } from './employee-attendance.component';
+import { employeeAttendanceResolver } from './employee-attendance.resolver';
 
 const employeeEmployeeAttendanceRoutes: Routes = [
   {
@@ -19,8 +19,8 @@ const employeeEmployeeAttendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(EmployeeAttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: employeeAttendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -34,8 +34,8 @@ const employeeEmployeeAttendanceRoutes: Routes = [
       permission: 'Attendance',
     },
     resolve: {
-      info: (route: ActivatedRouteSnapshot) => inject(EmployeeAttendanceResolver).resolve(route),
-      attendanceTypes: () => inject(AttendanceTypeResolver).resolve(),
+      info: employeeAttendanceResolver,
+      attendanceTypes: attendanceTypeResolver,
     },
     runGuardsAndResolvers: 'always',
   },
@@ -44,6 +44,5 @@ const employeeEmployeeAttendanceRoutes: Routes = [
 @NgModule({
   imports: [CommonModule, RouterModule.forChild(employeeEmployeeAttendanceRoutes)],
   exports: [RouterModule],
-  providers: [EmployeeAttendanceResolver],
 })
 export class EmployeeAttendanceRoutingModule {}

overlord/src/app/employee-attendance/employee-attendance.resolver.ts

@@ -0,0 +1,12 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { EmployeeAttendance } from './employee-attendance';
+import { EmployeeAttendanceService } from './employee-attendance.service';
+
+export const employeeAttendanceResolver: ResolveFn<EmployeeAttendance> = (route) => {
+  const id = route.paramMap.get('id');
+  const startDate = route.queryParamMap.get('startDate') || null;
+  const finishDate = route.queryParamMap.get('finishDate') || null;
+  return inject(EmployeeAttendanceService).get(id, startDate, finishDate);
+};