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

Ensure channel ID is set on move change to trash tree #3590

Merged
merged 2 commits into from
Aug 29, 2022

Conversation

bjester
Copy link
Member

@bjester bjester commented Aug 29, 2022

Summary

Description of the change(s) you made

The trash tree root node doesn't have channel_id annotated on it, so when deleting resources which moves them to the trash tree, the corresponding change event was missing the channel_id since it relied on the destination node having it. This updates that logic to fallback to the source node's channel_id, which should only ever be the case for moving to the trash tree.

This also adds the channel ID to node creation, since as a side effect, creating a new topic/folder and then immediately trying to delete it would fail given the newly added defensive check that prevents unset channel_id on the change objet.

Manual verification steps performed

  1. Create a topic
  2. Delete a topic
  3. Ensure the deletion change is allowed by the sync endpoint
  4. Retry the above in quick succession

References

Fixes #3507

Comments


Contributor's Checklist

PR process:

  • If this is an important user-facing change, PR or related issue the CHANGELOG label been added to this PR. Note: items with this label will be added to the CHANGELOG at a later time
  • If this includes an internal dependency change, a link to the diff is provided
  • The docs label has been added if this introduces a change that needs to be updated in the user docs?
  • If any Python requirements have changed, the updated requirements.txt files also included in this PR
  • Opportunities for using Google Analytics here are noted
  • Migrations are safe for a large db

Studio-specifc:

  • All user-facing strings are translated properly
  • The notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)
  • All UI components are LTR and RTL compliant
  • Views are organized into pages, components, and layouts directories as described in the docs
  • Users' storage used is recalculated properly on any changes to main tree files
  • If there new ways this uses user data that needs to be factored into our Privacy Policy, it has been noted.

Testing:

  • Code is clean and well-commented
  • 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
  • Any new interactions have been added to the QA Sheet
  • Critical and brittle code paths are covered by unit tests

Reviewer's Checklist

This section is for reviewers to fill out.

  • 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

@bjester bjester requested a review from rtibbles August 29, 2022 19:51
Copy link
Member

@rtibbles rtibbles left a comment

Choose a reason for hiding this comment

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

Deletions were both allowed and successful, and did not reappear. Much rejoicing!

@rtibbles rtibbles merged commit 28d993e into learningequality:unstable Aug 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unstable - Deleted folders/resources keep reappearing
2 participants