Merge branch 'resolvers-branch-angular6' into w2p-54472_Create-community-and-collection-pages

Conflicts:
	src/app/app.module.ts

src/app/app.module.ts

@@ -7,6 +7,7 @@ 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 { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -44,10 +45,7 @@ export function getMetaReducers(config: GlobalConfig): Array<MetaReducer<AppStat
   return config.debug ? [...metaReducers, ...debugMetaReducers] : metaReducers;
 }
 
-const DEV_MODULES: any[] = [];
+const IMPORTS = [
-
-@NgModule({
-  imports: [
   CommonModule,
   SharedModule,
   HttpClientModule,
@@ -58,9 +56,16 @@ const DEV_MODULES: any[] = [];
   EffectsModule.forRoot(appEffects),
   StoreModule.forRoot(appReducers),
   StoreRouterConnectingModule,
-    ...DEV_MODULES
+];
-  ],
+
-  providers: [
+IMPORTS.push(
+  StoreDevtoolsModule.instrument({
+    maxAge: 100,
+    logOnly: ENV_CONFIG.production,
+  })
+);
+
+const PROVIDERS = [
   {
     provide: GLOBAL_CONFIG,
     useFactory: (getConfig)
@@ -78,16 +83,34 @@ const DEV_MODULES: any[] = [];
     provide: RouterStateSerializer,
     useClass: DSpaceRouterStateSerializer
   }
-  ],
+];
-  declarations: [
+
+const DECLARATIONS = [
   AppComponent,
   HeaderComponent,
   FooterComponent,
   PageNotFoundComponent,
   NotificationComponent,
   NotificationsBoardComponent
+];
+
+const EXPORTS = [
+  AppComponent
+];
+
+@NgModule({
+  imports: [
+    ...IMPORTS
   ],
-  exports: [AppComponent]
+  providers: [
+    ...PROVIDERS
+  ],
+  declarations: [
+    ...DECLARATIONS
+  ],
+  exports: [
+    ...EXPORTS
+  ]
 })
 export class AppModule {