Skip to content

Hide the processing section of "Tasks" dialogs based on backend configuration #1782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2025
Merged

Hide the processing section of "Tasks" dialogs based on backend configuration #1782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
024b29e
Allow hiding the processing section of 'tasks' dialogs based on backe…
alessandro-olivo Sep 18, 2024
a219731
Update tests (acq parameters)
alessandro-olivo Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions demo/beamline_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ configuration:
skip_existing_images: true
take_snapshots: true
sub_wedge_size: 10
disable_processing: false # Not really needed (default is already false)
# NB 'compression' not added as apparently never used

helical:
Expand Down
21 changes: 17 additions & 4 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pydantic = ">=2.8.2,<2.9.0"
PyDispatcher = "^2.0.6"
pytz = "^2022.6"
tzlocal = "^4.2"
mxcubecore = ">=1.269.0"
mxcubecore = ">=1.335.0"
bcrypt = "^4.0.1"
authlib = "^1.3.0"
flask-limiter = "^3.12"
Expand Down
4 changes: 4 additions & 0 deletions test/input_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
"detector_binning_mode": None,
"detector_distance": 0.0,
"detector_roi_mode": 0,
"disable_processing": False,
"exp_time": 0.02,
"experiment_type": "",
"first_image": 1,
Expand Down Expand Up @@ -188,6 +189,7 @@
"detector_distance": 0.0,
"detector_roi_mode": 0,
"determine_rad_params": False,
"disable_processing": False,
"exp_time": 0.05,
"experiment_type": "",
"first_image": 1,
Expand Down Expand Up @@ -260,6 +262,7 @@
"detector_binning_mode": None,
"detector_distance": 0.0,
"detector_roi_mode": 0,
"disable_processing": False,
"exp_time": 10,
"experiment_type": "",
"first_image": 1,
Expand Down Expand Up @@ -312,6 +315,7 @@
"detector_binning_mode": None,
"detector_distance": 0.0,
"detector_roi_mode": 0,
"disable_processing": False,
"exp_time": 0.02,
"experiment_type": "",
"first_image": 1,
Expand Down
84 changes: 44 additions & 40 deletions ui/src/components/Tasks/DataCollection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,46 +293,50 @@ class DataCollection extends React.Component {
</CollapsableRows>
</Form>

<FieldsHeader title="Processing" />
<CollapsableRows>
<Form>
<SelectField
col1="3"
col2="3"
propName="space_group"
label="Space group"
list={SPACE_GROUPS}
/>
<Form.Label className="mb-2 mt-3">
<b> Unit Cell: </b>
</Form.Label>
<FieldsRow>
<InputField col1="1" col2="5" propName="cellA" label="a" />
<InputField col1="1" col2="5" propName="cellB" label="b" />
<InputField col1="1" col2="5" propName="cellC" label="c" />
</FieldsRow>
<FieldsRow>
<InputField
col1="1"
col2="5"
propName="cellAlpha"
label="&alpha;"
/>
<InputField
col1="1"
col2="5"
propName="cellBeta"
label="&beta;"
/>
<InputField
col1="1"
col2="5"
propName="cellGamma"
label="&gamma;"
/>
</FieldsRow>
</Form>
</CollapsableRows>
{!this.props.initialValues.disable_processing && (
<div>
<FieldsHeader title="Processing" />
<CollapsableRows>
<Form>
<SelectField
col1="3"
col2="3"
propName="space_group"
label="Space group"
list={SPACE_GROUPS}
/>
<Form.Label className="mb-2 mt-3">
<b> Unit Cell: </b>
</Form.Label>
<FieldsRow>
<InputField col1="1" col2="5" propName="cellA" label="a" />
<InputField col1="1" col2="5" propName="cellB" label="b" />
<InputField col1="1" col2="5" propName="cellC" label="c" />
</FieldsRow>
<FieldsRow>
<InputField
col1="1"
col2="5"
propName="cellAlpha"
label="&alpha;"
/>
<InputField
col1="1"
col2="5"
propName="cellBeta"
label="&beta;"
/>
<InputField
col1="1"
col2="5"
propName="cellGamma"
label="&gamma;"
/>
</FieldsRow>
</Form>
</CollapsableRows>
</div>
)}
</Modal.Body>

{this.props.taskData.state ? '' : this.showFooter()}
Expand Down
84 changes: 44 additions & 40 deletions ui/src/components/Tasks/Helical.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,46 +187,50 @@ class Helical extends React.Component {
</CollapsableRows>
</Form>

<FieldsHeader title="Processing" />
<CollapsableRows>
<Form>
<SelectField
col1="3"
col2="3"
propName="space_group"
label="Space group"
list={SPACE_GROUPS}
/>
<Form.Label className="mb-2 mt-3">
<b> Unit Cell: </b>
</Form.Label>
<FieldsRow>
<InputField col1="1" col2="5" propName="cellA" label="a" />
<InputField col1="1" col2="5" propName="cellB" label="b" />
<InputField col1="1" col2="5" propName="cellC" label="c" />
</FieldsRow>
<FieldsRow>
<InputField
col1="1"
col2="5"
propName="cellAlpha"
label="&alpha;"
/>
<InputField
col1="1"
col2="5"
propName="cellBeta"
label="&beta;"
/>
<InputField
col1="1"
col2="5"
propName="cellGamma"
label="&gamma;"
/>
</FieldsRow>
</Form>
</CollapsableRows>
{!this.props.initialValues.disable_processing && (
<div>
<FieldsHeader title="Processing" />
<CollapsableRows>
<Form>
<SelectField
col1="3"
col2="3"
propName="space_group"
label="Space group"
list={SPACE_GROUPS}
/>
<Form.Label className="mb-2 mt-3">
<b> Unit Cell: </b>
</Form.Label>
<FieldsRow>
<InputField col1="1" col2="5" propName="cellA" label="a" />
<InputField col1="1" col2="5" propName="cellB" label="b" />
<InputField col1="1" col2="5" propName="cellC" label="c" />
</FieldsRow>
<FieldsRow>
<InputField
col1="1"
col2="5"
propName="cellAlpha"
label="&alpha;"
/>
<InputField
col1="1"
col2="5"
propName="cellBeta"
label="&beta;"
/>
<InputField
col1="1"
col2="5"
propName="cellGamma"
label="&gamma;"
/>
</FieldsRow>
</Form>
</CollapsableRows>
</div>
)}
</Modal.Body>
{this.props.taskData.state ? (
''
Expand Down
84 changes: 44 additions & 40 deletions ui/src/components/Tasks/Mesh.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,46 +196,50 @@ class Mesh extends React.Component {
</CollapsableRows>
</Form>

<FieldsHeader title="Processing" />
<CollapsableRows>
<Form>
<SelectField
col1="3"
col2="3"
propName="space_group"
label="Space group"
list={SPACE_GROUPS}
/>
<Form.Label className="mb-2 mt-3">
<b> Unit Cell: </b>
</Form.Label>
<FieldsRow>
<InputField col1="1" col2="5" propName="cellA" label="a" />
<InputField col1="1" col2="5" propName="cellB" label="b" />
<InputField col1="1" col2="5" propName="cellC" label="c" />
</FieldsRow>
<FieldsRow>
<InputField
col1="1"
col2="5"
propName="cellAlpha"
label="&alpha;"
/>
<InputField
col1="1"
col2="5"
propName="cellBeta"
label="&beta;"
/>
<InputField
col1="1"
col2="5"
propName="cellGamma"
label="&gamma;"
/>
</FieldsRow>
</Form>
</CollapsableRows>
{!this.props.initialValues.disable_processing && (
<div>
<FieldsHeader title="Processing" />
<CollapsableRows>
<Form>
<SelectField
col1="3"
col2="3"
propName="space_group"
label="Space group"
list={SPACE_GROUPS}
/>
<Form.Label className="mb-2 mt-3">
<b> Unit Cell: </b>
</Form.Label>
<FieldsRow>
<InputField col1="1" col2="5" propName="cellA" label="a" />
<InputField col1="1" col2="5" propName="cellB" label="b" />
<InputField col1="1" col2="5" propName="cellC" label="c" />
</FieldsRow>
<FieldsRow>
<InputField
col1="1"
col2="5"
propName="cellAlpha"
label="&alpha;"
/>
<InputField
col1="1"
col2="5"
propName="cellBeta"
label="&beta;"
/>
<InputField
col1="1"
col2="5"
propName="cellGamma"
label="&gamma;"
/>
</FieldsRow>
</Form>
</CollapsableRows>
</div>
)}
</Modal.Body>
{this.props.taskData.state ? (
''
Expand Down