mumuki-laboratory 9.10.0 → 9.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb8cf028976b13658a28a48a6bf235276d1732ce1256a463cd348b8d915fcba7
-  data.tar.gz: 990a6400b5f4fa76f7f17cd5dc97575c9cb475bc7588a15d4ae8102d434583b7
+  metadata.gz: 331d677d1f93dd36a842d9b39bd78a364e3cfdfe6b87711a52b8dbd0fdd3c678
+  data.tar.gz: 159c5b4bf7abb35721da25fea0f11c861fe2df4243c505a4bc8b3c6f523f6207
 SHA512:
-  metadata.gz: 371681f22a60126bad63d241eee30f52f5a8c674077648a2bad413f15375fb704276af6149fc04046f0fc6d72d1562f76ccfcb1ec4d013a7bdcd4480dd817766
-  data.tar.gz: 40875a8558cb07951d09ca67bfe2c10405b9fb75d225ff1afd9f4ede4803ba87b9a1460a8aae18268027c3e4380b9a00d20eb9d03d8c2d5561d4ee023453d4a6
+  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/assets/javascripts/mumuki_laboratory/application/bridge.js

@@ -13,7 +13,9 @@
  * @typedef {{
   *  status: SubmissionStatus,
   *  class_for_progress_list_item?: string,
-  *  guide_finished_by_solution?: boolean
+  *  guide_finished_by_solution?: boolean,
+  *  title_html?: string,
+  *  in_gamified_context?: boolean
   * }} SubmissionResult
   */
 
