josh/electric-cherry
1
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify campaign list and add searchable status filters

Browse Source
This commit is contained in:
josh
2026-10-06 16:21:38 -04:00
parent 7985f1202f
commit ba015ca4c7
6 changed files with 327 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/api/campaigns/+server.ts
+29 -8
View File
@@ -6,16 +6,38 @@ export async function GET({ url }: { url: URL }) {
const activeOnly = url.searchParams.get('active') === 'true';
const historyOnly = url.searchParams.get('view') === 'history';
const server = url.searchParams.get('server');
const query = (url.searchParams.get('q') ?? '').slice(0, 100).toLowerCase();
const query = (url.searchParams.get('q') ?? '').slice(0, 100).trim().toLowerCase();
const action = url.searchParams.get('action');
const status = url.searchParams.get('status');
const limit = Math.min(500, Math.max(1, Math.floor(Number(url.searchParams.get('limit')) || 25)));
const offset = Math.min(1_000_000, Math.max(0, Math.floor(Number(url.searchParams.get('offset')) || 0)));
const active = `EXISTS (SELECT 1 FROM deployment_servers a WHERE a.deployment_id=d.id AND a.server_deleted_at IS NULL AND a.restart_state IN ('pending','failed'))`;
const attention = `EXISTS (SELECT 1 FROM deployment_servers a WHERE a.deployment_id=d.id AND a.server_deleted_at IS NULL AND a.restart_state IN ('failed','held','manual'))`;
const pending = `EXISTS (SELECT 1 FROM deployment_servers a WHERE a.deployment_id=d.id AND a.server_deleted_at IS NULL AND a.restart_state='pending')`;
const active = `(${attention} OR ${pending})`;
// Keep these outcomes aligned with campaignOutcome, including historical deleted servers.
const outcome = `CASE WHEN ${attention} THEN 'attention' WHEN ${pending} THEN 'progress'
WHEN d.rolled_back_by IS NOT NULL THEN 'rolled-back'
WHEN EXISTS (SELECT 1 FROM deployment_servers a WHERE a.deployment_id=d.id)
AND NOT EXISTS (SELECT 1 FROM deployment_servers a WHERE a.deployment_id=d.id AND a.restart_state != 'done') THEN 'complete'
ELSE 'inactive' END`;
const names = query ? (db().prepare('SELECT DISTINCT server FROM deployment_servers').all() as { server: string }[])
.map(row => row.server).filter(name => `${name} ${serverTitle(name)}`.toLowerCase().includes(query)) : [];
const where = `(? IS NULL OR EXISTS (SELECT 1 FROM deployment_servers target WHERE target.deployment_id=d.id AND target.server=?))
${activeOnly ? `AND ${active}` : historyOnly ? `AND NOT ${active}` : ''}
${query ? `AND EXISTS (SELECT 1 FROM deployment_servers target WHERE target.deployment_id=d.id AND target.server IN (${names.map(() => '?').join(',') || 'NULL'}))` : ''}`;
const parameters = [server, server, ...names];
const conditions = ['(? IS NULL OR EXISTS (SELECT 1 FROM deployment_servers target WHERE target.deployment_id=d.id AND target.server=?))'];
const parameters: (string | null)[] = [server, server];
if (activeOnly) conditions.push(active);
else if (historyOnly) conditions.push(`NOT ${active}`);
if (action && ['promote', 'rollback', 'drift'].includes(action)) { conditions.push('d.action=?'); parameters.push(action); }
if (status && ['attention', 'progress', 'complete', 'rolled-back', 'inactive'].includes(status)) { conditions.push(`(${outcome})=?`); parameters.push(status); }
if (query) {
conditions.push(`(instr(lower(d.id), ?) > 0
OR instr(lower(CASE WHEN d.action='drift' THEN 'maintenance repair' ELSE d.action END), ?) > 0
OR instr(lower('Beta #' || d.beta_id), ?) > 0
OR EXISTS (SELECT 1 FROM scripts s WHERE s.id=d.script_id AND instr(lower(s.name), ?) > 0)
OR EXISTS (SELECT 1 FROM deployment_scripts ds JOIN scripts s ON s.id=ds.script_id WHERE ds.deployment_id=d.id AND instr(lower(s.name), ?) > 0)
OR EXISTS (SELECT 1 FROM deployment_servers target WHERE target.deployment_id=d.id AND target.server IN (${names.map(() => '?').join(',') || 'NULL'})))`);
parameters.push(query, query, query, query, query, ...names);
}
const where = conditions.join(' AND ');
const { total } = db().prepare(`SELECT COUNT(*) AS total FROM deployments d WHERE ${where}`).get(...parameters) as { total: number };
const deployments = db()
@@ -105,8 +127,7 @@ export async function GET({ url }: { url: URL }) {
...d,
servers: grouped.get(d.id) ?? [],
scripts: scriptsByDep.get(d.id) ?? []
}))
.filter((d) => (activeOnly ? d.servers.some((s) => !s.server_deleted_at && (s.restart_state === 'pending' || s.restart_state === 'failed')) : true));
}));
return json({ deployments: rows, total, limit, offset });
}