Skip to content

Develop/fixes/td 4409 fix reference details deletioon #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: CI to Content Referencing V2 Branch
merged 3 commits into from
Sep 5, 2024
Merged

Develop/fixes/td 4409 fix reference details deletioon #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf9d58a
Update texts and fix error message in content structure
DRJTechnology Aug 29, 2024
7296004
TD-4409 Implement editing and deletion of Folder and Resource referen…
DRJTechnology Sep 4, 2024
56e85a2
Merge from CI branch
DRJTechnology Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/HierarchyController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -439,5 +438,29 @@ public async Task<IActionResult> RemoveReferenceNode(int hierarchyEditDetailId)
var apiResponse = await this.hierarchyService.RemoveReferenceNodeAsync(hierarchyEditDetailId);
return this.Ok(apiResponse.ValidationResult);
}

/// <summary>
/// The DeleteNodeReferenceDetails.
/// </summary>
/// <param name="hierarchyEditDetailId">The hierarchyEditDetailId<see cref="hierarchyEditDetailId"/>.</param>
/// <returns>IActionResult.</returns>
[Route("DeleteNodeReferenceDetails/{hierarchyEditDetailId}")]
public async Task<IActionResult> DeleteNodeReferenceDetails(int hierarchyEditDetailId)
{
var apiResponse = await this.hierarchyService.DeleteNodeReferenceDetailsAsync(hierarchyEditDetailId);
return this.Ok(apiResponse.ValidationResult);
}

/// <summary>
/// Deletes the resource reference details for a hierarchy edit.
/// </summary>
/// <param name="hierarchyEditDetailId">The hierarchy edit detail id.</param>
/// <returns>The <see cref="IActionResult"/>.</returns>
[Route("DeleteResourceReferenceDetails/{hierarchyEditDetailId}")]
public async Task<IActionResult> DeleteResourceReferenceDetails(int hierarchyEditDetailId)
{
var apiResponse = await this.hierarchyService.DeleteResourceReferenceDetailsAsync(hierarchyEditDetailId);
return this.Ok(apiResponse.ValidationResult);
}
}
}
14 changes: 14 additions & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Interfaces/IHierarchyService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,5 +198,19 @@ public interface IHierarchyService
/// <param name="hierarchyEditDetailId">The hierarchy Edit Detail Id.</param>
/// <returns>The <see cref="Task"/>.</returns>
Task<ApiResponse> RemoveReferenceNodeAsync(int hierarchyEditDetailId);

/// <summary>
/// Deletes the node reference details.
/// </summary>
/// <param name="hierarchyEditDetailId">The hierarchy Edit Detail Id.</param>
/// <returns>The <see cref="Task"/>.</returns>
Task<ApiResponse> DeleteNodeReferenceDetailsAsync(int hierarchyEditDetailId);

/// <summary>
/// Deletes the resource reference details.
/// </summary>
/// <param name="hierarchyEditDetailId">The hierarchy Edit Detail Id.</param>
/// <returns>The <see cref="Task"/>.</returns>
Task<ApiResponse> DeleteResourceReferenceDetailsAsync(int hierarchyEditDetailId);
}
}
51 changes: 22 additions & 29 deletions AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructure.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,13 @@
<input type="button" class="btn btn-custom-green mr-3" @click="onSaveFolderReferenceEdit()" v-bind:class="{disabled: !canSaveFolderReferenceEdit}" v-bind:disabled="!canSaveFolderReferenceEdit" value="Save changes" />
<input type="button" class="btn btn-admin btn-cancel" @click="onCancelFolderReferenceEdit()" value="Cancel" />

<span class="ml-auto mt-3">
<a class="delete-folder-link" @click.prevent="onEditFolderReferenceDeleteFolder" href="#">
Delete this folder reference <i class="fa-solid fa-trash-can delete-folder ml-2"></i>
<span class="ml-auto mt-3" v-if="editingFolderNodeReference.nodePathDisplayVersionId>0">
<a class="delete-folder-link" @click.prevent="onEditFolderReferenceDetailsDeleteFolder" href="#">
Delete folder reference details <i class="fa-solid fa-trash-can delete-folder ml-2"></i>
</a>
</span>
</div>
</div>

<div v-if="editMode === EditModeEnum.ResourceReference" id="editResourceReference">
<div class="col-12">
<label class="control-label">Resource location</label>
Expand Down Expand Up @@ -148,18 +147,16 @@
<input type="button" class="btn btn-custom-green mr-3" @click="onSaveResourceReferenceEdit()" v-bind:class="{disabled: !canSaveResourceReferenceEdit}" v-bind:disabled="!canSaveResourceReferenceEdit" value="Save changes" />
<input type="button" class="btn btn-admin btn-cancel" @click="onCancelResourceReferenceEdit()" value="Cancel" />

<span class="ml-auto mt-3">
<span class="ml-auto mt-3" v-if="editingResourceNodeReference.resourceReferenceDisplayVersionId>0">
<a class="delete-folder-link" @click.prevent="onEditResourceReferenceDeleteFolder" href="#">
Delete this resource reference <i class="fa-solid fa-trash-can delete-folder ml-2"></i>
Delete resource reference details <i class="fa-solid fa-trash-can delete-folder ml-2"></i>
</a>
</span>
</div>
</div>

<div v-if="editMode === EditModeEnum.ReferenceExternalContent" id="referenceExternalContentContainer">
<content-search :editingCatalogueNodePathId="catalogue.rootNodePathId"></content-search>
</div>

<div id="deleteFolderModal" class="modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
<div class="modal-dialog modal-dialog-centered modal-md" role="document">
<div class="modal-content">
Expand All @@ -182,53 +179,50 @@
</div>
</div>
</div>

<div id="deleteFolderReferenceModal" class="modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
<div id="deleteFolderReferenceDetailsModal" class="modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
<div class="modal-dialog modal-dialog-centered modal-md" role="document">
<div class="modal-content">
<div class="modal-header alert-modal-header text-center">
<h2 class="heading-lg w-100"><i class="delete-folder-warning-triangle fas fa-exclamation-triangle pr-3"></i>Delete folder reference</h2>
<h2 class="heading-lg w-100"><i class="delete-folder-warning-triangle fas fa-exclamation-triangle pr-3"></i>Delete folder reference details</h2>
</div>

<div class="modal-body alert-modal-body">
<div class="mt-3">You have chosen to delete the folder reference <span id="deleteFolderReferenceName">{{ deleteFolderReferenceName}}</span>. The folder will display using the default folder properties.</div>
<div class="mt-3">You have chosen to delete the folder reference details <span id="deleteFolderReferenceName">{{ deleteFolderReferenceName}}</span>. The folder will display using the default folder properties.</div>
</div>

<div class="modal-footer alert-modal-footer">
<div class="form-group col-12 p-0 m-0">
<div class="d-flex">
<input type="button" class="btn btn-action-cancel" data-dismiss="modal" value="Cancel" />
<input type="button" class="btn btn-action-red ml-auto" @click="onDeleteFolderReference()" value="Continue" />
<input type="button" class="btn btn-action-red ml-auto" @click="onDeleteFolderReferenceDetails()" value="Continue" />
</div>
</div>
</div>
</div>
</div>
</div>

<div id="deleteResourceReferenceModal" class="modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
<div class="modal-dialog modal-dialog-centered modal-md" role="document">
<div class="modal-content">
<div class="modal-header alert-modal-header text-center">
<h2 class="heading-lg w-100"><i class="delete-folder-warning-triangle fas fa-exclamation-triangle pr-3"></i>Delete resource reference</h2>
<h2 class="heading-lg w-100"><i class="delete-folder-warning-triangle fas fa-exclamation-triangle pr-3"></i>Delete resource reference details</h2>
</div>

<div class="modal-body alert-modal-body">
<div class="mt-3">You have chosen to delete the resource reference <span id="deleteResourceReferenceName">{{ deleteResourceReferenceName}}</span>. The resource will display using the default resource properties.</div>
<div class="mt-3">You have chosen to delete the resource reference details <span id="deleteResourceReferenceName">{{ deleteResourceReferenceName}}</span>. The resource will display using the default resource properties.</div>
</div>

<div class="modal-footer alert-modal-footer">
<div class="form-group col-12 p-0 m-0">
<div class="d-flex">
<input type="button" class="btn btn-action-cancel" data-dismiss="modal" value="Cancel" />
<input type="button" class="btn btn-action-red ml-auto" @click="onDeleteResourceReference()" value="Continue" />
<input type="button" class="btn btn-action-red ml-auto" @click="onDeleteResourceReferenceDetails()" value="Continue" />
</div>
</div>
</div>
</div>
</div>
</div>

<div id="cancelHierarchyEditModal" class="modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboad="false">
<div class="modal-dialog modal-dialog-centered modal-md" role="document">
<div class="modal-content">
Expand Down Expand Up @@ -272,7 +266,6 @@ import { ResourceReferenceDisplayVersionModel } from '../models/content-structur
import { NodeType } from '../constants';
import CKEditorToolbar from '../models/ckeditorToolbar';
import ckeditorwithhint from '../ckeditorwithhint.vue';

export default Vue.extend({
name: 'contentStructure',
components: {
Expand Down Expand Up @@ -418,28 +411,28 @@ export default Vue.extend({
},
onEditFolderDeleteFolder() {
this.deleteFolderName = this.editingFolderNode.name;
$('#deleteFolderReferenceModal').modal('show');
$('#deleteFolderModal').modal('show');
},
onEditFolderReferenceDeleteFolder() {
onEditFolderReferenceDetailsDeleteFolder() {
this.deleteFolderReferenceName = this.editingFolderNodeReference.name;
$('#deleteFolderReferenceModal').modal('show');
$('#deleteFolderReferenceDetailsModal').modal('show');
},
onEditResourceReferenceDeleteFolder() {
onEditResourceReferenceDeleteFolder() {
this.deleteResourceReferenceName = this.editingResourceNodeReference.name;
$('#deleteResourceReferenceModal').modal('show');
},
onDeleteFolder() {
this.$store.dispatch('contentStructureState/deleteFolder');
$('#deleteFolderModal').modal('hide');
},
onDeleteFolderReference() {
this.$store.dispatch('contentStructureState/deleteFolderReference');
$('#deleteFolderReferenceModal').modal('hide');
onDeleteFolderReferenceDetails() {
this.$store.dispatch('contentStructureState/deleteFolderReferenceDetails');
$('#deleteFolderReferenceDetailsModal').modal('hide');
this.onCancelFolderEdit()
},
onDeleteResourceReference() {
this.$store.dispatch('contentStructureState/deleteResourceReference');
$('#deleteFolderModal').modal('hide');
onDeleteResourceReferenceDetails() {
this.$store.dispatch('contentStructureState/deleteResourceReferenceDetails');
$('#deleteResourceReferenceModal').modal('hide');
},
onEdit() {
this.editFolderStructureButtonDisabled = true;
Expand Down
43 changes: 35 additions & 8 deletions AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/contentStructureState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -164,20 +165,22 @@ async function refreshNodeContents(node: NodeContentAdminModel, refreshParentPat
state.lastErrorMessage = `Error refreshing Node contents of ${node.name}`;
});
}

async function refreshNodeIfMatchingNodeId(node: NodeContentAdminModel, nodeId: number, hierarchyEditDetailId: number) {
async function refreshNodeIfMatchingNodeId(node: NodeContentAdminModel, nodeId: number, hierarchyEditDetailId: number, removeChildren?: boolean) {
if (node.nodeId === nodeId && node.hierarchyEditDetailId != hierarchyEditDetailId) {
if (removeChildren && node.parent) {
node.parent.children = [];
node.parent.childrenLoaded = false;
}
await refreshNodeContents(node.parent, false);
}
if (node.childrenLoaded) {
if (node.children.filter(c => c.hierarchyEditDetailId === hierarchyEditDetailId).length == 0) {
for (const child of node.children) {
await refreshNodeIfMatchingNodeId(child, nodeId, hierarchyEditDetailId);
await refreshNodeIfMatchingNodeId(child, nodeId, hierarchyEditDetailId, removeChildren);
}
}
}
}

async function processChildNodeContents(child: NodeContentAdminModel, parent: NodeContentAdminModel) {
child.parent = parent;
child.inEdit = child.parent.inEdit;
Expand Down Expand Up @@ -413,13 +416,34 @@ const actions = <ActionTree<State, any>>{
state.lastErrorMessage = "Error deleting folder.";
});
},
deleteFolderReference(context: ActionContext<State, State>) {
deleteFolderReferenceDetails(context: ActionContext<State, State>) {
state.inError = false;
state.updatedNode = null;
contentStructureData.deleteFolderReferenceDetails(state.editingTreeNode.hierarchyEditDetailId).then(async response => {
if (response.isValid) {
var parent = state.editingTreeNode.parent;
await refreshNodeContents(parent, false);
await refreshNodeIfMatchingNodeId(state.rootNode, state.editingTreeNode.nodeId, state.editingTreeNode.hierarchyEditDetailId, true);
state.updatedNode = parent;
context.commit("setEditMode", EditModeEnum.Structure);
}
else {
state.inError = true;
state.lastErrorMessage = "Error: " + response.details.join(",");
}
}).catch(e => {
state.inError = true;
state.lastErrorMessage = "Error deleting folder reference details.";
});
},
deleteResourceReferenceDetails(context: ActionContext<State, State>) {
state.inError = false;
state.updatedNode = null;
contentStructureData.deleteFolderReference(state.editingTreeNode.hierarchyEditDetailId).then(async response => {
contentStructureData.deleteResourceReferenceDetails(state.editingTreeNode.hierarchyEditDetailId).then(async response => {
if (response.isValid) {
var parent = state.editingTreeNode.parent;
await refreshNodeContents(parent, false);
await refreshNodeIfMatchingNodeId(state.rootNode, state.editingTreeNode.nodeId, state.editingTreeNode.hierarchyEditDetailId, true);
state.updatedNode = parent;
context.commit("setEditMode", EditModeEnum.Structure);
}
Expand All @@ -429,7 +453,7 @@ const actions = <ActionTree<State, any>>{
}
}).catch(e => {
state.inError = true;
state.lastErrorMessage = "Error deleting folder reference.";
state.lastErrorMessage = "Error deleting resource reference details.";
});
},
async moveNodeUp(context: ActionContext<State, State>, payload: { node: NodeContentAdminModel }) {
Expand Down Expand Up @@ -515,6 +539,7 @@ const actions = <ActionTree<State, any>>{
state.inError = false;
contentStructureData.removeReferenceNode(payload.node.hierarchyEditDetailId).then(async response => {
await refreshNodeContents(payload.node.parent, false);
await refreshNodeIfMatchingNodeId(state.rootNode, payload.node.nodeId, payload.node.hierarchyEditDetailId, true);
if (payload.node.parent.parent != null) {
await refreshNodeContents(payload.node.parent.parent, false);
}
Expand Down Expand Up @@ -563,6 +588,7 @@ const actions = <ActionTree<State, any>>{
contentStructureData.updateNodePathDisplayVersion(state.editingFolderNodeReference).then(async response => {
state.editingFolderNodeReference.nodePathDisplayVersionId = response.createdId;
await refreshNodeContents(state.editingTreeNode.parent, false);
await refreshNodeIfMatchingNodeId(state.rootNode, state.editingTreeNode.nodeId, state.editingTreeNode.hierarchyEditDetailId, true);
}).catch(e => {
state.inError = true;
state.lastErrorMessage = "Error creating folder reference.";
Expand All @@ -573,9 +599,10 @@ const actions = <ActionTree<State, any>>{
contentStructureData.updateResourceReferenceDisplayVersion(state.editingResourceNodeReference).then(async response => {
state.editingResourceNodeReference.resourceReferenceDisplayVersionId = response.createdId;
await refreshNodeContents(state.editingTreeNode.parent, false);
await refreshNodeIfMatchingNodeId(state.rootNode, state.editingTreeNode.nodeId, state.editingTreeNode.hierarchyEditDetailId, true);
}).catch(e => {
state.inError = true;
state.lastErrorMessage = "Error creating folder reference.";
state.lastErrorMessage = "Error creating resource reference.";
});
context.commit("setEditMode", EditModeEnum.Structure);
},
Expand Down
3 changes: 3 additions & 0 deletions AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content-structure/treeItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,9 @@
if (this.item.nodeTypeId === NodeType.Catalogue) {
this.isOpen = true;
this.$forceUpdate();
} else if (!newVal.childrenLoaded && oldVal.childrenLoaded) { // If children are removed then close the node
this.isOpen = false;
this.$forceUpdate();
}
},
updatedNode: function (newVal, oldVal) {
Expand Down
Loading