mumuki-laboratory 5.7.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eebf90572caa6242083ad55e7af966691ffadd00c9ea6cf4b9ccd5ce3ef89f22
-  data.tar.gz: a7a348cc2799dbbf19ab01be6f9b4edace17979ce784f124ef695db12a6ba1c2
+  metadata.gz: 7ca436cc42496e79bddfaff35a982a8f86dfbac83a5899152e6870526e8319eb
+  data.tar.gz: 60d05b8275511ab5f817fb6a2d6c10e756a7d362d9937ea071345262d4a088ee
 SHA512:
-  metadata.gz: a02f3ef36c6f80aa9b88b508b579e4d9479c4c43d04c8c120928394ca59a222192a31a7d8ec816d4ac6ccc18fd6e13d36913e819b959b10bbf26875ea95e9ebc
-  data.tar.gz: bc5ae60058112ffac03761ee34567349a3b34348f3a2f90c334b607fa97bd84e1e82af08886c828f607ac010d1be50eec4f0504fa83bc9ca77ce4506d5aded95
+  metadata.gz: 688fd91f7f9ffa2534d164742bb32bdf595ccd9e70638b9e84ba8011b0f5deced7b4154a699788b905577e45d33e4f0af3e53f8945dc3f69296e2545a0fb18e6
+  data.tar.gz: 4a6795662d811fc676d3ea281a6862dd1a4c811bd5255bf97f76ef008ddf341af011f30077ca3eab2b8c38f35359a3ef56ae992571350bba80f276a3a27393b5

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

@@ -29,9 +29,6 @@ var mumuki = mumuki || {};
   };
 
   CodeMirrorBuilder.prototype = {
-    createEditor: function (customOptions) {
-      return CodeMirror.fromTextArea(this.textarea, Object.assign({}, codeMirrorDefaults, customOptions));
-    },
     setupEditor: function () {
       this.editor = this.createEditor({
         lineNumbers: true,
@@ -47,6 +44,8 @@ var mumuki = mumuki || {};
           }
         }
       });
+
+      return this;
     },
     setupSimpleEditor: function () {
       this.editor = this.createEditor({
@@ -59,21 +58,30 @@ var mumuki = mumuki || {};
           }
         }
       });
+
+      return this;
     },
