Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

[ng v19] Apply provide-initializer migration

Alexander Brandon Coles358bdf7ec2b9
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 12002c76f33..062be16f389 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -26,7 +26,7 @@
// See COPYRIGHT and LICENSE files for more details.
//++
-import { APP_INITIALIZER, ApplicationRef, DoBootstrap, Injector, NgModule } from '@angular/core';
+import { ApplicationRef, DoBootstrap, Injector, NgModule, inject, provideAppInitializer } from '@angular/core';
import { A11yModule } from '@angular/cdk/a11y';
import { HTTP_INTERCEPTORS, HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { ReactiveFormsModule } from '@angular/forms';
@@ -240,6 +240,24 @@ export function initializeServices(injector:Injector) {
}
@NgModule({
+ declarations: [
+ OpContextMenuTrigger,
+
+ // Modals
+ ConfirmDialogModalComponent,
+ DynamicContentModalComponent,
+ PasswordConfirmationModalComponent,
+
+ // Main menu
+ MainMenuResizerComponent,
+
+ // Project selector
+ OpHeaderProjectSelectComponent,
+ OpHeaderProjectSelectListComponent,
+
+ // Form configuration
+ OpDragScrollDirective,
+ ],
imports: [
// The BrowserModule must only be loaded here!
BrowserModule,
@@ -270,7 +288,6 @@ export function initializeServices(injector:Injector) {
// Work packages in graph representation
OpenprojectWorkPackageGraphsModule,
-
// Calendar module
OpenprojectCalendarModule,
@@ -325,13 +342,13 @@ export function initializeServices(injector:Injector) {
providers: [
{ provide: States, useValue: new States() },
{ provide: HTTP_INTERCEPTORS, useClass: OpenProjectHeaderInterceptor, multi: true },
- {
- provide: APP_INITIALIZER, useFactory: initializeServices, deps: [Injector], multi: true,
- },
+ provideAppInitializer(() => {
+ const initializerFn = (initializeServices)(inject(Injector));
+ return initializerFn();
+ }),
{
provide: OpUploadService,
- useFactory: (config:ConfigurationService, http:HttpClient) =>
- (config.isDirectUploads() ? new FogUploadService(http) : new LocalUploadService(http)),
+ useFactory: (config:ConfigurationService, http:HttpClient) => (config.isDirectUploads() ? new FogUploadService(http) : new LocalUploadService(http)),
deps: [ConfigurationService, HttpClient],
},
PaginationService,
@@ -341,24 +358,6 @@ export function initializeServices(injector:Injector) {
CopyToClipboardService,
provideHttpClient(withInterceptorsFromDi()),
],
- declarations: [
- OpContextMenuTrigger,
-
- // Modals
- ConfirmDialogModalComponent,
- DynamicContentModalComponent,
- PasswordConfirmationModalComponent,
-
- // Main menu
- MainMenuResizerComponent,
-
- // Project selector
- OpHeaderProjectSelectComponent,
- OpHeaderProjectSelectListComponent,
-
- // Form configuration
- OpDragScrollDirective,
- ],
})
export class OpenProjectModule implements DoBootstrap {
// noinspection JSUnusedGlobalSymbols
diff --git a/frontend/src/app/features/hal/openproject-hal.module.ts b/frontend/src/app/features/hal/openproject-hal.module.ts
index 8b8d8ac8a70..332f4b89ce2 100644
--- a/frontend/src/app/features/hal/openproject-hal.module.ts
+++ b/frontend/src/app/features/hal/openproject-hal.module.ts
@@ -26,11 +26,7 @@
// See COPYRIGHT and LICENSE files for more details.
//++
-import {
- APP_INITIALIZER,
- ErrorHandler,
- NgModule,
-} from '@angular/core';
+import { ErrorHandler, NgModule, inject, provideAppInitializer } from '@angular/core';
import { CommonModule } from '@angular/common';
import { HalAwareErrorHandler } from 'core-app/features/hal/services/hal-aware-error-handler';
import { initializeHalResourceConfig } from 'core-app/features/hal/services/hal-resource.config';
@@ -43,9 +39,10 @@ import { HalResourceNotificationService } from 'core-app/features/hal/services/h
],
providers: [
{ provide: ErrorHandler, useClass: HalAwareErrorHandler },
- {
- provide: APP_INITIALIZER, useFactory: initializeHalResourceConfig, deps: [HalResourceService], multi: true,
- },
+ provideAppInitializer(() => {
+ const initializerFn = (initializeHalResourceConfig)(inject(HalResourceService));
+ return initializerFn();
+ }),
HalResourceNotificationService,
],
})
diff --git a/frontend/src/app/shared/components/editor/openproject-editor.module.ts b/frontend/src/app/shared/components/editor/openproject-editor.module.ts
index 725a3815208..c08d0c72403 100644
--- a/frontend/src/app/shared/components/editor/openproject-editor.module.ts
+++ b/frontend/src/app/shared/components/editor/openproject-editor.module.ts
@@ -26,7 +26,7 @@
// See COPYRIGHT and LICENSE files for more details.
//++
-import { APP_INITIALIZER, Injector, NgModule } from '@angular/core';
+import { Injector, NgModule, inject, provideAppInitializer } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';
import { OpenprojectAttachmentsModule } from 'core-app/shared/components/attachments/openproject-attachments.module';
@@ -67,9 +67,10 @@ export function initializeServices(injector:Injector) {
EditorMacrosService,
CKEditorSetupService,
CKEditorPreviewService,
- {
- provide: APP_INITIALIZER, useFactory: initializeServices, deps: [Injector], multi: true,
- },
+ provideAppInitializer(() => {
+ const initializerFn = (initializeServices)(inject(Injector));
+ return initializerFn();
+ }),
],
exports: [
CkeditorAugmentedTextareaComponent,
diff --git a/frontend/src/app/shared/components/fields/openproject-fields.module.ts b/frontend/src/app/shared/components/fields/openproject-fields.module.ts
index 754f0baaeae..7e4bf930ca2 100644
--- a/frontend/src/app/shared/components/fields/openproject-fields.module.ts
+++ b/frontend/src/app/shared/components/fields/openproject-fields.module.ts
@@ -26,12 +26,7 @@
// See COPYRIGHT and LICENSE files for more details.
//++
-import {
- APP_INITIALIZER,
- CUSTOM_ELEMENTS_SCHEMA,
- Injector,
- NgModule,
-} from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, Injector, NgModule, inject, provideAppInitializer } from '@angular/core';
import { CommonModule } from '@angular/common';
import { OpenprojectModalModule } from 'core-app/shared/components/modal/modal.module';
import { OpenprojectEditorModule } from 'core-app/shared/components/editor/openproject-editor.module';
@@ -102,18 +97,14 @@ import { FormsModule } from '@angular/forms';
DisplayFieldComponent,
],
providers: [
- {
- provide: APP_INITIALIZER,
- useFactory: initializeCoreEditFields,
- deps: [EditFieldService, SelectAutocompleterRegisterService],
- multi: true,
- },
- {
- provide: APP_INITIALIZER,
- useFactory: initializeCoreDisplayFields,
- deps: [DisplayFieldService],
- multi: true,
- },
+ provideAppInitializer(() => {
+ const initializerFn = (initializeCoreEditFields)(inject(EditFieldService), inject(SelectAutocompleterRegisterService));
+ return initializerFn();
+ }),
+ provideAppInitializer(() => {
+ const initializerFn = (initializeCoreDisplayFields)(inject(DisplayFieldService));
+ return initializerFn();
+ }),
],
declarations: [
EditFormPortalComponent,