labimotion 2.3.0 → 2.4.0.rc11

data/lib/labimotion/usecases/template_doi_helpers.rb

@@ -15,11 +15,29 @@ module Labimotion
     # admin rights over it. Keys are plural, matching the LabIMotion gem's
     # `authenticate_admin!` and `User#generic_admin`.
     GENERIC_ADMIN_KEY = {
-      ::Labimotion::ElementKlass => 'elements',
-      ::Labimotion::SegmentKlass => 'segments',
-      ::Labimotion::DatasetKlass => 'datasets'
+      ::Labimotion::ElementKlass => ::Labimotion::Constants::Family::ELEMENT,
+      ::Labimotion::SegmentKlass => ::Labimotion::Constants::Family::SEGMENT,
+      ::Labimotion::DatasetKlass => ::Labimotion::Constants::Family::DATASET
     }.freeze
 
+    # Where the hub lives, most specific first. PUBLIC_URL is the instance's own
+    # public address (the host app's config/application.rb insists on it), so the
+    # link follows whichever instance is serving it rather than a hardcoded
+    # chemotion-repository.net. The DataCite-facing domains stay as fallbacks for
+    # deployments that only set those.
+    HOST_ENV_KEYS = %w[PUBLIC_URL REPO_HOST DOI_DOMAIN_TEST DOI_DOMAIN].freeze
+
+    # The DataCite kernel-4 contributorType vocabulary. A template DOI may name
+    # any number of contributors — including none — each credited in one of
+    # these roles. The list is closed: DataCite rejects anything else.
+    CONTRIBUTOR_TYPES = %w[
+      ContactPerson DataCollector DataCurator DataManager Distributor Editor
+      HostingInstitution Producer ProjectLeader ProjectManager ProjectMember
+      RegistrationAgency RegistrationAuthority RelatedPerson Researcher
+      ResearchGroup RightsHolder Sponsor Supervisor WorkPackageLeader Other
+    ].freeze
+    DEFAULT_CONTRIBUTOR_TYPE = 'Researcher'
+
     module_function
 
     # True once the template's latest DOI has been released (minted) and the
@@ -49,13 +67,17 @@ module Labimotion
     # Used as the DOI's DataCite landing page and surfaced in the UI.
     def template_url(record)
       type = klass_type_for(record)
-      host = ENV['REPO_HOST'].presence || ENV['DOI_DOMAIN_TEST'].presence ||
-             ENV['DOI_DOMAIN'].presence || 'https://www.chemotion-repository.net'
       record_id = record.try(:identifier).presence || record.try(:uuid).presence || record.id
       query = "type=finder&kind=#{type}&id=#{record_id}"
       version = record.try(:version)
       query += "&version=#{version}" if version.present?
-      "#{host.chomp('/')}/home/genericHub?#{query}"
+      "#{public_host}/home/genericHub?#{query}"
+    end
+
+    # The instance serving the hub, without its trailing slash.
+    def public_host
+      host = HOST_ENV_KEYS.lazy.filter_map { |key| ENV[key].presence }.first
+      (host || 'http://localhost:3000').chomp('/')
     end
 
     # A user may manage a template's DOI iff they hold the LabIMotion

data/lib/labimotion/usecases/update_template_publication_metadata.rb

@@ -7,7 +7,12 @@ module Labimotion
   class UpdateTemplatePublicationMetadata
     include TemplateDoiHelpers
 
-    ALLOWED_KEYS = %w[title description authors license].freeze
+    ALLOWED_KEYS = %w[title description authors contributors references license].freeze
+    REFERENCE_KEYS = %w[doi title url].freeze
+    # Authors and contributors are the same shape: a DataCite personal name plus
+    # the identifiers that make it resolvable — ORCID for the person, ROR for
+    # their organisation. Contributors carry a contributorType on top.
+    PERSON_KEYS = %w[givenName familyName orcid affiliation affiliation_id ror_id].freeze
 
     attr_reader :record, :current_user, :publication, :error
 
