Commit a843785b authored by Maxime Chaillet's avatar Maxime Chaillet

Merge branch 'master' of https://gitlab.esrf.fr/icat/E-DataPortal into issue167

parents 880a66a8 b9de9b05
......@@ -126,7 +126,7 @@ class MyDataPage extends React.Component {
<LoginContainer />
<ExpirationLoginContainer></ExpirationLoginContainer>
<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>
);
......@@ -153,7 +153,7 @@ class ClosedDataPage extends React.Component {
</Panel.Heading>
<Panel>
<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>
</Panel>
......
......@@ -252,7 +252,7 @@ class InvestigationTable extends React.Component {
xs: { hidden : true },
sm: { 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 {
linkProposal={this.props.linkProposal}
closedData={this.props.closedData}
fetching={this.props.investigations.fetching}
investigations={this.props.investigations.data}>
investigations={this.props.investigations.data}
showInvestigationStats={this.props.showInvestigationStats}>
</InvestigationTable>
</Loader>
</div>);
......
......@@ -104,7 +104,7 @@ class SearchContainer extends Component {
<Col xs={10}>
<CategorySearch
componentId="searchbox"
dataField={["escompactsearch"]}
dataField={["investigationName", "investigationSummary","name", "definition", "sampleName", "scanType"]}
categoryField="investigationName.keyword"
queryFormat="or"
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