[DURACOM-327] move out unnecessary state from core to app state

Author: atarix83

src/app/app.effects.ts

@@ -1,5 +1,6 @@
 import { NavbarEffects } from './navbar/navbar.effects';
 import { RelationshipEffects } from './shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects';
+import { MenuEffects } from './shared/menu/menu.effects';
 import { NotificationsEffects } from './shared/notifications/notifications.effects';
 import { SidebarEffects } from './shared/sidebar/sidebar-effects.service';
 import { ThemeEffects } from './shared/theme-support/theme.effects';
@@ -12,4 +13,5 @@ export const appEffects = [
   SidebarEffects,
   ThemeEffects,
   RelationshipEffects,
+  MenuEffects,
 ];

src/app/app.reducer.ts

@@ -16,6 +16,10 @@ import {
   groupRegistryReducer,
   GroupRegistryState,
 } from './access-control/group-registry/group-registry.reducers';
+import {
+  bitstreamFormatReducer,
+  BitstreamFormatRegistryState,
+} from './admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import {
   metadataRegistryReducer,
   MetadataRegistryState,
@@ -97,6 +101,7 @@ export interface AppState {
   groupRegistry: GroupRegistryState;
   correlationId: string;
   contextHelp: ContextHelpState;
+  bitstreamFormats: BitstreamFormatRegistryState;
 }
 
 export const appReducers: ActionReducerMap<AppState> = {
@@ -119,6 +124,7 @@ export const appReducers: ActionReducerMap<AppState> = {
   groupRegistry: groupRegistryReducer,
   correlationId: correlationIdReducer,
   contextHelp: contextHelpReducer,
+  bitstreamFormats: bitstreamFormatReducer,
 };
 
 export const routerStateSelector = (state: AppState) => state.router;

src/app/core/core-state.model.ts

@@ -1,4 +1,3 @@
-import { BitstreamFormatRegistryState } from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { AuthState } from './auth/auth.reducer';
 import { ObjectCacheState } from './cache/object-cache.reducer';
 import { ServerSyncBufferState } from './cache/server-sync-buffer.reducer';
@@ -14,7 +13,6 @@ import { RouteState } from './services/route.reducer';
  * The core sub-state in the NgRx store
  */
 export interface CoreState {
-    'bitstreamFormats': BitstreamFormatRegistryState;
     'cache/object': ObjectCacheState;
     'cache/syncbuffer': ServerSyncBufferState;
     'cache/object-updates': ObjectUpdatesState;

src/app/core/core.effects.ts

@@ -1,4 +1,3 @@
-import { MenuEffects } from '../shared/menu/menu.effects';
 import { AuthEffects } from './auth/auth.effects';
 import { ObjectCacheEffects } from './cache/object-cache.effects';
 import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
@@ -19,5 +18,4 @@ export const coreEffects = [
   ObjectUpdatesEffects,
   RouteEffects,
   RouterEffects,
-  MenuEffects,
 ];

src/app/core/core.reducers.ts

@@ -1,6 +1,5 @@
 import { ActionReducerMap } from '@ngrx/store';
 
-import { bitstreamFormatReducer } from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { authReducer } from './auth/auth.reducer';
 import { objectCacheReducer } from './cache/object-cache.reducer';
 import { serverSyncBufferReducer } from './cache/server-sync-buffer.reducer';
@@ -14,7 +13,6 @@ import { metaTagReducer } from './metadata/meta-tag.reducer';
 import { routeReducer } from './services/route.reducer';
 
 export const coreReducers: ActionReducerMap<CoreState> = {
-  'bitstreamFormats': bitstreamFormatReducer,
   'cache/object': objectCacheReducer,
   'cache/syncbuffer': serverSyncBufferReducer,
   'cache/object-updates': objectUpdatesReducer,

src/app/core/data/bitstream-format-data.service.spec.ts

@@ -19,12 +19,12 @@ import {
   BitstreamFormatsRegistryDeselectAllAction,
   BitstreamFormatsRegistrySelectAction,
 } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import { AppState } from '../../app.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
-import { CoreState } from '../core-state.model';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
@@ -47,7 +47,7 @@ describe('BitstreamFormatDataService', () => {
     dispatch(action: Action) {
       // Do Nothing
     },
-  } as Store<CoreState>;
+  } as Store<AppState>;
 
   const requestUUIDs = ['some', 'uuid'];
 

src/app/core/data/bitstream-format-data.service.ts

@@ -18,11 +18,10 @@ import {
   BitstreamFormatsRegistrySelectAction,
 } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { BitstreamFormatRegistryState } from '../../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+import { AppState } from '../../app.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { coreSelector } from '../core.selectors';
-import { CoreState } from '../core-state.model';
 import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -46,10 +45,7 @@ import {
 } from './request.models';
 import { RequestService } from './request.service';
 
-const bitstreamFormatsStateSelector = createSelector(
-  coreSelector,
-  (state: CoreState) => state.bitstreamFormats,
-);
+export const bitstreamFormatsStateSelector = (state: AppState) => state.bitstreamFormats;
 const selectedBitstreamFormatSelector = createSelector(
   bitstreamFormatsStateSelector,
   (bitstreamFormatRegistryState: BitstreamFormatRegistryState) => bitstreamFormatRegistryState.selectedBitstreamFormats,
@@ -72,7 +68,7 @@ export class BitstreamFormatDataService extends IdentifiableDataService<Bitstrea
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
     protected notificationsService: NotificationsService,
-    protected store: Store<CoreState>,
+    protected store: Store<AppState>,
   ) {
     super('bitstreamformats', requestService, rdbService, objectCache, halService);