diff --git a/.npmrc b/.npmrc index 2810e35..fb8721e 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ -@modl-gg:registry=https://npm.pkg.github.com -//npm.pkg.github.com/:_authToken=${GITHUB_TOKEN} \ No newline at end of file +@modl-gg:registry=https://nexus.modl.gg/repository/npm-releases/ diff --git a/client/src/App.tsx b/client/src/App.tsx index 4c355d6..3d66000 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -10,6 +10,10 @@ import MonitoringPage from '@/pages/MonitoringPage'; import LoadingPage from '@/pages/LoadingPage'; import AnalyticsPage from '@/pages/AnalyticsPage'; import SystemPromptsPage from '@/pages/SystemPromptsPage'; +import AlertsPage from '@/pages/AlertsPage'; +import BetaTestersPage from '@/pages/BetaTestersPage'; +import BetaTesterDetailPage from '@/pages/BetaTesterDetailPage'; +import { isStagingHost } from '@/lib/env'; function ProtectedRoute({ children }: { children: React.ReactNode }) { const { isAuthenticated, isLoading } = useAuth(); @@ -46,6 +50,13 @@ function AppRoutes() { + + {isStagingHost() && ( + + )} + {isStagingHost() && ( + + )} diff --git a/client/src/components/CreateBetaTesterModal.tsx b/client/src/components/CreateBetaTesterModal.tsx new file mode 100644 index 0000000..74eee75 --- /dev/null +++ b/client/src/components/CreateBetaTesterModal.tsx @@ -0,0 +1,165 @@ +import { useEffect } from 'react'; +import { + Dialog, + DialogContent, + DialogDescription, + DialogHeader, + DialogTitle, + DialogFooter, +} from '@modl-gg/shared-web/components/ui/dialog'; +import { Button } from '@modl-gg/shared-web/components/ui/button'; +import { Input } from '@modl-gg/shared-web/components/ui/input'; +import { Label } from '@modl-gg/shared-web/components/ui/label'; +import { useToast } from '@modl-gg/shared-web/hooks/use-toast'; +import { useForm } from 'react-hook-form'; +import { zodResolver } from '@hookform/resolvers/zod'; +import { z } from 'zod'; +import { useMutation, useQueryClient } from '@tanstack/react-query'; +import { FlaskConical } from 'lucide-react'; +import { betaTestersService } from '@/lib/services/beta-testers-service'; + +const subdomainPattern = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/; + +const createBetaTesterSchema = z.object({ + serverName: z + .string() + .trim() + .min(2, 'Server name must be at least 2 characters') + .max(64, 'Server name must be at most 64 characters'), + customDomain: z + .string() + .trim() + .toLowerCase() + .min(3, 'Subdomain must be at least 3 characters') + .max(50, 'Subdomain must be at most 50 characters') + .regex(subdomainPattern, 'Use lowercase letters, numbers, and hyphens only'), + adminEmail: z.string().trim().email('Enter a valid email address'), +}); + +type CreateBetaTesterFormValues = z.infer; + +const defaultValues: CreateBetaTesterFormValues = { + serverName: '', + customDomain: '', + adminEmail: '', +}; + +interface CreateBetaTesterModalProps { + isOpen: boolean; + onClose: () => void; +} + +export function CreateBetaTesterModal({ isOpen, onClose }: CreateBetaTesterModalProps) { + const queryClient = useQueryClient(); + const { toast } = useToast(); + + const form = useForm({ + resolver: zodResolver(createBetaTesterSchema), + defaultValues, + }); + + useEffect(() => { + if (isOpen) { + form.reset(defaultValues); + } + }, [isOpen, form]); + + const subdomainPreview = form.watch('customDomain'); + + const mutation = useMutation({ + mutationFn: (values: CreateBetaTesterFormValues) => + betaTestersService.createBetaTester(values), + onSuccess: (record) => { + queryClient.invalidateQueries({ queryKey: ['beta-testers'] }); + toast({ + title: 'Beta tester provisioned', + description: `${record.serverName} is now live at ${record.customDomain}.modl.top`, + }); + onClose(); + }, + onError: (error) => { + toast({ + title: 'Failed to create beta tester', + description: error instanceof Error ? error.message : 'Unexpected error', + variant: 'destructive', + }); + }, + }); + + const onSubmit = (values: CreateBetaTesterFormValues) => { + mutation.mutate(values); + }; + + return ( + !open && onClose()}> + + + + + Create beta tester + + + Provisions a fully-featured panel with Premium granted for free and strict beta resource + limits. Available on staging only. + + + +
+
+ + + {form.formState.errors.serverName && ( +

{form.formState.errors.serverName.message}

+ )} +
+ +
+ +
+ + .modl.top +
+

