Merge pull request #1037 from TechnologyEnhancedLearning/MergeRc-EnglishIvy

Merge English Ivy changes to RC

Author: AnjuJose011

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/Controllers/AccountController.cs

@@ -581,7 +581,18 @@ public async Task<IActionResult> CreateAccountSearchRole(AccountCreationViewMode
         {
             var accountCreation = await this.multiPageFormService.GetMultiPageFormData<AccountCreationViewModel>(MultiPageFormDataFeature.AddRegistrationPrompt, this.TempData);
 
-            return this.View("CreateAccountSearchRole", new AccountCreationViewModel { CountryId = accountCreationViewModel.CountryId });
+            var currentJobRole = int.TryParse(accountCreation.CurrentRole, out int currentRole);
+            if (currentJobRole && currentRole > 0)
+            {
+                var filterText = await this.jobRoleService.GetByIdAsync(currentRole);
+                accountCreationViewModel.FilterText = filterText.Name;
+                var jobrole = await this.jobRoleService.GetByIdAsync(currentRole);
+                return this.View("CreateAccountCurrentRole", new AccountCreationListViewModel { RoleList = new List<JobRoleBasicViewModel> { jobrole }, AccountCreationPaging = new AccountCreationPagingModel { TotalItems = 1, PageSize = UserRegistrationContentPageSize, HasItems = jobrole != null, CurrentPage = 1 }, CurrentRole = accountCreation.CurrentRole, CountryId = accountCreation.CountryId, RegionId = accountCreation.RegionId, FilterText = accountCreationViewModel.FilterText, ReturnToConfirmation = accountCreationViewModel.ReturnToConfirmation });
+            }
+            else
+            {
+                return this.View("CreateAccountSearchRole", new AccountCreationViewModel { CountryId = accountCreationViewModel.CountryId });
+            }
         }
 
         /// <summary>

LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notification.vue

@@ -30,7 +30,7 @@
                                 <a href="#" @click="showNotification(notification)">{{ notification.title }}</a>
                             </td>
                             <td class="px-sm-3 py-sm-3">
-                                <div class="d-flex justify-content-between"
+                                <div class="d-flex justify-content-between" 
                                      v-for="item in notificationTypeContent(notification.notificationType)">
                                     {{ item.text }}&nbsp;
                                     <i :class="item.className"></i>
@@ -45,7 +45,7 @@
                             </td>
                             <td class="px-sm-3 py-sm-3">
                                 <div class="d-flex justify-content-between" v-if="notification.userDismissable">
-                                    <button data-target="#deleteModal" class="nhsuk-button" data-toggle="modal" @click="selectNotification(notification)">Delete</button>
+                                    <button data-target="#deleteModal" class="nhsuk-button nhsuk-u-margin-bottom-0" data-toggle="modal" @click="selectNotification(notification)">Delete</button>
                                 </div>
                             </td>
                         </tr>
@@ -74,7 +74,10 @@
                         <i :class="['fal fa-envelope' + (notification.readOnDate != null ? '-open text-success' : '')]">&nbsp;</i>
                         <a href="#" @click="showNotification(notification)">{{ notification.title }}</a>
                     </div>
-                    <button data-target="#deleteModalButton" class="nhsuk-button" data-toggle="modal" @click="deleteNotification()" aria-label="Delete" v-if="notification.userDismissable">Delete</button>
+                    
+                    <a href="#deleteModalButton" data-toggle="modal" @click="selectNotification(notification)" aria-label="Delete" v-if="notification.userDismissable">
+                        <i class="fas fa-ellipsis-h fa-lg" style="color: #435563;"></i>
+                    </a>
                 </div>
 
                 <paging v-bind="this.pagingModel" @loadPage="loadPage"></paging>
@@ -170,7 +173,7 @@
                         .catch(e => console.log(e));
                 }
             },
-            async deleteNotification() {
+            async deleteNotification() {  
                 await axios.delete(
                     '/api/notification/' + this.selectedNotification.notificationId + '?userNotificationId=' + this.selectedNotification.id)
                     .catch(e => console.log(e));

LearningHub.Nhs.WebUI/Scripts/vuesrc/notification/notifications.vue

@@ -86,7 +86,7 @@
                 <div class="modal-dialog modal-dialog-centered" role="document">
                     <div class="modal-content">
                         <div class="modal-header pr-0 pt-0">
-                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <button type="button" class="close" @click="closeConfirmation" aria-label="Close">
                                 <i class="fa-solid fa-xmark"></i>
                             </button>
                         </div>
@@ -97,7 +97,7 @@
                             </p>
                         </div>
                         <div class="modal-footer justify-content-center">
-                            <button type="button" class="nhsuk-button nhsuk-button--secondary mr-4" data-dismiss="modal">Cancel</button>
+                            <button type="button" class="nhsuk-button nhsuk-button--secondary mr-4" @click="closeConfirmation">Cancel</button>
                             <button type="button" class="nhsuk-button" @click="deleteNotification">Delete</button>
                         </div>
                     </div>
@@ -142,6 +142,13 @@
                 $('#deleteModalButton').modal('hide');
                 $('#deleteModal').modal();
             },
+            closeConfirmation() {
+                if (document.activeElement instanceof HTMLElement) {
+                    document.activeElement.blur();
+                }
+                document.body.focus();
+                setTimeout(() => { $('#deleteModal').modal('hide'); }, 10);
+            },
             showNotification(notification: NotificationModel) {
                 this.selectedNotification = notification;
                 this.showMessage = true;
@@ -154,7 +161,7 @@
             },
             async deleteNotification() {
                 await this.getSelectedComponent().deleteNotification();
-                $('#deleteModal').modal('hide');
+                this.closeConfirmation();
                 this.showMessage = false;
             },
             notificationTypeContent() {

LearningHub.Nhs.WebUI/Styles/nhsuk/pages/bookmark.scss

@@ -112,6 +112,23 @@ td.col-type {
 tr.bookmark-item:hover td {
     background-color: $nhsuk-white;
 }
+.my-bookmark-btn:focus {
+    outline: none;
+    text-decoration: none !important;
+    color: $nhsuk-black !important;
+    background-color: $nhsuk-yellow !important;
+    box-shadow: 0 -2px $govuk-focus-highlight-yellow, 0 4px $nhsuk-black;
+}
+
+.my-bookmark-btn:hover {
+    outline: none;
+    text-decoration: none !important;
+}
+
+.my-bookmark-btn {
+    transition: none !important;
+    border-radius: 0 !important;
+}
 
 @media (min-width: 768px) {
 

LearningHub.Nhs.WebUI/Views/Bookmark/_BookmarkAction.cshtml

@@ -6,7 +6,7 @@
         <span class="action-link-chevron @(Model.IsFirst? "empty" : "")">
             @if (Model.IsFirst == false)
             {
-                <button name="action" value="moveup" class="btn btn-link action-link" title="Move up" aria-label="Move up">
+                <button name="action" value="moveup" class="btn btn-link action-link my-bookmark-btn" title="Move up" aria-label="Move up">
                     <i class="fa-solid fa-chevron-up fa-sm"></i>
                 </button>
             }
@@ -15,25 +15,25 @@
         <span class="action-link-chevron @(Model.IsLast? "empty" : "")">
             @if (Model.IsLast == false)
             {
-                <button name="action" value="movedown" class="btn btn-link action-link" title="Move down" aria-label="Move down">
+                <button name="action" value="movedown" class="btn btn-link action-link my-bookmark-btn" title="Move down" aria-label="Move down">
                     <i class="fa-solid fa-chevron-down fa-sm"></i>
                 </button>
             }
         </span>
 
         <span class="action-link-rename">
-            <button name="action" value="rename" class="btn btn-link action-link" title="Rename">Rename</button>
+            <button name="action" value="rename" class="btn btn-link action-link my-bookmark-btn" title="Rename">Rename</button>
         </span>
 
         <span class="action-link-move">
             @if (Model.IsFolder == false)
             {
-                <button name="action" value="move" class="btn btn-link action-link" title="Move">Move</button>
+                <button name="action" value="move" class="btn btn-link action-link my-bookmark-btn" title="Move">Move</button>
             }
         </span>
 
         <span class="action-link-delete">
-            <button name="action" value="delete" class="btn btn-link action-link" title="Delete">Delete</button>
+            <button name="action" value="delete" class="btn btn-link action-link my-bookmark-btn" title="Delete">Delete</button>
         </span>
     </form>
 </div>

OpenAPI/LearningHub.Nhs.OpenApi.Models/Configuration/AzureBlobSettings.cs

@@ -0,0 +1,18 @@
+namespace LearningHub.Nhs.OpenApi.Models.Configuration
+{
+    /// <summary>
+    /// The AzureBlobSettings.
+    /// </summary>
+    public class AzureBlobSettings
+    {
+        /// <summary>
+        /// Gets or sets the connectionString.
+        /// </summary>
+        public string ConnectionString { get; set; } = null!;
+
+        /// <summary>
+        /// Gets or sets the catalogue collection id.
+        /// </summary>
+        public string UploadContainer { get; set; } = null!;
+    }
+}

OpenAPI/LearningHub.Nhs.OpenApi.Models/Configuration/AzureConfig.cs

@@ -0,0 +1,17 @@
+namespace LearningHub.Nhs.OpenApi.Models.Configuration
+{
+    /// <summary>
+    /// The AzureConfig.
+    /// </summary>
+    public class AzureConfig
+    {
+        /// <summary>
+        /// Gets or sets the azure blob settings.
+        /// </summary>
+        public AzureBlobSettings AzureBlobSettings { get; set; } = null!;
+        /// <summary>
+        /// Gets or sets the azure storage queue.
+        /// </summary>
+        public string AzureStorageQueueConnectionString { get; set; } = null!;
+    }
+}

OpenAPI/LearningHub.Nhs.OpenApi.Models/Configuration/FindwiseCollectionIdSettings.cs

@@ -14,5 +14,10 @@ public class FindwiseCollectionIdSettings
         /// Gets or sets the catalogue collection id.
         /// </summary>
         public string Catalogue { get; set; } = null!;
+
+        /// <summary>
+        /// Gets or sets the AutoSuggestion collection id.
+        /// </summary>
+        public string AutoSuggestion { get; set; } = null!;
     }
 }

OpenAPI/LearningHub.Nhs.OpenApi.Models/Configuration/FindwiseConfig.cs

@@ -5,6 +5,11 @@ namespace LearningHub.Nhs.OpenApi.Models.Configuration
     /// </summary>
     public class FindwiseConfig
     {
+        /// <summary>
+        /// Gets or sets the base url for the Findwise Index endpoint.
+        /// </summary>
+        public string IndexUrl { get; set; } = null!;
+
         /// <summary>
         /// Gets or sets the base url for the Findwise search service.
         /// </summary>
@@ -25,6 +30,16 @@ public class FindwiseConfig
         /// </summary>
         public int DefaultItemLimitForSearch { get; set; }
 
+        /// <summary>
+        /// Gets or sets the description limit.
+        /// </summary>
+        public int DescriptionLengthLimit { get; set; }
+
+        /// <summary>
+        /// Gets or sets the description length.
+        /// </summary>
+        public int MaximumDescriptionLength { get; set; }
+
         /// <summary>
         /// Gets or sets the collection ids.
         /// </summary>
@@ -34,5 +49,10 @@ public class FindwiseConfig
         ///  Gets or sets the special search characters.
         /// </summary>
         public string SpecialSearchCharacters { get; set; } = null!;
+
+        /// <summary>
+        ///  Gets or sets the index method.
+        /// </summary>
+        public string IndexMethod { get; set; } = null!;
     }
 }