Merge branch 'configs'

Author: esikkala

package-lock.json

@@ -17,6 +17,7 @@
     "client": "cross-env BABEL_ENV=browser webpack serve --config webpack.client.dev.js",
     "dev": "concurrently --prefix none --kill-others \"npm run server\" \"npm run client\"",
     "server": "cross-env BABEL_ENV=node NODE_ENV=development nodemon -r dotenv/config src/server/index.js --exec babel-node",
+    "utils": "cross-env BABEL_ENV=node NODE_ENV=development nodemon -r dotenv/config src/server/sparql/Utils.js --exec babel-node",
     "sitemap": "cross-env BABEL_ENV=node babel-node src/server/sitemap_generator/SitemapGenerator.js",
     "translate": "cross-env BABEL_ENV=node babel-node src/server/translations_generator/index.js"
   },
@@ -31,7 +32,7 @@
     "@shakacode/recompose": "^0.30.3",
     "@turf/buffer": "^6.3.0",
     "apexcharts": "^3.26.0",
-    "axios": "^0.21.4",
+    "axios": "^0.24.0",
     "buffer": "^6.0.3",
     "core-js": "^3.19.1",
     "cytoscape": "^3.12.1",
@@ -105,16 +106,13 @@
     "sitemap": "^6.3.5",
     "standard": "^16.0.4",
     "style-loader": "^2.0.0",
-    "webpack": "^5.51.1",
+    "webpack": "^5.64.4",
     "webpack-cli": "^4.8.0",
-    "webpack-dev-server": "^4.0.0",
+    "webpack-dev-server": "^4.6.0",
     "webpack-merge": "^5.7.3"
   },
   "standard": {
-    "parser": "@babel/eslint-parser",
-    "env": {
-      "jest": true
-    }
+    "parser": "@babel/eslint-parser"
   },
   "optionalDependencies": {
     "fsevents": "^2.3.2"

package.json

@@ -73,6 +73,7 @@ export const fetchPaginatedResultsFailed = (resultClass, error, message) => ({
   message
 })
 export const fetchResults = ({
+  perspectiveID,
   resultClass,
   facetClass,
   uri = null,
@@ -81,6 +82,7 @@ export const fetchResults = ({
   reason = null
 }) => ({
   type: FETCH_RESULTS,
+  perspectiveID,
   resultClass,
   facetClass,
   uri,
@@ -174,8 +176,9 @@ export const updateRowsPerPage = (resultClass, rowsPerPage) => ({
   resultClass,
   rowsPerPage
 })
-export const fetchByURI = ({ resultClass, facetClass, uri }) => ({
+export const fetchByURI = ({ perspectiveID, resultClass, facetClass, uri }) => ({
   type: FETCH_BY_URI,
+  perspectiveID,
   resultClass,
   facetClass,
   uri
@@ -356,8 +359,9 @@ export const clientFSToggleDataset = dataset => ({
   dataset
 })
 
-export const clientFSFetchResults = ({ jenaIndex, query }) => ({
+export const clientFSFetchResults = ({ perspectiveID, jenaIndex, query }) => ({
   type: CLIENT_FS_FETCH_RESULTS,
+  perspectiveID,
   jenaIndex,
   query
 })

src/client/__tests__/IntegrationAutosuggest.test.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import IconButton from '@material-ui/core/IconButton'
 import Tooltip from '@material-ui/core/Tooltip'
 import GeneralDialog from '../main_layout/GeneralDialog'
-import ApexChart from '../facet_results/ApexChart'
+import ApexCharts from '../facet_results/ApexCharts'
 import { makeStyles } from '@material-ui/core/styles'
 
 const useStyles = makeStyles(theme => ({
@@ -56,7 +56,7 @@ const ChartDialog = props => {
         dialogTitle={props.dialogTitle}
       >
         <div className={classes.chartContainer}>
-          <ApexChart
+          <ApexCharts
             pageType='dialog'
             facetID={facetID}
             resultClass={resultClass}

src/client/__tests__/__snapshots__/IntegrationAutosuggest.test.js.snap

@@ -19,6 +19,7 @@ import AccordionDetails from '@material-ui/core/AccordionDetails'
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore'
 import Typography from '@material-ui/core/Typography'
 import clsx from 'clsx'
+import { has } from 'lodash'
 
 const styles = theme => ({
   root: {
@@ -249,7 +250,6 @@ class FacetBar extends React.Component {
       <Accordion
         key={facetID}
         expanded={isActive}
-        // onClick={this.handleExpandButtonOnClick(facetID)}
       >
         <AccordionSummary
           classes={{
@@ -281,6 +281,11 @@ class FacetBar extends React.Component {
             facetDescription={description}
             rootUrl={this.props.rootUrl}
             layoutConfig={this.props.layoutConfig}
+            mapBoxAccessToken={this.props.mapBoxAccessToken}
+            mapBoxStyle={this.props.mapBoxStyle}
+            apexChartsConfig={this.props.apexChartsConfig}
+            leafletConfig={this.props.leafletConfig}
+            networkConfig={this.props.networkConfig}
           />
         </AccordionSummary>
         <AccordionDetails
@@ -322,6 +327,7 @@ class FacetBar extends React.Component {
           />
           {facets && Object.keys(facets).map(facetID => {
             if (facetID === 'datasetSelector') { return null }
+            if (!has(facets[facetID], 'filterType')) { return null }
             return this.renderFacet(facetID, someFacetIsFetching)
           })}
         </Accordion>
@@ -331,6 +337,7 @@ class FacetBar extends React.Component {
         <>
           {facets && Object.keys(facets).map(facetID => {
             if (facetID === 'datasetSelector') { return null }
+            if (!has(facets[facetID], 'filterType')) { return null }
             return this.renderFacet(facetID, someFacetIsFetching)
           })}
         </>
@@ -365,13 +372,15 @@ class FacetBar extends React.Component {
           />}
         {facetedSearchMode === 'clientFS' &&
           <LeafletMapDialog
+            portalConfig={this.props.portalConfig}
             clientFSState={this.props.clientFSState}
             clientFSFetchResults={this.props.clientFSFetchResults}
             clientFSClearResults={this.props.clientFSClearResults}
             updateMapBounds={this.props.updateMapBounds}
             showError={this.props.showError}
             perspectiveID={facetClass}
             layoutConfig={this.props.layoutConfig}
+            leafletConfig={this.props.leafletConfig}
           />}
         {(facetedSearchMode === 'serverFS' || hasClientFSResults) &&
           <Paper className={classes.facetInfoContainer}>