Merge pull request #2277 from ProjectMirador/selector-index

Move selectors out of index

src/state/selectors/annotations.js

+import { createSelector } from 'reselect';
+import filter from 'lodash/filter';
+import flatten from 'lodash/flatten';
+import Annotation from '../../lib/Annotation';
+import { getSelectedCanvases } from './canvases';
+
+const getAnnotationsOnSelectedCanvases = createSelector(
+  [
+    getSelectedCanvases,
+    state => state.annotations,
+  ],
+  (canvases, annotations) => {
+    if (!annotations || !canvases) return [];
+    return flatten(
+      canvases.map(c => c.id).map(
+        targetId => annotations[targetId] && Object.values(annotations[targetId]),
+      ),
+    );
+  },
+);
+
+const getPresentAnnotationsOnSelectedCanvases = createSelector(
+  [
+    getAnnotationsOnSelectedCanvases,
+  ],
+  annotations => filter(
+    Object.values(annotations).map(annotation => annotation && new Annotation(annotation.json)),
+    annotation => annotation && annotation.present(),
+  ),
+);
+
+/**
+* Return an array of annotation resources filtered by the given motivation
+* @param {Array} annotations
+* @param {Array} motivations
+* @return {Array}
+*/
+export const getAnnotationResourcesByMotivation = createSelector(
+  [
+    getPresentAnnotationsOnSelectedCanvases,
+    (state, { motivations }) => motivations,
+  ],
+  (annotations, motivations) => filter(
+    flatten(annotations.map(annotation => annotation.resources)),
+    resource => resource.motivations.some(
+      motivation => motivations.includes(motivation),
+    ),
+  ),
+);
+
+/**
+ * Return the selected annotations IDs of a given CanvasId
+ * @param {Object} state
+ * @param {String} windowId
+ * @param {Array} targetIds
+ * @return {Array}
+ */
+export const getSelectedAnnotationIds = createSelector(
+  [
+    (state, { windowId }) => state.windows[windowId].selectedAnnotations,
+    getSelectedCanvases,
+  ],
+  (selectedAnnotations, canvases) => (
+    flatten(
+      canvases.map(c => c.id).map(targetId => selectedAnnotations && selectedAnnotations[targetId]),
+    )
+  ),
+);
+
+export const getAllOrSelectedAnnotationsOnCanvases = createSelector(
+  [
+    getPresentAnnotationsOnSelectedCanvases,
+    getSelectedAnnotationIds,
+    (state, { windowId }) => state.windows[windowId].displayAllAnnotations,
+  ],
+  (canvasAnnotations, selectedAnnotationIds, displayAllAnnotations) => {
+    if (displayAllAnnotations) return canvasAnnotations;
+
+    return canvasAnnotations.map(annotation => ({
+      id: (annotation['@id'] || annotation.id),
+      resources: annotation.resources.filter(
+        r => selectedAnnotationIds && selectedAnnotationIds.includes(r.id),
+      ),
+    }));
+  },
+);

src/state/selectors/config.js

+import { createSelector } from 'reselect';
+/**
+* Return languages from config (in state) and indicate which is currently set
+* @param {object} state
+* @return {Array} [ {locale: 'de', label: 'Deutsch', current: true}, ... ]
+*/
+export const getLanguagesFromConfigWithCurrent = createSelector(
+  [state => state.config],
+  ({ availableLanguages, language }) => Object.keys(availableLanguages).map(key => ({
+    current: key === language,
+    label: availableLanguages[key],
+    locale: key,
+  })),
+);

src/state/selectors/index.js

-import { createSelector } from 'reselect';
-import filter from 'lodash/filter';
-import flatten from 'lodash/flatten';
-import Annotation from '../../lib/Annotation';
-import { getSelectedCanvases } from './canvases';
-
+export * from './annotations';
 export * from './canvases';
+export * from './config';
 export * from './manifests';
 export * from './windows';
-
-const getAnnotationsOnSelectedCanvases = createSelector(
-  [
-    getSelectedCanvases,
-    state => state.annotations,
-  ],
-  (canvases, annotations) => {
-    if (!annotations || !canvases) return [];
-    return flatten(
-      canvases.map(c => c.id).map(
-        targetId => annotations[targetId] && Object.values(annotations[targetId]),
-      ),
-    );
-  },
-);
-
-const getPresentAnnotationsOnSelectedCanvases = createSelector(
-  [
-    getAnnotationsOnSelectedCanvases,
-  ],
-  annotations => filter(
-    Object.values(annotations).map(annotation => annotation && new Annotation(annotation.json)),
-    annotation => annotation && annotation.present(),
-  ),
-);
-
-/**
-* Return an array of annotation resources filtered by the given motivation
-* @param {Array} annotations
-* @param {Array} motivations
-* @return {Array}
-*/
-export const getAnnotationResourcesByMotivation = createSelector(
-  [
-    getPresentAnnotationsOnSelectedCanvases,
-    (state, { motivations }) => motivations,
-  ],
-  (annotations, motivations) => filter(
-    flatten(annotations.map(annotation => annotation.resources)),
-    resource => resource.motivations.some(
-      motivation => motivations.includes(motivation),
-    ),
-  ),
-);
-
-/**
-* Return languages from config (in state) and indicate which is currently set
-* @param {object} state
-* @return {Array} [ {locale: 'de', label: 'Deutsch', current: true}, ... ]
-*/
-export function getLanguagesFromConfigWithCurrent(state) {
-  const { availableLanguages, language } = state.config;
-
-  return Object.keys(availableLanguages).map(key => ({
-    current: key === language,
-    label: availableLanguages[key],
-    locale: key,
-  }));
-}
-
-/**
- * Return the selected annotations IDs of a given CanvasId
- * @param {Object} state
- * @param {String} windowId
- * @param {Array} targetIds
- * @return {Array}
- */
-export const getSelectedAnnotationIds = createSelector(
-  [
-    (state, { windowId }) => state.windows[windowId].selectedAnnotations,
-    getSelectedCanvases,
-  ],
-  (selectedAnnotations, canvases) => (
-    flatten(
-      canvases.map(c => c.id).map(targetId => selectedAnnotations && selectedAnnotations[targetId]),
-    )
-  ),
-);
-
-export const getAllOrSelectedAnnotationsOnCanvases = createSelector(
-  [
-    getPresentAnnotationsOnSelectedCanvases,
-    getSelectedAnnotationIds,
-    (state, { windowId }) => state.windows[windowId].displayAllAnnotations,
-  ],
-  (canvasAnnotations, selectedAnnotationIds, displayAllAnnotations) => {
-    if (displayAllAnnotations) return canvasAnnotations;
-
-    return canvasAnnotations.map(annotation => ({
-      id: (annotation['@id'] || annotation.id),
-      resources: annotation.resources.filter(
-        r => selectedAnnotationIds && selectedAnnotationIds.includes(r.id),
-      ),
-    }));
-  },
-);