Revert "Fix output search styling"

This reverts commit 46728a0931.
This commit is contained in:
mabashian
2021-03-18 14:07:44 -04:00
parent 46728a0931
commit 2c8d524b1a
3 changed files with 4 additions and 15 deletions

View File

@@ -11,7 +11,7 @@ import {
} from '@patternfly/react-core'; } from '@patternfly/react-core';
import { RocketIcon } from '@patternfly/react-icons'; import { RocketIcon } from '@patternfly/react-icons';
function ReLaunchDropDown({ isPrimary = false, handleRelaunch, i18n, ouiaId }) { function ReLaunchDropDown({ isPrimary = false, handleRelaunch, i18n }) {
const [isOpen, setIsOPen] = useState(false); const [isOpen, setIsOPen] = useState(false);
const onToggle = () => { const onToggle = () => {
@@ -75,7 +75,6 @@ function ReLaunchDropDown({ isPrimary = false, handleRelaunch, i18n, ouiaId }) {
return ( return (
<Dropdown <Dropdown
ouiaId={ouiaId}
isPlain isPlain
position={DropdownPosition.right} position={DropdownPosition.right}
isOpen={isOpen} isOpen={isOpen}

View File

@@ -200,7 +200,7 @@ const OutputFooter = styled.div`
`; `;
const Toolbar = styled(_Toolbar)` const Toolbar = styled(_Toolbar)`
position: inherit !important; position: inherit;
`; `;
const ToolbarContent = styled(_ToolbarContent)` const ToolbarContent = styled(_ToolbarContent)`

View File

@@ -145,17 +145,13 @@ const OutputToolbar = ({
{job.status === 'failed' && job.type === 'job' ? ( {job.status === 'failed' && job.type === 'job' ? (
<LaunchButton resource={job}> <LaunchButton resource={job}>
{({ handleRelaunch }) => ( {({ handleRelaunch }) => (
<ReLaunchDropDown <ReLaunchDropDown handleRelaunch={handleRelaunch} />
handleRelaunch={handleRelaunch}
ouiaId="job-output-relaunch-dropdown"
/>
)} )}
</LaunchButton> </LaunchButton>
) : ( ) : (
<LaunchButton resource={job}> <LaunchButton resource={job}>
{({ handleRelaunch }) => ( {({ handleRelaunch }) => (
<Button <Button
ouiaId="job-output-relaunch-button"
variant="plain" variant="plain"
onClick={handleRelaunch} onClick={handleRelaunch}
aria-label={i18n._(t`Relaunch`)} aria-label={i18n._(t`Relaunch`)}
@@ -171,11 +167,7 @@ const OutputToolbar = ({
{job.related?.stdout && ( {job.related?.stdout && (
<Tooltip content={i18n._(t`Download Output`)}> <Tooltip content={i18n._(t`Download Output`)}>
<a href={`${job.related.stdout}?format=txt_download`}> <a href={`${job.related.stdout}?format=txt_download`}>
<Button <Button variant="plain" aria-label={i18n._(t`Download Output`)}>
ouiaId="job-output-download-button"
variant="plain"
aria-label={i18n._(t`Download Output`)}
>
<DownloadIcon /> <DownloadIcon />
</Button> </Button>
</a> </a>
@@ -185,7 +177,6 @@ const OutputToolbar = ({
['pending', 'waiting', 'running'].includes(jobStatus) && ( ['pending', 'waiting', 'running'].includes(jobStatus) && (
<Tooltip content={i18n._(t`Cancel Job`)}> <Tooltip content={i18n._(t`Cancel Job`)}>
<Button <Button
ouiaId="job-output-cancel-button"
variant="plain" variant="plain"
aria-label={i18n._(t`Cancel Job`)} aria-label={i18n._(t`Cancel Job`)}
onClick={onCancel} onClick={onCancel}
@@ -200,7 +191,6 @@ const OutputToolbar = ({
) && ( ) && (
<Tooltip content={i18n._(t`Delete Job`)}> <Tooltip content={i18n._(t`Delete Job`)}>
<DeleteButton <DeleteButton
ouiaId="job-output-delete-button"
name={job.name} name={job.name}
modalTitle={i18n._(t`Delete Job`)} modalTitle={i18n._(t`Delete Job`)}
onConfirm={onDelete} onConfirm={onDelete}