Separate folder for JSON configs

Author: esikkala

src/client/components/main_layout/InstancePage.stories.js

@@ -55,7 +55,7 @@ import {
   from '../helpers/helpers'
 
 // ** Generate portal configuration based on JSON configs **
-import portalConfig from '../configs/portalConfig.json'
+import portalConfig from '../../configs/portalConfig.json'
 await processPortalConfig(portalConfig)
 const {
   portalID,
@@ -71,9 +71,9 @@ const perspectiveConfigOnlyInfoPages = await createPerspectiveConfigOnlyInfoPage
   portalID,
   onlyInstancePagePerspectives: perspectives.onlyInstancePages
 })
-const apexChartsConfig = await import(`../configs/${portalID}/ApexCharts/ApexChartsConfig`)
-const leafletConfig = await import(`../configs/${portalID}/Leaflet/LeafletConfig`)
-const networkConfig = await import(`../configs/${portalID}/Cytoscape.js/NetworkConfig`)
+const apexChartsConfig = await import(`../library_configs/${portalID}/ApexCharts/ApexChartsConfig`)
+const leafletConfig = await import(`../library_configs/${portalID}/Leaflet/LeafletConfig`)
+const networkConfig = await import(`../library_configs/${portalID}/Cytoscape.js/NetworkConfig`)
 // ** portal configuration end **
 
 // ** Import general components **

src/client/containers/SemanticPortal.js

@@ -51,7 +51,7 @@ import {
   updateKnowledgeGraphMetadata,
   fetchGeoJSONLayersFailed
 } from '../actions'
-import portalConfig from '../configs/portalConfig.json'
+import portalConfig from '../../configs/portalConfig.json'
 const { portalID, localeConfig, documentFinderConfig } = portalConfig
 const { documentFinderAPIUrl } = documentFinderConfig
 export const availableLocales = {}

src/client/epics/index.js

