Skip to content

Commit 93977cd

Browse files
Make the SampleChanger component name more meaningful (renamed to SampleChangerInfo)
1 parent 293c603 commit 93977cd

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

ui/src/components/SampleChanger/SampleChanger.jsx renamed to ui/src/components/SampleChangerInfo/SampleChangerInfo.jsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import React from 'react';
22
import { Badge, Col, OverlayTrigger, Popover, Row } from 'react-bootstrap';
33

4-
import styles from './sampleChangerStyle.module.css';
4+
import styles from './sampleChangerInfoStyle.module.css';
55

6-
function SampleChanger(props) {
6+
function SampleChangerInfo(props) {
77
const { state, maintenance } = props;
88
const { global_state, message } = maintenance;
9-
const tooltipTitle = 'Sample Changer Status\n';
9+
const tooltipTitle = 'Sample Changer Status';
1010

1111
let variant = 'info';
1212
let popContent = '';
@@ -15,7 +15,7 @@ function SampleChanger(props) {
1515
['READY', 'LOADED', 'CHARGING', 'STANDBY'].includes(state.toUpperCase())
1616
) {
1717
variant = 'success';
18-
} else if (['FAULT'].includes(state.toUpperCase())) {
18+
} else if (state.toUpperCase() === 'FAULT') {
1919
variant = 'danger';
2020
} else {
2121
variant = 'warning';
@@ -56,7 +56,7 @@ function SampleChanger(props) {
5656
return (
5757
<OverlayTrigger placement="bottom" overlay={sampleChangerInfoPop}>
5858
<div className={styles.sampleChangerInfo}>
59-
<Badge className={styles.sampleChangerLabel} bg="secondary">
59+
<Badge className={styles.sampleChangerInfoLabel} bg="secondary">
6060
Sample Changer
6161
</Badge>
6262
<Badge
@@ -73,9 +73,9 @@ function SampleChanger(props) {
7373
);
7474
}
7575

76-
SampleChanger.defaultProps = {
76+
SampleChangerInfo.defaultProps = {
7777
maintenance: { global_state: {}, message: '' },
7878
state: 'UNKNOWN',
7979
};
8080

81-
export default React.memo(SampleChanger);
81+
export default React.memo(SampleChangerInfo);

ui/src/components/SampleChanger/sampleChangerStyle.module.css renamed to ui/src/components/SampleChangerInfo/sampleChangerInfoStyle.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
width: 7em;
33
}
44

5-
.sampleChangerLabel {
5+
.sampleChangerInfoLabel {
66
border-radius: 0%;
77
display: block;
88
margin-bottom: 3px;

ui/src/containers/BeamlineSetupContainer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import DeviceState from '../components/DeviceState/DeviceState';
1111
import InOutSwitch from '../components/InOutSwitch/InOutSwitch';
1212
import MachInfo from '../components/MachInfo/MachInfo';
1313
import OneAxisTranslationControl from '../components/MotorInput/OneAxisTranslationControl';
14-
import SampleChanger from '../components/SampleChanger/SampleChanger';
14+
import SampleChangerInfo from '../components/SampleChangerInfo/SampleChangerInfo';
1515
import BeamlineActions from './BeamlineActionsContainer';
1616

1717
function BeamlineSetupContainer() {
@@ -215,7 +215,7 @@ function BeamlineSetupContainer() {
215215
</Nav>
216216
<Nav className="me-3">
217217
<Nav.Item>
218-
<SampleChanger
218+
<SampleChangerInfo
219219
state={sampleChangerState}
220220
maintenance={sampleChangerMaint}
221221
/>

0 commit comments

Comments
 (0)