Skip to content

fix: switch Job Details UI out of manual selection immediately after submit (closes #182) #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
negativeeddy merged 1 commit into from
Sep 5, 2026
Merged

fix: switch Job Details UI out of manual selection immediately after submit (closes #182) #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 84 additions & 8 deletions src/ArmRipper.WebUi/Views/Jobs/JobDetail.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,33 @@ else
@section Scripts {
@Html.AntiForgeryToken()
<script>
// Tracks whether the user has already submitted a manual track selection in
// this page session. Prevents a stale SignalR broadcast from re-adding the
// Continue Rip button while the pipeline is resuming (issue #182).
var manualSelectionSubmitted = false;

// Remove the manual-selection UI (Continue button + track checkboxes) from
// the DOM. The server-rendered page only shows these in ManualSelectionStarted,
// so both the optimistic submit path and the live-update path must strip them
// once the job leaves that state (issue #182).
function removeManualSelectionUi() {
var continueBtn = document.getElementById('continueManualSelection');
if (continueBtn) {
var hint = continueBtn.nextElementSibling;
if (hint && hint.classList.contains('text-muted')) hint.remove();
continueBtn.remove();
}
var selectAll = document.getElementById('selectAllTracks');
if (selectAll) {
var th = selectAll.closest('th');
if (th) th.remove();
}
document.querySelectorAll('.track-select').forEach(function (cb) {
var td = cb.closest('td');
if (td) td.remove();
});
}

@if (Model.Status is JobState.ManualSelectionStarted)
{
<text>
Expand All @@ -538,11 +565,45 @@ else
})
.then(function(r) { return r.json(); })
.then(function(data) {
if (data.success) location.reload();
if (data.success) {
// Switch the UI out of manual-selection mode immediately. The
// pipeline needs a few DB round-trips before the status actually
// leaves manual_selection, so a blind reload would re-render the
// button (issue #182).
manualSelectionSubmitted = true;
removeManualSelectionUi();
waitForSelectionApplied();
}
else alert('Failed: ' + (data.error || 'unknown error'));
})
.catch(function(err) { alert('Error: ' + err); });
}

// Poll the job until it leaves manual_selection, then reload so the
// server-rendered page reflects the applied selections. Falls back to a
// reload after ~10s so the page can never get stuck.
function waitForSelectionApplied() {
var attempts = 0;
var maxAttempts = 20; // 20 × 500 ms = 10 s
var timer = setInterval(function () {
attempts++;
fetch('/api/jobs/' + @Model.Id)
.then(function (r) { return r.json(); })
.then(function (job) {
// JobState.ManualSelectionStarted serializes as 10.
if (job.status !== 10 || attempts >= maxAttempts) {
clearInterval(timer);
location.reload();
}
})
.catch(function () {
if (attempts >= maxAttempts) {
clearInterval(timer);
location.reload();
}
});
}, 500);
}
document.getElementById('selectAllTracks').addEventListener('change', function() {
var checked = this.checked;
document.querySelectorAll('.track-select').forEach(function(cb) { cb.checked = checked; });
Expand Down Expand Up @@ -663,18 +724,32 @@ else

if (isTerminal_) {
actionsDd.innerHTML = '';
removeManualSelectionUi();
return;
}

if (isManualSelection) {
actionsDd.innerHTML =
'<button type="button" class="btn btn-success me-2" onclick="submitManualSelection()">▶ Continue Rip</button>' +
'<small class="text-muted">Select tracks below, then click Continue.</small>' +
'<form method="post" action="/jobs/cancel" onsubmit="return confirm(\'Cancel this job?\')" style="display:inline">' +
'<input type="hidden" name="jobId" value="' + jobId + '" />' +
'<button type="submit" class="btn btn-outline-danger btn-sm ms-2">Cancel Job</button>' +
'</form>';
if (manualSelectionSubmitted) {
// The user already submitted a selection and the pipeline is
// resuming — don't re-add the Continue button if a stale
// broadcast arrives (issue #182).
removeManualSelectionUi();
actionsDd.innerHTML =
'<form method="post" action="/jobs/cancel" onsubmit="return confirm(\'Cancel this job?\')" style="display:inline">' +
'<input type="hidden" name="jobId" value="' + jobId + '" />' +
'<button type="submit" class="btn btn-outline-danger btn-sm">Cancel Job</button>' +
'</form>';
} else {
actionsDd.innerHTML =
'<button type="button" class="btn btn-success me-2" onclick="submitManualSelection()">▶ Continue Rip</button>' +
'<small class="text-muted">Select tracks below, then click Continue.</small>' +
'<form method="post" action="/jobs/cancel" onsubmit="return confirm(\'Cancel this job?\')" style="display:inline">' +
'<input type="hidden" name="jobId" value="' + jobId + '" />' +
'<button type="submit" class="btn btn-outline-danger btn-sm ms-2">Cancel Job</button>' +
'</form>';
}
} else if (isManualWait) {
removeManualSelectionUi();
actionsDd.innerHTML =
'<form method="post" action="/jobs/continue-wait" style="display:inline">' +
'<input type="hidden" name="jobId" value="' + jobId + '" />' +
Expand All @@ -685,6 +760,7 @@ else
'<button type="submit" class="btn btn-outline-danger btn-sm">Cancel Job</button>' +
'</form>';
} else {
removeManualSelectionUi();
actionsDd.innerHTML =
'<form method="post" action="/jobs/cancel" onsubmit="return confirm(\'Cancel this job?\')" style="display:inline">' +
'<input type="hidden" name="jobId" value="' + jobId + '" />' +
Expand Down
51 changes: 51 additions & 0 deletions tests/ArmRipper.WebUi.Tests/ControllerActionIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,57 @@ public async Task JobDetail_RendersIdentificationFormCellsForLiveUpdate()
Assert.Contains("id=\"id-poster-final\"", html);
}

[Fact]
public async Task JobDetail_ManualSelectionState_RendersSelectionUiAndSubmitHelpers()
{
// Regression test for issue #182: the manual-selection page must render
// the optimistic-removal + polling helpers so the Continue Rip button
// disappears immediately after a selection is submitted (instead of
// lingering until a manual refresh).
int jobId;
using (var scope = _factory.Services.CreateScope())
{
var db = scope.ServiceProvider.GetRequiredService<ArmDbContext>();
var job = new Job
{
Title = "Manual Selection Job",
TitleAuto = "Manual Selection Job",
Year = "2026",
VideoType = VideoContentType.Movie,
DiscType = DiscType.Dvd,
Status = JobState.ManualSelectionStarted,
StartTime = DateTime.UtcNow,
DevPath = "/dev/sr99",
Config = new ConfigSnapshot { MinLength = 300, MaxLength = 9999, RipMethod = "mkv", GetAudioTitle = "" }
};
db.Jobs.Add(job);
await db.SaveChangesAsync();
jobId = job.Id;

// Tracks are required — the checkbox column only renders when the
// track table is present.
db.Tracks.AddRange(
new Track { JobId = jobId, TrackNumber = "0", FileName = "title00.mkv", Length = 6000, Process = true, MainFeature = true },
new Track { JobId = jobId, TrackNumber = "1", FileName = "title01.mkv", Length = 300, Process = false });
await db.SaveChangesAsync();
}

var client = await CreateAuthenticatedClientAsync();
var response = await client.GetAsync($"/jobs/jobdetail?jobId={jobId}");
Assert.Equal(HttpStatusCode.OK, response.StatusCode);

var html = await response.Content.ReadAsStringAsync();
// The Continue Rip button and track checkboxes are rendered in this state.
Assert.Contains("id=\"continueManualSelection\"", html);
Assert.Contains("id=\"selectAllTracks\"", html);
Assert.Contains("class=\"track-select\"", html);
// The optimistic-removal and polling helpers must be present so the UI
// switches out of manual mode immediately after submission.
Assert.Contains("function removeManualSelectionUi()", html);
Assert.Contains("function waitForSelectionApplied()", html);
Assert.Contains("function submitManualSelection()", html);
}

[Fact]
public async Task ActiveRips_ReturnsPageWithActiveJobs()
{
Expand Down