Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

In Project study display, make clear removed samples completed their last step. #844

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

In Project study display, make clear removed samples completed their last step. #844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions frontend/src/components/studySamples/StudySamples.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import RefreshButton from '../RefreshButton'
import CompletedSamplesTable from './CompletedSamplesTable'
import StudyStepSamplesTable from './StudyStepSamplesTable'
import { WarningOutlined } from '@ant-design/icons'
import { PaginationParameters } from '../WorkflowSamplesTable/WorkflowSamplesTable'

const { Text, Title } = Typography

Expand Down Expand Up @@ -96,9 +95,9 @@ function StudySamples({ studyID, studySamples, refreshSamples }: StudySamplesPro
</div>
<Collapse bordered={true} onChange={handleExpand} activeKey={expandedPanelKeys}>
{renderedSteps.map((step) => {
const countString = `${step.completed.count} / ${step.ready.count + step.completed.count + step.removed.count}`
const countTitle = `${step.completed.count} of ${step.ready.count + step.completed.count + step.removed.count} samples are completed`
const removedTitle = step.removed.count === 1 ? `1 sample was removed from study at this step` : `${step.removed.count} samples were removed from study at this step`
const countString = `${step.completed.count + step.removed.count} / ${step.ready.count + step.completed.count + step.removed.count}`
const countTitle = `${step.completed.count + step.removed.count} of ${step.ready.count + step.completed.count + step.removed.count} samples are completed`
const removedTitle = step.removed.count === 1 ? `1 sample was removed from study after completing this step` : `${step.removed.count} samples were removed from study after completing this step`

// Call StepPanel as a function because the child of Collapse must be a CollapsePanel, not a StepPanel
return (
Expand Down Expand Up @@ -148,7 +147,7 @@ function StepTabs({step, studyID, uxSettings, removedTitle} : StepPanelProps) {
const completedTab = <Text>{`Completed (${step.completed.count})`}</Text>
const removedTab =
<Space size={'small'}>
<Text>{`Removed (${step.removed.count})`}</Text>
<Text>{`Completed and removed (${step.removed.count})`}</Text>
<WarningOutlined style={{color: 'red'}} title={removedTitle}/>
</Space>

Expand Down