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

Hide annotations in speedgrader #2227

Merged
merged 3 commits into from
Nov 15, 2024
Merged

Hide annotations in speedgrader #2227

merged 3 commits into from
Nov 15, 2024

Conversation

jlge
Copy link
Contributor

@jlge jlge commented Oct 3, 2024

Description

  • Allow users to hide annotations in speedgrader view

Motivation and Context

Resolves #2203

How Has This Been Tested?

As instructor

  • go to speedgrader for assignment, see that it works
  • see that when comments are hidden, new annotations that are created are still hidden

As student

  • go to assessment with comments on it
  • view files, and see that it works

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have run rubocop and erblint for style check. If you haven't, run overcommit --install && overcommit --sign to use pre-commit hook for linting
  • My change requires a change to the documentation, which is located at Autolab Docs
  • I have updated the documentation accordingly, included in this PR

Other issues / help required

If unsure, feel free to submit first and we'll help you along.

Copy link
Contributor

coderabbitai bot commented Oct 3, 2024

📝 Walkthrough

Walkthrough

The pull request introduces new JavaScript functions and HTML elements to enhance the visibility control of annotations within the application. Specifically, it adds functions to show and hide annotations and integrates these functionalities into the user interface through new buttons. The changes ensure that annotations can be toggled based on user interactions, improving the overall user experience for instructors and course assistants.

Changes

File Change Summary
app/assets/javascripts/annotations.js Added functions: commentsVisible, hideAnnotations, showAnnotations. Updated submitNewAnnotation to conditionally append annotations based on visibility. Modified initializeAnnotationsForPDF to incorporate visibility logic.
app/views/submissions/view.html.erb Added "Hide Comments" and "Show Comments" buttons, which call hideAnnotations() and showAnnotations(). Buttons conditionally rendered for instructors and course assistants.

Assessment against linked issues

