Merge pull request #7636 from donny-wong/release_2.8.0

Release 2.8.0

Author: donny-wong

.dockerfiles/entrypoint-dev-deps-updater.sh

@@ -30,10 +30,6 @@ printf "[MarkUs] Running pip install -q -r requirements-scanner.txt..."
 if ./venv/bin/python3 -m pip install -q -r requirements-scanner.txt; then
   printf " \e[32m✔\e[0m \n"
 fi
-printf "[MarkUs] Running pip install -q -r requirements-qr.txt..."
-if ./venv/bin/python3 -m pip install -q -r requirements-qr.txt; then
-  printf " \e[32m✔\e[0m \n"
-fi
 
 # Install chromium (for nbconvert webpdf conversion)
 printf "[MarkUs] Running playwright install chromium..."

.erb_lint.yml

@@ -0,0 +1,10 @@
+---
+EnableDefaultLinters: true
+linters:
+  NoJavascriptTagHelper:
+    enabled: false
+  ErbSafety:
+    enabled: false  # TODO: enable this
+    better_html_config: .better-html.yml
+  Rubocop:
+    enabled: false  # TODO: enable this

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,6 @@
 ## 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](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword).)*
 
-...
 
 <details>
 <summary>Screenshots of your changes (if applicable)</summary>
@@ -40,7 +39,7 @@ Before opening your pull request:
   - 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.