@@ -200,7 +200,7 @@ export const processPortalConfig = async portalConfig => {
 export const createPerspectiveConfig = async ({ portalID, searchPerspectives }) => {
   const perspectiveConfig = []
   for (const perspectiveID of searchPerspectives) {
-    const { default: perspective } = await import(`../configs/${portalID}/perspective_configs/search_perspectives/${perspectiveID}.json`)
+    const { default: perspective } = await import(`../../configs/${portalID}/search_perspectives/${perspectiveID}.json`)
     perspectiveConfig.push(perspective)
   }
   for (const perspective of perspectiveConfig) {
@@ -252,7 +252,7 @@ export const createPerspectiveConfig = async ({ portalID, searchPerspectives })
 export const createPerspectiveConfigOnlyInfoPages = async ({ portalID, onlyInstancePagePerspectives }) => {
   const perspectiveConfigOnlyInfoPages = []
   for (const perspectiveID of onlyInstancePagePerspectives) {
-    const { default: perspective } = await import(`../configs/${portalID}/perspective_configs/only_instance_pages/${perspectiveID}.json`)
+    const { default: perspective } = await import(`../../configs/${portalID}/only_instance_pages/${perspectiveID}.json`)
     perspectiveConfigOnlyInfoPages.push(perspective)
   }
   for (const perspective of perspectiveConfigOnlyInfoPages) {

src/client/helpers/helpers.js

@@ -15,7 +15,7 @@ import './index.css'
 import '@nosferatu500/react-sortable-tree/style.css'
 import 'react-redux-toastr/lib/css/react-redux-toastr.min.css'
 import 'mapbox-gl/dist/mapbox-gl.css'
-import portalConfig from './configs/portalConfig.json'
+import portalConfig from '../configs/portalConfig.json'
 
 const { localeConfig } = portalConfig
 const store = configureStore()

src/client/index.js

@@ -1,4 +1,4 @@
-import portalConfig from '../configs/portalConfig.json'
+import portalConfig from '../../configs/portalConfig.json'
 import { combineReducers } from 'redux'
 import { reducer as toastrReducer } from 'react-redux-toastr'
 import { createResultsReducer } from './general/results'
@@ -30,11 +30,11 @@ const { portalID, perspectives } = portalConfig
 const perspectiveConfig = []
 const perspectiveConfigOnlyInfoPages = []
 for (const perspectiveID of perspectives.searchPerspectives) {
-  const { default: perspective } = await import(`../configs/${portalID}/perspective_configs/search_perspectives/${perspectiveID}.json`)
+  const { default: perspective } = await import(`../../configs/${portalID}/search_perspectives/${perspectiveID}.json`)
   perspectiveConfig.push(perspective)
 }
 for (const perspectiveID of perspectives.onlyInstancePages) {
-  const { default: perspective } = await import(`../configs/${portalID}/perspective_configs/only_instance_pages/${perspectiveID}.json`)
+  const { default: perspective } = await import(`../../configs/${portalID}/only_instance_pages/${perspectiveID}.json`)
   perspectiveConfigOnlyInfoPages.push(perspective)
 }
 for (const perspective of perspectiveConfig) {

src/client/configs/sampo/ApexCharts/ApexChartsConfig.js renamed to src/client/library_configs/sampo/ApexCharts/ApexChartsConfig.js

@@ -3,13 +3,13 @@ import { has } from 'lodash'
 // import { backendSearchConfig } from '../sparql/sampo/BackendSearchConfig'
 
 export const createBackendSearchConfig = async () => {
-  const portalConfigJSON = await readFile('src/client/configs/portalConfig.json')
+  const portalConfigJSON = await readFile('src/configs/portalConfig.json')
   const portalConfig = JSON.parse(portalConfigJSON)
   const resultMappers = await import('./Mappers')
   const { portalID } = portalConfig
   const backendSearchConfig = {}
   for (const perspectiveID of portalConfig.perspectives.searchPerspectives) {
-    const perspectiveConfigJSON = await readFile(`src/client/configs/${portalID}/perspective_configs/search_perspectives/${perspectiveID}.json`)
+    const perspectiveConfigJSON = await readFile(`src/configs/${portalID}/search_perspectives/${perspectiveID}.json`)
     const perspectiveConfig = JSON.parse(perspectiveConfigJSON)
     const { sparqlQueriesFile } = perspectiveConfig
     const sparqlQueries = await import(`../sparql/${portalID}/sparql_queries/${sparqlQueriesFile}`)
@@ -87,7 +87,7 @@ export const createBackendSearchConfig = async () => {
     backendSearchConfig[perspectiveID] = perspectiveConfig
   }
   for (const perspectiveID of portalConfig.perspectives.onlyInstancePages) {
-    const perspectiveConfigJSON = await readFile(`src/client/configs/${portalID}/perspective_configs/only_instance_pages/${perspectiveID}.json`)
+    const perspectiveConfigJSON = await readFile(`src/configs/${portalID}/only_instance_pages/${perspectiveID}.json`)
     const perspectiveConfig = JSON.parse(perspectiveConfigJSON)
     const { sparqlQueriesFile } = perspectiveConfig
     const sparqlQueries = await import(`../sparql/${portalID}/sparql_queries/${sparqlQueriesFile}`)
@@ -201,7 +201,7 @@ export const mergeFacetConfigs = (oldFacets, mergedFacets) => {
 }
 
 export const mergeResultClasses = async oldBackendSearchConfig => {
-  const portalConfigJSON = await readFile('src/client/configs/portalConfig.json')
+  const portalConfigJSON = await readFile('src/configs/portalConfig.json')
   const portalConfig = JSON.parse(portalConfigJSON)
   const { portalID } = portalConfig
   const newPerspectiveConfigs = {}
@@ -211,7 +211,7 @@ export const mergeResultClasses = async oldBackendSearchConfig => {
     if (has(resultClassConfig, 'perspectiveID')) {
       const { perspectiveID } = resultClassConfig
       if (!has(newPerspectiveConfigs, perspectiveID)) {
-        const perspectiveConfigJSON = await readFile(`src/client/configs/${portalID}/perspective_configs/search_perspectives/${perspectiveID}.json`)
+        const perspectiveConfigJSON = await readFile(`src/configs/${portalID}/search_perspectives/${perspectiveID}.json`)
         newPerspectiveConfigs[perspectiveID] = JSON.parse(perspectiveConfigJSON)
       }
     }