Merge pull request #593 from cabinetoffice/EHD-1043-manage-organisati…

…ons-page--part-2 EHD-1043: Manage Organisations page: Re-wire links to point at new page
cabinetoffice · Oct 11, 2024 · b7e24d5 · b7e24d5
2 parents 637078e + 3f60a4a
commit b7e24d5
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/GenderPayGap.WebUI/Controllers/CompareController.cs b/GenderPayGap.WebUI/Controllers/CompareController.cs
@@ -283,7 +283,7 @@ public IActionResult CompareEmployers(string command, int year = 0)
             switch (command.ToLower())
             {
                 case "employer":
-                    return RedirectToAction(nameof(ViewingController.Employer), "Viewing", new {employerIdentifier = args});
+                    return RedirectToAction("ViewEmployerPage", "Redirect", new {employerIdentifier = args});
                 case "report":
                     return RedirectToAction(nameof(ViewingController.Report), "Viewing", new {employerIdentifier = args, year});
             }

diff --git a/GenderPayGap.WebUI/Controllers/RedirectController.cs b/GenderPayGap.WebUI/Controllers/RedirectController.cs
@@ -1,4 +1,5 @@
 using GenderPayGap.WebUI.Classes;
+using GenderPayGap.WebUI.Helpers;
 using Microsoft.AspNetCore.Mvc;
 
 namespace GenderPayGap.WebUI.Controllers
@@ -98,5 +99,13 @@ public IActionResult GuidancePdfRedirects()
             return Redirect("https://www.gov.uk/government/publications/gender-pay-gap-reporting-guidance-for-employers/closing-your-gender-pay-gap");
         }
 
+        [HttpGet("/Employer/{employerIdentifier}")]
+        public IActionResult ViewEmployerPage(string employerIdentifier, int? page = 1)
+        {
+            long organisationId = ControllerHelper.DeObfuscateOrganisationIdOrThrow404(employerIdentifier);
+
+            return RedirectToAction("Employer", "ViewReports", new {organisationId});
+        }
+
     }
 }
diff --git a/GenderPayGap.WebUI/Controllers/ViewingController.cs b/GenderPayGap.WebUI/Controllers/ViewingController.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -119,23 +119,6 @@ public IActionResult SuggestEmployerNameJs(string search)
 
         #endregion
 
-        #region Employer details
-
-        [HttpGet("~/Employer/{employerIdentifier}")]
-        public IActionResult Employer(string employerIdentifier, int? page = 1)
-        {
-            if (string.IsNullOrWhiteSpace(employerIdentifier))
-            {
-                return new HttpBadRequestResult("Missing employer identifier");
-            }
-
-            long organisationId = ControllerHelper.DeObfuscateOrganisationIdOrThrow404(employerIdentifier);
-
-            return RedirectToAction("Employer", "ViewReports", new {organisationId});
-        }
-
-        #endregion
-
         #region Reports
 
         [HttpGet("~/EmployerReport/{employerIdentifier}/{year}")]

diff --git a/GenderPayGap.WebUI/Views/Admin/ViewOrganisation.cshtml b/GenderPayGap.WebUI/Views/Admin/ViewOrganisation.cshtml
@@ -55,7 +55,7 @@
 </h1>
 
 <p class="govuk-body">
-    <a href="@Url.Action("Employer", "Viewing", new {employerIdentifier = Model.Organisation.GetEncryptedId()})"
+    <a href="@Url.Action("Employer", "ViewReports", new {organisationId = Model.Organisation.OrganisationId})"
        class="govuk-link">
         '@(Model.Organisation.OrganisationName)' on viewing service
     </a>

diff --git a/GenderPayGap.WebUI/Views/Viewing/EmployerDetails/Report.cshtml b/GenderPayGap.WebUI/Views/Viewing/EmployerDetails/Report.cshtml
@@ -21,7 +21,7 @@
 <partial name="~/Views/Compare/ComparisonBasket.cshtml" model="ViewBag.BasketViewModel"/>
 <div class="grid-row">
     <div class="column-full">
-        <a class="link-back" href="@(Url.Action("Employer", new {employerIdentifier}))">View all reports for this employer</a>
+        <a class="link-back" href="@Url.Action("Employer", "ViewReports", new {organisationId = Model.Organisation.OrganisationId})">View all reports for this employer</a>
         <h1 class="heading-large">
             <div id="OrganisationName">
                 @Model.Organisation.OrganisationName

diff --git a/GenderPayGap.WebUI/Views/Viewing/Finder/Parts/Results.cshtml b/GenderPayGap.WebUI/Views/Viewing/Finder/Parts/Results.cshtml
@@ -1,4 +1,5 @@
 @using GenderPayGap.Core.Models
+@using GenderPayGap.Core.Classes
 @model GenderPayGap.WebUI.Models.Search.SearchViewModel
 
 <ul id="SearchResults" class="results">
@@ -9,7 +10,7 @@
             <div class="govuk-grid-row">
                 <div class="govuk-grid-column-two-thirds">
                     <h2>
-                        @Html.ActionLink(employer.Name, "Employer", "Viewing", new {employerIdentifier = employer.OrganisationIdEncrypted}, new {data_name = "ViewLink", data_id = employer.OrganisationIdEncrypted, data_loadtestid = employer.Name})
+                        @Html.ActionLink(employer.Name, "Employer", "ViewReports", new {organisationId = Obfuscator.DeObfuscate(employer.OrganisationIdEncrypted)}, new {data_name = "ViewLink", data_id = employer.OrganisationIdEncrypted, data_loadtestid = employer.Name})
                     </h2>
                     @if (string.IsNullOrWhiteSpace(employer.PreviousName) == false)
                     {