mumuki-laboratory 9.12.1 → 9.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67eb631fe5c878f8151a859f82bcffc8225e087e59669f600e08ff66cc9034c0
-  data.tar.gz: ab208353d092d920d65d899ad84aecb58f7f89e15ecae80f6869e09e0df85b1e
+  metadata.gz: 5ad2aade204189333166666c1e645465a61863e7157e88a3cb7f7c70fbc56531
+  data.tar.gz: 3ba1bd40a4cce76c17a0c33ce377939f67c959ac17d09f324157d8b902a07dc7
 SHA512:
-  metadata.gz: 9b33f896c2ae44fee775b055f2dfcd965280452a3ef073a19a8650d0ca4c7e66c223247a28e5d126bc7a8dda256ae74683488d2090f796d97aa390a63bc3c00a
-  data.tar.gz: 21b1a86962e2edfcb17e09a96ae9983cf89828251cf283b3a0dd2004a8b98b09d495cf75b2995793d02d138aba5eaaba9cda6bf4c8f22e722881a0a312f94c87
+  metadata.gz: 404d077ba985d112f9a213b2cf548fe0c57dffe9b09d94472bf32a4505fb8cd90c3d5572d74eb2d03babe20644cdd9c7e7626bc2e3c9865fe665cbee80c95b1d
+  data.tar.gz: c1250fb109892e4646adf02f6ddc7b86fc867377a194b0846ff0e38722e116b51357e4d4adf2a66eea06b146f18bf3134d0e35e9ef8519d8adf79d563788610d

data/README.md

@@ -559,15 +559,16 @@ Before using the API, you must create an `ApiClient` using `rails c`, which will
 
 Before using the API, take a look to the roles hierarchy:
 
-![roles hierarchy](https://yuml.me/diagram/plain/class/[Admin]%5E-[Janitor],[Admin]%5E-[Moderator],%20[Janitor]%5E-[Headmaster],%20[Headmaster]%5E-[Teacher],%20[Teacher]%5E-[Student],%20,%20[Admin]%5E-[Editor],%20[Editor]%5E-[Writer],%20[Owner]%5E-[Admin]).
+![roles hierarchy](https://yuml.me/diagram/plain/class/[Admin]%5E-[Janitor],[Admin]%5E-[Forum%20Supervisor],[Forum%20Supervisor]%5E-[Moderator],[Janitor]%5E-[Headmaster],[Headmaster]%5E-[Teacher],[Teacher]%5E-[Student],[Student]%5E-[Ex%20Student],[Admin]%5E-[Editor],[Editor]%5E-[Writer],[Owner]%5E-[Admin]).
 
 Permissions are bound to a scope, that states in which context the operation can be performed. Scopes are simply two-level contexts, expressed as slugss `<first>/<second>`, without any explicit semantic. They exact meaning depends on the role:
 
+  * ex_student: `organization/course`
   * student: `organization/course`
   * teacher and headmaster: `organization/course`
   * writer and editor: `organization/content`
   * janitor: `organization/_`
-  * moderator: `organization/_`
+  * moderator and forum_supervisor: `organization/_`
   * admin: `_/_`
   * owner: `_/_`
 

data/app/assets/javascripts/mumuki_laboratory/application/codemirror-builder.js

@@ -71,6 +71,15 @@
       return this;
     }
 
+    setupSpellCheckedEditor() {
+      this.editor = this.createEditor({
+        inputStyle: 'contenteditable',
+        spellcheck: true
+      });
+
+      return this;
+    }
+
     setupLanguage(language) {
       var highlightMode = language || this.$textarea.data('editor-language');
       if (highlightMode === 'dynamic') {

data/app/assets/javascripts/mumuki_laboratory/application/discussions.js

@@ -9,12 +9,13 @@ mumuki.load(() => {
 
   function createNewMessageEditor() {
     var $textarea = $("#discussion-new-message");
-    var textarea = $textarea[0];
-    if (!textarea) return;
+    var editorContainer = $(".mu-spell-checked-editor")[0];
+    if (!editorContainer) return;
 
-    return new mumuki.editor.CodeMirrorBuilder(textarea)
-      .setupSimpleEditor()
+    return new mumuki.editor.CodeMirrorBuilder(editorContainer)
+      .setupSpellCheckedEditor()
       .setupMinLines($textarea.data('lines'))
+      .setupLanguage()
       .build();
   }
 

data/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js

@@ -27,11 +27,12 @@ mumuki.renderers.results = (() => {
    */
   function classForStatus(status) {
     switch (status) {
-      case "errored":              return "broken";
-      case "failed":               return "danger";
-      case "passed_with_warnings": return "warning";
-      case "passed":               return "success";
-      case "pending":              return "muted";
+      case "errored":                   return "broken";
+      case "failed":                    return "danger";
+      case "manual_evaluation_pending": return "info";
+      case "passed_with_warnings":      return "warning";
+      case "passed":                    return "success";
+      case "pending":                   return "muted";
     }
   }
 

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

@@ -38,3 +38,14 @@
     max-width: 70vw;
   }
 }
+
+.mu-read-only {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-content: center;
+  background-color: $mu-color-complementary;
+  color: white;
+  text-align: center;
+  padding: 15px;
+}

data/app/controllers/application_controller.rb

@@ -19,14 +19,14 @@ class ApplicationController < ActionController::Base
   before_action :set_time_zone!
 
   before_action :ensure_user_enabled!, if: :current_user?
-  before_action :validate_active_organization!
 
   before_action :redirect_to_proper_context!, if: :immersive_context_wrong?
+  before_action :validate_active_organization!
 
   before_action :authorize_if_private!
-  before_action :validate_active_organization!
   before_action :validate_user_profile!, if: :current_user?
   before_action :validate_accepted_role_terms!, if: :current_user?
+  before_action :ensure_restore_progress!, if: :current_user?
 
   before_action :visit_organization!, if: :current_user?
 
@@ -43,7 +43,8 @@ class ApplicationController < ActionController::Base
                 :current_immersive_organizations,
                 :theme_stylesheet_url,
                 :extension_javascript_url,
-                :current_immersive_path
+                :current_immersive_path,
+                :current_access_mode
 
   add_flash_types :info
 
@@ -72,7 +73,7 @@ class ApplicationController < ActionController::Base
 
   def validate_active_organization!
     return if current_user&.teacher_here?
-    Organization.current.validate_active!
+    Organization.current.validate_active_for! current_user
   end
 
   # required by Mumukit::Login
@@ -160,4 +161,14 @@ class ApplicationController < ActionController::Base
   def leave_organization!
     Mumukit::Platform::Organization.leave!
   end
+
+  def current_access_mode
+    Organization.current.access_mode(current_user)
+  end
+
+  def ensure_restore_progress!
+    if current_access_mode.restore_indicators?(Organization.current.book)
+      current_user.restore_organization_progress!(Organization.current)
+    end
+  end
 end

data/app/controllers/book_controller.rb

@@ -4,4 +4,10 @@ class BookController < ApplicationController
     @book = Organization.current.book
     @exams = Organization.current.accessible_exams_for current_user
   end
+
+  private
+
+  def authorization_minimum_role
+    :ex_student
+  end
 end

data/app/controllers/chapters_controller.rb

@@ -3,6 +3,7 @@ require 'addressable/uri'
 # It acts as a guide container in monolesson contexts
 class ChaptersController < GuideContainerController
   include Mumuki::Laboratory::Controllers::ImmersiveNavigation
+  include Mumuki::Laboratory::Controllers::ValidateAccessMode
 
   def subject
     @chapter ||= Chapter.find_by(id: params[:id])
@@ -14,4 +15,12 @@ class ChaptersController < GuideContainerController
     @monolesson = subject.monolesson
     @guide = @monolesson&.guide
   end
+
+  def authorization_minimum_role
+    :ex_student
+  end
+
+  def subject_container
+    subject.topic
+  end
 end

data/app/controllers/discussions_controller.rb

@@ -7,6 +7,7 @@ class DiscussionsController < ApplicationController
   before_action :discussion_filter_params, only: :index
   before_action :read_discussion, only: :show
   before_action :authorize_moderator!, only: [:responsible]
+  before_action :validate_access_mode!
 
   helper_method :discussion_filter_params
 
@@ -38,17 +39,19 @@ class DiscussionsController < ApplicationController
   end
 
   def responsible
-    if subject.can_toggle_responsible? current_user
-      subject.toggle_responsible! current_user
+    subject.with_pg_lock proc {
+      if subject.can_toggle_responsible? current_user
+        subject.toggle_responsible! current_user
 
-      set_flash_responsible_confirmation!
-      status = :ok
-    else
-      set_flash_responsible_alert!
-      status = :conflict
-    end
+        set_flash_responsible_confirmation!
+        status = :ok
+      else
+        set_flash_responsible_alert!
+        status = :conflict
+      end
 
-    render :partial => 'layouts/toast', status: status
+      render :partial => 'layouts/toast', status: status
+    }
   end
 
   def create
@@ -99,4 +102,12 @@ class DiscussionsController < ApplicationController
   def discussion_filter_params
     @filter_params ||= params.permit(Discussion.permitted_query_params)
   end
+
+  def authorization_minimum_role
+    :ex_student
+  end
+
+  def validate_access_mode!
+    current_access_mode.validate_discuss_here! subject
+  end
 end

data/app/controllers/exam_authorization_requests_controller.rb

@@ -31,6 +31,6 @@ class ExamAuthorizationRequestsController < ApplicationController
 
   def verify_registration_opened!
     exam_registration = ExamRegistration.find(authorization_request_params[:exam_registration_id])
-    raise Mumuki::Domain::GoneError if exam_registration.end_time.past?
+    raise Mumuki::Domain::GoneError if exam_registration.ended?
   end
 end

data/app/controllers/exercise_solutions_controller.rb

@@ -8,7 +8,7 @@ class ExerciseSolutionsController < AjaxController
 
   def create
     assignment = @exercise.try_submit_solution!(current_user, solution_params)
-    render_results_json assignment, status: assignment.status
+    render_results_json assignment, status: assignment.visible_status
   end
 
   private

data/app/controllers/exercises_controller.rb

@@ -2,6 +2,7 @@ class ExercisesController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
   include Mumuki::Laboratory::Controllers::ExerciseSeed
   include Mumuki::Laboratory::Controllers::ImmersiveNavigation
+  include Mumuki::Laboratory::Controllers::ValidateAccessMode
 
   before_action :set_guide!, only: :show
   before_action :set_assignment!, only: :show, if: :current_user?
@@ -50,4 +51,8 @@ class ExercisesController < ApplicationController
              :guide_id, :number,
              :layout, :expectations_yaml)
   end
+
+  def authorization_minimum_role
+    :ex_student
+  end
 end

data/app/controllers/faqs_controller.rb

@@ -1,4 +1,8 @@
 class FAQsController < ApplicationController
+  def authorization_minimum_role
+    :ex_student
+  end
+
   def index
     @faqs = Organization.current.faqs_html
     raise Mumuki::Domain::NotFoundError unless @faqs.present?

data/app/controllers/lessons_controller.rb

@@ -1,9 +1,18 @@
 class LessonsController < GuideContainerController
   include Mumuki::Laboratory::Controllers::ImmersiveNavigation
+  include Mumuki::Laboratory::Controllers::ValidateAccessMode
 
   private
 
   def subject
     @lesson ||= Lesson.find_by(id: params[:id])
   end
+
+  def authorization_minimum_role
+    :ex_student
+  end
+
+  def subject_container
+    subject.guide
+  end
 end

data/app/controllers/users_controller.rb

@@ -29,7 +29,10 @@ class UsersController < ApplicationController
   end
 
   def discussions
-    @watched_discussions = current_user.watched_discussions_in_organization.scoped_query_by(discussion_filter_params).unread_first
+    @watched_discussions = current_user.watched_discussions_in_organization
+                                       .where(exercise: Organization.current.exercises)
+                                       .scoped_query_by(discussion_filter_params)
+                                       .unread_first
   end
 
   def activity
@@ -108,4 +111,8 @@ class UsersController < ApplicationController
   def discussion_filter_params
     @filter_params ||= params.permit([:page])
   end
+
+  def authorization_minimum_role
+    :ex_student
+  end
 end

data/app/helpers/concerns/with_student_path_navigation.rb

@@ -9,7 +9,7 @@ module WithStudentPathNavigation
   end
 
   def next_exercise_button(exercise)
-    next_button(exercise) || next_button(exercise.guide.lesson)
+    next_button(exercise) || next_button(exercise.guide.lesson) if show_content_element?
   end
 
   def close_modal_button

data/app/helpers/content_view_helper.rb

@@ -7,6 +7,14 @@ module ContentViewHelper
     content.name
   end
 
+  def show_content?(content)
+    current_access_mode.show_content?(content)
+  end
+
+  def show_content_element?
+    current_access_mode.show_content_element?
+  end
+
   private
 
   def content_type_number(content)

data/app/helpers/discussions_helper.rb

@@ -8,7 +8,7 @@ module DiscussionsHelper
   end
 
   def solve_discussions_link
-    discussions_link others_discussions_icon(t(:solve_doubts)), discussions_path(solve_discussion_params_for(current_user)), class: 'dropdown-item'
+    discussions_link others_discussions_icon(t(:solve_doubts)), discussions_path(solve_discussion_params_for(current_user)), class: 'dropdown-item' if current_access_mode.resolve_discussions_here?
   end
 
   def user_discussions_link

data/app/helpers/editor_helper.rb

@@ -10,4 +10,9 @@ module EditorHelper
     editor_options = editor_defaults(language, options, 'read-only-editor')
     text_area_tag :solution_content, content, editor_options
   end
+
+  def spell_checked_editor(name, options = {})
+    editor_options = editor_defaults('markdown', options, 'form-control mu-spell-checked-editor')
+    text_area_tag name, '', editor_options
+  end
 end

data/app/helpers/exam_registration_helper.rb

@@ -1,6 +1,6 @@
 module ExamRegistrationHelper
   def exam_registration_view
-    if @registration.end_time.past?
+    if @registration.ended?
       { icon: :times_circle, class: :danger, t: :exam_registration_finished_html }
     else
       { icon: :info_circle, class: :info, t: :exam_registration_explanation_html }

data/app/helpers/links_helper.rb

@@ -71,7 +71,11 @@ module LinksHelper
   end
 
   def faqs_enabled_here?
-    Organization.current.faqs.present?
+    current_access_mode.faqs_here?
+  end
+
+  def profile_enabled_here?
+    current_access_mode.profile_here?
   end
 
   private

data/app/helpers/menu_bar_helper.rb

@@ -1,7 +1,6 @@
 module MenuBarHelper
   def menu_bar_links
     [
-      menu_link_to_profile,
       menu_link_to_classroom,
       menu_link_to_bibliotheca,
       solve_discussions_link,
@@ -18,7 +17,7 @@ module MenuBarHelper
   end
 
   def menu_link_to_profile
-    menu_item('user', :my_account, user_path)
+    li_tag menu_item('user', :my_account, user_path)
   end
 
   def menu_link_to_classroom
@@ -36,7 +35,7 @@ module MenuBarHelper
   end
 
   def logout_menu_link
-    li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for))
+    li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for, organization: Organization.current))
   end
 
   def menu_item(icon, name, url, css_class = nil, **translation_params)

data/app/helpers/overlapped_buttons_helper.rb

@@ -16,7 +16,8 @@ module OverlappedButtonsHelper
       {class: 'mu-content-toolbar-item mu-restart-guide',
        data: {confirm: t(:confirm_restart)}, method: :delete, 'data-bs-placement': 'top'})
 
