Merge branch 'development'

SpeciesFileGroup · Aug 4, 2020 · 239ef61 · 239ef61
2 parents c095f42 + 74b80ba
commit 239ef61
Show file tree

Hide file tree

Showing 104 changed files with 2,421 additions and 2,625 deletions.
diff --git a/.postcssrc.yml b/.postcssrc.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,64 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 \-
 
+## [0.12.13] - 2020-08-04
+
+### Added
+- Delete confirmation for original combinations [#1618]
+- Delete confirmation for type specimens in new type specimen task
+- Check if already exist an asserted combination with the same otu and geographic area in new asserted distribution task [#1329]
+- Modal on duplicate original citations in radial annotator [#1576]
+- Soft validations component for citations in radial annotator and tasks [#1552]
+- Redirect to valid name in browse nomenclature [#446]
+- sessionStorage for browse nomenclature autocomplete [#446]
+- Observation matrices in radial object [#1527]
+- Comprehensive task to taxon name radial [#934]
+- Map on OTU radial in asserted distribution form [#856]
+- Pin objects from list in filter sources
+- Checkbox to make document public on list in radial annotator
+- Title legend for "make default" icon in pinboard slide
+- Checkbox to alternative between AND/OR filter for authors in filter sources
+- Lep staged 2 layout for staged images [#1635]
+
+### Changed
+- Use amazing_print instead of awesome_print gem
+- Cleanup and add spec basis for nomenclature tabular stats queries  
+- Improve/unify image modal [#1617]
+- Replace repository and source autocompletes for smart selectors in new type material task
+- Changed autosave behaviour in new asserted distribution task
+- Gender list order in new taxon name task
+- Page range soft validation message made less strict
+- Original citation-related UI text
+- Moved taxon name input search to right column in new taxon name
+- Persons autosave in new taxon name
+- Updated elliptic node package. [#1632]
+
+### Fixed
+- Flip object to subject label on type section in new taxon name task
+- Shapes are possible to drag even if this option is not set up
+- Columns size of georeference table [#1622]
+- Webpacker host and port bind on docker container
+- Wrong taxon name relationship soft validation message for genera
+- Modal confirmation its not displaying in manage synonyms section [#1627]
+- Manage synonyms includes combinations [#1628]
+- Recent and per params in source filter and controller
+- Missing ZIP dependency for docker images
+
+[#446]: https://github.com/SpeciesFileGroup/taxonworks/issues/446
+[#856]: https://github.com/SpeciesFileGroup/taxonworks/issues/856
+[#934]: https://github.com/SpeciesFileGroup/taxonworks/issues/934
+[#1329]: https://github.com/SpeciesFileGroup/taxonworks/issues/1329
+[#1527]: https://github.com/SpeciesFileGroup/taxonworks/issues/1527
+[#1552]: https://github.com/SpeciesFileGroup/taxonworks/issues/1552
+[#1576]: https://github.com/SpeciesFileGroup/taxonworks/issues/1576
+[#1617]: https://github.com/SpeciesFileGroup/taxonworks/issues/1617
+[#1618]: https://github.com/SpeciesFileGroup/taxonworks/issues/1618
+[#1622]: https://github.com/SpeciesFileGroup/taxonworks/issues/1622
+[#1627]: https://github.com/SpeciesFileGroup/taxonworks/issues/1627
+[#1628]: https://github.com/SpeciesFileGroup/taxonworks/issues/1628
+[#1632]: https://github.com/SpeciesFileGroup/taxonworks/pull/1632
+[#1635]: https://github.com/SpeciesFileGroup/taxonworks/issues/1635
+
 ## [0.12.12] - 2020-07-22
 
 ### Fixed
@@ -245,7 +303,8 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 [#1532]: https://github.com/SpeciesFileGroup/taxonworks/issues/1532
 
-[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.12...development
+[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.13...development
+[0.12.13]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.12...v0.12.13
 [0.12.12]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.11...v0.12.12
 [0.12.11]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.10...v0.12.11
 [0.12.10]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.9...v0.12.10

diff --git a/Dockerfile b/Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update && \
       libpq-dev libproj-dev libgeos-dev libgeos++-dev \
       tesseract-ocr \
       cmake \
+      zip \
       nodejs \
       redis-server libhiredis-dev && \
       apt clean && \ 

diff --git a/Dockerfile.development b/Dockerfile.development
@@ -25,6 +25,7 @@ RUN apt-get update && \
                        libpq-dev libproj-dev libgeos-dev libgeos++-dev \
                        tesseract-ocr \
                        cmake \
+                       zip \
                        nodejs && \
                        apt clean && \
                        rm -rf /var/lip/abpt/lists/* /tmp/* /var/tmp/*

diff --git a/Gemfile b/Gemfile
@@ -103,7 +103,7 @@ gem 'ruby-units', '~> 2.3.0', require: 'ruby_units/namespaced'
 gem 'gnfinder', '~> 0.11.0'
 
 # Minor Utils/helpers
-gem 'awesome_print', '~> 1.8'
+gem 'amazing_print', '~> 1.2.1'
 gem 'indefinite_article', '~> 0.2.4'
 gem 'rainbow', '~> 3.0.0'
 gem 'term-ansicolor', '~> 1.6' # DEPRECATED

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -81,10 +81,10 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     afm (0.2.2)
+    amazing_print (1.2.1)
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     ast (2.4.1)
-    awesome_print (1.8.0)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -556,7 +556,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord-postgis-adapter (~> 6.0)
   acts_as_list (~> 1.0)
-  awesome_print (~> 1.8)
+  amazing_print (~> 1.2.1)
   bcrypt (~> 3.1.11)
   best_in_place (~> 3.1.1)
   better_errors (~> 2.4)

diff --git a/app/assets/javascripts/workbench/pinboard.js b/app/assets/javascripts/workbench/pinboard.js
@@ -103,7 +103,7 @@ Object.assign(TW.workbench.pinboard, {
             })
           }
       injectItem = injectItem + '<a href="' + object.object_url + '" class="remove circle-button button-delete" data-remote="true" rel="nofollow" data-method="delete">Remove</a> \
-      <a class="circle-button button-pinboard-default button-submit option-default" data-remote="true" rel="nofollow" data-method="put" href="/pinboard_items/' + object.id + '?pinboard_item%5Bis_inserted%5D=true">Make default</a> \
+      <a class="circle-button button-pinboard-default button-submit option-default" title="Make default" data-remote="true" rel="nofollow" data-method="put" href="/pinboard_items/' + object.id + '?pinboard_item%5Bis_inserted%5D=true">Make default</a> \
       </div> \
         </div> \
       </li>'
@@ -151,6 +151,7 @@ Object.assign(TW.workbench.pinboard, {
     newEl.setAttribute('href', '/pinboard_items/' + id + '?pinboard_item%5Bis_inserted%5D=' + inserted);
     newEl.setAttribute('data-remote', 'true');
     newEl.setAttribute('rel', 'nofollow');
+    newEl.setAttribute('title', (inserted ? 'Make default' : 'Disable default'));
     newEl.setAttribute('data-method', 'put');
     newEl.classList.add('circle-button', 'button-pinboard-default', (inserted ? 'button-submit' : 'button-delete'), 'option-default');
 

diff --git a/app/controllers/sources_controller.rb b/app/controllers/sources_controller.rb
@@ -218,6 +218,7 @@ def filter_params
     params[:project_id] = sessions_current_project_id
     params.permit(
       :author,
+      :author_ids_or,
       :citations,
       :documents,
       :exact_author,
@@ -230,6 +231,7 @@ def filter_params
       :namespace_id,
       :nomenclature,
       :notes,
+      :per,
       :project_id,
       :query_term,
       :recent, 

diff --git a/app/helpers/pinboard_items_helper.rb b/app/helpers/pinboard_items_helper.rb
@@ -10,9 +10,9 @@ def pin_item_to_pinboard_link(object, user)
 
   def insert_pinboard_item_link(pinboard_item)
     if pinboard_item.is_inserted
-      link_to('Disable default', pinboard_item_path(pinboard_item, pinboard_item: {is_inserted: false}), class: ['circle-button', 'button-pinboard-default', 'button-delete', 'option-default'], method: :put, remote: true ) 
+      link_to('Disable default', pinboard_item_path(pinboard_item, pinboard_item: {is_inserted: false}), title: 'Disable default', class: ['circle-button', 'button-pinboard-default', 'button-delete', 'option-default'], method: :put, remote: true ) 
     else
-      link_to('Make default', pinboard_item_path(pinboard_item, pinboard_item: {is_inserted: true}), class: ['circle-button', 'button-pinboard-default','button-submit', 'option-default'], method: :put, remote: true )
+      link_to('Make default', pinboard_item_path(pinboard_item, pinboard_item: {is_inserted: true}), title: 'Make default', class: ['circle-button', 'button-pinboard-default','button-submit', 'option-default'], method: :put, remote: true )
     end
   end
 

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
@@ -28,6 +28,7 @@ require('../vue/initializers/pdfViewer/main.js')
 require('../vue/initializers/default_confidence/main.js')
 require('../vue/initializers/tagButton/main.js')
 require('../vue/initializers/quick_citation_init/main.js')
+require('../vue/initializers/browse_nomenclature/main.js')
 require('../vue/tasks/type_specimens/main.js')
 require('../vue/tasks/nomenclature/new_combination/main.js')
 require('../vue/tasks/browse_annotations/main.js')

diff --git a/app/javascript/vue/components/autocomplete.vue b/app/javascript/vue/components/autocomplete.vue
@@ -28,6 +28,7 @@ Parameters:
     <input
       :id="inputId"
       ref="autofocus"
+      :style="inputStyle"
       class="vue-autocomplete-input normal-input"
       type="text"
       :placeholder="placeholder"
@@ -201,6 +202,11 @@ export default {
     eventSend: {
       type: String,
       default: 'itemSelect'
+    },
+
+    inputStyle: {
+      type: Object,
+      default: () => {}
     }
   },