Merge pull request #1073 from TechnologyEnhancedLearning/RC

Merge  RC changes  to master

Author: AnjuJose011

.gitignore

@@ -52,3 +52,4 @@ obj
 /OpenAPI/LearningHub.Nhs.OpenApi/web.config
 /AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj.user
 /WebAPI/LearningHub.Nhs.API/LearningHub.Nhs.Api.csproj.user
+/ReportAPI/LearningHub.Nhs.ReportApi/web.config

AdminUI/LearningHub.Nhs.AdminUI/LearningHub.Nhs.AdminUI.csproj

@@ -89,7 +89,7 @@
 		<PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 		<PackageReference Include="IdentityModel" Version="4.6.0" />
 		<PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.47" />
+		<PackageReference Include="LearningHub.Nhs.Models" Version="3.0.48" />
 		<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.36" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.36" />

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/mkiomediaplayer.ts

@@ -22,6 +22,7 @@ interface PlayerConfig {
 }
 
 interface SourceConfig {
+    enableLowLatency: boolean; 
     hls: string;
     drm: {
         clearkey: ClearKeyConfig;
@@ -57,6 +58,7 @@ function getSourceConfig(
     authenticationToken: string
 ): SourceConfig {
     return {
+        enableLowLatency: true,
         hls: locatorUri,
         drm: {
             clearkey: {
@@ -81,6 +83,7 @@ function initializePlayer(videoContainer: HTMLElement, playerConfig: MKPlayerCon
     };
 
     const sourceConfig: SourceConfig = {
+        enableLowLatency: true,
         hls: playBackUrl,
         drm: {
             clearkey: clearKeyConfig

AdminUI/LearningHub.Nhs.AdminUI/Services/MKIOMediaService.cs

@@ -91,19 +91,21 @@ public async Task<string> CreateMediaInputAsset(IFormFile file)
         /// <returns>.</returns>
         public async Task<BlobDownloadResult> DownloadMediaInputAsset(string inputAssetName, string fileName)
         {
-            IAzureMediaServicesClient client = await this.CreateMediaServicesClientAsync();
+            var client = this.GetMKIOServicesClientAsync();
+            var assets = client.Assets.Get(inputAssetName);
+
+            BlobServiceClient blobServiceClient = new BlobServiceClient(this.settings.MediaKindSettings.MediaKindStorageConnectionString);
 
-            AssetContainerSas assetContainerSas = await client.Assets.ListContainerSasAsync(
-                this.settings.AzureMediaResourceGroup,
-                this.settings.AzureMediaAccountName,
-                inputAssetName,
-                permissions: AssetContainerPermission.Read,
-                expiryTime: DateTime.UtcNow.AddHours(1).ToUniversalTime());
+            BlobContainerClient containerClient = blobServiceClient.GetBlobContainerClient(assets.Properties.Container);
+            if (!await containerClient.ExistsAsync().ConfigureAwait(false))
+            {
+                await containerClient.CreateIfNotExistsAsync().ConfigureAwait(false);
+            }
 
-            string sasUri = assetContainerSas.AssetContainerSasUrls.First();
+            var filename1 = Regex.Replace(fileName, "[^a-zA-Z0-9.]", string.Empty);
+            filename1 = string.IsNullOrEmpty(filename1) ? "file.txt" : filename1;
 
-            var blobServiceClient = new BlobContainerClient(new Uri(sasUri));
-            var blobClient = blobServiceClient.GetBlockBlobClient(fileName);
+            BlobClient blobClient = containerClient.GetBlobClient(filename1);
             var fileContent = await blobClient.DownloadContentAsync();
 
             return fileContent;

LearningHub.Nhs.WebUI.AutomatedUiTests/AccessibilityTests/AccessibilityTestsBase.cs

@@ -0,0 +1,60 @@
+namespace LearningHub.Nhs.WebUI.AutomatedUiTests.AccessibilityTests
+{
+    using FluentAssertions;
+    using LearningHub.Nhs.WebUI.AutomatedUiTests.TestFixtures;
+    using LearningHub.Nhs.WebUI.Startup;
+    using OpenQA.Selenium;
+    using Selenium.Axe;
+    using Xunit;
+
+    /// <summary>
+    /// Accessibility Tests Base.
+    /// </summary>
+    [Collection("Selenium test collection")]
+    public class AccessibilityTestsBase
+    {
+        /// <summary>
+        /// Gets the base URL for the tests.
+        /// </summary>
+        internal readonly string BaseUrl;
+
+        /// <summary>
+        /// Gets the WebDriver used for the tests.
+        /// </summary>
+        internal readonly IWebDriver Driver;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AccessibilityTestsBase"/> class.
+        /// </summary>
+        /// <param name="fixture">fixture.</param>
+        public AccessibilityTestsBase(AccessibilityTestsFixture fixture)
+        {
+            this.BaseUrl = fixture.BaseUrl;
+            this.Driver = fixture.Driver;
+        }
+
+        /// <summary>
+        /// Analyze Page Heading And Accessibility.
+        /// </summary>
+        /// <param name="pageTitle">Page Title.</param>
+        public void AnalyzePageHeadingAndAccessibility(string pageTitle)
+        {
+            this.ValidatePageHeading(pageTitle);
+
+            // then
+            // Exclude conditional radios, see: https://github.com/alphagov/govuk-frontend/issues/979#issuecomment-872300557
+            var axeResult = new AxeBuilder(this.Driver).Exclude("div.nhsuk-radios--conditional div.nhsuk-radios__item input.nhsuk-radios__input").Analyze();
+            axeResult.Violations.Where(v => !v.Tags.Contains("best-practice")).Should().BeEmpty();
+        }
+
+        /// <summary>
+        /// ValidatePageHeading.
+        /// </summary>
+        /// <param name="pageTitle">Page Title.</param>
+        public void ValidatePageHeading(string pageTitle)
+        {
+            var h1Element = this.Driver.FindElement(By.TagName("h1"));
+            h1Element.Text.Should().BeEquivalentTo(pageTitle);
+        }
+    }
+}

LearningHub.Nhs.WebUI.AutomatedUiTests/AccessibilityTests/BasicAccessibilityTests.cs

@@ -0,0 +1,54 @@
+namespace LearningHub.Nhs.WebUI.AutomatedUiTests.AccessibilityTests
+{
+    using FluentAssertions;
+    using LearningHub.Nhs.WebUI.AutomatedUiTests.TestFixtures;
+    using Selenium.Axe;
+    using Xunit;
+
+    /// <summary>
+    /// BasicAccessibilityTests.
+    /// </summary>
+    public class BasicAccessibilityTests : AccessibilityTestsBase, IClassFixture<AccessibilityTestsFixture>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BasicAccessibilityTests"/> class.
+        /// BasicAccessibilityTests.
+        /// </summary>
+        /// <param name="fixture">fixture.</param>
+        public BasicAccessibilityTests(AccessibilityTestsFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        /// <summary>
+        /// PageHasNoAccessibilityErrors.
+        /// </summary>
+        /// <param name="url">url to the page.</param>
+        /// <param name="pageTitle">title of the page.</param>
+        [Theory]
+        [InlineData("/forgotten-password", "Forgotten your username or password")]
+        [InlineData("/Login", "Access your Learning Hub account")]
+        [InlineData("/Home/Contactus", "Contact us")]
+        [InlineData("/Home/Aboutus", "About us")]
+        [InlineData("/Updates", "Service updates and releases")]
+        [InlineData("/Policies", "Our policies")]
+        [InlineData("/Home/Accessibility", "Accessibility Statement for the NHS England Learning Hub")]
+        [InlineData("/Home/NHSsites", "NHS sites")]
+        [InlineData("/policies/terms-and-conditions", "NHS England Learning Hub Terms and Conditions of Use (‘Terms’)")]
+        [InlineData("/policies/content-policy", "NHS England Learning Hub Content Policy")]
+        [InlineData("/policies/privacy-policy", "PRIVACY NOTICE")]
+        [InlineData("/policies/cookie-policy", "Cookie policy")]
+        [InlineData("/policies/acceptable-use-policy", "ACCEPTABLE USE POLICY")]
+
+        public void PageHasNoAccessibilityErrors(string url, string pageTitle)
+        {
+            // when
+            this.Driver.Navigate().GoToUrl(this.BaseUrl + url);
+
+            // then
+            this.AnalyzePageHeadingAndAccessibility(pageTitle);
+
+            ////this.Driver.Dispose();
+        }
+    }
+}

LearningHub.Nhs.WebUI.AutomatedUiTests/AccessibilityTests/BasicAuthenticatedAccessibilityTests.cs

@@ -0,0 +1,47 @@
+namespace LearningHub.Nhs.WebUI.AutomatedUiTests.AccessibilityTests
+{
+    using LearningHub.Nhs.WebUI.AutomatedUiTests.TestFixtures;
+    using LearningHub.Nhs.WebUI.AutomatedUiTests.TestHelpers;
+    using Microsoft.Azure.Management.Media.Models;
+    using OpenQA.Selenium;
+    using Xunit;
+
+    /// <summary>
+    /// BasicAuthenticatedAccessibilityTests.
+    /// </summary>
+    public class BasicAuthenticatedAccessibilityTests : AccessibilityTestsBase,
+        IClassFixture<AuthenticatedAccessibilityTestsFixture>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BasicAuthenticatedAccessibilityTests"/> class.
+        /// BasicAuthenticatedAccessibilityTests.
+        /// </summary>
+        /// <param name="fixture">fixture.</param>
+        public BasicAuthenticatedAccessibilityTests(AuthenticatedAccessibilityTestsFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        /// <summary>
+        /// Authenticated Page Has no Accessibility Errors.
+        /// </summary>
+        /// <param name="url">url.</param>
+        /// <param name="pageTitle">pageTitle.</param>
+        [Theory]
+        [InlineData("/myaccount", "My account details")]
+        [InlineData("/MyLearning", "My learning")]
+        [InlineData("/allcatalogue", "A-Z of catalogues")]
+        [InlineData("/allcataloguesearch?term=primary#searchTab", "Search results for primary")]
+        public void AuthenticatedPageHasNoAccessibilityErrors(string url, string pageTitle)
+        {
+            // when
+            this.Driver.Navigate().GoToUrl(this.BaseUrl + url);
+
+            // then
+            this.AnalyzePageHeadingAndAccessibility(pageTitle);
+
+            // Dispose driver
+            ////this.Driver.LogOutUser(this.BaseUrl);
+        }
+    }
+}

LearningHub.Nhs.WebUI.AutomatedUiTests/AccessibilityTests/BookmarksTests.cs

@@ -0,0 +1,100 @@
+namespace LearningHub.Nhs.WebUI.AutomatedUiTests.AccessibilityTests
+{
+    using FluentAssertions;
+    using LearningHub.Nhs.WebUI.AutomatedUiTests.TestFixtures;
+    using LearningHub.Nhs.WebUI.AutomatedUiTests.TestHelpers;
+    using Microsoft.AspNetCore.Components.Web;
+    using OpenQA.Selenium;
+    using Selenium.Axe;
+    using Xunit;
+
+    /// <summary>
+    /// Bookmarks Tests.
+    /// </summary>
+    public class BookmarksTests : AccessibilityTestsBase,
+        IClassFixture<AuthenticatedAccessibilityTestsFixture>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BookmarksTests"/> class.
+        /// </summary>
+        /// <param name="fixture">fixture.</param>
+        public BookmarksTests(AuthenticatedAccessibilityTestsFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        /// <summary>
+        /// BookmarksPageHasNoAccessibilityErrors.
+        /// </summary>
+        [Fact]
+        public void BookmarksPageHasNoAccessibilityErrors()
+        {
+            // given
+            const string resourceUrl = "/Resource/17844/Item";
+            const string resourceProdUrl = "/Resource/48180/Item";
+            const string addBookmarkPageUrl = "/bookmark/resource?bookmarked=False&title=Understanding%20and%20managing%20conflict%20in%20children%27s%20healthcare&rri=16593&returnUrl=%2FResource%2F16593%2FItem";
+            const string myBookmarksPage = "/bookmark";
+            const string bookmarkname = "Primary care clinicians";
+            IWebElement renameBookmarkElement = null;
+            IWebElement addBookmarkElement = null;
+            IWebElement moveBookmarkElement = null;
+            AxeResult addBookmarkPageResult = null;
+
+            // when
+            this.Driver.Navigate().GoToUrl(this.BaseUrl + resourceProdUrl);
+
+            var h1Element = this.Driver.FindElement(By.TagName("h1"));
+            if (h1Element.Text == "Unknown error" || h1Element.Text != bookmarkname)
+            {
+                this.Driver.Navigate().GoToUrl(this.BaseUrl + resourceUrl);
+            }
+
+            try
+            {
+                addBookmarkElement = this.Driver.FindElement(By.XPath("//a[contains(text(),'Add to  my bookmarks')]"));
+                if (addBookmarkElement.Displayed)
+                {
+                    this.Driver.ClickLinkContainingText("Add to  my bookmarks");
+                    this.ValidatePageHeading("Add bookmark");
+                    addBookmarkPageResult = new AxeBuilder(this.Driver).Exclude("div.nhsuk-radios--conditional div.nhsuk-radios__item input.nhsuk-radios__input").Analyze();
+                    this.Driver.ClickButtonByText("Continue");
+                }
+            }
+            catch (NoSuchElementException)
+            {
+                this.Driver.Navigate().GoToUrl(this.BaseUrl + addBookmarkPageUrl);
+                this.ValidatePageHeading("Add bookmark");
+                addBookmarkPageResult = new AxeBuilder(this.Driver).Exclude("div.nhsuk-radios--conditional div.nhsuk-radios__item input.nhsuk-radios__input").Analyze();
+                this.Driver.ClickLinkContainingText("Cancel");
+            }
+
+            this.Driver.Navigate().GoToUrl(this.BaseUrl + myBookmarksPage);
+            this.ValidatePageHeading("Bookmarked learning");
+            var myBookmarksPageResult = new AxeBuilder(this.Driver).Exclude("div.nhsuk-radios--conditional div.nhsuk-radios__item input.nhsuk-radios__input").Analyze();
+
+            this.Driver.ClickLinkContainingText("Add a folder");
+            this.ValidatePageHeading("Add a folder");
+            var addBookmarkFolderPageResult = new AxeBuilder(this.Driver).Exclude("div.nhsuk-radios--conditional div.nhsuk-radios__item input.nhsuk-radios__input").Analyze();
+            this.Driver.ClickLinkContainingText("Cancel");
+
+            renameBookmarkElement = this.Driver.FindElement(By.XPath($"//tr[td//span[contains(text(), '{bookmarkname}')]]//td//div//form//span//button[contains(text(), 'Rename')]"));
+            renameBookmarkElement.Click();
+            this.ValidatePageHeading("Rename bookmark");
+            var renameBookmarkPageResult = new AxeBuilder(this.Driver).Exclude("div.nhsuk-radios--conditional div.nhsuk-radios__item input.nhsuk-radios__input").Analyze();
+            this.Driver.ClickLinkContainingText("Cancel");
+
+            moveBookmarkElement = this.Driver.FindElement(By.XPath($"//tr[td//span[contains(text(), '{bookmarkname}')]]//td//div//form//span//button[contains(text(), 'Move')]"));
+            moveBookmarkElement.Click();
+            this.ValidatePageHeading("Move your bookmark");
+            var moveBookmarkPageResult = new AxeBuilder(this.Driver).Exclude("div.nhsuk-radios--conditional div.nhsuk-radios__item input.nhsuk-radios__input").Analyze();
+            this.Driver.ClickLinkContainingText("Cancel");
+
+            // then
+            addBookmarkPageResult.Violations.Where(v => !v.Tags.Contains("best-practice")).Should().BeEmpty();
+            myBookmarksPageResult.Violations.Where(v => !v.Tags.Contains("best-practice")).Should().BeEmpty();
+            addBookmarkFolderPageResult.Violations.Where(v => !v.Tags.Contains("best-practice")).Should().BeEmpty();
+            renameBookmarkPageResult.Violations.Where(v => !v.Tags.Contains("best-practice")).Should().BeEmpty();
+            moveBookmarkPageResult.Violations.Where(v => !v.Tags.Contains("best-practice")).Should().BeEmpty();
+        }
+    }
+}

LearningHub.Nhs.WebUI.AutomatedUiTests/AccessibilityTests/CatalogueFolderContentTests.cs

@@ -0,0 +1,46 @@
+namespace LearningHub.Nhs.WebUI.AutomatedUiTests.AccessibilityTests
+{
+    using FluentAssertions;
+    using LearningHub.Nhs.WebUI.AutomatedUiTests.TestFixtures;
+    using LearningHub.Nhs.WebUI.AutomatedUiTests.TestHelpers;
+    using Selenium.Axe;
+    using Xunit;
+
+    /// <summary>
+    /// Catalogue Folder Content Tests.
+    /// </summary>
+    public class CatalogueFolderContentTests : AccessibilityTestsBase,
+        IClassFixture<AuthenticatedAccessibilityTestsFixture>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CatalogueFolderContentTests"/> class.
+        /// </summary>
+        /// <param name="fixture">fixture.</param>
+        public CatalogueFolderContentTests(AuthenticatedAccessibilityTestsFixture fixture)
+            : base(fixture)
+        {
+        }
+
+        /// <summary>
+        /// DashboardPageHasNoAccessibilityErrors.
+        /// </summary>
+        [Fact]
+        public void CatalogueFolderContentPageHasNoAccessibilityErrors()
+        {
+            // given
+            const string catalogueUrl = "/catalogue/Neonatal-AHP";
+
+            // when
+            this.Driver.Navigate().GoToUrl(this.BaseUrl + catalogueUrl);
+            this.ValidatePageHeading("Enhanced Modules for Allied Health Professionals Working in Neonatal Care");
+            var cataloguePageResult = new AxeBuilder(this.Driver).Exclude("div.nhsuk-radios--conditional div.nhsuk-radios__item input.nhsuk-radios__input").Analyze();
+
+            ////this.Driver.ClickLinkContainingText("Manage this catalogue");
+            ////this.ValidatePageHeading("Catalogue Management");
+            ////var catalogueManagementPageResult = new AxeBuilder(this.Driver).Exclude("div.nhsuk-radios--conditional div.nhsuk-radios__item input.nhsuk-radios__input").Analyze();
+
+            // then
+            cataloguePageResult.Violations.Where(v => !v.Tags.Contains("best-practice")).Should().BeEmpty();
+        }
+    }
+}