Merge RC to Scopripus

.github/azure-pipeline-database-ci.yml

@@ -1,7 +1,13 @@
 trigger:
   branches:
-    include: 
-      - CI
+    exclude:
+      - '*'
+
+pr:
+  branches:
+    exclude:
+      - '*'
+
 resources:
   repositories:
   - repository: self
@@ -12,6 +18,7 @@ jobs:
   displayName: Agent job
   pool:
     vmImage: windows-2019
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/CI'))
   steps:
   - checkout: self
     clean: true

.github/azure-pipeline-openapi-reportapi-ci.yml

@@ -8,12 +8,14 @@ trigger:
   branches:
     include: 
       - CI
+    exclude:
+      - '*'
 name: $(date:yyyyMMdd)$(rev:.r)
 resources:
   repositories:
   - repository: self
     type: git
-    ref: refs/heads/RC
+    ref: refs/heads/CI
 jobs:
 - job: Job_1
   displayName: Agent job

.github/azure-pipeline-webui-ci.yml

@@ -4,10 +4,7 @@ variables:
   value: '**/*.csproj'
 - name: BuildParameters.TestProjects
   value: '**/*[Tt]ests/*.csproj'
-trigger:
-  branches:
-    include: 
-      - CI
+# Triggered Via Azure pipeline
 name: $(date:yyyyMMdd)$(rev:.r)
 resources:
   repositories:

AdminUI/LearningHub.Nhs.AdminUI/Controllers/ResourceController.cs

@@ -6,6 +6,7 @@
     using System.Threading.Tasks;
     using LearningHub.Nhs.AdminUI.Configuration;
     using LearningHub.Nhs.AdminUI.Extensions;
+    using LearningHub.Nhs.AdminUI.Helpers;
     using LearningHub.Nhs.AdminUI.Interfaces;
     using LearningHub.Nhs.AdminUI.Models;
     using LearningHub.Nhs.Models.Common;
@@ -16,6 +17,7 @@
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
+    using Microsoft.FeatureManagement;
 
     /// <summary>
     /// Defines the <see cref="ResourceController" />.
@@ -32,6 +34,11 @@ public class ResourceController : BaseController
         /// </summary>
         private readonly IOptions<WebSettings> websettings;
 
+        /// <summary>
+        /// Defines the featureManager.
+        /// </summary>
+        private readonly IFeatureManager featureManager;
+
         /// <summary>
         /// Defines the _logger.
         /// </summary>
@@ -55,18 +62,21 @@ public class ResourceController : BaseController
         /// <param name="logger">The logger<see cref="ILogger{HomeController}"/>.</param>
         /// <param name="resourceService">The resourceService<see cref="IResourceService"/>.</param>
         /// /// <param name="websettings">The websettings<see cref="IOptions{WebSettings}"/>.</param>
+        /// <param name="featureManager">The featureManager<see cref="IFeatureManager"/>.</param>
         public ResourceController(
             IWebHostEnvironment hostingEnvironment,
             IOptions<WebSettings> config,
             ILogger<HomeController> logger,
             IResourceService resourceService,
-            IOptions<WebSettings> websettings)
+            IOptions<WebSettings> websettings,
+            IFeatureManager featureManager)
         : base(hostingEnvironment)
         {
             this.logger = logger;
             this.websettings = websettings;
             this.config = config.Value;
             this.resourceService = resourceService;
+            this.featureManager = featureManager;
         }
 
         /// <summary>
@@ -309,6 +319,33 @@ public async Task<IActionResult> Unpublish(int resourceVersionId, string details
             }
         }
 
