Skip to content

Commit f98c7e7

Browse files
dominikatrojanowskawalesch-yan
authored andcommitted
Renaming LimsResult... to DataCollecionResult...
1 parent 8cd2177 commit f98c7e7

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.dc-result-dialog {
2+
width: 40%;
3+
}

ui/src/components/Lims/LimsResultDialog.jsx renamed to ui/src/components/DataCollectionResult/DataCollectionResultDialog.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* eslint-disable react/destructuring-assignment */
2-
import './LimsResultDialog.css';
2+
import './DataCollectionResultDialog.css';
33

44
import React from 'react';
55
import { Button, Modal } from 'react-bootstrap';
66

7-
import { LimsResultSummary } from './LimsResultSummary';
7+
import { DataCollectionResultSummary } from './DataCollectionResultSummary';
88

9-
export class LimsResultDialog extends React.Component {
9+
export class DataCollectionResultDialog extends React.Component {
1010
constructor(props) {
1111
super(props);
1212
this.onHide = this.onHide.bind(this);
@@ -19,7 +19,7 @@ export class LimsResultDialog extends React.Component {
1919
render() {
2020
return (
2121
<Modal
22-
dialogClassName="lims-result-dialog"
22+
dialogClassName="dc-result-dialog"
2323
show={this.props.show}
2424
onHide={this.onHide}
2525
>
@@ -28,7 +28,7 @@ export class LimsResultDialog extends React.Component {
2828
</Modal.Header>
2929
<Modal.Body>
3030
{this.props.taskData ? (
31-
<LimsResultSummary taskData={this.props.taskData} />
31+
<DataCollectionResultSummary taskData={this.props.taskData} />
3232
) : null}
3333
</Modal.Body>
3434
<Modal.Footer>

ui/src/components/Lims/LimsResultSummary.jsx renamed to ui/src/components/DataCollectionResult/DataCollectionResultSummary.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import React from 'react';
44

5-
export class LimsResultSummary extends React.Component {
5+
export class DataCollectionResultSummary extends React.Component {
66
taskSummary() {
77
const task = this.props.taskData;
88
const filePath = this.props.taskData.parameters.fullPath;

ui/src/components/Lims/LimsResultDialog.css

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

ui/src/components/Main.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import TaskContainer from '../containers/TaskContainer';
1818
import WorkflowParametersDialog from '../containers/WorkflowParametersDialog';
1919
import diagonalNoise from '../img/diagonal-noise.png';
2020
import ChatWidget from './ChatWidget';
21-
import { LimsResultDialog } from './Lims/LimsResultDialog';
21+
import { DataCollectionResultDialog } from './DataCollectionResult/DataCollectionResultDialog';
2222
import LoadingScreen from './LoadingScreen/LoadingScreen';
2323
import SelectProposal from './LoginForm/SelectProposal';
2424
import styles from './Main.module.css';
@@ -66,7 +66,7 @@ function Main() {
6666
<ConfirmCollectDialog />
6767
<WorkflowParametersDialog />
6868
<GphlWorkflowParametersDialog />
69-
<LimsResultDialog
69+
<DataCollectionResultDialog
7070
show={general.dialogType === 'LIMS_RESULT_DIALOG'}
7171
taskData={general.dialogData}
7272
onHide={() => dispatch(showDialog(false))}

ui/src/components/SampleGrid/TaskItem.jsx

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

1616
export class TaskItem extends React.Component {
1717
static defaultProps = {
@@ -167,7 +167,10 @@ export class TaskItem extends React.Component {
167167
id="taskSummaryPopover"
168168
title={<b>{this.title()}</b>}
169169
>
170-
<LimsResultSummary taskData={this.props.taskData} scale="0.5" />
170+
<DataCollectionResultSummary
171+
taskData={this.props.taskData}
172+
scale="0.5"
173+
/>
171174
</Popover>
172175
}
173176
>

0 commit comments

Comments
 (0)