Merge branch 'master' into angular-cli

This commit is contained in:
lotte
2020-04-17 16:09:12 +02:00
168 changed files with 15092 additions and 3223 deletions

View File

@@ -4,6 +4,10 @@ import {
ePeopleRegistryReducer,
EPeopleRegistryState
} from './+admin/admin-access-control/epeople-registry/epeople-registry.reducers';
import {
groupRegistryReducer,
GroupRegistryState
} from './+admin/admin-access-control/group-registry/group-registry.reducers';
import {
metadataRegistryReducer,
MetadataRegistryState
@@ -47,6 +51,7 @@ export interface AppState {
relationshipLists: NameVariantListsState;
communityList: CommunityListState;
epeopleRegistry: EPeopleRegistryState;
groupRegistry: GroupRegistryState;
}
export const appReducers: ActionReducerMap<AppState> = {
@@ -66,6 +71,7 @@ export const appReducers: ActionReducerMap<AppState> = {
relationshipLists: nameVariantReducer,
communityList: CommunityListReducer,
epeopleRegistry: ePeopleRegistryReducer,
groupRegistry: groupRegistryReducer,
};
export const routerStateSelector = (state: AppState) => state.router;