Skip to content

Fixed item edit relationships with same type name but different entities all being shown under same label#3098

Merged
tdonohue merged 2 commits intoDSpace:mainfrom
alexandrevryghem:w2p-115434_byLabel-related-entity-type_contribute-main
Jun 7, 2024
Merged

Fixed item edit relationships with same type name but different entities all being shown under same label#3098
tdonohue merged 2 commits intoDSpace:mainfrom
alexandrevryghem:w2p-115434_byLabel-related-entity-type_contribute-main

Conversation

@alexandrevryghem
Copy link
Copy Markdown
Member

References

Description

Fixes the item edit relationships tab showing relationships under multiple labels when those relationship types have the same leftwardType/rightwardType (but different entity types).

Instructions for Reviewers

List of changes in this PR:

  • Passed the relatedEntityType to the request to retrieve the relationships of each individual relationship section

Guidance for how to test/review this PR: See #1387

Checklist

  • My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
  • My PR passes ESLint validation using yarn lint
  • My PR doesn't introduce circular dependencies (verified via yarn check-circ-deps)
  • My PR includes TypeDoc comments for all new (or modified) public methods and classes. It also includes TypeDoc for large or complex private methods.
  • My PR passes all specs/tests and includes new/updated specs or tests based on the Code Testing Guide.
  • If my PR includes new libraries/dependencies (in package.json), I've made sure their licenses align with the DSpace BSD License based on the Licensing of Contributions documentation.
  • If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
  • If my PR fixes an issue ticket, I've linked them together.

…into w2p-115434_byLabel-related-entity-type_contribute-main

# Conflicts:
#	src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
Copy link
Copy Markdown
Member

@tdonohue tdonohue left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Thanks @alexandrevryghem ! I've tested this today with the backend PR. I can verify that this fixes the bug with Person entities related to Publication were shown twice on the Publication entity's Relationship tab (under both Person and OrgUnit). This is easily reproduced on sandbox.dspace.org for any Publication with a related Person.

@tdonohue tdonohue added the port to dspace-7_x This PR needs to be ported to `dspace-7_x` branch for next bug-fix release label Jun 4, 2024
@tdonohue tdonohue merged commit 1de8423 into DSpace:main Jun 7, 2024
@tdonohue tdonohue added this to the 8.0 milestone Jun 7, 2024
@dspace-bot
Copy link
Copy Markdown
Contributor

Backport failed for dspace-7_x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin dspace-7_x
git worktree add -d .worktree/backport-3098-to-dspace-7_x origin/dspace-7_x
cd .worktree/backport-3098-to-dspace-7_x
git switch --create backport-3098-to-dspace-7_x
git cherry-pick -x 38916ae5e70f43b3176941ce2943248288bd0bf5

@tdonohue
Copy link
Copy Markdown
Member

tdonohue commented Jun 7, 2024

Manual port to 7.x in #3107

@tdonohue tdonohue removed the port to dspace-7_x This PR needs to be ported to `dspace-7_x` branch for next bug-fix release label Jun 7, 2024
@alexandrevryghem alexandrevryghem deleted the w2p-115434_byLabel-related-entity-type_contribute-main branch June 7, 2024 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug claimed: Atmire Atmire team is working on this issue & will contribute back component: configurable entities related to configurable entities configuration high priority

Projects

No open projects
Status: ✅ Done

Development

Successfully merging this pull request may close these issues.

Entities relations with invalid associations shown

3 participants