External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-22 06:58:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Make expanded view ee detail warning match unexpanded

Browse Source
This commit is contained in:
mabashian 2021-06-21 11:55:33 -04:00 committed by Shane McDonald
parent 7c72be7025
commit 293924168f
No known key found for this signature in database
GPG Key ID: 6F374AF6E9EB9374
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.jsx
View File

@ -1,21 +1,29 @@
import React from 'react';
import { bool, string } from 'prop-types';
import { Link } from 'react-router-dom';
import { t } from '@lingui/macro';
import { Tooltip } from '@patternfly/react-core';
import { t, Trans } from '@lingui/macro';
import { Popover, Tooltip } from '@patternfly/react-core';
import styled from 'styled-components';
import { ExclamationTriangleIcon as PFExclamationTriangleIcon } from '@patternfly/react-icons';
import { Detail } from '../DetailList';
import { ExecutionEnvironment } from '../../types';
import getDocsBaseUrl from '../../util/getDocsBaseUrl';
import { useConfig } from '../../contexts/Config';
const ExclamationTriangleIcon = styled(PFExclamationTriangleIcon)`
color: var(--pf-global--warning-color--100);
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({
executionEnvironment,
isDefaultEnvironment,
@ -23,6 +31,10 @@ function ExecutionEnvironmentDetail({
verifyMissingVirtualEnv,
helpText,
}) {
const config = useConfig();
const docsLink = `${getDocsBaseUrl(
config
)}/html/upgrade-migration-guide/upgrade_to_ees.html`;
const label = isDefaultEnvironment
? t`Default Execution Environment`
: t`Execution Environment`;
@ -51,12 +63,29 @@ function ExecutionEnvironmentDetail({
<>
{t`Missing resource`}
<span>
<Tooltip
content={t`Custom virtual environment ${virtualEnvironment} must be replaced by an execution environment.`}
<Popover
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"
>
<ExclamationTriangleIcon />
</Tooltip>
<ExclamationTrianglePopover />
</Popover>
</span>
</>
}

5
awx/ui_next/src/components/ExecutionEnvironmentDetail/ExecutionEnvironmentDetail.test.jsx
View File

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