Fixes redirect controller code, appends "legacy" and formatter changes

Author: kevwhitt-hee

DigitalLearningSolutions.Web.Tests/Controllers/SuperAdmin/FaqControllerTests.cs

@@ -12,6 +12,8 @@ namespace DigitalLearningSolutions.Web.Tests.Controllers.SuperAdmin
     using FluentAssertions;
     using FluentAssertions.AspNetCore.Mvc;
     using NUnit.Framework;
+    using DigitalLearningSolutions.Data.Extensions;
+    using Microsoft.Extensions.Configuration;
 
     public class FaqControllerTests
     {
@@ -24,12 +26,14 @@ public class FaqControllerTests
         private SuperAdminFaqsController controller = null!;
 
         private IFaqsService faqService = null!;
+        private IConfiguration configuration = null!;
 
         [SetUp]
         public void Setup()
         {
             faqService = A.Fake<IFaqsService>();
-            controller = new SuperAdminFaqsController(faqService);
+            configuration = A.Fake<IConfiguration>();
+            controller = new SuperAdminFaqsController(faqService, configuration);
             A.CallTo(() => faqService.GetAllFaqs())
                 .Returns(faqs);
         }

DigitalLearningSolutions.Web/Controllers/SuperAdmin/SuperAdminFaqsController.cs

@@ -43,21 +43,25 @@ public IActionResult Index()
 
             return View("SuperAdminFaqs", model);
         }
+        [Route("Faqs/Manage")]
         public IActionResult ManageFaqs()
         {
-            return RedirectToPage(legacyUrl + "tracking/admin-faqs");
+            return Redirect(legacyUrl + "/tracking/admin-faqs");
         }
+        [Route("Resources")]
         public IActionResult Resources()
         {
-            return RedirectToPage(legacyUrl + "tracking/admin-resources");
+            return Redirect(legacyUrl + "/tracking/admin-resources");
         }
+        [Route("Notifications")]
         public IActionResult Notifications()
         {
-            return RedirectToPage(legacyUrl + "tracking/admin-notifications");
+            return Redirect(legacyUrl + "/tracking/admin-notifications");
         }
+        [Route("Brands")]
         public IActionResult Brands()
         {
-            return RedirectToPage(legacyUrl + "tracking/admin-landing");
+            return Redirect(legacyUrl + "/tracking/admin-landing");
         }
     }
 }

DigitalLearningSolutions.Web/Views/SuperAdmin/Shared/_SystemSideNavMenu.cshtml

@@ -5,22 +5,22 @@
 <ul class="nhsuk-list side-nav__list">
 
     <vc:side-menu-link asp-action="Brands"
-                     asp-controller="SuperAdminFaqs"
-                     link-text="Brands"
-                     is-current-page="@(Model == SuperAdminSystemPage.ManageLists)" />
+                       asp-controller="SuperAdminFaqs"
+                       link-text="Brands (legacy)"
+                       is-current-page="@(Model == SuperAdminSystemPage.ManageLists)" />
 
     <vc:side-menu-link asp-action="Notifications"
-                     asp-controller="SuperAdminFaqs"
-                     link-text="Notifications"
-                     is-current-page="@(Model == SuperAdminSystemPage.Notifications)" />
+                       asp-controller="SuperAdminFaqs"
+                       link-text="Notifications (legacy)"
+                       is-current-page="@(Model == SuperAdminSystemPage.Notifications)" />
 
     <vc:side-menu-link asp-action="Resources"
-                     asp-controller="SuperAdminFaqs"
-                     link-text="Resources"
-                     is-current-page="@(Model == SuperAdminSystemPage.Resources)" />
+                       asp-controller="SuperAdminFaqs"
+                       link-text="Resources (legacy)"
+                       is-current-page="@(Model == SuperAdminSystemPage.Resources)" />
 
-  <vc:side-menu-link asp-action="Index"
-                     asp-controller="SuperAdminFaqs"
-                     link-text="FAQs"
-                     is-current-page="@(Model == SuperAdminSystemPage.FAQs)" />
+    <vc:side-menu-link asp-action="Index"
+                       asp-controller="SuperAdminFaqs"
+                       link-text="FAQs"
+                       is-current-page="@(Model == SuperAdminSystemPage.FAQs)" />
 </ul>