Export release-8980@f05db8a9

Gemfile

@@ -146,8 +146,8 @@ gem 'jwt'
 
 # Assets
 gem 'rails-assets-manifest', '~> 3.0', '>= 3.0.1'
-gem 'sprockets', '~> 3.2'
-gem 'sprockets-rails', '~> 3.2'
+gem 'sprockets', '~> 4.2'
+gem 'sprockets-rails', '~> 3.5'
 
 group :assets do
   gem 'dartsass-sprockets'

Gemfile.lock

@@ -860,10 +860,9 @@ GEM
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    sprockets (3.7.5)
-      base64
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.5.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
@@ -1062,8 +1061,8 @@ DEPENDENCIES
   sitemap_generator
   slim
   slim_lint
-  sprockets (~> 3.2)
-  sprockets-rails (~> 3.2)
+  sprockets (~> 4.2)
+  sprockets-rails (~> 3.5)
   streamio-ffmpeg
   syslog
   telegraf (~> 3.0)

app/assets/config/manifest.js

@@ -0,0 +1,7 @@
+//= link_tree ../images
+//= link application.js
+//= link admin-legacy.js
+//= link course-admin.js
+//= link peer_assessment/train_samples.js
+//= link m.e.i.n.e.l.js
+//= link moment.js

app/assets/stylesheets/_partials.scss

@@ -68,7 +68,6 @@
 @import "partials/items";
 @import "partials/item_stats";
 @import "partials/collapsible";
-@import "partials/collabspace";
 @import "partials/cookie_consent_banner";
 @import "partials/report";
 @import "partials/voucher_redemptions";

app/components/course/learner_dashboard/section_progress/main.html.slim

@@ -37,9 +37,10 @@
       - else
         p = t(:'course.progress.section_material_empty')
 
-    .section-statistics
-      h5 = t(:'course.progress.section_statistics')
+    - if section_statistics?
+      .section-statistics
+        h5 = t(:'course.progress.section_statistics')
 
-      = render Course::LearnerDashboard::SectionProgress::Statistic.new(label: t(:'course.progress.statistics.main'), values: main_statistic, icon: 'money-check-pen')
-      = render Course::LearnerDashboard::SectionProgress::Statistic.new(label: t(:'course.progress.statistics.bonus'), values: bonus_statistic, icon: 'lightbulb-on+circle-star')
-      = render Course::LearnerDashboard::SectionProgress::Statistic.new(label: t(:'course.progress.statistics.selftests'), values: selftest_statistic, icon: 'lightbulb-on')
+        = render Course::LearnerDashboard::SectionProgress::Statistic.new(label: t(:'course.progress.statistics.main'), values: main_statistic, icon: 'money-check-pen')
+        = render Course::LearnerDashboard::SectionProgress::Statistic.new(label: t(:'course.progress.statistics.bonus'), values: bonus_statistic, icon: 'lightbulb-on+circle-star')
+        = render Course::LearnerDashboard::SectionProgress::Statistic.new(label: t(:'course.progress.statistics.selftests'), values: selftest_statistic, icon: 'lightbulb-on')

app/components/course/learner_dashboard/section_progress/main.rb

@@ -70,6 +70,10 @@ def legend_items
             {class_modifier: 'optional', text: t(:'course.progress.legend.optional')},
           ]
         end
+
+        def section_statistics?
+          main_statistic.present? || bonus_statistic.present? || selftest_statistic.present?
+        end
       end
     end
   end

app/components/course/learner_dashboard/section_progress/statistic.rb

@@ -27,6 +27,12 @@ def exercises_taken
             taken: @values['submitted_exercises'],
             total: @values['total_exercises'])
         end
+
+        private
+
+        def render?
+          @values.present?
+        end
       end
     end
   end

app/components/navigation/table_of_contents.rb

@@ -192,7 +192,6 @@ def initialize(context:, request:)
         @request = request
       end
 
-      # rubocop:disable Metrics/BlockLength
       def build
         ::Navigation::TableOfContents.new.tap do |toc|
           # 1. Add general collabspace links.
@@ -217,13 +216,6 @@ def build
             tooltip: 'Etherpad',
             active: false
           )
