Merge branch 'development' into webpacker_migration

benjaminfaure · web-flow · commit 043c3f5e52e2 · 2023-01-27T08:31:31.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -11,7 +11,7 @@ insert_final_newline = true
 
 # Matches multiple files with brace expansion notation
 # Set default charset
-[*.{js,rb,erb}]
+[*.{js,scss,rb,erb}]
 charset = utf-8
 indent_style = space
-indent_size = 2
+indent_size = 2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,19 @@
 # Changelog
 
-### Added 
+### 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)
+- Added popover for org profile page and added explanation for public plan 
 ### Fixed
 
+- Updated JS that used to call the TinyMCE `setMode()` function so that it now calls `mode.set()` because the former is now deprecated.
+
 ### Changed
 
+- Added scss files to EditorConfig
+- Change csv file name for statistics from 'Completed' to 'Created'
+
 #### Removed webpacker gem
 
 As Webpacker is no longer maintained by the Rails community, we have replaced it by `jsbundling-rails` and `cssbundling-rails` for the Javascript & CSS compilation. 
diff --git a/app/controllers/usage_controller.rb b/app/controllers/usage_controller.rb
@@ -84,14 +84,14 @@ def yearly_plans
     plan_data(args: default_query_args)
     sep = sep_param
     send_data(CSV.generate(col_sep: sep) do |csv|
-      csv << [_('Month'), _('No. Completed Plans')]
+      csv << [_('Month'), _('No. Created Plans')]
       total = 0
       @plans_per_month.each do |data|
         csv << [data.date.strftime('%b-%y'), data.count]
         total += data.count
       end
       csv << [_('Total'), total]
-    end, filename: 'completed_plans.csv')
+    end, filename: 'created_plans.csv')
   end
   # rubocop:enable Metrics/AbcSize
 
diff --git a/app/javascript/src/answers/edit.js b/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');
     });
   }
 
diff --git a/app/javascript/src/orgs/adminEdit.js b/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');
       }
     }
   };
diff --git a/app/models/research_output.rb b/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
 
diff --git a/app/views/orgs/_profile_form.html.erb b/app/views/orgs/_profile_form.html.erb
@@ -3,6 +3,9 @@
 <%
   shared_links_tooltip = _('Links will be displayed next to your organisation\'s logo')
   org_config_info_tooltip =  _('This information can only be changed by a system administrator. Contact the Help Desk if you have questions or to request changes.')
+  org_types_tooltip = _(
+  'This information can only be changed by a system administrator. Contact %{support_email} if you have questions or to request changes.' % { support_email: Rails.configuration.x.organisation.email}
+  )
 %>
 
 <%= form_for(org, url: url, html: { multipart: true, method: method,
@@ -136,7 +139,13 @@
   <div class="row">
     <% if current_user.can_super_admin? %>
       <fieldset class="col-xs-8">
-        <legend><%= _('Organisation Types') %></legend>
+        <legend>
+          <%= _('Organisation Types') %>
+            &nbsp; <a href="#" aria-label="<%= _('Text') %>" data-toggle="tooltip" data-placement="right" title="<%= org_types_tooltip %>">
+            <i class="fas fa-question-circle fa-reverse" ></i>
+            <em class="sr-only"></em>
+          </a>
+        </legend>
         <div class="checkbox">
           <%= f.label :funder do %>
             <%= f.check_box :funder, { class: 'org_types', value: org.funder? }, "true", "false" %>
@@ -159,7 +168,13 @@
     <% else %>
       <div class="col-xs-8">
         <dl>
-          <dt><%= _('Organisation type(s)') %></dt>
+          <dt>
+            <%= _('Organisation type(s)') %>
+              &nbsp; <a href="#" aria-label="<%= _('Text') %>" data-toggle="tooltip" data-placement="right" title="<%= org_types_tooltip %>">
+              <i class="fas fa-question-circle fa-reverse" ></i>
+              <em class="sr-only"></em>
+            </a>
+          </dt>
           <dd><%= org.org_type_to_s %></dd>
         </dl>
       </div>
diff --git a/app/views/plans/_share_form.html.erb b/app/views/plans/_share_form.html.erb
@@ -34,7 +34,7 @@
           <%= f.radio_button :visibility, :publicly_visible,
                              data: { url: visibility_plan_path(@plan),
                                      remote: true, method: :post }  %>
-          <%= _('Public: anyone can view') %>
+          <%= _('Public: anyone can view or download from the Public DMPs page') %>
         <% end %>
       </div>
     </div>
diff --git a/spec/controllers/usage_controller_spec.rb b/spec/controllers/usage_controller_spec.rb
@@ -92,7 +92,7 @@
       get :yearly_plans
     end
     it 'assigns the correct csv data' do
-      expected = "Month,No. Completed Plans\n" \
+      expected = "Month,No. Created Plans\n" \
                  "#{@date.strftime('%b-%y')},#{@plan_stat.count}\n" \
                  "Total,#{@plan_stat.count}\n"
       expect(response.content_type).to eq('text/csv')

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ $(() => {`
`180`	`180`	`} else {`
`181`	`181`	`// Sets the editor mode for each editor to readonly`
`182`	`182`	`Tinymce.findEditorsByClassName(editorClass).forEach((editor) => {`
`183`		`- editor.setMode('readonly');`
	`183`	`+ editor.mode.set('readonly');`
`184`	`184`	`});`
`185`	`185`	`}`
`186`	`186`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ $(() => {`
`10`	`10`	`const editor = Tinymce.findEditorById('org_feedback_msg');`
`11`	`11`	`if (isObject(editor)) {`
`12`	`12`	`if ($('#org_feedback_enabled_true').is(':checked')) {`
`13`		`- editor.setMode('code');`
	`13`	`+ editor.mode.set('design');`
`14`	`14`	`} else {`
`15`		`- editor.setMode('readonly');`
	`15`	`+ editor.mode.set('readonly');`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`};`