diff --git a/src/client/components/FacetBar.js b/src/client/components/FacetBar.js index c6678eddf9c303e3704950f8b005bc24aca06999..aca3a8c824da44f1144f66360abd4d99f23c4539 100644 --- a/src/client/components/FacetBar.js +++ b/src/client/components/FacetBar.js @@ -87,7 +87,7 @@ class FacetBar extends React.Component { <Paper className={classes.headingContainer}> <Typography variant="h6">Production place</Typography> </Paper> - <div className={classes.facetValuesContainerTen}> + { /* <div className={classes.facetValuesContainerTen}> <Tree property='productionPlace' lastUpdatedFacet={facet.lastUpdatedFacet} @@ -95,6 +95,7 @@ class FacetBar extends React.Component { updateFilter={this.props.updateFilter} /> </div> + */ } </Paper> <Paper className={classes.facetContainerLast}> <Paper className={classes.headingContainer}> diff --git a/src/client/components/ResultTable.js b/src/client/components/ResultTable.js index cc493201b141b41788cfb152c38be64debd4aeed..737744fa1c6df3faa7c112438c4c93be46d425e8 100644 --- a/src/client/components/ResultTable.js +++ b/src/client/components/ResultTable.js @@ -36,6 +36,9 @@ const styles = () => ({ paddingLeft: 0 }, withFilter: { + //minWidth: 170 + }, + wideColumn: { minWidth: 170 }, infoIcon: { @@ -260,6 +263,9 @@ class ResultTable extends React.Component { {rows.map(row => { return ( <TableRow key={row.id}> + <TableCell className={classes.withFilter}> + {this.objectListRenderer(row.source, true)} + </TableCell> <TableCell className={classes.withFilter} > {this.stringListRenderer(row.prefLabel)} </TableCell> @@ -269,7 +275,7 @@ class ResultTable extends React.Component { <TableCell className={classes.withFilter}> {this.objectListRenderer(row.productionPlace, true)} </TableCell> - <TableCell className={classes.withFilter}> + <TableCell className={classes.wideColumn}> {this.objectListRenderer(row.timespan)} </TableCell> <TableCell className={classes.withFilter}> @@ -278,15 +284,13 @@ class ResultTable extends React.Component { {/*<TableCell className={classes.withFilter}> {this.stringListRenderer(row.material)} </TableCell>*/} - <TableCell className={classes.withFilter}> + <TableCell className={classes.wideColumn}> {this.eventRenderer(row.event)} </TableCell> - <TableCell className={classes.withFilter}> + <TableCell className={classes.wideColumn}> {this.ownerRenderer(row.owner)} </TableCell> - <TableCell className={classes.withFilter}> - {this.objectListRenderer(row.source, true)} - </TableCell> + </TableRow> ); })} diff --git a/src/client/components/ResultTableHead.js b/src/client/components/ResultTableHead.js index 92cb9f7ccc06de74bdfb1e8d803f15117531bb46..c1ffc9eb6e48824e4b015ae19a7ec718bbe316f3 100644 --- a/src/client/components/ResultTableHead.js +++ b/src/client/components/ResultTableHead.js @@ -20,6 +20,12 @@ const styles = () => ({ }); const columns = [ + { + label: 'Source', + property: 'source', + desc: 'Source description', + //filter: true + }, { label: 'Title', property: 'prefLabel', @@ -62,12 +68,6 @@ const columns = [ property: 'owner', desc: 'Material description' }, - { - label: 'Source', - property: 'source', - desc: 'Source description', - //filter: true - }, ];