Skip to content
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.

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

Handle duplicate resources #8716

Merged

Conversation

rtibbles
Copy link
Member

@rtibbles rtibbles commented Nov 17, 2021

Summary

  • Adds utility function for deduplicating arrays of ContentNodes by content_id
  • Groups together and then adds a copies property to the ContentNodes with all of the nodes therein
  • Uses currently activated language code in an attempt to surface the most relevant node to the user out of the duplicates
  • Uses this in both search results and resumable content node display

References

Fixes #8700
Fixes #8498

Reviewer guidance

Does the styling and placement of everything look correct?

Flagging that this does produce slightly unpredictable counts of search results due to the deduplication, but I think it is still preferable to displaying the duplicates, especially in restricted searches.

Resume duplicates
resumeduplicate

Search duplicates (failure to render is because I don't actually have the exercise imported locally)
searchduplicates


Testing checklist

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

PR process

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Reviewer checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@rtibbles rtibbles added the TODO: needs review Waiting for review label Nov 17, 2021
@rtibbles rtibbles added this to the 0.15.0 milestone Nov 17, 2021
@radinamatic
Copy link
Member

produce slightly unpredictable counts of search results due to the deduplication, but I think it is still preferable to displaying the duplicates, especially in restricted searches.

💯 ✖️ 💯

Manual testing passes, I'm not able to see duplicates in 'Home' or 'Library > Recent'! 👍🏽

Copy link
Member

@radinamatic radinamatic left a comment

Choose a reason for hiding this comment

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

:shipit: 👏🏽

@marcellamaki marcellamaki merged commit 31fbee4 into learningequality:release-v0.15.x Nov 17, 2021
@rtibbles rtibbles deleted the i_think_im_a_clone_now branch November 17, 2021 22:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TODO: needs review Waiting for review
Projects
None yet
3 participants