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
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const FleetLessDevice = () => {
<Button
isInline
variant="plain"
style={{ paddingBlock: 0 }}
icon={<OutlinedQuestionCircleIcon />}
aria-label={t('Ownership information')}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const EnrollmentRequestTableRow: React.FC<EnrollmentRequestTableRow> = ({
<Td dataLabel={t('Approve')}>
<Button
variant="link"
isInline
onClick={approveEnrollment}
data-testid={`enrollment-request-approve-button-${rowIndex}`}
>
Expand Down
10 changes: 5 additions & 5 deletions libs/ui-components/src/components/common/CopyButton.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import * as React from 'react';
import { Button, Icon, Tooltip } from '@patternfly/react-core';
import { CopyIcon } from '@patternfly/react-icons/dist/js/icons/copy-icon';
import { Button, ButtonProps, Icon, Tooltip } from '@patternfly/react-core';

import { useTranslation } from '../../hooks/useTranslation';

interface CopyButtonProps {
text: string;
variant?: ButtonProps['variant'];
ariaLabel?: string;
}

const CopyButton = ({ ariaLabel, text, variant }: CopyButtonProps) => {
const CopyButton = ({ ariaLabel, text }: CopyButtonProps) => {
const { t } = useTranslation();

const [copied, setCopied] = React.useState(false);
Expand All @@ -37,8 +36,9 @@ const CopyButton = ({ ariaLabel, text, variant }: CopyButtonProps) => {
return (
<Tooltip content={copied ? t('Copied!') : ariaLabel || t('Copy text')}>
<Button
variant={variant || 'plain'}
isInline={variant === 'link'}
variant="plain"
isInline
style={{ paddingBlock: 0 }}
onClick={onCopy}
icon={
<Icon size="sm">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import FlightCtlForm from '../../form/FlightCtlForm';
import { FlightCtlLabel } from '../../../types/extraTypes';
import { useTranslation } from '../../../hooks/useTranslation';
import useDeviceLabelMatch from '../../../hooks/useDeviceLabelMatch';
import ResourceLink from '../../common/ResourceLink';
import DeviceLabelMatch from './DeviceLabelMatch';

export type ApproveDeviceFormValues = {
Expand Down Expand Up @@ -42,7 +41,7 @@ const ApproveDeviceForm: React.FC<ApproveDeviceFormProps> = ({ enrollmentRequest
isDisabled={!!defaultAlias}
/>
<FormGroup label={t('Name')} aria-label={t('Name')}>
<ResourceLink id={enrollmentRequest.metadata.name as string} variant="full" />
{enrollmentRequest.metadata.name}
</FormGroup>
<FormGroup label={t('Labels')}>
<LabelsField name="labels" onChangeCallback={matchLabelsOnChange} />
Expand Down
Loading