diff --git a/package-lock.json b/package-lock.json index 5f8ced721c323a6a612f717660f78e7a0b243e11..71a0166e4e3714e4921fd25464aeb345fd564ef9 100644 --- a/package-lock.json +++ b/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", diff --git a/package.json b/package.json index d02c279d21d13eca2c6f9ab4d7eabe5b84c31462..8506f1dd277d1559785d1acf29810605a9d612e7 100644 --- a/package.json +++ b/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", diff --git a/src/client/reducers/options.js b/src/client/reducers/options.js index 7cf65d5626831f0156f30e4e3b3331a14ae6fbf1..217020ce46420d9831c0068369100f8f144c80ae 100644 --- a/src/client/reducers/options.js +++ b/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 = { diff --git a/src/client/reducers/search.js b/src/client/reducers/search.js index 6e2ece6faf44be62742fc45d41ac3470d01cb7c0..a038f2cf58b66289715adb5b6c9f757640e76cec 100644 --- a/src/client/reducers/search.js +++ b/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: diff --git a/src/client/selectors/index.js b/src/client/selectors/index.js deleted file mode 100644 index b8b96caac123dbc8369a4684e2767b8c0fdb2643..0000000000000000000000000000000000000000 --- a/src/client/selectors/index.js +++ /dev/null @@ -1,50 +0,0 @@ -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; - } -);