mumuki-laboratory 9.9.0 → 9.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49d2ca01f9b5f0c006b68ae6a0587ee4231db269c9d6bb4dd3a5a77833757c7f
-  data.tar.gz: '0093396f29a33c579c63d5f227df36772f9aaee6867603f77a6d878f7eeb277d'
+  metadata.gz: 67eb631fe5c878f8151a859f82bcffc8225e087e59669f600e08ff66cc9034c0
+  data.tar.gz: ab208353d092d920d65d899ad84aecb58f7f89e15ecae80f6869e09e0df85b1e
 SHA512:
-  metadata.gz: 4e03ec14d6309220ef8bac5fc19691a4659f6612936831c17601338ce10a309b896c2c352424e8f063514cf95f7c7edde0de225b0d387b8cf1452c2dc6b46986
-  data.tar.gz: 4fe91de131798c91a7db006e4e89f6601c46c7bf61490c211f3090921ccdf08243695980c24a6ac720487d8d627a668c072ee051d5dfeb4c55815410f0badc70
+  metadata.gz: 9b33f896c2ae44fee775b055f2dfcd965280452a3ef073a19a8650d0ca4c7e66c223247a28e5d126bc7a8dda256ae74683488d2090f796d97aa390a63bc3c00a
+  data.tar.gz: 21b1a86962e2edfcb17e09a96ae9983cf89828251cf283b3a0dd2004a8b98b09d495cf75b2995793d02d138aba5eaaba9cda6bf4c8f22e722881a0a312f94c87

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

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/discussions_helper.rb

@@ -60,11 +60,18 @@ module DiscussionsHelper
     }.html_safe
   end
 
-  def discussion_messages_icon(discussion)
+  def discussion_messages_count(discussion)
     %Q{
-      <span class="discussion-icon fa-stack fa-xs">
-        <i class="far fa-comment fa-stack-2x"></i>
-        <i class="fas fa-stack-1x">#{discussion.validated_messages_count}</i>
+      <span class="discussion-messages-count">
+        #{fa_icon :comments, type: :regular, text: discussion.messages_count}
+      </span>
+    }.html_safe
+  end
+
+  def discussion_validated_messages_count(discussion)
+    %Q{
+      <span class="discussion-validated-messages-count">
+        #{fa_icon :comment, type: :regular}#{fa_icon :check, text: discussion.validated_messages_count}
       </span>
     }.html_safe
   end

data/app/helpers/icons_helper.rb

@@ -50,6 +50,6 @@ module IconsHelper
   end
 
   def icon_for_read(read)
-    tag('i', class: "fa#{read ? 'r' : 's'} fa-envelope")
+    tag.i(class: "fa#{read ? 'r' : 's'} fa-envelope#{read ? '-open' : ''}")
   end
 end

data/app/helpers/menu_bar_helper.rb

@@ -39,8 +39,12 @@ module MenuBarHelper
     li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for))
   end
 
-  def menu_item(icon, name, url, translation_params = {})
-    link_to fixed_fa_icon(icon, text: t(name, translation_params)), url, role: 'menuitem', tabindex: '-1', class: 'dropdown-item'
+  def menu_item(icon, name, url, css_class = nil, **translation_params)
+    menu_text_item(icon, t(name, translation_params), url, css_class)
+  end
+
+  def menu_text_item(icon, text, url, css_class = nil)
+    link_to fixed_fa_icon(icon, text: text), url, role: 'menuitem', tabindex: '-1', class: "dropdown-item #{css_class}"
   end
 
   def any_menu_bar_links?
@@ -48,6 +52,6 @@ module MenuBarHelper
   end
 
   def menu_link_to_faqs
-    li_tag menu_item('question', :faqs, faqs_path)
+    li_tag menu_item(:info, :faqs_abbreviated, faqs_path)
   end
 end