From 6aecda4cbff7366161646864d11e52d9e68e38a1 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Mon, 10 Jan 2022 20:38:30 +0200
Subject: [PATCH] Adapt to LetterSampo configs
---
src/client/components/facet_results/ApexCharts.js | 4 +++-
src/client/components/facet_results/ResultClassRoute.js | 4 +++-
src/client/components/main_layout/MuiIcon.js | 8 ++++++--
src/server/sparql/FacetResults.js | 3 ++-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/client/components/facet_results/ApexCharts.js b/src/client/components/facet_results/ApexCharts.js
index 61212318..346c5abc 100644
--- a/src/client/components/facet_results/ApexCharts.js
+++ b/src/client/components/facet_results/ApexCharts.js
@@ -59,7 +59,9 @@ class ApexChart extends React.Component {
resultClass: this.state.resultClass,
facetClass: this.props.facetClass,
facetID: this.props.facetID,
- uri: this.props.uri
+ uri: this.props.perspectiveState.instanceTableData
+ ? this.props.perspectiveState.instanceTableData.id
+ : null
})
}
diff --git a/src/client/components/facet_results/ResultClassRoute.js b/src/client/components/facet_results/ResultClassRoute.js
index 3a8dd378..be8cd478 100644
--- a/src/client/components/facet_results/ResultClassRoute.js
+++ b/src/client/components/facet_results/ResultClassRoute.js
@@ -247,11 +247,13 @@ const ResultClassRoute = props => {
break
}
case 'ApexCharts': {
+ const { pageType = 'facetResults' } = resultClassConfig
const apexProps = {
portalConfig,
perspectiveConfig: perspective,
resultClassConfig,
apexChartsConfig: props.apexChartsConfig,
+ pageType,
screenSize,
resultClass,
facetClass,
@@ -260,7 +262,7 @@ const ResultClassRoute = props => {
fetching: perspectiveState.fetching,
resultUpdateID: perspectiveState.resultUpdateID,
instanceAnalysisDataUpdateID: perspectiveState.instanceAnalysisDataUpdateID,
- facetUpdateID: facetState.facetUpdateID,
+ facetUpdateID: facetState ? facetState.facetUpdateID : null,
fetchData: props.fetchResults
}
routeComponent = (
diff --git a/src/client/components/main_layout/MuiIcon.js b/src/client/components/main_layout/MuiIcon.js
index 552c629a..5c107aef 100644
--- a/src/client/components/main_layout/MuiIcon.js
+++ b/src/client/components/main_layout/MuiIcon.js
@@ -17,7 +17,9 @@ import {
KeyboardVoice,
Autorenew,
Add,
- PlayArrow
+ PlayArrow,
+ MailOutline,
+ TrendingDown
} from '@material-ui/icons'
import has from 'lodash'
@@ -40,7 +42,9 @@ const MuiIcon = props => {
KeyboardVoice: KeyboardVoice,
Autorenew: Autorenew,
Add: Add,
- PlayArrow: PlayArrow
+ PlayArrow: PlayArrow,
+ MailOutline: MailOutline,
+ TrendingDown: TrendingDown
}
if (has(MuiIcons, props.iconName)) {
const MuiIconComponent = MuiIcons[props.iconName]
diff --git a/src/server/sparql/FacetResults.js b/src/server/sparql/FacetResults.js
index a46c9b3a..f59171d2 100644
--- a/src/server/sparql/FacetResults.js
+++ b/src/server/sparql/FacetResults.js
@@ -178,7 +178,8 @@ export const getAllResults = ({
links: q,
nodes: sparqlQueryNodes,
optimize,
- limit
+ limit,
+ queryType: resultClassConfig.queryType
})
} else {
if (uri !== null) {
--
GitLab