Merge branch 'RC' into Develop/Features/TD-6467-implement-new-search-ui

Author: Binon

AdminUI/LearningHub.Nhs.AdminUI/Controllers/CatalogueController.cs

@@ -20,6 +20,7 @@
     using System.Collections.Generic;
     using System.Drawing;
     using System.Linq;
+    using System.Net;
     using System.Text.RegularExpressions;
     using System.Threading.Tasks;
 
@@ -282,7 +283,10 @@ public async Task<IActionResult> MoodleCategory(int id)
 
             // Build hierarchical select list
             var selectList = BuildList(categories, parentId: null, depth: 0);
-
+            foreach (var item in selectList)
+            {
+                item.Text = WebUtility.HtmlDecode(item.Text);
+            }
             vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
             this.ViewData["CatalogueName"] = vm.Name;
             this.ViewData["id"] = id;
@@ -736,6 +740,12 @@ public async Task<IActionResult> AddCategoryToCatalogue(CatalogueViewModel catal
                 vm.MoodleCategories = categories;
                 // Build hierarchical select list
                 var selectList = BuildList(categories, parentId: null, depth: 0);
+      
+                foreach (var item in selectList)
+                {
+                    item.Text = WebUtility.HtmlDecode(item.Text);
+                }
+
                 vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
                 return this.View("MoodleCategory", vm);
             }
@@ -766,6 +776,10 @@ public async Task<IActionResult> RemoveCategoryFromCatalogue(int categoryId, int
                 vm.SelectedCategoryId = 0;
                 // Build hierarchical select list
                 var selectList = BuildList(categories, parentId: null, depth: 0);
+                foreach (var item in selectList)
+                {
+                    item.Text = WebUtility.HtmlDecode(item.Text);
+                }
                 vm.MoodleCategorySelectList = new SelectList(selectList, "Value", "Text");
                 return this.View("MoodleCategory", vm);
             }

LearningHub.Nhs.WebUI/Views/Catalogue/Courses.cshtml

@@ -20,7 +20,7 @@
                 <div class="nhsuk-u-padding-bottom-3 nhsuk-u-padding-top-2">
                     <h2 class="folder-title line-clamp-2">
                         <img src="/images/folder-icon.svg" alt="folder icon" />
-                        <a asp-controller="Catalogue" asp-route-reference="@Model.Catalogue.Url" asp-route-moodleCategoryId="@item.Id">@item.Name</a>
+                        <a asp-controller="Catalogue" asp-route-reference="@Model.Catalogue.Url" asp-route-moodleCategoryId="@item.Id">@Html.Raw(@item.Name)</a>
                     </h2>
                 </div>
                 <hr class="nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-0" />

LearningHub.Nhs.WebUI/Views/Catalogue/Index.cshtml

@@ -51,13 +51,19 @@
                 return "Search catalogue";
             case "browse":
             default:
-                return "Browse";
+                return "Resources";
         }
     }
 
-    if (Model.Catalogue.SelectedCategoryId == 0)
+    if (ViewBag.ActiveTab == "courses")
     {
-        ViewBag.ActiveTab = "browse";
+        if (Model.Catalogue.SelectedCategoryId == 0 ||
+         (Model.Catalogue.SelectedCategoryId > 0 &&
+          (Model.Courses == null || !Model.Courses.Any()) &&
+          (Model.SubCategories == null || !Model.SubCategories.Any())))
+        {
+            ViewBag.ActiveTab = "browse";
+        }
     }
 
     List<(string Title, string Url)> breadcrumbs;
@@ -114,7 +120,7 @@
 
         @* Catalogue header *@
         <div class="nhsuk-u-margin-bottom-7">
