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

Merge remote-tracking branch 'remotes/origin/master' into authentication

Browse Source 
# Conflicts:
#	package.json
#	src/app/app.reducer.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2018-03-08 10:18:33 +01:00
parent 1726c8afdb 605c3524c8
commit beb5e97158
69 changed files with 2180 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/app.reducer.ts
View File

@@ -11,7 +11,7 @@ import {
filterReducer,
SearchFiltersState
} from './+search-page/search-filters/search-filter/search-filter.reducer';
import { authReducer, AuthState } from './core/auth/auth.reducers';
import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer';
export interface AppState {
router: fromRouter.RouterReducerState;
@@ -19,6 +19,7 @@ export interface AppState {
header: HeaderState;
searchSidebar: SearchSidebarState;
searchFilter: SearchFiltersState;
truncatable: TruncatablesState;
}
export const appReducers: ActionReducerMap<AppState> = {
@@ -26,7 +27,8 @@ export const appReducers: ActionReducerMap<AppState> = {
hostWindow: hostWindowReducer,
header: headerReducer,
searchSidebar: sidebarReducer,
searchFilter: filterReducer
searchFilter: filterReducer,
truncatable: truncatableReducer
};
export const routerStateSelector = (state: AppState) => state.router;