Merge pull request #2732 from TechnologyEnhancedLearning/Develop/Fixes/TD-4137-'Switchapplication'navigationlinkshouldberemovedfrom'Givepagefeedback'screensforloggedinuser

rshrirohit · web-flow · commit 2482ac7d6bf1 · 2024-07-11T12:08:47.000+01:00
TD-4137  switch application navigation link should be removed from give page feedback screens for logged in user
diff --git a/DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs b/DigitalLearningSolutions.Web/Controllers/UserFeedbackController.cs
@@ -37,7 +37,6 @@ IMultiPageFormService multiPageFormService
         public IActionResult Index(string sourceUrl, string sourcePageTitle)
         {
             ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;
-
             _multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddUserFeedback, TempData);
             
             _userFeedbackViewModel = new()
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml
@@ -138,12 +138,16 @@
 
                                 @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?)ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] != true)
+                                    {
+                                         <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,6 @@ IMultiPageFormService multiPageFormService`
`37`	`37`	`public IActionResult Index(string sourceUrl, string sourcePageTitle)`
`38`	`38`	`{`
`39`	`39`	`ViewData[LayoutViewDataKeys.DoNotDisplayUserFeedbackBar] = true;`
`40`		`-`
`41`	`40`	`_multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddUserFeedback, TempData);`
`42`	`41`
`43`	`42`	`_userFeedbackViewModel = new()`