From 5cc966e11ea51e25ee52e868c6c137d861407ced Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Mon, 16 Aug 2021 13:58:54 +0200 Subject: [PATCH] Remove delete molecule activities [SCI-5999] --- app/controllers/bio_eddie_assets_controller.rb | 15 --------------- app/controllers/concerns/bio_eddie_actions.rb | 6 ------ app/views/assets/_asset_context_menu.html.erb | 2 +- config/initializers/extends.rb | 9 +++------ config/locales/global_activities/en.yml | 3 --- config/routes.rb | 2 +- 6 files changed, 5 insertions(+), 32 deletions(-) diff --git a/app/controllers/bio_eddie_assets_controller.rb b/app/controllers/bio_eddie_assets_controller.rb index a7964b0af..951274861 100644 --- a/app/controllers/bio_eddie_assets_controller.rb +++ b/app/controllers/bio_eddie_assets_controller.rb @@ -46,21 +46,6 @@ class BioEddieAssetsController < ApplicationController end end - def destroy - asset = current_team.assets.find(bio_eddie_params[:id]) - - if asset - create_delete_bio_eddie_activity(asset, current_user) - if asset.destroy - render json: { flash: I18n.t('assets.file_deleted', file_name: asset.file_name) } - else - render json: {}, status: :unprocessable_entity - end - else - render json: { error: t('bio_eddie.no_molecules_found') }, status: :unprocessable_entity - end - end - def license license_file_path = Rails.root.join('data/bioeddie/license.cxl') if File.file?(license_file_path) diff --git a/app/controllers/concerns/bio_eddie_actions.rb b/app/controllers/concerns/bio_eddie_actions.rb index 74cd793a8..8926853f4 100644 --- a/app/controllers/concerns/bio_eddie_actions.rb +++ b/app/controllers/concerns/bio_eddie_actions.rb @@ -23,12 +23,6 @@ module BioEddieActions bio_eddie_find_target_object(asset, current_user, 'create') end - def create_delete_bio_eddie_activity(asset, current_user) - return unless bio_eddie_asset_validation(asset) - - bio_eddie_find_target_object(asset, current_user, 'delete') - end - def create_register_bio_eddie_activity(asset, current_user) return unless bio_eddie_asset_validation(asset) diff --git a/app/views/assets/_asset_context_menu.html.erb b/app/views/assets/_asset_context_menu.html.erb index 44f9eb060..6eaaedb27 100644 --- a/app/views/assets/_asset_context_menu.html.erb +++ b/app/views/assets/_asset_context_menu.html.erb @@ -61,7 +61,7 @@ <% if deletable %>
  • - + <%= t("assets.context_menu.delete") %> diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb index ace2c445a..5a9c9d41a 100644 --- a/config/initializers/extends.rb +++ b/config/initializers/extends.rb @@ -316,9 +316,6 @@ class Extends create_molecule_on_step: 171, create_molecule_on_result: 172, create_molecule_on_step_in_repository: 173, - delete_molecule_on_step: 174, - delete_molecule_on_result: 175, - delete_molecule_on_step_in_repository: 176, register_molecule_on_step: 177, register_molecule_on_result: 178, register_molecule_on_step_in_repository: 179 @@ -326,17 +323,17 @@ class Extends ACTIVITY_GROUPS = { projects: [*0..7, 32, 33, 34, 95, 108, 65, 109, *158..162], - task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128, 169, 172, 175, 178], + task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128, 169, 172, 178], task: [8, 58, 9, 59, *10..14, 35, 36, 37, 53, 54, *60..63, 138, 139, 140, 64, 66, 106, 126, 120, 132, *146..148, 168], task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 111, 45, 46, 47, 121, 124, 115, 118, 127, 130, 137, - 171, 174, 177], + 171, 177], task_inventory: [55, 56, 146, 147], experiment: [*27..31, 57], reports: [48, 50, 49, 163, 164], inventories: [70, 71, 105, 144, 145, 72, 73, 74, 102, 142, 143, 75, 76, 77, 78, 96, 107, 113, 114, *133..136], protocol_repository: [80, 103, 89, 87, 79, 90, 91, 88, 85, 86, 84, 81, 82, - 83, 101, 112, 123, 125, 117, 119, 129, 131, 170, 173, 176, 179], + 83, 101, 112, 123, 125, 117, 119, 129, 131, 170, 173, 179], team: [92, 94, 93, 97, 104] } diff --git a/config/locales/global_activities/en.yml b/config/locales/global_activities/en.yml index d481c1294..7f21f941b 100644 --- a/config/locales/global_activities/en.yml +++ b/config/locales/global_activities/en.yml @@ -357,9 +357,6 @@ en: create_molecule_on_step: "Molecule on task step created" create_molecule_on_result: "Molecule on result created" create_molecule_on_step_in_repository: "Molecule on step created" - delete_molecule_on_step: "Molecule on task step deleted" - delete_molecule_on_result: "Molecule on result deleted" - delete_molecule_on_step_in_repository: "Molecule on step deleted" register_molecule_on_step: "Molecule on task step registered" register_molecule_on_result: "Molecule on result registered" register_molecule_on_step_in_repository: "Molecule on step registered" diff --git a/config/routes.rb b/config/routes.rb index e3d235fa4..ce9178869 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -770,7 +770,7 @@ Rails.application.routes.draw do end end - resources :bio_eddie_assets, only: %i(create update destroy) do + resources :bio_eddie_assets, only: %i(create update) do collection do get :license end