-            <partial name="_Breadcrumbs" model="new BreadcrumbViewModel { Breadcrumbs = breadcrumbs, ShowBackToParentOnMobile = true }" />
+            <partial name="_Breadcrumbs" model="new BreadcrumbViewModel { Breadcrumbs = breadcrumbs, ShowBackToParentOnMobile = false }" />
             @if (Model.Catalogue.Hidden)
             {
                 <div class="nhsuk-u-margin-bottom-4">

WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj

@@ -688,6 +688,9 @@
     <Build Include="Stored Procedures\Adf\AdfMergeUserRoleUpgrade.sql" />
     <Build Include="Stored Procedures\Adf\AdfMergeuserTermsAndConditions.sql" />
     <Build Include="Stored Procedures\Hierarchy\RemoveCatalogueCategory.sql" />
+    <None Include="Scripts\Post-Deploy\Scripts\TD-6148-ADFtableData.sql" />
+    <Build Include="Tables\Adf\ADFSyncMetadata.sql" />
+    <Build Include="Stored Procedures\Adf\proc_UpdateLastSyncTimeAdf.sql" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />

WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/TD-6148-ADFtableData.sql

@@ -0,0 +1,45 @@
+INSERT INTO ADFSyncMetadata (SyncDirection, TableName, LastSyncTime)
+VALUES
+('ELFHtoLH', 'employmentReferenceTypeTBL', '1900-01-01'),
+('ELFHtoLH', 'mergeUserTBL', '1900-01-01'),
+('ELFHtoLH', 'userAdminLocationTBL', '1900-01-01'),
+('ELFHtoLH', 'userEmploymentReferenceTBL', '1900-01-01'),
+('ELFHtoLH', 'userEmploymentResponsibilityTBL', '1900-01-01'),
+('ELFHtoLH', 'userHistoryAttributeTBL', '1900-01-01'),
+('ELFHtoLH', 'userReportingUserTBL', '1900-01-01'),
+('ELFHtoLH', 'emailTemplateTBL', '1900-01-01'),
+('ELFHtoLH', 'userprofile', '1900-01-01'),
+('ELFHtoLH', 'user', '1900-01-01'),
+('ELFHtoLH', 'userRoleUpgradeTBL', '1900-01-01'),
+('ELFHtoLH', 'userHistoryTBL', '1900-01-01'),
+('ELFHtoLH', 'userHistoryTypeTBL', '1900-01-01'),
+('ELFHtoLH', 'userPasswordValidationTokenTBL', '1900-01-01'),
+('ELFHtoLH', 'userGroupTypeInputValidationTBL', '1900-01-01'),
+('ELFHtoLH', 'userAttributeTBL', '1900-01-01'),
+('ELFHtoLH', 'termsAndConditionsTBL', '1900-01-01'),
+('ELFHtoLH', 'tenantUrlTBL', '1900-01-01'),
+('ELFHtoLH', 'tenantTBL', '1900-01-01'),
+('ELFHtoLH', 'tenantSmtpTBL', '1900-01-01'),
+('ELFHtoLH', 'systemSettingTBL', '1900-01-01'),
+('ELFHtoLH', 'loginWizardStageActivityTBL', '1900-01-01'),
+('ELFHtoLH', 'loginWizardRuleTBL', '1900-01-01'),
+('ELFHtoLH', 'loginWizardStageTBL', '1900-01-01'),
+('ELFHtoLH', 'ipCountryLookupTBL', '1900-01-01'),
+('ELFHtoLH', 'emailTemplateTypeTBL', '1900-01-01'),
+('ELFHtoLH', 'attributeTBL', '1900-01-01'),
+('ELFHtoLH', 'attributeTypeTBL', '1900-01-01'),
+('ELFHtoLH', 'gdcRegisterTBL', '1900-01-01'),
+('ELFHtoLH', 'gmclrmpTBL', '1900-01-01'),
+('ELFHtoLH', 'regionTBL', '1900-01-01'),
+('ELFHtoLH', 'userEmploymentTBL', '1900-01-01'),
+('ELFHtoLH', 'locationTypeTBL', '1900-01-01'),
+('ELFHtoLH', 'locationTBL', '1900-01-01'),
+('ELFHtoLH', 'countryTBL', '1900-01-01'),
+('ELFHtoLH', 'schoolTBL', '1900-01-01'),
+('ELFHtoLH', 'deaneryTBL', '1900-01-01'),
+('ELFHtoLH', 'gradeTBL', '1900-01-01'),
+('ELFHtoLH', 'specialtyTBL', '1900-01-01'),
+('ELFHtoLH', 'JobRoleTbl', '1900-01-01'),
+('ELFHtoLH', 'userTermsAndConditionsTBL', '1900-01-01'),
+('ELFHtoLH', 'medicalCouncilTBL', '1900-01-01'),
+('ELFHtoLH', 'staffGroupTBL', '1900-01-01')

WebAPI/LearningHub.Nhs.Database/Stored Procedures/Adf/proc_UpdateLastSyncTimeAdf.sql

@@ -0,0 +1,7 @@
+CREATE TABLE ADFSyncMetadata (
+    SyncDirection VARCHAR(50),   -- e.g., 'ELFHtoLH' or 'LHtoELFH'
+    TableName     VARCHAR(100),  -- e.g., 'userTBL_Test', 'departmentTBL'
+    LastSyncTime  DATETIME2,
+    PRIMARY KEY (SyncDirection, TableName)
+);
+GO