fix(users): prevent large quota values from overflowing (#6134)
- widen the quota column and add consistent spacing between remaining and total values. - extract quota rendering into a dedicated component and truncate oversized text within the cell. - preserve full-value tooltips, progress indicators, and the zero-quota state.
This commit is contained in:
@@ -0,0 +1,98 @@
|
||||
/*
|
||||
Copyright (C) 2023-2026 QuantumNous
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
For commercial licensing, please contact support@quantumnous.com
|
||||
*/
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import { StatusBadge } from '@/components/status-badge'
|
||||
import { Progress } from '@/components/ui/progress'
|
||||
import {
|
||||
Tooltip,
|
||||
TooltipContent,
|
||||
TooltipTrigger,
|
||||
} from '@/components/ui/tooltip'
|
||||
import { formatQuota } from '@/lib/format'
|
||||
import { cn } from '@/lib/utils'
|
||||
|
||||
type UserQuotaCellProps = {
|
||||
used: number
|
||||
remaining: number
|
||||
}
|
||||
|
||||
function getQuotaProgressColor(percentage: number): string {
|
||||
if (percentage <= 10) return '[&_[data-slot=progress-indicator]]:bg-rose-500'
|
||||
if (percentage <= 30) return '[&_[data-slot=progress-indicator]]:bg-amber-500'
|
||||
return '[&_[data-slot=progress-indicator]]:bg-emerald-500'
|
||||
}
|
||||
|
||||
export function UserQuotaCell(props: UserQuotaCellProps) {
|
||||
const { t } = useTranslation()
|
||||
const total = props.used + props.remaining
|
||||
const percentage = total > 0 ? (props.remaining / total) * 100 : 0
|
||||
const formattedRemaining = formatQuota(props.remaining)
|
||||
const formattedTotal = formatQuota(total)
|
||||
|
||||
if (total === 0) {
|
||||
return (
|
||||
<StatusBadge
|
||||
label={t('No Quota')}
|
||||
variant='neutral'
|
||||
copyable={false}
|
||||
className='-ml-1.5'
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<Tooltip>
|
||||
<TooltipTrigger
|
||||
render={
|
||||
<div className='w-full min-w-0 cursor-help space-y-1.5 overflow-hidden' />
|
||||
}
|
||||
>
|
||||
<div className='grid min-w-0 grid-cols-2 gap-x-4 text-xs'>
|
||||
<span className='min-w-0 truncate font-medium tabular-nums'>
|
||||
{formattedRemaining}
|
||||
</span>
|
||||
<span className='text-muted-foreground min-w-0 truncate text-right tabular-nums'>
|
||||
{formattedTotal}
|
||||
</span>
|
||||
</div>
|
||||
<Progress
|
||||
value={percentage}
|
||||
className={cn('h-1.5', getQuotaProgressColor(percentage))}
|
||||
/>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent>
|
||||
<div className='space-y-1 text-xs'>
|
||||
<div>
|
||||
{t('Used:')} {formatQuota(props.used)}
|
||||
</div>
|
||||
<div>
|
||||
{t('Remaining:')} {formattedRemaining}
|
||||
</div>
|
||||
<div>
|
||||
{t('Total:')} {formattedTotal}
|
||||
</div>
|
||||
<div>
|
||||
{t('Percentage:')} {percentage.toFixed(1)}%
|
||||
</div>
|
||||
</div>
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
)
|
||||
}
|
||||
+4
-61
@@ -25,14 +25,12 @@ import { LongText } from '@/components/long-text'
|
||||
import { StatusBadge } from '@/components/status-badge'
|
||||
import { TableId } from '@/components/table-id'
|
||||
import { Checkbox } from '@/components/ui/checkbox'
|
||||
import { Progress } from '@/components/ui/progress'
|
||||
import {
|
||||
Tooltip,
|
||||
TooltipContent,
|
||||
TooltipTrigger,
|
||||
} from '@/components/ui/tooltip'
|
||||
import { formatQuota, formatTimestamp } from '@/lib/format'
|
||||
import { cn } from '@/lib/utils'
|
||||
|
||||
import {
|
||||
USER_STATUS,
|
||||
@@ -42,12 +40,7 @@ import {
|
||||
} from '../constants'
|
||||
import type { User } from '../types'
|
||||
import { DataTableRowActions } from './data-table-row-actions'
|
||||
|
||||
function getQuotaProgressColor(percentage: number): string {
|
||||
if (percentage <= 10) return '[&_[data-slot=progress-indicator]]:bg-rose-500'
|
||||
if (percentage <= 30) return '[&_[data-slot=progress-indicator]]:bg-amber-500'
|
||||
return '[&_[data-slot=progress-indicator]]:bg-emerald-500'
|
||||
}
|
||||
import { UserQuotaCell } from './user-quota-cell'
|
||||
|
||||
export function useUsersColumns(): ColumnDef<User>[] {
|
||||
const { t } = useTranslation()
|
||||
@@ -173,60 +166,10 @@ export function useUsersColumns(): ColumnDef<User>[] {
|
||||
header: t('Quota'),
|
||||
cell: ({ row }) => {
|
||||
const user = row.original
|
||||
const used = user.used_quota
|
||||
const remaining = user.quota
|
||||
const total = used + remaining
|
||||
const percentage = total > 0 ? (remaining / total) * 100 : 0
|
||||
|
||||
if (total === 0) {
|
||||
return (
|
||||
<StatusBadge
|
||||
label={t('No Quota')}
|
||||
variant='neutral'
|
||||
copyable={false}
|
||||
className='-ml-1.5'
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<Tooltip>
|
||||
<TooltipTrigger
|
||||
render={<div className='w-[150px] cursor-help space-y-1' />}
|
||||
>
|
||||
<div className='flex justify-between text-xs'>
|
||||
<span className='font-medium tabular-nums'>
|
||||
{formatQuota(remaining)}
|
||||
</span>
|
||||
<span className='text-muted-foreground tabular-nums'>
|
||||
{formatQuota(total)}
|
||||
</span>
|
||||
</div>
|
||||
<Progress
|
||||
value={percentage}
|
||||
className={cn('h-1.5', getQuotaProgressColor(percentage))}
|
||||
/>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent>
|
||||
<div className='space-y-1 text-xs'>
|
||||
<div>
|
||||
{t('Used:')} {formatQuota(used)}
|
||||
</div>
|
||||
<div>
|
||||
{t('Remaining:')} {formatQuota(remaining)}
|
||||
</div>
|
||||
<div>
|
||||
{t('Total:')} {formatQuota(total)}
|
||||
</div>
|
||||
<div>
|
||||
{t('Percentage:')} {percentage.toFixed(1)}%
|
||||
</div>
|
||||
</div>
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
)
|
||||
return <UserQuotaCell used={user.used_quota} remaining={user.quota} />
|
||||
},
|
||||
size: 170,
|
||||
size: 300,
|
||||
minSize: 260,
|
||||
meta: { mobileOrder: 40 },
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user