@@ -39,18 +44,82 @@ module Labimotion
     def normalized_publication
       slice = publication.stringify_keys.slice(*ALLOWED_KEYS)
       slice['authors'] = Array(slice['authors']).filter_map { |a| normalize_author(a) }
+      # Contributors are people in their own right — none of them need be one of
+      # the authors — so they are stored as given rather than matched back
+      # against the author list. There may be any number, including none.
+      slice['contributors'] = submitted_contributors.filter_map { |c| normalize_contributor(c) }
+      slice['references'] = Array(slice['references']).filter_map { |r| normalize_reference(r) }
       slice
     end
 
+    # A single `contributor` is what the first version of the form sent; a
+    # template saved by it is read back into the list rather than dropped.
+    def submitted_contributors
+      given = publication.stringify_keys
+      given['contributors'].is_a?(Array) ? given['contributors'] : [given['contributor']].compact
+    end
+
+    # A person plus the DataCite role they are credited in. An unknown or
+    # missing role falls back to "Researcher" rather than failing the save —
+    # the vocabulary is closed, so anything else would be rejected at minting.
+    def normalize_contributor(contributor)
+      h = normalize_author(contributor)
+      return nil unless h
+
+      type = contributor.stringify_keys['contributorType'].to_s.strip
+      known = TemplateDoiHelpers::CONTRIBUTOR_TYPES.include?(type)
+      h.merge('contributorType' => known ? type : TemplateDoiHelpers::DEFAULT_CONTRIBUTOR_TYPE)
+    end
+
+    # A cited work, identified by its DOI. Anything without one is dropped: the
+    # DOI is what goes to DataCite as a relatedIdentifier, and a reference
+    # without it would be published as an empty relation.
+    def normalize_reference(reference)
+      return nil unless reference.is_a?(Hash)
+
+      h = reference.stringify_keys.slice(*REFERENCE_KEYS)
+      h['doi'] = sanitize_doi(h['doi'])
+      return nil if h['doi'].nil?
+
+      h.transform_values { |v| v.to_s.strip }
+    end
+
+    # Accepts a bare DOI, a doi: prefix or a resolver URL, and keeps the bare
+    # "10.x/y" form. Nil for anything that is not a DOI.
+    def sanitize_doi(value)
+      match = value.to_s.strip.match(%r{(10\.\d{4,9}/\S+)\z})
+      match && match[1]
+    end
+
     def normalize_author(author)
       return nil unless author.is_a?(Hash)
 
-      h = author.stringify_keys.slice('givenName', 'familyName', 'orcid', 'affiliation', 'affiliation_id')
+      h = author.stringify_keys.slice(*PERSON_KEYS)
       return nil if h.values_at('givenName', 'familyName').all? { |v| v.to_s.strip.empty? }
 
+      ror = normalize_ror(h['ror_id']) || ror_for(h['affiliation_id'])
+      ror ? h['ror_id'] = ror : h.delete('ror_id')
       h
     end
 