-          toc.with_section(
-            text: I18n.t(:'learning_rooms.nav.video_chat'),
-            link: {href: course_learning_room_video_chat_path(@context.course_code, @context.collabspace_id)},
-            tooltip: 'Jitsi Meet',
-            active: @context.current_page?(course_learning_room_video_chat_path(@context.course_code,
-              @context.collabspace_id))
-          )
           toc.with_section(
             text: I18n.t(:'learning_rooms.nav.files'),
             link: {href: course_learning_room_files_path(@context.course_code, @context.collabspace_id)},
@@ -263,8 +255,6 @@ def build
           end
         end
       end
-      # rubocop:enable Metrics/BlockLength
-
       private
 
       def etherpad_url

app/controllers/collabspace/collabspaces_controller.rb

@@ -61,7 +61,7 @@ def show
       if member? || current_user.allowed?('course.course.teaching_anywhere')
         render layout: LAYOUTS[:course_area_two_cols]
       else
-        render 'request_membership', layout: LAYOUTS[:course_area]
+        render 'join', layout: LAYOUTS[:course_area]
       end
     end
 

app/controllers/helpdesk_controller.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 require 'uri'
-require 'recaptcha_integration'
+require 'xi/recaptcha/integration'
 
 class HelpdeskController < Abstract::FrontendController
   layout :helpdesk_layout
 
   before_action :set_no_cache_headers
 
   def send_helpdesk
-    @recaptcha = RecaptchaIntegration.new(request: request, params: params, action: 'helpdesk')
+    @recaptcha = Xi::Recaptcha::Integration.new(request: request, params: params, action: 'helpdesk')
     unless @recaptcha.verified?
       @recaptcha.require_manual_verification!
       @ticket = Helpdesk::TicketForm.new(ticket_params).tap { annotate_with_metadata _1 }
@@ -21,20 +21,20 @@ def send_helpdesk
       end
     end
 
-    create_ticket
+    create_ticket!
     render 'success'
   rescue ActiveRecord::RecordInvalid
     render 'error', status: :unprocessable_entity
   end
 
   def show
-    @recaptcha = RecaptchaIntegration.new(request: request, params: params, action: 'helpdesk')
+    @recaptcha = Xi::Recaptcha::Integration.new(request: request, params: params, action: 'helpdesk')
     @ticket = Helpdesk::TicketForm.new(ticket_params).tap { annotate_with_metadata _1 }
   end
 
   private
 
-  def create_ticket
+  def create_ticket!
     params[:mail] = current_user.email if current_user.logged_in?
 
     # Here you can add as much data as you want...

app/views/collabspace/calendar_events/_form.html.slim

@@ -8,8 +8,8 @@
       = f.input :description
       - if current_user.feature?('collabspace_calendar.all_day_events')
         = f.input :all_day
-      = f.input :start_time, input_html: { 'data-localdate': true }
-      = f.input :end_time, input_html: { 'data-localdate': true }
+      = f.input :start_time, input_html: {'data-localdate': true}
+      = f.input :end_time, input_html: {'data-localdate': true}
       = f.input :category, collection: form.categories, include_blank: false
     .modal-footer
       - if form.persisted?

app/views/collabspace/calendars/show.html.slim

@@ -23,7 +23,7 @@
           .modal-frame.modal-frame--higher
 
     .category-keys
-      - ::Collabspace::CalendarEventForm.categories.each do |title, category|
+      - Collabspace::CalendarEventForm.categories.each do |title, category|
         span.category-keys__key
           = render Global::FaIcon.new('circle', style: :solid, css_classes: "xi-icon--#{category}")
           = title

app/views/collabspace/collabspaces/_basic_description.html.slim

@@ -2,13 +2,10 @@ h2
   = collabspace_presenter.name
 div
   p = collabspace_presenter.description
-  .mt10 == collabspace_presenter.details
+  p.mt10 == collabspace_presenter.details
 
 - unless collabspace_presenter.team?
-  p
-    - if collabspace_presenter.open?
-      = render Global::FaIcon.new('unlock', style: :solid, css_classes: 'mr10 em1-2')
-      span = t(:'learning_rooms.is_open')
-    - else
-      = render Global::FaIcon.new('lock', style: :solid, css_classes: 'mr10 em1-2')
-      span = t(:'learning_rooms.is_closed')
+  - if collabspace_presenter.open?
+    = render Global::Callout.new(t(:'learning_rooms.is_open'), icon: Global::FaIcon.new('unlock', style: :solid))
+  - else
+    = render Global::Callout.new(t(:'learning_rooms.is_closed'), icon: Global::FaIcon.new('lock', style: :solid))

app/views/collabspace/collabspaces/edit.html.slim

@@ -11,12 +11,12 @@
       h3
         = t(:'learning_rooms.admin.member_management')
       hr.divider
-      = render 'member_management', members: @members, memberships: @memberships, team: true
+      = render 'collabspace/memberships/management', members: @members, memberships: @memberships, team: true
   - else
     h3
       = t(:'learning_rooms.admin.member_management')
     hr.divider
-    = render 'member_management', members: @members, memberships: @memberships, team: false
+    = render 'collabspace/memberships/management', members: @members, memberships: @memberships, team: false
 
     h3
       = t(:'learning_rooms.admin.delete')
@@ -26,5 +26,4 @@
         course_learning_room_path(params[:course_id], params[:id]),
         class: 'btn btn-xs btn-danger',
         method: :delete,
-        data: { confirm: t(:'learning_rooms.admin.delete_confirm') }
-    end
+        data: {confirm: t(:'learning_rooms.admin.delete_confirm')}

app/views/collabspace/collabspaces/index.html.slim

@@ -9,7 +9,7 @@
             = t(:'learning_rooms.my_rooms')
         div class="collapse in" id="my-learning-rooms"
           - if @my_collabspace_presenters.any?
-            = render partial: 'collabspace_list', locals: {collabspaces: @my_collabspace_presenters}
+            = render partial: 'list', locals: {collabspaces: @my_collabspace_presenters}
           - else
             = render State::Empty.new(t(:'learning_rooms.my_rooms_empty_state'), size: :small)
 
@@ -21,7 +21,7 @@
         div class="collapse in" id="unjoined-learning-rooms"
           - if @unjoined_collabspaces.any?
             #pagination-items
-              = render 'collabspace_list', collabspaces: @collabspace_presenters
+              = render partial: 'list', locals: {collabspaces: @collabspace_presenters}
             #pagination-menu
               = will_paginate RestifyPaginationCollection.new(@unjoined_collabspaces), renderer: AjaxPaginationRenderer
           - else

app/views/collabspace/collabspaces/index.js.erb

@@ -1,2 +1,2 @@
-$("#pagination-items").html("<%= escape_javascript(render "collabspace_list", collabspaces: @collabspace_presenters) %>");
+$("#pagination-items").html("<%= escape_javascript(render "list", collabspaces: @collabspace_presenters) %>");
 $("#pagination-menu").html("<%= escape_javascript(will_paginate RestifyPaginationCollection.new(@unjoined_collabspaces), renderer: AjaxPaginationRenderer) %>");

app/views/collabspace/collabspaces/join.html.slim

@@ -0,0 +1,12 @@
+.col-md-9
+  = render partial: 'basic_description', locals: {collabspace_presenter: @collabspace_presenter}
+  = render partial: 'collabspace/memberships/list', locals: {members: @members, memberships: @memberships}
+
+  - if @collabspace_presenter.membership_pending?
+    = render Global::Callout.new(t(:'learning_rooms.pending_text'), type: :warning)
+  - elsif @collabspace_presenter.can_join?
+    .mt10
+      = button_to t(:'learning_rooms.join'),
+        @collabspace_presenter.join_url,
+        method: :post,
+        class: 'btn btn-primary'

app/views/collabspace/collabspaces/show.html.slim

@@ -1,10 +1,11 @@
 .col-md-12.course-area-main
-  = render 'basic_description', collabspace_presenter: @collabspace_presenter
-  = render 'member_list', members: @members, memberships: @memberships
+  = render partial: 'basic_description', locals: {collabspace_presenter: @collabspace_presenter}
+  = render partial: 'collabspace/memberships/list', locals: {members: @members, memberships: @memberships}
 
   - if @collabspace_presenter.can_quit?(@current_user)
-    = button_to t(:'learning_rooms.quit_membership'),
-                course_learning_room_membership_path(params[:course_id], params[:id], current_user.id),
-                class: 'btn btn-sm btn-primary',
-                method: :delete,
-                data: {confirm: t(:'learning_rooms.quit_membership_confirm')}
+    .mt10
+      = button_to t(:'learning_rooms.quit_membership'),
+        course_learning_room_membership_path(params[:course_id], params[:id], current_user.id),
+        class: 'btn btn-sm btn-primary',
+        method: :delete,
+        data: {confirm: t(:'learning_rooms.quit_membership_confirm')}