-    link_to overlapped_button_icon(:undo), guide_progress_path(guide), all_options
+    link_to overlapped_button_icon(:undo), guide_progress_path(guide), all_options if show_content_element?
+
   end
 
   private

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

@@ -6,16 +6,25 @@
   <%= render partial: 'book/header' %>
 
   <% @book.next_lesson_for(current_user).try do |lesson| %>
-    <div class="actions">
-      <a href="<%= lesson_path(lesson) %>" class="btn btn-complementary">
-        <%= t book_practice_key_for(current_user) %>
-      </a>
-    </div>
+    <% if show_content_element? %>
+      <div class="actions">
+        <a href="<%= lesson_path(lesson) %>" class="btn btn-complementary">
+          <%= t book_practice_key_for(current_user) %>
+        </a>
+      </div>
+    <% else %>
+      <br>
+    <% end %>
   <% end %>
 
-  <h2><%= t(:chapters) %></h2>
+  <% if show_content?(@book) %>
+    <h2><%= t(:chapters) %></h2>
+  <% end %>
 
   <% @book.chapter_visibilities_in(current_workspace).each do |it, enabled| %>
+
+    <% 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>
@@ -24,7 +33,7 @@
         </div>
       </div>
 
-      <% unless enabled  %>
+      <% unless enabled %>
         <div class="text-center mu-lock">
           <i class="fas fa-lock fa-5x"></i>
           <p><%= t :locked_content %></p>