Events: ignore pref labels for now

src/client/reducers/events.js

@@ -32,19 +32,20 @@ export const INITIAL_STATE = {
   instance: {},
   page: -1,
   pagesize: 15,
-  sortBy: 'prefLabel',
+  sortBy: 'place',
   sortDirection: 'asc',
   fetching: false,
   fetchingResultCount: false,
   tableColumns: [
     {
-      id: 'prefLabel',
-      label: 'Label',
-      desc: 'Label description',
+      id: 'type',
+      label: 'Type',
+      desc: 'Type description',
       valueType: 'object',
       makeLink: true,
       sortValues: false,
-      numberedList: false
+      numberedList: false,
+      minWidth: 200,
     },
     {
       id: 'timespan',

src/server/sparql/FacetConfigs.js

@@ -107,6 +107,10 @@ export const facetConfigs = {
       type: 'text',
       textQueryProperty: 'skos:prefLabel'
     },
+    // for sorting
+    type: {
+      labelPath: 'a/(skos:prefLabel|rdfs:label)',
+    },
     place: {
       id: 'place',
       facetValueFilter: `
@@ -119,10 +123,6 @@ export const facetConfigs = {
       parentPredicate: 'crm:P7_took_place_at/gvp:broaderPreferred+',
       type: 'hierarchical',
     },
-    // for sorting facet results
-    prefLabel: {
-      labelPath: 'skos:prefLabel',
-    },
   },
   people: {
     rdfType: 'mmm-schema:Person',

src/server/sparql/SparqlQueriesEvents.js

 export const eventProperties = `
     {
-      ?id skos:prefLabel ?prefLabel__id .
-      BIND(?prefLabel__id AS ?prefLabel__prefLabel)
-      BIND(?id AS ?prefLabel__dataProviderUrl)
+      ?id a ?type__id .
+      ?type__id skos:prefLabel|rdfs:label ?type__prefLabel .
+      BIND(?id AS ?type__dataProviderUrl)
     }
-    UNION {
+    UNION
+    {
       ?id crm:P7_took_place_at ?place__id .
       ?place__id skos:prefLabel ?place__prefLabel .
       ?place__id owl:sameAs ?place__dataProviderUrl .
     }
-    UNION {
+    UNION
+    {
       ?id crm:P4_has_time-span ?timespan__id .
       BIND(?timespan__id AS ?timespan__prefLabel)
     }