cclohmar/vm-bench
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: remove VM Name/ID from download and SCP forms — moved to configure page

Browse source
This commit is contained in:
Claus Lohmar 2026-07-27 10:48:59 +00:00
parent 41059b128d
commit 13dc96375d
2 changed files with 10 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
frontend/templates/index.html
View file

@ -34,24 +34,11 @@
</div>
<div class="pve-panel-body">
<form id="session-form" onsubmit="startSession(event)">
<div class="pve-row">
<div class="pve-form-group">
<label>VM Name *</label>
<input type="text" id="vm-name" name="vm_name" required class="pve-input"
placeholder="e.g. debian-test" value="{{ prefill_vmname or '' }}">
</div>
<div class="pve-form-group">
<label>VM ID *</label>
<input type="number" id="vmid" name="vmid" required class="pve-input"
placeholder="e.g. 21050" min="21000" max="21100">
<span class="pve-hint">Range 21000&ndash;21100. Must be unique on host.</span>
</div>
</div>
<div class="pve-form-group" id="url-group">
<label>Download URL *</label>
<input type="url" id="source-url" name="source_url" required class="pve-input"
placeholder="https://example.com/image.7z">
<span class="pve-hint">Direct URL to a disk image or archive (.vmdk, .7z, .zip, etc.)</span>
<span class="pve-hint">Direct URL to a disk image or archive (.vmdk, .7z, .zip, .ova, etc.)</span>
</div>
<button type="submit" id="start-btn" class="pve-btn pve-btn-primary">Download &amp; Analyse</button>
<button type="button" class="pve-btn" onclick="hideDownload()" style="margin-left:0.5rem;">Cancel</button>
@ -124,22 +111,20 @@ function resumeSession(sessionId, firstFile) {
document.getElementById('card-scp').style.display = 'none';
document.getElementById('download-section').classList.remove('pve-hidden');
document.getElementById('download-title').textContent = 'Resume Session';
document.getElementById('url-group').classList.add('pve-hidden');
var btn = document.getElementById('start-btn');
btn.textContent = 'Resume Analysis';
var urlGroup = document.getElementById('url-group');
if (urlGroup) urlGroup.classList.add('pve-hidden');
document.getElementById('source-url').required = false;
btn.onclick = function(e) {
e.preventDefault();
var vmid = document.getElementById('vmid').value;
var vmName = document.getElementById('vm-name').value.trim();
if (!vmid) { alert('Please enter a VM ID.'); return; }
window.RESUMED_SID = sessionId;
document.getElementById('resume-sessions').classList.add('pve-hidden');
var status = document.getElementById('session-status');
status.classList.remove('pve-hidden');
setPhase('Analysing source image...', 0, true);
runAnalysis(vmid, firstFile, vmName, sessionId);
runAnalysis(0, firstFile, '', sessionId);
};
document.getElementById('source-url').required = false;
}
function cleanupSession(sessionId, btn) {
@ -190,15 +175,11 @@ async function startSession(e) {
polling.innerHTML = '';
document.getElementById('session-error').textContent = '';
const vmid = document.getElementById('vmid').value;
const vmName = document.getElementById('vm-name').value.trim();
const url = document.getElementById('source-url').value.trim();
if (!url) { showError('Please enter a download URL.'); btn.disabled = false; return; }
const sessionId = window.VM_BENCH_SID || '';
const formData = new FormData();
formData.append('vmid', vmid);
formData.append('vm_name', vmName);
formData.append('source_type', 'url');
formData.append('source_url', url);
formData.append('session_id', sessionId);
@ -232,7 +213,7 @@ async function handleDownload(formData) {
if (pdata.phase === 'complete') {
setPhase('Download complete (' + (pdata.file_size_gb || 0) + ' GiB)', 100, false);
await sleep(500);
await runAnalysis(data.vmid, filename, data.vm_name);
await runAnalysis(0, filename, '');
return;
}
if (pdata.phase === 'error') { throw new Error(pdata.error); }

22
frontend/templates/scp.html
View file

@ -40,18 +40,6 @@
placeholder="/mnt/vmware/exchange-server.vmdk">
<span class="pve-hint">Full path to the disk image or archive on the remote server.</span>
</div>
<div class="pve-row">
<div class="pve-form-group">
<label>VM Name *</label>
<input type="text" id="scp-vm-name" name="vm_name" required class="pve-input"
placeholder="e.g. exchange-prod">
</div>
<div class="pve-form-group">
<label>VM ID *</label>
<input type="number" id="scp-vmid" name="vmid" required class="pve-input"
placeholder="e.g. 21050" min="21000" max="21100">
</div>
</div>
<button type="submit" id="scp-start-btn" class="pve-btn pve-btn-primary">Start SCP Pull</button>
</form>
@ -107,10 +95,10 @@ async function startScpPull(e) {
await new Promise(r => setTimeout(r, 500));
setScpPhase('Step 2/2: Analysing source image...', 0, true);
var fd = new FormData();
fd.append('vmid', document.getElementById('scp-vmid').value);
fd.append('filename', filename);
fd.append('vm_name', document.getElementById('scp-vm-name').value.trim());
fd.append('session_id', SESSION_ID);
fd.append('vmid', '0');
fd.append('vm_name', '');
var ar = await fetch('/session/analyze', { method: 'POST', body: fd });
var adata = await ar.json();
if (adata.phase === 'error') {
@ -121,11 +109,9 @@ async function startScpPull(e) {
var analysisId = adata.analysis_id;
if (!analysisId) {
setScpPhase('Analysis failed', 0, false);
showScpError('Backend returned invalid response — may need restart.');
showScpError('Backend returned invalid response.');
btn.disabled = false; return;
}
var vmid = document.getElementById('scp-vmid').value;
var vmName = document.getElementById('scp-vm-name').value.trim();
var astart = Date.now();
var pollErrs = 0;
for (;;) {
@ -135,7 +121,7 @@ async function startScpPull(e) {
var elapsed = Math.round((Date.now() - astart) / 1000);
setScpPhase('Analysing... ' + (sdata.message || '') + ' (' + elapsed + 's)', sdata.status === 'completed' ? 100 : 50, sdata.status !== 'completed');
if (sdata.status === 'completed') {
window.location.href = '/session/configure/' + analysisId + '?source_filename=' + encodeURIComponent(filename) + '&vm_name=' + encodeURIComponent(vmName) + '&vmid=' + vmid + '&session_id=' + SESSION_ID;
window.location.href = '/session/configure/' + analysisId + '?source_filename=' + encodeURIComponent(filename) + '&session_id=' + SESSION_ID;
btn.disabled = false; return;
}
if (sdata.status === 'failed') {