diff --git a/src/components/CaseCardComponent/CaseCardComponent.tsx b/src/components/CaseCardComponent/CaseCardComponent.tsx index c47d8dbd..97891f51 100644 --- a/src/components/CaseCardComponent/CaseCardComponent.tsx +++ b/src/components/CaseCardComponent/CaseCardComponent.tsx @@ -3,6 +3,7 @@ import { Typography } from '@equinor/eds-core-react'; import { ComputeCaseDto } from '../../api/generated'; import { AddCaseButtons } from '../AddCaseButtons/AddCaseButtons'; import * as Styled from './CaseCardComponent.styled'; +import { titleMapping } from './FormattedMethodNames'; export const CaseCardComponent = ({ children, @@ -19,23 +20,12 @@ export const CaseCardComponent = ({ localList?: ComputeCaseDto[]; addCase?: (methodType: string) => void; }) => { - const formattedTitle = () => { - let res = ''; - if (title === 'Indicator') { - res = 'Indicator'; - } else if (title === 'Net-To-Gross') { - res = 'Net-to-gross'; - } else if (title === 'ContiniousParameter') { - res = 'Continious parameter'; - } - return res; - }; return ( - {formattedTitle()} + {titleMapping[title]} {subTitle} = { + Indicator: 'Indicator', + 'Net-To-Gross': 'Net-to-gross', + ContiniousParameter: 'Continious parameter', +}; diff --git a/src/features/Compute/CaseGroup/CaseButtons/CaseButtons.styled.tsx b/src/features/Compute/CaseGroup/CaseButtons/CaseButtons.styled.tsx index 43bec137..e0a70cfc 100644 --- a/src/features/Compute/CaseGroup/CaseButtons/CaseButtons.styled.tsx +++ b/src/features/Compute/CaseGroup/CaseButtons/CaseButtons.styled.tsx @@ -13,6 +13,7 @@ export const ButtonDiv = styled.div` const StyledButton = styled(Button)` white-space: nowrap; + width: 100px; `; export { StyledButton as Button }; diff --git a/src/features/Compute/CaseGroup/CaseButtons/CaseButtons.tsx b/src/features/Compute/CaseGroup/CaseButtons/CaseButtons.tsx index 679cc7f4..93c646a6 100644 --- a/src/features/Compute/CaseGroup/CaseButtons/CaseButtons.tsx +++ b/src/features/Compute/CaseGroup/CaseButtons/CaseButtons.tsx @@ -112,14 +112,14 @@ export const CaseButtons = ({ {caseType === 'Object' ? ( <> {caseStatus === 'Succeeded' ? ( - + ) : saved ? (