mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-09 19:13:08 +00:00
Merge branch 'DURACOM-191' into DURACOM-191-align-to-angular-16
# Conflicts: # package.json # src/app/access-control/epeople-registry/eperson-resolver.service.ts # src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts # src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component.ts # src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts # src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.ts # src/app/app.module.ts # src/app/bitstream-page/bitstream-page.resolver.ts # src/app/bitstream-page/legacy-bitstream-url.resolver.ts # src/app/browse-by/browse-by-guard.ts # src/app/collection-page/collection-page.resolver.ts # src/app/collection-page/create-collection-page/create-collection-page.guard.ts # src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts # src/app/community-page/community-page.resolver.ts # src/app/community-page/create-community-page/create-community-page.guard.ts # src/app/core/auth/auth-blocking.guard.ts # src/app/core/auth/authenticated.guard.ts # src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts # src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts # src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts # src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts # src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts # src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts # src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts # src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts # src/app/core/feedback/feedback.guard.ts # src/app/core/reload/reload.guard.ts # src/app/core/server-check/server-check.guard.ts # src/app/core/submission/resolver/submission-object.resolver.ts # src/app/home-page/home-page.resolver.ts # src/app/init.service.ts # src/app/item-page/edit-item-page/edit-item-page.component.spec.ts # src/app/item-page/edit-item-page/edit-item-page.component.ts # src/app/item-page/item.resolver.ts # src/app/item-page/version-page/version.resolver.ts # src/app/lookup-by-id/lookup-guard.ts # src/app/menu.resolver.ts # src/app/my-dspace-page/my-dspace.guard.ts # src/app/process-page/process-breadcrumb.resolver.ts # src/app/process-page/process-page.resolver.ts # src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts # src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts # src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts # src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts # src/app/register-email-form/registration.resolver.ts # src/app/register-page/registration.guard.ts # src/app/request-copy/request-copy.resolver.ts # src/app/search-page/configuration-search-page.guard.ts # src/app/shared/context-help.directive.ts # src/app/shared/dso-page/dso-edit-menu.resolver.ts # src/app/shared/form/chips/chips.component.spec.ts # src/app/shared/form/chips/chips.component.ts # src/app/shared/form/form.module.ts # src/app/shared/metadata-representation/metadata-representation-loader.component.ts # src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts # src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts # src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts # src/app/shared/theme-support/themed.component.ts # src/app/shared/utils/markdown.pipe.ts # src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts # src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts # src/app/workflowitems-edit-page/item-from-workflow.resolver.ts # src/app/workflowitems-edit-page/workflow-item-page.resolver.ts # src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts # src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts # src/config/app-config.interface.ts # src/main.server.ts # src/modules/app/browser-app.module.ts # src/modules/app/browser-init.service.ts # src/modules/app/server-app.module.ts # src/modules/app/server-init.service.ts # src/ngx-translate-loaders/translate-browser.loader.ts # src/ngx-translate-loaders/translate-server.loader.ts # src/themes/custom/lazy-theme.module.ts # src/themes/dspace/lazy-theme.module.ts # yarn.lock
This commit is contained in:
Andrea Barbasso
@@ -1,44 +1,41 @@
|
||||
import { XhrFactory } from '@angular/common';
|
||||
import { HTTP_INTERCEPTORS } from '@angular/common/http';
|
||||
import { APP_ID, NgModule } from '@angular/core';
|
||||
import { TransferState } from '@angular/core';
|
||||
import { APP_ID, NgModule, TransferState } from '@angular/core';
|
||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
|
||||
import { ServerModule, ServerTransferStateModule, } from '@angular/platform-server';
|
||||
import { EffectsModule } from '@ngrx/effects';
|
||||
import { Action, StoreConfig, StoreModule, } from '@ngrx/store';
|
||||
import { TranslateLoader, TranslateModule, } from '@ngx-translate/core';
|
||||
|
||||
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
|
||||
|
||||
import { Angulartics2, Angulartics2GoogleAnalytics, Angulartics2GoogleGlobalSiteTag } from 'angulartics2';
|
||||
import { Angulartics2, Angulartics2GoogleAnalytics, Angulartics2GoogleGlobalSiteTag, } from 'angulartics2';
|
||||
|
||||
import { AppComponent } from '../../app/app.component';
|
||||
|
||||
import { AppModule } from '../../app/app.module';
|
||||
import { TranslateServerLoader } from '../../ngx-translate-loaders/translate-server.loader';
|
||||
import { CookieService } from '../../app/core/services/cookie.service';
|
||||
import { ServerCookieService } from '../../app/core/services/server-cookie.service';
|
||||
import { storeModuleConfig } from '../../app/app.reducer';
|
||||
import { AuthService } from '../../app/core/auth/auth.service';
|
||||
import { ServerAuthService } from '../../app/core/auth/server-auth.service';
|
||||
import { AngularticsProviderMock } from '../../app/shared/mocks/angulartics-provider.service.mock';
|
||||
import { SubmissionService } from '../../app/submission/submission.service';
|
||||
import { ServerSubmissionService } from '../../app/submission/server-submission.service';
|
||||
import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
|
||||
import { ServerLocaleService } from '../../app/core/locale/server-locale.service';
|
||||
import { LocaleService } from '../../app/core/locale/locale.service';
|
||||
import { ForwardClientIpInterceptor } from '../../app/core/forward-client-ip/forward-client-ip.interceptor';
|
||||
import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
|
||||
import { ServerHardRedirectService } from '../../app/core/services/server-hard-redirect.service';
|
||||
import { Angulartics2Mock } from '../../app/shared/mocks/angulartics2.service.mock';
|
||||
import { AuthRequestService } from '../../app/core/auth/auth-request.service';
|
||||
import { ServerAuthService } from '../../app/core/auth/server-auth.service';
|
||||
import { ServerAuthRequestService } from '../../app/core/auth/server-auth-request.service';
|
||||
import { ServerInitService } from './server-init.service';
|
||||
import { XhrFactory } from '@angular/common';
|
||||
import { ServerXhrService } from '../../app/core/services/server-xhr.service';
|
||||
import { coreEffects } from '../../app/core/core.effects';
|
||||
import { coreReducers } from '../../app/core/core.reducers';
|
||||
import { CoreState } from '../../app/core/core-state.model';
|
||||
import { ForwardClientIpInterceptor } from '../../app/core/forward-client-ip/forward-client-ip.interceptor';
|
||||
import { LocaleService } from '../../app/core/locale/locale.service';
|
||||
import { ServerLocaleService } from '../../app/core/locale/server-locale.service';
|
||||
import { CookieService } from '../../app/core/services/cookie.service';
|
||||
import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
|
||||
import { ReferrerService } from '../../app/core/services/referrer.service';
|
||||
import { ServerReferrerService } from '../../app/core/services/server.referrer.service';
|
||||
import { Action, StoreConfig, StoreModule } from '@ngrx/store';
|
||||
import { coreReducers } from '../../app/core/core.reducers';
|
||||
import { storeModuleConfig } from '../../app/app.reducer';
|
||||
import { CoreState } from '../../app/core/core-state.model';
|
||||
import { EffectsModule } from '@ngrx/effects';
|
||||
import { coreEffects } from '../../app/core/core.effects';
|
||||
import { ServerCookieService } from '../../app/core/services/server-cookie.service';
|
||||
import { ServerHardRedirectService } from '../../app/core/services/server-hard-redirect.service';
|
||||
import { ServerXhrService } from '../../app/core/services/server-xhr.service';
|
||||
import { AngularticsProviderMock } from '../../app/shared/mocks/angulartics-provider.service.mock';
|
||||
import { Angulartics2Mock } from '../../app/shared/mocks/angulartics2.service.mock';
|
||||
import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
|
||||
import { ServerSubmissionService } from '../../app/submission/server-submission.service';
|
||||
import { SubmissionService } from '../../app/submission/submission.service';
|
||||
import { TranslateServerLoader } from '../../ngx-translate-loaders/translate-server.loader';
|
||||
import { ServerInitService } from './server-init.service';
|
||||
|
||||
export function createTranslateLoader(transferState: TransferState) {
|
||||
return new TranslateServerLoader(transferState, 'dist/server/assets/i18n/', '.json');
|
||||
@@ -55,8 +52,8 @@ export function createTranslateLoader(transferState: TransferState) {
|
||||
loader: {
|
||||
provide: TranslateLoader,
|
||||
useFactory: (createTranslateLoader),
|
||||
deps: [TransferState]
|
||||
}
|
||||
deps: [TransferState],
|
||||
},
|
||||
}),
|
||||
AppModule,
|
||||
ServerModule,
|
||||
@@ -66,31 +63,31 @@ export function createTranslateLoader(transferState: TransferState) {
|
||||
{provide: APP_ID, useValue: 'dspace-angular'},
|
||||
{
|
||||
provide: Angulartics2,
|
||||
useClass: Angulartics2Mock
|
||||
useClass: Angulartics2Mock,
|
||||
},
|
||||
{
|
||||
provide: Angulartics2GoogleAnalytics,
|
||||
useClass: AngularticsProviderMock
|
||||
useClass: AngularticsProviderMock,
|
||||
},
|
||||
{
|
||||
provide: Angulartics2GoogleGlobalSiteTag,
|
||||
useClass: AngularticsProviderMock
|
||||
useClass: AngularticsProviderMock,
|
||||
},
|
||||
{
|
||||
provide: Angulartics2DSpace,
|
||||
useClass: AngularticsProviderMock
|
||||
useClass: AngularticsProviderMock,
|
||||
},
|
||||
{
|
||||
provide: AuthService,
|
||||
useClass: ServerAuthService
|
||||
useClass: ServerAuthService,
|
||||
},
|
||||
{
|
||||
provide: CookieService,
|
||||
useClass: ServerCookieService
|
||||
useClass: ServerCookieService,
|
||||
},
|
||||
{
|
||||
provide: SubmissionService,
|
||||
useClass: ServerSubmissionService
|
||||
useClass: ServerSubmissionService,
|
||||
},
|
||||
{
|
||||
provide: AuthRequestService,
|
||||
@@ -98,13 +95,13 @@ export function createTranslateLoader(transferState: TransferState) {
|
||||
},
|
||||
{
|
||||
provide: LocaleService,
|
||||
useClass: ServerLocaleService
|
||||
useClass: ServerLocaleService,
|
||||
},
|
||||
// register ForwardClientIpInterceptor as HttpInterceptor
|
||||
{
|
||||
provide: HTTP_INTERCEPTORS,
|
||||
useClass: ForwardClientIpInterceptor,
|
||||
multi: true
|
||||
multi: true,
|
||||
},
|
||||
{
|
||||
provide: HardRedirectService,
|
||||
@@ -118,7 +115,7 @@ export function createTranslateLoader(transferState: TransferState) {
|
||||
provide: ReferrerService,
|
||||
useClass: ServerReferrerService,
|
||||
},
|
||||
]
|
||||
],
|
||||
})
|
||||
export class ServerAppModule {
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user