+        /// <summary>
+        /// The GetAVUnavailableView.
+        /// </summary>
+        /// <returns> partial view.  </returns>
+        [Route("Resource/GetAVUnavailableView")]
+        [HttpGet("GetAVUnavailableView")]
+        public IActionResult GetAVUnavailableView()
+        {
+            return this.PartialView("_AudioVideoUnavailable");
+        }
+
+        /// <summary>
+        /// The GetAddAVFlag.
+        /// </summary>
+        /// <returns> Return AV Flag.</returns>
+        [Route("Resource/GetAddAVFlag")]
+        [HttpGet("GetAddAVFlag")]
+        public bool GetAddAVFlag() => this.featureManager.IsEnabledAsync(FeatureFlags.AddAudioVideo).Result;
+
+        /// <summary>
+        /// The GetDisplayAVFlag.
+        /// </summary>
+        /// <returns> Return display AV flag.</returns>
+        [Route("Resource/GetDisplayAVFlag")]
+        [HttpGet("GetDisplayAVFlag")]
+        public bool GetDisplayAVFlag() => this.featureManager.IsEnabledAsync(FeatureFlags.DisplayAudioVideo).Result;
+
         private static List<PagingOptionPair> FilterOptions()
         {
             List<PagingOptionPair> options = new List<PagingOptionPair>();

AdminUI/LearningHub.Nhs.AdminUI/Helpers/FeatureFlags.cs

@@ -0,0 +1,18 @@
+namespace LearningHub.Nhs.AdminUI.Helpers
+{
+    /// <summary>
+    /// <see cref="FeatureFlags"/>.
+    /// </summary>
+    public static class FeatureFlags
+    {
+        /// <summary>
+        /// The AddAudioVideo.
+        /// </summary>
+        public const string AddAudioVideo = "AddAudioVideo";
+
+        /// <summary>
+        /// The DisplayAudioVideo.
+        /// </summary>
+        public const string DisplayAudioVideo = "DisplayAudioVideo";
+    }
+}

AdminUI/LearningHub.Nhs.AdminUI/Helpers/LearningActivityHelper.cs

@@ -128,7 +128,7 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
         /// <returns>The .</returns>
         public static string GetActivityStatusDisplayText(this MyLearningDetailedItemViewModel myLearningDetailedItemViewModel)
         {
-            if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched
+            if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
                      && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article
                          || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink
                          || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image
@@ -137,7 +137,7 @@ public static string GetActivityStatusDisplayText(this MyLearningDetailedItemVie
             {
                 return "Completed";
             }
-            else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched
+            else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
                 && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile))
             {
                 return "Downloaded";
@@ -164,36 +164,33 @@ public static string GetActivityStatusDisplayText(this MyLearningDetailedItemVie
         /// </summary>
         /// <param name="myLearningDetailedItemViewModel">The myLearningDetailedItemViewModel.</param>
         /// <returns>The <see cref="ActivityStatusEnum"/>.</returns>
-        public static ActivityStatusEnum GetActivityStatus(this MyLearningDetailedItemViewModel myLearningDetailedItemViewModel)
+        public static string GetActivityStatus(this MyLearningDetailedItemViewModel myLearningDetailedItemViewModel)
         {
-            if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched
+            if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
                 && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Article
-                    || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink
                     || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Image
                     || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Html
                     || myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Case))
             {
-                return ActivityStatusEnum.Completed;
+                return "Viewed";
             }
-            else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Launched
-                && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile))
+            else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
+               && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.WebLink))
             {
-                return ActivityStatusEnum.Downloaded;
+                return "Launched";
             }
-            else if (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.Assessment)
+            else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Completed
+                      && (myLearningDetailedItemViewModel.ResourceType == ResourceTypeEnum.GenericFile))
             {
-                if (myLearningDetailedItemViewModel.Complete)
-                {
-                    return myLearningDetailedItemViewModel.ScorePercentage >= myLearningDetailedItemViewModel.AssessmentDetails.PassMark ? ActivityStatusEnum.Passed : ActivityStatusEnum.Failed;
-                }
-                else
-                {
-                    return myLearningDetailedItemViewModel.ScorePercentage >= myLearningDetailedItemViewModel.AssessmentDetails.PassMark ? ActivityStatusEnum.Passed : ActivityStatusEnum.InProgress;
-                }
+                return ActivityStatusEnum.Downloaded.ToString();
+            }
+            else if (myLearningDetailedItemViewModel.ActivityStatus == ActivityStatusEnum.Incomplete)
+            {
+                return ActivityStatusEnum.InProgress.ToString();
             }
             else
             {
-                return myLearningDetailedItemViewModel.ActivityStatus;
+                return myLearningDetailedItemViewModel.ActivityStatus.ToString();
             }
         }
 

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

