Skip to content

Commit 5225721

Browse files
committed
fix(api-keys): change default tab to 'active' and update filtering logic
1 parent a674934 commit 5225721

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

web/src/i18n/en.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"copied": "Copied!",
5252
"done": "Done",
5353
"edit": "Edit",
54-
"total": "Total",
5554
"all": "All",
5655
"none": "None",
5756
"selectAll": "Select all",

web/src/i18n/zh.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"copied": "已复制!",
5252
"done": "完成",
5353
"edit": "编辑",
54-
"total": "总计",
5554
"all": "全部",
5655
"none": "",
5756
"selectAll": "全选",

web/src/routes/api-keys.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export function ApiKeysPage() {
186186
const [keys, setKeys] = useState<ApiKey[]>([]);
187187
const [loading, setLoading] = useState(true);
188188
const [error, setError] = useState('');
189-
const [tab, setTab] = useState('all');
189+
const [tab, setTab] = useState('active');
190190

191191
// Shared data for dialogs
192192
const [costCenterOptions, setCostCenterOptions] = useState<string[]>([]);
@@ -319,7 +319,7 @@ export function ApiKeysPage() {
319319
})
320320
: tab === 'inactive'
321321
? keys.filter((k) => !k.is_active || !!k.disabled_reason)
322-
: keys;
322+
: keys.filter((k) => k.is_active && !k.disabled_reason);
323323

324324
// ---------------------------------------------------------------------------
325325
// Callbacks
@@ -415,7 +415,7 @@ export function ApiKeysPage() {
415415
<div className="mb-4 flex items-center">
416416
<Tabs value={tab} onValueChange={setTab}>
417417
<TabsList>
418-
<TabsTrigger value="all">{t('common.total')}</TabsTrigger>
418+
<TabsTrigger value="active">{t('common.active')}</TabsTrigger>
419419
<TabsTrigger value="expiring">{t('apiKeys.expiringSoon')}</TabsTrigger>
420420
<TabsTrigger value="inactive">{t('apiKeys.inactiveTab')}</TabsTrigger>
421421
</TabsList>
@@ -442,9 +442,9 @@ export function ApiKeysPage() {
442442
<div className="flex h-full flex-col items-center justify-center text-center">
443443
<KeyRound className="h-10 w-10 text-muted-foreground mb-3" />
444444
<p className="text-sm text-muted-foreground">
445-
{tab === 'all' ? t('apiKeys.noKeys') : t('common.noData')}
445+
{keys.length === 0 ? t('apiKeys.noKeys') : t('common.noData')}
446446
</p>
447-
{tab === 'all' && (
447+
{keys.length === 0 && (
448448
<>
449449
<p className="text-xs text-muted-foreground mt-1">{t('apiKeys.noKeysHint')}</p>
450450
{hasPermission('api_keys:create') && (

0 commit comments

Comments
 (0)