diff --git a/src/client/components/facet_results/ApexChart.js b/src/client/components/facet_results/ApexChart.js index 7c5a319123409940c845c502fed7740cabd9245c..4e988401fe55d22bf8448ea194f0002962b4f321 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 6d3c9a7cc5aad37f892f748505eb69b8f5f198e8..3792c773f726a048efde76912b2c92d302deecd5 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 fc5a939b86976262317267694c51c624afb52c8f..d2b1ae042d0ff196d5b1182c658b45719c5d8832 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 78376562734c5a88c454f6d15a5aca22b4e36807..571b876623438d2651e5e3932f4af538b84e39c0 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 92f0459868c805c5cf2976c6a147ce5fabcc526f..6f4b1a21c63cf416d17c10e0f3e590aa46a38590 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 cd7f97b7c2f43260219bf326331feb8804178ae0..63ab31d477b1e8025592068522b53c9bf4247c3b 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 c60799a84ce52f8c75c6208eea40bb20c9b0a9fb..3f65f304e59e2cff9659c72e4f6f1ea56218b488 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'