Sketch facet priorities

src/client/epics/index.js

@@ -251,40 +251,36 @@ export const stateToUrl = ({
   if (sortBy !== null) { params.sortBy = sortBy; }
   if (sortDirection !== null) { params.sortDirection = sortDirection; }
   if (variant !== null) { params.variant = variant; }
-  let uriFilters = {};
-  let spatialFilters = {};
-  let textFilters = {};
-  let timespanFilters = {};
-  let activeUriFilters = false;
-  let activeSpatialFilters = false;
-  let activeTextFilters = false;
-  let activeTimespanFilters = false;
+  let constraints = {};
   for (const [key, value] of Object.entries(facets)) {
     if (has(value, 'uriFilter') && value.uriFilter !== null) {
-      activeUriFilters = true;
-      uriFilters[key] = Object.keys(value.uriFilter);
+      constraints[key] = {
+        filterType: value.filterType,
+        priority: value.priority,
+        values: Object.keys(value.uriFilter)
+      };
     } else if (has(value, 'spatialFilter') && value.spatialFilter !== null) {
-      activeSpatialFilters = true;
-      spatialFilters[key] = boundsToValues(value.spatialFilter._bounds);
+      constraints[key] = {
+        filterType: value.filterType,
+        priority: value.priority,
+        values: boundsToValues(value.spatialFilter._bounds)
+      };
     }  else if (has(value, 'textFilter') && value.textFilter !== null) {
-      activeTextFilters = true;
-      textFilters[key] = value.textFilter;
+      constraints[key] = {
+        filterType: value.filterType,
+        priority: value.priority,
+        values: value.textFilter
+      };
     } else if (has(value, 'timespanFilter') && value.timespanFilter !== null) {
-      activeTimespanFilters = true;
-      timespanFilters[key] = value.timespanFilter;
+      constraints[key] = {
+        filterType: value.filterType,
+        priority: value.priority,
+        values: value.timespanFilter
+      };
     }
   }
-  if (activeUriFilters) {
-    params.uriFilters = JSON.stringify(uriFilters);
-  }
-  if (activeSpatialFilters) {
-    params.spatialFilters = JSON.stringify(spatialFilters);
-  }
-  if (activeTextFilters) {
-    params.textFilters = JSON.stringify(textFilters);
-  }
-  if (activeTimespanFilters) {
-    params.timespanFilters = JSON.stringify(timespanFilters);
+  if (Object.keys(constraints).length > 0) {
+    params.constraints = JSON.stringify(constraints);
   }
   return querystring.stringify(params);
 };

src/client/reducers/eventsFacets.js

@@ -16,23 +16,6 @@ export const INITIAL_STATE = {
   facetUpdateID: 0,
   updatedFilter: null,
   facets: {
-    label: {
-      id: 'label',
-      label: 'Label',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      //sortBy: 'instanceCount',
-      //sortDirection: 'desc',
-      sortButton: false,
-      spatialFilterButton: false,
-      isFetching: false,
-      searchField: false,
-      containerClass: 'one',
-      filterType: 'textFilter',
-      textFilter: null,
-    },
     type: {
       id: 'type',
       label: 'Type',
@@ -49,7 +32,8 @@ export const INITIAL_STATE = {
       containerClass: 'three',
       filterType: 'uriFilter',
       uriFilter: null,
-      spatialFilter: null
+      spatialFilter: null,
+      priority: 3
     },
     eventTimespan: {
       id: 'eventTimespan',
@@ -69,7 +53,8 @@ export const INITIAL_STATE = {
       min: null,
       max: null,
       timespanFilter: null,
-      type: 'timespan'
+      type: 'timespan',
+      priority: 2
     },
     place: {
       id: 'place',
@@ -88,7 +73,8 @@ export const INITIAL_STATE = {
       filterType: 'uriFilter',
       uriFilter: null,
       spatialFilter: null,
-      type: 'hierarchical'
+      type: 'hierarchical',
+      priority: 1
     },
   }
 };

src/server/index.js

@@ -48,7 +48,8 @@ app.get(`${apiPath}/:resultClass/paginated`, async (req, res, next) => {
       textFilters: req.query.textFilters == null ? null : JSON.parse(req.query.textFilters),
       timespanFilters: req.query.timespanFilters == null ? null : JSON.parse(req.query.timespanFilters),
       sortBy: req.query.sortBy || null,
-      sortDirection: req.query.sortDirection || null
+      sortDirection: req.query.sortDirection || null,
+      constraints: req.query.constraints
     });
     res.json(data);
   } catch(error) {

src/server/sparql/FacetResults.js

@@ -206,7 +206,7 @@ const getPaginatedData = ({
       resultSetProperties = '';
   }
   q = q.replace('<RESULT_SET_PROPERTIES>', resultSetProperties);
-  // console.log(prefixes + q)
+  console.log(prefixes + q)
   return runSelectQuery(prefixes + q, endpoint, makeObjectList);
 };