mumuki-laboratory 9.20.0 → 9.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de7e211f8a772b15e0018a75d15c69f1fd455bf4794362235e236c06bc125d06
-  data.tar.gz: 91b6b7564068e6fac29130c62639a17c277d0954fbf3900e07e947ae3cdc6da0
+  metadata.gz: b9a44eb8a52ea3e076a0e6dd62ba634664458f2010b8df7d5a9d36f2dc20d9fe
+  data.tar.gz: 16995ef8fe178a5e8f4ba5d9454e55628f7a17de7c61a61625fae017eb6beecd
 SHA512:
-  metadata.gz: 63dc960e1d91bd05a534d8ded2bfb9cfd13801ee2d3dfcb44da781642bcfa626f0bf80c7df642216bb7915a1ff2f32515668c6bb81b7615221e23ae44a3cd627
-  data.tar.gz: 7011fe8f2abadae8c93ac60192c0caa200a475a229183c257ccd74c0818291c9ced49507a75fc15f092405d9c10d8cad269b6723be45eac41dc022a120c7bd6e
+  metadata.gz: b7b567eb9a6b759b11c2d471bed6a5221e0c1c0123e7513c70111df499169714ea05ae2c26d5c86eeaf3a3ac1f85d490b3a9d529717834c865b15bc777a3d9b0
+  data.tar.gz: f7c010004b5dff4fd790e89bb6701277e7d3c8bc7fbf12a7c411aecf0bb437f36defbcc911381140ac74d2f101be83859bda2ce15726fdd7b2d53b8c8e5c9d7a

data/README.md

@@ -205,6 +205,17 @@ o.reindex_usages!
 
 Now you will be able to visit that guide at `http://localhost:3000/central/guides/#{slug}`
 
+## Debugging email sender
+
+The development environment is configured to "send" emails via `mailcatcher`, a mock server, if it is available. Run these commands to install and run it - and do it _before_ the emails are sent, so it can actually _catch_ them:
+
+```bash
+gem install mailcatcher
+mailcatcher
+```
+
+Once up and running, go to http://localhost:1080/ to see which emails have been sent. Unfortunately, the developers recommend not to install it via Bundler, so it has to be done this way. :woman_shrugging:
+
 ## JavaScript API Docs
 
 In order to be customized by runners, Laboratory exposes the following selectors and methods

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_discussion.scss

