fix: Remove EJS includes for express-ejs-layouts compatibility
express-ejs-layouts doesn't support nested includes. Changed scheduler.ejs to inline the table HTML. Changed routes to return raw HTML for HTMX partials instead of rendering. Signed-off-by: Claude (Chronicler #61) <claude@firefrostgaming.com>
This commit is contained in:
Claude (Chronicler #61)
@@ -40,7 +40,52 @@ router.get('/table-only', async (req, res) => {
|
||||
ORDER BY s.node, s.sort_order
|
||||
`);
|
||||
|
||||
res.render('admin/partials/scheduler-table', { servers: serversResult.rows });
|
||||
const servers = serversResult.rows;
|
||||
|
||||
let html = `<table class="w-full text-left">
|
||||
<thead class="bg-gray-100 dark:bg-darkbg text-gray-600 dark:text-gray-300">
|
||||
<tr>
|
||||
<th class="p-3 w-10"></th>
|
||||
<th class="p-3">Server</th>
|
||||
<th class="p-3">Node</th>
|
||||
<th class="p-3">Restart Time (UTC)</th>
|
||||
<th class="p-3">Status</th>
|
||||
<th class="p-3">Skip</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="sortable-servers">`;
|
||||
|
||||
if (servers.length === 0) {
|
||||
html += `<tr><td colspan="6" class="p-6 text-center text-gray-500">No servers imported yet. Click "Import Servers" to populate from Pterodactyl.</td></tr>`;
|
||||
} else {
|
||||
servers.forEach(server => {
|
||||
const nodeClass = server.node === 'TX1' ? 'bg-fire/20 text-fire' : 'bg-frost/20 text-frost';
|
||||
let statusHtml;
|
||||
if (server.sync_status === 'SUCCESS') {
|
||||
statusHtml = `<span class="text-green-500">● Synced</span>`;
|
||||
} else if (server.sync_status === 'FAILED') {
|
||||
statusHtml = `<span class="text-red-500" title="${server.last_error || ''}">✕ Error</span>`;
|
||||
} else {
|
||||
statusHtml = `<span class="text-yellow-500">○ Pending</span>`;
|
||||
}
|
||||
const skipClass = server.skip_restart ? 'bg-red-600 text-white' : 'bg-gray-200 dark:bg-gray-700 text-gray-600 dark:text-gray-300';
|
||||
const skipText = server.skip_restart ? 'Skipped' : 'Active';
|
||||
|
||||
html += `<tr class="border-t border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-800 transition" data-id="${server.server_id}">
|
||||
<td class="p-3 cursor-grab text-gray-400 hover:text-gray-900 dark:hover:text-white"><span class="drag-handle text-lg">☰</span></td>
|
||||
<td class="p-3 font-medium">${server.server_name}</td>
|
||||
<td class="p-3"><span class="px-2 py-1 rounded text-xs font-bold ${nodeClass}">${server.node}</span></td>
|
||||
<td class="p-3 font-mono text-sm">${server.effective_time || 'Not set'}</td>
|
||||
<td class="p-3 text-sm">${statusHtml}</td>
|
||||
<td class="p-3">
|
||||
<button hx-post="/admin/scheduler/toggle-skip/${server.server_id}" hx-swap="none" hx-on::after-request="htmx.ajax('GET', '/admin/scheduler/table-only', '#scheduler-table')" class="px-2 py-1 rounded text-xs ${skipClass}">${skipText}</button>
|
||||
</td>
|
||||
</tr>`;
|
||||
});
|
||||
}
|
||||
|
||||
html += `</tbody></table>`;
|
||||
res.send(html);
|
||||
} catch (err) {
|
||||
res.status(500).send('Error loading table');
|
||||
}
|
||||
@@ -167,12 +212,56 @@ router.get('/audit/:node', async (req, res) => {
|
||||
await sleep(200); // Rate limiting
|
||||
}
|
||||
|
||||
res.render('admin/partials/audit-modal', {
|
||||
node,
|
||||
results,
|
||||
totalRogue,
|
||||
serverCount: results.length
|
||||
});
|
||||
let html = `<div id="audit-modal" class="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-70 backdrop-blur-sm">
|
||||
<div class="bg-white dark:bg-darkcard border ${totalRogue > 0 ? 'border-red-500' : 'border-green-500'} rounded-lg shadow-2xl w-full max-w-2xl p-6 relative">`;
|
||||
|
||||
if (totalRogue > 0) {
|
||||
const nukePayload = [];
|
||||
results.forEach(r => r.rogueSchedules.forEach(s => nukePayload.push({
|
||||
serverId: r.serverId, scheduleId: s.id, scheduleName: s.name
|
||||
})));
|
||||
|
||||
html += `<h2 class="text-2xl font-bold text-red-500 mb-2">⚠ Conflicts Detected</h2>
|
||||
<p class="text-gray-600 dark:text-gray-300 mb-4">
|
||||
Found <strong class="text-gray-900 dark:text-white">${totalRogue}</strong> rogue restart schedule(s) across
|
||||
<strong class="text-gray-900 dark:text-white">${results.length}</strong> server(s) on ${node}.
|
||||
These must be removed before Trinity can take control.
|
||||
</p>
|
||||
<div class="bg-gray-100 dark:bg-darkbg rounded p-4 mb-6 max-h-64 overflow-y-auto border border-gray-200 dark:border-gray-700">
|
||||
<ul class="space-y-3">`;
|
||||
|
||||
results.forEach(result => {
|
||||
html += `<li class="border-b border-gray-200 dark:border-gray-700 pb-2 last:border-0">
|
||||
<span class="text-fire font-semibold">${result.serverName}</span>
|
||||
<ul class="ml-4 mt-1 text-sm text-gray-500 dark:text-gray-400">`;
|
||||
result.rogueSchedules.forEach(sched => {
|
||||
html += `<li>- "${sched.name}" (Cron: ${sched.cron})</li>`;
|
||||
});
|
||||
html += `</ul></li>`;
|
||||
});
|
||||
|
||||
html += `</ul></div>
|
||||
<form hx-post="/admin/scheduler/audit/nuke/${node}" hx-target="#audit-modal" hx-swap="outerHTML">
|
||||
<input type="hidden" name="nukeData" value='${JSON.stringify(nukePayload)}'>
|
||||
<div class="flex justify-end gap-4 mt-6">
|
||||
<button type="button" onclick="document.getElementById('audit-modal').remove()"
|
||||
class="px-4 py-2 text-gray-500 hover:text-gray-900 dark:hover:text-white transition">Cancel</button>
|
||||
<button type="submit" class="bg-red-600 hover:bg-red-500 text-white px-6 py-2 rounded font-bold transition">
|
||||
🔥 Nuke ${totalRogue} Schedules
|
||||
</button>
|
||||
</div>
|
||||
</form>`;
|
||||
} else {
|
||||
html += `<h2 class="text-2xl font-bold text-green-500 mb-2">✓ All Clear</h2>
|
||||
<p class="text-gray-600 dark:text-gray-300 mb-6">No conflicts found on ${node}. Trinity is ready to take control.</p>
|
||||
<div class="flex justify-end">
|
||||
<button type="button" onclick="document.getElementById('audit-modal').remove()"
|
||||
class="bg-green-600 hover:bg-green-500 text-white px-6 py-2 rounded transition">Close</button>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
html += `</div></div>`;
|
||||
res.send(html);
|
||||
} catch (err) {
|
||||
console.error('Audit error:', err);
|
||||
res.status(500).send('Error running audit');
|
||||
|
||||
@@ -62,7 +62,59 @@
|
||||
|
||||
<!-- Server Table -->
|
||||
<div id="scheduler-table" class="bg-white dark:bg-darkcard rounded overflow-hidden border border-gray-200 dark:border-gray-700">
|
||||
<%- include('scheduler/table', { servers: servers }) %>
|
||||
<table class="w-full text-left">
|
||||
<thead class="bg-gray-100 dark:bg-darkbg text-gray-600 dark:text-gray-300">
|
||||
<tr>
|
||||
<th class="p-3 w-10"></th>
|
||||
<th class="p-3">Server</th>
|
||||
<th class="p-3">Node</th>
|
||||
<th class="p-3">Restart Time (UTC)</th>
|
||||
<th class="p-3">Status</th>
|
||||
<th class="p-3">Skip</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="sortable-servers">
|
||||
<% if (servers.length === 0) { %>
|
||||
<tr>
|
||||
<td colspan="6" class="p-6 text-center text-gray-500">
|
||||
No servers imported yet. Click "Import Servers" to populate from Pterodactyl.
|
||||
</td>
|
||||
</tr>
|
||||
<% } else { %>
|
||||
<% servers.forEach((server, i) => { %>
|
||||
<tr class="border-t border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-800 transition" data-id="<%= server.server_id %>">
|
||||
<td class="p-3 cursor-grab text-gray-400 hover:text-gray-900 dark:hover:text-white">
|
||||
<span class="drag-handle text-lg">☰</span>
|
||||
</td>
|
||||
<td class="p-3 font-medium"><%= server.server_name %></td>
|
||||
<td class="p-3">
|
||||
<span class="px-2 py-1 rounded text-xs font-bold <%= server.node === 'TX1' ? 'bg-fire/20 text-fire' : 'bg-frost/20 text-frost' %>">
|
||||
<%= server.node %>
|
||||
</span>
|
||||
</td>
|
||||
<td class="p-3 font-mono text-sm"><%= server.effective_time || 'Not set' %></td>
|
||||
<td class="p-3 text-sm">
|
||||
<% if (server.sync_status === 'SUCCESS') { %>
|
||||
<span class="text-green-500" title="Last synced: <%= server.last_synced_at %>">● Synced</span>
|
||||
<% } else if (server.sync_status === 'FAILED') { %>
|
||||
<span class="text-red-500" title="<%= server.last_error %>">✕ Error</span>
|
||||
<% } else { %>
|
||||
<span class="text-yellow-500">○ Pending</span>
|
||||
<% } %>
|
||||
</td>
|
||||
<td class="p-3">
|
||||
<button hx-post="/admin/scheduler/toggle-skip/<%= server.server_id %>"
|
||||
hx-swap="none"
|
||||
hx-on::after-request="htmx.ajax('GET', '/admin/scheduler/table-only', '#scheduler-table')"
|
||||
class="px-2 py-1 rounded text-xs <%= server.skip_restart ? 'bg-red-600 text-white' : 'bg-gray-200 dark:bg-gray-700 text-gray-600 dark:text-gray-300' %>">
|
||||
<%= server.skip_restart ? 'Skipped' : 'Active' %>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<% }) %>
|
||||
<% } %>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- Modal Container -->
|
||||
|
||||
Reference in New Issue
Block a user