diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 1f1a9237b5..7fb537bd92 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -37,6 +37,13 @@ export class AppComponent implements OnDestroy, OnInit { translate.setDefaultLang('en'); // the lang to use, if the lang isn't available, it will use the current loader to get them translate.use('en'); + + this.onResize({ + target: { + innerWidth: 800, + innerHeight: 600 + } + }); } ngOnInit() { diff --git a/src/app/app.effects.ts b/src/app/app.effects.ts index 1461fca68e..6f149709f8 100644 --- a/src/app/app.effects.ts +++ b/src/app/app.effects.ts @@ -1,6 +1,6 @@ import { EffectsModule } from "@ngrx/effects"; import { HeaderEffects } from "./header/header.effects"; -export default [ +export const effects = [ EffectsModule.run(HeaderEffects) ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0d5a1ec7c1..5264b8bee6 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -11,8 +11,8 @@ import { StoreModule } from "@ngrx/store"; import { RouterStoreModule } from "@ngrx/router-store"; import { StoreDevtoolsModule } from "@ngrx/store-devtools"; -import reducers from './app.reducers'; -import effects from './app.effects'; +import { reducers } from './app.reducers'; +import { effects } from './app.effects'; @NgModule({ declarations: [ diff --git a/src/app/app.reducers.ts b/src/app/app.reducers.ts index 79238d5197..95d24041b2 100644 --- a/src/app/app.reducers.ts +++ b/src/app/app.reducers.ts @@ -1,7 +1,7 @@ import { headerReducer } from './header/header.reducer'; import { hostWindowReducer } from "./shared/host-window.reducer"; -export default { +export const reducers = { headerReducer, hostWindowReducer } diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts index edb8334ec9..18389a099c 100644 --- a/src/app/header/header.component.ts +++ b/src/app/header/header.component.ts @@ -3,6 +3,7 @@ import { Store } from "@ngrx/store"; import { HeaderState } from "./header.reducer"; import { HeaderActions } from "./header.actions"; import { Observable } from "rxjs"; +import 'rxjs/add/operator/filter'; @Component({ selector: 'ds-header', @@ -19,6 +20,9 @@ export class HeaderComponent implements OnInit { ngOnInit(): void { this.isNavBarCollapsed = this.store.select('headerReducer') + //ensure that state is not null, can happen when using AoT compilation + .filter((state: HeaderState) => state !== null && state !== undefined) + //unwrap navCollapsed .map(({ navCollapsed }: HeaderState) => navCollapsed); }