TD-4137 'Switch application' navigation link should be removed from 'Give page feedback' screens for logged in user

sherif-olaboye · sherif-olaboye · commit 579645a664d3 · 2024-06-25T16:00:27.000+01:00
diff --git a/DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs b/DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs
@@ -37,7 +37,7 @@ IMultiPageFormService multiPageFormService
         public IActionResult Index(string sourceUrl, string sourcePageTitle)
         {
             ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;
-
+            ViewBag.HideSwitchApplication = true;
             _multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddUserFeedback, TempData);
             
             _userFeedbackViewModel = new()
@@ -122,6 +122,7 @@ private string DeriveUserRoles()
         public IActionResult StartUserFeedbackSession(UserFeedbackViewModel userFeedbackViewModel)
         {
             ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;
+            ViewBag.HideSwitchApplication = true;
 
             var userFeedbackSessionData = new UserFeedbackTempData()
             {
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml
@@ -138,12 +138,15 @@
 
                                 @if (User.IsAdminAccount())
                                 {
-                                    <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.SwitchApplication)">
-                                        <a class="nhsuk-header__navigation-link" asp-controller="ApplicationSelector" asp-action="Index">
-                                            Switch application
-                                            <partial name="_NhsChevronRight" />
-                                        </a>
-                                    </li>
+                                    if ((bool?)ViewBag.HideSwitchApplication == false)
+                                    {
+                                        <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.SwitchApplication)">
+                                            <a class="nhsuk-header__navigation-link" asp-controller="ApplicationSelector" asp-action="Index">
+                                                Switch application
+                                                <partial name="_NhsChevronRight" />
+                                            </a>
+                                        </li>
+                                    }
                                 }
                             </ul>
                         </div>

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ IMultiPageFormService multiPageFormService`
`37`	`37`	`public IActionResult Index(string sourceUrl, string sourcePageTitle)`
`38`	`38`	`{`
`39`	`39`	`ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;`
`40`		`-`
	`40`	`+ ViewBag.HideSwitchApplication = true;`
`41`	`41`	`_multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddUserFeedback, TempData);`
`42`	`42`
`43`	`43`	`_userFeedbackViewModel = new()`
`@@ -122,6 +122,7 @@ private string DeriveUserRoles()`
`122`	`122`	`public IActionResult StartUserFeedbackSession(UserFeedbackViewModel userFeedbackViewModel)`
`123`	`123`	`{`
`124`	`124`	`ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;`
	`125`	`+ ViewBag.HideSwitchApplication = true;`
`125`	`126`
`126`	`127`	`var userFeedbackSessionData = new UserFeedbackTempData()`
`127`	`128`	`{`