From d6ffb326d196468ca09d237666f4eae7f467641b Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Tue, 29 Aug 2023 17:03:34 +0200 Subject: [PATCH 01/10] Display show more for experiment description if there are more than 2 lines [SCI-9096] --- app/views/projects/show/_experiment_card.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/show/_experiment_card.html.erb b/app/views/projects/show/_experiment_card.html.erb index a0a3e11eb..c9c6d0d80 100644 --- a/app/views/projects/show/_experiment_card.html.erb +++ b/app/views/projects/show/_experiment_card.html.erb @@ -74,7 +74,7 @@
<%= custom_auto_link(experiment.description, team: current_team) %>
- <% if experiment.description.present? && experiment.description.length > Constants::EXPERIMENT_LONG_DESCRIPTION %> + <% if experiment.description.present? && (experiment.description.length > Constants::EXPERIMENT_LONG_DESCRIPTION || experiment.description.count("\n") > 2) %> <%= link_to t('experiments.card.more'), experiment_path(experiment), class: 'more-button experiment-action-link', From d029b542917ea1f9728d704cc16eedaba3770ee7 Mon Sep 17 00:00:00 2001 From: Gregor Lasnibat Date: Thu, 7 Sep 2023 20:45:51 +0200 Subject: [PATCH 02/10] Fix shared task issues [SCI-9226] --- app/assets/stylesheets/reports.scss | 2 ++ app/assets/stylesheets/reports_print.scss | 2 ++ app/views/shareable_links/my_module_results_show.html.erb | 2 +- .../my_modules/results/_comments_list.html.erb | 4 ++-- .../shareable_links/my_modules/step_elements/_table.html.erb | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss index a8d342c66..308bfaf8d 100644 --- a/app/assets/stylesheets/reports.scss +++ b/app/assets/stylesheets/reports.scss @@ -67,6 +67,8 @@ label { * Global fix for handsontable */ .hot-table-container { + display: flex; + overflow: auto; .ht_master .wtHolder { height: auto !important; width: auto !important; diff --git a/app/assets/stylesheets/reports_print.scss b/app/assets/stylesheets/reports_print.scss index 18ac71a92..46f7f3fbb 100644 --- a/app/assets/stylesheets/reports_print.scss +++ b/app/assets/stylesheets/reports_print.scss @@ -29,6 +29,8 @@ div.print-report { } .hot-table-container { + display: flex; + overflow: auto; .ht_master .wtHolder { overflow: hidden !important; diff --git a/app/views/shareable_links/my_module_results_show.html.erb b/app/views/shareable_links/my_module_results_show.html.erb index 31be4be4c..604804799 100644 --- a/app/views/shareable_links/my_module_results_show.html.erb +++ b/app/views/shareable_links/my_module_results_show.html.erb @@ -6,7 +6,7 @@ -
+
<%= render partial: 'shareable_links/my_modules/header_actions' %>
diff --git a/app/views/shareable_links/my_modules/results/_comments_list.html.erb b/app/views/shareable_links/my_modules/results/_comments_list.html.erb index 2143a1f94..dbd59eb23 100644 --- a/app/views/shareable_links/my_modules/results/_comments_list.html.erb +++ b/app/views/shareable_links/my_modules/results/_comments_list.html.erb @@ -2,13 +2,13 @@
- <%= image_tag avatar_path(comment.user, :icon_small), class: 'avatar' %> + <%= image_tag user_avatar_absolute_url(comment.user, :icon_small, true), class: 'user-avatar' %>
<%= comment.user.full_name %>
-
<%= comment.created_at.iso8601 %>
+
<%= l(comment.created_at, format: :full) %>
<%= smart_annotation_text(comment.message) %>
diff --git a/app/views/shareable_links/my_modules/step_elements/_table.html.erb b/app/views/shareable_links/my_modules/step_elements/_table.html.erb index 567be700a..c04811a1d 100644 --- a/app/views/shareable_links/my_modules/step_elements/_table.html.erb +++ b/app/views/shareable_links/my_modules/step_elements/_table.html.erb @@ -4,7 +4,7 @@ <% if element.name.present? %>
<%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: false } %> -
+
<% end %>
From b436550ae92626a19ded43e3450bb2b72c9e5bf4 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Fri, 8 Sep 2023 11:59:57 +0400 Subject: [PATCH 03/10] Protocol template title is displayed in the grey area --- app/views/protocols/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/protocols/show.html.erb b/app/views/protocols/show.html.erb index d9431e1f8..5b1b5d42f 100644 --- a/app/views/protocols/show.html.erb +++ b/app/views/protocols/show.html.erb @@ -3,7 +3,6 @@ <%= render partial: "/shared/sidebar/templates_sidebar", locals: {active: :protocol} %> <% end %> <% provide(:container_class, 'no-second-nav-container') %> -

@@ -28,6 +27,7 @@

+
Date: Fri, 8 Sep 2023 11:35:16 +0200 Subject: [PATCH 04/10] Refactor old export async methods to ActiveJobs [SCI-9092] (#6170) --- .../my_module_repositories_controller.rb | 9 +- ..._module_repository_snapshots_controller.rb | 9 +- app/controllers/repositories_controller.rb | 16 +- app/controllers/teams_controller.rb | 28 +- app/jobs/protocols/docx_import_job.rb | 3 +- app/jobs/repositories_export_job.rb | 2 +- app/jobs/repository_stock_zip_export_job.rb | 11 + app/jobs/repository_zip_export_job.rb | 40 +++ app/jobs/team_zip_export_job.rb | 281 ++++++++++++++++ app/jobs/zip_export_job.rb | 50 +++ app/models/concerns/prefixed_id_model.rb | 26 +- app/models/my_module_repository_row.rb | 1 + app/models/repository_ledger_record.rb | 11 + app/models/team_zip_export.rb | 304 ------------------ app/models/zip_export.rb | 69 +--- .../repository_stock_ledger_zip_export.rb | 70 ++-- app/services/repository_zip_export.rb | 33 -- 17 files changed, 475 insertions(+), 488 deletions(-) create mode 100644 app/jobs/repository_stock_zip_export_job.rb create mode 100644 app/jobs/repository_zip_export_job.rb create mode 100644 app/jobs/team_zip_export_job.rb create mode 100644 app/jobs/zip_export_job.rb diff --git a/app/controllers/my_module_repositories_controller.rb b/app/controllers/my_module_repositories_controller.rb index c90a94811..18bf9112f 100644 --- a/app/controllers/my_module_repositories_controller.rb +++ b/app/controllers/my_module_repositories_controller.rb @@ -152,7 +152,14 @@ class MyModuleRepositoriesController < ApplicationController def export_repository if params[:header_ids] - RepositoryZipExport.generate_zip(params, @repository, current_user) + RepositoryZipExportJob.perform_later( + user_id: current_user.id, + params: { + repository_id: @repository.id, + my_module_id: @my_module.id, + header_ids: params[:header_ids] + } + ) Activities::CreateActivityService.call( activity_type: :export_inventory_items_assigned_to_task, diff --git a/app/controllers/my_module_repository_snapshots_controller.rb b/app/controllers/my_module_repository_snapshots_controller.rb index a87c2fece..112e76537 100644 --- a/app/controllers/my_module_repository_snapshots_controller.rb +++ b/app/controllers/my_module_repository_snapshots_controller.rb @@ -103,7 +103,14 @@ class MyModuleRepositorySnapshotsController < ApplicationController def export_repository_snapshot if params[:header_ids] - RepositoryZipExport.generate_zip(params, @repository_snapshot, current_user) + RepositoryZipExportJob.perform_later( + user_id: current_user.id, + params: { + repository_id: @repository_snapshot.id, + my_module_id: @my_module.id, + header_ids: params[:header_ids] + } + ) Activities::CreateActivityService.call( activity_type: :export_inventory_snapshot_items_assigned_to_task, diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index e4d385d68..7178c4a29 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -337,7 +337,14 @@ class RepositoriesController < ApplicationController def export_repository if params[:row_ids] && params[:header_ids] - RepositoryZipExport.generate_zip(params, @repository, current_user) + RepositoryZipExportJob.perform_later( + user_id: current_user.id, + params: { + repository_id: @repository.id, + row_ids: params[:row_ids], + header_ids: params[:header_ids] + } + ) log_activity(:export_inventory_items) render json: { message: t('zip_export.export_request_success') } else @@ -359,7 +366,12 @@ class RepositoriesController < ApplicationController def export_repository_stock_items row_ids = @repository.repository_rows.where(id: params[:row_ids]).pluck(:id) if row_ids.any? - RepositoryStockLedgerZipExport.generate_zip(row_ids, current_user.id) + RepositoryStockZipExportJob.perform_later( + user_id: current_user.id, + params: { + repository_row_ids: row_ids + } + ) render json: { message: t('zip_export.export_request_success') } else render json: { message: t('zip_export.export_error') }, status: :unprocessable_entity diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb index 18fa1b3f2..965f079ef 100644 --- a/app/controllers/teams_controller.rb +++ b/app/controllers/teams_controller.rb @@ -25,16 +25,18 @@ class TeamsController < ApplicationController def export_projects if current_user.has_available_exports? current_user.increase_daily_exports_counter! - - generate_export_projects_zip - + TeamZipExportJob.perform_later( + user_id: current_user.id, + params: { + team_id: @team.id, + project_ids: @exp_projects.collect(&:id) + } + ) log_activity(:export_projects, team: @team.id, projects: @exp_projects.map(&:name).join(', ')) - render json: { - flash: t('projects.export_projects.success_flash') - }, status: :ok + render json: { flash: t('projects.export_projects.success_flash') } end end @@ -147,20 +149,6 @@ class TeamsController < ApplicationController end end - def generate_export_projects_zip - ids = @exp_projects.index_by(&:id) - - options = { team: @team } - zip = TeamZipExport.create(user: current_user) - zip.generate_exportable_zip( - current_user.id, - ids, - :teams, - options - ) - ids - end - def log_activity(type_of, message_items = {}) Activities::CreateActivityService .call(activity_type: type_of, diff --git a/app/jobs/protocols/docx_import_job.rb b/app/jobs/protocols/docx_import_job.rb index 04e6d2084..0bfb494c4 100644 --- a/app/jobs/protocols/docx_import_job.rb +++ b/app/jobs/protocols/docx_import_job.rb @@ -144,8 +144,7 @@ module Protocols "href='#{Rails.application.routes.url_helpers.protocol_path(@protocol)}'>" \ "#{@protocol.name}" ) - - UserNotification.create!(notification: notification, user: @user) + notification.create_user_notification(@user) end # Overrides method from FailedDeliveryNotifiableJob concern diff --git a/app/jobs/repositories_export_job.rb b/app/jobs/repositories_export_job.rb index bd5c46e37..911334621 100644 --- a/app/jobs/repositories_export_job.rb +++ b/app/jobs/repositories_export_job.rb @@ -94,7 +94,7 @@ class RepositoriesExportJob < ApplicationJob .zip_exports_download_export_all_path(@zip_export)}'>" \ "#{@zip_export.zip_file_name}" ) - UserNotification.create!(notification: notification, user: @user) + notification.create_user_notification(@user) end # Overrides method from FailedDeliveryNotifiableJob concern diff --git a/app/jobs/repository_stock_zip_export_job.rb b/app/jobs/repository_stock_zip_export_job.rb new file mode 100644 index 000000000..95b6b0c93 --- /dev/null +++ b/app/jobs/repository_stock_zip_export_job.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class RepositoryStockZipExportJob < ZipExportJob + private + + # Overrride + def fill_content(dir, params) + data = RepositoryStockLedgerZipExport.to_csv(params[:repository_row_ids]) + File.binwrite("#{dir}/export.csv", data) + end +end diff --git a/app/jobs/repository_zip_export_job.rb b/app/jobs/repository_zip_export_job.rb new file mode 100644 index 000000000..04f1926f2 --- /dev/null +++ b/app/jobs/repository_zip_export_job.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +class RepositoryZipExportJob < ZipExportJob + private + + # Override + def fill_content(dir, params) + repository = Repository.find(params[:repository_id]) + # Fetch rows in the same order as in the currently viewed datatable + if params[:my_module_id] + rows = if repository.is_a?(RepositorySnapshot) + repository.repository_rows + else + repository.repository_rows + .joins(:my_module_repository_rows) + .where(my_module_repository_rows: { my_module_id: params[:my_module_id] }) + end + if repository.has_stock_management? + rows = rows.left_joins(my_module_repository_rows: :repository_stock_unit_item) + .select( + 'repository_rows.*', + 'my_module_repository_rows.stock_consumption' + ) + end + else + ordered_row_ids = params[:row_ids] + id_row_map = RepositoryRow.where(id: ordered_row_ids, + repository: repository) + .index_by(&:id) + rows = ordered_row_ids.collect { |id| id_row_map[id.to_i] } + end + data = RepositoryZipExport.to_csv(rows, + params[:header_ids], + @user, + repository, + nil, + params[:my_module_id].present?) + File.binwrite("#{dir}/export.csv", data) + end +end diff --git a/app/jobs/team_zip_export_job.rb b/app/jobs/team_zip_export_job.rb new file mode 100644 index 000000000..53a4fa9d1 --- /dev/null +++ b/app/jobs/team_zip_export_job.rb @@ -0,0 +1,281 @@ +# frozen_string_literal: true + +require 'fileutils' +require 'csv' + +class TeamZipExportJob < ZipExportJob + include StringUtility + + private + + # Override + def zip_name + "projects_export_#{Time.now.utc.strftime('%F_%H-%M-%S_UTC')}.zip" + end + + # Override + def fill_content(dir, params) + # Create team folder + @team = Team.find(params[:team_id]) + projects = @team.projects.where(id: params[:project_ids]) + team_path = "#{dir}/#{to_filesystem_name(@team.name)}" + FileUtils.mkdir_p(team_path) + + # Iterate through every project + p_idx = p_archive_idx = 0 + projects.each do |project| + idx = project.archived ? (p_archive_idx += 1) : (p_idx += 1) + project_path = make_model_dir(team_path, project, idx) + project_name = project_path.split('/')[-1] + + obj_filenames = { repositories: {}, assets: {}, tables: {} } + + # Change current dir for correct generation of relative links + Dir.chdir(project_path) + project_path = '.' + + inventories = "#{project_path}/Inventories" + FileUtils.mkdir_p(inventories) + + repositories = project.assigned_repositories_and_snapshots + + # Iterate through every inventory repo and save it to CSV + repositories.each_with_index do |repo, repo_idx| + next if obj_filenames[:repositories][repo.id].present? + + obj_filenames[:repositories][repo.id] = { + file: save_inventories_to_csv(inventories, repo, repo_idx) + } + end + + # Include all experiments + ex_idx = ex_archive_idx = 0 + project.experiments.each do |experiment| + idx = experiment.archived ? (ex_archive_idx += 1) : (ex_idx += 1) + experiment_path = make_model_dir(project_path, experiment, idx) + + # Include all modules + mod_pos = mod_archive_pos = 0 + experiment.my_modules.order(:workflow_order).each do |my_module| + pos = my_module.archived ? (mod_archive_pos += 1) : (mod_pos += 1) + my_module_path = make_model_dir(experiment_path, my_module, pos) + + # Create upper directories for both elements + protocol_path = "#{my_module_path}/Protocol attachments" + result_path = "#{my_module_path}/Result attachments" + FileUtils.mkdir_p(protocol_path) + FileUtils.mkdir_p(result_path) + + # Export protocols + steps = my_module.protocols.map(&:steps).flatten + obj_filenames[:assets].merge!( + export_assets(StepAsset.where(step: steps), :step, protocol_path) + ) + obj_filenames[:tables].merge!( + export_tables(StepTable.where(step: steps), :step, protocol_path) + ) + + # Export results + [false, true].each do |archived| + obj_filenames[:assets].merge!( + export_assets( + ResultAsset.where(result: my_module.results.where(archived: archived)), + :result, + result_path, + archived + ) + ) + end + + [false, true].each do |archived| + obj_filenames[:tables].merge!( + export_tables( + ResultTable.where(result: my_module.results.where(archived: archived)), + :result, + result_path, + archived + ) + ) + end + end + end + + # Generate and export whole project report HTML + html_name = "#{project_name} Report.html" + project_report_pdf = project.generate_teams_export_report_html( + @user, @team, html_name, obj_filenames + ) + File.binwrite("#{project_path}/#{html_name}", project_report_pdf) + end + ensure + # Change current dir outside dir, since it will be deleted + Dir.chdir(Rails.root) + end + + # Create directory for project, experiment, or module + def make_model_dir(parent_path, model, index) + # For MyModule, the index indicates its position in project sidebar + if model.instance_of?(MyModule) + class_name = 'module' + model_format = '(%s) %s' + else + class_name = model.class.to_s.downcase.pluralize + model_format = '%s (%s)' + end + model_name = + format(model_format, idx: index, name: to_filesystem_name(model.name)) + + model_path = parent_path + if model.archived + model_path += "/Archived #{class_name}" + FileUtils.mkdir_p(model_path) + end + model_path += "/#{model_name}" + FileUtils.mkdir_p(model_path) + model_path + end + + # Appends given suffix to file_name and then adds original extension + def append_file_suffix(file_name, suffix) + ext = File.extname(file_name) + File.basename(file_name, ext) + suffix + ext + end + + def create_archived_results_folder(result_path) + path = "#{result_path}/Archived attachments" + FileUtils.mkdir_p(path) unless File.directory?(path) + path + end + + # Helper method to extract given assets to the directory + def export_assets(elements, type, directory, archived = false) + directory = create_archived_results_folder(directory) if archived && elements.present? + + asset_indexes = {} + elements.each_with_index do |element, i| + asset = element.asset + preview = prepare_preview(asset) + if type == :step + name = "#{directory}/" \ + "#{append_file_suffix(asset.file_name, "_#{i}_Step#{element.step.position_plus_one}")}" + if preview + preview_name = "#{directory}/" \ + "#{append_file_suffix(preview[:file_name], "_#{i}_Step#{element.step.position_plus_one}_preview")}" + end + elsif type == :result + name = "#{directory}/#{append_file_suffix(asset.file_name, "_#{i}")}" + preview_name = "#{directory}/#{append_file_suffix(preview[:file_name], "_#{i}_preview")}" if preview + end + + if asset.file.attached? + begin + File.binwrite(name, asset.file.download) + File.binwrite(preview_name, preview[:file_data]) if preview + rescue ActiveStorage::FileNotFoundError + next + end + end + asset_indexes[asset.id] = { + file: name, + preview: preview_name + } + end + asset_indexes + end + + def prepare_preview(asset) + if asset.previewable? && !asset.list? + preview = asset.inline? ? asset.large_preview : asset.medium_preview + if preview.is_a?(ActiveStorage::Preview) + return unless preview.image.attached? + + file_name = preview.image.filename.to_s + file_data = preview.image.download + else + file_name = preview.blob.filename.to_s + + begin + file_data = preview.processed.service.download(preview.key) + # handle files not processable by Vips (no preview available) or missing + rescue Vips::Error, ActiveStorage::FileNotFoundError + return nil + end + end + + { + file_name: file_name, + file_data: file_data + } + end + end + + # Helper method to extract given tables to the directory + def export_tables(elements, type, directory, archived = false) + directory = create_archived_results_folder(directory) if archived && elements.present? + + table_indexes = {} + elements.each_with_index do |element, i| + table = element.table + table_name = table.name.presence || 'Table' + table_name += i.to_s + + if type == :step + name = "#{directory}/#{to_filesystem_name(table_name)}" \ + "_#{i}_Step#{element.step.position_plus_one}.csv" + elsif type == :result + name = "#{directory}/#{to_filesystem_name(table_name)}.csv" + end + File.binwrite(name, table.to_csv) + table_indexes[table.id] = { + file: name + } + end + + table_indexes + end + + # Helper method for saving inventories to CSV + def save_inventories_to_csv(path, repo, idx) + repo_name = "#{to_filesystem_name(repo.name)} (#{idx})" + + # Attachment folder + rel_attach_path = "#{repo_name} attachments" + attach_path = "#{path}/#{rel_attach_path}" + FileUtils.mkdir_p(attach_path) + + # CSV file + csv_file_path = "#{path}/#{repo_name}.csv" + + # Define headers and columns IDs + col_ids = [-3, -4, -5, -6] + repo.repository_columns.map(&:id) + + # Define callback function for file name + assets = {} + asset_counter = 0 + handle_name_func = lambda do |asset| + file_name = append_file_suffix(asset.file_name, "_#{asset_counter}").to_s + + # Save pair for downloading it later + assets[asset] = "#{attach_path}/#{file_name}" + + asset_counter += 1 + rel_path = "#{rel_attach_path}/#{file_name}" + return "=HYPERLINK(\"#{rel_path}\", \"#{rel_path}\")" + end + + # Generate CSV + csv_data = RepositoryZipExport.to_csv(repo.repository_rows, col_ids, @user, repo, handle_name_func) + File.binwrite(csv_file_path, csv_data) + + # Save all attachments (it doesn't work directly in callback function + assets.each do |asset, asset_path| + asset.file.open do |file| + FileUtils.cp(file.path, asset_path) + end + rescue ActiveStorage::FileNotFoundError + next + end + + csv_file_path + end +end diff --git a/app/jobs/zip_export_job.rb b/app/jobs/zip_export_job.rb new file mode 100644 index 000000000..fbbb2e47c --- /dev/null +++ b/app/jobs/zip_export_job.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +class ZipExportJob < ApplicationJob + include FailedDeliveryNotifiableJob + + def perform(user_id:, params: {}) + @user = User.find(user_id) + I18n.backend.date_format = @user.settings[:date_format] || Constants::DEFAULT_DATE_FORMAT + ZipExport.transaction do + @zip_export = ZipExport.create!(user: @user) + zip_input_dir = FileUtils.mkdir_p(Rails.root.join("tmp/temp_zip_#{Time.now.to_i}").to_s).first + zip_dir = FileUtils.mkdir_p(Rails.root.join('tmp/zip-ready').to_s).first + full_zip_name = File.join(zip_dir, zip_name) + + fill_content(zip_input_dir, params) + @zip_export.zip!(zip_input_dir, full_zip_name) + @zip_export.zip_file.attach(io: File.open(full_zip_name), filename: zip_name) + generate_notification! + ensure + FileUtils.rm_rf([zip_input_dir, full_zip_name], secure: true) + end + ensure + I18n.backend.date_format = nil + end + + private + + def zip_name + "export_#{Time.now.utc.strftime('%F %H-%M-%S_UTC')}.zip" + end + + def fill_content(dir, params) + raise NotImplementedError + end + + def generate_notification! + notification = Notification.create!( + type_of: :deliver, + title: I18n.t('zip_export.notification_title'), + message: "" \ + "#{@zip_export.zip_file_name}" + ) + notification.create_user_notification(@user) + end +end diff --git a/app/models/concerns/prefixed_id_model.rb b/app/models/concerns/prefixed_id_model.rb index 0527b1ae2..7488f1255 100644 --- a/app/models/concerns/prefixed_id_model.rb +++ b/app/models/concerns/prefixed_id_model.rb @@ -4,22 +4,24 @@ module PrefixedIdModel extend ActiveSupport::Concern included do - begin - indexdef = "CREATE INDEX index_#{table_name}_on_#{name.underscore}_code"\ - " ON public.#{table_name} USING gin ((('#{self::ID_PREFIX}'::text || id)) gin_trgm_ops)" + unless Rails.env.production? + begin + indexdef = "CREATE INDEX index_#{table_name}_on_#{name.underscore}_code " \ + "ON public.#{table_name} USING gin ((('#{self::ID_PREFIX}'::text || id)) gin_trgm_ops)" - index_exists = ActiveRecord::Base.connection.execute( - "SELECT indexdef FROM pg_indexes WHERE tablename NOT LIKE 'pg%';" - ).to_a.map(&:values).flatten.include?(indexdef) + index_exists = ActiveRecord::Base.connection.execute( + "SELECT indexdef FROM pg_indexes WHERE tablename NOT LIKE 'pg%';" + ).to_a.map(&:values).flatten.include?(indexdef) - # rubocop:disable Rails/Output - puts("\nWARNING missing index\n#{indexdef}\nfor prefixed id model #{name}!\n\n") unless index_exists - # rubocop:enable Rails/Output - rescue ActiveRecord::NoDatabaseError, ActiveRecord::ConnectionNotEstablished - # only applicable during build and when setting up project + # rubocop:disable Rails/Output + puts("\nWARNING missing index\n#{indexdef}\nfor prefixed id model #{name}!\n\n") unless index_exists + # rubocop:enable Rails/Output + rescue ActiveRecord::NoDatabaseError, ActiveRecord::ConnectionNotEstablished + # only applicable during build and when setting up project + end end - self::PREFIXED_ID_SQL = "('#{self::ID_PREFIX}' || #{table_name}.id)" + self::PREFIXED_ID_SQL = "('#{self::ID_PREFIX}' || #{table_name}.id)".freeze def code "#{self.class::ID_PREFIX}#{id}" diff --git a/app/models/my_module_repository_row.rb b/app/models/my_module_repository_row.rb index 98ca06294..09a7a1ab6 100644 --- a/app/models/my_module_repository_row.rb +++ b/app/models/my_module_repository_row.rb @@ -14,6 +14,7 @@ class MyModuleRepositoryRow < ApplicationRecord touch: true, inverse_of: :my_module_repository_rows belongs_to :repository_stock_unit_item, optional: true + has_many :repository_ledger_records, as: :reference, dependent: :nullify validates :repository_row, uniqueness: { scope: :my_module } diff --git a/app/models/repository_ledger_record.rb b/app/models/repository_ledger_record.rb index 8cca5c2c8..4ec13f498 100644 --- a/app/models/repository_ledger_record.rb +++ b/app/models/repository_ledger_record.rb @@ -6,4 +6,15 @@ class RepositoryLedgerRecord < ApplicationRecord belongs_to :repository_stock_value belongs_to :reference, polymorphic: true belongs_to :user + belongs_to :repository, + (lambda do |repository_ledger_record| + repository_ledger_record.reference_type == 'RepositoryBase' ? self : none + end), + optional: true, foreign_key: :reference_id, inverse_of: :repository_ledger_records + belongs_to :my_module_repository_row, + (lambda do |repository_ledger_record| + repository_ledger_record.reference_type == 'MyModuleRepositoryRow' ? self : none + end), + optional: true, foreign_key: :reference_id, inverse_of: :repository_ledger_records + has_one :repository_row, through: :repository_stock_value end diff --git a/app/models/team_zip_export.rb b/app/models/team_zip_export.rb index 31e231575..128d63fe0 100644 --- a/app/models/team_zip_export.rb +++ b/app/models/team_zip_export.rb @@ -1,311 +1,7 @@ # frozen_string_literal: true -require 'fileutils' -require 'csv' - class TeamZipExport < ZipExport - include StringUtility - - def generate_exportable_zip(user_id, data, type, options = {}) - @user = User.find(user_id) - zip_input_dir = FileUtils.mkdir_p( - File.join(Rails.root, "tmp/temp_zip_#{Time.now.to_i}") - ).first - zip_dir = FileUtils.mkdir_p(File.join(Rails.root, 'tmp/zip-ready')).first - - zip_name = "projects_export_#{Time.now.utc.strftime('%F_%H-%M-%S_UTC')}.zip" - full_zip_name = File.join(zip_dir, zip_name) - - fill_content(zip_input_dir, data, type, options) - zip!(zip_input_dir, full_zip_name) - zip_file.attach(io: File.open(full_zip_name), filename: zip_name) - generate_notification(user) if save - ensure - FileUtils.rm_rf([zip_input_dir, full_zip_name], secure: true) - end - - handle_asynchronously :generate_exportable_zip, - queue: :team_zip_export - def self.exports_limit (Rails.application.secrets.export_all_limit_24h || 3).to_i end - - private - - # Export all functionality - def generate_teams_zip(tmp_dir, data, options = {}) - # Create team folder - @team = options[:team] - team_path = "#{tmp_dir}/#{to_filesystem_name(@team.name)}" - FileUtils.mkdir_p(team_path) - - # Iterate through every project - p_idx = p_archive_idx = 0 - data.each do |(_, p)| - idx = p.archived ? (p_archive_idx += 1) : (p_idx += 1) - project_path = make_model_dir(team_path, p, idx) - project_name = project_path.split('/')[-1] - - obj_filenames = { repositories: {}, assets: {}, tables: {} } - - # Change current dir for correct generation of relative links - Dir.chdir(project_path) - project_path = '.' - - inventories = "#{project_path}/Inventories" - FileUtils.mkdir_p(inventories) - - repositories = p.assigned_repositories_and_snapshots - - # Iterate through every inventory repo and save it to CSV - repositories.each_with_index do |repo, repo_idx| - next if obj_filenames[:repositories][repo.id].present? - - obj_filenames[:repositories][repo.id] = { - file: save_inventories_to_csv(inventories, repo, repo_idx) - } - end - - # Include all experiments - ex_idx = ex_archive_idx = 0 - p.experiments.each do |ex| - idx = ex.archived ? (ex_archive_idx += 1) : (ex_idx += 1) - experiment_path = make_model_dir(project_path, ex, idx) - - # Include all modules - mod_pos = mod_archive_pos = 0 - ex.my_modules.order(:workflow_order).each do |my_module| - pos = my_module.archived ? (mod_archive_pos += 1) : (mod_pos += 1) - my_module_path = make_model_dir(experiment_path, my_module, pos) - - # Create upper directories for both elements - protocol_path = "#{my_module_path}/Protocol attachments" - result_path = "#{my_module_path}/Result attachments" - FileUtils.mkdir_p(protocol_path) - FileUtils.mkdir_p(result_path) - - # Export protocols - steps = my_module.protocols.map(&:steps).flatten - obj_filenames[:assets].merge!( - export_assets(StepAsset.where(step: steps), :step, protocol_path) - ) - obj_filenames[:tables].merge!( - export_tables(StepTable.where(step: steps), :step, protocol_path) - ) - - # Export results - [false, true].each do |archived| - obj_filenames[:assets].merge!( - export_assets( - ResultAsset.where(result: my_module.results.where(archived: archived)), - :result, - result_path, - archived - ) - ) - end - - [false, true].each do |archived| - obj_filenames[:tables].merge!( - export_tables( - ResultTable.where(result: my_module.results.where(archived: archived)), - :result, - result_path, - archived - ) - ) - end - end - end - - # Generate and export whole project report HTML - html_name = "#{project_name} Report.html" - project_report_pdf = p.generate_teams_export_report_html( - @user, @team, html_name, obj_filenames - ) - file = FileUtils.touch("#{project_path}/#{html_name}").first - File.open(file, 'wb') { |f| f.write(project_report_pdf) } - end - ensure - # Change current dir outside tmp_dir, since tmp_dir will be deleted - Dir.chdir(Rails.root) - end - - def generate_notification(user) - notification = Notification.create( - type_of: :deliver, - title: I18n.t('zip_export.notification_title'), - message: "" \ - "#{zip_file_name}" - ) - UserNotification.create(notification: notification, user: user) - end - - # Create directory for project, experiment, or module - def make_model_dir(parent_path, model, index) - # For MyModule, the index indicates its position in project sidebar - if model.class == MyModule - class_name = 'module' - model_format = '(%s) %s' - else - class_name = model.class.to_s.downcase.pluralize - model_format = '%s (%s)' - end - model_name = - format(model_format, idx: index, name: to_filesystem_name(model.name)) - - model_path = parent_path - if model.archived - model_path += "/Archived #{class_name}" - FileUtils.mkdir_p(model_path) - end - model_path += "/#{model_name}" - FileUtils.mkdir_p(model_path) - model_path - end - - # Appends given suffix to file_name and then adds original extension - def append_file_suffix(file_name, suffix) - ext = File.extname(file_name) - File.basename(file_name, ext) + suffix + ext - end - - def create_archived_results_folder(result_path) - path = "#{result_path}/Archived attachments" - FileUtils.mkdir_p(path) unless File.directory?(path) - path - end - - # Helper method to extract given assets to the directory - def export_assets(elements, type, directory, archived = false) - directory = create_archived_results_folder(directory) if archived && elements.present? - - asset_indexes = {} - elements.each_with_index do |element, i| - asset = element.asset - preview = prepare_preview(asset) - if type == :step - name = "#{directory}/" \ - "#{append_file_suffix(asset.file_name, "_#{i}_Step#{element.step.position_plus_one}")}" - if preview - preview_name = "#{directory}/" \ - "#{append_file_suffix(preview[:file_name], "_#{i}_Step#{element.step.position_plus_one}_preview")}" - end - elsif type == :result - name = "#{directory}/#{append_file_suffix(asset.file_name, "_#{i}")}" - preview_name = "#{directory}/#{append_file_suffix(preview[:file_name], "_#{i}_preview")}" if preview - end - - if asset.file.attached? - File.open(name, 'wb') { |f| f.write(asset.file.download) } - File.open(preview_name, 'wb') { |f| f.write(preview[:file_data]) } if preview - end - asset_indexes[asset.id] = { - file: name, - preview: preview_name - } - end - asset_indexes - end - - def prepare_preview(asset) - if asset.previewable? && !asset.list? - preview = asset.inline? ? asset.large_preview : asset.medium_preview - if preview.is_a?(ActiveStorage::Preview) - return unless preview.image.attached? - - file_name = preview.image.filename.to_s - file_data = preview.image.download - else - file_name = preview.blob.filename.to_s - - begin - file_data = preview.processed.service.download(preview.key) - rescue Vips::Error # handle files not processable by Vips (no preview available) - return nil - end - end - - { - file_name: file_name, - file_data: file_data - } - end - end - - # Helper method to extract given tables to the directory - def export_tables(elements, type, directory, archived = false) - directory = create_archived_results_folder(directory) if archived && elements.present? - - table_indexes = {} - elements.each_with_index do |element, i| - table = element.table - table_name = table.name.presence || 'Table' - table_name += i.to_s - - if type == :step - name = "#{directory}/#{to_filesystem_name(table_name)}" \ - "_#{i}_Step#{element.step.position_plus_one}.csv" - elsif type == :result - name = "#{directory}/#{to_filesystem_name(table_name)}.csv" - end - file = FileUtils.touch(name).first - File.open(file, 'wb') { |f| f.write(table.to_csv) } - table_indexes[table.id] = { - file: name - } - end - - table_indexes - end - - # Helper method for saving inventories to CSV - def save_inventories_to_csv(path, repo, idx) - repo_name = "#{to_filesystem_name(repo.name)} (#{idx})" - - # Attachment folder - rel_attach_path = "#{repo_name} attachments" - attach_path = "#{path}/#{rel_attach_path}" - FileUtils.mkdir_p(attach_path) - - # CSV file - csv_file_path = "#{path}/#{repo_name}.csv" - csv_file = FileUtils.touch(csv_file_path).first - - # Define headers and columns IDs - col_ids = [-3, -4, -5, -6] + repo.repository_columns.map(&:id) - - # Define callback function for file name - assets = {} - asset_counter = 0 - handle_name_func = lambda do |asset| - file_name = append_file_suffix(asset.file_name, "_#{asset_counter}").to_s - - # Save pair for downloading it later - assets[asset] = "#{attach_path}/#{file_name}" - - asset_counter += 1 - rel_path = "#{rel_attach_path}/#{file_name}" - return "=HYPERLINK(\"#{rel_path}\", \"#{rel_path}\")" - end - - # Generate CSV - csv_data = RepositoryZipExport.to_csv(repo.repository_rows, col_ids, @user, repo, handle_name_func) - File.open(csv_file, 'wb') { |f| f.write(csv_data) } - - # Save all attachments (it doesn't work directly in callback function - assets.each do |asset, asset_path| - asset.file.open do |file| - FileUtils.cp(file.path, asset_path) - end - end - - csv_file_path - end end diff --git a/app/models/zip_export.rb b/app/models/zip_export.rb index a76d51c4e..1e6f24e72 100644 --- a/app/models/zip_export.rb +++ b/app/models/zip_export.rb @@ -4,20 +4,6 @@ require 'zip' require 'fileutils' require 'csv' -# To use ZipExport you have to define the generate_( type )_zip method! -# Example: -# def generate_(type)_zip(tmp_dir, data, options = {}) -# attributes = options.fetch(:attributes) { :attributes_missing } -# file = FileUtils.touch("#{tmp_dir}/export.csv").first -# records = data -# CSV.open(file, 'wb') do |csv| -# csv << attributes -# records.find_each do |entity| -# csv << entity.values_at(*attributes.map(&:to_sym)) -# end -# end -# end - class ZipExport < ApplicationRecord belongs_to :user, optional: true @@ -26,8 +12,7 @@ class ZipExport < ApplicationRecord after_create :self_destruct def self.delete_expired_export(id) - export = find_by_id(id) - export&.destroy + find_by(id: id)&.destroy end def zip_file_name @@ -45,62 +30,10 @@ class ZipExport < ApplicationRecord end end - def generate_exportable_zip(user_id, data, type, options = {}) - user = User.find(user_id) - I18n.backend.date_format = user.settings[:date_format] || Constants::DEFAULT_DATE_FORMAT - zip_input_dir = FileUtils.mkdir_p(File.join(Rails.root, "tmp/temp_zip_#{Time.now.to_i}")).first - tmp_zip_dir = FileUtils.mkdir_p(File.join(Rails.root, 'tmp/zip-ready')).first - tmp_zip_name = "export_#{Time.now.strftime('%F %H-%M-%S_UTC')}.zip" - tmp_full_zip_name = File.join(tmp_zip_dir, tmp_zip_name) - - fill_content(zip_input_dir, data, type, options) - zip!(zip_input_dir, tmp_full_zip_name) - zip_file.attach(io: File.open(tmp_full_zip_name), filename: tmp_zip_name) - generate_notification(user) if save - ensure - FileUtils.rm_rf([zip_input_dir, tmp_full_zip_name], secure: true) - end - - handle_asynchronously :generate_exportable_zip - private def self_destruct ZipExport.delay(run_at: Constants::EXPORTABLE_ZIP_EXPIRATION_DAYS.days.from_now) .delete_expired_export(id) end - - def method_missing(method_name, *args, &block) - return super unless method_name.to_s.start_with?('generate_') - - raise StandardError, 'Method is missing! To use this zip_export you have to define a method: generate_( type )_zip.' - end - - def respond_to_missing?(method_name, include_private = false) - method_name.to_s.start_with?('generate_') || super - end - - def fill_content(dir, data, type, options = {}) - eval("generate_#{type}_zip(dir, data, options)") - end - - def generate_notification(user) - notification = Notification.create( - type_of: :deliver, - title: I18n.t('zip_export.notification_title'), - message: "" \ - "#{zip_file_name}" - ) - UserNotification.create(notification: notification, user: user) - end - - def generate_repositories_zip(tmp_dir, data, _options = {}) - file = FileUtils.touch("#{tmp_dir}/export.csv").first - File.open(file, 'wb') { |f| f.write(data) } - end end diff --git a/app/services/repository_stock_ledger_zip_export.rb b/app/services/repository_stock_ledger_zip_export.rb index b7ead95ff..d362fb060 100644 --- a/app/services/repository_stock_ledger_zip_export.rb +++ b/app/services/repository_stock_ledger_zip_export.rb @@ -22,48 +22,31 @@ module RepositoryStockLedgerZipExport stock_balance_unit ).freeze - def self.generate_zip(row_ids, user_id) - rows = generate_data(row_ids) - - zip = ZipExport.create(user_id: user_id) - zip.generate_exportable_zip( - user_id, - to_csv(rows), - :repositories - ) - end - - def self.to_csv(rows) + def self.to_csv(repository_row_ids) csv_header = COLUMNS.map { |col| I18n.t("repository_stock_values.stock_export.headers.#{col}") } + repository_ledger_records = load_records(repository_row_ids) CSV.generate do |csv| csv << csv_header - rows.each do |row| - csv << row + repository_ledger_records.each do |record| + csv << generate_record_data(record) end end end - def self.generate_data(row_ids) - data = [] - repository_ledger_records = - RepositoryLedgerRecord.joins(repository_stock_value: :repository_row) - .includes(:user, { repository_stock_value: :repository_row }) - .where(repository_row: { id: row_ids }) - .joins('LEFT OUTER JOIN my_module_repository_rows ON - repository_ledger_records.reference_id = my_module_repository_rows.id') - .joins('LEFT OUTER JOIN my_modules ON - my_modules.id = my_module_repository_rows.my_module_id') - .joins('LEFT OUTER JOIN experiments ON experiments.id = my_modules.experiment_id') - .joins('LEFT OUTER JOIN projects ON projects.id = experiments.project_id') - .joins('LEFT OUTER JOIN teams ON teams.id = projects.team_id') - .order('repository_row.created_at, repository_ledger_records.created_at') - .select('repository_ledger_records.*, - my_modules.id AS module_id, my_modules.name AS module_name, - projects.name AS project_name, teams.name AS team_name, - experiments.name AS experiment_name') - # rubocop:disable Metrics/BlockLength - repository_ledger_records.each do |record| + class << self + private + + def load_records(repository_row_ids) + RepositoryLedgerRecord + .joins(:repository_row) + .preload(:user, repository_row: { repository: :team }) + .preload(my_module_repository_row: { my_module: { experiment: { project: :team } } }) + .where(repository_row: { id: repository_row_ids }) + .order(:created_at) + end + + def generate_record_data(record) consumption_type = record.reference_type == 'MyModuleRepositoryRow' ? 'Task' : 'Inventory' if record.amount.positive? @@ -78,32 +61,31 @@ module RepositoryStockLedgerZipExport row_data = [ consumption_type, - record.repository_stock_value.repository_row.name, - record.repository_stock_value.repository_row.code, + record.repository_row.name, + record.repository_row.code, consumed_amount, consumed_amount_unit, added_amount, added_amount_unit, record.user.full_name, record.created_at.strftime(record.user.date_format), - record.team_name, + record.repository_row.repository.team.name, record.unit, record.balance.to_d ] if consumption_type == 'Task' + my_module = record.my_module_repository_row.my_module breadcrumbs_data = [ - record.project_name, - record.experiment_name, - record.module_name, - "#{MyModule::ID_PREFIX}#{record.module_id}" + my_module.experiment.project.name, + my_module.experiment.name, + my_module.name, + my_module.code ] end row_data.insert(10, *breadcrumbs_data) - data << row_data + row_data end - # rubocop:enable Metrics/BlockLength - data end end diff --git a/app/services/repository_zip_export.rb b/app/services/repository_zip_export.rb index 9bd8b5d05..b7a2ff125 100644 --- a/app/services/repository_zip_export.rb +++ b/app/services/repository_zip_export.rb @@ -3,39 +3,6 @@ require 'csv' module RepositoryZipExport - def self.generate_zip(params, repository, current_user) - # Fetch rows in the same order as in the currently viewed datatable - if params[:my_module_id] - rows = if repository.is_a?(RepositorySnapshot) - repository.repository_rows - else - repository.repository_rows - .joins(:my_module_repository_rows) - .where(my_module_repository_rows: { my_module_id: params[:my_module_id] }) - end - if repository.has_stock_management? - rows = rows.left_joins(my_module_repository_rows: :repository_stock_unit_item) - .select( - 'repository_rows.*', - 'my_module_repository_rows.stock_consumption' - ) - end - else - ordered_row_ids = params[:row_ids] - id_row_map = RepositoryRow.where(id: ordered_row_ids, - repository: repository) - .index_by(&:id) - rows = ordered_row_ids.collect { |id| id_row_map[id.to_i] } - end - - zip = ZipExport.create(user: current_user) - zip.generate_exportable_zip( - current_user.id, - to_csv(rows, params[:header_ids], current_user, repository, nil, params[:my_module_id].present?), - :repositories - ) - end - def self.to_csv(rows, column_ids, user, repository, handle_file_name_func = nil, in_module = false) # Parse column names csv_header = [] From e6252e09cc92dd4d6ba326def03aaed8fa7ba01c Mon Sep 17 00:00:00 2001 From: wandji Date: Fri, 8 Sep 2023 10:39:46 +0100 Subject: [PATCH 05/10] Change consumption reposrt esport modal text [SCI-9194] (#6167) --- .../repositories/_export_stock_consumption_modal.html.erb | 5 +++-- config/locales/en.yml | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/repositories/_export_stock_consumption_modal.html.erb b/app/views/repositories/_export_stock_consumption_modal.html.erb index e3f85f34c..72d813364 100644 --- a/app/views/repositories/_export_stock_consumption_modal.html.erb +++ b/app/views/repositories/_export_stock_consumption_modal.html.erb @@ -13,8 +13,9 @@

<%=t 'zip_export.consumption_modal_label' %>

-
<%=t('zip_export.consumption_header_html', repository: repository.name) %>
-
<%=t 'zip_export.consumption_footer_html' %>
+

<%=t('zip_export.consumption_header_html', repository: repository.name) %>

+

<%=t 'zip_export.consumption_body_html' %>

+

<%=t 'zip_export.consumption_footer_html' %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 2cf2c801d..404f4d177 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3532,9 +3532,10 @@ en: repository_footer_html: 'Inventory will be exported in a .csv file format. You will receive email with a link where you can download it.' export_request_success: "Export request received. Your export request is being processed." export_error: "Error when creating zip export." - consumption_modal_label: 'Consumption report' - consumption_header_html: 'You are about to generate consumption report for selected items in inventory %{repository}.' - consumption_footer_html: 'Consumption report will be exported in a .csv file format. You will receive email with a link where you can download it.' + consumption_modal_label: 'Export consumption' + consumption_header_html: 'You are about to generate consumption report for selected items in inventory %{repository}*. The report will be saved in a .csv file format.' + consumption_body_html: 'After the report is generated, you will be able to find the download link in both your SciNote notifications and email inbox.' + consumption_footer_html: 'For security reasons, please note that the link will only be valid for 7 days.' consumption_generate: 'Generate' webhooks: index: From 7b44a47d5171ce357eefa751882a7b29835acc91 Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 8 Sep 2023 13:42:02 +0200 Subject: [PATCH 06/10] Add active/archive switch to results page [SCI-9264] --- app/controllers/results_controller.rb | 2 +- app/helpers/secondary_navigation_helper.rb | 6 +---- app/javascript/vue/results/results.vue | 8 ++++++- .../vue/results/results_toolbar.vue | 24 ++++++++++++++++++- app/views/my_modules/_header_actions.html.erb | 16 ------------- app/views/results/index.html.erb | 5 +++- config/locales/en.yml | 2 ++ 7 files changed, 38 insertions(+), 25 deletions(-) diff --git a/app/controllers/results_controller.rb b/app/controllers/results_controller.rb index f32b977c4..9d5094eec 100644 --- a/app/controllers/results_controller.rb +++ b/app/controllers/results_controller.rb @@ -195,7 +195,7 @@ class ResultsController < ApplicationController def set_navigator @navigator = { url: tree_navigator_my_module_path(@my_module), - archived: params[:view_mode] == 'archived', + archived: false, id: @my_module.code } end diff --git a/app/helpers/secondary_navigation_helper.rb b/app/helpers/secondary_navigation_helper.rb index fc4fd9484..b3c0c75bd 100644 --- a/app/helpers/secondary_navigation_helper.rb +++ b/app/helpers/secondary_navigation_helper.rb @@ -41,17 +41,13 @@ module SecondaryNavigationHelper end def is_module_results? - %w(index).include?(action_name) && controller_name == 'results' && !%w(archived).include?(params[:view_mode]) + %w(index).include?(action_name) && controller_name == 'results' end def is_module_activities? action_name == 'activities' end - def is_module_archive? - %w(index).include?(action_name) && controller_name == 'results' && %w(archived).include?(params[:view_mode]) - end - def title_element if all_projects_page? current_team diff --git a/app/javascript/vue/results/results.vue b/app/javascript/vue/results/results.vue index 1f4b77fb5..f675f7370 100644 --- a/app/javascript/vue/results/results.vue +++ b/app/javascript/vue/results/results.vue @@ -2,6 +2,9 @@
+
+
+ {{ i18n.t('my_modules.results.archived_results') }} + {{ i18n.t('my_modules.results.active_results') }} + +
+ +
diff --git a/app/views/results/index.html.erb b/app/views/results/index.html.erb index 892c6382b..6c167db7a 100644 --- a/app/views/results/index.html.erb +++ b/app/views/results/index.html.erb @@ -19,7 +19,10 @@
> + active_url="<%= my_module_results_url(@my_module) %>" + archived_url="<%= my_module_results_url(@my_module, view_mode: :archived) %>" + can-create=<%= can_create_results?(@my_module) && !(params[:view_mode] == 'archived') %> + archived=<%= params[:view_mode] == 'archived' %>>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 404f4d177..8a6a0825b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1252,6 +1252,8 @@ en: load_from_file_protocol_general_error: "Failed to load the protocol from file. It is likely that certain fields (protocol and individual step titles and names) contain too many or too few characters.(max is %{max} and min is %{min})" results: head_title: "%{project} | %{module} | Results" + active_results: "Active results" + archived_results: "Archived results" default_name: "New result" placeholder: "Enter result name" add_label: "New result" From 520f978f35010c3a10f79d8cf7213edd5ff3c06e Mon Sep 17 00:00:00 2001 From: Martin Artnik <85488244+artoscinote@users.noreply.github.com> Date: Fri, 8 Sep 2023 14:45:39 +0200 Subject: [PATCH 07/10] Fix update of database settings values [SCI-9240] (#6174) --- app/models/settings.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/settings.rb b/app/models/settings.rb index ca3d4d373..48a1872bf 100644 --- a/app/models/settings.rb +++ b/app/models/settings.rb @@ -1,14 +1,18 @@ # frozen_string_literal: true class Settings < ApplicationRecord + attr_accessor :merged_values + + before_validation -> { self.values = merged_values || values } + def self.instance first || new end def values - merged_values = super + self.merged_values ||= super self.class.instance_methods(false).grep(/^load_values_from_[A-Z0-9_]*/).each do |method| - merged_values = merged_values.merge(public_send(method)) + self.merged_values = self.merged_values.merge(public_send(method)) end merged_values end From ede9e40be8d605792e39fa185ccc4b156c920f3c Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Fri, 8 Sep 2023 16:07:43 +0200 Subject: [PATCH 08/10] Fix attachment sorting in results [SCI-9267] --- app/controllers/results_controller.rb | 2 +- .../vue/shared/content/attachments.vue | 21 +++++++++---------- app/serializers/result_serializer.rb | 6 +++++- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/controllers/results_controller.rb b/app/controllers/results_controller.rb index f32b977c4..1ca4df48f 100644 --- a/app/controllers/results_controller.rb +++ b/app/controllers/results_controller.rb @@ -106,7 +106,7 @@ class ResultsController < ApplicationController def update_view_state view_state = @result.current_view_state(current_user) - view_state.state['result_assets']['sort'] = params.require(:assets).require(:order) + view_state.state['assets']['sort'] = params.require(:assets).require(:order) view_state.save! if view_state.changed? render json: {}, status: :ok diff --git a/app/javascript/vue/shared/content/attachments.vue b/app/javascript/vue/shared/content/attachments.vue index 66d45cb5d..5f1a6a4f1 100644 --- a/app/javascript/vue/shared/content/attachments.vue +++ b/app/javascript/vue/shared/content/attachments.vue @@ -47,17 +47,16 @@
- +
diff --git a/app/serializers/result_serializer.rb b/app/serializers/result_serializer.rb index f77f490ad..694782d5d 100644 --- a/app/serializers/result_serializer.rb +++ b/app/serializers/result_serializer.rb @@ -9,7 +9,7 @@ class ResultSerializer < ActiveModel::Serializer attributes :name, :id, :urls, :updated_at, :created_at_formatted, :updated_at_formatted, :user, :my_module_id, :attachments_manageble, :marvinjs_enabled, :marvinjs_context, :type, - :wopi_enabled, :wopi_context, :created_at, :created_by, :archived + :wopi_enabled, :wopi_context, :created_at, :created_by, :archived, :assets_order def marvinjs_enabled MarvinJsService.enabled? @@ -55,6 +55,10 @@ class ResultSerializer < ActiveModel::Serializer } end + def assets_order + object.current_view_state(current_user).state.dig('assets', 'sort') unless object.destroyed? + end + def attachments_manageble can_manage_result?(object) end From f0c77b4e7d8b5789fc62670d6e4b1e596fe7dce0 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Fri, 8 Sep 2023 16:26:29 +0200 Subject: [PATCH 09/10] Disable move button in move content modal if there's no target selected [SCI-9278] --- app/javascript/vue/shared/content/modal/move.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/vue/shared/content/modal/move.vue b/app/javascript/vue/shared/content/modal/move.vue index 79df09323..dc6d6983b 100644 --- a/app/javascript/vue/shared/content/modal/move.vue +++ b/app/javascript/vue/shared/content/modal/move.vue @@ -1,5 +1,5 @@