Update and rename timespan facets

src/client/reducers/actors.js

@@ -61,7 +61,7 @@ export const INITIAL_STATE = {
     },
     {
       id: 'birthPlace',
-      label: 'Place of birth/formation',
+      label: 'Birth/formation place',
       desc: 'Birth place description',
       valueType: 'object',
       makeLink: true,
@@ -71,8 +71,8 @@ export const INITIAL_STATE = {
     },
     {
       id: 'birthDateTimespan',
-      label: 'Date of birth/formation',
-      desc: 'Date of birth/formation description',
+      label: 'Birth/formation year',
+      desc: 'Birth/formation year description',
       valueType: 'object',
       makeLink: false,
       sortValues: true,
@@ -81,7 +81,7 @@ export const INITIAL_STATE = {
     },
     {
       id: 'deathDateTimespan',
-      label: 'Date of death/dissolution',
+      label: 'Death/dissolution year',
       desc: 'Date of death/dissolution description',
       valueType: 'object',
       makeLink: false,

src/client/reducers/actorsFacets.js

@@ -51,9 +51,27 @@ export const INITIAL_STATE = {
       uriFilter: null,
       spatialFilter: null
     },
+    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'
+    },
     birthDateTimespan: {
       id: 'birthDateTimespan',
-      label: 'Date of birth/formation',
+      label: 'Birth/formation year',
       //predicate: defined in backend
       distinctValueCount: 0,
       values: [],
@@ -71,23 +89,25 @@ export const INITIAL_STATE = {
       timespanFilter: null,
       type: 'timespan'
     },
-    birthPlace: {
-      id: 'birthPlace',
-      label: 'Place of birth/formation',
-      // predicate: defined in backend
+    deathDateTimespan: {
+      id: 'deathDateTimespan',
+      label: 'Death/dissolution year',
+      //predicate: defined in backend
       distinctValueCount: 0,
       values: [],
       flatValues: [],
-      sortBy: 'prefLabel',
-      sortDirection: 'asc',
-      sortButton: true,
+      sortBy: null,
+      sortDirection: null,
+      sortButton: false,
       spatialFilterButton: false,
       isFetching: false,
-      searchField: true,
-      containerClass: 'ten',
-      filterType: 'uriFilter',
-      uriFilter: null,
-      type: 'hierarchical'
+      searchField: false,
+      containerClass: 'three',
+      filterType: 'timespanFilter',
+      min: null,
+      max: null,
+      timespanFilter: null,
+      type: 'timespan'
     },
     place: {
       id: 'place',

src/client/reducers/manuscripts.js

@@ -82,7 +82,7 @@ export const INITIAL_STATE = {
     },
     {
       id: 'productionTimespan',
-      label: 'Production date',
+      label: 'Production year',
       desc: `
         The date when the manuscript was written. Multiple production dates
         may appear for a single manuscript, when there are discrepancies

src/client/reducers/manuscriptsFacets.js

@@ -54,7 +54,7 @@ export const INITIAL_STATE = {
     },
     productionTimespan: {
       id: 'productionTimespan',
-      label: 'Production date',
+      label: 'Production year',
       //predicate: defined in backend
       distinctValueCount: 0,
       values: [],

src/server/sparql/FacetConfigs.js

@@ -186,6 +186,34 @@ export const facetConfigs = {
       endProperty: 'crm:P82b_end_of_the_end',
       type: 'timespan',
     },
+    deathDateTimespan: {
+      id: 'deathDateTimespan',
+      facetValueFilter: `
+       FILTER(?timespan NOT IN (
+         <http://ldf.fi/mmm/actor/sdbm_39923_birth_timespan>,
+         <http://ldf.fi/mmm/actor/sdbm_2814_birth_timespan>,
+         <http://ldf.fi/mmm/actor/sdbm_4391_birth_timespan>,
+         <http://ldf.fi/mmm/actor/sdbm_45865_birth_timespan>,
+         <http://ldf.fi/mmm/time/bibale_element_876634-269>,
+         <http://ldf.fi/mmm/time/bibale_element_876940-269>,
+         <http://ldf.fi/mmm/time/bibale_element_877018-269>,
+         <http://ldf.fi/mmm/time/bibale_element_876634-269>,
+         <http://ldf.fi/mmm/time/bibale_element_877167-269>,
+         <http://ldf.fi/mmm/time/bibale_element_877167-269>,
+         <http://ldf.fi/mmm/time/bibale_element_882490-269>,
+         <http://ldf.fi/mmm/actor/sdbm_44872_birth_timespan>,
+         <http://ldf.fi/mmm/actor/sdbm_45182_birth_timespan>,
+         <http://ldf.fi/mmm/actor/sdbm_40695_birth_timespan>,
+         <http://ldf.fi/mmm/actor/sdbm_44762_birth_timespan>
+       ))
+      `,
+      sortByAscPredicate: 'crm:P100i_died_in/crm:P4_has_time-span/crm:P82a_begin_of_the_begin',
+      sortByDescPredicate: 'crm:P100i_died_in/crm:P4_has_time-span/crm:P82b_end_of_the_end',
+      predicate: 'crm:P98i_was_born/crm:P4_has_time-span',
+      startProperty: 'crm:P82a_begin_of_the_begin',
+      endProperty: 'crm:P82b_end_of_the_end',
+      type: 'timespan',
+    },
     birthPlace: {
       id: 'birthPlace',
       facetValueFilter: `