hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-16 14:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgraded to angular 8

Browse Source
This commit is contained in:
lotte
2020-02-13 11:09:20 +01:00
parent 3bbd05f588
commit 04cb75e786
106 changed files with 1959 additions and 1417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/app.module.ts
View File

@@ -6,14 +6,12 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { EffectsModule } from '@ngrx/effects';
import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
import { META_REDUCERS, MetaReducer, StoreModule } from '@ngrx/store';
import { META_REDUCERS, MetaReducer, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
import { TranslateModule } from '@ngx-translate/core';
import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
import { storeFreeze } from 'ngrx-store-freeze';
import { ENV_CONFIG, GLOBAL_CONFIG, GlobalConfig } from '../config';
import { AdminSidebarSectionComponent } from './+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
import { AdminSidebarComponent } from './+admin/admin-sidebar/admin-sidebar.component';
@@ -23,7 +21,7 @@ import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
import { appEffects } from './app.effects';
import { appMetaReducers, debugMetaReducers } from './app.metareducers';
import { appMetaReducers, debugMetaReducers, universalMetaReducer } from './app.metareducers';
import { appReducers, AppState } from './app.reducer';
import { CoreModule } from './core/core.module';
@@ -51,8 +49,7 @@ export function getBase() {
}
export function getMetaReducers(config: GlobalConfig): Array<MetaReducer<AppState>> {
const metaReducers: Array<MetaReducer<AppState>> = config.production ? appMetaReducers : [...appMetaReducers, storeFreeze];
return config.debug ? [...metaReducers, ...debugMetaReducers] : metaReducers;
return config.debug ? [...appMetaReducers, ...debugMetaReducers] : appMetaReducers;
}
const IMPORTS = [
@@ -63,11 +60,11 @@ const IMPORTS = [
AppRoutingModule,
CoreModule.forRoot(),
ScrollToModule.forRoot(),
NgbModule.forRoot(),
NgbModule,
TranslateModule.forRoot(),
EffectsModule.forRoot(appEffects),
StoreModule.forRoot(appReducers),
StoreRouterConnectingModule,
StoreRouterConnectingModule.forRoot(),
];
const ENTITY_IMPORTS = [
@@ -92,7 +89,7 @@ const PROVIDERS = [
useFactory: (getBase)
},
{
provide: META_REDUCERS,
provide: USER_PROVIDED_META_REDUCERS,
useFactory: getMetaReducers,
deps: [GLOBAL_CONFIG]
},