@@ -47,7 +49,13 @@
  */
 
 /**
- * @typedef {Contents & {client_result?: SubmissionClientResult}} Submission
+ * A submission, composed by:
+ *
+ *  * its actual contents
+ *  * the client results
+ *  * the _pristine flag, that tells whether the submission has been sent without previous results
+ *
+ * @typedef {Contents & {client_result?: SubmissionClientResult, _pristine: boolean}} Submission
  */
 
 /**
@@ -83,12 +91,12 @@ mumuki.bridge = (() => {
      */
     _submitSolution(submission) {
       const lastSubmission = mumuki.SubmissionsStore.getSubmissionResultFor(mumuki.exercise.id, submission);
-      if (lastSubmission) {
-        return $.Deferred().resolve(lastSubmission);
-      } else {
+      if (submission._pristine || !lastSubmission) {
         return this._sendNewSolution(submission).done((result) => {
           mumuki.SubmissionsStore.setSubmissionResultFor(mumuki.exercise.id, {submission, result});
         });
+      } else {
+        return $.Deferred().resolve(lastSubmission);
       }
     }
 
@@ -107,14 +115,12 @@ mumuki.bridge = (() => {
     }
 
     /**
-     * Pre-renders some html parts of submission UI, adding them to the given result
-     *
      * @param {SubmissionResult} result
      * @returns {SubmissionResult}
+     * @see mumuki.renderers.results.preRenderResult
      */
     _preRenderResult(result) {
-      result.class_for_progress_list_item = mumuki.renderers.results.progressListItemClassForStatus(result.status, true);
-      result.title_html = mumuki.renderers.results.translatedTitleHtml(result.status, result.in_gamified_context);
+      mumuki.renderers.results.preRenderResult(result);
       return result;
     }
   }

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

@@ -1,17 +1,19 @@
 mumuki.load(() => {
-  $('.btn-confirmation').on('click change', function (_evt) {
-    var token = new mumuki.CsrfToken();
+  $('.btn-confirmation').on('click change', function (_event) {
+    const token = new mumuki.CsrfToken();
+    const $element = $(this);
 
     $.ajax(token.newRequest({
       method: 'POST',
-      url: $(this).data('confirmation-url'),
+      url: $element.data('confirmation-url'),
       xhrFields: {withCredentials: true},
-      success: function(data){
-        mumuki.updateProgressBarAndShowModal(data);
+      success: function(result) {
+        result.status = "passed";
+        mumuki.renderers.results.preRenderResult(result)
+        mumuki.updateProgressBarAndShowModal(result);
+        window.location = $element.attr("href");
       }
     }));
-
-    return true;
+    return false;
   });
 });
-

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

@@ -55,12 +55,14 @@ mumuki.editors = {
    * @returns {Submission}
    */
   getSubmission() {
-    let content = {};
+    let submission = {
+      _pristine: $('.submission-results').children().length === 0
+    };
     let contents = this.getContents();
     contents.forEach((it) => {
-      content[it.name] = it.value;
+      submission[it.name] = it.value;
     });
-    return content;
+    return submission;
   },
 
   /**

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

@@ -2,11 +2,11 @@ mumuki.progress = (() => {
   /**
    * Updates the current exercise progress indicator
    *
-   * @param {SubmissionResult} data
+   * @param {SubmissionResult} result
    * */
-  function updateProgressBarAndShowModal(data) {
-    $('.progress-list-item.active').attr('class', data.class_for_progress_list_item);
-    if(data.guide_finished_by_solution) new bootstrap.Modal('#guide-done').show();
+  function updateProgressBarAndShowModal(result) {
+    $('.progress-list-item.active').attr('class', result.class_for_progress_list_item);
+    if(result.guide_finished_by_solution) new bootstrap.Modal('#guide-done').show();
   }
 
   /**

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

@@ -71,11 +71,22 @@ mumuki.renderers.results = (() => {
     return `progress-list-item text-center ${classForStatus(status)} ${active ? 'active' : ''}`;
   }
 
+  /**
+   * Pre-renders some html parts of submission UI, adding them to the given result
+   *
+   * @param {SubmissionResult} result
+   */
+  function preRenderResult(result) {
+    result.class_for_progress_list_item = progressListItemClassForStatus(result.status, true);
+    result.title_html = translatedTitleHtml(result.status, result.in_gamified_context);
+  }
+
   return {
     classForStatus,
     iconForStatus,
     progressListItemClassForStatus,
-    translatedTitleHtml
+    translatedTitleHtml,
+    preRenderResult
   };
 })();
 

data/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js

@@ -89,8 +89,14 @@ mumuki.SubmissionsStore = (() => {
 
     // private API
 
-    _asString(object) {
-      return JSON.stringify(object);
+    /**
+     * Serializes the submission and result.
+     * Private attributes are ignored
+     */
+    _asString(submissionAndResult) {
+      return JSON.stringify(submissionAndResult, (key, value) => {
+        if (!key.startsWith("_")) return value
+      });
     }
 
     _keyFor(exerciseId) {

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

@@ -1,3 +1,14 @@
 .fixed-icon {
   margin-right: 5px;
 }
+
+.mu-notification-preview {
+  max-width: 350px;
+  @extend .d-inline-block;
+  @extend .text-truncate;
+}
+
+.mu-stealth-link {
+  text-decoration: none;
+  color: unset;
+}

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

@@ -21,7 +21,7 @@
 
       @include media-breakpoint-down(md) {
         &:not(.active) {
-          h3, p {
+          h3, p, ul {
             display: none
           }
           h2 {

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?
 
@@ -37,13 +36,14 @@ class ApplicationController < ActionController::Base
                 :login_button,
                 :notifications_count,
                 :has_notifications?,
-                :notifications,
+                :user_notifications,
                 :subject,
                 :should_choose_organization?,
                 :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

@@ -3,6 +3,8 @@ class UsersController < ApplicationController
 
   before_action :authenticate!, except: :terms
   before_action :set_user!
+  before_action :set_notification!, only: :toggle_read
+  before_action :verify_owns_notification!, only: :toggle_read
   skip_before_action :validate_accepted_role_terms!
 
   def update
@@ -53,8 +55,39 @@ class UsersController < ApplicationController
     super << [:avatar_id, :avatar_type]
   end
 
+  def notifications
+    @notifications = @user.notifications_in_organization.order(created_at: :desc).page(params[:page])
+  end
+
+  def toggle_read
+    @notification.toggle! :read
+    redirect_to notifications_user_path
+  end
+
+  def show_manage_notifications
+    render 'manage_notifications'
+  end
+
+  def manage_notifications
+    @user.update! ignored_notifications: manage_notifications_params.reject { |_, allowed| allowed.to_boolean }.keys
+
+    redirect_to notifications_user_path, notice: I18n.t(:preferences_updated_successfully)
+  end
+
   private
 
+  def manage_notifications_params
+    params.require(:notifications)
+  end
+
+  def set_notification!
+    @notification = Notification.find(params[:id])
+  end
+
+  def verify_owns_notification!
+    raise Mumuki::Domain::NotFoundError unless @notification.user == @user
+  end
+
   def validate_user_profile!
   end
 
@@ -75,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/application_helper.rb

@@ -45,8 +45,8 @@ module ApplicationHelper
     }.html_safe
   end
 
-  def notification_preview_for(target)
-    render "notifications/#{target.class.name.underscore}", { target: target }
+  def notification_preview_for(notification)
+    render "notifications/previews/#{notification.subject}", { notification: notification }
   end
 
   def current_time_zone_html

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