Commit b9de9b05 authored by Alejandro De Maria Antolinos's avatar Alejandro De Maria Antolinos

Merge branch 'issue_171' into 'master'

It fixes #171

Closes #171

See merge request !153
parents 676ee218 5775aa9d
Pipeline #11584 passed with stages
in 6 minutes and 34 seconds
...@@ -126,7 +126,7 @@ class MyDataPage extends React.Component { ...@@ -126,7 +126,7 @@ class MyDataPage extends React.Component {
<LoginContainer /> <LoginContainer />
<ExpirationLoginContainer></ExpirationLoginContainer> <ExpirationLoginContainer></ExpirationLoginContainer>
<div style={{ marginTop: '30px', marginLeft: '30px', marginRight: '30px' }}> <div style={{ marginTop: '30px', marginLeft: '30px', marginRight: '30px' }}>
<InvestigationsContainer linkProposal={true} openData={true} investigations={this.props.myInvestigations} /> <InvestigationsContainer showInvestigationStats={true} linkProposal={true} openData={true} investigations={this.props.myInvestigations} />
</div> </div>
</div> </div>
); );
...@@ -153,7 +153,7 @@ class ClosedDataPage extends React.Component { ...@@ -153,7 +153,7 @@ class ClosedDataPage extends React.Component {
</Panel.Heading> </Panel.Heading>
<Panel> <Panel>
<Panel.Body> <Panel.Body>
<InvestigationsContainer linkProposal={false} investigations={this.props.investigations} openData={false} {...this.props} /> <InvestigationsContainer showInvestigationStats={this.props.user.isAdministrator} linkProposal={false} investigations={this.props.investigations} openData={false} {...this.props} />
</Panel.Body> </Panel.Body>
</Panel> </Panel>
</Panel> </Panel>
......
...@@ -252,7 +252,7 @@ class InvestigationTable extends React.Component { ...@@ -252,7 +252,7 @@ class InvestigationTable extends React.Component {
xs: { hidden : true }, xs: { hidden : true },
sm: { hidden : true }, sm: { hidden : true },
md: { hidden : true }, md: { hidden : true },
lg: { hidden : !this.props.openData && !this.props.user.isAdministrator, width: "150px" } lg: { hidden : !this.props.showInvestigationStats, width: "150px" }
} }
}, },
{ {
......
...@@ -28,7 +28,8 @@ class InvestigationsContainer extends Component { ...@@ -28,7 +28,8 @@ class InvestigationsContainer extends Component {
linkProposal={this.props.linkProposal} linkProposal={this.props.linkProposal}
closedData={this.props.closedData} closedData={this.props.closedData}
fetching={this.props.investigations.fetching} fetching={this.props.investigations.fetching}
investigations={this.props.investigations.data}> investigations={this.props.investigations.data}
showInvestigationStats={this.props.showInvestigationStats}>
</InvestigationTable> </InvestigationTable>
</Loader> </Loader>
</div>); </div>);
......
...@@ -104,7 +104,7 @@ class SearchContainer extends Component { ...@@ -104,7 +104,7 @@ class SearchContainer extends Component {
<Col xs={10}> <Col xs={10}>
<CategorySearch <CategorySearch
componentId="searchbox" componentId="searchbox"
dataField={["escompactsearch"]} dataField={["investigationName", "investigationSummary","name", "definition", "sampleName", "scanType"]}
categoryField="investigationName.keyword" categoryField="investigationName.keyword"
queryFormat="or" queryFormat="or"
placeholder="Search by dataset name, sample name or investigation title" /> placeholder="Search by dataset name, sample name or investigation title" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment