Merge pull request #544 from TechnologyEnhancedLearning/RC

Merge LH Scorpius changes to master

Author: AnjuJose011

.github/workflows/continuous-integration-workflow.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Use Node 12.19 with Yarn
         uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '18'
           npm: '6.14.8'
 
       - name: Typescript install WebUI

AdminUI/LearningHub.Nhs.AdminUI/Configuration/WebSettings.cs

@@ -77,6 +77,16 @@ public class WebSettings
         /// </summary>
         public string AzureFileStorageConnectionString { get; set; }
 
+        /// <summary>
+        /// Gets or sets the AzureSourceFileStorageConnectionString.
+        /// </summary>
+        public string AzureSourceArchiveStorageConnectionString { get; set; }
+
+        /// <summary>
+        /// Gets or sets the AzurePurgedFileStorageConnectionString.
+        /// </summary>
+        public string AzureContentArchiveStorageConnectionString { get; set; }
+
         /// <summary>
         /// Gets or sets the azure file storage resource share name.
         /// </summary>

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

@@ -54,20 +54,27 @@ public class ResourceController : BaseController
         /// </summary>
         private IResourceService resourceService;
 
+        /// <summary>
+        /// Defines the _fileService.
+        /// </summary>
+        private IFileService fileService;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ResourceController"/> class.
         /// </summary>
         /// <param name="hostingEnvironment">The hostingEnvironment<see cref="IWebHostEnvironment"/>.</param>
         /// <param name="config">The config<see cref="IOptions{WebSettings}"/>.</param>
         /// <param name="logger">The logger<see cref="ILogger{HomeController}"/>.</param>
         /// <param name="resourceService">The resourceService<see cref="IResourceService"/>.</param>
+        /// <param name="fileService">The fileService<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,
+            IFileService fileService,
             IOptions<WebSettings> websettings,
             IFeatureManager featureManager)
         : base(hostingEnvironment)
@@ -76,6 +83,7 @@ public ResourceController(
             this.websettings = websettings;
             this.config = config.Value;
             this.resourceService = resourceService;
+            this.fileService = fileService;
             this.featureManager = featureManager;
         }
 
@@ -298,11 +306,17 @@ public async Task<IActionResult> TransferResourceOwnership(int resourceId, strin
         [HttpPost]
         public async Task<IActionResult> Unpublish(int resourceVersionId, string details)
         {
+            var associatedFile = await this.resourceService.GetResourceVersionExtendedViewModelAsync(resourceVersionId);
             var vr = await this.resourceService.UnpublishResourceVersionAsync(resourceVersionId, details);
             await this.resourceService.CreateResourceVersionEvent(resourceVersionId, Nhs.Models.Enums.ResourceVersionEventTypeEnum.UnpublishedByAdmin, "Unpublish using Admin UI", 0);
 
             if (vr.IsValid)
             {
+                if (associatedFile.ScormDetails != null || associatedFile.HtmlDetails != null)
+                {
+                    _ = Task.Run(async () => { await this.fileService.PurgeResourceFile(associatedFile, null); });
+                }
+
                 return this.Json(new
                 {
                     success = true,

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

@@ -116,6 +116,12 @@ public static string GetResourceTypeVerb(this MyLearningDetailedItemViewModel my
                     return "Played " + GetDurationText(myLearningDetailedItemViewModel.ActivityDurationSeconds * 1000);
                 case ResourceTypeEnum.WebLink:
                     return "Visited";
+                case ResourceTypeEnum.Html:
+                    return "Viewed";
+                case ResourceTypeEnum.Case:
+                    return "Accessed";
+                case ResourceTypeEnum.Assessment:
+                    return "Accessed";
                 default:
                     return string.Empty;
             }

AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IFileService.cs

@@ -1,38 +1,48 @@
 namespace LearningHub.Nhs.AdminUI.Interfaces
 {
-  using System.IO;
-  using System.Threading.Tasks;
-  using Azure.Storage.Files.Shares.Models;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Threading.Tasks;
+    using Azure.Storage.Files.Shares.Models;
+    using LearningHub.Nhs.Models.Resource;
 
-  /// <summary>
-  /// Defines the <see cref="IFileService" />.
-  /// </summary>
-  public interface IFileService
-  {
     /// <summary>
-    /// The DeleteChunkDirectory.
+    /// Defines the <see cref="IFileService" />.
     /// </summary>
-    /// <param name="directoryRef">Directory ref.</param>
-    /// <param name="chunks">Chunks.</param>
-    /// <returns>A <see cref="Task"/> representing the result of the asynchronous operation.</returns>
-    Task DeleteChunkDirectory(string directoryRef, int chunks);
+    public interface IFileService
+    {
+        /// <summary>
+        /// The DeleteChunkDirectory.
+        /// </summary>
+        /// <param name="directoryRef">Directory ref.</param>
+        /// <param name="chunks">Chunks.</param>
+        /// <returns>A <see cref="Task"/> representing the result of the asynchronous operation.</returns>
+        Task DeleteChunkDirectory(string directoryRef, int chunks);
 
-    /// <summary>
-    /// The DownloadFileAsync.
-    /// </summary>
-    /// <param name="filePath">File path.</param>
-    /// <param name="fileName">File name.</param>
-    /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-    Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName);
+        /// <summary>
+        /// The DownloadFileAsync.
+        /// </summary>
+        /// <param name="filePath">File path.</param>
+        /// <param name="fileName">File name.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<ShareFileDownloadInfo> DownloadFileAsync(string filePath, string fileName);
 
-    /// <summary>
-    /// The ProcessFile.
-    /// </summary>
-    /// <param name="fileBytes">The fileBytes<see cref="Stream"/>.</param>
-    /// <param name="fileName">The fileName<see cref="string"/>.</param>
-    /// <param name="directoryRef">The directoryRef<see cref="string"/>.</param>
-    /// <param name="originalFileName">The originalFileName<see cref="string"/>.</param>
-    /// <returns>The <see cref="string"/>.</returns>
-    Task<string> ProcessFile(Stream fileBytes, string fileName, string directoryRef = "", string originalFileName = null);
-  }
+        /// <summary>
+        /// The ProcessFile.
+        /// </summary>
+        /// <param name="fileBytes">The fileBytes<see cref="Stream"/>.</param>
+        /// <param name="fileName">The fileName<see cref="string"/>.</param>
+        /// <param name="directoryRef">The directoryRef<see cref="string"/>.</param>
+        /// <param name="originalFileName">The originalFileName<see cref="string"/>.</param>
+        /// <returns>The <see cref="string"/>.</returns>
+        Task<string> ProcessFile(Stream fileBytes, string fileName, string directoryRef = "", string originalFileName = null);
+
+        /// <summary>
+        /// The PurgeResourceFile.
+        /// </summary>
+        /// <param name="vm">The vm.<see cref="ResourceVersionExtendedViewModel"/>.</param>
+        /// <param name="filePaths">.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task PurgeResourceFile(ResourceVersionExtendedViewModel vm = null, List<string> filePaths = null);
+    }
 }

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

@@ -89,7 +89,7 @@
     <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.31" />
+    <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <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" />

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/ckeditorwithhint.vue

@@ -23,7 +23,10 @@
         },
         data() {
             return {
-                editorConfig: { toolbar: CKEditorToolbar.default },
+                editorConfig: {
+                    toolbar: CKEditorToolbar.default,
+                    versionCheck: false
+                },
                 description: this.initialValue,
                 hint: `You have ${this.maxLength} characters remaining`,
                 valid: getRemainingCharactersFromHtml(this.maxLength, this.initialValue) >= 0,

AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue

@@ -169,7 +169,10 @@ export default Vue.extend({
             isReady: false,
             EditModeEnum: EditModeEnum,
             HierarchyEditStatusEnum: HierarchyEditStatusEnum,
-            editorConfig: { toolbar: CKEditorToolbar.default },
+            editorConfig: {
+                toolbar: CKEditorToolbar.default,
+                versionCheck: false
+            },
             deleteFolderName: '',
             editFolderStructureButtonText: '',
             editFolderStructureButtonDisabled: true,

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

@@ -257,6 +257,7 @@
                 SectionLayoutType: SectionLayoutType,
                 editorConfig: {
                     toolbar: CKEditorToolbar.landingPages,
+                    versionCheck: false,
                     stylesSet: 'landing-pages-image-text'
                 },
 

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

@@ -263,6 +263,7 @@ Vue.use(Vuelidate as any);
                 SectionLayoutType: SectionLayoutType,
                 editorConfig: {
                     toolbar: CKEditorToolbar.landingPages,
+                    versionCheck: false,
                     stylesSet: 'landing-pages-video-text'
                 },