feat: add sort by vmid, name, last created, last updated on dashboard
- GET /api/instances now accepts ?sort= (name|vmid|created_at|updated_at) and ?order= (asc|desc); invalid sort fields fall back to name asc - Timestamp sorts use id as a tiebreaker (datetime() precision is 1 s) - Toolbar gains a sort-field <select> and a ↑/↓ direction toggle button - toggleSortDir() flips direction and re-fetches; state held in data-dir attr Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -48,6 +48,13 @@
|
|||||||
<select id="filter-stack" onchange="filterInstances()">
|
<select id="filter-stack" onchange="filterInstances()">
|
||||||
<option value="">all stacks</option>
|
<option value="">all stacks</option>
|
||||||
</select>
|
</select>
|
||||||
|
<select id="sort-field" onchange="filterInstances()">
|
||||||
|
<option value="name">name</option>
|
||||||
|
<option value="vmid">vmid</option>
|
||||||
|
<option value="updated_at">last updated</option>
|
||||||
|
<option value="created_at">last created</option>
|
||||||
|
</select>
|
||||||
|
<button id="sort-dir" class="btn" data-dir="asc" onclick="toggleSortDir()" title="reverse sort">↑</button>
|
||||||
<div class="toolbar-right">
|
<div class="toolbar-right">
|
||||||
<button class="btn primary" onclick="openNewModal()">+ new instance</button>
|
<button class="btn primary" onclick="openNewModal()">+ new instance</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
12
js/ui.js
12
js/ui.js
@@ -100,11 +100,21 @@ function setStateFilter(state) {
|
|||||||
filterInstances();
|
filterInstances();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function toggleSortDir() {
|
||||||
|
const btn = document.getElementById('sort-dir');
|
||||||
|
const next = btn.dataset.dir === 'asc' ? 'desc' : 'asc';
|
||||||
|
btn.dataset.dir = next;
|
||||||
|
btn.textContent = next === 'asc' ? '↑' : '↓';
|
||||||
|
filterInstances();
|
||||||
|
}
|
||||||
|
|
||||||
async function filterInstances() {
|
async function filterInstances() {
|
||||||
const search = document.getElementById('search-input').value;
|
const search = document.getElementById('search-input').value;
|
||||||
const state = document.getElementById('filter-state').value;
|
const state = document.getElementById('filter-state').value;
|
||||||
const stack = document.getElementById('filter-stack').value;
|
const stack = document.getElementById('filter-stack').value;
|
||||||
const instances = await getInstances({ search, state, stack });
|
const sort = document.getElementById('sort-field').value;
|
||||||
|
const order = document.getElementById('sort-dir').dataset.dir || 'asc';
|
||||||
|
const instances = await getInstances({ search, state, stack, sort, order });
|
||||||
const grid = document.getElementById('instance-grid');
|
const grid = document.getElementById('instance-grid');
|
||||||
|
|
||||||
if (!instances.length) {
|
if (!instances.length) {
|
||||||
|
|||||||
@@ -133,6 +133,8 @@ function seedJobs() {
|
|||||||
|
|
||||||
// ── Queries ───────────────────────────────────────────────────────────────────
|
// ── Queries ───────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const VALID_SORTS = ['name', 'vmid', 'updated_at', 'created_at'];
|
||||||
|
|
||||||
export function getInstances(filters = {}) {
|
export function getInstances(filters = {}) {
|
||||||
const parts = ['SELECT * FROM instances WHERE 1=1'];
|
const parts = ['SELECT * FROM instances WHERE 1=1'];
|
||||||
const params = {};
|
const params = {};
|
||||||
@@ -142,7 +144,11 @@ export function getInstances(filters = {}) {
|
|||||||
}
|
}
|
||||||
if (filters.state) { parts.push('AND state = @state'); params.state = filters.state; }
|
if (filters.state) { parts.push('AND state = @state'); params.state = filters.state; }
|
||||||
if (filters.stack) { parts.push('AND stack = @stack'); params.stack = filters.stack; }
|
if (filters.stack) { parts.push('AND stack = @stack'); params.stack = filters.stack; }
|
||||||
parts.push('ORDER BY name ASC');
|
const sortField = VALID_SORTS.includes(filters.sort) ? filters.sort : 'name';
|
||||||
|
const sortOrder = filters.order === 'desc' ? 'DESC' : 'ASC';
|
||||||
|
// id is a stable tiebreaker for timestamp fields (datetime precision is 1 s)
|
||||||
|
const tiebreaker = (sortField === 'created_at' || sortField === 'updated_at') ? `, id ${sortOrder}` : '';
|
||||||
|
parts.push(`ORDER BY ${sortField} ${sortOrder}${tiebreaker}`);
|
||||||
return db.prepare(parts.join(' ')).all(params);
|
return db.prepare(parts.join(' ')).all(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -69,8 +69,8 @@ router.get('/instances/stacks', (_req, res) => {
|
|||||||
|
|
||||||
// GET /api/instances
|
// GET /api/instances
|
||||||
router.get('/instances', (req, res) => {
|
router.get('/instances', (req, res) => {
|
||||||
const { search, state, stack } = req.query;
|
const { search, state, stack, sort, order } = req.query;
|
||||||
res.json(getInstances({ search, state, stack }));
|
res.json(getInstances({ search, state, stack, sort, order }));
|
||||||
});
|
});
|
||||||
|
|
||||||
// GET /api/instances/:vmid/history
|
// GET /api/instances/:vmid/history
|
||||||
|
|||||||
Reference in New Issue
Block a user