@@ -89,11 +89,13 @@
     <PackageReference Include="HtmlSanitizer" Version="6.0.453" />
 	<PackageReference Include="IdentityModel" Version="4.4.0" />
     <PackageReference Include="LearningHub.Nhs.Caching" Version="2.0.2" />
-    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.29" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.31" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Media" Version="5.0.0" />
+    <PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
+    <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.2.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.9" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.14.1" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/cmsPageRow.vue

@@ -18,7 +18,7 @@
                         <div v-html="getDescription" />
                     </div>
                     <div class="information-page__asset-container">
-                        <div id="mediaContainer" :class="[`${disableVideoControl ? 'videoControlDisabled' : ''}`]" v-show="sectionTemplateType === SectionTemplateType.Video" class="w-100">
+                        <div id="mediaContainer" :class="[`${disableVideoControl ? 'videoControlDisabled' : ''}`]" v-show="sectionTemplateType === SectionTemplateType.Video && displayAVFlag" class="w-100">
                             <video controls v-show="section.id" :id="[`azureMediaPlayer${section.id}`]"
                                    data-setup='{"logo": { "enabled": false }, "techOrder": ["azureHtml5JS", "flashSS",  "silverlightSS", "html5"], "nativeControlsForTouch": false, "fluid": true}'
                                    class="azuremediaplayer amp-default-skin amp-big-play-centered" style="height:250px;">
@@ -33,6 +33,9 @@
                             </div>
                         </div>
                     </div>
+                    <div v-if="!displayAVFlag">
+                        <div v-html="audioVideoUnavailableView"></div>
+                    </div>
                 </div>
                 <div v-if="sectionTemplateType === SectionTemplateType.Image && section.imageAsset" class="nhsuk-grid-column-full">
                     <div :class="[`information-page__container ${section.sectionLayoutType == SectionLayoutType.Left ? 'information-page__container--reverse-child-order' : '' } ${section.hasBorder ? 'information-page__container--border' : '' }`]">
@@ -78,10 +81,14 @@
                 SectionTemplateType: SectionTemplateType,
                 pageSectionDetail: null as PageSectionDetailModel,
                 disableVideoControl: false,
+                displayAVFlag: false,
+                audioVideoUnavailableView : '' as string,
             };
         },
         created() {
             this.load();
+            this.getDisplayAVFlag();
+            this.getAudioVideoUnavailableView();
         },
         computed: {
             getStyle() {
@@ -125,7 +132,7 @@
                         returnClass = "information-page__text-container--no-padding-right";
                     }
                 }
