From 9c02ec0020c0a16c0fa2ab27b7360eb5764b4630 Mon Sep 17 00:00:00 2001 From: mjy Date: Mon, 5 Aug 2024 12:39:30 -0500 Subject: [PATCH 01/20] Shakapacker cleanup --- config/environments/development.rb | 3 --- config/environments/production.rb | 3 --- lib/tasks/shakapacker.rake | 24 ------------------------ 3 files changed, 30 deletions(-) delete mode 100644 lib/tasks/shakapacker.rake diff --git a/config/environments/development.rb b/config/environments/development.rb index e6c225f6f5..82b2a42b7a 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -38,9 +38,6 @@ #config.assets.quiet = false # is true by default config.assets.raise_runtime_errors = true - # Needed to make shakapacker not use yarn - config.shakapacker.check_yarn_integrity = false - config.action_mailer.default_url_options = { host: 'localhost:3000' } # Load local settings diff --git a/config/environments/production.rb b/config/environments/production.rb index c9f2939632..284e7da38d 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -41,9 +41,6 @@ # Version of your assets, change this if you want to expire all your assets. config.assets.version = '1.0' - # Needed to make shakapacker not use yarn - config.shakapacker.check_yarn_integrity = false - # Specifies the header that your server uses for sending files. # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx diff --git a/lib/tasks/shakapacker.rake b/lib/tasks/shakapacker.rake deleted file mode 100644 index 017a40d6cd..0000000000 --- a/lib/tasks/shakapacker.rake +++ /dev/null @@ -1,24 +0,0 @@ -namespace :shakapacker do - task :check_npm do - begin - npm_version = `npm --version` - raise Errno::ENOENT if npm_version.blank? - version = Gem::Version.new(npm_version) - - package_json_path = Pathname.new("#{Rails.root}/package.json").realpath - npm_requirement = JSON.parse(package_json_path.read).dig('engines', 'npm') - requirement = Gem::Requirement.new(npm_requirement) - - unless requirement.satisfied_by?(version) - $stderr.puts "Shakapacker requires npm #{requirement} and you are using #{version}" && exit! - end - rescue Errno::ENOENT - $stderr.puts 'npm not installed' - $stderr.puts 'Install NPM https://www.npmjs.com/get-npm' && exit! - end - end - - task :npm_install do - system 'npm install' - end -end From 7d0be0e671bced906e18f558f75e855c6341a4ee Mon Sep 17 00:00:00 2001 From: jlpereira Date: Mon, 5 Aug 2024 19:50:44 -0300 Subject: [PATCH 02/20] Fix #4002 --- CHANGELOG.md | 5 ++++- .../components/typeMaterial/TypeMaterialType.vue | 12 +++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 311ef99018..68e72dfacf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ This project does not yet adheres to [Semantic Versioning](https://semv ## [unreleased] -\- +### Changed + +- CSD: Prevent user add duplicate types for type materials [#4002] ## [0.43.1] - 2024-08-04 @@ -22,6 +24,7 @@ This project does not yet adheres to [Semantic Versioning](https://semv - Misspelled DwcOccurrence attribute [#4000]: https://github.com/SpeciesFileGroup/taxonworks/issues/4000 +[#4002]: https://github.com/SpeciesFileGroup/taxonworks/issues/4002 ## [0.43.0] - 2024-07-31 diff --git a/app/javascript/vue/tasks/digitize/components/typeMaterial/TypeMaterialType.vue b/app/javascript/vue/tasks/digitize/components/typeMaterial/TypeMaterialType.vue index 6fabb609ad..6ff83cc90a 100644 --- a/app/javascript/vue/tasks/digitize/components/typeMaterial/TypeMaterialType.vue +++ b/app/javascript/vue/tasks/digitize/components/typeMaterial/TypeMaterialType.vue @@ -6,7 +6,14 @@ v-for="(_, key) in nomenclatureCodeTypes" :key="key" > -
  • +