Merge pull request #2070 from TechnologyEnhancedLearning/Develop/Fixes/TD-1944_Fixed_showing_console_404_error_instead_of_410_error

TD-1944 Fixed false console error showing when clicking browser back …

Author: rshrirohit

DigitalLearningSolutions.Data/Enums/ViewDelegateNavigationType.cs

@@ -0,0 +1,7 @@
+namespace DigitalLearningSolutions.Data.Enums
+{
+    public enum ViewDelegateNavigationType
+    {
+        PromoteToAdmin
+    }
+}

DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/ViewDelegateControllerTests.cs

@@ -67,7 +67,7 @@ public void Index_shows_centre_specific_email_if_not_null()
             A.CallTo(() => userService.GetDelegateById(delegateId)).Returns(delegateEntity);
 
             // When
-            var result = viewDelegateController.Index(delegateId);
+            var result = viewDelegateController.Index(delegateId, null);
 
             // Then
             result.As<ViewResult>().Model.As<ViewDelegateViewModel>().DelegateInfo.Email.Should()
@@ -83,7 +83,7 @@ public void Index_shows_primary_email_if_centre_specific_email_is_null()
             A.CallTo(() => userService.GetDelegateById(delegateId)).Returns(delegateEntity);
 
             // When
-            var result = viewDelegateController.Index(delegateId);
+            var result = viewDelegateController.Index(delegateId, null);
 
             // Then
             result.As<ViewResult>().Model.As<ViewDelegateViewModel>().DelegateInfo.Email.Should()
@@ -98,7 +98,7 @@ public void Index_returns_not_found_result_if_no_delegate_found_with_given_id()
             A.CallTo(() => userService.GetDelegateById(delegateId)).Returns(null);
 
             // When
-            var result = viewDelegateController.Index(delegateId);
+            var result = viewDelegateController.Index(delegateId, null);
 
             // Then
             result.Should().BeNotFoundResult();

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/PromoteToAdminController.cs

@@ -173,7 +173,7 @@ public IActionResult Index(AdminRolesFormData formData, int delegateId)
                 return new StatusCodeResult(500);
             }
             TempData["IsDelegatePromoted"] = true;
-            return RedirectToAction("Index", "ViewDelegate", new { delegateId });
+            return RedirectToAction("Index", "ViewDelegate", new { delegateId = delegateId, callType = ViewDelegateNavigationType.PromoteToAdmin });
         }
     }
 }

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ViewDelegateController.cs

@@ -57,7 +57,7 @@ IEmailVerificationDataService emailVerificationDataService
             this.emailVerificationDataService = emailVerificationDataService;
         }
 
-        public IActionResult Index(int delegateId)
+        public IActionResult Index(int delegateId, string? callType)
         {
             var centreId = User.GetCentreIdKnownNotNull();
 
@@ -68,7 +68,7 @@ public IActionResult Index(int delegateId)
                 return NotFound();
             }
 
-            if (TempData["IsDelegatePromoted"] != null)
+            if (string.IsNullOrEmpty(callType) && TempData["IsDelegatePromoted"] != null)
             {
                 TempData.Remove("IsDelegatePromoted");
             }