Reworks the embed view and fixes embed scope

kevwhitt-hee · kevwhitt-hee · commit face0f8e6e74 · 2024-09-18T11:04:39.000+01:00
diff --git a/DigitalLearningSolutions.Web/Helpers/ExternalApis/TableauConnectionHelper.cs b/DigitalLearningSolutions.Web/Helpers/ExternalApis/TableauConnectionHelper.cs
@@ -41,7 +41,7 @@ public string GetTableauJwt(string email)
                 { "aud", "tableau" },
                 { "exp", new DateTimeOffset(DateTime.UtcNow.AddMinutes(5)).ToUnixTimeSeconds() },
                 { "sub", user },
-                { "scp", new[] { "tableau:content:read" } },
+                { "scp", new[] { "tableau:views:embed" } },
                 { "users.primaryemail", email}
         };
             var token = new JwtSecurityToken(header, payload);
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/TableauCompetencyDashboard.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/TableauCompetencyDashboard.cshtml
@@ -4,19 +4,14 @@
     var viewName = ViewBag.ViewName;
     var jwtToken = ViewBag.JwtToken;
     var siteName = ViewBag.SiteName;
+    var srcUrl = $"{tableauServerUrl}/t/{siteName}/views/{workbookName}/{viewName}";
 }
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Tableau Embedded View</title>
+<h1>Supervised competency self assessments dashboard report</h1>
+    <tableau-viz id='tableau-viz'
+                 src='@srcUrl' token='@jwtToken' toolbar='bottom'>
+    </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>
-</head>
-<body>
-   <tableau-viz id="tableauViz"
-                 src="@tableauServerUrl/#/site/@siteName/views/@workbookName/@viewName" token="@jwtToken">
-    </tableau-viz>
-</body>
-</html>
+}
+
