From 449c4f786033f65629a749b23ac6c8b5091d553a Mon Sep 17 00:00:00 2001
From: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com>
Date: Thu, 10 Sep 2026 12:01:58 +0100
Subject: [PATCH] TD-7588 Issue showing console 403 error when try to launched
 the self-assessment from Learning portal when marked every competency group
 as Optional

---
 .../RequireProcessAgreementFilter .cs           |  3 ++-
 .../Views/LearningPortal/Current/Current.cshtml | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/DigitalLearningSolutions.Web/ServiceFilter/RequireProcessAgreementFilter .cs b/DigitalLearningSolutions.Web/ServiceFilter/RequireProcessAgreementFilter .cs
index 9c480ebca7..4a0826f3f4 100644
--- a/DigitalLearningSolutions.Web/ServiceFilter/RequireProcessAgreementFilter .cs	
+++ b/DigitalLearningSolutions.Web/ServiceFilter/RequireProcessAgreementFilter .cs	
@@ -46,7 +46,8 @@ public void OnActionExecuting(ActionExecutingContext context)
                     logger.LogWarning(
                         $"Attempt to access self assessment {selfAssessmentId} by user {delegateUserId}, but no such assessment found"
                     );
-                    context.Result = new RedirectToActionResult("StatusCode", "LearningSolutions", new { code = 403 });
+                    controller.TempData["ErrorMessage"] = "The self-assessment cannot be launched because no competencies have been marked as required.";
+                    context.Result = new RedirectToActionResult("Current", "LearningPortal", null);
                     return;
                 }
                 if (!selfAssessment.IncludeLearnerDeclarationPrompt) return;
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml
index 8f1366568c..80d77ca4c1 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Current/Current.cshtml
@@ -26,6 +26,21 @@
     <div class="nhsuk-grid-column-full">
         <h1 id="page-heading">My Current Activities</h1>
 
+        @if (TempData["ErrorMessage"] is string errorMessage)
+        {
+            <div class="nhsuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1">
+                <h2 class="nhsuk-error-summary__title" id="error-summary-title">
+                    There is a problem
+                </h2>
+                <div class="nhsuk-error-summary__body">
+                    <div class="nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-3">
+                        <span class="error-message--margin-bottom-1 nhsuk-error-message">
+                            <span>@errorMessage</span>
+                        </span>
+                    </div>
+                </div>
+            </div>
+       }
         @if (!Model.ApiIsAccessible)
         {
             <vc:learning-resource-warning css-class="nhsuk-u-margin-bottom-4 nhsuk-u-margin-top-4"
@@ -73,6 +88,6 @@
 @if (Model.JavascriptSearchSortFilterPaginateEnabled)
 {
     @section scripts {
-    <script src="@Url.Content("~/js/learningPortal/current.js")" asp-append-version="true"></script>
+        <script src="@Url.Content("~/js/learningPortal/current.js")" asp-append-version="true"></script>
     }
 }