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

Clean up

parent 1ee2c49d
No related branches found
No related tags found
No related merge requests found
...@@ -209,7 +209,7 @@ const generateSelectedNoHitsBlock = ({ ...@@ -209,7 +209,7 @@ const generateSelectedNoHitsBlock = ({
const hasPreviousSelections = (constraints, facetID) => { const hasPreviousSelections = (constraints, facetID) => {
let hasPreviousSelections = false let hasPreviousSelections = false
constraints.map(facet => { constraints.forEach(facet => {
if (facet.facetID === facetID && facet.filterType === 'uriFilter') { if (facet.facetID === facetID && facet.filterType === 'uriFilter') {
hasPreviousSelections = true hasPreviousSelections = true
} }
...@@ -219,7 +219,7 @@ const hasPreviousSelections = (constraints, facetID) => { ...@@ -219,7 +219,7 @@ const hasPreviousSelections = (constraints, facetID) => {
const hasPreviousSelectionsFromOtherFacets = (constraints, facetID) => { const hasPreviousSelectionsFromOtherFacets = (constraints, facetID) => {
let hasPreviousSelectionsFromOtherFacets = false let hasPreviousSelectionsFromOtherFacets = false
constraints.map(facet => { constraints.forEach(facet => {
if (facet.facetID !== facetID && facet.filterType === 'uriFilter') { if (facet.facetID !== facetID && facet.filterType === 'uriFilter') {
const unknownAsOnlySelection = facet.values.length === 1 && facet.values[0] === 'http://ldf.fi/MISSING_VALUE' const unknownAsOnlySelection = facet.values.length === 1 && facet.values[0] === 'http://ldf.fi/MISSING_VALUE'
if (!unknownAsOnlySelection) { if (!unknownAsOnlySelection) {
...@@ -232,7 +232,7 @@ const hasPreviousSelectionsFromOtherFacets = (constraints, facetID) => { ...@@ -232,7 +232,7 @@ const hasPreviousSelectionsFromOtherFacets = (constraints, facetID) => {
const getUriFilters = (constraints, facetID) => { const getUriFilters = (constraints, facetID) => {
let filters = [] let filters = []
constraints.map(facet => { constraints.forEach(facet => {
if (facet.facetID === facetID && facet.filterType === 'uriFilter') { if (facet.facetID === facetID && facet.filterType === 'uriFilter') {
filters = facet.values filters = facet.values
} }
......
...@@ -16,7 +16,7 @@ export const generateConstraintsBlock = ({ ...@@ -16,7 +16,7 @@ export const generateConstraintsBlock = ({
const skipFacetID = constrainSelf ? '' : facetID const skipFacetID = constrainSelf ? '' : facetID
const modifiedConstraints = constraints.filter(facet => facet.facetID !== skipFacetID) const modifiedConstraints = constraints.filter(facet => facet.facetID !== skipFacetID)
modifiedConstraints.sort((a, b) => a.priority - b.priority) modifiedConstraints.sort((a, b) => a.priority - b.priority)
modifiedConstraints.map(c => { modifiedConstraints.forEach(c => {
switch (c.filterType) { switch (c.filterType) {
case 'textFilter': case 'textFilter':
filterStr += generateTextFilter({ filterStr += generateTextFilter({
...@@ -38,7 +38,8 @@ export const generateConstraintsBlock = ({ ...@@ -38,7 +38,8 @@ export const generateConstraintsBlock = ({
inverse: inverse, inverse: inverse,
filterTripleFirst, filterTripleFirst,
selectAlsoSubconcepts: Object.prototype.hasOwnProperty.call(c, 'selectAlsoSubconcepts') selectAlsoSubconcepts: Object.prototype.hasOwnProperty.call(c, 'selectAlsoSubconcepts')
? c.selectAlsoSubconcepts : true, // default behaviour for hierarchical facets, can be controlled via reducers ? c.selectAlsoSubconcepts
: true, // default behaviour for hierarchical facets, can be controlled via reducers
useConjuction: c.useConjuction useConjuction: c.useConjuction
}) })
break break
...@@ -244,14 +245,14 @@ const generateUriFilter = ({ ...@@ -244,14 +245,14 @@ const generateUriFilter = ({
const valuesStr = generateValuesForUriFilter({ values: modifiedValues, literal, useConjuction }) const valuesStr = generateValuesForUriFilter({ values: modifiedValues, literal, useConjuction })
s = useConjuction s = useConjuction
? generateConjuctionForUriFilter({ ? generateConjuctionForUriFilter({
facetID, facetID,
predicate, predicate,
parentProperty, parentProperty,
filterTarget, filterTarget,
inverse, inverse,
includeChildren, includeChildren,
valuesStr valuesStr
}) })
: generateDisjunctionForUriFilter({ : generateDisjunctionForUriFilter({
facetID, facetID,
predicate, predicate,
......
...@@ -85,7 +85,7 @@ export const mapLineChart = ({ sparqlBindings, config }) => { ...@@ -85,7 +85,7 @@ export const mapLineChart = ({ sparqlBindings, config }) => {
const seriesData = [] const seriesData = []
const categoriesData = [] const categoriesData = []
const sparqlBindingsLength = sparqlBindings.length const sparqlBindingsLength = sparqlBindings.length
sparqlBindings.map((b, index, bindings) => { sparqlBindings.forEach((b, index, bindings) => {
const currentCategory = parseInt(b.category.value) const currentCategory = parseInt(b.category.value)
const currentValue = parseInt(b.count.value) const currentValue = parseInt(b.count.value)
seriesData.push(currentValue) seriesData.push(currentValue)
...@@ -129,7 +129,7 @@ export const mapMultipleLineChart = ({ sparqlBindings, config }) => { ...@@ -129,7 +129,7 @@ export const mapMultipleLineChart = ({ sparqlBindings, config }) => {
if (config && config.fillEmptyValues) { if (config && config.fillEmptyValues) {
// fill the missing years with zeroes // fill the missing years with zeroes
const valmax = Math.max(...category) const valmax = Math.max(...category)
for (var i = Math.min(...category); i <= valmax; i++) { for (let i = Math.min(...category); i <= valmax; i++) {
for (const p in res) { for (const p in res) {
if (p !== 'category') { if (p !== 'category') {
res[p][i] = 0 res[p][i] = 0
...@@ -149,7 +149,7 @@ export const mapMultipleLineChart = ({ sparqlBindings, config }) => { ...@@ -149,7 +149,7 @@ export const mapMultipleLineChart = ({ sparqlBindings, config }) => {
// sort by year and remove empty sequence at start and end // sort by year and remove empty sequence at start and end
for (const p in res) { for (const p in res) {
var arr = Object.entries(res[p]) const arr = Object.entries(res[p])
.map(p => [parseFloat(p[0]), p[1]]) .map(p => [parseFloat(p[0]), p[1]])
.sort((a, b) => ((a[0] < b[0]) ? -1 : ((a[0] > b[0]) ? 1 : 0))) .sort((a, b) => ((a[0] < b[0]) ? -1 : ((a[0] > b[0]) ? 1 : 0)))
res[p] = trimResult(arr) res[p] = trimResult(arr)
...@@ -199,7 +199,7 @@ const trimResult = arr => { ...@@ -199,7 +199,7 @@ const trimResult = arr => {
} }
const mapFacetValues = sparqlBindings => { const mapFacetValues = sparqlBindings => {
const results = sparqlBindings.map(b => { const results = sparqlBindings.forEach(b => {
try { try {
return { return {
id: b.id.value, id: b.id.value,
......
...@@ -30,9 +30,6 @@ export const runSelectQuery = async ({ ...@@ -30,9 +30,6 @@ export const runSelectQuery = async ({
data: q data: q
}) })
if (resultFormat === 'json') { if (resultFormat === 'json') {
if (resultMapper) {
}
const mappedResults = resultMapperConfig const mappedResults = resultMapperConfig
? resultMapper({ sparqlBindings: response.data.results.bindings, config: resultMapperConfig }) ? resultMapper({ sparqlBindings: response.data.results.bindings, config: resultMapperConfig })
: resultMapper(response.data.results.bindings) : resultMapper(response.data.results.bindings)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment