Merge branch 'release/6.6.3'

.github/workflows/release-drafter.yml

@@ -13,6 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts next release notes as Pull Requests are merged into "develop"
-      - uses: toolmantim/release-drafter@v5.22.0
+      - uses: toolmantim/release-drafter@v5.23.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Gemfile

@@ -72,7 +72,7 @@ gem 'ruby-saml', '~> 1.15.0'
 # omniauth
 gem 'omniauth-google-oauth2', '~> 1.1.1'
 gem 'omniauth-oauth2', '~> 1.8.0'
-gem 'omniauth_openid_connect', '~> 0.6.0'
+gem 'omniauth_openid_connect', '~> 0.6.1'
 gem 'omniauth-rails_csrf_protection', '~> 1.0.1'
 
 # Json webtokens
@@ -180,7 +180,7 @@ group :development do
   gem 'web-console', '~> 4.2.0'
 
   gem 'rb-readline', '~> 0.5.5' # require for irb
-  gem 'rubocop-rails', '~> 2.17.4'
+  gem 'rubocop-rails', '~> 2.18.0'
 
   # for opening letters
   gem 'letter_opener', '~> 1.8.1'

Gemfile.lock

@@ -84,7 +84,7 @@ GEM
       execjs (~> 2)
     bcrypt (3.1.18)
     bcrypt_pbkdf (1.1.0)
-    bindata (2.4.14)
+    bindata (2.4.15)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
@@ -121,7 +121,7 @@ GEM
       xpath (~> 3.2)
     codecov (0.6.0)
       simplecov (>= 0.15, < 0.22)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     counter_culture (3.3.0)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
@@ -216,7 +216,7 @@ GEM
     jsbundling-rails (1.1.1)
       railties (>= 6.0.0)
     json (2.6.3)
-    json-jwt (1.16.2)
+    json-jwt (1.16.3)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
@@ -306,7 +306,7 @@ GEM
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth_openid_connect (0.6.0)
+    omniauth_openid_connect (0.6.1)
       omniauth (>= 1.9, < 3)
       openid_connect (~> 1.1)
     openid_connect (1.4.2)
@@ -322,7 +322,7 @@ GEM
       webfinger (~> 1.2)
     orm_adapter (0.5.0)
     parallel (1.22.1)
-    parser (3.1.3.0)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
     premailer (1.18.0)
       addressable
@@ -392,25 +392,25 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-readline (0.5.5)
-    regexp_parser (2.6.1)
+    regexp_parser (2.7.0)
     responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
     rexml (3.2.5)
     rouge (4.1.0)
