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

feat: Support decimal values in table progress cell type #824 #2329

Merged
merged 2 commits into from
May 15, 2024
Merged

feat: Support decimal values in table progress cell type #824 #2329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c5e18b
feat: Support decimal values in table progress cell type #824
dbranley May 10, 2024
1ba555b
feat: Changes from review comments, removed parseFloat() so data rend…
dbranley May 14, 2024
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
18 changes: 17 additions & 1 deletion ui/src/progress_table_cell_type.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,14 @@ import { ProgressTableCellType, XProgressTableCellType } from './progress_table_
const
name = 'progress-cell',
progress = 0.0,
progressCellProps: ProgressTableCellType = { name }
progressCellProps: ProgressTableCellType = { name },
progressValues = [
{input: 0.88, output: '88%'},
{input: 0.888, output: '88.8%'},
{input: 0.8888, output: '88.88%'},
{input: 0.88888, output: '88.89%'},
{input: 0.88899, output: '88.90%'},
{input: 0.88999, output: '89.00%'},]

describe('ProgressTableCellType.tsx', () => {

Expand All @@ -32,4 +39,13 @@ describe('ProgressTableCellType.tsx', () => {
const { queryByTestId } = render(<XProgressTableCellType model={progressCellProps} progress={progress} />)
expect(queryByTestId(name)).toBeInTheDocument()
})

it('Renders data-test attr with decimal values', () => {
const { queryByTestId, rerender } = render(<XProgressTableCellType model={progressCellProps} progress={progress} />)
progressValues.map(progressValue => {
rerender(<XProgressTableCellType model={progressCellProps} progress={progressValue.input} />)
expect(queryByTestId(name)).toBeInTheDocument()
expect(queryByTestId(name)).toHaveTextContent(progressValue.output)
})
})
})
2 changes: 1 addition & 1 deletion ui/src/progress_table_cell_type.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const XProgressTableCellType = ({ model: m, progress }: { model: Progress
<div data-test={m.name} className={css.container}>
<ProgressArc thickness={2} color={cssVar(m.color || '$red')} value={progress} />
<Fluent.Stack horizontalAlign='center' verticalAlign='center' className={clas(css.percentContainer, 'wave-s12')}>
<div className={css.percent}>{`${Math.round(progress * 100)}%`}</div>
<div className={css.percent}>{`${Number.isInteger(progress * 1000) ? (progress * 100) : (progress * 100).toFixed(2)}%`}</div>
</Fluent.Stack>
</div >
)