Cleanup TaskItems and collect similar container code #1753
Conversation
| if ( | ||
| specialTaskCSS === 'Characterisation' && | ||
| diffractionPlanLength === undefined | ||
| ) { | ||
| taskCSS += ' warning'; | ||
| break; | ||
| } | ||
| taskCSS += ' success'; |
There was a problem hiding this comment.
So there is a special style for characterisations that is applied if the Task has been collected but no diffraction plan was chosen
| let taskCSS = this.props.selected | ||
| ? 'task-head task-head-selected' | ||
| : 'task-head'; | ||
|
|
||
| taskCSS += ' uncollected'; |
There was a problem hiding this comment.
So the css applied to characterisation items was slightly different from the others, due to the warning style that I explained in another comment. The uncollected class does also only exist in this component. However, this one only sets the background to the same color as task-head does, hence I removed it (it was unnecessary)
| getPlot(state) { | ||
| if (state === TASK_UNCOLLECTED) { | ||
| return <span />; | ||
| } | ||
|
|
||
| return ( | ||
| <div className="float-end"> | ||
| <a href="#" onClick={this.showXRFPlot}> | ||
| Plot available | ||
| </a> | ||
| </div> | ||
| ); | ||
| } |
There was a problem hiding this comment.
So this component was supposed to render a link for the plot, but it is never rendered, hence I removed all logic related to 1d plots in XRFTaskItem
There was a problem hiding this comment.
Ok, it would be super nice if we could try to get those plots work again :).
| import { Component } from 'react'; | ||
| import { Collapse, ProgressBar } from 'react-bootstrap'; | ||
|
|
||
| import { |
|
I guess some of the CSS could be moved to a separate css file but I think this PR is good as it is. It could be done in a future PR. |
marcus-oscarsson
force-pushed
the
yw-add-TaskItemContainer
branch
from
27f956e to
7f50313
Compare
Oh Yes definitely, that's why it was on my next steps task list;) Just wanted to keep this PR as simple as possible:) |
This PR is a first (of probably many) PRs to try to clean up the different
TaskItemscomponents by doing two things essentially:TaskItemContainer: Every component had the exact same header rendering logic, so I created a single component to extract and centralise this code and make it easier to refacture/maintain. To make it easy to review, I did not make any changes to the code itself yet. (Will definitely in a later PR)TaskItems:This includes:
deleteTask,headerOnClickand headerOnContextmethods which were moved toTaskItemContainer`deleteButton,toggleCheckedmethods and internalstate, which were present in every component but never usedXRFTaskItem: it existed, but the Modal was never shown (always remained infalsystate) for now I removed it as part of a cleanup, but this could be added and/or fixed in a later PRSo while there are a lot changes in this PR, it is mainly one repetitive change in every file
Next steps are (not necessary in this order):
props