Skip to content
Snippets Groups Projects
Commit 8c679a63 authored by esikkala's avatar esikkala
Browse files

Update finds data handling

parent 4b1e8caa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/client/reducers/sampo/finds.js
+ 36
− 36
View file @ 8c679a63
...@@ -94,43 +94,43 @@ export const INITIAL_STATE = { ...@@ -94,43 +94,43 @@ export const INITIAL_STATE = {
sortValues: true, sortValues: true,
numberedList: false, numberedList: false,
minWidth: 180 minWidth: 180
},
{
id: 'startYear',
valueType: 'string',
makeLink: false,
externalLink: false,
sortValues: true,
numberedList: false,
minWidth: 180
},
{
id: 'endYear',
valueType: 'string',
makeLink: false,
externalLink: false,
sortValues: true,
numberedList: false,
minWidth: 180
},
{
id: 'earliestStart',
valueType: 'string',
makeLink: false,
externalLink: false,
sortValues: true,
numberedList: false,
minWidth: 180
},
{
id: 'latestEnd',
valueType: 'string',
makeLink: false,
externalLink: false,
sortValues: true,
numberedList: false,
minWidth: 180
} }
// {
// id: 'startYear',
// valueType: 'string',
// makeLink: false,
// externalLink: false,
// sortValues: true,
// numberedList: false,
// minWidth: 180
// },
// {
// id: 'endYear',
// valueType: 'string',
// makeLink: false,
// externalLink: false,
// sortValues: true,
// numberedList: false,
// minWidth: 180
// },
// {
// id: 'earliestStart',
// valueType: 'string',
// makeLink: false,
// externalLink: false,
// sortValues: true,
// numberedList: false,
// minWidth: 180
// },
// {
// id: 'latestEnd',
// valueType: 'string',
// makeLink: false,
// externalLink: false,
// sortValues: true,
// numberedList: false,
// minWidth: 180
// }
] ]
} }
......
src/client/reducers/sampo/findsFacets.js
+ 113
− 93
View file @ 8c679a63
...@@ -23,6 +23,25 @@ export const INITIAL_STATE = { ...@@ -23,6 +23,25 @@ export const INITIAL_STATE = {
uriFilter: null, uriFilter: null,
priority: 1 priority: 1
}, },
objectType: {
id: 'objectType',
// predicate: defined in backend
distinctValueCount: 0,
values: [],
flatValues: [],
sortBy: 'instanceCount',
sortDirection: 'desc',
sortButton: true,
spatialFilterButton: false,
pieChartButton: true,
isFetching: false,
searchField: true,
containerClass: 'ten',
filterType: 'uriFilter',
uriFilter: null,
type: 'hierarchical',
priority: 6
},
// specification: { // specification: {
// id: 'specification', // id: 'specification',
// // predicate: defined in backend // // predicate: defined in backend
...@@ -41,61 +60,61 @@ export const INITIAL_STATE = { ...@@ -41,61 +60,61 @@ export const INITIAL_STATE = {
// uriFilter: null, // uriFilter: null,
// priority: 2 // priority: 2
// }, // },
type: { // type: {
id: 'type', // id: 'type',
// predicate: defined in backend // // predicate: defined in backend
distinctValueCount: 0, // distinctValueCount: 0,
values: [], // values: [],
flatValues: [], // flatValues: [],
sortBy: 'instanceCount', // sortBy: 'instanceCount',
sortDirection: 'desc', // sortDirection: 'desc',
sortButton: true, // sortButton: true,
spatialFilterButton: false, // spatialFilterButton: false,
pieChartButton: true, // pieChartButton: true,
isFetching: false, // isFetching: false,
searchField: true, // searchField: true,
containerClass: 'ten', // containerClass: 'ten',
filterType: 'uriFilter', // filterType: 'uriFilter',
uriFilter: null, // uriFilter: null,
priority: 2 // priority: 2
}, // },
subCategory: { // subCategory: {
id: 'subCategory', // id: 'subCategory',
// predicate: defined in backend // // predicate: defined in backend
distinctValueCount: 0, // distinctValueCount: 0,
values: [], // values: [],
flatValues: [], // flatValues: [],
sortBy: 'instanceCount', // sortBy: 'instanceCount',
sortDirection: 'desc', // sortDirection: 'desc',
sortButton: true, // sortButton: true,
spatialFilterButton: false, // spatialFilterButton: false,
pieChartButton: true, // pieChartButton: true,
isFetching: false, // isFetching: false,
searchField: true, // searchField: true,
containerClass: 'ten', // containerClass: 'ten',
filterType: 'uriFilter', // filterType: 'uriFilter',
uriFilter: null, // uriFilter: null,
priority: 3 // priority: 3
}, // },
objectSubCategory: { // objectSubCategory: {
id: 'objectSubCategory', // id: 'objectSubCategory',
// predicate: defined in backend // // predicate: defined in backend
distinctValueCount: 0, // distinctValueCount: 0,
values: [], // values: [],
flatValues: [], // flatValues: [],
sortBy: 'instanceCount', // sortBy: 'instanceCount',
sortDirection: 'desc', // sortDirection: 'desc',
sortButton: true, // sortButton: true,
spatialFilterButton: false, // spatialFilterButton: false,
pieChartButton: true, // pieChartButton: true,
isFetching: false, // isFetching: false,
searchField: true, // searchField: true,
containerClass: 'ten', // containerClass: 'ten',
filterType: 'uriFilter', // filterType: 'uriFilter',
uriFilter: null, // uriFilter: null,
priority: 3 // priority: 3,
// type: 'hierarchical' // //type: 'hierarchical'
}, // },
material: { material: {
id: 'material', id: 'material',
// predicate: defined in backend // predicate: defined in backend
...@@ -115,42 +134,42 @@ export const INITIAL_STATE = { ...@@ -115,42 +134,42 @@ export const INITIAL_STATE = {
priority: 4, priority: 4,
type: 'hierarchical' type: 'hierarchical'
}, },
materialLiteral: { // materialLiteral: {
id: 'materialLiteral', // id: 'materialLiteral',
// predicate: defined in backend // // predicate: defined in backend
distinctValueCount: 0, // distinctValueCount: 0,
values: [], // values: [],
flatValues: [], // flatValues: [],
sortBy: 'instanceCount', // sortBy: 'instanceCount',
sortDirection: 'desc', // sortDirection: 'desc',
sortButton: true, // sortButton: true,
spatialFilterButton: false, // spatialFilterButton: false,
pieChartButton: true, // pieChartButton: true,
isFetching: false, // isFetching: false,
searchField: true, // searchField: true,
containerClass: 'ten', // containerClass: 'ten',
filterType: 'uriFilter', // filterType: 'uriFilter',
uriFilter: null, // uriFilter: null,
priority: 4 // priority: 4,
}, // },
period: { // period: {
id: 'period', // id: 'period',
// predicate: defined in backend // // predicate: defined in backend
distinctValueCount: 0, // distinctValueCount: 0,
values: [], // values: [],
flatValues: [], // flatValues: [],
sortBy: 'instanceCount', // sortBy: 'instanceCount',
sortDirection: 'desc', // sortDirection: 'desc',
sortButton: true, // sortButton: true,
spatialFilterButton: false, // spatialFilterButton: false,
pieChartButton: true, // pieChartButton: true,
isFetching: false, // isFetching: false,
searchField: true, // searchField: true,
containerClass: 'ten', // containerClass: 'ten',
filterType: 'uriFilter', // filterType: 'uriFilter',
uriFilter: null, // uriFilter: null,
priority: 5 // priority: 5
}, // },
periodObject: { periodObject: {
id: 'periodObject', id: 'periodObject',
// predicate: defined in backend // predicate: defined in backend
...@@ -170,8 +189,8 @@ export const INITIAL_STATE = { ...@@ -170,8 +189,8 @@ export const INITIAL_STATE = {
type: 'hierarchical', type: 'hierarchical',
priority: 6 priority: 6
}, },
municipality: { place: {
id: 'municipality', id: 'place',
// predicate: defined in backend // predicate: defined in backend
distinctValueCount: 0, distinctValueCount: 0,
values: [], values: [],
...@@ -186,6 +205,7 @@ export const INITIAL_STATE = { ...@@ -186,6 +205,7 @@ export const INITIAL_STATE = {
containerClass: 'ten', containerClass: 'ten',
filterType: 'uriFilter', filterType: 'uriFilter',
uriFilter: null, uriFilter: null,
type: 'hierarchical',
priority: 6 priority: 6
} }
} }
......
src/server/sparql/sampo/sparql_queries/SparqlQueriesFinds.js
+ 2
− 2
View file @ 8c679a63
...@@ -67,8 +67,8 @@ export const findPropertiesFacetResults = ...@@ -67,8 +67,8 @@ export const findPropertiesFacetResults =
} }
UNION UNION
{ {
?id :object_type ?objectSubCatecory__id. ?id :object_type ?objectType__id.
?objectSubCatecory___id skos:prefLabel ?objectSubCatecory___prefLabel . ?objectType__id skos:prefLabel ?objectType__prefLabel .
} }
UNION UNION
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment