diff --git a/src/client/components/main_layout/InstanceHomePageTable.js b/src/client/components/main_layout/InstanceHomePageTable.js index 37bd43492df90b823f7f684f25b9a4f991ff6266..e64fb34add1f746b45e3bba550b86862d60267a1 100644 --- a/src/client/components/main_layout/InstanceHomePageTable.js +++ b/src/client/components/main_layout/InstanceHomePageTable.js @@ -75,9 +75,13 @@ const styles = theme => ({ class InstanceHomePageTable extends React.Component { constructor (props) { super(props) - this.state = { - expandedRows: new Set() - } + const expandedRows = new Set() + props.properties.forEach(prop => { + if (prop.expandedOnInstancePage) { + expandedRows.add(prop.id) + } + }) + this.state = { expandedRows } } componentDidMount = () => { diff --git a/src/client/components/perspectives/sampo/InstanceHomePage.js b/src/client/components/perspectives/sampo/InstanceHomePage.js index 10897dc0cf0ff9e8a146531b2a68626953b00f08..0173c83127e6db3bfaf075211181ac2f8f8c3ba7 100644 --- a/src/client/components/perspectives/sampo/InstanceHomePage.js +++ b/src/client/components/perspectives/sampo/InstanceHomePage.js @@ -135,7 +135,7 @@ class InstanceHomePage extends React.Component { getLocalIDFromURL = () => { const locationArr = this.props.routeProps.location.pathname.split('/') let localID = locationArr.pop() - this.props.perspectiveConfig.instancePageTabs.map(tab => { + this.props.perspectiveConfig.instancePageTabs.forEach(tab => { if (localID === tab.id) { localID = locationArr.pop() // pop again if tab id } @@ -147,7 +147,7 @@ class InstanceHomePage extends React.Component { const { instanceTableData } = this.props.perspectiveState const visibleRows = [] const instanceClass = instanceTableData.type ? instanceTableData.type.id : '' - rows.map(row => { + rows.forEach(row => { if ((has(row, 'onlyForClass') && row.onlyForClass === instanceClass) || !has(row, 'onlyForClass')) { visibleRows.push(row) @@ -161,7 +161,8 @@ class InstanceHomePage extends React.Component { const { instanceTableData, fetching } = perspectiveState const resultClass = perspectiveConfig.id const defaultInstancePageTab = perspectiveConfig.defaultInstancePageTab - ? perspectiveConfig.defaultInstancePageTab : 'table' + ? perspectiveConfig.defaultInstancePageTab + : 'table' const hasTableData = this.hasTableData() return ( <div className={classes.root}> diff --git a/src/client/reducers/sampo/perspective1.js b/src/client/reducers/sampo/perspective1.js index 842d401c92b3e9afd02621d0572707ccf19a372c..36ad1c8227e6fb456ddaf214e0f228715d10ce51 100644 --- a/src/client/reducers/sampo/perspective1.js +++ b/src/client/reducers/sampo/perspective1.js @@ -133,7 +133,8 @@ export const INITIAL_STATE = { sortValues: true, numberedList: false, minWidth: 220, - collapsedMaxWords: 12 + collapsedMaxWords: 12, + expandedOnInstancePage: true }, { id: 'language',