Skip to content

Commit de34d10

Browse files
Removing limsResultDialog and limsResultSummary from the frontend
Accordingly to the discussion #1773 limsResultData was removed from the backend signals' messages in 6af4e5d
1 parent 001a516 commit de34d10

File tree

6 files changed

+2
-138
lines changed

6 files changed

+2
-138
lines changed

ui/src/components/Lims/LimsResultDialog.css

Lines changed: 0 additions & 3 deletions
This file was deleted.

ui/src/components/Lims/LimsResultDialog.jsx

Lines changed: 0 additions & 40 deletions
This file was deleted.

ui/src/components/Lims/LimsResultSummary.jsx

Lines changed: 0 additions & 42 deletions
This file was deleted.

ui/src/components/Main.jsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { Stack } from 'react-bootstrap';
66
import { useDispatch, useSelector } from 'react-redux';
77
import { Outlet, useLocation } from 'react-router-dom';
88

9-
import { showDialog } from '../actions/general';
109
import { getInitialState } from '../actions/login';
1110
import ConfirmCollectDialog from '../containers/ConfirmCollectDialog';
1211
import ConnectionLostDialog from '../containers/ConnectionLostDialog';
@@ -18,7 +17,6 @@ import TaskContainer from '../containers/TaskContainer';
1817
import WorkflowParametersDialog from '../containers/WorkflowParametersDialog';
1918
import diagonalNoise from '../img/diagonal-noise.png';
2019
import ChatWidget from './ChatWidget';
21-
import { LimsResultDialog } from './Lims/LimsResultDialog';
2220
import LoadingScreen from './LoadingScreen/LoadingScreen';
2321
import SelectProposal from './LoginForm/SelectProposal';
2422
import styles from './Main.module.css';
@@ -66,11 +64,6 @@ function Main() {
6664
<ConfirmCollectDialog />
6765
<WorkflowParametersDialog />
6866
<GphlWorkflowParametersDialog />
69-
<LimsResultDialog
70-
show={general.dialogType === 'LIMS_RESULT_DIALOG'}
71-
taskData={general.dialogData}
72-
onHide={() => dispatch(showDialog(false))}
73-
/>
7467

7568
<MXNavbar />
7669

ui/src/components/SampleGrid/TaskItem.jsx

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
TASK_RUNNING,
1212
TASK_UNCOLLECTED,
1313
} from '../../constants';
14-
import { LimsResultSummary } from '../Lims/LimsResultSummary';
1514

1615
export class TaskItem extends React.Component {
1716
static defaultProps = {
@@ -21,7 +20,6 @@ export class TaskItem extends React.Component {
2120

2221
constructor(props) {
2322
super(props);
24-
this.taskItemOnClick = this.taskItemOnClick.bind(this);
2523
this.deleteButtonOnClick = this.deleteButtonOnClick.bind(this);
2624

2725
this.tagName = this.tagName.bind(this);
@@ -132,11 +130,6 @@ export class TaskItem extends React.Component {
132130
return variant;
133131
}
134132

135-
taskItemOnClick() {
136-
const task = this.props.taskData;
137-
this.props.showDialog(true, 'LIMS_RESULT_DIALOG', 'Lims Results', task);
138-
}
139-
140133
deleteButtonOnClick(e) {
141134
if (this.props.deleteButtonOnClick) {
142135
this.props.deleteButtonOnClick(
@@ -166,17 +159,10 @@ export class TaskItem extends React.Component {
166159
className="p-2"
167160
id="taskSummaryPopover"
168161
title={<b>{this.title()}</b>}
169-
>
170-
<LimsResultSummary taskData={this.props.taskData} scale="0.5" />
171-
</Popover>
162+
/>
172163
}
173164
>
174-
<Badge
175-
bg={this.stateClass()}
176-
style={style}
177-
onClick={this.taskItemOnClick}
178-
className="p-1 me-2"
179-
>
165+
<Badge bg={this.stateClass()} style={style} className="p-1 me-2">
180166
{this.tagName()}
181167
{task.state === TASK_UNCOLLECTED ? (
182168
<i

ui/src/components/SampleQueue/TaskItem.jsx

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import PropTypes from 'prop-types';
77
import { Component } from 'react';
88
import { Button, Table } from 'react-bootstrap';
99

10-
import { TASK_COLLECTED } from '../../constants';
1110
import TooltipTrigger from '../TooltipTrigger';
1211
import styles from './Item.module.css';
1312
import TaskItemContainer from './TaskItemContainer';
@@ -21,38 +20,10 @@ export default class TaskItem extends Component {
2120
constructor(props) {
2221
super(props);
2322
this.showForm = this.showForm.bind(this);
24-
this.getResult = this.getResult.bind(this);
2523
this.pointIDString = this.pointIDString.bind(this);
2624
this.wedgeParameters = this.wedgeParameters.bind(this);
2725
}
2826

29-
getResult(state) {
30-
if (state !== TASK_COLLECTED) {
31-
return (
32-
<div>
33-
<span />
34-
</div>
35-
);
36-
}
37-
return (
38-
<div className={styles.resultBody}>
39-
<a
40-
href="#"
41-
onClick={() =>
42-
this.props.showDialog(
43-
true,
44-
'LIMS_RESULT_DIALOG',
45-
'Lims Results',
46-
this.props.data,
47-
)
48-
}
49-
>
50-
View Results
51-
</a>
52-
</div>
53-
);
54-
}
55-
5627
showForm() {
5728
const { data, sampleId, shapes } = this.props;
5829
const { type, parameters } = data;
@@ -243,7 +214,6 @@ export default class TaskItem extends Component {
243214
</thead>
244215
<tbody>{this.wedgeParameters(wedge)}</tbody>
245216
</Table>
246-
{this.getResult(state)}
247217
</div>
248218
);
249219
})}

0 commit comments

Comments
 (0)