Skip to content

Commit

Permalink
Use && operator to render JSX conditionally where possible
Browse files Browse the repository at this point in the history
  • Loading branch information
@axelboc
axelboc committed Sep 26, 2024
1 parent 19e0d7d commit 3b6840f
Show file tree
Hide file tree
Showing 13 changed files with 81 additions and 84 deletions.
59 changes: 29 additions & 30 deletions ui/src/components/Equipment/PlateManipulator.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ export default function PlateManipulator(props) {
>
Move to drop {selectedDrop}
</Item>
{crystalForSelectedWell?.shelf === selectedDrop ? (
{crystalForSelectedWell?.shelf === selectedDrop && (
<>
<Separator />
<Item
Expand All @@ -292,14 +292,13 @@ export default function PlateManipulator(props) {
Move to Crystal Position
</Item>
</>
) : null}
)}
</Menu>
{crystalForSelectedWell?.shelf === selectedDrop
? crimsImg(
crystalForSelectedWell.image_url,
crystalForSelectedWell.sample,
)
: null}
{crystalForSelectedWell?.shelf === selectedDrop &&
crimsImg(
crystalForSelectedWell.image_url,
crystalForSelectedWell.sample,
)}
{plate.name === 'ChipX' ? (
<div
style={{
Expand Down Expand Up @@ -486,16 +485,16 @@ export default function PlateManipulator(props) {
>
Move to this Well
</Item>
{crystal !== null
? ((<Separator />),
(<b>Crystal Info : </b>),
(
<ul>
<li>Sample : {crystal.sample}</li>
<li>Drop : {crystal.shelf}</li>
</ul>
))
: null}
{crystal !== null && (
<>
<Separator />
<b>Crystal Info : </b>
<ul>
<li>Sample : {crystal.sample}</li>
<li>Drop : {crystal.shelf}</li>
</ul>
</>
)}
</Menu>
</div>
);
Expand Down Expand Up @@ -592,16 +591,16 @@ export default function PlateManipulator(props) {
>
Move to this Well
</Item>
{crystal !== null
? ((<Separator />),
(<b>Crystal Info : </b>),
(
<ul>
<li>Sample : {crystal.sample}</li>
<li>Drop : {crystal.shelf}</li>
</ul>
))
: null}
{crystal !== null && (
<>
<Separator />
<b>Crystal Info : </b>
<ul>
<li>Sample : {crystal.sample}</li>
<li>Drop : {crystal.shelf}</li>
</ul>
</>
)}
</Menu>
</div>
);
Expand Down Expand Up @@ -634,11 +633,11 @@ export default function PlateManipulator(props) {
>
<Col className="ms-3">
<ButtonToolbar className="ms-4">
{!inPopover ? (
{!inPopover && (
<div className="me-4">
<b>{cplate_label}</b>
</div>
) : null}
)}
<OverlayTrigger
variant="outline-success"
placement="bottom"
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/Equipment/SampleChanger.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ function SampleChangerTreeItem(props) {
</Dropdown.Header>
<Dropdown.Divider />
<Dropdown.Item onClick={handleMountClick}>Mount</Dropdown.Item>
{props.loadedSample === props.label ? (
{props.loadedSample === props.label && (
<Dropdown.Item onClick={handleUnmountClick}>
Umount this position
</Dropdown.Item>
) : null}
)}
</DropdownButton>
<span style={ls}>
&nbsp;
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/Lims/LimsResultSummary.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export class LimsResultSummary extends React.Component {
className="lims-result-summary"
style={style}
>
{!taskHasLimsData(task) ? this.taskSummary() : null}
{!taskHasLimsData(task) && this.taskSummary()}
<div
// ref="resultContainer"
ref={(ref) => {
Expand Down
23 changes: 11 additions & 12 deletions ui/src/components/SampleQueue/CharacterisationTaskItem.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,16 +245,16 @@ export default class TaskItem extends Component {
<td>
<a>{parameters.energy.toFixed(4)}</a>
</td>
{parameters.kappa_phi !== null ? (
{parameters.kappa_phi !== null && (
<td>
<a>{parameters.kappa_phi.toFixed(2)}</a>
</td>
) : null}
{parameters.kappa !== null ? (
)}
{parameters.kappa !== null && (
<td>
<a>{parameters.kappa.toFixed(2)}</a>
</td>
) : null}
)}
</tr>
);
}
Expand Down Expand Up @@ -298,7 +298,6 @@ export default class TaskItem extends Component {
);
}

// eslint-disable-next-line sonarjs/cognitive-complexity
render() {
const { state, data, show } = this.props;
const wedges =
Expand Down Expand Up @@ -349,16 +348,16 @@ export default class TaskItem extends Component {
<b>
<span className="node-name" style={{ display: 'flex' }}>
{this.pointIDString(wedges)} {data.label}
{state === TASK_RUNNING ? this.progressBar() : null}
{state === TASK_RUNNING && this.progressBar()}
</span>
</b>
{state === TASK_UNCOLLECTED ? (
{state === TASK_UNCOLLECTED && (
<i
className="fas fa-times"
onClick={this.deleteTask}
style={delTaskCSS}
/>
) : null}
)}
</div>
</div>
<Collapse in={Boolean(show)}>
Expand Down Expand Up @@ -420,12 +419,12 @@ export default class TaskItem extends Component {
<th>T (%)</th>
<th>Res. (&Aring;)</th>
<th>E (keV)</th>
{wedge.parameters.kappa_phi !== null ? (
{wedge.parameters.kappa_phi !== null && (
<th>&phi; &deg;</th>
) : null}
{wedge.parameters.kappa !== null ? (
)}
{wedge.parameters.kappa !== null && (
<th>&kappa; &deg;</th>
) : null}
)}
</tr>
</thead>
<tbody>{this.wedgeParameters(wedge)}</tbody>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SampleQueue/EnergyScanTaskItem.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,13 @@ export default class EnergyScanTaskItem extends Component {
</span>
</span>
</b>
{state === TASK_UNCOLLECTED ? (
{state === TASK_UNCOLLECTED && (
<i
className="fas fa-times"
onClick={this.deleteTask}
style={delTaskCSS}
/>
) : null}
)}
</div>
</div>
<Collapse in={Boolean(show)}>
Expand Down
38 changes: 19 additions & 19 deletions ui/src/components/SampleQueue/TaskItem.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,16 @@ export default class TaskItem extends Component {
const { parameters } = wedge;
return (
<tr>
{parameters.osc_start !== null ? (
{parameters.osc_start !== null && (
<td>
<a>{parameters.osc_start.toFixed(2)}</a>
</td>
) : null}
{parameters.osc_range !== null ? (
)}
{parameters.osc_range !== null && (
<td>
<a>{parameters.osc_range.toFixed(2)}</a>
</td>
) : null}
)}
<td>
<a>{parameters.exp_time.toFixed(6)}</a>
</td>
Expand All @@ -200,16 +200,16 @@ export default class TaskItem extends Component {
<td>
<a>{parameters.energy.toFixed(4)}</a>
</td>
{parameters.kappa_phi !== null ? (
{parameters.kappa_phi !== null && (
<td>
<a>{parameters.kappa_phi.toFixed(2)}</a>
</td>
) : null}
{parameters.kappa !== null ? (
)}
{parameters.kappa !== null && (
<td>
<a>{parameters.kappa.toFixed(2)}</a>
</td>
) : null}
)}
</tr>
);
}
Expand Down Expand Up @@ -307,16 +307,16 @@ export default class TaskItem extends Component {
<b>
<span className="node-name" style={{ display: 'flex' }}>
{this.pointIDString(wedges)} {data.label}
{state === TASK_RUNNING ? this.progressBar() : null}
{state === TASK_RUNNING && this.progressBar()}
</span>
</b>
{state === TASK_UNCOLLECTED ? (
{state === TASK_UNCOLLECTED && (
<i
className="fas fa-times"
onClick={this.deleteTask}
style={delTaskCSS}
/>
) : null}
)}
</div>
</div>
<Collapse in={Boolean(show)}>
Expand Down Expand Up @@ -371,23 +371,23 @@ export default class TaskItem extends Component {
>
<thead>
<tr>
{wedge.parameters.osc_start !== null ? (
{wedge.parameters.osc_start !== null && (
<th>Start &deg; </th>
) : null}
{wedge.parameters.osc_range !== null ? (
)}
{wedge.parameters.osc_range !== null && (
<th>Osc. &deg; </th>
) : null}
)}
<th>t (s)</th>
<th># Img</th>
<th>T (%)</th>
<th>Res. (&Aring;)</th>
<th>E (keV)</th>
{wedge.parameters.kappa_phi !== null ? (
{wedge.parameters.kappa_phi !== null && (
<th>&phi; &deg;</th>
) : null}
{wedge.parameters.kappa !== null ? (
)}
{wedge.parameters.kappa !== null && (
<th>&kappa; &deg;</th>
) : null}
)}
</tr>
</thead>
<tbody>{this.wedgeParameters(wedge)}</tbody>
Expand Down
6 changes: 3 additions & 3 deletions ui/src/components/SampleQueue/WorkflowTaskItem.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,17 +227,17 @@ export default class WorkflowTaskItem extends Component {
<b>
<span className="node-name" style={{ display: 'flex' }}>
{this.pointIDString(parameters)} {data.parameters.label}
{state === TASK_RUNNING ? this.progressBar() : null}
{state === TASK_RUNNING && this.progressBar()}
</span>
</b>
{state === TASK_UNCOLLECTED ? (
{state === TASK_UNCOLLECTED && (
<i
key="delete_task"
className="fa fa-times"
onClick={this.deleteTask}
style={delTaskCSS}
/>
) : null}
)}
</div>
</div>
<Collapse in={Boolean(show)}>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/SampleQueue/XRFTaskItem.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,13 @@ export default class XRFTaskItem extends Component {
</span>
</span>
</b>
{state === TASK_UNCOLLECTED ? (
{state === TASK_UNCOLLECTED && (
<i
className="fas fa-times"
onClick={this.deleteTask}
style={delTaskCSS}
/>
) : null}
)}
</div>
</div>
<Collapse in={Boolean(show)}>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/Tasks/DataCollection.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class DataCollection extends React.Component {
label="Resolution"
/>
</FieldsRow>
{this.props.taskResult.energyScan.length > 0 ? (
{this.props.taskResult.energyScan.length > 0 && (
<FieldsRow>
<SelectField
col1="6"
Expand All @@ -275,7 +275,7 @@ class DataCollection extends React.Component {
list={energyList}
/>
</FieldsRow>
) : null}
)}
<CollapsableRows>
<FieldsRow>
<InputField propName="kappa" type="number" label="Kappa" />
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/Tasks/GenericTaskForm.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,13 +218,13 @@ class GenericTaskForm extends React.Component {
} = props;
return (
<div className={classNames}>
{id !== 'root' ? (
{id !== 'root' && (
<label htmlFor={id}>
{label}
{required ? '*' : null}
{rawDescription ? ` (${rawDescription})` : null}
</label>
) : null}
)}
{description}
{children}
{errors}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/Tasks/Workflow.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function Workflow(props) {
/>
</Row>
) : null}
{strategyNames.length > 0 ? (
{strategyNames.length > 0 && (
<div className="mt-3">
<SelectField
propName="strategy_name"
Expand All @@ -88,7 +88,7 @@ function Workflow(props) {
col2={7}
/>
</div>
) : null}
)}
</Form>
</Modal.Body>

Expand Down
5 changes: 2 additions & 3 deletions ui/src/containers/GphlWorkflowParametersDialog.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,8 @@ function GphlWorkflowParametersDialog(props) {
<Form.Group as={Col} sm>
<Form.Label>
{schema.properties[fieldKey].type !==
'boolean'
? schema.properties[fieldKey].title
: null}
'boolean' &&
schema.properties[fieldKey].title}
</Form.Label>
{schema.properties[fieldKey].type ===
'boolean' ? (
Expand Down
Loading

0 comments on commit 3b6840f

Please sign in to comment.