Make expanded view ee detail warning match unexpanded

This commit is contained in:
mabashian
2021-06-21 11:55:33 -04:00
committed by Shane McDonald
parent 7c72be7025
commit 293924168f
2 changed files with 40 additions and 12 deletions

View File

@@ -1,21 +1,29 @@
import React from 'react'; import React from 'react';
import { bool, string } from 'prop-types'; import { bool, string } from 'prop-types';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { t, Trans } from '@lingui/macro';
import { t } from '@lingui/macro'; import { Popover, Tooltip } from '@patternfly/react-core';
import { Tooltip } from '@patternfly/react-core';
import styled from 'styled-components'; import styled from 'styled-components';
import { ExclamationTriangleIcon as PFExclamationTriangleIcon } from '@patternfly/react-icons'; import { ExclamationTriangleIcon as PFExclamationTriangleIcon } from '@patternfly/react-icons';
import { Detail } from '../DetailList'; import { Detail } from '../DetailList';
import { ExecutionEnvironment } from '../../types'; import { ExecutionEnvironment } from '../../types';
import getDocsBaseUrl from '../../util/getDocsBaseUrl';
import { useConfig } from '../../contexts/Config';
const ExclamationTriangleIcon = styled(PFExclamationTriangleIcon)` const ExclamationTriangleIcon = styled(PFExclamationTriangleIcon)`
color: var(--pf-global--warning-color--100); color: var(--pf-global--warning-color--100);
margin-left: 18px; margin-left: 18px;
cursor: pointer;
`; `;
const ExclamationTrianglePopover = styled(PFExclamationTriangleIcon)`
color: var(--pf-global--warning-color--100);
margin-left: 18px;
cursor: pointer;
`;
ExclamationTrianglePopover.displayName = 'ExclamationTrianglePopover';
function ExecutionEnvironmentDetail({ function ExecutionEnvironmentDetail({
executionEnvironment, executionEnvironment,
isDefaultEnvironment, isDefaultEnvironment,
@@ -23,6 +31,10 @@ function ExecutionEnvironmentDetail({
verifyMissingVirtualEnv, verifyMissingVirtualEnv,
helpText, helpText,
}) { }) {
const config = useConfig();
const docsLink = `${getDocsBaseUrl(
config
)}/html/upgrade-migration-guide/upgrade_to_ees.html`;
const label = isDefaultEnvironment const label = isDefaultEnvironment
? t`Default Execution Environment` ? t`Default Execution Environment`
: t`Execution Environment`; : t`Execution Environment`;
@@ -51,12 +63,29 @@ function ExecutionEnvironmentDetail({
<> <>
{t`Missing resource`} {t`Missing resource`}
<span> <span>
<Tooltip <Popover
content={t`Custom virtual environment ${virtualEnvironment} must be replaced by an execution environment.`} className="missing-execution-environment"
headerContent={<div>{t`Execution Environment Missing`}</div>}
bodyContent={
<div>
<Trans>
Custom virtual environment {virtualEnvironment} must be
replaced by an execution environment. For more information
about migrating to execution environments see{' '}
<a
href={docsLink}
target="_blank"
rel="noopener noreferrer"
>
the documentation.
</a>
</Trans>
</div>
}
position="right" position="right"
> >
<ExclamationTriangleIcon /> <ExclamationTrianglePopover />
</Tooltip> </Popover>
</span> </span>
</> </>
} }

View File

@@ -57,9 +57,8 @@ describe('<ExecutionEnvironmentDetail/>', () => {
'Execution Environment' 'Execution Environment'
); );
expect(executionEnvironment.find('dd').text()).toEqual('Missing resource'); expect(executionEnvironment.find('dd').text()).toEqual('Missing resource');
expect(wrapper.find('Tooltip').prop('content')).toEqual( expect(wrapper.find('ExclamationTrianglePopover').length).toBe(1);
`Custom virtual environment ${virtualEnvironment} must be replaced by an execution environment.` expect(wrapper.find('Popover').length).toBe(1);
);
}); });
test('should display warning deleted execution environment', async () => { test('should display warning deleted execution environment', async () => {