Skip to content

TD-3223 Showing console '404' error when removing the delegate from activity and clicking browser back button #3305

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
merged 2 commits into from
Jul 8, 2025
Merged

TD-3223 Showing console '404' error when removing the delegate from activity and clicking browser back button #3305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a092b18
TD-3223 Showing console '404' error when removing the delegate from a…
sherif-olaboye Jul 1, 2025
ce1d59c
TD-3223 Showing console '404' error when removing the delegate from …
sherif-olaboye Jul 1, 2025
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
11 changes: 8 additions & 3 deletions ...lutions.Web.Tests/Controllers/TrackingSystem/Delegates/DelegateProgressControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
namespace DigitalLearningSolutions.Web.Tests.Controllers.TrackingSystem.Delegates
{
using System;
using System.Collections.Generic;
using DigitalLearningSolutions.Data.Models;
using DigitalLearningSolutions.Data.Models.Courses;
using DigitalLearningSolutions.Data.Models.CustomPrompts;
Expand All @@ -15,8 +13,11 @@
using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Delegates.DelegateProgress;
using FakeItEasy;
using FluentAssertions.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration;
using NUnit.Framework;
using System;
using System.Collections.Generic;

public class DelegateProgressControllerTests
{
Expand Down Expand Up @@ -386,7 +387,11 @@ public void Delegate_removal_for_delegate_with_no_active_progress_returns_not_fo
);

// Then
result.Should().BeNotFoundResult();
result.Should()
.BeRedirectToActionResult()
.WithActionName("StatusCode")
.WithControllerName("LearningSolutions")
.WithRouteValue("code", 410);
}

[Test]
Expand Down
10 changes: 3 additions & 7 deletions ...lLearningSolutions.Web/Controllers/TrackingSystem/Delegates/DelegateProgressController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,8 @@ public IActionResult ConfirmRemoveFromCourse(
)
{
var progress = progressService.GetDetailedCourseProgress(progressId);
if (progress == null)
{
return StatusCode((int)HttpStatusCode.Gone);
}
if (!courseService.DelegateHasCurrentProgress(progressId) || progress == null)
return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });

var model = new RemoveFromCourseViewModel(
progress,
Expand All @@ -305,9 +303,7 @@ RemoveFromCourseViewModel model

var progress = progressService.GetDetailedCourseProgress(progressId);
if (!courseService.DelegateHasCurrentProgress(progressId) || progress == null)
{
return new NotFoundResult();
}
return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });

courseService.RemoveDelegateFromCourse(
progress.DelegateId,
Expand Down
Loading