Skip to content

TD-4650: Remove this reference" option should not be available in Primary catalogue after adding external reference #579

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
merged 2 commits into from
Sep 12, 2024
Merged

TD-4650: Remove this reference" option should not be available in Primary catalogue after adding external reference #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9257dc
TD-4650: Remove this reference" option should not be available in Pri…
sarathlal-sarangadharan Sep 11, 2024
38bf544
TD-4650: Changes applied in WebUI.
sarathlal-sarangadharan Sep 12, 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
6 changes: 4 additions & 2 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 @@ -48,7 +48,7 @@
<a class="dropdown-item" v-if="!isExternalCatalogue" @click="onInitiateReferenceNode">Create reference to this folder</a>
<a class="dropdown-item" v-if="canEditFolderReference" @click="onEditFolderReference">{{item.nodePathDisplayVersionId == 0 ? "Create" : "Edit"}} reference details</a>
<a class="dropdown-item" v-if="!isExternalCatalogue" @click="addReference">Add a reference here</a>
<a class="dropdown-item" v-if="item.isReference && !item.parent.isReference" @click="removeReference">Remove this reference</a>
<a class="dropdown-item" v-if="item.isReference && !item.parent.isReference && canRemove" @click="removeReference">Remove this reference</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -166,7 +166,7 @@
<a class="dropdown-item" v-if="canMoveResource && !isExternalCatalogue" @click="onInitiateMoveResource">Move</a>
<a class="dropdown-item" v-if="!isExternalCatalogue" @click="onInitiateReferenceResource">Create reference to this resource</a>
<a class="dropdown-item" v-if="canEditResourceReference" @click="onEditResourceReference">{{item.resourceReferenceDisplayVersionId == 0 ? "Create" : "Edit"}} reference details</a>
<a class="dropdown-item" v-if="item.isReference && !item.parent.isReference" @click="removeReference">Remove this reference</a>
<a class="dropdown-item" v-if="item.isReference && !item.parent.isReference && canRemove" @click="removeReference">Remove this reference</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -253,6 +253,7 @@
canMoveResourceDown: false,
canMoveResourceUp: false,
canMoveResource: false,
canRemove: false,
};
},
computed: {
Expand Down Expand Up @@ -397,6 +398,7 @@
this.canEditNode = true;
this.canMoveNode = this.item.parent != null;
this.canEditFolderReference = this.item.nodePathDisplayVersionId > 0 || (this.item.nodePaths && this.item.nodePaths.length > 1);
this.canRemove = this.item.primaryCatalogueNodeId != this.$store.state.contentStructureState.rootNode.nodeId;
},
recomputeResourceOptions: function () {
this.canMoveResourceUp = this.item.displayOrder > 1;
Expand Down
6 changes: 4 additions & 2 deletions LearningHub.Nhs.WebUI/Scripts/vuesrc/content-structure-admin/treeItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<a class="dropdown-item" v-if="!isExternalCatalogue" @click="onInitiateReferenceNode">Create reference to this folder</a>
<a class="dropdown-item" v-if="canEditFolderReference" @click="onEditFolderReference">{{item.nodePathDisplayVersionId == 0 ? "Create" : "Edit"}} reference details</a>
<a class="dropdown-item" v-if="!isExternalCatalogue" @click="addReference">Add a reference here</a>
<a class="dropdown-item" v-if="item.isReference && !item.parent.isReference" @click="removeReference">Remove this reference</a>
<a class="dropdown-item" v-if="item.isReference && !item.parent.isReference && canRemove" @click="removeReference">Remove this reference</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -166,7 +166,7 @@
<a class="dropdown-item" v-if="canMoveResource && !isExternalCatalogue" @click="onInitiateMoveResource">Move</a>
<a class="dropdown-item" v-if="!isExternalCatalogue" @click="onInitiateReferenceResource">Create reference to this resource</a>
<a class="dropdown-item" v-if="canEditResourceReference" @click="onEditResourceReference">{{item.resourceReferenceDisplayVersionId == 0 ? "Create" : "Edit"}} reference details</a>
<a class="dropdown-item" v-if="item.isReference && !item.parent.isReference" @click="removeReference">Remove this reference</a>
<a class="dropdown-item" v-if="item.isReference && !item.parent.isReference && canRemove" @click="removeReference">Remove this reference</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -253,6 +253,7 @@
canMoveResourceDown: false,
canMoveResourceUp: false,
canMoveResource: false,
canRemove: false,
};
},
computed: {
Expand Down Expand Up @@ -397,6 +398,7 @@
this.canEditNode = true;
this.canMoveNode = this.item.parent != null;
this.canEditFolderReference = this.item.nodePathDisplayVersionId > 0 || (this.item.nodePaths && this.item.nodePaths.length > 1);
this.canRemove = this.item.primaryCatalogueNodeId != this.$store.state.contentStructureState.rootNode.nodeId;
},
recomputeResourceOptions: function () {
this.canMoveResourceUp = this.item.displayOrder > 1;
Expand Down
1 change: 1 addition & 0 deletions WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,7 @@
<Build Include="Stored Procedures\Hierarchy\CheckCatalogueHasExternalReference.sql" />
<Build Include="Stored Procedures\Hierarchy\HierarchyEditDeleteNodeReferenceDetails.sql" />
<Build Include="Stored Procedures\Hierarchy\HierarchyEditDeleteResourceReferenceDetails.sql" />
<Build Include="Stored Procedures\Hierarchy\HierarchyNewResourceReferenceForReferedCatalogue.sql" />
</ItemGroup>
<ItemGroup>
<None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
Expand Down
8 changes: 8 additions & 0 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 @@ -589,6 +589,14 @@ BEGIN
----------------------------------------------------------

EXEC [hierarchy].[HierarchyNewNodePathForReferedCatalogue] @HierarchyEditId,@AmendUserId,@AmendDate

----------------------------------------------------------
-- ResourceReference: generate new resource reference
----------------------------------------------------------

EXEC [hierarchy].[HierarchyNewResourceReferenceForReferedCatalogue] @HierarchyEditId,@AmendUserId,@AmendDate


----------------------------------------------------------
-- NodePathNode
----------------------------------------------------------
Expand Down
93 changes: 93 additions & 0 deletions ...Database/Stored Procedures/Hierarchy/HierarchyNewResourceReferenceForReferedCatalogue.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
-------------------------------------------------------------------------------
-- Author Sarathlal
-- Created 11-09-2024
-- Purpose Move resource in primary catalogue after external reference should reflect secondary catalogue
--
-- Modification History
-- 11-09-2024 SS Initial version
-------------------------------------------------------------------------------
CREATE PROCEDURE [hierarchy].[HierarchyNewResourceReferenceForReferedCatalogue]
(
@HierarchyEditId INT,
@AmendUserId INT,
@AmendDate datetimeoffset(7)
)

AS

BEGIN
BEGIN TRY

BEGIN TRAN
DECLARE @NodePathId int
DECLARE @ResourceId INT
DECLARE @PrimaryCatalogueNodeId int
DECLARE @NodeId int
DECLARE @ParentNodeId int
DECLARE @NewNodePath as NVARCHAR(256)
DECLARE @ResourceReferenceId INT
DECLARE @ResourceReferenceCursor as CURSOR
SET @ResourceReferenceCursor = CURSOR FORWARD_ONLY FOR
SELECT
ResourceId,
PrimaryCatalogueNodeId,
ParentNodeId,
NodeId,
hed.NewNodePath,
NodePathId,
ResourceReferenceId
FROM
hierarchy.HierarchyEditDetail hed
WHERE
HierarchyEditId = @HierarchyEditId
AND
(

HierarchyEditDetailTypeId = 5 -- Resource
)
AND (
HierarchyEditDetailOperationId = 1 -- Add
OR
HierarchyEditDetailOperationId = 2 -- Edit
)
AND NodeLinkId IS NULL
AND [Deleted] = 0
OPEN @ResourceReferenceCursor;
FETCH NEXT FROM @ResourceReferenceCursor INTO @ResourceId,@PrimaryCatalogueNodeId,@ParentNodeId,@NodeId,@NewNodePath,@NodePathId,@ResourceReferenceId;
WHILE @@FETCH_STATUS = 0
BEGIN

INSERT INTO [resources].[ResourceReference]([ResourceId],[NodePathId],[OriginalResourceReferenceId],[IsActive],[Deleted],[CreateUserId],[CreateDate],[AmendUserId],[AmendDate])
SELECT @ResourceId,NP.Id,@ResourceReferenceId,1,0,@AmendUserId,@AmendDate,@AmendUserId,@AmendDate
FROM
hub.[fn_Split](@NewNodePath, '\') nodeInPath
INNER JOIN hierarchy.NodePath NP ON NP.NodeId=nodeInPath.value AND CatalogueNodeId!=@PrimaryCatalogueNodeId
WHERE nodeInPath.value=@ParentNodeId

FETCH NEXT FROM @ResourceReferenceCursor INTO @ResourceId,@PrimaryCatalogueNodeId,@ParentNodeId,@NodeId,@NewNodePath,@NodePathId,@ResourceReferenceId;

END

CLOSE @ResourceReferenceCursor;
DEALLOCATE @ResourceReferenceCursor;
COMMIT

END TRY
BEGIN CATCH
DECLARE @ErrorMessage NVARCHAR(4000);
DECLARE @ErrorSeverity INT;
DECLARE @ErrorState INT;

SELECT
@ErrorMessage = ERROR_MESSAGE(),
@ErrorSeverity = ERROR_SEVERITY(),
@ErrorState = ERROR_STATE();

IF @@TRANCOUNT > 0
ROLLBACK TRAN;

RAISERROR (@ErrorMessage, @ErrorSeverity, @ErrorState);

END CATCH
END
GO
Loading