Tweaks email attribute name and feature flags the dashboard link and page content.

Author: kevwhitt-hee

DigitalLearningSolutions.Web/Helpers/ExternalApis/TableauConnectionHelper.cs

@@ -42,7 +42,7 @@ public string GetTableauJwt(string email)
                 { "exp", new DateTimeOffset(DateTime.UtcNow.AddMinutes(5)).ToUnixTimeSeconds() },
                 { "sub", user },
                 { "scp", new[] { "tableau:views:embed" } },
-                { "Email", email}
+                { "ExernalUserEmail", new [] { email } }
         };
             var token = new JwtSecurityToken(header, payload);
             var tokenHandler = new JwtSecurityTokenHandler();

DigitalLearningSolutions.Web/Helpers/FeatureFlags.cs

@@ -14,5 +14,6 @@ public static class FeatureFlags
         public const string UserFeedbackBar = "UserFeedbackBar";
         public const string ShowSelfAssessmentProgressButtons = "ShowSelfAssessmentProgressButtons";
         public const string LoginWithLearningHub = "LoginWithLearningHub";
+        public const string TableauSelfAssessmentDashboards = "TableauSelfAssessmentDashboards";
     }
 }

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

@@ -1,5 +1,6 @@
 @using DigitalLearningSolutions.Web.Models.Enums
 @using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.Reports
+@using DigitalLearningSolutions.Web.Helpers
 @model SelfAssessmentReportsViewModel
 @{
     ViewData["Title"] = "Self assessment reports";
@@ -18,10 +19,12 @@
                 <span class="nhsuk-u-visually-hidden"> - </span>
             </span>@ViewData["Title"]
         </h1>
-        @if (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" />
-        }
+        <feature name="@(FeatureFlags.TableauSelfAssessmentDashboards)">
+            @if (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" />
+            }
+        </feature>
         <h2>Excel learner activity reports</h2>
         <p class="nhsuk-lede-text">Download Excel competency self assessments activity reports for your centre.</p>
         <ul>

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

@@ -1,4 +1,5 @@
-@{
+@using DigitalLearningSolutions.Web.Helpers
+@{
     var tableauServerUrl = ViewBag.TableauServerUrl;
     var workbookName = ViewBag.WorkbookName;
     var viewName = ViewBag.ViewName;
@@ -16,11 +17,17 @@
     </a>
 </div>
 <h1>@ViewData["Title"]</h1>
+<feature name="@(FeatureFlags.TableauSelfAssessmentDashboards)">
     <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>
     </tableau-viz>
-@section scripts {
-    @* We are not using Yarn/npm for the Tableau JS becaue of errors during installation relating to a missing dependency *@
-    <script type="module" src="@tableauServerUrl/javascripts/api/tableau.embedding.3.latest.min.js"></script>
-}
-
+    @section scripts {
+        @* We are not using Yarn/npm for the Tableau JS becaue of errors during installation relating to a missing dependency *@
+        <script type="module" src="@tableauServerUrl/javascripts/api/tableau.embedding.3.latest.min.js"></script>
+    }
+</feature>
+<feature name="@(FeatureFlags.TableauSelfAssessmentDashboards)" negate="true">
+    <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>

DigitalLearningSolutions.Web/appsettings.Production.json

@@ -22,7 +22,8 @@
     "UserFeedbackBar": true,
     "ExportQueryRowLimit": 250,
     "MaxBulkUploadRows": 200,
-    "LoginWithLearningHub": true
+    "LoginWithLearningHub": true,
+    "TableauSelfAssessmentDashboards": false
   },
   "LearningHubOpenAPIBaseUrl": "https://learninghubnhsuk-openapi-prod.azurewebsites.net",
   "LearningHubReportAPIConfig": {

DigitalLearningSolutions.Web/appsettings.json

@@ -17,7 +17,8 @@
     "UseSignposting": true,
     "PricingPage": true,
     "ShowSelfAssessmentProgressButtons": false,
-    "LoginWithLearningHub": true
+    "LoginWithLearningHub": true,
+    "TableauSelfAssessmentDashboards":  true
   },
   "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net",
   "LearningHubOpenAPIKey": "",