-                return returnClass;                
+                return returnClass;
             },
             getDescription() {
                 if (this.section.description) {
@@ -138,50 +145,60 @@
             },
             isRightSectionLayout() {
                 return this.section.sectionLayoutType == SectionLayoutType.Right;
-            }
+            },            
         },
         methods: {
+            getDisplayAVFlag() {
+                contentData.getDisplayAVFlag().then(response => {
+                this.displayAVFlag = response;
+               });
+            },
+            getAudioVideoUnavailableView() {
+                contentData.getAVUnavailableView().then(response => {
+                this.audioVideoUnavailableView =  response;
+                });
+            },
             load() {
                 if (this.sectionTemplateType === SectionTemplateType.Video) {
-                contentData.getPageSectionDetailVideo(this.section.id).then(response => {
-                    this.pageSectionDetail = response;
+                    contentData.getPageSectionDetailVideo(this.section.id).then(response => {
+                        this.pageSectionDetail = response;
 
-                    if (!this.pageSectionDetail.videoAsset)
-                        return;
+                        if (!this.pageSectionDetail.videoAsset)
+                            return;
 
-                    const id = 'azureMediaPlayer' + this.pageSectionDetail.id;
-                    let azureMediaPlayer = amp(id);
+                        const id = 'azureMediaPlayer' + this.pageSectionDetail.id;
+                        let azureMediaPlayer = amp(id);
 
-                    if (this.pageSectionDetail.videoAsset.azureMediaAsset) {
-                        $(`#${id}`).css({ 'height': '', 'border': '1px solid #768692' });
-                        this.disableVideoControl = false;
-                    } else {
-                        this.disableVideoControl = true;
-                    }
+                        if (this.pageSectionDetail.videoAsset.azureMediaAsset) {
+                            $(`#${id}`).css({ 'height': '', 'border': '1px solid #768692' });
+                            this.disableVideoControl = false;
+                        } else {
+                            this.disableVideoControl = true;
+                        }
 
-                    if (this.pageSectionDetail.videoAsset.thumbnailImageFile) {
-                        azureMediaPlayer.poster(`/file/download/${this.pageSectionDetail.videoAsset.thumbnailImageFile.filePath}/${this.pageSectionDetail.videoAsset.thumbnailImageFile.fileName}`);
-                    }
-                    if (this.pageSectionDetail.videoAsset.azureMediaAsset && this.pageSectionDetail.videoAsset.closedCaptionsFile) {
-                        azureMediaPlayer.src([{
-                            type: "application/vnd.ms-sstr+xml",
-                            src: this.pageSectionDetail.videoAsset.azureMediaAsset.locatorUri,
-                            protectionInfo: [{ type: 'AES', authenticationToken: `Bearer=${this.pageSectionDetail.videoAsset.azureMediaAsset.authenticationToken}` }]
-                        }],
-                            [{ kind: "captions", src: `/file/download/${this.pageSectionDetail.videoAsset.closedCaptionsFile.filePath}/${this.pageSectionDetail.videoAsset.closedCaptionsFile.fileName}`, srclang: "en", label: "english" }]);
-                    }
-                    else if (this.pageSectionDetail.videoAsset.azureMediaAsset && !this.pageSectionDetail.videoAsset.closedCaptionsFile) {
-                        azureMediaPlayer.src([{
-                            type: "application/vnd.ms-sstr+xml",
-                            src: this.pageSectionDetail.videoAsset.azureMediaAsset.locatorUri,
-                            protectionInfo: [{ type: 'AES', authenticationToken: `Bearer=${this.pageSectionDetail.videoAsset.azureMediaAsset.authenticationToken}` }]
-                        }]);
-                    }
-                });
-            } else {
-                contentData.getPageSectionDetail(this.section.id).then(x => this.pageSectionDetail = x);
-            }
-            },
+                        if (this.pageSectionDetail.videoAsset.thumbnailImageFile) {
+                            azureMediaPlayer.poster(`/file/download/${this.pageSectionDetail.videoAsset.thumbnailImageFile.filePath}/${this.pageSectionDetail.videoAsset.thumbnailImageFile.fileName}`);
+                        }
+                        if (this.pageSectionDetail.videoAsset.azureMediaAsset && this.pageSectionDetail.videoAsset.closedCaptionsFile) {
+                            azureMediaPlayer.src([{
+                                type: "application/vnd.ms-sstr+xml",
+                                src: this.pageSectionDetail.videoAsset.azureMediaAsset.locatorUri,
+                                protectionInfo: [{ type: 'AES', authenticationToken: `Bearer=${this.pageSectionDetail.videoAsset.azureMediaAsset.authenticationToken}` }]
+                            }],
+                                [{ kind: "captions", src: `/file/download/${this.pageSectionDetail.videoAsset.closedCaptionsFile.filePath}/${this.pageSectionDetail.videoAsset.closedCaptionsFile.fileName}`, srclang: "en", label: "english" }]);
+                        }
+                        else if (this.pageSectionDetail.videoAsset.azureMediaAsset && !this.pageSectionDetail.videoAsset.closedCaptionsFile) {
+                            azureMediaPlayer.src([{
+                                type: "application/vnd.ms-sstr+xml",
+                                src: this.pageSectionDetail.videoAsset.azureMediaAsset.locatorUri,
+                                protectionInfo: [{ type: 'AES', authenticationToken: `Bearer=${this.pageSectionDetail.videoAsset.azureMediaAsset.authenticationToken}` }]
+                            }]);
+                        }
+                    });
+                } else {
+                    contentData.getPageSectionDetail(this.section.id).then(x => this.pageSectionDetail = x);
+                }
+            },           
             getAESProtection(token: string): string {
                 var aesProtectionInfo = '{"protectionInfo": [{"type": "AES", "authenticationToken":"Bearer=' + token + '"}], "streamingFormats":["SMOOTH","DASH"]}';
                 return aesProtectionInfo;
@@ -198,7 +215,7 @@
         },
         watch: {
             section() {
-                this.load();
+                this.load();               
             }
         }
     })