diff --git a/package-lock.json b/package-lock.json
index 535dabc13fb05177a40eb8f179ef6f668abda7e1..912be71d5c9c8200f9db18ec8cbec3a60abdec2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8277,12 +8277,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -8297,17 +8299,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -8437,6 +8442,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -8451,6 +8457,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -8458,12 +8465,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -8482,6 +8491,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -8562,7 +8572,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -8574,6 +8585,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
@@ -8695,6 +8707,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
diff --git a/src/client/components/facet_bar/ActiveFilters.js b/src/client/components/facet_bar/ActiveFilters.js
new file mode 100644
index 0000000000000000000000000000000000000000..d8bec99bd8bb74108d4f55f76a978542152226a6
--- /dev/null
+++ b/src/client/components/facet_bar/ActiveFilters.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ChipsArray from './ChipsArray';
+
+const ActiveFilters = props => {
+ const { uriFilters, facets } = props;
+ return (
+ <React.Fragment>
+ {Object.keys(uriFilters).map(facetID => {
+ const facetValues = [];
+ Object.values(uriFilters[facetID]).forEach(value => {
+ facetValues.push({
+ facetID: facetID,
+ facetLabel: facets[facetID].label,
+ filterType: 'uriFilter',
+ value: value // a react sortable tree object
+ });
+ });
+ return (
+ <ChipsArray
+ key={facetID}
+ data={facetValues}
+ facetClass={props.facetClass}
+ updateFacetOption={props.updateFacetOption}
+ />
+ );
+ })}
+ </React.Fragment>
+ );
+};
+
+ActiveFilters.propTypes = {
+ facets: PropTypes.object.isRequired,
+ facetClass: PropTypes.string.isRequired,
+ uriFilters: PropTypes.object.isRequired,
+ spatialFilters: PropTypes.object.isRequired,
+ updateFacetOption: PropTypes.func.isRequired
+};
+
+export default ActiveFilters;
diff --git a/src/client/components/facet_bar/ChipsArray.js b/src/client/components/facet_bar/ChipsArray.js
index ac344029b78b59367d5e2a88160c0d225dfd558d..b5af4d16f215bafa553196c6eb442bdc4fcb3419 100644
--- a/src/client/components/facet_bar/ChipsArray.js
+++ b/src/client/components/facet_bar/ChipsArray.js
@@ -2,15 +2,12 @@ import React from 'react';
import PropTypes from 'prop-types';
import { withStyles } from '@material-ui/core/styles';
import Chip from '@material-ui/core/Chip';
-import Paper from '@material-ui/core/Paper';
-//import TagFacesIcon from '@material-ui/icons/TagFaces';
const styles = theme => ({
root: {
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
- padding: theme.spacing.unit / 2,
},
chip: {
margin: theme.spacing.unit / 2,
@@ -20,48 +17,46 @@ const styles = theme => ({
class ChipsArray extends React.Component {
handleDelete = data => () => {
- if (data.label === 'React') {
- alert('Why would you want to delete React?! :)'); // eslint-disable-line no-alert
- return;
- }
-
- this.setState(state => {
- const chipData = [...state.chipData];
- const chipToDelete = chipData.indexOf(data);
- chipData.splice(chipToDelete, 1);
- return { chipData };
+ this.props.updateFacetOption({
+ facetClass: this.props.facetClass,
+ facetID: data.facetID,
+ option: data.filterType,
+ value: data.value // a react sortable tree object
});
};
+ generateLabel = (facetLabel, valueLabel) => {
+ return valueLabel.length > 18
+ ? `${facetLabel}: ${valueLabel.substring(0, 18)}...`
+ : `${facetLabel}: ${valueLabel}`;
+ }
+
render() {
const { classes, data } = this.props;
return (
- <Paper className={classes.root}>
+ <div className={classes.root}>
{data !== null && data.map(item => {
let icon = null;
-
- // if (item.label === 'React') {
- // icon = <TagFacesIcon />;
- // }
-
return (
<Chip
- key={item.key}
+ key={item.value.node.id}
icon={icon}
- label={item.label}
- onDelete={this.handleDelete(item)}
+ label={this.generateLabel(item.facetLabel, item.value.node.prefLabel)}
+
className={classes.chip}
/>
);
})}
- </Paper>
+ </div>
);
}
}
ChipsArray.propTypes = {
classes: PropTypes.object.isRequired,
- data: PropTypes.object,
+ data: PropTypes.array.isRequired,
+ facetClass: PropTypes.string.isRequired,
+ updateFacetOption: PropTypes.func.isRequired
};
export default withStyles(styles)(ChipsArray);
diff --git a/src/client/components/facet_bar/FacetBar.js b/src/client/components/facet_bar/FacetBar.js
index 27c2a852284f1aae1159789a7dbe1d3067c1ed13..cdbf8f678a875cbe936ae5171207c26d357b4d96 100644
--- a/src/client/components/facet_bar/FacetBar.js
+++ b/src/client/components/facet_bar/FacetBar.js
@@ -1,10 +1,14 @@
import React from 'react';
import PropTypes from 'prop-types';
+import { has } from 'lodash';
import { withStyles } from '@material-ui/core/styles';
-import Tree from './Tree';
+import HierarchicalFacet from './HierarchicalFacet';
import DateSlider from './slider/DateSlider';
import Paper from '@material-ui/core/Paper';
import FacetHeader from './FacetHeader';
+import Typography from '@material-ui/core/Typography';
+import ActiveFilters from './ActiveFilters';
+import Divider from '@material-ui/core/Divider';
const styles = theme => ({
root: {
@@ -42,16 +46,62 @@ const styles = theme => ({
},
facetHeaderButtons: {
marginLeft: 'auto'
+ },
+ textContainer: {
+ padding: theme.spacing.unit
+ },
+ resultInfoDivider: {
+ marginTop: theme.spacing.unit / 2,
+ marginBottom: theme.spacing.unit / 2
}
});
class FacetBar extends React.Component {
render() {
- const { classes } = this.props;
- const { facetUpdateID, updatedFacet, facets } = this.props.facetData;
+ const { classes, facetClass } = this.props;
+ const { facetUpdateID, updatedFacet, updatedFilter, facets } = this.props.facetData;
+ let uriFilters = {};
+ let spatialFilters = {};
+ let activeUriFilters = false;
+ let activeSpatialFilters = false;
+ for (const [key, value] of Object.entries(facets)) {
+ //
+ if (value.uriFilter !== null) {
+ activeUriFilters = true;
+ uriFilters[key] = value.uriFilter;
+ } else if (has(value, 'spatialFilter') && value.spatialFilter !== null) {
+ activeSpatialFilters = true;
+ spatialFilters[key] = value.spatialFilter._bounds;
+ }
+ }
+
return (
<div className={classes.root}>
+
+
+ <Paper className={classes.facetContainer}>
+ <div className={classes.textContainer}>
+ <Typography variant="h6">Results: {this.props.resultCount} {this.props.resultClass}</Typography>
+ <Divider className={classes.resultInfoDivider} />
+ {(activeUriFilters || activeSpatialFilters) &&
+ <React.Fragment>
+ <Typography variant="h6">Active filters:</Typography>
+ <div className={classes.textContainer}>
+ <ActiveFilters
+ facets={facets}
+ facetClass={facetClass}
+ uriFilters={uriFilters}
+ spatialFilters={spatialFilters}
+ updateFacetOption={this.props.updateFacetOption}
+ />
+ </div>
+ <Divider className={classes.resultInfoDivider} />
+ </React.Fragment>
+ }
+ <Typography variant="h6">Narrow down by:</Typography>
+ </div>
+ </Paper>
{Object.keys(facets).map(id => {
return (
<Paper key={id} className={classes.facetContainer}>
@@ -64,14 +114,16 @@ class FacetBar extends React.Component {
updateFacetOption={this.props.updateFacetOption}
/>
<div className={classes[facets[id].containerClass]}>
- {facets[id].filterType === 'uriFilter' || facets[id].filterType === 'spatialFilter' ?
- <Tree
+ {facets[id].filterType === 'uriFilter'
+ || facets[id].filterType === 'spatialFilter' ?
+ <HierarchicalFacet
facetID={id}
facet={facets[id]}
facetClass={this.props.facetClass}
resultClass={this.props.resultClass}
facetUpdateID={facetUpdateID}
updatedFacet={updatedFacet}
+ updatedFilter={updatedFilter}
fetchFacet={this.props.fetchFacet}
updateFacetOption={this.props.updateFacetOption}
/> :
@@ -86,7 +138,6 @@ class FacetBar extends React.Component {
updateFacetOption={this.props.updateFacetOption}
/>
}
-
</div>
</Paper>
);
@@ -101,6 +152,7 @@ FacetBar.propTypes = {
facetData: PropTypes.object.isRequired,
facetClass: PropTypes.string.isRequired,
resultClass: PropTypes.string.isRequired,
+ resultCount: PropTypes.number.isRequired,
fetchFacet: PropTypes.func.isRequired,
updateFacetOption: PropTypes.func.isRequired
};
diff --git a/src/client/components/facet_bar/FacetHeader.js b/src/client/components/facet_bar/FacetHeader.js
index 5a5d7f5d55c6ec9076fe0e270adf6756f3aad408..52077a30b0d41e8f2c8fd8589d2e362653cce358 100644
--- a/src/client/components/facet_bar/FacetHeader.js
+++ b/src/client/components/facet_bar/FacetHeader.js
@@ -189,12 +189,12 @@ class FacetHeader extends React.Component {
FacetHeader.propTypes = {
classes: PropTypes.object.isRequired,
- facetID: PropTypes.string.isRequired,
- facet: PropTypes.object.isRequired,
- facetClass: PropTypes.string.isRequired,
- resultClass: PropTypes.string.isRequired,
- fetchFacet: PropTypes.func.isRequired,
- updateFacetOption: PropTypes.func.isRequired
+ facetID: PropTypes.string,
+ facet: PropTypes.object,
+ facetClass: PropTypes.string,
+ resultClass: PropTypes.string,
+ fetchFacet: PropTypes.func,
+ updateFacetOption: PropTypes.func,
};
export default withStyles(styles)(FacetHeader);
diff --git a/src/client/components/facet_bar/Tree.js b/src/client/components/facet_bar/HierarchicalFacet.js
similarity index 79%
rename from src/client/components/facet_bar/Tree.js
rename to src/client/components/facet_bar/HierarchicalFacet.js
index 0fc4feba5d54a1ec4a13063898e9a8dbedd7cb8a..3ed9da31ce494cbda1cd1f9510fce70dfa844d38 100644
--- a/src/client/components/facet_bar/Tree.js
+++ b/src/client/components/facet_bar/HierarchicalFacet.js
@@ -12,7 +12,6 @@ import IconButton from '@material-ui/core/IconButton';
import NavigateNextIcon from '@material-ui/icons/NavigateNext';
import NavigateBeforeIcon from '@material-ui/icons/NavigateBefore';
import Typography from '@material-ui/core/Typography';
-import ChipsArray from './ChipsArray';
const styles = () => ({
facetSearchContainer: {
@@ -64,7 +63,7 @@ const styles = () => ({
This component is based on the React Sortable Tree example at:
https://frontend-collective.github.io/react-sortable-tree/storybook/?selectedKind=Basics&selectedStory=Search&full=0&addons=0&stories=1&panelRight=0
*/
-class Tree extends Component {
+class HierarchicalFacet extends Component {
constructor(props) {
super(props);
this.state = {
@@ -85,23 +84,32 @@ class Tree extends Component {
}
componentDidUpdate = prevProps => {
- // if (this.props.facetID === 'productionPlace') {
- // console.log(this.props.facet.values)
- // }
- if (prevProps.facet.values != this.props.facet.values) {
- this.setState({
- treeData: this.props.facet.values
- });
- }
- if (this.props.updatedFacet !== null
- && this.props.updatedFacet !== this.props.facetID
- && prevProps.facetUpdateID !== this.props.facetUpdateID) {
- this.props.fetchFacet({
- facetClass: this.props.facetClass,
- facetID: this.props.facetID,
- });
+ if (prevProps.facetUpdateID !== this.props.facetUpdateID) {
+ // update component state if the user modified this facet
+ if (this.props.updatedFacet === this.props.facetID ) {
+ const treeObj = this.props.updatedFilter;
+ const newTreeData = changeNodeAtPath({
+ treeData: this.state.treeData,
+ getNodeKey: ({ treeIndex }) => treeIndex,
+ path: treeObj.path,
+ newNode: {
+ ...treeObj.node,
+ selected: treeObj.added ? 'true' : 'false'
+ },
+ });
+ this.setState({ treeData: newTreeData });
+ }
+ // else fetch new values, because some other facet was updated
+ else {
+ this.props.fetchFacet({
+ facetClass: this.props.facetClass,
+ facetID: this.props.facetID,
+ });
+ }
}
+
+ // fetch new values if the user changes the filter type or sort order
if (prevProps.facet.filterType !== this.props.facet.filterType
&& this.props.facet.filterType === 'uriFilter') {
this.props.fetchFacet({
@@ -115,27 +123,21 @@ class Tree extends Component {
facetID: this.props.facetID,
});
}
+
+ // when values have been fetched, update component's state
+ if (prevProps.facet.values != this.props.facet.values) {
+ this.setState({
+ treeData: this.props.facet.values
+ });
+ }
}
- handleCheckboxChange = treeObj => event => {
- const newTreeData = changeNodeAtPath({
- treeData: this.state.treeData,
- getNodeKey: ({ treeIndex }) => treeIndex,
- path: treeObj.path,
- newNode: {
- ...treeObj.node,
- selected: event.target.checked ? 'true' : 'false'
- },
- });
- this.setState({ treeData: newTreeData });
+ handleCheckboxChange = treeObj => () => {
this.props.updateFacetOption({
facetClass: this.props.facetClass,
facetID: this.props.facetID,
option: this.props.facet.filterType,
- value: {
- id: treeObj.node.id,
- label: treeObj.node.prefLabel
- }
+ value: treeObj
});
};
@@ -150,8 +152,9 @@ class Tree extends Component {
control={
<Checkbox
className={this.props.classes.checkbox}
- checked={treeObj.node.selected == 'true' ? true : false}
- disabled={treeObj.node.instanceCount == 0 || treeObj.node.prefLabel == 'Unknown' ? true : false}
+ checked={treeObj.node.selected === 'true' ? true : false}
+ disabled={(treeObj.node.instanceCount == 0 && treeObj.node.selected === 'false')
+ || treeObj.node.prefLabel == 'Unknown' ? true : false}
onChange={this.handleCheckboxChange(treeObj)}
value={treeObj.node.id}
color="primary"
@@ -182,19 +185,19 @@ class Tree extends Component {
);
}
- generateLabelClass = (classes, node) => {
+ generateLabelClass = classes => {
let labelClass = classes.label;
- if (this.props.facetID === 'author' || this.props.facetID === 'source') {
- if (node.source === 'http://ldf.fi/mmm/schema/SDBM' || node.id === 'http://ldf.fi/mmm/schema/SDBM') {
- labelClass = classes.sdbmLabel;
- }
- if (node.source === 'http://ldf.fi/mmm/schema/Bodley' || node.id === 'http://ldf.fi/mmm/schema/Bodley') {
- labelClass = classes.bodleyLabel;
- }
- if (node.source === 'http://ldf.fi/mmm/schema/Bibale' || node.id === 'http://ldf.fi/mmm/schema/Bibale') {
- labelClass = classes.bibaleLabel;
- }
- }
+ // if (this.props.facetID === 'author' || this.props.facetID === 'source') {
+ // if (node.source === 'http://ldf.fi/mmm/schema/SDBM' || node.id === 'http://ldf.fi/mmm/schema/SDBM') {
+ // labelClass = classes.sdbmLabel;
+ // }
+ // if (node.source === 'http://ldf.fi/mmm/schema/Bodley' || node.id === 'http://ldf.fi/mmm/schema/Bodley') {
+ // labelClass = classes.bodleyLabel;
+ // }
+ // if (node.source === 'http://ldf.fi/mmm/schema/Bibale' || node.id === 'http://ldf.fi/mmm/schema/Bibale') {
+ // labelClass = classes.bibaleLabel;
+ // }
+ // }
return labelClass;
}
@@ -203,6 +206,10 @@ class Tree extends Component {
const { classes, facet } = this.props;
const { isFetching, searchField } = facet;
+ // if (this.props.facetID == 'owner') {
+ // console.log(this.state.treeData)
+ // }
+
// Case insensitive search of `node.title`
const customSearchMethod = ({ node, searchQuery }) => {
let prefLabel = Array.isArray(node.prefLabel) ? node.prefLabel[0] : node.prefLabel;
@@ -226,7 +233,6 @@ class Tree extends Component {
: 0,
});
- //<ChipsArray data={this.props.facet.uriFilter} />}
return (
<React.Fragment>
{isFetching ?
@@ -302,7 +308,7 @@ class Tree extends Component {
}
}
-Tree.propTypes = {
+HierarchicalFacet.propTypes = {
classes: PropTypes.object.isRequired,
facetID: PropTypes.string.isRequired,
facet: PropTypes.object.isRequired,
@@ -311,7 +317,8 @@ Tree.propTypes = {
fetchFacet: PropTypes.func,
updateFacetOption: PropTypes.func,
facetUpdateID: PropTypes.number,
+ updatedFilter: PropTypes.object,
updatedFacet: PropTypes.string,
};
-export default withStyles(styles)(Tree);
+export default withStyles(styles)(HierarchicalFacet);
diff --git a/src/client/components/facet_results/ResultTable.js b/src/client/components/facet_results/ResultTable.js
index 98b82c6f704095b5783a02b7f205975523b58b98..5621bd0ae5366a4be7b62ca0aadc39ee08429280 100644
--- a/src/client/components/facet_results/ResultTable.js
+++ b/src/client/components/facet_results/ResultTable.js
@@ -137,7 +137,7 @@ class ResultTable extends React.Component {
render() {
const { classes } = this.props;
- const { resultsCount, paginatedResults, page, pagesize, sortBy, sortDirection, fetching } = this.props.data;
+ const { resultCount, paginatedResults, page, pagesize, sortBy, sortDirection, fetching } = this.props.data;
if (fetching) {
return (
<div className={classes.progressContainer}>
@@ -153,7 +153,7 @@ class ResultTable extends React.Component {
onChangePage={this.handleChangePage}
onSortBy={this.handleSortBy}
onChangeRowsPerPage={this.handleOnChangeRowsPerPage}
- resultsCount={resultsCount}
+ resultCount={resultCount}
page={page}
pagesize={pagesize}
sortBy={sortBy}
diff --git a/src/client/components/facet_results/ResultTableHead.js b/src/client/components/facet_results/ResultTableHead.js
index ddb3384733dcf5f3b31ff3544c4cee81521c52d0..09964c02dfc435aa733f70ed4be36c0ee5edceae 100644
--- a/src/client/components/facet_results/ResultTableHead.js
+++ b/src/client/components/facet_results/ResultTableHead.js
@@ -38,13 +38,13 @@ class ResultTableHead extends React.Component {
};
render() {
- const { classes, page, resultsCount, pagesize, sortBy, sortDirection } = this.props;
+ const { classes, page, resultCount, pagesize, sortBy, sortDirection } = this.props;
return (
<TableHead>
<TableRow className={classes.paginationRow}>
<TablePagination
- count={resultsCount}
+ count={resultCount}
rowsPerPage={pagesize}
rowsPerPageOptions={[5]}
page={page}
@@ -97,7 +97,7 @@ ResultTableHead.propTypes = {
onChangePage: PropTypes.func.isRequired,
onSortBy: PropTypes.func.isRequired,
onChangeRowsPerPage: PropTypes.func.isRequired,
- resultsCount: PropTypes.number.isRequired,
+ resultCount: PropTypes.number.isRequired,
page: PropTypes.number.isRequired,
pagesize: PropTypes.number.isRequired,
sortBy: PropTypes.string.isRequired,
diff --git a/src/client/containers/SemanticPortal.js b/src/client/containers/SemanticPortal.js
index 9c429a040db630f7921657fc7617bbc74fdaf5e4..b521d8dd8b5d901f4a3db2867a40cfbb9c07ca06 100644
--- a/src/client/containers/SemanticPortal.js
+++ b/src/client/containers/SemanticPortal.js
@@ -114,6 +114,7 @@ let SemanticPortal = (props) => {
facetData={props.manuscriptsFacets}
facetClass='manuscripts'
resultClass='manuscripts'
+ resultCount={props.manuscripts.resultCount}
fetchFacet={props.fetchFacet}
updateFacetOption={props.updateFacetOption}
/>
@@ -146,6 +147,7 @@ let SemanticPortal = (props) => {
facetData={props.worksFacets}
facetClass='works'
resultClass='works'
+ resultCount={props.works.resultCount}
fetchFacet={props.fetchFacet}
updateFacetOption={props.updateFacetOption}
/>
@@ -177,6 +179,7 @@ let SemanticPortal = (props) => {
facetData={props.peopleFacets}
facetClass='people'
resultClass='people'
+ resultCount={props.people.resultCount}
fetchFacet={props.fetchFacet}
updateFacetOption={props.updateFacetOption}
/>
@@ -209,6 +212,7 @@ let SemanticPortal = (props) => {
facetData={props.organizationsFacets}
facetClass='organizations'
resultClass='organizations'
+ resultCount={props.organizations.resultCount}
fetchFacet={props.fetchFacet}
updateFacetOption={props.updateFacetOption}
/>
@@ -241,6 +245,7 @@ let SemanticPortal = (props) => {
facetData={props.placesFacets}
facetClass='places'
resultClass='places'
+ resultCount={props.places.resultCount}
fetchFacet={props.fetchFacet}
updateFacetOption={props.updateFacetOption}
/>
diff --git a/src/client/reducers/helpers.js b/src/client/reducers/helpers.js
index adce08d4828d704ab2228499c628a99f827aa2a9..9f6b9d08a391e55a9d0bd8e5f28fcce2e04b6805 100644
--- a/src/client/reducers/helpers.js
+++ b/src/client/reducers/helpers.js
@@ -70,13 +70,16 @@ const updateFacetFilter = (state, action) => {
let newFacet = {};
if (oldFacet.filterType === 'uriFilter') {
let newUriFilter = oldFacet.uriFilter == null ? {} : oldFacet.uriFilter;
- if (has(newUriFilter, value.id)) {
- delete newUriFilter[value.id];
+ // 'value' is a react sortable tree object
+ if (has(newUriFilter, value.node.id)) {
+ value.added = false;
+ delete newUriFilter[value.node.id];
if (isEmpty(newUriFilter)) {
newUriFilter = null;
}
} else {
- newUriFilter[value.id] = value.label;
+ value.added = true;
+ newUriFilter[value.node.id] = value;
}
newFacet = {
...state.facets[facetID],
@@ -92,6 +95,7 @@ const updateFacetFilter = (state, action) => {
...state,
updatedFacet: facetID,
facetUpdateID: ++state.facetUpdateID,
+ updatedFilter: value, // a react sortable tree object
facets: {
...state.facets,
[ facetID ]: newFacet
@@ -103,7 +107,7 @@ export const updateResults = (state, action) => {
return {
...state,
resultsUpdateID: ++state.resultsUpdateID,
- resultsCount: parseInt(action.data.resultCount),
+ resultCount: parseInt(action.data.resultCount),
results: action.data.results,
fetching: false,
};
@@ -113,7 +117,7 @@ export const updatePaginatedResults = (state, action) => {
return {
...state,
resultsUpdateID: ++state.resultsUpdateID,
- resultsCount: parseInt(action.data.resultCount),
+ resultCount: parseInt(action.data.resultCount),
paginatedResults: action.data.results,
fetching: false
};
diff --git a/src/client/reducers/manuscripts.js b/src/client/reducers/manuscripts.js
index 239e03c0aca6cd5035a489dd4ad16624d45380e2..97bec51194ce637ddad112f06551c27e07d4734d 100644
--- a/src/client/reducers/manuscripts.js
+++ b/src/client/reducers/manuscripts.js
@@ -23,7 +23,7 @@ import {
export const INITIAL_STATE = {
results: [],
paginatedResults: [],
- resultsCount: 0,
+ resultCount: 0,
resultsUpdateID: -1,
instance: {},
page: -1,
diff --git a/src/client/reducers/manuscriptsFacets.js b/src/client/reducers/manuscriptsFacets.js
index bcca7273310465798e15fee177ac6c9bead1206c..995edb58c00f87eeeb4dc848cf69c4b96e2070f5 100644
--- a/src/client/reducers/manuscriptsFacets.js
+++ b/src/client/reducers/manuscriptsFacets.js
@@ -14,6 +14,7 @@ import {
export const INITIAL_STATE = {
updatedFacet: null,
facetUpdateID: 0,
+ updatedFilter: null,
facets: {
source: {
id: 'source',
@@ -75,8 +76,8 @@ export const INITIAL_STATE = {
distinctValueCount: 0,
values: [],
flatValues: [],
- sortBy: 'prefLabel',
- sortDirection: 'asc',
+ sortBy: 'instanceCount',
+ sortDirection: 'desc',
sortButton: true,
spatialFilterButton: false,
isFetching: false,
@@ -125,6 +126,7 @@ const manuscriptsFacets = (state = INITIAL_STATE, action) => {
case UPDATE_FACET_VALUES:
return updateFacetValues(state, action);
case UPDATE_FACET_OPTION:
+ // console.log(action)
return updateFacetOption(state, action);
default:
return state;
diff --git a/src/client/reducers/organizations.js b/src/client/reducers/organizations.js
index 0d81445a65bbda3f97782e65a85fcece9bd9fc0b..96e7ae1f54b33ee98b3998e6c3a39d4aefa240f4 100644
--- a/src/client/reducers/organizations.js
+++ b/src/client/reducers/organizations.js
@@ -23,7 +23,7 @@ import {
export const INITIAL_STATE = {
results: [],
paginatedResults: [],
- resultsCount: 0,
+ resultCount: 0,
resultsUpdateID: -1,
instance: {},
page: -1,
diff --git a/src/client/reducers/organizationsFacets.js b/src/client/reducers/organizationsFacets.js
index 89c77548061fe6bbec68b9afa36d4ecafb94d6b1..b2c22c4b0fffb9335e4899b5c9a9796e6e552605 100644
--- a/src/client/reducers/organizationsFacets.js
+++ b/src/client/reducers/organizationsFacets.js
@@ -14,6 +14,7 @@ import {
export const INITIAL_STATE = {
updatedFacet: null,
facetUpdateID: 0,
+ updatedFilter: null,
facets: {
source: {
id: 'source',
diff --git a/src/client/reducers/people.js b/src/client/reducers/people.js
index 1cab006eb29a4af49b2b56f84f83a3a231a71090..44ad9e8fa90799f9582d791c6e8ee581b3677912 100644
--- a/src/client/reducers/people.js
+++ b/src/client/reducers/people.js
@@ -23,7 +23,7 @@ import {
export const INITIAL_STATE = {
results: [],
paginatedResults: [],
- resultsCount: 0,
+ resultCount: 0,
resultsUpdateID: -1,
instance: {},
page: -1,
diff --git a/src/client/reducers/peopleFacets.js b/src/client/reducers/peopleFacets.js
index 4605a5ff49724bdb7c6c39c0cecd5ce03c664a4f..4085f1e827ac2e9fe8d11c8fc615b66b31c67d6d 100644
--- a/src/client/reducers/peopleFacets.js
+++ b/src/client/reducers/peopleFacets.js
@@ -14,6 +14,7 @@ import {
export const INITIAL_STATE = {
updatedFacet: null,
facetUpdateID: 0,
+ updatedFilter: null,
facets: {
source: {
id: 'source',
diff --git a/src/client/reducers/places.js b/src/client/reducers/places.js
index 50538f218f94f2b3fa751720fa04a5a9437f264b..142e3442b356ab762a92b040429bd328b5ad79ab 100644
--- a/src/client/reducers/places.js
+++ b/src/client/reducers/places.js
@@ -23,7 +23,7 @@ import {
export const INITIAL_STATE = {
results: [],
paginatedResults: [],
- resultsCount: 0,
+ resultCount: 0,
resultsUpdateID: -1,
instance: {},
page: -1,
diff --git a/src/client/reducers/placesFacets.js b/src/client/reducers/placesFacets.js
index 6feefc3a6c1b440758d68c2fb593e4b413f53c8b..e064d2364c8a4de6afabcaa25d9f1845bae2a4fd 100644
--- a/src/client/reducers/placesFacets.js
+++ b/src/client/reducers/placesFacets.js
@@ -14,6 +14,7 @@ import {
export const INITIAL_STATE = {
updatedFacet: null,
facetUpdateID: 0,
+ updatedFilter: null,
facets: {
source: {
id: 'source',
diff --git a/src/client/reducers/works.js b/src/client/reducers/works.js
index b043cbdee22dfc93a33f34583c901d36426c7782..895971e4e1234803bef19d082a2a2a40247808b4 100644
--- a/src/client/reducers/works.js
+++ b/src/client/reducers/works.js
@@ -23,7 +23,7 @@ import {
export const INITIAL_STATE = {
results: [],
paginatedResults: [],
- resultsCount: 0,
+ resultCount: 0,
resultsUpdateID: -1,
instance: {},
page: -1,
diff --git a/src/client/reducers/worksFacets.js b/src/client/reducers/worksFacets.js
index 6dfa5d16f88bf8aa4d3591ebee5cb9b9eef126d8..5ca312bde77031041b2b603e63eaa7999dc5a411 100644
--- a/src/client/reducers/worksFacets.js
+++ b/src/client/reducers/worksFacets.js
@@ -14,6 +14,7 @@ import {
export const INITIAL_STATE = {
updatedFacet: null,
facetUpdateID: 0,
+ updatedFilter: null,
facets: {
source: {
id: 'source',
diff --git a/src/server/sparql/FacetConfigs.js b/src/server/sparql/FacetConfigs.js
index 025990493dbdf36262df2e350736d53a185841f6..bd65db0117a3a3320cfc08c79e971dbf2f8feb52 100644
--- a/src/server/sparql/FacetConfigs.js
+++ b/src/server/sparql/FacetConfigs.js
@@ -1,6 +1,14 @@
export const facetConfigs = {
manuscripts: {
rdfType: 'frbroo:F4_Manifestation_Singleton',
+ author: {
+ id: 'author',
+ facetValueFilter: '',
+ label: 'Author',
+ labelPath: 'mmm-schema:manuscript_author/skos:prefLabel',
+ predicate: 'mmm-schema:manuscript_author',
+ type: 'list'
+ },
productionPlace: {
id: 'productionPlace',
facetValueFilter: `
@@ -13,22 +21,6 @@ export const facetConfigs = {
parentPredicate: '^crm:P108_has_produced/crm:P7_took_place_at/gvp:broaderPreferred+',
type: 'hierarchical',
},
- author: {
- id: 'author',
- facetValueFilter: '',
- label: 'Author',
- labelPath: 'mmm-schema:manuscript_author/skos:prefLabel',
- predicate: 'mmm-schema:manuscript_author',
- type: 'list'
- },
- source: {
- id: 'source',
- facetValueFilter: '',
- label: 'Source',
- labelPath: 'dct:source/skos:prefLabel',
- predicate: 'dct:source',
- type: 'list',
- },
language: {
id: 'language',
facetValueFilter: '',
@@ -66,6 +58,14 @@ export const facetConfigs = {
predicate: 'crm:P51_has_former_or_current_owner',
type: 'list',
},
+ source: {
+ id: 'source',
+ facetValueFilter: '',
+ label: 'Source',
+ labelPath: 'dct:source/skos:prefLabel',
+ predicate: 'dct:source',
+ type: 'list',
+ },
},
works: {
rdfType: 'frbroo:F1_Work',
diff --git a/src/server/sparql/FacetValues.js b/src/server/sparql/FacetValues.js
index a380dadb4cc03d36310e0096467f58719f6dfeab..1a097762f30f97d7c98d402188942a41ab8b7194 100644
--- a/src/server/sparql/FacetValues.js
+++ b/src/server/sparql/FacetValues.js
@@ -20,6 +20,7 @@ export const getFacet = ({
let q = facetValuesQuery;
const facetConfig = facetConfigs[facetClass][facetID];
let selectedBlock = '# no selections';
+ let selectedNoHitsBlock = '# no selections';
let filterBlock = '# no filters';
let parentBlock = '# no parents';
let mapper = mapFacet;
@@ -29,50 +30,88 @@ export const getFacet = ({
uriFilters: uriFilters,
spatialFilters: spatialFilters,
filterTarget: 'instance',
- facetID: facetID
+ facetID: facetID,
+ inverse: false,
});
}
if (uriFilters !== null && has(uriFilters, facetID)) {
selectedBlock = `
- OPTIONAL {
- FILTER(?id IN ( <${uriFilters[facetID].join('>, <')}> ))
- BIND(true AS ?selected_)
- }
+ OPTIONAL {
+ FILTER(?id IN ( <${uriFilters[facetID].join('>, <')}> ))
+ BIND(true AS ?selected_)
+ }
`;
+ const facetIDs = Object.keys(uriFilters);
+ // get selected values with no hits, only when there are filters from
+ // other facets
+ if (facetIDs.length > 1) {
+ const noHitsFilter = generateFilter({
+ facetClass: facetClass,
+ uriFilters: uriFilters,
+ spatialFilters: spatialFilters,
+ filterTarget: 'instance',
+ facetID: facetID,
+ inverse: true,
+ });
+ selectedNoHitsBlock = `
+ UNION
+ {
+ {
+ SELECT DISTINCT (count(DISTINCT ?instance) as ?instanceCount) ?id ?selected ?parent {
+ {
+ VALUES ?id { <${uriFilters[facetID].join('> <')}> }
+ ${noHitsFilter}
+ BIND(true AS ?selected)
+ OPTIONAL {
+ ?id gvp:broaderPreferred ?parent_
+ }
+ BIND(COALESCE(?parent_, '0') as ?parent)
+ }
+ <PARENTS>
+ }
+ GROUP BY ?id ?selected ?parent
+ }
+ FILTER(BOUND(?id))
+ <FACET_VALUE_FILTER>
+ OPTIONAL { ?id skos:prefLabel ?prefLabel_ }
+ BIND(COALESCE(STR(?prefLabel_), STR(?id)) AS ?prefLabel)
+ }
+ `;
+ }
}
if (facetConfig.type === 'hierarchical') {
mapper = mapHierarchicalFacet;
- const filterStr = generateFilter({
+ const parentFilterStr = generateFilter({
facetClass: facetClass,
uriFilters: uriFilters,
spatialFilters: spatialFilters,
- filterTarget: 'different_instance',
+ filterTarget: 'instance2',
facetID: facetID });
parentBlock = `
- UNION
- {
- ${filterStr}
- ?different_instance ${facetConfig.parentPredicate} ?id .
- BIND(COALESCE(?selected_, false) as ?selected)
- OPTIONAL { ?id skos:prefLabel ?prefLabel_ }
- BIND(COALESCE(STR(?prefLabel_), STR(?id)) AS ?prefLabel)
- OPTIONAL { ?id dct:source ?source }
- OPTIONAL {
- ?id gvp:broaderPreferred ?parent_
- }
- BIND(COALESCE(?parent_, '0') as ?parent)
+ UNION
+ {
+ ${parentFilterStr}
+ ?instance2 ${facetConfig.parentPredicate} ?id .
+ OPTIONAL { ?id skos:prefLabel ?prefLabel_ }
+ BIND(COALESCE(STR(?prefLabel_), STR(?id)) AS ?prefLabel)
+ OPTIONAL {
+ ?id gvp:broaderPreferred ?parent_
}
+ BIND(COALESCE(?selected_, false) as ?selected)
+ BIND(COALESCE(?parent_, '0') as ?parent)
+ }
`;
}
+ q = q.replace('<SELECTED_VALUES>', selectedBlock);
+ q = q.replace('<SELECTED_VALUES_NO_HITS>', selectedNoHitsBlock);
+ q = q.replace(/<FACET_VALUE_FILTER>/g, facetConfig.facetValueFilter);
+ q = q.replace(/<PARENTS>/g, parentBlock);
+ q = q.replace('<ORDER_BY>', `ORDER BY ${sortDirection}(?${sortBy})` );
q = q.replace(/<RDF_TYPE>/g, facetConfigs[facetClass].rdfType);
q = q.replace(/<FILTER>/g, filterBlock );
q = q.replace(/<PREDICATE>/g, facetConfig.predicate);
- q = q.replace('<SELECTED_VALUES>', selectedBlock);
- q = q.replace('<FACET_VALUE_FILTER>', facetConfig.facetValueFilter);
- q = q.replace('<PARENTS>', parentBlock);
- q = q.replace('<ORDER_BY>', `ORDER BY ${sortDirection}(?${sortBy})` );
- // if (facetID == 'source') {
- // //console.log(uriFilters)
+ // if (facetID == 'productionPlace') {
+ // // console.log(uriFilters)
// console.log(prefixes + q)
// }
return runSelectQuery(prefixes + q, endpoint, mapper);
diff --git a/src/server/sparql/Filters.js b/src/server/sparql/Filters.js
index 8aeb0f744e3bd33f2551b405212d547562588a8a..2817cc6e74f8f7f48c48da01544dd3c36506ebca 100644
--- a/src/server/sparql/Filters.js
+++ b/src/server/sparql/Filters.js
@@ -5,18 +5,31 @@ export const generateFilter = ({
uriFilters,
spatialFilters,
filterTarget,
- facetID
+ facetID,
+ inverse,
}) => {
let filterStr = '';
let facetProperty = facetID !== null ? facetID : '';
+
if (uriFilters !== null) {
for (let property in uriFilters) {
// when filtering facet values, apply filters only from other facets
if (property !== facetProperty) {
filterStr += `
- VALUES ?${property}Filter { <${uriFilters[property].join('> <')}> }
- ?${filterTarget} ${facetConfigs[facetClass][property].predicate} ?${property}Filter .
+ VALUES ?${property}Filter { <${uriFilters[property].join('> <')}> }
`;
+ if (inverse) {
+ filterStr += `
+ FILTER NOT EXISTS {
+ ?${filterTarget} ${facetConfigs[facetClass][property].predicate} ?${property}Filter .
+ ?${filterTarget} ${facetConfigs[facetClass][facetID].predicate} ?id .
+ }
+ `;
+ } else {
+ filterStr += `
+ ?${filterTarget} ${facetConfigs[facetClass][property].predicate} ?${property}Filter .
+ `;
+ }
}
}
}
diff --git a/src/server/sparql/Mappers.js b/src/server/sparql/Mappers.js
index 6f88a5e5cb1ea1a59f6dd4d003637ee6292e5945..f53423d56d782079c0cc12ae79e4180011356829 100644
--- a/src/server/sparql/Mappers.js
+++ b/src/server/sparql/Mappers.js
@@ -1,8 +1,8 @@
import { has } from 'lodash';
import { getTreeFromFlatData } from 'react-sortable-tree';
-import { makeObjectList } from './SparqlObjectMapper';
+// import { makeObjectList } from './SparqlObjectMapper';
-export const mapPlaces = (sparqlBindings) => {
+export const mapPlaces = sparqlBindings => {
//console.log(sparqlBindings);
const results = sparqlBindings.map(b => {
return {
@@ -22,11 +22,25 @@ export const mapCount = sparqlBindings => {
return sparqlBindings[0].count.value;
};
+export const mapFacetValues = sparqlBindings => {
+ const results = sparqlBindings.map(b => {
+ try {
+ return {
+ id: b.id.value,
+ prefLabel: b.prefLabel.value,
+ selected: b.selected.value,
+ parent: b.parent.value,
+ instanceCount: b.instanceCount.value
+ };
+ } catch(err) {
+ console.log(err);
+ }
+ });
+ return results;
+};
+
export const mapFacet = sparqlBindings => {
- const results = makeObjectList(sparqlBindings);
- if (results[results.length - 1].instanceCount == 0) {
- results.pop();
- }
+ const results = mapFacetValues(sparqlBindings);
return {
distinctValueCount: results.length,
values: results
@@ -34,7 +48,7 @@ export const mapFacet = sparqlBindings => {
};
export const mapHierarchicalFacet = sparqlBindings => {
- const results = makeObjectList(sparqlBindings);
+ const results = mapFacetValues(sparqlBindings);
//const flatResults = results;
let treeData = getTreeFromFlatData({
flatData: results,
diff --git a/src/server/sparql/SparqlQueriesGeneral.js b/src/server/sparql/SparqlQueriesGeneral.js
index d51244ca05a7c556070bcc93e6354fd7c3240b28..ad0ddd063bebf48ab2b81dfadcb773b852d772e3 100644
--- a/src/server/sparql/SparqlQueriesGeneral.js
+++ b/src/server/sparql/SparqlQueriesGeneral.js
@@ -1,5 +1,5 @@
export const endpoint = 'http://ldf.fi/mmm-cidoc/sparql';
-//export const endpoint = 'http://localhost:3050/ds/sparql';
+// export const endpoint = 'http://localhost:3050/ds/sparql';
export const countQuery = `
SELECT (COUNT(DISTINCT ?id) as ?count)
@@ -47,30 +47,32 @@ export const facetResultSetQuery = `
`;
export const facetValuesQuery = `
- SELECT DISTINCT ?id ?prefLabel ?selected ?source ?parent ?lat ?long ?instanceCount {
+ SELECT DISTINCT ?id ?prefLabel ?selected ?parent ?instanceCount {
+ # facet values that return results
{
{
- SELECT DISTINCT (count(DISTINCT ?instance) as ?instanceCount) ?id ?selected ?source ?lat ?long ?parent {
+ SELECT DISTINCT (count(DISTINCT ?instance) as ?instanceCount) ?id ?selected ?parent {
{
<FILTER>
?instance <PREDICATE> ?id .
?instance a <RDF_TYPE> .
<SELECTED_VALUES>
BIND(COALESCE(?selected_, false) as ?selected)
- OPTIONAL { ?id dct:source ?source . }
OPTIONAL { ?id gvp:broaderPreferred ?parent_ . }
BIND(COALESCE(?parent_, '0') as ?parent)
}
<PARENTS>
}
- GROUP BY ?id ?selected ?source ?lat ?long ?parent
+ GROUP BY ?id ?selected ?source ?parent
}
FILTER(BOUND(?id))
<FACET_VALUE_FILTER>
OPTIONAL { ?id skos:prefLabel ?prefLabel_ }
BIND(COALESCE(STR(?prefLabel_), STR(?id)) AS ?prefLabel)
}
+ <SELECTED_VALUES_NO_HITS>
UNION
+ # 'Unknown' facet value for results with no predicate path
{
{
SELECT DISTINCT (count(DISTINCT ?instance) as ?instanceCount) {
@@ -84,6 +86,7 @@ export const facetValuesQuery = `
BIND(IRI("http://ldf.fi/MISSING_VALUE") AS ?id)
BIND("Unknown" AS ?prefLabel)
BIND('0' as ?parent)
+ BIND(false as ?selected)
}
}