fix(frontend): remove default scheduler UI and restore dark page styles
This commit is contained in:
@@ -5,9 +5,11 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
|
|||||||
import DashboardPage from '@/pages/DashboardPage'
|
import DashboardPage from '@/pages/DashboardPage'
|
||||||
import * as entitiesApi from '@/api/entitiesApi'
|
import * as entitiesApi from '@/api/entitiesApi'
|
||||||
import * as logsApi from '@/api/logsApi'
|
import * as logsApi from '@/api/logsApi'
|
||||||
|
import * as tasksApi from '@/api/tasksApi'
|
||||||
|
|
||||||
vi.mock('@/api/entitiesApi')
|
vi.mock('@/api/entitiesApi')
|
||||||
vi.mock('@/api/logsApi')
|
vi.mock('@/api/logsApi')
|
||||||
|
vi.mock('@/api/tasksApi')
|
||||||
|
|
||||||
const wrapper = ({ children }: { children: React.ReactNode }) => (
|
const wrapper = ({ children }: { children: React.ReactNode }) => (
|
||||||
<QueryClientProvider client={new QueryClient({ defaultOptions: { queries: { retry: false } } })}>
|
<QueryClientProvider client={new QueryClient({ defaultOptions: { queries: { retry: false } } })}>
|
||||||
@@ -19,6 +21,7 @@ describe('DashboardPage', () => {
|
|||||||
it('should_display_app_version_when_rendered', () => {
|
it('should_display_app_version_when_rendered', () => {
|
||||||
vi.mocked(entitiesApi.getEntities).mockResolvedValue([])
|
vi.mocked(entitiesApi.getEntities).mockResolvedValue([])
|
||||||
vi.mocked(logsApi.getLogs).mockResolvedValue([])
|
vi.mocked(logsApi.getLogs).mockResolvedValue([])
|
||||||
|
vi.mocked(tasksApi.getAllTasks).mockResolvedValue([])
|
||||||
render(<DashboardPage />, { wrapper })
|
render(<DashboardPage />, { wrapper })
|
||||||
expect(screen.getByText(/version \d+\.\d+\.\d+/i)).toBeInTheDocument()
|
expect(screen.getByText(/version \d+\.\d+\.\d+/i)).toBeInTheDocument()
|
||||||
})
|
})
|
||||||
@@ -28,6 +31,7 @@ describe('DashboardPage', () => {
|
|||||||
{ id: '1', name: 'Entity A', email: 'a@a.com', jobTitle: 'Job A', personality: '', scheduleCron: '', contextWindowDays: 3, active: true, createdAt: '' },
|
{ id: '1', name: 'Entity A', email: 'a@a.com', jobTitle: 'Job A', personality: '', scheduleCron: '', contextWindowDays: 3, active: true, createdAt: '' },
|
||||||
])
|
])
|
||||||
vi.mocked(logsApi.getLogs).mockResolvedValue([])
|
vi.mocked(logsApi.getLogs).mockResolvedValue([])
|
||||||
|
vi.mocked(tasksApi.getAllTasks).mockResolvedValue([])
|
||||||
render(<DashboardPage />, { wrapper })
|
render(<DashboardPage />, { wrapper })
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(screen.getByText(/1 active entity|1 entidade/i)).toBeInTheDocument()
|
expect(screen.getByText(/1 active entity|1 entidade/i)).toBeInTheDocument()
|
||||||
@@ -39,13 +43,14 @@ describe('DashboardPage', () => {
|
|||||||
vi.mocked(logsApi.getLogs).mockResolvedValue([
|
vi.mocked(logsApi.getLogs).mockResolvedValue([
|
||||||
{ id: '1', entityId: 'e1', entityName: 'Entity A', promptSent: '', aiResponse: '', emailSubject: 'Memo', emailBody: '', status: 'SENT', errorMessage: null, dispatchedAt: '2024-01-01T10:00:00' },
|
{ id: '1', entityId: 'e1', entityName: 'Entity A', promptSent: '', aiResponse: '', emailSubject: 'Memo', emailBody: '', status: 'SENT', errorMessage: null, dispatchedAt: '2024-01-01T10:00:00' },
|
||||||
])
|
])
|
||||||
|
vi.mocked(tasksApi.getAllTasks).mockResolvedValue([])
|
||||||
render(<DashboardPage />, { wrapper })
|
render(<DashboardPage />, { wrapper })
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(screen.getByText(/Memo/i)).toBeInTheDocument()
|
expect(screen.getByText(/Memo/i)).toBeInTheDocument()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should_renderScheduledTasks_when_entitiesHaveSchedule', async () => {
|
it('should_ignoreEntityDefaultScheduler_when_onlyEntityScheduleExists', async () => {
|
||||||
vi.mocked(entitiesApi.getEntities).mockResolvedValue([
|
vi.mocked(entitiesApi.getEntities).mockResolvedValue([
|
||||||
{
|
{
|
||||||
id: '1',
|
id: '1',
|
||||||
@@ -60,13 +65,14 @@ describe('DashboardPage', () => {
|
|||||||
},
|
},
|
||||||
])
|
])
|
||||||
vi.mocked(logsApi.getLogs).mockResolvedValue([])
|
vi.mocked(logsApi.getLogs).mockResolvedValue([])
|
||||||
|
vi.mocked(tasksApi.getAllTasks).mockResolvedValue([])
|
||||||
|
|
||||||
render(<DashboardPage />, { wrapper })
|
render(<DashboardPage />, { wrapper })
|
||||||
|
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(screen.getByRole('heading', { name: /Scheduled Tasks/i })).toBeInTheDocument()
|
expect(screen.getByRole('heading', { name: /Scheduled Tasks/i })).toBeInTheDocument()
|
||||||
expect(screen.getByText(/Entity A default task/i)).toBeInTheDocument()
|
expect(screen.getByText(/No scheduled tasks configured yet./i)).toBeInTheDocument()
|
||||||
expect(screen.getByText(/0 9 \* \* 1/i)).toBeInTheDocument()
|
expect(screen.queryByText(/Entity A default task/i)).not.toBeInTheDocument()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
@@ -52,6 +52,7 @@ describe('EntityDetailPage', () => {
|
|||||||
expect(screen.getByText(/Entity A/i)).toBeInTheDocument()
|
expect(screen.getByText(/Entity A/i)).toBeInTheDocument()
|
||||||
expect(screen.getByText(/Weekly Check-in/i)).toBeInTheDocument()
|
expect(screen.getByText(/Weekly Check-in/i)).toBeInTheDocument()
|
||||||
expect(screen.getByText(/Last week/i)).toBeInTheDocument()
|
expect(screen.getByText(/Last week/i)).toBeInTheDocument()
|
||||||
|
expect(screen.queryByText(/Default scheduler:/i)).not.toBeInTheDocument()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,14 @@ describe('LoginPage', () => {
|
|||||||
expect(screen.getByLabelText(/password/i)).toBeInTheDocument()
|
expect(screen.getByLabelText(/password/i)).toBeInTheDocument()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('should_renderDarkModeStyles_when_pageLoads', () => {
|
||||||
|
render(<LoginPage />, { wrapper })
|
||||||
|
|
||||||
|
expect(screen.getByRole('heading', { name: /condado abaixo da média sa/i }).parentElement).toHaveClass('bg-slate-900')
|
||||||
|
expect(screen.getByLabelText(/password/i)).toHaveClass('bg-slate-800', 'border-slate-700', 'text-slate-100')
|
||||||
|
expect(screen.getByRole('button', { name: /login/i })).toHaveClass('bg-cyan-500', 'text-slate-950')
|
||||||
|
})
|
||||||
|
|
||||||
it('should_callLoginApi_when_formSubmitted', async () => {
|
it('should_callLoginApi_when_formSubmitted', async () => {
|
||||||
vi.mocked(authApi.login).mockResolvedValue(undefined)
|
vi.mocked(authApi.login).mockResolvedValue(undefined)
|
||||||
render(<LoginPage />, { wrapper })
|
render(<LoginPage />, { wrapper })
|
||||||
|
|||||||
@@ -38,6 +38,19 @@ describe('LogsPage', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('should_renderDarkModeStyles_when_pageLoads', async () => {
|
||||||
|
vi.mocked(logsApi.getLogs).mockResolvedValue([mockLog])
|
||||||
|
vi.mocked(entitiesApi.getEntities).mockResolvedValue([])
|
||||||
|
|
||||||
|
render(<LogsPage />, { wrapper })
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(screen.getByRole('heading', { name: /dispatch logs/i })).toHaveClass('text-slate-100')
|
||||||
|
expect(screen.getByRole('combobox')).toHaveClass('border-slate-700', 'bg-slate-800', 'text-slate-100')
|
||||||
|
expect(screen.getByText('Weekly Memo')).toHaveClass('text-slate-100')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
it('should_filterLogsByEntity_when_filterSelected', async () => {
|
it('should_filterLogsByEntity_when_filterSelected', async () => {
|
||||||
vi.mocked(logsApi.getLogs).mockResolvedValue([mockLog])
|
vi.mocked(logsApi.getLogs).mockResolvedValue([mockLog])
|
||||||
vi.mocked(entitiesApi.getEntities).mockResolvedValue([
|
vi.mocked(entitiesApi.getEntities).mockResolvedValue([
|
||||||
|
|||||||
@@ -10,17 +10,7 @@ export default function DashboardPage() {
|
|||||||
const { data: entityTasks = [] } = useQuery({ queryKey: ['entity-tasks'], queryFn: getAllTasks })
|
const { data: entityTasks = [] } = useQuery({ queryKey: ['entity-tasks'], queryFn: getAllTasks })
|
||||||
|
|
||||||
const activeCount = entities.filter((e) => e.active).length
|
const activeCount = entities.filter((e) => e.active).length
|
||||||
const scheduledDefaults = entities
|
const scheduledTasks = entityTasks.map((task) => ({
|
||||||
.filter((entity) => entity.active && entity.scheduleCron)
|
|
||||||
.map((entity) => ({
|
|
||||||
id: `default-${entity.id}`,
|
|
||||||
entityName: entity.name,
|
|
||||||
taskName: `${entity.name} default task`,
|
|
||||||
scheduleCron: entity.scheduleCron,
|
|
||||||
emailLookbackLabel: `Last ${entity.contextWindowDays} days`,
|
|
||||||
}))
|
|
||||||
|
|
||||||
const scheduledCustomTasks = entityTasks.map((task) => ({
|
|
||||||
id: task.id,
|
id: task.id,
|
||||||
entityName: entities.find((entity) => entity.id === task.entityId)?.name ?? 'Unknown entity',
|
entityName: entities.find((entity) => entity.id === task.entityId)?.name ?? 'Unknown entity',
|
||||||
taskName: task.name,
|
taskName: task.name,
|
||||||
@@ -28,8 +18,6 @@ export default function DashboardPage() {
|
|||||||
emailLookbackLabel: getEmailLookbackLabel(task.emailLookback),
|
emailLookbackLabel: getEmailLookbackLabel(task.emailLookback),
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const scheduledTasks = [...scheduledDefaults, ...scheduledCustomTasks]
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-8 p-8">
|
<div className="space-y-8 p-8">
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -88,7 +88,6 @@ export default function EntityDetailPage() {
|
|||||||
<div>
|
<div>
|
||||||
<h1 className="text-3xl font-bold text-slate-100">{entity.name}</h1>
|
<h1 className="text-3xl font-bold text-slate-100">{entity.name}</h1>
|
||||||
<p className="mt-2 text-sm text-slate-300">{entity.jobTitle} - {entity.email}</p>
|
<p className="mt-2 text-sm text-slate-300">{entity.jobTitle} - {entity.email}</p>
|
||||||
<p className="mt-1 text-sm text-slate-400">Default scheduler: {entity.scheduleCron || 'Not configured'}</p>
|
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
onClick={() => setDialogOpen(true)}
|
onClick={() => setDialogOpen(true)}
|
||||||
|
|||||||
@@ -19,14 +19,14 @@ export default function LoginPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex min-h-screen items-center justify-center bg-gray-50">
|
<div className="flex min-h-screen items-center justify-center bg-slate-950">
|
||||||
<div className="w-full max-w-sm rounded-lg bg-white p-8 shadow">
|
<div className="w-full max-w-sm rounded-lg border border-slate-800 bg-slate-900 p-8 shadow-lg">
|
||||||
<h1 className="mb-6 text-2xl font-bold text-gray-900">
|
<h1 className="mb-6 text-2xl font-bold text-slate-100">
|
||||||
Condado Abaixo da Média SA
|
Condado Abaixo da Média SA
|
||||||
</h1>
|
</h1>
|
||||||
<form onSubmit={handleSubmit} className="space-y-4">
|
<form onSubmit={handleSubmit} className="space-y-4">
|
||||||
<div>
|
<div>
|
||||||
<label htmlFor="password" className="block text-sm font-medium text-gray-700">
|
<label htmlFor="password" className="block text-sm font-medium text-slate-300">
|
||||||
Password
|
Password
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
@@ -34,15 +34,15 @@ export default function LoginPage() {
|
|||||||
type="password"
|
type="password"
|
||||||
value={password}
|
value={password}
|
||||||
onChange={(e) => setPassword(e.target.value)}
|
onChange={(e) => setPassword(e.target.value)}
|
||||||
className="mt-1 block w-full rounded border border-gray-300 px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500"
|
className="mt-1 block w-full rounded border border-slate-700 bg-slate-800 px-3 py-2 text-sm text-slate-100 focus:outline-none focus:ring-2 focus:ring-cyan-500"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{error && (
|
{error && (
|
||||||
<p className="text-sm text-red-600">{error}</p>
|
<p className="text-sm text-red-400">{error}</p>
|
||||||
)}
|
)}
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
className="w-full rounded bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700"
|
className="w-full rounded bg-cyan-500 px-4 py-2 text-sm font-medium text-slate-950 hover:bg-cyan-400"
|
||||||
>
|
>
|
||||||
Login
|
Login
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -15,11 +15,11 @@ export default function LogsPage() {
|
|||||||
return (
|
return (
|
||||||
<div className="p-8">
|
<div className="p-8">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<h1 className="text-2xl font-bold text-gray-900">Dispatch Logs</h1>
|
<h1 className="text-2xl font-bold text-slate-100">Dispatch Logs</h1>
|
||||||
<select
|
<select
|
||||||
value={selectedEntityId}
|
value={selectedEntityId}
|
||||||
onChange={(e) => setSelectedEntityId(e.target.value)}
|
onChange={(e) => setSelectedEntityId(e.target.value)}
|
||||||
className="rounded border border-gray-300 px-3 py-2 text-sm"
|
className="rounded border border-slate-700 bg-slate-800 px-3 py-2 text-sm text-slate-100"
|
||||||
>
|
>
|
||||||
<option value="">All Entities</option>
|
<option value="">All Entities</option>
|
||||||
{entities.map((entity) => (
|
{entities.map((entity) => (
|
||||||
@@ -30,9 +30,9 @@ export default function LogsPage() {
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="mt-6 overflow-hidden rounded-lg border bg-white shadow-sm">
|
<div className="mt-6 overflow-hidden rounded-lg border border-slate-800 bg-slate-900/70 shadow-sm">
|
||||||
<table className="w-full text-sm">
|
<table className="w-full text-sm">
|
||||||
<thead className="bg-gray-50 text-left text-xs font-medium uppercase tracking-wide text-gray-500">
|
<thead className="bg-slate-800/50 text-left text-xs font-medium uppercase tracking-wide text-slate-400">
|
||||||
<tr>
|
<tr>
|
||||||
<th className="px-4 py-3">Subject</th>
|
<th className="px-4 py-3">Subject</th>
|
||||||
<th className="px-4 py-3">Entity</th>
|
<th className="px-4 py-3">Entity</th>
|
||||||
@@ -40,32 +40,32 @@ export default function LogsPage() {
|
|||||||
<th className="px-4 py-3">Dispatched At</th>
|
<th className="px-4 py-3">Dispatched At</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody className="divide-y divide-gray-100">
|
<tbody className="divide-y divide-slate-800">
|
||||||
{logs.map((log) => (
|
{logs.map((log) => (
|
||||||
<tr key={log.id}>
|
<tr key={log.id}>
|
||||||
<td className="px-4 py-3 font-medium">{log.emailSubject}</td>
|
<td className="px-4 py-3 font-medium text-slate-100">{log.emailSubject}</td>
|
||||||
<td className="px-4 py-3 text-gray-500">{log.entityName}</td>
|
<td className="px-4 py-3 text-slate-400">{log.entityName}</td>
|
||||||
<td className="px-4 py-3">
|
<td className="px-4 py-3">
|
||||||
<span
|
<span
|
||||||
className={`rounded-full px-2 py-0.5 text-xs font-medium ${
|
className={`rounded-full px-2 py-0.5 text-xs font-medium ${
|
||||||
log.status === 'SENT'
|
log.status === 'SENT'
|
||||||
? 'bg-green-100 text-green-700'
|
? 'bg-green-900/40 text-green-400'
|
||||||
: log.status === 'FAILED'
|
: log.status === 'FAILED'
|
||||||
? 'bg-red-100 text-red-700'
|
? 'bg-red-900/40 text-red-400'
|
||||||
: 'bg-yellow-100 text-yellow-700'
|
: 'bg-yellow-900/40 text-yellow-400'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{log.status}
|
{log.status}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-4 py-3 text-gray-400">
|
<td className="px-4 py-3 text-slate-500">
|
||||||
{new Date(log.dispatchedAt).toLocaleString()}
|
{new Date(log.dispatchedAt).toLocaleString()}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
))}
|
))}
|
||||||
{logs.length === 0 && (
|
{logs.length === 0 && (
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={4} className="px-4 py-6 text-center text-gray-400">
|
<td colSpan={4} className="px-4 py-6 text-center text-slate-400">
|
||||||
No logs found.
|
No logs found.
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user