From 80860f18e5d29ee07744b8e1a43b0cf42632c8b8 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Tue, 17 Sep 2024 14:45:56 -0500
Subject: [PATCH 01/25] Remove duplicate validation call

---
 app/models/collecting_event.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models/collecting_event.rb b/app/models/collecting_event.rb
index b9e2bd4c49..31c1753164 100644
--- a/app/models/collecting_event.rb
+++ b/app/models/collecting_event.rb
@@ -256,7 +256,6 @@ class CollectingEvent < ApplicationRecord
     :check_elevation_range,
     :check_min_land_elevation,
     :check_max_land_elevation,
-    :check_date_range,
     :check_ma_range
 
   validates_uniqueness_of :md5_of_verbatim_label, scope: [:project_id], unless: -> { verbatim_label.blank? }

From 009265546e3f41f2ec2806a521b900a93556f4d4 Mon Sep 17 00:00:00 2001
From: Tom Klein <twointofive@gmail.com>
Date: Wed, 18 Sep 2024 09:51:03 -0500
Subject: [PATCH 02/25] Deal with some UI exceptions

---
 .../components/ModalGraph.vue                        |  6 ++++--
 .../composer/components/Properties/NewProperty.vue   | 12 +++++++-----
 .../tasks/sources/new_source/components/bibtex.vue   |  6 ++++--
 .../tasks/sources/new_source/components/crossRef.vue |  4 +++-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/javascript/vue/tasks/biological_associations/biological_associations_graph/components/ModalGraph.vue b/app/javascript/vue/tasks/biological_associations/biological_associations_graph/components/ModalGraph.vue
index ee8975374a..6ed1e2ac43 100644
--- a/app/javascript/vue/tasks/biological_associations/biological_associations_graph/components/ModalGraph.vue
+++ b/app/javascript/vue/tasks/biological_associations/biological_associations_graph/components/ModalGraph.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, nextTick, onMounted } from 'vue'
 import VModal from '@/components/ui/Modal.vue'
 import VBtn from '@/components/ui/VBtn/index.vue'
 
@@ -47,6 +47,8 @@ function handleUpdateName() {
 }
 
 onMounted(() => {
-  inputName.value.focus()
+  nextTick(() => {
+    inputName.value.focus()
+  })
 })
 </script>
diff --git a/app/javascript/vue/tasks/biological_relationships/composer/components/Properties/NewProperty.vue b/app/javascript/vue/tasks/biological_relationships/composer/components/Properties/NewProperty.vue
index 16a061bd71..63ae1deceb 100644
--- a/app/javascript/vue/tasks/biological_relationships/composer/components/Properties/NewProperty.vue
+++ b/app/javascript/vue/tasks/biological_relationships/composer/components/Properties/NewProperty.vue
@@ -90,11 +90,13 @@ export default {
             controlled_vocabulary_term: this.controlVocabularyTerm
           })
 
-      saveRecord.then((response) => {
-        this.$emit('save', response.body)
-        this.showModal = false
-        this.controlVocabularyTerm = this.resetCVT()
-      })
+      saveRecord
+        .then((response) => {
+          this.$emit('save', response.body)
+          this.showModal = false
+          this.controlVocabularyTerm = this.resetCVT()
+        })
+        .catch(() => {})
     },
 
     resetCVT() {
diff --git a/app/javascript/vue/tasks/sources/new_source/components/bibtex.vue b/app/javascript/vue/tasks/sources/new_source/components/bibtex.vue
index faaf3a62d3..c09bf44396 100644
--- a/app/javascript/vue/tasks/sources/new_source/components/bibtex.vue
+++ b/app/javascript/vue/tasks/sources/new_source/components/bibtex.vue
@@ -51,7 +51,7 @@ import setParam from '@/helpers/setParam'
 import { MutationNames } from '../store/mutations/mutations'
 import { ActionNames } from '../store/actions/actions'
 import { Source, Serial } from '@/routes/endpoints'
-import { ref, onMounted } from 'vue'
+import { ref, nextTick, onMounted } from 'vue'
 import { useStore } from 'vuex'
 
 const emit = defineEmits(['close'])
@@ -62,7 +62,9 @@ const textareaRef = ref(null)
 const store = useStore()
 
 onMounted(() => {
-  textareaRef.value.focus()
+  nextTick(() => {
+    textareaRef.value.focus()
+  })
 })
 
 function createSource() {
diff --git a/app/javascript/vue/tasks/sources/new_source/components/crossRef.vue b/app/javascript/vue/tasks/sources/new_source/components/crossRef.vue
index 0d16c3fe15..d1c1d48d19 100644
--- a/app/javascript/vue/tasks/sources/new_source/components/crossRef.vue
+++ b/app/javascript/vue/tasks/sources/new_source/components/crossRef.vue
@@ -100,7 +100,9 @@ export default {
   },
 
   mounted() {
-    this.$refs.textareaRef.focus()
+    this.$nextTick(() => {
+      this.$refs.textareaRef.focus()
+    })
   },
 
   methods: {

From 99c4a83509b00ee20b7944d2d41a23e9dbc6015f Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Wed, 18 Sep 2024 15:43:22 -0500
Subject: [PATCH 03/25] Spec that identifiers are not also recorded as verbatim

---
 spec/models/dataset_record/darwin_core/occurrence_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/models/dataset_record/darwin_core/occurrence_spec.rb b/spec/models/dataset_record/darwin_core/occurrence_spec.rb
index ba5ac951de..43adc5deb8 100644
--- a/spec/models/dataset_record/darwin_core/occurrence_spec.rb
+++ b/spec/models/dataset_record/darwin_core/occurrence_spec.rb
@@ -132,6 +132,10 @@
     it 'attached FieldNumber to CollectingEvent' do
       expect(Identifier::Local::FieldNumber.first.identifier_object).to be_kind_of(CollectingEvent)
     end
+
+    it 'does not populate verbatim fields by default' do
+      expect(CollectingEvent.first.verbatim_trip_identifier).to eq(nil)
+    end
   end
 
   # TODO: Check that `TW:CollectingEvent:verbatim_locality' alone will create a CE (see tsv)

From dec4c03b0c8c38f26373e47092130074c1cebe0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Wed, 18 Sep 2024 18:01:54 -0300
Subject: [PATCH 04/25] Stop populating verbatim_trip_identifier with
 fieldIdentifier data

---
 app/models/dataset_record/darwin_core/occurrence.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/models/dataset_record/darwin_core/occurrence.rb b/app/models/dataset_record/darwin_core/occurrence.rb
index 60be22d575..4a1fcba4fe 100644
--- a/app/models/dataset_record/darwin_core/occurrence.rb
+++ b/app/models/dataset_record/darwin_core/occurrence.rb
@@ -297,7 +297,6 @@ def import(dwc_data_attributes = {})
         #
         #       New rules:
         #         * No overlapping intended meanings, each maps to itself
-        #         * verbatim_trip_identifier should look exactly like the (fully) defined fieldNumber (remember use of virtual attribute in Namespace to render without namespace string)
         #      
         event_id, field_number = get_field_value(:eventID), get_field_value(:fieldNumber)
         collecting_event_identifiers = []
@@ -356,8 +355,6 @@ def import(dwc_data_attributes = {})
           field_number_namespace = Namespace.find_by(Namespace.arel_table[:short_name].matches(field_number_namespace)) # Case insensitive match
           raise DarwinCore::InvalidData.new({ 'TW:Namespace:fieldNumber' => ['Namespace not found'] }) unless field_number_namespace
 
-          verbatim_trip_identifier = "#{field_number_namespace.is_virtual ? '': Identifier::Local.build_cached_prefix(field_number_namespace)}#{field_number}"
-          attributes[:collecting_event][:verbatim_trip_identifier] ||= verbatim_trip_identifier
           identifier_attributes[:namespace] = field_number_namespace
 
           field_number_identifier = Identifier::Local::FieldNumber.find_by(identifier_attributes)

From 578ab802a6abc911b66c9fb35774aa781577f59f Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Wed, 18 Sep 2024 18:35:31 -0300
Subject: [PATCH 05/25] Add new category to new otu task

---
 config/interface/hub/user_tasks.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/interface/hub/user_tasks.yml b/config/interface/hub/user_tasks.yml
index 44fac753c5..3ef505faf9 100644
--- a/config/interface/hub/user_tasks.yml
+++ b/config/interface/hub/user_tasks.yml
@@ -893,6 +893,7 @@ new_otu_task:
   related:
   categories:
     - otu
+    - new
   status: prototype
   description: 'Create one or many OTUs in batch.'
 leads_hub_task:

From 56aa6855b1d0b2e5836cc1f8cef047de31b02594 Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Wed, 18 Sep 2024 18:35:46 -0300
Subject: [PATCH 06/25] Add task links to dwca importer

---
 app/javascript/vue/tasks/dwca_import/app.vue | 160 ++++++++-----------
 1 file changed, 71 insertions(+), 89 deletions(-)

diff --git a/app/javascript/vue/tasks/dwca_import/app.vue b/app/javascript/vue/tasks/dwca_import/app.vue
index e484b46286..757d545f55 100644
--- a/app/javascript/vue/tasks/dwca_import/app.vue
+++ b/app/javascript/vue/tasks/dwca_import/app.vue
@@ -1,122 +1,104 @@
 <template>
   <div>
-    <spinner-component
-      :full-screen="true"
-      legend="Loading records..."
-      v-if="isLoading"
-    />
-    <h1>DwC-A Workbench</h1>
+    <div class="flex-separate middle">
+      <h1>DwC-A Workbench</h1>
+      <ul class="context-menu">
+        <li
+          v-for="{ label, url } in TASK_LINKS"
+          :key="url"
+        >
+          <a :href="url">{{ label }}</a>
+        </li>
+      </ul>
+    </div>
     <template v-if="dataset.id">
       <div class="position-relative">
-        <navbar-component />
-        <request-import />
-        <table-component v-if="!disableStatus.includes(dataset.status)" />
+        <VNavbar />
+        <RequestImport />
+        <VTable v-if="!Object.keys(disableStatus).includes(dataset.status)" />
       </div>
       <import-running />
     </template>
     <template v-else>
-      <new-import @onCreate="loadDataset($event.id)" />
-      <import-list @onSelect="loadDataset" />
+      <NewImport @on-create="loadDataset($event.id)" />
+      <ImportList @on-select="loadDataset" />
     </template>
   </div>
 </template>
 
-<script>
+<script setup>
 import NewImport from './components/NewImport'
 import ImportList from './components/ImportList'
-import TableComponent from './components/table'
-import NavbarComponent from './components/NavBar'
+import VTable from './components/table'
+import VNavbar from './components/NavBar'
 import ImportRunning from './components/ImportRunning'
+import RequestImport from './components/RequestImport'
+import { RouteNames } from '@/routes/routes'
 import { GetterNames } from './store/getters/getters'
 import { MutationNames } from './store/mutations/mutations'
 import { ActionNames } from './store/actions/actions'
-import RequestImport from './components/RequestImport'
 import { disableStatus } from './const/datasetStatus'
+import { computed, onMounted } from 'vue'
+import { useStore } from 'vuex'
 
-import SpinnerComponent from '@/components/ui/VSpinner'
-
-export default {
-  name: 'DWCImporter',
+defineOptions({
+  name: 'DWCImporter'
+})
 
-  components: {
-    NewImport,
-    ImportList,
-    TableComponent,
-    SpinnerComponent,
-    NavbarComponent,
-    RequestImport,
-    ImportRunning
+const TASK_LINKS = [
+  {
+    label: 'New namespace',
+    url: RouteNames.NewNamespace
   },
+  {
+    label: 'Manage controlled vocabulary term',
+    url: RouteNames.ManageControlledVocabularyTask
+  }
+]
 
-  computed: {
-    datasetRecords: {
-      get() {
-        return this.$store.getters[GetterNames.GetDatasetRecords]
-      },
-      set(value) {
-        this.$store.commit(MutationNames.SetDatasetRecords, value)
-      }
-    },
+const store = useStore()
 
-    dataset() {
-      return this.$store.getters[GetterNames.GetDataset]
-    },
+const dataset = computed(() => store.getters[GetterNames.GetDataset])
 
-    pagination: {
-      get() {
-        return this.$store.getters[GetterNames.GetPagination]
-      },
-      set(value) {
-        this.$store.commit(MutationNames.SetPagination, value)
-      }
-    }
+const pagination = computed({
+  get() {
+    return store.getters[GetterNames.GetPagination]
   },
+  set(value) {
+    store.commit(MutationNames.SetPagination, value)
+  }
+})
 
-  data() {
-    return {
-      isLoading: false,
-      disableStatus: Object.keys(disableStatus)
-    }
-  },
+onMounted(() => {
+  const ID = new URLSearchParams(window.location.search).get(
+    'import_dataset_id'
+  )
+  if (ID) {
+    loadDataset(ID)
+  }
+  document.addEventListener('turbolinks:load', () => {
+    window.removeEventListener('scroll', checkScroll)
+  })
+  window.addEventListener('scroll', checkScroll)
+})
 
-  mounted() {
-    const ID = new URLSearchParams(window.location.search).get(
-      'import_dataset_id'
-    )
-    if (ID) {
-      this.loadDataset(ID)
-    }
-    document.addEventListener('turbolinks:load', () => {
-      window.removeEventListener('scroll', this.checkScroll)
-    })
-    window.addEventListener('scroll', this.checkScroll)
-  },
+function loadDataset(id) {
+  store.dispatch(ActionNames.LoadDataset, id).then(() => {
+    store.dispatch(ActionNames.LoadDatasetRecords)
+  })
+}
 
-  methods: {
-    loadDataset(id) {
-      this.$store.dispatch(ActionNames.LoadDataset, id).then(() => {
-        this.$store.dispatch(ActionNames.LoadDatasetRecords)
-      })
-    },
-    checkScroll() {
-      const bottomOfTable =
-        document.documentElement.scrollTop + window.innerHeight >=
-        document.documentElement.offsetHeight
+function checkScroll() {
+  const bottomOfTable =
+    document.documentElement.scrollTop + window.innerHeight >=
+    document.documentElement.offsetHeight
 
-      if (bottomOfTable && this.dataset.id) {
-        if (
-          this.pagination?.nextPage &&
-          this.pagination.nextPage > this.pagination.paginationPage
-        ) {
-          this.$store.dispatch(
-            ActionNames.LoadDatasetRecords,
-            this.pagination.nextPage
-          )
-        }
-      }
-    },
-    unselectAll() {
-      this.selectedIds = []
+  if (bottomOfTable && dataset.value.id) {
+    if (
+      pagination.value?.nextPage &&
+      pagination.value.nextPage > pagination.value.paginationPage
+    ) {
+      store.dispatch(ActionNames.LoadDatasetRecords, pagination.value.nextPage)
     }
   }
 }

From 9e5dd54b9c0968ee55bf42ab613533f58d44412d Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Mon, 23 Sep 2024 09:24:00 -0500
Subject: [PATCH 07/25] Bundle update.

---
 Gemfile.lock | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index da2c42b7ef..711802b164 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -217,7 +217,7 @@ GEM
     drb (2.2.1)
     dropzonejs-rails (0.8.5)
       rails (> 3.1)
-    dwc_agent (3.1.5.0)
+    dwc_agent (3.2.0.0)
       namae (~> 1)
       namecase (~> 2)
     erubi (1.13.0)
@@ -233,8 +233,9 @@ GEM
       railties (>= 5.0.0)
     faker (3.4.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.11.0)
+    faraday (2.12.0)
       faraday-net_http (>= 2.0, < 3.4)
+      json
       logger
     faraday-excon (2.2.0)
       excon (>= 0.109.0)
@@ -427,7 +428,7 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (6.0.1)
-    puma (6.4.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (2.2.9)
@@ -577,7 +578,7 @@ GEM
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.26.1)
+    rubocop-rails (2.26.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
@@ -609,7 +610,7 @@ GEM
       rdoc (>= 5.0)
     seedbank (0.5.0)
       rake (>= 10.0)
-    selenium-webdriver (4.24.0)
+    selenium-webdriver (4.25.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)

From 2a4b8494f0ce98b556e4882f45c0d478fc7a15a3 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Mon, 23 Sep 2024 10:11:57 -0500
Subject: [PATCH 08/25] Add scoping Otu to ObservationMatrix

---
 CHANGELOG.md                                  |  5 ++-
 .../observation_matrices_controller.rb        |  7 ++--
 app/models/observation_matrix.rb              |  9 +++++
 ...923143033_add_otu_to_observation_matrix.rb |  5 +++
 db/schema.rb                                  | 33 ++++++++++---------
 lib/queries/observation_matrix/filter.rb      | 17 +++++++++-
 6 files changed, 57 insertions(+), 19 deletions(-)
 create mode 100644 db/migrate/20240923143033_add_otu_to_observation_matrix.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 587e2a17f5..9b0d55ceb4 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
+
+- `otu_id` to ObservationMatrix, to facilitate setting scope and indexing of multi-entry keys
 
 ## [0.44.0] - 2024-09-17
 
diff --git a/app/controllers/observation_matrices_controller.rb b/app/controllers/observation_matrices_controller.rb
index 52b823078b..3ee5771852 100644
--- a/app/controllers/observation_matrices_controller.rb
+++ b/app/controllers/observation_matrices_controller.rb
@@ -354,7 +354,10 @@ def set_observation_matrix
   end
 
   def observation_matrix_params
-    params.require(:observation_matrix).permit(:name)
+    params.require(:observation_matrix).permit(
+      :name,
+      :otu_id
+    )
   end
 
   def nexus_import_options_params
@@ -468,4 +471,4 @@ def nexus_dimensions_okay(nf)
     false
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/observation_matrix.rb b/app/models/observation_matrix.rb
index bb46a5d4fb..d11d185f14 100644
--- a/app/models/observation_matrix.rb
+++ b/app/models/observation_matrix.rb
@@ -1,5 +1,12 @@
 # A view to a set of Observations.
 #
+# @params otu_id
+#   .the "parent" concept that this key applies to, for example
+#   if this is species concepts it might be a species group, or genus.
+#   Used primarly to index keys.
+# TODO: soft validate that this OTU actually makes sense given the content of the key
+#
+#
 class ObservationMatrix < ApplicationRecord
   include Housekeeping
   include Shared::Citations
@@ -16,6 +23,8 @@ class ObservationMatrix < ApplicationRecord
   validates_presence_of :name
   validates_uniqueness_of :name, scope: [:project_id]
 
+  belongs_to :otu, inverse_of: :observation_matrices
+
   has_many :observation_matrix_column_items, dependent: :delete_all, inverse_of: :observation_matrix
   has_many :observation_matrix_row_items, dependent: :delete_all, inverse_of: :observation_matrix
 
diff --git a/db/migrate/20240923143033_add_otu_to_observation_matrix.rb b/db/migrate/20240923143033_add_otu_to_observation_matrix.rb
new file mode 100644
index 0000000000..a0efec0361
--- /dev/null
+++ b/db/migrate/20240923143033_add_otu_to_observation_matrix.rb
@@ -0,0 +1,5 @@
+class AddOtuToObservationMatrix < ActiveRecord::Migration[7.1]
+  def change
+    add_reference :observation_matrices, :otu, foreign_key: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9c11906465..5899a9da89 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[7.1].define(version: 2024_08_24_190648) do
+ActiveRecord::Schema[7.1].define(version: 2024_09_23_143033) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gin"
   enable_extension "fuzzystrmatch"
@@ -439,8 +439,8 @@
   end
 
   create_table "confidences", id: :serial, force: :cascade do |t|
-    t.string "confidence_object_type", null: false
     t.integer "confidence_object_id", null: false
+    t.string "confidence_object_type", null: false
     t.integer "position", null: false
     t.integer "created_by_id", null: false
     t.integer "updated_by_id", null: false
@@ -672,8 +672,8 @@
   end
 
   create_table "documentation", id: :serial, force: :cascade do |t|
-    t.string "documentation_object_type", null: false
     t.integer "documentation_object_id", null: false
+    t.string "documentation_object_type", null: false
     t.integer "document_id", null: false
     t.integer "project_id", null: false
     t.integer "created_by_id", null: false
@@ -691,7 +691,7 @@
   create_table "documents", id: :serial, force: :cascade do |t|
     t.string "document_file_file_name", null: false
     t.string "document_file_content_type", null: false
-    t.bigint "document_file_file_size", null: false
+    t.integer "document_file_file_size", null: false
     t.datetime "document_file_updated_at", precision: nil, null: false
     t.integer "project_id", null: false
     t.integer "created_by_id", null: false
@@ -900,8 +900,8 @@
     t.string "vernacularName"
     t.string "waterBody"
     t.string "year"
-    t.string "dwc_occurrence_object_type"
     t.integer "dwc_occurrence_object_id"
+    t.string "dwc_occurrence_object_type"
     t.integer "created_by_id", null: false
     t.integer "updated_by_id", null: false
     t.integer "project_id"
@@ -1124,7 +1124,7 @@
     t.datetime "updated_at", precision: nil, null: false
     t.string "image_file_file_name"
     t.string "image_file_content_type"
-    t.bigint "image_file_file_size"
+    t.integer "image_file_file_size"
     t.datetime "image_file_updated_at", precision: nil
     t.integer "updated_by_id", null: false
     t.text "image_file_meta"
@@ -1239,8 +1239,8 @@
     t.integer "project_id", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.string "loan_item_object_type"
     t.integer "loan_item_object_id"
+    t.string "loan_item_object_type"
     t.integer "total"
     t.string "disposition"
     t.index ["created_by_id"], name: "index_loan_items_on_created_by_id"
@@ -1269,7 +1269,7 @@
     t.datetime "updated_at", precision: nil, null: false
     t.string "recipient_honorific"
     t.string "recipient_country"
-    t.text "lender_address", null: false
+    t.text "lender_address", default: "Lender's address not provided.", null: false
     t.boolean "is_gift"
     t.index ["created_by_id"], name: "index_loans_on_created_by_id"
     t.index ["project_id"], name: "index_loans_on_project_id"
@@ -1317,8 +1317,10 @@
     t.integer "project_id"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.bigint "otu_id"
     t.index ["created_by_id"], name: "index_observation_matrices_on_created_by_id"
     t.index ["name"], name: "index_observation_matrices_on_name"
+    t.index ["otu_id"], name: "index_observation_matrices_on_otu_id"
     t.index ["project_id"], name: "index_observation_matrices_on_project_id"
     t.index ["updated_by_id"], name: "index_observation_matrices_on_updated_by_id"
   end
@@ -1465,10 +1467,10 @@
   end
 
   create_table "origin_relationships", id: :serial, force: :cascade do |t|
-    t.string "old_object_type", null: false
     t.integer "old_object_id", null: false
-    t.string "new_object_type", null: false
+    t.string "old_object_type", null: false
     t.integer "new_object_id", null: false
+    t.string "new_object_type", null: false
     t.integer "position"
     t.integer "created_by_id", null: false
     t.integer "updated_by_id", null: false
@@ -1570,8 +1572,8 @@
   end
 
   create_table "pinboard_items", id: :serial, force: :cascade do |t|
-    t.string "pinned_object_type", null: false
     t.integer "pinned_object_id", null: false
+    t.string "pinned_object_type", null: false
     t.integer "user_id", null: false
     t.integer "project_id", null: false
     t.integer "position", null: false
@@ -1637,7 +1639,7 @@
     t.datetime "updated_at", precision: nil, null: false
     t.integer "created_by_id", null: false
     t.integer "updated_by_id", null: false
-    t.jsonb "preferences", default: "{}", null: false
+    t.jsonb "preferences", default: {}, null: false
     t.string "api_access_token"
     t.string "data_curation_issue_tracker_url"
     t.index ["created_by_id"], name: "index_projects_on_created_by_id"
@@ -1646,8 +1648,8 @@
 
   create_table "protocol_relationships", id: :serial, force: :cascade do |t|
     t.integer "protocol_id", null: false
-    t.string "protocol_relationship_object_type", null: false
     t.integer "protocol_relationship_object_id", null: false
+    t.string "protocol_relationship_object_type", null: false
     t.integer "position", null: false
     t.integer "created_by_id", null: false
     t.integer "updated_by_id", null: false
@@ -1906,8 +1908,8 @@
     t.string "boundary_finder", null: false
     t.boolean "has_border", null: false
     t.string "layout", null: false
-    t.jsonb "metadata_map", default: "{}", null: false
-    t.jsonb "specimen_coordinates", default: "{}", null: false
+    t.jsonb "metadata_map", default: {}, null: false
+    t.jsonb "specimen_coordinates", default: {}, null: false
     t.integer "project_id", null: false
     t.integer "created_by_id", null: false
     t.integer "updated_by_id", null: false
@@ -2341,6 +2343,7 @@
   add_foreign_key "notes", "projects", name: "notes_project_id_fkey"
   add_foreign_key "notes", "users", column: "created_by_id", name: "notes_created_by_id_fkey"
   add_foreign_key "notes", "users", column: "updated_by_id", name: "notes_updated_by_id_fkey"
+  add_foreign_key "observation_matrices", "otus"
   add_foreign_key "observation_matrices", "projects"
   add_foreign_key "observation_matrices", "users", column: "created_by_id"
   add_foreign_key "observation_matrices", "users", column: "updated_by_id"
diff --git a/lib/queries/observation_matrix/filter.rb b/lib/queries/observation_matrix/filter.rb
index a93b4182fc..e13456693c 100644
--- a/lib/queries/observation_matrix/filter.rb
+++ b/lib/queries/observation_matrix/filter.rb
@@ -4,20 +4,35 @@ class Filter < Query::Filter
 
       PARAMS = [
         :observation_matrix_id,
-        observation_matrix_id: []
+        :otu_id, 
+        observation_matrix_id: [],
+        otu_id: []
       ].freeze
 
+      attr_accessor :otu_id
+
       attr_accessor :observation_matrix_id
 
       def initialize(query_params)
         super
         @observation_matrix_id = params[:observation_matrix_id]
+        @otu_id = params[:otu_id]
+      end
+
+
+      def otu_id
+        [@otu_id].flatten.compact
       end
 
       def observation_matrix_id
         [@observation_matrix_id].flatten.compact
       end
 
+      def otu_id_facet
+        return nil if otu_id.empty?
+        table[:otu_id].eq_any(otu_id)
+      end
+
       def and_clauses
         [ ]
       end

From ccb594563b0f7281d40392dcc62edd6a777950f3 Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Mon, 23 Sep 2024 12:23:12 -0300
Subject: [PATCH 09/25] Update packages

---
 package-lock.json | 198 ++++++++++++++++++++++++++--------------------
 package.json      |  12 +--
 2 files changed, 120 insertions(+), 90 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 302825e10c..d24b42c331 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -34,7 +34,7 @@
         "shakapacker": "8.0.2",
         "three": "^0.168.0",
         "v-network-graph": "^0.9.16",
-        "vue": "^3.5.6",
+        "vue": "^3.5.8",
         "vue-handy-scroll": "^3.0.2",
         "vue-tippy": "^6.4.4",
         "vue3-hotkey": "^1.0.6",
@@ -47,12 +47,12 @@
         "@babel/plugin-transform-runtime": "^7.25.4",
         "@babel/preset-env": "^7.25.4",
         "@babel/runtime": "^7.25.6",
-        "@vue/compiler-sfc": "^3.5.6",
+        "@vue/compiler-sfc": "^3.5.8",
         "babel-loader": "^9.2.1",
         "compression-webpack-plugin": "^11.1.0",
         "css-loader": "^7.1.2",
         "css-minimizer-webpack-plugin": "^7.0.0",
-        "eslint": "^9.10.0",
+        "eslint": "^9.11.0",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-vue": "^9.28.0",
         "mini-css-extract-plugin": "^2.9.1",
@@ -60,11 +60,11 @@
         "postcss-flexbugs-fixes": "^5.0.2",
         "postcss-import": "^16.1.0",
         "postcss-loader": "^8.1.1",
-        "postcss-preset-env": "^10.0.3",
+        "postcss-preset-env": "^10.0.5",
         "raw-loader": "^4.0.2",
         "resolve-url-loader": "^5.0.0",
-        "sass": "^1.78.0",
-        "sass-loader": "^16.0.1",
+        "sass": "^1.79.3",
+        "sass-loader": "^16.0.2",
         "style-loader": "^4.0.0",
         "terser-webpack-plugin": "^5.3.10",
         "url": "^0.11.4",
@@ -2247,9 +2247,9 @@
       }
     },
     "node_modules/@csstools/postcss-light-dark-function": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-light-dark-function/-/postcss-light-dark-function-2.0.2.tgz",
-      "integrity": "sha512-QAWWDJtJ7ywzhaMe09QwhjhuwB0XN04fW1MFwoEJMcYyiQub4a57mVFV+ngQEekUhsqe/EtKVCzyOx4q3xshag==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-light-dark-function/-/postcss-light-dark-function-2.0.4.tgz",
+      "integrity": "sha512-yHUt5DZ61Irvp72notmAl3Zt4Me50EWToWNocazyIFTVYFwwo/EucmV3hWi9zJehu3rOSvMclL7DzvRDfbak/A==",
       "dev": true,
       "funding": [
         {
@@ -2916,9 +2916,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.10.0.tgz",
-      "integrity": "sha512-fuXtbiP5GWIn8Fz+LWoOMVf/Jxm+aajZYkhi6CuEm4SxymFM+eUWzbO9qXT+L0iCkL5+KGYMCSGxo686H19S1g==",
+      "version": "9.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.11.0.tgz",
+      "integrity": "sha512-LPkkenkDqyzTFauZLLAPhIb48fj6drrfMvRGSL9tS3AcZBSVTllemLSNyCvHNNL2t797S/6DJNSIwRwXgMO/eQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2936,9 +2936,9 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.1.0.tgz",
-      "integrity": "sha512-autAXT203ixhqei9xt+qkYOvY8l6LAFIdT2UXc/RPNeUVfqRF1BV94GTJyVPFKT8nFM6MyVJhjLj9E8JWvf5zQ==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
+      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -3863,39 +3863,39 @@
       "license": "MIT"
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.6.tgz",
-      "integrity": "sha512-r+gNu6K4lrvaQLQGmf+1gc41p3FO2OUJyWmNqaIITaJU6YFiV5PtQSFZt8jfztYyARwqhoCayjprC7KMvT3nRA==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.8.tgz",
+      "integrity": "sha512-Uzlxp91EPjfbpeO5KtC0KnXPkuTfGsNDeaKQJxQN718uz+RqDYarEf7UhQJGK+ZYloD2taUbHTI2J4WrUaZQNA==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.6",
+        "@vue/shared": "3.5.8",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.6.tgz",
-      "integrity": "sha512-xRXqxDrIqK8v8sSScpistyYH0qYqxakpsIvqMD2e5sV/PXQ1mTwtXp4k42yHK06KXxKSmitop9e45Ui/3BrTEw==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.8.tgz",
+      "integrity": "sha512-GUNHWvoDSbSa5ZSHT9SnV5WkStWfzJwwTd6NMGzilOE/HM5j+9EB9zGXdtu/fCNEmctBqMs6C9SvVPpVPuk1Eg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.6",
-        "@vue/shared": "3.5.6"
+        "@vue/compiler-core": "3.5.8",
+        "@vue/shared": "3.5.8"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.6.tgz",
-      "integrity": "sha512-pjWJ8Kj9TDHlbF5LywjVso+BIxCY5wVOLhkEXRhuCHDxPFIeX1zaFefKs8RYoHvkSMqRWt93a0f2gNJVJixHwg==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.8.tgz",
+      "integrity": "sha512-taYpngQtSysrvO9GULaOSwcG5q821zCoIQBtQQSx7Uf7DxpR6CIHR90toPr9QfDD2mqHQPCSgoWBvJu0yV9zjg==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.6",
-        "@vue/compiler-dom": "3.5.6",
-        "@vue/compiler-ssr": "3.5.6",
-        "@vue/shared": "3.5.6",
+        "@vue/compiler-core": "3.5.8",
+        "@vue/compiler-dom": "3.5.8",
+        "@vue/compiler-ssr": "3.5.8",
+        "@vue/shared": "3.5.8",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.11",
         "postcss": "^8.4.47",
@@ -3903,13 +3903,13 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.6.tgz",
-      "integrity": "sha512-VpWbaZrEOCqnmqjE83xdwegtr5qO/2OPUC6veWgvNqTJ3bYysz6vY3VqMuOijubuUYPRpG3OOKIh9TD0Stxb9A==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.8.tgz",
+      "integrity": "sha512-W96PtryNsNG9u0ZnN5Q5j27Z/feGrFV6zy9q5tzJVyJaLiwYxvC0ek4IXClZygyhjm+XKM7WD9pdKi/wIRVC/Q==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.6",
-        "@vue/shared": "3.5.6"
+        "@vue/compiler-dom": "3.5.8",
+        "@vue/shared": "3.5.8"
       }
     },
     "node_modules/@vue/devtools-api": {
@@ -3919,53 +3919,53 @@
       "license": "MIT"
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.6.tgz",
-      "integrity": "sha512-shZ+KtBoHna5GyUxWfoFVBCVd7k56m6lGhk5e+J9AKjheHF6yob5eukssHRI+rzvHBiU1sWs/1ZhNbLExc5oYQ==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.8.tgz",
+      "integrity": "sha512-mlgUyFHLCUZcAYkqvzYnlBRCh0t5ZQfLYit7nukn1GR96gc48Bp4B7OIcSfVSvlG1k3BPfD+p22gi1t2n9tsXg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.6"
+        "@vue/shared": "3.5.8"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.6.tgz",
-      "integrity": "sha512-FpFULR6+c2lI+m1fIGONLDqPQO34jxV8g6A4wBOgne8eSRHP6PQL27+kWFIx5wNhhjkO7B4rgtsHAmWv7qKvbg==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.8.tgz",
+      "integrity": "sha512-fJuPelh64agZ8vKkZgp5iCkPaEqFJsYzxLk9vSC0X3G8ppknclNDr61gDc45yBGTaN5Xqc1qZWU3/NoaBMHcjQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.6",
-        "@vue/shared": "3.5.6"
+        "@vue/reactivity": "3.5.8",
+        "@vue/shared": "3.5.8"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.6.tgz",
-      "integrity": "sha512-SDPseWre45G38ENH2zXRAHL1dw/rr5qp91lS4lt/nHvMr0MhsbCbihGAWLXNB/6VfFOJe2O+RBRkXU+CJF7/sw==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.8.tgz",
+      "integrity": "sha512-DpAUz+PKjTZPUOB6zJgkxVI3GuYc2iWZiNeeHQUw53kdrparSTG6HeXUrYDjaam8dVsCdvQxDz6ZWxnyjccUjQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.6",
-        "@vue/runtime-core": "3.5.6",
-        "@vue/shared": "3.5.6",
+        "@vue/reactivity": "3.5.8",
+        "@vue/runtime-core": "3.5.8",
+        "@vue/shared": "3.5.8",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.6.tgz",
-      "integrity": "sha512-zivnxQnOnwEXVaT9CstJ64rZFXMS5ZkKxCjDQKiMSvUhXRzFLWZVbaBiNF4HGDqGNNsTgmjcCSmU6TB/0OOxLA==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.8.tgz",
+      "integrity": "sha512-7AmC9/mEeV9mmXNVyUIm1a1AjUhyeeGNbkLh39J00E7iPeGks8OGRB5blJiMmvqSh8SkaS7jkLWSpXtxUCeagA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.6",
-        "@vue/shared": "3.5.6"
+        "@vue/compiler-ssr": "3.5.8",
+        "@vue/shared": "3.5.8"
       },
       "peerDependencies": {
-        "vue": "3.5.6"
+        "vue": "3.5.8"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.6.tgz",
-      "integrity": "sha512-eidH0HInnL39z6wAt6SFIwBrvGOpDWsDxlw3rCgo1B+CQ1781WzQUSU3YjxgdkcJo9Q8S6LmXTkvI+cLHGkQfA==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.8.tgz",
+      "integrity": "sha512-mJleSWbAGySd2RJdX1RBtcrUBX6snyOc0qHpgk3lGi4l9/P/3ny3ELqFWqYdkXIwwNN/kdm8nD9ky8o6l/Lx2A==",
       "license": "MIT"
     },
     "node_modules/@vueuse/core": {
@@ -6358,9 +6358,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.10.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.10.0.tgz",
-      "integrity": "sha512-Y4D0IgtBZfOcOUAIQTSXBKoNGfY0REGqHJG6+Q81vNippW5YlKjHFj4soMxamKK1NXHUWuBZTLdU3Km+L/pcHw==",
+      "version": "9.11.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.11.0.tgz",
+      "integrity": "sha512-yVS6XODx+tMFMDFcG4+Hlh+qG7RM6cCJXtQhCKLSsr3XkLvWggHjCqjfh0XsPPnt1c56oaT6PMgW9XWQQjdHXA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6368,8 +6368,8 @@
         "@eslint-community/regexpp": "^4.11.0",
         "@eslint/config-array": "^0.18.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.10.0",
-        "@eslint/plugin-kit": "^0.1.0",
+        "@eslint/js": "9.11.0",
+        "@eslint/plugin-kit": "^0.2.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
@@ -9949,9 +9949,9 @@
       }
     },
     "node_modules/postcss-preset-env": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-10.0.3.tgz",
-      "integrity": "sha512-1nrZ4IeBXEEj53IMoRKE+k/Ub6nQb3gFjaxTeyUNG5zv3JQclFDY5GKKhAi3nsa1lnPMWgzQX+/1y6wUt2+I7Q==",
+      "version": "10.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-10.0.5.tgz",
+      "integrity": "sha512-ipPOgr3RY0utgJDbNoCX2dxKoQ4e4WO1pC21QhDlxCAX8+qC8O2Ezkzb54fd+8XtZ1UveA5gLjBsVo6dJDoWIg==",
       "dev": true,
       "funding": [
         {
@@ -9977,7 +9977,7 @@
         "@csstools/postcss-ic-unit": "^4.0.0",
         "@csstools/postcss-initial": "^2.0.0",
         "@csstools/postcss-is-pseudo-class": "^5.0.0",
-        "@csstools/postcss-light-dark-function": "^2.0.2",
+        "@csstools/postcss-light-dark-function": "^2.0.4",
         "@csstools/postcss-logical-float-and-clear": "^3.0.0",
         "@csstools/postcss-logical-overflow": "^2.0.0",
         "@csstools/postcss-logical-overscroll-behavior": "^2.0.0",
@@ -10636,13 +10636,13 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.78.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.78.0.tgz",
-      "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
+      "version": "1.79.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz",
+      "integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
+        "chokidar": "^4.0.0",
         "immutable": "^4.0.0",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
@@ -10654,9 +10654,9 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.1.tgz",
-      "integrity": "sha512-xACl1ToTsKnL9Ce5yYpRxrLj9QUDCnwZNhzpC7tKiFyA8zXsd3Ap+HGVnbCgkdQcm43E+i6oKAWBsvGA6ZoiMw==",
+      "version": "16.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.2.tgz",
+      "integrity": "sha512-Ll6iXZ1EYwYT19SqW4mSBb76vSSi8JgzElmzIerhEGgzB5hRjDQIWsPmuk1UrAXkR16KJHqVY0eH+5/uw9Tmfw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10694,6 +10694,36 @@
         }
       }
     },
+    "node_modules/sass/node_modules/chokidar": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
+      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/sass/node_modules/readdirp": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz",
+      "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/schema-utils": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
@@ -11671,16 +11701,16 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.5.6",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.6.tgz",
-      "integrity": "sha512-zv+20E2VIYbcJOzJPUWp03NOGFhMmpCKOfSxVTmCYyYFFko48H9tmuQFzYj7tu4qX1AeXlp9DmhIP89/sSxxhw==",
+      "version": "3.5.8",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.8.tgz",
+      "integrity": "sha512-hvuvuCy51nP/1fSRvrrIqTLSvrSyz2Pq+KQ8S8SXCxTWVE0nMaOnSDnSOxV1eYmGfvK7mqiwvd1C59CEEz7dAQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.6",
-        "@vue/compiler-sfc": "3.5.6",
-        "@vue/runtime-dom": "3.5.6",
-        "@vue/server-renderer": "3.5.6",
-        "@vue/shared": "3.5.6"
+        "@vue/compiler-dom": "3.5.8",
+        "@vue/compiler-sfc": "3.5.8",
+        "@vue/runtime-dom": "3.5.8",
+        "@vue/server-renderer": "3.5.8",
+        "@vue/shared": "3.5.8"
       },
       "peerDependencies": {
         "typescript": "*"
diff --git a/package.json b/package.json
index 7775adfdc5..eac5376686 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "qs": "^6.13.0",
     "shakapacker": "8.0.2",
     "v-network-graph": "^0.9.16",
-    "vue": "^3.5.6",
+    "vue": "^3.5.8",
     "vue-handy-scroll": "^3.0.2",
     "vue-tippy": "^6.4.4",
     "vue3-hotkey": "^1.0.6",
@@ -50,12 +50,12 @@
     "@babel/plugin-transform-runtime": "^7.25.4",
     "@babel/preset-env": "^7.25.4",
     "@babel/runtime": "^7.25.6",
-    "@vue/compiler-sfc": "^3.5.6",
+    "@vue/compiler-sfc": "^3.5.8",
     "babel-loader": "^9.2.1",
     "compression-webpack-plugin": "^11.1.0",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
-    "eslint": "^9.10.0",
+    "eslint": "^9.11.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-vue": "^9.28.0",
     "mini-css-extract-plugin": "^2.9.1",
@@ -63,11 +63,11 @@
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^16.1.0",
     "postcss-loader": "^8.1.1",
-    "postcss-preset-env": "^10.0.3",
+    "postcss-preset-env": "^10.0.5",
     "raw-loader": "^4.0.2",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.78.0",
-    "sass-loader": "^16.0.1",
+    "sass": "^1.79.3",
+    "sass-loader": "^16.0.2",
     "style-loader": "^4.0.0",
     "terser-webpack-plugin": "^5.3.10",
     "url": "^0.11.4",

From 2f29562c20cfa6394bbaba1eaab02a35188a7390 Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Mon, 23 Sep 2024 16:30:42 -0300
Subject: [PATCH 10/25] Add otu autocomplete to edit/new matrix task. Refactor
 code

---
 .../Facets/shared/FacetMatchIdentifiers.vue   |   2 +-
 .../Filter/Facets/shared/FacetPeople.vue      |   2 +-
 .../vue/components/ui/Autocomplete.vue        |  28 +-
 app/javascript/vue/constants/modelTypes.js    |   1 +
 .../vue/routes/endpoints/ObservationMatrix.js |   2 +-
 .../endpoints/ObservationMatrixColumn.js      |   7 +-
 .../routes/endpoints/ObservationMatrixRow.js  |   5 +-
 .../collectionObject/Repository/main.vue      |   2 +-
 .../tasks/observation_matrices/new/app.vue    |   6 +-
 .../new/components/Matrix/MatrixForm.vue      |  96 ++++
 .../new/components/Matrix/MatrixParent.vue    |  60 +++
 .../{newMatrix => Matrix}/switch.vue          |   0
 .../new/components/newMatrix/newMatrix.vue    | 132 ------
 .../new/components/rows/copyRows.vue          | 433 ++++++++----------
 .../new/components/tables/view.vue            | 152 +++---
 .../new/request/resources.js                  |  12 +-
 .../new/store/actions/actionNames.js          |   2 +-
 .../new/store/actions/actions.js              |   4 +-
 .../new/store/actions/saveMatrix.js           |  24 +
 .../new/store/actions/updateMatrix.js         |  16 -
 .../observation_matrices/new/store/store.js   |   9 +-
 .../new_otu/components/TaxonNameSelector.vue  |   2 +-
 .../filter/components/Facet/FacetProjects.vue |   2 +-
 .../_attributes.json.jbuilder                 |   2 +-
 24 files changed, 492 insertions(+), 509 deletions(-)
 create mode 100644 app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixForm.vue
 create mode 100644 app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixParent.vue
 rename app/javascript/vue/tasks/observation_matrices/new/components/{newMatrix => Matrix}/switch.vue (100%)
 delete mode 100644 app/javascript/vue/tasks/observation_matrices/new/components/newMatrix/newMatrix.vue
 create mode 100644 app/javascript/vue/tasks/observation_matrices/new/store/actions/saveMatrix.js
 delete mode 100644 app/javascript/vue/tasks/observation_matrices/new/store/actions/updateMatrix.js

diff --git a/app/javascript/vue/components/Filter/Facets/shared/FacetMatchIdentifiers.vue b/app/javascript/vue/components/Filter/Facets/shared/FacetMatchIdentifiers.vue
index 8b621d91e7..6ed2d9d71c 100644
--- a/app/javascript/vue/components/Filter/Facets/shared/FacetMatchIdentifiers.vue
+++ b/app/javascript/vue/components/Filter/Facets/shared/FacetMatchIdentifiers.vue
@@ -35,7 +35,7 @@
 <script setup>
 import { computed, ref, onBeforeMount } from 'vue'
 import { vTabkey } from '@/directives'
-import VToggle from '@/tasks/observation_matrices/new/components/newMatrix/switch.vue'
+import VToggle from '@/tasks/observation_matrices/new/components/Matrix/switch.vue'
 import FacetContainer from '@/components/Filter/Facets/FacetContainer.vue'
 
 const TYPE_PARAMETERS = {
diff --git a/app/javascript/vue/components/Filter/Facets/shared/FacetPeople.vue b/app/javascript/vue/components/Filter/Facets/shared/FacetPeople.vue
index 3513879d42..88e8d59c12 100644
--- a/app/javascript/vue/components/Filter/Facets/shared/FacetPeople.vue
+++ b/app/javascript/vue/components/Filter/Facets/shared/FacetPeople.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import SwitchButtom from '@/tasks/observation_matrices/new/components/newMatrix/switch.vue'
+import SwitchButtom from '@/tasks/observation_matrices/new/components/Matrix/switch.vue'
 import SmartSelector from '@/components/ui/SmartSelector'
 import DisplayList from '@/components/displayList'
 import FacetContainer from '@/components/Filter/Facets/FacetContainer.vue'
diff --git a/app/javascript/vue/components/ui/Autocomplete.vue b/app/javascript/vue/components/ui/Autocomplete.vue
index 0bc4a5d5dc..9fee3a413c 100644
--- a/app/javascript/vue/components/ui/Autocomplete.vue
+++ b/app/javascript/vue/components/ui/Autocomplete.vue
@@ -13,26 +13,27 @@ headers to be used in the call. Using it will override the common headers
 <template>
   <div class="vue-autocomplete">
     <input
-      :id="inputId"
+      type="text"
       ref="autofocus"
+      :id="inputId"
       :style="inputStyle"
-      class="vue-autocomplete-input normal-input"
-      type="text"
       :placeholder="placeholder"
-      @input="checkTime(), sendType()"
+      :autofocus="autofocus"
+      :disabled="disabled"
       v-model="type"
       v-bind="inputAttributes"
+      autocomplete="off"
+      :class="[
+        'vue-autocomplete-input normal-input',
+        spinner && 'ui-autocomplete-loading',
+        !spinner && 'vue-autocomplete-input-search',
+        inputClass
+      ]"
+      @input="checkTime(), sendType()"
       @keydown.down="downKey"
       @keydown.up="upKey"
       @keydown.enter="enterKey"
       @keyup="sendKeyEvent"
-      autocomplete="off"
-      :autofocus="autofocus"
-      :disabled="disabled"
-      :class="{
-        'ui-autocomplete-loading': spinner,
-        'vue-autocomplete-input-search': !spinner
-      }"
     />
     <ul
       class="vue-autocomplete-list"
@@ -166,6 +167,11 @@ export default {
       default: 'value'
     },
 
+    inputClass: {
+      type: Array,
+      default: () => []
+    },
+
     inputStyle: {
       type: Object,
       default: () => ({})
diff --git a/app/javascript/vue/constants/modelTypes.js b/app/javascript/vue/constants/modelTypes.js
index e76932e87d..bd22cb5d9b 100644
--- a/app/javascript/vue/constants/modelTypes.js
+++ b/app/javascript/vue/constants/modelTypes.js
@@ -33,6 +33,7 @@ export const LOAN = 'Loan'
 export const LOT = 'Lot'
 export const NOTE = 'Note'
 export const OBSERVATION = 'Observation'
+export const OBSERVATION_MATRIX = 'ObservationMatrix'
 export const OTU = 'Otu'
 export const PEOPLE = 'People'
 export const PERSON = 'Person'
diff --git a/app/javascript/vue/routes/endpoints/ObservationMatrix.js b/app/javascript/vue/routes/endpoints/ObservationMatrix.js
index 7b440876ef..a0d2c6b698 100644
--- a/app/javascript/vue/routes/endpoints/ObservationMatrix.js
+++ b/app/javascript/vue/routes/endpoints/ObservationMatrix.js
@@ -5,7 +5,7 @@ const controller = 'observation_matrices'
 const permitParams = {
   observation_matrix: {
     name: String,
-    otu_id: Array
+    otu_id: Number
   }
 }
 
diff --git a/app/javascript/vue/routes/endpoints/ObservationMatrixColumn.js b/app/javascript/vue/routes/endpoints/ObservationMatrixColumn.js
index c45f2eec75..fc5d5b97e5 100644
--- a/app/javascript/vue/routes/endpoints/ObservationMatrixColumn.js
+++ b/app/javascript/vue/routes/endpoints/ObservationMatrixColumn.js
@@ -1,4 +1,5 @@
-import baseCRUD, {annotations} from './base'
+import baseCRUD from './base'
+import { ajaxCall } from '@/helpers'
 
 const controller = 'observation_matrix_columns'
 const permitParams = {
@@ -6,5 +7,7 @@ const permitParams = {
 }
 
 export const ObservationMatrixColumn = {
-  ...baseCRUD(controller, permitParams)
+  ...baseCRUD(controller, permitParams),
+
+  sort: (ids) => ajaxCall('patch', `/${controller}/sort`, { ids })
 }
diff --git a/app/javascript/vue/routes/endpoints/ObservationMatrixRow.js b/app/javascript/vue/routes/endpoints/ObservationMatrixRow.js
index 2ad45cd723..eb3afd855c 100644
--- a/app/javascript/vue/routes/endpoints/ObservationMatrixRow.js
+++ b/app/javascript/vue/routes/endpoints/ObservationMatrixRow.js
@@ -1,4 +1,5 @@
 import baseCRUD, { annotations } from './base'
+import { ajaxCall } from '@/helpers'
 
 const permitParams = {
   observation_matrix_row: Object
@@ -6,5 +7,7 @@ const permitParams = {
 
 export const ObservationMatrixRow = {
   ...baseCRUD('observation_matrix_rows', permitParams),
-  ...annotations('observation_matrix_rows')
+  ...annotations('observation_matrix_rows'),
+
+  sort: (ids) => ajaxCall('patch', '/observation_matrix_rows/sort', { ids })
 }
diff --git a/app/javascript/vue/tasks/digitize/components/collectionObject/Repository/main.vue b/app/javascript/vue/tasks/digitize/components/collectionObject/Repository/main.vue
index 940af7f453..cf33acd6d3 100644
--- a/app/javascript/vue/tasks/digitize/components/collectionObject/Repository/main.vue
+++ b/app/javascript/vue/tasks/digitize/components/collectionObject/Repository/main.vue
@@ -26,7 +26,7 @@
 import { GetterNames } from '../../../store/getters/getters.js'
 import { MutationNames } from '../../../store/mutations/mutations.js'
 import extendCO from '../mixins/extendCO.js'
-import SwitchComponent from '@/tasks/observation_matrices/new/components/newMatrix/switch.vue'
+import SwitchComponent from '@/tasks/observation_matrices/new/components/Matrix/switch.vue'
 import RepositorySelector from './RepositorySelector.vue'
 
 export default {
diff --git a/app/javascript/vue/tasks/observation_matrices/new/app.vue b/app/javascript/vue/tasks/observation_matrices/new/app.vue
index 41b7521c70..b2555271b9 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/app.vue
+++ b/app/javascript/vue/tasks/observation_matrices/new/app.vue
@@ -91,7 +91,7 @@
     </div>
     <div class="horizontal-left-content align-start full_width">
       <div class="cleft margin-medium-right">
-        <new-matrix />
+        <MatrixForm />
         <div
           v-if="matrix.id"
           class="margin-medium-top"
@@ -112,7 +112,7 @@
 </template>
 
 <script>
-import NewMatrix from './components/newMatrix/newMatrix'
+import MatrixForm from './components/Matrix/MatrixForm.vue'
 import TablesComponent from './components/tables/view'
 import RowsFixed from './components/rows/fixed'
 import columnsFixed from './components/columns/fixed'
@@ -133,7 +133,7 @@ export default {
   name: 'NewObservationMatrix',
 
   components: {
-    NewMatrix,
+    MatrixForm,
     RowsFixed,
     RowsDynamic,
     TablesComponent,
diff --git a/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixForm.vue b/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixForm.vue
new file mode 100644
index 0000000000..0a08c66907
--- /dev/null
+++ b/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixForm.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="panel basic-information">
+    <div class="header flex-separate">
+      <h3>Matrix</h3>
+    </div>
+    <div class="body">
+      <div class="field label-above">
+        <label>Name</label>
+        <div class="horizontal-left-content full_width">
+          <input
+            v-model="matrixName"
+            autofocus
+            class="full_width margin-small-right"
+            type="text"
+          />
+          <VBtn
+            medium
+            color="create"
+            @click="() => store.dispatch(ActionNames.SaveMatrix)"
+          >
+            {{ matrix.id ? 'Update' : 'Create' }}
+          </VBtn>
+        </div>
+      </div>
+      <MatrixParent class="field" />
+      <template v-if="matrix.id">
+        <hr />
+        <div>
+          <VSwitch
+            class="margin-small-bottom"
+            :options="Object.values(MATRIX_VIEW)"
+            v-model="matrixView"
+          />
+          <VSwitch
+            :options="Object.values(MATRIX_MODE)"
+            v-model="matrixMode"
+          />
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { MutationNames } from '../../store/mutations/mutations'
+import { GetterNames } from '../../store/getters/getters'
+import { ActionNames } from '../../store/actions/actions'
+import { computed } from 'vue'
+import { useStore } from 'vuex'
+import MatrixParent from './MatrixParent.vue'
+import VSwitch from './switch.vue'
+import VBtn from '@/components/ui/VBtn/index.vue'
+
+const store = useStore()
+
+const MATRIX_VIEW = {
+  Column: 'column',
+  Row: 'row'
+}
+
+const MATRIX_MODE = {
+  Fixed: 'fixed',
+  Dynamic: 'dynamic'
+}
+
+const matrixName = computed({
+  get: () => store.getters[GetterNames.GetMatrix].name,
+
+  set: (value) => store.commit(MutationNames.SetMatrixName, value)
+})
+
+const matrix = computed({
+  get: () => store.getters[GetterNames.GetMatrix],
+  set: (value) => store.commit(MutationNames.SetMatrix, value)
+})
+
+const matrixView = computed({
+  get: () => store.getters[GetterNames.GetMatrixView] === MATRIX_VIEW.Column,
+
+  set(value) {
+    store.commit(
+      MutationNames.SetMatrixView,
+      value ? MATRIX_VIEW.Column : MATRIX_VIEW.Row
+    )
+  }
+})
+
+const matrixMode = computed({
+  get: () => store.getters[GetterNames.GetMatrixMode] === MATRIX_MODE.Fixed,
+  set: (value) =>
+    store.commit(
+      MutationNames.SetMatrixMode,
+      value ? MATRIX_MODE.Fixed : MATRIX_MODE.Dynamic
+    )
+})
+</script>
diff --git a/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixParent.vue b/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixParent.vue
new file mode 100644
index 0000000000..53218a2913
--- /dev/null
+++ b/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixParent.vue
@@ -0,0 +1,60 @@
+<template>
+  <div>
+    <label>Otu</label>
+    <SmartSelectorItem
+      v-if="otu"
+      :item="otu"
+      @unset="matrix.otu_id = null"
+    />
+    <VAutocomplete
+      v-else
+      class="full_width"
+      url="/otus/autocomplete"
+      placeholder="Search an OTU..."
+      label="label_html"
+      :input-style="{ width: '100%' }"
+      clear-after
+      param="term"
+      @select="setOtu"
+    />
+  </div>
+</template>
+
+<script setup>
+import { useStore } from 'vuex'
+import { computed } from 'vue'
+import { Otu } from '@/routes/endpoints'
+import { MutationNames } from '../../store/mutations/mutations'
+import { GetterNames } from '../../store/getters/getters'
+import { ref, watch } from 'vue'
+import VAutocomplete from '@/components/ui/Autocomplete.vue'
+import SmartSelectorItem from '@/components/ui/SmartSelectorItem.vue'
+
+const store = useStore()
+const otu = ref(null)
+
+const matrix = computed({
+  get: () => store.getters[GetterNames.GetMatrix],
+  set: (value) => store.commit(MutationNames.SetMatrix, value)
+})
+
+watch(
+  () => matrix.value.otu_id,
+  (id) => {
+    if (id) {
+      if (otu.value?.id !== id) {
+        Otu.find(id).then(({ body }) => {
+          otu.value = body
+        })
+      }
+    } else {
+      otu.value = null
+    }
+  }
+)
+
+function setOtu(item) {
+  otu.value = { id: item.id, object_tag: item.label_html }
+  matrix.value.otu_id = item.id
+}
+</script>
diff --git a/app/javascript/vue/tasks/observation_matrices/new/components/newMatrix/switch.vue b/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/switch.vue
similarity index 100%
rename from app/javascript/vue/tasks/observation_matrices/new/components/newMatrix/switch.vue
rename to app/javascript/vue/tasks/observation_matrices/new/components/Matrix/switch.vue
diff --git a/app/javascript/vue/tasks/observation_matrices/new/components/newMatrix/newMatrix.vue b/app/javascript/vue/tasks/observation_matrices/new/components/newMatrix/newMatrix.vue
deleted file mode 100644
index 78a6b0e98f..0000000000
--- a/app/javascript/vue/tasks/observation_matrices/new/components/newMatrix/newMatrix.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-  <div class="panel basic-information">
-    <div class="header flex-separate">
-      <h3>Matrix</h3>
-    </div>
-    <div class="body">
-      <div class="field label-above">
-        <label>Name</label>
-        <div class="horizontal-left-content full_width">
-          <input
-            v-model="matrixName"
-            autofocus
-            class="full_width margin-small-right"
-            type="text"
-          />
-          <button
-            v-if="!matrix.id"
-            @click="create"
-            class="normal-input button button-submit"
-            type="button"
-          >
-            Create
-          </button>
-          <button
-            v-else
-            @click="updateMatrix"
-            class="normal-input button button-submit"
-            type="button"
-          >
-            Update
-          </button>
-        </div>
-      </div>
-      <template v-if="matrix.id">
-        <hr />
-        <div>
-          <switch-component
-            class="margin-small-bottom"
-            :options="['Column', 'Row']"
-            v-model="matrixView"
-          />
-          <switch-component
-            :options="['fixed', 'dynamic']"
-            v-model="matrixMode"
-          />
-        </div>
-      </template>
-    </div>
-  </div>
-</template>
-
-<script>
-import { MutationNames } from '../../store/mutations/mutations'
-import { GetterNames } from '../../store/getters/getters'
-import { ActionNames } from '../../store/actions/actions'
-import { ObservationMatrix } from '@/routes/endpoints'
-
-import SwitchComponent from './switch.vue'
-
-export default {
-  components: { SwitchComponent },
-
-  computed: {
-    matrixName: {
-      get() {
-        return this.$store.getters[GetterNames.GetMatrix].name
-      },
-
-      set(value) {
-        this.$store.commit(MutationNames.SetMatrixName, value)
-      }
-    },
-
-    matrix: {
-      get() {
-        return this.$store.getters[GetterNames.GetMatrix]
-      },
-
-      set(value) {
-        this.$store.commit(MutationNames.SetMatrix, value)
-      }
-    },
-
-    matrixView: {
-      get() {
-        return this.$store.getters[GetterNames.GetMatrixView] === 'column'
-      },
-
-      set(value) {
-        this.$store.commit(
-          MutationNames.SetMatrixView,
-          value ? 'column' : 'row'
-        )
-      }
-    },
-
-    matrixMode: {
-      get() {
-        return this.$store.getters[GetterNames.GetMatrixMode] === 'fixed'
-      },
-
-      set(value) {
-        this.$store.commit(
-          MutationNames.SetMatrixMode,
-          value ? 'fixed' : 'dynamic'
-        )
-      }
-    },
-
-    validateData() {
-      return (
-        this.$store.getters[GetterNames.GetMatrix].name &&
-        !this.$store.getters[GetterNames.GetMatrix].id
-      )
-    }
-  },
-
-  methods: {
-    create() {
-      ObservationMatrix.create({ observation_matrix: this.matrix }).then(
-        (response) => {
-          this.matrix = response.body
-        }
-      )
-    },
-
-    updateMatrix() {
-      this.$store.dispatch(ActionNames.UpdateMatrix)
-    }
-  }
-}
-</script>
diff --git a/app/javascript/vue/tasks/observation_matrices/new/components/rows/copyRows.vue b/app/javascript/vue/tasks/observation_matrices/new/components/rows/copyRows.vue
index 9a619b8806..42245a07ee 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/components/rows/copyRows.vue
+++ b/app/javascript/vue/tasks/observation_matrices/new/components/rows/copyRows.vue
@@ -1,267 +1,228 @@
 <template>
-  <div>
-    <modal-component
-      v-if="showModal"
-      :container-style="{
-        width: '500px',
-        'overflow-y': 'scroll',
-        'max-height': '60vh'
-      }"
-      @close="closeModal"
-    >
-      <template #header>
-        <h3>Copy rows from matrix</h3>
-      </template>
-      <template #body>
-        <spinner-component
-          v-if="isLoading"
-          legend="Loading..."
-        />
-        <select
-          class="full_width margin-medium-bottom"
-          v-model="matrixSelected"
+  <VModal
+    :container-style="{
+      width: '500px',
+      'overflow-y': 'scroll',
+      'max-height': '60vh'
+    }"
+    @close="closeModal"
+  >
+    <template #header>
+      <h3>Copy rows from matrix</h3>
+    </template>
+    <template #body>
+      <VSpinner
+        v-if="isLoading"
+        legend="Loading..."
+      />
+      <select
+        class="full_width margin-medium-bottom"
+        v-model="matrixSelected"
+      >
+        <option :value="undefined">Select a observation matrix</option>
+        <option
+          v-for="item in observationMatrices"
+          :key="item.id"
+          :value="item"
         >
-          <option :value="undefined">Select a observation matrix</option>
-          <option
-            v-for="item in observationMatrices"
-            :key="item.id"
-            :value="item"
-          >
-            {{ item.name }}
-          </option>
-        </select>
+          {{ item.name }}
+        </option>
+      </select>
+      <div
+        v-if="matrixSelected"
+        class="flex-separate margin-small-bottom"
+      >
+        <VBtn
+          color="create"
+          :disabled="!rowsSelected.length"
+          @click="addRows"
+        >
+          Add rows
+        </VBtn>
         <div
+          class="horizontal-right-content middle gap-small"
           v-if="matrixSelected"
-          class="flex-separate margin-small-bottom"
         >
-          <div>
-            <button
-              @click="addRows"
-              :disabled="!rowsSelected.length"
-              class="button normal-input button-submit"
-            >
-              Add rows
-            </button>
-          </div>
-          <div v-if="matrixSelected">
-            <button
-              class="button normal-input button-default"
-              @click="selectAll"
-            >
-              Select all
-            </button>
-            <button
-              class="button normal-input button-default"
-              @click="unselectAll"
-            >
-              Unselect all
-            </button>
-          </div>
-        </div>
-        <ul class="no_bullets">
-          <li
-            v-for="item in rows"
-            :key="item.observation_object.id"
+          <VBtn
+            color="primary"
+            @click="selectAll"
           >
-            <label>
-              <input
-                type="checkbox"
-                :value="item"
-                v-model="rowsSelected"
-                :disabled="alreadyExist(item)"
-              />
-              <span
-                class="disabled"
-                v-if="alreadyExist(item)"
-              >
-                <span v-html="item.observation_object.object_tag" /> ({{
-                  item.observation_object.base_class
-                }}) <span>(Already added)</span></span
-              >
-              <span v-else>
-                <span v-html="item.observation_object.object_tag" /> ({{
-                  item.observation_object.base_class
-                }})
-              </span>
-            </label>
-          </li>
-        </ul>
-      </template>
-      <template #footer>
-        <div class="flex-separate">
-          <div>
-            <button
-              @click="addRows"
-              :disabled="!rowsSelected.length"
-              class="button normal-input button-submit"
-            >
-              Add rows
-            </button>
-          </div>
-          <div v-if="matrixSelected">
-            <button
-              class="button normal-input button-default"
-              @click="selectAll"
+            Select all
+          </VBtn>
+          <VBtn
+            color="primary"
+            @click="unselectAll"
+          >
+            Unselect all
+          </VBtn>
+        </div>
+      </div>
+      <ul class="no_bullets">
+        <li
+          v-for="item in rows"
+          :key="item.observation_object.id"
+        >
+          <label>
+            <input
+              type="checkbox"
+              :value="item"
+              v-model="rowsSelected"
+              :disabled="alreadyExist(item)"
+            />
+            <span
+              class="disabled"
+              v-if="alreadyExist(item)"
             >
-              Select all
-            </button>
-            <button
-              class="button normal-input button-default"
-              @click="unselectAll"
+              <span v-html="item.observation_object.object_tag" /> ({{
+                item.observation_object.base_class
+              }}) <span>(Already added)</span></span
             >
-              Unselect all
-            </button>
-          </div>
+            <span v-else>
+              <span v-html="item.observation_object.object_tag" /> ({{
+                item.observation_object.base_class
+              }})
+            </span>
+          </label>
+        </li>
+      </ul>
+    </template>
+    <template #footer>
+      <div class="flex-separate middle gap-small">
+        <VBtn
+          color="create"
+          :disabled="!rowsSelected.length"
+          @click="addRows"
+        >
+          Add rows
+        </VBtn>
+        <div
+          class="horizontal-right-content middle gap-small"
+          v-if="matrixSelected"
+        >
+          <VBtn
+            color="primary"
+            @click="selectAll"
+          >
+            Select all
+          </VBtn>
+          <VBtn
+            color="primary"
+            @click="unselectAll"
+          >
+            Unselect all
+          </VBtn>
         </div>
-      </template>
-    </modal-component>
-  </div>
+      </div>
+    </template>
+  </VModal>
 </template>
 
-<script>
-import ModalComponent from '@/components/ui/Modal'
-import SpinnerComponent from '@/components/ui/VSpinner'
+<script setup>
+import VModal from '@/components/ui/Modal'
+import VSpinner from '@/components/ui/VSpinner'
 import getPagination from '@/helpers/getPagination'
 
 import { ActionNames } from '../../store/actions/actions'
 import { GetterNames } from '../../store/getters/getters'
-import { GetMatrixObservationRows } from '../../request/resources'
 import { ObservationMatrix, ObservationMatrixRowItem } from '@/routes/endpoints'
+import { computed, ref, watch, onBeforeMount } from 'vue'
+import { useStore } from 'vuex'
+import VBtn from '@/components/ui/VBtn/index.vue'
 import ObservationTypes from '../../const/types.js'
 
-export default {
-  components: {
-    ModalComponent,
-    SpinnerComponent
-  },
+const props = defineProps({
+  matrixId: {
+    type: [String, Number],
+    required: true
+  }
+})
 
-  props: {
-    matrixId: {
-      type: [String, Number],
-      required: true
-    }
-  },
+const emit = defineEmits('close')
 
-  computed: {
-    existingRows() {
-      return this.$store.getters[GetterNames.GetMatrixRows]
-    }
-  },
+const store = useStore()
 
-  data() {
-    return {
-      types: ObservationTypes.Row,
-      isLoading: false,
-      matrixSelected: undefined,
-      rowsSelected: [],
-      rows: [],
-      showModal: true,
-      observationMatrices: [],
-      pagination: undefined
-    }
-  },
+const matrixSelected = ref()
+const isLoading = ref(false)
+const pagination = ref()
+const rows = ref([])
+const existingRows = computed(() => store.getters[GetterNames.GetMatrixRows])
+const observationMatrices = ref([])
+const rowsSelected = ref([])
 
-  watch: {
-    showModal: {
-      handler(newVal) {
-        if (newVal) {
-          this.isLoading = true
-          ObservationMatrix.where({ per: 500 }).then((response) => {
-            response.body.splice(
-              response.body.findIndex((item) => this.matrixId === item.id),
-              1
-            )
-            this.observationMatrices = response.body
-            this.isLoading = false
-          })
-        }
-      },
-      immediate: true
-    },
+onBeforeMount(() => {
+  isLoading.value = true
+  ObservationMatrix.where({ per: 500 }).then(({ body }) => {
+    observationMatrices.value = body.filter(
+      (item) => props.matrixId !== item.id
+    )
+    isLoading.value = false
+  })
+})
 
-    matrixSelected(newVal) {
-      if (newVal) {
-        this.loadRows()
-      } else {
-        this.rows = []
-      }
-    }
-  },
+watch(matrixSelected, (newVal) => {
+  if (newVal) {
+    loadRows()
+  } else {
+    rows.value = []
+  }
+})
 
-  mounted() {
-    document.addEventListener('turbolinks:load', () => {
-      window.removeEventListener('scroll', this.checkScroll)
-    })
-    this.$el
-      .querySelector('.modal-container')
-      .addEventListener('scroll', this.checkScroll)
-  },
+function loadRows(page = undefined) {
+  isLoading.value = true
 
-  methods: {
-    loadRows(page = undefined) {
-      this.isLoading = true
-      GetMatrixObservationRows(this.matrixSelected.id, {
-        per: 500,
-        page: page,
-        extend: ['observation_object']
-      }).then((response) => {
-        this.rows = this.rows.concat(response.body)
-        this.pagination = getPagination(response)
-        this.isLoading = false
-      })
-    },
-    addRows() {
-      const index = this.existingRows.length
-      const data = this.rowsSelected.map((item) => ({
-        observation_matrix_id: this.matrixId,
-        observation_object_id: item.observation_object.id,
-        observation_object_type: item.observation_object.base_class,
-        position: item.position + index,
-        type: this.types[item.observation_object.base_class]
-      }))
+  ObservationMatrix.rows(matrixSelected.value.id, {
+    per: 500,
+    page: page,
+    extend: ['observation_object']
+  }).then((response) => {
+    rows.value = rows.value.concat(response.body)
+    pagination.value = getPagination(response)
+    isLoading.value = false
+  })
+}
 
-      data.sort((a, b) => a - b)
+function addRows() {
+  const index = existingRows.value.length
+  const data = rowsSelected.value.map((item) => ({
+    observation_matrix_id: props.matrixId,
+    observation_object_id: item.observation_object.id,
+    observation_object_type: item.observation_object.base_class,
+    position: item.position + index,
+    type: ObservationTypes.Row[item.observation_object.base_class]
+  }))
 
-      const promises = data.map((row) =>
-        ObservationMatrixRowItem.create({ observation_matrix_row_item: row })
-      )
+  data.sort((a, b) => a - b)
 
-      Promise.all(promises).then(() => {
-        this.$store.dispatch(ActionNames.GetMatrixObservationRows)
-        this.rowsSelected = []
-        TW.workbench.alert.create(
-          'Rows was successfully added to matrix.',
-          'notice'
-        )
-        this.closeModal()
-      })
-    },
-    alreadyExist(item) {
-      return this.existingRows.find(
-        (row) => item.observation_object.id === row.observation_object.id
-      )
-    },
-    closeModal() {
-      this.showModal = false
-      this.$emit('close')
-    },
-    selectAll() {
-      this.rowsSelected = this.rows.filter((item) => !this.alreadyExist(item))
-    },
-    unselectAll() {
-      this.rowsSelected = []
-    },
-    checkScroll(event) {
-      const scrollPosition = event.target.clientHeight + event.target.scrollTop
-      const listHeght = event.target.scrollHeight
+  const promises = data.map((row) =>
+    ObservationMatrixRowItem.create({ observation_matrix_row_item: row })
+  )
 
-      const bottomOfTable = scrollPosition >= listHeght
-      if (bottomOfTable && !this.isLoading) {
-        if (this.pagination.nextPage) {
-          this.loadRows(this.pagination.nextPage)
-        }
-      }
-    }
-  }
+  Promise.all(promises).then(() => {
+    store.dispatch(ActionNames.GetMatrixObservationRows)
+    rowsSelected.value = []
+    TW.workbench.alert.create(
+      'Rows was successfully added to matrix.',
+      'notice'
+    )
+    closeModal()
+  })
+}
+
+function alreadyExist(item) {
+  return existingRows.value.find(
+    (row) => item.observation_object.id === row.observation_object.id
+  )
+}
+
+function closeModal() {
+  emit('close')
+}
+
+function selectAll() {
+  rowsSelected.value = rows.value.filter((item) => !alreadyExist(item))
+}
+
+function unselectAll() {
+  rowsSelected.value = []
 }
 </script>
diff --git a/app/javascript/vue/tasks/observation_matrices/new/components/tables/view.vue b/app/javascript/vue/tasks/observation_matrices/new/components/tables/view.vue
index 4e6df3f380..c0160050f8 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/components/tables/view.vue
+++ b/app/javascript/vue/tasks/observation_matrices/new/components/tables/view.vue
@@ -5,60 +5,64 @@
     :gap="4"
   >
     <div>
-      <rows-table
-        class="margin-medium-bottom"
-        :list="rowsListDynamic"
+      <VTable
+        :list="store.getters[GetterNames.GetMatrixRowsDynamic]"
         :matrix-id="matrixId"
         :header="['Dynamic rows', '']"
         :attributes="['object_tag']"
         :global-id-path="['global_id']"
-        @delete="removeRow($event.id)"
         edit
+        @delete="(item) => store.dispatch(ActionNames.RemoveRow, item.id)"
         @order="updateRowsOrder"
       />
       <pagination-component
         v-if="fixedRowPagination"
-        @nextPage="loadRowPage"
         :pagination="fixedRowPagination"
+        @next-page="loadRowPage"
       />
-      <rows-table
-        :list="rowsList"
+      <VTable
+        :list="store.getters[GetterNames.GetMatrixRows]"
         :matrix-id="matrixId"
         :header="['Rows (all)', '']"
         :filter-remove="(item) => item.cached_observation_matrix_row_item_id"
         :attributes="['observation_object_label']"
         :global-id-path="['observation_object_global_id']"
         warning-message="You are trying to delete the OTU/collection object row from the matrix. Deleting the row from the matrix, does not delete OTU/collection object itself; it does not also delete the observations on this OTU. Are you sure you want to proceed?"
-        @delete="removeRow($event.cached_observation_matrix_row_item_id)"
         edit
         code
         @order="updateRowsOrder"
+        @delete="
+          (item) =>
+            store.dispatch(
+              ActionNames.RemoveRow,
+              item.cached_observation_matrix_row_item_id
+            )
+        "
       />
       <pagination-component
         v-if="fixedRowPagination"
-        @nextPage="loadRowPage"
         :pagination="fixedRowPagination"
+        @next-page="loadRowPage"
       />
     </div>
     <div class="full_width">
-      <columns-table
-        class="margin-medium-bottom"
-        :list="columnsListDynamic"
+      <VTable
+        :list="store.getters[GetterNames.GetMatrixColumnsDynamic]"
         :matrix-id="matrixId"
         :row="false"
         :header="['Dynamic column', '']"
         :attributes="['object_tag']"
         :global-id-path="['global_id']"
-        @delete="removeColumn($event.id)"
+        @delete="(item) => store.dispatch(ActionNames.RemoveColumn, item.id)"
         @order="updateColumnsOrder"
       />
       <pagination-component
         v-if="fixedColumnPagination"
-        @nextPage="loadColumnPage"
         :pagination="fixedColumnPagination"
+        @next-page="loadColumnPage"
       />
-      <columns-table
-        :list="columnsList"
+      <VTable
+        :list="store.getters[GetterNames.GetMatrixColumns]"
         :matrix-id="matrixId"
         :row="false"
         edit
@@ -67,84 +71,68 @@
         :global-id-path="['descriptor', 'global_id']"
         :filter-remove="(item) => item.cached_observation_matrix_column_item_id"
         code
-        @delete="removeColumn($event.cached_observation_matrix_column_item_id)"
+        @delete="
+          (item) =>
+            store.dispatch(
+              ActionNames.RemoveColumn,
+              item.cached_observation_matrix_column_item_id
+            )
+        "
         @order="updateColumnsOrder"
       />
       <pagination-component
         v-if="fixedColumnPagination"
-        @nextPage="loadColumnPage"
         :pagination="fixedColumnPagination"
+        @next-page="loadColumnPage"
       />
     </div>
   </TableGrid>
 </template>
-<script>
-import TableComponent from './table.vue'
-import TableGrid from '@/components/layout/Table/TableGrid.vue'
-import { SortRows, SortColumns } from '../../request/resources'
+
+<script setup>
+import { computed } from 'vue'
+import { useStore } from 'vuex'
 import { GetterNames } from '../../store/getters/getters'
 import { ActionNames } from '../../store/actions/actions'
+import {
+  ObservationMatrixRow,
+  ObservationMatrixColumn
+} from '@/routes/endpoints'
+import VTable from './table.vue'
+import TableGrid from '@/components/layout/Table/TableGrid.vue'
 import PaginationComponent from '@/components/pagination'
 
-export default {
-  components: {
-    RowsTable: TableComponent,
-    ColumnsTable: TableComponent,
-    PaginationComponent,
-    TableGrid
-  },
-  computed: {
-    matrixId() {
-      return this.$store.getters[GetterNames.GetMatrix].id
-    },
-    columnsList() {
-      return this.$store.getters[GetterNames.GetMatrixColumns]
-    },
-    columnsListDynamic() {
-      return this.$store.getters[GetterNames.GetMatrixColumnsDynamic]
-    },
-    rowsList() {
-      return this.$store.getters[GetterNames.GetMatrixRows]
-    },
-    rowsListDynamic() {
-      return this.$store.getters[GetterNames.GetMatrixRowsDynamic]
-    },
-    fixedRowPagination() {
-      return this.$store.getters[GetterNames.GetRowFixedPagination]
-    },
-    fixedColumnPagination() {
-      return this.$store.getters[GetterNames.GetColumnFixedPagination]
-    }
-  },
-  methods: {
-    removeColumn(id) {
-      this.$store.dispatch(ActionNames.RemoveColumn, id)
-    },
-    removeRow(id) {
-      this.$store.dispatch(ActionNames.RemoveRow, id)
-    },
-    updateRowsOrder(ids) {
-      SortRows(ids).then(() => {
-        this.$store.dispatch(ActionNames.GetMatrixObservationRows, { per: 500 })
-      })
-    },
-    updateColumnsOrder(ids) {
-      SortColumns(ids).then(() => {
-        this.$store.dispatch(ActionNames.GetMatrixObservationColumns, {
-          per: 500
-        })
-      })
-    },
-    loadRowPage(event) {
-      this.$store.dispatch(ActionNames.GetMatrixObservationRows, {
-        page: event.page
-      })
-    },
-    loadColumnPage(event) {
-      this.$store.dispatch(ActionNames.GetMatrixObservationColumns, {
-        page: event.page
-      })
-    }
-  }
+const store = useStore()
+const matrixId = computed(() => store.getters[GetterNames.GetMatrix].id)
+const fixedRowPagination = computed(
+  () => store.getters[GetterNames.GetRowFixedPagination]
+)
+const fixedColumnPagination = computed(
+  () => store.getters[GetterNames.GetColumnFixedPagination]
+)
+
+function updateRowsOrder(ids) {
+  ObservationMatrixRow.sort(ids).then(() => {
+    store.dispatch(ActionNames.GetMatrixObservationRows, { per: 500 })
+  })
+}
+
+function updateColumnsOrder(ids) {
+  ObservationMatrixColumn.sort(ids).then(() => {
+    store.dispatch(ActionNames.GetMatrixObservationColumns, {
+      per: 500
+    })
+  })
+}
+function loadRowPage(event) {
+  store.dispatch(ActionNames.GetMatrixObservationRows, {
+    page: event.page
+  })
+}
+
+function loadColumnPage(event) {
+  store.dispatch(ActionNames.GetMatrixObservationColumns, {
+    page: event.page
+  })
 }
 </script>
diff --git a/app/javascript/vue/tasks/observation_matrices/new/request/resources.js b/app/javascript/vue/tasks/observation_matrices/new/request/resources.js
index 59d156b139..ae554e8756 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/request/resources.js
+++ b/app/javascript/vue/tasks/observation_matrices/new/request/resources.js
@@ -81,14 +81,6 @@ const GetSmartSelector = function (type) {
   })
 }
 
-const SortRows = function (ids) {
-  return ajaxCall('patch', `/observation_matrix_rows/sort`, { ids: ids })
-}
-
-const SortColumns = function (ids) {
-  return ajaxCall('patch', `/observation_matrix_columns/sort`, { ids: ids })
-}
-
 const SortMatrixByNomenclature = (matrixId) =>
   ajaxCall('get', `/observation_matrices/${matrixId}/reorder_rows`, {
     params: { by: 'nomenclature' }
@@ -105,7 +97,5 @@ export {
   GetMatrixRowMetadata,
   BatchRemoveKeyword,
   GetSmartSelector,
-  SortColumns,
-  SortMatrixByNomenclature,
-  SortRows
+  SortMatrixByNomenclature
 }
diff --git a/app/javascript/vue/tasks/observation_matrices/new/store/actions/actionNames.js b/app/javascript/vue/tasks/observation_matrices/new/store/actions/actionNames.js
index 166be56f2c..346e9feb83 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/store/actions/actionNames.js
+++ b/app/javascript/vue/tasks/observation_matrices/new/store/actions/actionNames.js
@@ -8,7 +8,7 @@ const ActionNames = {
   GetMatrixObservationColumnsDynamic: 'getMatrixObservationColumnsDynamic',
   RemoveRow: 'removeRow',
   RemoveColumn: 'removeColumn',
-  UpdateMatrix: 'updateMatrix'
+  SaveMatrix: 'saveMatrix'
 }
 
 export default ActionNames
diff --git a/app/javascript/vue/tasks/observation_matrices/new/store/actions/actions.js b/app/javascript/vue/tasks/observation_matrices/new/store/actions/actions.js
index 226dd70179..2b7109f658 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/store/actions/actions.js
+++ b/app/javascript/vue/tasks/observation_matrices/new/store/actions/actions.js
@@ -8,7 +8,7 @@ import getMatrixObservationColumnsDynamic from './loadColumnDynamicItems'
 import loadMatrix from './loadMatrix'
 import removeRow from './removeRow'
 import removeColumn from './removeColumn'
-import updateMatrix from './updateMatrix'
+import saveMatrix from './saveMatrix'
 
 const ActionFunctions = {
   [ActionNames.CreateRowItem]: createRowItem,
@@ -20,7 +20,7 @@ const ActionFunctions = {
   [ActionNames.GetMatrixObservationColumnsDynamic]: getMatrixObservationColumnsDynamic,
   [ActionNames.RemoveRow]: removeRow,
   [ActionNames.RemoveColumn]: removeColumn,
-  [ActionNames.UpdateMatrix]: updateMatrix
+  [ActionNames.SaveMatrix]: saveMatrix
 }
 
 export { ActionNames, ActionFunctions }
\ No newline at end of file
diff --git a/app/javascript/vue/tasks/observation_matrices/new/store/actions/saveMatrix.js b/app/javascript/vue/tasks/observation_matrices/new/store/actions/saveMatrix.js
new file mode 100644
index 0000000000..bcf1161b2d
--- /dev/null
+++ b/app/javascript/vue/tasks/observation_matrices/new/store/actions/saveMatrix.js
@@ -0,0 +1,24 @@
+import { ObservationMatrix } from '@/routes/endpoints'
+
+export default ({ state }) => {
+  const payload = {
+    observation_matrix: {
+      id: state.matrix.id,
+      name: state.matrix.name,
+      otu_id: state.matrix.otu_id
+    }
+  }
+
+  const request = state.matrix.id
+    ? ObservationMatrix.update(state.matrix.id, payload)
+    : ObservationMatrix.create(payload)
+
+  request
+    .then(({ body }) => {
+      TW.workbench.alert.create('Matrix was successfully saved.', 'notice')
+      state.matrix = body
+    })
+    .catch(() => {})
+
+  return request
+}
diff --git a/app/javascript/vue/tasks/observation_matrices/new/store/actions/updateMatrix.js b/app/javascript/vue/tasks/observation_matrices/new/store/actions/updateMatrix.js
deleted file mode 100644
index 5c30daeaf2..0000000000
--- a/app/javascript/vue/tasks/observation_matrices/new/store/actions/updateMatrix.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ObservationMatrix } from '@/routes/endpoints'
-
-export default ({ state }) =>
-  new Promise((resolve, reject) => {
-    const data = {
-      id: state.matrix.id,
-      name: state.matrix.name
-    }
-
-    ObservationMatrix.update(state.matrix.id, {
-      observation_matrix: data
-    }).then((response) => {
-      TW.workbench.alert.create('Matrix was successfully updated.', 'notice')
-      return resolve(response.body)
-    })
-  })
diff --git a/app/javascript/vue/tasks/observation_matrices/new/store/store.js b/app/javascript/vue/tasks/observation_matrices/new/store/store.js
index 5dfd3472f8..a0ff60c3c2 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/store/store.js
+++ b/app/javascript/vue/tasks/observation_matrices/new/store/store.js
@@ -3,7 +3,7 @@ import { GetterFunctions } from './getters/getters'
 import { MutationFunctions } from './mutations/mutations'
 import { ActionFunctions } from './actions/actions'
 
-function makeInitialState () {
+function makeInitialState() {
   return {
     settings: {
       loadingRows: false,
@@ -17,6 +17,7 @@ function makeInitialState () {
     matrix: {
       id: undefined,
       name: undefined,
+      otu_id: undefined,
       project_id: undefined,
       global_id: undefined
     },
@@ -31,7 +32,7 @@ function makeInitialState () {
   }
 }
 
-function newStore () {
+function newStore() {
   return createStore({
     state: makeInitialState(),
     getters: GetterFunctions,
@@ -40,6 +41,4 @@ function newStore () {
   })
 }
 
-export {
-  newStore
-}
+export { newStore }
diff --git a/app/javascript/vue/tasks/otus/new_otu/components/TaxonNameSelector.vue b/app/javascript/vue/tasks/otus/new_otu/components/TaxonNameSelector.vue
index a8f118c916..88a93c4820 100644
--- a/app/javascript/vue/tasks/otus/new_otu/components/TaxonNameSelector.vue
+++ b/app/javascript/vue/tasks/otus/new_otu/components/TaxonNameSelector.vue
@@ -35,7 +35,7 @@ import BlockLayout from '@/components/layout/BlockLayout.vue'
 import { TaxonName } from '@/routes/endpoints'
 import SmartSelectorItem from '@/components/ui/SmartSelectorItem.vue'
 import VAutocomplete from '@/components/ui/Autocomplete.vue'
-import VToggle from '@/tasks/observation_matrices/new/components/newMatrix/switch.vue'
+import VToggle from '@/tasks/observation_matrices/new/components/Matrix/switch.vue'
 
 const isMatch = defineModel('match', {
   type: Boolean,
diff --git a/app/javascript/vue/tasks/people/filter/components/Facet/FacetProjects.vue b/app/javascript/vue/tasks/people/filter/components/Facet/FacetProjects.vue
index 9b5a3ac249..0c50a1240b 100644
--- a/app/javascript/vue/tasks/people/filter/components/Facet/FacetProjects.vue
+++ b/app/javascript/vue/tasks/people/filter/components/Facet/FacetProjects.vue
@@ -41,7 +41,7 @@ import { ref, computed, watch, onBeforeMount } from 'vue'
 import { User } from '@/routes/endpoints'
 import { getCurrentUserId } from '@/helpers/user.js'
 import { getCurrentProjectId } from '@/helpers/project.js'
-import VToggle from '@/tasks/observation_matrices/new/components/newMatrix/switch.vue'
+import VToggle from '@/tasks/observation_matrices/new/components/Matrix/switch.vue'
 import FacetContainer from '@/components/Filter/Facets/FacetContainer.vue'
 
 const props = defineProps({
diff --git a/app/views/observation_matrices/_attributes.json.jbuilder b/app/views/observation_matrices/_attributes.json.jbuilder
index f293510ebe..6b9d26465e 100644
--- a/app/views/observation_matrices/_attributes.json.jbuilder
+++ b/app/views/observation_matrices/_attributes.json.jbuilder
@@ -1,4 +1,4 @@
-json.extract! observation_matrix, :id, :name, :created_by_id, :updated_by_id, :project_id, :created_at, :updated_at
+json.extract! observation_matrix, :id, :name, :otu_id, :created_by_id, :updated_by_id, :project_id, :created_at, :updated_at
 json.partial! '/shared/data/all/metadata', object: observation_matrix 
 json.is_media_matrix observation_matrix.is_media_matrix?
 

From 647740d40a94f7d9afcee7529923e2c6ad522ae2 Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Mon, 23 Sep 2024 17:44:28 -0300
Subject: [PATCH 11/25] Add missing facet to observation matrix filter

---
 lib/queries/observation_matrix/filter.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/queries/observation_matrix/filter.rb b/lib/queries/observation_matrix/filter.rb
index e13456693c..4e77b47f8d 100644
--- a/lib/queries/observation_matrix/filter.rb
+++ b/lib/queries/observation_matrix/filter.rb
@@ -34,7 +34,9 @@ def otu_id_facet
       end
 
       def and_clauses
-        [ ]
+        [ 
+          otu_id_facet
+        ]
       end
 
     end

From 0185b2a1bc7748a459a89882474278cf43659ac0 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Mon, 23 Sep 2024 16:07:19 -0500
Subject: [PATCH 12/25] Add /api/v1/otus/:id/inventory/keys metadata endpoint

---
 CHANGELOG.md                                        |  2 +-
 app/controllers/otus_controller.rb                  |  7 ++++++-
 app/helpers/otus_helper.rb                          | 13 +++++++++++++
 app/models/observation_matrix.rb                    |  3 ++-
 app/models/otu.rb                                   |  2 ++
 app/views/observation_matrices/_attributes.html.erb |  5 +++++
 config/routes/api_v1.rb                             |  1 +
 7 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b0d55ceb4..45259a380e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,9 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ## [unreleased]
 
-
 ### Added
 
+- `/api/v1/otus/:id/inventory/keys` a list of keys scoped to or containing the Otu
 - `otu_id` to ObservationMatrix, to facilitate setting scope and indexing of multi-entry keys
 
 ## [0.44.0] - 2024-09-17
diff --git a/app/controllers/otus_controller.rb b/app/controllers/otus_controller.rb
index d95138454c..4080595dca 100644
--- a/app/controllers/otus_controller.rb
+++ b/app/controllers/otus_controller.rb
@@ -5,7 +5,7 @@ class OtusController < ApplicationController
     :show, :edit, :update, :destroy, :collection_objects, :navigation,
     :breadcrumbs, :timeline, :coordinate, :distribution,
     :api_show, :api_taxonomy_inventory, :api_type_material_inventory,
-    :api_nomenclature_citations, :api_distribution, :api_content, :api_dwc_inventory, :api_dwc_gallery ]
+    :api_nomenclature_citations, :api_distribution, :api_content, :api_dwc_inventory, :api_dwc_gallery, :api_key_inventory ]
 
   after_action -> { set_pagination_headers(:otus) }, only: [:index, :api_index], if: :json_request?
 
@@ -313,6 +313,11 @@ def api_autocomplete
     render '/otus/api/v1/autocomplete'
   end
 
+  # GET /api/v1/otus/:id/inventory/keys
+  def api_key_inventory
+    render json: helpers.otu_key_inventory(@otu)
+  end
+
   # GET /api/v1/otus/:id/inventory/taxonomy
   def api_taxonomy_inventory
     render '/otus/api/v1/inventory/taxonomy'
diff --git a/app/helpers/otus_helper.rb b/app/helpers/otus_helper.rb
index e5ec52f557..4a0612c737 100644
--- a/app/helpers/otus_helper.rb
+++ b/app/helpers/otus_helper.rb
@@ -348,4 +348,17 @@ def dwc_gallery_data(otu)
     r
   end
 
+  def otu_key_inventory(otu)
+    return {
+      observation_matrices: {
+        scoped: otu.in_scope_observation_matrices.pluck(:id) || [] ,
+        in: otu.observation_matrices.pluck(:id) || [] ,
+      },
+      leads: {
+        scoped: otu.leads.where(parent_id: nil).pluck(:id) || [],
+        in:  otu.leads.where.not(parent_id: nil).pluck(:id)  || [],
+      }
+    }
+  end
+
 end
diff --git a/app/models/observation_matrix.rb b/app/models/observation_matrix.rb
index d11d185f14..f1096ad92a 100644
--- a/app/models/observation_matrix.rb
+++ b/app/models/observation_matrix.rb
@@ -23,7 +23,8 @@ class ObservationMatrix < ApplicationRecord
   validates_presence_of :name
   validates_uniqueness_of :name, scope: [:project_id]
 
-  belongs_to :otu, inverse_of: :observation_matrices
+  # We can not inverse: `observation_matrices` as that comes from row content.
+  belongs_to :otu, inverse_of: :in_scope_observation_matrices
 
   has_many :observation_matrix_column_items, dependent: :delete_all, inverse_of: :observation_matrix
   has_many :observation_matrix_row_items, dependent: :delete_all, inverse_of: :observation_matrix
diff --git a/app/models/otu.rb b/app/models/otu.rb
index e4a4f32781..6f47ba04e6 100644
--- a/app/models/otu.rb
+++ b/app/models/otu.rb
@@ -59,6 +59,8 @@ class Otu < ApplicationRecord
   # Why?  Could be combination too.
   belongs_to :protonym, -> { where(type: 'Protonym') }, foreign_key: :taxon_name_id
 
+  has_many :in_scope_observation_matrices, inverse_of: :otu, class_name: 'ObservationMatrix'
+
   has_many :asserted_distributions, inverse_of: :otu, dependent: :restrict_with_error
 
   has_many :taxon_determinations, inverse_of: :otu, dependent: :destroy # TODO: change
diff --git a/app/views/observation_matrices/_attributes.html.erb b/app/views/observation_matrices/_attributes.html.erb
index a86cc94f65..c18096dfde 100644
--- a/app/views/observation_matrices/_attributes.html.erb
+++ b/app/views/observation_matrices/_attributes.html.erb
@@ -3,3 +3,8 @@
   <%= @observation_matrix.name %>
 </p>
 
+<p>
+  <strong>Otu (parent/scoping):</strong>
+  <%= otu_link(@observation_matrix.otu) %>
+</p>
+
diff --git a/config/routes/api_v1.rb b/config/routes/api_v1.rb
index c9508b9941..0ff0633a46 100644
--- a/config/routes/api_v1.rb
+++ b/config/routes/api_v1.rb
@@ -46,6 +46,7 @@
       get '/otus/autocomplete', to: '/otus#api_autocomplete'
       get '/otus/:id/inventory/content', to: '/otus#api_content', as: :api_content
       get '/otus/:id/inventory/distribution', to: '/otus#api_distribution', as: :api_distribution
+      get '/otus/:id/inventory/keys', to: '/otus#api_key_inventory', as: :key_inventory
       get '/otus/:id/inventory/taxonomy', to: '/otus#api_taxonomy_inventory', as: :taxonomy_inventory
       get '/otus/:otu_id/inventory/images', to: '/images#api_image_inventory', as: :images_inventory
       get '/otus/:id/inventory/dwc_gallery', to: '/otus#api_dwc_gallery', as: :dwc_inventory_gallery

From b8c054503f2153bca30d786a809787b56e8748aa Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Mon, 23 Sep 2024 16:33:00 -0500
Subject: [PATCH 13/25] Rename verbatim_trip_code to verbatim_field_number
 #4058

---
 CHANGELOG.md                                  |  7 +++++
 .../vue/adapters/makeCollectingEvent.js       |  2 +-
 .../payload/makeCollectionObjectPayload.js    |  2 +-
 .../components/map/PrintLabel.vue             |  2 +-
 .../components/verbatim/TripIdentifier.vue    |  2 +-
 .../FormCollectingEvent/const/components.js   |  6 ++--
 .../helpers/verbatimProperties.js             |  2 +-
 .../radials/ce/components/VerbatimSlice.vue   |  2 +-
 app/javascript/vue/factory/CollectingEvent.js |  2 +-
 .../vue/routes/endpoints/CollectingEvents.js  |  2 +-
 .../Filter/constants/collectingEvent.js       |  2 +-
 .../components/map/PrintLabel.vue             |  2 +-
 .../components/verbatim/TripIdentifier.vue    |  2 +-
 .../new_collecting_event/const/components.js  |  6 ++--
 .../helpers/verbatimProperties.js             |  2 +-
 .../filter/constants/layouts.js               |  2 +-
 .../components/map/printLabel.vue             |  2 +-
 .../components/verbatim/tripIdentifier.vue    |  2 +-
 .../vue/tasks/digitize/const/components.js    |  6 ++--
 app/models/collecting_event.rb                | 18 ++++++------
 .../collection_object/dwc_extensions.rb       |  2 +-
 .../dataset_record/darwin_core/occurrence.rb  |  8 +++---
 app/models/identifier/local/field_number.rb   |  4 +--
 .../collecting_events/_attributes.html.erb    |  2 +-
 .../_attributes.json.jbuilder                 |  2 +-
 app/views/collecting_events/_card.html.erb    |  4 +--
 app/views/collecting_events/_form.html.erb    |  8 +++---
 .../api/v1/_attributes.json.jbuilder          | 28 +++++++++----------
 app/views/collecting_events/list.html.erb     |  4 +--
 ...ame_collecting_event_verbatim_trip_code.rb |  7 +++++
 db/schema.rb                                  |  4 +--
 lib/batch_load/import/collection_objects.rb   |  2 +-
 lib/queries/collecting_event/autocomplete.rb  |  6 ++--
 .../collecting_event/autocomplete_spec.rb     |  6 ++--
 .../queries/collecting_event/filter_spec.rb   |  2 +-
 .../queries/collection_object/filter_spec.rb  |  2 +-
 spec/lib/queries/concerns/attributes_spec.rb  |  2 +-
 spec/models/collecting_event_spec.rb          |  6 ++--
 .../darwin_core/occurrence_spec.rb            |  2 +-
 .../identifier/local/field_number_spec.rb     |  8 +++---
 40 files changed, 97 insertions(+), 85 deletions(-)
 create mode 100644 db/migrate/20240923211118_rename_collecting_event_verbatim_trip_code.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45259a380e..4e1715dfaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,13 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - `/api/v1/otus/:id/inventory/keys` a list of keys scoped to or containing the Otu
 - `otu_id` to ObservationMatrix, to facilitate setting scope and indexing of multi-entry keys
 
+### Changed
+
+- Renamed CollectingEvent `verbatim_trip_code` to `verbatim_field_number` [#4058]
+
+[#4058]: https://github.com/SpeciesFileGroup/taxonworks/issues/4058
+ 
+
 ## [0.44.0] - 2024-09-17
 
 ### Added
diff --git a/app/javascript/vue/adapters/makeCollectingEvent.js b/app/javascript/vue/adapters/makeCollectingEvent.js
index 65eea25e34..dfd136e7a7 100644
--- a/app/javascript/vue/adapters/makeCollectingEvent.js
+++ b/app/javascript/vue/adapters/makeCollectingEvent.js
@@ -11,7 +11,7 @@ export function makeCollectingEvent (ceData = {}) {
     verbatimLongitude: ceData.verbatim_longitude,
     verbatimLatitude: ceData.verbatim_latitude,
     verbatimGeolocationUncertainty: ceData.verbatim_geolocation_uncertainty,
-    verbatimTripIdentifier: ceData.verbatim_trip_identifier,
+    verbatimFieldNumber: ceData.verbatim_field_number,
     verbatimCollectors: ceData.verbatim_collectors,
     verbatimMethod: ceData.verbatim_method,
     verbatimHabitat: ceData.verbatim_habitat,
diff --git a/app/javascript/vue/adapters/payload/makeCollectionObjectPayload.js b/app/javascript/vue/adapters/payload/makeCollectionObjectPayload.js
index 0c9907040b..1c1e3d8616 100644
--- a/app/javascript/vue/adapters/payload/makeCollectionObjectPayload.js
+++ b/app/javascript/vue/adapters/payload/makeCollectionObjectPayload.js
@@ -10,7 +10,7 @@ export function makeCollectingEventPayload (ceData) {
     verbatim_longitude: ceData.verbatimLongitude,
     verbatim_latitude: ceData.verbatimLatitude,
     verbatim_geolocation_uncertainty: ceData.verbatimGeolocationUncertainty,
-    verbatim_trip_identifier: ceData.verbatimTripIdentifier,
+    verbatim_field_number: ceData.verbatimFieldNumber,
     verbatim_collectors: ceData.verbatimCollectors,
     verbatim_method: ceData.verbatimMethod,
     verbatim_habitat: ceData.verbatimHabitat,
diff --git a/app/javascript/vue/components/Form/FormCollectingEvent/components/map/PrintLabel.vue b/app/javascript/vue/components/Form/FormCollectingEvent/components/map/PrintLabel.vue
index 561751a141..fcd152d438 100644
--- a/app/javascript/vue/components/Form/FormCollectingEvent/components/map/PrintLabel.vue
+++ b/app/javascript/vue/components/Form/FormCollectingEvent/components/map/PrintLabel.vue
@@ -112,7 +112,7 @@ function generateLabel() {
     ...generateParsedLabel()
   )
 
-  const AtStart = ['TripIdentifier', 'TripCode']
+  const AtStart = ['FieldNumber', 'TripCode']
 
   const sortedObjectLabelKeys = sortArrayByArray(
     Object.keys(objectLabels),
diff --git a/app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/TripIdentifier.vue b/app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/TripIdentifier.vue
index 6858cd6358..e3f1dce4e3 100644
--- a/app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/TripIdentifier.vue
+++ b/app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/TripIdentifier.vue
@@ -5,7 +5,7 @@
       class="full_width"
       type="text"
       rows="3"
-      v-model="collectingEvent.verbatim_trip_identifier"
+      v-model="collectingEvent.verbatim_field_number"
       @change="() => { collectingEvent.isUnsaved = true }"
     />
   </div>
diff --git a/app/javascript/vue/components/Form/FormCollectingEvent/const/components.js b/app/javascript/vue/components/Form/FormCollectingEvent/const/components.js
index 9d9a2ad58e..6deac717ca 100644
--- a/app/javascript/vue/components/Form/FormCollectingEvent/const/components.js
+++ b/app/javascript/vue/components/Form/FormCollectingEvent/const/components.js
@@ -8,7 +8,7 @@ import Latitude from '../components/verbatim/Latitude.vue'
 import Locality from '../components/verbatim/Locality.vue'
 import Longitude from '../components/verbatim/Longitude.vue'
 import Method from '../components/verbatim/Method.vue'
-import TripIdentifier from '../components/verbatim/TripIdentifier.vue'
+import FieldNumber from '../components/verbatim/FieldNumber.vue'
 import Dates from '../components/parsed/Dates.vue'
 import Elevation from '../components/parsed/Elevation.vue'
 import GeographicArea from '../components/parsed/GeographicArea.vue'
@@ -36,7 +36,7 @@ const ComponentVerbatim = {
   Datum: 'Datum',
   Collectors: 'Collectors',
   Method: 'Method',
-  TripIdentifier: 'TripIdentifier'
+  FieldNumber: 'FieldNumber'
 }
 
 const ComponentParse = {
@@ -70,7 +70,7 @@ const VueComponents = {
   [ComponentVerbatim.VerbatimElevation]: VerbatimElevation,
   [ComponentVerbatim.Datum]: Datum,
   [ComponentVerbatim.Method]: Method,
-  [ComponentVerbatim.TripIdentifier]: TripIdentifier,
+  [ComponentVerbatim.FieldNumber]: FieldNumber,
   [ComponentParse.Dates]: Dates,
   [ComponentParse.Elevation]: Elevation,
   [ComponentParse.GeographicArea]: GeographicArea,
diff --git a/app/javascript/vue/components/Form/FormCollectingEvent/helpers/verbatimProperties.js b/app/javascript/vue/components/Form/FormCollectingEvent/helpers/verbatimProperties.js
index 66235bc7c8..f78c445c9e 100644
--- a/app/javascript/vue/components/Form/FormCollectingEvent/helpers/verbatimProperties.js
+++ b/app/javascript/vue/components/Form/FormCollectingEvent/helpers/verbatimProperties.js
@@ -9,5 +9,5 @@ export const verbatimProperties = {
   DateComponent: 'verbatim_date',
   Collectors: 'verbatim_collectors',
   Method: 'verbatim_method',
-  TripIdentifier: 'verbatim_trip_identifier'
+  FieldNumber: 'verbatim_field_number'
 }
diff --git a/app/javascript/vue/components/radials/ce/components/VerbatimSlice.vue b/app/javascript/vue/components/radials/ce/components/VerbatimSlice.vue
index 477034ac8e..e9ffdab927 100644
--- a/app/javascript/vue/components/radials/ce/components/VerbatimSlice.vue
+++ b/app/javascript/vue/components/radials/ce/components/VerbatimSlice.vue
@@ -86,7 +86,7 @@ const VERBATIM_FIELDS = {
   verbatim_datum: 'input',
   verbatim_collectors: 'textarea',
   verbatim_method: 'input',
-  verbatim_trip_identifier: 'input'
+  verbatim_field_number: 'input'
 }
 
 const props = defineProps({
diff --git a/app/javascript/vue/factory/CollectingEvent.js b/app/javascript/vue/factory/CollectingEvent.js
index 3bcbcafafb..9d6239d761 100644
--- a/app/javascript/vue/factory/CollectingEvent.js
+++ b/app/javascript/vue/factory/CollectingEvent.js
@@ -10,7 +10,7 @@ export default () => ({
   verbatim_longitude: undefined,
   verbatim_latitude: undefined,
   verbatim_geolocation_uncertainty: undefined,
-  verbatim_trip_identifier: undefined,
+  verbatim_field_number: undefined,
   verbatim_collectors: undefined,
   verbatim_method: undefined,
   verbatim_habitat: undefined,
diff --git a/app/javascript/vue/routes/endpoints/CollectingEvents.js b/app/javascript/vue/routes/endpoints/CollectingEvents.js
index 64e94ee16d..06da581038 100644
--- a/app/javascript/vue/routes/endpoints/CollectingEvents.js
+++ b/app/javascript/vue/routes/endpoints/CollectingEvents.js
@@ -14,7 +14,7 @@ const permitParams = {
     verbatim_longitude: String,
     verbatim_latitude: String,
     verbatim_geolocation_uncertainty: String,
-    verbatim_trip_identifier: String,
+    verbatim_field_number: String,
     verbatim_collectors: String,
     verbatim_method: String,
     geographic_area_id: String,
diff --git a/app/javascript/vue/shared/Filter/constants/collectingEvent.js b/app/javascript/vue/shared/Filter/constants/collectingEvent.js
index 916551a4c1..0c6464668b 100644
--- a/app/javascript/vue/shared/Filter/constants/collectingEvent.js
+++ b/app/javascript/vue/shared/Filter/constants/collectingEvent.js
@@ -8,7 +8,7 @@ export const COLLECTING_EVENT_PROPERTIES = [
   'verbatim_longitude',
   'verbatim_latitude',
   'verbatim_geolocation_uncertainty',
-  'verbatim_trip_identifier',
+  'verbatim_field_number',
   'verbatim_collectors',
   'verbatim_method',
   'geographic_area_id',
diff --git a/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/map/PrintLabel.vue b/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/map/PrintLabel.vue
index efa88797d3..2d6bd0c900 100644
--- a/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/map/PrintLabel.vue
+++ b/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/map/PrintLabel.vue
@@ -124,7 +124,7 @@ export default {
         ...this.generateParsedLabel()
       )
 
-      const AtStart = ['TripIdentifier', 'TripCode']
+      const AtStart = ['FieldNumber', 'TripCode']
 
       const sortedObjectLabelKeys = sortArrayByArray(
         Object.keys(objectLabels),
diff --git a/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/TripIdentifier.vue b/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/TripIdentifier.vue
index cd5d71da4a..a6c70a8671 100644
--- a/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/TripIdentifier.vue
+++ b/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/TripIdentifier.vue
@@ -5,7 +5,7 @@
       class="full_width"
       type="text"
       rows="3"
-      v-model="collectingEvent.verbatim_trip_identifier"
+      v-model="collectingEvent.verbatim_field_number"
     />
   </div>
 </template>
diff --git a/app/javascript/vue/tasks/collecting_events/new_collecting_event/const/components.js b/app/javascript/vue/tasks/collecting_events/new_collecting_event/const/components.js
index 9d9a2ad58e..6deac717ca 100644
--- a/app/javascript/vue/tasks/collecting_events/new_collecting_event/const/components.js
+++ b/app/javascript/vue/tasks/collecting_events/new_collecting_event/const/components.js
@@ -8,7 +8,7 @@ import Latitude from '../components/verbatim/Latitude.vue'
 import Locality from '../components/verbatim/Locality.vue'
 import Longitude from '../components/verbatim/Longitude.vue'
 import Method from '../components/verbatim/Method.vue'
-import TripIdentifier from '../components/verbatim/TripIdentifier.vue'
+import FieldNumber from '../components/verbatim/FieldNumber.vue'
 import Dates from '../components/parsed/Dates.vue'
 import Elevation from '../components/parsed/Elevation.vue'
 import GeographicArea from '../components/parsed/GeographicArea.vue'
@@ -36,7 +36,7 @@ const ComponentVerbatim = {
   Datum: 'Datum',
   Collectors: 'Collectors',
   Method: 'Method',
-  TripIdentifier: 'TripIdentifier'
+  FieldNumber: 'FieldNumber'
 }
 
 const ComponentParse = {
@@ -70,7 +70,7 @@ const VueComponents = {
   [ComponentVerbatim.VerbatimElevation]: VerbatimElevation,
   [ComponentVerbatim.Datum]: Datum,
   [ComponentVerbatim.Method]: Method,
-  [ComponentVerbatim.TripIdentifier]: TripIdentifier,
+  [ComponentVerbatim.FieldNumber]: FieldNumber,
   [ComponentParse.Dates]: Dates,
   [ComponentParse.Elevation]: Elevation,
   [ComponentParse.GeographicArea]: GeographicArea,
diff --git a/app/javascript/vue/tasks/collecting_events/new_collecting_event/helpers/verbatimProperties.js b/app/javascript/vue/tasks/collecting_events/new_collecting_event/helpers/verbatimProperties.js
index 66235bc7c8..f78c445c9e 100644
--- a/app/javascript/vue/tasks/collecting_events/new_collecting_event/helpers/verbatimProperties.js
+++ b/app/javascript/vue/tasks/collecting_events/new_collecting_event/helpers/verbatimProperties.js
@@ -9,5 +9,5 @@ export const verbatimProperties = {
   DateComponent: 'verbatim_date',
   Collectors: 'verbatim_collectors',
   Method: 'verbatim_method',
-  TripIdentifier: 'verbatim_trip_identifier'
+  FieldNumber: 'verbatim_field_number'
 }
diff --git a/app/javascript/vue/tasks/collection_objects/filter/constants/layouts.js b/app/javascript/vue/tasks/collection_objects/filter/constants/layouts.js
index c5ef3b9860..a69534c8e5 100644
--- a/app/javascript/vue/tasks/collection_objects/filter/constants/layouts.js
+++ b/app/javascript/vue/tasks/collection_objects/filter/constants/layouts.js
@@ -187,7 +187,7 @@ export const LAYOUTS = {
         'verbatim_longitude',
         'verbatim_latitude',
         'verbatim_geolocation_uncertainty',
-        'verbatim_trip_identifier',
+        'verbatim_field_number',
         'verbatim_collectors',
         'verbatim_method',
         'verbatim_elevation',
diff --git a/app/javascript/vue/tasks/digitize/components/collectingEvent/components/map/printLabel.vue b/app/javascript/vue/tasks/digitize/components/collectingEvent/components/map/printLabel.vue
index c43f16f50e..4c35ee7816 100644
--- a/app/javascript/vue/tasks/digitize/components/collectingEvent/components/map/printLabel.vue
+++ b/app/javascript/vue/tasks/digitize/components/collectingEvent/components/map/printLabel.vue
@@ -124,7 +124,7 @@ export default {
         ...this.generateParsedLabel()
       )
 
-      const AtStart = ['TripIdentifier', 'TripCode']
+      const AtStart = ['FieldNumber', 'TripCode']
 
       const sortedObjectLabelKeys = sortArrayByArray(
         Object.keys(objectLabels),
diff --git a/app/javascript/vue/tasks/digitize/components/collectingEvent/components/verbatim/tripIdentifier.vue b/app/javascript/vue/tasks/digitize/components/collectingEvent/components/verbatim/tripIdentifier.vue
index e9b0309c13..5a33255f54 100644
--- a/app/javascript/vue/tasks/digitize/components/collectingEvent/components/verbatim/tripIdentifier.vue
+++ b/app/javascript/vue/tasks/digitize/components/collectingEvent/components/verbatim/tripIdentifier.vue
@@ -3,7 +3,7 @@
     <label>Trip identifier</label>
     <input
       type="text"
-      v-model="collectingEvent.verbatim_trip_identifier"
+      v-model="collectingEvent.verbatim_field_number"
       @change="updateChange"
     />
   </div>
diff --git a/app/javascript/vue/tasks/digitize/const/components.js b/app/javascript/vue/tasks/digitize/const/components.js
index b9b58d61b8..dfeca4bef8 100644
--- a/app/javascript/vue/tasks/digitize/const/components.js
+++ b/app/javascript/vue/tasks/digitize/const/components.js
@@ -3,7 +3,7 @@ import Label from '../components/collectingEvent/components/verbatim/label.vue'
 import DateComponent from '../components/collectingEvent/components/verbatim/date.vue'
 import Datum from '../components/collectingEvent/components/verbatim/datum.vue'
 import VerbatimElevation from '../components/collectingEvent/components/verbatim/elevation.vue'
-import TripIdentifier from '../components/collectingEvent/components/verbatim/tripIdentifier.vue'
+import FieldNumber from '../components/collectingEvent/components/verbatim/tripIdentifier.vue'
 import Geolocation from '../components/collectingEvent/components/verbatim/geolocationUncertainty.vue'
 import Habitat from '../components/collectingEvent/components/verbatim/habitat.vue'
 import Latitude from '../components/collectingEvent/components/verbatim/latitude.vue'
@@ -48,7 +48,7 @@ const ComponentVerbatim = {
   Datum: 'Datum',
   Collectors: 'Collectors',
   Method: 'Method',
-  TripIdentifier: 'TripIdentifier'
+  FieldNumber: 'FieldNumber'
 }
 
 const ComponentParse = {
@@ -83,7 +83,7 @@ const VueComponents = {
   [ComponentVerbatim.DateComponent]: DateComponent,
   [ComponentVerbatim.Datum]: Datum,
   [ComponentVerbatim.Method]: Method,
-  [ComponentVerbatim.TripIdentifier]: TripIdentifier,
+  [ComponentVerbatim.FieldNumber]: FieldNumber,
   [ComponentParse.Dates]: Dates,
   [ComponentParse.Elevation]: Elevation,
   [ComponentParse.GeographicArea]: GeographicArea,
diff --git a/app/models/collecting_event.rb b/app/models/collecting_event.rb
index 31c1753164..5ed3aaeb9b 100644
--- a/app/models/collecting_event.rb
+++ b/app/models/collecting_event.rb
@@ -31,7 +31,7 @@
 #   @return [String]
 #   A string, typically sliced from verbatim_label, that represents the provided uncertainty value.
 #
-# @!attribute verbatim_trip_identifier
+# @!attribute verbatim_field_number
 #   @return [String]
 #      the literal string/identifier used by the collector(s) to identify this particular collecting event, usually part of a series particular to one trip
 #
@@ -295,13 +295,13 @@ class CollectingEvent < ApplicationRecord
 
   validates_presence_of :geographic_area_id, if: -> { meta_prioritize_geographic_area }
 
-  validate :verbatim_trip_identifier_syncronized
+  validate :verbatim_field_number_syncronized
 
-  def verbatim_trip_identifier_syncronized
-    if verbatim_trip_identifier.present? 
+  def verbatim_field_number_syncronized
+    if verbatim_field_number.present?
       if i = identifiers.where(type: 'Identifier::Local::FieldNumber').first
-        if i.cached != verbatim_trip_identifier
-          errors.add(:verbatim_trip_identifier, 'does not match the FieldNumber identifier attached to record')
+        if i.cached != verbatim_field_number
+          errors.add(:verbatim_field_number, 'does not match the FieldNumber identifier attached to record')
         end
       end
     end
@@ -332,7 +332,7 @@ def verbatim_trip_identifier_syncronized
     description: 'Georaphic area is missing')
 
   def dwc_occurrences
-    # THrough CollectionObjects
+    # Through CollectionObjects
     DwcOccurrence
       .joins("JOIN collection_objects co on dwc_occurrence_object_id = co.id AND dwc_occurrence_object_type = 'CollectionObject'")
       .where(co: {collecting_event_id: id})
@@ -1027,7 +1027,7 @@ def clone(annotations: false, incremented_identifier_id: nil)
           # not_georeference_attributes = %w{created_at updated_at project_id updated_by_id created_by_id collecting_event_id id position}
           georeferences.each do |g|
             i = g.dup
-          
+
             g.georeferencer_roles.each do |r|
               i.georeferencer_roles.build(person: r.person, position: r.position)
             end
@@ -1041,7 +1041,7 @@ def clone(annotations: false, incremented_identifier_id: nil)
           add_incremented_identifier(to_object: a, incremented_identifier_id:)
         end
 
-        if !annotations.blank? # TODO: boolean param this 
+        if !annotations.blank? # TODO: boolean param this
           clone_annotations(to_object: a, except: [:identifiers])
         end
 
diff --git a/app/models/collection_object/dwc_extensions.rb b/app/models/collection_object/dwc_extensions.rb
index b76506b323..df5679d21e 100644
--- a/app/models/collection_object/dwc_extensions.rb
+++ b/app/models/collection_object/dwc_extensions.rb
@@ -368,7 +368,7 @@ def dwc_sampling_protocol
   def dwc_field_number
     return nil unless collecting_event
     # Since we enforce that they are identical we can choose the former if present
-    collecting_event&.verbatim_trip_identifier || collecting_event.identifiers.where(type: 'Identifier::Local::FieldNumber').first&.cached
+    collecting_event&.verbatim_field_number || collecting_event.identifiers.where(type: 'Identifier::Local::FieldNumber').first&.cached
   end
 
   def dwc_event_id
diff --git a/app/models/dataset_record/darwin_core/occurrence.rb b/app/models/dataset_record/darwin_core/occurrence.rb
index 4a1fcba4fe..fc423ccaed 100644
--- a/app/models/dataset_record/darwin_core/occurrence.rb
+++ b/app/models/dataset_record/darwin_core/occurrence.rb
@@ -24,7 +24,7 @@ class DatasetRecord::DarwinCore::Occurrence < DatasetRecord::DarwinCore
       start_date_day start_date_month start_date_year end_date_day end_date_month end_date_year
       time_end_hour time_end_minute time_end_second time_start_hour time_start_minute time_start_second
       verbatim_collectors verbatim_date verbatim_datum verbatim_elevation verbatim_geolocation_uncertainty verbatim_habitat
-      verbatim_latitude verbatim_locality verbatim_longitude verbatim_method verbatim_trip_identifier
+      verbatim_latitude verbatim_locality verbatim_longitude verbatim_method verbatim_field_number
     ).to_set.freeze
   }.freeze
 
@@ -297,7 +297,7 @@ def import(dwc_data_attributes = {})
         #
         #       New rules:
         #         * No overlapping intended meanings, each maps to itself
-        #      
+        #
         event_id, field_number = get_field_value(:eventID), get_field_value(:fieldNumber)
         collecting_event_identifiers = []
         if event_id.present?
@@ -305,7 +305,7 @@ def import(dwc_data_attributes = {})
 
           # TODO: Shouldn't this be local?!
           identifier_type = Identifier::Global.descendants.detect { |c| c.name.downcase == event_id_namespace.downcase } if event_id_namespace
-          
+
           identifier_attributes = {
             identifier: event_id,
             identifier_object_type: 'CollectingEvent',
@@ -863,7 +863,7 @@ def parse_event_class
 
     # parentEventID: [Not mapped]
 
-    # fieldNumber: verbatim_trip_identifier & Identifier::Local::FieldNumber
+    # fieldNumber: verbatim_field_number & Identifier::Local::FieldNumber
 
     start_date, end_date = parse_iso_date(:eventDate)
 
diff --git a/app/models/identifier/local/field_number.rb b/app/models/identifier/local/field_number.rb
index d6460c6175..423d6e17d0 100644
--- a/app/models/identifier/local/field_number.rb
+++ b/app/models/identifier/local/field_number.rb
@@ -21,8 +21,8 @@ def dwc_occurrences
 
   def same_as_verbatim
     unless errors.any? || !identifier_object.present?
-      if identifier_object.verbatim_trip_identifier.present? && build_cached !=  identifier_object.verbatim_trip_identifier
-        errors.add(:identifier, 'not identical to CollectingEvent verbatim_trip_identifier')
+      if identifier_object.verbatim_field_number.present? && build_cached !=  identifier_object.verbatim_field_number
+        errors.add(:identifier, 'not identical to CollectingEvent verbatim_field_number')
       end
     end
   end
diff --git a/app/views/collecting_events/_attributes.html.erb b/app/views/collecting_events/_attributes.html.erb
index f74589028c..862d1fa047 100644
--- a/app/views/collecting_events/_attributes.html.erb
+++ b/app/views/collecting_events/_attributes.html.erb
@@ -63,7 +63,7 @@
 
   <p>
     <strong>Verbatim trip identifier:</strong>
-    <%= object.verbatim_trip_identifier %>
+    <%= object.verbatim_field_number %>
   </p>
 
   <p>
diff --git a/app/views/collecting_events/_attributes.json.jbuilder b/app/views/collecting_events/_attributes.json.jbuilder
index bb01b48be2..c2440f263f 100644
--- a/app/views/collecting_events/_attributes.json.jbuilder
+++ b/app/views/collecting_events/_attributes.json.jbuilder
@@ -1,6 +1,6 @@
 json.extract! collecting_event, :id,
   :verbatim_label, :print_label, :document_label,
-  :verbatim_locality, :verbatim_longitude, :verbatim_latitude, :verbatim_geolocation_uncertainty, :verbatim_trip_identifier, :verbatim_collectors, :verbatim_method,
+  :verbatim_locality, :verbatim_longitude, :verbatim_latitude, :verbatim_geolocation_uncertainty, :verbatim_field_number, :verbatim_collectors, :verbatim_method,
   :verbatim_elevation, :verbatim_habitat, :verbatim_datum, :verbatim_date,
   :geographic_area_id, :minimum_elevation, :maximum_elevation, :elevation_precision,
   :start_date_day, :start_date_month, :start_date_year, :end_date_day, :end_date_month, :end_date_year,
diff --git a/app/views/collecting_events/_card.html.erb b/app/views/collecting_events/_card.html.erb
index 65c3e55055..914b3c8a4f 100644
--- a/app/views/collecting_events/_card.html.erb
+++ b/app/views/collecting_events/_card.html.erb
@@ -10,13 +10,13 @@
       'Verbatim collectors:': object.verbatim_collectors,
       'Verbatim method:': object.verbatim_method,
       'Geographic area:': object_link(object.geographic_area),
-      'Verbatim trip identifier:': object.verbatim_trip_identifier,
+      'Verbatim trip identifier:': object.verbatim_field_number,
       'Field notes:': object.field_notes,
       'Verbatim date:': object.verbatim_date,
       'Verbatim habitat:': object.verbatim_habitat,
       'Verbatim label:': object.verbatim_label,
       'Verbatim elevation:': object.verbatim_elevation,
-      'Time start:': object.time_start, 
+      'Time start:': object.time_start,
       'Time end:': object.time_end,
       'Print label:': object.print_label,
       'Document label:': object.document_label
diff --git a/app/views/collecting_events/_form.html.erb b/app/views/collecting_events/_form.html.erb
index 7d8021e364..9b38672a60 100644
--- a/app/views/collecting_events/_form.html.erb
+++ b/app/views/collecting_events/_form.html.erb
@@ -22,11 +22,11 @@
 
   <%= content_tag(:li, link_to( "New", new_collecting_event_path,
       data: { confirm: "Leave this record? Changes will not be saved!"})) %>
-  
+
   <%= content_tag(:li, radial_annotator(@collecting_event)) -%>
 
   </ul>
-  <br/> 
+  <br/>
 <% end %>
 
 <%= form_for(@collecting_event, html: {id: :collecting_event_form}) do |f| %>
@@ -95,9 +95,9 @@
           <%= f.text_field :verbatim_geolocation_uncertainty %>
         </div>
         <div class="field">
-          <%= f.label :verbatim_trip_identifier %>
+          <%= f.label :verbatim_field_number %>
           <br>
-          <%= f.text_field :verbatim_trip_identifier,  size: 35 %>
+          <%= f.text_field :verbatim_field_number,  size: 35 %>
         </div>
 
         <div class="field">
diff --git a/app/views/collecting_events/api/v1/_attributes.json.jbuilder b/app/views/collecting_events/api/v1/_attributes.json.jbuilder
index 5d902629f2..8238eda933 100644
--- a/app/views/collecting_events/api/v1/_attributes.json.jbuilder
+++ b/app/views/collecting_events/api/v1/_attributes.json.jbuilder
@@ -1,26 +1,26 @@
-json.extract! collecting_event, :id, 
-  :verbatim_label, :print_label, :document_label, 
-  :verbatim_locality, :verbatim_longitude, :verbatim_latitude, :verbatim_geolocation_uncertainty, :verbatim_trip_identifier, :verbatim_collectors, :verbatim_method, 
+json.extract! collecting_event, :id,
+  :verbatim_label, :print_label, :document_label,
+  :verbatim_locality, :verbatim_longitude, :verbatim_latitude, :verbatim_geolocation_uncertainty, :verbatim_field_number, :verbatim_collectors, :verbatim_method,
   :verbatim_elevation, :verbatim_habitat, :verbatim_datum, :verbatim_date,
-  :geographic_area_id, :minimum_elevation, :maximum_elevation, :elevation_precision, 
+  :geographic_area_id, :minimum_elevation, :maximum_elevation, :elevation_precision,
   :start_date_day, :start_date_month, :start_date_year, :end_date_day, :end_date_month, :end_date_year,
   :time_start_hour,
-  :time_start_minute,  
-  :time_start_second, 
-  :time_end_hour,      
-  :time_end_minute,    
-  :time_end_second, 
+  :time_start_minute,
+  :time_start_second,
+  :time_end_hour,
+  :time_end_minute,
+  :time_end_second,
   :field_notes, :md5_of_verbatim_label,
   :min_ma, :max_ma,
-  :cached, 
+  :cached,
   :cached_level0_geographic_name,
   :cached_level1_geographic_name,
   :cached_level2_geographic_name,
   :group,
   :formation,
-  :member,   
+  :member,
   :lithology,
-  :max_ma,  
+  :max_ma,
   :min_ma,
   :identifiers,
   :created_by_id, :updated_by_id, :project_id, :created_at, :updated_at
@@ -35,7 +35,5 @@ if extend_response_with('roles')
         json.partial! '/people/api/v1/brief', person: role.person
       end
     end
-  end 
+  end
 end
-
-
diff --git a/app/views/collecting_events/list.html.erb b/app/views/collecting_events/list.html.erb
index 9ea20b545c..8e8cc7b2c1 100644
--- a/app/views/collecting_events/list.html.erb
+++ b/app/views/collecting_events/list.html.erb
@@ -49,7 +49,7 @@
           <td><%= collecting_event.start_date_day %></td>
           <td><%= collecting_event.start_date_month %></td>
           <td><%= collecting_event.start_date_year %></td>
-    
+
           <!--<td><%#= collecting_event.verbatim_label %></td>-->
           <!--<td><%#= collecting_event.print_label %></td>-->
           <!--<td><%#= collecting_event.document_label %></td>-->
@@ -57,7 +57,7 @@
           <!--<td><%#= collecting_event.verbatim_longitude %></td>-->
           <!--<td><%#= collecting_event.verbatim_latitude %></td>-->
           <!--<td><%#= collecting_event.verbatim_geolocation_uncertainty %></td>-->
-          <!--<td><%#= collecting_event.verbatim_trip_identifier %></td>-->
+          <!--<td><%#= collecting_event.verbatim_field_number %></td>-->
           <!--<td><%#= collecting_event.minimum_elevation %></td>-->
           <!--<td><%#= collecting_event.maximum_elevation %></td>-->
           <!--<td><%#= collecting_event.elevation_precision %></td>-->
diff --git a/db/migrate/20240923211118_rename_collecting_event_verbatim_trip_code.rb b/db/migrate/20240923211118_rename_collecting_event_verbatim_trip_code.rb
new file mode 100644
index 0000000000..9f76c354bf
--- /dev/null
+++ b/db/migrate/20240923211118_rename_collecting_event_verbatim_trip_code.rb
@@ -0,0 +1,7 @@
+class RenameCollectingEventVerbatimTripCode < ActiveRecord::Migration[7.1]
+  def change
+    # Also verbatimTripIdentifier
+    # FieldIdentifier
+    rename_column :collecting_events, :verbatim_trip_identifier, :verbatim_field_number
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5899a9da89..87d8fd6741 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[7.1].define(version: 2024_09_23_143033) do
+ActiveRecord::Schema[7.1].define(version: 2024_09_23_211118) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gin"
   enable_extension "fuzzystrmatch"
@@ -293,7 +293,7 @@
     t.string "verbatim_longitude"
     t.string "verbatim_latitude"
     t.string "verbatim_geolocation_uncertainty"
-    t.string "verbatim_trip_identifier"
+    t.string "verbatim_field_number"
     t.string "verbatim_collectors"
     t.string "verbatim_method"
     t.integer "geographic_area_id"
diff --git a/lib/batch_load/import/collection_objects.rb b/lib/batch_load/import/collection_objects.rb
index baf27e0977..977ead3acb 100644
--- a/lib/batch_load/import/collection_objects.rb
+++ b/lib/batch_load/import/collection_objects.rb
@@ -123,7 +123,7 @@ def build_collection_objects
                            time_end_minute:                  nil,
                            time_end_second:                  nil,
                            verbatim_date:                    row['verbatim_date'],
-                           verbatim_trip_identifier:         nil,
+                           verbatim_field_number:         nil,
                            verbatim_collectors:              nil,
                            verbatim_label:                   nil,
                            document_label:                   nil,
diff --git a/lib/queries/collecting_event/autocomplete.rb b/lib/queries/collecting_event/autocomplete.rb
index 01840d6832..5050d72ced 100644
--- a/lib/queries/collecting_event/autocomplete.rb
+++ b/lib/queries/collecting_event/autocomplete.rb
@@ -29,8 +29,8 @@ def autocomplete_start_date_wild_card(field = :verbatim_locality)
         base_query.where( a.and(table[field].matches(b.join)).to_sql).limit(20)
       end
 
-      def autocomplete_verbatim_trip_identifier_match
-        base_query.where( table[:verbatim_trip_identifier].matches(end_wildcard).to_sql).limit(20)
+      def autocomplete_verbatim_field_number_match
+        base_query.where( table[:verbatim_field_number].matches(end_wildcard).to_sql).limit(20)
       end
 
       def autocomplete_verbatim_collectors_wildcard
@@ -80,7 +80,7 @@ def autocomplete
           autocomplete_identifier_identifier_exact,
           autocomplete_identifier_cached_exact,
           autocomplete_identifier_cached_like.limit(4),
-          autocomplete_verbatim_trip_identifier_match,
+          autocomplete_verbatim_field_number_match,
           autocomplete_start_or_end_date,
           autocomplete_start_date_wild_card(:verbatim_locality),
           autocomplete_start_date_wild_card(:cached),
diff --git a/spec/lib/queries/collecting_event/autocomplete_spec.rb b/spec/lib/queries/collecting_event/autocomplete_spec.rb
index af5e932d2c..1e6f013573 100644
--- a/spec/lib/queries/collecting_event/autocomplete_spec.rb
+++ b/spec/lib/queries/collecting_event/autocomplete_spec.rb
@@ -12,7 +12,7 @@
 
   let!(:ce2) { CollectingEvent.create(
     verbatim_locality: 'Out there, under the stars',
-    verbatim_trip_identifier: 'Foo manchu',
+    verbatim_field_number: 'Foo manchu',
     start_date_year: 2000,
     start_date_month: 2,
     start_date_day: 19,
@@ -68,9 +68,9 @@
     expect(query.autocomplete_verbatim_locality_wildcard_end).to eq(nil)
   end
 
-  specify '#autocomplete_verbatim_trip_identifier_match (:cached)' do
+  specify '#autocomplete_verbatim_field_number_match (:cached)' do
     query.terms = 'foo manchu'
-    expect(query.autocomplete_verbatim_trip_identifier_match.map(&:id)).to contain_exactly(ce2.id)
+    expect(query.autocomplete_verbatim_field_number_match.map(&:id)).to contain_exactly(ce2.id)
   end
 
   specify '#autocomplete_identifier_cached_exact' do
diff --git a/spec/lib/queries/collecting_event/filter_spec.rb b/spec/lib/queries/collecting_event/filter_spec.rb
index ede9cd4baf..df0cace4ba 100644
--- a/spec/lib/queries/collecting_event/filter_spec.rb
+++ b/spec/lib/queries/collecting_event/filter_spec.rb
@@ -13,7 +13,7 @@
 
   let!(:ce2) { CollectingEvent.create(
     verbatim_locality: 'Out there, under the stars',
-    verbatim_trip_identifier: 'Foo manchu',
+    verbatim_field_number: 'Foo manchu',
     start_date_year: 2000,
     start_date_month: 2,
     start_date_day: 18,
diff --git a/spec/lib/queries/collection_object/filter_spec.rb b/spec/lib/queries/collection_object/filter_spec.rb
index efab75efbb..2d9fffa4ab 100644
--- a/spec/lib/queries/collection_object/filter_spec.rb
+++ b/spec/lib/queries/collection_object/filter_spec.rb
@@ -396,7 +396,7 @@
 
     let(:ce2) { CollectingEvent.create(
       verbatim_locality: 'Out there, under the stars',
-      verbatim_trip_identifier: 'Foo manchu',
+      verbatim_field_number: 'Foo manchu',
       start_date_year: 2000,
       start_date_month: 2,
       start_date_day: 18,
diff --git a/spec/lib/queries/concerns/attributes_spec.rb b/spec/lib/queries/concerns/attributes_spec.rb
index 09a8850d15..7b421ee579 100644
--- a/spec/lib/queries/concerns/attributes_spec.rb
+++ b/spec/lib/queries/concerns/attributes_spec.rb
@@ -13,7 +13,7 @@
 
   let!(:ce2) { CollectingEvent.create(
     verbatim_locality: 'Out there, under the stars',
-    verbatim_trip_identifier: 'Foo manchu',
+    verbatim_field_number: 'Foo manchu',
     start_date_year: 2000,
     start_date_month: 2,
     start_date_day: 18,
diff --git a/spec/models/collecting_event_spec.rb b/spec/models/collecting_event_spec.rb
index 0925c950eb..dedae65a49 100644
--- a/spec/models/collecting_event_spec.rb
+++ b/spec/models/collecting_event_spec.rb
@@ -6,7 +6,7 @@
   let(:state) { county.parent }
   let(:country) { state.parent }
 
-  specify '#verbatim_trip_identifier matches Identifier' do
+  specify '#verbatim_field_number matches Identifier' do
     collecting_event.verbatim_label = 'All the stuff'
     collecting_event.save!
 
@@ -16,8 +16,8 @@
       identifier: '1'
     )
 
-    collecting_event.update(verbatim_trip_identifier: '2')
-    expect(collecting_event.errors.key?(:verbatim_trip_identifier)).to be_truthy
+    collecting_event.update(verbatim_field_number: '2')
+    expect(collecting_event.errors.key?(:verbatim_field_number)).to be_truthy
   end
 
   # Added as a context for exploring re-indexing DwC based on DataAttribute updates
diff --git a/spec/models/dataset_record/darwin_core/occurrence_spec.rb b/spec/models/dataset_record/darwin_core/occurrence_spec.rb
index 43adc5deb8..f6591a92d0 100644
--- a/spec/models/dataset_record/darwin_core/occurrence_spec.rb
+++ b/spec/models/dataset_record/darwin_core/occurrence_spec.rb
@@ -134,7 +134,7 @@
     end
 
     it 'does not populate verbatim fields by default' do
-      expect(CollectingEvent.first.verbatim_trip_identifier).to eq(nil)
+      expect(CollectingEvent.first.verbatim_field_number).to eq(nil)
     end
   end
 
diff --git a/spec/models/identifier/local/field_number_spec.rb b/spec/models/identifier/local/field_number_spec.rb
index 290cddf77f..c94045b99b 100644
--- a/spec/models/identifier/local/field_number_spec.rb
+++ b/spec/models/identifier/local/field_number_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 describe Identifier::Local::FieldNumber, type: :model, group: :identifiers do
 
-  let(:n) { FactoryBot.create(:valid_namespace, short_name: 'NS', delimiter: nil) } 
+  let(:n) { FactoryBot.create(:valid_namespace, short_name: 'NS', delimiter: nil) }
 
   specify 'assigned to CollectingEvent only 1' do
     i = Identifier::Local::FieldNumber.create(identifier: '345', namespace: n, identifier_object: Specimen.create!)
@@ -13,12 +13,12 @@
     expect(i.errors.key?(:identifier_object_type)).to be_falsey
   end
 
-  specify 'must be same as verbatim_trip_identifier if provided' do
-    c = FactoryBot.create(:valid_collecting_event, verbatim_trip_identifier: 'NS345')
+  specify 'must be same as verbatim_field_number if provided' do
+    c = FactoryBot.create(:valid_collecting_event, verbatim_field_number: 'NS345')
 
     i = Identifier::Local::FieldNumber.new(identifier: '345', namespace: n, identifier_object: c)
     expect(i.valid?).to be_falsey
     expect(i.errors.key?(:identifier)).to be_truthy
   end
-  
+
 end

From 08cb9fe91d1042d312bc1d3830f7c7c34a93db13 Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Mon, 23 Sep 2024 18:42:54 -0300
Subject: [PATCH 14/25] Fix renamed files

---
 .../verbatim/{TripIdentifier.vue => FieldNumber.vue}      | 8 ++++++--
 .../verbatim/{TripIdentifier.vue => FieldNumber.vue}      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/{TripIdentifier.vue => FieldNumber.vue} (67%)
 rename app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/{TripIdentifier.vue => FieldNumber.vue} (88%)

diff --git a/app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/TripIdentifier.vue b/app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/FieldNumber.vue
similarity index 67%
rename from app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/TripIdentifier.vue
rename to app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/FieldNumber.vue
index e3f1dce4e3..d3206fad2c 100644
--- a/app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/TripIdentifier.vue
+++ b/app/javascript/vue/components/Form/FormCollectingEvent/components/verbatim/FieldNumber.vue
@@ -1,12 +1,16 @@
 <template>
   <div class="field label-above">
-    <label>Trip identifier</label>
+    <label>Field number</label>
     <textarea
       class="full_width"
       type="text"
       rows="3"
       v-model="collectingEvent.verbatim_field_number"
-      @change="() => { collectingEvent.isUnsaved = true }"
+      @change="
+        () => {
+          collectingEvent.isUnsaved = true
+        }
+      "
     />
   </div>
 </template>
diff --git a/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/TripIdentifier.vue b/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/FieldNumber.vue
similarity index 88%
rename from app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/TripIdentifier.vue
rename to app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/FieldNumber.vue
index a6c70a8671..636636c038 100644
--- a/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/TripIdentifier.vue
+++ b/app/javascript/vue/tasks/collecting_events/new_collecting_event/components/verbatim/FieldNumber.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="field label-above">
-    <label>Trip identifier</label>
+    <label>Field number</label>
     <textarea
       class="full_width"
       type="text"

From e0d770e5d39a3657647aeb4cecae666230deb207 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Mon, 23 Sep 2024 16:51:26 -0500
Subject: [PATCH 15/25] Add `is_public` boolean, refactor keys inventory format

---
 .../20240923214129_add_is_public_to_observation_matrix.rb    | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 db/migrate/20240923214129_add_is_public_to_observation_matrix.rb

diff --git a/db/migrate/20240923214129_add_is_public_to_observation_matrix.rb b/db/migrate/20240923214129_add_is_public_to_observation_matrix.rb
new file mode 100644
index 0000000000..409629fe71
--- /dev/null
+++ b/db/migrate/20240923214129_add_is_public_to_observation_matrix.rb
@@ -0,0 +1,5 @@
+class AddIsPublicToObservationMatrix < ActiveRecord::Migration[7.1]
+  def change
+    add_column :observation_matrices, :is_public, :boolean
+  end
+end

From 92a64268e4e828b13c3d7cae9138dc3334ef7003 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Mon, 23 Sep 2024 16:53:04 -0500
Subject: [PATCH 16/25] Permit is_public param for observation matrix;
 *actually* refactor keys response

---
 CHANGELOG.md                                       |  1 +
 app/controllers/observation_matrices_controller.rb |  3 ++-
 app/helpers/otus_helper.rb                         | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e1715dfaa..9a0937dea2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 - `/api/v1/otus/:id/inventory/keys` a list of keys scoped to or containing the Otu
 - `otu_id` to ObservationMatrix, to facilitate setting scope and indexing of multi-entry keys
+- `is_public` flag to ObservationMatrix
 
 ### Changed
 
diff --git a/app/controllers/observation_matrices_controller.rb b/app/controllers/observation_matrices_controller.rb
index 3ee5771852..b0aa8390a9 100644
--- a/app/controllers/observation_matrices_controller.rb
+++ b/app/controllers/observation_matrices_controller.rb
@@ -356,7 +356,8 @@ def set_observation_matrix
   def observation_matrix_params
     params.require(:observation_matrix).permit(
       :name,
-      :otu_id
+      :otu_id,
+      :is_public
     )
   end
 
diff --git a/app/helpers/otus_helper.rb b/app/helpers/otus_helper.rb
index 4a0612c737..f22dbbbd12 100644
--- a/app/helpers/otus_helper.rb
+++ b/app/helpers/otus_helper.rb
@@ -348,15 +348,15 @@ def dwc_gallery_data(otu)
     r
   end
 
-  def otu_key_inventory(otu)
+  def otu_key_inventory(otu, is_public: true)
     return {
       observation_matrices: {
-        scoped: otu.in_scope_observation_matrices.pluck(:id) || [] ,
-        in: otu.observation_matrices.pluck(:id) || [] ,
+        scoped: otu.in_scope_observation_matrices.where(is_public:).select(:id, :name).inject({}){|hsh, m| hsh[m.id] = m.name; hsh;} || {} ,
+        in: otu.observation_matrices.where(is_public:).select(:id, :name).inject({}){|hsh, m| hsh[m.id] = m.name; hsh;} || {},
       },
       leads: {
-        scoped: otu.leads.where(parent_id: nil).pluck(:id) || [],
-        in:  otu.leads.where.not(parent_id: nil).pluck(:id)  || [],
+        scoped: otu.leads.where(parent_id: nil, is_public:).select(:id, :text).inject({}){|hsh, m| hsh[m.id] = m.text; hsh;} || {},
+        in:  otu.leads.where.not(parent_id: nil).where(is_public: true).select(:id, :text).inject({}){|hsh, m| hsh[m.id] = m.text; hsh;} || {},
       }
     }
   end

From 6df06ba7407ee8a7a16b19c813c7fd341fb9e7a4 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Tue, 24 Sep 2024 06:10:39 -0500
Subject: [PATCH 17/25] CVrbatim field number labell changes

---
 .../components/settings/Occurrences/OccurrenceSettings.vue      | 2 +-
 app/views/collecting_events/_attributes.html.erb                | 2 +-
 app/views/collecting_events/_card.html.erb                      | 2 +-
 app/views/collecting_events/list.html.erb                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/vue/tasks/dwca_import/components/settings/Occurrences/OccurrenceSettings.vue b/app/javascript/vue/tasks/dwca_import/components/settings/Occurrences/OccurrenceSettings.vue
index 118e43148f..9d56abe453 100644
--- a/app/javascript/vue/tasks/dwca_import/components/settings/Occurrences/OccurrenceSettings.vue
+++ b/app/javascript/vue/tasks/dwca_import/components/settings/Occurrences/OccurrenceSettings.vue
@@ -36,7 +36,7 @@ const OCCURRENCE_CHECKBOX_SETTINGS = {
   require_type_material_success:
     'Error records with unprocessable typeStatus information',
   require_tripcode_match_verbatim:
-    'Error records when computed Trip code will not match fieldNumber',
+    'Error records when computed verbatim Field number will not match fieldNumber',
   require_catalog_number_match_verbatim:
     'Error records when computed identifier will not match catalogNumber',
   enable_organization_determiners:
diff --git a/app/views/collecting_events/_attributes.html.erb b/app/views/collecting_events/_attributes.html.erb
index 862d1fa047..8388dc4905 100644
--- a/app/views/collecting_events/_attributes.html.erb
+++ b/app/views/collecting_events/_attributes.html.erb
@@ -62,7 +62,7 @@
   </p>
 
   <p>
-    <strong>Verbatim trip identifier:</strong>
+    <strong>Verbatim field number:</strong>
     <%= object.verbatim_field_number %>
   </p>
 
diff --git a/app/views/collecting_events/_card.html.erb b/app/views/collecting_events/_card.html.erb
index 914b3c8a4f..77082c2dda 100644
--- a/app/views/collecting_events/_card.html.erb
+++ b/app/views/collecting_events/_card.html.erb
@@ -10,7 +10,7 @@
       'Verbatim collectors:': object.verbatim_collectors,
       'Verbatim method:': object.verbatim_method,
       'Geographic area:': object_link(object.geographic_area),
-      'Verbatim trip identifier:': object.verbatim_field_number,
+      'Verbatim field number:': object.verbatim_field_number,
       'Field notes:': object.field_notes,
       'Verbatim date:': object.verbatim_date,
       'Verbatim habitat:': object.verbatim_habitat,
diff --git a/app/views/collecting_events/list.html.erb b/app/views/collecting_events/list.html.erb
index 8e8cc7b2c1..93f7d70e37 100644
--- a/app/views/collecting_events/list.html.erb
+++ b/app/views/collecting_events/list.html.erb
@@ -10,7 +10,7 @@
     <!--<th>Verbatim longitude</th>-->
     <!--<th>Verbatim latitude</th>-->
     <!--<th>Verbatim geolocation uncertainty</th>-->
-    <!--<th>Verbatim trip identifier</th>-->
+    <!--<th>Verbatim field number</th>-->
     <!--<th>Verbatim method</th>-->
     <!--<th>Minimum elevation</th>-->
     <!--<th>Maximum elevation</th>-->

From ae75c223b8dcbaf0e80107aa5df8645de8e9ea5a Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Tue, 24 Sep 2024 15:43:40 -0300
Subject: [PATCH 18/25] Add is_public to new observation matrix

---
 .../vue/routes/endpoints/ObservationMatrix.js |  3 ++-
 .../new/components/Matrix/MatrixForm.vue      | 20 +++++++++----------
 .../observation_matrices/new/const/modes.js   |  9 +++++++++
 .../new/store/actions/saveMatrix.js           |  3 ++-
 .../observation_matrices/new/store/store.js   |  9 ++++-----
 .../_attributes.json.jbuilder                 |  2 +-
 6 files changed, 28 insertions(+), 18 deletions(-)
 create mode 100644 app/javascript/vue/tasks/observation_matrices/new/const/modes.js

diff --git a/app/javascript/vue/routes/endpoints/ObservationMatrix.js b/app/javascript/vue/routes/endpoints/ObservationMatrix.js
index a0d2c6b698..619fb684eb 100644
--- a/app/javascript/vue/routes/endpoints/ObservationMatrix.js
+++ b/app/javascript/vue/routes/endpoints/ObservationMatrix.js
@@ -5,7 +5,8 @@ const controller = 'observation_matrices'
 const permitParams = {
   observation_matrix: {
     name: String,
-    otu_id: Number
+    otu_id: Number,
+    is_public: Boolean
   }
 }
 
diff --git a/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixForm.vue b/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixForm.vue
index 0a08c66907..ec89a7ad24 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixForm.vue
+++ b/app/javascript/vue/tasks/observation_matrices/new/components/Matrix/MatrixForm.vue
@@ -23,6 +23,15 @@
         </div>
       </div>
       <MatrixParent class="field" />
+      <div class="field">
+        <label>
+          <input
+            type="checkbox"
+            v-model="matrix.is_public"
+          />
+          Is public
+        </label>
+      </div>
       <template v-if="matrix.id">
         <hr />
         <div>
@@ -42,6 +51,7 @@
 </template>
 
 <script setup>
+import { MATRIX_MODE, MATRIX_VIEW } from '../../const/modes'
 import { MutationNames } from '../../store/mutations/mutations'
 import { GetterNames } from '../../store/getters/getters'
 import { ActionNames } from '../../store/actions/actions'
@@ -53,16 +63,6 @@ import VBtn from '@/components/ui/VBtn/index.vue'
 
 const store = useStore()
 
-const MATRIX_VIEW = {
-  Column: 'column',
-  Row: 'row'
-}
-
-const MATRIX_MODE = {
-  Fixed: 'fixed',
-  Dynamic: 'dynamic'
-}
-
 const matrixName = computed({
   get: () => store.getters[GetterNames.GetMatrix].name,
 
diff --git a/app/javascript/vue/tasks/observation_matrices/new/const/modes.js b/app/javascript/vue/tasks/observation_matrices/new/const/modes.js
new file mode 100644
index 0000000000..6f7b46c329
--- /dev/null
+++ b/app/javascript/vue/tasks/observation_matrices/new/const/modes.js
@@ -0,0 +1,9 @@
+export const MATRIX_VIEW = {
+  Column: 'column',
+  Row: 'row'
+}
+
+export const MATRIX_MODE = {
+  Fixed: 'fixed',
+  Dynamic: 'dynamic'
+}
diff --git a/app/javascript/vue/tasks/observation_matrices/new/store/actions/saveMatrix.js b/app/javascript/vue/tasks/observation_matrices/new/store/actions/saveMatrix.js
index bcf1161b2d..34f66d8ecf 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/store/actions/saveMatrix.js
+++ b/app/javascript/vue/tasks/observation_matrices/new/store/actions/saveMatrix.js
@@ -5,7 +5,8 @@ export default ({ state }) => {
     observation_matrix: {
       id: state.matrix.id,
       name: state.matrix.name,
-      otu_id: state.matrix.otu_id
+      otu_id: state.matrix.otu_id,
+      is_public: state.matrix.is_public
     }
   }
 
diff --git a/app/javascript/vue/tasks/observation_matrices/new/store/store.js b/app/javascript/vue/tasks/observation_matrices/new/store/store.js
index a0ff60c3c2..2145b32cd5 100644
--- a/app/javascript/vue/tasks/observation_matrices/new/store/store.js
+++ b/app/javascript/vue/tasks/observation_matrices/new/store/store.js
@@ -2,6 +2,7 @@ import { createStore } from 'vuex'
 import { GetterFunctions } from './getters/getters'
 import { MutationFunctions } from './mutations/mutations'
 import { ActionFunctions } from './actions/actions'
+import { MATRIX_VIEW, MATRIX_MODE } from '../const/modes.js'
 
 function makeInitialState() {
   return {
@@ -23,8 +24,8 @@ function makeInitialState() {
     },
     columnFixedPagination: undefined,
     rowFixedPagination: undefined,
-    matrixView: 'row',
-    matrixMode: 'fixed',
+    matrixView: MATRIX_VIEW.Row,
+    matrixMode: MATRIX_MODE.Fixed,
     matrixRowItems: [],
     matrixColumnItems: [],
     matrixRowDynamicItems: [],
@@ -32,7 +33,7 @@ function makeInitialState() {
   }
 }
 
-function newStore() {
+export function newStore() {
   return createStore({
     state: makeInitialState(),
     getters: GetterFunctions,
@@ -40,5 +41,3 @@ function newStore() {
     actions: ActionFunctions
   })
 }
-
-export { newStore }
diff --git a/app/views/observation_matrices/_attributes.json.jbuilder b/app/views/observation_matrices/_attributes.json.jbuilder
index 6b9d26465e..d79d5d49bc 100644
--- a/app/views/observation_matrices/_attributes.json.jbuilder
+++ b/app/views/observation_matrices/_attributes.json.jbuilder
@@ -1,4 +1,4 @@
-json.extract! observation_matrix, :id, :name, :otu_id, :created_by_id, :updated_by_id, :project_id, :created_at, :updated_at
+json.extract! observation_matrix, :id, :name, :otu_id, :is_public, :created_by_id, :updated_by_id, :project_id, :created_at, :updated_at
 json.partial! '/shared/data/all/metadata', object: observation_matrix 
 json.is_media_matrix observation_matrix.is_media_matrix?
 

From 3301e8b0da66e84678dbc33f529b6750155793d7 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Tue, 24 Sep 2024 14:56:30 -0500
Subject: [PATCH 19/25] Revert field_number strict validation. Fix #4061

---
 CHANGELOG.md                         |  4 +++-
 app/models/collecting_event.rb       | 12 ------------
 db/schema.rb                         |  3 ++-
 spec/models/collecting_event_spec.rb | 14 --------------
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a0937dea2..e9575c38e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,10 +15,12 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ### Changed
 
+- Revert strict `verbatim_field_number` validation [#4061]
 - Renamed CollectingEvent `verbatim_trip_code` to `verbatim_field_number` [#4058]
 
+[#4061]: https://github.com/SpeciesFileGroup/taxonworks/issues/4061
 [#4058]: https://github.com/SpeciesFileGroup/taxonworks/issues/4058
- 
+
 
 ## [0.44.0] - 2024-09-17
 
diff --git a/app/models/collecting_event.rb b/app/models/collecting_event.rb
index 5ed3aaeb9b..25476913be 100644
--- a/app/models/collecting_event.rb
+++ b/app/models/collecting_event.rb
@@ -295,18 +295,6 @@ class CollectingEvent < ApplicationRecord
 
   validates_presence_of :geographic_area_id, if: -> { meta_prioritize_geographic_area }
 
-  validate :verbatim_field_number_syncronized
-
-  def verbatim_field_number_syncronized
-    if verbatim_field_number.present?
-      if i = identifiers.where(type: 'Identifier::Local::FieldNumber').first
-        if i.cached != verbatim_field_number
-          errors.add(:verbatim_field_number, 'does not match the FieldNumber identifier attached to record')
-        end
-      end
-    end
-  end
-
   soft_validate(
     :sv_minimally_check_for_a_label,
     set: :minimally_check_for_a_label,
diff --git a/db/schema.rb b/db/schema.rb
index 87d8fd6741..aacd756aae 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[7.1].define(version: 2024_09_23_211118) do
+ActiveRecord::Schema[7.1].define(version: 2024_09_23_214129) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gin"
   enable_extension "fuzzystrmatch"
@@ -1318,6 +1318,7 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.bigint "otu_id"
+    t.boolean "is_public"
     t.index ["created_by_id"], name: "index_observation_matrices_on_created_by_id"
     t.index ["name"], name: "index_observation_matrices_on_name"
     t.index ["otu_id"], name: "index_observation_matrices_on_otu_id"
diff --git a/spec/models/collecting_event_spec.rb b/spec/models/collecting_event_spec.rb
index dedae65a49..0419875948 100644
--- a/spec/models/collecting_event_spec.rb
+++ b/spec/models/collecting_event_spec.rb
@@ -6,20 +6,6 @@
   let(:state) { county.parent }
   let(:country) { state.parent }
 
-  specify '#verbatim_field_number matches Identifier' do
-    collecting_event.verbatim_label = 'All the stuff'
-    collecting_event.save!
-
-    a = Identifier::Local::FieldNumber.create(
-      namespace: FactoryBot.create(:valid_namespace),
-      identifier_object: collecting_event,
-      identifier: '1'
-    )
-
-    collecting_event.update(verbatim_field_number: '2')
-    expect(collecting_event.errors.key?(:verbatim_field_number)).to be_truthy
-  end
-
   # Added as a context for exploring re-indexing DwC based on DataAttribute updates
   xspecify 'data_attributes_attributes cascades' do
     p = FactoryBot.create(:valid_predicate, uri: 'http://rs.tdwg.org/dwc/terms/waterBody', name: 'waterBody')

From 942dbe22f597f098c181f8db3ab9edc65e8d537b Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Tue, 24 Sep 2024 15:02:26 -0500
Subject: [PATCH 20/25] Spec #4058

---
 spec/models/dataset_record/darwin_core/occurrence_spec.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spec/models/dataset_record/darwin_core/occurrence_spec.rb b/spec/models/dataset_record/darwin_core/occurrence_spec.rb
index f6591a92d0..dfd36a1982 100644
--- a/spec/models/dataset_record/darwin_core/occurrence_spec.rb
+++ b/spec/models/dataset_record/darwin_core/occurrence_spec.rb
@@ -133,7 +133,7 @@
       expect(Identifier::Local::FieldNumber.first.identifier_object).to be_kind_of(CollectingEvent)
     end
 
-    it 'does not populate verbatim fields by default' do
+    it 'does not populate verbatim_field_number by default' do
       expect(CollectingEvent.first.verbatim_field_number).to eq(nil)
     end
   end
@@ -175,6 +175,11 @@
     it 'attached FieldNumber to CollectingEvent' do
       expect(Identifier::Local::Event.first.identifier_object).to be_kind_of(CollectingEvent)
     end
+
+    it 'does not populate verbatim_field_number by default' do
+      expect(CollectingEvent.first.verbatim_field_number).to eq(nil)
+    end
+
   end
 
   # TODO: Check that Namespace column names are correctly written out in tsv

From dfa898dce9b23c49c89d3943b4fbb6071e9586b6 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Tue, 24 Sep 2024 15:21:09 -0500
Subject: [PATCH 21/25] Spec DwC date handling. Example tsv date columns. Close
 #4059.

---
 .../occurrences/dates/event_dates.tsv         |  5 ++
 .../darwin_core/occurrence_spec.rb            | 48 +++++++++++++++++--
 2 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 spec/files/import_datasets/occurrences/dates/event_dates.tsv

diff --git a/spec/files/import_datasets/occurrences/dates/event_dates.tsv b/spec/files/import_datasets/occurrences/dates/event_dates.tsv
new file mode 100644
index 0000000000..4bc3a7d063
--- /dev/null
+++ b/spec/files/import_datasets/occurrences/dates/event_dates.tsv
@@ -0,0 +1,5 @@
+occurrenceID	basisOfRecord	scientificName	taxonRank	TW:CollectingEvent:verbatim_date	eventDate
+occurrence-1	PreservedSpecimen	Orotettix andeanus	species	11-99-1000	
+occurrence-2	PreservedSpecimen	Orotettix andeanus	species		2020-10-2
+occurrence-3	PreservedSpecimen	Orotettix andeanus	species	2020-10-2	2020-10-2
+occurrence-4	PreservedSpecimen	Orotettix andeanus	species	2020-10-2	4020-10-2
diff --git a/spec/models/dataset_record/darwin_core/occurrence_spec.rb b/spec/models/dataset_record/darwin_core/occurrence_spec.rb
index dfd36a1982..5f7f60e28b 100644
--- a/spec/models/dataset_record/darwin_core/occurrence_spec.rb
+++ b/spec/models/dataset_record/darwin_core/occurrence_spec.rb
@@ -1,16 +1,54 @@
 require 'rails_helper'
 
 describe 'DatasetRecord::DarwinCore::Occurrence', type: :model do
+  before :all do
+    DatabaseCleaner.start
+
+    init_housekeeping
+
+    @root = FactoryBot.create(:root_taxon_name)
+  end
+
+  after(:all) do
+    DatabaseCleaner.clean
+  end
+
+  context 'when working with date fields' do
     before :all do
       DatabaseCleaner.start
 
       init_housekeeping
 
-      @root = FactoryBot.create(:root_taxon_name)
+      @import_dataset = ImportDataset::DarwinCore::Occurrences.create!(
+        source: fixture_file_upload((Rails.root + 'spec/files/import_datasets/occurrences/dates/event_dates.tsv'), 'text/plain'),
+        description: 'Testing dates'
+      ).tap { |i| i.stage }
+
+    end
+
+    after :all do
+      DatabaseCleaner.clean
+    end
+
+    let!(:results) { @import_dataset.import(5000, 100) }
+
+    it 'sets verbatim_date' do
+      expect(CollectingEvent.first.verbatim_date).to eq('11-99-1000')
+    end
+
+    it 'expands to parsed dates' do
+      expect(CollectingEvent.second.start_date_year).to eq(2020)
+    end
+
+    it 'sets date in both places when identical' do
+      expect(CollectingEvent.third.start_date_year).to eq(2020)
+      expect(CollectingEvent.third.verbatim_date).to eq('2020-10-2')
+    end
+
+    it 'errors on bad dates' do
+      expect(results.last.status).to eq('Errored')
     end
 
-  after(:all) do
-    DatabaseCleaner.clean
   end
 
   context 'when importing a single occurrence in a text file' do
@@ -262,6 +300,10 @@
     it 'attached FieldNumber to CollectingEvent' do
       expect(Identifier::Local::Event.first.identifier_object).to be_kind_of(CollectingEvent)
     end
+
+    it 'does not populate verbatim_field_number by default' do
+      expect(CollectingEvent.first.verbatim_field_number).to eq(nil)
+    end
   end
 
   context 'when importing virtualCatalogNumber and unique RecordNumber' do

From 627a891affc5fc52da58d49ef4c0559d7b69c248 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Tue, 24 Sep 2024 15:35:41 -0500
Subject: [PATCH 22/25] DwC eventDate requires start year. Fix #4053

---
 CHANGELOG.md                                         | 5 +++++
 app/models/collection_object/dwc_extensions.rb       | 1 +
 spec/models/collection_object/dwc_extensions_spec.rb | 7 +++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9575c38e9..f0ae7063aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,11 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 - Revert strict `verbatim_field_number` validation [#4061]
 - Renamed CollectingEvent `verbatim_trip_code` to `verbatim_field_number` [#4058]
 
+### Fixed
+
+- DwC `eventDate` is not populated without an explict year reference [#4053]
+
+[#4053]: https://github.com/SpeciesFileGroup/taxonworks/issues/4053
 [#4061]: https://github.com/SpeciesFileGroup/taxonworks/issues/4061
 [#4058]: https://github.com/SpeciesFileGroup/taxonworks/issues/4058
 
diff --git a/app/models/collection_object/dwc_extensions.rb b/app/models/collection_object/dwc_extensions.rb
index df5679d21e..7744dd5bb1 100644
--- a/app/models/collection_object/dwc_extensions.rb
+++ b/app/models/collection_object/dwc_extensions.rb
@@ -602,6 +602,7 @@ def dwc_verbatim_event_date
 
   def dwc_event_date
     return unless collecting_event
+    return if collecting_event.start_date_year.blank? # don't need to check end, it requires start in model
 
     %w{start_date end_date}
       .map { |d| %w{year month day}
diff --git a/spec/models/collection_object/dwc_extensions_spec.rb b/spec/models/collection_object/dwc_extensions_spec.rb
index cfea833db5..d53939e3c6 100644
--- a/spec/models/collection_object/dwc_extensions_spec.rb
+++ b/spec/models/collection_object/dwc_extensions_spec.rb
@@ -152,8 +152,6 @@
     let(:p) { Person.create!(last_name: 'Smith', first_name: 'Sue', suffix: 'Jr.') }
     let(:o) { Otu.create!(name: 'Barney') }
 
-
-
     specify '#dwc_decimal_latitude' do
       a = Georeference::Wkt.create!(collecting_event: ce, wkt: 'POINT(9.0 60)' )
 
@@ -161,6 +159,11 @@
       expect(s.dwc_decimal_latitude).to eq(60.0) # technically not correct significant figures :(
     end
 
+    specify 'without start Year event_date is not populated' do
+      ce.update!(start_date_year: nil, start_date_month: 2, end_date_month: 4)
+      expect(s.dwc_event_date).to eq(nil)
+    end
+
     specify '#dwc_year' do
       expect(s.dwc_year).to eq(2010)
     end

From df726d549776d7a14c5fa3b101443b98df4ada53 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Tue, 24 Sep 2024 15:43:09 -0500
Subject: [PATCH 23/25] DwC month should not populate when ranged. Fix #4055

---
 CHANGELOG.md                                         | 7 ++++---
 app/models/collection_object/dwc_extensions.rb       | 1 +
 spec/models/collection_object/dwc_extensions_spec.rb | 7 ++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0ae7063aa..3153d14cc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,12 +20,13 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
 
 ### Fixed
 
-- DwC `eventDate` is not populated without an explict year reference [#4053]
+- DwC `eventDate` should not be populated without an explict year reference [#4053]
+- DwC `month` should not be populated when range-provided [#4055]
 
 [#4053]: https://github.com/SpeciesFileGroup/taxonworks/issues/4053
-[#4061]: https://github.com/SpeciesFileGroup/taxonworks/issues/4061
+[#4055]: https://github.com/SpeciesFileGroup/taxonworks/issues/4055
 [#4058]: https://github.com/SpeciesFileGroup/taxonworks/issues/4058
-
+[#4061]: https://github.com/SpeciesFileGroup/taxonworks/issues/4061
 
 ## [0.44.0] - 2024-09-17
 
diff --git a/app/models/collection_object/dwc_extensions.rb b/app/models/collection_object/dwc_extensions.rb
index 7744dd5bb1..88b36ec7da 100644
--- a/app/models/collection_object/dwc_extensions.rb
+++ b/app/models/collection_object/dwc_extensions.rb
@@ -621,6 +621,7 @@ def dwc_year
 
   def dwc_month
     return unless collecting_event
+    return if collecting_event.start_date_month.present? && collecting_event.end_date_month.present?
     collecting_event.start_date_month.presence
   end
 
diff --git a/spec/models/collection_object/dwc_extensions_spec.rb b/spec/models/collection_object/dwc_extensions_spec.rb
index d53939e3c6..b73bcd36e1 100644
--- a/spec/models/collection_object/dwc_extensions_spec.rb
+++ b/spec/models/collection_object/dwc_extensions_spec.rb
@@ -173,7 +173,12 @@
       expect(s.dwc_month).to eq(1)
     end
 
-    specify '#dwc_month' do
+    specify '#dwc_month is nil when range' do
+      ce.update!( start_date_month: 1, end_date_month: 2)
+      expect(s.dwc_month).to eq(nil)
+    end
+
+    specify '#dwc_day' do
       ce.update!( start_date_month: 1, start_date_day: 10)
       expect(s.dwc_day).to eq(10)
     end

From 73614a131f8587e53226561a2ca9f38ee4382d5d Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Tue, 24 Sep 2024 20:32:31 -0300
Subject: [PATCH 24/25] Hide dwcClass #4051

---
 .../vue/tasks/collection_objects/browse/constants/darwinCore.js  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/vue/tasks/collection_objects/browse/constants/darwinCore.js b/app/javascript/vue/tasks/collection_objects/browse/constants/darwinCore.js
index b7a64f160c..9be28b13a6 100644
--- a/app/javascript/vue/tasks/collection_objects/browse/constants/darwinCore.js
+++ b/app/javascript/vue/tasks/collection_objects/browse/constants/darwinCore.js
@@ -45,6 +45,7 @@ export const PRIORITIZE_ATTRIBUTES = [
 ]
 
 export const HIDE_ATTRIBUTES = [
+  'dwcClass',
   'dwc_occurrence_object_id',
   'dwc_occurrence_object_type',
   'footprintWKT',

From b1adc41d77cdae39e3bc3c20bb2795f3cb8d41a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Lucas=20Pereira?=
 <ellocodelassembler@gmail.com>
Date: Tue, 24 Sep 2024 22:57:56 -0300
Subject: [PATCH 25/25] Preparing for version 0.44.1 release [skip ci]

---
 CHANGELOG.md              | 7 ++++++-
 lib/taxonworks/version.rb | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3153d14cc6..9ea00378a5 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.44.1] - 2024-09-24
+
 ### Added
 
 - `/api/v1/otus/:id/inventory/keys` a list of keys scoped to or containing the Otu
@@ -4855,7 +4859,8 @@ _Special thanks to Tom Klein for his amazing open-source contributions on this r
 - Loosing input page numbers when switching tabs on New Taxon Name task
 
 [#1532]: https://github.com/SpeciesFileGroup/taxonworks/issues/1532
-[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.44.0..development
+[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.44.1..development
+[0.44.1]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.44.0...v0.44.1
 [0.44.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.43.3...v0.44.0
 [0.43.3]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.43.2...v0.43.3
 [0.43.2]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.43.1...v0.43.2
diff --git a/lib/taxonworks/version.rb b/lib/taxonworks/version.rb
index 6df38fd193..b5473b4c25 100644
--- a/lib/taxonworks/version.rb
+++ b/lib/taxonworks/version.rb
@@ -1,3 +1,3 @@
 module TaxonWorks
-  VERSION = '0.44.0'
+  VERSION = '0.44.1'
 end