mumuki-laboratory 9.12.1 → 9.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67eb631fe5c878f8151a859f82bcffc8225e087e59669f600e08ff66cc9034c0
-  data.tar.gz: ab208353d092d920d65d899ad84aecb58f7f89e15ecae80f6869e09e0df85b1e
+  metadata.gz: 331d677d1f93dd36a842d9b39bd78a364e3cfdfe6b87711a52b8dbd0fdd3c678
+  data.tar.gz: 159c5b4bf7abb35721da25fea0f11c861fe2df4243c505a4bc8b3c6f523f6207
 SHA512:
-  metadata.gz: 9b33f896c2ae44fee775b055f2dfcd965280452a3ef073a19a8650d0ca4c7e66c223247a28e5d126bc7a8dda256ae74683488d2090f796d97aa390a63bc3c00a
-  data.tar.gz: 21b1a86962e2edfcb17e09a96ae9983cf89828251cf283b3a0dd2004a8b98b09d495cf75b2995793d02d138aba5eaaba9cda6bf4c8f22e722881a0a312f94c87
+  metadata.gz: b575ed92e419931d69aae5b043f7e29a792c9d9180746e1be3c6bd1261b29394d656a5d97231a6f419181c97daf0dd01b40637c62ab7cc35ee52fd31f84de2b6
+  data.tar.gz: 84a684078c62aa1f15c070a3af71f82c6afce2ea657c0b8de0017954c2d020e7a3eb9c5014031746440bfd44b363386cbae0d8f1d6a9e58ee16cb2cb7368257e

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/controllers/application_controller.rb

@@ -24,7 +24,6 @@ class ApplicationController < ActionController::Base
   before_action :redirect_to_proper_context!, if: :immersive_context_wrong?
 
   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?
 
@@ -43,7 +42,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 +72,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 +160,8 @@ class ApplicationController < ActionController::Base
   def leave_organization!
     Mumukit::Platform::Organization.leave!
   end
+
+  def current_access_mode
+    Organization.current.access_mode(current_user)
+  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
 
@@ -99,4 +100,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

@@ -108,4 +108,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/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">

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

@@ -4,7 +4,7 @@
 
 <div>
   <div class="discussion-context">
-    <%= render partial: 'exercises/read_only', locals: {exercise: @debatable} %>
+    <%= render partial: 'exercises/read_only', locals: { exercise: @debatable } %>
   </div>
 </div>
 
@@ -13,7 +13,7 @@
 
   <div class="d-flex flex-wrap">
     <h3 class="flex-grow-1 me-3"><%= t :messages %></h3>
-    <% if current_user && @discussion.persisted? %>
+    <% if current_user && @discussion.persisted? && current_access_mode.show_discussion_element? %>
       <span class="d-flex">
         <% if @discussion.can_toggle_responsible?(current_user) %>
           <div class="discussion-responsible me-1">
@@ -40,10 +40,10 @@
   <% if @discussion.has_messages? %>
     <div class="discussion-messages">
       <% if @discussion.description.present? %>
-        <%= render partial: 'discussions/description_message', locals: {discussion: @discussion} %>
+        <%= 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_user, message: message } %>
       <% end %>
       <% if @discussion.commentable_by?(current_user) %>
         <hr class="message-divider">
@@ -51,7 +51,7 @@
     </div>
   <% end %>
 
-  <%= render partial: 'discussions/new_message', locals: {user: current_user} if @discussion.commentable_by?(current_user) %>
+  <%= render partial: 'discussions/new_message', locals: { user: current_user } if @discussion.commentable_by?(current_user) && current_access_mode.show_discussion_element? %>
 
 <% end %>
 

data/app/views/exercise_solutions/_results.html.erb

@@ -13,7 +13,7 @@
     <% unless assignment.manual_evaluation_comment? %>
       <%= render layout: 'exercise_solutions/assistant_rules_box', locals: {assignment: assignment } do %>
         <%= render partial: 'exercise_solutions/contextualization_results_body', locals: {contextualization: assignment} %>
-        <% if should_render_need_help_dropdown?(assignment) %>
+        <% if should_render_need_help_dropdown?(assignment) && current_access_mode.show_discussion_element? %>
           <div class="notify-problem-box">
             <div class="dropdown">
               <%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-bs-toggle': 'dropdown'} %>

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

@@ -28,7 +28,7 @@
   </div>
 <% end %>
 
-<% if !@stats.try(:done?) && @next_exercise %>
+<% if !@stats.try(:done?) && @next_exercise && show_content_element? %>
   <div class="text-box">
     <div class="actions">
       <%= link_to t(lesson_practice_key_for(@stats)), exercise_path(@next_exercise), class: 'btn btn-complementary' %>
@@ -36,7 +36,7 @@
   </div>
 <% end %>
 
-<% if @stats&.done? %>
+<% if @stats&.done? && show_content_element? %>
   <div class="text-box">
     <div class="actions">
       <%= next_lesson_button @guide %>

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

@@ -1,6 +1,7 @@
 <div class="progress-list-flex">
   <% assignments = guide.assignments_for(current_user) %>
   <% assignments.each do |assignment| %>
+    <% next unless show_content?(assignment.exercise) %>
     <% exercise = assignment.exercise %>
     <a
       <%= turbolinks_enable_for exercise %>

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

@@ -1,5 +1,6 @@
 <ul class="progress-listing">
   <% guide.assignments_for(current_user).each do |assignment| %>
+      <% next unless show_content?(assignment.exercise) %>
       <% cache [assignment.exercise, assignment.status, Organization.current.name, current_user?] do %>
           <li <%= turbolinks_enable_for(assignment.exercise) %>>
             <%= assignment_status_icon assignment %>

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

@@ -20,6 +20,10 @@
                 <%= profile_picture_for current_user %>
               </div>
               <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="profileDropdown">
+                <% if profile_enabled_here? %>
+                  <%= menu_link_to_profile %>
+                  <li class="dropdown-divider"></li>
+                <% end %>
                 <%= menu_bar_list_items %>
                 <% if any_menu_bar_links? %>
                   <li class="dropdown-divider"></li>

data/app/views/layouts/exercise_inputs/forms/_kids_form.html.erb

@@ -4,7 +4,7 @@
   <%= render_exercise_input_editor f, exercise %>
 
   <div class="actions mu-submit-button mu-kids-submit-button">
-    <%= render_submit_button(@assignment) %>
+    <%= render_submit_button(@assignment) if current_access_mode.submit_solutions_here? %>
   </div>
   <div class="actions mu-kids-reset-button"></div>
   <img class="mu-kids-compass-rose" src="/compass_rose.svg">

data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb

@@ -34,11 +34,15 @@
                  remote: true,
                  html: {role: 'form', class: "new_solution mu-editor mu-editor-overlap mu-form #{pending_messages_filter(@assignment)}"}) do |f| %>
       <div class="mb-3">
-        <%= render_exercise_input_editor f, exercise %>
+        <% if current_access_mode.submit_solutions_here? %>
+          <%= render_exercise_input_editor f, exercise %>
+        <% else %>
+          <%= render_exercise_read_only_editor exercise, @assignment.solution %>
+        <% end %>
       </div>
 
       <div class="actions mu-submit-button">
-        <%= render_submit_button(@assignment) %>
+        <%= render_submit_button(@assignment) if current_access_mode.submit_solutions_here? %>
       </div>
     <% end %>
   </div>