Skip to content

Fix admin user null statistics #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sunnylqm wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix admin user null statistics #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 28 additions & 20 deletions src/pages/admin-users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,36 +349,44 @@ const UserDetailDrawer = ({
})}
</Descriptions.Item>
<Descriptions.Item label={translate('admin_users.today_used')}>
{t('admin_users.checks_value', {
value: detail.quotaDetail.todayUsed,
})}
{detail.quotaDetail.todayUsed === null
? '-'
: t('admin_users.checks_value', {
value: detail.quotaDetail.todayUsed,
})}
</Descriptions.Item>
<Descriptions.Item
label={translate('admin_users.today_remaining')}
>
{t('admin_users.checks_value', {
value: detail.quotaDetail.todayRemaining,
})}
{detail.quotaDetail.todayRemaining === null
? '-'
: t('admin_users.checks_value', {
value: detail.quotaDetail.todayRemaining,
})}
</Descriptions.Item>
<Descriptions.Item label={translate('admin_users.avg_7_days')}>
{t('admin_users.checks_value', {
value: detail.quotaDetail.last7Days.avg,
})}
{detail.quotaDetail.last7Days
? t('admin_users.checks_value', {
value: detail.quotaDetail.last7Days.avg,
})
: '-'}
</Descriptions.Item>
<Descriptions.Item
label={translate('admin_users.last_7_days_details')}
span={2}
>
{detail.quotaDetail.last7Days.counts
.slice()
.reverse()
.map((c, i) => (
// biome-ignore lint/suspicious/noArrayIndexKey: fixed-length ordered day list, index is the stable identity
<span key={i} className="mr-3 inline-block">
{t('admin_users.day_label', { day: i + 1 })}:{' '}
<strong>{c}</strong>
</span>
))}
{detail.quotaDetail.last7Days
? detail.quotaDetail.last7Days.counts
.slice()
.reverse()
.map((c, i) => (
// biome-ignore lint/suspicious/noArrayIndexKey: fixed-length ordered day list, index is the stable identity
<span key={i} className="mr-3 inline-block">
{t('admin_users.day_label', { day: i + 1 })}:{' '}
<strong>{c}</strong>
</span>
))
: '-'}
</Descriptions.Item>
<Descriptions.Item label={translate('admin_users.app_limit')}>
{detail.apps.length} / {detail.quotaDetail.limit.app}
Expand Down Expand Up @@ -408,7 +416,7 @@ const UserDetailDrawer = ({
</span>
<Space size="middle">
<span>
PV: <strong>{app.checkCount}</strong>
PV: <strong>{app.checkCount ?? '-'}</strong>
</span>
<span>
{translate('admin_users.packages_count')}:{' '}
Expand Down
8 changes: 4 additions & 4 deletions src/services/admin-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,16 @@ export const adminApi = {
};
quotaDetail: {
limit: Quota;
todayRemaining: number;
todayUsed: number;
todayRemaining: number | null;
todayUsed: number | null;
last7Days: {
counts: number[];
avg: number;
};
} | null;
};
apps: Array<
AdminApp & {
checkCount: number;
checkCount: number | null;
packagesCount: number;
}
>;
Expand Down