+    # ROR IDs travel either bare ("05f950310") or as a resolver URL; DataCite
+    # wants the URI, so the bare form is what gets stored and the URI is built
+    # when the XML is rendered.
+    def normalize_ror(value)
+      value.to_s.strip.sub(%r{\Ahttps?://ror\.org/}i, '').presence
+    end
+
+    # The authoritative ROR for a picked affiliation. Whoever the editor picked
+    # came from an Affiliation record, so its id is the better source than
+    # anything retyped — and the current-user payload carries no ROR at all.
+    def ror_for(affiliation_id)
+      return nil if affiliation_id.blank? || !defined?(::Affiliation)
+
+      normalize_ror(::Affiliation.where(id: affiliation_id).pick(:ror_id))
+    rescue StandardError
+      nil
+    end
+
     def failure(message)
       @error = message
       self

data/lib/labimotion/utils/export_utils.rb

@@ -156,6 +156,7 @@ module Labimotion
 
           set_table_prop(field, uuids, Labimotion::FieldType::DRAG_MOLECULE, &fetch_one)
           set_table_prop(field, uuids, Labimotion::FieldType::DRAG_SAMPLE, &fetch_one)
+          set_table_prop(field, uuids, Labimotion::FieldType::DRAG_ELEMENT, &fetch_one)
         end
         properties
       rescue StandardError => e

data/lib/labimotion/utils/import_utils.rb

@@ -120,7 +120,21 @@ module Labimotion
         properties
       end
 
-      def proc_table_prop(layer, key, data, instance, properties, field, tidx, type)
+      def proc_table_element(properties, instances, elements, svalue, key, tidx, vdx, col_id)
+        return properties unless id = svalue.fetch('el_id', nil)
+
+        att_el = (elements && elements[id]) || instances.fetch(Labimotion::Prop::L_ELEMENT, nil)&.fetch(id, nil)
+        return properties if att_el.nil?
+
+        val = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][tidx]['sub_values'][vdx][col_id]['value']
+        properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][tidx]['sub_values'][vdx][col_id]['value'] = proc_assign_element(val, att_el)
+        properties
+      rescue StandardError => e
+        Labimotion.log_exception(e)
+        properties
+      end
+
+      def proc_table_prop(layer, key, data, instance, properties, field, tidx, type, elements = nil)
         fields = field[Labimotion::Prop::SUBFIELDS].select { |ss| ss['type'] == type }
         return properties if fields.nil?
 
@@ -141,6 +155,8 @@ module Labimotion
               properties = proc_table_molecule(properties, data, svalue, key, tidx, vdx, col_id)
             when Labimotion::FieldType::DRAG_SAMPLE
               properties = proc_table_sample(properties, data, instance, svalue, key, tidx, vdx, col_id)
+            when Labimotion::FieldType::DRAG_ELEMENT
+              properties = proc_table_element(properties, instance, elements, svalue, key, tidx, vdx, col_id)
             end
           end
         end
@@ -256,7 +272,7 @@ module Labimotion
     end
 
 
-    def self.proc_table(layer, key, data, instance, properties)
+    def self.proc_table(layer, key, data, instance, properties, elements = nil)
       fields = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::TABLE }
       fields&.each do |field|
         tidx = layer[Labimotion::Prop::FIELDS].index(field)
@@ -264,6 +280,7 @@ module Labimotion
 
         proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_MOLECULE)
         proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_SAMPLE)
+        proc_table_prop(layer, key, data, instance, properties, field, tidx, Labimotion::FieldType::DRAG_ELEMENT, elements)
       end
       properties
     rescue StandardError => e
@@ -280,7 +297,7 @@ module Labimotion
         properties = proc_reaction(layer, key, data, instances, properties)
         properties = proc_sample(layer, key, data, instances, properties)
         properties = proc_element(layer, key, data, instances, properties, elements) # unless elements.nil?
-        properties = proc_table(layer, key, data, instances, properties)
+        properties = proc_table(layer, key, data, instances, properties, elements)
       end
       properties
     rescue StandardError => e

data/lib/labimotion/utils/serializer.rb

@@ -32,6 +32,30 @@ module Labimotion
       field
     end
 
+    ## Refresh the stored label/name of every drag_element cell of a table field.
+    ## Shared by PropertiesEntity and ElnElementEntity so all three loaders agree.
+    def self.set_table_element(field, field_table_elements)
+      col_ids = field_table_elements.map { |x| x.values[0] }
+      col_ids.each do |col_id|
+        field['sub_values'].each do |sub_value|
+          cell = sub_value[col_id]
+          next unless cell.present? && cell['value'].present? && cell['value']['el_id'].present?
+          ## A drag_element cell may link a standard ELN element (reaction, wellplate, ...);
+          ## el_id is then not a Labimotion::Element id, so keep what the client stored.
+          next if Labimotion::LinkedElement::MODELS.key?(cell['value']['el_klass'].to_s)
+
+          find_obj = Labimotion::Element.find_by(id: cell['value']['el_id'])
+          next if find_obj.blank?
+
+          cell['value']['el_label'] = find_obj.short_label
+          cell['value']['el_name'] = find_obj.name
+          cell['value']['el_tip'] = "#{find_obj.element_klass&.label}@@#{find_obj.name}"
+          cell['value']['icon_name'] = find_obj.element_klass&.icon_name || ''
+        end
+      end
+      field
+    end
+
     def self.element_properties(object)
       object.properties[Labimotion::Prop::LAYERS]&.keys.each do |key|
         # layer = object.properties[key]
