Skip to content

Td-4584: Adding content to, or re-aranging content within, a referenc… #543

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 2, 2024
Merged

Td-4584: Adding content to, or re-aranging content within, a referenc… #543

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
7c74966
Td-4584: Adding content to, or re-aranging content within, a referenc…
Swapnamol Aug 28, 2024
bd8ddec
Operations are restricted to the current HierarchyEditId
Swapnamol Sep 2, 2024
f47de2c
Added Distinct condition to avoid duplicate entries in to the [hierar…
Swapnamol Sep 2, 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
1 change: 1 addition & 0 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 @@ -457,6 +457,7 @@ const actions = <ActionTree<State, any>>{
await refreshNodeContents(payload.destinationNode, true).then(async x => {
await refreshNodeContents(state.editingTreeNode.parent, true).then(y => {
});
refreshHierarchyEdit(state);
state.rootNode.children.forEach(async (child) => {
if (child.nodeId != null) {
await refreshNodeContents(child, false);
Expand Down
11 changes: 9 additions & 2 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/contentStructureState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,12 @@ const actions = <ActionTree<State, any>>{
await refreshNodeContents(payload.destinationNode, true).then(async x => {
await refreshNodeContents(state.editingTreeNode.parent, true).then(y => {
});
refreshHierarchyEdit(state);
state.rootNode.children.forEach(async (child) => {
if (child.nodeId != null) {
await refreshNodeContents(child, false);
}
});
});
}).catch(e => {
state.inError = true;
Expand Down Expand Up @@ -492,8 +498,9 @@ const actions = <ActionTree<State, any>>{
state.inError = false;
contentStructureData.removeReferenceNode(payload.node.hierarchyEditDetailId).then(async response => {
await refreshNodeContents(payload.node.parent, false);
await refreshNodeContents(payload.node.parent.parent, false);
await refreshNodeIfMatchingNodeId(payload.node.parent, state.editingTreeNode.nodeId, state.editingTreeNode.hierarchyEditDetailId);
if (payload.node.parent.parent != null) {
await refreshNodeContents(payload.node.parent.parent, false);
}
}).catch(e => {
state.inError = true;
state.lastErrorMessage = "Error removing resource refrence.";
Expand Down
45 changes: 44 additions & 1 deletion WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditMoveNode.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
-- 20-05-2024 DB Added the creation of a new NodePath record for the moved node and update child nodes.
-- 29-05-2024 DB Clear the NodePathId for moved nodes. NodePaths can not be updated incase susequent references are made to the original path.
-- 07-08-2024 SA Remove all instance of the referenced path when moving a referenced folder
-- 23-08-2024 SA Moving a folder into a referenced folder should affect all instances of the referenced folder.
-------------------------------------------------------------------------------
CREATE PROCEDURE [hierarchy].[HierarchyEditMoveNode]
(
Expand Down Expand Up @@ -279,9 +280,51 @@ BEGIN
AND rrdv.Deleted = 0
AND hed.Deleted = 0

-- Remove all instance of the referenced path when moving a referenced folder
-- Remove all instance of the referenced path when moving a referenced folder

EXEC hierarchy.HierarchyEditRemoveNodeReferencesOnMoveNode @HierarchyEditDetailId,@UserId,@UserTimezoneOffset

-- Moving a folder into a referenced folder should affect all instances of the referenced folder.

DECLARE @CurrentNodeId INT,
@ReferenceHierarchyEditDetailId INT

SELECT @CurrentNodeId = hed.NodeId
FROM [hierarchy].[HierarchyEditDetail] hed
WHERE hed.Id = @MoveToHierarchyEditDetailId
AND HierarchyEditId = @HierarchyEditId

-- Declare the cursor

DECLARE NodeCursor CURSOR FOR
SELECT Id AS ReferenceHierarchyEditDetailId
FROM hierarchy.HierarchyEditDetail
WHERE NodeId = @CurrentNodeId
AND Id != @MoveToHierarchyEditDetailId
AND HierarchyEditId = @HierarchyEditId
AND deleted = 0
-- Open the cursor
OPEN NodeCursor;

-- Fetch the first row from the cursor
FETCH NEXT FROM NodeCursor
INTO @ReferenceHierarchyEditDetailId;

-- Loop until no more rows are returned
WHILE @@FETCH_STATUS = 0
BEGIN
-- Execute the script to add new folder references in all referenced instances
EXEC [hierarchy].[HierarchyEditReferenceNode] @HierarchyEditDetailId, @ReferenceHierarchyEditDetailId, @UserId,@UserTimezoneOffset

-- Fetch the next row from the cursor
FETCH NEXT FROM NodeCursor
INTO @ReferenceHierarchyEditDetailId;
END

-- Close and deallocate the cursor
CLOSE NodeCursor;
DEALLOCATE NodeCursor;

------------------------------------------------------------
-- Refresh HierarchyEditNodeResourceLookup
------------------------------------------------------------
Expand Down
43 changes: 43 additions & 0 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditMoveResource.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
--
-- 11-01-2022 KD Initial Revision.
-- 08-08-2024 SA Remove all instance of the referenced path when moving a referenced resource
-- 23-08-2024 SA Moving a resource into a referenced folder should affect all instances of the referenced folder
-------------------------------------------------------------------------------
CREATE PROCEDURE [hierarchy].[HierarchyEditMoveResource]
(
Expand Down Expand Up @@ -175,6 +176,48 @@ BEGIN
-- Remove all instance of the referenced path when moving a referenced resource

EXEC hierarchy.HierarchyEditRemoveResourceReferencesOnMoveResource @HierarchyEditDetailId,@ParentNodeId,@UserId,@UserTimezoneOffset

-- Moving a resource into a referenced folder should affect all instances of the referenced folder

DECLARE @CurrentNodeId INT,
@ReferenceHierarchyEditDetailId INT

SELECT @CurrentNodeId = hed.NodeId
FROM [hierarchy].[HierarchyEditDetail] hed
WHERE hed.Id = @MoveToHierarchyEditDetailId
AND HierarchyEditId = @HierarchyEditId

-- Declare the cursor

DECLARE NodeCursor CURSOR FOR
SELECT Id AS ReferenceHierarchyEditDetailId
FROM hierarchy.HierarchyEditDetail
WHERE NodeId = @CurrentNodeId
AND Id != @MoveToHierarchyEditDetailId
AND HierarchyEditId = @HierarchyEditId
AND deleted = 0
-- Open the cursor
OPEN NodeCursor;

-- Fetch the first row from the cursor
FETCH NEXT FROM NodeCursor
INTO @ReferenceHierarchyEditDetailId;

-- Loop until no more rows are returned
WHILE @@FETCH_STATUS = 0
BEGIN
-- Execute the update statement for the current row
EXEC [hierarchy].[HierarchyEditReferenceResource] @HierarchyEditDetailId, @ReferenceHierarchyEditDetailId, @UserId,@UserTimezoneOffset

-- Fetch the next row from the cursor
FETCH NEXT FROM NodeCursor
INTO @ReferenceHierarchyEditDetailId;
END

-- Close and deallocate the cursor
CLOSE NodeCursor;
DEALLOCATE NodeCursor;

------------------------------------------------------------
-- Refresh HierarchyEditNodeResourceLookup
------------------------------------------------------------
Expand Down
21 changes: 4 additions & 17 deletions WebAPI/LearningHub.Nhs.Database/Stored Procedures/Hierarchy/HierarchyEditPublish.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
-- 03-06-2024 DB Publish NodePathDisplayVersion records.
-- 13-06-2024 DB Publish ResourceReferenceDisplayVersion records.
-- 26-07-2024 SA Remove references to be implemented
-- 27-08-2024 SA Moving a folder into a referenced folder should affect all instances of the referenced folder.[added
-- condition to avoid duplicate entries in to NodeLink table]
-------------------------------------------------------------------------------
CREATE PROCEDURE [hierarchy].[HierarchyEditPublish]
(
Expand Down Expand Up @@ -62,7 +64,7 @@ BEGIN
----------------------------------------------------------
-- Create new NodeLinks (arising from Create or Reference Node)
INSERT INTO [hierarchy].[NodeLink] ([ParentNodeId],[ChildNodeId],[DisplayOrder],[Deleted],[CreateUserId],[CreateDate],[AmendUserId],[AmendDate])
SELECT
SELECT DISTINCT
ParentNodeId,
NodeId AS ChildNodeId,
DisplayOrder,
Expand Down Expand Up @@ -230,7 +232,7 @@ BEGIN

-- Create moved NodeResource/s in their new locations
INSERT INTO [hierarchy].[NodeResource] ([NodeId],[ResourceId],[DisplayOrder],[VersionStatusId],[PublicationId],[Deleted],[CreateUserId],[CreateDate],[AmendUserId],[AmendDate])
SELECT ParentNodeId, ResourceId, DisplayOrder, 2 /* Published */, @PublicationId, 0, CreateUserId, CreateDate, AmendUserId, AmendDate
SELECT DISTINCT ParentNodeId, ResourceId, DisplayOrder, 2 /* Published */, @PublicationId, 0, @AmendUserId, @AmendDate, @AmendUserId, @AmendDate
FROM hierarchy.HierarchyEditDetail
WHERE HierarchyEditId = @HierarchyEditId
AND HierarchyEditDetailTypeId = 5 -- Node Resource
Expand Down Expand Up @@ -284,21 +286,6 @@ BEGIN
AND hed.Deleted = 0
AND nr.Deleted = 0

-- Update NodeResource Deleted status , if the reference is removed.
UPDATE
nr
SET
Deleted = 1,
AmendUserId = @AmendUserId,
AmendDate = @AmendDate
FROM
hierarchy.HierarchyEditDetail hed
INNER JOIN
hierarchy.NodeResource nr ON hed.NodeResourceId = nr.Id
WHERE
HierarchyEditId = @HierarchyEditId
AND hed.Deleted =1

----------------------------------------------------------
-- NodeVersion
----------------------------------------------------------
Expand Down