diff --git a/src/client/components/facet_results/ObjectListCollapsible.js b/src/client/components/facet_results/ObjectListCollapsible.js index c499d4140a1e030800e70de73d9da65c6aa9b3c9..780abecafbb29fb0284c805664beff9619fe735f 100644 --- a/src/client/components/facet_results/ObjectListCollapsible.js +++ b/src/client/components/facet_results/ObjectListCollapsible.js @@ -7,21 +7,18 @@ import { orderBy, has } from 'lodash' import ObjectListItem from './ObjectListItem' import ObjectListItemSources from './ObjectListItemSources' import ObjectListItemEvent from './ObjectListItemEvent' +import classNames from 'classnames' const styles = () => ({ - valueList: { - paddingLeft: 20, - maxHeight: 200, + resultTableList: props => ({ + maxHeight: props.tableData.paginatedResultsRowContentMaxHeight + ? props.tableData.paginatedResultsRowContentMaxHeight + : 200, overflow: 'auto' - }, - valueListNoBullets: { - listStyle: 'none', - paddingLeft: 0 - }, - numberedList: { - maxHeight: 200, - overflow: 'auto' - }, + }), + valueList: props => ({ + paddingLeft: 20 + }), dateContainer: { width: 180, display: 'inline-block' @@ -103,12 +100,12 @@ const ObjectListCollapsible = props => { </> const renderBulletedList = data => - <ul className={props.classes.valueList}> + <ul className={classNames(classes.resultTableList, classes.valueList)}> {renderListItems(data)} </ul> const renderNumberedList = data => - <ol className={props.classes.numberedList}> + <ol className={classes.resultTableList}> {renderListItems(data)} </ol> diff --git a/src/client/components/facet_results/ResultTable.js b/src/client/components/facet_results/ResultTable.js index 88bfcca472cd51f72e810059aba34d0f0da9dc31..71ff24ecf1b7057925a94c3c6e68f5e8e1098eb6 100644 --- a/src/client/components/facet_results/ResultTable.js +++ b/src/client/components/facet_results/ResultTable.js @@ -226,6 +226,7 @@ class ResultTable extends React.Component { key={id} rowId={row.id} columnId={id} + tableData={data} data={columnData} valueType={valueType} makeLink={makeLink} diff --git a/src/client/components/facet_results/ResultTableCell.js b/src/client/components/facet_results/ResultTableCell.js index d9971e0285b38e6e3b4810e289335029907e64e2..694b87d2c5b725809a25de62d60c05efbde1ce1d 100644 --- a/src/client/components/facet_results/ResultTableCell.js +++ b/src/client/components/facet_results/ResultTableCell.js @@ -8,7 +8,7 @@ import ImageGallerySRL from '../main_layout/ImageGallerySRL' const ResultTableCell = props => { const { - data, valueType, makeLink, externalLink, sortValues, sortBy, numberedList, minWidth, + data, tableData, valueType, makeLink, externalLink, sortValues, sortBy, numberedList, minWidth, container, columnId, expanded, linkAsButton, collapsedMaxWords, showSource, sourceExternalLink, renderAsHTML, HTMLParserTask, referencedTerm, previewImageHeight, onExpandClick, rowId, shortenLabel @@ -22,6 +22,7 @@ const ResultTableCell = props => { cellContent = ( <ObjectListCollapsible data={data} + tableData={tableData} makeLink={makeLink} externalLink={externalLink} sortValues={sortValues} @@ -43,6 +44,7 @@ const ResultTableCell = props => { cellContent = ( <StringList data={data} + tableData={tableData} expanded={expanded} onExpandClick={onExpandClick} rowId={rowId} diff --git a/src/client/components/facet_results/StringList.js b/src/client/components/facet_results/StringList.js index 134f109882aef1afe8f0dd13f001683b50790609..0270dec825c5e1c31bcf8b394bdbce264f4fe9e8 100644 --- a/src/client/components/facet_results/StringList.js +++ b/src/client/components/facet_results/StringList.js @@ -3,21 +3,18 @@ import PropTypes from 'prop-types' import { withStyles } from '@material-ui/core/styles' import Collapse from '@material-ui/core/Collapse' import HTMLParser from '../../helpers/HTMLParser' +import classNames from 'classnames' const styles = theme => ({ - valueList: { - paddingLeft: 20, - maxHeight: 200, + resultTableList: props => ({ + maxHeight: props.tableData.paginatedResultsRowContentMaxHeight + ? props.tableData.paginatedResultsRowContentMaxHeight + : 200, overflow: 'auto' - }, - valueListNoBullets: { - listStyle: 'none', - paddingLeft: 0 - }, - numberedList: { - maxHeight: 200, - overflow: 'auto' - }, + }), + valueList: props => ({ + paddingLeft: 20 + }), tooltip: { maxWidth: 500 }, @@ -50,7 +47,7 @@ const StringList = props => { } return ( <> - <div className={props.classes.stringContainer}>{firstValue}</div> + <div>{firstValue}</div> {addThreeDots && <span className={props.classes.threeDots} onClick={() => props.onExpandClick(props.rowId)}> ...</span>} </> @@ -61,20 +58,20 @@ const StringList = props => { data = data.sort() if (props.numberedList) { return ( - <ol className={props.classes.numberedList}> + <ol className={classes.resultTableList}> {data.map((item, i) => <li key={i}>{item}</li>)} </ol> ) } else { return ( - <ul className={props.classes.valueList}> + <ul className={classNames(classes.resultTableList, classes.valueList)}> {data.map((item, i) => <li key={i}>{item}</li>)} </ul> ) } } - const { renderAsHTML } = props + const { renderAsHTML, classes } = props let { data } = props if (data == null || data === '-') { return '-' @@ -89,7 +86,7 @@ const StringList = props => { {!props.expanded && createFirstValue(data, isArray)} <Collapse in={props.expanded} timeout='auto' unmountOnExit> {isArray && createBasicList(data)} - {!isArray && <div className={props.classes.stringContainer}>{data}</div>} + {!isArray && <div>{data}</div>} </Collapse> </> ) diff --git a/src/client/containers/SemanticPortal.js b/src/client/containers/SemanticPortal.js index 28b6c3c87c117d311ff40a23c01e461d7119db2f..3f9c45130c81effdd49865fda9a245f86e17b8b9 100644 --- a/src/client/containers/SemanticPortal.js +++ b/src/client/containers/SemanticPortal.js @@ -468,6 +468,7 @@ const SemanticPortal = props => { </React.Fragment> ) } + return null })} {/* create routes for classes that have only info pages and no faceted search perspective */} {perspectiveConfigOnlyInfoPages.map(perspective => diff --git a/src/client/reducers/sampo/perspective1.js b/src/client/reducers/sampo/perspective1.js index cc62ae02e9579cd81bd8a676795a279dfe103c14..aa7a5a02c5b64383f6f7b610d948d869f0d3da0b 100644 --- a/src/client/reducers/sampo/perspective1.js +++ b/src/client/reducers/sampo/perspective1.js @@ -7,6 +7,7 @@ export const INITIAL_STATE = { paginatedResults: [], paginatedResultsSparqlQuery: null, paginatedResultsAlwaysExpandRows: true, + paginatedResultsRowContentMaxHeight: 190, resultCount: 0, page: -1, pagesize: 10, @@ -134,7 +135,7 @@ export const INITIAL_STATE = { sortValues: true, numberedList: false, minWidth: 220, - collapsedMaxWords: 12, + collapsedMaxWords: 5, expandedOnInstancePage: true }, {