Merge pull request 'v1.5.0' (#53) from dev into main

Reviewed-on: #53

js/ui.js

@@ -463,13 +463,6 @@ async function loadJobDetail(jobId) {
       <label class="form-label" for="job-schedule">Poll interval (minutes)</label>
       <input class="form-input" id="job-schedule" type="number" min="1" value="${job.schedule}" style="max-width:100px">
     </div>
-    <div class="form-group">
-      <label class="form-label" style="display:flex;align-items:center;gap:8px;cursor:pointer">
-        <input type="checkbox" id="job-run-on-create" ${cfg.run_on_create ? 'checked' : ''}
-          style="accent-color:var(--accent);width:13px;height:13px">
-        Run on instance creation
-      </label>
-    </div>
     ${_renderJobConfigFields(job.key, cfg)}
     <div class="job-actions">
       <button class="btn btn-secondary" onclick="saveJobDetail(${job.id})">Save</button>
@@ -528,12 +521,10 @@ async function saveJobDetail(jobId) {
   const apiKey   = document.getElementById('job-cfg-api-key');
   const apiUrl   = document.getElementById('job-cfg-api-url');
   const apiToken = document.getElementById('job-cfg-api-token');
-  if (tailnet)  cfg.tailnet        = tailnet.value.trim();
-  if (apiKey)   cfg.api_key        = apiKey.value;
-  if (apiUrl)   cfg.api_url        = apiUrl.value.trim();
-  if (apiToken) cfg.api_token      = apiToken.value;
-  const runOnCreate = document.getElementById('job-run-on-create');
-  if (runOnCreate) cfg.run_on_create = runOnCreate.checked;
+  if (tailnet)  cfg.tailnet   = tailnet.value.trim();
+  if (apiKey)   cfg.api_key   = apiKey.value;
+  if (apiUrl)   cfg.api_url   = apiUrl.value.trim();
+  if (apiToken) cfg.api_token = apiToken.value;
   const res = await fetch(`/api/jobs/${jobId}`, {
     method: 'PUT',
     headers: { 'Content-Type': 'application/json' },

server/db.js

@@ -227,7 +227,7 @@ export function importInstances(rows, historyRows = []) {
 
 export function getInstanceHistory(vmid) {
   return db.prepare(
-    'SELECT * FROM instance_history WHERE vmid = ? ORDER BY changed_at ASC, id ASC'
+    'SELECT * FROM instance_history WHERE vmid = ? ORDER BY changed_at DESC'
   ).all(vmid);
 }
 

server/jobs.js

@@ -129,15 +129,6 @@ export async function runJob(jobId) {
 
 const _intervals = new Map();
 
-export async function runJobsOnCreate() {
-  for (const job of getJobs()) {
-    const cfg = JSON.parse(job.config || '{}');
-    if (cfg.run_on_create) {
-      try { await runJob(job.id); } catch (e) { console.error(`runJobsOnCreate job ${job.id}:`, e); }
-    }
-  }
-}
-
 export function restartJobs() {
   for (const iv of _intervals.values()) clearInterval(iv);
   _intervals.clear();

server/routes.js

@@ -5,7 +5,7 @@ import {
   getConfig, setConfig, getJobs, getJob, updateJob, getJobRuns,
   getAllJobs, getAllJobRuns, importJobs,
 } from './db.js';
-import { runJob, restartJobs, runJobsOnCreate } from './jobs.js';
+import { runJob, restartJobs } from './jobs.js';
 
 export const router = Router();
 
@@ -102,7 +102,6 @@ router.post('/instances', (req, res) => {
     createInstance(data);
     const created = getInstance(data.vmid);
     res.status(201).json(created);
-    runJobsOnCreate().catch(() => {});
   } catch (e) {
     handleDbError('POST /api/instances', e, res);
   }

tests/api.test.js

@@ -623,25 +623,6 @@ describe('POST /api/jobs/:id/run', () => {
     expect(res.status).toBe(500)
   })
 
-  it('run_on_create: triggers matching jobs when an instance is created', async () => {
-    createJob({ ...testJob, config: JSON.stringify({ api_key: 'k', tailnet: 't', run_on_create: true }) })
-    const id = (await request(app).get('/api/jobs')).body[0].id
-    vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ ok: true, json: async () => ({ devices: [] }) }))
-    await request(app).post('/api/instances').send(base)
-    await new Promise(r => setImmediate(r))
-    const detail = await request(app).get(`/api/jobs/${id}`)
-    expect(detail.body.runs).toHaveLength(1)
-    expect(detail.body.runs[0].status).toBe('success')
-  })
-
-  it('run_on_create: does not trigger jobs without the flag', async () => {
-    createJob(testJob)
-    const id = (await request(app).get('/api/jobs')).body[0].id
-    await request(app).post('/api/instances').send(base)
-    await new Promise(r => setImmediate(r))
-    expect((await request(app).get(`/api/jobs/${id}`)).body.runs).toHaveLength(0)
-  })
-
   it('semaphore_sync: parses ansible inventory and updates instances', async () => {
     const semaphoreJob = {
       key: 'semaphore_sync', name: 'Semaphore Sync', description: 'test',