Clean up

package-lock.json

@@ -13032,11 +13032,6 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
-    "reselect": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
-      "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc="
-    },
     "resolve": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz",

package.json

@@ -84,7 +84,6 @@
     "redux": "^4.0.0",
     "redux-observable": "^0.18.0",
     "redux-responsive": "^4.3.8",
-    "reselect": "^3.0.1",
     "rxjs": "^6.3.3",
     "rxjs-compat": "^6.3.3",
     "superagent": "^3.8.3",

src/client/reducers/options.js

@@ -5,7 +5,7 @@ import {
 } from '../actions';
 
 const DEFAULT_LANGUAGE = 'en';
-const DEFAULT_RESULT_FORMAT = 'map';
+const DEFAULT_RESULT_FORMAT = 'table';
 const DEFAULT_MAP_MODE = 'cluster';
 
 export const INITIAL_STATE = {

src/client/reducers/search.js

@@ -43,16 +43,8 @@ export const INITIAL_STATE = {
   page: 0,
   places: [],
   place: {},
-  manuscriptsFilter: {
-    //'author': new Set(),
-    //'timespan': new Set(),
-    'creationPlace': new Set(),
-    //'material': new Set(),
-    //'language': new Set(),
-  },
   sortBy: 'author',
   sortDirection: 'asc',
-  groupBy: 'label',
   resultsQuery: '',
   fetchingPlaces: false,
   fetchingManuscripts: false
@@ -128,18 +120,15 @@ const search = (state = INITIAL_STATE, action) => {
       return {
         ...state,
         'manuscripts': [],
-        resultsQuery: '',
         fetchingManuscripts: false
       };
     case CLEAR_PLACES:
       return {
         ...state,
         'places': {},
-        resultsQuery: '',
         fetchingPlaces: false
       };
 
-
     case UPDATE_RESULTS_FILTER:
       return updateResultsFilter(state, action);
     case SORT_RESULTS:

src/client/selectors/index.js

-import { createSelector } from 'reselect';
-import _ from 'lodash';
-
-// https://redux.js.org/recipes/computing-derived-data
-
-const getResultsFilter = (state) => state.manuscriptsFilter;
-const getResults = (state) => state.manuscripts;
-const getSortBy = (state) => state.sortBy;
-const getSortDirection = (state) => state.sortDirection;
-
-export const getVisibleResults = createSelector(
-  [ getResults, getResultsFilter, getSortBy, getSortDirection ],
-  (results, resultsFilter, sortBy, sortDirection) => {
-    const filteredResults =  results.filter(filterVisibleResult(resultsFilter));
-    return _.orderBy(filteredResults, sortBy, sortDirection);
-  }
-);
-
-const filterVisibleResult = resultsFilter => (resultObj) => {
-  for (const property in resultsFilter) {
-    const filterValues = resultsFilter[property];
-    if (filterValues.has(resultObj[property])) {
-      return false;
-    }
-  }
-  return true;
-};
-
-export const getVisibleValues = createSelector(
-  [ getResults, getResultsFilter ],
-  (visibleResults, resultsFilter) => {
-    const properties = Object.keys(resultsFilter);
-    let visibleValues = {};
-    properties.forEach((property) => {
-      visibleValues[property] = [];
-    });
-    for (const result of visibleResults) {
-      properties.forEach((property) => {
-        visibleValues[property].push({
-          value: result[property],
-          selected: !resultsFilter[property].has(result[property])
-        });
-      });
-    }
-    properties.forEach((property) => {
-      visibleValues[property] = _.sortBy(_.uniqBy(visibleValues[property], 'value'), 'value');
-    });
-    return visibleValues;
-  }
-);