mumuki-laboratory 9.8.1 → 9.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '010359ac9c5634aef6562e79e3bf7bcbda5636811940d65b8b4cea33bf925343'
-  data.tar.gz: 985a05cba4d9d05a240b214e8c1fc26b7f1be78f2798945a20cd4d101609920a
+  metadata.gz: b34448fea9940dfe1784874284974ae37cce2df2b56277e2eb1afdff93cab092
+  data.tar.gz: 14cafb4c1d57a5ecf4569c3de18a8ab35f2b0d7030dcd3f0c925945d3f9f2200
 SHA512:
-  metadata.gz: 075a1767df05f3dbeb70bef5f3d8d4276379df342bc4ea63d7a370bbc94c2d3a92f4357f86ef456c0f33f8b347250869162959823e534138f943abfcb0f6ed9d
-  data.tar.gz: 73b01a26563a8af9eed8210fa8c1e1553ef7a444d64ea39b2f97c3e41e5faa33f2cfb9cb37c857602f05947bf9d5d7ae4254db71e3df6219e2b49cd9096aaa6c
+  metadata.gz: f8796a932c0f10ffd127de92b75d21cae746aae645e57a1a8c40e714c139ef9cd5b833cacd7e1c2259ca298ea8a076d1248c7891aacb49f69066a85bd37cbfce
+  data.tar.gz: 77ebd8d9a64a7eb2767e35a67befe8cf9f96346e4df97a92b23ad805c71c275252d1965744193d8c9b16d7f7b555323fd7d38b6176bacf32511944dd3296b3a0

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/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.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,7 +45,11 @@ 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
+    %Q{(<span class="select-date-timezone">#{Organization.current.time_zone}</span>)}.html_safe
   end
 end

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

@@ -6,8 +6,4 @@ module ExamRegistrationHelper
       { icon: :info_circle, class: :info, t: :exam_registration_explanation_html }
     end
   end
-
-  def current_time_zone_html
-    %Q{(<span class="select-date-timezone">#{Organization.current&.time_zone}</span>)}.html_safe
-  end
 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

data/app/helpers/messages_helper.rb

@@ -1,8 +1,4 @@
 module MessagesHelper
-  def messages_url(exercise)
-    exercise.messages_url_for(current_user) if current_user?
-  end
-
   def hidden_pending(assignment)
     assignment.pending_messages? ? '' : 'd-none'
   end
@@ -15,11 +11,11 @@ module MessagesHelper
     'pending-messages-filter' if assignment.pending_messages?
   end
 
-  def read_messages_caption(assignment)
-    assignment.pending_messages? ? :read_messages : :exit
-  end
-
   def sender_class(message)
     message.blank? || message.from_user?(current_user) ? 'self' : 'other'
   end
+
+  def staleness_class(message)
+    'mu-stale' if message.stale?
+  end
 end

data/app/helpers/notifications_helper.rb

@@ -0,0 +1,13 @@
+module NotificationsHelper
+  def background_for_notification(notification)
+    notification.read? ? '' : 'bg-light'
+  end
+
+  def notification_preview_item(icon, name, url, **translation_params)
+    menu_item icon, name, url, 'mu-notification-preview', **translation_params
+  end
+
+  def notification_text_preview_item(icon, text, url)
+    menu_text_item(icon, text, url, 'mu-notification-preview')
+  end
+end

data/app/helpers/profile_helper.rb

@@ -10,4 +10,8 @@ module ProfileHelper
   def save_edit_profile_button(form)
     form.submit t(:save), class: 'btn btn-complementary mu-edit-profile-btn'
   end
+
+  def show_verified_full_name_notice?(user, organization)
+    user.has_verified_full_name? && organization.private?
+  end
 end

data/app/helpers/user_discussions_helper.rb

@@ -0,0 +1,38 @@
+module UserDiscussionsHelper
+  def user_discussions_table_title(discussion, user, last_read)
+    %Q{
+      <tr></tr>
+      <thead>
+        <tr>
+          <td class="#{last_read.nil? ? '' : 'pt-5'}" colspan="4">
+            <strong>#{discussion.read_by?(user) ? t(:discussions_read) : t(:discussions_unread)}</strong>
+          </td>
+        </tr>
+      </thead>
+    }.html_safe
+  end
+
+  def user_discussions_table_header
+    %Q{
+      <tr class="fw-bold">
+        <td></td>
+        <td>#{t(:exercise)}</td>
+        <td>#{t(:discussion_created_by)}</td>
+        <td>#{t(:last_message)}</td>
+      </tr>
+    }.html_safe
+  end
+
+  def user_discussions_table_item(discussion, user)
+    %Q{
+      <tr>
+        <td class="text-center">
+          #{icon_for_read(discussion.read_by?(user))}
+        </td>
+        <td>#{link_to discussion.item.name, item_discussion_path(discussion)}</td>
+        <td>#{discussion_user_name discussion.initiator}</td>
+        <td>#{t(:time_since, time: time_ago_in_words(discussion.last_message_date))}</td>
+      </tr>
+    }.html_safe
+  end
+end