@@ -72,6 +96,9 @@ module Labimotion
 
           field_table_samples = field[Labimotion::Prop::SUBFIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_SAMPLE }
           object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx] = set_table(field, field_table_samples, Labimotion::Prop::SAMPLE) if field_table_samples.present?
+
+          field_table_elements = field[Labimotion::Prop::SUBFIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_ELEMENT }
+          object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx] = set_table_element(field, field_table_elements) if field_table_elements.present?
         end
       end
       object.properties

data/lib/labimotion/utils/units.rb

@@ -9,7 +9,7 @@ module Labimotion
       "default": "",
       "position": 10,
       "placeholder": "acceleration",
-      "units": [{ "key": "mm_s2", "label": "mm/s²" }]
+      "units": [{ "key": "mm_s2", "label": "mm/s<sup>2</sup>" }]
     },
     {
       "type": "numeric",
@@ -59,10 +59,10 @@ module Labimotion
       "position": 38,
       "placeholder": "areal density",
       "units": [
-        { "key": "kg_m2", "label": "kg m⁻²", "nm": 1 },
-        { "key": "t_m2", "label": "t m⁻²", "nm": 0.001 },
-        { "key": "kg_cm2", "label": "kg cm⁻²", "nm": 1e-4 },
-        { "key": "g_m2", "label": "g m⁻²", "nm": 1000 }
+        { "key": "kg_m2", "label": "kg m<sup>-2</sup>", "nm": 1 },
+        { "key": "t_m2", "label": "t m<sup>-2</sup>", "nm": 0.001 },
+        { "key": "kg_cm2", "label": "kg cm<sup>-2</sup>", "nm": 1e-4 },
+        { "key": "g_m2", "label": "g m<sup>-2</sup>", "nm": 1000 }
       ]
     },
     {
@@ -97,7 +97,7 @@ module Labimotion
       "position": 60,
       "placeholder": "concentration",
       "units": [
-        { "key": "ng_l", "label": "ng/L", "nm": 1000000000 },
+        { "key": "ng_l", "label": "ng/L", "nm": 1000000 },
         { "key": "mg_l", "label": "mg/L", "nm": 1000 },
         { "key": "g_l", "label": "g/L", "nm": 1 }
       ]
@@ -171,7 +171,7 @@ module Labimotion
       "position": 75,
       "placeholder": "density",
       "units": [
-        { "key": "g_cm3", "label": "g/cm³", "nm": 1 },
+        { "key": "g_cm3", "label": "g/cm<sup>3</sup>", "nm": 1 },
         { "key": "kg_l", "label": "kg/l", "nm": 1 }
       ]
     },
@@ -198,8 +198,7 @@ module Labimotion
         { "key": "d", "label": "d", "nm": 1 },
         { "key": "h", "label": "h", "nm": 24 },
         { "key": "min", "label": "m", "nm": 1440 },
