Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 28 additions & 13 deletions src/buttons/CreateScenarioButton/CreateScenarioButton.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { Button } from '@mui/material';
import { FadingTooltip } from '../../misc/FadingTooltip';
import AddCircleIcon from '@mui/icons-material/AddCircle';
import { Button, IconButton } from '@mui/material';
import { FadingTooltip } from '../../misc';
import CreateScenarioDialog from './components';

export const CreateScenarioButton = ({
Expand All @@ -16,24 +17,32 @@ export const CreateScenarioButton = ({
solution,
disabled,
labels,
isIconButton,
}) => {
const [open, setOpen] = useState(false);
const openDialog = () => setOpen(true);
const closeDialog = () => setOpen(false);

const buttonContent = isIconButton ? (
<IconButton data-cy="create-scenario-button" size="medium" onClick={openDialog} color="primary" disabled={disabled}>
<AddCircleIcon />
</IconButton>
) : (
<Button
data-cy="create-scenario-button"
size="medium"
variant="contained"
onClick={openDialog}
color="primary"
disabled={disabled}
>
{labels.button.title}
</Button>
);
return (
<div>
<FadingTooltip arrow title={labels.button.tooltip}>
<Button
data-cy="create-scenario-button"
size="medium"
variant="contained"
onClick={openDialog}
color="primary"
disabled={disabled}
>
{labels.button.title}
</Button>
<FadingTooltip arrow title={labels.button.tooltip} disableHoverListener={!isIconButton && !disabled}>
{buttonContent}
</FadingTooltip>
<CreateScenarioDialog
createScenario={createScenario}
Expand Down Expand Up @@ -139,6 +148,12 @@ CreateScenarioButton.propTypes = {
forbiddenCharsInScenarioName: PropTypes.string.isRequired,
}).isRequired,
}),
/**
* Defines the CreateScenarioButton's form:
* - true : the button is round shaped and has an Add icon instead of title
* - false (default value): the button is contained and has a title
*/
isIconButton: PropTypes.bool,
};

CreateScenarioButton.defaultProps = {
Expand Down
4 changes: 3 additions & 1 deletion src/buttons/RolesEditionButton/RolesEditionButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ export const RolesEditionButton = ({
);
return (
<div>
<FadingTooltip title={labels.button?.tooltip ?? 'Modify access'}>{buttonContent}</FadingTooltip>
<FadingTooltip title={labels.button?.tooltip ?? 'Share'} disableHoverListener={!isIconButton && !disabled}>
{buttonContent}
</FadingTooltip>
<RolesEditionDialog
open={open}
resourceRolesPermissionsMapping={resourceRolesPermissionsMapping}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Chip, CircularProgress } from '@mui/material';
import { Box, Chip, CircularProgress } from '@mui/material';

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

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

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

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

Expand Down