labimotion 2.1.0.rc14 → 2.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3be4d822cf9ab027e3d64f1b6356f02a6d696a6125c0db56bf8ca61e342eaabe
-  data.tar.gz: 8038b4423f9c7a26fa01c07defd715809d4698a51b6362948de4560870ab4c61
+  metadata.gz: 4397eed28e8f2c6f0e21e022191d842dbb7a42000a2efe72731a89ab8bf9e77b
+  data.tar.gz: 3ae429541da0f787d6d0f544307b5acfbf3e922d83c7fc7cd27e47738eb5880e
 SHA512:
-  metadata.gz: 3c2fe973a0fd5593246206ac697d84ae77bea51f32d1501d3fbd4dc79273d67d9ac04c54866c1cf2a952424043a1edca73591756cd5644c8156d07943bc51208
-  data.tar.gz: 70b348d0130ee3fe9cc72e829013b06357172a16f5cda79e4799dcd019d317f2561ce2910e457382904cda7fe02d36465ef58fbde0de24803990fd0b428ea5c6
+  metadata.gz: 12a5d77d600daaf1a45640ab5ff7d253a608cd683fac28a5286019a7990e85cb7c1f0c957240fab625d3dbb703196dcb918b652bcc86457c6ac88cc085990ea0
+  data.tar.gz: 28453642570e3e177c0c2684590cdb715016c4043645d9f2e097eca0a4f41e9e3ff30564df8a0b7d5800bfb36a2fd224aa40cb91a107a2bc53adddc1db133070

data/lib/labimotion/apis/generic_element_api.rb

@@ -378,6 +378,7 @@ module Labimotion
           requires :klass, type: String, desc: 'Klass', values: %w[ElementKlass SegmentKlass DatasetKlass]
           requires :id, type: Integer, desc: 'Klass ID'
           requires :properties_template, type: Hash
+          optional :metadata, type: Hash, default: {}
           optional :release, type: String, default: 'draft', desc: 'release status', values: %w[draft major minor patch]
         end
         after_validation do

data/lib/labimotion/entities/dataset_entity.rb

@@ -9,6 +9,7 @@ module Labimotion
     expose :klass_ols, :klass_label, :klass_uuid
     expose :properties, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
     expose :properties_release, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
+    expose :metadata, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
 
     def klass_ols
       object&.dataset_klass&.ols_term_id

data/lib/labimotion/entities/element_entity.rb

@@ -16,6 +16,7 @@ module Labimotion
       expose! :name
       expose! :properties
       expose! :properties_release
+      expose! :metadata
       expose! :short_label
       expose! :thumb_svg
       expose! :type

data/lib/labimotion/entities/element_revision_entity.rb

@@ -4,7 +4,7 @@ require 'labimotion/entities/application_entity'
 module Labimotion
   # ElementRevisionEntity
   class ElementRevisionEntity < Labimotion::ApplicationEntity
-    expose :id, :element_id, :uuid, :name, :klass_uuid, :properties, :created_at
+    expose :id, :element_id, :uuid, :name, :klass_uuid, :properties, :metadata, :created_at
     def created_at
       object.created_at.strftime('%d.%m.%Y, %H:%M')
     end

data/lib/labimotion/entities/generic_klass_entity.rb

@@ -8,6 +8,7 @@ module Labimotion
 
     expose :properties_template, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
     expose :properties_release, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
+    expose :metadata, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
     expose_timestamps(timestamp_fields: %i[released_at created_at updated_at sync_time])
   end
 end

data/lib/labimotion/entities/generic_public_entity.rb

@@ -18,6 +18,7 @@ module Labimotion
     expose! :version
     expose! :released_at
     expose :properties_release, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
+    expose :metadata, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
     expose :element_klass do |obj|
       if obj[:element_klass_id]
         { label: obj.element_klass.label, icon_name: obj.element_klass.icon_name, id: obj.element_klass_id }

data/lib/labimotion/entities/klass_revision_entity.rb

@@ -5,6 +5,7 @@ module Labimotion
   class KlassRevisionEntity < Labimotion::ApplicationEntity
     expose :id, :uuid, :version, :released_at, :klass_id, :submitted
     expose :properties_release, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
+    expose :metadata, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
 
     def klass_id
       object.klass&.id

data/lib/labimotion/entities/segment_entity.rb

@@ -8,6 +8,7 @@ module Labimotion
     expose :id, :segment_klass_id, :element_type, :element_id, :uuid, :klass_uuid, :klass_label
     expose :properties, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
     expose :properties_release, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
+    expose :metadata, **DISPLAYED_IN_LIST_CONDITION, anonymize_with: {}
 
     def klass_label
       object.segment_klass.label

data/lib/labimotion/entities/segment_revision_entity.rb

@@ -3,7 +3,7 @@
 require 'labimotion/entities/application_entity'
 module Labimotion
   class SegmentRevisionEntity < Labimotion::ApplicationEntity
-    expose :id, :segment_id, :uuid, :klass_uuid, :properties, :created_at
+    expose :id, :segment_id, :uuid, :klass_uuid, :properties, :metadata, :created_at
     def created_at
       object.created_at.strftime('%d.%m.%Y, %H:%M')
     end

data/lib/labimotion/helpers/dataset_helpers.rb

@@ -17,7 +17,7 @@ module Labimotion
 
     def create_repo_klass(params, current_user, origin)
       response = Labimotion::TemplateHub.fetch_identifier('DatasetKlass', params[:identifier], origin)
-      attributes = response.slice('ols_term_id', 'label', 'desc', 'uuid', 'identifier', 'properties_release', 'version') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
+      attributes = response.slice('ols_term_id', 'label', 'desc', 'uuid', 'identifier', 'properties_release', 'version', 'metadata') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
       attributes['properties_release']['identifier'] = attributes['identifier']
       attributes['properties_template'] = attributes['properties_release']
       attributes['place'] = ((Labimotion::DatasetKlass.all.length * 10) || 0) + 10

data/lib/labimotion/helpers/element_helpers.rb

@@ -128,6 +128,7 @@ module Labimotion
         attributes['properties']['uuid'] = uuid
         attributes['uuid'] = uuid
         attributes['klass_uuid'] = properties['klass_uuid']
+        attributes['updated_at'] = Time.current
         element.update_columns(attributes)
       end
       # element.save_segments(segments: params[:segments], current_user_id: current_user.id)
@@ -333,7 +334,7 @@ module Labimotion
 
     def create_repo_klass(params, current_user, origin)
       response = Labimotion::TemplateHub.fetch_identifier('ElementKlass', params[:identifier], origin)
-      attributes = response.slice('name', 'label', 'desc', 'icon_name', 'uuid', 'klass_prefix', 'is_generic', 'identifier', 'properties_release', 'version')
+      attributes = response.slice('name', 'label', 'desc', 'icon_name', 'uuid', 'klass_prefix', 'is_generic', 'identifier', 'properties_release', 'version', 'metadata')
       attributes['properties_release']['identifier'] = attributes['identifier']
       attributes['properties_template'] = attributes['properties_release']
       attributes['place'] = ((Labimotion::ElementKlass.all.length * 10) || 0) + 10

data/lib/labimotion/helpers/generic_helpers.rb

@@ -60,6 +60,7 @@ module Labimotion
       properties.delete('eln') if properties['eln'].present?
       klz.updated_by = current_user.id
       klz.properties_template = properties
+      klz.metadata = params[:metadata] || {}
       klz.save!
       klz.reload
       klz.create_klasses_revision(current_user) if params[:release] != 'draft'

data/lib/labimotion/helpers/param_helpers.rb

@@ -47,6 +47,7 @@ module Labimotion
       requires :name, type: String
       optional :properties, type: Hash
       optional :properties_release, type: Hash
+      optional :metadata, type: Hash
       optional :collection_id, type: Integer
       requires :container, type: Hash
       optional :user_labels, type: Array
@@ -58,6 +59,7 @@ module Labimotion
       optional :name, type: String
       requires :properties, type: Hash
       optional :properties_release, type: Hash
+      optional :metadata, type: Hash
       requires :container, type: Hash
       optional :user_labels, type: Array
       optional :segments, type: Array, desc: 'Segments'

data/lib/labimotion/helpers/segment_helpers.rb

@@ -99,7 +99,7 @@ module Labimotion
 
     def create_repo_klass(params, current_user, origin)
       response = Labimotion::TemplateHub.fetch_identifier('SegmentKlass', params[:identifier], origin)
-      attributes = response.slice('label', 'desc', 'uuid', 'identifier', 'released_at', 'properties_release', 'version')
+      attributes = response.slice('label', 'desc', 'uuid', 'identifier', 'released_at', 'properties_release', 'version', 'metadata')
       attributes['properties_release']['identifier'] = attributes['identifier']
       attributes['properties_template'] = attributes['properties_release']
       attributes['place'] = ((Labimotion::SegmentKlass.all.length * 10) || 0) + 10

data/lib/labimotion/models/concerns/datasetable.rb

@@ -32,26 +32,29 @@ module Labimotion
       )
     end
 
-    def save_dataset(**args)
+    def save_dataset(**dataset_args)
       return if not_dataset?
 
-      klass = Labimotion::DatasetKlass.find_by(id: args[:dataset_klass_id])
+      args = dataset_args[:dataset]
+      dataset_klass_id = args[:dataset_klass_id]
+      klass = Labimotion::DatasetKlass.find_by(id: dataset_klass_id)
       uuid = SecureRandom.uuid
+      metadata = args[:metadata] || {}
       props = args[:properties]
       props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
       props['identifier'] = klass.identifier if klass.identifier.present?
       props['uuid'] = uuid
       props['klass'] = 'Dataset'
       props['klass_uuid'] = klass.uuid
-      props = Labimotion::VocabularyHandler.update_vocabularies(props, args[:current_user], args[:element])
+      props = Labimotion::VocabularyHandler.update_vocabularies(props, dataset_args[:current_user], dataset_args[:element])
 
       ds = Labimotion::Dataset.find_by(element_type: self.class.name, element_id: id)
       if ds.present? && (ds.klass_uuid != klass.uuid || ds.properties != props)
-        ds.update!(properties_release: klass.properties_release, uuid: uuid, dataset_klass_id: args[:dataset_klass_id], properties: props, klass_uuid: klass.uuid)
+        ds.update!(properties_release: klass.properties_release, uuid: uuid, dataset_klass_id: dataset_klass_id, properties: props, klass_uuid: klass.uuid)
       end
       return if ds.present?
 
-      Labimotion::Dataset.create!(properties_release: klass.properties_release, uuid: uuid, dataset_klass_id: args[:dataset_klass_id], element_type: self.class.name, element_id: id, properties: props, klass_uuid: klass.uuid)
+      Labimotion::Dataset.create!(properties_release: klass.properties_release, uuid: uuid, dataset_klass_id: dataset_klass_id, element_type: self.class.name, element_id: id, properties: props, klass_uuid: klass.uuid, metadata: metadata)
     end
 
     def destroy_datasetable

data/lib/labimotion/models/concerns/generic_klass_revisions.rb

@@ -45,7 +45,8 @@ module Labimotion
         version: version,
         created_by: updated_by,
         properties_release: properties_release,
-        released_at: released_at
+        released_at: released_at,
+        metadata: metadata
       }
       attributes["#{self.class.name.underscore.split('/').last}_id"] = id
       "#{self.class.name}esRevision".constantize.create(attributes)