-        { "key": "s", "label": "s", "nm": 86400 },
-        { "key": "y", "label": "y", "nm": 0.0027378507871321013 }
+        { "key": "s", "label": "s", "nm": 86400 }
       ]
     },
     {
@@ -281,8 +280,7 @@ module Labimotion
         { "key": "eV", "label": "eV", "nm": 6.241509e21 },
         { "key": "keV", "label": "keV", "nm": 6.241509e18 },
         { "key": "j", "label": "J", "nm": 1000 },
-        { "key": "k_j", "label": "kJ", "nm": 1 },
-        { "key": "kWh", "label": "kWh", "nm": 2.7777778e-4 }
+        { "key": "k_j", "label": "kJ", "nm": 1 }
       ]
     },
     {
@@ -359,9 +357,9 @@ module Labimotion
         { "key": "k_min", "label": "K/min", "nm": 1 },
         { "key": "k_s", "label": "K/s", "nm": 0.016666666666667 },
         { "key": "k_h", "label": "K/h", "nm": 60 },
-        { "key": "degc_min", "label": "°C min⁻¹", "nm": 1 },
-        { "key": "degc_s", "label": "°C s⁻¹", "nm": 0.016666666666667 },
-        { "key": "degc_h", "label": "°C h⁻¹", "nm": 60 }
+        { "key": "degc_min", "label": "°C min<sup>-1</sup>", "nm": 1 },
+        { "key": "degc_s", "label": "°C s<sup>-1</sup>", "nm": 0.016666666666667 },
+        { "key": "degc_h", "label": "°C h<sup>-1</sup>", "nm": 60 }
       ]
     },
     {
@@ -396,23 +394,7 @@ module Labimotion
       "units": [
         { "key": "g", "label": "g", "nm": 1 },
         { "key": "mg", "label": "mg", "nm": 1000 },
-        { "key": "ug", "label": "µg", "nm": 1000000 },
-        { "key": "kg", "label": "kg", "nm": 0.001 }
-      ]
-    },
-    {
-      "type": "numeric",
-      "field": "mass_flow",
-      "label": "Mass flow",
-      "default": "",
-      "position": 121,
-      "placeholder": "mass flow",
-      "units": [
-        { "key": "g_min", "label": "g/min", "nm": 1 },
-        { "key": "kg_h", "label": "kg/h", "nm": 0.06 },
-        { "key": "kg_s", "label": "kg/s", "nm": 0.000016666666666667 },
-        { "key": "g_s", "label": "g/s", "nm": 0.016666666666667 },
-        { "key": "mg_s", "label": "mg/s", "nm": 16.666666666667 }
+        { "key": "ug", "label": "µg", "nm": 1000000 }
       ]
     },
     {
@@ -434,8 +416,8 @@ module Labimotion
       "position": 125,
       "placeholder": "mass loading",
       "units": [
-        { "key": "g_cm2", "label": "g cm⁻²", "nm": 1 },
-        { "key": "mg_cm2", "label": "mg cm⁻²", "nm": 1000 }
+        { "key": "g_cm2", "label": "g cm<sup>-2</sup>", "nm": 1 },
+        { "key": "mg_cm2", "label": "mg cm<sup>-2</sup>", "nm": 1000 }
       ]
     },
     {
@@ -458,7 +440,7 @@ module Labimotion
       "position": 127,
       "placeholder": "molar conductivity",
       "units": [
-        { "key": "s_cm2_mol", "label": "S cm² mol⁻¹", "nm": 1 }
+        { "key": "s_cm2_mol", "label": "S cm<sup>2</sup> mol<sup>-1</sup>", "nm": 1 }
       ]
     },
     {
@@ -510,7 +492,6 @@ module Labimotion
         { "key": "atm", "label": "atm", "nm": 1 },
         { "key": "pa", "label": "Pa", "nm": 101325 },
         { "key": "kpa", "label": "kPa", "nm": 101.325 },
-        { "key": "mpa", "label": "MPa", "nm": 0.101325 },
         { "key": "hpa", "label": "hPa", "nm": 1013.25 },
         { "key": "torr", "label": "Torr", "nm": 760 },
         { "key": "bar", "label": "bar", "nm": 1.01325 },
@@ -549,8 +530,8 @@ module Labimotion
       "position": 150,
       "placeholder": "Reaction rate",
       "units": [
-        { "key": "mol_lmin", "label": "mol L⁻¹ min⁻¹", "nm": 1 },
-        { "key": "mol_lsec", "label": "mol L⁻¹ s⁻¹", "nm": 0.016666666666667 }
+        { "key": "mol_lmin", "label": "mol L<sup>-1</sup> min<sup>-1</sup>", "nm": 1 },
+        { "key": "mol_lsec", "label": "mol L<sup>-1</sup> s<sup>-1</sup>", "nm": 0.016666666666667 }
       ]
     },
     {
@@ -577,22 +558,6 @@ module Labimotion
         { "key": "v_s", "label": "V/s", "nm": 1 }
       ]
     },
-    {
-      "type": "numeric",
-      "field": "space_time_yield",
-      "label": "Space-time yield",
-      "default": "",
-      "position": 156,
-      "placeholder": "space-time yield",
-      "units": [
-        { "key": "kg_m3_d", "label": "kg/(m³*d)", "nm": 1 },
-        { "key": "kg_m3_h", "label": "kg/(m³*h)", "nm": 0.041666666666667 },
-        { "key": "g_l_h", "label": "g/(L*h)", "nm": 0.041666666666667 },
-        { "key": "mg_ml_h", "label": "mg/(mL*h)", "nm": 0.041666666666667 },
-        { "key": "g_l_min", "label": "g/(L*min)", "nm": 0.00069444444444444 },
-        { "key": "g_m3_s", "label": "g/(m³*s)", "nm": 0.011574074074074 }
-      ]
-    },
     {
       "type": "numeric",
       "field": "specific_current",
@@ -603,9 +568,9 @@ module Labimotion
       "units": [
         { "key": "ma_g", "label": "mA/g", "nm": 1000, "unit_type": "mass" },
         { "key": "a_g", "label": "A/g", "nm": 1, "unit_type": "mass" },
-        { "key": "ma_cm2", "label": "mA/cm²", "nm": 1000, "unit_type": "area" },
-        { "key": "a_cm2", "label": "A/cm²", "nm": 1, "unit_type": "area" },
-        { "key": "a_mm2", "label": "A/mm²", "nm": 0.01, "unit_type": "area" }
+        { "key": "ma_cm2", "label": "mA/cm<sup>2</sup>", "nm": 1000, "unit_type": "area" },
+        { "key": "a_cm2", "label": "A/cm<sup>2</sup>", "nm": 1, "unit_type": "area" },
+        { "key": "a_mm2", "label": "A/mm<sup>2</sup>", "nm": 0.01, "unit_type": "area" }
       ]
     },
     {
@@ -628,7 +593,7 @@ module Labimotion
       "position": 158,
       "placeholder": "Specific surface area",
       "units": [
-        { "key": "m2_g", "label": "m²/g", "nm": 1 }
+        { "key": "m2_g", "label": "m<sup>2</sup>/g", "nm": 1 }
       ]
     },
     {
@@ -638,7 +603,7 @@ module Labimotion
       "default": "",
       "position": 160,
       "placeholder": "Specific Volume",
-      "units": [{ "key": "cm3_g", "label": "cm³/g", "nm": 1 }]
+      "units": [{ "key": "cm3_g", "label": "cm<sup>3</sup>/g", "nm": 1 }]
     },
     {
       "type": "numeric",
@@ -677,10 +642,10 @@ module Labimotion
       "position": 170,
       "placeholder": "surface",
       "units": [
-        { "key": "a_2", "label": "A²", "nm": 1.0e16 },
-        { "key": "um_2", "label": "µm²", "nm": 1.0e8 },
-        { "key": "mm_2", "label": "mm²", "nm": 100 },
-        { "key": "cm_2", "label": "cm²", "nm": 1 }
+        { "key": "a_2", "label": "A<sup>2</sup>", "nm": 1.0e16 },
+        { "key": "um_2", "label": "µm<sup>2</sup>", "nm": 1.0e8 },
+        { "key": "mm_2", "label": "mm<sup>2</sup>", "nm": 100 },
+        { "key": "cm_2", "label": "cm<sup>2</sup>", "nm": 1 }
       ]
     },
     {
@@ -717,8 +682,8 @@ module Labimotion
       "position": 186,
       "placeholder": "tensile stress",
       "units": [
-        { "key": "n_cm2", "label": "N cm⁻²", "nm": 1 },
-        { "key": "n_mm2", "label": "N mm⁻²", "nm": 0.01 }
+        { "key": "n_cm2", "label": "N cm<sup>-2</sup>", "nm": 1 },
+        { "key": "n_mm2", "label": "N mm<sup>-2</sup>", "nm": 0.01 }
       ]
     },
     {
@@ -728,7 +693,7 @@ module Labimotion
       "default": "",
       "position": 190,
       "placeholder": "Turnover number",
-      "units": [{ "key": "1_s", "label": "1/s", "nm": 1 }, { "key": "1_m", "label": "1/min", "nm": 60 }]
+      "units": [{ "key": "1_s", "label": "1/s", "nm": 1 }, { "key": "1_m", "label": "1/m", "nm": 60 }]
     },
     {
       "type": "numeric",
@@ -749,7 +714,7 @@ module Labimotion
       "default": "",
       "position": 205,
       "placeholder": "Kinematic Viscosity",
-      "units": [{ "key": "m2_s", "label": "m²/s", "nm": 1 }]
+      "units": [{ "key": "m2_s", "label": "m<sup>2</sup>/s", "nm": 1 }]
     },
     {
       "type": "numeric",
@@ -802,6 +767,6 @@ module Labimotion
         { "key": "m3", "label": "m³", "nm": 0.000001 }
       ]
     }
