Commit 07b2ea97 authored by Alejandro De Maria Antolinos's avatar Alejandro De Maria Antolinos

Merge branch 'issue_162' into 'master'

It fixes problem elastic search

See merge request !147
parents fed16420 4f0beed1
Pipeline #11477 passed with stages
in 2 minutes and 11 seconds
......@@ -104,8 +104,9 @@ class SearchContainer extends Component {
<Col xs={10}>
<CategorySearch
componentId="searchbox"
dataField={["investigationName", "investigationSummary","name", "definition"]}
dataField={["escompactsearch"]}
categoryField="investigationName.keyword"
queryFormat="or"
placeholder="Search by dataset name, sample name or investigation title" />
</Col>
......@@ -124,12 +125,18 @@ class SearchContainer extends Component {
componentId="BeamlineSensor"
dataField="investigationVisitId.keyword"
title="Beamlines"
react={{
and: ["DateSensor", "DefinitionSensor"]
}}
/>
<br />
<MultiList
componentId="DefinitionSensor"
dataField="definition.keyword"
title="Technique"
react={{
and: ["DateSensor", "DefinitionSensor"]
}}
/>
</Col>
......@@ -145,7 +152,10 @@ class SearchContainer extends Component {
stream={true}
showResultStats={true}
react={{
and: ["SingleDropdownListUsage", "RangeSliderSensorWavelength", "searchbox", "DateSensor", "BeamlineSensor", "DefinitionSensor", "RangeSliderSensor", "SingleDropdownListReflection", "InstrumentMonochromatorCrystal_type"]
//and: ["SingleDropdownListUsage", "RangeSliderSensorWavelength", "searchbox", "DateSensor", "BeamlineSensor", "DefinitionSensor", "RangeSliderSensor", "SingleDropdownListReflection"]
//and: ["searchbox", "DateSensor", "BeamlineSensor", "DefinitionSensor"]
//and: ["searchbox", "DateSensor", "BeamlineSensor", "DefinitionSensor", "SingleDropdownListUsage", "SingleDropdownListType", "SingleDropdownListReflection", "RangeSliderSensorEnergy", "RangeSliderSensorWavelength"]
and: ["searchbox", "DateSensor", "BeamlineSensor", "DefinitionSensor", "SingleDropdownListUsage", "SingleDropdownListType", "SingleDropdownListReflection"]
}}
onData={(res) => {
return this.renderDataset(res);
......@@ -153,27 +163,15 @@ class SearchContainer extends Component {
/>
</Col>
<Col sm={2}>
<br />
<RangeInput
componentId="RangeSliderSensor"
dataField="InstrumentMonochromator_energy"
title="Energy (keV)"
range={{
"start": 0,
"end": 100
}}
/>
<br />
<RangeInput
componentId="RangeSliderSensorWavelength"
dataField="InstrumentMonochromator_wavelength"
title="Wavelength"
range={{
"start": 0,
"end": 10
}}
<Col sm={2}>
<br />
<SingleDropdownList
componentId="SingleDropdownListType"
dataField="InstrumentMonochromatorCrystal_type.keyword"
title="Crystal Type"
/>
<br />
<SingleDropdownList
componentId="SingleDropdownListReflection"
......@@ -181,13 +179,6 @@ class SearchContainer extends Component {
title="Crystal Reflection"
/>
<br />
<SingleDropdownList
componentId="SingleDropdownListType"
dataField="InstrumentMonochromatorCrystal_type.keyword"
title="Crystal Type"
/>
<br />
<SingleDropdownList
componentId="SingleDropdownListUsage"
dataField="InstrumentMonochromatorCrystal_usage.keyword"
......
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