Hierarchical facet: return also flat version of data

src/client/actions/index.js

@@ -105,11 +105,11 @@ export const updateFacetValues = ({
   facetClass,
   id,
   data,
-  flatValues,
+  flatData,
   sparqlQuery
 }) => ({
   type: UPDATE_FACET_VALUES,
-  facetClass, id, data, flatValues, sparqlQuery
+  facetClass, id, data, flatData, sparqlQuery
 });
 export const updateFacetOption = ({ facetClass, facetID, option, value }) => ({
   type: UPDATE_FACET_OPTION,

src/server/sparql/FacetValues.js

@@ -121,13 +121,22 @@ export const getFacet = async ({
   }
   // console.log(prefixes + q)
   const response = await runSelectQuery(prefixes + q, endpoint, mapper, resultFormat);
-  return({
-    facetClass: facetClass,
-    id: facetID,
-    data: response.data,
-    flatData: response.flatData || null,
-    sparqlQuery: response.sparqlQuery
-  });
+  if (facetConfig.type === 'hierarchical') {
+    return({
+      facetClass: facetClass,
+      id: facetID,
+      data: response.data.treeData,
+      flatData: response.data.flatData,
+      sparqlQuery: response.sparqlQuery
+    });
+  } else {
+    return({
+      facetClass: facetClass,
+      id: facetID,
+      data: response.data,
+      sparqlQuery: response.sparqlQuery
+    });
+  }
 };
 
 const generateSelectedBlock = ({

src/server/sparql/Mappers.js

@@ -29,7 +29,6 @@ export const mapFacet = sparqlBindings => {
 
 export const mapHierarchicalFacet = sparqlBindings => {
   const results = mapFacetValues(sparqlBindings);
-  //const flatResults = results;
   let treeData = getTreeFromFlatData({
     flatData: results,
     getKey: node => node.id, // resolve a node's key
@@ -38,7 +37,10 @@ export const mapHierarchicalFacet = sparqlBindings => {
   });
   treeData = recursiveSort(treeData);
   treeData.forEach(node => sumUpAndSelectChildren(node));
-  return treeData;
+  return ({
+    treeData,
+    flatData: results
+  });
 };
 
 export const mapTimespanFacet = sparqlBindings => {