diff --git a/src/client/reducers/placesFacets.js b/src/client/reducers/placesFacets.js index 270876eb99030e7ad83adaf85e66a64ea7e3801a..6e9d75268ac4a917ba872ee4cd03a779b0136bcc 100644 --- a/src/client/reducers/placesFacets.js +++ b/src/client/reducers/placesFacets.js @@ -30,27 +30,27 @@ export const INITIAL_STATE = { distinctValueCount: 0, values: [], flatValues: [], - sortBy: 'instanceCount', - sortDirection: 'desc', - sortButton: false, - isFetching: false, - searchField: false, - containerSize: 'large', - }, - type: { - id: 'type', - label: 'Type', - // predicate: defined in backend - distinctValueCount: 0, - values: [], - flatValues: [], - sortBy: 'instanceCount', - sortDirection: 'desc', + sortBy: 'prefLabel', + sortDirection: 'asc', sortButton: false, isFetching: false, searchField: false, containerSize: 'large', }, + // type: { + // id: 'type', + // label: 'Type', + // // predicate: defined in backend + // distinctValueCount: 0, + // values: [], + // flatValues: [], + // sortBy: 'instanceCount', + // sortDirection: 'desc', + // sortButton: false, + // isFetching: false, + // searchField: false, + // containerSize: 'large', + //} , }, filters: { source: new Set(), diff --git a/src/server/sparql/FacetConfigs.js b/src/server/sparql/FacetConfigs.js index e3856d6913ad2eb3d6a222b47cbb54a46b29168b..e4445aa69c74a877b92c6d207b4dbd07adb99e28 100644 --- a/src/server/sparql/FacetConfigs.js +++ b/src/server/sparql/FacetConfigs.js @@ -82,16 +82,17 @@ export const facetConfigs = { label: 'Area', labelPath: 'gvp:broaderPreferred/skos:prefLabel', predicate: 'gvp:broaderPreferred', - type: 'list', - }, - type: { - id: 'type', - facetValueFilter: '', - label: 'Type', - labelPath: 'gvp:placeTypePreferred', - predicate: 'gvp:placeTypePreferred', - type: 'list', + parentPredicate: 'gvp:broaderPreferred+', + type: 'hierarchical', }, + // type: { + // id: 'type', + // facetValueFilter: '', + // label: 'Type', + // labelPath: 'gvp:placeTypePreferred', + // predicate: 'gvp:placeTypePreferred', + // type: 'list', + // }, } }; diff --git a/src/server/sparql/FacetResults.js b/src/server/sparql/FacetResults.js index a8d70f4ed0eb41344f42eb61b95a41487c7420fb..46043640704f11acee99330d8ee3950fa7a52a8f 100644 --- a/src/server/sparql/FacetResults.js +++ b/src/server/sparql/FacetResults.js @@ -31,7 +31,7 @@ export const getAllResults = (resultClass, facetClass, variant, filters) => { switch (variant) { case 'allPlaces': q = allPlacesQuery; - filterTarget = 'manuscripts'; + filterTarget = 'id'; break; case 'productionPlaces': q = productionPlacesQuery; diff --git a/src/server/sparql/SparqlQueriesPlaces.js b/src/server/sparql/SparqlQueriesPlaces.js index 5adee8d549d49e07f1d7d55287c307f5a9b2884e..23853042cadb50e0e140bb25b9d194ddcae0f1db 100644 --- a/src/server/sparql/SparqlQueriesPlaces.js +++ b/src/server/sparql/SparqlQueriesPlaces.js @@ -26,6 +26,7 @@ export const allPlacesQuery = ` PREFIX gvp: <http://vocab.getty.edu/ontology#> SELECT * WHERE { + <FILTER> ?id a crm:E53_Place . ?id skos:prefLabel ?prefLabel . ?id dct:source ?source .