Skip to content

refactor:replace constructor injection with inject() #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DjesikaV wants to merge 4 commits into
base: main
Choose a base branch
from
Open

refactor:replace constructor injection with inject() #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54ddeec
refactor:replace constructor injection with inject()
Jun 16, 2026
d5da32f
refactor: replace remaining constructors with inject()
Jun 16, 2026
27ea942
Merge branch 'main' into replace-constructor-with-inject
DjesikaV Jun 25, 2026
cb0e463
Merge branch 'main' into replace-constructor-with-inject
DjesikaV Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions uniplanWeb/src/app/core/shared/navmenu-component/navmenu-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, HostListener, OnInit, ChangeDetectionStrategy } from '@angular/core';
import { Component, HostListener, OnInit, ChangeDetectionStrategy, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterLink, RouterLinkActive } from '@angular/router';
import { TranslatePipe } from '@ngx-translate/core';
Expand All @@ -17,7 +17,8 @@ export class NavmenuComponent implements OnInit {
isSidebarCollapsed = false;
isMobileView = window.innerWidth <= 768;

constructor(public authService: LoginAuthService) {}
public authService = inject(LoginAuthService);
public viewService = inject(ViewService);

ngOnInit(): void {
this.checkViewport();
Expand Down
10 changes: 4 additions & 6 deletions uniplanWeb/src/app/features/faculty/faculty-add-form/faculty-add-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
import { Component, OnInit, ChangeDetectionStrategy, inject } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
import { MatFormField, MatLabel } from '@angular/material/form-field';
Expand Down Expand Up @@ -37,11 +37,9 @@ export class FacultyAddForm implements OnInit {
universityId = '';
universities: UniversityElm[] = [];

constructor(
private dialogRef: MatDialogRef<AddForm>,
private facultyService: FacultyService,
private universityService: UniversityService
) { }
private dialogRef = inject(MatDialogRef<AddForm>);
private facultyService = inject(FacultyService);
private universityService = inject(UniversityService);

ngOnInit(): void {
this.universityService.getAllUniversities().subscribe({
Expand Down
12 changes: 5 additions & 7 deletions uniplanWeb/src/app/features/faculty/faculty-delete-form/faculty-delete-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, Inject, ChangeDetectionStrategy } from '@angular/core';
import {Component, ChangeDetectionStrategy, inject} from '@angular/core';
import { DeleteForm } from '../../../core/shared/delete-form/delete-form';
import {
MAT_DIALOG_DATA,
Expand All @@ -16,12 +16,10 @@ import { TranslatePipe } from '@ngx-translate/core';
imports: [DeleteForm, MatDialogModule, TranslatePipe],
})
export class FacultyDeleteForm {
constructor(
private facultyService: FacultyService,
private dialogRef: MatDialogRef<FacultyDeleteForm>,
@Inject(MAT_DIALOG_DATA)
public data: { id: string; facultyName: string }
) { }

private facultyService = inject(FacultyService);
private dialogRef = inject(MatDialogRef<FacultyDeleteForm>);
public data = inject<{ id: string; facultyName: string }>(MAT_DIALOG_DATA);

deleteFaculty(): void {
this.facultyService.deleteFaculty(this.data.id).subscribe({
Expand Down
32 changes: 13 additions & 19 deletions uniplanWeb/src/app/features/faculty/faculty-edit/faculty-edit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, Inject, ChangeDetectionStrategy } from '@angular/core';
import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
import { FormsModule } from '@angular/forms';
import {
MatDialogModule,
Expand Down Expand Up @@ -32,25 +32,19 @@ import { TranslatePipe } from '@ngx-translate/core';
],
})
export class FacultyEdit {
facultyName = '';
location = '';
universityId = '';

constructor(
private dialogRef: MatDialogRef<EditForm>,
private facultyService: FacultyService,
@Inject(MAT_DIALOG_DATA)
public data: {
id: string;
facultyName: string;
location: string;
universityId: string;
}
) {
this.facultyName = data.facultyName;
this.location = data.location;
this.universityId = data.universityId;
}
private dialogRef = inject(MatDialogRef<EditForm>);
private facultyService = inject(FacultyService);
public data = inject<{
id: string;
facultyName: string;
location: string;
universityId: string;
}>(MAT_DIALOG_DATA);

facultyName = this.data.facultyName;
location = this.data.location;
universityId = this.data.universityId;

save() {
if (!this.facultyName.trim()) {
Expand Down
4 changes: 2 additions & 2 deletions uniplanWeb/src/app/features/faculty/faculty-options/faculty-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import { Component, ChangeDetectionStrategy } from '@angular/core';
import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTableModule } from '@angular/material/table';
Expand All @@ -20,7 +20,7 @@ import { AddButton } from '../../../core/shared/add-button/add-button';
],
})
export class FacultyOptions {
constructor(private dialog: MatDialog) { }
private dialog = inject(MatDialog);

openAddForm() {
this.dialog.open(FacultyAddForm, {
Expand Down
4 changes: 2 additions & 2 deletions uniplanWeb/src/app/features/faculty/faculty-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Injectable, inject } from '@angular/core';
import { map, Observable, Subject } from 'rxjs';
import { FacultyElm } from '../../core/interfaces/faculty-elm';
import {API_ENDPOINTS} from '../../config/endpoints';
Expand All @@ -10,7 +10,7 @@ import {API_ENDPOINTS} from '../../config/endpoints';
export class FacultyService {
refreshNeeded = new Subject<void>();

constructor(private http: HttpClient) {}
private http = inject(HttpClient);

getFaculties(): Observable<FacultyElm[]> {
return this.http.get<FacultyElm[]>(API_ENDPOINTS.faculties).pipe(
Expand Down
8 changes: 3 additions & 5 deletions uniplanWeb/src/app/features/faculty/faculty-table/faculty-table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import { Component, ChangeDetectionStrategy, signal } from '@angular/core';
import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTableModule } from '@angular/material/table';
Expand Down Expand Up @@ -32,10 +32,8 @@ export class FacultyTable {
];
dataSource = signal<FacultyElm[]>([]);

constructor(
private facultyService: FacultyService,
private dialog: MatDialog
) { }
private facultyService = inject(FacultyService);
private dialog = inject(MatDialog);

ngOnInit(): void {
this.loadFaculties();
Expand Down
10 changes: 4 additions & 6 deletions uniplanWeb/src/app/features/major/major-add-form/major-add-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
import { Component, OnInit, ChangeDetectionStrategy, inject } from '@angular/core';
import { AddForm } from '../../../core/shared/add-form/add-form';
import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
import {
Expand Down Expand Up @@ -40,11 +40,9 @@ export class MajorAddForm implements OnInit {

faculties: FacultyElm[] = [];

constructor(
private dialogRef: MatDialogRef<AddForm>,
private majorService: MajorService,
private facultyService: FacultyService
) { }
private dialogRef = inject(MatDialogRef<AddForm>);
private majorService = inject(MajorService);
private facultyService = inject(FacultyService);

ngOnInit(): void {
this.facultyService.getFaculties().subscribe({
Expand Down
12 changes: 5 additions & 7 deletions uniplanWeb/src/app/features/major/major-delete-form/major-delete-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, Inject, ChangeDetectionStrategy } from '@angular/core';
import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
import { DeleteForm } from '../../../core/shared/delete-form/delete-form';
import {
MAT_DIALOG_DATA,
Expand All @@ -18,12 +18,10 @@ import { TranslatePipe } from '@ngx-translate/core';
TranslatePipe],
})
export class MajorDeleteForm {
constructor(
private majorService: MajorService,
private dialogRef: MatDialogRef<MajorDeleteForm>,
@Inject(MAT_DIALOG_DATA)
public data: { id: string; name: string }
) {}

private majorService = inject(MajorService);
private dialogRef = inject(MatDialogRef<MajorDeleteForm>);
public data = inject<{ id: string; courseId: string; name: string }>(MAT_DIALOG_DATA);

deleteMajor(): void {
this.majorService
Expand Down
29 changes: 12 additions & 17 deletions uniplanWeb/src/app/features/major/major-edit-form/major-edit-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, Inject, OnInit, ChangeDetectionStrategy } from '@angular/core';
import { Component, OnInit, ChangeDetectionStrategy, inject } from '@angular/core';
import { EditForm } from '../../../core/shared/edit-form/edit-form';
import { MatFormField, MatLabel } from '@angular/material/form-field';
import {
Expand Down Expand Up @@ -32,25 +32,20 @@ import { TranslatePipe } from '@ngx-translate/core';
TranslatePipe],
})
export class MajorEditForm implements OnInit {
majorName = '';
facultyId = '';

faculties: FacultyElm[] = [];

constructor(
private dialogRef: MatDialogRef<EditForm>,
private majorService: MajorService,
private facultyService: FacultyService,
@Inject(MAT_DIALOG_DATA)
public data: {
id: string;
majorName: string;
facultyId?: string;
}
) {
this.majorName = data.majorName;
this.facultyId = data.facultyId || '';
}
private dialogRef = inject(MatDialogRef<EditForm>);
private majorService = inject(MajorService);
private facultyService = inject(FacultyService);
public data = inject<{
id: string;
majorName: string;
facultyId?: string;
}>(MAT_DIALOG_DATA);

majorName = this.data.majorName;
facultyId = this.data.facultyId || '';

ngOnInit(): void {
this.facultyService.getFaculties().subscribe({
Expand Down
4 changes: 2 additions & 2 deletions uniplanWeb/src/app/features/major/major-options/major-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, ChangeDetectionStrategy } from '@angular/core';
import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { MajorAddForm } from '../major-add-form/major-add-form';

Expand All @@ -20,7 +20,7 @@ import { AddButton } from '../../../core/shared/add-button/add-button';
styleUrl: './major-options.scss',
})
export class MajorOptions {
constructor(private dialog: MatDialog) {}
private dialog = inject(MatDialog);

openAddForm() {
this.dialog.open(MajorAddForm, {
Expand Down
4 changes: 2 additions & 2 deletions uniplanWeb/src/app/features/major/major-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Injectable, inject } from '@angular/core';
import { map, Observable, Subject, switchMap } from 'rxjs';
import { MajorElm } from '../../core/interfaces/major-elm';
import {environment} from '../../../environments/environment';
Expand All @@ -11,7 +11,7 @@ import {API_ENDPOINTS} from '../../config/endpoints';
export class MajorService {
refreshNeeded = new Subject<void>();

constructor(private http: HttpClient) {}
private http = inject(HttpClient);

getMajors(): Observable<MajorElm[]> {
return this.http.get<MajorElm[]>(API_ENDPOINTS.majors).pipe(
Expand Down
10 changes: 4 additions & 6 deletions uniplanWeb/src/app/features/major/major-table/major-table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import { Component, Input, OnInit, ChangeDetectionStrategy, signal } from '@angular/core';
import { Component, Input, OnInit, ChangeDetectionStrategy, inject } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTableModule } from '@angular/material/table';
Expand Down Expand Up @@ -36,11 +36,9 @@ export class MajorTable implements OnInit {
@Input() type: string = '';
@Input() subtype: string = '';

constructor(
private dialog: MatDialog,
private service: MajorService,
private facultyService: FacultyService
) { }
private dialog = inject(MatDialog);
private service = inject(MajorService);
private facultyService = inject(FacultyService);

ngOnInit(): void {
this.loadMajors();
Expand Down
4 changes: 2 additions & 2 deletions uniplanWeb/src/app/features/student/student-add-form/student-add-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, ChangeDetectionStrategy } from '@angular/core';
import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
import { AddForm } from '../../../core/shared/add-form/add-form';
import { MatDialogModule, MatDialogRef } from '@angular/material/dialog';
import {
Expand Down Expand Up @@ -32,7 +32,7 @@ export class StudentAddForm {
course = '';
type = '';

constructor(private dialogRef: MatDialogRef<AddForm>) { }
private dialogRef = inject(MatDialogRef<AddForm>);

save() {
if (!this.studentName.trim()) {
Expand Down
4 changes: 2 additions & 2 deletions uniplanWeb/src/app/features/student/student-options/student-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, ChangeDetectionStrategy } from '@angular/core';
import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
import { AddButton } from '../../../core/shared/add-button/add-button';
import { MatDialog } from '@angular/material/dialog';
import { StudentAddForm } from '../student-add-form/student-add-form';
Expand All @@ -11,7 +11,7 @@ import { StudentAddForm } from '../student-add-form/student-add-form';
styleUrl: './student-options.scss',
})
export class StudentOptions {
constructor(private dialog: MatDialog) {}
private dialog = inject(MatDialog);

openAddForm() {
this.dialog.open(StudentAddForm, {
Expand Down
6 changes: 4 additions & 2 deletions uniplanWeb/src/app/features/university/university-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import {API_ENDPOINTS} from '../../config/endpoints';

Expand All @@ -16,7 +16,9 @@ export interface UniversityElm {
providedIn: 'root',
})
export class UniversityService {
constructor(private http: HttpClient) {}
private apiUrl = 'http://localhost:8080/api/universities';

@PIPetkova19 PIPetkova19 Jul 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for that; API_ENDPOINTS is used


private http = inject(HttpClient);

getAllUniversities(): Observable<UniversityElm[]> {
return this.http.get<UniversityElm[]>(API_ENDPOINTS.universities);
Expand Down