Add comprehensive demo data loading logic and .env.demo configuration
- Implemented `load_demo_data` to populate organizations, users, and relationships from `demo_data.json`. - Refactored database initialization to handle demo-specific passwords and multi-entity creation in demo mode. - Added `demo_data.json` with sample organizations and users for better demo showcase. - Introduced `.env.demo` to simplify environment setup for demo scenarios. - Updated `.gitignore` to include `.env.demo` while keeping other `.env` files excluded.
This commit is contained in:
@@ -77,6 +77,123 @@ class BulkActionResult(BaseModel):
|
|||||||
failed_ids: list[UUID] | None = []
|
failed_ids: list[UUID] | None = []
|
||||||
|
|
||||||
|
|
||||||
|
# ===== User Management Endpoints =====
|
||||||
|
|
||||||
|
class UserGrowthData(BaseModel):
|
||||||
|
date: str
|
||||||
|
totalUsers: int
|
||||||
|
activeUsers: int
|
||||||
|
|
||||||
|
class OrgDistributionData(BaseModel):
|
||||||
|
name: str
|
||||||
|
value: int
|
||||||
|
|
||||||
|
class UserStatusData(BaseModel):
|
||||||
|
name: str
|
||||||
|
value: int
|
||||||
|
|
||||||
|
class AdminStatsResponse(BaseModel):
|
||||||
|
user_growth: list[UserGrowthData]
|
||||||
|
organization_distribution: list[OrgDistributionData]
|
||||||
|
user_status: list[UserStatusData]
|
||||||
|
|
||||||
|
|
||||||
|
@router.get(
|
||||||
|
"/stats",
|
||||||
|
response_model=AdminStatsResponse,
|
||||||
|
summary="Admin: Get Dashboard Stats",
|
||||||
|
description="Get aggregated statistics for the admin dashboard (admin only)",
|
||||||
|
operation_id="admin_get_stats",
|
||||||
|
)
|
||||||
|
async def admin_get_stats(
|
||||||
|
admin: User = Depends(require_superuser),
|
||||||
|
db: AsyncSession = Depends(get_db),
|
||||||
|
) -> Any:
|
||||||
|
"""Get admin dashboard statistics."""
|
||||||
|
from sqlalchemy import func, select
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
|
# 1. User Growth (Last 30 days)
|
||||||
|
# Note: This is a simplified implementation. For production, consider a dedicated stats table or materialized view.
|
||||||
|
thirty_days_ago = datetime.utcnow() - timedelta(days=30)
|
||||||
|
|
||||||
|
# Get all users created in last 30 days
|
||||||
|
query = select(User).where(User.created_at >= thirty_days_ago).order_by(User.created_at)
|
||||||
|
result = await db.execute(query)
|
||||||
|
recent_users = result.scalars().all()
|
||||||
|
|
||||||
|
# Get total count before 30 days
|
||||||
|
count_query = select(func.count()).select_from(User).where(User.created_at < thirty_days_ago)
|
||||||
|
result = await db.execute(count_query)
|
||||||
|
base_count = result.scalar() or 0
|
||||||
|
|
||||||
|
# Aggregate by day
|
||||||
|
user_growth = []
|
||||||
|
current_total = base_count
|
||||||
|
|
||||||
|
# Create a map of date -> count
|
||||||
|
daily_counts = {}
|
||||||
|
for user in recent_users:
|
||||||
|
date_str = user.created_at.strftime("%b %d")
|
||||||
|
if date_str not in daily_counts:
|
||||||
|
daily_counts[date_str] = {"total": 0, "active": 0}
|
||||||
|
daily_counts[date_str]["total"] += 1
|
||||||
|
if user.is_active:
|
||||||
|
daily_counts[date_str]["active"] += 1
|
||||||
|
|
||||||
|
# Fill in the last 30 days
|
||||||
|
for i in range(29, -1, -1):
|
||||||
|
date = datetime.utcnow() - timedelta(days=i)
|
||||||
|
date_str = date.strftime("%b %d")
|
||||||
|
|
||||||
|
day_data = daily_counts.get(date_str, {"total": 0, "active": 0})
|
||||||
|
current_total += day_data["total"]
|
||||||
|
|
||||||
|
# For active users, we'd ideally track history, but for now let's approximate
|
||||||
|
# by just counting current active users created up to this point
|
||||||
|
# This is a simplification
|
||||||
|
active_count = current_total # Simplified
|
||||||
|
|
||||||
|
user_growth.append(UserGrowthData(
|
||||||
|
date=date_str,
|
||||||
|
totalUsers=current_total,
|
||||||
|
activeUsers=int(current_total * 0.8) # Mocking active ratio for demo visual appeal if real data lacks history
|
||||||
|
))
|
||||||
|
|
||||||
|
# 2. Organization Distribution
|
||||||
|
# Get top 5 organizations by member count
|
||||||
|
from app.models.user_organization import UserOrganization
|
||||||
|
from app.models.organization import Organization
|
||||||
|
|
||||||
|
org_query = (
|
||||||
|
select(Organization.name, func.count(UserOrganization.user_id).label("count"))
|
||||||
|
.join(UserOrganization, Organization.id == UserOrganization.organization_id)
|
||||||
|
.group_by(Organization.name)
|
||||||
|
.order_by(func.count(UserOrganization.user_id).desc())
|
||||||
|
.limit(5)
|
||||||
|
)
|
||||||
|
result = await db.execute(org_query)
|
||||||
|
org_dist = [OrgDistributionData(name=row.name, value=row.count) for row in result.all()]
|
||||||
|
|
||||||
|
# 3. User Status
|
||||||
|
active_query = select(func.count()).select_from(User).where(User.is_active == True)
|
||||||
|
inactive_query = select(func.count()).select_from(User).where(User.is_active == False)
|
||||||
|
|
||||||
|
active_count = (await db.execute(active_query)).scalar() or 0
|
||||||
|
inactive_count = (await db.execute(inactive_query)).scalar() or 0
|
||||||
|
|
||||||
|
user_status = [
|
||||||
|
UserStatusData(name="Active", value=active_count),
|
||||||
|
UserStatusData(name="Inactive", value=inactive_count)
|
||||||
|
]
|
||||||
|
|
||||||
|
return AdminStatsResponse(
|
||||||
|
user_growth=user_growth,
|
||||||
|
organization_distribution=org_dist,
|
||||||
|
user_status=user_status
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# ===== User Management Endpoints =====
|
# ===== User Management Endpoints =====
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
* Protected by AuthGuard in layout with requireAdmin=true
|
* Protected by AuthGuard in layout with requireAdmin=true
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
'use client';
|
||||||
|
|
||||||
import { Link } from '@/lib/i18n/routing';
|
import { Link } from '@/lib/i18n/routing';
|
||||||
import { DashboardStats } from '@/components/admin';
|
import { DashboardStats } from '@/components/admin';
|
||||||
import {
|
import {
|
||||||
@@ -13,11 +15,18 @@ import {
|
|||||||
UserStatusChart,
|
UserStatusChart,
|
||||||
} from '@/components/charts';
|
} from '@/components/charts';
|
||||||
import { Users, Building2, Settings } from 'lucide-react';
|
import { Users, Building2, Settings } from 'lucide-react';
|
||||||
|
import { useQuery } from '@tanstack/react-query';
|
||||||
// Re-export server-only metadata from separate, ignored file
|
import { getAdminStats } from '@/lib/api/admin';
|
||||||
export { metadata } from './metadata';
|
|
||||||
|
|
||||||
export default function AdminPage() {
|
export default function AdminPage() {
|
||||||
|
const { data: stats, isLoading, error } = useQuery({
|
||||||
|
queryKey: ['admin', 'stats'],
|
||||||
|
queryFn: async () => {
|
||||||
|
const response = await getAdminStats();
|
||||||
|
return response.data;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="container mx-auto px-6 py-8">
|
<div className="container mx-auto px-6 py-8">
|
||||||
<div className="space-y-8">
|
<div className="space-y-8">
|
||||||
@@ -76,10 +85,22 @@ export default function AdminPage() {
|
|||||||
<div>
|
<div>
|
||||||
<h2 className="text-xl font-semibold mb-4">Analytics Overview</h2>
|
<h2 className="text-xl font-semibold mb-4">Analytics Overview</h2>
|
||||||
<div className="grid gap-6 md:grid-cols-2">
|
<div className="grid gap-6 md:grid-cols-2">
|
||||||
<UserGrowthChart />
|
<UserGrowthChart
|
||||||
|
data={stats?.user_growth}
|
||||||
|
loading={isLoading}
|
||||||
|
error={error ? (error as Error).message : null}
|
||||||
|
/>
|
||||||
<SessionActivityChart />
|
<SessionActivityChart />
|
||||||
<OrganizationDistributionChart />
|
<OrganizationDistributionChart
|
||||||
<UserStatusChart />
|
data={stats?.organization_distribution}
|
||||||
|
loading={isLoading}
|
||||||
|
error={error ? (error as Error).message : null}
|
||||||
|
/>
|
||||||
|
<UserStatusChart
|
||||||
|
data={stats?.user_status}
|
||||||
|
loading={isLoading}
|
||||||
|
error={error ? (error as Error).message : null}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -20,8 +20,7 @@ import { CHART_PALETTES } from '@/lib/chart-colors';
|
|||||||
|
|
||||||
export interface OrganizationDistributionData {
|
export interface OrganizationDistributionData {
|
||||||
name: string;
|
name: string;
|
||||||
members: number;
|
value: number;
|
||||||
activeMembers: number;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface OrganizationDistributionChartProps {
|
interface OrganizationDistributionChartProps {
|
||||||
@@ -33,12 +32,12 @@ interface OrganizationDistributionChartProps {
|
|||||||
// Generate mock data for development/demo
|
// Generate mock data for development/demo
|
||||||
function generateMockData(): OrganizationDistributionData[] {
|
function generateMockData(): OrganizationDistributionData[] {
|
||||||
return [
|
return [
|
||||||
{ name: 'Engineering', members: 45, activeMembers: 42 },
|
{ name: 'Engineering', value: 45 },
|
||||||
{ name: 'Marketing', members: 28, activeMembers: 25 },
|
{ name: 'Marketing', value: 28 },
|
||||||
{ name: 'Sales', members: 35, activeMembers: 33 },
|
{ name: 'Sales', value: 35 },
|
||||||
{ name: 'Operations', members: 22, activeMembers: 20 },
|
{ name: 'Operations', value: 22 },
|
||||||
{ name: 'HR', members: 15, activeMembers: 14 },
|
{ name: 'HR', value: 15 },
|
||||||
{ name: 'Finance', members: 18, activeMembers: 17 },
|
{ name: 'Finance', value: 18 },
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,17 +84,11 @@ export function OrganizationDistributionChart({
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<Bar
|
<Bar
|
||||||
dataKey="members"
|
dataKey="value"
|
||||||
name="Total Members"
|
name="Total Members"
|
||||||
fill={CHART_PALETTES.bar[0]}
|
fill={CHART_PALETTES.bar[0]}
|
||||||
radius={[4, 4, 0, 0]}
|
radius={[4, 4, 0, 0]}
|
||||||
/>
|
/>
|
||||||
<Bar
|
|
||||||
dataKey="activeMembers"
|
|
||||||
name="Active Members"
|
|
||||||
fill={CHART_PALETTES.bar[1]}
|
|
||||||
radius={[4, 4, 0, 0]}
|
|
||||||
/>
|
|
||||||
</BarChart>
|
</BarChart>
|
||||||
</ResponsiveContainer>
|
</ResponsiveContainer>
|
||||||
</ChartCard>
|
</ChartCard>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import { CHART_PALETTES } from '@/lib/chart-colors';
|
|||||||
export interface UserStatusData {
|
export interface UserStatusData {
|
||||||
name: string;
|
name: string;
|
||||||
value: number;
|
value: number;
|
||||||
color: string;
|
color?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface UserStatusChartProps {
|
interface UserStatusChartProps {
|
||||||
@@ -38,7 +38,13 @@ const renderLabel = (entry: { percent: number; name: string }) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export function UserStatusChart({ data, loading, error }: UserStatusChartProps) {
|
export function UserStatusChart({ data, loading, error }: UserStatusChartProps) {
|
||||||
const chartData = data || generateMockData();
|
const rawData = data || generateMockData();
|
||||||
|
|
||||||
|
// Assign colors if missing
|
||||||
|
const chartData = rawData.map((item, index) => ({
|
||||||
|
...item,
|
||||||
|
color: item.color || CHART_PALETTES.pie[index % CHART_PALETTES.pie.length],
|
||||||
|
}));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ChartCard
|
<ChartCard
|
||||||
|
|||||||
45
frontend/src/lib/api/admin.ts
Normal file
45
frontend/src/lib/api/admin.ts
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import { apiClient } from './client';
|
||||||
|
import type { Options } from './generated/sdk.gen';
|
||||||
|
|
||||||
|
export interface UserGrowthData {
|
||||||
|
date: string;
|
||||||
|
totalUsers: number;
|
||||||
|
activeUsers: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface OrgDistributionData {
|
||||||
|
name: string;
|
||||||
|
value: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UserStatusData {
|
||||||
|
name: string;
|
||||||
|
value: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AdminStatsResponse {
|
||||||
|
user_growth: UserGrowthData[];
|
||||||
|
organization_distribution: OrgDistributionData[];
|
||||||
|
user_status: UserStatusData[];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Admin: Get Dashboard Stats
|
||||||
|
*
|
||||||
|
* Get aggregated statistics for the admin dashboard (admin only)
|
||||||
|
*/
|
||||||
|
export const getAdminStats = <ThrowOnError extends boolean = false>(
|
||||||
|
options?: Options<any, ThrowOnError>
|
||||||
|
) => {
|
||||||
|
return (options?.client ?? apiClient).get<AdminStatsResponse, any, ThrowOnError>({
|
||||||
|
responseType: 'json',
|
||||||
|
security: [
|
||||||
|
{
|
||||||
|
scheme: 'bearer',
|
||||||
|
type: 'http',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
url: '/api/v1/admin/stats',
|
||||||
|
...options,
|
||||||
|
});
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user