From bf9d58ab16d03f64622c3e8189ebb88adaeb1c50 Mon Sep 17 00:00:00 2001 From: Dave Brown Date: Thu, 29 Aug 2024 09:14:00 +0100 Subject: [PATCH 1/2] Update texts and fix error message in content structure * Updated delete folder reference link text in `contentStructure.vue` to "Delete folder reference details". * Updated delete resource reference link text in `contentStructure.vue` to "Delete resource reference details". * Added `resourceReferenceDisplayVersionId` property to `existing` object in `refreshNodeContents` function in `contentStructureState.ts`. * Corrected error message in `updateResourceReferenceDisplayVersion` action in `contentStructureState.ts` from "Error creating folder reference." to "Error creating resource reference.". --- .../Scripts/vuesrc/content-structure/contentStructure.vue | 8 ++++---- .../vuesrc/content-structure/contentStructureState.ts | 3 ++- .../vuesrc/content-structure-admin/contentStructure.vue | 8 ++++---- .../content-structure-admin/contentStructureState.ts | 1 + 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue index d9c84355d..a2cfb0110 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue @@ -110,9 +110,9 @@ - + - Delete this folder reference + Delete folder reference details @@ -148,9 +148,9 @@ - + - Delete this resource reference + Delete resource reference details diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructureState.ts b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructureState.ts index df00e9665..ec714a34b 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructureState.ts +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructureState.ts @@ -116,6 +116,7 @@ async function refreshNodeContents(node: NodeContentAdminModel, refreshParentPat existing.displayOrder = child.displayOrder; existing.name = child.name; existing.nodePathDisplayVersionId = child.nodePathDisplayVersionId; + existing.resourceReferenceDisplayVersionId = child.resourceReferenceDisplayVersionId; existing.nodePaths = child.nodePaths; existing.isResource = child.nodeTypeId === NodeType.Resource; if (child.nodePaths) { @@ -574,7 +575,7 @@ const actions = >{ await refreshNodeContents(state.editingTreeNode.parent, false); }).catch(e => { state.inError = true; - state.lastErrorMessage = "Error creating folder reference."; + state.lastErrorMessage = "Error creating resource reference."; }); context.commit("setEditMode", EditModeEnum.Structure); }, diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructure.vue b/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructure.vue index 3adea4f3a..f240fb649 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructure.vue +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructure.vue @@ -117,9 +117,9 @@ - + - Delete this folder reference + Delete folder reference details @@ -154,9 +154,9 @@ - + - Delete this resource reference + Delete resource reference details diff --git a/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructureState.ts b/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructureState.ts index 14ee33ef9..ac0ac94b2 100644 --- a/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructureState.ts +++ b/LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructureState.ts @@ -115,6 +115,7 @@ async function refreshNodeContents(node: NodeContentAdminModel, refreshParentPat existing.displayOrder = child.displayOrder; existing.name = child.name; existing.nodePathDisplayVersionId = child.nodePathDisplayVersionId; + existing.resourceReferenceDisplayVersionId = child.resourceReferenceDisplayVersionId; existing.nodePaths = child.nodePaths; existing.isResource = child.nodeTypeId === NodeType.Resource; if (child.nodePaths) { From 7296004532ff1877ddc751126e4aaa6c625638a2 Mon Sep 17 00:00:00 2001 From: Dave Brown Date: Wed, 4 Sep 2024 16:46:21 +0100 Subject: [PATCH 2/2] TD-4409 Implement editing and deletion of Folder and Resource reference details --- .../Controllers/api/HierarchyController.cs | 25 ++- .../Interfaces/IHierarchyService.cs | 14 ++ .../content-structure/contentStructure.vue | 45 ++--- .../contentStructureState.ts | 40 +++- .../vuesrc/content-structure/treeItem.vue | 3 + .../Scripts/vuesrc/data/contentStructure.ts | 24 ++- .../Services/HierarchyService.cs | 20 ++ .../Controllers/Api/HierarchyController.cs | 48 +++++ .../Interfaces/IHierarchyService.cs | 14 ++ .../contentStructure.vue | 120 +++++------ .../contentStructureState.ts | 185 +++++++++-------- .../content-structure-admin/treeItem.vue | 3 + .../Scripts/vuesrc/data/contentStructure.ts | 186 ++++++++++-------- .../Services/HierarchyService.cs | 20 ++ .../Controllers/HierarchyController.cs | 40 ++++ .../LearningHub.Nhs.Database.sqlproj | 2 + ...ierarchyEditDeleteNodeReferenceDetails.sql | 54 +++++ ...rchyEditDeleteResourceReferenceDetails.sql | 54 +++++ ...HierarchyEditGetChildNodePathBreakdown.sql | 30 ++- .../Hierarchy/HierarchyEditPublish.sql | 29 +++ ...tResourceReferenceDisplayVersionUpdate.sql | 2 +- .../Hierarchy/IHierarchyEditRepository.cs | 16 ++ .../Hierarchy/HierarchyEditRepository.cs | 36 ++++ .../IHierarchyService.cs | 16 ++ .../HierarchyService.cs | 26 +++ 25 files changed, 783 insertions(+), 269 deletions(-) create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditDeleteNodeReferenceDetails.sql create mode 100644 WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditDeleteResourceReferenceDetails.sql diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/HierarchyController.cs b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/HierarchyController.cs index ab42dc4df..ca13e6d81 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/HierarchyController.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/HierarchyController.cs @@ -6,7 +6,6 @@ using LearningHub.Nhs.AdminUI.Configuration; using LearningHub.Nhs.AdminUI.Controllers.Api; using LearningHub.Nhs.AdminUI.Interfaces; - using LearningHub.Nhs.Models.Common; using LearningHub.Nhs.Models.Hierarchy; using LearningHub.Nhs.WebUI.Models.Contribute; using Microsoft.AspNetCore.Mvc; @@ -439,5 +438,29 @@ public async Task RemoveReferenceNode(int hierarchyEditDetailId) var apiResponse = await this.hierarchyService.RemoveReferenceNodeAsync(hierarchyEditDetailId); return this.Ok(apiResponse.ValidationResult); } + + /// + /// The DeleteNodeReferenceDetails. + /// + /// The hierarchyEditDetailId. + /// IActionResult. + [Route("DeleteNodeReferenceDetails/{hierarchyEditDetailId}")] + public async Task DeleteNodeReferenceDetails(int hierarchyEditDetailId) + { + var apiResponse = await this.hierarchyService.DeleteNodeReferenceDetailsAsync(hierarchyEditDetailId); + return this.Ok(apiResponse.ValidationResult); + } + + /// + /// Deletes the resource reference details for a hierarchy edit. + /// + /// The hierarchy edit detail id. + /// The . + [Route("DeleteResourceReferenceDetails/{hierarchyEditDetailId}")] + public async Task DeleteResourceReferenceDetails(int hierarchyEditDetailId) + { + var apiResponse = await this.hierarchyService.DeleteResourceReferenceDetailsAsync(hierarchyEditDetailId); + return this.Ok(apiResponse.ValidationResult); + } } } diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IHierarchyService.cs b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IHierarchyService.cs index d93bb79e4..a744cd81f 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IHierarchyService.cs +++ b/AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IHierarchyService.cs @@ -198,5 +198,19 @@ public interface IHierarchyService /// The hierarchy Edit Detail Id. /// The . Task RemoveReferenceNodeAsync(int hierarchyEditDetailId); + + /// + /// Deletes the node reference details. + /// + /// The hierarchy Edit Detail Id. + /// The . + Task DeleteNodeReferenceDetailsAsync(int hierarchyEditDetailId); + + /// + /// Deletes the resource reference details. + /// + /// The hierarchy Edit Detail Id. + /// The . + Task DeleteResourceReferenceDetailsAsync(int hierarchyEditDetailId); } } diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue index a2cfb0110..ad42c042e 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue @@ -111,13 +111,12 @@ - - Delete folder reference details + + Delete folder reference details -
@@ -155,11 +154,9 @@
-
- - - -