From e8991297b2bdf482db857a12da4e7cd78c41aa13 Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Wed, 24 Feb 2021 10:20:29 +0200
Subject: [PATCH] Update components for storybook
---
.../components/facet_results/ApexChart.js | 2 ++
.../components/facet_results/Deck.stories.js | 34 +++++++++++++++++--
.../components/facet_results/ExportCSV.js | 3 +-
.../InstanceHomePageTable.stories.js | 2 +-
.../sampo/InstanceHomePage.stories.js | 2 +-
.../sampo}/TopBar.stories.js | 2 +-
src/client/index.js | 1 -
7 files changed, 38 insertions(+), 8 deletions(-)
rename src/client/components/{main_layout => perspectives/sampo}/TopBar.stories.js (91%)
diff --git a/src/client/components/facet_results/ApexChart.js b/src/client/components/facet_results/ApexChart.js
index 7c5a3191..4e988401 100644
--- a/src/client/components/facet_results/ApexChart.js
+++ b/src/client/components/facet_results/ApexChart.js
@@ -207,4 +207,6 @@ ApexChart.propTypes = {
resultClasses: PropTypes.array
}
+export const ApexChartComponent = ApexChart
+
export default withStyles(styles)(ApexChart)
diff --git a/src/client/components/facet_results/Deck.stories.js b/src/client/components/facet_results/Deck.stories.js
index 6d3c9a7c..3792c773 100644
--- a/src/client/components/facet_results/Deck.stories.js
+++ b/src/client/components/facet_results/Deck.stories.js
@@ -1,6 +1,6 @@
import React from 'react'
+import intl from 'react-intl-universal'
import Deck, { DeckComponent } from './Deck'
-import MigrationsMapLegend from '../perspectives/sampo/MigrationsMapLegend'
import { MAPBOX_ACCESS_TOKEN, MAPBOX_STYLE } from '../../configs/sampo/GeneralConfig'
import 'mapbox-gl/dist/mapbox-gl.css'
import { results } from './Deck.testData'
@@ -12,7 +12,7 @@ export default {
export const arcLayer = () =>
<div style={{ width: '100%', height: '100%' }}>
- <Deck
+ {/* <Deck
results={results}
facetUpdateID={0}
resultClass='placesMsMigrations'
@@ -23,5 +23,33 @@ export const arcLayer = () =>
layerType='arcLayer'
mapBoxAccessToken={MAPBOX_ACCESS_TOKEN}
mapBoxStyle={MAPBOX_STYLE}
- />
+ /> */}
+ <Deck
+ results={results}
+ facetUpdateID={0}
+ // instanceAnalysisData={props.placesResults.instanceAnalysisData}
+ // instanceAnalysisDataUpdateID={props.placesResults.instanceAnalysisDataUpdateID}
+ resultClass='placesMsMigrations'
+ facetClass='perspective1'
+ fetchResults={() => null}
+ // fetchInstanceAnalysis={props.fetchInstanceAnalysis}
+ fetching={false}
+ fetchingInstanceAnalysisData={false}
+ layerType='arcLayer'
+ getArcWidth={d => d.instanceCountScaled}
+ fromText={intl.get('deckGlMap.manuscriptMigrations.from')}
+ toText={intl.get('deckGlMap.manuscriptMigrations.to')}
+ countText={intl.get('deckGlMap.manuscriptMigrations.count')}
+ legendTitle={intl.get('deckGlMap.manuscriptMigrations.legendTitle')}
+ legendFromText={intl.get('deckGlMap.manuscriptMigrations.legendFrom')}
+ legendToText={intl.get('deckGlMap.manuscriptMigrations.legendTo')}
+ showMoreText={intl.get('deckGlMap.showMoreInformation')}
+ listHeadingSingleInstance={intl.get('deckGlMap.manuscriptMigrations.listHeadingSingleInstance')}
+ listHeadingMultipleInstances={intl.get('deckGlMap.manuscriptMigrations.listHeadingMultipleInstances')}
+ instanceVariable='manuscript'
+ showTooltips
+ mapBoxAccessToken={MAPBOX_ACCESS_TOKEN}
+ mapBoxStyle={MAPBOX_STYLE}
+ />}
+
</div>
diff --git a/src/client/components/facet_results/ExportCSV.js b/src/client/components/facet_results/ExportCSV.js
index fc5a939b..d2b1ae04 100644
--- a/src/client/components/facet_results/ExportCSV.js
+++ b/src/client/components/facet_results/ExportCSV.js
@@ -3,9 +3,10 @@ import PropTypes from 'prop-types'
import { withStyles } from '@material-ui/core/styles'
import Button from '@material-ui/core/Button'
import Paper from '@material-ui/core/Paper'
-import { apiUrl } from '../../epics/index.js'
import { stateToUrl } from '../../helpers/helpers'
+const apiUrl = process.env.API_URL
+
const styles = theme => ({
root: {
height: 'calc(100% - 72px)',
diff --git a/src/client/components/main_layout/InstanceHomePageTable.stories.js b/src/client/components/main_layout/InstanceHomePageTable.stories.js
index 78376562..571b8766 100644
--- a/src/client/components/main_layout/InstanceHomePageTable.stories.js
+++ b/src/client/components/main_layout/InstanceHomePageTable.stories.js
@@ -1,7 +1,7 @@
import React from 'react'
import { useSelector } from 'react-redux'
import InstanceHomePageTable, { InstanceHomePageTableComponent } from './InstanceHomePageTable'
-import { data } from './InstanceHomePage.testData.js'
+import { data } from '../perspectives/sampo/InstanceHomePage.testData.js'
import PaperContainer from '../../../../.storybook/PaperContainer'
export default {
diff --git a/src/client/components/perspectives/sampo/InstanceHomePage.stories.js b/src/client/components/perspectives/sampo/InstanceHomePage.stories.js
index 92f04598..6f4b1a21 100644
--- a/src/client/components/perspectives/sampo/InstanceHomePage.stories.js
+++ b/src/client/components/perspectives/sampo/InstanceHomePage.stories.js
@@ -2,7 +2,7 @@ import React from 'react'
import { useSelector } from 'react-redux'
import { useLocation } from 'react-router-dom'
import InstanceHomePage, { InstanceHomePageComponent } from './InstanceHomePage'
-import { perspectiveConfig } from '../../configs/sampo/PerspectiveConfig'
+import { perspectiveConfig } from '../../../configs/sampo/PerspectiveConfig'
import { data, sparqlQuery } from './InstanceHomePage.testData.js'
export default {
diff --git a/src/client/components/main_layout/TopBar.stories.js b/src/client/components/perspectives/sampo/TopBar.stories.js
similarity index 91%
rename from src/client/components/main_layout/TopBar.stories.js
rename to src/client/components/perspectives/sampo/TopBar.stories.js
index cd7f97b7..63ab31d4 100644
--- a/src/client/components/main_layout/TopBar.stories.js
+++ b/src/client/components/perspectives/sampo/TopBar.stories.js
@@ -2,7 +2,7 @@ import React from 'react'
import TopBar from './TopBar'
import { useSelector } from 'react-redux'
import { useLocation } from 'react-router-dom'
-import { perspectiveConfig } from '../../configs/sampo/PerspectiveConfig'
+import { perspectiveConfig } from '../../../configs/sampo/PerspectiveConfig'
export default {
component: TopBar,
diff --git a/src/client/index.js b/src/client/index.js
index c60799a8..3f65f304 100644
--- a/src/client/index.js
+++ b/src/client/index.js
@@ -11,7 +11,6 @@ import { loadLocales } from './actions'
import { defaultLocale } from './configs/sampo/GeneralConfig'
import { updateLocaleToPathname } from './helpers/helpers'
-
import './index.css'
import 'react-sortable-tree/style.css'
import 'react-redux-toastr/lib/css/react-redux-toastr.min.css'
--
GitLab