-    rubocop (1.41.1)
+    rubocop (1.46.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
-      parser (>= 3.1.1.0)
-    rubocop-rails (2.17.4)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
+    rubocop-rails (2.18.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -456,15 +456,15 @@ GEM
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
-    terser (1.1.13)
+    terser (1.1.14)
       execjs (>= 0.3.0, < 3)
     test-prof (1.2.0)
     thor (1.2.1)
     tilt (2.0.11)
-    timeout (0.3.1)
+    timeout (0.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
@@ -553,7 +553,7 @@ DEPENDENCIES
   omniauth-google-oauth2 (~> 1.1.1)
   omniauth-oauth2 (~> 1.8.0)
   omniauth-rails_csrf_protection (~> 1.0.1)
-  omniauth_openid_connect (~> 0.6.0)
+  omniauth_openid_connect (~> 0.6.1)
   premailer-rails (~> 1.12.0)
   pretender (~> 0.4.0)
   puma (~> 6.1.0)
@@ -564,7 +564,7 @@ DEPENDENCIES
   rails-i18n (~> 7.0.6)
   rb-readline (~> 0.5.5)
   rouge (= 4.1.0)
-  rubocop-rails (~> 2.17.4)
+  rubocop-rails (~> 2.18.0)
   ruby-saml (~> 1.15.0)
   rubyzip (~> 2.3.2)
   selenium-webdriver (~> 4.8.1)

app/assets/stylesheets/bootstrap_style_overrides.css.scss

@@ -113,6 +113,10 @@ code {
   @include shadow-z5;
 }
 
+.dropdown-divider {
+  overflow: visible;
+}
+
 // tables
 .table {
   margin-bottom: 0;

app/models/institution.rb

@@ -95,7 +95,8 @@ def self.similarity_matrix
       # we group by domain to get all institutions with the same domain, we update the similarity matrix for all pairs of institutions
       domains.group_by { |u| u[:domain] }.each do |_, institution|
         institution.combination(2).each do |i1, i2|
-          matrix[i1[:institution_id]][i2[:institution_id]] = [matrix[i1[:institution_id]][i2[:institution_id]], [i1[:count], i2[:count]].min].max
+          overlap = [i1[:count], i2[:count]].min
+          matrix[i1[:institution_id]][i2[:institution_id]] = [matrix[i1[:institution_id]][i2[:institution_id]], overlap].max
           matrix[i2[:institution_id]][i1[:institution_id]] = matrix[i1[:institution_id]][i2[:institution_id]]
         end
       end

app/views/activities/_labels.html.erb

@@ -16,9 +16,9 @@
         <% end %>
         ...</span>
     <% elsif labels.any? %>
-      <% labels.each do |label| %>
+      <% labels.each_with_index do |label, index| %>
         <d-filter-button param="labels" value="<%= label.name %>" multi>
-          <%= label.name %>,
+          <%= label.name %><%= "," unless index == labels.count - 1 %>
         </d-filter-button>
       <% end %>
     <% end %>

app/views/series/_form.html.erb

@@ -49,8 +49,7 @@
     <div class="field form-group row">
       <div class="offset-sm-3 col-sm-6">
         <div class="form-check">
-          <input type="hidden" value="1" name="series[progress_enabled]">
-          <%= check_box_tag "series[progress_enabled]", "0", !@series.progress_enabled, class: "form-check-input" %>
+          <%= f.check_box :progress_enabled, {checked: !@series.progress_enabled, class: "form-check-input" }, '0', '1' %>
           <%= f.label :progress_enabled, t('.class_progress_disable'), class: 'form-check-label' %>
         </div>
       </div>
@@ -61,8 +60,7 @@
     <div class="field form-group row">
       <div class="col-sm-6 offset-sm-3">
         <div class="form-check">
-          <input type="hidden" value="1" name="series[activities_visible]">
-          <%= check_box_tag "series[activities_visible]", "0", !@series.activities_visible, class: "form-check-input" %>
+          <%= f.check_box :activities_visible, {checked: !@series.activities_visible, class: "form-check-input" }, '0', '1' %>
           <%= f.label :activities_visible, t('.hide_activities'), class:"form-check-label" %>
         </div>
       </div>
@@ -73,7 +71,6 @@
     <div class="field form-group row">
       <div class="col-sm-6 offset-sm-3">
         <div class="form-check">
-          <input type="hidden" value="1" name="series[activities_visible]">
           <%= f.check_box :activity_numbers_enabled, class: "form-check-input" %>
           <%= f.label :activity_numbers_enabled, t('.activity_numbers_enabled'), class:"form-check-label" %>
         </div>

app/views/series/_series.html.erb

@@ -139,19 +139,19 @@
   <% if current_user&.course_admin?(series.course) && series.hidden? %>
     <div class="alert alert-info hidden-print">
       <%= t "series.show.series_not_visible" %>
-      <%= t('series.show.make_visible_html', series_url: series_path(series, series: {visibility: :open}), method: :patch) %>
+      <%= link_to t("series.show.make_visible_text"), series_path(series, series: {visibility: :open}), method: :patch, data: {confirm: t('general.are_you_sure')} %>
     </div>
   <% end %>
   <% if current_user&.course_admin?(series.course) && series.closed? %>
     <div class="alert alert-info hidden-print">
       <%= t "series.show.series_not_accessible" %>
-      <%= t('series.show.make_visible_html', series_url: series_path(series, series: {visibility: :open}), method: :patch) %>
+      <%= link_to t("series.show.make_visible_text"), series_path(series, series: {visibility: :open}), method: :patch, data: {confirm: t('general.are_you_sure')} %>
     </div>
   <% end %>
   <% if current_user&.course_admin?(series.course) && !series.activities_visible %>
     <div class="alert alert-info hidden-print">
       <%= t "series.show.activities_not_visible" %>
-      <%= t('series.show.make_visible_html', series_url: series_path(series, series: {activities_visible: true}), method: :patch) %>
+      <%= link_to t("series.show.make_visible_text"), series_path(series, series: {activities_visible: true}), method: :patch, data: {confirm: t('general.are_you_sure')} %>
     </div>
   <% end %>
   <div class="tab-content">

config/initializers/00_version.rb

@@ -3,7 +3,7 @@ class Application
     module Version
       MAJOR = 6
       MINOR = 6
-      PATCH = 2
+      PATCH = 3
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

config/locales/views/series/en.yml

@@ -24,7 +24,7 @@ en:
       activities: Learning activities
       download_submissions: Export my submissions
       download_all_solutions: Export student submissions
-      make_visible_html: "<a href=%{series_url} data-method=\"patch\">Make visible</a> for students."
+      make_visible_text: Make visible for students.
       series_not_visible: This series is only visible for students using the secret link!
       series_not_accessible: This series is not accessible to students!
       activities_not_visible: The learning activities in this series are not visible to students!

config/locales/views/series/nl.yml

@@ -24,7 +24,7 @@ nl:
       activities: Leeractiviteiten
       download_submissions: Mijn oplossingen exporteren
       download_all_solutions: Oplossingen van studenten exporteren
-      make_visible_html: "<a href=%{series_url} data-method=\"patch\">Maak zichtbaar</a> voor studenten."
+      make_visible_text: "Maak zichtbaar voor studenten."
       series_not_visible: Deze reeks is enkel zichtbaar voor studenten via de geheime link!
       series_not_accessible: Deze reeks is niet toegankelijk voor studenten!
       activities_not_visible: De leeractiviteiten in deze reeks zijn niet zichtbaar voor studenten!

package.json

@@ -11,11 +11,11 @@
     "typeCheck": "yarn tsc --skipLibCheck --noEmit"
   },
   "dependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-proposal-decorators": "^7.20.13",
-    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/core": "^7.21.0",
+    "@babel/plugin-proposal-decorators": "^7.21.0",
+    "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
-    "@babel/preset-typescript": "^7.18.6",
+    "@babel/preset-typescript": "^7.21.0",
     "@dodona/papyros": "^1.0.1",
     "@popperjs/core": "^2.11.6",
     "@rails/activestorage": "^7.0.4",
@@ -26,7 +26,7 @@
     "babel-plugin-macros": "^3.1.0",
     "bootstrap": "5.2.0",
     "clipboard": "^2.0.11",
-    "core-js": "^3.28.0",
+    "core-js": "^3.29.0",
     "d3": "^7.8.2",
     "dayjs": "^1.11.7",
     "dragula": "^3.7.3",
@@ -50,9 +50,9 @@
     "@types/iframe-resizer": "^3.5.9",
     "@types/jest": "^27.5.0",
     "@types/serviceworker": "^0.0.62",
-    "@typescript-eslint/eslint-plugin": "^5.52.0",
-    "@typescript-eslint/parser": "^5.52.0",
-    "eslint": "^8.34.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
+    "eslint": "^8.35.0",
     "eslint-config-google": "^0.14.0",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-lit": "^1.8.2",