mumuki-laboratory 9.8.2 → 9.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab01a709d13fa43fb20ead7bb17a0f8d217ed1fb864423dd2af54ea197109c44
-  data.tar.gz: 0f88578a615139a0ac93ca07c2ffa2f8580b5f6c99c900dacef03d34ba62d6e1
+  metadata.gz: 81fd1285c7db44af533a878ee10b6388976451e1d9b493c5aabf5db6516855bd
+  data.tar.gz: b76dcfb86b425f80fa31e2683561d897c7e047fb7ff538319317c1cee40a327c
 SHA512:
-  metadata.gz: 438fef387af073a4423ade676a7739933ca090f5319a1d71098c41443c8c928094bcec9b98205ce7e1b43b9295f9270c131a86de553e0eabadb6b7ec63b51c49
-  data.tar.gz: 5172fa138e0b5acd092e7e99cb1475abe8c07de26c1024d305805104c848a71168fe4a1dec9cc1efc44c51d7c7b2a7a5d37a5cc79cf9264ca165ef76fd38d195
+  metadata.gz: 9d583004159cc6bc0d88e318b3b0da5c9363b61a2b57f228f25f9ee19a016acb518f420b70015254367b2dd930b1887ae1ef61332cd349982251a1ecce995199
+  data.tar.gz: fec344b55bec29c42ca6b8017b7500ec08e0209aaf7649391890268adcc6f626077cb91040bfb2f391a38fe0a67e7af266b93fa0ccb28b6e01c2f9a5ebe9076b

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/messages.js

@@ -19,6 +19,7 @@ mumuki.load(() => {
       $('.pending-messages-filter').removeClass('pending-messages-filter');
       $('button.btn-submit').removeClass('disabled');
       $('.pending-messages-text').remove();
+      $("a[data-bs-target='#messages']")[0].click();
     },
     readMessages: function (url) {
       Chat.tokenRequest({
@@ -47,35 +48,6 @@ mumuki.load(() => {
     setMessagesInterval: function () {
       mumuki.setInterval(Chat.getMessages, 60000);
     },
-    submitMessagesForm: function (url, readUrl, errorUrl) {
-      var $container = $('.mu-view-messages');
-
-      function renderHTML(data) {
-        $container.empty();
-        $container.html(data);
-        $("a[data-bs-target='#messages']").click();
-      }
-
-      function success(data) {
-        renderHTML(data);
-        Chat.readMessages(readUrl);
-      }
-
-      function error(_xhr) {
-        Chat.tokenRequest({
-          url: errorUrl,
-          success: renderHTML,
-          xhrFields: {withCredentials: true}
-        });
-      }
-
-      $.ajax({
-        url: url,
-        success: success,
-        error: error,
-        xhrFields: {withCredentials: true}
-      });
-    },
     openNewMessageModal: function () {
       Chat.$newMessageModal().modal({backdrop: false, keyboard: false});
       Chat.$body().addClass("new-message-modal-open");
@@ -90,4 +62,3 @@ mumuki.load(() => {
   mumuki.Chat = Chat;
 
 });
-

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/_discussion.scss

@@ -50,36 +50,28 @@ $moderator-badge-color: #dd9900;
     }
   }
 
-  .discussion-pagination {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-  }
-
   .discussion-language-icon {
-    float: right;
-    margin-right: 10px;
-    margin-top: 6px;
-    -ms-transform: scale(1.4, 1.4);
-    -webkit-transform: scale(1.4, 1.4);
-    transform: scale(1.4, 1.4);
+    display: inline;
+    padding-right: 5px;
   }
 
-  .discussion-icon {
-    -ms-transform: scale(0.8, 0.8);
-    -webkit-transform: scale(0.8, 0.8);
-    transform: scale(0.8, 0.8);
-    margin-left: 5px;
-    float: right;
-    .fa-stack-1x {
-      -ms-transform: scale(0.9, 0.9);
-      -webkit-transform: scale(0.9, 0.9);
-      transform: scale(0.9, 0.9);
+  .discussion-validated-messages-count {
+    .fa-check {
+      font-size: calc(#{$font-size-base} * 0.5);
+      position: absolute;
+      margin-left: -13px;
+      margin-top: 10px;
     }
   }
 }
 
+.discussion-pagination {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+
 .discussions-no-filtered-results {
   padding: 20px;
   border: 1px solid $discussion-toolbar-border-color;
@@ -96,7 +88,7 @@ $moderator-badge-color: #dd9900;
 }
 
 .discussion-status-icon {
-  padding-right: 10px;
+  padding-left: 2px;
 }
 
 .discussion-row {
@@ -106,11 +98,26 @@ $moderator-badge-color: #dd9900;
     font-size: 18px;
     font-weight: bold;
   }
+  .discussion-title-icons {
+    display: flex;
+    flex-shrink: 0;
+    align-items: center;
+    font-size: calc(#{$font-size-base} * 0.95);
+
+    > * {
+      padding-left: 20px;
+    }
+  }
   .discussion-description {
     overflow: hidden;
     display: block;
     text-overflow: ellipsis;
     white-space: nowrap;
+    margin-bottom: 20px;
+    font-size: calc(#{$font-size-base} * 0.95);
+  }
+  .discussion-initiator {
+    font-size: calc(#{$font-size-base} * 0.85);
   }
 }
 
@@ -308,6 +315,7 @@ $moderator-badge-color: #dd9900;
   border: 1px solid $discussion-message-border-color;
   border-radius: 3px;
   position: relative;
+  margin-bottom: 20px;
   .discussion-message-bubble-header {
     background-color: $mu-color-highlight-background;
     height: 40px;
@@ -400,13 +408,3 @@ $moderator-badge-color: #dd9900;
     font-weight: normal;
   }
 }
-
-.discussion-moderator-access {
-  margin-right: 20px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  .moderator-initials {
-    font-size: 14px;
-  }
-}

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/_editor.scss

@@ -115,3 +115,6 @@ body.fullscreen {
   }
 }
 
+.pending-messages-text {
+  top: auto;
+}

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

@@ -37,7 +37,7 @@ class ApplicationController < ActionController::Base
                 :login_button,
                 :notifications_count,
                 :has_notifications?,
-                :notifications,
+                :user_notifications,
                 :subject,
                 :should_choose_organization?,
                 :current_immersive_organizations,

data/app/controllers/messages_controller.rb

@@ -2,7 +2,8 @@ class MessagesController < AjaxController
   before_action :set_exercise!, only: [:create, :read_messages]
 
   def index
-    render json: {has_messages: has_messages?, messages_count: messages_count}
+    pending_messages = current_user.unread_messages
+    render json: {has_messages: pending_messages.present?, messages_count: pending_messages.count}
   end
 
   def read_messages
@@ -15,10 +16,6 @@ class MessagesController < AjaxController
     redirect_to @exercise
   end
 
-  def errors
-    render 'messages/errors', layout: false
-  end
-
   private
 
   def set_exercise!

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
@@ -27,7 +29,7 @@ class UsersController < ApplicationController
   end
 
   def discussions
-    @watched_discussions = current_user.watched_discussions_in_organization
+    @watched_discussions = current_user.watched_discussions_in_organization.scoped_query_by(discussion_filter_params).unread_first
   end
 
   def activity
@@ -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
 
@@ -71,4 +104,8 @@ class UsersController < ApplicationController
       nil
     end
   end
+
+  def discussion_filter_params
+    @filter_params ||= params.permit([:page])
+  end
 end