From bbab47674d2e7aa96e5aa58790bae3c58ee83e29 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Fri, 14 Dec 2018 16:16:33 +0200
Subject: [PATCH] Update facets
---
src/client/components/FacetBar.js | 8 ++++++--
src/client/components/Tree.js | 9 ++++++++-
src/client/reducers/facet.js | 3 ++-
src/server/sparql/Datasets.js | 3 ---
src/server/sparql/Manuscripts.js | 2 +-
5 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/client/components/FacetBar.js b/src/client/components/FacetBar.js
index dfc065d9..c6678edd 100644
--- a/src/client/components/FacetBar.js
+++ b/src/client/components/FacetBar.js
@@ -30,7 +30,7 @@ const styles = theme => ({
padding: theme.spacing.unit,
},
facetValuesContainerThree: {
- height: 95,
+ height: 108,
padding: theme.spacing.unit,
},
});
@@ -51,7 +51,7 @@ class FacetBar extends React.Component {
render() {
const { classes, facet } = this.props;
-
+ //console.log(facet)
return (
<div className={classes.root}>
{this.props.facet.fetchingFacet ?
@@ -63,6 +63,8 @@ class FacetBar extends React.Component {
</Paper>
<div className={classes.facetValuesContainerThree}>
<Tree
+ property='source'
+ lastUpdatedFacet={facet.lastUpdatedFacet}
data={facet.facetValues.source}
updateFilter={this.props.updateFilter}
/>
@@ -87,6 +89,8 @@ class FacetBar extends React.Component {
</Paper>
<div className={classes.facetValuesContainerTen}>
<Tree
+ property='productionPlace'
+ lastUpdatedFacet={facet.lastUpdatedFacet}
data={facet.facetValues.productionPlace}
updateFilter={this.props.updateFilter}
/>
diff --git a/src/client/components/Tree.js b/src/client/components/Tree.js
index 5280ee56..51acd116 100644
--- a/src/client/components/Tree.js
+++ b/src/client/components/Tree.js
@@ -37,6 +37,11 @@ class Tree extends Component {
};
}
+ // componentDidUpdate = prevProps => {
+ // console.log(this.props.lastUpdatedFacet);
+ // //if (prevProps.facetFilters[this.props.property] != this.props.facetFilters )
+ // };
+
handleCheckboxChange = treeObj => event => {
const newTreeData = changeNodeAtPath({
treeData: this.state.treeData,
@@ -49,7 +54,7 @@ class Tree extends Component {
});
this.setState({ treeData: newTreeData });
this.props.updateFilter({
- property: 'productionPlace',
+ property: this.props.property,
value: treeObj.node.id
});
};
@@ -183,6 +188,8 @@ class Tree extends Component {
Tree.propTypes = {
classes: PropTypes.object.isRequired,
+ property: PropTypes.string.isRequired,
+ lastUpdatedFacet: PropTypes.string.isRequired,
data: PropTypes.array.isRequired,
updateFilter: PropTypes.func.isRequired,
};
diff --git a/src/client/reducers/facet.js b/src/client/reducers/facet.js
index b9de6d34..3e769088 100644
--- a/src/client/reducers/facet.js
+++ b/src/client/reducers/facet.js
@@ -39,7 +39,8 @@ export const INITIAL_STATE = {
},
fetchingFacet : false,
facetDialogOpen: false,
- activeFacet: ''
+ activeFacet: '',
+ lastUpdatedFacet: ''
};
const facet = (state = INITIAL_STATE, action) => {
diff --git a/src/server/sparql/Datasets.js b/src/server/sparql/Datasets.js
index 82a61f45..760d33f7 100644
--- a/src/server/sparql/Datasets.js
+++ b/src/server/sparql/Datasets.js
@@ -42,9 +42,6 @@ module.exports = {
SELECT DISTINCT ?id {
<FILTER>
?id a frbroo:F4_Manifestation_Singleton .
- # ?id dct:source mmm-schema:Bodley .
- # ?id dct:source mmm-schema:SDBM .
- # ?id dct:source mmm-schema:Bibale .
# ?id (^frbroo:R18_created|^crm:P108_has_produced)/crm:P7_took_place_at/skos:prefLabel ?orderBy .
}
#ORDER BY (!BOUND(?orderBy)) ?orderBy
diff --git a/src/server/sparql/Manuscripts.js b/src/server/sparql/Manuscripts.js
index 5a715239..779e65d8 100644
--- a/src/server/sparql/Manuscripts.js
+++ b/src/server/sparql/Manuscripts.js
@@ -53,7 +53,7 @@ const getManuscriptData = (page, pagesize, filters) => {
manuscriptQuery = manuscriptQuery.replace('<FILTER>', generateResultFilter(filters));
}
manuscriptQuery = manuscriptQuery.replace('<PAGE>', `LIMIT ${pagesize} OFFSET ${page * pagesize}`);
- // console.log(manuscriptQuery)
+ //console.log(manuscriptQuery)
return sparqlSearchEngine.doSearch(manuscriptQuery, endpoint, makeObjectList);
};
--
GitLab