Objective Addressed Explanation
Have option to hide annotations in speedgrader (#2203)

Possibly related PRs

  • Make annotation UI more compact #2208: The changes in this PR involve the addition of buttons that utilize the hideAnnotations() and showAnnotations() functions, which are also introduced in the main PR, indicating a direct connection in functionality related to annotation visibility.

Suggested reviewers

  • evanyeyeye

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (4)
app/views/submissions/view.html.erb (1)

149-150: LGTM! Consider reducing code duplication.

The addition of "Hide Comments" and "Show Comments" buttons to the student view is consistent with the PR objective of improving readability for all users. This implementation ensures that both instructors and students can benefit from the new feature.

To reduce code duplication, consider extracting the button HTML into a partial view that can be rendered in both the instructor and student sections. This would make future maintenance easier. Here's an example of how you could refactor this:

  1. Create a new partial file, e.g., _annotation_toggle_buttons.html.erb:
<button id="hideAnnotations" class="btn small" onclick="hideAnnotations()">Hide Comments</button>
<button id="showAnnotations" style="display: none;" class="btn small" onclick="showAnnotations()">Show Comments</button>
  1. Replace the button code in both sections with a render call:
<%= render partial: 'annotation_toggle_buttons' %>

This refactoring is optional but could improve code maintainability.

app/assets/javascripts/annotations.js (3)

1580-1585: LGTM: Effective implementation of hide annotations feature

The hideAnnotations() function correctly implements the feature to hide annotations. It properly toggles button visibility, removes annotation lines, and refreshes the UI.

Consider adding a CSS class to toggle visibility instead of directly manipulating style properties. This would improve separation of concerns:

-  document.getElementById("hideAnnotations").style.display = "none";
-  document.getElementById("showAnnotations").style.display = "inline-flex";
+  document.getElementById("hideAnnotations").classList.add("hidden");
+  document.getElementById("showAnnotations").classList.remove("hidden");

Then define the hidden class in your CSS:

.hidden {
  display: none !important;
}

1587-1592: LGTM: Well-implemented show annotations feature

The showAnnotations() function effectively implements the feature to show annotations. It correctly toggles button visibility, displays annotations, and refreshes the UI.

As suggested for hideAnnotations(), consider using CSS classes for toggling visibility:

-  document.getElementById("showAnnotations").style.display = "none";
-  document.getElementById("hideAnnotations").style.display = "inline-flex";
+  document.getElementById("showAnnotations").classList.add("hidden");
+  document.getElementById("hideAnnotations").classList.remove("hidden");

1345-1348: Overall implementation of hide/show annotations feature is solid

The new hide/show annotations feature is well-implemented with clear, distinct functions for each action (commentsVisible(), hideAnnotations(), and showAnnotations()). The integration with existing code, such as in submitNewAnnotation(), is done correctly.

For consistency and improved maintainability, consider extracting the button IDs into constants at the top of the file:

const HIDE_ANNOTATIONS_BUTTON_ID = "hideAnnotations";
const SHOW_ANNOTATIONS_BUTTON_ID = "showAnnotations";

Then use these constants throughout the code. This would make it easier to update button IDs if needed and reduce the risk of typos.

Also applies to: 1574-1592

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between be48fe4 and 8e9dc0b.

📒 Files selected for processing (2)
  • app/assets/javascripts/annotations.js (2 hunks)
  • app/views/submissions/view.html.erb (2 hunks)
🔇 Additional comments (4)
app/views/submissions/view.html.erb (2)

132-133: Great implementation! Fully addresses PR objectives.

The changes successfully implement the feature to hide annotations in the speedgrader, as requested in issue #2203. By adding toggle buttons for both instructors/course assistants and students, the implementation improves the user experience and enhances the readability of student submissions.

The changes are minimal, focused, and consistent, which reduces the risk of unintended side effects. Overall, this implementation effectively addresses the PR objectives and provides a valuable enhancement to the Autolab application.

Also applies to: 149-150


132-133: LGTM! Verify JavaScript functions.

The addition of "Hide Comments" and "Show Comments" buttons aligns well with the PR objective of allowing users to hide annotations in the speedgrader. The implementation is consistent with the existing UI.

Please ensure that the hideAnnotations() and showAnnotations() JavaScript functions are properly defined and functional. Run the following script to verify:

✅ Verification successful

JavaScript functions are present and correctly defined.

The hideAnnotations() and showAnnotations() functions exist in app/assets/javascripts/annotations.js and are correctly implemented.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the existence of hideAnnotations() and showAnnotations() functions

# Test: Search for the function definitions
rg --type js 'function (hide|show)Annotations\(\)'

Length of output: 186

app/assets/javascripts/annotations.js (2)

1345-1348: LGTM: New visibility check for annotation boxes

The added condition if (!commentsVisible()) ensures that new annotation boxes are only appended when comments are visible. This change aligns well with the new feature to hide/show annotations and is implemented correctly.


1574-1578: LGTM: Well-implemented visibility check function

The commentsVisible() function is a clean and effective way to determine if comments are currently visible. It uses getComputedStyle to reliably check the visibility of the "hideAnnotations" button, which is a good approach.

@jlge jlge requested review from a team and 20wildmanj and removed request for a team October 3, 2024 21:03
@20wildmanj
Copy link
Contributor

When you hide comments, you can still navigate to them using the annotations tab, but they aren't visible. Any thoughts on if they should become visible when you navigate to them?
Screenshot 2024-10-04 at 2 26 12 PM

Also, you can add annotations while annotations are hidden, and then the annotations are still hidden, not sure if that's the best user experience either.

Copy link
Contributor

@20wildmanj 20wildmanj left a comment

Choose a reason for hiding this comment

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

Code-wise looks fine and is functional, just some user-experience thoughts

@jlge
Copy link
Contributor Author

jlge commented Oct 4, 2024

When you hide comments, you can still navigate to them using the annotations tab, but they aren't visible. Any thoughts on if they should become visible when you navigate to them? Screenshot 2024-10-04 at 2 26 12 PM

Also, you can add annotations while annotations are hidden, and then the annotations are still hidden, not sure if that's the best user experience either.

Yeah I was thinking about what the behavior should be and I felt like consistent behavior made the most sense for me (all hidden or all shown) since it could get confusing, but having the ability to hide on a more granular level could be helpful too idk tbh,, I will ask around maybe

@jlge jlge added this pull request to the merge queue Nov 15, 2024
Merged via the queue into master with commit 14d5a5e Nov 15, 2024
5 checks passed
@jlge jlge deleted the joanna-hide-annotations branch November 15, 2024 11:11
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.

Have option to hide annotations in speedgrader
2 participants