-  ]
+    ]
   end
 end

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '2.3.0'
+  VERSION = '2.4.0.rc11'
 end

data/lib/labimotion.rb

@@ -27,7 +27,11 @@ module Labimotion
   autoload :ExporterAPI, 'labimotion/apis/exporter_api'
   autoload :StandardLayerAPI, 'labimotion/apis/standard_layer_api'
   autoload :VocabularyAPI, 'labimotion/apis/vocabulary_api'
+  autoload :OntologyRootAPI, 'labimotion/apis/ontology_root_api'
   autoload :UserAPI, 'labimotion/apis/user_api'
+  autoload :LabimotionAiAPI, 'labimotion/apis/labimotion_ai_api'
+  autoload :UserKlassSettingsAPI, 'labimotion/apis/user_klass_settings_api'
+  autoload :KlassShareAPI, 'labimotion/apis/klass_share_api'
   autoload :MttAPI, 'labimotion/apis/mtt_api'
   autoload :ElementVariationAPI, 'labimotion/apis/element_variation_api'
   autoload :LabimotionDoiAPI, 'labimotion/apis/labimotion_doi_api'
@@ -56,12 +60,15 @@ module Labimotion
   ## autoload :DatasetRevisionEntity, 'labimotion/entities/dataset_revision_entity'
   autoload :VocabularyEntity, 'labimotion/entities/vocabulary_entity'
   autoload :UserEntity, 'labimotion/entities/user_entity'
+  autoload :UserKlassSettingEntity, 'labimotion/entities/user_klass_setting_entity'
+  autoload :KlassShareEntity, 'labimotion/entities/klass_share_entity'
   autoload :ElementVariationEntity, 'labimotion/entities/element_variation_entity'
   autoload :LabimotionTemplateDoiEntity, 'labimotion/entities/labimotion_template_doi_entity'
 
   ######## Helpers
   autoload :GenericHelpers, 'labimotion/helpers/generic_helpers'
   autoload :ElementHelpers, 'labimotion/helpers/element_helpers'
