From c6f4184cc719fd9e82ae1abf3578f242e9732dbb Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Wed, 29 Dec 2021 19:12:26 +0200
Subject: [PATCH] Adapt configs

---
 src/client/components/main_layout/MuiIcon.js |  6 +++--
 src/client/helpers/helpers.js                |  8 ++++---
 src/server/sparql/FacetResults.js            |  8 +++++++
 src/server/sparql/Utils.js                   | 25 +++++++-------------
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/client/components/main_layout/MuiIcon.js b/src/client/components/main_layout/MuiIcon.js
index 5a84acc3..be78abc8 100644
--- a/src/client/components/main_layout/MuiIcon.js
+++ b/src/client/components/main_layout/MuiIcon.js
@@ -15,7 +15,8 @@ import {
   ClearAll,
   OndemandVideo,
   KeyboardVoice,
-  Autorenew
+  Autorenew,
+  Add
 } from '@material-ui/icons'
 import has from 'lodash'
 
@@ -36,7 +37,8 @@ const MuiIcon = props => {
     ClearAll: ClearAll,
     OndemandVideo: OndemandVideo,
     KeyboardVoice: KeyboardVoice,
-    Autorenew: Autorenew
+    Autorenew: Autorenew,
+    Add: Add
   }
   if (has(MuiIcons, props.iconName)) {
     const MuiIconComponent = MuiIcons[props.iconName]
diff --git a/src/client/helpers/helpers.js b/src/client/helpers/helpers.js
index 1e14944d..e3780518 100644
--- a/src/client/helpers/helpers.js
+++ b/src/client/helpers/helpers.js
@@ -192,13 +192,15 @@ export const createURIfromLocalID = ({ localID, baseURI, URITemplate }) => {
 
 export const processPortalConfig = async portalConfig => {
   const { layoutConfig, mapboxConfig } = portalConfig
-  const { bannerImage, bannerBackround } = layoutConfig.mainPage
-  const { default: bannerImageURL } = await import(/* webpackMode: "eager" */ `../img/${bannerImage}`)
+  if (layoutConfig.mainPage) {
+    const { bannerImage, bannerBackround } = layoutConfig.mainPage
+    const { default: bannerImageURL } = await import(/* webpackMode: "eager" */ `../img/${bannerImage}`)
+    layoutConfig.mainPage.bannerBackround = bannerBackround.replace('<BANNER_IMAGE_URL', bannerImageURL)
+  }
   const mapboxAccessToken = process.env.MAPBOX_ACCESS_TOKEN
   if (mapboxConfig && mapboxAccessToken) {
     mapboxConfig.mapboxAccessToken = mapboxAccessToken
   }
-  layoutConfig.mainPage.bannerBackround = bannerBackround.replace('<BANNER_IMAGE_URL', bannerImageURL)
   if (layoutConfig.topBar.logoImage) {
     const { default: image } = await import(/* webpackMode: "eager" */ `../img/${layoutConfig.topBar.logoImage}`)
     layoutConfig.topBar.logoImage = image
diff --git a/src/server/sparql/FacetResults.js b/src/server/sparql/FacetResults.js
index 4996f63f..a46c9b3a 100644
--- a/src/server/sparql/FacetResults.js
+++ b/src/server/sparql/FacetResults.js
@@ -131,6 +131,8 @@ export const getAllResults = ({
   const {
     sparqlQuery,
     sparqlQueryNodes = null,
+    property = null,
+    rdfType = null,
     filterTarget = 'id',
     resultMapper = makeObjectList,
     resultMapperConfig = null,
@@ -162,6 +164,12 @@ export const getAllResults = ({
   if (toID) {
     q = q.replace(/<TO_ID>/g, `<${toID}>`)
   }
+  if (property) {
+    q = q.replace(/<PROPERTY>/g, property)
+  }
+  if (rdfType) {
+    q = q.replace(/<RDF_TYPE>/g, rdfType)
+  }
   if (resultClassConfig.useNetworkAPI) {
     return runNetworkQuery({
       endpoint: endpoint.url,
diff --git a/src/server/sparql/Utils.js b/src/server/sparql/Utils.js
index 00639c28..e26f041d 100644
--- a/src/server/sparql/Utils.js
+++ b/src/server/sparql/Utils.js
@@ -3,14 +3,8 @@ import { has } from 'lodash'
 
 // import { backendSearchConfig as oldBackendSearchConfig } from './veterans/BackendSearchConfig'
 
-// import { videosConfig } from './veterans/perspective_configs/VideosConfig'
-// import { clipsConfig } from './veterans/perspective_configs/ClipsConfig'
-// import { entitiesConfig } from './veterans/perspective_configs/EntitiesConfig'
-// import { coinsPerspectiveConfig } from './perspective_configs/CoinsPerspectiveConfig'
-
-// import { INITIAL_STATE } from '../../client/reducers/veterans/videosFacets'
-// import { INITIAL_STATE } from '../../client/reducers/veterans/clipsFacets'
-// import { INITIAL_STATE } from '../../client/reducers/veterans/entitiesFacets'
+// import { battlesPerspectiveConfig as oldPerspectiveConfig } from './sotasurmat/perspective_configs/BattlesPerspectiveConfig'
+// import { INITIAL_STATE } from '../../client/reducers/sotasurmat/battlesFacets'
 
 export const createBackendSearchConfig = async () => {
   const portalConfigJSON = await readFile('src/configs/portalConfig.json')
@@ -161,6 +155,9 @@ export const mergeFacetConfigs = (clientFacets, serverFacets) => {
     if (serverFacet.labelPath && serverFacet.labelPath !== '') {
       serverFacet.labelPath = serverFacet.labelPath.replace(/\s+/g, ' ').trim()
     }
+    if (serverFacet.orderByPattern && serverFacet.orderByPattern !== '') {
+      serverFacet.orderByPattern = serverFacet.orderByPattern.replace(/\s+/g, ' ').trim()
+    }
     if (serverFacet.textQueryPredicate && serverFacet.textQueryPredicate !== '') {
       serverFacet.textQueryPredicate = serverFacet.textQueryPredicate.replace(/\s+/g, ' ').trim()
     }
@@ -190,6 +187,9 @@ export const mergeFacetConfigs = (clientFacets, serverFacets) => {
     if (serverFacet.labelPath) {
       mergedFacet.sortByPredicate = serverFacet.labelPath
     }
+    if (serverFacet.orderByPattern) {
+      mergedFacet.sortByPattern = serverFacet.orderByPattern
+    }
 
     if (serverFacet.type === 'text') {
       mergedFacet.facetType = 'text'
@@ -327,11 +327,4 @@ export const createExtraResultClassesForJSONConfig = async oldBackendSearchConfi
 }
 
 // createExtraResultClassesForJSONConfig(oldBackendSearchConfig)
-
-// mergeFacetConfigs(INITIAL_STATE.facets, entitiesConfig.facets)
-
-// console.log(JSON.stringify(INITIAL_STATE.properties))
-
-// "tabID": 0,
-// "tabPath": "",
-// "tabIcon": "",
+// mergeFacetConfigs(INITIAL_STATE.facets, oldPerspectiveConfig.facets)
-- 
GitLab