+ Panel URL:{' '} + + {(subdomainPreview || 'subdomain').toLowerCase()}.modl.top + +

+ {form.formState.errors.customDomain && ( +

{form.formState.errors.customDomain.message}

+ )} +
+ +
+ + + {form.formState.errors.adminEmail && ( +

{form.formState.errors.adminEmail.message}

+ )} +
+ + + + + +
+ + + ); +} diff --git a/client/src/components/layout/Layout.tsx b/client/src/components/layout/Layout.tsx index 202003a..1b26653 100644 --- a/client/src/components/layout/Layout.tsx +++ b/client/src/components/layout/Layout.tsx @@ -1,7 +1,8 @@ import { Link, useLocation } from 'wouter'; -import { LayoutDashboard, Server, Activity, BarChart3, Sparkles, LogOut } from 'lucide-react'; +import { LayoutDashboard, Server, Activity, BarChart3, Sparkles, Bell, FlaskConical, LogOut } from 'lucide-react'; import { Button } from '@modl-gg/shared-web/components/ui/button'; import { useAuth } from '@/hooks/useAuth'; +import { isStagingHost } from '@/lib/env'; import Logo from '@/components/Logo'; const navItems = [ @@ -10,6 +11,8 @@ const navItems = [ { href: '/monitoring', label: 'Monitoring', icon: Activity }, { href: '/analytics', label: 'Analytics', icon: BarChart3 }, { href: '/prompts', label: 'AI Prompts', icon: Sparkles }, + { href: '/alerts', label: 'Alerts', icon: Bell }, + ...(isStagingHost() ? [{ href: '/beta-testers', label: 'Beta Testing', icon: FlaskConical }] : []), ]; export default function Layout({ children }: { children: React.ReactNode }) { diff --git a/client/src/hooks/useAuth.tsx b/client/src/hooks/useAuth.tsx index 65fda9b..3f77114 100644 --- a/client/src/hooks/useAuth.tsx +++ b/client/src/hooks/useAuth.tsx @@ -25,7 +25,7 @@ export function useAuth() { throw caught; } }, - staleTime: 10 * 60 * 1000, + staleTime: 60 * 1000, retry: false, }); diff --git a/client/src/lib/api-contracts/beta-testers.ts b/client/src/lib/api-contracts/beta-testers.ts new file mode 100644 index 0000000..3fdfc9c --- /dev/null +++ b/client/src/lib/api-contracts/beta-testers.ts @@ -0,0 +1,205 @@ +import { + getOptionalString, + isRecord, + normalizeDateValue, + parseNumber, +} from '@/lib/api-contracts/common'; +import { + normalizeProvisioningStatus, + normalizeServerPlan, + normalizeSubscriptionStatus, + type ProvisioningStatus, + type ServerPlan, + type SubscriptionStatus, +} from '@/lib/services/servers-service'; + +export interface BetaTesterUsage { + storageUsedBytes: number; + userCount: number; + ticketCount: number; + cdnUsageGb: number; + aiRequestsUsed: number; +} + +export interface BetaTesterLimits { + maxStaffSeats: number; + maxStorageBytes: number; + aiRequestLimit: number; + cdnLimitGb: number; + customDomainAllowed: boolean; + maxUploadBytes: number; +} + +export interface BetaTesterRecord { + id: string; + serverName: string; + customDomain: string; + adminEmail: string; + plan: ServerPlan; + subscriptionStatus?: SubscriptionStatus; + betaTester: boolean; + provisioningStatus: ProvisioningStatus; + emailVerified: boolean; + apiKeySet: boolean; + createdAt?: string; + updatedAt?: string; + betaTesterCreatedAt?: string; + betaTesterCreatedBy?: string; + usage: BetaTesterUsage; + limits: BetaTesterLimits; +} + +export interface PaginatedBetaTesters { + betaTesters: BetaTesterRecord[]; + pagination: { + page: number; + limit: number; + total: number; + pages: number; + }; +} + +export interface BetaTesterResetResult { + serverId: string; + clearedCollections: string[]; +} + +export interface BetaTesterResetAllItem { + serverId: string; + serverName: string; + success: boolean; + message?: string; +} + +export interface BetaTesterResetAllResult { + results: BetaTesterResetAllItem[]; +} + +export interface BetaAuditEntry { + action: string; + adminEmail: string; + timestamp?: string; + details?: string; +} + +export interface BetaTesterAudit { + entries: BetaAuditEntry[]; +} + +interface RawBetaTester { + id?: unknown; + _id?: unknown; + serverName?: unknown; + customDomain?: unknown; + adminEmail?: unknown; + plan?: unknown; + subscriptionStatus?: unknown; + betaTester?: unknown; + provisioningStatus?: unknown; + emailVerified?: unknown; + apiKeySet?: unknown; + createdAt?: unknown; + updatedAt?: unknown; + betaTesterCreatedAt?: unknown; + betaTesterCreatedBy?: unknown; + usage?: unknown; + limits?: unknown; +} + +function ensureId(raw: RawBetaTester): string { + if (typeof raw.id === 'string') { + return raw.id; + } + + if (typeof raw._id === 'string') { + return raw._id; + } + + return ''; +} + +function mapUsage(value: unknown): BetaTesterUsage { + const raw = isRecord(value) ? value : {}; + + return { + storageUsedBytes: parseNumber(raw.storageUsedBytes, 0), + userCount: parseNumber(raw.userCount, 0), + ticketCount: parseNumber(raw.ticketCount, 0), + cdnUsageGb: parseNumber(raw.cdnUsageGb, 0), + aiRequestsUsed: parseNumber(raw.aiRequestsUsed, 0), + }; +} + +function mapLimits(value: unknown): BetaTesterLimits { + const raw = isRecord(value) ? value : {}; + + return { + maxStaffSeats: parseNumber(raw.maxStaffSeats, 0), + maxStorageBytes: parseNumber(raw.maxStorageBytes, 0), + aiRequestLimit: parseNumber(raw.aiRequestLimit, 0), + cdnLimitGb: parseNumber(raw.cdnLimitGb, 0), + customDomainAllowed: raw.customDomainAllowed === true, + maxUploadBytes: parseNumber(raw.maxUploadBytes, 0), + }; +} + +export function mapBetaTester(raw: RawBetaTester): BetaTesterRecord { + return { + id: ensureId(raw), + serverName: getOptionalString(raw.serverName) ?? 'Unknown Server', + customDomain: getOptionalString(raw.customDomain) ?? 'unknown', + adminEmail: getOptionalString(raw.adminEmail) ?? 'unknown@example.com', + plan: normalizeServerPlan(raw.plan), + subscriptionStatus: normalizeSubscriptionStatus(raw.subscriptionStatus), + betaTester: raw.betaTester === true, + provisioningStatus: normalizeProvisioningStatus(raw.provisioningStatus), + emailVerified: raw.emailVerified === true, + apiKeySet: raw.apiKeySet === true, + createdAt: normalizeDateValue(raw.createdAt), + updatedAt: normalizeDateValue(raw.updatedAt), + betaTesterCreatedAt: normalizeDateValue(raw.betaTesterCreatedAt), + betaTesterCreatedBy: getOptionalString(raw.betaTesterCreatedBy), + usage: mapUsage(raw.usage), + limits: mapLimits(raw.limits), + }; +} + +export function mapResetResult(value: unknown): BetaTesterResetResult { + const raw = isRecord(value) ? value : {}; + const collections = Array.isArray(raw.clearedCollections) + ? raw.clearedCollections.filter((entry): entry is string => typeof entry === 'string') + : []; + + return { + serverId: getOptionalString(raw.serverId) ?? '', + clearedCollections: collections, + }; +} + +export function mapResetAllResult(value: unknown): BetaTesterResetAllResult { + const raw = isRecord(value) ? value : {}; + const items = Array.isArray(raw.results) ? raw.results : []; + + return { + results: items.filter(isRecord).map((entry) => ({ + serverId: getOptionalString(entry.serverId) ?? '', + serverName: getOptionalString(entry.serverName) ?? 'Unknown Server', + success: entry.success === true, + message: getOptionalString(entry.message), + })), + }; +} + +export function mapAudit(value: unknown): BetaTesterAudit { + const raw = isRecord(value) ? value : {}; + const entries = Array.isArray(raw.entries) ? raw.entries : []; + + return { + entries: entries.filter(isRecord).map((entry) => ({ + action: getOptionalString(entry.action) ?? 'unknown', + adminEmail: getOptionalString(entry.adminEmail) ?? 'unknown', + timestamp: normalizeDateValue(entry.timestamp), + details: getOptionalString(entry.details), + })), + }; +} diff --git a/client/src/lib/api-contracts/common.ts b/client/src/lib/api-contracts/common.ts index 20f9a72..93c25c4 100644 --- a/client/src/lib/api-contracts/common.ts +++ b/client/src/lib/api-contracts/common.ts @@ -87,6 +87,26 @@ export function normalizeDateValue(value: unknown): string | undefined { return parsed.toISOString(); } +export function normalizeEpochMillisValue(value: unknown): string | undefined { + let millis: number | undefined; + + if (typeof value === 'number' && Number.isFinite(value)) { + millis = value; + } else if (typeof value === 'string' && /^-?\d+$/.test(value)) { + const parsed = Number(value); + if (Number.isFinite(parsed)) { + millis = parsed; + } + } + + if (millis === undefined || millis <= 0) { + return undefined; + } + + const date = new Date(millis); + return Number.isNaN(date.getTime()) ? undefined : date.toISOString(); +} + export function normalizeStringArray(value: unknown): string[] { if (!Array.isArray(value)) { return []; diff --git a/client/src/lib/api.ts b/client/src/lib/api.ts index 136b03a..fce5f21 100644 --- a/client/src/lib/api.ts +++ b/client/src/lib/api.ts @@ -497,12 +497,6 @@ class ApiClient { return this.request(`/security/events${query ? `?${query}` : ''}`); } - async testSecurityConfig() { - return this.request('/security/test', { - method: 'POST', - }); - } - async getRateLimitStatus() { return this.request('/system/rate-limits'); } diff --git a/client/src/lib/env.ts b/client/src/lib/env.ts new file mode 100644 index 0000000..ac6e6b9 --- /dev/null +++ b/client/src/lib/env.ts @@ -0,0 +1,15 @@ +const STAGING_DOMAIN_SUFFIX = 'modl.top'; +const LOCAL_HOSTNAMES = new Set(['localhost', '127.0.0.1']); + +export function isStagingHost(): boolean { + if (import.meta.env.DEV) { + return true; + } + + if (typeof window === 'undefined') { + return false; + } + + const hostname = window.location.hostname; + return hostname.endsWith(STAGING_DOMAIN_SUFFIX) || LOCAL_HOSTNAMES.has(hostname); +} diff --git a/client/src/lib/services/alerts-service.ts b/client/src/lib/services/alerts-service.ts new file mode 100644 index 0000000..6172a9b --- /dev/null +++ b/client/src/lib/services/alerts-service.ts @@ -0,0 +1,96 @@ +import { requestJsonRaw } from '@/lib/api'; +import { isRecord, normalizeEpochMillisValue, toEpochMillisString } from '@/lib/api-contracts/common'; + +export type SystemAlertSeverity = 'BASIC' | 'WARNING' | 'CRITICAL'; +export type SystemAlertAudience = 'ALL_PANEL_USERS' | 'SUPER_ADMINS_ONLY'; + +export interface SystemAlert { + id: string; + message: string; + severity: SystemAlertSeverity; + audience: SystemAlertAudience; + expiresAt?: string; + createdAt?: string; + updatedAt?: string; + createdBy?: string; + updatedBy?: string; +} + +interface RawSystemAlert { + id?: unknown; + _id?: unknown; + message?: unknown; + severity?: unknown; + audience?: unknown; + expiresAt?: unknown; + createdAt?: unknown; + updatedAt?: unknown; + createdBy?: unknown; + updatedBy?: unknown; +} + +export interface AlertPayload { + message: string; + severity: SystemAlertSeverity; + audience: SystemAlertAudience; + expiresAt: string; +} + +function toSeverity(value: unknown): SystemAlertSeverity { + const normalized = typeof value === 'string' ? value.trim().toUpperCase() : ''; + return normalized === 'WARNING' || normalized === 'CRITICAL' ? normalized : 'BASIC'; +} + +function toAudience(value: unknown): SystemAlertAudience { + const normalized = typeof value === 'string' ? value.trim().toUpperCase() : ''; + return normalized === 'SUPER_ADMINS_ONLY' ? normalized : 'ALL_PANEL_USERS'; +} + +function mapAlert(raw: RawSystemAlert): SystemAlert { + const id = typeof raw.id === 'string' ? raw.id : (typeof raw._id === 'string' ? raw._id : ''); + + return { + id, + message: typeof raw.message === 'string' ? raw.message : '', + severity: toSeverity(raw.severity), + audience: toAudience(raw.audience), + expiresAt: normalizeEpochMillisValue(raw.expiresAt), + createdAt: normalizeEpochMillisValue(raw.createdAt), + updatedAt: normalizeEpochMillisValue(raw.updatedAt), + createdBy: typeof raw.createdBy === 'string' ? raw.createdBy : undefined, + updatedBy: typeof raw.updatedBy === 'string' ? raw.updatedBy : undefined, + }; +} + +function toRequestBody(payload: AlertPayload): Record { + return { + message: payload.message, + severity: payload.severity, + audience: payload.audience, + expiresAt: toEpochMillisString(payload.expiresAt) ?? '0', + }; +} + +export const alertsService = { + async getAlerts(): Promise { + const raw = await requestJsonRaw('/v1/admin/alerts'); + const items = isRecord(raw) && Array.isArray(raw.items) ? (raw.items as RawSystemAlert[]) : []; + return items.map(mapAlert); + }, + + async createAlert(payload: AlertPayload): Promise { + const raw = await requestJsonRaw('/v1/admin/alerts', { + method: 'POST', + body: toRequestBody(payload), + }); + return mapAlert(raw); + }, + + async updateAlert(id: string, payload: AlertPayload): Promise { + const raw = await requestJsonRaw(`/v1/admin/alerts/${id}`, { + method: 'PUT', + body: toRequestBody(payload), + }); + return mapAlert(raw); + }, +}; diff --git a/client/src/lib/services/analytics-service.ts b/client/src/lib/services/analytics-service.ts index ec00974..62d2076 100644 --- a/client/src/lib/services/analytics-service.ts +++ b/client/src/lib/services/analytics-service.ts @@ -1,5 +1,5 @@ import { requestJsonRaw, requestText } from '@/lib/api'; -import { parseNumber, isRecord, unwrapEnvelope } from '@/lib/api-contracts/common'; +import { isRecord, unwrapEnvelope } from '@/lib/api-contracts/common'; export type AnalyticsRange = '7d' | '30d' | '90d' | '1y'; export type AnalyticsExportType = 'csv' | 'json'; diff --git a/client/src/lib/services/auth-service.ts b/client/src/lib/services/auth-service.ts index 1d28035..ed8f0a3 100644 --- a/client/src/lib/services/auth-service.ts +++ b/client/src/lib/services/auth-service.ts @@ -23,6 +23,7 @@ interface SessionPayload { interface LoginPayload { email?: unknown; lastActivityAt?: unknown; + isAuthenticated?: boolean; } function mapSessionPayload(payload: SessionPayload): AdminSession { @@ -63,7 +64,7 @@ export const authService = { email: typeof data.email === 'string' ? data.email : email, lastActivityAt: normalizeDateValue(data.lastActivityAt), loggedInIps: [], - isAuthenticated: true, + isAuthenticated: data.isAuthenticated ?? true, }; }, diff --git a/client/src/lib/services/beta-testers-service.ts b/client/src/lib/services/beta-testers-service.ts new file mode 100644 index 0000000..88a0e2d --- /dev/null +++ b/client/src/lib/services/beta-testers-service.ts @@ -0,0 +1,129 @@ +import { requestJsonRaw } from '@/lib/api'; +import { parseNumber, unwrapEnvelope } from '@/lib/api-contracts/common'; +import { + mapAudit, + mapBetaTester, + mapResetAllResult, + mapResetResult, + type BetaTesterAudit, + type BetaTesterRecord, + type BetaTesterResetAllResult, + type BetaTesterResetResult, + type PaginatedBetaTesters, +} from '@/lib/api-contracts/beta-testers'; + +const BASE_PATH = '/v1/admin/beta-testers'; + +export interface ListBetaTestersParams { + page?: number; + limit?: number; + search?: string; +} + +export interface CreateBetaTesterInput { + serverName: string; + customDomain: string; + adminEmail: string; +} + +interface RawBetaTestersPayload { + betaTesters?: unknown; + pagination?: { + page?: unknown; + limit?: unknown; + total?: unknown; + pages?: unknown; + }; +} + +function buildQueryString(params?: Record): string { + const queryParams = new URLSearchParams(); + + if (params) { + Object.entries(params).forEach(([key, value]) => { + if (value !== undefined && value !== null) { + queryParams.append(key, String(value)); + } + }); + } + + const query = queryParams.toString(); + return query ? `?${query}` : ''; +} + +export const betaTestersService = { + async listBetaTesters(params?: ListBetaTestersParams): Promise { + const query = buildQueryString({ + page: params?.page, + limit: params?.limit, + search: params?.search, + }); + + const raw = await requestJsonRaw(`${BASE_PATH}${query}`); + const { data } = unwrapEnvelope(raw, 'beta testers list'); + + const betaTestersRaw = Array.isArray(data.betaTesters) ? data.betaTesters : []; + const paginationRaw = data.pagination ?? {}; + + return { + betaTesters: betaTestersRaw.map(mapBetaTester), + pagination: { + page: parseNumber(paginationRaw.page, 1), + limit: parseNumber(paginationRaw.limit, 20), + total: parseNumber(paginationRaw.total, 0), + pages: parseNumber(paginationRaw.pages, 0), + }, + }; + }, + + async getBetaTester(id: string): Promise { + const raw = await requestJsonRaw(`${BASE_PATH}/${id}`); + const { data } = unwrapEnvelope(raw, 'beta tester detail'); + return mapBetaTester(data as Record); + }, + + async createBetaTester(input: CreateBetaTesterInput): Promise { + const raw = await requestJsonRaw(BASE_PATH, { + method: 'POST', + body: input, + }); + + const { data } = unwrapEnvelope(raw, 'beta tester create'); + return mapBetaTester(data as Record); + }, + + async revokeBetaTester(id: string): Promise { + const raw = await requestJsonRaw(`${BASE_PATH}/${id}`, { + method: 'DELETE', + }); + + const { data } = unwrapEnvelope(raw, 'beta tester revoke'); + return mapBetaTester(data as Record); + }, + + async resetBetaTester(id: string): Promise { + const raw = await requestJsonRaw(`${BASE_PATH}/${id}/reset`, { + method: 'POST', + }); + + const { data } = unwrapEnvelope(raw, 'beta tester reset'); + return mapResetResult(data); + }, + + async resetAllBetaTesters(): Promise { + const raw = await requestJsonRaw(`${BASE_PATH}/reset-all`, { + method: 'POST', + }); + + const { data } = unwrapEnvelope(raw, 'beta tester reset all'); + return mapResetAllResult(data); + }, + + async getBetaTesterAudit(id: string, limit = 25): Promise { + const query = buildQueryString({ limit }); + const raw = await requestJsonRaw(`${BASE_PATH}/${id}/audit${query}`); + + const { data } = unwrapEnvelope(raw, 'beta tester audit'); + return mapAudit(data); + }, +}; diff --git a/client/src/lib/services/servers-service.ts b/client/src/lib/services/servers-service.ts index fbc9e6a..61191d7 100644 --- a/client/src/lib/services/servers-service.ts +++ b/client/src/lib/services/servers-service.ts @@ -129,7 +129,7 @@ interface RawUsagePayload { } -function normalizeServerPlan(value: unknown): ServerPlan { +export function normalizeServerPlan(value: unknown): ServerPlan { if (typeof value !== 'string') { return 'free'; } @@ -138,7 +138,7 @@ function normalizeServerPlan(value: unknown): ServerPlan { return normalized === 'premium' ? 'premium' : 'free'; } -function normalizeProvisioningStatus(value: unknown): ProvisioningStatus { +export function normalizeProvisioningStatus(value: unknown): ProvisioningStatus { if (typeof value !== 'string') { return 'pending'; } @@ -172,7 +172,7 @@ function normalizeCustomDomainStatus(value: unknown): CustomDomainStatus | undef return undefined; } -function normalizeSubscriptionStatus(value: unknown): SubscriptionStatus | undefined { +export function normalizeSubscriptionStatus(value: unknown): SubscriptionStatus | undefined { if (typeof value !== 'string') { return undefined; } @@ -196,6 +196,21 @@ function normalizeSubscriptionStatus(value: unknown): SubscriptionStatus | undef : undefined; } +function toOptionalCount(value: unknown): number | undefined { + if (typeof value === 'number' && Number.isFinite(value)) { + return value; + } + + if (typeof value === 'string' && /^-?\d+$/.test(value)) { + const parsed = Number(value); + if (Number.isFinite(parsed)) { + return parsed; + } + } + + return undefined; +} + function ensureServerId(value: RawServer): string { if (typeof value.id === 'string') { return value.id; @@ -219,8 +234,8 @@ function mapServerListItem(raw: RawServer): AdminServerListItem { provisioningStatus: normalizeProvisioningStatus(raw.provisioningStatus), createdAt: normalizeDateValue(raw.createdAt), updatedAt: normalizeDateValue(raw.updatedAt), - userCount: typeof raw.userCount === 'number' ? raw.userCount : undefined, - ticketCount: typeof raw.ticketCount === 'number' ? raw.ticketCount : undefined, + userCount: toOptionalCount(raw.userCount), + ticketCount: toOptionalCount(raw.ticketCount), lastActivityAt: normalizeDateValue(raw.lastActivityAt), }; } diff --git a/client/src/lib/services/system-service.ts b/client/src/lib/services/system-service.ts index bf96f09..a520d3c 100644 --- a/client/src/lib/services/system-service.ts +++ b/client/src/lib/services/system-service.ts @@ -56,11 +56,8 @@ export interface MaintenanceStatus { message: string; } -export type PromptStrictnessLevel = 'lenient' | 'standard' | 'strict'; - export interface SystemPrompt { id: string; - strictnessLevel: PromptStrictnessLevel; prompt: string; isActive: boolean; createdAt?: string; @@ -70,32 +67,17 @@ export interface SystemPrompt { interface RawSystemPrompt { id?: unknown; _id?: unknown; - strictnessLevel?: unknown; prompt?: unknown; isActive?: unknown; createdAt?: unknown; updatedAt?: unknown; } -function toPromptStrictness(value: unknown): PromptStrictnessLevel { - if (typeof value !== 'string') { - return 'standard'; - } - - const normalized = value.trim().toLowerCase(); - if (normalized === 'lenient' || normalized === 'strict') { - return normalized; - } - - return 'standard'; -} - function mapPrompt(raw: RawSystemPrompt): SystemPrompt { const id = typeof raw.id === 'string' ? raw.id : (typeof raw._id === 'string' ? raw._id : ''); return { id, - strictnessLevel: toPromptStrictness(raw.strictnessLevel), prompt: typeof raw.prompt === 'string' ? raw.prompt : '', isActive: raw.isActive !== false, createdAt: normalizeDateValue(raw.createdAt), @@ -103,10 +85,6 @@ function mapPrompt(raw: RawSystemPrompt): SystemPrompt { }; } -function toUpperStrictness(level: PromptStrictnessLevel): string { - return level.toUpperCase(); -} - export const systemService = { async getSystemConfig(): Promise { const raw = await requestJsonRaw('/v1/admin/system/config'); @@ -149,16 +127,14 @@ export const systemService = { return message ?? 'Service restart requested'; }, - async getSystemPrompts(): Promise { + async getSystemPrompt(): Promise { const raw = await requestJsonRaw('/v1/admin/system/prompts'); - const { data } = unwrapEnvelope(raw, 'admin system prompts'); - - const prompts = Array.isArray(data) ? (data as RawSystemPrompt[]) : []; - return prompts.map(mapPrompt); + const { data } = unwrapEnvelope(raw, 'admin system prompt'); + return mapPrompt(data); }, - async updateSystemPrompt(strictnessLevel: PromptStrictnessLevel, prompt: string): Promise { - const raw = await requestJsonRaw(`/v1/admin/system/prompts/${toUpperStrictness(strictnessLevel)}`, { + async updateSystemPrompt(prompt: string): Promise { + const raw = await requestJsonRaw('/v1/admin/system/prompts', { method: 'PUT', body: { prompt }, }); @@ -167,8 +143,8 @@ export const systemService = { return mapPrompt(data); }, - async resetSystemPrompt(strictnessLevel: PromptStrictnessLevel): Promise { - const raw = await requestJsonRaw(`/v1/admin/system/prompts/${toUpperStrictness(strictnessLevel)}/reset`, { + async resetSystemPrompt(): Promise { + const raw = await requestJsonRaw('/v1/admin/system/prompts/reset', { method: 'POST', }); diff --git a/client/src/pages/AlertsPage.tsx b/client/src/pages/AlertsPage.tsx new file mode 100644 index 0000000..4d8a60b --- /dev/null +++ b/client/src/pages/AlertsPage.tsx @@ -0,0 +1,358 @@ +import { FormEvent, useEffect, useMemo, useRef, useState } from 'react'; +import { Badge } from '@modl-gg/shared-web/components/ui/badge'; +import { Button } from '@modl-gg/shared-web/components/ui/button'; +import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@modl-gg/shared-web/components/ui/card'; +import { Textarea } from '@modl-gg/shared-web/components/ui/textarea'; +import { Input } from '@modl-gg/shared-web/components/ui/input'; +import { useToast } from '@modl-gg/shared-web/hooks/use-toast'; +import { AlertTriangle, Bell, Edit, RefreshCw, Save, X } from 'lucide-react'; +import { + alertsService, + type AlertPayload, + type SystemAlert, + type SystemAlertAudience, + type SystemAlertSeverity, +} from '@/lib/services/alerts-service'; + +const severityLabels: Record = { + BASIC: 'Basic', + WARNING: 'Warning', + CRITICAL: 'Critical', +}; + +const audienceLabels: Record = { + ALL_PANEL_USERS: 'All panel users', + SUPER_ADMINS_ONLY: 'Super admins only', +}; + +interface AlertFormState { + message: string; + severity: SystemAlertSeverity; + audience: SystemAlertAudience; + expiresAt: string; +} + +function toDatetimeLocal(date: Date): string { + const offsetMs = date.getTimezoneOffset() * 60_000; + return new Date(date.getTime() - offsetMs).toISOString().slice(0, 16); +} + +function defaultFormState(): AlertFormState { + return { + message: '', + severity: 'BASIC', + audience: 'ALL_PANEL_USERS', + expiresAt: toDatetimeLocal(new Date(Date.now() + 24 * 60 * 60 * 1000)), + }; +} + +function toFormState(alert: SystemAlert): AlertFormState { + return { + message: alert.message, + severity: alert.severity, + audience: alert.audience, + expiresAt: alert.expiresAt ? toDatetimeLocal(new Date(alert.expiresAt)) : defaultFormState().expiresAt, + }; +} + +function toPayload(form: AlertFormState): AlertPayload { + return { + message: form.message.trim(), + severity: form.severity, + audience: form.audience, + expiresAt: new Date(form.expiresAt).toISOString(), + }; +} + +function formatDate(value?: string): string { + if (!value) return 'Unknown'; + return new Date(value).toLocaleString(); +} + +export default function AlertsPage() { + const [alerts, setAlerts] = useState([]); + const [form, setForm] = useState(defaultFormState); + const [editingId, setEditingId] = useState(null); + const [minimumExpiresAt, setMinimumExpiresAt] = useState(() => toDatetimeLocal(new Date())); + const [loading, setLoading] = useState(true); + const [saving, setSaving] = useState(false); + const loadSequence = useRef(0); + const { toast } = useToast(); + + const editingAlert = useMemo( + () => alerts.find((alert) => alert.id === editingId) ?? null, + [alerts, editingId] + ); + + useEffect(() => { + loadAlerts(); + }, []); + + useEffect(() => { + const updateMinimumExpiresAt = () => setMinimumExpiresAt(toDatetimeLocal(new Date())); + const interval = window.setInterval(updateMinimumExpiresAt, 30_000); + + return () => window.clearInterval(interval); + }, []); + + useEffect(() => { + if (!editingId) { + return; + } + + if (!alerts.some((alert) => alert.id === editingId)) { + resetForm(); + } + }, [alerts, editingId]); + + const loadAlerts = async () => { + const requestId = loadSequence.current + 1; + loadSequence.current = requestId; + + try { + setLoading(true); + const loadedAlerts = await alertsService.getAlerts(); + if (loadSequence.current === requestId) { + setAlerts(loadedAlerts); + } + } catch (caught) { + if (loadSequence.current !== requestId) { + return; + } + console.error('Error loading alerts:', caught); + toast({ + title: 'Error', + description: 'Failed to load alerts', + variant: 'destructive', + }); + } finally { + if (loadSequence.current === requestId) { + setLoading(false); + } + } + }; + + const resetForm = () => { + setEditingId(null); + setForm(defaultFormState()); + }; + + const startEditing = (alert: SystemAlert) => { + setEditingId(alert.id); + setForm(toFormState(alert)); + }; + + const handleSubmit = async (event: FormEvent) => { + event.preventDefault(); + const expiresAtMs = new Date(form.expiresAt).getTime(); + const now = Date.now(); + setMinimumExpiresAt(toDatetimeLocal(new Date(now))); + + if (!form.message.trim()) { + toast({ + title: 'Error', + description: 'Alert message is required', + variant: 'destructive', + }); + return; + } + + if (!Number.isFinite(expiresAtMs) || expiresAtMs <= now) { + toast({ + title: 'Error', + description: 'Expiry must be in the future', + variant: 'destructive', + }); + return; + } + + if (editingId && !editingAlert) { + resetForm(); + toast({ + title: 'Error', + description: 'The alert being edited is no longer available', + variant: 'destructive', + }); + return; + } + + try { + setSaving(true); + if (editingId) { + await alertsService.updateAlert(editingId, toPayload(form)); + } else { + await alertsService.createAlert(toPayload(form)); + } + toast({ + title: 'Success', + description: editingId ? 'Alert updated' : 'Alert created', + }); + resetForm(); + await loadAlerts(); + } catch (caught) { + console.error('Error saving alert:', caught); + toast({ + title: 'Error', + description: 'Failed to save alert', + variant: 'destructive', + }); + } finally { + setSaving(false); + } + }; + + const isExpired = (alert: SystemAlert) => alert.expiresAt ? new Date(alert.expiresAt).getTime() <= Date.now() : true; + + return ( +
+
+
+
+

Panel Alerts

+

Create dashboard notices for server panel users.

+
+ +
+ +
+ + + + + {editingAlert ? 'Edit Alert' : 'New Alert'} + + + Alerts remain stored after expiry and stop showing automatically. + + + +
+
+ +