From 14fdc8c76cab5af829182d835995f85e0bc95f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Tue, 14 Jul 2020 18:44:27 -0300
Subject: [PATCH 01/76] changed autosave behavior in etymology section

---
 app/javascript/vue/components/markdown-editor.vue          | 3 +++
 .../nomenclature/new_taxon_name/components/etymology.vue   | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/javascript/vue/components/markdown-editor.vue b/app/javascript/vue/components/markdown-editor.vue
index df0ce8174e..1c071625ac 100644
--- a/app/javascript/vue/components/markdown-editor.vue
+++ b/app/javascript/vue/components/markdown-editor.vue
@@ -53,6 +53,9 @@ export default {
       this.simplemde.codemirror.on('change', () => {
         this.$emit('input', this.simplemde.value())
       })
+      this.simplemde.codemirror.on('blur', () => {
+        this.$emit('blur', this.simplemde.value())
+      })
       this.simplemde.codemirror.on('mousedown', (cm, ev) => {
         let that = this
 
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/etymology.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/etymology.vue
index ff7e09f74b..0d8238058a 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/etymology.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/etymology.vue
@@ -7,6 +7,7 @@
       slot="body"
       v-show="expanded">
       <markdown-editor
+        @blur="updateLastChange"
         class="edit-content"
         v-model="etymology"
         :configs="config"
@@ -33,7 +34,6 @@ export default {
       },
       set (text) {
         this.$store.commit(MutationNames.SetEtymology, text)
-        this.$store.commit(MutationNames.UpdateLastChange)
       }
     }
   },
@@ -46,6 +46,11 @@ export default {
         spellChecker: false
       }
     }
+  },
+  methods: {
+    updateLastChange () {
+      this.$store.commit(MutationNames.UpdateLastChange)
+    }
   }
 }
 </script>

From a6da0eadfdaab6ed3cd21b39df58fa473a285365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 12:23:16 -0300
Subject: [PATCH 02/76] Fix #1617

---
 .../components/depictions/depictionImage.vue  | 157 ++++++++++++------
 .../components/collectionObject.vue           |  32 ++--
 .../type_specimens/components/depictions.vue  |   2 +-
 .../components/typeMaterial.vue               |   2 +-
 4 files changed, 121 insertions(+), 72 deletions(-)

diff --git a/app/javascript/vue/components/depictions/depictionImage.vue b/app/javascript/vue/components/depictions/depictionImage.vue
index 3005029f9c..581e34e16b 100644
--- a/app/javascript/vue/components/depictions/depictionImage.vue
+++ b/app/javascript/vue/components/depictions/depictionImage.vue
@@ -2,47 +2,61 @@
   <div class="depiction-thumb-container">
     <modal
       v-if="viewMode"
-      @close="viewMode = false"
-      :container-style="{ width: ((fullSizeImage ? depiction.image.width : depiction.image.alternatives.medium.width) + 'px')}">
+      @close="viewMode = false">
       <h3 slot="header">View</h3>
-      <div slot="body">
-        <template>
-          <img
-            class="img-maxsize img-fullsize"
-            v-if="fullSizeImage"
-            @click="fullSizeImage = false"
-            :src="depiction.image.image_file_url"
-            :height="depiction.image.height"
-            :width="depiction.image.width">
-          <img
-            v-else
-            class="img-maxsize img-normalsize"
-            @click="fullSizeImage = true"
-            :src="depiction.image.alternatives.medium.image_file_url"
-            :height="depiction.image.alternatives.medium.height"
-            :width="depiction.image.alternatives.medium.width">
-        </template>
-        <div class="field separate-top">
-          <input
-            v-model="depiction.figure_label"
-            type="text"
-            placeholder="Label">
+      <div
+        slot="body"
+        class="horizontal-left-content align-start">
+        <div class="full_width">
+          <template>
+            <img
+              class="img-maxsize"
+              :src="depiction.image.image_file_url"
+              :height="depiction.image.height"
+              :width="depiction.image.width">
+          </template>
+          <div class="horizontal-left-content">
+            <radial-annotator :global-id="depiction.image.global_id"/>
+            Annotate image
+            <radial-navigation :global-id="depiction.image.global_id"/>
+            Navigate image
+          </div>
         </div>
-        <div class="field separate-bottom">
-          <textarea
-            v-model="depiction.caption"
-            rows="5"
-            placeholder="Caption"/>
-        </div>
-        <div class="flex-separate">
-          <button
-            type="button"
-            @click="updateDepiction"
-            class="normal-input button button-submit">Update</button>
-          <button
-            type="button"
-            @click="deleteDepiction"
-            class="normal-input button button-delete">Delete</button>
+        <div class="margin-medium-left full_width">
+          <h3>Image depicts a {{ depiction.depiction_object_type }}</h3>
+          <div class="field separate-top label-above">
+            <label>Figure label</label>
+            <input
+              v-model="depiction.figure_label"
+              type="text"
+              placeholder="Label">
+          </div>
+          <div class="field separate-bottom label-above">
+            <label>Caption</label>
+            <markdown-editor
+              v-model="depiction.caption"
+              :configs="config"
+              ref="etymologyText"/>
+          </div>
+          <div class="margin-small-bottom">
+            <label>
+              <input
+                v-model="depiction.is_metadata_depiction"
+                type="checkbox">
+              Is metadata
+            </label>
+          </div>
+          <div class="flex-separate">
+            <button
+              type="button"
+              @click="updateDepiction"
+              class="normal-input button button-submit">Save
+            </button>
+            <button
+              type="button"
+              @click="deleteDepiction"
+              class="normal-input button button-delete">Delete</button>
+          </div>
         </div>
       </div>
     </modal>
@@ -52,16 +66,38 @@
       :src="depiction.image.alternatives.thumb.image_file_url"
       :height="depiction.image.alternatives.thumb.height"
       :width="depiction.image.alternatives.thumb.width">
+    <div class="horizontal-left-content">
+      <span
+        class="circle-button btn-edit button-default"
+        @click="viewMode = true"/>
+      <span
+        class="circle-button btn-delete"
+        @click="deleteDepiction"/>
+    </div>
   </div>
 </template>
 <script>
 
 import Modal from 'components/modal.vue'
 import { UpdateDepiction } from './request/resources'
+import RadialAnnotator from 'components/radials/annotator/annotator'
+import RadialNavigation from 'components/radials/navigation/radial'
+import SwitchComponent from 'components/switch'
+import MarkdownEditor from 'components/markdown-editor.vue'
+
+const Tabs = {
+  MARKDOWN: 'markdown',
+  CAPTION: 'caption'
+
+}
 
 export default {
   components: {
-    Modal
+    Modal,
+    RadialAnnotator,
+    RadialNavigation,
+    SwitchComponent,
+    MarkdownEditor
   },
   props: {
     depiction: {
@@ -72,18 +108,24 @@ export default {
   data: function () {
     return {
       fullSizeImage: false,
-      viewMode: false
+      viewMode: false,
+      tabSelected: undefined,
+      tabs: Object.values(Tabs),
+      config: {
+        status: false,
+        toolbar: ['bold', 'italic', 'code', 'heading', '|', 'quote', 'unordered-list', 'ordered-list', '|', 'link', 'table', 'preview'],
+        spellChecker: false
+      }
     }
   },
   methods: {
     updateDepiction () {
-      let depiction = {
-        depiction: {
-          caption: this.depiction.caption,
-          figure_label: this.depiction.figure_label
-        }
+      const depiction = {
+        caption: this.depiction.caption,
+        figure_label: this.depiction.figure_label,
+        is_metadata_depiction: this.depiction.is_metadata_depiction
       }
-      UpdateDepiction(this.depiction.id, depiction).then(response => {
+      UpdateDepiction(this.depiction.id, { depiction: depiction }).then(response => {
         TW.workbench.alert.create('Depiction was successfully updated.', 'notice')
       })
     },
@@ -94,15 +136,11 @@ export default {
 }
 </script>
 <style lang="scss">
-  .depiction-thumb-container {
-    .modal-container {
-     max-width: 100vh;
-   }
-   margin: 4px;
-   .img-thumb {
+.depiction-thumb-container {
+  .img-thumb {
      cursor: pointer;
-   }
-   .img-maxsize {
+  }
+  .img-maxsize {
     transition: all 0.5s ease;
     max-width: 100%;
     max-height: 60vh;
@@ -118,5 +156,14 @@ export default {
      width: 100%
    }
   }
+  .modal-container {
+    width: auto;
+    min-width: 200px;
+    max-width: 100vh;
   }
+  .CodeMirror {
+    min-height: 100px;
+    height: 100px;
+  }
+}
 </style>
diff --git a/app/javascript/vue/tasks/type_specimens/components/collectionObject.vue b/app/javascript/vue/tasks/type_specimens/components/collectionObject.vue
index c0bf27a3ea..86b58a2673 100644
--- a/app/javascript/vue/tasks/type_specimens/components/collectionObject.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/collectionObject.vue
@@ -18,21 +18,23 @@
         rows="5"
         v-model="bufferedLabels"/>
     </div>
-    <div class="field">
-      <label>Total</label>
-      <input
-        type="number"
-        v-model="total">
-    </div>
-    <div class="field">
-      <label>Preparation type</label>
-      <select
-        v-model="preparationId"
-        class="normal-input">
-        <option
-          v-for="item in types"
-          :value="item.id">{{ item.name }}</option>
-      </select>
+    <div class="horizontal-left-content">
+      <div class="field label-above">
+        <label>Total</label>
+        <input
+          type="number"
+          v-model="total">
+      </div>
+      <div class="field label-above margin-small-left">
+        <label>Preparation type</label>
+        <select
+          v-model="preparationId"
+          class="normal-input">
+          <option
+            v-for="item in types"
+            :value="item.id">{{ item.name }}</option>
+        </select>
+      </div>
     </div>
     <div class="field">
       <label>Repository</label>
diff --git a/app/javascript/vue/tasks/type_specimens/components/depictions.vue b/app/javascript/vue/tasks/type_specimens/components/depictions.vue
index cc298a3872..5b08cb2448 100644
--- a/app/javascript/vue/tasks/type_specimens/components/depictions.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/depictions.vue
@@ -35,7 +35,7 @@ import { GetDepictions, DestroyDepiction } from '../request/resources'
 
 import dropzone from 'components/dropzone.vue'
 import spinner from 'components/spinner.vue'
-import depictionImage from './depictionImage.vue'
+import depictionImage from 'components/depictions/depictionImage.vue'
 
 export default {
   components: {
diff --git a/app/javascript/vue/tasks/type_specimens/components/typeMaterial.vue b/app/javascript/vue/tasks/type_specimens/components/typeMaterial.vue
index 12853808b5..b1a2217aa5 100644
--- a/app/javascript/vue/tasks/type_specimens/components/typeMaterial.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/typeMaterial.vue
@@ -70,7 +70,7 @@
               </div>
             </template>
           </div>
-          <div>
+          <div class="margin-small-left">
             <div
               class="field"
               v-if="protonymId"

From 1e76e3ae260e66564343d5073b0a994803902e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 12:26:02 -0300
Subject: [PATCH 03/76] Remove old component

---
 CHANGELOG.md                                  |   5 +
 .../components/depictionImage.vue             | 135 ------------------
 2 files changed, 5 insertions(+), 135 deletions(-)
 delete mode 100644 app/javascript/vue/tasks/type_specimens/components/depictionImage.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32d202e719..2565b4ce45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,11 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 ## [unreleased]
 
 \-
+### Changed
+
+- Improve/unify image modal [#1617]
+
+[#1617]: https://github.com/SpeciesFileGroup/taxonworks/issues/1617
 
 ## [0.12.11] - 2020-07-14
 
diff --git a/app/javascript/vue/tasks/type_specimens/components/depictionImage.vue b/app/javascript/vue/tasks/type_specimens/components/depictionImage.vue
deleted file mode 100644
index 86a5c56e87..0000000000
--- a/app/javascript/vue/tasks/type_specimens/components/depictionImage.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <div class="depiction-thumb-container">
-    <modal
-      v-if="viewMode"
-      @close="viewMode = false"
-      :container-style="{ width: ((fullSizeImage ? depiction.image.width : depiction.image.alternatives.medium.width) + 'px')}">
-      <h3 slot="header">View</h3>
-      <div slot="body">
-        <template>
-          <img
-            class="img-maxsize img-fullsize"
-            v-if="fullSizeImage"
-            @click="fullSizeImage = false"
-            :src="depiction.image.image_file_url"
-            :height="depiction.image.height"
-            :width="depiction.image.width">
-          <img
-            v-else
-            class="img-maxsize img-normalsize"
-            @click="fullSizeImage = true"
-            :src="depiction.image.alternatives.medium.image_file_url"
-            :height="depiction.image.alternatives.medium.height"
-            :width="depiction.image.alternatives.medium.width">
-        </template>
-        <div class="field separate-top">
-          <input
-            v-model="depiction.figure_label"
-            type="text"
-            placeholder="Label">
-        </div>
-        <div class="field separate-bottom">
-          <textarea
-            v-model="depiction.caption"
-            rows="5"
-            placeholder="Caption"/>
-        </div>
-        <div class="flex-separate">
-          <button
-            type="button"
-            @click="updateDepiction"
-            class="normal-input button button-submit">Update</button>
-          <button
-            type="button"
-            @click="deleteDepiction"
-            class="normal-input button button-delete">Delete</button>
-        </div>
-      </div>
-    </modal>
-    <img
-      class="img-thumb"
-      @click="viewMode = true"
-      :src="depiction.image.alternatives.thumb.image_file_url"
-      :height="depiction.image.alternatives.thumb.height"
-      :width="depiction.image.alternatives.thumb.width">
-    <div class="horizontal-left-content">
-      <radial-annotator
-        type="annotations"
-        :global-id="depiction.image.global_id"/>
-      <radial-annotator
-        type="annotations"
-        :global-id="depiction.global_id"/>
-      <span
-        class="circle-button btn-delete"
-        @click="deleteDepiction"/>
-    </div>
-  </div>
-</template>
-<script>
-
-import Modal from 'components/modal.vue'
-import { UpdateDepiction } from '../request/resources'
-import RadialAnnotator from 'components/radials/annotator/annotator'
-
-export default {
-  components: {
-    Modal,
-    RadialAnnotator
-  },
-  props: {
-    depiction: {
-      type: Object,
-      required: true
-    }
-  },
-  data: function () {
-    return {
-      fullSizeImage: false,
-      viewMode: false
-    }
-  },
-  methods: {
-    updateDepiction () {
-      let depiction = {
-        depiction: {
-          caption: this.depiction.caption,
-          figure_label: this.depiction.figure_label
-        }
-      }
-      UpdateDepiction(this.depiction.id, depiction).then(response => {
-        TW.workbench.alert.create('Depiction was successfully updated.', 'notice')
-      })
-    },
-    deleteDepiction () {
-      this.$emit('delete', this.depiction)
-    }
-  }
-}
-</script>
-<style lang="scss">
-  .depiction-thumb-container {
-    .modal-container {
-     max-width: 100vh;
-   }
-   margin: 4px;
-   .img-thumb {
-     cursor: pointer;
-   }
-   .img-maxsize {
-    transition: all 0.5s ease;
-    max-width: 100%;
-    max-height: 60vh;
-  }
-  .img-fullsize {
-    cursor: zoom-out
-  }
-  .img-normalsize {
-    cursor: zoom-in
-  }
-  .field {
-    input, textarea {
-     width: 100%
-   }
-  }
-  }
-</style>

From c16c62f28eec70d10fbdf1f93ba28c8c2104ccaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 13:25:17 -0300
Subject: [PATCH 04/76] flip object to subject label

---
 CHANGELOG.md                                                | 5 +++++
 .../tasks/nomenclature/new_taxon_name/components/type.vue   | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2565b4ce45..8e6490ea50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,11 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 - Improve/unify image modal [#1617]
 
+
+### Fixed
+
+- Flip object to subject on type label in new taxon name
+
 [#1617]: https://github.com/SpeciesFileGroup/taxonworks/issues/1617
 
 ## [0.12.11] - 2020-07-14
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/type.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/type.vue
index 79e7db2dfd..80a5badb6d 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/type.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/type.vue
@@ -64,7 +64,7 @@
           mutation-name-add="AddTaxonType"
           mutation-name-modal="SetModalType"
           name-module="Types"
-          display-name="object_status_tag"/>
+          display-name="subject_status_tag"/>
         <div class="switch-radio">
           <input
             name="type-picker-options"
@@ -95,7 +95,7 @@
             :object-lists="objectLists.common"
             :filter="true"
             @addEntry="addEntry"
-            display="object_status_tag"
+            display="subject_status_tag"
             :list-created="GetRelationshipsCreated"/>
         </div>
       </div>
@@ -106,7 +106,7 @@
         :list="GetRelationshipsCreated"
         @delete="removeType"
         @edit="setEdit"
-        :display="['object_status_tag', { link: '/tasks/nomenclature/browse?taxon_name_id=', label: 'subject_object_tag', param: 'subject_taxon_name_id'}]"/>
+        :display="['subject_status_tag', { link: '/tasks/nomenclature/browse?taxon_name_id=', label: 'subject_object_tag', param: 'subject_taxon_name_id'}]"/>
     </div>
   </block-layout>
 </template>

From 4ff5de19ce73f5489308de7e7ee26528d6c49b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 13:28:44 -0300
Subject: [PATCH 05/76] Fix #1618

---
 CHANGELOG.md                                  |  6 ++++-
 .../components/originalCombination.vue        | 10 +++++----
 .../components/pickOriginalCombination.vue    | 22 ++++++++++---------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e6490ea50..3952c3d771 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,10 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ## [unreleased]
 
-\-
+### Added 
+
+- Delete confirmation for original combinations [#1618]
+
 ### Changed
 
 - Improve/unify image modal [#1617]
@@ -18,6 +21,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - Flip object to subject on type label in new taxon name
 
 [#1617]: https://github.com/SpeciesFileGroup/taxonworks/issues/1617
+[#1618]: https://github.com/SpeciesFileGroup/taxonworks/issues/1618
 
 ## [0.12.11] - 2020-07-14
 
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/originalCombination.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/originalCombination.vue
index 5bbbd99b51..31a77e3cea 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/originalCombination.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/originalCombination.vue
@@ -229,11 +229,13 @@ export default {
     },
 
     removeCombination: function (value) {
-      let that = this
+      if(window.confirm('Are you sure you want to remove this combination?')) {
+        let that = this
 
-      this.$store.dispatch(ActionNames.RemoveOriginalCombination, value).then(response => {
-        that.$emit('delete', response)
-      })
+        this.$store.dispatch(ActionNames.RemoveOriginalCombination, value).then(response => {
+          that.$emit('delete', response)
+        })
+      }
     },
     onMove: function (evt) {
       this.newPosition = evt.draggedContext.futureIndex
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue
index a8db9f7c4d..e20b66d263 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue
@@ -172,17 +172,19 @@ export default {
       }]
     },
     removeAllCombinations: function () {
-      let that = this
-      let combinations = this.$store.getters[GetterNames.GetOriginalCombination]
-      let allDelete = []
-      for (var key in combinations) {
-        allDelete.push(this.$store.dispatch(ActionNames.RemoveOriginalCombination, combinations[key]).then(response => {
-          return true
-        }))
+      if(window.confirm('Are you sure you want to remove all combinations?')) {
+        let that = this
+        let combinations = this.$store.getters[GetterNames.GetOriginalCombination]
+        let allDelete = []
+        for (var key in combinations) {
+          allDelete.push(this.$store.dispatch(ActionNames.RemoveOriginalCombination, combinations[key]).then(response => {
+            return true
+          }))
+        }
+        Promise.all(allDelete).then(function () {
+          that.saveTaxonName()
+        })
       }
-      Promise.all(allDelete).then(function () {
-        that.saveTaxonName()
-      })
     },
     addOriginalCombination: function () {
       var that = this

From eccf25972e7408f226e4e39ada837ee917be61b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 14:06:23 -0300
Subject: [PATCH 06/76] Added klass to source smart selector

---
 .../annotator/components/citations/citation_annotator.vue    | 1 +
 .../radials/annotator/components/citations/new.vue           | 5 +++++
 app/javascript/vue/components/smartSelector.vue              | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/javascript/vue/components/radials/annotator/components/citations/citation_annotator.vue b/app/javascript/vue/components/radials/annotator/components/citations/citation_annotator.vue
index 4183e11e94..08737dcc4f 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/citation_annotator.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/citation_annotator.vue
@@ -3,6 +3,7 @@
     <div v-if="!citation.hasOwnProperty('id')">
       <citation-new
         :global-id="globalId"
+        :object-type="objectType"
         @create="createNew"/>
       <table-list
         :list="list"
diff --git a/app/javascript/vue/components/radials/annotator/components/citations/new.vue b/app/javascript/vue/components/radials/annotator/components/citations/new.vue
index 75b4943ea0..af863abbd9 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/new.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/new.vue
@@ -6,6 +6,7 @@
         model="sources"
         ref="smartSelector"
         pin-section="Sources"
+        :klass="objectType"
         pin-type="Source"
         @selected="citation.source_id = $event.id"
         v-model="source">
@@ -61,6 +62,10 @@
       globalId: {
         type: String,
         required: true
+      },
+      objectType: {
+        type: String,
+        required: true
       }
     },
     computed: {
diff --git a/app/javascript/vue/components/smartSelector.vue b/app/javascript/vue/components/smartSelector.vue
index 2d56390df0..470f83570a 100644
--- a/app/javascript/vue/components/smartSelector.vue
+++ b/app/javascript/vue/components/smartSelector.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="separate-bottom horizontal-left-content">
       <switch-components
-        class="full_width"
+        class="full_width capitalize"
         v-model="view"
         :options="options"/>
       <default-pin

From eff845ded605296d6b7050f511613a41ac7ef59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 14:55:58 -0300
Subject: [PATCH 07/76] Added smart selector for source and repository in new
 type material

---
 .../vue/tasks/type_specimens/app.vue          |  8 --
 .../components/collectionObject.vue           | 67 +++++++------
 .../components/metadataSection.vue            | 96 ++++++++++---------
 .../components/typeMaterial.vue               |  2 +-
 4 files changed, 94 insertions(+), 79 deletions(-)

diff --git a/app/javascript/vue/tasks/type_specimens/app.vue b/app/javascript/vue/tasks/type_specimens/app.vue
index 351d92cfb8..787f911a4c 100644
--- a/app/javascript/vue/tasks/type_specimens/app.vue
+++ b/app/javascript/vue/tasks/type_specimens/app.vue
@@ -163,14 +163,6 @@ export default {
        visibility:hidden;
     }
 
-    .types_field {
-      input[type="text"], textarea {
-        width: 300px;
-      }
-      .vue-autocomplete-input {
-          width: 300px;
-      }
-    }
     hr {
         height: 1px;
         color: #f5f5f5;
diff --git a/app/javascript/vue/tasks/type_specimens/components/collectionObject.vue b/app/javascript/vue/tasks/type_specimens/components/collectionObject.vue
index 86b58a2673..cf885c0d95 100644
--- a/app/javascript/vue/tasks/type_specimens/components/collectionObject.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/collectionObject.vue
@@ -1,20 +1,23 @@
 <template>
   <div>
-    <div class="field types_field">
+    <div class="field label-above">
       <label>Buffered collecting event</label>
       <textarea
+        class="full_width"
         rows="5"
         v-model="bufferedEvent"/>
     </div>
-    <div class="field types_field">
+    <div class="field label-above">
       <label>Buffered determinations</label>
       <textarea
+        class="full_width"
         rows="5"
         v-model="bufferedDeterminations"/>
     </div>
-    <div class="field types_field">
+    <div class="field label-above">
       <label>Buffered other labels</label>
       <textarea
+        class="full_width"
         rows="5"
         v-model="bufferedLabels"/>
     </div>
@@ -37,24 +40,26 @@
       </div>
     </div>
     <div class="field">
-      <label>Repository</label>
-      <div class="horizontal-left-content">
-        <autocomplete
-          class="types_field margin-small-right"
-          url="/repositories/autocomplete"
-          param="term"
-          label="label_html"
-          :send-label="labelRepository"
-          placeholder="Select a repository"
-          @getItem="repositoryId = $event.id; labelRepository = $event.label"
-          display="label"
-          min="2"/>
-        <default-pin
-          class="button-circle margin-small-left"
-          type="Repository"
-          @getItem="repositoryId = $event.id; labelRepository = $event.label"
-          section="Repositories"/>
-      </div>
+      <fieldset>
+        <legend>Repository</legend>
+        <smart-selector
+          class="full_width"
+          ref="smartSelector"
+          model="repositories"
+          target="CollectionObject"
+          klass="CollectionObject"
+          pin-section="Repositories"
+          pin-type="Repository"
+          @selected="setRepository"/>
+        <p
+          v-if="labelRepository"
+          class="horizontal-left-content">
+          <span v-html="labelRepository"/>
+          <span
+            class="button circle-button btn-delete button-default"
+            @click="unsetRepository"/>
+        </p>
+      </fieldset>
     </div>
     <div class="field">
       <label>Collection event</label>
@@ -77,18 +82,18 @@
 
 <script>
 
-import autocomplete from 'components/autocomplete.vue'
-import DefaultPin from 'components/getDefaultPin.vue'
-import toggleSwitch from './toggleSwitch.vue'
+import Autocomplete from 'components/autocomplete.vue'
+import SmartSelector from 'components/smartSelector'
+import ToggleSwitch from './toggleSwitch.vue'
 import { GetterNames } from '../store/getters/getters'
 import { MutationNames } from '../store/mutations/mutations'
 import { GetCollectionEvent, GetRepository, GetPreparationTypes } from '../request/resources'
 
 export default {
   components: {
-    autocomplete,
-    toggleSwitch,
-    DefaultPin
+    Autocomplete,
+    ToggleSwitch,
+    SmartSelector
   },
   computed: {
     typeMaterial () {
@@ -206,6 +211,14 @@ export default {
           this.labelRepository = response.body.name
         })
       }
+    },
+    setRepository (repository) {
+      this.labelRepository = repository.name
+      this.repositoryId = repository.id
+    },
+    unsetRepository () {
+      this.labelRepository = null
+      this.repositoryId = null
     }
   }
 }
diff --git a/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue b/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue
index 00392e5ce0..f10d71248f 100644
--- a/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue
@@ -15,7 +15,9 @@
       <div class="flex-wrap-row separate-top separate-bottom">
         <template v-if="checkForTypeList">
           <ul class="flex-wrap-column no_bullets">
-            <li v-for="(item, key) in types[taxon.nomenclatural_code]">
+            <li
+              v-for="(item, key) in types[taxon.nomenclatural_code]"
+              :key="key">
               <label class="capitalize">
                 <input
                   v-model="type"
@@ -29,46 +31,52 @@
         </template>
       </div>
       <div class="field">
-        <label>Source</label>
+        <fieldset v-if="!citationCreated">
+          <legend>Source</legend>
+          <smart-selector
+            ref="sourceSmartSelector"
+            model="sources"
+            pin-section="Sources"
+            pin-type="Source"
+            @selected="selectSource"
+          >
+            <div slot="body">
+              <p
+                v-if="showSource && citation.source_id"
+                class="horizontal-left-content">
+                <span v-html="showSource"/>
+                <span
+                  class="circle-button button-default btn-undo"
+                  @click="resetCitation"/>
+              </p>
+            </div>
+            <div slot="footer">
+              <ul class="no_bullets context-menu">
+                <li>
+                  <input
+                    type="text"
+                    v-model="citation.pages"
+                    placeholder="Pages">
+                </li>
+                <li>
+                  <label>
+                    <input
+                      type="checkbox"
+                      v-model="citation.is_original">
+                    Is original
+                  </label>
+                </li>
+              </ul>
+            </div>
+          </smart-selector>
+        </fieldset>
         <div
-          v-if="!citationCreated"
+          v-else
           class="horizontal-left-content">
-          <autocomplete
-            class="separate-right"
-            url="/sources/autocomplete"
-            label="label_html"
-            param="term"
-            :clear-after="true"
-            min="2"
-            placeholder="Select a source"
-            @getItem="citation.source_id = $event.id; showSource = $event.label_html"/>
-          <default-pinned
-            section="Sources"
-            type="Source"
-            @getLabel="showSource = $event"
-            @getId="citation.source_id = $event"/>
-          <input
-            class="separate-left"
-            type="text"
-            v-model="citation.pages"
-            placeholder="Pages">
-        </div>
-        <div
-          class="horizontal-left-content">
-          <template v-if="citationCreated">
-            <span v-html="typeMaterial.origin_citation.object_tag"/>
-            <span
-              class="circle-button btn-delete"
-              @click="removeCitation"/>
-          </template>
-          <template v-else>
-            <template v-if="showSource && citation.source_id">
-              <span v-html="showSource"/>
-              <span
-                class="circle-button button-default btn-undo"
-                @click="resetCitation"/>
-            </template>
-          </template>
+          <span v-html="typeMaterial.origin_citation.object_tag"/>
+          <span
+            class="circle-button btn-delete"
+            @click="removeCitation"/>
         </div>
       </div>
     </div>
@@ -78,9 +86,8 @@
 <script>
 
 import Expand from './expand.vue'
-import Autocomplete from 'components/autocomplete.vue'
+import SmartSelector from 'components/smartSelector'
 import Spinner from 'components/spinner.vue'
-import DefaultPinned from 'components/getDefaultPin'
 
 import { GetterNames } from '../store/getters/getters'
 import { MutationNames } from '../store/mutations/mutations'
@@ -88,10 +95,9 @@ import { GetTypes, GetSource, DestroyCitation } from '../request/resources'
 
 export default {
   components: {
-    Autocomplete,
     Spinner,
     Expand,
-    DefaultPinned
+    SmartSelector
   },
   computed: {
     citation: {
@@ -167,6 +173,10 @@ export default {
       DestroyCitation(this.typeMaterial.origin_citation.id).then(response => {
         this.typeMaterial.origin_citation = undefined
       })
+    },
+    selectSource (source) {
+      this.citation.source_id = source.id
+      this.showSource = source.object_tag
     }
   }
 }
diff --git a/app/javascript/vue/tasks/type_specimens/components/typeMaterial.vue b/app/javascript/vue/tasks/type_specimens/components/typeMaterial.vue
index b1a2217aa5..5d88d1d48a 100644
--- a/app/javascript/vue/tasks/type_specimens/components/typeMaterial.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/typeMaterial.vue
@@ -70,7 +70,7 @@
               </div>
             </template>
           </div>
-          <div class="margin-small-left">
+          <div class="margin-medium-left">
             <div
               class="field"
               v-if="protonymId"

From 2750a6268f587f2e4189d8c748dcc9be248d8240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 14:59:59 -0300
Subject: [PATCH 08/76] Added klass for smart selector

---
 CHANGELOG.md                                               | 1 +
 .../tasks/type_specimens/components/metadataSection.vue    | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3952c3d771..bd9e1f00db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 ### Changed
 
 - Improve/unify image modal [#1617]
+- Replace repository and source autocompletes for smart selectors in new type material
 
 
 ### Fixed
diff --git a/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue b/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue
index f10d71248f..c3fb7cd805 100644
--- a/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue
@@ -34,8 +34,8 @@
         <fieldset v-if="!citationCreated">
           <legend>Source</legend>
           <smart-selector
-            ref="sourceSmartSelector"
             model="sources"
+            klass="CollectionObject"
             pin-section="Sources"
             pin-type="Source"
             @selected="selectSource"
@@ -181,8 +181,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-/deep/ .vue-autocomplete-input {
-  width: 400px;
-}
-</style>
\ No newline at end of file

From 216c14e8bf5f40dde044592f70f2181dcdade491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 15:17:04 -0300
Subject: [PATCH 09/76] layout tweak

---
 .../components/catalogNumber.vue              | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/javascript/vue/tasks/type_specimens/components/catalogNumber.vue b/app/javascript/vue/tasks/type_specimens/components/catalogNumber.vue
index 4b55fb71b2..9be9a4aa75 100644
--- a/app/javascript/vue/tasks/type_specimens/components/catalogNumber.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/catalogNumber.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <h3>Identifier</h3>
+    <h3>Catalog number</h3>
     <div
       class="flex-wrap-column middle align-start">
       <fieldset>
@@ -20,30 +20,30 @@
             @click="removeNamespace"
             class="button circle-button btn-undo button-default"/>
         </div>
-      </fieldset>
-      <div class="separate-top">
-        <label>Identifier</label>
-        <div class="horizontal-left-content field">
-          <input
-            id="identifier-field"
-            :class="{ 'validate-identifier': existingIdentifier }"
-            type="text"
-            @input="checkIdentifier"
-            v-model="identifier.identifier">
+        <div class="separate-top">
+          <label>Identifier</label>
+          <div class="horizontal-left-content field">
+            <input
+              id="identifier-field"
+              :class="{ 'validate-identifier': existingIdentifier }"
+              type="text"
+              @input="checkIdentifier"
+              v-model="identifier.identifier">
+            <span
+              class="margin-small-left">Namespace and identifier needs to be set to be save.</span>
+          </div>
           <span
-            class="margin-small-left">Namespace and identifier needs to be set to be save.</span>
+            v-if="!namespace && identifier && identifier.length"
+            style="color: red">Namespace is needed.</span>
+          <template v-if="existingIdentifier">
+            <span
+              style="color: red">Identifier already exists, and it won't be saved:</span>
+            <a
+              :href="existingIdentifier.identifier_object.object_url"
+              v-html="existingIdentifier.identifier_object.object_tag"/>
+          </template>
         </div>
-        <span
-          v-if="!namespace && identifier && identifier.length"
-          style="color: red">Namespace is needed.</span>
-        <template v-if="existingIdentifier">
-          <span
-            style="color: red">Identifier already exists, and it won't be saved:</span>
-          <a
-            :href="existingIdentifier.identifier_object.object_url"
-            v-html="existingIdentifier.identifier_object.object_tag"/>
-        </template>
-      </div>
+      </fieldset>
     </div>
   </div>
 </template>

From 1ee59ab24aa921118331e64ee754e3254325bb06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 15:43:04 -0300
Subject: [PATCH 10/76] Added warning message

---
 CHANGELOG.md                                  |  5 +-
 .../components/catalogNumber.vue              | 79 +++++++++----------
 .../type_specimens/components/typeBox.vue     |  4 +-
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd9e1f00db..95cf0ac1b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,16 +10,17 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 ### Added 
 
 - Delete confirmation for original combinations [#1618]
+- Delete confirmation for type specimens in new type specimen task
 
 ### Changed
 
 - Improve/unify image modal [#1617]
-- Replace repository and source autocompletes for smart selectors in new type material
+- Replace repository and source autocompletes for smart selectors in new type material task
 
 
 ### Fixed
 
-- Flip object to subject on type label in new taxon name
+- Flip object to subject on type label in new taxon name task
 
 [#1617]: https://github.com/SpeciesFileGroup/taxonworks/issues/1617
 [#1618]: https://github.com/SpeciesFileGroup/taxonworks/issues/1618
diff --git a/app/javascript/vue/tasks/type_specimens/components/catalogNumber.vue b/app/javascript/vue/tasks/type_specimens/components/catalogNumber.vue
index 9be9a4aa75..36d5634e8d 100644
--- a/app/javascript/vue/tasks/type_specimens/components/catalogNumber.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/catalogNumber.vue
@@ -1,50 +1,47 @@
 <template>
   <div>
     <h3>Catalog number</h3>
-    <div
-      class="flex-wrap-column middle align-start">
-      <fieldset>
-        <legend>Namespace</legend>
-        <smart-selector
-          class="margin-medium-top"
-          model="namespaces"
-          klass="Source"
-          pin-section="Namespaces"
-          pin-type="Namespace"
-          @selected="setNamespace"/>
-        <div
-          v-if="namespace"
-          class="horizontal-left-content">
-          <span>{{ namespace.short_name }}: {{ namespace.name }}</span>
+    <fieldset>
+      <legend>Namespace</legend>
+      <smart-selector
+        class="margin-medium-top"
+        model="namespaces"
+        klass="Source"
+        pin-section="Namespaces"
+        pin-type="Namespace"
+        @selected="setNamespace"/>
+      <div
+        v-if="namespace"
+        class="horizontal-left-content">
+        <span>{{ namespace.short_name }}: {{ namespace.name }}</span>
+        <span
+          @click="removeNamespace"
+          class="button circle-button btn-undo button-default"/>
+      </div>
+      <div class="separate-top">
+        <label>Identifier</label>
+        <div class="horizontal-left-content field">
+          <input
+            id="identifier-field"
+            :class="{ 'validate-identifier': existingIdentifier }"
+            type="text"
+            @input="checkIdentifier"
+            v-model="identifier.identifier">
           <span
-            @click="removeNamespace"
-            class="button circle-button btn-undo button-default"/>
+            class="margin-small-left">Namespace and identifier needs to be set to be save.</span>
         </div>
-        <div class="separate-top">
-          <label>Identifier</label>
-          <div class="horizontal-left-content field">
-            <input
-              id="identifier-field"
-              :class="{ 'validate-identifier': existingIdentifier }"
-              type="text"
-              @input="checkIdentifier"
-              v-model="identifier.identifier">
-            <span
-              class="margin-small-left">Namespace and identifier needs to be set to be save.</span>
-          </div>
+        <span
+          v-if="!namespace && identifier && identifier.length"
+          style="color: red">Namespace is needed.</span>
+        <template v-if="existingIdentifier">
           <span
-            v-if="!namespace && identifier && identifier.length"
-            style="color: red">Namespace is needed.</span>
-          <template v-if="existingIdentifier">
-            <span
-              style="color: red">Identifier already exists, and it won't be saved:</span>
-            <a
-              :href="existingIdentifier.identifier_object.object_url"
-              v-html="existingIdentifier.identifier_object.object_tag"/>
-          </template>
-        </div>
-      </fieldset>
-    </div>
+            style="color: red">Identifier already exists, and it won't be saved:</span>
+          <a
+            :href="existingIdentifier.identifier_object.object_url"
+            v-html="existingIdentifier.identifier_object.object_tag"/>
+        </template>
+      </div>
+    </fieldset>
   </div>
 </template>
 
diff --git a/app/javascript/vue/tasks/type_specimens/components/typeBox.vue b/app/javascript/vue/tasks/type_specimens/components/typeBox.vue
index a6f310e5c6..87d14abea1 100644
--- a/app/javascript/vue/tasks/type_specimens/components/typeBox.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/typeBox.vue
@@ -115,7 +115,9 @@ export default {
       window.location.href = '/tasks/type_material/edit_type_material'
     },
     removeTypeSpecimen (item) {
-      this.$store.dispatch(ActionNames.RemoveTypeSpecimen, item.id)
+      if (window.confirm('Are you sure you want to destroy this record?')) {
+        this.$store.dispatch(ActionNames.RemoveTypeSpecimen, item.id)
+      }
     },
     setTypeMaterial (material) {
       this.$store.dispatch(ActionNames.LoadTypeMaterial, material)

From ba240c81074b92bd83ab4cc076539e125624fe4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 15:55:11 -0300
Subject: [PATCH 11/76] Changed autosave behaviour in new asserted distribution
 task

---
 CHANGELOG.md                                   |  1 +
 .../new_asserted_distribution/app.vue          | 18 +++++++-----------
 .../components/geographicArea.vue              |  5 +++++
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95cf0ac1b5..8448bbae3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 - 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
 
 
 ### Fixed
diff --git a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/app.vue b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/app.vue
index e75bcd5715..cfa707142c 100644
--- a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/app.vue
+++ b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/app.vue
@@ -71,6 +71,7 @@
         <geographic-area
           class="separate-right"
           ref="geoComponent"
+          @selected="triggerAutosave"
           v-model="asserted_distribution"/>
         <lock-component
           class="margin-medium-top"
@@ -99,7 +100,7 @@ import SpinnerComponent from 'components/spinner'
 import NavBarComponent from 'components/navBar'
 import GetMacKey from 'helpers/getMacKey'
 
-import { 
+import {
   CreateAssertedDistribution,
   RemoveAssertedDistribution,
   UpdateAssertedDistribution,
@@ -140,16 +141,6 @@ export default {
       }
     }
   },
-  watch: {
-    validate: {
-      handler (newVal) {
-        if (newVal && this.autosave) {
-          this.createAndNewAssertedDistribution()
-        }
-      },
-      deep: true
-    }
-  },
   mounted () {
     this.addShortcutsDescription()
     LoadRecentRecords().then(response => {
@@ -158,6 +149,11 @@ export default {
     })
   },
   methods: {
+    triggerAutosave () {
+      if (this.validate && this.autosave) {
+        this.createAndNewAssertedDistribution()
+      }
+    },
     addShortcutsDescription () {
       TW.workbench.keyboard.createLegend(`${this.getMacKey()}+s`, 'Save and create new asserted distribution', 'New asserted distribution')
     },
diff --git a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/geographicArea.vue b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/geographicArea.vue
index 05af9c321f..16f08fe1a1 100644
--- a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/geographicArea.vue
+++ b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/geographicArea.vue
@@ -9,6 +9,7 @@
       ref="smartSelector"
       label="name"
       pin-section="GeographicAreas"
+      @selected="onSelect"
       pin-type="GeographicArea">
       <template v-if="assertedDistribution.geographicArea">
         <p class="horizontal-left-content">
@@ -53,6 +54,10 @@ export default {
     },
     unset () {
       this.assertedDistribution.geographicArea = undefined
+    },
+    onSelect (geo) {
+      this.assertedDistribution.geographicArea = geo
+      this.$emit('selected')
     }
   }
 }

From 2bb55ffb6d3a5b0cd3bce797995770b733b30015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 16:18:19 -0300
Subject: [PATCH 12/76] Check if asserted distribution exist before create

---
 .../new_asserted_distribution/app.vue         | 30 +++++++++++++++----
 .../request/resources.js                      |  3 ++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/app.vue b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/app.vue
index cfa707142c..bbd887ea0b 100644
--- a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/app.vue
+++ b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/app.vue
@@ -105,7 +105,8 @@ import {
   RemoveAssertedDistribution,
   UpdateAssertedDistribution,
   LoadRecentRecords,
-  GetSource
+  GetSource,
+  GetAssertedDistribution
 } from './request/resources.js'
 
 export default {
@@ -216,11 +217,28 @@ export default {
           })
         } else {
           assertedDistribution.citations_attributes[0].id = undefined
-          CreateAssertedDistribution(assertedDistribution).then(response => {
-            this.list.unshift(response.body)
-            TW.workbench.alert.create('Asserted distribution was successfully created.', 'notice')
-            this.refreshSmarts()
-            resolve(response.body)
+          GetAssertedDistribution({ 
+            otu_id: assertedDistribution.otu_id,
+            geographic_area_id: assertedDistribution.geographic_area_id
+          }).then(response => {
+            if (response.body.length) {
+              assertedDistribution.id = response.body[0].id
+              UpdateAssertedDistribution(assertedDistribution).then(response => {
+                this.$set(this.list, this.list.findIndex(item => {
+                  return item.id === response.body.id
+                }), response.body)
+                TW.workbench.alert.create('Asserted distribution was successfully updated.', 'notice')
+                this.refreshSmarts()
+                resolve(response.body)
+              })
+            } else {
+              CreateAssertedDistribution(assertedDistribution).then(response => {
+                this.list.unshift(response.body)
+                TW.workbench.alert.create('Asserted distribution was successfully created.', 'notice')
+                this.refreshSmarts()
+                resolve(response.body)
+              })
+            }
           })
         }
       })
diff --git a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/request/resources.js b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/request/resources.js
index 75ef91e51d..232012cf15 100644
--- a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/request/resources.js
+++ b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/request/resources.js
@@ -4,6 +4,8 @@ const CreateAssertedDistribution = (data) => {
   return ajaxCall('post', '/asserted_distributions.json', { asserted_distribution: data })
 }
 
+const GetAssertedDistribution = (params) => ajaxCall('get', '/asserted_distributions.json', { params: params })
+
 const GetGeographicArea = (id) => {
   return ajaxCall('get', `/geographic_areas/${id}.json`)
 }
@@ -32,6 +34,7 @@ export {
   GetSource,
   GetOtu,
   GetGeographicArea,
+  GetAssertedDistribution,
   CreateAssertedDistribution,
   RemoveAssertedDistribution,
   UpdateAssertedDistribution,

From 4133acb66f22d32d597374896e51d0f91372f03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 16:51:25 -0300
Subject: [PATCH 13/76] Changed gender list order

---
 CHANGELOG.md                                           |  2 ++
 .../nomenclature/new_taxon_name/components/gender.vue  | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8448bbae3e..4a6f57c513 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,12 +11,14 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 - 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
 
 ### Changed
 
 - 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
 
 
 ### Fixed
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/gender.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/gender.vue
index 53a123312b..dc4797d83f 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/gender.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/gender.vue
@@ -82,7 +82,15 @@ export default {
         adjective: 'TaxonNameClassification::Latinized::PartOfSpeech::Adjective',
         participle: 'TaxonNameClassification::Latinized::PartOfSpeech::Participle'
       },
-      sortOrder: ['masculine', 'feminine', 'neuter']
+      sortOrder: [
+        'masculine',
+        'feminine',
+        'neuter',
+        'noun in apposition',
+        'noun in genitive case',
+        'adjective',
+        'participle'
+      ]
     }
   },
   mounted: function () {

From df803527facca709a71798167e7d8af6719cb23b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 17:24:46 -0300
Subject: [PATCH 14/76] Fix #1038

---
 CHANGELOG.md                                                 | 3 ++-
 .../new_taxon_name/components/pickOriginalCombination.vue    | 4 ++++
 .../new_taxon_name/store/actions/addOriginalCombination.js   | 3 ++-
 .../new_taxon_name/store/actions/addTaxonRelationship.js     | 1 +
 .../new_taxon_name/store/actions/addTaxonStatus.js           | 1 +
 .../new_taxon_name/store/actions/addTaxonType.js             | 1 +
 .../new_taxon_name/store/actions/loadSoftValidation.js       | 2 ++
 .../new_taxon_name/store/actions/loadTaxonRelationships.js   | 1 +
 .../store/actions/removeOriginalCombination.js               | 3 ++-
 .../new_taxon_name/store/actions/removeTaxonRelationship.js  | 1 +
 .../new_taxon_name/store/actions/removeTaxonStatus.js        | 1 +
 .../new_taxon_name/store/actions/updateTaxonRelationship.js  | 1 +
 .../new_taxon_name/store/actions/updateTaxonStatus.js        | 1 +
 .../new_taxon_name/store/actions/updateTaxonType.js          | 1 +
 .../vue/tasks/nomenclature/new_taxon_name/store/store.js     | 5 +++++
 15 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a6f57c513..9bbf584019 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 - 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
+- Check if already exist an asserted combination with the same otu and geographic area in new asserted distribution task [#1329]
 
 ### Changed
 
@@ -25,6 +25,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 - Flip object to subject on type label in new taxon name task
 
+[#1329]: https://github.com/SpeciesFileGroup/taxonworks/issues/1329
 [#1617]: https://github.com/SpeciesFileGroup/taxonworks/issues/1617
 [#1618]: https://github.com/SpeciesFileGroup/taxonworks/issues/1618
 
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue
index e20b66d263..3c049d4969 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/pickOriginalCombination.vue
@@ -1,6 +1,7 @@
 <template>
   <block-layout
     anchor="original-combination"
+    :warning="softValidation.length"
     v-help.section.originalCombination.container>
     <h3 slot="header">Original combination and classification</h3>
     <div
@@ -145,6 +146,9 @@ export default {
         }
         return exist
       }
+    },
+    softValidation () {
+      return this.$store.getters[GetterNames.GetSoftValidation].original_combination.list
     }
   },
   watch: {
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addOriginalCombination.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addOriginalCombination.js
index 528eb0f0c5..bdca316e18 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addOriginalCombination.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addOriginalCombination.js
@@ -1,7 +1,7 @@
 import { createTaxonRelationship } from '../../request/resources'
 import { MutationNames } from '../mutations/mutations'
 
-export default function ({ commit, state }, data) {
+export default function ({ commit, state, dispatch }, data) {
   let relationship = {
     taxon_name_relationship: {
       object_taxon_name_id: state.taxon_name.id,
@@ -12,6 +12,7 @@ export default function ({ commit, state }, data) {
   return new Promise((resolve, reject) => {
     createTaxonRelationship(relationship).then(response => {
       commit(MutationNames.AddOriginalCombination, response.body)
+      dispatch('loadSoftValidation', 'original_combination')
       resolve(response.body)
     }, response => {
       commit(MutationNames.SetHardValidation, response.body)
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonRelationship.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonRelationship.js
index 4b71b9f69d..0f059a015f 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonRelationship.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonRelationship.js
@@ -16,6 +16,7 @@ export default function ({ commit, state, dispatch }, data) {
       dispatch('loadSoftValidation', 'taxon_name')
       dispatch('loadSoftValidation', 'taxonRelationshipList')
       dispatch('loadSoftValidation', 'taxonStatusList')
+      dispatch('loadSoftValidation', 'original_combination')
       resolve(response.body)
     }, response => {
       commit(MutationNames.SetHardValidation, response.body)
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonStatus.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonStatus.js
index 35f15124a0..ae147ec4d7 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonStatus.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonStatus.js
@@ -22,6 +22,7 @@ export default function ({ dispatch, commit, state }, status) {
         dispatch('loadSoftValidation', 'taxon_name')
         dispatch('loadSoftValidation', 'taxonStatusList')
         dispatch('loadSoftValidation', 'taxonRelationshipList')
+        dispatch('loadSoftValidation', 'original_combination')
         return resolve(response.body)
       }, response => {
         return reject(response.body)
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonType.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonType.js
index 929649d890..744f85958e 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonType.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/addTaxonType.js
@@ -13,6 +13,7 @@ export default function ({ commit, state, dispatch }, data) {
     createTaxonRelationship(relationship).then(response => {
       commit(MutationNames.AddTaxonRelationship, response.body)
       dispatch('loadSoftValidation', 'taxonRelationshipList')
+      dispatch('loadSoftValidation', 'original_combination')
       dispatch('loadSoftValidation', 'taxon_name')
       resolve(response)
     }, response => {
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/loadSoftValidation.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/loadSoftValidation.js
index 596953a717..9d269432b2 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/loadSoftValidation.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/loadSoftValidation.js
@@ -7,6 +7,8 @@ export default function ({ commit, state }, type) {
 
   if (Array.isArray(state[type])) {
     validations = state[type]
+  } else if (state.softValidation[type].transform) {
+    validations = state.softValidation[type].transform(state[type])
   } else {
     validations.push(state[type])
   }
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/loadTaxonRelationships.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/loadTaxonRelationships.js
index 56aa3a111f..840e8c7e07 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/loadTaxonRelationships.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/loadTaxonRelationships.js
@@ -9,6 +9,7 @@ export default function ({ commit, state, dispatch }, id) {
       }
       commit(MutationNames.SetTaxonRelationshipList, response.body)
       dispatch('loadSoftValidation', 'taxonRelationshipList')
+      dispatch('loadSoftValidation', 'original_combination')
       return resolve()
     })
   })
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeOriginalCombination.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeOriginalCombination.js
index e4f66fb06f..9f4770e624 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeOriginalCombination.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeOriginalCombination.js
@@ -2,11 +2,12 @@ import { removeTaxonRelationship } from '../../request/resources'
 import { MutationNames } from '../mutations/mutations'
 
 export default function ({ commit, state, dispatch }, combination) {
-	 return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     removeTaxonRelationship(combination).then(response => {
       commit(MutationNames.RemoveOriginalCombination, combination)
       commit(MutationNames.RemoveTaxonRelationship, combination)
       dispatch('loadSoftValidation', 'taxonRelationshipList')
+      dispatch('loadSoftValidation', 'original_combination')
       dispatch('loadSoftValidation', 'taxon_name')
       resolve(response.body)
     })
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeTaxonRelationship.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeTaxonRelationship.js
index a2b7e7cc43..4090f2d3bd 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeTaxonRelationship.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeTaxonRelationship.js
@@ -5,6 +5,7 @@ export default function ({ commit, state, dispatch }, relationship) {
   return removeTaxonRelationship(relationship).then(response => {
     commit(MutationNames.RemoveTaxonRelationship, relationship)
     dispatch('loadSoftValidation', 'taxonRelationshipList')
+    dispatch('loadSoftValidation', 'original_combination')
     dispatch('loadSoftValidation', 'taxonStatusList')
     dispatch('loadSoftValidation', 'taxon_name')
   })
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeTaxonStatus.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeTaxonStatus.js
index 75701726f3..883c512e05 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeTaxonStatus.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/removeTaxonStatus.js
@@ -6,6 +6,7 @@ export default function ({ commit, state, dispatch }, status) {
     removeTaxonStatus(status.id).then(response => {
       commit(MutationNames.RemoveTaxonStatus, status)
       dispatch('loadSoftValidation', 'taxonRelationshipList')
+      dispatch('loadSoftValidation', 'original_combination')
       dispatch('loadSoftValidation', 'taxonStatusList')
       dispatch('loadSoftValidation', 'taxon_name')
       resolve(response.body)
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonRelationship.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonRelationship.js
index 3ff0263397..00947f845d 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonRelationship.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonRelationship.js
@@ -10,6 +10,7 @@ export default function ({ commit, state, dispatch }, relationship) {
       commit(MutationNames.AddTaxonRelationship, response.body)
       dispatch('loadSoftValidation', 'taxon_name')
       dispatch('loadSoftValidation', 'taxonRelationshipList')
+      dispatch('loadSoftValidation', 'original_combination')
       dispatch('loadSoftValidation', 'taxonStatusList')
       resolve(response)
     }, (error) => {
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonStatus.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonStatus.js
index 6c4d4e5a48..2712be3b08 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonStatus.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonStatus.js
@@ -17,6 +17,7 @@ export default function ({ commit, state, dispatch }, status) {
       commit(MutationNames.AddTaxonStatus, response.body)
       dispatch('loadSoftValidation', 'taxon_name')
       dispatch('loadSoftValidation', 'taxonRelationshipList')
+      dispatch('loadSoftValidation', 'original_combination')
       dispatch('loadSoftValidation', 'taxonStatusList')
       resolve(response.body)
     })
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonType.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonType.js
index 171056fe03..b7246911a4 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonType.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateTaxonType.js
@@ -13,6 +13,7 @@ export default function ({ commit, state, dispatch }, data) {
   updateTaxonRelationship(relationship).then(response => {
     commit(MutationNames.AddTaxonRelationship, response.body)
     dispatch('loadSoftValidation', 'taxonRelationshipList')
+    dispatch('loadSoftValidation', 'original_combination')
     dispatch('loadSoftValidation', 'taxon_name')
   }, response => {
     commit(MutationNames.SetHardValidation, response.body)
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/store.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/store.js
index 4b880d7591..6656327c97 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/store.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/store.js
@@ -53,6 +53,11 @@ function makeInitialState () {
       taxonStatusList: {
         title: 'Status',
         list: []
+      },
+      original_combination: {
+        title: 'Original combination',
+        list: [],
+        transform: (value) => { return Object.values(value) }
       }
     },
     hardValidation: undefined,

From 6f0ab9f43876f8ca3319e7d779ed00a898b6eec5 Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Thu, 9 Jul 2020 23:13:38 -0500
Subject: [PATCH 15/76] interactive key

---
 app/assets/images/3iView1.gif                 | Bin 0 -> 113 bytes
 app/assets/images/3iView2.gif                 | Bin 0 -> 116 bytes
 .../tasks/matrix/observation_matrices.scss    | 168 +++++
 .../interactive_key_controller.rb             |  11 +
 app/models/language.rb                        |   1 +
 .../export/nexus/_nexus.html.erb              |   2 +-
 .../interactive_key/index.html.erb            | 127 ++++
 config/interface/hub/user_tasks.yml           |   8 +
 config/routes/tasks.rb                        |   5 +-
 lib/interactive_key.rb                        | 678 ++++++++++++++++++
 lib/queries/taxon_name/tabular.rb             |   4 +-
 spec/lib/interactive_key_spec.rb              |  36 +
 12 files changed, 1036 insertions(+), 4 deletions(-)
 create mode 100755 app/assets/images/3iView1.gif
 create mode 100755 app/assets/images/3iView2.gif
 create mode 100644 app/controllers/tasks/observation_matrices/interactive_key_controller.rb
 create mode 100644 app/views/tasks/observation_matrices/interactive_key/index.html.erb
 create mode 100644 lib/interactive_key.rb
 create mode 100644 spec/lib/interactive_key_spec.rb

diff --git a/app/assets/images/3iView1.gif b/app/assets/images/3iView1.gif
new file mode 100755
index 0000000000000000000000000000000000000000..fd003d01b8c52360e6be2f46e739424e8210708b
GIT binary patch
literal 113
zcmZ?wbhEHblw*)&XkcUjg8%>jEB<5wG8q|kKzxu41CvKj|H{*E`4=;8xz)Y;)Si5W
z+N6#EWy{9S&SmPSre#UX->t2+__wZDe#K9zLl5##Xo%&yOHT02(TnxW6pp(3)@GmX
Mc2>S_WmX1j02A^kCIA2c

literal 0
HcmV?d00001

diff --git a/app/assets/images/3iView2.gif b/app/assets/images/3iView2.gif
new file mode 100755
index 0000000000000000000000000000000000000000..df73131a459d74302432aab8ed773ef8072b1af2
GIT binary patch
literal 116
zcmZ?wbhEHblw*)&XkcUjg8%>jEB<5wG8q|kKzxu41Cw`8|H{*E`4=;8xz)Y;)Smnc
z0g5v^dUh^okD9b{_o25xE-shZ&>?rdeEDPF2FIB9&#G^h9eem`h0D1mfzOJwmZ~MY
RJX+2@rQ`UMq9qIr)&RT6GR^=1

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/views/tasks/matrix/observation_matrices.scss b/app/assets/stylesheets/views/tasks/matrix/observation_matrices.scss
index 8220ea3db2..b3d69d3fbc 100644
--- a/app/assets/stylesheets/views/tasks/matrix/observation_matrices.scss
+++ b/app/assets/stylesheets/views/tasks/matrix/observation_matrices.scss
@@ -23,3 +23,171 @@
   position: relative;
   text-align: left;
 }
+
+
+#header3i {
+  position: fixed;
+  width: 100%;
+  height: 56px;
+  top: 99px;
+  right: 0;
+  bottom: auto;
+  left: 0;
+  border-bottom: 2px solid #CCCCCC;
+  background-color: #C0C0B0;
+}
+
+#header3i h1
+{
+  margin: 0px;
+  font-size: 16pt;
+  font-weight: bold;
+  text-align: center;
+  font-family: arial,sans-serif;
+  color: #004050;
+}
+
+#header3i table {
+  width: 100%;
+  background-color: #C0C0B0;
+  text-align: center;
+  color: #004050;
+}
+
+#characters3i {
+  position: fixed;
+  top: 157px;
+  bottom: 45%;
+  left: 0px;
+  right: 0px;
+  margin: 0px 0px 0px 0px;
+  width: auto;
+  height: auto;
+  padding-left: 5px;
+  padding-right: 12px;
+  background-color: #CFCFBE;
+  border-bottom: 2px solid #CCCCCC;
+  overflow: auto;
+}
+
+div.vertical #characters3i {
+  position: fixed;
+  top: 157px;
+  bottom: 42px;
+  left: 0px;
+  right: 50%;
+  margin: 0px 0px 0px 0px;
+  width: auto;
+  height: auto;
+  padding-left: 5px;
+  padding-right: 12px;
+  background-color: #CFCFBE;
+  border-bottom: 2px solid #CCCCCC;
+  overflow: auto;
+}
+
+#characters3i h1, #content h2 {
+  color: #C00000;
+}
+
+#taxa1_3i {
+  position: fixed;
+  top: 55%;
+  bottom: 42px;
+  margin: 0px 0px 0px 0px;
+  right: 50%;
+  left: 0px;
+  width: auto;
+  height: auto;
+  padding-left: 5px;
+  padding-right: 12px;
+  background-color: #C0C0B0;
+  border-bottom: 2px solid #CCCCCC;
+  overflow: auto;
+}
+
+div.vertical #taxa1_3i {
+  position: fixed;
+  top: 157px;
+  bottom: 45%;
+  margin: 0px 0px 0px 0px;
+  right: 0px;
+  left: 50%;
+  width: auto;
+  height: auto;
+  padding-left: 5px;
+  padding-right: 12px;
+  background-color: #C0C0B0;
+  border-left: 2px solid #CCCCCC;
+  border-bottom: 2px solid #CCCCCC;
+  overflow: auto;
+}
+
+#taxa2_3i {
+  position: fixed;
+  top: 55%;
+  bottom: 42px;
+  margin: 0px 0px 0px 0px;
+  width: auto;
+  height: auto;
+  left: 50%;
+  right: 0px;
+  padding-left: 5px;
+  padding-right: 12px;
+  background-color: #C0C0B0;
+  border-left: 2px solid #CCCCCC;
+  border-bottom: 2px solid #CCCCCC;
+  overflow: auto;
+}
+
+.mainfont { color: #004050;}
+.red { color: #C00000; }
+.redbold { color: #C00000; font-weight: bold; }
+
+div.i3{
+  color: #004050;
+  font-family: arial,sans-serif;
+}
+
+div.i3 a { color: #004050;}
+div.i3 a:visited { color: #004050;}
+div.i3 a:hover { color: #C00000;}
+
+div.help3i
+{
+  background-color: #CAD9EE;
+  height: auto;
+  border: 1px solid;
+  padding: 1px;
+}
+
+div.helpBox3i{
+  background-color: #CAD9EE;
+  margin-left: 10px;
+  max-width: 300px;
+  position: absolute;
+  display: inline-block;
+  border: 1px solid;
+  z-index:10000;
+}
+
+.a1 a, .a2 a, .a3 a, .a0 a {
+  text-decoration: none;
+}
+
+.a1	{ border:2px solid transparent; }
+.a2	{ border:2px outset #FFFFFF; cursor: hand; }
+.a3	{ border:2px inset #FFFFFF; }
+.a0 { border:3px solid transparent;}
+.a5	{ border:3px outset #FFFFFF; cursor: hand; }
+.a6	{ border:3px inset #FFFFFF; }
+
+table.key {
+  background-color: #CAD9DD;
+  text-align: center;
+  color: #000080;
+}
+
+table.key td.taxon {text-align: left;}
+table.key td.image {vertical-align: top;}
+
diff --git a/app/controllers/tasks/observation_matrices/interactive_key_controller.rb b/app/controllers/tasks/observation_matrices/interactive_key_controller.rb
new file mode 100644
index 0000000000..d25911bc58
--- /dev/null
+++ b/app/controllers/tasks/observation_matrices/interactive_key_controller.rb
@@ -0,0 +1,11 @@
+class Tasks::ObservationMatrices::InteractiveKeyController < ApplicationController
+  include TaskControllerConfiguration
+
+  # GET
+  def index
+
+    @observation_matrix = ObservationMatrix.where(project_id: sessions_current_project_id, id: params[:observation_matrix_id]).first unless params[:observation_matrix_id].blank?
+#    redirect_to new_observation_matrix_path and return if @observation_matrix.nil?
+  end
+
+end
\ No newline at end of file
diff --git a/app/models/language.rb b/app/models/language.rb
index 5bb29bf2a8..e8be48013f 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -26,6 +26,7 @@ class Language < ApplicationRecord
 
   has_many :serials, inverse_of: :language, foreign_key: :primary_language_id
   has_many :sources, inverse_of: :source_language, class_name: 'Source::Bibtex'
+  has_many :alternate_value_translations, class_name: 'AlternateValue::Translation'
   
   scope :used_recently_on_sources, -> { joins(sources: [:project_sources]).includes(sources: [:project_sources]).where(sources: { created_at: 1.weeks.ago..Time.now } ).order('"sources"."created_at" DESC') }
   scope :used_recently_on_serials, -> { joins(:serials).includes(:serials).where(serials: { created_at: 1.weeks.ago..Time.now } ).order('"serials"."created_at" DESC') }
diff --git a/app/views/observation_matrices/export/nexus/_nexus.html.erb b/app/views/observation_matrices/export/nexus/_nexus.html.erb
index b2a9bbc2ab..616fae291d 100644
--- a/app/views/observation_matrices/export/nexus/_nexus.html.erb
+++ b/app/views/observation_matrices/export/nexus/_nexus.html.erb
@@ -5,7 +5,7 @@
 
 [ generated by TaxonWorks (http://taxonworks.org) at <%= Time.now %>]
 [ from matrix: <%= m.name %> (id: <%= m.id %>) ]  
-[ <TODO> access these data via the API at XXXX ]  
+[ <TODO> access these data via the API at XXXX </TODO>]
 
 Begin taxa;
 Dimensions Ntax=<%= m.observation_matrix_rows.load.size -%>;
diff --git a/app/views/tasks/observation_matrices/interactive_key/index.html.erb b/app/views/tasks/observation_matrices/interactive_key/index.html.erb
new file mode 100644
index 0000000000..f2d1b483c7
--- /dev/null
+++ b/app/views/tasks/observation_matrices/interactive_key/index.html.erb
@@ -0,0 +1,127 @@
+<h1 class="task_header"> Interactive key </h1>
+
+<div class="i3">
+  <noscript>
+    <p style="color: #C00000;">Java script is disabled!</p>
+  </noscript>
+
+  <div id="header3i">
+    <%= content_tag(:h1, observation_matrix_tag(@observation_matrix), id: 'ltrSecondHeader') -%>
+    <div style="border-top: 1px solid">
+      <table border='0' cellpadding='0' cellspacing='0'>
+        <tr>
+          <td>
+            Language
+          </td>
+          <td>
+            <a href='javascript: changeView()'>
+              <%= image_tag('3iView2.gif', :alt => 'Change view', :id => 'k1', :style => 'opacity: 0.3')
+              %><%= image_tag('3iView1.gif', :alt => 'Change view', :id => 'k2', :style => 'opacity: 1') %>
+            </a>
+          </td>
+          <td>
+            Proceed
+          </td>
+          <td style="width:400px">&nbsp;</td>
+          <td>
+            Key_Author
+          </td>
+        </tr>
+        <tr>
+          <td>
+            &nbsp;</td>
+          <td>
+            &nbsp;</td>
+          <td>
+            &nbsp;</td>
+          <td style="width:400px">&nbsp;</td>
+          <td>
+            <div ID="div1" CssClass="helpBox3i">Source Text</div>
+          </td>
+        </tr>
+      </table>
+    </div>
+  </div>
+  <div ID="vert">
+    <div id="characters3i"></div>
+    <div ID="taxa1_3i">
+      <h2>Remaining Taxa</h2>
+    </div>
+    <div ID="taxa2_3i">
+      <h2>Elimitated Taxa</h2>
+    </div>
+  </div>
+
+
+
+
+</div>
+<script type="text/javascript">
+    <!--
+    window.onerror = null;
+
+    window.onload = coupletSelect;
+
+    window.onfocus = ppHide;
+    var ww = null;
+
+    window.onclose = ppHide;
+
+    function makeHelpWindow(hc)
+    { ww = window.open('../basic/Taxa.aspx?TaxonNameID=' + hc, '_blank', 'scrollbars=yes,resizable=yes,width=640,height=480,top=' + (screen.availHeight - 480) / 2 + ',left=' + (screen.availWidth - 640) / 2); }
+
+    function makeHelpWindow1(couplet, ccode, c1, c2) {
+        keyID = document.forms['mainform'].elements['hdfKeyID'].value;
+        ww = window.open('DichotKeyHelp.aspx?keyID=' + keyID + '&couplet=' + couplet + '&ccode=' + ccode + '&c1=' + c1 + '&c2=' + c2, '_blank', 'scrollbars=yes,resizable=yes,width=640,height=480,top=' + (screen.availHeight - 480) / 2 + ',left=' + (screen.availWidth - 640) / 2);
+    }
+
+    function makeImageWindow(hc)
+    { ww = window.open('ImageZoom.aspx?FigureID=' + hc, '_blank', 'scrollbars=yes,resizable=yes,width=640,height=480,top=' + (screen.availHeight - 480) / 2 + ',left=' + (screen.availWidth - 640) / 2); }
+
+    function ppHide()
+    { if (ww != null) ww.close(); ww = null; }
+
+    function coupletSelect() {
+        b = window.document.forms['mainform'].elements['hdfStep'].value;
+        if (b > 0) {
+            GoToCouplet(b, "");
+        }
+    }
+
+    function GoToCouplet(c, stepCode) {
+        window.document.location = "#a" + c;
+        window.document.forms['mainform'].elements['hdfStep'].value = c;
+        l = window.document.getElementsByTagName('span').length;
+        for (i = 0; i < l; i++) {
+            b = i + ' ' + window.document.getElementsByTagName('span')[i].id + '  ';
+            if (b.search('cc') != -1) {
+                window.document.getElementsByTagName('span')[i].className = 'mainfont';
+            }
+        }
+        window.document.getElementById('cc' + c).className = 'redbold';
+        window.document.forms['mainform'].elements['hdfStepCode'].value = stepCode;
+        if (stepCode != "") {
+            window.document.forms['mainform'].elements['btnProceedHidden'].click();
+        }
+    }
+
+    function changeView() {
+        if (window.document.getElementById('vert').className == 'vertical') {
+            window.document.getElementById('vert').classList.remove('vertical');
+            window.document.getElementById('k1').style = 'opacity: 0.3';
+            window.document.getElementById('k2').style = 'opacity: 1';
+        }
+        else {
+            window.document.getElementById('vert').classList.add('vertical');
+            window.document.getElementById('k1').style = 'opacity: 1';
+            window.document.getElementById('k2').style = 'opacity: 0.3';
+        }
+    }
+
+    function mouse(i, a) {
+        window.document.getElementById('k' + i).className = 'a' + a;
+    }
+
+
+    //-->
+</script>
\ No newline at end of file
diff --git a/config/interface/hub/user_tasks.yml b/config/interface/hub/user_tasks.yml
index 2b0a480b08..20026c0a7a 100644
--- a/config/interface/hub/user_tasks.yml
+++ b/config/interface/hub/user_tasks.yml
@@ -444,6 +444,14 @@ index_dashboard_task:
     - matrix
   status: prototype
   description: 'Summarize observations across a nomenclaturally-based hierarchy.'
+interactive_key_task:
+  hub: true
+  name: 'Interactive key'
+  related:
+  categories:
+    - matrix
+  status: prototype
+  description: 'Interactive key based on an observation matrix.'
 index_stats_task:
   hub: true
   name: 'Nomenclature stats'
diff --git a/config/routes/tasks.rb b/config/routes/tasks.rb
index 6fec7bb3ca..cdf9f8c674 100644
--- a/config/routes/tasks.rb
+++ b/config/routes/tasks.rb
@@ -340,7 +340,6 @@
       get :index, as: 'index_dashboard_task'
     end
 
-
     scope :view, controller: 'tasks/observation_matrices/view' do
       get '(:observation_matrix_id)', as: 'observation_matrix_view_task', action: :index
     end
@@ -360,6 +359,10 @@
       get 'index', as: 'index_row_coder_task'
       get 'set', as: 'set_row_coder_task'
     end
+
+    scope :interactive_key, controller: 'tasks/observation_matrices/interactive_key' do
+      get '(:observation_matrix_id)', as: 'interactive_key_task', action: :index
+    end
   end
 
   scope :otus do
diff --git a/lib/interactive_key.rb b/lib/interactive_key.rb
new file mode 100644
index 0000000000..cd56f5762b
--- /dev/null
+++ b/lib/interactive_key.rb
@@ -0,0 +1,678 @@
+# Contains methods used to build an interactive key
+class InteractiveKey
+
+  attr_accessor :observation_matrix_id
+
+  attr_accessor :project_id
+
+  attr_accessor :observation_matrix
+
+  attr_accessor :descriptor_available_languages
+
+  attr_accessor :descriptors
+
+  def initialize(observation_matrix_id: nil, observation_matrix: nil, project_id: nil, descriptor_available_languages: nil)
+    raise if observation_matrix_id.blank? || project_id.blank?
+    @observation_matrix_id = observation_matrix_id
+    @project_id = project_id
+    @observation_matrix = observation_matrix
+    @descriptor_available_languages = descriptor_available_languages
+  end
+
+  def observation_matrix
+    ObservationMatrix.where(id: @observation_matrix_id, project_id: @project_id).first
+  end
+
+  def descriptors
+    observation_matrix.descriptors
+  end
+
+  def descriptor_available_languages
+    descriptor_ids = descriptors.pluck(:id)
+    languages = Language.joins(:alternate_value_translations)
+                    .where(alternate_values: {alternate_value_object_type: 'Descriptor', type: 'AlternateValue::Translation'})
+                    .where('alternate_values.alternate_value_object_id IN (?)', descriptor_ids ).order('languages.english_name').distinct.to_a
+    unless languages.empty?
+      languages = Language.where(english_name: 'English').to_a + languages
+    end
+    languages
+  end
+
+end
+
+=begin
+
+strSQL = "SELECT Morph, Morph" & lng & " FROM Morph ORDER BY Morph"
+Set rst1 = Server.CreateObject("ADODB.Recordset")
+rst1.Open strSQL,Conn
+
+<title>3I - Characters</title>
+<link rel="stylesheet" href="style.css">
+<link rel="meta" href="labels.rdf" type="application/rdf+xml" title="ICRA labels" />
+</head>
+
+<%
+' Open recordset Set of all characters and states
+
+if sex <> replace(sex, "e", "") then where = where & "Characters.Type Like '%e%' or "
+if sex <> replace(sex, "l", "") then where = where & "Characters.Type Like '%l%' or "
+if sex <> replace(sex, "p", "") then where = where & "Characters.Type Like '%p%' or "
+if sex <> replace(sex, "n", "") then where = where & "Characters.Type Like '%n%' or "
+if sex <> replace(sex, "m", "") then where = where & "Characters.Type Like '%m%' or "
+if sex <> replace(sex, "f", "") then where = where & "Characters.Type Like '%f%' or "
+if sex <> replace(sex, "d", "") then where = where & "Characters.Type Like '%d%' or "
+if where & "" <> "" then where = "( " & left(where, len(where)-4) & ") and "
+where = "WHERE " & where & "(Characters.Weight is Null or Characters.Weight Not Like '0') "
+if keyN <> "" then where1 = "AND ','&Characters.KeyN&',' Like '%," & keyN & ",%' "
+
+strSQL = "SELECT Characters.Key1, Characters.Char, Characters.Type, Characters.Numeric, Characters.Morph, Characters.Weight, Characters.Char" & lng & ", Characters.Descr" & lng & ", State.Key2, State.State, State.State" & lng & ", State.Fig " &_
+	"FROM Characters INNER JOIN State ON Characters.Key1 = State.Key1 "
+if cat = "1" then
+	strSQL = strSQL & where & where1 & "ORDER BY Characters.Morph, Characters.Weight DESC, Characters.Char, State.State"
+else
+	strSQL = strSQL & where & where1 & "ORDER BY Characters.Weight DESC, Characters.Char, State.State"
+end if
+Set rst = Server.CreateObject("ADODB.Recordset")
+rst.Open strSQL,Conn
+
+' Fill out array taxa() with set of taxa
+
+if keyN = "" then
+	strSQL = "SELECT Key, Hiercode FROM TaxonQuery2 ORDER BY Hiercode"
+else
+	strSQL = "SELECT Key, Hiercode FROM TaxonQuery2 Where ','&KeyN&',' Like '%," & keyN & ",%' ORDER BY Hiercode"
+end if
+Set rst2 = Server.CreateObject("ADODB.Recordset")
+rst2.Open strSQL, Conn
+
+if rank = "" then
+	Do Until rst2.EOF
+		taxaMax = taxaMax + 1
+		taxa(taxaMax, 0) = CStr(rst2("Key"))
+		taxa(taxaMax, 1) = CStr(rst2("Hiercode"))
+		if filter = "" or inStr(filter, "a" & rst2("Key") & "a") > 0 then
+			taxa(taxaMax, 2) = "0"
+		else
+			taxa(taxaMax, 2) = "-1"
+		end if
+		rst2.MoveNext
+	Loop
+	rst2.Close
+else
+	Set rst4 = Server.CreateObject("ADODB.Recordset")
+	strSQL = "SELECT Key, Hiercode, Rank FROM Taxon WHERE Rank>=" & rank & " ORDER BY Hiercode"
+	rst4.Open strSQL, Conn, 3, 3
+	Do Until rst2.EOF
+		rst4.moveLast
+		do until rst4("Hiercode") = left(rst2("Hiercode"), len(rst4("Hiercode")))
+			rst4.movePrevious
+		loop
+		hc = rst4("Hiercode")
+		i = rst4("Key")
+
+		if hc > taxa(taxaMax, 1) then
+			taxaMax = taxaMax + 1
+			taxa(taxaMax, 0) = i
+			taxa(taxaMax, 1) = hc
+			if filter = "" or inStr(filter, "a" & i & "a") > 0 then
+				taxa(taxaMax, 2) = "0"
+			else
+				taxa(taxaMax, 2) = "-1"
+			end if
+			taxa(taxaMax, 3) = "0"
+		end if
+		do until hc <> left(rst2("Hiercode"), len(hc))
+			rst2.MoveNext
+			if rst2.EOF then exit do
+		loop
+	Loop
+	rst2.Close
+	rst4.Close
+	Set rst4 = Nothing
+end if
+
+' Save all used characters and their states into array charUsed()
+
+CharMax = 0
+Do Until rst.EOF
+	i = CStr(rst("Char"))
+	j = CStr(rst("State"))
+	r = replace(CStr(Request("a" & i)), " ", "")
+	r = replace(r, "aa", "a")
+	if (r = j and multistates = "") or (rst("Numeric") = True and r <> "" and isNumeric(left(r, inStr(r & "-", "-") - 1)) and isNumeric(right(r, len(r) - inStr(r, "-")))) then
+		charMax = charMax + 1
+		charUsed(charMax, 1) = i
+		charUsed(charMax, 2) = r
+		charUsed(charMax, 3) = CStr(request("n" & i))
+		if charUsed(charMax, 3) = "1" then
+			states = states & "-" & rst("Key2")
+		else
+			states = states & rst("Key2")
+		end if
+		if rst("Numeric") = True then
+			states = states & "-" & r & "b"
+		else
+			states = states & "b"
+		end if
+		where2 = where2 & " OR Char=" & i
+	elseif multistates = "1" and rst("Numeric") = False then
+		m = CStr(Request("m" & i))
+		if (inStr(m, "!") = 0 and inStr(m, "a" & j & "a") > 0) or (m = "" and r = j) or (inStr(m, "!") = 1 and ((inStr(m, "a" & j & "a") > 0 and inStr(m, "a" & r & "a") > 0) or (r = j and inStr(m, "a" & r & "a") = 0))) then
+			if charUsed(charMax, 1) <> i then charMax = charMax + 1
+			charUsed(charMax, 1) = i
+			charUsed(charMax, 2) = charUsed(charMax, 2) & "a" & j & "a"
+			charUsed(charMax, 3) = CStr(request("n" & i))
+			if charUsed(charMax, 3) = "1" then
+				states = states & "-" & rst("Key2") & "b"
+			else
+				states = states & rst("Key2") & "b"
+			end if
+			where2 = where2 & " OR Char=" & i
+		end if
+	end if
+	rst.moveNext
+Loop
+rst.MoveFirst
+if where2 & "" <> "" then where2 = "AND (" & right(where2, len(where2) - 4) & ") "
+
+' Open recordset Matrix of characters
+
+if keyN <> "" then where1 = "AND ','&CharTableTotal.KeyN&',' Like '%," & keyN & ",%' AND ','&CharTableTotal.CharKeyN&',' Like '%," & keyN & ",%' "
+strSQL = "SELECT Morph, Char, State, Hiercode, Numeric, NumericFrom, NumericTo FROM CharTableTotal "
+if cat = "1" then
+	strSQL = strSQL & replace(where, "Characters", "CharTableTotal") & where1 & where2 & "ORDER BY Morph, Weight DESC, Char, Hiercode, State"
+else
+	strSQL = strSQL & replace(where, "Characters", "CharTableTotal") & where1 & where2 & "ORDER BY Weight DESC, Char, Hiercode, State"
+end if
+rst2.Open strSQL, Conn
+
+
+if rst2.eof then ' Datamatrix is empty
+	response.write "<p style='color: #FF0000'>The datamatrix is empty!</p>"
+else
+
+' Mark the taxa in array taxa() which does not fit to criteria (count number of errors)
+
+for j = 1 to charMax
+	for i = 1 to taxaMax
+	  if taxa(i, 2) <> "-1" then
+	  	do until left(rst2("Hiercode"), len(taxa(i, 1))) = taxa(i, 1) and rst2("Char") & "" = charUsed(j, 1)
+			rst2.MoveNext
+		loop
+		if multistates = "1" and rst2("Numeric") = False then
+			if charUsed(j, 3) = "1" then ' character with not
+				do until inStr(charUsed(j, 2), rst2("State")) = 0 or (rst2("State") & "" = "" and unknowns <> "1") or left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1)
+					rst2.MoveNext
+					if rst2.EOF then exit do
+				loop
+			else
+				do until inStr(charUsed(j, 2), rst2("State")) > 0 or (rst2("State") & "" = "" and unknowns <> "1") or left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1)
+					rst2.MoveNext
+					if rst2.EOF then exit do
+				loop
+			end if
+		else
+			if charUsed(j, 3) = "1" then ' character with not
+				do until (rst2("Numeric") = True and (rst2("NumericFrom") > cDbl(right(charUsed(j, 2), len(charUsed(j, 2)) - inStr(charUsed(j, 2), "-"))) or rst2("NumericTo") < cDbl(left(charUsed(j, 2), inStr(charUsed(j, 2) & "-", "-")-1)))) or (charUsed(j, 2) <> rst2("State") & "" and rst2("Numeric") = False) or (rst2("State") & "" = "" and unknowns <> "1") or left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1)
+					rst2.MoveNext
+					if rst2.EOF then exit do
+				loop
+			else
+				do until (rst2("Numeric") = True and rst2("NumericFrom") <= cDbl(right(charUsed(j, 2), len(charUsed(j, 2)) - inStr(charUsed(j, 2), "-"))) and rst2("NumericTo") >= cDbl(left(charUsed(j, 2), inStr(charUsed(j, 2) & "-", "-")-1))) or (charUsed(j, 2) = rst2("State") & "" and rst2("Numeric") = False) or (rst2("State") & "" = "" and unknowns <> "1") or left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1)
+					rst2.MoveNext
+					if rst2.EOF then exit do
+				loop
+			end if
+		end if
+		if rst2.EOF then
+			taxa(i, 2) = taxa(i, 2) + 1
+		elseIf left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1) then
+			taxa(i, 2) = taxa(i, 2) + 1
+		end if
+	  end if
+	next
+next
+
+' Making query strings for lists of taxa
+
+for t = 1 to taxaMax
+	if CInt(taxa(t, 2)) <= tol and taxa(t, 2) <> "-1" then
+		queryStr1 = queryStr1 & taxa(t, 0) & "a" & taxa(t, 2) & "a"
+		if CInt(taxa(t, 2)) < tol then taxaRemTol = taxaRemTol + 1
+		taxaRem = taxaRem + 1
+	else
+		queryStr2 = queryStr2 & taxa(t, 0) & "a" & taxa(t, 2) & "a"
+	end if
+next
+if len(queryStr1) > 0 then queryStr1 = states & left(queryStr1, len(queryStr1) - 1)
+if len(queryStr2) > 0 then queryStr2 = states & left(queryStr2, len(queryStr2) - 1)
+
+' Resort recordset rst2
+
+rst2.Close
+strSQL = "SELECT Morph, Char, State, Hiercode, Numeric, NumericFrom, NumericTo " &_
+	"FROM CharTableTotal "
+if cat = "1" then
+	strSQL = strSQL & replace(where, "Characters", "CharTableTotal") & where1 & "ORDER BY Morph, Weight DESC, Char, State, Hiercode"
+else
+	strSQL = strSQL & replace(where, "Characters", "CharTableTotal") & where1 & "ORDER BY Weight DESC, Char, State, Hiercode"
+end if
+rst2.Open strSQL, Conn
+
+' Make the form with set of character
+
+a = 1
+t = 1
+m = ""
+j = rst("Char") & ""
+Do Until rst.EOF
+	if rank <> "" then
+		for i = 1 to taxaMax
+			taxa(i, 3) = "0"
+		next
+	end if
+	i = rst("Char") & ""
+	morphN = rst("Morph")
+	charName = charReplace(rst("Char" & lng))
+
+	descr = rst("Descr" & lng) & ""
+
+	if not rst2.eof then
+		Do Until rst2("Char") & "" = i
+			rst2.MoveNext
+			if rst2.EOF then exit do
+		Loop
+	end if
+
+	if not rst2.eof then
+	  fig = 0
+	  weight = rst("Weight") & ""
+	  CharTemp1 = ""
+	  if weight <> "" then weight = ", I=" & weight
+	  usefull = 0
+	  stUnknown = 0
+	  stNum = 0
+	  stSum = 0
+	  numMin = 9999999
+	  numMax = -9999999
+
+	  if rst("Numeric") = False then ' !!!!!!!!!!Not Numeric!!!!!!!!!
+	  	if multistates = "1" then
+	  		m = request("m" & i) & ""
+	  		if (inStr(m, "!") = 1 and inStr(m, "a" & Request("a" & i) & "a") > 0) or (m <> "" and inStr(m, "!") <> 1) then
+		  		m = Replace("<input type='hidden' name='m" & i & "' value='!" & Replace(m, "!", "") & "'>", "'!'", "''") & sp
+			else
+				m = "<input type='hidden' name='m" & i & "' value=''>" & sp
+			end if
+	  	end if
+		if charUsed(a, 1) & "" <> i then
+			CharTemp = "<li><b>" & charName & "</b> (" & UCase(rst("Type")) & weight & ")<br>" & sp & m & "not&nbsp;<input type=checkbox name='n" & i & "' value='1'>&nbsp;<select name='a" & i & "'>" & sp & "<option value='" & "' selected> </option>" & sp
+		else
+			CharTemp = "<li><b>" & charName & "</b> (" & UCase(rst("Type")) & weight & ")<br>" & sp & m & "not&nbsp;<input type=checkbox " & replace(charUsed(a,3), "1", "checked ") & "name='n" & i & "' value='1'>&nbsp;<select name='a" & i & "'>" & sp & "<option value='" & "'> </option>" & sp
+		end if
+
+		hc = 0
+		if not rst2.eof then
+			Do Until rst2("Char") & "" <> i or rst2("State") & "" <> ""
+				z = 0
+				Do Until left(rst2("Hiercode"), len(taxa(t, 1))) = taxa(t, 1)
+					t = t + 1
+					if t > taxaMax then
+						t = 1
+						z = z + 1
+						if z > 1 then exit Do
+					end if
+				Loop
+				if CInt(taxa(t, 2)) = tol and hc <> taxa(t, 1) and z < 2 then
+					if rank <> "" then taxa(t, 3) = "1"
+					stUnknown = stUnknown + 1
+					hc = taxa(t, 1)
+				end if
+				rst2.MoveNext
+				if rst2.eof then exit do
+			Loop
+		end if
+
+		if unknowns = "1" then stUnknown = 0
+		Do until j <> i
+			stCount = stUnknown
+			if not rst2.EOF then
+				r = rst("State") & ""
+				hc = 0
+				Do Until rst2("Char") & "" <> i or rst2("State") & "" <> r
+					z = 0
+					Do Until left(rst2("Hiercode"), len(taxa(t, 1))) = taxa(t, 1)
+						t = t + 1
+						if t > taxaMax then
+							t = 1
+							z = z + 1
+							if z > 1 then exit Do
+						end if
+					Loop
+					if CInt(taxa(t, 2)) = tol and hc <> taxa(t, 1) and taxa (t, 3) <> "1" and z < 2 then
+						stCount = stCount + 1
+						hc = taxa(t, 1)
+					end if
+					rst2.MoveNext
+					if rst2.EOF then Exit Do
+				Loop
+			end if
+			stCount = stCount + taxaRemTol
+			if stCount > 0 and stCount < taxaRem Then
+				stNum = stNum + 1
+				strCharArr(stNum, 0) = stCount
+			end if
+
+			if charUsed(a, 1) = i and (inStr(charUsed(a, 2) , "a" & r & "a") = 1 or charUsed(a, 2) = r) then
+				CharTemp = CharTemp + "<option value='" & rst("State") & "' selected>&gt; " & charReplace(rst("State" & lng)) & "</option>" & sp
+			elseif charUsed(a, 1) = i and inStr(charUsed(a, 2) & "", "a" & r & "a") > 1 then
+				CharTemp = CharTemp + "<option value='" & rst("State") & "'>&gt; " & charReplace(rst("State" & lng)) & "</option>" & sp
+			elseIf charUsed(a, 1) = i and charUsed(a, 2) <> r then
+				CharTemp = CharTemp + "<option value='" & rst("State") & "'>" & charReplace(rst("State" & lng)) & "</option>" & sp
+			else
+				if stCount = 0 or stCount = taxaRem then
+					CharTemp = CharTemp + "<option value='" & rst("State") & "'>- " & charReplace(rst("State" & lng)) & " ("&stCount&") -</option>" & sp
+				else
+					CharTemp = CharTemp + "<option value='" & rst("State") & "'>" & charReplace(rst("State" & lng)) & " ("&stCount&")</option>" & sp
+					usefull = 1
+				end if
+				CharTemp1 = CharTemp1 & "&a" & rst("State") & "=" & stCount
+			end if
+			if rst("Fig") & "" <> "" then fig = 1
+
+			rst.MoveNext
+			if rst.EOF then
+				exit do
+			else
+				j = rst("Char") & ""
+			end if
+		Loop
+		CharTemp1 = CharTemp1 & "&b=" & taxaRem
+		CharTemp = CharTemp + "</select>" & sp & sp
+		If fig = 1 or descr <> "" or multistates = "1" then
+			opt = len(CharTemp) - len(replace(CharTemp, "option", ""))
+			if fig = 1 and multistates = "1" then opt = opt + 12
+			if opt > 90 and fig = 1 then
+				CharTemp = replace(CharTemp, ">" & charName & "<", "><a href=""" & "javascript:makeHelpWindow('" & i & CharTemp1 & "',800,600)""" & " Title='" & show & "'>" & charName & "</a><")
+			elseIf opt > 50 or (multistates = "1" and fig = 1) then
+				CharTemp = replace(CharTemp, ">" & charName & "<", "><a href=""" & "javascript:makeHelpWindow('" & i & CharTemp1 & "',640,480)""" & " Title='" & show & "'>" & charName & "</a><")
+			elseIf opt < 50 then
+				CharTemp = replace(CharTemp, ">" & charName & "<", "><a href=""" & "javascript:makeHelpWindow('" & i & CharTemp1 & "',640,300)""" & " Title='" & show & "'>" & charName & "</a><")
+			end if
+		end if
+
+	  else ' !!!!!!!Numeric!!!!!!!!
+
+		if not rst2.eof then
+			hc = 0
+			Do Until rst2("Char") & "" <> i or rst2("State") & "" <> ""
+				z = 0
+				Do Until left(rst2("Hiercode"), len(taxa(t, 1))) = taxa(t, 1)
+					t = t + 1
+					if t > taxaMax then
+						t = 1
+						z = z + 1
+						if z > 1 then exit do
+					end if
+				Loop
+				if CInt(taxa(t, 2)) = tol and hc <> taxa(t, 1) and z < 2 then
+					if rank <> "" then taxa(t, 3) = "1"
+					stUnknown = stUnknown + 1
+					hc = taxa(t, 1)
+				end if
+				rst2.MoveNext
+				if rst2.eof then exit do
+			Loop
+		end if
+
+		usefull = 0
+		if not rst2.eof then
+			stCount = 0
+			hc = 0
+			do until rst2("Char") & "" <> i
+				z = 0
+				Do Until left(rst2("Hiercode"), len(taxa(t, 1))) = taxa(t, 1)
+					t = t + 1
+					if t > taxaMax then
+						t = 1
+						z = z + 1
+						if z > 1 then exit Do
+					end if
+				Loop
+				if CInt(taxa(t, 2)) = tol and z < 2 then
+					if hc <> taxa(t, 1) and taxa(t, 3) <> "1" then
+						hc = taxa(t, 1)
+						stNum = stNum + 1
+						strCharArr(stNum, 0) = rst2("NumericTo")
+						strCharArr(stNum, 4) = rst2("NumericFrom")
+					end if
+					if strCharArr(stNum, 0) > rst2("NumericTo") then strCharArr(stNum, 0) = rst2("NumericTo")
+					if strCharArr(stNum, 4) < rst2("NumericFrom") then strCharArr(stNum, 4) = rst2("NumericFrom")
+					if numMin > rst2("NumericFrom") then
+						if numMin < 9999999 then usefull = 1
+						numMin = rst2("NumericFrom")
+					end if
+					if numMax < rst2("NumericTo") then
+						if numMax > -9999999 then usefull = 1
+						numMax = rst2("NumericTo")
+					end if
+					stCount = 1
+				end if
+				rst2.moveNext
+				if rst2.eof then exit do
+			loop
+		end if
+		if charUsed(a, 1) & "" <> i then
+			if numMin = 9999999 then
+				charTemp1 = ""
+			elseIf numMin = numMax then
+				charTemp1 = numMin & " "
+			else
+			CharTemp1 = numMin & "-" & numMax & " "
+			end if
+			CharTemp = "<li><b>" & charName & " [" & charTemp1 & charReplace(rst("State" & lng)) & "]</b> (" & UCase(rst("Type")) & weight & ")<br>" & sp & "not&nbsp;<input type=checkbox name='n" & i & "' value='1'>&nbsp;<input type='text' name='a" & i & "' value='' size='15'>" & sp
+		else
+			CharTemp = "<li><b>" & charName & " [" & charReplace(rst("State" & lng)) & "]</b> (" & UCase(rst("Type")) & weight & ")<br>" & sp & "not&nbsp;<input type=checkbox " & replace(charUsed(a,3), "1", "checked ") & "name='n" & i & "' value='1'>&nbsp;<input type='text' name='a" & i & "' value='" & charUsed(a, 2) & "' size='15'>" & sp
+		end if
+		If rst("fig") & "" <> "" or descr <> "" then
+			CharTemp = replace(CharTemp, ">" & charName & " [" & charTemp1 & charReplace(rst("State" & lng)) & "]<", "><a href=""" & "javascript:makeHelpWindow('" & i & "',640,280)""" & " Title='" & show & "'>" & charName & "</a> [" & charTemp1 & charReplace(rst("State" & lng)) & "]<")
+		end if
+
+		rst.MoveNext
+		if not rst.EOF then j = rst("Char") & ""
+
+	  end if ' !!!!!!!!!Numeric!!!!!!!!!!
+	end if
+
+	if charUsed(a, 1) = i then
+		strChar2 = strChar2 + CharTemp
+		a = a + 1
+	ElseIf usefull = 0 then
+		strChar3 = strChar3 & CharTemp
+	Else
+		if taxaRem > 1 then
+			if cat = "1" and rst1("Morph") <> morphN then
+				Do until rst1("Morph") = morphN
+					rst1.moveNext
+				Loop
+				morph = 0
+			end if
+			if cat = "1" and rst1("Morph") = morphN and morph <> 1 then
+				l = Replace(rst1("Morph" & lng), " ", "&nbsp;")
+				strChar1 = strChar1 & "<br><br><a name='" & l & "'></a><span class='a'>" & l & "</span><br><br>" & sp & sp
+				link = link & "<a href='#" & l & "'>" & l & "</a>&nbsp;| " & sp
+				morph = 1
+			end if
+			if cat <> "1" then
+				if numMin = 9999999 then stMed = taxaRem / stNum else stMed = taxaRem
+				For i1 = 1 to stNum
+					if numMin = 9999999 then
+						stSum = stSum + ((stMed) - strCharArr(i1, 0)) ^ 2
+					else
+						strCharArr(i1, 0) = strCharArr(i1, 4) - strCharArr(i1, 0)
+						if strCharArr(i1, 0) = 0 then strCharArr(i1, 0) = (numMax - numMin) / 10
+						stSum = stSum + strCharArr(i1, 0)
+					end if
+				Next
+				strCharMax = strCharMax + 1
+				if numMax = numMin then numMax = numMax + 0.00001
+				if numMin = 9999999 then
+					strCharArr(strCharMax, 2) = stMed + Sqr(stSum)
+				else
+					strCharArr(strCharMax, 2) = stMed * (stSum / stNum / (numMax - numMin)) * (2 - stNum / taxaRem)
+				end if
+				strCharArr(strCharMax, 1) = CharTemp ' & strCharArr(strCharMax, 2) '!!!!!!!!!!!!!!!!
+				strCharArr(strCharMax, 3) = CLng("0" & replace(weight, ", I=", ""))
+			else
+				strChar1 = strChar1 & CharTemp
+			end if
+		else
+			strChar3 = strChar3 & CharTemp
+		End if
+	End if
+Loop
+
+' Outputtin form
+
+%>
+<body>
+<script type="text/javascript">
+<!--
+window.onerror = null;
+
+if (window.parent.window.length != 4)
+	{ window.location = ""; }
+else {
+
+window.parent.window.frames['taxa1'].window.document.forms['mainform'].elements['taxa'].value='<% =queryStr1 %>';
+window.parent.window.frames['taxa1'].window.document.forms['mainform'].elements['lng'].value='<% =lng %>';
+window.parent.window.frames['taxa1'].window.document.forms['mainform'].submit();
+<% if tax = "1" then %>
+	window.parent.window.frames['taxa2'].window.document.forms['mainform'].elements['taxa'].value='<% =queryStr2 %>';
+	window.parent.window.frames['taxa2'].window.document.forms['mainform'].elements['lng'].value='<% =lng %>';
+	window.parent.window.frames['taxa2'].window.document.forms['mainform'].submit();
+<% end if %>
+}
+window.onfocus = ppHide;
+var ww = null;
+
+window.onclose = ppHide;
+
+function makeHelpWindow(n,w,h)
+{
+if (navigator.appName == "Microsoft Internet Explorer")
+<%
+	Response.write "{ ww = window.open('charhelp.asp?key=" & key & "&lng=" & lng & "&m=" & multistates & "&keyN=" & keyN & "&ch=' + n,'_blank','scrollbars=" & scroll & ",resizable=no,width=' + w + ',height=' + h + ',top=' + (screen.availHeight - h) / 2 + ',left=' + (screen.availWidth - w) / 2 ); }"
+%>
+else
+<%
+	Response.write "{ ww = window.open('charhelp.asp?key=" & key & "&lng=" & lng & "&m=" & multistates & "&keyN=" & keyN & "&ch=' + n,'_blank','scrollbars=yes,resizable=yes,width=' + w + ',height=' + h + ',top=' + (screen.availHeight - h) / 2 + ',left=' + (screen.availWidth - w) / 2 ); }"
+%>
+}
+
+function ppHide()
+{ if(ww != null) ww.close(); ww=null;}
+
+//-->
+</script>
+
+<%
+
+if len(link) > 9 then
+	link = left(link, len(link)-9)
+end if %>
+
+<form method='POST' action='char.asp' name='mainform'>
+
+<input type="hidden" name="sex" value="<% =sex %>">
+<input type="hidden" name="char" value="<% =char %>">
+<input type="hidden" name="tax" value="<% =tax %>">
+<input type="hidden" name="cat" value="<% =cat %>">
+<input type="hidden" name="tol" value="<% =tol %>">
+<input type="hidden" name="key" value="<% =key %>">
+<input type="hidden" name="keyN" value="<% =keyN %>">
+<input type="hidden" name="visit" value="<% =visit %>">
+<input type="hidden" name="lng" value="<% =lng %>">
+<input type="hidden" name="rank" value="<% =rank %>">
+<input type="hidden" name="unknowns" value="<% =unknowns %>">
+<input type="hidden" name="filter" value="<% =filter %>">
+<input type="hidden" name="multistates" value="<% =multistates %>">
+<%
+if cat <> "1" and strCharMax > 1 then
+For i = 1 to strCharMax - 1
+For j = i + 1 to strCharMax
+if strCharArr(i, 3) > strCharArr(j, 3) and cat = "0" then exit for
+                                                               if strCharArr(i, 2) > strCharArr(j, 2) then
+                                                                 CharTemp = strCharArr(i, 1)
+                                                                 strCharArr(i, 1) = strCharArr(j, 1)
+                                                                 strCharArr(j, 1) = CharTemp
+                                                                 CharTemp = strCharArr(i, 2)
+                                                                 strCharArr(i, 2) = strCharArr(j, 2)
+                                                                 strCharArr(j, 2) = CharTemp
+                                                               end if
+      Next
+  strChar1 = strChar1 + strCharArr(i, 1)
+  Next
+  strChar1 = strChar1 + strCharArr(strCharMax, 1)
+  elseIf cat = "2" or strCharMax = 1 then
+  strChar1 = strChar1 + strCharArr(1, 1)
+                                                               end if
+    if strChar2 & "" <> "" or filter <> "" then
+      response.write "<div class='a'><ul>" & sp
+      if strChar1 & "" <> "" then
+        response.write "<li><a href='#useful'>" & rst3("Useful") & "</a>" & sp
+        if len(link) > 0 then
+          response.write "<br>" & sp & "(" & link & ")" & sp & sp
+        end if
+      end if
+          if strChar3 & "" <> "" and char = "1" then
+            response.write "<li><a href='#useless'>" & rst3("Relevant") & "</a>" & sp
+          end if
+          response.write "</ul></div>" & sp & sp
+    end if
+
+
+    if strChar2 & "" <> "" then
+      response.Write sp & "<a Name='used'></a>" & sp & "<h2>" & rst3("Used") & "</h2>" & sp & sp
+    end if
+    if filter <> "" then
+      if strChar2 & "" = "" then response.Write sp & "<a Name='used'></a>" & sp & "<h2>" & rst3("Used") & "</h2>" & sp & sp
+      response.write "<p style='margin-bottom: 1em'><input type=checkbox checked name='f' value='1'>&nbsp;<b>Filter</b><br></p>" & sp & sp
+      else
+        response.write "<input type=hidden name='f' value=''>" & sp & sp
+      end if
+          if strChar2 & "" <> "" then
+            response.write "<div class='a'><ol>" & sp & sp & strChar2 & "</ol></div>" & sp
+          end if
+          if strChar1 & "" <> "" then
+            response.Write sp & "<a Name='useful'></a>" & sp & "<h2>" & rst3("Useful") & "</h2>" & sp & sp & "<p style='margin-bottom: 0em' align='center'>" & sp & link & sp & "</p>" & sp & sp & "<div class='a'><ol>" & sp & sp & strChar1 & "</ol></div>" & sp
+          end if
+          if strChar3 & "" <> "" and char = "1" then
+            response.Write sp & "<a Name='useless'></a>" & sp & "<h2>" & rst3("Relevant") & "</h2>" & sp & sp & "<div class='a'><ol>" & sp & sp & strChar3 & "</ol></div>" & sp
+          end if
+
+
+          function charReplace(string)
+      Do
+      if inStr(string, "[") > 0 and inStr(string, "]") - inStr(string, "[") > 0 then
+        string = trim(left(string, inStr(string, "[")-1) & right(string, len(string) - inStr(string, "]")))
+      else
+        Exit Do
+      end if
+          Loop
+      string = replace(string & "", "{", "")
+      string = replace(string, "}", "")
+      string = replace(string, " & ", " &amp; ")
+      if inStr(string & "<", "<") < inStrRev(">" & string, ">") and inStr(string, "</") > 0 then
+      else
+        string = replace(string, "<", "&lt;")
+        string = replace(string, ">", "&gt;")
+      end if
+          charReplace = string
+    end function
+
+rst3.Close
+Set rst3 = Nothing
+
+end if ' Datamatrix is empty
+=end
diff --git a/lib/queries/taxon_name/tabular.rb b/lib/queries/taxon_name/tabular.rb
index fadd700659..0da5fc9b60 100644
--- a/lib/queries/taxon_name/tabular.rb
+++ b/lib/queries/taxon_name/tabular.rb
@@ -92,13 +92,13 @@ def otu_table
 
       def base_query
         q = table
-        h = hierarchy_table     
+        h = hierarchy_table
 
         # Scope all names in the result
         a = table[:id].eq(h[:descendant_id])
           .and(h[:ancestor_id].eq(ancestor_id) )
         a = a.and(table[:cached_valid_taxon_name_id].eq(table[:id])) if validity
-       
+
         # Start a query 
         q = q.join(h, Arel::Nodes::InnerJoin).on(a)
 
diff --git a/spec/lib/interactive_key_spec.rb b/spec/lib/interactive_key_spec.rb
new file mode 100644
index 0000000000..a3a5458d9d
--- /dev/null
+++ b/spec/lib/interactive_key_spec.rb
@@ -0,0 +1,36 @@
+require 'rails_helper'
+require 'interactive_key'
+
+describe InteractiveKey, type: :model, group: :observation_matrix do
+
+  context 'respond to' do
+    let(:observation_matrix) { ObservationMatrix.create!(name: 'Matrix') }
+    let(:otu1) { Otu.create!(name: 'phoo') }
+    let(:otu2) { Otu.create!(name: 'barr') }
+    let(:descriptor1) { Descriptor::Working.create!(name: 'working1') }
+    let(:descriptor2) { Descriptor::Working.create!(name: 'working2') }
+    let!(:rus) { FactoryBot.create(:russian) }
+    let!(:eng) { FactoryBot.create(:english) }
+
+    let(:interactive_key) { InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id) }
+
+#    observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu1)
+#    observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu2)
+#    observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
+#    observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
+
+    specify 'observation_matrix' do
+      expect(interactive_key.observation_matrix).to eq(observation_matrix)
+    end
+
+    specify 'descriptor_available_languages' do
+      eng
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
+      a = AlternateValue.create(type: 'AlternateValue::Translation', value: 'zzz', alternate_value_object: descriptor1, alternate_value_object_attribute: 'name', language_id: rus.id)
+      observation_matrix.reload
+      expect(interactive_key.descriptor_available_languages.count).to eq(2)
+    end
+
+  end
+end

From c7e8479245fe20c61abe6f2f94abc2554ddf2406 Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Fri, 10 Jul 2020 22:02:00 -0500
Subject: [PATCH 16/76] interactive key

---
 lib/interactive_key.rb           | 156 ++++++++++++++-----------------
 lib/utilities/geo.rb             |   8 +-
 spec/lib/interactive_key_spec.rb |  19 ++++
 spec/lib/utilities/geo_spec.rb   |   1 +
 4 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/lib/interactive_key.rb b/lib/interactive_key.rb
index cd56f5762b..9428c21f6c 100644
--- a/lib/interactive_key.rb
+++ b/lib/interactive_key.rb
@@ -1,22 +1,48 @@
 # Contains methods used to build an interactive key
 class InteractiveKey
 
+  # required attribude to build the key
   attr_accessor :observation_matrix_id
 
+  #required attribute to build the key
   attr_accessor :project_id
 
+  #returns ObservationMatrix object
   attr_accessor :observation_matrix
 
+  #optional attribute to display the characters in a particular language
+  attr_accessor :language_id
+
+  #optional attribute to provide a list of tags to limit the set of characters "1|5|15"
+  attr_accessor :tag_ids
+
+
+
+  #returns the list of Languages used as translations for descriptors
   attr_accessor :descriptor_available_languages
 
+  #returns the list of all descriptors for this matrix
   attr_accessor :descriptors
 
-  def initialize(observation_matrix_id: nil, observation_matrix: nil, project_id: nil, descriptor_available_languages: nil)
+  #returns the list of all Tags used with the descriptors
+  attr_accessor :descriptor_available_tags
+
+  #the validated Language object to display descriptors in a particular language
+  attr_accessor :language_to_use
+
+  #list of descriptors reduced by tag_ids
+  attr_accessor :descriptors_to_use
+
+  def initialize(observation_matrix_id: nil, project_id: nil, language_id: nil, tag_ids: nil)
     raise if observation_matrix_id.blank? || project_id.blank?
     @observation_matrix_id = observation_matrix_id
     @project_id = project_id
     @observation_matrix = observation_matrix
     @descriptor_available_languages = descriptor_available_languages
+    @language_id = language_id
+    @language_to_use = language_to_use
+    @descriptors_to_use =
+    @descriptor_available_tags = descriptor_available_tags
   end
 
   def observation_matrix
@@ -38,98 +64,54 @@ def descriptor_available_languages
     languages
   end
 
-end
-
-=begin
+  def language_to_use
+    return nil if @language_id.blank?
+    l = Language.where(id: @language_id).first
+    return nil if l.nil? || !descriptor_available_languages.to_a.include?(l)
+    l
+  end
 
-strSQL = "SELECT Morph, Morph" & lng & " FROM Morph ORDER BY Morph"
-Set rst1 = Server.CreateObject("ADODB.Recordset")
-rst1.Open strSQL,Conn
+  def descriptor_available_tags
+    descriptor_ids = descriptors.pluck(:id)
+    tags = Keyword.joins(:tags)
+                    .where(tags: {tag_object_type: 'Descriptor'})
+                    .where('tags.tag_object_id IN (?)', descriptor_ids ).order('name').distinct.to_a
+  end
 
-<title>3I - Characters</title>
-<link rel="stylesheet" href="style.css">
-<link rel="meta" href="labels.rdf" type="application/rdf+xml" title="ICRA labels" />
-</head>
+  def descriptor_import_predicate
+    ###TODO import_attribute 'char_weight' exclude characters with weight == 0
+  end
 
-<%
-' Open recordset Set of all characters and states
-
-if sex <> replace(sex, "e", "") then where = where & "Characters.Type Like '%e%' or "
-if sex <> replace(sex, "l", "") then where = where & "Characters.Type Like '%l%' or "
-if sex <> replace(sex, "p", "") then where = where & "Characters.Type Like '%p%' or "
-if sex <> replace(sex, "n", "") then where = where & "Characters.Type Like '%n%' or "
-if sex <> replace(sex, "m", "") then where = where & "Characters.Type Like '%m%' or "
-if sex <> replace(sex, "f", "") then where = where & "Characters.Type Like '%f%' or "
-if sex <> replace(sex, "d", "") then where = where & "Characters.Type Like '%d%' or "
-if where & "" <> "" then where = "( " & left(where, len(where)-4) & ") and "
-where = "WHERE " & where & "(Characters.Weight is Null or Characters.Weight Not Like '0') "
-if keyN <> "" then where1 = "AND ','&Characters.KeyN&',' Like '%," & keyN & ",%' "
-
-strSQL = "SELECT Characters.Key1, Characters.Char, Characters.Type, Characters.Numeric, Characters.Morph, Characters.Weight, Characters.Char" & lng & ", Characters.Descr" & lng & ", State.Key2, State.State, State.State" & lng & ", State.Fig " &_
-	"FROM Characters INNER JOIN State ON Characters.Key1 = State.Key1 "
-if cat = "1" then
-	strSQL = strSQL & where & where1 & "ORDER BY Characters.Morph, Characters.Weight DESC, Characters.Char, State.State"
-else
-	strSQL = strSQL & where & where1 & "ORDER BY Characters.Weight DESC, Characters.Char, State.State"
-end if
-Set rst = Server.CreateObject("ADODB.Recordset")
-rst.Open strSQL,Conn
+  def observations
+    # id
+    # descriptor_id
+    # otu_id
+    # collection_object_id
+    # character_state_id
+    # continuous_value
+    # continuous_unit
+    # sample_min
+    # sample_max
+    # sample_unit
+    # presence
+    # description
+    # cached
+    # cached_column_label
+    # cached_row_label
+    # description
+    # type
+    ### types: Qualitative(char_states); Presence absence; Quantitative (single measurement); Sample (min, max); Free text
+  end
 
-' Fill out array taxa() with set of taxa
+  # rst = All characters ordered by Characters.Weight DESC, Characters.Char, State.State"
+  # rst2 = List of all taxa from the key ordered by hiercode
+  # filter = taxa with specic IDs
+  # list of used states
+  # count the number of errors for each taxon
+end
 
-if keyN = "" then
-	strSQL = "SELECT Key, Hiercode FROM TaxonQuery2 ORDER BY Hiercode"
-else
-	strSQL = "SELECT Key, Hiercode FROM TaxonQuery2 Where ','&KeyN&',' Like '%," & keyN & ",%' ORDER BY Hiercode"
-end if
-Set rst2 = Server.CreateObject("ADODB.Recordset")
-rst2.Open strSQL, Conn
+=begin
 
-if rank = "" then
-	Do Until rst2.EOF
-		taxaMax = taxaMax + 1
-		taxa(taxaMax, 0) = CStr(rst2("Key"))
-		taxa(taxaMax, 1) = CStr(rst2("Hiercode"))
-		if filter = "" or inStr(filter, "a" & rst2("Key") & "a") > 0 then
-			taxa(taxaMax, 2) = "0"
-		else
-			taxa(taxaMax, 2) = "-1"
-		end if
-		rst2.MoveNext
-	Loop
-	rst2.Close
-else
-	Set rst4 = Server.CreateObject("ADODB.Recordset")
-	strSQL = "SELECT Key, Hiercode, Rank FROM Taxon WHERE Rank>=" & rank & " ORDER BY Hiercode"
-	rst4.Open strSQL, Conn, 3, 3
-	Do Until rst2.EOF
-		rst4.moveLast
-		do until rst4("Hiercode") = left(rst2("Hiercode"), len(rst4("Hiercode")))
-			rst4.movePrevious
-		loop
-		hc = rst4("Hiercode")
-		i = rst4("Key")
-
-		if hc > taxa(taxaMax, 1) then
-			taxaMax = taxaMax + 1
-			taxa(taxaMax, 0) = i
-			taxa(taxaMax, 1) = hc
-			if filter = "" or inStr(filter, "a" & i & "a") > 0 then
-				taxa(taxaMax, 2) = "0"
-			else
-				taxa(taxaMax, 2) = "-1"
-			end if
-			taxa(taxaMax, 3) = "0"
-		end if
-		do until hc <> left(rst2("Hiercode"), len(hc))
-			rst2.MoveNext
-			if rst2.EOF then exit do
-		loop
-	Loop
-	rst2.Close
-	rst4.Close
-	Set rst4 = Nothing
-end if
 
 ' Save all used characters and their states into array charUsed()
 
diff --git a/lib/utilities/geo.rb b/lib/utilities/geo.rb
index 75f89f9575..699d5ef13d 100644
--- a/lib/utilities/geo.rb
+++ b/lib/utilities/geo.rb
@@ -446,7 +446,7 @@ def self.coordinates_regex_from_verbatim_label(text)
       coordinates = {}
 
       #  pattern: 42°5'18.1"S88°11'43.3"W
-      if matchdata1 = text.match(/\D(\d+) ?[\*°ººod˚ ] ?(\d+) ?[ '´ʹʼˊ] ?(\d+[\.|,]\d+|\d+) ?[ "ʺ”ˮ'´ʹʼˊ]['´ʹʼˊ]? ?([nN]|[sS])[\.,;]? ?(\d+) ?[\*°ººod˚ ] ?(\d+) ?[ '´ʹʼˊ]\ ?(\d+[\.|,]\d+|\d+) ?[ "ʺ”ˮ'´ʹʼˊ]['´ʹʼˊ]? ?([wW]|[eE])\W/)
+      if matchdata1 = text.match(/\D(\d+) ?[\*°ººod˚ ] ?(\d+) ?[ '´ʹʼ’ˊ] ?(\d+[\.|,]\d+|\d+) ?[ "ʺ”ˮ'´ʹʼ’ˊ]['´ʹʼ’ˊ]? ?([nN]|[sS])[\.,;]? ?(\d+) ?[\*°ººod˚ ] ?(\d+) ?[ '´ʹʼ’ˊ]\ ?(\d+[\.|,]\d+|\d+) ?[ "ʺ”ˮ'´ʹʼ’ˊ]['´ʹʼ’ˊ]? ?([wW]|[eE])\W/)
         coordinates[:lat_deg] = matchdata1[1]
         coordinates[:lat_min] = matchdata1[2]
         coordinates[:lat_sec] = matchdata1[3]
@@ -456,7 +456,7 @@ def self.coordinates_regex_from_verbatim_label(text)
         coordinates[:long_sec] = matchdata1[7]
         coordinates[:long_we]  = matchdata1[8]
         # pattern: S42°5'18.1"W88°11'43.3"
-      elsif matchdata2 = text.match(/\W([nN]|[sS])\.? ?(\d+) ?[\*°ººod˚ ] ?(\d+) ?[ '´ʹʼˊ] ?(\d+[\.|,]\d+|\d+) ?[ "ʺ”ˮ'´ʹʼˊ]['´ʹʼˊ]?[\.,;]? ?([wW]|[eE])\.? ?(\d+) ?[\*°ººod˚ ] ?(\d+) ?[ '´ʹʼˊ] ?(\d+[\.|,]\d+|\d+) ?[ "ʺ”ˮ'´ʹʼˊ]?['´ʹʼˊ]?\D/)
+      elsif matchdata2 = text.match(/\W([nN]|[sS])\.? ?(\d+) ?[\*°ººod˚ ] ?(\d+) ?[ '´ʹʼ’ˊ] ?(\d+[\.|,]\d+|\d+) ?[ "ʺ”ˮ'´ʹʼ’ˊ]['´ʹʼ’ˊ]?[\.,;]? ?([wW]|[eE])\.? ?(\d+) ?[\*°ººod˚ ] ?(\d+) ?[ '´ʹʼ’ˊ] ?(\d+[\.|,]\d+|\d+) ?[ "ʺ”ˮ'´ʹʼ’ˊ]?['´ʹʼ’ˊ]?\D/)
         coordinates[:lat_deg] = matchdata2[2]
         coordinates[:lat_min] = matchdata2[3]
         coordinates[:lat_sec] = matchdata2[4]
@@ -466,7 +466,7 @@ def self.coordinates_regex_from_verbatim_label(text)
         coordinates[:long_sec] = matchdata2[8]
         coordinates[:long_we]  = matchdata2[5]
         # pattern: S42°5.18'W88°11.43'
-      elsif matchdata3 = text.match(/\W([nN]|[sS])\.? ?(\d+) ?[\*°ººod˚ ] ?(\d+[\.|,]\d+|\d+) ?[ '´ʹʼˊ][\.,;]? ?([wW]|[eE])\.? ?(\d+) ?[\*°ººod˚ ] ?(\d+[\.|,]\d+|\d+) ?[ '´ʹʼˊ]?\D/)
+      elsif matchdata3 = text.match(/\W([nN]|[sS])\.? ?(\d+) ?[\*°ººod˚ ] ?(\d+[\.|,]\d+|\d+) ?[ '´ʹʼ’ˊ][\.,;]? ?([wW]|[eE])\.? ?(\d+) ?[\*°ººod˚ ] ?(\d+[\.|,]\d+|\d+) ?[ '´ʹʼ’ˊ]?\D/)
         coordinates[:lat_deg] = matchdata3[2]
         coordinates[:lat_min] = matchdata3[3]
         coordinates[:lat_ns]  = matchdata3[1]
@@ -474,7 +474,7 @@ def self.coordinates_regex_from_verbatim_label(text)
         coordinates[:long_min] = matchdata3[6]
         coordinates[:long_we]  = matchdata3[4]
         # pattern: 42°5.18'S88°11.43'W
-      elsif matchdata4 = text.match(/\D(\d+) ?[\*°ººod˚ ] ?(\d+[\.|,]\d+|\d+) ?[ '´ʹʼˊ]? ?([nN]|[sS])[\.,;]? ?(\d+) ?[\*°ººod˚ ] ?(\d+[\.|,]\d+|\d+) ?[ '´ʹʼˊ]? ?([wW]|[eE])\W/)
+      elsif matchdata4 = text.match(/\D(\d+) ?[\*°ººod˚ ] ?(\d+[\.|,]\d+|\d+) ?[ '´ʹʼ’ˊ]? ?([nN]|[sS])[\.,;]? ?(\d+) ?[\*°ººod˚ ] ?(\d+[\.|,]\d+|\d+) ?[ '´ʹʼ’ˊ]? ?([wW]|[eE])\W/)
         coordinates[:lat_deg] = matchdata4[1]
         coordinates[:lat_min] = matchdata4[2]
         coordinates[:lat_ns]  = matchdata4[3]
diff --git a/spec/lib/interactive_key_spec.rb b/spec/lib/interactive_key_spec.rb
index a3a5458d9d..06fd9af1f0 100644
--- a/spec/lib/interactive_key_spec.rb
+++ b/spec/lib/interactive_key_spec.rb
@@ -32,5 +32,24 @@
       expect(interactive_key.descriptor_available_languages.count).to eq(2)
     end
 
+    specify 'language_to_use' do
+      eng
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
+      a = AlternateValue.create(type: 'AlternateValue::Translation', value: 'zzz', alternate_value_object: descriptor1, alternate_value_object_attribute: 'name', language_id: rus.id)
+      observation_matrix.reload
+      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, language_id: rus.id)
+      expect(interactive_key.language_to_use).to eq(rus)
+    end
+
+    specify 'descriptor_available_tags' do
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
+      k = Keyword.create(name: 'zzz', definition: 'zzzzzzzzzzzzzzzzzzzzzzzzz')
+      descriptor1.tags.create(keyword: k)
+      observation_matrix.reload
+      expect(interactive_key.descriptor_available_tags.count).to eq(1)
+    end
+
   end
 end
diff --git a/spec/lib/utilities/geo_spec.rb b/spec/lib/utilities/geo_spec.rb
index 1ea7db0a0f..65d4d8a1d7 100644
--- a/spec/lib/utilities/geo_spec.rb
+++ b/spec/lib/utilities/geo_spec.rb
@@ -885,6 +885,7 @@
                    'text, S42°5ʼ18.1"W88°11ʼ43.3", text'  => '42/5/18.1/S/88/11/43.3/W',
                    'text, S42°5.18ʼW88°11.43ʼ, text'      => '42/5.18//S/88/11.43//W',
                    'text, 42°5.18ʼS88°11.43ʼW, text'      => '42/5.18//S/88/11.43//W',
+                   'text, 10°32’S, 75°21’W, text'         => '10/32//S/75/21//W',
                    'text, S42.18°W88.34°, text'           => '42.18///S/88.34///W',
                    'text, 42.18°S88.34°W, text'           => '42.18///S/88.34///W',
                    'text, -12.263, 49.398, text'          => '12.263///S/49.398///E'    }

From d64742bcda4abfb175b761b0f5491248e6c51b99 Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Wed, 15 Jul 2020 14:53:21 -0500
Subject: [PATCH 17/76] taxon_name_relationship wrong soft validation message
 for genera

---
 app/models/taxon_name.rb                      |  2 +-
 app/models/taxon_name_relationship.rb         | 28 +++++++++++--------
 lib/interactive_key.rb                        | 25 +++++++++++------
 spec/lib/interactive_key_spec.rb              | 18 ++++++++++--
 .../protonym_specs/soft_validation_spec.rb    |  8 +++---
 5 files changed, 55 insertions(+), 26 deletions(-)

diff --git a/app/models/taxon_name.rb b/app/models/taxon_name.rb
index a4db170167..552cf24a12 100644
--- a/app/models/taxon_name.rb
+++ b/app/models/taxon_name.rb
@@ -1338,7 +1338,7 @@ def sv_missing_original_publication
             maxP = matchdata[2] ? matchdata[2].to_i : matchdata[3].to_i
             minP = 1 if minP == maxP && %w{book booklet manual mastersthesis phdthesis techreport}.include?(self.source.bibtex_type)
             unless (maxP && minP && minP <= citMinP && maxP >= citMaxP)
-              soft_validations.add(:base, 'Original citation is out of the source page range')
+              soft_validations.add(:base, 'Original citation could be out of the source page range')
             end
           end
         end
diff --git a/app/models/taxon_name_relationship.rb b/app/models/taxon_name_relationship.rb
index 9008b601bf..7470cfc4b7 100644
--- a/app/models/taxon_name_relationship.rb
+++ b/app/models/taxon_name_relationship.rb
@@ -437,10 +437,13 @@ def sv_validate_required_relationships
   end
 
   def sv_validate_disjoint_relationships
-    subject_relationships = TaxonNameRelationship.where_subject_is_taxon_name(self.subject_taxon_name).not_self(self)
-    subject_relationships.each  do |i|
-      if self.type_class.disjoint_taxon_name_relationships.include?(i.type_name)
-        soft_validations.add(:type, "#{self.subject_status.capitalize} relationship is conflicting with another relationship: '#{i.subject_status}'")
+    tname = self.type_name
+    if tname =~ /TaxonNameRelationship::(Icnp|Icn|Iczn|Icvcn)/ && tname != 'TaxonNameRelationship::Iczn::Validating::UncertainPlacement'
+      subject_relationships = TaxonNameRelationship.where_subject_is_taxon_name(self.subject_taxon_name).not_self(self)
+      subject_relationships.each  do |i|
+        if self.type_class.disjoint_taxon_name_relationships.include?(i.type_name)
+          soft_validations.add(:type, "#{self.subject_status.capitalize} relationship is conflicting with another relationship: '#{i.subject_status}'")
+        end
       end
     end
   end
@@ -457,13 +460,16 @@ def sv_validate_disjoint_object
   end
 
   def sv_validate_disjoint_subject
-    classifications = self.subject_taxon_name.taxon_name_classifications.reload.map {|i| i.type_name}
-    disjoint_subject_classes = self.type_class.disjoint_subject_classes
-    compare = disjoint_subject_classes & classifications
-    compare.each do |i|
-      c = i.demodulize.underscore.humanize.downcase
-      soft_validations.add(:type, "#{self.subject_status.capitalize} conflicting with the status: '#{c}'")
-      soft_validations.add(:subject_taxon_name_id, "#{self.subject_taxon_name.cached_html} has a conflicting status: '#{c}'")
+    tname = self.type_name
+    if tname =~ /TaxonNameRelationship::(Icnp|Icn|Iczn|Icvcn)/ && tname != 'TaxonNameRelationship::Iczn::Validating::UncertainPlacement'
+      classifications = self.subject_taxon_name.taxon_name_classifications.reload.map {|i| i.type_name}
+      disjoint_subject_classes = self.type_class.disjoint_subject_classes
+      compare = disjoint_subject_classes & classifications
+      compare.each do |i|
+        c = i.demodulize.underscore.humanize.downcase
+        soft_validations.add(:type, "#{self.subject_status.capitalize} conflicting with the status: '#{c}'")
+        soft_validations.add(:subject_taxon_name_id, "#{self.subject_taxon_name.cached_html} has a conflicting status: '#{c}'")
+      end
     end
   end
 
diff --git a/lib/interactive_key.rb b/lib/interactive_key.rb
index 9428c21f6c..a63c2b0a80 100644
--- a/lib/interactive_key.rb
+++ b/lib/interactive_key.rb
@@ -14,7 +14,7 @@ class InteractiveKey
   attr_accessor :language_id
 
   #optional attribute to provide a list of tags to limit the set of characters "1|5|15"
-  attr_accessor :tag_ids
+  attr_accessor :keyword_ids
 
 
 
@@ -25,15 +25,15 @@ class InteractiveKey
   attr_accessor :descriptors
 
   #returns the list of all Tags used with the descriptors
-  attr_accessor :descriptor_available_tags
+  attr_accessor :descriptor_available_keywords
 
   #the validated Language object to display descriptors in a particular language
   attr_accessor :language_to_use
 
-  #list of descriptors reduced by tag_ids
-  attr_accessor :descriptors_to_use
+  #list of descriptors reduced by keyword_ids
+  attr_accessor :descriptors_with_filter
 
-  def initialize(observation_matrix_id: nil, project_id: nil, language_id: nil, tag_ids: nil)
+  def initialize(observation_matrix_id: nil, project_id: nil, language_id: nil, keyword_ids: nil)
     raise if observation_matrix_id.blank? || project_id.blank?
     @observation_matrix_id = observation_matrix_id
     @project_id = project_id
@@ -41,8 +41,9 @@ def initialize(observation_matrix_id: nil, project_id: nil, language_id: nil, ta
     @descriptor_available_languages = descriptor_available_languages
     @language_id = language_id
     @language_to_use = language_to_use
-    @descriptors_to_use =
-    @descriptor_available_tags = descriptor_available_tags
+    @keyword_ids = keyword_ids
+    @descriptor_available_keywords = descriptor_available_keywords
+    @descriptors_with_filter = descriptors_with_keywords
   end
 
   def observation_matrix
@@ -71,13 +72,21 @@ def language_to_use
     l
   end
 
-  def descriptor_available_tags
+  def descriptor_available_keywords
     descriptor_ids = descriptors.pluck(:id)
     tags = Keyword.joins(:tags)
                     .where(tags: {tag_object_type: 'Descriptor'})
                     .where('tags.tag_object_id IN (?)', descriptor_ids ).order('name').distinct.to_a
   end
 
+  def descriptors_with_keywords
+    if @keyword_ids
+      descriptors.joins(:tags).where('tags.keyword_id IN (?)', keyword_ids.to_s.split('|') )
+    else
+      descriptors
+    end
+  end
+
   def descriptor_import_predicate
     ###TODO import_attribute 'char_weight' exclude characters with weight == 0
   end
diff --git a/spec/lib/interactive_key_spec.rb b/spec/lib/interactive_key_spec.rb
index 06fd9af1f0..987683fa4a 100644
--- a/spec/lib/interactive_key_spec.rb
+++ b/spec/lib/interactive_key_spec.rb
@@ -42,13 +42,27 @@
       expect(interactive_key.language_to_use).to eq(rus)
     end
 
-    specify 'descriptor_available_tags' do
+    specify 'descriptor_available_keywords' do
       observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
       observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
       k = Keyword.create(name: 'zzz', definition: 'zzzzzzzzzzzzzzzzzzzzzzzzz')
       descriptor1.tags.create(keyword: k)
       observation_matrix.reload
-      expect(interactive_key.descriptor_available_tags.count).to eq(1)
+      expect(interactive_key.descriptor_available_keywords.count).to eq(1)
+    end
+
+    specify 'descriptors_with_keywords' do
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
+      k1 = Keyword.create(name: 'zzz1', definition: 'zzzzzzzzzzzzzzzzzzzzzzzzz')
+      k2 = Keyword.create(name: 'zzz2', definition: 'zzzzzzzzzzzzzzzzzzzzzzzzzz')
+      t1 = descriptor1.tags.create(keyword: k1)
+      t2 = descriptor2.tags.create(keyword: k2)
+      observation_matrix.reload
+      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, keyword_ids: t1.id)
+      expect(interactive_key.descriptors_with_filter.count).to eq(1)
+      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, keyword_ids: t1.id.to_s + '|' + t2.id.to_s)
+      expect(interactive_key.descriptors_with_filter.count).to eq(2)
     end
 
   end
diff --git a/spec/models/protonym_specs/soft_validation_spec.rb b/spec/models/protonym_specs/soft_validation_spec.rb
index b691e633d4..0360e45b51 100644
--- a/spec/models/protonym_specs/soft_validation_spec.rb
+++ b/spec/models/protonym_specs/soft_validation_spec.rb
@@ -97,16 +97,16 @@
         @genus.source.pages = '1-10, i-v'
         @genus.origin_citation.pages = '11'
         @genus.soft_validate(:missing_fields)
-        expect(@genus.soft_validations.messages_on(:base).include?('Original citation is out of the source page range')).to be_truthy
+        expect(@genus.soft_validations.messages_on(:base).include?('Original citation could be out of the source page range')).to be_truthy
         @genus.origin_citation.pages = '1'
         @genus.soft_validate(:missing_fields)
-        expect(@genus.soft_validations.messages_on(:base).include?('Original citation is out of the source page range')).to be_falsey
+        expect(@genus.soft_validations.messages_on(:base).include?('Original citation could be out of the source page range')).to be_falsey
         @genus.origin_citation.pages = '10'
         @genus.soft_validate(:missing_fields)
-        expect(@genus.soft_validations.messages_on(:base).include?('Original citation is out of the source page range')).to be_falsey
+        expect(@genus.soft_validations.messages_on(:base).include?('Original citation could be out of the source page range')).to be_falsey
         @genus.origin_citation.pages = '5'
         @genus.soft_validate(:missing_fields)
-        expect(@genus.soft_validations.messages_on(:base).include?('Original citation is out of the source page range')).to be_falsey
+        expect(@genus.soft_validations.messages_on(:base).include?('Original citation could be out of the source page range')).to be_falsey
       end
       specify 'etymology is missing' do
         @species.soft_validate(:missing_fields)

From 4b088baf0286b95a4ab26e2d2dd8f3a1c4e4feca Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Wed, 15 Jul 2020 15:46:38 -0500
Subject: [PATCH 18/76] taxon_name_relationship wrong soft validation message
 for genera

---
 app/models/taxon_name_relationship.rb          | 17 +++++++----------
 .../taxon_name_relationship/combination.rb     | 18 +++++++++---------
 .../combination_spec.rb                        |  6 +++---
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/app/models/taxon_name_relationship.rb b/app/models/taxon_name_relationship.rb
index 7470cfc4b7..00c078a612 100644
--- a/app/models/taxon_name_relationship.rb
+++ b/app/models/taxon_name_relationship.rb
@@ -460,16 +460,13 @@ def sv_validate_disjoint_object
   end
 
   def sv_validate_disjoint_subject
-    tname = self.type_name
-    if tname =~ /TaxonNameRelationship::(Icnp|Icn|Iczn|Icvcn)/ && tname != 'TaxonNameRelationship::Iczn::Validating::UncertainPlacement'
-      classifications = self.subject_taxon_name.taxon_name_classifications.reload.map {|i| i.type_name}
-      disjoint_subject_classes = self.type_class.disjoint_subject_classes
-      compare = disjoint_subject_classes & classifications
-      compare.each do |i|
-        c = i.demodulize.underscore.humanize.downcase
-        soft_validations.add(:type, "#{self.subject_status.capitalize} conflicting with the status: '#{c}'")
-        soft_validations.add(:subject_taxon_name_id, "#{self.subject_taxon_name.cached_html} has a conflicting status: '#{c}'")
-      end
+    classifications = self.subject_taxon_name.taxon_name_classifications.reload.map {|i| i.type_name}
+    disjoint_subject_classes = self.type_class.disjoint_subject_classes
+    compare = disjoint_subject_classes & classifications
+    compare.each do |i|
+      c = i.demodulize.underscore.humanize.downcase
+      soft_validations.add(:type, "#{self.subject_status.capitalize} conflicting with the status: '#{c}'")
+      soft_validations.add(:subject_taxon_name_id, "#{self.subject_taxon_name.cached_html} has a conflicting status: '#{c}'")
     end
   end
 
diff --git a/app/models/taxon_name_relationship/combination.rb b/app/models/taxon_name_relationship/combination.rb
index edcef8cfd2..55d46755c8 100644
--- a/app/models/taxon_name_relationship/combination.rb
+++ b/app/models/taxon_name_relationship/combination.rb
@@ -15,17 +15,17 @@ def self.order_index
     RANKS.index(::ICN_LOOKUP[self.name.demodulize.underscore.humanize.downcase])
   end
 
-  def self.disjoint_classes
-    self.collect_descendants_to_s(TaxonNameClassification)
-  end
+#  def self.disjoint_classes
+#    self.collect_descendants_to_s(TaxonNameClassification)
+#  end
 
-  def self.disjoint_subject_classes
-    self.disjoint_classes
-  end
+#  def self.disjoint_subject_classes
+#    self.disjoint_classes
+#  end
 
-  def self.disjoint_object_classes
-    self.disjoint_classes
-  end
+#  def self.disjoint_object_classes
+#    self.disjoint_classes
+#  end
 
   def self.nomenclatural_priority
     :reverse
diff --git a/spec/models/taxon_name_relationship/combination_spec.rb b/spec/models/taxon_name_relationship/combination_spec.rb
index 3a34506385..fcaa2d4d7a 100644
--- a/spec/models/taxon_name_relationship/combination_spec.rb
+++ b/spec/models/taxon_name_relationship/combination_spec.rb
@@ -14,9 +14,9 @@
     expect(TaxonNameRelationship::Combination::Genus.new.rank_name).to eq('genus')
   end
 
-  specify '.dijoint_classes' do
-    expect(TaxonNameRelationship::Combination::Genus.disjoint_classes).to include('TaxonNameClassification::Icn', 'TaxonNameClassification::Icn::EffectivelyPublished') # and many others
-  end
+#  specify '.dijoint_classes' do
+#    expect(TaxonNameRelationship::Combination::Genus.disjoint_classes).to include('TaxonNameClassification::Icn', 'TaxonNameClassification::Icn::EffectivelyPublished') # and many others
+#  end
 
   specify '#object_status' do
     expect(TaxonNameRelationship::Combination::Genus.new.object_status).to eq('genus in combination')

From 77346c5e7afec8be1849759125a6a97eac6399ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 15 Jul 2020 20:32:17 -0300
Subject: [PATCH 19/76] Added modal to handle original citations duplicates

---
 .../annotator/components/annotatorExtend.js   |   9 +-
 .../citations/citation_annotator.vue          | 190 +++++++++++-------
 .../citations/handleOriginalModal.vue         | 100 +++++++++
 .../annotator/components/citations/new.vue    |  10 +-
 app/javascript/vue/helpers/ajaxCall.js        |   5 +-
 .../components/taxonNameBox.vue               |   4 +-
 lib/queries/citation/filter.rb                |   9 +
 7 files changed, 244 insertions(+), 83 deletions(-)
 create mode 100644 app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue

diff --git a/app/javascript/vue/components/radials/annotator/components/annotatorExtend.js b/app/javascript/vue/components/radials/annotator/components/annotatorExtend.js
index dd90c39cdb..dcebb671ae 100644
--- a/app/javascript/vue/components/radials/annotator/components/annotatorExtend.js
+++ b/app/javascript/vue/components/radials/annotator/components/annotatorExtend.js
@@ -28,9 +28,7 @@ const vueAnnotator = {
     }
   },
   mounted: function () {
-    this.getList((typeof this.urlList == 'undefined') ? `${this.url}/${this.type}.json` : this.urlList).then(response => {
-      this.list = response.body
-    })
+    this.loadObjectsList()
   },
   watch: {
     list: {
@@ -56,6 +54,11 @@ const vueAnnotator = {
     },
     updateCount () {
       this.$emit('updateCount', this.list.length)
+    },
+    loadObjectsList () {
+      this.getList((typeof this.urlList == 'undefined') ? `${this.url}/${this.type}.json` : this.urlList).then(response => {
+        this.list = response.body
+      })
     }
   }
 }
diff --git a/app/javascript/vue/components/radials/annotator/components/citations/citation_annotator.vue b/app/javascript/vue/components/radials/annotator/components/citations/citation_annotator.vue
index 08737dcc4f..6106a8d981 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/citation_annotator.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/citation_annotator.vue
@@ -4,136 +4,178 @@
       <citation-new
         :global-id="globalId"
         :object-type="objectType"
-        @create="createNew"/>
+        @create="createNew"
+      />
       <table-list
         :list="list"
         @edit="citation = $event"
         @delete="removeItem"
-        />
+      />
     </div>
     <div v-else>
       <citation-edit
         :global-id="globalId"
         :citation="citation"
         @update="updateCitation"
-        @new="citation = newCitation()"/>
+        @new="citation = newCitation()"
+      />
       <citation-topic
         v-if="!disabledFor.includes(objectType)"
         :object-type="objectType"
         :global-id="globalId"
         :citation="citation"
-        @create="updateCitation"/>
+        @create="updateCitation"
+      />
       <table class="full_width">
         <thead>
           <tr>
             <th>Topic</th>
             <th>Pages</th>
-            <th></th>
+            <th />
           </tr>
         </thead>
         <tbody>
           <tr v-for="(item, index) in citation.citation_topics">
-            <td v-html="item.topic.object_tag"/>
+            <td v-html="item.topic.object_tag" />
             <td>
               <topic-pages
                 v-model="citation.citation_topics[index]"
                 :citation-id="citation.id"
-                @update="updateCitation"/>
+                @update="updateCitation"
+              />
             </td>
             <td class="horizontal-right-content">
               <span
                 class="button circle-button btn-delete"
-                @click="deleteTopic(item)"/>
+                @click="deleteTopic(item)"
+              />
             </td>
           </tr>
         </tbody>
       </table>
     </div>
+    <handle-citations
+      v-if="showModal"
+      :citation="currentCitation"
+      :original-citation="existingOriginal[0]"
+      @create="setCitation"
+      @close="resetCitations"
+    />
   </div>
 </template>
 <script>
 
-  import CRUD from '../../request/crud.js'
-  import annotatorExtend from '../annotatorExtend.js'
-  import TableList from './table.vue'
-  import CitationNew from './new.vue'
-  import CitationEdit from './edit.vue'
-  import CitationTopic from './topic.vue'
-  import TopicPages from './pagesUpdate'
+import CRUD from '../../request/crud.js'
+import annotatorExtend from '../annotatorExtend.js'
+import TableList from './table.vue'
+import CitationNew from './new.vue'
+import CitationEdit from './edit.vue'
+import CitationTopic from './topic.vue'
+import TopicPages from './pagesUpdate'
+import HandleCitations from './handleOriginalModal'
 
-  export default {
-    mixins: [CRUD, annotatorExtend],
-    components: {
-      CitationNew,
-      CitationEdit,
-      CitationTopic,
-      TableList,
-      TopicPages
+export default {
+  mixins: [CRUD, annotatorExtend],
+  components: {
+    CitationNew,
+    CitationEdit,
+    CitationTopic,
+    TableList,
+    TopicPages,
+    HandleCitations
+  },
+  computed: {
+    validateFields () {
+      return this.citation.source_id
+    }
+  },
+  data () {
+    return {
+      list: [],
+      citation: this.newCitation(),
+      topic: this.newTopic(),
+      autocompleteLabel: undefined,
+      disabledFor: ['Content'],
+      showModal: false,
+      existingOriginal: [],
+      currentCitation: undefined
+    }
+  },
+  methods: {
+    setCitation(citation) {
+      this.resetCitations()
+      this.citation = citation
+      this.loadObjectsList()
+    },
+    resetCitations () {
+      this.showModal = false
+      this.currentCitation = undefined
+      this.existingOriginal = []
     },
-    computed: {
-      validateFields() {
-        return this.citation.source_id
+    newCitation () {
+      return {
+        annotated_global_entity: decodeURIComponent(this.globalId),
+        source_id: undefined,
+        is_original: false,
+        pages: undefined,
+        citation_topics_attributes: []
       }
     },
-    data() {
+    newTopic () {
       return {
-        list: [],
-        citation: this.newCitation(),
-        topic: this.newTopic(),
-        autocompleteLabel: undefined,
-        disabledFor: ['Content']
+        topic_id: undefined,
+        pages: undefined
       }
     },
-    methods: {
-      newCitation() {
-        return {
-          annotated_global_entity: decodeURIComponent(this.globalId),
-          source_id: undefined,
-          is_original: false,
-          pages: undefined,
-          citation_topics_attributes: []
-        }
-      },
-      newTopic() {
-        return {
-          topic_id: undefined,
-          pages: undefined
-        }
-      },
-      deleteTopic(topic) {
-        let object = {
-          id: this.citation.id,
-          citation_topics_attributes: [{
-            id: topic.id,
-            _destroy: true
-          }]
-        }
-        this.update(`/citations/${object.id}`, {citation: object}).then(response => {
-          this.citation.citation_topics.splice(
-            this.citation.citation_topics.findIndex(element => element.id == topic.id), 1)
-        })
-      },
-      updateCitation(editCitation) {
-        this.update(`/citations/${editCitation.id}`, { citation: editCitation }).then(response => {
-          this.citation = response.body
-          this.list[this.list.findIndex(element => element.id == editCitation.id)] = response.body
-          TW.workbench.alert.create('Citation was successfully updated.', 'notice')
+    deleteTopic (topic) {
+      const object = {
+        id: this.citation.id,
+        citation_topics_attributes: [{
+          id: topic.id,
+          _destroy: true
+        }]
+      }
+      this.update(`/citations/${object.id}`, { citation: object }).then(response => {
+        this.citation.citation_topics.splice(
+          this.citation.citation_topics.findIndex(element => element.id == topic.id), 1)
+      })
+    },
+    updateCitation (editCitation) {
+      this.update(`/citations/${editCitation.id}`, { citation: editCitation }).then(response => {
+        this.citation = response.body
+        this.list[this.list.findIndex(element => element.id == editCitation.id)] = response.body
+        TW.workbench.alert.create('Citation was successfully updated.', 'notice')
+      })
+    },
+    async createNew (newCitation) {
+      if (newCitation.is_original) {
+        const loadCitations = await this.getList('/citations.json', {
+          params: {
+            citation_object_type: this.objectType,
+            citation_object_id: this.metadata.object_id,
+            is_original: true
+          }
         })
-      },
-      createNew(newCitation) {
-        this.create('/citations', {citation: newCitation}).then(response => {
+        this.existingOriginal = loadCitations.body
+        this.currentCitation = newCitation
+      }
+      if (this.existingOriginal.length) {
+        this.showModal = true
+      } else {
+        this.create('/citations', { citation: newCitation }).then(response => {
           this.list.push(response.body)
           this.citation = response.body
           TW.workbench.alert.create('Citation was successfully created.', 'notice')
         })
-      },
-      updateTopic(topic) {
-        this.update(`/citation_topics/${topic.id}.json`, { citation_topic: topic }).then(response => {
-          TW.workbench.alert.create('Topic was successfully updated.', 'notice')
-        })
       }
+    },
+    updateTopic (topic) {
+      this.update(`/citation_topics/${topic.id}.json`, { citation_topic: topic }).then(response => {
+        TW.workbench.alert.create('Topic was successfully updated.', 'notice')
+      })
     }
   }
+}
 </script>
 <style lang="scss">
   .radial-annotator {
diff --git a/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
new file mode 100644
index 0000000000..7bcce68bb0
--- /dev/null
+++ b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
@@ -0,0 +1,100 @@
+<template>
+  <modal-component
+    @close="$emit('close')">
+    <h3 slot="header">Select original citation</h3>
+    <div slot="body">
+      <p>Already exist an original citation. Select one of the following options to proceed:</p>
+      <p>
+        <span>Current original citation: <b v-html="originalCitation.source.author_year"/></span>
+        <br>
+        <span>New citation: <b v-html="citation.author_year"/></span>
+      </p>
+      <ul class="no_bullets">
+        <li v-for="option in options">
+          <label>
+            <input
+              name="handle-original"
+              type="radio"
+              :value="option.value"
+              v-model="keepOriginal">
+            {{ option.label }}
+          </label>
+        </li>
+      </ul>
+    </div>
+    <div slot="footer">
+      <button
+        type="button"
+        class="button normal-input button-submit"
+        @click="handleCitation">
+        Save
+      </button>
+    </div>
+  </modal-component>
+</template>
+
+<script>
+
+import ModalComponent from 'components/modal'
+import CRUD from '../../request/crud.js'
+
+export default {
+  mixins: [CRUD],
+  components: {
+    ModalComponent
+  },
+  props: {
+    citation: {
+      type: Object,
+      required: true
+    },
+    originalCitation: {
+      type: Object,
+      required: true
+    }
+  },
+  data () {
+    return {
+      options: [
+        {
+          label: 'Keep previous citation as original, create new one as non original.',
+          value: true
+        },
+        {
+          label: 'Make new citation original.',
+          value: false
+        }
+      ],
+      keepOriginal: true
+    }
+  },
+  methods: {
+    createNonOriginal () {
+      this.create('/citations.json', { citation: Object.assign({}, this.citation, { is_original: false }) }).then(response => {
+        this.$emit('create', response.body)
+        this.$emit('close')
+      })
+    },
+    changeOriginal () {
+      this.update(`/citations/${this.originalCitation.id}.json`, { citation: Object.assign({}, this.originalCitation, { is_original: false }) }).then(response => {
+        this.create('/citations.json', { citation: this.citation }).then(response => {
+          this.$emit('create', response.body)
+          this.$emit('close')
+        })
+      })
+    },
+    handleCitation () {
+      if (this.keepOriginal) {
+        this.createNonOriginal()
+      } else {
+        this.changeOriginal()
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+  /deep/ .modal-container {
+    background-color: white !important;
+  }
+</style>
diff --git a/app/javascript/vue/components/radials/annotator/components/citations/new.vue b/app/javascript/vue/components/radials/annotator/components/citations/new.vue
index af863abbd9..cccfb98c05 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/new.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/new.vue
@@ -8,12 +8,12 @@
         pin-section="Sources"
         :klass="objectType"
         pin-type="Source"
-        @selected="citation.source_id = $event.id"
+        @selected="citation.source_id = $event.id; citation.author_year = getAuthorYear($event)"
         v-model="source">
         <div slot="footer">
           <div
             v-if="source"
-            class="horizontal-left-content margin-small-bottom">
+            class="horizontal-left-content margin-medium-bottom margin-medium-top">
             <span
               v-html="source.object_tag"/>
             <span
@@ -86,7 +86,8 @@
           source_id: undefined,
           is_original: false,
           pages: undefined,
-          citation_topics_attributes: []
+          citation_topics_attributes: [],
+          author_year: undefined
         }
       },
       sendCitation() {
@@ -97,6 +98,9 @@
       unsetSource () {
         this.citation.source_id = undefined,
         this.source = undefined
+      },
+      getAuthorYear (source) {
+        return `${source.cached_author_string}, ${source.year}`
       }
     }
   }
diff --git a/app/javascript/vue/helpers/ajaxCall.js b/app/javascript/vue/helpers/ajaxCall.js
index 2dd511d3cf..3c6677842e 100644
--- a/app/javascript/vue/helpers/ajaxCall.js
+++ b/app/javascript/vue/helpers/ajaxCall.js
@@ -36,11 +36,14 @@ const ajaxCall = function (type, url, data = {}, config = {}) {
       if (process.env.NODE_ENV !== 'production') {
         console.log(error.response)
       }
+      error.response.body = error.response.data
+      delete error.response.data
+
       switch (error.response.status) {
         case 404:
           break
         default:
-          handleError(error.response.data)
+          handleError(error.response.body)
       }
       return reject(error.response)
     })
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/taxonNameBox.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/taxonNameBox.vue
index 8f93f08e7e..33583c3fba 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/taxonNameBox.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/taxonNameBox.vue
@@ -14,7 +14,7 @@
     </modal>
     <div class="panel basic-information">
       <div class="content header">
-        <h3
+        <div
           v-if="taxon.id"
           class="flex-separate middle">
           <a
@@ -54,7 +54,7 @@
                 class="circle-button btn-delete"/>
             </div>
           </div>
-        </h3>
+        </div>
         <h3
           class="taxonname"
           v-else>New</h3>
diff --git a/lib/queries/citation/filter.rb b/lib/queries/citation/filter.rb
index 5b79f56b07..28bc74b670 100644
--- a/lib/queries/citation/filter.rb
+++ b/lib/queries/citation/filter.rb
@@ -16,12 +16,16 @@ class Filter
       # Array, Integer
       attr_accessor :citation_object_type, :citation_object_id, :source_id
 
+      # Boolean
+      attr_accessor :is_original
+
       # @params params [Hash]
       #   already Permitted params, or new Hash
       def initialize(params)
         @citation_object_type = params[:citation_object_type]
         @citation_object_id = params[:citation_object_id]
         @source_id = params[:source_id]
+        @is_original = params[:is_original]
         @options = params
       end
 
@@ -32,6 +36,7 @@ def and_clauses
           matching_citation_object_type,
           matching_citation_object_id,
           matching_source_id,
+          matching_is_original
         ].compact
 
         return nil if clauses.empty?
@@ -58,6 +63,10 @@ def matching_source_id
         source_id.blank? ? nil : table[:source_id].eq(source_id)  
       end
 
+      def matching_is_original
+        is_original.blank? ? nil : table[:is_original].eq(is_original)  
+      end
+
       # @return [ActiveRecord::Relation]
       def all
         if a = and_clauses

From 7cfb741206603fafcf2c326ee0b4e71c0583887a Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Wed, 15 Jul 2020 22:12:10 -0500
Subject: [PATCH 20/76] notifier error fix on TN

---
 app/models/taxon_name.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/taxon_name.rb b/app/models/taxon_name.rb
index 552cf24a12..3cf95b6885 100644
--- a/app/models/taxon_name.rb
+++ b/app/models/taxon_name.rb
@@ -1325,8 +1325,8 @@ def sv_missing_original_publication
 
       if self.source.nil?
         soft_validations.add(:base, 'Original publication is not selected')
-      elsif self.origin_citation.pages.blank?
-        soft_validations.add(:base, 'Original citation pages are not indicated')
+      elsif self.origin_citation.try(:pages).blank?
+        soft_validations.add(:base, 'Original citation pages are not recorded')
       elsif !self.source.pages.blank?
         matchdata1 = self.origin_citation.pages.match(/(\d+) ?[-–] ?(\d+)|(\d+)/)
         if matchdata1

From d52faef7672bbed7f65ac80e08c885125b93c638 Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Wed, 15 Jul 2020 22:35:57 -0500
Subject: [PATCH 21/76] original citatition change message

---
 .../components/citations/handleOriginalModal.vue       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
index 7bcce68bb0..5fc0e5a00d 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
@@ -3,11 +3,11 @@
     @close="$emit('close')">
     <h3 slot="header">Select original citation</h3>
     <div slot="body">
-      <p>Already exist an original citation. Select one of the following options to proceed:</p>
+      <p>A new citation is marked as original, but another original citation already exists. Select one of the following actions to proceed:</p>
       <p>
-        <span>Current original citation: <b v-html="originalCitation.source.author_year"/></span>
+        <span>Existing original citation: <b v-html="originalCitation.source.author_year"/></span>
         <br>
-        <span>New citation: <b v-html="citation.author_year"/></span>
+        <span>Proposed new original citation: <b v-html="citation.author_year"/></span>
       </p>
       <ul class="no_bullets">
         <li v-for="option in options">
@@ -57,11 +57,11 @@ export default {
     return {
       options: [
         {
-          label: 'Keep previous citation as original, create new one as non original.',
+          label: 'Keep the existing citation as original, save a new one as non original.',
           value: true
         },
         {
-          label: 'Make new citation original.',
+          label: 'Save a new citation as original.',
           value: false
         }
       ],

From c85193ee175dbb136e24a1441075b2c84337b1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Thu, 16 Jul 2020 10:40:33 -0300
Subject: [PATCH 22/76] Fix #1576

---
 CHANGELOG.md                                          |  4 +++-
 .../components/citations/handleOriginalModal.vue      | 11 +++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bbf584019..fa3e230e0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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]
 
 ### Changed
 
@@ -23,9 +24,10 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ### Fixed
 
-- Flip object to subject on type label in new taxon name task
+- Flip object to subject label on type section in new taxon name task
 
 [#1329]: https://github.com/SpeciesFileGroup/taxonworks/issues/1329
+[#1576]: https://github.com/SpeciesFileGroup/taxonworks/issues/1576
 [#1617]: https://github.com/SpeciesFileGroup/taxonworks/issues/1617
 [#1618]: https://github.com/SpeciesFileGroup/taxonworks/issues/1618
 
diff --git a/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
index 5fc0e5a00d..126640476f 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
@@ -4,11 +4,6 @@
     <h3 slot="header">Select original citation</h3>
     <div slot="body">
       <p>A new citation is marked as original, but another original citation already exists. Select one of the following actions to proceed:</p>
-      <p>
-        <span>Existing original citation: <b v-html="originalCitation.source.author_year"/></span>
-        <br>
-        <span>Proposed new original citation: <b v-html="citation.author_year"/></span>
-      </p>
       <ul class="no_bullets">
         <li v-for="option in options">
           <label>
@@ -17,7 +12,7 @@
               type="radio"
               :value="option.value"
               v-model="keepOriginal">
-            {{ option.label }}
+            <span v-html="option.label"/>
           </label>
         </li>
       </ul>
@@ -57,11 +52,11 @@ export default {
     return {
       options: [
         {
-          label: 'Keep the existing citation as original, save a new one as non original.',
+          label: `Keep <i>${this.originalCitation.source.author_year}</i> as original, save <i>${this.citation.author_year}</i> as non original.`,
           value: true
         },
         {
-          label: 'Save a new citation as original.',
+          label: `Save <i>${this.citation.author_year}</i> as original citation.`,
           value: false
         }
       ],

From 4e3a79e40e37cc1cb988f9bf945c2d001d7ae0a8 Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Thu, 16 Jul 2020 14:17:16 -0500
Subject: [PATCH 23/76] interactive_key model

---
 .../citations/handleOriginalModal.vue         |  4 +--
 lib/interactive_key.rb                        | 27 ++++++++++++++++---
 spec/lib/interactive_key_spec.rb              | 11 ++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
index 126640476f..599abf6941 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
@@ -52,11 +52,11 @@ export default {
     return {
       options: [
         {
-          label: `Keep <i>${this.originalCitation.source.author_year}</i> as original, save <i>${this.citation.author_year}</i> as non original.`,
+          label: `Keep <b>${this.originalCitation.source.author_year}</b> as original, save <b>${this.citation.author_year}</b> as non original.`,
           value: true
         },
         {
-          label: `Save <i>${this.citation.author_year}</i> as original citation.`,
+          label: `Save <b>${this.citation.author_year}</b> as original citation.`,
           value: false
         }
       ],
diff --git a/lib/interactive_key.rb b/lib/interactive_key.rb
index a63c2b0a80..c68ae1e3d9 100644
--- a/lib/interactive_key.rb
+++ b/lib/interactive_key.rb
@@ -13,9 +13,12 @@ class InteractiveKey
   #optional attribute to display the characters in a particular language
   attr_accessor :language_id
 
-  #optional attribute to provide a list of tags to limit the set of characters "1|5|15"
+  #optional attribute to provide a list of tagIDs to limit the set of characters "1|5|15"
   attr_accessor :keyword_ids
 
+  #optional attribute to provide a list of rowIDs to limit the set "1|5|10"
+  attr_accessor :row_filter
+
 
 
   #returns the list of Languages used as translations for descriptors
@@ -33,7 +36,10 @@ class InteractiveKey
   #list of descriptors reduced by keyword_ids
   attr_accessor :descriptors_with_filter
 
-  def initialize(observation_matrix_id: nil, project_id: nil, language_id: nil, keyword_ids: nil)
+  #list of rows to be included into the matrix
+  attr_accessor :rows_with_filter
+
+  def initialize(observation_matrix_id: nil, project_id: nil, language_id: nil, keyword_ids: nil, row_filter: nil)
     raise if observation_matrix_id.blank? || project_id.blank?
     @observation_matrix_id = observation_matrix_id
     @project_id = project_id
@@ -44,6 +50,8 @@ def initialize(observation_matrix_id: nil, project_id: nil, language_id: nil, ke
     @keyword_ids = keyword_ids
     @descriptor_available_keywords = descriptor_available_keywords
     @descriptors_with_filter = descriptors_with_keywords
+    @row_filter = row_filter
+    @rows_with_filter = rows_with_filter
   end
 
   def observation_matrix
@@ -81,12 +89,25 @@ def descriptor_available_keywords
 
   def descriptors_with_keywords
     if @keyword_ids
-      descriptors.joins(:tags).where('tags.keyword_id IN (?)', keyword_ids.to_s.split('|') )
+      descriptors.joins(:tags).where('tags.keyword_id IN (?)', @keyword_ids.to_s.split('|') )
     else
       descriptors
     end
   end
 
+  def rows
+    ObservationMatrixRow.where(observation_matrix_id: @observation_matrix_id)
+  end
+
+  def rows_with_filter
+    if @row_item_filter
+      rows
+    else
+      rows.where('observation_matrix_rows.id IN (?)', @row_filter.to_s.split('|'))
+    end
+
+  end
+
   def descriptor_import_predicate
     ###TODO import_attribute 'char_weight' exclude characters with weight == 0
   end
diff --git a/spec/lib/interactive_key_spec.rb b/spec/lib/interactive_key_spec.rb
index 987683fa4a..ab5b6c0ebb 100644
--- a/spec/lib/interactive_key_spec.rb
+++ b/spec/lib/interactive_key_spec.rb
@@ -65,5 +65,16 @@
       expect(interactive_key.descriptors_with_filter.count).to eq(2)
     end
 
+    specify 'rows_with_filter' do
+      o1 = observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu1)
+      o2 = observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu2)
+      observation_matrix.reload
+      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, row_filter: observation_matrix.observation_matrix_rows.first.id)
+      expect(interactive_key.rows_with_filter.count).to eq(1)
+      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, row_filter: observation_matrix.observation_matrix_rows.first.id.to_s + '|' + observation_matrix.observation_matrix_rows.last.id.to_s)
+      expect(interactive_key.rows_with_filter.count).to eq(2)
+    end
+
+
   end
 end

From bf7839ade099da2b17fc7064a324c99f2ba2714f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Thu, 16 Jul 2020 17:44:32 -0300
Subject: [PATCH 24/76] Added soft validation component

---
 CHANGELOG.md                                  |  1 +
 .../radials/annotator/annotator.vue           |  7 +-
 .../annotator/components/citations/edit.vue   | 75 +++++++++++--------
 .../citations/handleOriginalModal.vue         |  5 --
 .../annotator/components/citations/table.vue  | 53 ++++++-------
 .../vue/components/radials/object/radial.vue  | 67 +----------------
 .../soft_validations/objectValidation.vue     | 62 +++++++++++++++
 7 files changed, 136 insertions(+), 134 deletions(-)
 create mode 100644 app/javascript/vue/components/soft_validations/objectValidation.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa3e230e0c..fd33cc1c69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 
 ### Changed
 
diff --git a/app/javascript/vue/components/radials/annotator/annotator.vue b/app/javascript/vue/components/radials/annotator/annotator.vue
index 13489579bd..8d744f7aa0 100644
--- a/app/javascript/vue/components/radials/annotator/annotator.vue
+++ b/app/javascript/vue/components/radials/annotator/annotator.vue
@@ -4,6 +4,7 @@
       class="radial-annotator">
       <modal
         v-if="display"
+        :container-style="{ backgroundColor: 'transparent' }"
         @close="closeModal()">
         <h3
           slot="header"
@@ -11,7 +12,7 @@
           <span v-html="title" />
           <span
             v-if="metadata"
-            class="separate-right"> 
+            class="separate-right">
             {{ metadata.object_type }}
           </span>
         </h3>
@@ -360,10 +361,6 @@ export default {
     .modal-mask {
       background-color: rgba(0, 0, 0, 0.7);
     }
-    .modal-container {
-      box-shadow: none;
-      background-color: transparent;
-    }
     .modal-container {
       min-width: 1024px;
       width: 1200px;
diff --git a/app/javascript/vue/components/radials/annotator/components/citations/edit.vue b/app/javascript/vue/components/radials/annotator/components/citations/edit.vue
index d90cd449a5..0e566f827d 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/edit.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/edit.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="field">
-    <span v-html="editCitation.object_tag"/>
+    <div class="horizontal-left-content">
+      <span v-html="editCitation.object_tag"/>
+      <soft-validation
+        class="margin-small-left"
+        :global-id="editCitation.global_id"/>
+    </div>
     <div class="flex-separate separate-bottom separate-top field">
       <label class="inline middle">
         <input
@@ -29,39 +34,43 @@
 </template>
 <script>
 
-  export default {
-    props: {
-      citation: {
-        type: Object,
-        required: true
-      },
-      globalId: {
-        type: String,
-        required: true
-      }
-    },
-    computed: {
-      validateFields() {
-        return this.citation.source_id
-      }
+import SoftValidation from 'components/soft_validations/objectValidation.vue'
+export default {
+  components: {
+    SoftValidation
+  },
+  props: {
+    citation: {
+      type: Object,
+      required: true
     },
-    data() {
-      return {
-        editCitation: this.citation,
-      }
-    },
-    watch: {
-      citation(newVal) {
-        this.citation = newVal
-      }
+    globalId: {
+      type: String,
+      required: true
+    }
+  },
+  computed: {
+    validateFields() {
+      return this.citation.source_id
+    }
+  },
+  data() {
+    return {
+      editCitation: this.citation,
+    }
+  },
+  watch: {
+    citation(newVal) {
+      this.citation = newVal
+    }
+  },
+  methods: {
+    sendCitation() {
+      this.$emit('update', this.editCitation)
     },
-    methods: {
-      sendCitation() {
-        this.$emit('update', this.editCitation)
-      },
-      newCitation() {
-        this.$emit('new', true)
-      }
+    newCitation() {
+      this.$emit('new', true)
     }
   }
-</script>
\ No newline at end of file
+}
+</script>
diff --git a/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
index 599abf6941..4a0be8c77d 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/handleOriginalModal.vue
@@ -88,8 +88,3 @@ export default {
   }
 }
 </script>
-<style scoped>
-  /deep/ .modal-container {
-    background-color: white !important;
-  }
-</style>
diff --git a/app/javascript/vue/components/radials/annotator/components/citations/table.vue b/app/javascript/vue/components/radials/annotator/components/citations/table.vue
index bd6770a679..626ce9e01f 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/table.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/table.vue
@@ -15,9 +15,12 @@
           :key="item.id"
           class="list-complete-item">
           <td>
-            <span 
+            <span
               :class="{ originalCitation: item.is_original }"
               v-html="item.object_tag"/>
+            <soft-validation
+              class="margin-small-left"
+              :global-id="item.global_id"/>
           </td>
           <td class="vue-table-options">
             <a
@@ -43,35 +46,35 @@
 </template>
 <script>
 
-  import RadialAnnotator from 'components/radials/annotator/annotator.vue'
-  import CitationCount from '../shared/citationsCount.vue'
-  import PdfButton from 'components/pdfButton.vue'
+import RadialAnnotator from 'components/radials/annotator/annotator.vue'
+import PdfButton from 'components/pdfButton.vue'
+import SoftValidation from 'components/soft_validations/objectValidation'
 
-  export default {
-    components: {
-      RadialAnnotator,
-      CitationCount,
-      PdfButton
-    },
-    props: {
-      list: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-    },
-    mounted() {
-      this.$options.components['RadialAnnotator'] = RadialAnnotator
+export default {
+  components: {
+    RadialAnnotator,
+    SoftValidation,
+    PdfButton
+  },
+  props: {
+    list: {
+      type: Array,
+      default: () => {
+        return []
+      }
     },
-    methods: {
-      deleteItem(item) {
-        if(window.confirm(`You're trying to delete this record. Are you sure want to proceed?`)) {
-          this.$emit('delete', item)
-        }
+  },
+  mounted() {
+    this.$options.components['RadialAnnotator'] = RadialAnnotator
+  },
+  methods: {
+    deleteItem(item) {
+      if(window.confirm(`You're trying to delete this record. Are you sure want to proceed?`)) {
+        this.$emit('delete', item)
       }
     }
   }
+}
 </script>
 <style lang="scss" scoped>
   .vue-table-container {
diff --git a/app/javascript/vue/components/radials/object/radial.vue b/app/javascript/vue/components/radials/object/radial.vue
index 13c6183faa..8b338d07cf 100644
--- a/app/javascript/vue/components/radials/object/radial.vue
+++ b/app/javascript/vue/components/radials/object/radial.vue
@@ -3,6 +3,7 @@
     <div class="radial-annotator">
       <modal
         v-if="display"
+        :container-style="{ backgroundColor: 'transparent' }"
         @close="closeModal()">
         <h3
           slot="header"
@@ -301,69 +302,3 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-
-  .radial-annotator {
-    position: relative;
-    .view-title {
-      font-size: 18px;
-      font-weight: 300;
-    }
-    .modal-close {
-      top: 30px;
-      right: 20px;
-    }
-    .modal-mask {
-      background-color: rgba(0, 0, 0, 0.7);
-    }
-    .modal-container {
-      box-shadow: none;
-      background-color: transparent;
-    }
-    .modal-container {
-      min-width: 1024px;
-      width: 1200px;
-    }
-    .radial-annotator-template {
-      border-radius: 3px;
-      background: #FFFFFF;
-      padding: 1em;
-      width: 100%;
-      max-width: 100%;
-      min-height: 600px;
-    }
-    .radial-annotator-container {
-      display: flex;
-      height: 600px;
-      flex-direction: column;
-      overflow-y: scroll;
-    }
-    .radial-annotator-menu {
-      padding-top: 1em;
-      padding-bottom: 1em;
-      width: 700px;
-      min-height: 650px;
-    }
-    .annotator-buttons-list {
-      overflow-y: scroll;
-    }
-    .save-annotator-button {
-      width: 100px;
-    }
-    .circle-count {
-      bottom: -6px;
-    }
-  }
-
-  .tag_button {
-    padding-left: 12px;
-    padding-right: 8px;
-    width: auto !important;
-    min-width: auto !important;
-    cursor: pointer;
-    margin: 2px;
-    border: none;
-    border-top-left-radius: 15px;
-    border-bottom-left-radius: 15px;
-  }
-</style>
diff --git a/app/javascript/vue/components/soft_validations/objectValidation.vue b/app/javascript/vue/components/soft_validations/objectValidation.vue
new file mode 100644
index 0000000000..d71f07711a
--- /dev/null
+++ b/app/javascript/vue/components/soft_validations/objectValidation.vue
@@ -0,0 +1,62 @@
+<template>
+  <span>
+    <span
+      v-if="validations.length"
+      data-icon="warning"
+      class="cursor-pointer"
+      @click="setModalView(true)"
+      title="Click to show soft validations"
+    />
+    <modal-component
+      v-if="showModal"
+      @close="setModalView(false)">
+      <h3 slot="header">Soft validation</h3>
+      <div slot="body">
+        <ul class="no_bullets soft_validation list">
+          <li
+            v-for="(validation, index) in validations"
+            :key="index">
+            <span v-html="validation"/>
+          </li>
+        </ul>
+      </div>
+    </modal-component>
+  </span>
+</template>
+
+<script>
+
+import ModalComponent from '../modal'
+import AjaxCall from 'helpers/ajaxCall'
+
+export default {
+  components: {
+    ModalComponent
+  },
+  props: {
+    globalId: {
+      type: String,
+      required: true
+    }
+  },
+  data () {
+    return {
+      validations: [],
+      showModal: false
+    }
+  },
+  mounted () {
+    this.getSoftValidation()
+  },
+  methods: {
+    getSoftValidation () {
+      AjaxCall('get', '/soft_validations/validate', { params: { global_id: this.globalId } }).then(response => {
+        this.validations = response.body.validations.soft_validations.map(validation => validation.message)
+      })
+    },
+    setModalView (value) {
+      this.showModal = value
+    }
+  }
+}
+</script>

From 4d49cf0c04d7ce4cbd7a104c3216249ed924c8e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 17 Jul 2020 12:08:51 -0300
Subject: [PATCH 25/76] Refactor citation count component, added soft
 validation #1552

---
 app/javascript/vue/components/displayList.vue |  22 +++-
 .../components/shared/citationsCount.vue      |  33 ------
 .../components/shared/citationsCount.vue      |  74 +++++++------
 .../vue/components/radials/object/radial.vue  |   2 +-
 .../soft_validations/objectValidation.vue     |  14 +++
 .../components/citationsCount.vue             | 104 +++++++-----------
 .../components/table.vue                      |   7 +-
 .../components/sourcePicker.vue               |   8 +-
 .../store/actions/updateSource.js             |   1 +
 .../sources/hub/components/citationsCount.vue |  23 ----
 .../components/metadataSection.vue            |  11 +-
 11 files changed, 136 insertions(+), 163 deletions(-)

diff --git a/app/javascript/vue/components/displayList.vue b/app/javascript/vue/components/displayList.vue
index 88ebea5d4d..6ac79b7379 100644
--- a/app/javascript/vue/components/displayList.vue
+++ b/app/javascript/vue/components/displayList.vue
@@ -8,15 +8,21 @@
       :key="setKey ? item[setKey] : item.hasOwnProperty('id') ? item.id : JSON.stringify(item)"
       class="list-complete-item flex-separate middle"
       :class="{ 'highlight': checkHighlight(item) }">
-      <span
-        class="list-item"
-        v-html="displayName(item)"/>
+      <span>
+        <span
+          class="list-item"
+          v-html="displayName(item)"/>
+        <soft-validation
+          v-if="validations"
+          class="margin-small-left"
+          :global-id="item.global_id"/>
+      </span>
       <div class="list-controls">
         <slot
           name="options"
           :item="item"/>
         <a
-          v-if="download" 
+          v-if="download"
           class="btn-download circle-button"
           :href="getPropertyValue(item, download)"
           download/>
@@ -44,10 +50,12 @@
 
 import RadialAnnotator from 'components/radials/annotator/annotator.vue'
 import RadialObject from 'components/radials/navigation/radial.vue'
+import SoftValidation from 'components/soft_validations/objectValidation.vue'
 
 export default {
   components: {
-    RadialAnnotator
+    RadialAnnotator,
+    SoftValidation
   },
   props: {
     list: {
@@ -89,6 +97,10 @@ export default {
     deleteWarning: {
       type: Boolean,
       default: true
+    },
+    validations: {
+      type: Boolean,
+      default: false
     }
   },
   beforeCreate() {
diff --git a/app/javascript/vue/components/radials/annotator/components/shared/citationsCount.vue b/app/javascript/vue/components/radials/annotator/components/shared/citationsCount.vue
index 230662f005..0816c4eb09 100644
--- a/app/javascript/vue/components/radials/annotator/components/shared/citationsCount.vue
+++ b/app/javascript/vue/components/radials/annotator/components/shared/citationsCount.vue
@@ -87,36 +87,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-  .citation-count {
-    position: relative;
-  }
-  .citation-count-text {
-    position: relative;
-    font-size: 100%;
-    justify-content: center
-  }
-  .citation-tooltip-list {
-    position: fixed;
-    min-width: 300px;
-    transform: translateX(-50%);
-    z-index: 30;
-  }
-  .circle-count {
-    right:-2px;
-    bottom: -2px;
-    justify-content: center;
-    position: absolute;
-    border-radius: 50%;
-    display: flex;
-    width: 12px;
-    height: 12px;
-    min-width: 12px;
-    min-height: 12px;
-    font-size: 8px;
-    box-shadow: 0px 1px 2px 0px #EBEBEB;
-    margin: 5px;
-    cursor: pointer;
-  }
-</style>
diff --git a/app/javascript/vue/components/radials/object/components/shared/citationsCount.vue b/app/javascript/vue/components/radials/object/components/shared/citationsCount.vue
index cb5c6f16bf..935d8a474e 100644
--- a/app/javascript/vue/components/radials/object/components/shared/citationsCount.vue
+++ b/app/javascript/vue/components/radials/object/components/shared/citationsCount.vue
@@ -1,41 +1,51 @@
 <template>
-  <div
-    v-if="citations.length"
-    class="citation-count"
-    @mouseover="showCitations = true"
-    @mouseout="showCitations = false">
-    <span class="button-data circle-button btn-citation">
-      <span class="circle-count button-default middle">{{ citations.length }} </span>
-    </span>
+  <span>
     <div
-      v-show="showCitations"
-      class="citation-tooltip-list panel">
-      <display-list 
-        :list="citations"
-        :label="['citation_source_body']"
-        @delete="removeCitation"
-        :edit="false">
-        <div
-          slot="options"
-          slot-scope="slotProps">
-          <display-source :source="slotProps.item.source"/>
-        </div>
-      </display-list>
+      v-if="citations.length"
+      class="citation-count"
+      @click.prevent="setModalView(true)">
+      <span class="circle-button btn-citation button-default">
+        <span class="circle-count button-data middle">{{ citations.length }} </span>
+      </span>
     </div>
-  </div>
+    <modal-component
+      v-if="showCitations"
+      @close="setModalView(false)">
+      <h3 slot="header">Citations</h3>
+      <div
+        slot="body">
+        <display-list
+          :list="citations"
+          :validations="true"
+          :label="['citation_source_body']"
+          @delete="removeCitation"
+          :edit="false">
+          <div
+            slot="options"
+            slot-scope="slotProps">
+            <a
+              :title="slotProps.item.source.object_tag"
+              class="button-default circle-button btn-citation"
+              :href="`/tasks/nomenclature/by_source?source_id=${slotProps.item.source.id}`"
+              target="blank"/>
+          </div>
+        </display-list>
+      </div>
+    </modal-component>
+  </span>
 </template>
 
 <script>
 
 import CRUD from '../../request/crud.js'
 import DisplayList from 'components/displayList'
-import DisplaySource from './displaySource'
+import ModalComponent from 'components/modal'
 
 export default {
   mixins: [CRUD],
   components: {
     DisplayList,
-    DisplaySource
+    ModalComponent
   },
   props: {
     object: {
@@ -87,8 +97,7 @@ export default {
         this.getList(`/${this.target}/${this.object.id}/citations.json`).then(response => {
           this.citations = response.body
         })
-      }
-      else {
+      } else {
         this.citations = this.values
       }
     },
@@ -100,6 +109,9 @@ export default {
           this.loadCitations()
         }
       }
+    },
+    setModalView (value) {
+      this.showCitations = value
     }
   }
 }
@@ -114,15 +126,9 @@ export default {
     font-size: 100%;
     justify-content: center
   }
-  .citation-tooltip-list {
-    position: fixed;
-    min-width: 300px;
-    transform: translateX(-50%);
-    z-index: 30;
-  }
   .circle-count {
-    right:-2px;
-    bottom: -2px;
+    left:15px;
+    bottom: -6px;
     justify-content: center;
     position: absolute;
     border-radius: 50%;
diff --git a/app/javascript/vue/components/radials/object/radial.vue b/app/javascript/vue/components/radials/object/radial.vue
index 8b338d07cf..47a85878cb 100644
--- a/app/javascript/vue/components/radials/object/radial.vue
+++ b/app/javascript/vue/components/radials/object/radial.vue
@@ -11,7 +11,7 @@
           <span v-html="title" />
           <span
             v-if="metadata"
-            class="separate-right"> 
+            class="separate-right">
             {{ metadata.object_type }}
           </span>
         </h3>
diff --git a/app/javascript/vue/components/soft_validations/objectValidation.vue b/app/javascript/vue/components/soft_validations/objectValidation.vue
index d71f07711a..c4497775dc 100644
--- a/app/javascript/vue/components/soft_validations/objectValidation.vue
+++ b/app/javascript/vue/components/soft_validations/objectValidation.vue
@@ -37,6 +37,10 @@ export default {
     globalId: {
       type: String,
       required: true
+    },
+    validateObject: {
+      type: Object,
+      default: undefined
     }
   },
   data () {
@@ -45,6 +49,16 @@ export default {
       showModal: false
     }
   },
+  watch: {
+    validateObject: {
+      handler (newVal) {
+        if (newVal) {
+          this.getSoftValidation()
+        }
+      },
+      deep: true
+    }
+  },
   mounted () {
     this.getSoftValidation()
   },
diff --git a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/citationsCount.vue b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/citationsCount.vue
index a25a17ae50..d8d5b9b90e 100644
--- a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/citationsCount.vue
+++ b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/citationsCount.vue
@@ -1,41 +1,49 @@
 <template>
-  <div
-    v-if="citations.length"
-    class="citation-count"
-    @mouseover="showCitations = true"
-    @mouseout="showCitations = false">
-    <span class="button-data circle-button btn-citation">
-      <span class="circle-count button-default middle">{{ citations.length }} </span>
-    </span>
+  <span>
     <div
-      @mouseover="showCitations = true"
-      @mouseout="showCitations = false"
-      v-show="showCitations"
-      class="citation-tooltip-list panel">
-      <display-list 
-        :list="citations"
-        label="citation_source_body"
-        :remove="false"
-        :edit="false">
-        <div
-          slot="options"
-          slot-scope="slotProps">
-          <display-source :source="slotProps.item.source"/>
-        </div>
-      </display-list>
+      v-if="citations.length"
+      class="citation-count"
+      @click.prevent="setModalView(true)">
+      <span class="circle-button btn-citation button-default">
+        <span class="circle-count button-data middle">{{ citations.length }} </span>
+      </span>
     </div>
-  </div>
+    <modal-component
+      v-if="showCitations"
+      @close="setModalView(false)">
+      <h3 slot="header">Citations</h3>
+      <div
+        slot="body">
+        <display-list
+          :list="citations"
+          :validations="true"
+          :label="['citation_source_body']"
+          @delete="removeCitation"
+          :edit="false">
+          <div
+            slot="options"
+            slot-scope="slotProps">
+            <a
+              :title="slotProps.item.source.object_tag"
+              class="button-default circle-button btn-citation"
+              :href="`/tasks/nomenclature/by_source?source_id=${slotProps.item.source.id}`"
+              target="blank"/>
+          </div>
+        </display-list>
+      </div>
+    </modal-component>
+  </span>
 </template>
 
 <script>
 
 import DisplayList from 'components/displayList'
-import DisplaySource from './displaySource'
+import ModalComponent from 'components/modal'
 
 export default {
   components: {
     DisplayList,
-    DisplaySource
+    ModalComponent
   },
   props: {
     citations: {
@@ -43,45 +51,15 @@ export default {
       required: true
     },
   },
-  data() {
+  data () {
     return {
-      showCitations: false,
+      showCitations: false
+    }
+  },
+  methods: {
+    setModalView (value) {
+      this.showCitations = value
     }
   }
 }
 </script>
-
-<style lang="scss">
-  .citation-count {
-    display: block;
-    position: relative;
-    width: 34px
-  }
-  .citation-count-text {
-    position: relative;
-    font-size: 100%;
-    justify-content: center
-  }
-  .citation-tooltip-list {
-    position: absolute;
-    min-width: 300px;
-    transform: translate(0%, -10%);
-    z-index: 30;
-  }
-  .circle-count {
-    right:-2px;
-    bottom: -2px;
-    justify-content: center;
-    position: absolute;
-    border-radius: 50%;
-    display: flex;
-    width: 12px;
-    height: 12px;
-    min-width: 12px;
-    min-height: 12px;
-    font-size: 8px;
-    box-shadow: 0px 1px 2px 0px #EBEBEB;
-    margin: 5px;
-    cursor: pointer;
-  }
-</style>
diff --git a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/table.vue b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/table.vue
index eaba56e777..ef28713984 100644
--- a/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/table.vue
+++ b/app/javascript/vue/tasks/asserted_distribution/new_asserted_distribution/components/table.vue
@@ -27,6 +27,9 @@
               target="blank"
               :href="nomenclatureBySourceRoute(item.citations[0].source.id)"
               v-html="item.citations[0].citation_source_body"/>
+            <soft-validation
+              class="margin-small-left"
+              :global-id="item.global_id"/>
           </td>
         </template>
         <td>
@@ -74,11 +77,13 @@
 import RadialAnnotator from 'components/radials/annotator/annotator'
 import CitationCount from './citationsCount'
 import { RouteNames } from 'routes/routes'
+import SoftValidation from 'components/soft_validations/objectValidation.vue'
 
 export default {
   components: {
     CitationCount,
-    RadialAnnotator
+    RadialAnnotator,
+    SoftValidation
   },
   props: {
     list: {
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue
index 8fa86422f7..0ae8f4db14 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue
@@ -107,6 +107,10 @@
                 target="_blank"
                 v-html="citation.source.object_tag"
               />
+              <soft-validation
+                class="margin-small-left"
+                :validate-object="citation"
+                :global-id="citation.global_id"/>
             </p>
             <div class="horizontal-left-content">
               <citation-pages
@@ -182,6 +186,7 @@ import DefaultElement from 'components/getDefaultPin.vue'
 import RadialAnnotator from 'components/radials/annotator/annotator.vue'
 import RadialObject from 'components/radials/navigation/radial'
 import BlockLayout from './blockLayout'
+import SoftValidation from 'components/soft_validations/objectValidation.vue'
 
 export default {
   components: {
@@ -194,7 +199,8 @@ export default {
     CitationPages,
     RadialAnnotator,
     RadialObject,
-    BlockLayout
+    BlockLayout,
+    SoftValidation
   },
   computed: {
     lastSave () {
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateSource.js b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateSource.js
index 56a0403cb1..832c4e08b3 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateSource.js
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/store/actions/updateSource.js
@@ -15,6 +15,7 @@ export default function ({ commit, state, dispatch }, citation) {
 
     updateTaxonName(taxonName).then(response => {
       dispatch('loadSoftValidation', 'taxon_name')
+      state.taxon_name.origin_citation = response.body.origin_citation
       commit(MutationNames.UpdateLastSave)
       return resolve(response)
     }, response => {
diff --git a/app/javascript/vue/tasks/sources/hub/components/citationsCount.vue b/app/javascript/vue/tasks/sources/hub/components/citationsCount.vue
index b0138544de..402fef5933 100644
--- a/app/javascript/vue/tasks/sources/hub/components/citationsCount.vue
+++ b/app/javascript/vue/tasks/sources/hub/components/citationsCount.vue
@@ -37,26 +37,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-  .citation-count {
-    position: relative;
-  }
-
-  .circle-count {
-    right:-2px;
-    bottom: -2px;
-    justify-content: center;
-    position: absolute;
-    border-radius: 50%;
-    display: flex;
-    width: 12px;
-    height: 12px;
-    min-width: 12px;
-    min-height: 12px;
-    font-size: 8px;
-    box-shadow: 0px 1px 2px 0px #EBEBEB;
-    margin: 5px;
-    cursor: pointer;
-  }
-</style>
diff --git a/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue b/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue
index c3fb7cd805..23e11d2e15 100644
--- a/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue
+++ b/app/javascript/vue/tasks/type_specimens/components/metadataSection.vue
@@ -73,7 +73,12 @@
         <div
           v-else
           class="horizontal-left-content">
-          <span v-html="typeMaterial.origin_citation.object_tag"/>
+          <span>
+            <span v-html="typeMaterial.origin_citation.object_tag"/>
+            <soft-validation
+              class="margin-small-left"
+              :global-id="typeMaterial.origin_citation.global_id"/>
+          </span>
           <span
             class="circle-button btn-delete"
             @click="removeCitation"/>
@@ -88,6 +93,7 @@
 import Expand from './expand.vue'
 import SmartSelector from 'components/smartSelector'
 import Spinner from 'components/spinner.vue'
+import SoftValidation from 'components/soft_validations/objectValidation.vue'
 
 import { GetterNames } from '../store/getters/getters'
 import { MutationNames } from '../store/mutations/mutations'
@@ -97,7 +103,8 @@ export default {
   components: {
     Spinner,
     Expand,
-    SmartSelector
+    SmartSelector,
+    SoftValidation
   },
   computed: {
     citation: {

From 27504fb63e65e35ec36a8074dbf0aafc9b2bde73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 17 Jul 2020 12:10:05 -0300
Subject: [PATCH 26/76] Update CHANGELOG.md [skip ci]

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd33cc1c69..1cdf57d21a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
+- Soft validations component for citations in radial annotator and tasks [#1552]
 
 ### Changed
 
@@ -28,10 +28,12 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - Flip object to subject label on type section in new taxon name task
 
 [#1329]: https://github.com/SpeciesFileGroup/taxonworks/issues/1329
+[#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
 
+
 ## [0.12.11] - 2020-07-14
 
 ### Changed

From dd7cd6296aff59241c209a0e9414e43138f520a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 17 Jul 2020 13:35:16 -0300
Subject: [PATCH 27/76] Fix drag shape

---
 CHANGELOG.md                                        | 1 +
 app/javascript/vue/components/georeferences/map.vue | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cdf57d21a..7f6c5dcc39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 ### 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
 
 [#1329]: https://github.com/SpeciesFileGroup/taxonworks/issues/1329
 [#1552]: https://github.com/SpeciesFileGroup/taxonworks/issues/1552
diff --git a/app/javascript/vue/components/georeferences/map.vue b/app/javascript/vue/components/georeferences/map.vue
index 03de63a2f4..1e3469796e 100644
--- a/app/javascript/vue/components/georeferences/map.vue
+++ b/app/javascript/vue/components/georeferences/map.vue
@@ -232,14 +232,6 @@ export default {
           removalMode: this.removalMode
         })
       }
-
-      this.mapObject.pm.enableDraw('Marker', { tooltips: this.tooltips })
-      this.mapObject.pm.enableDraw('Polygon', { tooltips: this.tooltips })
-      this.mapObject.pm.enableDraw('Circle', { tooltips: this.tooltips })
-      this.mapObject.pm.enableDraw('Line', { tooltips: this.tooltips })
-      this.mapObject.pm.enableDraw('Rectangle', { tooltips: this.tooltips })
-      this.mapObject.pm.enableDraw('Cut', { tooltips: this.tooltips })
-      this.mapObject.pm.toggleGlobalDragMode()
     },
     handleEvents () {
       const that = this

From d1d9e9a18fe3fe76c0cb96b86b0a5dbd624c3c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 17 Jul 2020 14:09:20 -0300
Subject: [PATCH 28/76] Added inplace option for soft validation component

---
 .../annotator/components/citations/edit.vue   | 10 ++--
 .../soft_validations/objectValidation.vue     | 57 ++++++++++++-------
 2 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/app/javascript/vue/components/radials/annotator/components/citations/edit.vue b/app/javascript/vue/components/radials/annotator/components/citations/edit.vue
index 0e566f827d..b2a7c1bfdb 100644
--- a/app/javascript/vue/components/radials/annotator/components/citations/edit.vue
+++ b/app/javascript/vue/components/radials/annotator/components/citations/edit.vue
@@ -2,11 +2,8 @@
   <div class="field">
     <div class="horizontal-left-content">
       <span v-html="editCitation.object_tag"/>
-      <soft-validation
-        class="margin-small-left"
-        :global-id="editCitation.global_id"/>
     </div>
-    <div class="flex-separate separate-bottom separate-top field">
+    <div class="flex-separate separate-top field">
       <label class="inline middle">
         <input
           type="text"
@@ -19,8 +16,11 @@
         Is original (does not apply to topics)
       </label>
     </div>
+    <soft-validation
+      :in-place="true"
+      :global-id="editCitation.global_id"/>
     <button
-      class="button button-submit normal-input separate-bottom"
+      class="button button-submit normal-input separate-bottom margin-medium-top"
       :disabled="!validateFields"
       @click="sendCitation()"
       type="button">Update
diff --git a/app/javascript/vue/components/soft_validations/objectValidation.vue b/app/javascript/vue/components/soft_validations/objectValidation.vue
index c4497775dc..fa784b43de 100644
--- a/app/javascript/vue/components/soft_validations/objectValidation.vue
+++ b/app/javascript/vue/components/soft_validations/objectValidation.vue
@@ -1,26 +1,37 @@
 <template>
   <span>
-    <span
-      v-if="validations.length"
-      data-icon="warning"
-      class="cursor-pointer"
-      @click="setModalView(true)"
-      title="Click to show soft validations"
-    />
-    <modal-component
-      v-if="showModal"
-      @close="setModalView(false)">
-      <h3 slot="header">Soft validation</h3>
-      <div slot="body">
-        <ul class="no_bullets soft_validation list">
-          <li
-            v-for="(validation, index) in validations"
-            :key="index">
-            <span v-html="validation"/>
-          </li>
-        </ul>
-      </div>
-    </modal-component>
+    <template v-if="inPlace">
+      <ul class="no_bullets soft_validation list">
+        <li
+          v-for="(validation, index) in validations"
+          :key="index">
+          <span v-html="validation"/>
+        </li>
+      </ul>
+    </template>
+    <template v-else>
+      <span
+        v-if="validations.length"
+        data-icon="warning"
+        class="cursor-pointer"
+        @click="setModalView(true)"
+        title="Click to show soft validations"
+      />
+      <modal-component
+        v-if="showModal"
+        @close="setModalView(false)">
+        <h3 slot="header">Soft validation</h3>
+        <div slot="body">
+          <ul class="no_bullets soft_validation list">
+            <li
+              v-for="(validation, index) in validations"
+              :key="index">
+              <span v-html="validation"/>
+            </li>
+          </ul>
+        </div>
+      </modal-component>
+    </template>
   </span>
 </template>
 
@@ -41,6 +52,10 @@ export default {
     validateObject: {
       type: Object,
       default: undefined
+    },
+    inPlace: {
+      type: Boolean,
+      default: false
     }
   },
   data () {

From eaa62d51de9a09aef61539445940bbb77f15f01b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 17 Jul 2020 14:16:38 -0300
Subject: [PATCH 29/76] Fix radial navigation background color

---
 app/javascript/vue/components/radials/navigation/radial.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/vue/components/radials/navigation/radial.vue b/app/javascript/vue/components/radials/navigation/radial.vue
index 24b144e0fa..31942b6713 100644
--- a/app/javascript/vue/components/radials/navigation/radial.vue
+++ b/app/javascript/vue/components/radials/navigation/radial.vue
@@ -3,6 +3,7 @@
     <div class="radial-annotator">
       <modal
         v-if="display"
+        :container-style="{ backgroundColor: 'transparent' }"
         @close="closeModal()">
         <h3
           slot="header"

From a3a63c969bb3db56fee224f094c4968e03c46ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 17 Jul 2020 15:28:59 -0300
Subject: [PATCH 30/76] Fix #446

---
 CHANGELOG.md                                  |  1 +
 app/javascript/packs/application.js           |  1 +
 .../vue/components/autocomplete.vue           |  6 +++
 .../initializers/browse_nomenclature/app.vue  | 18 +++++++++
 .../initializers/browse_nomenclature/main.js  | 17 ++++++++
 .../nomenclature/browse/components/search.vue | 40 +++++++++++++++++++
 .../tasks/nomenclature/browse/index.html.erb  | 14 ++-----
 .../taxon_names/autocomplete.json.jbuilder    |  1 +
 8 files changed, 87 insertions(+), 11 deletions(-)
 create mode 100644 app/javascript/vue/initializers/browse_nomenclature/app.vue
 create mode 100644 app/javascript/vue/initializers/browse_nomenclature/main.js
 create mode 100644 app/javascript/vue/tasks/nomenclature/browse/components/search.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f6c5dcc39..a5643ae422 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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]
 
 ### Changed
 
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 9fb0945f08..205ba8bca3 100644
--- 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
index e94e1a9f4b..d257aec667 100644
--- 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: () => {}
     }
   },
 
diff --git a/app/javascript/vue/initializers/browse_nomenclature/app.vue b/app/javascript/vue/initializers/browse_nomenclature/app.vue
new file mode 100644
index 0000000000..4ee53398f0
--- /dev/null
+++ b/app/javascript/vue/initializers/browse_nomenclature/app.vue
@@ -0,0 +1,18 @@
+<template>
+  <div>
+    <nomenclature-search/>
+  </div>
+</template>
+
+<script>
+import NomenclatureSearch from 'tasks/nomenclature/browse/components/search'
+export default {
+  components: {
+    NomenclatureSearch
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/app/javascript/vue/initializers/browse_nomenclature/main.js b/app/javascript/vue/initializers/browse_nomenclature/main.js
new file mode 100644
index 0000000000..51dff8d7d6
--- /dev/null
+++ b/app/javascript/vue/initializers/browse_nomenclature/main.js
@@ -0,0 +1,17 @@
+import Vue from 'vue'
+import App from './app.vue'
+
+function init () {
+  new Vue({
+    el: '#vue-browse-nomenclature-search',
+    render: function (createElement) {
+      return createElement(App)
+    }
+  })
+}
+
+document.addEventListener('turbolinks:load', (event) => {
+  if (document.querySelector('#vue-browse-nomenclature-search')) {
+    init()
+  }
+})
diff --git a/app/javascript/vue/tasks/nomenclature/browse/components/search.vue b/app/javascript/vue/tasks/nomenclature/browse/components/search.vue
new file mode 100644
index 0000000000..e414692155
--- /dev/null
+++ b/app/javascript/vue/tasks/nomenclature/browse/components/search.vue
@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <br>
+    <autocomplete
+      url="/taxon_names/autocomplete"
+      placeholder="Select a taxon name"
+      param="term"
+      :input-style="{ width: '300px' }"
+      @getItem="redirect"
+      display="label"
+      label="label_html"/>
+    <label>
+      <input
+        v-model="validName"
+        type="checkbox"> Redirect to valid name
+    </label>
+  </div>
+</template>
+
+<script>
+
+import Autocomplete from 'components/autocomplete'
+import { RouteNames } from 'routes/routes'
+
+export default {
+  components: {
+    Autocomplete
+  },
+  data () {
+    return {
+      validName: true
+    }
+  },
+  methods: {
+    redirect (event) {
+      window.open(`${RouteNames.BrowseNomenclature}?taxon_name_id=${this.validName ? event.valid_taxon_name_id : event.id}`, '_self')
+    }
+  }
+}
+</script>
diff --git a/app/views/tasks/nomenclature/browse/index.html.erb b/app/views/tasks/nomenclature/browse/index.html.erb
index d15e3cdd28..aa15006c3c 100644
--- a/app/views/tasks/nomenclature/browse/index.html.erb
+++ b/app/views/tasks/nomenclature/browse/index.html.erb
@@ -5,17 +5,9 @@
     <div class="flex-separate middle">
 
       <div class="middle">
-        <div class="separate-right">
-          <%= form_tag( browse_nomenclature_task_path, method: :get) do %>
-            <%= render  'workbench/elements/forms/ajax_select',
-              controller: '/taxon_names',
-              object: '',
-              method:  'taxon_name_id',
-              send_select: true,
-              tag_id:  'taxon_name_id_for_browse_nomenclature',
-              size: 20 %>
-          <% end %>
-        </div>
+        <div
+          class="separate-right"
+          id="vue-browse-nomenclature-search"></div>
 
         <div class="separate-left separate-right">
         <%= render('/taxon_names/breadcrumb_navigator', taxon_name: @taxon_name, target: :browse_nomenclature_task_path) -%>
diff --git a/app/views/taxon_names/autocomplete.json.jbuilder b/app/views/taxon_names/autocomplete.json.jbuilder
index dfd067ef27..99c172dcbc 100644
--- a/app/views/taxon_names/autocomplete.json.jbuilder
+++ b/app/views/taxon_names/autocomplete.json.jbuilder
@@ -1,5 +1,6 @@
 json.array! @taxon_names do |t|
   json.id t.id
+  json.valid_taxon_name_id t.cached_valid_taxon_name_id
   json.label taxon_name_autocomplete_selected_tag(t)
   json.label_html taxon_name_autocomplete_tag(t, params[:term]) 
 

From 0c46f1d0d257661c5ed3dc5872513556543edbac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 17 Jul 2020 15:44:56 -0300
Subject: [PATCH 31/76] Added sessionStorage

---
 CHANGELOG.md                                    |  1 +
 .../nomenclature/browse/components/search.vue   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5643ae422..11623bcba8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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]
 
 ### Changed
 
diff --git a/app/javascript/vue/tasks/nomenclature/browse/components/search.vue b/app/javascript/vue/tasks/nomenclature/browse/components/search.vue
index e414692155..df99a0a9e1 100644
--- a/app/javascript/vue/tasks/nomenclature/browse/components/search.vue
+++ b/app/javascript/vue/tasks/nomenclature/browse/components/search.vue
@@ -22,6 +22,10 @@
 import Autocomplete from 'components/autocomplete'
 import { RouteNames } from 'routes/routes'
 
+const SettingsStore = {
+  redirectValid: 'browseNomenclature::redirectValid'
+}
+
 export default {
   components: {
     Autocomplete
@@ -31,6 +35,19 @@ export default {
       validName: true
     }
   },
+  watch: {
+    validName: {
+      handler (newVal) {
+        sessionStorage.setItem(SettingsStore.redirectValid, newVal)
+      }
+    }
+  },
+  mounted () {
+    const value = sessionStorage.getItem(SettingsStore.redirectValid)
+    if (value !== null) {
+      this.validName = value === 'true'
+    }
+  },
   methods: {
     redirect (event) {
       window.open(`${RouteNames.BrowseNomenclature}?taxon_name_id=${this.validName ? event.valid_taxon_name_id : event.id}`, '_self')

From 48e892de768e078835bde0c465b795b86b1875ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 17 Jul 2020 15:45:29 -0300
Subject: [PATCH 32/76] Update CHANGELOG.md [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11623bcba8..072d4ace94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 
+[#446]: https://github.com/SpeciesFileGroup/taxonworks/issues/446
 [#1329]: https://github.com/SpeciesFileGroup/taxonworks/issues/1329
 [#1552]: https://github.com/SpeciesFileGroup/taxonworks/issues/1552
 [#1576]: https://github.com/SpeciesFileGroup/taxonworks/issues/1576

From c51c426de5933635c7a83ee05d2994bd8b3ca517 Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Fri, 17 Jul 2020 16:16:18 -0500
Subject: [PATCH 33/76] closes #934

---
 config/interface/object_radials.yml              |  7 ++++---
 .../20200716192152_add_descriptor_weight.rb      |  6 ++++++
 db/schema.rb                                     |  3 ++-
 lib/interactive_key.rb                           |  2 +-
 spec/lib/interactive_key_spec.rb                 | 16 +++++++++++-----
 5 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20200716192152_add_descriptor_weight.rb

diff --git a/config/interface/object_radials.yml b/config/interface/object_radials.yml
index afc4afdea7..f9a6fecfbb 100644
--- a/config/interface/object_radials.yml
+++ b/config/interface/object_radials.yml
@@ -97,12 +97,13 @@ Source:
     recent: true
 TaxonName:
   tasks:
-    - browse_nomenclature_task 
-    - new_taxon_name_task 
     - new_combination_task
     - edit_type_material_task
+    - comprehensive_collection_object_task
     - browse_otus_task
-    - index_stats_task 
+    - browse_nomenclature_task
+    - new_taxon_name_task
+    - index_stats_task
     - otu_distribution_data_task
     - asserted_distributions_basic_endemism_task
   edit: new_taxon_name_task
diff --git a/db/migrate/20200716192152_add_descriptor_weight.rb b/db/migrate/20200716192152_add_descriptor_weight.rb
new file mode 100644
index 0000000000..8ef402093a
--- /dev/null
+++ b/db/migrate/20200716192152_add_descriptor_weight.rb
@@ -0,0 +1,6 @@
+class AddDescriptorWeight < ActiveRecord::Migration[6.0]
+  def change
+    add_column :descriptors, :weight, :integer
+  end
+end
+
diff --git a/db/schema.rb b/db/schema.rb
index a512cac2f7..8f2cfefd0e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_04_01_201911) do
+ActiveRecord::Schema.define(version: 2020_07_16_192152) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "fuzzystrmatch"
@@ -557,6 +557,7 @@
     t.string "default_unit"
     t.string "description_name"
     t.string "key_name"
+    t.integer "weight"
     t.index ["created_by_id"], name: "index_descriptors_on_created_by_id"
     t.index ["name"], name: "index_descriptors_on_name"
     t.index ["project_id"], name: "index_descriptors_on_project_id"
diff --git a/lib/interactive_key.rb b/lib/interactive_key.rb
index c68ae1e3d9..1674ce603e 100644
--- a/lib/interactive_key.rb
+++ b/lib/interactive_key.rb
@@ -59,7 +59,7 @@ def observation_matrix
   end
 
   def descriptors
-    observation_matrix.descriptors
+    observation_matrix.descriptors.where('NOT descriptors.weight = 0 OR descriptors.weight IS NULL').order(:position)
   end
 
   def descriptor_available_languages
diff --git a/spec/lib/interactive_key_spec.rb b/spec/lib/interactive_key_spec.rb
index ab5b6c0ebb..6c9ab6d5d5 100644
--- a/spec/lib/interactive_key_spec.rb
+++ b/spec/lib/interactive_key_spec.rb
@@ -28,7 +28,6 @@
       observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
       observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
       a = AlternateValue.create(type: 'AlternateValue::Translation', value: 'zzz', alternate_value_object: descriptor1, alternate_value_object_attribute: 'name', language_id: rus.id)
-      observation_matrix.reload
       expect(interactive_key.descriptor_available_languages.count).to eq(2)
     end
 
@@ -37,7 +36,6 @@
       observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
       observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
       a = AlternateValue.create(type: 'AlternateValue::Translation', value: 'zzz', alternate_value_object: descriptor1, alternate_value_object_attribute: 'name', language_id: rus.id)
-      observation_matrix.reload
       interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, language_id: rus.id)
       expect(interactive_key.language_to_use).to eq(rus)
     end
@@ -47,10 +45,20 @@
       observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
       k = Keyword.create(name: 'zzz', definition: 'zzzzzzzzzzzzzzzzzzzzzzzzz')
       descriptor1.tags.create(keyword: k)
-      observation_matrix.reload
       expect(interactive_key.descriptor_available_keywords.count).to eq(1)
     end
 
+    specify 'descriptor_weight' do
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
+      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
+      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id)
+      expect(interactive_key.descriptors_with_filter.count).to eq(2)
+      descriptor1.weight = 0
+      descriptor1.save
+      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id)
+      expect(interactive_key.descriptors_with_filter.count).to eq(1)
+    end
+
     specify 'descriptors_with_keywords' do
       observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
       observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
@@ -58,7 +66,6 @@
       k2 = Keyword.create(name: 'zzz2', definition: 'zzzzzzzzzzzzzzzzzzzzzzzzzz')
       t1 = descriptor1.tags.create(keyword: k1)
       t2 = descriptor2.tags.create(keyword: k2)
-      observation_matrix.reload
       interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, keyword_ids: t1.id)
       expect(interactive_key.descriptors_with_filter.count).to eq(1)
       interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, keyword_ids: t1.id.to_s + '|' + t2.id.to_s)
@@ -68,7 +75,6 @@
     specify 'rows_with_filter' do
       o1 = observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu1)
       o2 = observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu2)
-      observation_matrix.reload
       interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, row_filter: observation_matrix.observation_matrix_rows.first.id)
       expect(interactive_key.rows_with_filter.count).to eq(1)
       interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, row_filter: observation_matrix.observation_matrix_rows.first.id.to_s + '|' + observation_matrix.observation_matrix_rows.last.id.to_s)

From 7eb6d56e931fe88b4be175718fb3f3109ee59d60 Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Fri, 17 Jul 2020 23:54:11 -0500
Subject: [PATCH 34/76] tabular_spec

---
 spec/lib/queries/taxon_name/tabular_spec.rb | 26 +++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 spec/lib/queries/taxon_name/tabular_spec.rb

diff --git a/spec/lib/queries/taxon_name/tabular_spec.rb b/spec/lib/queries/taxon_name/tabular_spec.rb
new file mode 100644
index 0000000000..97b948f6a9
--- /dev/null
+++ b/spec/lib/queries/taxon_name/tabular_spec.rb
@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+describe Queries::TaxonName::Tabular, type: :model, group: [:nomenclature] do
+  let(:root) { FactoryBot.create(:root_taxon_name)}
+  let(:genus) { Protonym.create(name: 'Erasmoneura', rank_class: Ranks.lookup(:iczn, 'genus'), parent: root) }
+  let(:species1) { Protonym.create(name: 'alpha', rank_class: Ranks.lookup(:iczn, 'species'), parent: genus) }
+  let(:species2) { Protonym.create(name: 'betta', rank_class: Ranks.lookup(:iczn, 'species'), parent: genus) }
+
+  specify '#number_of_species' do
+    genus = Protonym.create(name: 'Erasmoneura', rank_class: Ranks.lookup(:iczn, 'genus'), parent: root)
+    species1 = Protonym.create(name: 'alpha', rank_class: Ranks.lookup(:iczn, 'species'), parent: genus)
+    species2 = Protonym.create(name: 'betta', rank_class: Ranks.lookup(:iczn, 'species'), parent: genus)
+
+    query = Queries::TaxonName::Tabular.new(
+    ancestor_id: genus.id.to_s,
+    ranks: ['genus', 'species'],
+    fieldsets: ['nomenclatural_stats'],
+    combinations: 'true',
+    rank_data: ['genus', 'species'],
+    validity: 'true',
+    project_id: genus.project_id.to_s,
+    limit: '1000')
+    query
+  end
+
+end
\ No newline at end of file

From e58e5453f6a5b0160c00900c58cc2f971d83c795 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Sat, 18 Jul 2020 09:41:38 -0500
Subject: [PATCH 35/76] cleanup and add spec framework for nomenclatural stats

---
 CHANGELOG.md                                  |  2 +-
 .../_controlled_vocabularies/units.rb         |  1 -
 lib/queries/taxon_name/tabular.rb             | 36 +++++++++++++------
 spec/lib/queries/taxon_name/tabular_spec.rb   | 34 ++++++++----------
 4 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 072d4ace94..2270d77891 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,12 +19,12 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ### Changed
 
+- 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
 
-
 ### Fixed
 
 - Flip object to subject label on type section in new taxon name task
diff --git a/config/initializers/constants/_controlled_vocabularies/units.rb b/config/initializers/constants/_controlled_vocabularies/units.rb
index 37202fab43..d3fa5c2c8e 100644
--- a/config/initializers/constants/_controlled_vocabularies/units.rb
+++ b/config/initializers/constants/_controlled_vocabularies/units.rb
@@ -11,7 +11,6 @@
    "mi" =>  "201168/125 m",
    "g" => "1/1000 kg",
    "nmi" =>  "1852 m",
-   "nm" =>  "1/1000000000 m",
    "P" =>  "127/30000 m",
    "px/in" =>  "5000/127 each/m",
    "dot/in" =>  "5000/127 each/m",
diff --git a/lib/queries/taxon_name/tabular.rb b/lib/queries/taxon_name/tabular.rb
index 0da5fc9b60..f85d2da15f 100644
--- a/lib/queries/taxon_name/tabular.rb
+++ b/lib/queries/taxon_name/tabular.rb
@@ -2,6 +2,8 @@ module Queries
   module TaxonName 
 
     # Summarize data across a nomenclatural hierarchy.
+    #
+    # Results are Arrays, not AR objects.
     #  
     # The approach is to use OVER/PARTITION build ranked list, then to summarize only those ranked data requested.
     # When we select without preserving all ranks, then the data are not sortable according to their overall neesting.
@@ -20,24 +22,26 @@ class Tabular < Queries::Query
 
       # @return [Array]
       #   like 'family', 'genus', 'species'
-      # ORDER IS IMPORTANT
+      # ORDER matters 
       attr_accessor :ranks
 
       # @return [Array]
       #   like 'family', 'genus', 'species'
-      # ORDER IS IMPORTANT
+      # ORDER MATTERS
       attr_accessor :rank_data
 
       # !! CAREFUL, too small limits will not properly nest all names !!
+      #   defaults to 1000
       attr_accessor :limit
 
       # @return [Boolean]
-      #   if true than also include combinations
+      #   if true than also include Combinations in counts
       attr_accessor :combinations
 
       # @return [Array of Strings]
       #  named sets of columns to include
       #  valid values are 
+      #    - nomenclatural_stats
       #    - observations
       attr_accessor :fieldsets
 
@@ -49,17 +53,21 @@ class Tabular < Queries::Query
 
       # @return [ the build query ] 
       attr_accessor :query
-      
-      attr_accessor :ancestor
+
       attr_accessor :data_fields
       attr_accessor :column_headers
       attr_accessor :rank_joins
       attr_accessor :rank_id_fields
 
-      # @param params [Params] 
-      #   a permitted via controller
-      def initialize(params)
-        super(nil, params)
+      # Internal
+      # 
+      # @return [Protonym, nil]
+      attr_accessor :ancestor
+
+      # @param params [Hash] 
+      #   keys are symbols
+      def initialize(params = {}) 
+        super(nil, project_id: params[:project_id]) # We don't actually use project_id here
 
         @ancestor_id = params[:ancestor_id]
         @combinations = (params[:combinations]&.downcase == 'true' ? true : false)
@@ -68,7 +76,6 @@ def initialize(params)
         @rank_data = params[:rank_data] || [] 
         @validity = (params[:validity]&.downcase == 'true' ? true : false)
 
-        @ancestor = ::Protonym.where(project_id: project_id).find(ancestor_id)
         @column_headers = ['rank_over', 'otu_id', 'taxon_name_id', 'cached_valid_taxon_name_id', *ranks, 'cached', 'otu']
         @fieldsets = params[:fieldsets] || []
         @rank_id_fields = []
@@ -78,6 +85,15 @@ def initialize(params)
         build_query
       end
 
+      def ancestor
+        return nil unless ancestor_id
+        @ancestor ||= ::Protonym.find(ancestor_id) 
+      end
+
+      def limit
+        @limit ||= 1000
+      end
+
       def table
         ::TaxonName.arel_table
       end 
diff --git a/spec/lib/queries/taxon_name/tabular_spec.rb b/spec/lib/queries/taxon_name/tabular_spec.rb
index 97b948f6a9..0ebf39f1ff 100644
--- a/spec/lib/queries/taxon_name/tabular_spec.rb
+++ b/spec/lib/queries/taxon_name/tabular_spec.rb
@@ -1,26 +1,22 @@
 require 'rails_helper'
 
 describe Queries::TaxonName::Tabular, type: :model, group: [:nomenclature] do
-  let(:root) { FactoryBot.create(:root_taxon_name)}
-  let(:genus) { Protonym.create(name: 'Erasmoneura', rank_class: Ranks.lookup(:iczn, 'genus'), parent: root) }
-  let(:species1) { Protonym.create(name: 'alpha', rank_class: Ranks.lookup(:iczn, 'species'), parent: genus) }
-  let(:species2) { Protonym.create(name: 'betta', rank_class: Ranks.lookup(:iczn, 'species'), parent: genus) }
+  let(:root) { FactoryBot.create(:root_taxon_name) }
+  let(:genus) { Protonym.create!(name: 'Erasmoneura', rank_class: Ranks.lookup(:iczn, :genus), parent: root) }
+  let!(:species1) { Protonym.create!(name: 'alpha', rank_class: Ranks.lookup(:iczn, :species), parent: genus) }
+  let!(:species2) { Protonym.create!(name: 'betta', rank_class: Ranks.lookup(:iczn, :species), parent: genus) }
 
-  specify '#number_of_species' do
-    genus = Protonym.create(name: 'Erasmoneura', rank_class: Ranks.lookup(:iczn, 'genus'), parent: root)
-    species1 = Protonym.create(name: 'alpha', rank_class: Ranks.lookup(:iczn, 'species'), parent: genus)
-    species2 = Protonym.create(name: 'betta', rank_class: Ranks.lookup(:iczn, 'species'), parent: genus)
+  let(:query) { Queries::TaxonName::Tabular.new } 
 
-    query = Queries::TaxonName::Tabular.new(
-    ancestor_id: genus.id.to_s,
-    ranks: ['genus', 'species'],
-    fieldsets: ['nomenclatural_stats'],
-    combinations: 'true',
-    rank_data: ['genus', 'species'],
-    validity: 'true',
-    project_id: genus.project_id.to_s,
-    limit: '1000')
-    query
+  specify '#number_of_species' do
+    query.ancestor_id = genus.id.to_s 
+    query.ranks = ['genus', 'species']
+    query.rank_data =  ['genus', 'species']
+    query.fieldsets = ['nomenclatural_stats']
+    query.validity = true
+    
+    query.build_query
+    expect(query.all.first['valid_species']).to eq(2)
   end
 
-end
\ No newline at end of file
+end

From ac54d0b4e11f2d13dec877d2858e242b26373662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Sun, 19 Jul 2020 19:59:17 -0300
Subject: [PATCH 36/76] Fix protonym pages soft validations specs

---
 spec/models/protonym_specs/soft_validation_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/protonym_specs/soft_validation_spec.rb b/spec/models/protonym_specs/soft_validation_spec.rb
index 0360e45b51..12116a8a44 100644
--- a/spec/models/protonym_specs/soft_validation_spec.rb
+++ b/spec/models/protonym_specs/soft_validation_spec.rb
@@ -86,10 +86,10 @@
       specify 'source author, year are missing' do
         @species.etymology = 'Test'
         @species.soft_validate(:missing_fields)
-        expect(@species.soft_validations.messages_on(:base).include?('Original citation pages are not indicated')).to be_truthy
+        expect(@species.soft_validations.messages_on(:base).include?('Original citation pages are not recorded')).to be_truthy
         @species.origin_citation.pages = 1 if !@species.source.nil?
         @species.soft_validate(:missing_fields)
-        expect(@species.soft_validations.messages_on(:base).include?('Original citation pages are not indicated')).to be_falsey
+        expect(@species.soft_validations.messages_on(:base).include?('Original citation pages are not recorded')).to be_falsey
         expect(@species.soft_validations.messages_on(:verbatim_author).empty?).to be_truthy
         expect(@species.soft_validations.messages_on(:year_of_publication).empty?).to be_truthy
       end

From a1c16380f505397a454e3712f50ba0882a2209bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Mon, 20 Jul 2020 10:28:01 -0300
Subject: [PATCH 37/76] Fix #1622

---
 CHANGELOG.md                                   |  3 ++-
 .../vue/components/georeferences/list.vue      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2270d77891..a3c98e3645 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 - 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]
 
 [#446]: https://github.com/SpeciesFileGroup/taxonworks/issues/446
 [#1329]: https://github.com/SpeciesFileGroup/taxonworks/issues/1329
@@ -36,7 +37,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 [#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
 
 ## [0.12.11] - 2020-07-14
 
diff --git a/app/javascript/vue/components/georeferences/list.vue b/app/javascript/vue/components/georeferences/list.vue
index 6f1f51b39e..68274e6bcc 100644
--- a/app/javascript/vue/components/georeferences/list.vue
+++ b/app/javascript/vue/components/georeferences/list.vue
@@ -3,11 +3,11 @@
     <table class="vue-table">
       <thead>
         <tr>
-          <th>Georeference ID</th>
-          <th>Shape</th>
-          <th>Coordinates</th>
-          <th>Error radius</th>
-          <th>Type</th>
+          <th class="word-keep-all line-nowrap">Georeference ID</th>
+          <th class="word-keep-all">Shape</th>
+          <th class="word-keep-all">Coordinates</th>
+          <th class="word-keep-all line-nowrap">Error radius</th>
+          <th class="word-keep-all">Type</th>
           <th></th>
         </tr>
       </thead>
@@ -19,14 +19,14 @@
           :key="item.id"
           class="list-complete-item">
           <td>{{ item.id }}</td>
-          <td>{{ item.geo_json.geometry.type }}</td>
+          <td class="word-keep-all">{{ item.geo_json.geometry.type }}</td>
           <td>{{ getCoordinates(item.geo_json.geometry.coordinates) }}</td>
-          <td>
-            <edit-in-place 
+          <td class="line-nowrap">
+            <edit-in-place
               v-model="item.error_radius"
               @end="$emit('updateGeo', item)"/>
           </td>
-          <td>{{ item.type }}</td>
+          <td class="word-keep-all">{{ item.type }}</td>
           <td class="vue-table-options">
             <radial-annotator
               :global-id="item.global_id"/>

From 6fcf15ae3c992a5e54adab357fe9a7698962f987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Mon, 20 Jul 2020 16:52:13 -0300
Subject: [PATCH 38/76] Fix webpacker on docker

---
 docker-compose.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b8530172e8..8f1f157f55 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,8 @@ services:
     build: 
       context: .
       dockerfile: Dockerfile.development
+    environment:
+      - WEBPACKER_DEV_SERVER_HOST=webpack
     volumes: # mount root directory from this machine to the container itself (live development, e.g. Rails sees changes to files without rebuilding container0
       - .:/app
     ports: 
@@ -25,12 +27,16 @@ services:
     build: 
       context: .
       dockerfile: Dockerfile.development
-    command: bash -c "npm install && /app/bin/webpack-dev-server --host 0.0.0.0"
+    environment:
+      - NODE_ENV=development
+      - RAILS_ENV=development
+      - WEBPACKER_DEV_SERVER_HOST=0.0.0.0
+    command: bash -c "npm install && /app/bin/webpack-dev-server"
     volumes: 
       - .:/app
       - ./volumes/webpack_build:/mnt/rails/public/webpack
     ports:
-      - '3808:3808'
+      - '3035:3035'
 volumes:
     pg:
       external: false

From bef005fa1cfa8316b9bce1784d3d0bbbf595db77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Mon, 20 Jul 2020 17:35:09 -0300
Subject: [PATCH 39/76] Fix #1527

---
 CHANGELOG.md                                  |   3 +
 .../radials/annotator/annotator.vue           |   2 +-
 .../components/radials/navigation/radial.vue  |   2 +-
 .../object/components/annotatorExtend.js      |  11 +-
 .../components/observation_matrices/main.vue  | 186 ++++++++++++++++++
 .../vue/components/radials/object/radial.vue  |  20 +-
 6 files changed, 215 insertions(+), 9 deletions(-)
 create mode 100644 app/javascript/vue/components/radials/object/components/observation_matrices/main.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3c98e3645..5cca1c929d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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]
 
 ### Changed
 
@@ -30,9 +31,11 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 
 [#446]: https://github.com/SpeciesFileGroup/taxonworks/issues/446
 [#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
diff --git a/app/javascript/vue/components/radials/annotator/annotator.vue b/app/javascript/vue/components/radials/annotator/annotator.vue
index 8d744f7aa0..cc58d63127 100644
--- a/app/javascript/vue/components/radials/annotator/annotator.vue
+++ b/app/javascript/vue/components/radials/annotator/annotator.vue
@@ -4,7 +4,7 @@
       class="radial-annotator">
       <modal
         v-if="display"
-        :container-style="{ backgroundColor: 'transparent' }"
+        :container-style="{ backgroundColor: 'transparent', boxShadow: 'none' }"
         @close="closeModal()">
         <h3
           slot="header"
diff --git a/app/javascript/vue/components/radials/navigation/radial.vue b/app/javascript/vue/components/radials/navigation/radial.vue
index 31942b6713..80e94847b6 100644
--- a/app/javascript/vue/components/radials/navigation/radial.vue
+++ b/app/javascript/vue/components/radials/navigation/radial.vue
@@ -3,7 +3,7 @@
     <div class="radial-annotator">
       <modal
         v-if="display"
-        :container-style="{ backgroundColor: 'transparent' }"
+        :container-style="{ backgroundColor: 'transparent', boxShadow: 'none' }"
         @close="closeModal()">
         <h3
           slot="header"
diff --git a/app/javascript/vue/components/radials/object/components/annotatorExtend.js b/app/javascript/vue/components/radials/object/components/annotatorExtend.js
index d2b208f974..1fa34bc213 100644
--- a/app/javascript/vue/components/radials/object/components/annotatorExtend.js
+++ b/app/javascript/vue/components/radials/object/components/annotatorExtend.js
@@ -24,14 +24,17 @@ const vueAnnotator = {
   data: function () {
     return {
       list: [],
-      urlList: undefined
+      urlList: undefined,
+      loadOnMounted: true
     }
   },
   mounted: function () {
     let that = this
-    this.getList((typeof this.urlList == 'undefined') ? `${this.url}/${this.type}.json` : this.urlList).then(response => {
-      that.list = response.body
-    })
+    if(this.loadOnMounted) {
+      this.getList((typeof this.urlList == 'undefined') ? `${this.url}/${this.type}.json` : this.urlList).then(response => {
+        that.list = response.body
+      })
+    }
   },
   watch: {
     list: {
diff --git a/app/javascript/vue/components/radials/object/components/observation_matrices/main.vue b/app/javascript/vue/components/radials/object/components/observation_matrices/main.vue
new file mode 100644
index 0000000000..70f0a7dcb2
--- /dev/null
+++ b/app/javascript/vue/components/radials/object/components/observation_matrices/main.vue
@@ -0,0 +1,186 @@
+<template>
+  <div>
+    <h3>Select observation matrix to open MRC or Image matrix</h3>
+    <div>
+      <spinner-component
+        v-if="loading"
+        legend="Loading"
+      />
+      <div>
+        <div
+          class="separate-bottom horizontal-left-content"
+        >
+          <input
+            v-model="filterType"
+            type="text"
+            placeholder="Filter matrix"
+          >
+          <default-pin
+            section="ObservationMatrices"
+            type="ObservationMatrix"
+            @getId="setMatrix"
+          />
+        </div>
+        <div class="flex-separate">
+          <div>
+            <ul class="no_bullets">
+              <template v-for="item in alreadyInMatrices">
+                <li
+                  :key="item.id"
+                  v-if="item.object_tag.toLowerCase().includes(filterType.toLowerCase())"
+                >
+                  <button
+                    class="button normal-input button-default margin-small-bottom"
+                    @click="loadMatrix(item)"
+                    v-html="item.object_tag"
+                  />
+                </li>
+              </template>
+            </ul>
+            <ul class="no_bullets">
+              <template v-for="item in matrices">
+                <li
+                  :key="item.id"
+                  v-if="item.object_tag.toLowerCase().includes(filterType.toLowerCase()) && !alreadyInMatrices.includes(item)"
+                >
+                  <button
+                    class="button normal-input button-submit margin-small-bottom"
+                    @click="loadMatrix(item)"
+                    v-html="item.object_tag"
+                  />
+                </li>
+              </template>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import CRUD from '../../request/crud'
+import annotatorExtend from '../annotatorExtend'
+import {
+  GetObservationMatrices,
+  GetObservationRow,
+  CreateObservationMatrixRow,
+  GetObservationMatrix
+} from 'tasks/observation_matrices/dashboard/request/resources'
+
+export default {
+  mixins: [CRUD, annotatorExtend],
+  computed: {
+    alreadyInMatrices () {
+      return this.matrices.filter(item => {
+        return this.rows.find(row => { return item.id === row.observation_matrix_id })
+      })
+    },
+    alreadyInCurrentMatrix () {
+      return this.rows.filter(row => { return this.selectedMatrix.id === row.observation_matrix_id })
+    }
+  },
+  data () {
+    return {
+      show: false,
+      matrices: [],
+      selectedMatrix: undefined,
+      rows: [],
+      create: false,
+      filterType: '',
+      loading: false,
+      otuSelected: undefined,
+      loadOnMounted: false,
+      types: {
+        Otu: {
+          propertyName: 'otu_id',
+          type: 'ObservationMatrixRowItem::SingleOtu'
+        },
+        CollectionObject: {
+          propertyName: 'collection_object_id',
+          type: 'ObservationMatrixRowItem::SingleCollectionObject'
+        }
+      }
+    }
+  },
+  mounted () {
+    this.loading = true
+    this.show = true
+    GetObservationMatrices().then(response => {
+      this.matrices = response.body.sort((a, b) => {
+        const compareA = a.object_tag
+        const compareB = b.object_tag
+        if (compareA < compareB) {
+          return -1
+        } else if (compareA > compareB) {
+          return 1
+        } else {
+          return 0
+        }
+      })
+      this.loading = false
+    })
+    GetObservationRow({ [this.types[this.metadata.object_type].propertyName]: this.metadata.object_id }).then(response => {
+      this.rows = response.body
+    })
+  },
+  methods: {
+    loadMatrix (matrix) {
+      this.selectedMatrix = matrix
+      if (matrix.is_media_matrix) {
+        this.openImageMatrix()
+      } else {
+        this.openMatrixRowCoder()
+      }
+    },
+    reset () {
+      this.selectedMatrix = undefined
+      this.rows = []
+      this.create = false
+      this.show = false
+    },
+    createRow () {
+      return new Promise((resolve, reject) => {
+        if (window.confirm('Are you sure you want to add this otu to this matrix?')) {
+          const promises = []
+
+          Promise.all(promises).then(() => {
+            const data = {
+              observation_matrix_id: this.selectedMatrix.id,
+              [this.types[this.metadata.object_type].propertyName]: this.metadata.object_id,
+              type: this.types[this.metadata.object_type].type
+            }
+            CreateObservationMatrixRow(data).then(response => {
+              GetObservationRow({ [this.types[this.metadata.object_type].propertyName]: this.metadata.object_id }).then(response => {
+                this.rows = response.body
+                resolve(response)
+              })
+            })
+          })
+        }
+      })
+    },
+    setMatrix (id) {
+      GetObservationMatrix(id).then(response => {
+        this.selectedMatrix = response.body
+        this.loadMatrix(this.selectedMatrix)
+      })
+    },
+    openMatrixRowCoder () {
+      if (this.alreadyInCurrentMatrix.length) {
+        window.open(`/tasks/observation_matrices/row_coder/index?observation_matrix_row_id=${this.alreadyInCurrentMatrix[0].id}`, '_blank')
+      } else {
+        this.createRow().then(() => {
+          window.open(`/tasks/observation_matrices/row_coder/index?observation_matrix_row_id=${this.alreadyInCurrentMatrix[0].id}`, '_blank')
+        })
+      }
+    },
+    openImageMatrix () {
+      if (this.alreadyInCurrentMatrix.length) {
+        window.open(`/tasks/matrix_image/matrix_image/index?observation_matrix_id=${this.selectedMatrix.id}&row_id=${this.alreadyInCurrentMatrix[0].id}&row_position=${this.alreadyInCurrentMatrix[0].position}`, '_blank')
+      }
+    }
+  }
+}
+</script>
diff --git a/app/javascript/vue/components/radials/object/radial.vue b/app/javascript/vue/components/radials/object/radial.vue
index 47a85878cb..f7207e7257 100644
--- a/app/javascript/vue/components/radials/object/radial.vue
+++ b/app/javascript/vue/components/radials/object/radial.vue
@@ -3,7 +3,7 @@
     <div class="radial-annotator">
       <modal
         v-if="display"
-        :container-style="{ backgroundColor: 'transparent' }"
+        :container-style="{ backgroundColor: 'transparent', boxShadow: 'none' }"
         @close="closeModal()">
         <h3
           slot="header"
@@ -80,6 +80,7 @@ import common_namesAnnotator from './components/common_names/main.vue'
 import contentsAnnotator from './components/contents/main.vue'
 import biocuration_classificationsAnnotator from './components/biocurations/biocurations'
 import taxon_determinationsAnnotator from './components/taxon_determinations/taxon_determinations'
+import observation_matricesAnnotator from './components/observation_matrices/main.vue'
 
 import Icons from './images/icons.js'
 
@@ -96,7 +97,8 @@ export default {
     common_namesAnnotator,
     contentsAnnotator,
     biocuration_classificationsAnnotator,
-    taxon_determinationsAnnotator
+    taxon_determinationsAnnotator,
+    observation_matricesAnnotator
   },
   props: {
     reload: {
@@ -144,7 +146,13 @@ export default {
       title: 'Otu radial',
       menuOptions: [],
       defaultTag: undefined,
-      tagCreated: false
+      tagCreated: false,
+      hardcodeSections: [
+        {
+          section: 'observation_matrices',
+          objectTypes: ['Otu', 'CollectionObject']
+        }
+      ]
     }
   },
   computed: {
@@ -235,6 +243,7 @@ export default {
       const that = this
       this.getList(`/${this.type}/${encodeURIComponent(this.globalId)}/metadata`).then(response => {
         that.metadata = response.body
+        that.metadata.endpoints = Object.assign({}, that.metadata.endpoints, ...this.addHardcodeSections(response.body.object_type))
         that.title = response.body.object_tag
         that.menuOptions = that.createMenuOptions(response.body.endpoints)
         that.url = response.body.url
@@ -298,6 +307,11 @@ export default {
         this.defaultTag = undefined
         TW.workbench.alert.create('Tag item was successfully destroyed.', 'notice')
       })
+    },
+    addHardcodeSections (type) {
+      return this.hardcodeSections.filter(item => item.objectTypes.includes(type)).map(item => {
+        return { [item.section]: { total: 0 } }
+      })
     }
   }
 }

From d2427e6d1161756a188080231673ab196eb2c0ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Mon, 20 Jul 2020 17:37:00 -0300
Subject: [PATCH 40/76] minor tweak

---
 .../radials/object/components/observation_matrices/main.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/vue/components/radials/object/components/observation_matrices/main.vue b/app/javascript/vue/components/radials/object/components/observation_matrices/main.vue
index 70f0a7dcb2..729bb5173c 100644
--- a/app/javascript/vue/components/radials/object/components/observation_matrices/main.vue
+++ b/app/javascript/vue/components/radials/object/components/observation_matrices/main.vue
@@ -142,7 +142,7 @@ export default {
     },
     createRow () {
       return new Promise((resolve, reject) => {
-        if (window.confirm('Are you sure you want to add this otu to this matrix?')) {
+        if (window.confirm(`Are you sure you want to add this ${this.metadata.object_type} to this matrix?`)) {
           const promises = []
 
           Promise.all(promises).then(() => {

From d6a115784720a37002c8a365df42a23ce5da194b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Mon, 20 Jul 2020 19:00:55 -0300
Subject: [PATCH 41/76] Update package.json and remove old packages

---
 .postcssrc.yml    |    3 -
 package-lock.json | 1982 ++++++++++-----------------------------------
 package.json      |   30 +-
 3 files changed, 453 insertions(+), 1562 deletions(-)
 delete mode 100644 .postcssrc.yml

diff --git a/.postcssrc.yml b/.postcssrc.yml
deleted file mode 100644
index 150dac3c6c..0000000000
--- a/.postcssrc.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-plugins:
-  postcss-import: {}
-  postcss-cssnext: {}
diff --git a/package-lock.json b/package-lock.json
index de6419cb1c..dbb8928723 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -891,13 +891,14 @@
       "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
     },
     "@geoman-io/leaflet-geoman-free": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.5.0.tgz",
-      "integrity": "sha512-Zq/gOGPpsRurTrW3d3qiXlvEPHZfU/PZ7jr02jtweaN0kXyHo/WqkihMS9h5yUySjJBXdUC9Xuuo4/ZzHqEH4g==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.6.0.tgz",
+      "integrity": "sha512-lJ/s277OjvW8OVJ49lonqTk2VNS5Qmn6fdfkBS4FkBqjzDTa5PKfkSRXUZlV+CMGt1fTIezfSwpEK+85gqo6sw==",
       "requires": {
         "@turf/difference": "^6.0.2",
         "@turf/intersect": "^6.1.3",
         "@turf/kinks": "6.x",
+        "@turf/line-intersect": "^6.0.2",
         "lodash": "^4.17.15"
       }
     },
@@ -976,6 +977,15 @@
         "@turf/meta": "6.x"
       }
     },
+    "@turf/bbox": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-6.0.1.tgz",
+      "integrity": "sha512-EGgaRLettBG25Iyx7VyUINsPpVj1x3nFQFiGS3ER8KCI1MximzNLsam3eXRabqQDjyAKyAE1bJ4EZEpGvspQxw==",
+      "requires": {
+        "@turf/helpers": "6.x",
+        "@turf/meta": "6.x"
+      }
+    },
     "@turf/difference": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/@turf/difference/-/difference-6.0.2.tgz",
@@ -1019,6 +1029,28 @@
         "@turf/helpers": "6.x"
       }
     },
+    "@turf/line-intersect": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@turf/line-intersect/-/line-intersect-6.0.2.tgz",
+      "integrity": "sha512-pfL/lBu7ukBPdTjvSCmcNUzZ83V4R95htwqs5NqU8zeS4R+5KTwacbrOYKztjpmHBwUmPEIIpSbqkUoD0Fp7kg==",
+      "requires": {
+        "@turf/helpers": "6.x",
+        "@turf/invariant": "6.x",
+        "@turf/line-segment": "6.x",
+        "@turf/meta": "6.x",
+        "geojson-rbush": "3.x"
+      }
+    },
+    "@turf/line-segment": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@turf/line-segment/-/line-segment-6.0.2.tgz",
+      "integrity": "sha512-8AkzDHoNw3X68y115josal+lvdAi4b2P1K0YNTKGyLRBaUhPXVSuMBpMd53FRF1hYEb9UJgMbugF9ZE7m5L6zg==",
+      "requires": {
+        "@turf/helpers": "6.x",
+        "@turf/invariant": "6.x",
+        "@turf/meta": "6.x"
+      }
+    },
     "@turf/meta": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-6.0.2.tgz",
@@ -1080,6 +1112,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz",
       "integrity": "sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug==",
+      "dev": true,
       "requires": {
         "consolidate": "^0.15.1",
         "hash-sum": "^1.0.2",
@@ -1096,6 +1129,7 @@
           "version": "4.1.5",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
           "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
           "requires": {
             "pseudomap": "^1.0.2",
             "yallist": "^2.1.2"
@@ -1104,12 +1138,14 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         },
         "yallist": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
         }
       }
     },
@@ -1283,7 +1319,7 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
     },
     "accepts": {
       "version": "1.3.7",
@@ -1310,6 +1346,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
       "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
+      "dev": true,
       "requires": {
         "assert": "1.4.1",
         "camelcase": "5.0.0",
@@ -1322,6 +1359,7 @@
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
           "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+          "dev": true,
           "requires": {
             "util": "0.10.3"
           }
@@ -1329,22 +1367,26 @@
         "camelcase": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
-          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
+          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
+          "dev": true
         },
         "emojis-list": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+          "dev": true
         },
         "inherits": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
         },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
           "requires": {
             "minimist": "^1.2.0"
           }
@@ -1353,6 +1395,7 @@
           "version": "1.2.3",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
           "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "dev": true,
           "requires": {
             "big.js": "^5.2.2",
             "emojis-list": "^2.0.0",
@@ -1363,6 +1406,7 @@
           "version": "0.10.3",
           "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
           "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
           "requires": {
             "inherits": "2.0.1"
           }
@@ -1415,23 +1459,6 @@
       "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
       "dev": true
     },
-    "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.11.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
-          "dev": true
-        }
-      }
-    },
     "ansi-html": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
@@ -1451,11 +1478,6 @@
         "color-convert": "^1.9.0"
       }
     },
-    "any-promise": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz",
-      "integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic="
-    },
     "anymatch": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -1469,12 +1491,12 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo="
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
     "are-we-there-yet": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -1483,7 +1505,7 @@
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "requires": {
         "sprintf-js": "~1.0.2"
       }
@@ -1491,7 +1513,8 @@
     "arity-n": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U="
+      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
+      "dev": true
     },
     "arr-diff": {
       "version": "4.0.0",
@@ -1501,7 +1524,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE="
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
     },
     "arr-union": {
       "version": "3.1.0",
@@ -1571,7 +1594,7 @@
     "asn1.js": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
@@ -1719,6 +1742,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
       "requires": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
@@ -1728,12 +1752,14 @@
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -1745,12 +1771,14 @@
         "js-tokens": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+          "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
         }
       }
     },
@@ -1758,6 +1786,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
       "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+      "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-traverse": "^6.24.1",
@@ -1768,6 +1797,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
       "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
       "requires": {
         "babel-helper-explode-assignable-expression": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1778,6 +1808,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
       "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-traverse": "^6.24.1",
@@ -1788,6 +1819,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
       "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+      "dev": true,
       "requires": {
         "babel-helper-bindify-decorators": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1799,6 +1831,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
       "requires": {
         "babel-helper-get-function-arity": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1811,6 +1844,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
       "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0",
         "babel-types": "^6.24.1"
@@ -1820,6 +1854,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
       "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
       "requires": {
         "babel-helper-function-name": "^6.24.1",
         "babel-runtime": "^6.22.0",
@@ -1844,6 +1879,7 @@
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0"
       }
@@ -1869,67 +1905,80 @@
     "babel-plugin-syntax-async-functions": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
-      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU="
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
     },
     "babel-plugin-syntax-async-generators": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
-      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o="
+      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+      "dev": true
     },
     "babel-plugin-syntax-class-constructor-call": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
-      "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY="
+      "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
+      "dev": true
     },
     "babel-plugin-syntax-class-properties": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
-      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94="
+      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+      "dev": true
     },
     "babel-plugin-syntax-decorators": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
-      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs="
+      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+      "dev": true
     },
     "babel-plugin-syntax-do-expressions": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz",
-      "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0="
+      "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=",
+      "dev": true
     },
     "babel-plugin-syntax-dynamic-import": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
-      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo="
+      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+      "dev": true
     },
     "babel-plugin-syntax-exponentiation-operator": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
-      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4="
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
     },
     "babel-plugin-syntax-export-extensions": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
-      "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE="
+      "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
+      "dev": true
     },
     "babel-plugin-syntax-function-bind": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz",
-      "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y="
+      "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=",
+      "dev": true
     },
     "babel-plugin-syntax-object-rest-spread": {
       "version": "6.13.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
-      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
+      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+      "dev": true
     },
     "babel-plugin-syntax-trailing-function-commas": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
-      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM="
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
     },
     "babel-plugin-transform-async-generator-functions": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
       "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+      "dev": true,
       "requires": {
         "babel-helper-remap-async-to-generator": "^6.24.1",
         "babel-plugin-syntax-async-generators": "^6.5.0",
@@ -1940,6 +1989,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
       "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
       "requires": {
         "babel-helper-remap-async-to-generator": "^6.24.1",
         "babel-plugin-syntax-async-functions": "^6.8.0",
@@ -1950,6 +2000,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
       "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
+      "dev": true,
       "requires": {
         "babel-plugin-syntax-class-constructor-call": "^6.18.0",
         "babel-runtime": "^6.22.0",
@@ -1960,6 +2011,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
       "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+      "dev": true,
       "requires": {
         "babel-helper-function-name": "^6.24.1",
         "babel-plugin-syntax-class-properties": "^6.8.0",
@@ -1971,6 +2023,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
       "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+      "dev": true,
       "requires": {
         "babel-helper-explode-class": "^6.24.1",
         "babel-plugin-syntax-decorators": "^6.13.0",
@@ -1983,6 +2036,7 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz",
       "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=",
+      "dev": true,
       "requires": {
         "babel-plugin-syntax-do-expressions": "^6.8.0",
         "babel-runtime": "^6.22.0"
@@ -1992,6 +2046,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
       "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
       "requires": {
         "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
         "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
@@ -2002,6 +2057,7 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
       "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
+      "dev": true,
       "requires": {
         "babel-plugin-syntax-export-extensions": "^6.8.0",
         "babel-runtime": "^6.22.0"
@@ -2011,6 +2067,7 @@
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz",
       "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=",
+      "dev": true,
       "requires": {
         "babel-plugin-syntax-function-bind": "^6.8.0",
         "babel-runtime": "^6.22.0"
@@ -2020,6 +2077,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
       "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+      "dev": true,
       "requires": {
         "babel-plugin-syntax-object-rest-spread": "^6.8.0",
         "babel-runtime": "^6.26.0"
@@ -2029,6 +2087,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.24.1.tgz",
       "integrity": "sha1-VkLRUEL5E4TX5a+LyIsduVsDnmo=",
+      "dev": true,
       "requires": {
         "babel-plugin-transform-do-expressions": "^6.22.0",
         "babel-plugin-transform-function-bind": "^6.22.0",
@@ -2039,6 +2098,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
       "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
+      "dev": true,
       "requires": {
         "babel-plugin-transform-class-constructor-call": "^6.24.1",
         "babel-plugin-transform-export-extensions": "^6.22.0",
@@ -2049,6 +2109,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
       "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+      "dev": true,
       "requires": {
         "babel-plugin-syntax-dynamic-import": "^6.18.0",
         "babel-plugin-transform-class-properties": "^6.24.1",
@@ -2060,6 +2121,7 @@
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
       "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+      "dev": true,
       "requires": {
         "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
         "babel-plugin-transform-async-generator-functions": "^6.24.1",
@@ -2072,6 +2134,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "dev": true,
       "requires": {
         "core-js": "^2.4.0",
         "regenerator-runtime": "^0.11.0"
@@ -2080,12 +2143,14 @@
         "core-js": {
           "version": "2.6.11",
           "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==",
+          "dev": true
         },
         "regenerator-runtime": {
           "version": "0.11.1",
           "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+          "dev": true
         }
       }
     },
@@ -2093,6 +2158,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
       "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
         "babel-traverse": "^6.26.0",
@@ -2105,6 +2171,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
       "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
       "requires": {
         "babel-code-frame": "^6.26.0",
         "babel-messages": "^6.23.0",
@@ -2121,6 +2188,7 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -2128,12 +2196,14 @@
         "globals": {
           "version": "9.18.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
+          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+          "dev": true
         },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -2141,6 +2211,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
       "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
         "esutils": "^2.0.2",
@@ -2151,14 +2222,16 @@
         "to-fast-properties": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
+          "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+          "dev": true
         }
       }
     },
     "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha1-ry87iPpvXB5MY00aD46sT1WzleM="
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
     },
     "balanced-match": {
       "version": "1.0.0",
@@ -2168,7 +2241,7 @@
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -2190,7 +2263,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -2198,7 +2271,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -2206,7 +2279,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -2341,7 +2414,7 @@
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2350,7 +2423,7 @@
     "braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "requires": {
         "arr-flatten": "^1.1.0",
         "array-unique": "^0.3.2",
@@ -2379,15 +2452,10 @@
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
     },
-    "browser-request": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz",
-      "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc="
-    },
     "browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "requires": {
         "buffer-xor": "^1.0.3",
         "cipher-base": "^1.0.0",
@@ -2400,7 +2468,7 @@
     "browserify-cipher": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "requires": {
         "browserify-aes": "^1.0.4",
         "browserify-des": "^1.0.0",
@@ -2470,7 +2538,7 @@
     "browserify-zlib": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "requires": {
         "pako": "~1.0.5"
       }
@@ -2551,7 +2619,7 @@
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -2649,12 +2717,6 @@
         "supports-color": "^5.3.0"
       }
     },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
     "chokidar": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
@@ -2722,7 +2784,7 @@
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -2731,7 +2793,7 @@
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
@@ -2754,21 +2816,6 @@
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
     },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz",
-      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
-      "dev": true
-    },
     "cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -2809,11 +2856,6 @@
         }
       }
     },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
-    },
     "clone-deep": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -2906,6 +2948,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
       "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
+      "dev": true,
       "requires": {
         "arity-n": "^1.0.4"
       }
@@ -3048,7 +3091,7 @@
     "concat-stream": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
       "requires": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
@@ -3075,7 +3118,8 @@
     "consolidate": {
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha1-IasEMjXHGgfUXZqtmFk7DbpWurc=",
+      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+      "dev": true,
       "requires": {
         "bluebird": "^3.1.1"
       }
@@ -3129,7 +3173,7 @@
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
       "requires": {
         "aproba": "^1.1.1",
         "fs-write-stream-atomic": "^1.0.8",
@@ -3185,7 +3229,7 @@
     "create-ecdh": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "requires": {
         "bn.js": "^4.1.0",
         "elliptic": "^6.0.0"
@@ -3201,7 +3245,7 @@
     "create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "requires": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -3213,7 +3257,7 @@
     "create-hmac": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "requires": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -3251,7 +3295,7 @@
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "requires": {
         "browserify-cipher": "^1.0.0",
         "browserify-sign": "^4.0.0",
@@ -3270,6 +3314,7 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
       "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "source-map": "^0.6.1",
@@ -3280,7 +3325,8 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
@@ -3292,50 +3338,6 @@
         "postcss": "^7.0.5"
       }
     },
-    "css-color-function": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/css-color-function/-/css-color-function-1.3.3.tgz",
-      "integrity": "sha1-jtJMLAIFBzM5+voAS8jBQfzLKC4=",
-      "requires": {
-        "balanced-match": "0.1.0",
-        "color": "^0.11.0",
-        "debug": "^3.1.0",
-        "rgb": "~0.1.0"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz",
-          "integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo="
-        },
-        "color": {
-          "version": "0.11.4",
-          "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
-          "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
-          "requires": {
-            "clone": "^1.0.2",
-            "color-convert": "^1.3.0",
-            "color-string": "^0.3.0"
-          }
-        },
-        "color-string": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
-          "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
-          "requires": {
-            "color-name": "^1.0.0"
-          }
-        },
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -3407,6 +3409,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
       "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+      "dev": true,
       "requires": {
         "css": "^2.0.0"
       }
@@ -3451,11 +3454,6 @@
         }
       }
     },
-    "css-unit-converter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
-      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA=="
-    },
     "css-what": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz",
@@ -3629,6 +3627,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
       "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "dev": true,
       "requires": {
         "es5-ext": "^0.10.50",
         "type": "^1.0.1"
@@ -3645,7 +3644,8 @@
     "de-indent": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0="
+      "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
+      "dev": true
     },
     "debug": {
       "version": "4.1.1",
@@ -3706,7 +3706,7 @@
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -3715,7 +3715,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3723,7 +3723,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3731,7 +3731,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -3808,7 +3808,7 @@
     "diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "requires": {
         "bn.js": "^4.1.0",
         "miller-rabin": "^4.0.0",
@@ -3875,7 +3875,7 @@
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto="
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
     },
     "domelementtype": {
       "version": "1.3.1",
@@ -4001,6 +4001,23 @@
         }
       }
     },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      },
+      "dependencies": {
+        "ansi-colors": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+          "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+          "dev": true
+        }
+      }
+    },
     "entities": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
@@ -4009,7 +4026,7 @@
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "requires": {
         "prr": "~1.0.1"
       }
@@ -4054,6 +4071,7 @@
       "version": "0.10.53",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
       "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "dev": true,
       "requires": {
         "es6-iterator": "~2.0.3",
         "es6-symbol": "~3.1.3",
@@ -4064,6 +4082,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
       "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
       "requires": {
         "d": "1",
         "es5-ext": "^0.10.35",
@@ -4074,6 +4093,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
       "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+      "dev": true,
       "requires": {
         "d": "^1.0.1",
         "ext": "^1.1.2"
@@ -4091,9 +4111,9 @@
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "eslint": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.2.0.tgz",
-      "integrity": "sha512-B3BtEyaDKC5MlfDa2Ha8/D6DsS4fju95zs0hjS3HdGazw+LNayai38A25qMppK37wWGWNYSPOR6oYzlz5MHsRQ==",
+      "version": "7.5.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz",
+      "integrity": "sha512-vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -4102,10 +4122,11 @@
         "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
         "eslint-scope": "^5.1.0",
-        "eslint-utils": "^2.0.0",
-        "eslint-visitor-keys": "^1.2.0",
-        "espree": "^7.1.0",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^1.3.0",
+        "espree": "^7.2.0",
         "esquery": "^1.2.0",
         "esutils": "^2.0.2",
         "file-entry-cache": "^5.0.1",
@@ -4115,12 +4136,11 @@
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
         "is-glob": "^4.0.0",
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash": "^4.17.14",
+        "lodash": "^4.17.19",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -4151,9 +4171,9 @@
           }
         },
         "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -4196,6 +4216,21 @@
             "estraverse": "^4.1.1"
           }
         },
+        "eslint-utils": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+          "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^1.1.0"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        },
         "globals": {
           "version": "12.4.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
@@ -4211,6 +4246,12 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "lodash": {
+          "version": "4.17.19",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
+          "dev": true
+        },
         "path-key": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -4274,9 +4315,9 @@
       "dev": true
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
-      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz",
+      "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
       "dev": true,
       "requires": {
         "debug": "^2.6.9",
@@ -4347,9 +4388,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.21.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.21.1.tgz",
-      "integrity": "sha512-qYOOsgUv63vHof7BqbzuD+Ud34bXHxFJxntuAC1ZappFZXYbRIek3aJ7jc9i2dHDGDyZ/0zlO0cpioES265Lsw==",
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz",
+      "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.1",
@@ -4533,20 +4574,26 @@
       "dev": true
     },
     "espree": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-7.1.0.tgz",
-      "integrity": "sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz",
+      "integrity": "sha512-H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g==",
       "dev": true,
       "requires": {
-        "acorn": "^7.2.0",
+        "acorn": "^7.3.1",
         "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.2.0"
+        "eslint-visitor-keys": "^1.3.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
-          "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
+          "version": "7.3.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
+          "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==",
+          "dev": true
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "dev": true
         }
       }
@@ -4576,7 +4623,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "requires": {
         "estraverse": "^4.1.0"
       }
@@ -4620,7 +4667,7 @@
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "requires": {
         "md5.js": "^1.3.4",
         "safe-buffer": "^5.1.1"
@@ -4630,6 +4677,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
       "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
       "requires": {
         "cross-spawn": "^6.0.0",
         "get-stream": "^4.0.0",
@@ -4644,6 +4692,7 @@
           "version": "6.0.5",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
           "requires": {
             "nice-try": "^1.0.4",
             "path-key": "^2.0.1",
@@ -4778,6 +4827,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
       "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
+      "dev": true,
       "requires": {
         "type": "^2.0.0"
       },
@@ -4785,7 +4835,8 @@
         "type": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="
+          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
+          "dev": true
         }
       }
     },
@@ -4806,28 +4857,17 @@
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "requires": {
             "is-plain-object": "^2.0.4"
           }
         }
       }
     },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "requires": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
@@ -4858,7 +4898,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -4866,7 +4906,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -4874,7 +4914,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -4918,15 +4958,6 @@
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
       "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="
     },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
     "file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -5199,7 +5230,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0="
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
@@ -5225,7 +5256,7 @@
     "gaze": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=",
+      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
       "requires": {
         "globule": "^1.0.0"
       }
@@ -5235,6 +5266,17 @@
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
       "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="
     },
+    "geojson-rbush": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/geojson-rbush/-/geojson-rbush-3.1.2.tgz",
+      "integrity": "sha512-grkfdg3HIeTjwTfiJe5FT8+fGU3fABCc+vRJDBwdQz9kkLF0Sbif2gs2JUzjewwgmnvLGy9fInySDeADoNuk7w==",
+      "requires": {
+        "@turf/bbox": "*",
+        "@turf/helpers": "6.x",
+        "@turf/meta": "6.x",
+        "rbush": "^2.0.0"
+      }
+    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -5249,6 +5291,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
       "requires": {
         "pump": "^3.0.0"
       }
@@ -5355,14 +5398,6 @@
         "minimatch": "~3.0.2"
       }
     },
-    "gonzales-pe": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
-      "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "graceful-fs": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
@@ -5478,7 +5513,8 @@
     "hash-sum": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ="
+      "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
+      "dev": true
     },
     "hash.js": {
       "version": "1.1.7",
@@ -5492,7 +5528,8 @@
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true
     },
     "hex-color-regex": {
       "version": "1.1.0",
@@ -5750,123 +5787,12 @@
     "ini": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc="
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
-    "inquirer": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.5.3",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+    "internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
       "dev": true,
       "requires": {
         "default-gateway": "^4.2.0",
@@ -5874,23 +5800,18 @@
       }
     },
     "interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+      "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
     },
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "requires": {
         "loose-envify": "^1.0.0"
       }
     },
-    "invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
-    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -5955,7 +5876,7 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4="
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "is-callable": {
       "version": "1.2.0",
@@ -6001,7 +5922,7 @@
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
         "is-data-descriptor": "^0.1.4",
@@ -6011,7 +5932,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
         }
       }
     },
@@ -6106,7 +6027,7 @@
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "requires": {
         "isobject": "^3.0.1"
       }
@@ -6122,12 +6043,13 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg="
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
     },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
     },
     "is-string": {
       "version": "1.0.5",
@@ -6164,7 +6086,7 @@
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0="
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
     },
     "is-wsl": {
       "version": "1.1.0",
@@ -6181,11 +6103,6 @@
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
-    "isnumeric": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/isnumeric/-/isnumeric-0.2.0.tgz",
-      "integrity": "sha1-ojR7o2DeGeM9D/1ZD933dVy/LmQ="
-    },
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
@@ -6252,7 +6169,7 @@
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk="
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
     },
     "json-schema": {
       "version": "0.2.3",
@@ -6342,14 +6259,6 @@
         "webpack-sources": "^1.1.0"
       }
     },
-    "lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-      "requires": {
-        "invert-kv": "^2.0.0"
-      }
-    },
     "leaflet": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.6.0.tgz",
@@ -6472,7 +6381,8 @@
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
     },
     "lodash.get": {
       "version": "4.4.2",
@@ -6558,14 +6468,6 @@
         "semver": "^5.6.0"
       }
     },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -6593,11 +6495,6 @@
         "tinyqueue": "^1.2.0"
       }
     },
-    "math-expression-evaluator": {
-      "version": "1.2.22",
-      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.22.tgz",
-      "integrity": "sha512-L0j0tFVZBQQLeEjmWOvDLoRciIY8gQGWahvkztXUal8jH8R5Rlqo9GCvgqvXcy9LQhEWdQCVvzqAbxgYNt4blQ=="
-    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -6619,16 +6516,6 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
       "dev": true
     },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      }
-    },
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -6664,7 +6551,8 @@
     "merge-source-map": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha1-L93n5gIJOfcJBqaPLXrmheTIxkY=",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+      "dev": true,
       "requires": {
         "source-map": "^0.6.1"
       },
@@ -6672,7 +6560,8 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
@@ -6690,7 +6579,7 @@
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -6710,7 +6599,7 @@
     "miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "requires": {
         "bn.js": "^4.0.0",
         "brorand": "^1.0.1"
@@ -6742,11 +6631,6 @@
         "mime-db": "1.44.0"
       }
     },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-    },
     "mini-css-extract-plugin": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
@@ -6773,7 +6657,7 @@
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc="
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
     },
     "minimalistic-crypto-utils": {
       "version": "1.0.1",
@@ -6783,7 +6667,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -6903,12 +6787,6 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
     "nan": {
       "version": "2.14.1",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
@@ -6952,7 +6830,8 @@
     "next-tick": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
     },
     "nice-try": {
       "version": "1.0.5",
@@ -7130,6 +7009,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
       "requires": {
         "path-key": "^2.0.0"
       }
@@ -7137,7 +7017,7 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -7224,7 +7104,8 @@
     "object-path": {
       "version": "0.11.4",
       "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
-      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk="
+      "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
+      "dev": true
     },
     "object-visit": {
       "version": "1.0.1",
@@ -7302,20 +7183,6 @@
         "wrappy": "1"
       }
     },
-    "onecolor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.1.0.tgz",
-      "integrity": "sha512-YZSypViXzu3ul5LMu/m6XjJ9ol8qAy9S2VjHl5E6UlhUH1KGKWabyEJifn0Jjpw23bYDzC2ucKMPGiH5kfwSGQ=="
-    },
-    "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
     "opn": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
@@ -7367,16 +7234,6 @@
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
-    "os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-      "requires": {
-        "execa": "^1.0.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
-      }
-    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@@ -7385,26 +7242,17 @@
     "osenv": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
       }
     },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
-    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
-    },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
     },
     "p-limit": {
       "version": "1.3.0",
@@ -7520,7 +7368,7 @@
     "path-complete-extname": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/path-complete-extname/-/path-complete-extname-1.0.0.tgz",
-      "integrity": "sha1-+ImYXckQAMgVUVwL/tBsWs2gdSs="
+      "integrity": "sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg=="
     },
     "path-dirname": {
       "version": "1.0.2",
@@ -7614,42 +7462,6 @@
         "pinkie": "^2.0.0"
       }
     },
-    "pixrem": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pixrem/-/pixrem-4.0.1.tgz",
-      "integrity": "sha1-LaSh3m7EQjxfw3lOkwuB1EkOxoY=",
-      "requires": {
-        "browserslist": "^2.0.0",
-        "postcss": "^6.0.0",
-        "reduce-css-calc": "^1.2.7"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "2.11.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-          "integrity": "sha1-/jYWeu0bvN5IJ+v+cTR6LMcLmbI=",
-          "requires": {
-            "caniuse-lite": "^1.0.30000792",
-            "electron-to-chromium": "^1.3.30"
-          }
-        },
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "pkg-dir": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
@@ -7706,32 +7518,6 @@
         "find-up": "^2.1.0"
       }
     },
-    "pleeease-filters": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pleeease-filters/-/pleeease-filters-4.0.0.tgz",
-      "integrity": "sha1-ZjKy+wVkjSdY2GU4T7zteeHMrsc=",
-      "requires": {
-        "onecolor": "^3.0.4",
-        "postcss": "^6.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "pnp-webpack-plugin": {
       "version": "1.6.4",
       "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
@@ -7797,38 +7583,6 @@
         }
       }
     },
-    "postcss-apply": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/postcss-apply/-/postcss-apply-0.8.0.tgz",
-      "integrity": "sha1-FOVEu7XLbxweBIhXll15rgZrE0M=",
-      "requires": {
-        "babel-runtime": "^6.23.0",
-        "balanced-match": "^0.4.2",
-        "postcss": "^6.0.0"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
-        },
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "postcss-attribute-case-insensitive": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz",
@@ -7848,39 +7602,6 @@
         "postcss-value-parser": "^4.0.2"
       }
     },
-    "postcss-color-function": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-function/-/postcss-color-function-4.1.0.tgz",
-      "integrity": "sha512-2/fuv6mP5Lt03XbRpVfMdGC8lRP1sykme+H1bR4ARyOmSMB8LPSjcL6EAI1iX6dqUF+jNEvKIVVXhan1w/oFDQ==",
-      "requires": {
-        "css-color-function": "~1.3.3",
-        "postcss": "^6.0.23",
-        "postcss-message-helpers": "^2.0.0",
-        "postcss-value-parser": "^3.3.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
     "postcss-color-functional-notation": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
@@ -7909,75 +7630,6 @@
         "postcss-values-parser": "^2.0.1"
       }
     },
-    "postcss-color-hsl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-hsl/-/postcss-color-hsl-2.0.0.tgz",
-      "integrity": "sha1-EnA2ZvoxBDDj8wpFTawThjF9WEQ=",
-      "requires": {
-        "postcss": "^6.0.1",
-        "postcss-value-parser": "^3.3.0",
-        "units-css": "^0.4.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
-    "postcss-color-hwb": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-hwb/-/postcss-color-hwb-3.0.0.tgz",
-      "integrity": "sha1-NAKxnvTYSXVAwftQcr6YY8qVVx4=",
-      "requires": {
-        "color": "^1.0.3",
-        "postcss": "^6.0.1",
-        "postcss-message-helpers": "^2.0.0",
-        "reduce-function-call": "^1.0.2"
-      },
-      "dependencies": {
-        "color": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
-          "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
-          "requires": {
-            "color-convert": "^1.8.2",
-            "color-string": "^1.4.0"
-          }
-        },
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "postcss-color-mod-function": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
@@ -7997,69 +7649,6 @@
         "postcss-values-parser": "^2.0.0"
       }
     },
-    "postcss-color-rgb": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rgb/-/postcss-color-rgb-2.0.0.tgz",
-      "integrity": "sha1-FFOcinExSUtILg3RzCZf9lFLUmM=",
-      "requires": {
-        "postcss": "^6.0.1",
-        "postcss-value-parser": "^3.3.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
-    "postcss-color-rgba-fallback": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-3.0.0.tgz",
-      "integrity": "sha1-N9XJNToHoJJwkSqCYGu0Kg1wLAQ=",
-      "requires": {
-        "postcss": "^6.0.6",
-        "postcss-value-parser": "^3.3.0",
-        "rgb-hex": "^2.1.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "postcss-colormin": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
@@ -8095,326 +7684,6 @@
         }
       }
     },
-    "postcss-cssnext": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-3.1.0.tgz",
-      "integrity": "sha1-kn3Ck0GpOCVM3jjqYKkjud/t6tk=",
-      "requires": {
-        "autoprefixer": "^7.1.1",
-        "caniuse-api": "^2.0.0",
-        "chalk": "^2.0.1",
-        "pixrem": "^4.0.0",
-        "pleeease-filters": "^4.0.0",
-        "postcss": "^6.0.5",
-        "postcss-apply": "^0.8.0",
-        "postcss-attribute-case-insensitive": "^2.0.0",
-        "postcss-calc": "^6.0.0",
-        "postcss-color-function": "^4.0.0",
-        "postcss-color-gray": "^4.0.0",
-        "postcss-color-hex-alpha": "^3.0.0",
-        "postcss-color-hsl": "^2.0.0",
-        "postcss-color-hwb": "^3.0.0",
-        "postcss-color-rebeccapurple": "^3.0.0",
-        "postcss-color-rgb": "^2.0.0",
-        "postcss-color-rgba-fallback": "^3.0.0",
-        "postcss-custom-media": "^6.0.0",
-        "postcss-custom-properties": "^6.1.0",
-        "postcss-custom-selectors": "^4.0.1",
-        "postcss-font-family-system-ui": "^3.0.0",
-        "postcss-font-variant": "^3.0.0",
-        "postcss-image-set-polyfill": "^0.3.5",
-        "postcss-initial": "^2.0.0",
-        "postcss-media-minmax": "^3.0.0",
-        "postcss-nesting": "^4.0.1",
-        "postcss-pseudo-class-any-link": "^4.0.0",
-        "postcss-pseudoelements": "^5.0.0",
-        "postcss-replace-overflow-wrap": "^2.0.0",
-        "postcss-selector-matches": "^3.0.1",
-        "postcss-selector-not": "^3.0.1"
-      },
-      "dependencies": {
-        "autoprefixer": {
-          "version": "7.2.6",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz",
-          "integrity": "sha1-JWZy+G98c12oScTwfQCKuwVgZ9w=",
-          "requires": {
-            "browserslist": "^2.11.3",
-            "caniuse-lite": "^1.0.30000805",
-            "normalize-range": "^0.1.2",
-            "num2fraction": "^1.2.2",
-            "postcss": "^6.0.17",
-            "postcss-value-parser": "^3.2.3"
-          }
-        },
-        "browserslist": {
-          "version": "2.11.3",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-          "integrity": "sha1-/jYWeu0bvN5IJ+v+cTR6LMcLmbI=",
-          "requires": {
-            "caniuse-lite": "^1.0.30000792",
-            "electron-to-chromium": "^1.3.30"
-          }
-        },
-        "caniuse-api": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-2.0.0.tgz",
-          "integrity": "sha1-sd21pZZrFvSNxJmERNS7xsfZ2DQ=",
-          "requires": {
-            "browserslist": "^2.0.0",
-            "caniuse-lite": "^1.0.0",
-            "lodash.memoize": "^4.1.2",
-            "lodash.uniq": "^4.5.0"
-          }
-        },
-        "color": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color/-/color-2.0.1.tgz",
-          "integrity": "sha512-ubUCVVKfT7r2w2D3qtHakj8mbmKms+tThR8gI8zEYCbUBl8/voqFGt3kgBqGwXAopgXybnkuOq+qMYCRrp4cXw==",
-          "requires": {
-            "color-convert": "^1.9.1",
-            "color-string": "^1.5.2"
-          }
-        },
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "postcss-attribute-case-insensitive": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-2.0.0.tgz",
-          "integrity": "sha1-lNxCLI+QmX8WvTOjZUu77AhJY7Q=",
-          "requires": {
-            "postcss": "^6.0.0",
-            "postcss-selector-parser": "^2.2.3"
-          }
-        },
-        "postcss-calc": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-6.0.2.tgz",
-          "integrity": "sha512-fiznXjEN5T42Qm7qqMCVJXS3roaj9r4xsSi+meaBVe7CJBl8t/QLOXu02Z2E6oWAMWIvCuF6JrvzFekmVEbOKA==",
-          "requires": {
-            "css-unit-converter": "^1.1.1",
-            "postcss": "^7.0.2",
-            "postcss-selector-parser": "^2.2.2",
-            "reduce-css-calc": "^2.0.0"
-          },
-          "dependencies": {
-            "postcss": {
-              "version": "7.0.32",
-              "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
-              "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
-              "requires": {
-                "chalk": "^2.4.2",
-                "source-map": "^0.6.1",
-                "supports-color": "^6.1.0"
-              }
-            },
-            "supports-color": {
-              "version": "6.1.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-              "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss-color-gray": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-4.1.0.tgz",
-          "integrity": "sha512-L4iLKQLdqChz6ZOgGb6dRxkBNw78JFYcJmBz1orHpZoeLtuhDDGegRtX9gSyfoCIM7rWZ3VNOyiqqvk83BEN+w==",
-          "requires": {
-            "color": "^2.0.1",
-            "postcss": "^6.0.14",
-            "postcss-message-helpers": "^2.0.0",
-            "reduce-function-call": "^1.0.2"
-          }
-        },
-        "postcss-color-hex-alpha": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-3.0.0.tgz",
-          "integrity": "sha1-HlPmyKyyN5Vej9CLfs2xuLgwn5U=",
-          "requires": {
-            "color": "^1.0.3",
-            "postcss": "^6.0.1",
-            "postcss-message-helpers": "^2.0.0"
-          },
-          "dependencies": {
-            "color": {
-              "version": "1.0.3",
-              "resolved": "https://registry.npmjs.org/color/-/color-1.0.3.tgz",
-              "integrity": "sha1-5I6DLYXxTvaU+0aIEcLVz+cptV0=",
-              "requires": {
-                "color-convert": "^1.8.2",
-                "color-string": "^1.4.0"
-              }
-            }
-          }
-        },
-        "postcss-color-rebeccapurple": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-3.1.0.tgz",
-          "integrity": "sha512-212hJUk9uSsbwO5ECqVjmh/iLsmiVL1xy9ce9TVf+X3cK/ZlUIlaMdoxje/YpsL9cmUH3I7io+/G2LyWx5rg1g==",
-          "requires": {
-            "postcss": "^6.0.22",
-            "postcss-values-parser": "^1.5.0"
-          }
-        },
-        "postcss-custom-media": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-6.0.0.tgz",
-          "integrity": "sha1-vlMnhBEOyylQRPtTlaGABushpzc=",
-          "requires": {
-            "postcss": "^6.0.1"
-          }
-        },
-        "postcss-custom-properties": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-6.3.1.tgz",
-          "integrity": "sha512-zoiwn4sCiUFbr4KcgcNZLFkR6gVQom647L+z1p/KBVHZ1OYwT87apnS42atJtx6XlX2yI7N5fjXbFixShQO2QQ==",
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "postcss": "^6.0.18"
-          }
-        },
-        "postcss-custom-selectors": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-4.0.1.tgz",
-          "integrity": "sha1-eBOC+UxS5yfvXKR3bqKt9JphE4I=",
-          "requires": {
-            "postcss": "^6.0.1",
-            "postcss-selector-matches": "^3.0.0"
-          }
-        },
-        "postcss-font-variant": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-3.0.0.tgz",
-          "integrity": "sha1-CMzIj2BQuoLtjvLMdsDGprQfGD4=",
-          "requires": {
-            "postcss": "^6.0.1"
-          }
-        },
-        "postcss-initial": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-2.0.0.tgz",
-          "integrity": "sha1-cnFfczbgu3k1HZnuZcSiU6hEG6Q=",
-          "requires": {
-            "lodash.template": "^4.2.4",
-            "postcss": "^6.0.1"
-          }
-        },
-        "postcss-media-minmax": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz",
-          "integrity": "sha1-Z1JWA3pD70C8Twdgv9BtTcadSNI=",
-          "requires": {
-            "postcss": "^6.0.1"
-          }
-        },
-        "postcss-nesting": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-4.2.1.tgz",
-          "integrity": "sha512-IkyWXICwagCnlaviRexi7qOdwPw3+xVVjgFfGsxmztvRVaNxAlrypOIKqDE5mxY+BVxnId1rnUKBRQoNE2VDaA==",
-          "requires": {
-            "postcss": "^6.0.11"
-          }
-        },
-        "postcss-pseudo-class-any-link": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-4.0.0.tgz",
-          "integrity": "sha1-kVKgYT00UHIFE+iJKFS65C0O5o4=",
-          "requires": {
-            "postcss": "^6.0.1",
-            "postcss-selector-parser": "^2.2.3"
-          }
-        },
-        "postcss-replace-overflow-wrap": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-2.0.0.tgz",
-          "integrity": "sha1-eU22+qVPjbEAhUOSqTr0V2i04ls=",
-          "requires": {
-            "postcss": "^6.0.1"
-          }
-        },
-        "postcss-selector-matches": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz",
-          "integrity": "sha1-5WNAEeE5UIgYYbvdWMLQER/8lqs=",
-          "requires": {
-            "balanced-match": "^0.4.2",
-            "postcss": "^6.0.1"
-          },
-          "dependencies": {
-            "balanced-match": {
-              "version": "0.4.2",
-              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-              "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
-            }
-          }
-        },
-        "postcss-selector-not": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz",
-          "integrity": "sha1-Lk2y8JZTNsAefOx9tsYN/3ZzNdk=",
-          "requires": {
-            "balanced-match": "^0.4.2",
-            "postcss": "^6.0.1"
-          },
-          "dependencies": {
-            "balanced-match": {
-              "version": "0.4.2",
-              "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-              "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
-            }
-          }
-        },
-        "postcss-selector-parser": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
-          "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
-          "requires": {
-            "flatten": "^1.0.2",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        },
-        "postcss-values-parser": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz",
-          "integrity": "sha512-3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ==",
-          "requires": {
-            "flatten": "^1.0.2",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        },
-        "reduce-css-calc": {
-          "version": "2.1.7",
-          "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.7.tgz",
-          "integrity": "sha512-fDnlZ+AybAS3C7Q9xDq5y8A2z+lT63zLbynew/lur/IR24OQF5x98tfNwf79mzEdfywZ0a2wpM860FhFfMxZlA==",
-          "requires": {
-            "css-unit-converter": "^1.1.1",
-            "postcss-value-parser": "^3.3.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "postcss-custom-media": {
       "version": "7.0.8",
       "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
@@ -8558,31 +7827,6 @@
         "postcss": "^7.0.2"
       }
     },
-    "postcss-font-family-system-ui": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-family-system-ui/-/postcss-font-family-system-ui-3.0.0.tgz",
-      "integrity": "sha1-Z1/nqeApZp8F+Nui5EwiJe3oBiM=",
-      "requires": {
-        "postcss": "^6.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "postcss-font-variant": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz",
@@ -8608,32 +7852,6 @@
         "postcss-values-parser": "^2.0.0"
       }
     },
-    "postcss-image-set-polyfill": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-polyfill/-/postcss-image-set-polyfill-0.3.5.tgz",
-      "integrity": "sha1-Dxk0E3AM8fgr05Bm7wFtZaShgYE=",
-      "requires": {
-        "postcss": "^6.0.1",
-        "postcss-media-query-parser": "^0.2.3"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "postcss-import": {
       "version": "12.0.1",
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
@@ -8755,11 +7973,6 @@
         "postcss": "^7.0.2"
       }
     },
-    "postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ="
-    },
     "postcss-merge-longhand": {
       "version": "4.0.11",
       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
@@ -8803,11 +8016,6 @@
         }
       }
     },
-    "postcss-message-helpers": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
-      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4="
-    },
     "postcss-minify-font-values": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
@@ -9193,31 +8401,6 @@
         }
       }
     },
-    "postcss-pseudoelements": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-5.0.0.tgz",
-      "integrity": "sha1-7vGU6NUkZFylIKlJ6V5RjoEkAss=",
-      "requires": {
-        "postcss": "^6.0.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "postcss-reduce-initial": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
@@ -9246,72 +8429,21 @@
           "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
         }
       }
-    },
-    "postcss-replace-overflow-wrap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
-      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
-      "requires": {
-        "postcss": "^7.0.2"
-      }
-    },
-    "postcss-safe-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
-      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
-      "requires": {
-        "postcss": "^7.0.26"
-      }
-    },
-    "postcss-sass": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.2.0.tgz",
-      "integrity": "sha1-5VUWRB6VJrpLOApzDToC6eqnjHo=",
-      "requires": {
-        "gonzales-pe": "^4.0.3",
-        "postcss": "^6.0.6"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
+    },
+    "postcss-replace-overflow-wrap": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
+      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
+      "requires": {
+        "postcss": "^7.0.2"
       }
     },
-    "postcss-scss": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.6.tgz",
-      "integrity": "sha512-4EFYGHcEw+H3E06PT/pQQri06u/1VIIPjeJQaM8skB80vZuXMhp4cSNV5azmdNkontnOID/XYWEvEEELLFB1ww==",
+    "postcss-safe-parser": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
+      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
       "requires": {
-        "postcss": "^6.0.23"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
+        "postcss": "^7.0.26"
       }
     },
     "postcss-selector-matches": {
@@ -9342,46 +8474,6 @@
         "uniq": "^1.0.1"
       }
     },
-    "postcss-smart-import": {
-      "version": "0.7.6",
-      "resolved": "https://registry.npmjs.org/postcss-smart-import/-/postcss-smart-import-0.7.6.tgz",
-      "integrity": "sha1-JZ3rhKoo8ThFghjswOmoTGGtpqQ=",
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "lodash": "^4.17.4",
-        "object-assign": "^4.1.1",
-        "postcss": "^6.0.14",
-        "postcss-sass": "^0.2.0",
-        "postcss-scss": "^1.0.2",
-        "postcss-value-parser": "^3.3.0",
-        "promise-each": "^2.2.0",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.5.0",
-        "sugarss": "^1.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "postcss-svgo": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
@@ -9440,12 +8532,13 @@
       "version": "1.19.1",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
       "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+      "dev": true,
       "optional": true
     },
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8="
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
     },
     "process": {
       "version": "0.11.10",
@@ -9463,14 +8556,6 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
-    "promise-each": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz",
-      "integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=",
-      "requires": {
-        "any-promise": "^0.1.0"
-      }
-    },
     "promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
@@ -9533,7 +8618,7 @@
     "pumpify": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
       "requires": {
         "duplexify": "^3.6.0",
         "inherits": "^2.0.3",
@@ -9554,7 +8639,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "q": {
       "version": "1.5.1",
@@ -9591,6 +8676,11 @@
       "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
       "dev": true
     },
+    "quickselect": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz",
+      "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ=="
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -9602,7 +8692,7 @@
     "randomfill": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "requires": {
         "randombytes": "^2.0.5",
         "safe-buffer": "^5.1.0"
@@ -9657,6 +8747,14 @@
         }
       }
     },
+    "rbush": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz",
+      "integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==",
+      "requires": {
+        "quickselect": "^1.0.1"
+      }
+    },
     "read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -9769,31 +8867,6 @@
         }
       }
     },
-    "reduce-css-calc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
-      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
-      "requires": {
-        "balanced-match": "^0.4.2",
-        "math-expression-evaluator": "^1.2.14",
-        "reduce-function-call": "^1.0.1"
-      },
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
-        }
-      }
-    },
-    "reduce-function-call": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
-      "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==",
-      "requires": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "regenerate": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
@@ -9824,7 +8897,7 @@
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
@@ -9833,7 +8906,8 @@
     "regex-parser": {
       "version": "2.2.10",
       "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
-      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA=="
+      "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
+      "dev": true
     },
     "regexp.prototype.flags": {
       "version": "1.3.0",
@@ -10008,6 +9082,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz",
       "integrity": "sha512-K1N5xUjj7v0l2j/3Sgs5b8CjrrgtC70SmdCuZiJ8tSyb5J+uk3FoeZ4b7yTnH6j7ngI+Bc5bldHJIa8hYdu2gQ==",
+      "dev": true,
       "requires": {
         "adjust-sourcemap-loader": "2.0.0",
         "camelcase": "5.3.1",
@@ -10024,12 +9099,14 @@
         "emojis-list": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+          "dev": true
         },
         "json5": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
           "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
           "requires": {
             "minimist": "^1.2.0"
           }
@@ -10038,6 +9115,7 @@
           "version": "1.2.3",
           "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
           "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "dev": true,
           "requires": {
             "big.js": "^5.2.2",
             "emojis-list": "^2.0.0",
@@ -10048,6 +9126,7 @@
           "version": "7.0.21",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
           "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
+          "dev": true,
           "requires": {
             "chalk": "^2.4.2",
             "source-map": "^0.6.1",
@@ -10057,32 +9136,24 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
         }
       }
     },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w="
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
     },
     "retry": {
       "version": "0.12.0",
@@ -10094,6 +9165,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
       "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
+      "dev": true,
       "requires": {
         "convert-source-map": "^0.3.3",
         "css": "^2.0.0"
@@ -10102,24 +9174,16 @@
         "convert-source-map": {
           "version": "0.3.5",
           "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-          "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA="
+          "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
+          "dev": true
         }
       }
     },
     "rework-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo="
-    },
-    "rgb": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/rgb/-/rgb-0.1.0.tgz",
-      "integrity": "sha1-vieykej+/+rBvZlylyG/pA/AN7U="
-    },
-    "rgb-hex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-2.1.0.tgz",
-      "integrity": "sha1-x3PF/iJoolV42SU5qCp6XOU77aY="
+      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
+      "dev": true
     },
     "rgb-regex": {
       "version": "1.0.1",
@@ -10142,18 +9206,12 @@
     "ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
       }
     },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true
-    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -10162,19 +9220,10 @@
         "aproba": "^1.1.1"
       }
     },
-    "rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -10187,7 +9236,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass-graph": {
       "version": "2.2.5",
@@ -10222,7 +9271,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "schema-utils": {
       "version": "2.7.0",
@@ -10432,7 +9481,7 @@
     "sha.js": {
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -10501,7 +9550,7 @@
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
@@ -10547,7 +9596,7 @@
     "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "requires": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
@@ -10565,7 +9614,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -10573,7 +9622,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -10581,7 +9630,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -10593,7 +9642,7 @@
     "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "requires": {
         "kind-of": "^3.2.0"
       },
@@ -10785,7 +9834,7 @@
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "requires": {
         "extend-shallow": "^3.0.0"
       }
@@ -10879,7 +9928,7 @@
     "stream-http": {
       "version": "2.8.3",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
       "requires": {
         "builtin-status-codes": "^3.0.0",
         "inherits": "^2.0.1",
@@ -10949,7 +9998,7 @@
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "requires": {
         "safe-buffer": "~5.1.0"
       }
@@ -10973,7 +10022,8 @@
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
     },
     "strip-indent": {
       "version": "1.0.1",
@@ -10984,9 +10034,9 @@
       }
     },
     "strip-json-comments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
-      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
     "style-loader": {
@@ -11033,17 +10083,18 @@
       }
     },
     "stylus": {
-      "version": "0.54.7",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
-      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
+      "version": "0.54.8",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
+      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
+      "dev": true,
       "requires": {
         "css-parse": "~2.0.0",
         "debug": "~3.1.0",
-        "glob": "^7.1.3",
-        "mkdirp": "~0.5.x",
+        "glob": "^7.1.6",
+        "mkdirp": "~1.0.4",
         "safer-buffer": "^2.1.2",
         "sax": "~1.2.4",
-        "semver": "^6.0.0",
+        "semver": "^6.3.0",
         "source-map": "^0.7.3"
       },
       "dependencies": {
@@ -11051,62 +10102,48 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
           "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
           "requires": {
             "ms": "2.0.0"
           }
         },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         },
         "source-map": {
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
         }
       }
     },
     "stylus-loader": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-      "integrity": "sha1-J6cGQgsFo44DjnyssVNXjUUFE8Y=",
+      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "dev": true,
       "requires": {
         "loader-utils": "^1.0.2",
         "lodash.clonedeep": "^4.5.0",
         "when": "~3.6.x"
       }
     },
-    "sugarss": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-1.0.1.tgz",
-      "integrity": "sha1-voJtkAPg8kdzX5I2XcP9fxuunkQ=",
-      "requires": {
-        "postcss": "^6.0.14"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
-        }
-      }
-    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -11324,12 +10361,6 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
     "through2": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
@@ -11371,15 +10402,6 @@
         "popper.js": "^1.14.7"
       }
     },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -11411,7 +10433,7 @@
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "requires": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
@@ -11516,7 +10538,8 @@
     "type": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
+      "dev": true
     },
     "type-check": {
       "version": "0.4.0",
@@ -11609,15 +10632,6 @@
         "imurmurhash": "^0.1.4"
       }
     },
-    "units-css": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/units-css/-/units-css-0.4.0.tgz",
-      "integrity": "sha1-1iKGU6UZg9fBb/KPi53Dsf/tOgc=",
-      "requires": {
-        "isnumeric": "^0.2.0",
-        "viewport-dimensions": "^0.2.0"
-      }
-    },
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -11673,7 +10687,7 @@
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -11757,9 +10771,9 @@
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
     "v8-compile-cache": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
-      "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
+      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -11791,11 +10805,6 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "viewport-dimensions": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/viewport-dimensions/-/viewport-dimensions-0.2.0.tgz",
-      "integrity": "sha1-3nQHR9tTh/0XJfUXXpG6x2r982w="
-    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -11852,12 +10861,14 @@
     "vue-hot-reload-api": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
-      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="
+      "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
+      "dev": true
     },
     "vue-loader": {
-      "version": "15.9.2",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.2.tgz",
-      "integrity": "sha512-oXBubaY//CYEISBlHX+c2YPJbmOH68xXPXjFv4MAgPqQvUsnjrBAjCJi8HXZ/r/yfn0tPL5VZj1Zcp8mJPI8VA==",
+      "version": "15.9.3",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.3.tgz",
+      "integrity": "sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==",
+      "dev": true,
       "requires": {
         "@vue/component-compiler-utils": "^3.1.0",
         "hash-sum": "^1.0.2",
@@ -11879,6 +10890,7 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
       "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==",
+      "dev": true,
       "requires": {
         "hash-sum": "^1.0.2",
         "loader-utils": "^1.0.2"
@@ -11888,6 +10900,7 @@
       "version": "2.6.11",
       "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
       "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
+      "dev": true,
       "requires": {
         "de-indent": "^1.0.2",
         "he": "^1.1.0"
@@ -11896,12 +10909,13 @@
     "vue-template-es2015-compiler": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
-      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="
+      "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
+      "dev": true
     },
     "vue-tippy": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/vue-tippy/-/vue-tippy-4.4.0.tgz",
-      "integrity": "sha512-3UgRjCgVHZFP613dU5tMv2lEgoiGP8A/HJ1OSmbaitL2A4bpv5N5sXTXVBkDDJRZJ/ZLr6NHIRrB/t50ajXpKA==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/vue-tippy/-/vue-tippy-4.5.1.tgz",
+      "integrity": "sha512-kcRCkwvkV8ObV977Xwur7kuuzCi9Zv6r5IyYZsUJx6Ya4qbGKdgLQyCCZyoqNOG+jUSNpc7+SYE6XDB0X6lVtA==",
       "requires": {
         "humps": "^2.0.1",
         "tippy.js": "^4.3.5"
@@ -11916,17 +10930,17 @@
       }
     },
     "vuedraggable": {
-      "version": "2.23.2",
-      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.23.2.tgz",
-      "integrity": "sha512-PgHCjUpxEAEZJq36ys49HfQmXglattf/7ofOzUrW2/rRdG7tu6fK84ir14t1jYv4kdXewTEa2ieKEAhhEMdwkQ==",
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.0.tgz",
+      "integrity": "sha512-IlslPpc+iZ2zPNSJbydFZIDrE+don5u+Nc/bjT2YaF+Azidc+wxxJKfKT0NwE68AKk0syb0YbZneAcnynqREZQ==",
       "requires": {
         "sortablejs": "^1.10.1"
       }
     },
     "vuex": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.4.0.tgz",
-      "integrity": "sha512-ajtqwEW/QhnrBZQsZxCLHThZZaa+Db45c92Asf46ZDXu6uHXgbfVuBaJ4gzD2r4UX0oMJHstFwd2r2HM4l8umg=="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz",
+      "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="
     },
     "watchpack": {
       "version": "1.7.2",
@@ -12185,28 +11199,23 @@
       }
     },
     "webpack-cli": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz",
-      "integrity": "sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==",
-      "requires": {
-        "chalk": "2.4.2",
-        "cross-spawn": "6.0.5",
-        "enhanced-resolve": "4.1.0",
-        "findup-sync": "3.0.0",
-        "global-modules": "2.0.0",
-        "import-local": "2.0.0",
-        "interpret": "1.2.0",
-        "loader-utils": "1.2.3",
-        "supports-color": "6.1.0",
-        "v8-compile-cache": "2.0.3",
-        "yargs": "13.2.4"
+      "version": "3.3.12",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz",
+      "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==",
+      "requires": {
+        "chalk": "^2.4.2",
+        "cross-spawn": "^6.0.5",
+        "enhanced-resolve": "^4.1.1",
+        "findup-sync": "^3.0.0",
+        "global-modules": "^2.0.0",
+        "import-local": "^2.0.0",
+        "interpret": "^1.4.0",
+        "loader-utils": "^1.4.0",
+        "supports-color": "^6.1.0",
+        "v8-compile-cache": "^2.1.1",
+        "yargs": "^13.3.2"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-        },
         "cross-spawn": {
           "version": "6.0.5",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -12219,100 +11228,6 @@
             "which": "^1.2.9"
           }
         },
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
-        },
-        "enhanced-resolve": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-          "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "memory-fs": "^0.4.0",
-            "tapable": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^2.0.0",
-            "json5": "^1.0.1"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -12320,24 +11235,6 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
-        },
-        "yargs": {
-          "version": "13.2.4",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
-          "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
-          "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^2.0.1",
-            "os-locale": "^3.1.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.0"
-          }
         }
       }
     },
@@ -12580,12 +11477,13 @@
     "when": {
       "version": "3.6.4",
       "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz",
-      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404="
+      "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=",
+      "dev": true
     },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "requires": {
         "isexe": "^2.0.0"
       }
@@ -12598,7 +11496,7 @@
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "requires": {
         "string-width": "^1.0.2 || 2"
       }
diff --git a/package.json b/package.json
index 44a6c5328a..0ad0a04674 100644
--- a/package.json
+++ b/package.json
@@ -1,38 +1,34 @@
 {
   "dependencies": {
-    "@geoman-io/leaflet-geoman-free": "^2.5.0",
+    "@geoman-io/leaflet-geoman-free": "^2.6.0",
     "@ibm/plex": "^5.0.0",
     "@rails/webpacker": "^5.1.1",
     "@sfgrp/sled": "^0.5.4",
     "axios": "^0.19.2",
-    "babel-preset-stage-0": "^6.24.1",
-    "browser-request": "^0.3.3",
-    "file-loader": "^6.0.0",
     "json2csv": "^5.0.1",
     "leaflet": "^1.6.0",
     "leaflet.pattern": "^0.1.0",
     "parse-dms": "0.0.3",
     "pdfjs-dist": "2.3.200",
-    "postcss-cssnext": "^3.1.0",
-    "postcss-smart-import": "^0.7.6",
-    "resolve-url-loader": "^3.1.1",
-    "stylus": "^0.54.7",
-    "stylus-loader": "^3.0.2",
     "vue": "^2.6.11",
-    "vue-loader": "^15.9.2",
     "vue-shortkey": "^3.1.7",
-    "vue-template-compiler": "^2.6.11",
-    "vue-tippy": "^4.4.0",
+    "vue-tippy": "^4.5.1",
     "vue-turbolinks": "^2.1.0",
-    "vuedraggable": "^2.23.2",
-    "vuex": "^3.4.0",
-    "webpack-cli": "^3.3.11"
+    "vuedraggable": "^2.24.0",
+    "vuex": "^3.5.1",
+    "webpack-cli": "^3.3.12"
   },
   "devDependencies": {
+    "stylus": "^0.54.8",
+    "stylus-loader": "^3.0.2",
+    "resolve-url-loader": "^3.1.1",
+    "vue-loader": "^15.9.3",
+    "vue-template-compiler": "^2.6.11",
+    "babel-preset-stage-0": "^6.24.1",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "eslint": "^7.2.0",
+    "eslint": "^7.5.0",
     "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.21.1",
+    "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",

From 66cde7ad6a4cf161c716a83b63bfdd80e37c3c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Tue, 21 Jul 2020 20:44:21 -0300
Subject: [PATCH 42/76] Join Otu with above Arel queries (refs #1626)

---
 app/models/otu.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/otu.rb b/app/models/otu.rb
index eed79fbf3a..4bab1fb7e8 100644
--- a/app/models/otu.rb
+++ b/app/models/otu.rb
@@ -308,7 +308,7 @@ def self.used_recently(user_id, project_id, used_on = '')
           Arel::Nodes::InnerJoin.new(z, Arel::Nodes::On.new(z['otu_id'].eq(p['id'])))
         end
 
-    Otu.pluck(:id).uniq
+    Otu.joins(j).pluck(:id).uniq
   end
 
   # @params target [String] required, one of nil, `AssertedDistribution`, `Content`, `BiologicalAssociation`, 'TaxonDetermination'

From 05f5e17f19f1151c8a471b06156f1d0fa091bd7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Tue, 21 Jul 2020 21:48:29 -0300
Subject: [PATCH 43/76] Fix spec by added a pinned OTU (ref #1626)

---
 spec/models/otu_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/models/otu_spec.rb b/spec/models/otu_spec.rb
index 0296d04b79..5857ce30a9 100644
--- a/spec/models/otu_spec.rb
+++ b/spec/models/otu_spec.rb
@@ -181,6 +181,7 @@
     before do
       otu.name = 'Foo recently'
       otu.save!
+      PinboardItem.create!(pinned_object: o2, is_inserted: true, user_id: 1)
     end
 
     let(:o2) { Otu.create(name: 'o2') }

From 328e4e42e082037f2b740f9a4366ae090ee094e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Wed, 22 Jul 2020 08:51:58 -0300
Subject: [PATCH 44/76] CHANGELOG update [ci-skip]

---
 CHANGELOG.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cca1c929d..587039ed19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,8 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ## [unreleased]
 
-### Added 
-
+### Added
+- Interactive keys task
 - 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]
@@ -17,23 +17,26 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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]
 
 ### Changed
-
 - 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
 
 ### 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
 
 [#446]: https://github.com/SpeciesFileGroup/taxonworks/issues/446
+[#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

From 7d6636ff79d614d5627cda57ef56207c6751f0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Wed, 22 Jul 2020 08:57:19 -0300
Subject: [PATCH 45/76] CHANGELOG update [ci-skip]

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 587039ed19..ddb3ca7d98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - Columns size of georeference table [#1622]
 - Webpacker host and port bind on docker container
 - Wrong taxon name relationship soft validation message for genera
+- Seeing OTUs in Recent that do not belong to project [#1626]
 
 [#446]: https://github.com/SpeciesFileGroup/taxonworks/issues/446
 [#934]: https://github.com/SpeciesFileGroup/taxonworks/issues/934
@@ -44,6 +45,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 [#1617]: https://github.com/SpeciesFileGroup/taxonworks/issues/1617
 [#1618]: https://github.com/SpeciesFileGroup/taxonworks/issues/1618
 [#1622]: https://github.com/SpeciesFileGroup/taxonworks/issues/1622
+[#1626]: https://github.com/SpeciesFileGroup/taxonworks/issues/1626
 
 ## [0.12.11] - 2020-07-14
 

From f44df9630b0a1a52268158136aa057afd3e04bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 22 Jul 2020 12:17:56 -0300
Subject: [PATCH 46/76] Fix #856

---
 CHANGELOG.md                                  |   7 +
 .../asserted_distributions_annotator.vue      | 283 +++++++++---------
 2 files changed, 154 insertions(+), 136 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddb3ca7d98..240399c16b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,13 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ## [unreleased]
 
+### Added
+- Map on OTU radial in asserted distribution form [#856]
+
+[#856]: https://github.com/SpeciesFileGroup/taxonworks/issues/856
+
+## [0.12.12] - 2020-07-22
+
 ### Added
 - Interactive keys task
 - Delete confirmation for original combinations [#1618]
diff --git a/app/javascript/vue/components/radials/object/components/asserted_distributions/asserted_distributions_annotator.vue b/app/javascript/vue/components/radials/object/components/asserted_distributions/asserted_distributions_annotator.vue
index 703f2fabc9..b6dc897f40 100644
--- a/app/javascript/vue/components/radials/object/components/asserted_distributions/asserted_distributions_annotator.vue
+++ b/app/javascript/vue/components/radials/object/components/asserted_distributions/asserted_distributions_annotator.vue
@@ -51,11 +51,13 @@
           @select="asserted_distribution.geographic_area_id = $event; createAsserted()"/>
       </div>
     </div>
-    <div>
-      <a 
-        class="asserted-map-link"
-        :href="`/tasks/gis/otu_distribution_data?otu_id=${metadata.object_id}`"
-        target="blank">Map</a>
+    <div class="horizontal-left-content">
+      <map-component
+        width="90%"
+        height="300px"
+        :zoom="2"
+        :zoom-on-click="false"
+        :geojson="shapes"/>
     </div>
     <table-list
       class="separate-top"
@@ -69,150 +71,159 @@
 </template>
 <script>
 
-  import CRUD from '../../request/crud.js'
-  import AnnotatorExtend from '../annotatorExtend.js'
-  import TableList from './table.vue'
-  import DisplayList from 'components/displayList.vue'
-  import GeographicArea from './geographicArea.vue'
-  import SourcePicker from './sourcePicker.vue'
-  import Spinner from 'components/spinner.vue'
+import CRUD from '../../request/crud.js'
+import AnnotatorExtend from '../annotatorExtend.js'
+import TableList from './table.vue'
+import DisplayList from 'components/displayList.vue'
+import GeographicArea from './geographicArea.vue'
+import SourcePicker from './sourcePicker.vue'
+import Spinner from 'components/spinner.vue'
+import MapComponent from 'components/georeferences/map.vue'
 
-  export default {
-    mixins: [CRUD, AnnotatorExtend],
-    components: {
-      Spinner,
-      TableList,
-      SourcePicker,
-      DisplayList,
-      GeographicArea
+export default {
+  mixins: [CRUD, AnnotatorExtend],
+  components: {
+    Spinner,
+    TableList,
+    SourcePicker,
+    DisplayList,
+    GeographicArea,
+    MapComponent
+  },
+  computed: {
+    validateFields() {
+      return this.asserted_distribution.geographic_area_id && this.asserted_distribution.source_id
     },
-    computed: {
-      validateFields() {
-        return this.asserted_distribution.geographic_area_id && this.asserted_distribution.source_id
-      },
-      splittedGlobalId() {
-        let splitted = this.globalId.split('/')
-        return splitted[splitted.length-1]
-      },
-      idIndex() {
-        return this.list.findIndex(item => item.id === this.asserted_distribution.id);
-      },
-      filterList() {
-        return this.list
-      },
-      existingArea() {
-        return this.list.find(item => { return item.geographic_area_id === this.asserted_distribution.geographic_area_id && (item.is_absent === null ? false : item.is_absent) === (this.asserted_distribution.is_absent === undefined ? false : this.asserted_distribution.is_absent) })
-      }
+    splittedGlobalId() {
+      let splitted = this.globalId.split('/')
+      return splitted[splitted.length-1]
     },
-    data() {
-      return {
-        asserted_distribution: this.newAsserted(),
-        displayLabel: undefined,
-        displayGeographic: undefined,
-        editTitle: undefined,
-        lockSource: false,
-        lockGeo: false,
-        editCitation: undefined
-      }
+    idIndex() {
+      return this.list.findIndex(item => item.id === this.asserted_distribution.id);
     },
-    mounted() {
-      this.asserted_distribution.otu_id = this.splittedGlobalId
+    filterList() {
+      return this.list
     },
-    methods: {
-      setEditCitation(citation) {
-        let data = {
-          id: citation.id,
-          is_absent: undefined,
-          pages: citation.pages,
-          source_id: citation.source_id,
-          is_original: citation.is_original,
-          citation_source_body: citation.citation_source_body
-        }
-        this.editCitation = citation
-        this.$refs.source.setCitation(data)
-      },
-      createAsserted() {
-        if(!this.existingArea) {
-          this.create('/asserted_distributions.json', { asserted_distribution: this.asserted_distribution }).then(response => {
-            TW.workbench.alert.create('Asserted distribution was successfully created.', 'notice')
-            this.addToList(response.body)
-          })
-        }
-        else {
-          this.asserted_distribution['id'] = this.existingArea.id
-          this.update(`/asserted_distributions/${this.existingArea.id}.json`, { asserted_distribution: this.asserted_distribution }).then(response => {
-            TW.workbench.alert.create('Asserted distribution was successfully updated.', 'notice')
-            this.addToList(response.body)
-          })
-        }
-      },
-      removeCitation(item) {
-        let data = { 
-          asserted_distribution: {
-            citations_attributes: [{
-              id: item.id,
-              _destroy: true
-            }]
-          }
-        }
-        this.update(`/asserted_distributions/${this.asserted_distribution.id}.json`, data).then(response => {
+    existingArea() {
+      return this.list.find(item => { return item.geographic_area_id === this.asserted_distribution.geographic_area_id && (item.is_absent === null ? false : item.is_absent) === (this.asserted_distribution.is_absent === undefined ? false : this.asserted_distribution.is_absent) })
+    },
+    shapes () {
+      return this.list.map(item => { 
+        const shape = item.geographic_area.shape
+        shape.properties.is_absent = item.is_absent
+        return shape
+      })
+    }
+  },
+  data() {
+    return {
+      asserted_distribution: this.newAsserted(),
+      displayLabel: undefined,
+      displayGeographic: undefined,
+      editTitle: undefined,
+      lockSource: false,
+      lockGeo: false,
+      editCitation: undefined
+    }
+  },
+  mounted() {
+    this.asserted_distribution.otu_id = this.splittedGlobalId
+  },
+  methods: {
+    setEditCitation(citation) {
+      let data = {
+        id: citation.id,
+        is_absent: undefined,
+        pages: citation.pages,
+        source_id: citation.source_id,
+        is_original: citation.is_original,
+        citation_source_body: citation.citation_source_body
+      }
+      this.editCitation = citation
+      this.$refs.source.setCitation(data)
+    },
+    createAsserted() {
+      if(!this.existingArea) {
+        this.create('/asserted_distributions.json', { asserted_distribution: this.asserted_distribution }).then(response => {
+          TW.workbench.alert.create('Asserted distribution was successfully created.', 'notice')
           this.addToList(response.body)
         })
-      },
-      addToList(item) {
-        this.editTitle = item.object_tag
-        if(!this.lockSource) {
-          this.$refs.source.cleanInput()
-          this.$refs.source.setFocus()
-        }
-        if(this.idIndex > -1) {
-          this.$set(this.list, this.idIndex, item)
-        }
-        else {
-          this.list.push(item)
+      }
+      else {
+        this.asserted_distribution['id'] = this.existingArea.id
+        this.update(`/asserted_distributions/${this.existingArea.id}.json`, { asserted_distribution: this.asserted_distribution }).then(response => {
+          TW.workbench.alert.create('Asserted distribution was successfully updated.', 'notice')
+          this.addToList(response.body)
+        })
+      }
+    },
+    removeCitation(item) {
+      let data = { 
+        asserted_distribution: {
+          citations_attributes: [{
+            id: item.id,
+            _destroy: true
+          }]
         }
-        this.asserted_distribution = this.newAsserted()
-      },
-      setDistribution(item) {
-        this.asserted_distribution = this.newAsserted()
-        this.editTitle = item.object_tag
-        this.asserted_distribution.id = item.id
-        this.asserted_distribution.citations = item.citations
-        this.asserted_distribution.otu_id = item.otu_id
-        this.asserted_distribution.geographic_area_id = item.geographic_area_id
-        this.asserted_distribution.citations_attributes = [{
-          id: undefined,
+      }
+      this.update(`/asserted_distributions/${this.asserted_distribution.id}.json`, data).then(response => {
+        this.addToList(response.body)
+      })
+    },
+    addToList(item) {
+      this.editTitle = item.object_tag
+      if(!this.lockSource) {
+        this.$refs.source.cleanInput()
+        this.$refs.source.setFocus()
+      }
+      if(this.idIndex > -1) {
+        this.$set(this.list, this.idIndex, item)
+      }
+      else {
+        this.list.push(item)
+      }
+      this.asserted_distribution = this.newAsserted()
+    },
+    setDistribution(item) {
+      this.asserted_distribution = this.newAsserted()
+      this.editTitle = item.object_tag
+      this.asserted_distribution.id = item.id
+      this.asserted_distribution.citations = item.citations
+      this.asserted_distribution.otu_id = item.otu_id
+      this.asserted_distribution.geographic_area_id = item.geographic_area_id
+      this.asserted_distribution.citations_attributes = [{
+        id: undefined,
+        source_id: undefined,
+        pages: undefined,
+        is_original: undefined
+      }]
+      this.editCitation = undefined
+      this.$refs.source.cleanCitation()
+    },
+    newAsserted() {
+      this.displayLabel = ''
+      return { 
+        id: undefined,
+        otu_id: this.splittedGlobalId,
+        geographic_area_id: this.lockGeo ? this.asserted_distribution.geographic_area_id : undefined,
+        citations: [],
+        citations_attributes: this.lockSource ? this.asserted_distribution.citations_attributes : [{
           source_id: undefined,
           pages: undefined,
           is_original: undefined
-        }]
-        this.editCitation = undefined
-        this.$refs.source.cleanCitation()
-      },
-      newAsserted() {
-        this.displayLabel = ''
-        return { 
-          id: undefined,
-          otu_id: this.splittedGlobalId,
-          geographic_area_id: this.lockGeo ? this.asserted_distribution.geographic_area_id : undefined,
-          citations: [],
-          citations_attributes: this.lockSource ? this.asserted_distribution.citations_attributes : [{
-            source_id: undefined,
-            pages: undefined,
-            is_original: undefined
-          }],
-          is_absent: undefined
-        }
-      },
-      setSource(source) {
-        this.asserted_distribution.is_absent = source.is_absent
-        this.asserted_distribution.citations_attributes[0].id = source.id
-        this.asserted_distribution.citations_attributes[0].source_id = source.source_id
-        this.asserted_distribution.citations_attributes[0].pages = source.pages
-        this.asserted_distribution.citations_attributes[0].is_original = source.is_original
+        }],
+        is_absent: undefined
       }
     },
-  }
+    setSource(source) {
+      this.asserted_distribution.is_absent = source.is_absent
+      this.asserted_distribution.citations_attributes[0].id = source.id
+      this.asserted_distribution.citations_attributes[0].source_id = source.source_id
+      this.asserted_distribution.citations_attributes[0].pages = source.pages
+      this.asserted_distribution.citations_attributes[0].is_original = source.is_original
+    }
+  },
+}
 </script>
 <style lang="scss">
   .radial-annotator {

From dfc9743fb944e44844a2c40ab04183fb4dbe852e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 22 Jul 2020 13:25:51 -0300
Subject: [PATCH 47/76] Moved autocomplete

---
 CHANGELOG.md                                          |  3 +++
 .../vue/tasks/nomenclature/new_taxon_name/app.vue     | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 240399c16b..aebe00924e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 ### Added
 - Map on OTU radial in asserted distribution form [#856]
 
+### Changed
+- Moved taxon name input search to right column in new taxon name
+
 [#856]: https://github.com/SpeciesFileGroup/taxonworks/issues/856
 
 ## [0.12.12] - 2020-07-22
diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/app.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/app.vue
index 6d7f8dc619..1adb0d873a 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/app.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/app.vue
@@ -12,6 +12,7 @@
           Autosave
         </label>
         <autocomplete
+          v-if="!getTaxon.id"
           class="autocomplete-search-bar"
           url="/taxon_names/autocomplete"
           param="term"
@@ -43,6 +44,16 @@
           v-if="getTaxon.id"
           class="cright item separate-left">
           <div id="cright-panel">
+            <div class="panel content margin-medium-bottom">
+              <autocomplete
+                url="/taxon_names/autocomplete"
+                param="term"
+                :add-params="{ 'type[]': 'Protonym' }"
+                label="label_html"
+                placeholder="Search a taxon name..."
+                @getItem="loadTaxon"
+                :clearAfter="true"/>
+            </div>
             <check-changes/>
             <taxon-name-box class="separate-bottom"/>
             <soft-validation class="separate-top"/>

From 88830080fc819aec586e6340633b6327724e09d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 22 Jul 2020 13:55:42 -0300
Subject: [PATCH 48/76] Fix #1627

---
 .../components/manageSynonym.vue              | 188 +++++++++---------
 1 file changed, 94 insertions(+), 94 deletions(-)

diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/manageSynonym.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/manageSynonym.vue
index 7bf08ed99f..3702654ed8 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/manageSynonym.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/manageSynonym.vue
@@ -1,87 +1,89 @@
 <template>
-  <block-layout
-    anchor="original-combination"
-    v-if="isInvalid && validTaxon && childrenList.length"
-    v-help.section.originalCombination.container>
-    <h3 slot="header">Manage synonymy</h3>
-    <div
-      slot="body">
-      <spinner-component
-        :full-screen="true"
-        legend="Saving changes..."
-        :logo-size="{ width: '100px', height: '100px'}"
-        v-if="saving"/>
-      <spinner-component
-        legend="Loading..."
-        :logo-size="{ width: '100px', height: '100px'}"
-        v-if="isLoading"/>
-      <div>
-        <p>This name is invalid. The valid name is <span v-html="validTaxon.name"/></p>
-        <div class="horizontal-right-content">
+  <div>
+    <block-layout
+      anchor="original-combination"
+      v-if="isInvalid && validTaxon && childrenList.length"
+      v-help.section.originalCombination.container>
+      <h3 slot="header">Manage synonymy</h3>
+      <div
+        slot="body">
+        <spinner-component
+          :full-screen="true"
+          legend="Saving changes..."
+          :logo-size="{ width: '100px', height: '100px'}"
+          v-if="saving"/>
+        <spinner-component
+          legend="Loading..."
+          :logo-size="{ width: '100px', height: '100px'}"
+          v-if="isLoading"/>
+        <div>
+          <p>This name is invalid. The valid name is <span v-html="validTaxon.name"/></p>
+          <div class="horizontal-right-content">
+            <button
+              class="button normal-input button-default separate-right"
+              @click="selectAll">
+              All
+            </button>
+            <button
+              class="button normal-input button-default"
+              @click="selected = []">
+              None
+            </button>
+          </div>
+          <table class="full_width margin-small-bottom margin-small-top">
+            <thead>
+              <tr>
+                <th>Child</th>
+                <th>Valid</th>
+                <th>Current parent</th>
+                <th>New parent</th>
+                <th>Options</th>
+                <th>Select</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="children in childrenList">
+                <td>
+                  {{ children.name }}
+                </td>
+                <td>
+                  {{ children.id == children.cached_valid_taxon_name_id ? 'Yes' : 'No' }}
+                </td>
+                <td v-html="children.parent.name"/>
+                <td>
+                  <autocomplete
+                    url="/taxon_names/autocomplete"
+                    param="term"
+                    min="2"
+                    label="label"
+                    @getItem="addPreSelected(children.id, $event.id)"
+                    :add-params="{ type: 'Protonym', 'nomenclature_group[]': 'Genus' }"
+                    :placeholder="validTaxon.name"/>
+                </td>
+                <td class="horizontal-left-content">
+                  <span
+                    class="circle-button btn-edit"
+                    @click="loadTaxon(children.id)"/>
+                  <radial-annotator :global-id="children.global_id"/>
+                </td>
+                <td>
+                  <input
+                    :value="children.id"
+                    type="checkbox"
+                    v-model="selected">
+                </td>
+              </tr>
+            </tbody>
+          </table>
           <button
-            class="button normal-input button-default separate-right"
-            @click="selectAll">
-            All
-          </button>
-          <button
-            class="button normal-input button-default"
-            @click="selected = []">
-            None
+            class="button normal-input button-submit"
+            :disabled="!selected.length"
+            @click="confirmSave">
+            Save
           </button>
         </div>
-        <table class="full_width margin-small-bottom margin-small-top">
-          <thead>
-            <tr>
-              <th>Child</th>
-              <th>Valid</th>
-              <th>Current parent</th>
-              <th>New parent</th>
-              <th>Options</th>
-              <th>Select</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr v-for="children in childrenList">
-              <td>
-                {{ children.name }}
-              </td>
-              <td>
-                {{ children.id == children.cached_valid_taxon_name_id ? 'Yes' : 'No' }}
-              </td>
-              <td v-html="children.parent.name"/>
-              <td>
-                <autocomplete
-                  url="/taxon_names/autocomplete"
-                  param="term"
-                  min="2"
-                  label="label"
-                  @getItem="addPreSelected(children.id, $event.id)"
-                  :add-params="{ type: 'Protonym', 'nomenclature_group[]': 'Genus' }"
-                  :placeholder="validTaxon.name"/>
-              </td>
-              <td class="horizontal-left-content">
-                <span
-                  class="circle-button btn-edit"
-                  @click="loadTaxon(children.id)"/>
-                <radial-annotator :global-id="children.global_id"/>
-              </td>
-              <td>
-                <input
-                  :value="children.id"
-                  type="checkbox"
-                  v-model="selected"/>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <button
-          class="button normal-input button-submit"
-          :disabled="!selected.length"
-          @click="confirmSave">
-          Save
-        </button>
       </div>
-    </div>
+    </block-layout>
     <modal-component
       v-if="showModal"
       @close="showModal = false">
@@ -97,7 +99,7 @@
           placeholder="Wirte MOVE to continue">
       </div>
       <div slot="footer">
-        <button 
+        <button
           type="button"
           class="button normal-input button-submit"
           :disabled="checkInput"
@@ -106,7 +108,7 @@
         </button>
       </div>
     </modal-component>
-  </block-layout>
+  </div>
 </template>
 
 <script>
@@ -180,28 +182,27 @@ export default {
     confirmSave() {
       if(this.selected.length >= 10) {
         this.showModal = true
-      }
-      else {
+      } else {
         if(window.confirm(`Are you sure you want to proceed?`)) {
           this.saveTaxonNames()
         }
       }
     },
     saveTaxonNames() {
-      let promises = []
-      
+      const promises = []
+
       this.saving = true
       this.showModal = false
       this.moveInput = ''
 
       this.selected.forEach((id, index) => {
-        let findPreSelected = this.preSelected.find(children => {
-          return children.childrenId == id
+        console.log(id)
+        const findPreSelected = this.preSelected.find(children => {
+          return children.childrenId === id
         })
-        if(findPreSelected) {
+        if (findPreSelected) {
           promises.push(AjaxCall('patch', `/taxon_names/${id}`, { taxon_name: { parent_id: findPreSelected.parentId } }))
-        }
-        else {
+        } else {
           promises.push(AjaxCall('patch', `/taxon_names/${id}`, { taxon_name: { parent_id: this.taxon.cached_valid_taxon_name_id } }))
         }
       })
@@ -210,18 +211,17 @@ export default {
         this.childrenList = this.childrenList.filter(children => {
           return !this.selected.includes(children.id)
         })
-        this.selected = [],
+        this.selected = []
         this.preSelected = []
         this.saving = false
         TW.workbench.alert.create(`Taxon name was successfully moved.`, 'notice')
       }, (response) => {
-        TW.workbench.alert.create(`Something went wrong: ${JSON.stringify(response.body)}`, 'error')
         this.saving = false
       })
     },
     addPreSelected(childrenId, parentId) {
-      this.preSelected.push({ 
-        childrenId: childrenId, 
+      this.preSelected.push({
+        childrenId: childrenId,
         parentId: parentId
       })
     }

From 83dc440f5cb78b8c2d58672fbde972b4929fb982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 22 Jul 2020 14:03:51 -0300
Subject: [PATCH 49/76] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aebe00924e..e2aeb80aea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,11 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 ### Changed
 - Moved taxon name input search to right column in new taxon name
 
+### Fixed
+- Modal confirmation its not displaying in manage synonyms section [#1627]
+
 [#856]: https://github.com/SpeciesFileGroup/taxonworks/issues/856
+[#1627]: https://github.com/SpeciesFileGroup/taxonworks/issues/1627
 
 ## [0.12.12] - 2020-07-22
 

From b6df8c4760d038454e0040777351dc65a3a2d0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 22 Jul 2020 14:37:47 -0300
Subject: [PATCH 50/76] Fix #1628

---
 .../new_taxon_name/components/manageSynonym.vue          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/manageSynonym.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/manageSynonym.vue
index 3702654ed8..8f25d5aa94 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/manageSynonym.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/manageSynonym.vue
@@ -160,8 +160,13 @@ export default {
           AjaxCall('get', `/taxon_names/${this.taxon.cached_valid_taxon_name_id}.json`).then(res => {
             this.validTaxon = res.body
             this.isLoading = true
-            AjaxCall('get', `/taxon_names.json?taxon_name_id[]=${this.taxon.id}&descendants=true`).then(response => {
-              this.childrenList = response.body.filter(item => { return item.id != this.taxon.id })
+            AjaxCall('get', '/taxon_names.json', {
+              params: {
+                taxon_name_id: [this.taxon.id],
+                descendants: true,
+                taxon_name_type: 'Protonym'
+              }}).then(response => {
+              this.childrenList = response.body.filter(item => { return item.id !== this.taxon.id })
               this.isLoading = false
             })
           })

From 4a7c483ac3170641a57c3ac5425a8f1827298324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 22 Jul 2020 14:39:40 -0300
Subject: [PATCH 51/76] Update CHANGELOG.md [skip ci]

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2aeb80aea..b81d0aa79a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,9 +15,11 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ### Fixed
 - Modal confirmation its not displaying in manage synonyms section [#1627]
+- Manage synonyms includes combinations [#1628]
 
 [#856]: https://github.com/SpeciesFileGroup/taxonworks/issues/856
 [#1627]: https://github.com/SpeciesFileGroup/taxonworks/issues/1627
+[#1628]: https://github.com/SpeciesFileGroup/taxonworks/issues/1628
 
 ## [0.12.12] - 2020-07-22
 

From 0bad3dcd9e580dddc6e0963f35c4f1a1fe89d4ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 22 Jul 2020 16:03:55 -0300
Subject: [PATCH 52/76] Changed autosave on persons

---
 .../new_taxon_name/components/sourcePicker.vue             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue
index 0ae8f4db14..c14a832d3c 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue
@@ -150,8 +150,8 @@
         <div class="flex-separate">
           <role-picker
             v-model="roles"
-            @create="updateTaxonName"
-            @delete="updateTaxonName"
+            @create="updateLastChange"
+            @delete="updateLastChange"
             @sortable="updateTaxonName"
             @update="updatePersons"
             role-type="TaxonNameAuthor"
@@ -315,6 +315,9 @@ export default {
       if (this.isAutosaveActive) {
         this.$store.dispatch(ActionNames.UpdateTaxonName, this.taxon)
       }
+    },
+    updateLastChange () {
+      this.$store.commit(MutationNames.UpdateLastChange)
     }
   }
 }

From 848e34c70967135f3425b9f05b4a427951463744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 22 Jul 2020 16:08:11 -0300
Subject: [PATCH 53/76] Changed autosave on persons

---
 .../nomenclature/new_taxon_name/components/sourcePicker.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue
index c14a832d3c..95f4738b9b 100644
--- a/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue
+++ b/app/javascript/vue/tasks/nomenclature/new_taxon_name/components/sourcePicker.vue
@@ -152,7 +152,7 @@
             v-model="roles"
             @create="updateLastChange"
             @delete="updateLastChange"
-            @sortable="updateTaxonName"
+            @sortable="updateLastChange"
             @update="updatePersons"
             role-type="TaxonNameAuthor"
           />

From e288db38669a559ca050d021015705be2f26726d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Wed, 22 Jul 2020 16:18:00 -0300
Subject: [PATCH 54/76] Update CHANGELOG.md [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b81d0aa79a..1725d5d6a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ### Changed
 - Moved taxon name input search to right column in new taxon name
+- Persons autosave in new taxon name
 
 ### Fixed
 - Modal confirmation its not displaying in manage synonyms section [#1627]

From cce1909352cc28f05b67f3d75a321dfe34036c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Wed, 22 Jul 2020 17:44:55 -0300
Subject: [PATCH 55/76] Purge interactive keys code from development branch

---
 app/assets/images/3iView1.gif                 | Bin 113 -> 0 bytes
 app/assets/images/3iView2.gif                 | Bin 116 -> 0 bytes
 .../tasks/matrix/observation_matrices.scss    | 168 -----
 .../interactive_key_controller.rb             |  11 -
 .../interactive_key/index.html.erb            | 127 ----
 config/interface/hub/user_tasks.yml           |   8 -
 config/routes/tasks.rb                        |   5 +-
 .../20200716192152_add_descriptor_weight.rb   |   6 -
 db/schema.rb                                  |   3 +-
 lib/interactive_key.rb                        | 690 ------------------
 spec/lib/interactive_key_spec.rb              |  86 ---
 11 files changed, 2 insertions(+), 1102 deletions(-)
 delete mode 100755 app/assets/images/3iView1.gif
 delete mode 100755 app/assets/images/3iView2.gif
 delete mode 100644 app/controllers/tasks/observation_matrices/interactive_key_controller.rb
 delete mode 100644 app/views/tasks/observation_matrices/interactive_key/index.html.erb
 delete mode 100644 db/migrate/20200716192152_add_descriptor_weight.rb
 delete mode 100644 lib/interactive_key.rb
 delete mode 100644 spec/lib/interactive_key_spec.rb

diff --git a/app/assets/images/3iView1.gif b/app/assets/images/3iView1.gif
deleted file mode 100755
index fd003d01b8c52360e6be2f46e739424e8210708b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 113
zcmZ?wbhEHblw*)&XkcUjg8%>jEB<5wG8q|kKzxu41CvKj|H{*E`4=;8xz)Y;)Si5W
z+N6#EWy{9S&SmPSre#UX->t2+__wZDe#K9zLl5##Xo%&yOHT02(TnxW6pp(3)@GmX
Mc2>S_WmX1j02A^kCIA2c

diff --git a/app/assets/images/3iView2.gif b/app/assets/images/3iView2.gif
deleted file mode 100755
index df73131a459d74302432aab8ed773ef8072b1af2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmZ?wbhEHblw*)&XkcUjg8%>jEB<5wG8q|kKzxu41Cw`8|H{*E`4=;8xz)Y;)Smnc
z0g5v^dUh^okD9b{_o25xE-shZ&>?rdeEDPF2FIB9&#G^h9eem`h0D1mfzOJwmZ~MY
RJX+2@rQ`UMq9qIr)&RT6GR^=1

diff --git a/app/assets/stylesheets/views/tasks/matrix/observation_matrices.scss b/app/assets/stylesheets/views/tasks/matrix/observation_matrices.scss
index b3d69d3fbc..8220ea3db2 100644
--- a/app/assets/stylesheets/views/tasks/matrix/observation_matrices.scss
+++ b/app/assets/stylesheets/views/tasks/matrix/observation_matrices.scss
@@ -23,171 +23,3 @@
   position: relative;
   text-align: left;
 }
-
-
-#header3i {
-  position: fixed;
-  width: 100%;
-  height: 56px;
-  top: 99px;
-  right: 0;
-  bottom: auto;
-  left: 0;
-  border-bottom: 2px solid #CCCCCC;
-  background-color: #C0C0B0;
-}
-
-#header3i h1
-{
-  margin: 0px;
-  font-size: 16pt;
-  font-weight: bold;
-  text-align: center;
-  font-family: arial,sans-serif;
-  color: #004050;
-}
-
-#header3i table {
-  width: 100%;
-  background-color: #C0C0B0;
-  text-align: center;
-  color: #004050;
-}
-
-#characters3i {
-  position: fixed;
-  top: 157px;
-  bottom: 45%;
-  left: 0px;
-  right: 0px;
-  margin: 0px 0px 0px 0px;
-  width: auto;
-  height: auto;
-  padding-left: 5px;
-  padding-right: 12px;
-  background-color: #CFCFBE;
-  border-bottom: 2px solid #CCCCCC;
-  overflow: auto;
-}
-
-div.vertical #characters3i {
-  position: fixed;
-  top: 157px;
-  bottom: 42px;
-  left: 0px;
-  right: 50%;
-  margin: 0px 0px 0px 0px;
-  width: auto;
-  height: auto;
-  padding-left: 5px;
-  padding-right: 12px;
-  background-color: #CFCFBE;
-  border-bottom: 2px solid #CCCCCC;
-  overflow: auto;
-}
-
-#characters3i h1, #content h2 {
-  color: #C00000;
-}
-
-#taxa1_3i {
-  position: fixed;
-  top: 55%;
-  bottom: 42px;
-  margin: 0px 0px 0px 0px;
-  right: 50%;
-  left: 0px;
-  width: auto;
-  height: auto;
-  padding-left: 5px;
-  padding-right: 12px;
-  background-color: #C0C0B0;
-  border-bottom: 2px solid #CCCCCC;
-  overflow: auto;
-}
-
-div.vertical #taxa1_3i {
-  position: fixed;
-  top: 157px;
-  bottom: 45%;
-  margin: 0px 0px 0px 0px;
-  right: 0px;
-  left: 50%;
-  width: auto;
-  height: auto;
-  padding-left: 5px;
-  padding-right: 12px;
-  background-color: #C0C0B0;
-  border-left: 2px solid #CCCCCC;
-  border-bottom: 2px solid #CCCCCC;
-  overflow: auto;
-}
-
-#taxa2_3i {
-  position: fixed;
-  top: 55%;
-  bottom: 42px;
-  margin: 0px 0px 0px 0px;
-  width: auto;
-  height: auto;
-  left: 50%;
-  right: 0px;
-  padding-left: 5px;
-  padding-right: 12px;
-  background-color: #C0C0B0;
-  border-left: 2px solid #CCCCCC;
-  border-bottom: 2px solid #CCCCCC;
-  overflow: auto;
-}
-
-.mainfont { color: #004050;}
-.red { color: #C00000; }
-.redbold { color: #C00000; font-weight: bold; }
-
-div.i3{
-  color: #004050;
-  font-family: arial,sans-serif;
-}
-
-div.i3 a { color: #004050;}
-div.i3 a:visited { color: #004050;}
-div.i3 a:hover { color: #C00000;}
-
-div.help3i
-{
-  background-color: #CAD9EE;
-  height: auto;
-  border: 1px solid;
-  padding: 1px;
-}
-
-div.helpBox3i{
-  background-color: #CAD9EE;
-  margin-left: 10px;
-  max-width: 300px;
-  position: absolute;
-  display: inline-block;
-  border: 1px solid;
-  z-index:10000;
-}
-
-.a1 a, .a2 a, .a3 a, .a0 a {
-  text-decoration: none;
-}
-
-.a1	{ border:2px solid transparent; }
-.a2	{ border:2px outset #FFFFFF; cursor: hand; }
-.a3	{ border:2px inset #FFFFFF; }
-.a0 { border:3px solid transparent;}
-.a5	{ border:3px outset #FFFFFF; cursor: hand; }
-.a6	{ border:3px inset #FFFFFF; }
-
-table.key {
-  background-color: #CAD9DD;
-  text-align: center;
-  color: #000080;
-}
-
-table.key td.taxon {text-align: left;}
-table.key td.image {vertical-align: top;}
-
diff --git a/app/controllers/tasks/observation_matrices/interactive_key_controller.rb b/app/controllers/tasks/observation_matrices/interactive_key_controller.rb
deleted file mode 100644
index d25911bc58..0000000000
--- a/app/controllers/tasks/observation_matrices/interactive_key_controller.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Tasks::ObservationMatrices::InteractiveKeyController < ApplicationController
-  include TaskControllerConfiguration
-
-  # GET
-  def index
-
-    @observation_matrix = ObservationMatrix.where(project_id: sessions_current_project_id, id: params[:observation_matrix_id]).first unless params[:observation_matrix_id].blank?
-#    redirect_to new_observation_matrix_path and return if @observation_matrix.nil?
-  end
-
-end
\ No newline at end of file
diff --git a/app/views/tasks/observation_matrices/interactive_key/index.html.erb b/app/views/tasks/observation_matrices/interactive_key/index.html.erb
deleted file mode 100644
index f2d1b483c7..0000000000
--- a/app/views/tasks/observation_matrices/interactive_key/index.html.erb
+++ /dev/null
@@ -1,127 +0,0 @@
-<h1 class="task_header"> Interactive key </h1>
-
-<div class="i3">
-  <noscript>
-    <p style="color: #C00000;">Java script is disabled!</p>
-  </noscript>
-
-  <div id="header3i">
-    <%= content_tag(:h1, observation_matrix_tag(@observation_matrix), id: 'ltrSecondHeader') -%>
-    <div style="border-top: 1px solid">
-      <table border='0' cellpadding='0' cellspacing='0'>
-        <tr>
-          <td>
-            Language
-          </td>
-          <td>
-            <a href='javascript: changeView()'>
-              <%= image_tag('3iView2.gif', :alt => 'Change view', :id => 'k1', :style => 'opacity: 0.3')
-              %><%= image_tag('3iView1.gif', :alt => 'Change view', :id => 'k2', :style => 'opacity: 1') %>
-            </a>
-          </td>
-          <td>
-            Proceed
-          </td>
-          <td style="width:400px">&nbsp;</td>
-          <td>
-            Key_Author
-          </td>
-        </tr>
-        <tr>
-          <td>
-            &nbsp;</td>
-          <td>
-            &nbsp;</td>
-          <td>
-            &nbsp;</td>
-          <td style="width:400px">&nbsp;</td>
-          <td>
-            <div ID="div1" CssClass="helpBox3i">Source Text</div>
-          </td>
-        </tr>
-      </table>
-    </div>
-  </div>
-  <div ID="vert">
-    <div id="characters3i"></div>
-    <div ID="taxa1_3i">
-      <h2>Remaining Taxa</h2>
-    </div>
-    <div ID="taxa2_3i">
-      <h2>Elimitated Taxa</h2>
-    </div>
-  </div>
-
-
-
-
-</div>
-<script type="text/javascript">
-    <!--
-    window.onerror = null;
-
-    window.onload = coupletSelect;
-
-    window.onfocus = ppHide;
-    var ww = null;
-
-    window.onclose = ppHide;
-
-    function makeHelpWindow(hc)
-    { ww = window.open('../basic/Taxa.aspx?TaxonNameID=' + hc, '_blank', 'scrollbars=yes,resizable=yes,width=640,height=480,top=' + (screen.availHeight - 480) / 2 + ',left=' + (screen.availWidth - 640) / 2); }
-
-    function makeHelpWindow1(couplet, ccode, c1, c2) {
-        keyID = document.forms['mainform'].elements['hdfKeyID'].value;
-        ww = window.open('DichotKeyHelp.aspx?keyID=' + keyID + '&couplet=' + couplet + '&ccode=' + ccode + '&c1=' + c1 + '&c2=' + c2, '_blank', 'scrollbars=yes,resizable=yes,width=640,height=480,top=' + (screen.availHeight - 480) / 2 + ',left=' + (screen.availWidth - 640) / 2);
-    }
-
-    function makeImageWindow(hc)
-    { ww = window.open('ImageZoom.aspx?FigureID=' + hc, '_blank', 'scrollbars=yes,resizable=yes,width=640,height=480,top=' + (screen.availHeight - 480) / 2 + ',left=' + (screen.availWidth - 640) / 2); }
-
-    function ppHide()
-    { if (ww != null) ww.close(); ww = null; }
-
-    function coupletSelect() {
-        b = window.document.forms['mainform'].elements['hdfStep'].value;
-        if (b > 0) {
-            GoToCouplet(b, "");
-        }
-    }
-
-    function GoToCouplet(c, stepCode) {
-        window.document.location = "#a" + c;
-        window.document.forms['mainform'].elements['hdfStep'].value = c;
-        l = window.document.getElementsByTagName('span').length;
-        for (i = 0; i < l; i++) {
-            b = i + ' ' + window.document.getElementsByTagName('span')[i].id + '  ';
-            if (b.search('cc') != -1) {
-                window.document.getElementsByTagName('span')[i].className = 'mainfont';
-            }
-        }
-        window.document.getElementById('cc' + c).className = 'redbold';
-        window.document.forms['mainform'].elements['hdfStepCode'].value = stepCode;
-        if (stepCode != "") {
-            window.document.forms['mainform'].elements['btnProceedHidden'].click();
-        }
-    }
-
-    function changeView() {
-        if (window.document.getElementById('vert').className == 'vertical') {
-            window.document.getElementById('vert').classList.remove('vertical');
-            window.document.getElementById('k1').style = 'opacity: 0.3';
-            window.document.getElementById('k2').style = 'opacity: 1';
-        }
-        else {
-            window.document.getElementById('vert').classList.add('vertical');
-            window.document.getElementById('k1').style = 'opacity: 1';
-            window.document.getElementById('k2').style = 'opacity: 0.3';
-        }
-    }
-
-    function mouse(i, a) {
-        window.document.getElementById('k' + i).className = 'a' + a;
-    }
-
-
-    //-->
-</script>
\ No newline at end of file
diff --git a/config/interface/hub/user_tasks.yml b/config/interface/hub/user_tasks.yml
index 20026c0a7a..2b0a480b08 100644
--- a/config/interface/hub/user_tasks.yml
+++ b/config/interface/hub/user_tasks.yml
@@ -444,14 +444,6 @@ index_dashboard_task:
     - matrix
   status: prototype
   description: 'Summarize observations across a nomenclaturally-based hierarchy.'
-interactive_key_task:
-  hub: true
-  name: 'Interactive key'
-  related:
-  categories:
-    - matrix
-  status: prototype
-  description: 'Interactive key based on an observation matrix.'
 index_stats_task:
   hub: true
   name: 'Nomenclature stats'
diff --git a/config/routes/tasks.rb b/config/routes/tasks.rb
index cdf9f8c674..6fec7bb3ca 100644
--- a/config/routes/tasks.rb
+++ b/config/routes/tasks.rb
@@ -340,6 +340,7 @@
       get :index, as: 'index_dashboard_task'
     end
 
+
     scope :view, controller: 'tasks/observation_matrices/view' do
       get '(:observation_matrix_id)', as: 'observation_matrix_view_task', action: :index
     end
@@ -359,10 +360,6 @@
       get 'index', as: 'index_row_coder_task'
       get 'set', as: 'set_row_coder_task'
     end
-
-    scope :interactive_key, controller: 'tasks/observation_matrices/interactive_key' do
-      get '(:observation_matrix_id)', as: 'interactive_key_task', action: :index
-    end
   end
 
   scope :otus do
diff --git a/db/migrate/20200716192152_add_descriptor_weight.rb b/db/migrate/20200716192152_add_descriptor_weight.rb
deleted file mode 100644
index 8ef402093a..0000000000
--- a/db/migrate/20200716192152_add_descriptor_weight.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class AddDescriptorWeight < ActiveRecord::Migration[6.0]
-  def change
-    add_column :descriptors, :weight, :integer
-  end
-end
-
diff --git a/db/schema.rb b/db/schema.rb
index 8f2cfefd0e..a512cac2f7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_07_16_192152) do
+ActiveRecord::Schema.define(version: 2020_04_01_201911) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "fuzzystrmatch"
@@ -557,7 +557,6 @@
     t.string "default_unit"
     t.string "description_name"
     t.string "key_name"
-    t.integer "weight"
     t.index ["created_by_id"], name: "index_descriptors_on_created_by_id"
     t.index ["name"], name: "index_descriptors_on_name"
     t.index ["project_id"], name: "index_descriptors_on_project_id"
diff --git a/lib/interactive_key.rb b/lib/interactive_key.rb
deleted file mode 100644
index 1674ce603e..0000000000
--- a/lib/interactive_key.rb
+++ /dev/null
@@ -1,690 +0,0 @@
-# Contains methods used to build an interactive key
-class InteractiveKey
-
-  # required attribude to build the key
-  attr_accessor :observation_matrix_id
-
-  #required attribute to build the key
-  attr_accessor :project_id
-
-  #returns ObservationMatrix object
-  attr_accessor :observation_matrix
-
-  #optional attribute to display the characters in a particular language
-  attr_accessor :language_id
-
-  #optional attribute to provide a list of tagIDs to limit the set of characters "1|5|15"
-  attr_accessor :keyword_ids
-
-  #optional attribute to provide a list of rowIDs to limit the set "1|5|10"
-  attr_accessor :row_filter
-
-
-
-  #returns the list of Languages used as translations for descriptors
-  attr_accessor :descriptor_available_languages
-
-  #returns the list of all descriptors for this matrix
-  attr_accessor :descriptors
-
-  #returns the list of all Tags used with the descriptors
-  attr_accessor :descriptor_available_keywords
-
-  #the validated Language object to display descriptors in a particular language
-  attr_accessor :language_to_use
-
-  #list of descriptors reduced by keyword_ids
-  attr_accessor :descriptors_with_filter
-
-  #list of rows to be included into the matrix
-  attr_accessor :rows_with_filter
-
-  def initialize(observation_matrix_id: nil, project_id: nil, language_id: nil, keyword_ids: nil, row_filter: nil)
-    raise if observation_matrix_id.blank? || project_id.blank?
-    @observation_matrix_id = observation_matrix_id
-    @project_id = project_id
-    @observation_matrix = observation_matrix
-    @descriptor_available_languages = descriptor_available_languages
-    @language_id = language_id
-    @language_to_use = language_to_use
-    @keyword_ids = keyword_ids
-    @descriptor_available_keywords = descriptor_available_keywords
-    @descriptors_with_filter = descriptors_with_keywords
-    @row_filter = row_filter
-    @rows_with_filter = rows_with_filter
-  end
-
-  def observation_matrix
-    ObservationMatrix.where(id: @observation_matrix_id, project_id: @project_id).first
-  end
-
-  def descriptors
-    observation_matrix.descriptors.where('NOT descriptors.weight = 0 OR descriptors.weight IS NULL').order(:position)
-  end
-
-  def descriptor_available_languages
-    descriptor_ids = descriptors.pluck(:id)
-    languages = Language.joins(:alternate_value_translations)
-                    .where(alternate_values: {alternate_value_object_type: 'Descriptor', type: 'AlternateValue::Translation'})
-                    .where('alternate_values.alternate_value_object_id IN (?)', descriptor_ids ).order('languages.english_name').distinct.to_a
-    unless languages.empty?
-      languages = Language.where(english_name: 'English').to_a + languages
-    end
-    languages
-  end
-
-  def language_to_use
-    return nil if @language_id.blank?
-    l = Language.where(id: @language_id).first
-    return nil if l.nil? || !descriptor_available_languages.to_a.include?(l)
-    l
-  end
-
-  def descriptor_available_keywords
-    descriptor_ids = descriptors.pluck(:id)
-    tags = Keyword.joins(:tags)
-                    .where(tags: {tag_object_type: 'Descriptor'})
-                    .where('tags.tag_object_id IN (?)', descriptor_ids ).order('name').distinct.to_a
-  end
-
-  def descriptors_with_keywords
-    if @keyword_ids
-      descriptors.joins(:tags).where('tags.keyword_id IN (?)', @keyword_ids.to_s.split('|') )
-    else
-      descriptors
-    end
-  end
-
-  def rows
-    ObservationMatrixRow.where(observation_matrix_id: @observation_matrix_id)
-  end
-
-  def rows_with_filter
-    if @row_item_filter
-      rows
-    else
-      rows.where('observation_matrix_rows.id IN (?)', @row_filter.to_s.split('|'))
-    end
-
-  end
-
-  def descriptor_import_predicate
-    ###TODO import_attribute 'char_weight' exclude characters with weight == 0
-  end
-
-  def observations
-    # id
-    # descriptor_id
-    # otu_id
-    # collection_object_id
-    # character_state_id
-    # continuous_value
-    # continuous_unit
-    # sample_min
-    # sample_max
-    # sample_unit
-    # presence
-    # description
-    # cached
-    # cached_column_label
-    # cached_row_label
-    # description
-    # type
-    ### types: Qualitative(char_states); Presence absence; Quantitative (single measurement); Sample (min, max); Free text
-  end
-
-  # rst = All characters ordered by Characters.Weight DESC, Characters.Char, State.State"
-  # rst2 = List of all taxa from the key ordered by hiercode
-  # filter = taxa with specic IDs
-  # list of used states
-  # count the number of errors for each taxon
-end
-
-=begin
-
-
-' Save all used characters and their states into array charUsed()
-
-CharMax = 0
-Do Until rst.EOF
-	i = CStr(rst("Char"))
-	j = CStr(rst("State"))
-	r = replace(CStr(Request("a" & i)), " ", "")
-	r = replace(r, "aa", "a")
-	if (r = j and multistates = "") or (rst("Numeric") = True and r <> "" and isNumeric(left(r, inStr(r & "-", "-") - 1)) and isNumeric(right(r, len(r) - inStr(r, "-")))) then
-		charMax = charMax + 1
-		charUsed(charMax, 1) = i
-		charUsed(charMax, 2) = r
-		charUsed(charMax, 3) = CStr(request("n" & i))
-		if charUsed(charMax, 3) = "1" then
-			states = states & "-" & rst("Key2")
-		else
-			states = states & rst("Key2")
-		end if
-		if rst("Numeric") = True then
-			states = states & "-" & r & "b"
-		else
-			states = states & "b"
-		end if
-		where2 = where2 & " OR Char=" & i
-	elseif multistates = "1" and rst("Numeric") = False then
-		m = CStr(Request("m" & i))
-		if (inStr(m, "!") = 0 and inStr(m, "a" & j & "a") > 0) or (m = "" and r = j) or (inStr(m, "!") = 1 and ((inStr(m, "a" & j & "a") > 0 and inStr(m, "a" & r & "a") > 0) or (r = j and inStr(m, "a" & r & "a") = 0))) then
-			if charUsed(charMax, 1) <> i then charMax = charMax + 1
-			charUsed(charMax, 1) = i
-			charUsed(charMax, 2) = charUsed(charMax, 2) & "a" & j & "a"
-			charUsed(charMax, 3) = CStr(request("n" & i))
-			if charUsed(charMax, 3) = "1" then
-				states = states & "-" & rst("Key2") & "b"
-			else
-				states = states & rst("Key2") & "b"
-			end if
-			where2 = where2 & " OR Char=" & i
-		end if
-	end if
-	rst.moveNext
-Loop
-rst.MoveFirst
-if where2 & "" <> "" then where2 = "AND (" & right(where2, len(where2) - 4) & ") "
-
-' Open recordset Matrix of characters
-
-if keyN <> "" then where1 = "AND ','&CharTableTotal.KeyN&',' Like '%," & keyN & ",%' AND ','&CharTableTotal.CharKeyN&',' Like '%," & keyN & ",%' "
-strSQL = "SELECT Morph, Char, State, Hiercode, Numeric, NumericFrom, NumericTo FROM CharTableTotal "
-if cat = "1" then
-	strSQL = strSQL & replace(where, "Characters", "CharTableTotal") & where1 & where2 & "ORDER BY Morph, Weight DESC, Char, Hiercode, State"
-else
-	strSQL = strSQL & replace(where, "Characters", "CharTableTotal") & where1 & where2 & "ORDER BY Weight DESC, Char, Hiercode, State"
-end if
-rst2.Open strSQL, Conn
-
-
-if rst2.eof then ' Datamatrix is empty
-	response.write "<p style='color: #FF0000'>The datamatrix is empty!</p>"
-else
-
-' Mark the taxa in array taxa() which does not fit to criteria (count number of errors)
-
-for j = 1 to charMax
-	for i = 1 to taxaMax
-	  if taxa(i, 2) <> "-1" then
-	  	do until left(rst2("Hiercode"), len(taxa(i, 1))) = taxa(i, 1) and rst2("Char") & "" = charUsed(j, 1)
-			rst2.MoveNext
-		loop
-		if multistates = "1" and rst2("Numeric") = False then
-			if charUsed(j, 3) = "1" then ' character with not
-				do until inStr(charUsed(j, 2), rst2("State")) = 0 or (rst2("State") & "" = "" and unknowns <> "1") or left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1)
-					rst2.MoveNext
-					if rst2.EOF then exit do
-				loop
-			else
-				do until inStr(charUsed(j, 2), rst2("State")) > 0 or (rst2("State") & "" = "" and unknowns <> "1") or left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1)
-					rst2.MoveNext
-					if rst2.EOF then exit do
-				loop
-			end if
-		else
-			if charUsed(j, 3) = "1" then ' character with not
-				do until (rst2("Numeric") = True and (rst2("NumericFrom") > cDbl(right(charUsed(j, 2), len(charUsed(j, 2)) - inStr(charUsed(j, 2), "-"))) or rst2("NumericTo") < cDbl(left(charUsed(j, 2), inStr(charUsed(j, 2) & "-", "-")-1)))) or (charUsed(j, 2) <> rst2("State") & "" and rst2("Numeric") = False) or (rst2("State") & "" = "" and unknowns <> "1") or left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1)
-					rst2.MoveNext
-					if rst2.EOF then exit do
-				loop
-			else
-				do until (rst2("Numeric") = True and rst2("NumericFrom") <= cDbl(right(charUsed(j, 2), len(charUsed(j, 2)) - inStr(charUsed(j, 2), "-"))) and rst2("NumericTo") >= cDbl(left(charUsed(j, 2), inStr(charUsed(j, 2) & "-", "-")-1))) or (charUsed(j, 2) = rst2("State") & "" and rst2("Numeric") = False) or (rst2("State") & "" = "" and unknowns <> "1") or left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1)
-					rst2.MoveNext
-					if rst2.EOF then exit do
-				loop
-			end if
-		end if
-		if rst2.EOF then
-			taxa(i, 2) = taxa(i, 2) + 1
-		elseIf left(rst2("Hiercode"), len(taxa(i, 1))) <> taxa(i, 1) then
-			taxa(i, 2) = taxa(i, 2) + 1
-		end if
-	  end if
-	next
-next
-
-' Making query strings for lists of taxa
-
-for t = 1 to taxaMax
-	if CInt(taxa(t, 2)) <= tol and taxa(t, 2) <> "-1" then
-		queryStr1 = queryStr1 & taxa(t, 0) & "a" & taxa(t, 2) & "a"
-		if CInt(taxa(t, 2)) < tol then taxaRemTol = taxaRemTol + 1
-		taxaRem = taxaRem + 1
-	else
-		queryStr2 = queryStr2 & taxa(t, 0) & "a" & taxa(t, 2) & "a"
-	end if
-next
-if len(queryStr1) > 0 then queryStr1 = states & left(queryStr1, len(queryStr1) - 1)
-if len(queryStr2) > 0 then queryStr2 = states & left(queryStr2, len(queryStr2) - 1)
-
-' Resort recordset rst2
-
-rst2.Close
-strSQL = "SELECT Morph, Char, State, Hiercode, Numeric, NumericFrom, NumericTo " &_
-	"FROM CharTableTotal "
-if cat = "1" then
-	strSQL = strSQL & replace(where, "Characters", "CharTableTotal") & where1 & "ORDER BY Morph, Weight DESC, Char, State, Hiercode"
-else
-	strSQL = strSQL & replace(where, "Characters", "CharTableTotal") & where1 & "ORDER BY Weight DESC, Char, State, Hiercode"
-end if
-rst2.Open strSQL, Conn
-
-' Make the form with set of character
-
-a = 1
-t = 1
-m = ""
-j = rst("Char") & ""
-Do Until rst.EOF
-	if rank <> "" then
-		for i = 1 to taxaMax
-			taxa(i, 3) = "0"
-		next
-	end if
-	i = rst("Char") & ""
-	morphN = rst("Morph")
-	charName = charReplace(rst("Char" & lng))
-
-	descr = rst("Descr" & lng) & ""
-
-	if not rst2.eof then
-		Do Until rst2("Char") & "" = i
-			rst2.MoveNext
-			if rst2.EOF then exit do
-		Loop
-	end if
-
-	if not rst2.eof then
-	  fig = 0
-	  weight = rst("Weight") & ""
-	  CharTemp1 = ""
-	  if weight <> "" then weight = ", I=" & weight
-	  usefull = 0
-	  stUnknown = 0
-	  stNum = 0
-	  stSum = 0
-	  numMin = 9999999
-	  numMax = -9999999
-
-	  if rst("Numeric") = False then ' !!!!!!!!!!Not Numeric!!!!!!!!!
-	  	if multistates = "1" then
-	  		m = request("m" & i) & ""
-	  		if (inStr(m, "!") = 1 and inStr(m, "a" & Request("a" & i) & "a") > 0) or (m <> "" and inStr(m, "!") <> 1) then
-		  		m = Replace("<input type='hidden' name='m" & i & "' value='!" & Replace(m, "!", "") & "'>", "'!'", "''") & sp
-			else
-				m = "<input type='hidden' name='m" & i & "' value=''>" & sp
-			end if
-	  	end if
-		if charUsed(a, 1) & "" <> i then
-			CharTemp = "<li><b>" & charName & "</b> (" & UCase(rst("Type")) & weight & ")<br>" & sp & m & "not&nbsp;<input type=checkbox name='n" & i & "' value='1'>&nbsp;<select name='a" & i & "'>" & sp & "<option value='" & "' selected> </option>" & sp
-		else
-			CharTemp = "<li><b>" & charName & "</b> (" & UCase(rst("Type")) & weight & ")<br>" & sp & m & "not&nbsp;<input type=checkbox " & replace(charUsed(a,3), "1", "checked ") & "name='n" & i & "' value='1'>&nbsp;<select name='a" & i & "'>" & sp & "<option value='" & "'> </option>" & sp
-		end if
-
-		hc = 0
-		if not rst2.eof then
-			Do Until rst2("Char") & "" <> i or rst2("State") & "" <> ""
-				z = 0
-				Do Until left(rst2("Hiercode"), len(taxa(t, 1))) = taxa(t, 1)
-					t = t + 1
-					if t > taxaMax then
-						t = 1
-						z = z + 1
-						if z > 1 then exit Do
-					end if
-				Loop
-				if CInt(taxa(t, 2)) = tol and hc <> taxa(t, 1) and z < 2 then
-					if rank <> "" then taxa(t, 3) = "1"
-					stUnknown = stUnknown + 1
-					hc = taxa(t, 1)
-				end if
-				rst2.MoveNext
-				if rst2.eof then exit do
-			Loop
-		end if
-
-		if unknowns = "1" then stUnknown = 0
-		Do until j <> i
-			stCount = stUnknown
-			if not rst2.EOF then
-				r = rst("State") & ""
-				hc = 0
-				Do Until rst2("Char") & "" <> i or rst2("State") & "" <> r
-					z = 0
-					Do Until left(rst2("Hiercode"), len(taxa(t, 1))) = taxa(t, 1)
-						t = t + 1
-						if t > taxaMax then
-							t = 1
-							z = z + 1
-							if z > 1 then exit Do
-						end if
-					Loop
-					if CInt(taxa(t, 2)) = tol and hc <> taxa(t, 1) and taxa (t, 3) <> "1" and z < 2 then
-						stCount = stCount + 1
-						hc = taxa(t, 1)
-					end if
-					rst2.MoveNext
-					if rst2.EOF then Exit Do
-				Loop
-			end if
-			stCount = stCount + taxaRemTol
-			if stCount > 0 and stCount < taxaRem Then
-				stNum = stNum + 1
-				strCharArr(stNum, 0) = stCount
-			end if
-
-			if charUsed(a, 1) = i and (inStr(charUsed(a, 2) , "a" & r & "a") = 1 or charUsed(a, 2) = r) then
-				CharTemp = CharTemp + "<option value='" & rst("State") & "' selected>&gt; " & charReplace(rst("State" & lng)) & "</option>" & sp
-			elseif charUsed(a, 1) = i and inStr(charUsed(a, 2) & "", "a" & r & "a") > 1 then
-				CharTemp = CharTemp + "<option value='" & rst("State") & "'>&gt; " & charReplace(rst("State" & lng)) & "</option>" & sp
-			elseIf charUsed(a, 1) = i and charUsed(a, 2) <> r then
-				CharTemp = CharTemp + "<option value='" & rst("State") & "'>" & charReplace(rst("State" & lng)) & "</option>" & sp
-			else
-				if stCount = 0 or stCount = taxaRem then
-					CharTemp = CharTemp + "<option value='" & rst("State") & "'>- " & charReplace(rst("State" & lng)) & " ("&stCount&") -</option>" & sp
-				else
-					CharTemp = CharTemp + "<option value='" & rst("State") & "'>" & charReplace(rst("State" & lng)) & " ("&stCount&")</option>" & sp
-					usefull = 1
-				end if
-				CharTemp1 = CharTemp1 & "&a" & rst("State") & "=" & stCount
-			end if
-			if rst("Fig") & "" <> "" then fig = 1
-
-			rst.MoveNext
-			if rst.EOF then
-				exit do
-			else
-				j = rst("Char") & ""
-			end if
-		Loop
-		CharTemp1 = CharTemp1 & "&b=" & taxaRem
-		CharTemp = CharTemp + "</select>" & sp & sp
-		If fig = 1 or descr <> "" or multistates = "1" then
-			opt = len(CharTemp) - len(replace(CharTemp, "option", ""))
-			if fig = 1 and multistates = "1" then opt = opt + 12
-			if opt > 90 and fig = 1 then
-				CharTemp = replace(CharTemp, ">" & charName & "<", "><a href=""" & "javascript:makeHelpWindow('" & i & CharTemp1 & "',800,600)""" & " Title='" & show & "'>" & charName & "</a><")
-			elseIf opt > 50 or (multistates = "1" and fig = 1) then
-				CharTemp = replace(CharTemp, ">" & charName & "<", "><a href=""" & "javascript:makeHelpWindow('" & i & CharTemp1 & "',640,480)""" & " Title='" & show & "'>" & charName & "</a><")
-			elseIf opt < 50 then
-				CharTemp = replace(CharTemp, ">" & charName & "<", "><a href=""" & "javascript:makeHelpWindow('" & i & CharTemp1 & "',640,300)""" & " Title='" & show & "'>" & charName & "</a><")
-			end if
-		end if
-
-	  else ' !!!!!!!Numeric!!!!!!!!
-
-		if not rst2.eof then
-			hc = 0
-			Do Until rst2("Char") & "" <> i or rst2("State") & "" <> ""
-				z = 0
-				Do Until left(rst2("Hiercode"), len(taxa(t, 1))) = taxa(t, 1)
-					t = t + 1
-					if t > taxaMax then
-						t = 1
-						z = z + 1
-						if z > 1 then exit do
-					end if
-				Loop
-				if CInt(taxa(t, 2)) = tol and hc <> taxa(t, 1) and z < 2 then
-					if rank <> "" then taxa(t, 3) = "1"
-					stUnknown = stUnknown + 1
-					hc = taxa(t, 1)
-				end if
-				rst2.MoveNext
-				if rst2.eof then exit do
-			Loop
-		end if
-
-		usefull = 0
-		if not rst2.eof then
-			stCount = 0
-			hc = 0
-			do until rst2("Char") & "" <> i
-				z = 0
-				Do Until left(rst2("Hiercode"), len(taxa(t, 1))) = taxa(t, 1)
-					t = t + 1
-					if t > taxaMax then
-						t = 1
-						z = z + 1
-						if z > 1 then exit Do
-					end if
-				Loop
-				if CInt(taxa(t, 2)) = tol and z < 2 then
-					if hc <> taxa(t, 1) and taxa(t, 3) <> "1" then
-						hc = taxa(t, 1)
-						stNum = stNum + 1
-						strCharArr(stNum, 0) = rst2("NumericTo")
-						strCharArr(stNum, 4) = rst2("NumericFrom")
-					end if
-					if strCharArr(stNum, 0) > rst2("NumericTo") then strCharArr(stNum, 0) = rst2("NumericTo")
-					if strCharArr(stNum, 4) < rst2("NumericFrom") then strCharArr(stNum, 4) = rst2("NumericFrom")
-					if numMin > rst2("NumericFrom") then
-						if numMin < 9999999 then usefull = 1
-						numMin = rst2("NumericFrom")
-					end if
-					if numMax < rst2("NumericTo") then
-						if numMax > -9999999 then usefull = 1
-						numMax = rst2("NumericTo")
-					end if
-					stCount = 1
-				end if
-				rst2.moveNext
-				if rst2.eof then exit do
-			loop
-		end if
-		if charUsed(a, 1) & "" <> i then
-			if numMin = 9999999 then
-				charTemp1 = ""
-			elseIf numMin = numMax then
-				charTemp1 = numMin & " "
-			else
-			CharTemp1 = numMin & "-" & numMax & " "
-			end if
-			CharTemp = "<li><b>" & charName & " [" & charTemp1 & charReplace(rst("State" & lng)) & "]</b> (" & UCase(rst("Type")) & weight & ")<br>" & sp & "not&nbsp;<input type=checkbox name='n" & i & "' value='1'>&nbsp;<input type='text' name='a" & i & "' value='' size='15'>" & sp
-		else
-			CharTemp = "<li><b>" & charName & " [" & charReplace(rst("State" & lng)) & "]</b> (" & UCase(rst("Type")) & weight & ")<br>" & sp & "not&nbsp;<input type=checkbox " & replace(charUsed(a,3), "1", "checked ") & "name='n" & i & "' value='1'>&nbsp;<input type='text' name='a" & i & "' value='" & charUsed(a, 2) & "' size='15'>" & sp
-		end if
-		If rst("fig") & "" <> "" or descr <> "" then
-			CharTemp = replace(CharTemp, ">" & charName & " [" & charTemp1 & charReplace(rst("State" & lng)) & "]<", "><a href=""" & "javascript:makeHelpWindow('" & i & "',640,280)""" & " Title='" & show & "'>" & charName & "</a> [" & charTemp1 & charReplace(rst("State" & lng)) & "]<")
-		end if
-
-		rst.MoveNext
-		if not rst.EOF then j = rst("Char") & ""
-
-	  end if ' !!!!!!!!!Numeric!!!!!!!!!!
-	end if
-
-	if charUsed(a, 1) = i then
-		strChar2 = strChar2 + CharTemp
-		a = a + 1
-	ElseIf usefull = 0 then
-		strChar3 = strChar3 & CharTemp
-	Else
-		if taxaRem > 1 then
-			if cat = "1" and rst1("Morph") <> morphN then
-				Do until rst1("Morph") = morphN
-					rst1.moveNext
-				Loop
-				morph = 0
-			end if
-			if cat = "1" and rst1("Morph") = morphN and morph <> 1 then
-				l = Replace(rst1("Morph" & lng), " ", "&nbsp;")
-				strChar1 = strChar1 & "<br><br><a name='" & l & "'></a><span class='a'>" & l & "</span><br><br>" & sp & sp
-				link = link & "<a href='#" & l & "'>" & l & "</a>&nbsp;| " & sp
-				morph = 1
-			end if
-			if cat <> "1" then
-				if numMin = 9999999 then stMed = taxaRem / stNum else stMed = taxaRem
-				For i1 = 1 to stNum
-					if numMin = 9999999 then
-						stSum = stSum + ((stMed) - strCharArr(i1, 0)) ^ 2
-					else
-						strCharArr(i1, 0) = strCharArr(i1, 4) - strCharArr(i1, 0)
-						if strCharArr(i1, 0) = 0 then strCharArr(i1, 0) = (numMax - numMin) / 10
-						stSum = stSum + strCharArr(i1, 0)
-					end if
-				Next
-				strCharMax = strCharMax + 1
-				if numMax = numMin then numMax = numMax + 0.00001
-				if numMin = 9999999 then
-					strCharArr(strCharMax, 2) = stMed + Sqr(stSum)
-				else
-					strCharArr(strCharMax, 2) = stMed * (stSum / stNum / (numMax - numMin)) * (2 - stNum / taxaRem)
-				end if
-				strCharArr(strCharMax, 1) = CharTemp ' & strCharArr(strCharMax, 2) '!!!!!!!!!!!!!!!!
-				strCharArr(strCharMax, 3) = CLng("0" & replace(weight, ", I=", ""))
-			else
-				strChar1 = strChar1 & CharTemp
-			end if
-		else
-			strChar3 = strChar3 & CharTemp
-		End if
-	End if
-Loop
-
-' Outputtin form
-
-%>
-<body>
-<script type="text/javascript">
-<!--
-window.onerror = null;
-
-if (window.parent.window.length != 4)
-	{ window.location = ""; }
-else {
-
-window.parent.window.frames['taxa1'].window.document.forms['mainform'].elements['taxa'].value='<% =queryStr1 %>';
-window.parent.window.frames['taxa1'].window.document.forms['mainform'].elements['lng'].value='<% =lng %>';
-window.parent.window.frames['taxa1'].window.document.forms['mainform'].submit();
-<% if tax = "1" then %>
-	window.parent.window.frames['taxa2'].window.document.forms['mainform'].elements['taxa'].value='<% =queryStr2 %>';
-	window.parent.window.frames['taxa2'].window.document.forms['mainform'].elements['lng'].value='<% =lng %>';
-	window.parent.window.frames['taxa2'].window.document.forms['mainform'].submit();
-<% end if %>
-}
-window.onfocus = ppHide;
-var ww = null;
-
-window.onclose = ppHide;
-
-function makeHelpWindow(n,w,h)
-{
-if (navigator.appName == "Microsoft Internet Explorer")
-<%
-	Response.write "{ ww = window.open('charhelp.asp?key=" & key & "&lng=" & lng & "&m=" & multistates & "&keyN=" & keyN & "&ch=' + n,'_blank','scrollbars=" & scroll & ",resizable=no,width=' + w + ',height=' + h + ',top=' + (screen.availHeight - h) / 2 + ',left=' + (screen.availWidth - w) / 2 ); }"
-%>
-else
-<%
-	Response.write "{ ww = window.open('charhelp.asp?key=" & key & "&lng=" & lng & "&m=" & multistates & "&keyN=" & keyN & "&ch=' + n,'_blank','scrollbars=yes,resizable=yes,width=' + w + ',height=' + h + ',top=' + (screen.availHeight - h) / 2 + ',left=' + (screen.availWidth - w) / 2 ); }"
-%>
-}
-
-function ppHide()
-{ if(ww != null) ww.close(); ww=null;}
-
-//-->
-</script>
-
-<%
-
-if len(link) > 9 then
-	link = left(link, len(link)-9)
-end if %>
-
-<form method='POST' action='char.asp' name='mainform'>
-
-<input type="hidden" name="sex" value="<% =sex %>">
-<input type="hidden" name="char" value="<% =char %>">
-<input type="hidden" name="tax" value="<% =tax %>">
-<input type="hidden" name="cat" value="<% =cat %>">
-<input type="hidden" name="tol" value="<% =tol %>">
-<input type="hidden" name="key" value="<% =key %>">
-<input type="hidden" name="keyN" value="<% =keyN %>">
-<input type="hidden" name="visit" value="<% =visit %>">
-<input type="hidden" name="lng" value="<% =lng %>">
-<input type="hidden" name="rank" value="<% =rank %>">
-<input type="hidden" name="unknowns" value="<% =unknowns %>">
-<input type="hidden" name="filter" value="<% =filter %>">
-<input type="hidden" name="multistates" value="<% =multistates %>">
-<%
-if cat <> "1" and strCharMax > 1 then
-For i = 1 to strCharMax - 1
-For j = i + 1 to strCharMax
-if strCharArr(i, 3) > strCharArr(j, 3) and cat = "0" then exit for
-                                                               if strCharArr(i, 2) > strCharArr(j, 2) then
-                                                                 CharTemp = strCharArr(i, 1)
-                                                                 strCharArr(i, 1) = strCharArr(j, 1)
-                                                                 strCharArr(j, 1) = CharTemp
-                                                                 CharTemp = strCharArr(i, 2)
-                                                                 strCharArr(i, 2) = strCharArr(j, 2)
-                                                                 strCharArr(j, 2) = CharTemp
-                                                               end if
-      Next
-  strChar1 = strChar1 + strCharArr(i, 1)
-  Next
-  strChar1 = strChar1 + strCharArr(strCharMax, 1)
-  elseIf cat = "2" or strCharMax = 1 then
-  strChar1 = strChar1 + strCharArr(1, 1)
-                                                               end if
-    if strChar2 & "" <> "" or filter <> "" then
-      response.write "<div class='a'><ul>" & sp
-      if strChar1 & "" <> "" then
-        response.write "<li><a href='#useful'>" & rst3("Useful") & "</a>" & sp
-        if len(link) > 0 then
-          response.write "<br>" & sp & "(" & link & ")" & sp & sp
-        end if
-      end if
-          if strChar3 & "" <> "" and char = "1" then
-            response.write "<li><a href='#useless'>" & rst3("Relevant") & "</a>" & sp
-          end if
-          response.write "</ul></div>" & sp & sp
-    end if
-
-
-    if strChar2 & "" <> "" then
-      response.Write sp & "<a Name='used'></a>" & sp & "<h2>" & rst3("Used") & "</h2>" & sp & sp
-    end if
-    if filter <> "" then
-      if strChar2 & "" = "" then response.Write sp & "<a Name='used'></a>" & sp & "<h2>" & rst3("Used") & "</h2>" & sp & sp
-      response.write "<p style='margin-bottom: 1em'><input type=checkbox checked name='f' value='1'>&nbsp;<b>Filter</b><br></p>" & sp & sp
-      else
-        response.write "<input type=hidden name='f' value=''>" & sp & sp
-      end if
-          if strChar2 & "" <> "" then
-            response.write "<div class='a'><ol>" & sp & sp & strChar2 & "</ol></div>" & sp
-          end if
-          if strChar1 & "" <> "" then
-            response.Write sp & "<a Name='useful'></a>" & sp & "<h2>" & rst3("Useful") & "</h2>" & sp & sp & "<p style='margin-bottom: 0em' align='center'>" & sp & link & sp & "</p>" & sp & sp & "<div class='a'><ol>" & sp & sp & strChar1 & "</ol></div>" & sp
-          end if
-          if strChar3 & "" <> "" and char = "1" then
-            response.Write sp & "<a Name='useless'></a>" & sp & "<h2>" & rst3("Relevant") & "</h2>" & sp & sp & "<div class='a'><ol>" & sp & sp & strChar3 & "</ol></div>" & sp
-          end if
-
-
-          function charReplace(string)
-      Do
-      if inStr(string, "[") > 0 and inStr(string, "]") - inStr(string, "[") > 0 then
-        string = trim(left(string, inStr(string, "[")-1) & right(string, len(string) - inStr(string, "]")))
-      else
-        Exit Do
-      end if
-          Loop
-      string = replace(string & "", "{", "")
-      string = replace(string, "}", "")
-      string = replace(string, " & ", " &amp; ")
-      if inStr(string & "<", "<") < inStrRev(">" & string, ">") and inStr(string, "</") > 0 then
-      else
-        string = replace(string, "<", "&lt;")
-        string = replace(string, ">", "&gt;")
-      end if
-          charReplace = string
-    end function
-
-rst3.Close
-Set rst3 = Nothing
-
-end if ' Datamatrix is empty
-=end
diff --git a/spec/lib/interactive_key_spec.rb b/spec/lib/interactive_key_spec.rb
deleted file mode 100644
index 6c9ab6d5d5..0000000000
--- a/spec/lib/interactive_key_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'rails_helper'
-require 'interactive_key'
-
-describe InteractiveKey, type: :model, group: :observation_matrix do
-
-  context 'respond to' do
-    let(:observation_matrix) { ObservationMatrix.create!(name: 'Matrix') }
-    let(:otu1) { Otu.create!(name: 'phoo') }
-    let(:otu2) { Otu.create!(name: 'barr') }
-    let(:descriptor1) { Descriptor::Working.create!(name: 'working1') }
-    let(:descriptor2) { Descriptor::Working.create!(name: 'working2') }
-    let!(:rus) { FactoryBot.create(:russian) }
-    let!(:eng) { FactoryBot.create(:english) }
-
-    let(:interactive_key) { InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id) }
-
-#    observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu1)
-#    observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu2)
-#    observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
-#    observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
-
-    specify 'observation_matrix' do
-      expect(interactive_key.observation_matrix).to eq(observation_matrix)
-    end
-
-    specify 'descriptor_available_languages' do
-      eng
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
-      a = AlternateValue.create(type: 'AlternateValue::Translation', value: 'zzz', alternate_value_object: descriptor1, alternate_value_object_attribute: 'name', language_id: rus.id)
-      expect(interactive_key.descriptor_available_languages.count).to eq(2)
-    end
-
-    specify 'language_to_use' do
-      eng
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
-      a = AlternateValue.create(type: 'AlternateValue::Translation', value: 'zzz', alternate_value_object: descriptor1, alternate_value_object_attribute: 'name', language_id: rus.id)
-      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, language_id: rus.id)
-      expect(interactive_key.language_to_use).to eq(rus)
-    end
-
-    specify 'descriptor_available_keywords' do
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
-      k = Keyword.create(name: 'zzz', definition: 'zzzzzzzzzzzzzzzzzzzzzzzzz')
-      descriptor1.tags.create(keyword: k)
-      expect(interactive_key.descriptor_available_keywords.count).to eq(1)
-    end
-
-    specify 'descriptor_weight' do
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
-      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id)
-      expect(interactive_key.descriptors_with_filter.count).to eq(2)
-      descriptor1.weight = 0
-      descriptor1.save
-      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id)
-      expect(interactive_key.descriptors_with_filter.count).to eq(1)
-    end
-
-    specify 'descriptors_with_keywords' do
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
-      observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
-      k1 = Keyword.create(name: 'zzz1', definition: 'zzzzzzzzzzzzzzzzzzzzzzzzz')
-      k2 = Keyword.create(name: 'zzz2', definition: 'zzzzzzzzzzzzzzzzzzzzzzzzzz')
-      t1 = descriptor1.tags.create(keyword: k1)
-      t2 = descriptor2.tags.create(keyword: k2)
-      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, keyword_ids: t1.id)
-      expect(interactive_key.descriptors_with_filter.count).to eq(1)
-      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, keyword_ids: t1.id.to_s + '|' + t2.id.to_s)
-      expect(interactive_key.descriptors_with_filter.count).to eq(2)
-    end
-
-    specify 'rows_with_filter' do
-      o1 = observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu1)
-      o2 = observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu2)
-      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, row_filter: observation_matrix.observation_matrix_rows.first.id)
-      expect(interactive_key.rows_with_filter.count).to eq(1)
-      interactive_key = InteractiveKey.new(observation_matrix_id: observation_matrix.id, project_id: observation_matrix.project_id, row_filter: observation_matrix.observation_matrix_rows.first.id.to_s + '|' + observation_matrix.observation_matrix_rows.last.id.to_s)
-      expect(interactive_key.rows_with_filter.count).to eq(2)
-    end
-
-
-  end
-end

From c767e9d3e8b31ab4d0a51a9114c589add3a57d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Wed, 22 Jul 2020 18:18:11 -0300
Subject: [PATCH 56/76] CHANGELOG amendment [ci skip]

---
 CHANGELOG.md | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1725d5d6a7..c1f84ba15c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,24 +8,6 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 ## [unreleased]
 
 ### Added
-- Map on OTU radial in asserted distribution form [#856]
-
-### Changed
-- Moved taxon name input search to right column in new taxon name
-- Persons autosave in new taxon name
-
-### Fixed
-- Modal confirmation its not displaying in manage synonyms section [#1627]
-- Manage synonyms includes combinations [#1628]
-
-[#856]: https://github.com/SpeciesFileGroup/taxonworks/issues/856
-[#1627]: https://github.com/SpeciesFileGroup/taxonworks/issues/1627
-[#1628]: https://github.com/SpeciesFileGroup/taxonworks/issues/1628
-
-## [0.12.12] - 2020-07-22
-
-### Added
-- Interactive keys task
 - 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]
@@ -35,6 +17,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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]
 
 ### Changed
 - Cleanup and add spec basis for nomenclature tabular stats queries  
@@ -44,6 +27,8 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 
 ### Fixed
 - Flip object to subject label on type section in new taxon name task
@@ -51,9 +36,11 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - Columns size of georeference table [#1622]
 - Webpacker host and port bind on docker container
 - Wrong taxon name relationship soft validation message for genera
-- Seeing OTUs in Recent that do not belong to project [#1626]
+- Modal confirmation its not displaying in manage synonyms section [#1627]
+- Manage synonyms includes combinations [#1628]
 
 [#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
@@ -62,6 +49,14 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 [#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
+
+## [0.12.12] - 2020-07-22
+
+### Fixed
+- Seeing OTUs in Recent that do not belong to project [#1626]
+
 [#1626]: https://github.com/SpeciesFileGroup/taxonworks/issues/1626
 
 ## [0.12.11] - 2020-07-14
@@ -293,7 +288,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.11...development
+[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.12...development
+[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
 [0.12.9]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.8...v0.12.9

From 98326becdedc56f3d8a57f927c25bcf175bd9f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Thu, 23 Jul 2020 13:57:39 -0300
Subject: [PATCH 57/76] Fix recent and per params in source filter and
 controller

---
 CHANGELOG.md                                             | 1 +
 app/controllers/sources_controller.rb                    | 1 +
 .../vue/tasks/sources/hub/components/citationsCount.vue  | 6 ++----
 .../vue/tasks/sources/hub/components/recent.vue          | 4 +++-
 .../vue/tasks/sources/new_source/request/resources.js    | 9 +++++++--
 lib/queries/source/filter.rb                             | 7 +++++++
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1f84ba15c..7fcc0b12b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 
 [#446]: https://github.com/SpeciesFileGroup/taxonworks/issues/446
 [#856]: https://github.com/SpeciesFileGroup/taxonworks/issues/856
diff --git a/app/controllers/sources_controller.rb b/app/controllers/sources_controller.rb
index 91fe691b4a..5aaaebdc41 100644
--- a/app/controllers/sources_controller.rb
+++ b/app/controllers/sources_controller.rb
@@ -230,6 +230,7 @@ def filter_params
       :namespace_id,
       :nomenclature,
       :notes,
+      :per,
       :project_id,
       :query_term,
       :recent, 
diff --git a/app/javascript/vue/tasks/sources/hub/components/citationsCount.vue b/app/javascript/vue/tasks/sources/hub/components/citationsCount.vue
index 402fef5933..c211f10010 100644
--- a/app/javascript/vue/tasks/sources/hub/components/citationsCount.vue
+++ b/app/javascript/vue/tasks/sources/hub/components/citationsCount.vue
@@ -1,10 +1,8 @@
 <template>
   <a
-    class="citation-count"
+    class="citation-count button-data circle-button btn-citation"
     :href="`/tasks/nomenclature/by_source?source_id=${sourceId}`">
-    <span class="button-data circle-button btn-citation">
-      <span class="circle-count button-default middle">{{ citations.length }} </span>
-    </span>
+    <span class="circle-count button-default middle">{{ citations.length }} </span>
   </a>
 </template>
 
diff --git a/app/javascript/vue/tasks/sources/hub/components/recent.vue b/app/javascript/vue/tasks/sources/hub/components/recent.vue
index b81621a726..461598cff6 100644
--- a/app/javascript/vue/tasks/sources/hub/components/recent.vue
+++ b/app/javascript/vue/tasks/sources/hub/components/recent.vue
@@ -28,7 +28,9 @@
           </td>
           <td> {{ item.year }} </td>
           <td>
-            <citations-count :source-id="item.id"/>
+            <div>
+              <citations-count :source-id="item.id"/>
+            </div>
           </td>
           <td>
             <documents-component :source-id="item.id"/>
diff --git a/app/javascript/vue/tasks/sources/new_source/request/resources.js b/app/javascript/vue/tasks/sources/new_source/request/resources.js
index 10e495894b..792525fe46 100644
--- a/app/javascript/vue/tasks/sources/new_source/request/resources.js
+++ b/app/javascript/vue/tasks/sources/new_source/request/resources.js
@@ -7,11 +7,16 @@ const GetSource = (id) => {
 }
 
 const GetRecentSources = () => {
-  return ajaxCall('get', `/sources.json?per=10&recent=true`)
+  return ajaxCall('get', '/sources.json', {
+    params: {
+      per: 10,
+      recent: true
+    }
+  })
 }
 
 const CreateSource = (source) => {
-  return ajaxCall('post', `/sources`, { source: source })
+  return ajaxCall('post', '/sources', { source: source })
 }
 
 const UpdateSource = (source) => {
diff --git a/lib/queries/source/filter.rb b/lib/queries/source/filter.rb
index c3fa729046..a2d439d42b 100644
--- a/lib/queries/source/filter.rb
+++ b/lib/queries/source/filter.rb
@@ -44,6 +44,10 @@ class Filter < Queries::Query
       # @params citations ['true', 'false', nil]
       attr_accessor :citations
 
+      # @return [Boolean, nil]
+      # @params recent ['true', 'false', nil]
+      attr_accessor :recent
+
       # @return [Boolean, nil]
       # @params roles ['true', 'false', nil]
       attr_accessor :roles
@@ -98,6 +102,7 @@ def initialize(params)
         @with_doi = (params[:with_doi]&.downcase == 'true' ? true : false) if !params[:with_doi].nil?
         @year_end = params[:year_end]
         @year_start = params[:year_start]
+        @recent = (params[:recent]&.downcase == 'true' ? true : false) if !params[:recent].nil?
 
         build_terms
         set_identifier(params)
@@ -342,6 +347,8 @@ def all
         else
           q = ::Source.all
         end
+
+        q = q.order(updated_at: :desc) if recent
         q
       end
 

From 4cfbf2bbafd5b0d1fd88f7b6378c8ed7036a8673 Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Thu, 23 Jul 2020 13:16:25 -0500
Subject: [PATCH 58/76] tabular_spec

---
 app/models/otu.rb                           |   6 +-
 package-lock.json                           | 170 ++++++++++----------
 spec/lib/queries/taxon_name/tabular_spec.rb | 138 ++++++++++++++--
 3 files changed, 217 insertions(+), 97 deletions(-)

diff --git a/app/models/otu.rb b/app/models/otu.rb
index 4bab1fb7e8..23f8c53ef7 100644
--- a/app/models/otu.rb
+++ b/app/models/otu.rb
@@ -299,13 +299,13 @@ def self.used_recently(user_id, project_id, used_on = '')
 
     z = i.as('recent_t')
 
-    j = case used_on
+    case used_on
         when 'BiologicalAssociation' 
-          Arel::Nodes::InnerJoin.new(z, Arel::Nodes::On.new(
+          j = Arel::Nodes::InnerJoin.new(z, Arel::Nodes::On.new(
             z['biological_association_object_id'].eq(p['id'])
           ))
         else
-          Arel::Nodes::InnerJoin.new(z, Arel::Nodes::On.new(z['otu_id'].eq(p['id'])))
+          j = Arel::Nodes::InnerJoin.new(z, Arel::Nodes::On.new(z['otu_id'].eq(p['id'])))
         end
 
     Otu.joins(j).pluck(:id).uniq
diff --git a/package-lock.json b/package-lock.json
index dbb8928723..8c0fff6253 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1319,7 +1319,7 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
     },
     "accepts": {
       "version": "1.3.7",
@@ -1491,12 +1491,12 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo="
     },
     "are-we-there-yet": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
       "requires": {
         "delegates": "^1.0.0",
         "readable-stream": "^2.0.6"
@@ -1505,7 +1505,7 @@
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
       "requires": {
         "sprintf-js": "~1.0.2"
       }
@@ -1524,7 +1524,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE="
     },
     "arr-union": {
       "version": "3.1.0",
@@ -1594,7 +1594,7 @@
     "asn1.js": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=",
       "requires": {
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
@@ -2230,7 +2230,7 @@
     "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "integrity": "sha1-ry87iPpvXB5MY00aD46sT1WzleM=",
       "dev": true
     },
     "balanced-match": {
@@ -2241,7 +2241,7 @@
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
       "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -2263,7 +2263,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -2271,7 +2271,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -2279,7 +2279,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -2414,7 +2414,7 @@
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2423,7 +2423,7 @@
     "braces": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "integrity": "sha1-WXn9PxTNUxVl5fot8av/8d+u5yk=",
       "requires": {
         "arr-flatten": "^1.1.0",
         "array-unique": "^0.3.2",
@@ -2455,7 +2455,7 @@
     "browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "integrity": "sha1-Mmc0ZC9APavDADIJhTu3CtQo70g=",
       "requires": {
         "buffer-xor": "^1.0.3",
         "cipher-base": "^1.0.0",
@@ -2468,7 +2468,7 @@
     "browserify-cipher": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "integrity": "sha1-jWR0wbhwv9q807z8wZNKEOlPFfA=",
       "requires": {
         "browserify-aes": "^1.0.4",
         "browserify-des": "^1.0.0",
@@ -2538,7 +2538,7 @@
     "browserify-zlib": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=",
       "requires": {
         "pako": "~1.0.5"
       }
@@ -2619,7 +2619,7 @@
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
       "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -2784,7 +2784,7 @@
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -2793,7 +2793,7 @@
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
       "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
@@ -3091,7 +3091,7 @@
     "concat-stream": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=",
       "requires": {
         "buffer-from": "^1.0.0",
         "inherits": "^2.0.3",
@@ -3118,7 +3118,7 @@
     "consolidate": {
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+      "integrity": "sha1-IasEMjXHGgfUXZqtmFk7DbpWurc=",
       "dev": true,
       "requires": {
         "bluebird": "^3.1.1"
@@ -3173,7 +3173,7 @@
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=",
       "requires": {
         "aproba": "^1.1.1",
         "fs-write-stream-atomic": "^1.0.8",
@@ -3229,7 +3229,7 @@
     "create-ecdh": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "integrity": "sha1-yREbbzMEXEaX8UR4f5JUzcd8Rf8=",
       "requires": {
         "bn.js": "^4.1.0",
         "elliptic": "^6.0.0"
@@ -3245,7 +3245,7 @@
     "create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "integrity": "sha1-iJB4rxGmN1a8+1m9IhmWvjqe8ZY=",
       "requires": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -3257,7 +3257,7 @@
     "create-hmac": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "integrity": "sha1-aRcMeLOrlXFHsriwRXLkfq0iQ/8=",
       "requires": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -3295,7 +3295,7 @@
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=",
       "requires": {
         "browserify-cipher": "^1.0.0",
         "browserify-sign": "^4.0.0",
@@ -3706,7 +3706,7 @@
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
       "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -3715,7 +3715,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3723,7 +3723,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3731,7 +3731,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -3808,7 +3808,7 @@
     "diffie-hellman": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "integrity": "sha1-QOjumPVaIUlgcUaSHGPhrl89KHU=",
       "requires": {
         "bn.js": "^4.1.0",
         "miller-rabin": "^4.0.0",
@@ -3875,7 +3875,7 @@
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+      "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto="
     },
     "domelementtype": {
       "version": "1.3.1",
@@ -4026,7 +4026,7 @@
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
       "requires": {
         "prr": "~1.0.1"
       }
@@ -4623,7 +4623,7 @@
     "esrecurse": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
       "requires": {
         "estraverse": "^4.1.0"
       }
@@ -4667,7 +4667,7 @@
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
       "requires": {
         "md5.js": "^1.3.4",
         "safe-buffer": "^5.1.1"
@@ -4857,7 +4857,7 @@
         "is-extendable": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
           "requires": {
             "is-plain-object": "^2.0.4"
           }
@@ -4867,7 +4867,7 @@
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "integrity": "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM=",
       "requires": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
@@ -4898,7 +4898,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -4906,7 +4906,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -4914,7 +4914,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -5230,7 +5230,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0="
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
@@ -5256,7 +5256,7 @@
     "gaze": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
-      "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+      "integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=",
       "requires": {
         "globule": "^1.0.0"
       }
@@ -5787,7 +5787,7 @@
     "ini": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc="
     },
     "internal-ip": {
       "version": "4.3.0",
@@ -5807,7 +5807,7 @@
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=",
       "requires": {
         "loose-envify": "^1.0.0"
       }
@@ -5876,7 +5876,7 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+      "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4="
     },
     "is-callable": {
       "version": "1.2.0",
@@ -5922,7 +5922,7 @@
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
         "is-data-descriptor": "^0.1.4",
@@ -5932,7 +5932,7 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+          "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0="
         }
       }
     },
@@ -6027,7 +6027,7 @@
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
       "requires": {
         "isobject": "^3.0.1"
       }
@@ -6043,7 +6043,7 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg="
     },
     "is-stream": {
       "version": "1.1.0",
@@ -6086,7 +6086,7 @@
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+      "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0="
     },
     "is-wsl": {
       "version": "1.1.0",
@@ -6169,7 +6169,7 @@
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+      "integrity": "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk="
     },
     "json-schema": {
       "version": "0.2.3",
@@ -6551,7 +6551,7 @@
     "merge-source-map": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+      "integrity": "sha1-L93n5gIJOfcJBqaPLXrmheTIxkY=",
       "dev": true,
       "requires": {
         "source-map": "^0.6.1"
@@ -6560,7 +6560,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
           "dev": true
         }
       }
@@ -6579,7 +6579,7 @@
     "micromatch": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "integrity": "sha1-cIWbyVyYQJUvNZoGij/En57PrCM=",
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -6599,7 +6599,7 @@
     "miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
       "requires": {
         "bn.js": "^4.0.0",
         "brorand": "^1.0.1"
@@ -6657,7 +6657,7 @@
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+      "integrity": "sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc="
     },
     "minimalistic-crypto-utils": {
       "version": "1.0.1",
@@ -6667,7 +6667,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -7017,7 +7017,7 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
       "requires": {
         "are-we-there-yet": "~1.1.2",
         "console-control-strings": "~1.1.0",
@@ -7242,7 +7242,7 @@
     "osenv": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=",
       "requires": {
         "os-homedir": "^1.0.0",
         "os-tmpdir": "^1.0.0"
@@ -7368,7 +7368,7 @@
     "path-complete-extname": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/path-complete-extname/-/path-complete-extname-1.0.0.tgz",
-      "integrity": "sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg=="
+      "integrity": "sha1-+ImYXckQAMgVUVwL/tBsWs2gdSs="
     },
     "path-dirname": {
       "version": "1.0.2",
@@ -8538,7 +8538,7 @@
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
+      "integrity": "sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8="
     },
     "process": {
       "version": "0.11.10",
@@ -8618,7 +8618,7 @@
     "pumpify": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=",
       "requires": {
         "duplexify": "^3.6.0",
         "inherits": "^2.0.3",
@@ -8639,7 +8639,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
     },
     "q": {
       "version": "1.5.1",
@@ -8692,7 +8692,7 @@
     "randomfill": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=",
       "requires": {
         "randombytes": "^2.0.5",
         "safe-buffer": "^5.1.0"
@@ -8897,7 +8897,7 @@
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
@@ -9153,7 +9153,7 @@
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+      "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w="
     },
     "retry": {
       "version": "0.12.0",
@@ -9206,7 +9206,7 @@
     "ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "integrity": "sha1-ocGm9iR1FXe6XQeRTLyShQWFiQw=",
       "requires": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -9223,7 +9223,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -9236,7 +9236,7 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo="
     },
     "sass-graph": {
       "version": "2.2.5",
@@ -9271,7 +9271,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
     },
     "schema-utils": {
       "version": "2.7.0",
@@ -9481,7 +9481,7 @@
     "sha.js": {
       "version": "2.4.11",
       "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "integrity": "sha1-N6XPC4HsvGlD3hCbopYNGyZYSuc=",
       "requires": {
         "inherits": "^2.0.1",
         "safe-buffer": "^5.0.1"
@@ -9550,7 +9550,7 @@
     "snapdragon": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
       "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
@@ -9596,7 +9596,7 @@
     "snapdragon-node": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
       "requires": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
@@ -9614,7 +9614,7 @@
         "is-accessor-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -9622,7 +9622,7 @@
         "is-data-descriptor": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -9630,7 +9630,7 @@
         "is-descriptor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -9642,7 +9642,7 @@
     "snapdragon-util": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
       "requires": {
         "kind-of": "^3.2.0"
       },
@@ -9834,7 +9834,7 @@
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
       "requires": {
         "extend-shallow": "^3.0.0"
       }
@@ -9928,7 +9928,7 @@
     "stream-http": {
       "version": "2.8.3",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "integrity": "sha1-stJCRpKIpaJ+xP6JM6z2I95lFPw=",
       "requires": {
         "builtin-status-codes": "^3.0.0",
         "inherits": "^2.0.1",
@@ -9998,7 +9998,7 @@
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
       "requires": {
         "safe-buffer": "~5.1.0"
       }
@@ -10136,7 +10136,7 @@
     "stylus-loader": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz",
-      "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==",
+      "integrity": "sha1-J6cGQgsFo44DjnyssVNXjUUFE8Y=",
       "dev": true,
       "requires": {
         "loader-utils": "^1.0.2",
@@ -10433,7 +10433,7 @@
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
       "requires": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
@@ -10687,7 +10687,7 @@
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -11483,7 +11483,7 @@
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
       "requires": {
         "isexe": "^2.0.0"
       }
@@ -11496,7 +11496,7 @@
     "wide-align": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
       "requires": {
         "string-width": "^1.0.2 || 2"
       }
diff --git a/spec/lib/queries/taxon_name/tabular_spec.rb b/spec/lib/queries/taxon_name/tabular_spec.rb
index 0ebf39f1ff..0af3cb96e3 100644
--- a/spec/lib/queries/taxon_name/tabular_spec.rb
+++ b/spec/lib/queries/taxon_name/tabular_spec.rb
@@ -1,22 +1,142 @@
 require 'rails_helper'
 
 describe Queries::TaxonName::Tabular, type: :model, group: [:nomenclature] do
-  let(:root) { FactoryBot.create(:root_taxon_name) }
-  let(:genus) { Protonym.create!(name: 'Erasmoneura', rank_class: Ranks.lookup(:iczn, :genus), parent: root) }
+  let!(:root) { FactoryBot.create(:root_taxon_name) }
+  let!(:genus) { Protonym.create!(name: 'Erasmoneura', rank_class: Ranks.lookup(:iczn, :genus), parent: root) }
+  let!(:genus1) { Protonym.create!(name: 'Erasmoneuraa', rank_class: Ranks.lookup(:iczn, :genus), parent: root) }
+  let!(:tr1) {TaxonNameRelationship.create!(subject_taxon_name: genus1, object_taxon_name: genus, type: 'TaxonNameRelationship::Iczn::Invalidating::Usage::Misspelling')}
   let!(:species1) { Protonym.create!(name: 'alpha', rank_class: Ranks.lookup(:iczn, :species), parent: genus) }
-  let!(:species2) { Protonym.create!(name: 'betta', rank_class: Ranks.lookup(:iczn, :species), parent: genus) }
+  let!(:species2) { Protonym.create!(name: 'beta', rank_class: Ranks.lookup(:iczn, :species), parent: genus) }
+  let!(:species3) { Protonym.create!(name: 'gamma', rank_class: Ranks.lookup(:iczn, :species), parent: genus) }
+  let!(:tr2) {TaxonNameRelationship.create!(subject_taxon_name: species3, object_taxon_name: species2, type: 'TaxonNameRelationship::Iczn::Invalidating::Synonym')}
+  let!(:combination) { Combination.create!(genus: genus1, species: species2)}
+  let!(:otu1) {Otu.create!(name: 'otu1', taxon_name: species1)}
+  let!(:otu2) {Otu.create!(name: 'otu2', taxon_name: species1)}
+  let!(:otu3) {Otu.create!(taxon_name: species2)}
+  let(:observation_matrix) { ObservationMatrix.create!(name: 'Matrix') }
+  let(:descriptor1) { Descriptor::Working.create!(name: 'working1') }
 
-  let(:query) { Queries::TaxonName::Tabular.new } 
+  let(:query) { Queries::TaxonName::Tabular.new }
 
-  specify '#number_of_species' do
-    query.ancestor_id = genus.id.to_s 
+  specify '#column_headers: nomenclatural_stats' do
+    query.ancestor_id = genus.id.to_s
     query.ranks = ['genus', 'species']
     query.rank_data =  ['genus', 'species']
     query.fieldsets = ['nomenclatural_stats']
-    query.validity = true
-    
+    query.validity = false
+    query.combinations = true
+    query.project_id = genus.project_id.to_s
+
+    query.build_query
+    expect(query.column_headers.include? 'valid_genus').to be_truthy
+    expect(query.column_headers.include? 'invalid_genus').to be_truthy
+    expect(query.column_headers.include? 'valid_species').to be_truthy
+    expect(query.column_headers.include? 'invalid_species').to be_truthy
+    expect(query.column_headers.include? 'valid_tribe').to be_falsey
+    expect(query.column_headers.include? 'combination').to be_trythy
+    expect(query.column_headers.include? 'valid_combination').to be_falsey
+    expect(query.column_headers.include? 'invalid_combination').to be_falsey
+    expect(query.column_headers.include? 'otu_id').to be_falsey
+    expect(query.column_headers.include? 'otu').to be_falsey
+    expect(query.column_headers.include? 'observation_count').to be_falsey
+    expect(query.column_headers.include? 'observation_depictions').to be_falsey
+    expect(query.column_headers.include? 'descriptors_scored').to be_falsey
+  end
+
+  specify '#column_headers: observations' do
+    query.ancestor_id = genus.id.to_s
+    query.ranks = ['genus', 'species']
+    query.rank_data =  ['genus', 'species']
+    query.fieldsets = ['observations']
+    query.validity = false
+    query.combinations = true
+    query.project_id = genus.project_id.to_s
+
+    query.build_query
+    expect(query.column_headers.include? 'valid_genus').to be_truthy
+    expect(query.column_headers.include? 'invalid_genus').to be_truthy
+    expect(query.column_headers.include? 'valid_species').to be_truthy
+    expect(query.column_headers.include? 'invalid_species').to be_truthy
+    expect(query.column_headers.include? 'valid_tribe').to be_falsey
+    expect(query.column_headers.include? 'combination').to be_falsey
+    expect(query.column_headers.include? 'valid_combination').to be_falsey
+    expect(query.column_headers.include? 'invalid_combination').to be_falsey
+    expect(query.column_headers.include? 'otu_id').to be_truthy
+    expect(query.column_headers.include? 'otu').to be_truthy
+    expect(query.column_headers.include? 'observation_count').to be_truthy
+    expect(query.column_headers.include? 'observation_depictions').to be_truthy
+    expect(query.column_headers.include? 'descriptors_scored').to be_truthy
+  end
+
+  specify '#number_of_species: nomenclature stats' do
+    query.ancestor_id = genus.id.to_s
+    query.ranks = ['genus', 'species']
+    query.rank_data =  ['genus', 'species']
+    query.fieldsets = ['nomenclatural_stats']
+    query.validity = false
+    query.combinations = true
+    query.project_id = genus.project_id.to_s
+
     query.build_query
-    expect(query.all.first['valid_species']).to eq(2)
+    expect(query.all.count).to eq(3)
+
+    expect(query.all[0]['cached']).to eq('Erasmoneura')
+    expect(query.all[0]['valid_genus']).to eq(1)
+    expect(query.all[0]['invalid_genus']).to eq(1)
+    expect(query.all[0]['valid_species']).to eq(2)
+    expect(query.all[0]['invalid_species']).to eq(1)
+    expect(query.all[0]['combination']).to eq(1)
+
+    expect(query.all[1]['cached']).to eq('Erasmoneura alpha')
+    expect(query.all[1]['valid_genus'].nil?).to be_truthy
+    expect(query.all[1]['invalid_genus'].nil?).to be_truthy
+    expect(query.all[1]['valid_species']).to eq(1)
+    expect(query.all[1]['invalid_species'].nil?).to be_truthy
+    expect(query.all[1]['combination'].nil?).to be_truthy
+
+    expect(query.all[2]['cached']).to eq('Erasmoneura beta')
+    expect(query.all[2]['valid_genus'].nil?).to be_truthy
+    expect(query.all[2]['invalid_genus'].nil?).to be_truthy
+    expect(query.all[2]['valid_species']).to eq(1)
+    expect(query.all[2]['invalid_species']).to eq(1)
+    expect(query.all[2]['combination']).to eq(1)
+  end
+
+  specify '#number_of_species: observations' do
+    observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
+    observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu1)
+
+    query.ancestor_id = genus.id.to_s
+    query.ranks = ['genus', 'species']
+    query.rank_data =  ['genus', 'species']
+    query.fieldsets = ['observations']
+    query.validity = false
+    query.combinations = true
+    query.project_id = genus.project_id.to_s
+
+    query.build_query
+    expect(query.all.count).to eq(3)
+
+    expect(query.all[0]['cached']).to eq('Erasmoneura')
+    expect(query.all[0]['valid_genus']).to eq(1)
+    expect(query.all[0]['invalid_genus']).to eq(1)
+    expect(query.all[0]['valid_species']).to eq(2)
+    expect(query.all[0]['invalid_species']).to eq(1)
+    expect(query.all[0]['combination']).to eq(1)
+
+    expect(query.all[1]['cached']).to eq('Erasmoneura alpha')
+    expect(query.all[1]['valid_genus'].nil?).to be_truthy
+    expect(query.all[1]['invalid_genus'].nil?).to be_truthy
+    expect(query.all[1]['valid_species']).to eq(1)
+    expect(query.all[1]['invalid_species'].nil?).to be_truthy
+    expect(query.all[1]['combination'].nil?).to be_truthy
+
+    expect(query.all[2]['cached']).to eq('Erasmoneura beta')
+    expect(query.all[2]['valid_genus'].nil?).to be_truthy
+    expect(query.all[2]['invalid_genus'].nil?).to be_truthy
+    expect(query.all[2]['valid_species']).to eq(1)
+    expect(query.all[2]['invalid_species']).to eq(1)
+    expect(query.all[2]['combination']).to eq(1)
   end
 
 end

From 202e08c2c59205ee925b99800b7628b9d11febae Mon Sep 17 00:00:00 2001
From: Dmitry Dmitriev <arboridia@gmail.com>
Date: Thu, 23 Jul 2020 15:26:53 -0500
Subject: [PATCH 59/76] Nomanclature stats and observations query specs. Cover
 several issues in GitHub.

---
 package-lock.json                           | 14 ++---
 spec/lib/queries/taxon_name/tabular_spec.rb | 66 ++++++++++++++-------
 2 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8c0fff6253..7f7a28e415 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1109,9 +1109,9 @@
       "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
     },
     "@vue/component-compiler-utils": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz",
-      "integrity": "sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz",
+      "integrity": "sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==",
       "dev": true,
       "requires": {
         "consolidate": "^0.15.1",
@@ -3118,7 +3118,7 @@
     "consolidate": {
       "version": "0.15.1",
       "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
-      "integrity": "sha1-IasEMjXHGgfUXZqtmFk7DbpWurc=",
+      "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
       "dev": true,
       "requires": {
         "bluebird": "^3.1.1"
@@ -5787,7 +5787,7 @@
     "ini": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc="
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
     "internal-ip": {
       "version": "4.3.0",
@@ -6551,7 +6551,7 @@
     "merge-source-map": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha1-L93n5gIJOfcJBqaPLXrmheTIxkY=",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
       "dev": true,
       "requires": {
         "source-map": "^0.6.1"
@@ -6560,7 +6560,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
diff --git a/spec/lib/queries/taxon_name/tabular_spec.rb b/spec/lib/queries/taxon_name/tabular_spec.rb
index 0af3cb96e3..3cc39fe7e9 100644
--- a/spec/lib/queries/taxon_name/tabular_spec.rb
+++ b/spec/lib/queries/taxon_name/tabular_spec.rb
@@ -14,7 +14,9 @@
   let!(:otu2) {Otu.create!(name: 'otu2', taxon_name: species1)}
   let!(:otu3) {Otu.create!(taxon_name: species2)}
   let(:observation_matrix) { ObservationMatrix.create!(name: 'Matrix') }
-  let(:descriptor1) { Descriptor::Working.create!(name: 'working1') }
+  let(:descriptor1) { Descriptor::Continuous.create!(name: 'descriptor1') }
+  let(:descriptor2) { Descriptor::Media.create!(name: 'descriptor2') }
+  let(:image_file) { fixture_file_upload( Spec::Support::Utilities::Files.generate_png, 'image/png') }
 
   let(:query) { Queries::TaxonName::Tabular.new }
 
@@ -28,14 +30,16 @@
     query.project_id = genus.project_id.to_s
 
     query.build_query
+    expect(query.column_headers.include? 'valid_tribe').to be_falsey
     expect(query.column_headers.include? 'valid_genus').to be_truthy
     expect(query.column_headers.include? 'invalid_genus').to be_truthy
     expect(query.column_headers.include? 'valid_species').to be_truthy
     expect(query.column_headers.include? 'invalid_species').to be_truthy
-    expect(query.column_headers.include? 'valid_tribe').to be_falsey
+    # do not breack combinations into valid and invalid, make a single column
     expect(query.column_headers.include? 'combination').to be_trythy
     expect(query.column_headers.include? 'valid_combination').to be_falsey
     expect(query.column_headers.include? 'invalid_combination').to be_falsey
+    #otus should be excluded from nomenclature stats, but included in observations
     expect(query.column_headers.include? 'otu_id').to be_falsey
     expect(query.column_headers.include? 'otu').to be_falsey
     expect(query.column_headers.include? 'observation_count').to be_falsey
@@ -53,11 +57,11 @@
     query.project_id = genus.project_id.to_s
 
     query.build_query
+    expect(query.column_headers.include? 'valid_tribe').to be_falsey
     expect(query.column_headers.include? 'valid_genus').to be_truthy
     expect(query.column_headers.include? 'invalid_genus').to be_truthy
     expect(query.column_headers.include? 'valid_species').to be_truthy
     expect(query.column_headers.include? 'invalid_species').to be_truthy
-    expect(query.column_headers.include? 'valid_tribe').to be_falsey
     expect(query.column_headers.include? 'combination').to be_falsey
     expect(query.column_headers.include? 'valid_combination').to be_falsey
     expect(query.column_headers.include? 'invalid_combination').to be_falsey
@@ -78,9 +82,11 @@
     query.project_id = genus.project_id.to_s
 
     query.build_query
+    # 3 is correct, OTUs should not increase the number of taxa
     expect(query.all.count).to eq(3)
 
     expect(query.all[0]['cached']).to eq('Erasmoneura')
+    #number of synonyms for the genus is not displayed
     expect(query.all[0]['valid_genus']).to eq(1)
     expect(query.all[0]['invalid_genus']).to eq(1)
     expect(query.all[0]['valid_species']).to eq(2)
@@ -97,46 +103,62 @@
     expect(query.all[2]['cached']).to eq('Erasmoneura beta')
     expect(query.all[2]['valid_genus'].nil?).to be_truthy
     expect(query.all[2]['invalid_genus'].nil?).to be_truthy
+    #synonyms and combinations for each species are not displayed
     expect(query.all[2]['valid_species']).to eq(1)
     expect(query.all[2]['invalid_species']).to eq(1)
     expect(query.all[2]['combination']).to eq(1)
   end
 
-  specify '#number_of_species: observations' do
-    observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
-    observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu1)
-
+  specify '#number_of_species: nomenclature stats: unavailable' do
+    # all TN with the TaxonNameClassification in the array: TAXON_NAME_CLASS_NAMES_UNAVAILABLE_AND_INVALID
+    # should be excluded from counting of valid names.
+    tc = TaxonNameClassification.create!(taxon_name: species1, type: 'TaxonNameClassification::Iczn::Unavailable::NomenNudum')
     query.ancestor_id = genus.id.to_s
     query.ranks = ['genus', 'species']
     query.rank_data =  ['genus', 'species']
-    query.fieldsets = ['observations']
+    query.fieldsets = ['nomenclatural_stats']
     query.validity = false
     query.combinations = true
     query.project_id = genus.project_id.to_s
 
     query.build_query
+    #otus should not be inluded in the list
     expect(query.all.count).to eq(3)
 
     expect(query.all[0]['cached']).to eq('Erasmoneura')
     expect(query.all[0]['valid_genus']).to eq(1)
     expect(query.all[0]['invalid_genus']).to eq(1)
-    expect(query.all[0]['valid_species']).to eq(2)
-    expect(query.all[0]['invalid_species']).to eq(1)
+    expect(query.all[0]['valid_species']).to eq(1)
+    expect(query.all[0]['invalid_species']).to eq(2) # eq(1) is also OK
     expect(query.all[0]['combination']).to eq(1)
+  end
 
-    expect(query.all[1]['cached']).to eq('Erasmoneura alpha')
-    expect(query.all[1]['valid_genus'].nil?).to be_truthy
-    expect(query.all[1]['invalid_genus'].nil?).to be_truthy
-    expect(query.all[1]['valid_species']).to eq(1)
-    expect(query.all[1]['invalid_species'].nil?).to be_truthy
-    expect(query.all[1]['combination'].nil?).to be_truthy
+  specify '#number_of_species: observations' do
+    observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
+    observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
+    observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu1)
+    o1 = Observation.create!(otu: otu1, descriptor: descriptor1, continuous_value: 5)
+    o2 = Observation.create!(otu: otu1, descriptor: descriptor2)
+    d = Depiction.create!(depiction_object: o2, image_attributes: {image_file: image_file})
 
-    expect(query.all[2]['cached']).to eq('Erasmoneura beta')
-    expect(query.all[2]['valid_genus'].nil?).to be_truthy
-    expect(query.all[2]['invalid_genus'].nil?).to be_truthy
-    expect(query.all[2]['valid_species']).to eq(1)
-    expect(query.all[2]['invalid_species']).to eq(1)
-    expect(query.all[2]['combination']).to eq(1)
+    query.ancestor_id = genus.id.to_s
+    query.ranks = ['genus', 'species']
+    query.rank_data =  ['genus', 'species']
+    query.fieldsets = ['observations']
+    query.validity = true
+    query.combinations = true
+    query.project_id = genus.project_id.to_s
+
+    query.build_query
+    # 4 is correct, because each OTU is listed as a separate line
+    expect(query.all.count).to eq(4)
+
+    expect(query.all[1]['cached']).to eq('Erasmoneura alpha')
+    expect(query.all[1]['otu_name']).to eq('otu1')
+    expect(query.all[1]['observation_count']).to eq(2)
+    #att the moment all depictions go to the "descriptors_scored" column
+    expect(query.all[1]['observation_depictions']).to eq(1)
+    expect(query.all[1]['descriptors_scored']).to eq(1)
   end
 
 end

From 7d9d8e4a0222dd6999fab61c394069dbe3f92886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 24 Jul 2020 13:06:55 -0300
Subject: [PATCH 60/76] Pin objects from list in filter source

---
 CHANGELOG.md                                             | 1 +
 .../vue/tasks/sources/filter/components/list.vue         | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fcc0b12b7..3aa2447543 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 
 ### Changed
 - Cleanup and add spec basis for nomenclature tabular stats queries  
diff --git a/app/javascript/vue/tasks/sources/filter/components/list.vue b/app/javascript/vue/tasks/sources/filter/components/list.vue
index 012d9048cf..8cde58b908 100644
--- a/app/javascript/vue/tasks/sources/filter/components/list.vue
+++ b/app/javascript/vue/tasks/sources/filter/components/list.vue
@@ -57,6 +57,11 @@
           </td>
           <td>
             <div class="horizontal-left-content">
+              <pin-component
+                class="button button-circle"
+                :object-id="item.id"
+                type="Source"
+              />
               <radial-annotator :global-id="item.global_id"/>
               <radial-navigation :global-id="item.global_id"/>
             </div>
@@ -74,6 +79,7 @@ import RadialAnnotator from 'components/radials/annotator/annotator'
 import TagAll from 'tasks/collection_objects/filter/components/tagAll'
 import PdfButton from 'components/pdfButton'
 import AddToProject from 'components/addToProjectSource'
+import PinComponent from 'components/pin.vue'
 
 export default {
   components: {
@@ -81,7 +87,8 @@ export default {
     RadialAnnotator,
     PdfButton,
     TagAll,
-    AddToProject
+    AddToProject,
+    PinComponent
   },
   props: {
     list: {

From 2ff44d7a2ffb4fba7db139452a35ca5c4a29d884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 24 Jul 2020 15:25:45 -0300
Subject: [PATCH 61/76] Checkbox to make document public on list in radial
 annotator

---
 CHANGELOG.md                                  |   1 +
 .../components/documentation_annotator.vue    | 189 +++++++++++-------
 2 files changed, 115 insertions(+), 75 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3aa2447543..e8c2675d4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 
 ### Changed
 - Cleanup and add spec basis for nomenclature tabular stats queries  
diff --git a/app/javascript/vue/components/radials/annotator/components/documentation_annotator.vue b/app/javascript/vue/components/radials/annotator/components/documentation_annotator.vue
index 14ad9620ee..e8fc132b87 100644
--- a/app/javascript/vue/components/radials/annotator/components/documentation_annotator.vue
+++ b/app/javascript/vue/components/radials/annotator/components/documentation_annotator.vue
@@ -3,7 +3,8 @@
     <div class="separate-bottom">
       <div class="switch-radio">
         <template
-        v-for="(item, index) in optionList">
+          v-for="(item, index) in optionList"
+        >
           <input
             v-model="display"
             :value="index"
@@ -14,7 +15,8 @@
           >
           <label
             :for="`alternate_values-picker-${index}`"
-            class="capitalize">{{ item }}</label>
+            class="capitalize"
+          >{{ item }}</label>
         </template>
       </div>
     </div>
@@ -22,13 +24,15 @@
       <label>
         <input
           v-model="isPublic"
-          type="checkbox">
-          Is public?
+          type="checkbox"
+        >
+        Is public?
       </label>
     </div>
     <div
       class="field"
-      v-if="display == 0">
+      v-if="display == 0"
+    >
       <dropzone
         class="dropzone-card"
         @vdropzone-sending="sending"
@@ -37,7 +41,8 @@
         id="figure"
         url="/documentation"
         :use-custom-dropzone-options="true"
-        :dropzone-options="dropzone"/>
+        :dropzone-options="dropzone"
+      />
     </div>
 
     <div v-if="display == 1">
@@ -48,94 +53,128 @@
         min="2"
         placeholder="Select a document"
         @getItem="documentation.document_id = $event.id"
-        param="term"/>
+        param="term"
+      />
       <button
         @click="createNew()"
         :disabled="!validateFields"
         class="button button-submit normal-input separate-bottom"
-        type="button">Create
+        type="button"
+      >
+        Create
       </button>
     </div>
 
-    <table-list
-      :attributes="[['document', 'object_tag'], 'updated_at']"
-      :header="['Filename', 'Updated at', '']"
-      :list="list"
-      :pdf="true"
-      download="document.file_url"
-      @delete="removeItem"
-      class="list"/>
+    <table>
+      <thead>
+        <tr>
+          <th>Filename</th>
+          <th>Is public</th>
+          <th>Updated at</th>
+          <th />
+        </tr>
+      </thead>
+      <tbody>
+        <tr v-for="(item, index) in list">
+          <td><span v-html="item.document.object_tag" /></td>
+          <td>
+            <input
+              type="checkbox"
+              :checked="item.document.is_public"
+              @click="changeIsPublicState(index, item)"
+            >
+          </td>
+          <td>{{ item.updated_at }}</td>
+          <td>
+            <div class="horizontal-right-content">
+              <radial-annotator :global-id="item.global_id"/>
+              <pdf-button :pdf="item.document"/>
+              <span
+                class="button circle-button btn-delete"
+                @click="removeItem(item)"/>
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
   </div>
 </template>
 <script>
 
-  import CRUD from '../request/crud.js'
-  import annotatorExtend from '../components/annotatorExtend.js'
-  import Autocomplete from 'components/autocomplete.vue'
-  import Dropzone from 'components/dropzone.vue'
-  import TableList from 'components/table_list.vue'
+import CRUD from '../request/crud.js'
+import annotatorExtend from '../components/annotatorExtend.js'
+import Autocomplete from 'components/autocomplete.vue'
+import Dropzone from 'components/dropzone.vue'
+import PdfButton from 'components/pdfButton.vue'
+import RadialAnnotator from 'components/radials/annotator/annotator'
 
-  export default {
-    mixins: [CRUD, annotatorExtend],
-    components: {
-      TableList,
-      Autocomplete,
-      Dropzone
-    },
-    computed: {
-      validateFields() {
-        return this.documentation.document_id
+export default {
+  mixins: [CRUD, annotatorExtend],
+  components: {
+    RadialAnnotator,
+    Autocomplete,
+    PdfButton,
+    Dropzone
+  },
+  computed: {
+    validateFields () {
+      return this.documentation.document_id
+    }
+  },
+  data: function () {
+    return {
+      display: 0,
+      optionList: ['drop', 'pick', 'pinboard'],
+      list: [],
+      documentation: this.newDocumentation(),
+      isPublic: undefined,
+      dropzone: {
+        timeout: 0,
+        paramName: 'documentation[document_attributes][document_file]',
+        url: '/documentation',
+        headers: {
+          'X-CSRF-Token': document.querySelector('meta[name="csrf-token"]').getAttribute('content')
+        },
+        dictDefaultMessage: 'Drop documents here',
+        acceptedFiles: 'application/pdf, text/plain'
       }
-    },
-    data: function () {
+    }
+  },
+  created () {
+    this.$options.components['RadialAnnotator'] = RadialAnnotator
+  },
+  methods: {
+    newDocumentation () {
       return {
-        display: 0,
-        optionList: ['drop', 'pick', 'pinboard'],
-        list: [],
-        documentation: this.newDocumentation(),
-        isPublic: undefined,
-        dropzone: {
-          timeout: 0,
-          paramName: 'documentation[document_attributes][document_file]',
-          url: '/documentation',
-          headers: {
-            'X-CSRF-Token': document.querySelector('meta[name="csrf-token"]').getAttribute('content')
-          },
-          dictDefaultMessage: 'Drop documents here',
-          acceptedFiles: 'application/pdf, text/plain'
-        }
+        document_id: null,
+        annotated_global_entity: decodeURIComponent(this.globalId)
       }
     },
-    methods: {
-      newDocumentation() {
-        return {
-          document_id: null,
-          annotated_global_entity: decodeURIComponent(this.globalId)
-        }
-      },
-      createNew() {
-        this.create('/documentation', {documentation: this.documentation}).then(response => {
-          this.list.push(response.body)
-          this.documentation = this.newDocumentation()
-        })
-      },
-      'success': function (file, response) {
-        this.list.push(response)
-        this.$refs.figure.removeFile(file)
-      },
-      'sending': function (file, xhr, formData) {
-        formData.append('documentation[annotated_global_entity]', decodeURIComponent(this.globalId))
-        if (this.isPublic)
-          formData.append('documentation[document_attributes][is_public]', this.isPublic)
-      },
-      updateFigure() {
-        this.update(`/depictions/${this.depiction.id}`, this.depiction).then(response => {
-          this.$set(this.list, this.list.findIndex(element => this.depiction.id == element.id), response.body)
-          this.depiction = undefined
-        })
+    createNew () {
+      this.create('/documentation', { documentation: this.documentation }).then(response => {
+        this.list.push(response.body)
+        this.documentation = this.newDocumentation()
+      })
+    },
+    success: function (file, response) {
+      this.list.push(response)
+      this.$refs.figure.removeFile(file)
+    },
+    sending: function (file, xhr, formData) {
+      formData.append('documentation[annotated_global_entity]', decodeURIComponent(this.globalId))
+      if (this.isPublic) { formData.append('documentation[document_attributes][is_public]', this.isPublic) }
+    },
+    changeIsPublicState (index, documentation) {
+      const data = {
+        id: documentation.document_id,
+        is_public: !documentation.document.is_public
       }
+      this.update(`/documents/${data.id}.json`, { document: data }).then(response => {
+        this.list[index].is_public = response.body.is_public
+      })
     }
   }
+}
 </script>
 <style lang="scss">
   .radial-annotator {

From f3f767dd0d2deff006e585f7850d40f4ce0df2ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Tue, 28 Jul 2020 18:20:36 -0300
Subject: [PATCH 62/76] Added missing dependency for docker image

---
 Dockerfile             | 1 +
 Dockerfile.development | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 8a6d91683a..df2fe5e2b5 100644
--- 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
index 3f934d6d15..b127c8d0b2 100644
--- 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/*

From 832beb46314fe3e0f0278b944d5323a7ae0b18cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Tue, 28 Jul 2020 18:23:10 -0300
Subject: [PATCH 63/76] Update CHANGELOG.md [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8c2675d4d..cec56fe546 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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

From 65a563a60dffd5019a669474efa81959ed7a600e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Jul 2020 20:57:09 +0000
Subject: [PATCH 64/76] Bump elliptic from 6.5.2 to 6.5.3

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7f7a28e415..bc2c539491 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3936,9 +3936,9 @@
       "integrity": "sha512-yWh1otcs3OKUWDvu/IxyI36ZI3WNaRZlI0uG/DK6fu0pap0VYZ0J5pEGTk1zakme+hT0OKHwhlHc0N5TJhY6yQ=="
     },
     "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
       "requires": {
         "bn.js": "^4.4.0",
         "brorand": "^1.0.1",

From 317a04b91a64b8ef28386137d26650384a08ab70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Thu, 30 Jul 2020 14:02:41 -0300
Subject: [PATCH 65/76] Added title legend for make default icon in pinboard
 slide

---
 app/assets/javascripts/workbench/pinboard.js | 3 ++-
 app/helpers/pinboard_items_helper.rb         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/workbench/pinboard.js b/app/assets/javascripts/workbench/pinboard.js
index e97a6b4825..499666c652 100644
--- 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/helpers/pinboard_items_helper.rb b/app/helpers/pinboard_items_helper.rb
index 2e3825c21d..6c69e756e2 100644
--- 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
 

From 83789558a0dd68af4a53df75348b99b2adcb8983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Thu, 30 Jul 2020 14:36:06 -0300
Subject: [PATCH 66/76] Update CHANGELOG.md [skip ci]

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cec56fe546..bd6117078f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 
 ### Changed
 - Cleanup and add spec basis for nomenclature tabular stats queries  

From f7661f4fbed19862543781f506dfb167b1751251 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Thu, 30 Jul 2020 14:04:11 -0500
Subject: [PATCH 67/76] Add author_ids_or param

---
 lib/queries/source/filter.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/queries/source/filter.rb b/lib/queries/source/filter.rb
index a2d439d42b..5374b6e85a 100644
--- a/lib/queries/source/filter.rb
+++ b/lib/queries/source/filter.rb
@@ -24,6 +24,9 @@ class Filter < Queries::Query
       # @params author [Array of Integer, Person#id]
       attr_accessor :author_ids
 
+      # @params author [Boolean, nil]
+      attr_accessor :author_ids_or
+
       # @params author [Array of Integer, Topic#id]
       attr_accessor :topic_ids
 
@@ -86,6 +89,9 @@ def initialize(params)
         
         @author = params[:author]
         @author_ids = params[:author_ids] || []
+
+        @author_ids_or = (params[:author_ids_or]&.downcase == 'true' ? true : false) if !params[:author_ids_or].nil?
+
         @topic_ids = params[:topic_ids] || []
         @citation_object_type = params[:citation_object_type] || []
         @citations = (params[:citations]&.downcase == 'true' ? true : false) if !params[:citations].nil?
@@ -169,7 +175,12 @@ def author_ids_facet
         )
 
         e = c[:id].not_eq(nil)
-        f = c[:person_id].eq_any(author_ids)
+   
+        if author_ids_or 
+          f = c[:person_id].eq_any(author_ids)
+        else
+          f = c[:person_id].eq_all(author_ids)
+        end
 
         b = b.where(e.and(f))
         b = b.group(a['id'])

From f19e8c5063476bbbea58ea2b0de66dcab5fc8ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Thu, 30 Jul 2020 16:20:26 -0300
Subject: [PATCH 68/76] Added OR/AND filter

---
 CHANGELOG.md                                               | 1 +
 app/controllers/sources_controller.rb                      | 1 +
 .../vue/tasks/sources/filter/components/filter.vue         | 1 +
 .../tasks/sources/filter/components/filters/authors.vue    | 7 +++++++
 .../vue/tasks/sources/filter/components/filters/date.vue   | 2 ++
 5 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd6117078f..fdc1a28573 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 
 ### Changed
 - Cleanup and add spec basis for nomenclature tabular stats queries  
diff --git a/app/controllers/sources_controller.rb b/app/controllers/sources_controller.rb
index 5aaaebdc41..b9d7b6ad12 100644
--- 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,
diff --git a/app/javascript/vue/tasks/sources/filter/components/filter.vue b/app/javascript/vue/tasks/sources/filter/components/filter.vue
index 1c8313af48..353b8fadd9 100644
--- a/app/javascript/vue/tasks/sources/filter/components/filter.vue
+++ b/app/javascript/vue/tasks/sources/filter/components/filter.vue
@@ -146,6 +146,7 @@ export default {
           page: 1
         },
         source: {
+          author_ids_or: undefined,
           query_term: undefined,
           author: undefined,
           exact_author: undefined,
diff --git a/app/javascript/vue/tasks/sources/filter/components/filters/authors.vue b/app/javascript/vue/tasks/sources/filter/components/filters/authors.vue
index f55de22d0b..5dbd91222b 100644
--- a/app/javascript/vue/tasks/sources/filter/components/filters/authors.vue
+++ b/app/javascript/vue/tasks/sources/filter/components/filters/authors.vue
@@ -23,6 +23,12 @@
           roles: ['SourceAuthor', 'SourceEditor']
         }"
         @selected="addAuthor"/>
+      <label>
+        <input
+          v-model="source.author_ids_or"
+          type="checkbox">
+        Any
+      </label>
     </fieldset>
     <display-list
       :list="authors"
@@ -84,6 +90,7 @@ export default {
     const params = URLParamsToJSON(location.href)
     this.source.author = params.author
     this.source.exact_author = params.exact_author
+    this.source.author_ids_or = params.author_ids_or
     if (params.author_ids) {
       params.author_ids.forEach(id => {
         GetPeople(id).then(response => {
diff --git a/app/javascript/vue/tasks/sources/filter/components/filters/date.vue b/app/javascript/vue/tasks/sources/filter/components/filters/date.vue
index 7e82356131..a3aacbcdf8 100644
--- a/app/javascript/vue/tasks/sources/filter/components/filters/date.vue
+++ b/app/javascript/vue/tasks/sources/filter/components/filters/date.vue
@@ -6,6 +6,7 @@
         <label>Start year</label>
         <input
           type="text"
+          class="full_width"
           :maxlength="4"
           v-model="source.year_start">
       </div>
@@ -14,6 +15,7 @@
         <input
           type="text"
           :maxlength="4"
+          class="full_width"
           v-model="source.year_end">
       </div>
     </div>

From 5a7939f208ac2285ed8ffb1817aeecd148cdd92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Thu, 30 Jul 2020 19:45:40 -0300
Subject: [PATCH 69/76] Fix #1635

---
 CHANGELOG.md                                  |   2 +
 .../components/sqed/layouts/lep_stage2.vue    | 117 ++++++++++++++++++
 2 files changed, 119 insertions(+)
 create mode 100644 app/javascript/vue/tasks/images/new_image/components/sqed/layouts/lep_stage2.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdc1a28573..b501569d82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
 - Cleanup and add spec basis for nomenclature tabular stats queries  
@@ -57,6 +58,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 [#1622]: https://github.com/SpeciesFileGroup/taxonworks/issues/1622
 [#1627]: https://github.com/SpeciesFileGroup/taxonworks/issues/1627
 [#1628]: https://github.com/SpeciesFileGroup/taxonworks/issues/1628
+[#1635]: https://github.com/SpeciesFileGroup/taxonworks/issues/1635
 
 ## [0.12.12] - 2020-07-22
 
diff --git a/app/javascript/vue/tasks/images/new_image/components/sqed/layouts/lep_stage2.vue b/app/javascript/vue/tasks/images/new_image/components/sqed/layouts/lep_stage2.vue
new file mode 100644
index 0000000000..367aed8eae
--- /dev/null
+++ b/app/javascript/vue/tasks/images/new_image/components/sqed/layouts/lep_stage2.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="lep_stage2">
+    <div class="horizontal-left-content row">
+      <div class="section-box box-0">
+        <select-component
+          :layout-types="layoutTypes"
+          v-model="newType[0]"/>
+      </div>
+      <div class="section-box box-1">
+        <select-component
+          :layout-types="layoutTypes"
+          v-model="newType[1]"/>
+      </div>
+      <div class="section-box box-2">
+        <select-component
+          :layout-types="layoutTypes"
+          v-model="newType[2]"/>
+      </div>
+    </div>
+    <div class="horizontal-left-content">
+      <div class="section-box box-double-size box-6">
+        <select-component
+          :layout-types="layoutTypes"
+          v-model="newType[6]"/>
+      </div>
+      <div>
+        <div class="section-box box-5">
+          <select-component
+            :layout-types="layoutTypes"
+            v-model="newType[5]"/>
+        </div>
+        <div class="section-box box-4">
+          <select-component
+            :layout-types="layoutTypes"
+            v-model="newType[4]"/>
+        </div>
+      </div>
+      <div class="section-box box-3">
+        <select-component
+          :layout-types="layoutTypes"
+          v-model="newType[3]"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import Layout from './shared/layout.js'
+
+export default {
+  mixins: [Layout],
+}
+</script>
+
+<style lang="scss">
+  .lep_stage2 {
+    .section-box {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 200px;
+      height: 150px;
+      padding: 30px;
+      border: 1px solid gray;
+      border-radius: 3px;
+      background-color: #FFFFFF;
+    }
+
+    .row {
+      margin-bottom: 10px;
+    }
+
+    .box-0 {
+      margin-right: 5px;
+    }
+
+    .box-1 {
+      margin-right: 5px;
+      margin-left: 5px;
+    }
+
+    .box-6 {
+      height: 372px;
+      margin-right: 5px;
+    }
+
+    .box-2 {
+      margin-left: 5px;
+    }
+
+    .box-3 {
+      height: 372px;
+      width:10px;
+      margin-left: 5px;
+      select {
+        transform: rotate(-90deg);
+      }
+    }
+
+    .box-5 {
+      margin-left: 5px;
+      margin-right: 5px;
+      width: 118px;
+    }
+
+    .box-4 {
+      margin-top: 10px;
+      margin-left: 5px;
+      width: 118px;
+    }
+    .box-double-size {
+      width: 472px;
+      height: 370px;
+    }
+  }
+</style>

From 111bcb002fee4cde8d791e21dfe1e8079893e34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Fri, 31 Jul 2020 10:37:48 -0300
Subject: [PATCH 70/76] Setting unimplemented specs as pending

---
 spec/lib/queries/taxon_name/tabular_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/lib/queries/taxon_name/tabular_spec.rb b/spec/lib/queries/taxon_name/tabular_spec.rb
index 3cc39fe7e9..19b9e215a8 100644
--- a/spec/lib/queries/taxon_name/tabular_spec.rb
+++ b/spec/lib/queries/taxon_name/tabular_spec.rb
@@ -20,7 +20,7 @@
 
   let(:query) { Queries::TaxonName::Tabular.new }
 
-  specify '#column_headers: nomenclatural_stats' do
+  xspecify '#column_headers: nomenclatural_stats' do
     query.ancestor_id = genus.id.to_s
     query.ranks = ['genus', 'species']
     query.rank_data =  ['genus', 'species']
@@ -47,7 +47,7 @@
     expect(query.column_headers.include? 'descriptors_scored').to be_falsey
   end
 
-  specify '#column_headers: observations' do
+  xspecify '#column_headers: observations' do
     query.ancestor_id = genus.id.to_s
     query.ranks = ['genus', 'species']
     query.rank_data =  ['genus', 'species']
@@ -72,7 +72,7 @@
     expect(query.column_headers.include? 'descriptors_scored').to be_truthy
   end
 
-  specify '#number_of_species: nomenclature stats' do
+  xspecify '#number_of_species: nomenclature stats' do
     query.ancestor_id = genus.id.to_s
     query.ranks = ['genus', 'species']
     query.rank_data =  ['genus', 'species']
@@ -109,7 +109,7 @@
     expect(query.all[2]['combination']).to eq(1)
   end
 
-  specify '#number_of_species: nomenclature stats: unavailable' do
+  xspecify '#number_of_species: nomenclature stats: unavailable' do
     # all TN with the TaxonNameClassification in the array: TAXON_NAME_CLASS_NAMES_UNAVAILABLE_AND_INVALID
     # should be excluded from counting of valid names.
     tc = TaxonNameClassification.create!(taxon_name: species1, type: 'TaxonNameClassification::Iczn::Unavailable::NomenNudum')
@@ -133,7 +133,7 @@
     expect(query.all[0]['combination']).to eq(1)
   end
 
-  specify '#number_of_species: observations' do
+  xspecify '#number_of_species: observations' do
     observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor1)
     observation_matrix.observation_matrix_column_items << ObservationMatrixColumnItem::SingleDescriptor.new(descriptor: descriptor2)
     observation_matrix.observation_matrix_row_items << ObservationMatrixRowItem::SingleOtu.new(otu: otu1)

From dec59832cafde02576735c6e895e18591237c885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Fri, 31 Jul 2020 17:02:54 -0300
Subject: [PATCH 71/76] Fix author_ids_or query

---
 lib/queries/source/filter.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/queries/source/filter.rb b/lib/queries/source/filter.rb
index 5374b6e85a..3e41335bf7 100644
--- a/lib/queries/source/filter.rb
+++ b/lib/queries/source/filter.rb
@@ -175,15 +175,11 @@ def author_ids_facet
         )
 
         e = c[:id].not_eq(nil)
-   
-        if author_ids_or 
-          f = c[:person_id].eq_any(author_ids)
-        else
-          f = c[:person_id].eq_all(author_ids)
-        end
+        f = c[:person_id].eq_any(author_ids)
 
         b = b.where(e.and(f))
         b = b.group(a['id'])
+        b = b.having(a['id'].count.eq(author_ids.length)) unless author_ids_or
         b = b.as('z1_')
 
         ::Source.joins(Arel::Nodes::InnerJoin.new(b, Arel::Nodes::On.new(b['id'].eq(o['id']))))

From bb22db5c3b3f9be34d8c563a7585979e8a9e31a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Pereira?= <pepelui@outlook.com>
Date: Fri, 31 Jul 2020 17:05:50 -0300
Subject: [PATCH 72/76] Removed warning message

---
 .../vue/tasks/sources/filter/components/filters/authors.vue      | 1 +
 .../vue/tasks/sources/filter/components/filters/title.vue        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/vue/tasks/sources/filter/components/filters/authors.vue b/app/javascript/vue/tasks/sources/filter/components/filters/authors.vue
index 5dbd91222b..ee2aafee79 100644
--- a/app/javascript/vue/tasks/sources/filter/components/filters/authors.vue
+++ b/app/javascript/vue/tasks/sources/filter/components/filters/authors.vue
@@ -33,6 +33,7 @@
     <display-list
       :list="authors"
       label="object_tag"
+      :delete-warning="false"
       @deleteIndex="removeAuthor"/>
   </div>
 </template>
diff --git a/app/javascript/vue/tasks/sources/filter/components/filters/title.vue b/app/javascript/vue/tasks/sources/filter/components/filters/title.vue
index f43457dd00..f2688e3acd 100644
--- a/app/javascript/vue/tasks/sources/filter/components/filters/title.vue
+++ b/app/javascript/vue/tasks/sources/filter/components/filters/title.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <h2>Keywords</h2>
     <div class="field label-above">
       <label>Search text</label>
       <input

From 6988a82a246756ea25b4c26b166711c39651b669 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Sat, 1 Aug 2020 11:11:16 -0500
Subject: [PATCH 73/76] move from awesome_print to amazing_print

---
 CHANGELOG.md | 1 +
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b501569d82..29136a1aa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
diff --git a/Gemfile b/Gemfile
index 25a13aca0f..2600696194 100644
--- 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
index b2b2b82208..f755de9c46 100644
--- 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)

From 8997398e4b08d25dfe4a54867a4f13bd6fe30631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Mon, 3 Aug 2020 21:08:20 -0300
Subject: [PATCH 74/76] Fix new amazing_print require

---
 spec/rails_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index cc8cf7e775..265efb87c6 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -14,7 +14,7 @@
 ActiveRecord::Migration.check_pending!
 ActiveRecord::Migration.maintain_test_schema!
 
-require 'awesome_print'
+require 'amazing_print'
 require 'rspec/rails'
 require 'spec_helper'
 

From 4e0c1aa0eaae85856ae3c0d2a1dae6e5c8db2727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Tue, 4 Aug 2020 10:19:20 -0300
Subject: [PATCH 75/76] CHANGELOG update [ci-skip]

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29136a1aa2..bf18463a68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - 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
@@ -59,6 +60,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 [#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

From 74b80ba68705932fa520ada8742f5737c7031316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Tue, 4 Aug 2020 14:48:48 -0300
Subject: [PATCH 76/76] Update CHANGELOG for v0.12.13 release [ci skip]

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf18463a68..eb567b5e0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ## [unreleased]
 
+\-
+
+## [0.12.13] - 2020-08-04
+
 ### Added
 - Delete confirmation for original combinations [#1618]
 - Delete confirmation for type specimens in new type specimen task
@@ -299,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