mumuki-laboratory 9.13.1 → 9.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b47dd283c616c348e2ce6aab4a61cb1e12ec68fa902fcff158e8dc6a7bf63a64
-  data.tar.gz: 44a250723c61c458d582fe87b62dab762ee846a687c74d9c5e738a9eb5b14f92
+  metadata.gz: 19427492957bc679a64b679d1b50e33e38a750a032e9ca916fa8ba543eef8c03
+  data.tar.gz: bab7ef25dbc9e0970471fca58b4d8e3a1efd592d9f34d092e6f0eeed4c8eeb5d
 SHA512:
-  metadata.gz: 2f39b477c86a46e4eaa33535adfd2adea92fe78f2fdc858c893b6eff24ff16c943b73a3a846045fe6af5ce0b80b6251614c17af13ef29d551ce7a198d2636d94
-  data.tar.gz: 78e3cf4b67a33b11a3dccb90551ea2382714e5f1ab3b3bdfecdc3cbeabeb45af53178fbd6843fd78859f4e5844afc56656191eba00cffa6431460d8f98858ee7
+  metadata.gz: bb031814c4d6bc24bcfe00e988923cbdaf0e9cdd6e033d37fd09542736be3a6d9489bc41b5b9cb85bafd52b461ef48a2483082e441a2e92a02370135ba77b3be
+  data.tar.gz: eb0b4b0e606f74d5e679b77cb05088eebcbd651e733730acfee0f28fb15d5aecaa490d011d5bc4319cda746951419c5a85f9398472a9aa4cf40b5f5408dc5f3a

data/app/assets/javascripts/mumuki_laboratory/application/codemirror-builder.js

@@ -71,6 +71,15 @@
       return this;
     }
 
