Merge pull request #538 from TechnologyEnhancedLearning/TD-4570_Options_are_not_poulating_in_the_hierachy_edit_Screen

Td 4570 options are not poulating in the hierachy edit screen

Author: Swapnamol

LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs

@@ -465,7 +465,7 @@ public async Task<ActionResult> SaveResourceDetailAsync([FromBody] ResourceDetai
             request.Description = Regex.Replace(request.Description, "<p> ", "<p>");
             request.Description = Regex.Replace(request.Description, "<p></p>", 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);
         }

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

WebAPI/LearningHub.Nhs.Repository/Resources/ResourceVersionRepository.cs

@@ -337,6 +337,7 @@ public async Task<List<ResourceVersion>> 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);
             }