Actors: update facet order and table colums, remove birth place

src/client/reducers/actors.js

@@ -60,20 +60,9 @@ export const INITIAL_STATE = {
       numberedList: false,
       minWidth: 150
     },
-    {
-      id: 'birthPlace',
-      label: 'Birth/formation place',
-      desc: 'Birth place description',
-      valueType: 'object',
-      makeLink: true,
-      externalLink: false,
-      sortValues: true,
-      numberedList: false,
-      minWidth: 200
-    },
     {
       id: 'birthDateTimespan',
-      label: 'Birth/formation year',
+      label: 'Birth / formation date',
       desc: 'Birth/formation year description',
       valueType: 'object',
       makeLink: false,
@@ -84,7 +73,7 @@ export const INITIAL_STATE = {
     },
     {
       id: 'deathDateTimespan',
-      label: 'Death/dissolution year',
+      label: 'Death / dissolution date',
       desc: 'Date of death/dissolution description',
       valueType: 'object',
       makeLink: false,

src/client/reducers/actorsFacets.js

@@ -51,30 +51,11 @@ export const INITIAL_STATE = {
       filterType: 'uriFilter',
       uriFilter: null,
       spatialFilter: null,
-      priority: 6
-    },
-    birthPlace: {
-      id: 'birthPlace',
-      label: 'Birth/formation location',
-      // predicate: defined in backend
-      distinctValueCount: 0,
-      values: [],
-      flatValues: [],
-      sortBy: 'prefLabel',
-      sortDirection: 'asc',
-      sortButton: true,
-      spatialFilterButton: false,
-      isFetching: false,
-      searchField: true,
-      containerClass: 'ten',
-      filterType: 'uriFilter',
-      uriFilter: null,
-      type: 'hierarchical',
-      priority: 3
+      priority: 5
     },
     birthDateTimespan: {
       id: 'birthDateTimespan',
-      label: 'Birth/formation year',
+      label: 'Birth / formation date',
       //predicate: defined in backend
       distinctValueCount: 0,
       values: [],
@@ -91,11 +72,11 @@ export const INITIAL_STATE = {
       max: null,
       timespanFilter: null,
       type: 'timespan',
-      priority: 4
+      priority: 3
     },
     deathDateTimespan: {
       id: 'deathDateTimespan',
-      label: 'Death/dissolution year',
+      label: 'Death / dissolution date',
       //predicate: defined in backend
       distinctValueCount: 0,
       values: [],
@@ -112,7 +93,7 @@ export const INITIAL_STATE = {
       max: null,
       timespanFilter: null,
       type: 'timespan',
-      priority: 5
+      priority: 4
     },
     place: {
       id: 'place',
@@ -150,7 +131,7 @@ export const INITIAL_STATE = {
       containerClass: 'five',
       filterType: 'uriFilter',
       uriFilter: null,
-      priority: 7
+      priority: 6
     },
   }
 };

src/server/sparql/FacetConfigsMMM.js

@@ -376,24 +376,14 @@ export const facetConfigs = {
       endProperty: 'crm:P82b_end_of_the_end',
       type: 'timespan',
     },
-    birthPlace: {
-      id: 'birthPlace',
-      facetValueFilter: `
-      ?id dct:source <http://vocab.getty.edu/tgn/> .
-      `,
-      labelPath: 'crm:P98i_was_born/crm:P7_took_place_at/skos:prefLabel',
-      predicate: 'crm:P98i_was_born/crm:P7_took_place_at',
-      parentPredicate: 'crm:P98i_was_born/crm:P7_took_place_at/gvp:broaderPreferred+',
-      type: 'hierarchical',
-    },
     place: {
       id: 'source',
       facetValueFilter: `
       ?id dct:source <http://vocab.getty.edu/tgn/> .
       `,
-      labelPath: 'mmm-schema:person_place/skos:prefLabel',
-      predicate: 'mmm-schema:person_place',
-      parentPredicate: 'mmm-schema:person_place/gvp:broaderPreferred+',
+      labelPath: '^crm:P11_had_participant/crm:P7_took_place_at/skos:prefLabel',
+      predicate: '^crm:P11_had_participant/crm:P7_took_place_at',
+      parentPredicate: '^crm:P11_had_participant/crm:P7_took_place_at/gvp:broaderPreferred+',
       type: 'hierarchical',
     },
     work: {

src/server/sparql/SparqlQueriesActors.js

@@ -42,7 +42,7 @@ export const actorProperties = `
     }
     UNION
     {
-      ?id mmm-schema:person_place ?place__id .
+      ?id ^crm:P11_had_participant/crm:P7_took_place_at ?place__id .
       ?place__id skos:prefLabel ?place__prefLabel .
       BIND(CONCAT("/places/page/", REPLACE(STR(?place__id), "^.*\\\\/(.+)", "$1")) AS ?place__dataProviderUrl)
     }
@@ -117,7 +117,7 @@ export const placesActorsQuery = `
     UNION
     { ?actor__id crm:P100i_died_in/crm:P7_took_place_at ?id }
     UNION
-    { ?actor__id mmm-schema:person_place ?id }
+    { ?actor__id ^crm:P11_had_participant/crm:P7_took_place_at ?id }
     ?id wgs84:lat ?lat ;
         wgs84:long ?long .
   }