Merge branch 'develop' into ai-sci-11264-show-file-versions-with-view-permissions

app/controllers/global_activities_controller.rb

@@ -151,7 +151,25 @@ class GlobalActivitiesController < ApplicationController
   end
 
   def activity_filter_params
-    params.permit(:name, filter: {})
+    params.permit(
+      :name,
+      filter: [
+        :to_date,
+        :from_date,
+        { types: [] },
+        { subjects: {
+          'Report' => [],
+          'Project' => [],
+          'MyModule' => [],
+          'Protocol' => [],
+          'Experiment' => [],
+          'RepositoryRow' => [],
+          'RepositoryBase' => []
+        } },
+        { users: [] },
+        { teams: [] }
+      ]
+    )
   end
 
   def activity_filters

app/controllers/reports_controller.rb

@@ -361,7 +361,7 @@ class ReportsController < ApplicationController
 
   def report_params
     params.require(:report)
-          .permit(:name, :description, :grouped_by, :report_contents, settings: {})
+          .permit(:name, :description, :grouped_by, :report_contents, settings: permit_report_settings_structure(Report::DEFAULT_SETTINGS))
   end
 
   def search_params

app/controllers/search_controller.rb

@@ -145,7 +145,10 @@ class SearchController < ApplicationController
 
   def quick
     results = if params[:filter].present?
-                object_quick_search(params[:filter].singularize)
+                class_name = params[:filter].singularize
+                return render_422(t('general.invalid_params')) unless Constants::QUICK_SEARCH_SEARCHABLE_OBJECTS.include?(class_name)
+
+                object_quick_search(class_name)
               else
                 Constants::QUICK_SEARCH_SEARCHABLE_OBJECTS.filter_map do |object|
                   next if object == 'label_template' && !LabelTemplate.enabled?

app/helpers/reports_helper.rb

@@ -106,4 +106,17 @@ module ReportsHelper
       experiment_element.experiment.description
     end
   end
+
+  def permit_report_settings_structure(settings_definition)
+    settings_definition.each_with_object([]) do |(key, value), permitted|
+      permitted << case value
+                   when Hash
+                     { key => permit_report_settings_structure(value) }
+                   when Array
+                     { key => [] }
+                   else
+                     key
+                   end
+    end
+  end
 end

app/javascript/vue/shared/content/attachments/open_locally_menu.vue

@@ -134,11 +134,11 @@ export default {
       document.getElementById('editImageButton').click();
     },
     refreshPreview() {
-      const imageElement = document.querySelector('.file-preview-container .asset-image');
+      const filePreview = document.querySelector('.file-preview-container');
 
-      if (!imageElement) return;
+      if (!filePreview) return;
 
-      $('#filePreviewModal').modal('hide');
+      window.location.reload();
     }
   }
 };

config/locales/en.yml

@@ -4305,6 +4305,7 @@ en:
     comment_placeholder: "Your Message"
     comment_placeholder_new: "Add new comment…"
     archived: "Archived"
+    invalid_params: "Invalid params"
     sort:
       title: "Sorting"
       new_html: "Started last"