Skip to content

Commit 9b49259

Browse files
Copilotrenemadsen
andcommitted
Migrate first batch of components to inject() pattern
Co-authored-by: renemadsen <[email protected]>
1 parent 3694a81 commit 9b49259

File tree

7 files changed

+66
-55
lines changed

7 files changed

+66
-55
lines changed

eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-container/time-plannings-container.component.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import { Component, OnDestroy, OnInit } from '@angular/core';
1+
import { Component, OnDestroy, OnInit,
2+
inject
3+
} from '@angular/core';
24
import { AutoUnsubscribe } from 'ngx-auto-unsubscribe';
35
import {Subscription, take} from 'rxjs';
46
import { SiteDto } from 'src/app/common/models';
@@ -23,6 +25,11 @@ import {MatDatepickerInputEvent} from '@angular/material/datepicker';
2325
standalone: false
2426
})
2527
export class TimePlanningsContainerComponent implements OnInit, OnDestroy {
28+
private store = inject(Store);
29+
private planningsService = inject(TimePlanningPnPlanningsService);
30+
private settingsService = inject(TimePlanningPnSettingsService);
31+
private dialog = inject(MatDialog);
32+
2633
timePlanningsRequest: TimePlanningsRequestModel;
2734
availableSites: SiteDto[] = [];
2835
showResignedSites: boolean = false;
@@ -38,12 +45,7 @@ export class TimePlanningsContainerComponent implements OnInit, OnDestroy {
3845
public selectCurrentUserLocale$ = this.store.select(selectCurrentUserLocale);
3946
locale: string;
4047

41-
constructor(
42-
private store: Store,
43-
private planningsService: TimePlanningPnPlanningsService,
44-
private settingsService: TimePlanningPnSettingsService,
45-
private dialog: MatDialog,
46-
) {}
48+
4749

4850
ngOnInit(): void {
4951

eform-client/src/app/plugins/modules/time-planning-pn/components/settings/time-planning-settings/time-planning-settings.component.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import {Component, OnDestroy, OnInit} from '@angular/core';
1+
import {Component, OnDestroy, OnInit,
2+
inject
3+
} from '@angular/core';
24
import {Subscription} from 'rxjs';
35
import {TimePlanningPnSettingsService} from '../../../services';
46
import {TimePlanningSettingsModel} from '../../../models';
@@ -12,18 +14,18 @@ import {Store} from '@ngrx/store';
1214
standalone: false
1315
})
1416
export class TimePlanningSettingsComponent implements OnInit, OnDestroy {
17+
private timePlanningPnSettingsService = inject(TimePlanningPnSettingsService);
18+
private store = inject(Store);
19+
1520
getSettings$: Subscription;
1621
settingsModel: TimePlanningSettingsModel = new TimePlanningSettingsModel();
1722
previousData: TimePlanningSettingsModel = new TimePlanningSettingsModel();
1823
public selectCurrentUserIsFirstUser$ = this.store.select(selectCurrentUserIsFirstUser);
1924

20-
constructor(
21-
private timePlanningPnSettingsService: TimePlanningPnSettingsService,
22-
private store: Store
23-
) {
24-
this.previousData = {...this.settingsModel};
25-
}
25+
26+
2627
ngOnInit() {
28+
this.previousData = {...this.settingsModel};
2729
this.getSettings();
2830
}
2931

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import {AfterContentInit, Component, OnInit} from '@angular/core';
1+
import {AfterContentInit, Component, OnInit,
2+
inject
3+
} from '@angular/core';
24
import {TranslateService} from '@ngx-translate/core';
35
import {translates} from './../i18n/translates';
46
import {Store} from '@ngrx/store';
@@ -12,13 +14,15 @@ import {take} from 'rxjs';
1214
standalone: false
1315
})
1416
export class TimePlanningPnLayoutComponent implements AfterContentInit, OnInit {
17+
private translateService = inject(TranslateService);
18+
private store = inject(Store);
19+
1520
private pluginName = 'time-planning';
1621

17-
constructor(
18-
private translateService: TranslateService,
19-
store: Store
20-
) {
21-
store.select(selectPluginsVisitedPlugins)
22+
23+
24+
ngOnInit() {
25+
this.store.select(selectPluginsVisitedPlugins)
2226
.pipe(take(1))
2327
.subscribe(x => {
2428
// check current plugin in activated plugin
@@ -28,14 +32,11 @@ export class TimePlanningPnLayoutComponent implements AfterContentInit, OnInit {
2832
this.translateService.setTranslation(locale, translates[locale], true);
2933
});
3034
// add plugin to visited plugins
31-
store.dispatch(addPluginToVisited(this.pluginName));
35+
this.store.dispatch(addPluginToVisited(this.pluginName));
3236
}
3337
});
3438
}
3539