+- [ ] If this is my first contribution, I have added myself to the [list of contributors](https://github.com/MarkUsProject/Markus/blob/master/doc/markus-contributors.txt).
 
 After opening your pull request:
 

.github/dependabot.yml

@@ -5,21 +5,15 @@ updates:
   schedule:
     interval: monthly
     time: "10:00"
-  open-pull-requests-limit: 10
 - package-ecosystem: npm
   directory: "/"
   schedule:
     interval: monthly
     time: "10:00"
-  open-pull-requests-limit: 10
   ignore:
   - dependency-name: react-table
     versions:
     - "> 6.9.2"
-  - dependency-name: webpack
-    versions:
-    - 5.19.0
-    - 5.24.2
   groups:
     babel:
       patterns:
@@ -30,6 +24,10 @@ updates:
     rails:
       patterns:
         - "@rails*"
+    react:
+      patterns:
+        - "react"
+        - "react-dom"
     rjsf:
       patterns:
         - "@rjsf*"

.github/workflows/test_ci.yml

@@ -7,7 +7,7 @@ on:
       - master
 
 jobs:
-  test:
+  test_rspec:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-22.04
     services:
@@ -37,7 +37,6 @@ jobs:
     env:
       BUNDLE_WITHOUT: development:production:console:unicorn
       RAILS_ENV: test
-      NODE_ENV: test
       RSPEC_RENDER_VIEWS: true
     permissions:
       contents: read
@@ -47,7 +46,7 @@ jobs:
       - name: Install system dependencies
         run: |
           sudo apt-get update
-          sudo apt-get -yqq install libpq-dev cmake ghostscript pandoc imagemagick libmagickwand-dev git libgl1 tesseract-ocr pandoc
+          sudo apt-get -yqq install libpq-dev cmake ghostscript pandoc imagemagick libmagickwand-dev git libgl1 tesseract-ocr pandoc poppler-utils
       - name: Set up ruby and cache gems
         uses: ruby/setup-ruby@v1
         with:
@@ -72,7 +71,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-jupyter.txt') }}-${{ hashFiles('requirements-scanner.txt') }}-${{ hashFiles('requirements-qr.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('requirements-jupyter.txt') }}-${{ hashFiles('requirements-scanner.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
       - name: Cache playwright's installation of Chromium
@@ -85,7 +84,7 @@ jobs:
       - name: Install python packages and playwright dependencies
         run: |
           python3.10 -m venv venv
-          ./venv/bin/pip install -r requirements-jupyter.txt -r requirements-scanner.txt -r requirements-qr.txt
+          ./venv/bin/pip install -r requirements-jupyter.txt -r requirements-scanner.txt
           ./venv/bin/playwright install chromium
           ./venv/bin/playwright install-deps chromium
       - name: Configure server
@@ -119,6 +118,52 @@ jobs:
           flag-name: rspec
           parallel: true
           file: coverage/lcov.info
+
+  test_jest:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-22.04
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+          --entrypoint redis-server
+    permissions:
+      contents: read
+    env:
+      RAILS_ENV: test
+      NODE_ENV: test
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Set up ruby and cache gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby-3.3
+          bundler-cache: true
+      - name: Configure server
+        run: |
+          sudo rm -f /etc/localtime
+          sudo ln -s /usr/share/zoneinfo/US/Eastern /etc/localtime
+          sudo sed -ri 's/(rights=")none("\s+pattern="PDF")/\1read\2/' /etc/ImageMagick-6/policy.xml
+          cp config/database.yml.ci config/database.yml
+      - name: Export i18n translations
+        run: bundle exec rake i18n:js:export
+      - name: Build assets
+        run: |
+          bundle exec rake javascript:build
+      - name: Set up node and cache packages
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+          cache: npm
+      - name: Install npm packages
+        run: npm ci
       - name: Run jest tests
         run: npm run test-cov
       - name: Coveralls Parallel (jest)
@@ -130,7 +175,7 @@ jobs:
           file: coverage/lcov.info
 
   finish:
-    needs: test
+    needs: [test_rspec, test_jest]
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-22.04
     permissions:

.pre-commit-config.yaml

@@ -17,12 +17,12 @@ repos:
         -   id: end-of-file-fixer
         -   id: trailing-whitespace
   -   repo: https://github.com/rbubley/mirrors-prettier
-      rev: v3.5.3
+      rev: v3.6.2
       hooks:
         - id: prettier
           types_or: [javascript, jsx, css, scss, html]
   -   repo: https://github.com/thibaudcolas/pre-commit-stylelint
-      rev: v16.18.0
+      rev: v16.21.1
       hooks:
         - id: stylelint
           additional_dependencies: [
@@ -39,7 +39,7 @@ repos:
               app/assets/stylesheets/common/_reset.scss
             )$
   - repo: https://github.com/rubocop/rubocop
-    rev: v1.75.2
+    rev: v1.77.0
     hooks:
       - id: rubocop
         args: ["--autocorrect"]
@@ -58,6 +58,21 @@ repos:
           - rubocop-rspec:3.2.0
           - rubocop-rspec_rails:2.30.0
           - rubocop-capybara:2.21.0
+  - repo: local
+    hooks:
+      - id: erb_lint
+        name: erb_lint
+        entry: erb_lint
+        language: ruby
+        types: ["erb"]
+        args: ["--autocorrect"]
+        exclude: |
+          (?x)^(
+          .*.xml.erb|
+          .*/assign_scans.html.erb
+          )$
+        additional_dependencies:
+          - erb_lint:0.9.0
 
 exclude: vendor
 

.rubocop.yml

@@ -2,9 +2,10 @@ require:
   - rubocop-rails
   - rubocop-performance
   - rubocop-factory_bot
-  - rubocop-rspec
   - rubocop-rspec_rails
   - rubocop-capybara
+plugins:
+  - rubocop-rspec
 
 AllCops:
   Exclude:
@@ -146,7 +147,10 @@ Naming/AccessorMethodName:
 Naming/MethodParameterName:
   MinNameLength: 1
 
-Naming/PredicateName:
+Naming/PredicateMethod:
+  Enabled: false
+
+Naming/PredicatePrefix:
   Enabled: false
 
 # Performance checks
@@ -283,6 +287,9 @@ Style/DocumentDynamicEvalDefinition:
 Style/Documentation:
   Enabled: false
 
+Style/EmptyStringInsideInterpolation:
+  Enabled: false
+
 # Enable this when we upgrade to Ruby version 3.0+
 Style/EndlessMethod:
   EnforcedStyle: disallow

Changelog.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## [v2.8.0]
+
+### 🚨 Breaking changes
+
+### ✨ New features and improvements
+- Improved layout and labeling in the assignment settings form for both standard and timed assessments. (#7531)
+- Design improvement of tables when the data is empty. (#7557)
+- Improved Assignment view for students (#7533)
+- Added average annotations section in Assignment Summary (#7559)
+- Maintain font size in grading view (#7525)
+- Replaced assignment summary statistics in the "Status" column on the instructor Assignments page with a link to the grades page. (#7560)
+- Renamed the "Summary" sub-tab label to "Grades" in the Assignment interface. (#7560)
+- Replaced "Edit" and "Delete" action text links with Font Awesome icons across all tables. (#7595)
+- Create User class method to retrieve orphaned users (#7633)
+
+### 🐛 Bug fixes
+- Added host authorization setting for Resque (#7562)
+
+### 🔧 Internal changes
+
+- Updated `test_ci.yml`, making GitHub Actions run rspec and jest tests in parallel. (#7634)
+- Remove `activerecord-session_store` gem (#7517)
+- Upgrade to Rails 8 (#7504)
+- Add tests for `#new` and `#create` actions in `CriteriaController` (#7521)
+- Add tests for `#edit` and `#update` when user is trying to change criteria in `CriteriaController` (#7527)
+- Remove the placeholder "..." text under the "Proposed changes" section in `PULL_REQUEST_TEMPLATE.md`. (#7524)
+- Update the checklist in `PULL_REQUEST_TEMPLATE.md` to make the text "list of contributors" a link to the file in the repository. (#7524)
+- Enabled `erb_lint` linter for erb files (#7561)
+- Refactored the loading method of `javascripts/Results/context_menu.js`. (#7563)
+- Added test metadata examples to seed data for R autotesting (#7564)
+- Refactored the method of loading `javascripts/Results/keybinding.js` in `submission_selector.jsx` (#7566)
+- Moved QR scanning to external python package markus_exam_matcher (#7567)
+- Updated the instructor table to use `@tanstack/react-table` v8 (#7589)
+- Refactor `DropDownMenu` class to a new React component (#7592)
+- Updated the tag table and "one time only annotations" table to use `@tanstack/react-table` v8 (#7596)
+- Updated Python autotest script file to include example of using `pytest.mark` to customize test marks (#7597)
+- Refactor `Grader` table in `Users` to use `@tanstack/react-table` v8 (#7598)
+- Updated `dependabot.yml` to add React dependency group and increase, remove old webpack ignored versions, and remove open PR limits (#7627)
+- Improved performance of PDF splitting for scanned assessments (#7632)
+
 ## [v2.7.1]
 
 ### 🐛 Bug fixes
@@ -25,6 +65,7 @@
 - Allow creating image annotations from a test run's outputs (#7486)
 - Added an API that collects a single submission (#7494)
 - Enable removal of a student from a course (#7480)
+- Changed the PDF scanning job separate the student matching process into its own job. (#7499)
 
 ### 🐛 Bug fixes
 
@@ -57,6 +98,7 @@
 - Update Python version to 3.13 in seed autotest schemas (#7388)
 - Rename jupyter notebook content functions and files to generalize to html content (#7391)
 - Update to React v18 (#7392)
+- Refactor querying on dashboard graph to query per-assignment rather than per-TA (#7420)
 - Remove unused Javascript files (#7442)
 - Refactor scanned test generation and test splitting from polling to websockets (#7428)
 - Move Docker dependency updates into separate service (#7451)

Gemfile

@@ -8,7 +8,7 @@ source 'https://rubygems.org'
 
 # Bundler requires these gems in all environments
 gem 'puma'
-gem 'rails', '~> 7.2.2'
+gem 'rails', '~> 8.0.2'
 gem 'sprockets'
 gem 'sprockets-rails'
 
@@ -37,16 +37,16 @@ gem 'histogram'
 # Internationalization
 gem 'i18n'
 gem 'i18n-js'
-gem 'rails-i18n', '~> 7.0.10'
+gem 'rails-i18n', '~> 8.0.1'
 
 # Redis
-gem 'redis', '~> 5.4.0'
+gem 'redis', '~> 5.4.1'
 
 # Exam template requirements
 gem 'combine_pdf'
 gem 'prawn'
 gem 'prawn-qrcode'
-gem 'rmagick', '~> 6.1.1'
+gem 'rmagick', '~> 6.1.2'
 gem 'rtesseract'
 
 # Ruby miscellany
@@ -59,7 +59,6 @@ gem 'rugged'
 
 # Rails miscellany
 gem 'activemodel-serializers-xml'
-gem 'activerecord-session_store'
 gem 'config'
 gem 'cookies_eu'
 gem 'dry-validation'  # For settings schema validation
@@ -93,7 +92,7 @@ group :test do
   gem 'rails-controller-testing'
   gem 'shoulda-callback-matchers', '~> 1.1.1'
   gem 'shoulda-context', '~> 3.0.0.rc1'
-  gem 'shoulda-matchers', '~> 6.0'
+  gem 'shoulda-matchers', '~> 6.5'
   gem 'simplecov', require: false
   gem 'simplecov-lcov', require: false
   gem 'timecop'
@@ -107,7 +106,7 @@ group :development, :test do
   gem 'capybara'
   gem 'debug', '>= 1.0.0'
   gem 'i18n-tasks', require: false
-  gem 'rspec-rails', '~> 7.1.1'
+  gem 'rspec-rails', '~> 8.0.1'
   gem 'selenium-webdriver'
 end