-    setupLanguage: function () {
-      var language = this.$textarea.data('editor-language');
-      if (language === 'dynamic') {
+    setupLanguage: function (language) {
+      var highlightMode = language || this.$textarea.data('editor-language');
+      if (highlightMode === 'dynamic') {
         mumuki.page.dynamicEditors.push(this.editor);
       } else {
-        this.editor.setOption('mode', language);
+        this.editor.setOption('mode', highlightMode);
         this.editor.refresh();
       }
+
+      return this;
     },
-    setupOptions: function (minLines) {
+    setupMinLines: function (minLines) {
       this.editor.setOption('minLines', minLines);
+
+      return this;
     },
     build: function () {
       return this.editor;
+    },
+    createEditor: function (customOptions) {
+      return CodeMirror.fromTextArea(this.textarea, Object.assign({}, codeMirrorDefaults, customOptions));
     }
   };
 

data/app/assets/javascripts/application/codemirror.js

@@ -2,16 +2,15 @@ var mumuki = mumuki || {};
 
 (function (mumuki) {
   function createCodeMirrors() {
-    var editors = $(".editor").map(function (index, textarea) {
+    return $(".editor").map(function (index, textarea) {
       var $textarea = $("#solution_content");
-      var builder = new mumuki.editor.CodeMirrorBuilder(textarea);
-      builder.setupEditor();
-      builder.setupOptions($textarea.data('lines'));
-      builder.setupLanguage();
-      return builder.build();
-    });
 
-    return editors;
+      return new mumuki.editor.CodeMirrorBuilder(textarea)
+        .setupEditor()
+        .setupMinLines($textarea.data('lines'))
+        .setupLanguage()
+        .build();
+    });
   }
 
   function onSelectUpdateCodeMirror() {
@@ -62,7 +61,6 @@ var mumuki = mumuki || {};
   }
 
   mumuki.editor = mumuki.editor || {};
-  mumuki.editor.setupCodeMirrors = setEditorLanguage;
   mumuki.editor.toggleFullscreen = toggleFullscreen;
   mumuki.editor.indentWithSpaces = indentWithSpaces;
   mumuki.editor.syncContent = syncContent;

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

@@ -18,10 +18,11 @@ mumuki.load(function () {
     var $textarea = $("#new-discussion-message");
     var textarea = $textarea[0];
     if(!textarea) return;
-    var builder = new mumuki.editor.CodeMirrorBuilder(textarea);
-    builder.setupSimpleEditor();
-    builder.setupOptions($textarea.data('lines'));
-    builder.build();
+
+    new mumuki.editor.CodeMirrorBuilder(textarea)
+      .setupSimpleEditor()
+      .setupMinLines($textarea.data('lines'))
+      .build();
   }
 
   createNewMessageEditor();
@@ -31,6 +32,16 @@ mumuki.load(function () {
       spans.toggleClass('hidden');
     },
     token: new mumuki.CsrfToken(),
+    tokenRequest: function (data) {
+      return $.ajax(Forum.token.newRequest(data))
+    },
+    discussionPost: function (url) {
+      return Forum.tokenRequest({
+        url: url,
+        method: 'POST',
+        xhrFields: {withCredentials: true}
+      })
+    },
     discussionSubscription: function (url) {
       Forum.discussionPostAndToggle(url, $subscriptionSpans)
     },
@@ -38,15 +49,12 @@ mumuki.load(function () {
       Forum.discussionPostAndToggle(url, $upvoteSpans)
     },
     discussionPostAndToggle: function (url, elem) {
-      Forum.tokenRequest({
-        url: url,
-        method: 'POST',
-        success: Forum.toggleButton(elem),
-        xhrFields: {withCredentials: true}
-      })
+      Forum.discussionPost(url).done(Forum.toggleButton(elem))
     },
-    tokenRequest: function (data) {
-      $.ajax(Forum.token.newRequest(data))
+    discussionMessageToggleApprove : function (url, elem) {
+      Forum.discussionPost(url).done(function () {
+        elem.toggleClass("selected");
+      })
     }
   };
 

data/app/assets/javascripts/application/multiple-files.js

@@ -0,0 +1,222 @@
+mumuki.load(() => {
+  class File {
+    static get NAME_CLASS() { return '.file-name'; }
+    static get DELETE_BUTTON_CLASS() { return '.delete-file-button'; }
+
+    constructor(tab, editor) {
+      this.tab = tab;
+      this.editor = editor;
+    }
+
+    initialize(name) {
+      this.name = name;
+      this.unselect();
+
+      return this;
+    }
+
+    get name() {
+      return this.tab.find(File.NAME_CLASS).text();
+    }
+
+    set name(name) {
+      return this.tab.find(File.NAME_CLASS).text(name);
+    }
+
+    get isSelected() {
+      return this.tab.hasClass("active");
+    }
+
+    setUpOnRemove(handler) {
+      this.tab.find(File.DELETE_BUTTON_CLASS).click(() => {
+        handler(this);
+      });
+    }
+
+    remove() {
+      const wasSelected = this.isSelected;
+
+      this.tab.remove();
+      this.editor.remove();
+
+      return wasSelected;
+    }
+
+    select() {
+      this._selectElement(this.tab);
+      this._selectElement(this.editor);
+    }
+
+    unselect() {
+      this._unselectElement(this.tab);
+      this._unselectElement(this.editor);
+    }
+
+    _selectElement(element) {
+      element.addClass('active');
+      element.addClass('in');
+    }
+
+    _unselectElement(element) {
+      element.removeClass('active');
+      element.removeClass('in');
+    }
+  }
+
+  class MultipleFileEditor {
+    constructor(tabsContainer, editorsContainer) {
+      this.tabsContainer = tabsContainer;
+      this.editorsContainer = editorsContainer;
+
+      this.MAX_TABS = 5;
+
+      this._addFileButton = this.tabsContainer.siblings('.add-file-button');
+      this._updateButtonsVisibility();
+    }
+
+    get files() {
+      const editors = this.editors;
+
+      return this.tabs.map((i, tab) => {
+        return new File($(tab), $(editors[i]));
+      });
+    }
+
+    get tabs() {
+      return this.tabsContainer.children();
+    }
+
+    get editors() {
+      return this.editorsContainer.find('.file-editor')
+    }
+
+    get highlightModes() {
+      return this._getDataFromHiddenInput('#highlight-modes')
+    }
+
+    get locales() {
+      return this._getDataFromHiddenInput('#multifile-locales')
+    }
+
+    setUpAddFile() {
+      this._addFileButton.click(() => {
+        this._addFile();
+      });
+    }
+
+    setUpDeleteFiles() {
+      this.files.each((i, file) => {
+        this.setUpDeleteFile(file);
+      });
+    }
+
+    setUpDeleteFile(file) {
+      file.setUpOnRemove(this._deleteFile.bind(this));
+    }
+
+    _addFile() {
+      const name = prompt(this.locales.insert_file_name);
+      const alreadyExists = this.files.toArray().some(it => it.name === name);
+      if (!name.length || !name.includes('.') || alreadyExists) return;
+
+      const id = `editor-file-${this._getFilesCount()}`;
+      this.tabsContainer.append(this._createTab(name, id));
+      this.editors.parent().last().append(this._createEditor(name, id));
+      const file = this.files.last().get(0).initialize(name);
+      this.setUpDeleteFile(file);
+
+      this._updateButtonsVisibility();
+    }
+
+    _deleteFile(file) {
+      const index  = this.files.toArray()
+        .map((file) => file.name)
+        .indexOf(file.name);
+      const previousIndex = Math.max(index - 1, 0);
+
+      const wasSelected = file.remove();
+      if (wasSelected) this.files[previousIndex].select();
+
+      this._updateButtonsVisibility();
+    }
+
+    _updateButtonsVisibility() {
+      const filesCount = this._getFilesCount();
+      const deleteButtons = this.tabs.find(File.DELETE_BUTTON_CLASS);
+
+      this._setVisibility(this._addFileButton, filesCount < this.MAX_TABS);
+      this._setVisibility(deleteButtons, filesCount > 1);
+    }
+
+    _createTab(name, id) {
+      const tab = this.tabs.last().clone();
+      tab.attr('data-target', `#${id}`);
+
+      return tab;
+    }
+
+    _createEditor(name, id) {
+      const editor = this.editors.last().clone();
+      editor.attr('id', id);
+      editor.find('.CodeMirror').remove();
+
+      const textarea = editor.children().first();
+      this._setUpTextArea(textarea, `solution_content[${name}]`, `solution[content[${name}]]`);
+
+      const highlightMode = this._getHighlightModeFor(name);
+      const codeMirrorEditor = new mumuki.editor.CodeMirrorBuilder(textarea.get(0))
+        .setupEditor()
+        .setupMinLines(textarea.data('lines'))
+        .setupLanguage(highlightMode)
+        .build();
+
+      codeMirrorEditor.on("change", (event) => {
+        textarea.val(event.getValue());
+      });
+
+      const solutionTextArea = $('.new_solution').find('textarea').last();
+      this._setUpTextArea(solutionTextArea, '', '');
+
+      return editor;
+    }
+
+    _getFilesCount() {
+      return this.files.length;
+    }
+
+    _setUpTextArea(textarea, id, name) {
+      textarea.attr('id', id);
+      textarea.attr('name', name);
+      textarea.text('');
+      textarea.val('');
+    }
+
+    _getHighlightModeFor(name) {
+      const extension = name.split('.').pop();
+      const language = this.highlightModes.find((it) => it.extension === extension);
+
+      return language && language.highlight_mode || extension;
+    }
+
+    _setVisibility(element, isVisible) {
+      if (isVisible) element.show(); else element.hide();
+    }
+
+    _getDataFromHiddenInput(name) {
+      return JSON.parse($(name).val());
+    }
+  }
+
+
+  const setUpTabsBehavior = () => {
+    const tabsContainer = $('.nav-tabs');
+    if (!tabsContainer.length) return;
+    const editorsContainer = $('.tab-content');
+
+    const multipleFileEditor = new MultipleFileEditor(tabsContainer, editorsContainer);
+    multipleFileEditor.setUpAddFile();
+    multipleFileEditor.setUpDeleteFiles();
+  };
+
+  $(document).ready(setUpTabsBehavior);
+});

data/app/assets/javascripts/application/submission.js

@@ -84,6 +84,7 @@ var mumuki = mumuki || {};
 
   function getContent(){
     var content = {};
+
     $('.new_solution').serializeArray().forEach(function(it) {
       content[it.name] = it.value;
     });

data/app/assets/stylesheets/application/modules/_discussion.scss

@@ -329,6 +329,18 @@ summary.discussion-summary {
       }
       .actions {
         float: right;
+        a {
+          margin-left: 5px;
+        }
+        .discussion-message-approved {
+          cursor: pointer;
+          text-decoration: none;
+          &.selected {
+            i {
+              color: $brand-success;
+            }
+          }
+        }
         i {
           color: #aaaaaa
         }

data/app/assets/stylesheets/application/modules/_editor.scss

@@ -88,6 +88,7 @@ body.fullscreen {
     width: 100%;
 
     li {
+      position: relative;
       width: 100%;
       white-space: nowrap;
       overflow: hidden;
@@ -99,6 +100,12 @@ body.fullscreen {
         margin-right: 0;
         padding: 5px 10px;
       }
+      .delete-file-button {
+        position: absolute;
+        right: 16px;
+        top: 12px;
+        cursor: pointer;
+      }
       &.active {
         a {
           background-color: #f7f7f7;
@@ -114,5 +121,11 @@ body.fullscreen {
       }
     }
   }
+
+  .add-file-button {
+    margin-left: 16px;
+    margin-right: 16px;
+    cursor: pointer;
+  }
 }
 

data/app/controllers/discussions_controller.rb

@@ -1,6 +1,8 @@
 class DiscussionsController < AjaxController
   include Mumuki::Laboratory::Controllers::Content
 
+  before_action :validate_forum_enabled!
+  before_action :validate_not_in_exam!
   before_action :set_debatable, except: [:subscription]
   before_action :authenticate!, only: [:update, :create]
   before_action :discussion_filter_params, only: :index
@@ -62,4 +64,12 @@ class DiscussionsController < AjaxController
   def discussion_filter_params
     @filter_params ||= params.permit(Discussion.permitted_query_params)
   end
+
+  def validate_forum_enabled!
+    raise Mumuki::Laboratory::NotFoundError unless Organization.current.forum_enabled?
+  end
+
+  def validate_not_in_exam!
+    raise Mumuki::Laboratory::BlockedForumError if current_user&.currently_in_exam?
+  end
 end