36-
ngOnInit() {
37-
}
38-
3940
ngAfterContentInit() {
4041
}
4142
}

eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-create-modal/registration-devices-create-modal.component.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import {Component, OnInit} from '@angular/core';
1+
import {Component, OnInit,
2+
inject
3+
} from '@angular/core';
24
import {MatDialogRef} from '@angular/material/dialog';
35
import {TimePlanningPnRegistrationDevicesService} from '../../../../../services/time-planning-pn-registration-devices.service';
46
import {TimePlanningRegistrationDeviceModel} from '../../../../../../../modules/time-planning-pn/models';
@@ -11,11 +13,11 @@ import {TimePlanningRegistrationDeviceModel} from '../../../../../../../modules/
1113
standalone: false
1214
})
1315
export class RegistrationDevicesCreateModalComponent implements OnInit {
16+
private registrationDevicesService = inject(TimePlanningPnRegistrationDevicesService);
17+
public dialogRef = inject(MatDialogRef<RegistrationDevicesCreateModalComponent>);
18+
1419
selectedRegistrationDevice: TimePlanningRegistrationDeviceModel = new TimePlanningRegistrationDeviceModel();
15-
constructor(
16-
private registrationDevicesService: TimePlanningPnRegistrationDevicesService,
17-
public dialogRef: MatDialogRef<RegistrationDevicesCreateModalComponent>) {
18-
}
20+
1921

2022
ngOnInit() {
2123
}

eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-delete-modal/registration-devices-delete-modal.component.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import {Component, Inject, Input, OnInit} from '@angular/core';
1+
import {Component, OnInit,
2+
inject
3+
} from '@angular/core';
24
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
35
import {TimePlanningPnRegistrationDevicesService} from 'src/app/plugins/modules/time-planning-pn/services';
46
import {TimePlanningRegistrationDeviceModel} from 'src/app/plugins/modules/time-planning-pn/models';
@@ -11,17 +13,17 @@ import {TimePlanningRegistrationDeviceModel} from 'src/app/plugins/modules/time-
1113
standalone: false
1214
})
1315
export class RegistrationDevicesDeleteModalComponent implements OnInit {
14-
selectedRegistrationDevice: TimePlanningRegistrationDeviceModel = new TimePlanningRegistrationDeviceModel();
15-
constructor(
16-
@Inject(MAT_DIALOG_DATA) model: {
16+
private registrationDevicesService = inject(TimePlanningPnRegistrationDevicesService);
17+
public dialogRef = inject(MatDialogRef<RegistrationDevicesDeleteModalComponent>);
18+
private model = inject<{
1719
selectedRegistrationDevice: TimePlanningRegistrationDeviceModel
18-
},
19-
private registrationDevicesService: TimePlanningPnRegistrationDevicesService,
20-
public dialogRef: MatDialogRef<RegistrationDevicesDeleteModalComponent>) {
21-
this.selectedRegistrationDevice = {...model.selectedRegistrationDevice};
22-
}
20+
}>(MAT_DIALOG_DATA);
21+
22+
selectedRegistrationDevice: TimePlanningRegistrationDeviceModel = new TimePlanningRegistrationDeviceModel();
23+
2324

2425
ngOnInit() {
26+
this.selectedRegistrationDevice = {...this.model.selectedRegistrationDevice};
2527
}
2628

2729
hide(result = false) {

eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-edit-modal/registration-devices-edit-modal.component.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import {Component, Inject, Input, OnInit} from '@angular/core';
1+
import {Component, OnInit,
2+
inject
3+
} from '@angular/core';
24
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
35
import {TimePlanningPnRegistrationDevicesService} from 'src/app/plugins/modules/time-planning-pn/services';
46
import {TimePlanningRegistrationDeviceModel} from 'src/app/plugins/modules/time-planning-pn/models';
@@ -11,17 +13,17 @@ import {TimePlanningRegistrationDeviceModel} from 'src/app/plugins/modules/time-
1113
standalone: false
1214
})
1315
export class RegistrationDevicesEditModalComponent implements OnInit {
14-
selectedRegistrationDevice: TimePlanningRegistrationDeviceModel = new TimePlanningRegistrationDeviceModel();
15-
constructor(
16-
@Inject(MAT_DIALOG_DATA) model: {
16+
private registrationDevicesService = inject(TimePlanningPnRegistrationDevicesService);
17+
public dialogRef = inject(MatDialogRef<RegistrationDevicesEditModalComponent>);
18+
private model = inject<{
1719
selectedRegistrationDevice: TimePlanningRegistrationDeviceModel
18-
},
19-
private registrationDevicesService: TimePlanningPnRegistrationDevicesService,
20-
public dialogRef: MatDialogRef<RegistrationDevicesEditModalComponent>) {
21-
this.selectedRegistrationDevice = {...model.selectedRegistrationDevice};
22-
}
20+
}>(MAT_DIALOG_DATA);
21+
22+
selectedRegistrationDevice: TimePlanningRegistrationDeviceModel = new TimePlanningRegistrationDeviceModel();
23+
2324

2425
ngOnInit() {
26+
this.selectedRegistrationDevice = {...this.model.selectedRegistrationDevice};
2527
}
2628

2729
updateRegistrationDevice() {

eform-client/src/app/plugins/modules/time-planning-pn/modules/registration-devices/components/registration-devices-actions/registration-devices-otp-code/registration-devices-otp-code.component.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import {Component, Inject, OnInit} from '@angular/core';
1+
import {Component, OnInit,
2+
inject
3+
} from '@angular/core';
24
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
35
import {TimePlanningRegistrationDeviceModel} from '../../../../../models';
46
import {TimePlanningPnRegistrationDevicesService} from '../../../../../services';
@@ -11,13 +13,11 @@ import {TimePlanningPnRegistrationDevicesService} from '../../../../../services'
1113
standalone: false
1214
})
1315
export class RegistrationDevicesOtpCodeComponent implements OnInit {
14-
constructor(
15-
private timePlanningPnRegistrationDevicesService: TimePlanningPnRegistrationDevicesService,
16-
public dialogRef: MatDialogRef<RegistrationDevicesOtpCodeComponent>,
17-
@Inject(MAT_DIALOG_DATA) public selectedRegistrationDevice: TimePlanningRegistrationDeviceModel =
18-
new TimePlanningRegistrationDeviceModel(),
19-
) {
20-
}
16+
private timePlanningPnRegistrationDevicesService = inject(TimePlanningPnRegistrationDevicesService);
17+
public dialogRef = inject(MatDialogRef<RegistrationDevicesOtpCodeComponent>);
18+
public selectedRegistrationDevice = inject<TimePlanningRegistrationDeviceModel>(MAT_DIALOG_DATA);
19+
20+
2121

2222
ngOnInit() {
2323
}

0 commit comments

Comments
 (0)