[DURACOM-327] Move common selector functions into the core

Author: atarix83

src/app/core/json-patch/selectors.ts

@@ -1,11 +1,11 @@
 import { MemoizedSelector } from '@ngrx/store';
 
+import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
 import {
   keySelector,
   subStateSelector,
-} from '../../submission/selectors';
-import { coreSelector } from '../core.selectors';
-import { CoreState } from '../core-state.model';
+} from '../ngrx/selectors-utils';
 import {
   JsonPatchOperationsEntry,
   JsonPatchOperationsResourceEntry,

src/app/core/ngrx/selectors-utils.ts

@@ -0,0 +1,32 @@
+import { hasValue } from '@dspace/shared/utils/empty.util';
+import {
+  createSelector,
+  MemoizedSelector,
+  Selector,
+} from '@ngrx/store';
+
+/**
+ * Export a function to return a subset of the state by key
+ */
+export function keySelector<T, V>(parentSelector: Selector<any, any>, subState: string, key: string): MemoizedSelector<T, V> {
+  return createSelector<T, unknown[], V>(parentSelector, (state: T) => {
+    if (hasValue(state) && hasValue(state[subState])) {
+      return state[subState][key];
+    } else {
+      return undefined;
+    }
+  });
+}
+
+/**
+ * Export a function to return a subset of the state
+ */
+export function subStateSelector<T, V>(parentSelector: Selector<any, any>, subState: string): MemoizedSelector<T, V> {
+  return createSelector<T, unknown[], V>(parentSelector, (state: T) => {
+    if (hasValue(state) && hasValue(state[subState])) {
+      return state[subState];
+    } else {
+      return undefined;
+    }
+  });
+}

src/app/notifications/suggestions/targets/selectors.ts

@@ -1,11 +1,11 @@
+import { subStateSelector } from '@dspace/core/ngrx/selectors-utils';
 import { SuggestionTarget } from '@dspace/core/notifications/suggestions/models/suggestion-target.model';
 import {
   createFeatureSelector,
   createSelector,
   MemoizedSelector,
 } from '@ngrx/store';
 
-import { subStateSelector } from '../../../submission/selectors';
 import {
   suggestionNotificationsSelector,
   SuggestionNotificationsState,

src/app/submission/selectors.ts

@@ -1,9 +1,8 @@
-import { hasValue } from '@dspace/shared/utils/empty.util';
 import {
-  createSelector,
-  MemoizedSelector,
-  Selector,
-} from '@ngrx/store';
+  keySelector,
+  subStateSelector,
+} from '@dspace/core/ngrx/selectors-utils';
+import { MemoizedSelector } from '@ngrx/store';
 
 import { SubmissionObjectEntry } from './objects/submission-objects.reducer';
 import { SubmissionSectionObject } from './objects/submission-section-object.model';
@@ -12,32 +11,6 @@ import {
   SubmissionState,
 } from './submission.reducers';
 
-/**
- * Export a function to return a subset of the state by key
- */
-export function keySelector<T, V>(parentSelector: Selector<any, any>, subState: string, key: string): MemoizedSelector<T, V> {
-  return createSelector<T,unknown[],V>(parentSelector, (state: T) => {
-    if (hasValue(state) && hasValue(state[subState])) {
-      return state[subState][key];
-    } else {
-      return undefined;
-    }
-  });
-}
-
-/**
- * Export a function to return a subset of the state
- */
-export function subStateSelector<T, V>(parentSelector: Selector<any, any>, subState: string): MemoizedSelector<T, V> {
-  return createSelector<T,unknown[],V>(parentSelector, (state: T) => {
-    if (hasValue(state) && hasValue(state[subState])) {
-      return state[subState];
-    } else {
-      return undefined;
-    }
-  });
-}
-
 export function submissionObjectFromIdSelector(submissionId: string): MemoizedSelector<SubmissionState, SubmissionObjectEntry> {
   return keySelector<SubmissionState, SubmissionObjectEntry>(submissionSelector, 'objects', submissionId);
 }