mumuki-laboratory 9.12.0 → 9.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81fd1285c7db44af533a878ee10b6388976451e1d9b493c5aabf5db6516855bd
-  data.tar.gz: b76dcfb86b425f80fa31e2683561d897c7e047fb7ff538319317c1cee40a327c
+  metadata.gz: 19427492957bc679a64b679d1b50e33e38a750a032e9ca916fa8ba543eef8c03
+  data.tar.gz: bab7ef25dbc9e0970471fca58b4d8e3a1efd592d9f34d092e6f0eeed4c8eeb5d
 SHA512:
-  metadata.gz: 9d583004159cc6bc0d88e318b3b0da5c9363b61a2b57f228f25f9ee19a016acb518f420b70015254367b2dd930b1887ae1ef61332cd349982251a1ecce995199
-  data.tar.gz: fec344b55bec29c42ca6b8017b7500ec08e0209aaf7649391890268adcc6f626077cb91040bfb2f391a38fe0a67e7af266b93fa0ccb28b6e01c2f9a5ebe9076b
+  metadata.gz: bb031814c4d6bc24bcfe00e988923cbdaf0e9cdd6e033d37fd09542736be3a6d9489bc41b5b9cb85bafd52b461ef48a2483082e441a2e92a02370135ba77b3be
+  data.tar.gz: eb0b4b0e606f74d5e679b77cb05088eebcbd651e733730acfee0f28fb15d5aecaa490d011d5bc4319cda746951419c5a85f9398472a9aa4cf40b5f5408dc5f3a

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/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/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/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>

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

@@ -28,6 +28,7 @@
       <h3><%= t(:lessons) %></h3>
 
       <% @chapter.lessons.includes(guide: :exercises).each do |lesson| %>
+        <% next unless show_content?(lesson.guide) %>
         <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
         <%= render partial: 'layouts/progress_listing', locals: { guide: lesson.guide } %>
       <% end %>

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

@@ -1,5 +1,5 @@
 <%= form_for [@discussion, Message.new] do |f| %>
-  <%= render layout: 'discussions/message_container', locals: {user: user} do %>
+  <%= render layout: 'discussions/message_container', locals: { user: user } do %>
     <div class="discussion-message-bubble">
       <div class="discussion-message-bubble-header">
         <div class="discussion-message-bubble-title">
@@ -10,7 +10,7 @@
         <div class="container-fluid">
           <div class="row">
             <div class="discussion-new-message-content">
-              <%= f.editor :content, '', { id: 'discussion-new-message', class: 'form-control', placeholder: t(:message) } %>
+              <%= spell_checked_editor 'message[content]', { id: 'discussion-new-message', placeholder: t(:message) } %>
             </div>
             <div class="discussion-message-content d-none" id="discussion-new-message-preview"></div>
           </div>