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

Fixes undo button on snackbar #4149

Merged
merged 1 commit into from
Jun 20, 2023

Conversation

akolson
Copy link
Member

@akolson akolson commented Jun 16, 2023

Summary

Description of the change(s) you made

This pr fixes the failure of the undo button to revert back the changes on delete a resource(s) in a channel.

Screenshots (if applicable)

Screen.Recording.2023-06-16.at.20.54.46.mov

Does this introduce any tech-debt items?

No

Reviewer guidance

How can a reviewer test these changes?

  • Login into studio
  • Select a particular channel
  • Try to delete a resource by checking an item(s) and clicking on the "Delete" icon
  • You will be presented with a Snackbar with a success message and an UNDO button to undo the changes made
  • Click the undo button before the Snackbar dismisses.

References

Fixes #4116

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

Copy link
Member

@bjester bjester left a comment

Choose a reason for hiding this comment

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

It works!

Requesting that we refactor usage of oldParent to use oldObj.parent now that we're persisting oldObj on the change event.

this.setAndValidateIsDefined(target, 'target');
this.setAndValidateLookup(position, 'position', RELATIVE_TREE_POSITIONS_LOOKUP);
this.setAndValidateIsDefined(parent, 'parent');
this.setAndValidateIsDefined(oldParent, 'oldParent');
this.setAndValidateIsDefined(oldObj.parent, 'oldParent');
Copy link
Member

Choose a reason for hiding this comment

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

We really don't need to setAndValidateIsDefined both oldObj and oldParent since, as your change here suggests, the oldParent is accessible via oldObj. So I think we should remove oldParent and update usages of oldParent to use oldObj.parent instead.

@akolson akolson requested a review from bjester June 20, 2023 14:24
@akolson
Copy link
Member Author

akolson commented Jun 20, 2023

The usage of oldObj.parent has been streamlined

Copy link
Member

@bjester bjester left a comment

Choose a reason for hiding this comment

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

Nice work! Undoing a deletion works and resource count tracking still works 👍

@bjester bjester merged commit 7efe06a into learningequality:hotfixes Jun 20, 2023
@pcenov
Copy link
Member

pcenov commented Jun 21, 2023

Hi @akolson while testing this I noticed that it still doesn't work if the item being deleted is the last one in the folder or the last remaining folder/resource in the channel.

Video:

undo.mp4

Error in the console:

2023-06-21_17-22-32

@akolson
Copy link
Member Author

akolson commented Jun 21, 2023

@pcenov , Thanks! let me look into this

@bjester
Copy link
Member

bjester commented Jun 21, 2023

@akolson since the deletion was the last resource in a folder, I'm guessing there might be an API call being triggered to grab the children (eventual siblings) for the folder where it should re-appear. Such async invocations do not play well within Dexie transactions.

@akolson
Copy link
Member Author

akolson commented Jun 21, 2023

Yeah, it looks like the async/wait invocations are causing issues

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants