Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 28, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
176fb31
Implements persistence of url param to dashboard page and handling
kevwhitt-hee Jul 28, 2025
c5cd891
formatter changes
kevwhitt-hee Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...ontrollers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down
9 changes: 8 additions & 1 deletion DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down
11 changes: 7 additions & 4 deletions ...s.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/TableauCompetencyDashboard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
}

Loading