@@ -318,7 +318,6 @@ $moderator-badge-color: #dd9900;
   margin-bottom: 20px;
   .discussion-message-bubble-header {
     background-color: $mu-color-highlight-background;
-    height: 40px;
     &:before {
       position: absolute;
       top: calc(20px - #{$discussion-message-arrow-size + 2px} / 2);
@@ -330,12 +329,11 @@ $moderator-badge-color: #dd9900;
     }
     .discussion-message-bubble-title {
       padding: 5px 15px;
-      display: block;
+      display: flex;
       .message-date {
         font-size: 15px;
       }
       .actions {
-        float: right;
         > a, .dropdown {
           margin-left: 20px;
           cursor: pointer;

data/app/controllers/appendixes_controller.rb

@@ -1,5 +1,12 @@
 class AppendixesController < ApplicationController
+
   def show
     @chapter = Chapter.find(params[:chapter_id])
   end
+
+  private
+
+  def authorization_minimum_role
+    :ex_student
+  end
 end

data/app/controllers/application_controller.rb

@@ -7,7 +7,6 @@ class ApplicationController < ActionController::Base
   include Mumukit::Login::AuthenticationHelpers
 
   include Mumuki::Laboratory::Controllers::Authorization
-  include Mumuki::Laboratory::Controllers::Disabling
   include Mumuki::Laboratory::Controllers::Notifications
   include Mumuki::Laboratory::Controllers::DynamicErrors
   include Mumuki::Laboratory::Controllers::EmbeddedMode
@@ -18,7 +17,6 @@ class ApplicationController < ActionController::Base
   before_action :set_locale!
   before_action :set_time_zone!
 
-  before_action :ensure_user_enabled!, if: :current_user?
   before_action :redirect_to_proper_context!, if: :immersive_context_wrong?
 
   before_action :authorize_if_private!
@@ -44,7 +42,8 @@ class ApplicationController < ActionController::Base
                 :theme_stylesheet_url,
                 :extension_javascript_url,
                 :current_immersive_path,
-                :current_access_mode
+                :current_access_mode,
+                :limited_query?
 
   add_flash_types :info
 
@@ -170,4 +169,8 @@ class ApplicationController < ActionController::Base
       current_user.restore_organization_progress!(Organization.current)
     end
   end
+
+  def limited_query?
+    params[:limit].present?
+  end
 end

data/app/controllers/complements_controller.rb

@@ -1,8 +1,21 @@
 class ComplementsController < GuideContainerController
+  include Mumuki::Laboratory::Controllers::ValidateAccessMode
 
   private
 
   def subject
     @complement ||= Complement.find_by(id: params[:id])
   end
+
+  def authorization_minimum_role
+    :ex_student
+  end
+
+  def subject_container
+    subject.guide
+  end
+
+  def contentless_subject?
+    subject_container.exercises.empty?
+  end
 end

data/app/controllers/login_controller.rb

@@ -2,9 +2,17 @@ class LoginController < ApplicationController
   Mumukit::Login.configure_login_controller! self
 
   skip_before_action :verify_authenticity_token, if: lambda { Rails.env.development? }
-  skip_before_action :validate_user_profile!
-  skip_before_action :validate_accepted_role_terms!
-  skip_before_action :validate_active_organization!
+  skip_before_action :validate_user_profile!,
+                     :validate_accepted_role_terms!,
+                     :validate_active_organization!,
+                     :redirect_to_proper_context!,
+                     :ensure_restore_progress!,
+                     :visit_organization!
+
+  def logout_current_user!
+    flash.keep
+    super
+  end
 
   private
 

data/app/controllers/users_controller.rb

@@ -47,11 +47,18 @@ class UsersController < ApplicationController
     @exam_authorization_requests ||= ExamAuthorizationRequest.where(user: current_user, organization: Organization.current)
   end
 
-  def unsubscribe
-    user_id = User.unsubscription_verifier.verify(params[:id])
-    User.find(user_id).unsubscribe_from_reminders!
+  def send_delete_confirmation_email
+    current_user.generate_delete_account_token!
+    UserMailer.delete_account(current_user).post!
+    redirect_to delete_request_user_path
+  end
+
+  def delete_confirmation
+    return redirect_to delete_confirmation_invalid_user_path unless @user.delete_account_token_matches? params[:token]
+
+    @user.destroy!
 
-    redirect_to root_path, notice: t(:unsubscribed_successfully)
+    redirect_to logout_path, notice: I18n.t(:user_deleted_successfully)
   end
 
   def permissible_params

data/app/helpers/application_helper.rb

@@ -17,7 +17,9 @@ module ApplicationHelper
   end
 
   def paginate(object, options = {})
-    super(object, {theme: 'bootstrap-5', pagination_class: 'flex-wrap justify-content-center'}.merge(options))
+    unless limited_query?
+      super(object, {theme: 'bootstrap-5', pagination_class: 'flex-wrap justify-content-center'}.merge(options))
+    end
   end
 
   def last_box_class(trailing_boxes)

data/app/helpers/discussions_helper.rb

@@ -38,14 +38,14 @@ module DiscussionsHelper
 
   def solve_discussion_params_for(user)
     if user&.moderator_here?
-      {status: :pending_review, sort: :responses_count_asc, requires_moderator_response: true}
+      {status: :pending_review, sort: :responses_count_asc, requires_attention: true}
     else
       {status: :opened, sort: :responses_count_desc}
     end
   end
 
   def default_discussions_params
-    {status: :solved, sort: :upvotes_count_desc}
+    {status: :solved, sort: :created_at_desc, recent: true, limit: 15}
   end
 
   def user_avatar(user, image_class='')
@@ -53,37 +53,37 @@ module DiscussionsHelper
   end
 
   def forum_terms_link
-    %Q{
+    <<~HTML.html_safe
       <span>
         #{ t(:forum_terms_link, terms_link: link_to_forum_terms).html_safe }
       </span>
-    }.html_safe
+    HTML
   end
 
   def discussion_messages_count(discussion)
-    %Q{
+    <<~HTML.html_safe
       <span class="discussion-messages-count">
         #{fa_icon :comments, type: :regular, text: discussion.messages_count}
       </span>
-    }.html_safe
+    HTML
   end
 
   def discussion_validated_messages_count(discussion)
-    %Q{
+    <<~HTML.html_safe
       <span class="discussion-validated-messages-count">
         #{fa_icon :comment, type: :regular}#{fa_icon :check, text: discussion.validated_messages_count}
       </span>
-    }.html_safe
+    HTML
   end
 
   def discussion_upvotes_icon(discussion)
     if discussion.upvotes_count > 0
-      %Q{
+      <<~HTML.html_safe
         <span class="discussion-icon fa-stack fa-xs">
           <i class="far fa-star fa-stack-2x"></i>
           <i class="fas fa-stack-1x">#{discussion.upvotes_count}</i>
         </span>
-      }.html_safe
+      HTML
     end
   end
 
@@ -99,16 +99,21 @@ module DiscussionsHelper
   end
 
   def new_discussion_link(teaser_text, link_text)
-    %Q{
+    <<~HTML.html_safe
       <h4>
         <span>#{t(teaser_text)}</span>
         #{link_to t(link_text), new_exercise_discussion_path(@debatable, anchor: 'new-discussion-description-container') }
       </h4>
-    }.html_safe
+    HTML
   end
 
-  def discussion_count_for_status(status, discussions)
-    discussions.scoped_query_by(discussion_filter_params, excluded_params: [:status], excluded_methods: [:page]).by_status(status).count
+  def discussion_status_counts(discussions)
+    discussions.scoped_query_by(discussion_filter_params, excluded_params: [:status], excluded_methods: [:page])
+               .group(:status)
+               .reorder('')
+               .pluck(:status, 'count(*)')
+               .to_h
+               .transform_keys(&:to_sym)
   end
 
   def discussions_reset_query_link
@@ -122,11 +127,21 @@ module DiscussionsHelper
   #TODO: this one uses a long method chain in order to take advantage of eager load
   # Delegate it once again when polymorphic association is removed
   def discussions_languages(discussions)
-    @languages ||= discussions.map { |it| it.exercise.language.name }.uniq
+    @languages ||= discussions.distinct
+                              .joins(:exercise)
+                              .pluck('languages.name')
   end
 
-  def discussion_status_filter_link(status, discussions)
-    discussions_count = discussion_count_for_status(status, discussions)
+  def discussion_status_filter_links(discussions)
+    status_counts = discussion_status_counts(discussions)
+
+    discussions_statuses.map do |status|
+      discussion_status_filter_link(status, status_counts)
+    end.compact.join("\n").html_safe
+  end
+
+  def discussion_status_filter_link(status, status_counts)
+    discussions_count = status_counts[status.to_sym] || 0
     if status.should_be_shown?(discussions_count, current_user)
       discussion_filter_item(:status, status) do
         discussion_status_filter(status, discussions_count)
@@ -135,17 +150,17 @@ module DiscussionsHelper
   end
 
   def discussion_status_filter(status, discussions_count)
-    %Q{
-    #{discussion_status_fa_icon(status)}
+    <<~HTML.html_safe
+      #{discussion_status_fa_icon(status)}
       <span>
         #{t("#{status}_count", count: discussions_count)}
       </span>
-    }.html_safe
+    HTML
   end
 
   def discussion_dropdown_filter(label, filters, can_select_all = false, &block)
     if filters.present?
-      %Q{
+      <<~HTML.html_safe
         <div class="dropdown discussions-toolbar-filter">
           <a id="dropdown-#{label}" data-bs-toggle="dropdown" role="menu">
             #{t label} #{fa_icon :'caret-down', class: 'fa-xs'}
@@ -155,7 +170,7 @@ module DiscussionsHelper
             #{discussion_filter_list(label, filters, &block)}
           </ul>
         </div>
-      }.html_safe
+      HTML
     end
   end
 
@@ -244,7 +259,7 @@ module DiscussionsHelper
   end
 
   def discussion_delete_message_dropdown(discussion, message)
-    %Q{
+    <<~HTML.html_safe
       <span class="dropdown">
         #{content_tag :span, fa_icon('trash-alt', type: :regular, class: 'fa-lg'), role: 'menu', 'data-bs-toggle': 'dropdown',
                       class: 'discussion-delete-message', id: 'deleteDiscussionDropdown'}
@@ -254,17 +269,17 @@ module DiscussionsHelper
           #{discussion_delete_message_option discussion, message, :discloses_personal_information, 'user-tag'}
         </ul>
       </span>
-    }.html_safe
+    HTML
   end
 
   def discussion_delete_message_option(discussion, message, motive, icon)
-    %Q{
+    <<~HTML.html_safe
       <li>
         #{link_to fa_icon(icon, text: t("deletion_motive.#{motive}.present"), class: 'fa-fw fixed-icon'),
                   discussion_message_path(discussion, message, motive: motive), method: :delete, class: 'dropdown-item',
                   role: 'menuitem', data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } }
       </li>
-    }.html_safe
+    HTML
   end
 
   def message_deleted_text(message)

data/app/helpers/mailer_helper.rb

@@ -0,0 +1,5 @@
+module MailerHelper
+  def delete_account_url_for(user)
+    @organization.url_for("/user/delete_confirmation?token=#{user.delete_account_token}")
+  end
+end

data/app/helpers/user_menu_helper.rb

@@ -35,11 +35,15 @@ module UserMenuHelper
     user_menu_item t(:notifications), notifications_user_path, 'notifications'
   end
 
+  def delete_account_user_menu_link
+    user_menu_item t(:delete_account), delete_account_user_path, 'delete_account', 'text-danger'
+  end
+
   private
 
-  def user_menu_item(label, path, active_on)
-    link_klass = 'active' if action_name == active_on
-    content_tag :div, link_to(label, path, { class: link_klass }.compact), class: 'mu-user-menu-item'
+  def user_menu_item(label, path, active_on, link_klass = '')
+    active_klass = 'active' if action_name == active_on
+    content_tag :div, link_to(label, path, { class: "#{link_klass} #{active_klass}" }.compact), class: 'mu-user-menu-item'
   end
 
   def user_menu_header_icon

data/app/mailers/application_mailer.rb

@@ -1,5 +1,6 @@
 class ApplicationMailer < ActionMailer::Base
   default from: Rails.configuration.reminder_sender_email
+  add_template_helper MailerHelper
   layout 'mailer'
 
   def self.mailer_environment_variables

data/app/mailers/user_mailer.rb

@@ -22,6 +22,12 @@ class UserMailer < ApplicationMailer
     end
   end
 
+  def delete_account(user)
+    with_locale(user) do
+      build_email t(:delete_account_mumuki), 'delete_account'
+    end
+  end
+
   def certificate(certificate)
     with_locale certificate.user, certificate.organization do
       attachments[certificate.filename] = pdf_for(certificate)
@@ -39,7 +45,6 @@ class UserMailer < ApplicationMailer
 
   def with_locale(user, organization = nil, &block)
     @user = user
-    @unsubscribe_code = User.unsubscription_verifier.generate(user.id)
     @organization = organization || user.last_organization
 
     I18n.with_locale(@organization.locale, &block)

data/app/views/book/show.html.erb

@@ -17,30 +17,33 @@
     <% end %>
   <% end %>
 
-  <% if show_content?(@book) %>
-    <h2><%= t(:chapters) %></h2>
-  <% end %>
+  <% unless @book.chapters.empty? %>
+    <% if show_content?(@book) %>
+      <h2><%= t(:chapters) %></h2>
+    <% end %>
 
-  <% @book.chapter_visibilities_in(current_workspace).each do |it, enabled| %>
+    <% @book.chapter_visibilities_in(current_workspace).each do |it, enabled| %>
 
-    <% next unless show_content?(it.topic) %>
+      <% next unless show_content?(it.topic) %>
 
-    <div class="chapter-container">
-      <div class="chapter <%= enabled ? '' : 'mu-locked' %>">
-        <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
-        <div class="text-box" <%= 'aria-label=""' unless enabled %>>
-          <%= it.description_teaser_html %>
+      <div class="chapter-container">
+        <div class="chapter <%= enabled ? '' : 'mu-locked' %>">
+          <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
+          <div class="text-box" <%= 'aria-label=""' unless enabled %>>
+            <%= it.description_teaser_html %>
+          </div>
         </div>
-      </div>
 
-      <% unless enabled %>
-        <div class="text-center mu-lock">
-          <i class="fas fa-lock fa-5x"></i>
-          <p><%= t :locked_content %></p>
-        </div>
-      <% end %>
-    </div>
+        <% unless enabled %>
+          <div class="text-center mu-lock">
+            <i class="fas fa-lock fa-5x"></i>
+            <p><%= t :locked_content %></p>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
   <% end %>
+
   <% if current_user? && @exams.present? %>
     <h2><%= t(:exams) %></h2>
     <% @exams.each_with_index do |it, index| %>

data/app/views/chapters/show.html.erb

@@ -20,7 +20,7 @@
   </div>
 </div>
 
-<% if @chapter.lessons.present? %>
+<% unless @chapter.lessons.empty? %>
   <% if @chapter.monolesson? %>
     <div> <%= render partial: 'guides/guide', locals: { subject: @monolesson } %> </div>
   <% else %>

data/app/views/discussions/_description_message.html.erb

@@ -2,10 +2,12 @@
   <div class="discussion-message-bubble">
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
-        <%= linked_discussion_user_name(discussion.initiator) %>
-        <span class="message-date">
-          <%= friendly_time(discussion.created_at, :time_since) %>
-        </span>
+        <div class="flex-fill">
+          <%= linked_discussion_user_name(discussion.initiator) %>
+          <span class="message-date">
+            <%= friendly_time(discussion.created_at, :time_since) %>
+          </span>
+        </div>
       </div>
     </div>
     <div class="discussion-message-bubble-content">

data/app/views/discussions/_message.html.erb

@@ -2,14 +2,16 @@
   <div class="discussion-message-bubble">
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
-        <%= linked_discussion_user_name user %>
-        <% if user.moderator_here? %>
-          <span class="moderator-badge"><%= t(:moderation) %></span>
-        <% end %>
-        <span class="message-date">
-          <%= friendly_time(message.created_at, :time_since) %>
-        </span>
-        <span class="actions">
+        <div class="flex-fill">
+          <%= linked_discussion_user_name user %>
+          <% if message.from_moderator? %>
+            <span class="moderator-badge"><%= t(:moderation) %></span>
+          <% end %>
+          <span class="message-date">
+            <%= friendly_time(message.created_at, :time_since) %>
+          </span>
+        </div>
+        <span class="actions flex-shrink-0">
           <% if message.authorized?(current_user) && !message.deleted? %>
             <% if current_user&.moderator_here? %>
               <a class="discussion-message-approved <%= 'selected' if message.approved? %>"

data/app/views/discussions/show.html.erb

@@ -26,7 +26,7 @@
         <%= render partial: 'discussions/description_message', locals: { discussion: @discussion } %>
       <% end %>
       <% @discussion.visible_messages.each do |message| %>
-        <%= render partial: 'discussions/message', locals: { user: message.sender_user, message: message } %>
+        <%= render partial: 'discussions/message', locals: { user: message.sender, message: message } %>
       <% end %>
       <% if @discussion.commentable_by?(current_user) %>
         <hr class="message-divider">

data/app/views/errors/forbidden.html.erb

@@ -8,12 +8,10 @@
         <%= t(:error_description, error: link_to_status_codes(403)).html_safe %>
       </p>
       <p class="mu-error-explanation-line">
-        <%= Organization.current.explain_error(403, explanation).html_safe %>
+        <%= Organization.current.explain_error(error_code, explanation).html_safe %>
       </p>
       <p class="mu-error-contact-line mu-maybe">
         <%= t(:contact_administrator, link: mail_to_administrator).html_safe %>
       </p>
     </div>
 <% end %>
-
-

data/app/views/errors/gone.html.erb

@@ -8,8 +8,7 @@
         <%= t(:error_description, error: link_to_status_codes(410)).html_safe %>
       </p>
       <p class="mu-error-explanation-line">
-        <%= Organization.current.explain_error(410, explanation).html_safe %>
+        <%= Organization.current.explain_error(error_code, explanation).html_safe %>
       </p>
     </div>
 <% end %>
-

data/app/views/errors/not_found.html.erb

@@ -8,7 +8,7 @@
         <%= t(:error_description, error: link_to_error_404).html_safe %>
       </p>
       <p class="mu-error-explanation-line">
-        <%= Organization.current.explain_error(404, :not_found_explanation).html_safe %>
+        <%= Organization.current.explain_error(:not_found, :not_found_explanation).html_safe %>
       </p>
     </div>
 <% end %>

data/app/views/guides/_guide.html.erb

@@ -8,12 +8,16 @@
 
 <%= yield if block_given? %>
 
-<h3>
-  <%= t :exercises %>
-  <%= restart_guide_link(@guide) if current_user && @stats.started? && @guide.resettable? %>
-</h3>
+<% unless @guide.exercises.empty? %>
 
-<%= render partial: 'layouts/progress_listing', locals: { guide: @guide } %>
+  <h3>
+    <%= t :exercises %>
+    <%= restart_guide_link(@guide) if current_user && @stats.started? && @guide.resettable? %>
+  </h3>
+
+  <%= render partial: 'layouts/progress_listing', locals: { guide: @guide } %>
+
+<% end %>
 
 <% if @stats&.done? %>
   <div class="text-box">

data/app/views/layouts/_discussions.html.erb

@@ -3,9 +3,7 @@
   <div class="discussions-toolbar">
     <div class="discussions-toolbar-status">
       <div class="d-none d-lg-block">
-        <% discussions_statuses.each do |status| %>
-          <%= discussion_status_filter_link(status, @discussions) %>
-        <% end %>
+        <%= discussion_status_filter_links(@discussions) %>
       </div>
     </div>
     <div>

data/app/views/layouts/_organization_chooser.html.erb

@@ -1,4 +1,4 @@
-<div class="modal fade mu-organization-chooser" id="redirect" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-organization-chooser" id="organization-chooser-modal" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -14,7 +14,7 @@
   </div>
 </div>
 <script>
-  $("#redirect").modal({
+  $("#organization-chooser-modal").modal({
     backdrop: 'static',
     keyboard: false
   });

data/app/views/layouts/_user_menu.html.erb

@@ -12,6 +12,8 @@
         <%= activity_user_menu_link %>
         <%= certificates_user_menu_link %>
         <%= exam_authorizations_user_menu_link %>
+        <%= user_menu_divider %>
+        <%= delete_account_user_menu_link %>
       </div>
     </div>
     <div class="mu-user-menu-divider vertical d-none d-md-block"></div>

data/app/views/user_mailer/delete_account.html.erb

@@ -0,0 +1,7 @@
+<%= render partial: 'user_mailer/mail_template', locals: {
+  title: t('mailer.title.delete_account'),
+  subtitle: t('mailer.subtitle.delete_account'),
+  text: t('mailer.text.delete_account').html_safe,
+  button: t('mailer.button.delete_account'),
+  url: delete_account_url_for(@user)
+} %>

data/app/views/users/_user_delete_confirmation.erb

@@ -0,0 +1,17 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs @user %>
+<% end %>
+
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1>
+      <%= t :email_sent %>
+    </h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <%= t :delete_account_confirmation_email_explain_html, user_email: @user.email, disable_email: Rails.configuration.disable_email %>
+  </div>
+</div>