Merge branch 'development' into research-outputs-csv

Author: benjaminfaure

CHANGELOG.md

@@ -3,9 +3,10 @@
 ### Added
 
 - Added CHANGELOG.md and Danger Github Action [#3257](https://github.com/DMPRoadmap/roadmap/issues/3257)
-
+- Added validation with custom error message in research_output.rb to ensure a user does not enter a very large value as 'Anticipated file size'. [#3161] (https://github.com/DMPRoadmap/roadmap/issues/3161)
 ### Fixed
 
 - Updated the CSV export so that it now includes research outputs
+- Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated.
 
 ### Changed

app/javascript/src/answers/edit.js

@@ -180,7 +180,7 @@ $(() => {
   } else {
     // Sets the editor mode for each editor to readonly
     Tinymce.findEditorsByClassName(editorClass).forEach((editor) => {
-      editor.setMode('readonly');
+      editor.mode.set('readonly');
     });
   }
 

app/javascript/src/orgs/adminEdit.js

@@ -10,9 +10,9 @@ $(() => {
     const editor = Tinymce.findEditorById('org_feedback_msg');
     if (isObject(editor)) {
       if ($('#org_feedback_enabled_true').is(':checked')) {
-        editor.setMode('code');
+        editor.mode.set('design');
       } else {
-        editor.setMode('readonly');
+        editor.mode.set('readonly');
       }
     }
   };

app/models/research_output.rb

@@ -64,6 +64,8 @@ class ResearchOutput < ApplicationRecord
                                            allow_nil: true, allow_blank: true,
                                            message: UNIQUENESS_MESSAGE }
 
+  validates_numericality_of :byte_size, greater_than: 0, less_than_or_equal_to: 2**63,
+                                        message: '(Anticipated file size) is too large. Please enter a smaller value.'
   # Ensure presence of the :output_type_description if the user selected 'other'
   validates_presence_of :output_type_description, if: -> { other? }, message: PRESENCE_MESSAGE