data/lib/labimotion/models/concerns/generic_revisions.rb

@@ -22,7 +22,8 @@ module Labimotion
         klass_uuid: klass_uuid,
         properties: properties,
         ## created_by: user_for_revision&.id,
-        properties_release: properties_release
+        properties_release: properties_release,
+        metadata: metadata
       }
       attributes["#{Labimotion::Utils.element_name_dc(self.class.name)}_id"] = id
       attributes['name'] = name if self.class.name == 'Labimotion::Element'

data/lib/labimotion/models/concerns/metadata_validation.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Labimotion
+  ## Metadata Validation Concern
+  module MetadataValidation
+    extend ActiveSupport::Concern
+
+    included do
+      validate :metadata_must_be_hash
+
+      # Provide default value for metadata to support migrations
+      # when the column might not exist yet
+      after_initialize :set_metadata_default
+    end
+
+    private
+
+    def set_metadata_default
+      self.metadata ||= {} if has_attribute?(:metadata)
+    end
+
+    def metadata_must_be_hash
+      # Skip validation if the metadata column doesn't exist yet (during migrations)
+      return unless has_attribute?(:metadata)
+
+      # Set default if nil
+      self.metadata ||= {}
+
+      return if metadata.is_a?(Hash)
+
+      errors.add(:metadata, 'must be a hash/object, not an array or other type')
+    end
+  end
+end

data/lib/labimotion/models/concerns/segmentable.rb

@@ -68,14 +68,14 @@ module Labimotion
         # props = Labimotion::VocabularyHandler.update_vocabularies(props, current_user, self)
         segment = Labimotion::Segment.where(element_type: self.class.name, element_id: self.id, segment_klass_id: seg['segment_klass_id']).order(id: :desc).first
         if segment.present? && (segment.klass_uuid != props['klass_uuid'] || segment.properties != props)
-          segment.update!(properties_release: klass.properties_release, properties: props, uuid: uuid, klass_uuid: props['klass_uuid'])
+          segment.update!(properties_release: klass.properties_release, properties: props, uuid: uuid, klass_uuid: props['klass_uuid'], metadata: seg['metadata'] || {})
           # segments.push(segment)
           Labimotion::Segment.where(element_type: self.class.name, element_id: self.id, segment_klass_id: seg['segment_klass_id']).where.not(id: segment.id).destroy_all
         end
         next if segment.present?
 
         props['klass_uuid'] = klass.uuid
-        segment = Labimotion::Segment.create!(properties_release: klass.properties_release, segment_klass_id: seg['segment_klass_id'], element_type: self.class.name, element_id: self.id, properties: props, created_by: args[:current_user_id], uuid: uuid, klass_uuid: klass.uuid)
+        segment = Labimotion::Segment.create!(properties_release: klass.properties_release, segment_klass_id: seg['segment_klass_id'], element_type: self.class.name, element_id: self.id, properties: props, created_by: args[:current_user_id], uuid: uuid, klass_uuid: klass.uuid, metadata: seg['metadata'] || {})
         # segments.push(segment)
       end
 

data/lib/labimotion/models/dataset_klass.rb

@@ -2,6 +2,7 @@
 
 require 'labimotion/models/concerns/generic_klass_revisions'
 require 'labimotion/models/concerns/generic_klass'
+require 'labimotion/models/concerns/metadata_validation'
 
 module Labimotion
   class DatasetKlass < ApplicationRecord
@@ -9,6 +10,7 @@ module Labimotion
     self.table_name = :dataset_klasses
     include GenericKlassRevisions
     include GenericKlass
+    include MetadataValidation
 
     has_many :datasets, dependent: :destroy, class_name: 'Labimotion::Dataset'
     has_many :dataset_klasses_revisions, dependent: :destroy, class_name: 'Labimotion::DatasetKlassesRevision'

