Skip to content

Migrate graders_manager.jsx GroupsTable, GradersTable, CriteriaTable to React Table V8 - #8014

Merged
david-yz-liu merged 37 commits into
MarkUsProject:masterfrom
mrafie1:migrate-GradersManager-tables
Jun 23, 2026
Merged

Migrate graders_manager.jsx GroupsTable, GradersTable, CriteriaTable to React Table V8#8014
david-yz-liu merged 37 commits into
MarkUsProject:masterfrom
mrafie1:migrate-GradersManager-tables

Conversation

@mrafie1

@mrafie1 mrafie1 commented Jun 20, 2026

Copy link
Copy Markdown
Contributor

Proposed Changes

(Describe your changes here. Also describe the motivation for your changes: what problem do they solve, or how do they improve the application or codebase? If this pull request fixes an open issue, use a keyword to link this pull request to the issue.)

  • Added new filter component under table folder to include case sensitive filtering along side searching: case_sensitive_search_filter
    • Updated filter.jsx to allow this component to be displayed when filterVariant: "case-sensitive-text" is used
    • In case_sensitive_search_filter.jsx file, I updated the structure of filterValue
      • filterValue has a value attribute that contains the actual value to be filtered (Let me know if you want this name to be changed)
      • filterValue has a caseSensitive attribute which is a boolean with the default value of false. This changes when the user toggles the caseSensitive checkbox.
  • Updated search_filter.jsx aria-label definition
    • Updated defaultSearchPlaceholderText to take in optional parameter header
  • Migrated GradersTable, GroupsTable, and CriteriaTable to React Table V8
    • Added functions that were previously present in V6 implementation: getSelectedRows() and resetSelection()
    • Mimicked the previous implementation defining of columns
    • Mimicked https://github.com/MarkUsProject/Markus/pull/7826 props input to <Table>
    • GradersTable
      • Added ComponentDidUpdate function so that it updates the state attribute columnFilters when toggling display inactive graders checkbox
    • GroupsTable
      • Edited ComponentDidUpdate function so that it updates the state attribute columnFilters when toggling display inactive groups checkbox
      • Edited filtering function for group_name row to filter the filterValue filterValue.filterValue, and filter based on case sensitivity if filterValue.caseSensitive is true.
Screenshots of your changes (if applicable) See [link](https://github.com//pull/8002)
Associated documentation repository pull request (if applicable)

Type of Change

(Write an X or a brief description next to the type or types that best describe your changes.)

Type Applies?
🚨 Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change that adds functionality)
🐛 Bug fix (non-breaking change that fixes an issue)
🎨 User interface change (change to user interface; provide screenshots)
♻️ Refactoring (internal change to codebase, without changing functionality) x
🚦 Test update (change that only adds or modifies tests)
📦 Dependency update (change that updates a dependency)
🔧 Internal (change that only affects developers or continuous integration)

Checklist

(Complete each of the following items for your pull request. Indicate that you have completed an item by changing the [ ] into a [x] in the raw text, or by clicking on the checkbox in the rendered description on GitHub.)

Before opening your pull request:

  • I have performed a self-review of my changes.
    • Check that all changed files included in this pull request are intentional changes.
    • Check that all changes are relevant to the purpose of this pull request, as described above.
  • I have added tests for my changes, if applicable.
    • This is required for all bug fixes and new features.
  • I have updated the project documentation, if applicable.
    • This is required for new features.
  • If this is my first contribution, I have added myself to the list of contributors.

After opening your pull request:

  • I have updated the project Changelog (this is required for all changes).
  • I have verified that the pre-commit.ci checks have passed.
  • I have verified that the CI tests have passed.
  • I have reviewed the test coverage changes reported by Coveralls.
  • I have requested a review from a project maintainer.

Questions and Comments

(Include any questions or comments you have regarding your changes.)

About the criteria and section column of the groupTable, the functionality works.
Now the issue is that the spacing is a bit weird with tables that have showCoverage = true. The "graders" column data covers/overlaps the "coverage" column data. Only slightly adjusting the widths of the columns fixes the problem. Not sure how to approach this issue. I'll tinker a little bit with the minSize attributes of the column, but let me know if this is within scope of my task.

Images of issue:
Before slightly adjusting column widths using mouse pointer:
Screenshot 2026-06-21 at 16 09 17

