Skip to content

Esas/UI fixes #417

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

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Esas/UI fixes #417

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
fb76924
fix: fix pipe not displayed if run template name is too long
esasova Sep 27, 2024
4e5eeaf
fix: delete unnecessary margins in ScenarioValidationChip
esasova Sep 27, 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
5 changes: 4 additions & 1 deletion src/cards/ScenarioNode/ScenarioNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,13 @@ export const ScenarioNode = ({
>
{labels.runTemplateLabel}
<Typography variant="subtitle2" component="span" sx={{ fontWeight: 'normal' }}>
&nbsp;{scenario.runTemplateName}&nbsp;|&nbsp;
&nbsp;{scenario.runTemplateName}
</Typography>
</Typography>
</FadingTooltip>
<Typography variant="subtitle2" component="span" mx={0.5}>
|
</Typography>
<FadingTooltip title={labels.dataset + ' ' + datasetNames}>
<Typography
variant="subtitle2"
Expand Down
34 changes: 15 additions & 19 deletions src/misc/ScenarioValidationStatusChip/ScenarioValidationStatusChip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Box, Chip, CircularProgress } from '@mui/material';
import { Chip, CircularProgress } from '@mui/material';

export const ScenarioValidationStatusChip = (props) => {
const { labels, status, onDelete, className } = props;
Expand All @@ -17,30 +17,26 @@ export const ScenarioValidationStatusChip = (props) => {

if (lowerCaseStatus === 'loading') {
return (
<Box mx={2}>
<CircularProgress
className={className}
color="inherit"
data-cy="scenario-validation-status-loading-spinner"
size="15px"
/>
</Box>
<CircularProgress
className={className}
color="inherit"
data-cy="scenario-validation-status-loading-spinner"
size="15px"
/>
);
}

const colorProp = lowerCaseStatus === 'validated' ? 'success' : 'error';

return lowerCaseStatus === 'rejected' || lowerCaseStatus === 'validated' ? (
<Box mx={1}>
<Chip
clickable={false}
data-cy="scenario-validation-status"
label={getLabel()}
onDelete={onDelete}
color={colorProp}
className={className}
/>
</Box>
<Chip
clickable={false}
data-cy="scenario-validation-status"
label={getLabel()}
onDelete={onDelete}
color={colorProp}
className={className}
/>
) : null;
};

Expand Down