+  autoload :CoverImageHelpers, 'labimotion/helpers/cover_image_helpers'
   autoload :SegmentHelpers, 'labimotion/helpers/segment_helpers'
   autoload :DatasetHelpers, 'labimotion/helpers/dataset_helpers'
   autoload :SearchHelpers, 'labimotion/helpers/search_helpers'
@@ -80,6 +87,15 @@ module Labimotion
   autoload :UpdateTemplatePublicationMetadata, 'labimotion/usecases/update_template_publication_metadata'
 
   ######## Libs
+  autoload :AiTemplate, 'labimotion/libs/ai_template'
+  autoload :AiKlassQueue, 'labimotion/libs/ai_klass_queue'
+  autoload :AiKlassValidator, 'labimotion/libs/ai_klass_validator'
+  autoload :AiEgressGuard, 'labimotion/libs/ai_egress_guard'
+  autoload :AiModels, 'labimotion/libs/ai_models'
+  autoload :UserAiSettings, 'labimotion/libs/user_ai_settings'
+  autoload :OntologyTerms, 'labimotion/libs/ontology_terms'
+  autoload :OntologyStore, 'labimotion/libs/ontology_store'
+  autoload :FileExtractor, 'labimotion/libs/file_extractor'
   autoload :Converter, 'labimotion/libs/converter'
   autoload :DatasetBuilder, 'labimotion/libs/dataset_builder'
   autoload :NmrMapper, 'labimotion/libs/nmr_mapper'
@@ -89,6 +105,7 @@ module Labimotion
   autoload :ExportDataset, 'labimotion/libs/export_dataset'
   autoload :SampleAssociation, 'labimotion/libs/sample_association'
   autoload :PropertiesHandler, 'labimotion/libs/properties_handler'
+  autoload :LinkedElement, 'labimotion/libs/linked_element'
   autoload :AttachmentHandler, 'labimotion/libs/attachment_handler'
   autoload :VocabularyHandler, 'labimotion/libs/vocabulary_handler'
   autoload :XlsxExporter, 'labimotion/libs/xlsx_exporter'
@@ -96,6 +113,10 @@ module Labimotion
   autoload :ElementVariationHeader, 'labimotion/libs/element_variation_header'
   autoload :ExportElementVariations, 'labimotion/libs/export_element_variations'
   autoload :ImportElementVariations, 'labimotion/libs/import_element_variations'
+  autoload :OwnerResolver, 'labimotion/libs/owner_resolver'
+  autoload :OwnershipAudit, 'labimotion/libs/ownership_audit'
+  autoload :ShareNotifier, 'labimotion/libs/share_notifier'
+  autoload :ShareResolver, 'labimotion/libs/share_resolver'
 
   ######## Utils
   autoload :Prop, 'labimotion/utils/prop'
@@ -133,7 +154,11 @@ module Labimotion
 
   autoload :StdLayer, 'labimotion/models/std_layer'
   autoload :StdLayersRevision, 'labimotion/models/std_layers_revision'
+  autoload :UserKlassSetting, 'labimotion/models/user_klass_setting'
+  autoload :UserSetting, 'labimotion/models/user_setting'
+  autoload :KlassShare, 'labimotion/models/klass_share'
 
+  autoload :CellLine, 'labimotion/models/cellline'
   autoload :DeviceDescription, 'labimotion/models/device_description'
   autoload :DoseRespRequest, 'labimotion/models/dose_resp_request'
   autoload :DoseRespOutput, 'labimotion/models/dose_resp_output'
@@ -151,5 +176,7 @@ module Labimotion
   autoload :Segmentable, 'labimotion/models/concerns/segmentable'
   autoload :Datasetable, 'labimotion/models/concerns/datasetable'
   autoload :AttachmentConverter, 'labimotion/models/concerns/attachment_converter'
+  autoload :MatriceLabimotion, 'labimotion/models/concerns/matrice_labimotion'
   autoload :LinkedProperties, 'labimotion/models/concerns/linked_properties'
+  autoload :TemplateDoi, 'labimotion/models/concerns/template_doi'
 end