Merge pull request #3334 from TechnologyEnhancedLearning/Develop/Features/TD-5859-URLFlagOverride

TD-5859 url flag override persist to dashboard page and handle

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs

@@ -93,19 +93,22 @@ public IActionResult DownloadSelfAssessmentReport(int selfAssessmentId)
         }
         [HttpGet]
         [Route("TableauCompetencyDashboard")]
-        public IActionResult TableauCompetencyDashboard()
+        public async Task<IActionResult> TableauCompetencyDashboardAsync()
         {
             var userEmail = User.GetUserPrimaryEmail();
             var adminId = User.GetAdminId();
             var jwt = tableauConnectionHelper.GetTableauJwt();
+            var tableauFlag = await featureManager.IsEnabledAsync(FeatureFlags.TableauSelfAssessmentDashboards);
+            var tableauQueryOverride = string.Equals(Request.Query["tableaulink"], "true", StringComparison.OrdinalIgnoreCase);
+            var showTableauLink = tableauFlag || tableauQueryOverride;
             ViewBag.Email = userEmail;
             ViewBag.AdminId = adminId;
             ViewBag.SiteName = tableauSiteName;
             ViewBag.TableauServerUrl = tableauUrl;
             ViewBag.WorkbookName = workbookName;
             ViewBag.ViewName = viewName;
             ViewBag.JwtToken = jwt;
-
+            ViewBag.ShowTableauLink = showTableauLink;
             return View();
         }
     }

DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/Index.cshtml

@@ -4,6 +4,12 @@
 @model SelfAssessmentReportsViewModel
 @{
     ViewData["Title"] = "Self assessment reports";
+    var routeData = new Dictionary<string, string>();
+
+    if (string.Equals(Context.Request.Query["tableaulink"], "true", StringComparison.OrdinalIgnoreCase))
+    {
+        routeData["tableaulink"] = "true";
+    }
 }
 <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-one-quarter">
@@ -21,7 +27,8 @@
         </h1>
         @if (Model.ShowTableauLink && Model.SelfAssessmentSelects.Any())
         {
-            <vc:action-link asp-controller="SelfAssessmentReports" asp-action="TableauCompetencyDashboard" asp-all-route-data="@new Dictionary<string, string>();" link-text="View Tableau supervised self assessments dashboard" />
+            <vc:action-link asp-controller="SelfAssessmentReports"
+                            asp-all-route-data="routeData" asp-action="TableauCompetencyDashboard" link-text="View Tableau supervised self assessments dashboard" />
         }
         <h2>Excel learner activity reports</h2>
         <p class="nhsuk-lede-text">Download Excel competency self assessments activity reports for your centre.</p>

DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/TableauCompetencyDashboard.cshtml

@@ -20,7 +20,8 @@
 </div>
 <h1>@ViewData["Title"]</h1>
 <vc:inset-text css-class="" text="Use the full screen button below the Tableau dashboard (next to 'Share') for the best experience." />
-<feature name="@(FeatureFlags.TableauSelfAssessmentDashboards)">
+@if (ViewBag.ShowTableauLink)
+{
     <tableau-viz id='tableau-viz'
                  src='@srcUrl' token='@jwtToken' toolbar='bottom'>
         If the dashboard doesn't appear after a few seconds, <a href="#">reload the page</a>
@@ -32,8 +33,10 @@
         <script type="module" src="@tableauServerUrl/javascripts/api/tableau.embedding.3.latest.min.js"></script>
         <script src="@Url.Content("~/js/trackingSystem/tableaureports.js")" asp-append-version="true"></script>
     }
-</feature>
-<feature name="@(FeatureFlags.TableauSelfAssessmentDashboards)" negate="true">
+}
+else
+{
     <h2>Oops! We are still working on this area of the site</h2>
     <p class="nhsuk-lede-text">This feature is under development and should be available soon.</p>
-</feature>
+}
+