From 75bc162d65a219b0f1cd8bb1e2d8b7178784ef84 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Wed, 21 Aug 2024 14:57:59 +0100 Subject: [PATCH 1/2] TD-4570: Options are not getting populated in Hierarchy Edit Screen -For Newly created resources from Contribute screen --- LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs | 2 +- .../Resources/ResourceVersionRepository.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs index 6bfbcca6c..f6e76cf1e 100644 --- a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs +++ b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs @@ -465,7 +465,7 @@ public async Task SaveResourceDetailAsync([FromBody] ResourceDetai request.Description = Regex.Replace(request.Description, "

", "

"); request.Description = Regex.Replace(request.Description, "

", string.Empty); request.Description = Regex.Replace(request.Description, "\\n", string.Empty); - + request.PrimaryCatalogueNodeId = (int)request.ResourceCatalogueId; int resourceVersionId = await this.contributeService.SaveResourceDetailAsync(request); return this.Ok(resourceVersionId); } diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs index 584da6344..b87c998aa 100644 --- a/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs +++ b/WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs @@ -337,6 +337,7 @@ public async Task> GetResourceVersionsAsync(int resourceId resourceVersionUpdate.ResourceLicenceId = resourceVersion.ResourceLicenceId == 0 ? null : resourceVersion.ResourceLicenceId; resourceVersionUpdate.SensitiveContent = resourceVersion.SensitiveContent; resourceVersionUpdate.CertificateEnabled = resourceVersion.CertificateEnabled; + resourceVersionUpdate.PrimaryCatalogueNodeId = resourceVersion.PrimaryCatalogueNodeId; this.SetAuditFieldsForUpdate(userId, resourceVersionUpdate); } From b7996b883f27b1412da4db8c780d4742267f9b6a Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Wed, 21 Aug 2024 15:01:17 +0100 Subject: [PATCH 2/2] To handle primary catalogue node id on catalogue create --- .../Stored Procedures/Hierarchy/CatalogueCreate.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueCreate.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueCreate.sql index d9ab9ecd5..13ddea7ca 100644 --- a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueCreate.sql +++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/CatalogueCreate.sql @@ -101,6 +101,9 @@ BEGIN SELECT @NodeVersionId = SCOPE_IDENTITY() + UPDATE nv SET PrimaryCatalogueNodeId = CatalogueNodeId from hierarchy.NodePath np + INNER JOIN hierarchy.NodeVersion nv ON nv.NodeId = np.NodeId where nv.Id =@NodeVersionId + UPDATE [hierarchy].[Node] SET CurrentNodeVersionId = @NodeVersionId WHERE Id = @NodeId