After:
Screenshot 2026-06-21 at 16 09 24

In regard to Git, I had to close my previous pull request. Running Git Pull Upstream Master caused all of the previous changes made by other peers to be present in my PR, including line count and file changes. I ended up opening this PR, and the line updates/file changes reflect my actual work. However, the commits/contributors have carried over. I've asked some of the MarkUs people for help, and I've tried rebasing, but I'm still encountering this issue.

mrafie1 and others added 27 commits June 13, 2026 12:01
…Updated filter.jsx to account for new component
Bumps [dayjs](https://github.com/iamkun/dayjs) from 1.11.13 to 1.11.21.
- [Release notes](https://github.com/iamkun/dayjs/releases)
- [Changelog](https://github.com/iamkun/dayjs/blob/dev/CHANGELOG.md)
- [Commits](iamkun/dayjs@v1.11.13...v1.11.21)

---
updated-dependencies:
- dependency-name: dayjs
  dependency-version: 1.11.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [action_policy](https://github.com/palkan/action_policy) from 0.7.5 to 0.7.6.
- [Release notes](https://github.com/palkan/action_policy/releases)
- [Changelog](https://github.com/palkan/action_policy/blob/master/CHANGELOG.md)
- [Commits](palkan/action_policy@v0.7.5...v0.7.6)

---
updated-dependencies:
- dependency-name: action_policy
  dependency-version: 0.7.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.4.0 to 3.4.9.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.4.0...3.4.9)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-version: 3.4.9
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [playwright](https://github.com/microsoft/playwright-python) from 1.59.0 to 1.60.0.
- [Release notes](https://github.com/microsoft/playwright-python/releases)
- [Commits](microsoft/playwright-python@v1.59.0...v1.60.0)

---
updated-dependencies:
- dependency-name: playwright
  dependency-version: 1.60.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
updates:
- [github.com/thibaudcolas/pre-commit-stylelint: v17.10.0 → v17.12.0](thibaudcolas/pre-commit-stylelint@v17.10.0...v17.12.0)
- [github.com/rubocop/rubocop: v1.86.1 → v1.87.0](rubocop/rubocop@v1.86.1...v1.87.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Bumps the rjsf group with 2 updates: [@rjsf/core](https://github.com/rjsf-team/react-jsonschema-form) and [@rjsf/validator-ajv8](https://github.com/rjsf-team/react-jsonschema-form).


Updates `@rjsf/core` from 6.5.2 to 6.6.1
- [Release notes](https://github.com/rjsf-team/react-jsonschema-form/releases)
- [Changelog](https://github.com/rjsf-team/react-jsonschema-form/blob/main/CHANGELOG.md)
- [Commits](rjsf-team/react-jsonschema-form@6.5.2...6.6.1)

Updates `@rjsf/validator-ajv8` from 6.5.2 to 6.6.1
- [Release notes](https://github.com/rjsf-team/react-jsonschema-form/releases)
- [Changelog](https://github.com/rjsf-team/react-jsonschema-form/blob/main/CHANGELOG.md)
- [Commits](rjsf-team/react-jsonschema-form@6.5.2...6.6.1)

---
updated-dependencies:
- dependency-name: "@rjsf/core"
  dependency-version: 6.6.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rjsf
- dependency-name: "@rjsf/validator-ajv8"
  dependency-version: 6.6.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: rjsf
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.4.9 to 3.4.11.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.4.9...3.4.11)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-version: 3.4.11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.19.3...v1.19.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-version: 1.19.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…8011)

Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.3.6 to 1.3.7.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](ruby-concurrency/concurrent-ruby@v1.3.6...v1.3.7)

---
updated-dependencies:
- dependency-name: concurrent-ruby
  dependency-version: 1.3.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@mrafie1 mrafie1 changed the title Migrate graders manager tables Migrate graders_manager.jsx GroupsTable, GradersTable, CriteriaTable to React Table V8 Jun 20, 2026
@mrafie1
mrafie1 marked this pull request as draft June 20, 2026 19:23
@mrafie1
mrafie1 marked this pull request as ready for review June 21, 2026 18:38
@mrafie1
mrafie1 requested a review from david-yz-liu June 21, 2026 18:41
@coveralls

coveralls commented Jun 21, 2026

Copy link
Copy Markdown
Collaborator

Coverage Report for CI Build 27990030644

Coverage decreased (-0.08%) to 90.187%

Details

  • Coverage decreased (-0.08%) from the base build.
  • Patch coverage: 42 uncovered changes across 1 file (47 of 89 lines covered, 52.81%).
  • 6 coverage regressions across 2 files.

Uncovered Changes

File Changed Covered %
app/javascript/Components/graders_manager.jsx 77 35 45.45%
Total (4 files) 89 47 52.81%

Coverage Regressions

6 previously-covered lines in 2 files lost coverage.

File Lines Losing Coverage Coverage
app/javascript/Components/graders_manager.jsx 4 39.76%
app/javascript/Components/Helpers/table_helpers.jsx 2 33.94%

Coverage Stats

Coverage Status
Relevant Lines: 50475
Covered Lines: 46531
Line Coverage: 92.19%
Relevant Branches: 2352
Covered Branches: 1112
Branch Coverage: 47.28%
Branches in Coverage %: Yes
Coverage Strength: 127.2 hits per line

💛 - Coveralls

@david-yz-liu david-yz-liu left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

@mrafie1 nice work! The changes look good. In response to your comments:

  1. About the row rendering issue: after inspecting the raw HTML, I found that the "coverage" cell was not being rendered for each row. This is because the TableRow component is memoized, so when only the columns prop of Table changes, that isn't triggering a re-render. I fixed a similar earlier by passing a columnSizing prop to TableRow; you can pass the columns directly (and update the React.memo call for TableRow) to force a re-render.
  2. Not sure about the git issue you faced, but please make sure your git config pull.rebase is set to false (git config pull.rebase false) to avoid accidentally doing a rebase.

Comment thread Changelog.md Outdated
Comment thread app/javascript/Components/graders_manager.jsx Outdated
Comment thread app/javascript/Components/graders_manager.jsx
@mrafie1
mrafie1 requested a review from david-yz-liu June 22, 2026 23:06

@david-yz-liu david-yz-liu left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Nice work, @mrafie1!

@david-yz-liu
david-yz-liu merged commit 991bb2e into MarkUsProject:master Jun 23, 2026
6 of 7 checks passed
akarki2005 pushed a commit to akarki2005/Markus that referenced this pull request Jun 23, 2026
@mrafie1
mrafie1 deleted the migrate-GradersManager-tables branch June 24, 2026 14:46
@david-yz-liu david-yz-liu added this to the v2.10.1 milestone Jul 14, 2026
Naragod added a commit that referenced this pull request Jul 27, 2026
* Implement GET and PATCH /overall_comment API routes (#7963)

Closes #7708

* build(deps): bump puma from 7.2.0 to 7.2.1 (#7994)

Bumps [puma](https://github.com/puma/puma) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/main/History.md)
- [Commits](puma/puma@v7.2.0...v7.2.1)

---
updated-dependencies:
- dependency-name: puma
  dependency-version: 7.2.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump dompurify from 3.4.0 to 3.4.9 (#8005)

Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.4.0 to 3.4.9.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.4.0...3.4.9)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-version: 3.4.9
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Refactored SubmissionFilePanel subcomponents into functional style (#7969)

* build(deps): bump net-imap from 0.6.4 to 0.6.4.1 (#7995)

Bumps [net-imap](https://github.com/ruby/net-imap) from 0.6.4 to 0.6.4.1.
- [Release notes](https://github.com/ruby/net-imap/releases)
- [Commits](ruby/net-imap@v0.6.4...v0.6.4.1)

---
updated-dependencies:
- dependency-name: net-imap
  dependency-version: 0.6.4.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps): bump dompurify from 3.4.9 to 3.4.11 (#8009)

Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.4.9 to 3.4.11.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.4.9...3.4.11)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-version: 3.4.11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Added missing NOT NULL db constraints and presence validations (#7965)

Issues detected by active_record_doctor

* build(deps): bump nokogiri from 1.19.3 to 1.19.4 (#8010)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.19.3 to 1.19.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](sparklemotion/nokogiri@v1.19.3...v1.19.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-version: 1.19.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* build(deps-dev): bump ws from 8.18.3 to 8.21.1 (#8058)

Bumps [ws](https://github.com/websockets/ws) from 8.18.3 to 8.21.1.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](websockets/ws@8.18.3...8.21.1)

---
updated-dependencies:
- dependency-name: ws
  dependency-version: 8.21.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Added case sensitivity to group search (#7938)

This adds a new caseSensitiveTextFilter table component for doing case-sensitive search.

* build(deps): bump concurrent-ruby from 1.3.6 to 1.3.7 (#8011)

Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.3.6 to 1.3.7.
- [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases)
- [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md)
- [Commits](ruby-concurrency/concurrent-ruby@v1.3.6...v1.3.7)

---
updated-dependencies:
- dependency-name: concurrent-ruby
  dependency-version: 1.3.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Refactored group creation to set group_name and repo_name pre-validation (#7975)

Also add NOT NULL constraint to groups.group_name column

* Simplified Chart.js usage (#7987)

* Migrated MarkingSchemesTable to React Table v8 (#7985)

* Fixed merge commits being incorrectly attributed as latest submission (#7988)

When an instructor cloned a student repo, made a local commit, then merged and
pushed, the merge commit was treated as the latest submission for the student's
files. This inflated late penalties and showed the instructor's name as author.

`entry_changed?` returned true for a merge commit whenever the file differed from
*any* parent — including the instructor's branch that simply didn't have the file
yet. The fix: for merge commits (2+ parents), only return true when the result
differs from *all* parents. If the merged content matches at least one parent the
merge was trivial for that path and should not be counted as a new modification.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

* Refactored criterion keyboard navigation (#7989)

* Moved criterion and level keyboard handlers into React components (MarksPanel and RubricCrtierionInput)
* Fixed keyboard criterion navigation when flexible/checkbox inputs were focused
* Ensured criterion navigation causes selected criterion to scroll into view

---------

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

* Fixed navbar MarkUs logo link URL on mobile (#7990)

* Added confirmation when uploading scans for a template with no divisions (#7993)

* Fixed tester spec upload when spec contains non-existent criterion (#7998)

Closes #7528

* Migrated SummaryPanel marks chart modal to use react-modal (#7996)

* Added release process automation scripts (#7914)

* Fixed SVG rendering by converting base64 SVG data URIs to inline <svg> (#8001)

* Added pagination to Admin Users table for performance (#7997)

* Added confirm dialog when a student submits during late period (#8003)

* Reorganized locale strings from config/locales/en.yml (#8012)

* Used native HTML required validation on modal upload inputs (#8016)

* Refactored group creation job updates to use websockets (#8020)

* Updated database indexes (#8018)

- Enforce model uniqueness validations
- Remove redundant indexes

These were detected by active_record_doctor:missing_unique_indexes and active_record_doctor:extraneous_indexes.

* Migrated graders_manager.jsx tables to react-table v8 (#8014)

* Support all annotation types in add_annotations API route (#8007)

* Fixed result annotation links to display correct file (#8017)

* Updated PDFViewer to persist PDF scroll across submissions (#8004)

* Added assignment grades upload feature (#8008)

* bump jwt from 2.10.3 to 3.2.0 (#8039)

* Fix LTI test JWK fixture to use 2048-bit key for jwt 3.0 compatibility

* Fixed selection column header checkbox in v8 tables (#8037)

* Added migrations to add missing timestamp columns and foreign key constraints (#8040)

* Fixed assignment dropdown menu redirection from Assignments#index (#8043)

* Fixed escaping of HTML annotation start_node and end_node attributes (#8064)

* update changelog with new release v2.10.1 [ci skip]

* update markus version

* Fix rubocop ArrayIntersect and spec path offenses

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Install postgresql-client-17 for CI pg_dump compatibility

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: philipkukulak <philip.kukulak@utoronto.ca>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: David Liu <david@cs.toronto.edu>
Co-authored-by: Yanzhen Chen <yanzhenchen123@gmail.com>
Co-authored-by: Muhammad <rafie.muhammad2007@gmail.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Daniel Rafailov <74218740+danielrafailov1@users.noreply.github.com>
Co-authored-by: donny-wong <141858744+donny-wong@users.noreply.github.com>
Co-authored-by: Aayush Karki <147123757+akarki2005@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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.

6 participants