Skip to content

Commit e7044c4

Browse files
committed
feat(Icon): add ic-key-enter icon and update icon mapping
1 parent b80e095 commit e7044c4

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/Assets/IconV2/ic-key-enter.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Shared/Components/ConfirmationModal/ConfirmationModal.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import { Backdrop } from '../Backdrop'
2525
import { Button, ButtonStyleType, ButtonVariantType } from '../Button'
2626
import { Confetti } from '../Confetti'
2727
import { CustomInput } from '../CustomInput'
28+
import { Icon } from '../Icon'
2829
import { useConfirmationModalContext } from './ConfirmationModalContext'
2930
import { ConfirmationModalBodyProps, ConfirmationModalProps, ConfirmationModalVariantType } from './types'
3031
import { getConfirmationLabel, getIconFromVariant, getPrimaryButtonStyleFromVariant } from './utils'
@@ -34,7 +35,7 @@ import './confirmationModal.scss'
3435
const ConfirmationModalBody = ({
3536
title,
3637
subtitle,
37-
Icon,
38+
Icon: ButtonIcon,
3839
variant,
3940
buttonConfig,
4041
confirmationConfig,
@@ -53,8 +54,8 @@ const ConfirmationModalBody = ({
5354

5455
const { primaryButtonConfig, secondaryButtonConfig } = buttonConfig
5556

56-
const RenderIcon = Icon ?? getIconFromVariant(variant)
57-
const hideIcon = variant === ConfirmationModalVariantType.custom && !Icon
57+
const RenderIcon = ButtonIcon ?? getIconFromVariant(variant)
58+
const hideIcon = variant === ConfirmationModalVariantType.custom && !ButtonIcon
5859

5960
const disablePrimaryButton: boolean =
6061
('disabled' in primaryButtonConfig && primaryButtonConfig.disabled) ||
@@ -159,7 +160,7 @@ const ConfirmationModalBody = ({
159160
text={primaryButtonConfig.text}
160161
onClick={primaryButtonConfig.onClick as ButtonHTMLAttributes<HTMLButtonElement>['onClick']}
161162
startIcon={primaryButtonConfig.startIcon}
162-
endIcon={primaryButtonConfig.endIcon}
163+
endIcon={primaryButtonConfig.endIcon || <Icon name="ic-key-enter" color={null} />}
163164
/>
164165
)}
165166
</div>

src/Shared/Components/Icon/Icon.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ import { ReactComponent as ICJobColor } from '@IconsV2/ic-job-color.svg'
9898
import { ReactComponent as ICK3s } from '@IconsV2/ic-k3s.svg'
9999
import { ReactComponent as ICK8sJob } from '@IconsV2/ic-k8s-job.svg'
100100
import { ReactComponent as ICKey } from '@IconsV2/ic-key.svg'
101+
import { ReactComponent as ICKeyEnter } from '@IconsV2/ic-key-enter.svg'
101102
import { ReactComponent as ICKind } from '@IconsV2/ic-kind.svg'
102103
import { ReactComponent as ICLaptop } from '@IconsV2/ic-laptop.svg'
103104
import { ReactComponent as ICLdap } from '@IconsV2/ic-ldap.svg'
@@ -260,6 +261,7 @@ export const iconMap = {
260261
'ic-job-color': ICJobColor,
261262
'ic-k3s': ICK3s,
262263
'ic-k8s-job': ICK8sJob,
264+
'ic-key-enter': ICKeyEnter,
263265
'ic-key': ICKey,
264266
'ic-kind': ICKind,
265267
'ic-laptop': ICLaptop,

0 commit comments

Comments
 (0)