MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

bug fix

This commit is contained in:
Diamantis Tziotzios 2024-06-07 09:49:19 +03:00
parent eaa802872a
commit 72d2728474
1 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
dmp-frontend/src/app/app.module.ts
View File

@ -83,7 +83,7 @@ const appearance: MatFormFieldDefaultOptions = {
// appearance: 'standard' // appearance: 'standard'
}; };
export function InstallationConfigurationFactory(appConfig: ConfigurationService, keycloak: KeycloakService, authService: AuthService, languageService: LanguageService, tenantHandlingService:TenantHandlingService) { export function InstallationConfigurationFactory(appConfig: ConfigurationService, keycloak: KeycloakService, authService: AuthService, languageService: LanguageService, tenantHandlingService: TenantHandlingService) {
return () => appConfig.loadConfiguration().then(() => { return () => appConfig.loadConfiguration().then(() => {
return languageService.loadAvailableLanguages().toPromise(); return languageService.loadAvailableLanguages().toPromise();
}).then(x => keycloak.init({ }).then(x => keycloak.init({
@ -118,71 +118,73 @@ export function InstallationConfigurationFactory(appConfig: ConfigurationService
} }
@NgModule({ declarations: [ @NgModule({
AppComponent, declarations: [
ReloadHelperComponent AppComponent,
], ReloadHelperComponent
bootstrap: [AppComponent], imports: [BrowserModule, ],
BrowserAnimationsModule, bootstrap: [AppComponent], imports: [BrowserModule,
KeycloakAngularModule, BrowserAnimationsModule,
CoreServiceModule.forRoot(), KeycloakAngularModule,
CoreAnnotationServiceModule.forRoot(), CoreServiceModule.forRoot(),
CoreNotificationServiceModule.forRoot(), CoreAnnotationServiceModule.forRoot(),
AppRoutingModule, CoreNotificationServiceModule.forRoot(),
CommonUiModule, AppRoutingModule,
TranslateModule.forRoot({ CommonUiModule,
compiler: { provide: TranslateCompiler, useClass: OpenDMPCustomTranslationCompiler }, TranslateModule.forRoot({
loader: { compiler: { provide: TranslateCompiler, useClass: OpenDMPCustomTranslationCompiler },
provide: TranslateLoader, loader: {
useFactory: HttpLoaderFactory, provide: TranslateLoader,
deps: [LanguageHttpService] useFactory: HttpLoaderFactory,
} deps: [LanguageHttpService]
}), }
OverlayModule, }),
CommonHttpModule, OverlayModule,
MatMomentDateModule, CommonHttpModule,
LoginModule, MatMomentDateModule,
//Ui LoginModule,
NotificationModule, //Ui
// BreadcrumbModule, NotificationModule,
ReactiveFormsModule, // BreadcrumbModule,
FormsModule, ReactiveFormsModule,
NavbarModule, FormsModule,
SidebarModule, NavbarModule,
NgcCookieConsentModule.forRoot(cookieConfig), SidebarModule,
DepositOauth2DialogModule, NgcCookieConsentModule.forRoot(cookieConfig),
GuidedTourModule.forRoot(), DepositOauth2DialogModule,
DragulaModule.forRoot(), GuidedTourModule.forRoot(),
NgxMatomoModule.forRoot({ DragulaModule.forRoot(),
mode: MatomoInitializationMode.AUTO_DEFERRED, NgxMatomoModule.forRoot({
})], providers: [ mode: MatomoInitializationMode.AUTO_DEFERRED,
ConfigurationService, })], providers: [
{ ConfigurationService,
provide: APP_INITIALIZER, {
useFactory: InstallationConfigurationFactory, provide: APP_INITIALIZER,
deps: [ConfigurationService, KeycloakService, AuthService, LanguageService], useFactory: InstallationConfigurationFactory,
multi: true deps: [ConfigurationService, KeycloakService, AuthService, LanguageService, TenantHandlingService],
}, multi: true
{ },
provide: MAT_DATE_LOCALE, {
deps: [CultureService], provide: MAT_DATE_LOCALE,
useFactory: (cultureService) => cultureService.getCurrentCulture().name deps: [CultureService],
}, useFactory: (cultureService) => cultureService.getCurrentCulture().name
{ provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS }, },
{ provide: DateAdapter, useClass: MomentUtcDateAdapter }, { provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS },
{ { provide: DateAdapter, useClass: MomentUtcDateAdapter },
provide: LOCALE_ID, {
deps: [CultureService], provide: LOCALE_ID,
useFactory: (cultureService) => cultureService.getCurrentCulture().name deps: [CultureService],
}, useFactory: (cultureService) => cultureService.getCurrentCulture().name
{ },
provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, {
useValue: appearance provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
}, useValue: appearance
Title, },
CookieService, Title,
MatomoService, CookieService,
AnalyticsService, MatomoService,
provideHttpClient(withInterceptorsFromDi()) AnalyticsService,
] }) provideHttpClient(withInterceptorsFromDi())
]
})
export class AppModule { } export class AppModule { }