data/lib/labimotion/models/dataset_klasses_revision.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require 'labimotion/models/concerns/klass_revision'
+require 'labimotion/models/concerns/metadata_validation'
 
 module Labimotion
   class DatasetKlassesRevision < ApplicationRecord
     self.table_name = :dataset_klasses_revisions
     acts_as_paranoid
     include KlassRevision
+    include MetadataValidation
     belongs_to :dataset_klass, class_name: 'Labimotion::DatasetKlass'
   end
 end

data/lib/labimotion/models/element_klass.rb

@@ -4,6 +4,7 @@ require 'labimotion/conf'
 require 'labimotion/models/concerns/generic_klass_revisions'
 require 'labimotion/models/concerns/generic_klass'
 require 'labimotion/models/concerns/workflow'
+require 'labimotion/models/concerns/metadata_validation'
 
 module Labimotion
   class ElementKlass < ApplicationRecord
@@ -12,6 +13,7 @@ module Labimotion
     include GenericKlassRevisions
     include GenericKlass
     include Workflow
+    include MetadataValidation
     has_many :elements, dependent: :destroy, class_name: 'Labimotion::Element'
     has_many :segment_klasses, dependent: :destroy, class_name: 'Labimotion::SegmentKlass'
     has_many :element_klasses_revisions, dependent: :destroy, class_name: 'Labimotion::ElementKlassesRevision'

data/lib/labimotion/models/element_klasses_revision.rb

@@ -2,6 +2,7 @@
 
 require 'labimotion/models/concerns/workflow'
 require 'labimotion/models/concerns/klass_revision'
+require 'labimotion/models/concerns/metadata_validation'
 
 module Labimotion
   class ElementKlassesRevision < ApplicationRecord
@@ -9,6 +10,7 @@ module Labimotion
     self.table_name = :element_klasses_revisions
     include Workflow
     include KlassRevision
+    include MetadataValidation
     belongs_to :element_klass, class_name: 'Labimotion::ElementKlass'
 
     def migrate_workflow

data/lib/labimotion/models/segment_klass.rb

@@ -3,6 +3,7 @@
 require 'labimotion/models/concerns/generic_klass_revisions'
 require 'labimotion/models/concerns/generic_klass'
 require 'labimotion/models/concerns/workflow'
+require 'labimotion/models/concerns/metadata_validation'
 
 module Labimotion
   class SegmentKlass < ApplicationRecord
@@ -11,6 +12,7 @@ module Labimotion
     include GenericKlassRevisions
     include GenericKlass
     include Workflow
+    include MetadataValidation
     belongs_to :element_klass, class_name: 'Labimotion::ElementKlass'
     has_many :segments, dependent: :destroy, class_name: 'Labimotion::Segment'
     has_many :segment_klasses_revisions, dependent: :destroy, class_name: 'Labimotion::SegmentKlassesRevision'

data/lib/labimotion/models/segment_klasses_revision.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require 'labimotion/models/concerns/klass_revision'
+require 'labimotion/models/concerns/metadata_validation'
 
 module Labimotion
   class SegmentKlassesRevision < ApplicationRecord
     acts_as_paranoid
     self.table_name = :segment_klasses_revisions
     include KlassRevision
+    include MetadataValidation
     belongs_to :segment_klass, class_name: 'Labimotion::SegmentKlass'
   end
 end

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '2.1.0.rc14'
+  VERSION = '2.2.0.rc1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc14
+  version: 2.2.0.rc1
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-12-04 00:00:00.000000000 Z
+date: 2025-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -122,6 +122,7 @@ files:
 - lib/labimotion/models/concerns/generic_revisions.rb
 - lib/labimotion/models/concerns/klass_revision.rb
 - lib/labimotion/models/concerns/linked_properties.rb
+- lib/labimotion/models/concerns/metadata_validation.rb
 - lib/labimotion/models/concerns/segmentable.rb
 - lib/labimotion/models/concerns/workflow.rb
 - lib/labimotion/models/dataset.rb