diff --git a/frontend/web/components/PermissionsSummaryList.tsx b/frontend/web/components/PermissionsSummaryList.tsx index 0adcaf24098d..913958632073 100644 --- a/frontend/web/components/PermissionsSummaryList.tsx +++ b/frontend/web/components/PermissionsSummaryList.tsx @@ -2,7 +2,7 @@ import React, { FC, useMemo } from 'react' import Tooltip from './Tooltip' import { RolePermission } from 'common/types/responses' import Format from 'common/utils/format' -import classNames from 'classnames' +import Chip, { chipClassName } from './base/Chip' import { sortBy } from 'lodash' type PermissionsSummaryListType = { @@ -40,49 +40,36 @@ const PermissionsSummaryList: FC = ({ const getPermissionString = (v: RolePermission['permissions'][number]) => `${Format.enumeration.get(v.permission_key)}${v.tags?.length ? `*` : ''}` + // Tag-scoped permissions grant limited access. + const getVariant = (v: RolePermission['permissions'][number]) => + v.tags?.length ? 'warning' : 'success' + const truncatedHasLimitedAccess = truncatedItems?.find((v) => v.tags?.length) return (
{items.map((value, i) => ( -
+ {getPermissionString(value)} -
+ ))} {!!truncatedItems.length && ( +{truncatedItems.length} - + } > {`
${truncatedItems .map( - (v) => `
- ${getPermissionString(v)} -
`, + (v) => + `${getPermissionString(v)}`, ) .join('')}
`}
diff --git a/frontend/web/components/base/Chip/Chip.tsx b/frontend/web/components/base/Chip/Chip.tsx index b03f87386546..86b1d2599cd9 100644 --- a/frontend/web/components/base/Chip/Chip.tsx +++ b/frontend/web/components/base/Chip/Chip.tsx @@ -46,6 +46,23 @@ const VARIANT_UTILITIES: Record = { warning: 'bg-surface-warning text-warning', } +// The classes for a token chip, for markup built as an HTML string (tooltips). +export const chipClassName = ({ + size = 'default', + variant = 'neutral', +}: { + size?: ChipSize + variant?: ChipVariant +}) => + classNames( + 'ds-chip d-inline-flex align-items-center align-middle gap-1 rounded-sm', + variant !== 'tinted' && VARIANT_UTILITIES[variant], + { + [`ds-chip--${variant}`]: variant !== 'neutral', + [`ds-chip--${size}`]: size !== 'default', + }, + ) + // Token-based chip primitive. Uses `ds-chip` rather than the legacy `.chip` // (old SCSS vars + a manual `.dark {}` block, ~35 usages) so the two coexist // until those migrate under #6606. Clickable on its own (role=button), or a @@ -80,16 +97,10 @@ const Chip = ({ // Data, not styling: Chip.scss derives the shades from these. style={tintStyle} className={classNames( - 'ds-chip d-inline-flex align-items-center align-middle gap-1 rounded-sm', - !tint && VARIANT_UTILITIES[tokenVariant], + chipClassName({ size, variant: tint ? 'tinted' : tokenVariant }), { - 'ds-chip--accent': !tint && tokenVariant === 'accent', 'ds-chip--clickable': interactive, - 'ds-chip--success': !tint && tokenVariant === 'success', - 'ds-chip--tinted': !!tint, 'ds-chip--truncate': truncate, - [`ds-chip--${size}`]: size !== 'default', - 'ds-chip--warning': !tint && tokenVariant === 'warning', }, className, )} diff --git a/frontend/web/components/base/Chip/index.ts b/frontend/web/components/base/Chip/index.ts index a67c8c1b2c0d..87efd48a31ba 100644 --- a/frontend/web/components/base/Chip/index.ts +++ b/frontend/web/components/base/Chip/index.ts @@ -1,2 +1,2 @@ -export { default } from './Chip' +export { default, chipClassName } from './Chip' export type { ChipProps, ChipSize, ChipVariant, ChipVariantProps } from './Chip'