+    setupSpellCheckedEditor() {
+      this.editor = this.createEditor({
+        inputStyle: 'contenteditable',
+        spellcheck: true
+      });
+
+      return this;
+    }
+
     setupLanguage(language) {
       var highlightMode = language || this.$textarea.data('editor-language');
       if (highlightMode === 'dynamic') {

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

@@ -9,12 +9,13 @@ mumuki.load(() => {
 
   function createNewMessageEditor() {
     var $textarea = $("#discussion-new-message");
-    var textarea = $textarea[0];
-    if (!textarea) return;
+    var editorContainer = $(".mu-spell-checked-editor")[0];
+    if (!editorContainer) return;
 
-    return new mumuki.editor.CodeMirrorBuilder(textarea)
-      .setupSimpleEditor()
+    return new mumuki.editor.CodeMirrorBuilder(editorContainer)
+      .setupSpellCheckedEditor()
       .setupMinLines($textarea.data('lines'))
+      .setupLanguage()
       .build();
   }
 

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

@@ -38,3 +38,14 @@
     max-width: 70vw;
   }
 }
+
+.mu-read-only {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-content: center;
+  background-color: $mu-color-complementary;
+  color: white;
+  text-align: center;
+  padding: 15px;
+}

data/app/controllers/application_controller.rb

@@ -26,6 +26,7 @@ class ApplicationController < ActionController::Base
   before_action :authorize_if_private!
   before_action :validate_user_profile!, if: :current_user?
   before_action :validate_accepted_role_terms!, if: :current_user?
+  before_action :ensure_restore_progress!, if: :current_user?
 
   before_action :visit_organization!, if: :current_user?
 
@@ -164,4 +165,10 @@ class ApplicationController < ActionController::Base
   def current_access_mode
     Organization.current.access_mode(current_user)
   end
+
+  def ensure_restore_progress!
+    if current_access_mode.restore_indicators?(Organization.current.book)
+      current_user.restore_organization_progress!(Organization.current)
+    end
+  end
 end

data/app/controllers/discussions_controller.rb

@@ -39,17 +39,19 @@ class DiscussionsController < ApplicationController
   end
 
   def responsible
-    if subject.can_toggle_responsible? current_user
-      subject.toggle_responsible! current_user
-
-      set_flash_responsible_confirmation!
-      status = :ok
-    else
-      set_flash_responsible_alert!
-      status = :conflict
-    end
-
-    render :partial => 'layouts/toast', status: status
+    subject.with_pg_lock proc {
+      if subject.can_toggle_responsible? current_user
+        subject.toggle_responsible! current_user
+
+        set_flash_responsible_confirmation!
+        status = :ok
+      else
+        set_flash_responsible_alert!
+        status = :conflict
+      end
+
+      render :partial => 'layouts/toast', status: status
+    }
   end
 
   def create

data/app/controllers/users_controller.rb

@@ -29,7 +29,10 @@ class UsersController < ApplicationController
   end
 
   def discussions
-    @watched_discussions = current_user.watched_discussions_in_organization.scoped_query_by(discussion_filter_params).unread_first
+    @watched_discussions = current_user.watched_discussions_in_organization
+                                       .where(exercise: Organization.current.exercises)
+                                       .scoped_query_by(discussion_filter_params)
+                                       .unread_first
   end
 
   def activity

data/app/helpers/editor_helper.rb

@@ -10,4 +10,9 @@ module EditorHelper
     editor_options = editor_defaults(language, options, 'read-only-editor')
     text_area_tag :solution_content, content, editor_options
   end
+
+  def spell_checked_editor(name, options = {})
+    editor_options = editor_defaults('markdown', options, 'form-control mu-spell-checked-editor')
+    text_area_tag name, '', editor_options
+  end
 end

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

@@ -10,7 +10,7 @@
         <div class="container-fluid">
           <div class="row">
             <div class="discussion-new-message-content">
-              <%= f.editor :content, '', { id: 'discussion-new-message', class: 'form-control', placeholder: t(:message) } %>
+              <%= spell_checked_editor 'message[content]', { id: 'discussion-new-message', placeholder: t(:message) } %>
             </div>
             <div class="discussion-message-content d-none" id="discussion-new-message-preview"></div>
           </div>

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

@@ -1,4 +1,11 @@
 <%= content_for :navbar do %>
+
+  <% if current_access_mode.read_only? %>
+    <div class="mu-read-only">
+      <small><%= t :organization_read_only_legend %></small>
+    </div>
+  <% end %>
+
   <%= hidden_field_tag("mu-current-exp", UserStats.exp_for(@current_user)) if in_gamified_context? %>
   <div class="<%= exercise_container_type %> px-0">
     <nav class="navbar navbar-light navbar-expand-lg mu-navbar">

data/lib/mumuki/laboratory/locales/en.yml

@@ -275,6 +275,7 @@ en:
   only_landscape_support: Please, rotate your tablet or cellphone to continue practicing
   opened: Open
   opened_count: '%{count} opened'
+  organization_read_only_legend: 'You are in reading mode. You will only be able to access the exercises that you did previously and you will not be able to send new solutions'
   other: Other
   out_of_attempts: You've run out of attempts. You should proceed to the next exercise!
   output: Output

data/lib/mumuki/laboratory/locales/es-CL.yml

@@ -284,6 +284,7 @@ es-CL:
     one: '1 abierta'
     other: '%{count} abiertas'
   organizations: Organizaciones
+  organization_read_only_legend: 'Estás en modo lectura. Solo podrás acceder a los ejercicios que realizaste previamente y no podrás enviar nuevas soluciones'
   other: Otro
   out_of_attempts: Te quedaste sin intentos. ¡Sigue al próximo ejercicio!
   output: Salida

data/lib/mumuki/laboratory/locales/es.yml

@@ -293,6 +293,7 @@ es:
     one: '1 abierta'
     other: '%{count} abiertas'
   organizations: Organizaciones
+  organization_read_only_legend: 'Estás en modo lectura. Solo podrás acceder a los ejercicios que realizaste previamente y no podrás enviar nuevas soluciones'
   other: Otro
   out_of_attempts: Te quedaste sin intentos. ¡Seguí al proximo ejercicio!
   output: Salida

data/lib/mumuki/laboratory/locales/pt.yml

@@ -284,6 +284,7 @@ pt:
   opened: Aberto
   opened_count: '%{count} aberto'
   organizations: Organizações
+  organization_read_only_legend: 'Você está no modo de leitura. Você só poderá acessar os exercícios que fez anteriormente e não poderá enviar novas soluções'
   other: Outro
   out_of_attempts: Você ficou sem tentativas. Você deve prosseguir para o próximo exercício!
   output: Sair

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.13.1'
+    VERSION = '9.13.2'
   end
 end

data/spec/features/read_only_flow_spec.rb

@@ -257,6 +257,19 @@ feature 'Read Only Flow' do
           visit "/exercises/#{exercise112.id}/discussions/new"
           expect(page).to have_text('You are not allowed to see this content')
         end
+        scenario 'reattach book' do
+          expect(book.has_progress_for?(user, organization)).to eq true
+          visit "/"
+          expect(page).to have_text('Chapters')
+          organization.update! book: create(:book_with_full_tree)
+          organization.reload
+          visit "/"
+          expect(page).not_to have_text('Chapters')
+          organization.update! book: book
+          organization.reload
+          visit "/"
+          expect(page).to have_text('Chapters')
+        end
       end
 
       context 'and user is outsider of organization' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.13.1
+  version: 9.13.2
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.13.0
+        version: 9.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.13.0
+        version: 9.13.1
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement