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

move invite user modal init to global place

Ivan Kuchincc60bdc13f41
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 5a37cc9cff7..b172117f6fd 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -206,6 +206,7 @@ import {
import {
OpWpDatePickerInstanceComponent,
} from 'core-app/shared/components/datepicker/wp-date-picker-modal/wp-date-picker-instance.component';
+import { OpInviteUserModalAugmentService } from 'core-app/features/invite-user-modal/invite-user-modal-augment.service';
export function initializeServices(injector:Injector) {
return () => {
@@ -213,6 +214,7 @@ export function initializeServices(injector:Injector) {
const keyboardShortcuts = injector.get(KeyboardShortcutService);
const contextMenu = injector.get(OPContextMenuService);
const currentProject = injector.get(CurrentProjectService);
+ const inviteUserAugmentService = injector.get(OpInviteUserModalAugmentService);
// Conditionally add the Revit Add-In settings button
injector.get(RevitAddInSettingsButtonService);
@@ -220,6 +222,7 @@ export function initializeServices(injector:Injector) {
const runOnRenderAndLoad = () => {
topMenuService.register();
contextMenu.register();
+ inviteUserAugmentService.setupListener();
};
runOnRenderAndLoad();
diff --git a/frontend/src/app/features/invite-user-modal/invite-user-modal.module.ts b/frontend/src/app/features/invite-user-modal/invite-user-modal.module.ts
index 8bcc1a62e04..c77c5eb84ee 100644
--- a/frontend/src/app/features/invite-user-modal/invite-user-modal.module.ts
+++ b/frontend/src/app/features/invite-user-modal/invite-user-modal.module.ts
@@ -1,4 +1,4 @@
-import { APP_INITIALIZER, Injector, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
import {
FormsModule,
ReactiveFormsModule,
@@ -10,7 +10,6 @@ import { CurrentUserModule } from 'core-app/core/current-user/current-user.modul
import { OpenprojectModalModule } from 'core-app/shared/components/modal/modal.module';
import { InviteUserButtonModule } from 'core-app/features/invite-user-modal/button/invite-user-button.module';
import { DynamicFormsModule } from 'core-app/shared/components/dynamic-forms/dynamic-forms.module';
-import { OpInviteUserModalAugmentService } from 'core-app/features/invite-user-modal/invite-user-modal-augment.service';
import { OpSharedModule } from 'core-app/shared/shared.module';
import { OpInviteUserModalService } from 'core-app/features/invite-user-modal/invite-user-modal.service';
import { InviteUserModalComponent } from './invite-user.component';
@@ -21,16 +20,6 @@ import { RoleSearchComponent } from './role/role-search.component';
import { SummaryComponent } from './summary/summary.component';
import { SuccessComponent } from './success/success.component';
-export function initializeServices(injector:Injector) {
- return function () {
- const inviteUserAugmentService = injector.get(OpInviteUserModalAugmentService);
- document.addEventListener('turbo:load', () => {
- inviteUserAugmentService.setupListener();
- });
- inviteUserAugmentService.setupListener();
- };
-}
-
@NgModule({
imports: [
CommonModule,
@@ -58,9 +47,6 @@ export function initializeServices(injector:Injector) {
],
providers: [
OpInviteUserModalService,
- {
- provide: APP_INITIALIZER, useFactory: initializeServices, deps: [Injector], multi: true,
- },
],
})
export class OpenprojectInviteUserModalModule {