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
Revert bubble choice progress tab updates that weren't ready to go out #35180
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎉 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice job getting this over the finish line! The screenshots look great!
if (levels[levelIndex].sublevels) { | ||
// TODO: import SMALL_DOT_SIZE from progressStyles | ||
// TODO: make consistent with multiGridConstants | ||
width = width + levels[levelIndex].sublevels.length * 18; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If these items are yet to be done, is this work captured anywhere else? If it's done, we probably don't need the comments :)
@@ -168,39 +168,6 @@ def user_summary(user) | |||
# if we have a contained level or BubbleChoice level, use that to represent progress | |||
level = Level.cache_find(level_id) | |||
sublevel_id = level.is_a?(BubbleChoice) ? level.best_result_sublevel(user)&.id : nil | |||
if level.is_a?(BubbleChoice) # we have a parent level |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it would be awesome to DRY this up by extracting lines 174-200 and 206-232, which are very similar, into a helper function.
if completion_status == LEVEL_STATUS.not_tried | ||
# for now, we don't allow authorized teachers to be "locked" | ||
if locked && !user.authorized_teacher? | ||
levels[level_id] = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should this be sublevel_id
?
I accidentally merged #34986 via the command line and then created a big ol' knot and couldn't revert cleanly. See this discussion for details.
I used
git checkout <commit> -- <files>
to create this PR that reverses the changes in #34986