labimotion 2.1.0.rc13 → 2.1.0.rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2d91570fdadd94114fe2f9d718500c5b63952aedc8d4b3c70284f50f0332aa7
-  data.tar.gz: 2aa299d45b1136966622d165fbb4f09416d9f13b9d7e11c8a857c14c6499dfe4
+  metadata.gz: 00f664a1f81cf5face58aaffb1855e0056643ae6e624ec01a41299e2097d4f78
+  data.tar.gz: f2591aee3db2b0de0019f7a85191b1bf0b84f1ee5ebf9ada9861782115fd415c
 SHA512:
-  metadata.gz: 52896a77e3e27514c0216b081e1899878097f313dab59051bd6a2916752f50bdf4b55d11dbf87c08484c8c4a8e298415dcffe2257b6fd8585ec09de7f064931c
-  data.tar.gz: 5e870746f14902a8e23dd42be15c18f0eb798cc313428f917e8dd8d06ccc0b601e04bae967ffd5a008274e2f1542f7c292e28e228846c5a1b70fed027b68a62c
+  metadata.gz: fcf9e9ee81ce54790ad7005f5b9bb6143052f1c5c0b5fcfe3fb4fd1d88c49603d8b91783dd997f0aa5a2242a22aaa34e77bcd9d7680006d4aab4d945e2b82785
+  data.tar.gz: deb0ed0dbf6537d1af22cb89fabae0d1f2c82565c21e5cf4a588be70c2dcc79e1e83c8695aa3188105d7fed2b08e794b03d0511c9819625d064ea7544d76999c

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
@@ -473,7 +474,7 @@ module Labimotion
               detail_levels: ElementDetailLevelCalculator.new(user: current_user, element: element).detail_levels,
               policy: @element_policy
             ),
-            attachments: attach_thumbnail(element&.attachments)
+            attachments: Entities::AttachmentEntity.represent(element&.attachments)
           }
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
@@ -516,7 +517,7 @@ module Labimotion
                 element,
                 detail_levels: ElementDetailLevelCalculator.new(user: current_user, element: element).detail_levels,
               ),
-              attachments: attach_thumbnail(element&.attachments),
+              attachments: Entities::AttachmentEntity.represent(element&.attachments),
             }
           rescue StandardError => e
             Labimotion.log_exception(e, current_user)

data/lib/labimotion/apis/labimotion_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # app/api/labimotion/central_api.rb
 module Labimotion
   class LabimotionAPI < Grape::API
@@ -11,4 +13,4 @@ module Labimotion
     mount Labimotion::StandardLayerAPI
     mount Labimotion::VocabularyAPI
   end
-end
+end

data/lib/labimotion/apis/labimotion_hub_api.rb

@@ -11,24 +11,24 @@ module Labimotion
 
     namespace :labimotion_hub do
       namespace :list do
-        desc "get active generic templates"
+        desc 'get active generic templates'
         params do
-          requires :klass, type: String, desc: 'Klass', values: %w[ElementKlass SegmentKlass DatasetKlass]
+          requires :klass, type: String, desc: 'Klass', values: Labimotion::Constants::Klass::ALL
           optional :with_props, type: Boolean, desc: 'With Properties', default: false
         end
         get do
           list = "Labimotion::#{params[:klass]}".constantize.where(is_active: true).where.not(released_at: nil)
-          list = list.where(is_generic: true) if params[:klass] == 'ElementKlass'
-          entities = Labimotion::GenericPublicEntity.represent(list, displayed: params[:with_props], root: 'list')
+          list = list.where(is_generic: true) if params[:klass] == Labimotion::Constants::Klass::ELEMENT
+          Labimotion::GenericPublicEntity.represent(list, displayed: params[:with_props], root: 'list')
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
           []
         end
       end
       namespace :fetch do
-        desc "get active generic templates"
+        desc 'get active generic templates'
         params do
-          requires :klass, type: String, desc: 'Klass', values: %w[ElementKlass SegmentKlass DatasetKlass]
+          requires :klass, type: String, desc: 'Klass', values: Labimotion::Constants::Klass::ALL
           requires :origin, type: String, desc: 'origin'
           requires :identifier, type: String, desc: 'Identifier'
         end
@@ -43,13 +43,16 @@ module Labimotion
       end
 
       namespace :element_klasses_name do
-        desc "get klasses"
+        desc 'get klasses'
         params do
-          optional :generic_only, type: Boolean, desc: "list generic element only"
+          optional :generic_only, type: Boolean, desc: 'list generic element only'
         end
         get do
-          list = Labimotion::ElementKlass.where(is_active: true) if params[:generic_only].present? && params[:generic_only] == true
-          list = Labimotion::ElementKlass.where(is_active: true) unless params[:generic_only].present? && params[:generic_only] == true
+          if params[:generic_only].present? && params[:generic_only] == true
+            list = Labimotion::ElementKlass.where(is_active: true, is_generic: true)
+          else
+            list = Labimotion::ElementKlass.where(is_active: true)
+          end
           list.pluck(:name)
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
@@ -57,6 +60,76 @@ module Labimotion
         end
       end
 
+      namespace :submit do
+        desc 'submit a template'
+        params do
+          requires :klass, type: String, desc: 'klass of the template',
+                           values: Labimotion::Constants::Klass::ALL
+          requires :id, type: Integer, desc: 'template revision id'
+          requires :contact_email, type: String, desc: 'email of the submitter', regexp: URI::MailTo::EMAIL_REGEXP
+          requires :application, type: String, desc: 'application for the template'
+          requires :message, type: String, desc: 'message of the submission'
+        end
+        post do
+          klass = params[:klass]
+          template = "Labimotion::#{klass}esRevision".constantize.find(params[:id])
+          klass_data = "Labimotion::#{klass}Entity".constantize.represent(template.klass, displayed_in_list: true)
+          metadata = {
+            klass: {
+              klass: klass,
+              data: klass_data
+            },
+            submission: {
+              last_name: current_user.last_name,
+              first_name: current_user.first_name,
+              email: current_user.email,
+              id: current_user.id,
+              contact_email: params[:contact_email],
+              application: params[:application],
+              message: params[:message]
+            }
+          }
+
+          # Submit the main template
+          result = Labimotion::TemplateHub.send_to_central_hub(klass, template.properties_release, metadata,
+                                                               request.headers['Origin'])
+
+          # Increment submitted counter if submission was successful
+          template.increment_submitted! if result[:mc] == 'ss00'
+
+          # For SegmentKlass, also submit the associated ElementKlass
+          if klass == Labimotion::Constants::Klass::SEGMENT && result[:mc] == 'ss00'
+            element_klass = template.klass.element_klass
+            element_klass_data = Labimotion::ElementKlassEntity.represent(element_klass, displayed_in_list: true)
+            element_metadata = {
+              klass: {
+                klass: Labimotion::Constants::Klass::ELEMENT,
+                data: element_klass_data
+              },
+              submission: metadata[:submission].merge(
+                associated_submission_id: result[:data][:id]
+              )
+            }
+
+            element_result = Labimotion::TemplateHub.send_to_central_hub(Labimotion::Constants::Klass::ELEMENT,
+                                                                         element_klass.properties_release,
+                                                                         element_metadata, request.headers['Origin'])
+
+            # Increment the ElementKlass revision counter if submission was successful
+            if element_result[:mc] == 'ss00'
+              # Find the revision that matches the ElementKlass UUID
+              element_revision = Labimotion::ElementKlassesRevision.find_by(uuid: element_klass.uuid)
+              element_revision&.increment_submitted!
+            end
+          end
+
+          # Only return the main result; TODO: handle element_result as well
+          result
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          { mc: 'se00', msg: e.message, data: [] }
+        end
+      end
     end
   end
 end

data/lib/labimotion/collection/import.rb

@@ -69,7 +69,7 @@ module Labimotion
 
           dataset = Labimotion::Dataset.create!(
             fields.slice(
-              'properties', 'properties_release'
+              'properties', 'properties_release', 'metadata'
             ).merge(
               ## created_by: current_user_id,
               element: element,
@@ -112,7 +112,7 @@ module Labimotion
 
         segment = Labimotion::Segment.create!(
           fields.slice(
-            'properties', 'properties_release'
+            'properties', 'properties_release', 'metadata'
           ).merge(
             created_by: current_user_id,
             element: element,
@@ -149,7 +149,7 @@ module Labimotion
 
         element = Labimotion::Element.create!(
           fields.slice(
-            'name', 'properties', 'properties_release'
+            'name', 'properties', 'properties_release', 'metadata'
           ).merge(
             created_by: current_user_id,
             element_klass: element_klass,

data/lib/labimotion/constants.rb

@@ -21,5 +21,12 @@ module Labimotion
       NMR_CONFIG = ::File.join(__dir__, 'libs', 'data', 'mapper', 'Source.json').freeze
       WIKI_CONFIG = ::File.join(__dir__, 'libs', 'data', 'mapper', 'Chemwiki.json').freeze
     end
+
+    module Klass
+      ELEMENT = 'ElementKlass'
+      SEGMENT = 'SegmentKlass'
+      DATASET = 'DatasetKlass'
+      ALL = [ELEMENT, SEGMENT, DATASET].freeze
+    end
   end
 end

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

@@ -2,15 +2,13 @@
 
 require 'labimotion/entities/application_entity'
 module Labimotion
-  # KlassRevisionEntity
   class KlassRevisionEntity < Labimotion::ApplicationEntity
-    expose :id, :uuid, :properties_release, :version, :released_at
+    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: {}
 
-    expose :klass_id do |object|
-      klass_id = object.element_klass_id if object.respond_to? :element_klass_id
-      klass_id = object.segment_klass_id if object.respond_to? :segment_klass_id
-      klass_id = object.dataset_klass_id if object.respond_to? :dataset_klass_id
-      klass_id
+    def klass_id
+      object.klass&.id
     end
 
     def released_at
@@ -18,4 +16,3 @@ module Labimotion
     end
   end
 end
-

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

@@ -82,7 +82,8 @@ module Labimotion
         klass_uuid: klass[:uuid],
         properties: properties,
         properties_release: params[:properties_release],
-        created_by: current_user.id,
+        metadata: params[:metadata] || {},
+        created_by: current_user.id
       }
       element = Labimotion::Element.new(attributes)
 
@@ -116,7 +117,8 @@ module Labimotion
       params.delete(:user_labels)
       attributes = declared(params.except(:segments), include_missing: false)
       properties['pkg'] = Labimotion::Utils.pkg(properties['pkg'])
-      if element.klass_uuid != properties['klass_uuid'] || element.properties != properties || element.name != params[:name]
+      metadata = params[:metadata] || element.metadata || {}
+      if element.klass_uuid != properties['klass_uuid'] || element.properties != properties || element.name != params[:name] || element.metadata != metadata
         properties['klass'] = 'Element'
         uuid = SecureRandom.uuid
         properties['uuid'] = uuid
@@ -128,6 +130,8 @@ module Labimotion
         attributes['properties']['uuid'] = uuid
         attributes['uuid'] = uuid
         attributes['klass_uuid'] = properties['klass_uuid']
+        attributes['metadata'] = metadata
+        attributes['updated_at'] = Time.current
         element.update_columns(attributes)
       end
       # element.save_segments(segments: params[:segments], current_user_id: current_user.id)
@@ -333,7 +337,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

@@ -13,6 +13,7 @@ module Labimotion
       optional :desc, type: String, desc: 'Klass desc'
       optional :klass_prefix, type: String, desc: 'Klass klass_prefix'
       optional :icon_name, type: String, desc: 'Klass icon_name'
+      optional :metadata, type: Hash, desc: 'Klass metadata'
       requires :properties_template, type: Hash, desc: 'Klass template'
       optional :properties_release, type: Hash, desc: 'Klass release'
       optional :released_at, type: DateTime, desc: 'Klass released_at'
@@ -29,6 +30,7 @@ module Labimotion
       requires :klass_prefix, type: String, desc: 'Element Klass Short Label Prefix'
       optional :icon_name, type: String, desc: 'Element Klass Icon Name'
       optional :desc, type: String, desc: 'Element Klass Desc'
+      optional :metadata, type: Hash, desc: 'Element Klass metadata'
       optional :properties_template, type: Hash, desc: 'Element Klass properties template'
     end
 
@@ -47,6 +49,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 +61,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'
@@ -67,6 +71,7 @@ module Labimotion
     params :upload_segment_klass_params do
       requires :label, type: String, desc: 'Klass label'
       optional :desc, type: String, desc: 'Klass desc'
+      optional :metadata, type: Hash, desc: 'Klass metadata'
       requires :properties_template, type: Hash, desc: 'Klass template'
       optional :properties_release, type: Hash, desc: 'Klass release'
       optional :released_at, type: DateTime, desc: 'Klass released_at'
@@ -93,6 +98,7 @@ module Labimotion
       requires :element_klass, type: Integer, desc: 'Element Klass Id'
       optional :desc, type: String, desc: 'Segment Klass Desc'
       optional :place, type: String, desc: 'Segment Klass Place', default: '100'
+      optional :metadata, type: Hash, desc: 'Klass metadata'
       optional :properties_template, type: Hash, desc: 'Element Klass properties template'
     end
 

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/libs/converter.rb

@@ -222,7 +222,8 @@ module Labimotion
         element_id: cds.id,
         properties: props,
         properties_release: klass.properties_release,
-        klass_uuid: klass.uuid
+        klass_uuid: klass.uuid,
+        metadata: klass.metadata
       )
     end
 

data/lib/labimotion/libs/dataset_builder.rb

@@ -44,7 +44,8 @@ module Labimotion
         element_id: container.id,
         properties: props,
         properties_release: klass.properties_release,
-        klass_uuid: klass.uuid
+        klass_uuid: klass.uuid,
+        metadata: klass.metadata
       )
     end
 

data/lib/labimotion/libs/template_hub.rb

@@ -5,9 +5,6 @@ require 'uri'
 require 'json'
 require 'date'
 
-# rubocop: disable Metrics/AbcSize
-# rubocop: disable Metrics/MethodLength
-
 module Labimotion
   ## TemplateHub
   class TemplateHub
@@ -18,12 +15,11 @@ module Labimotion
       "#{url}api/v1/labimotion_hub/#{api_name}"
     end
 
-
     def self.header(opt = {})
       opt || { timeout: 10, headers: { 'Content-Type' => 'text/json' } }
     end
 
-    def self.handle_response(oat, response) # rubocop: disable Metrics/PerceivedComplexity
+    def self.handle_response(oat, response)
       begin
         response&.success? ? 'OK' : 'ERROR'
       rescue StandardError => e
@@ -56,10 +52,32 @@ module Labimotion
       Labimotion.log_exception(e)
       error!('Cannot connect to Chemotion Repository', 401)
     end
+
+    def self.send_to_central_hub(klass, template, metadata, origin)
+      body = {
+        template_klass: klass,
+        template: template,
+        metadata: metadata,
+        origin: origin
+      }
+      response = HTTParty.post(
+        Labimotion::TemplateHub.uri('template_submissions'),
+        headers: {
+          'Content-Type' => 'application/json',
+          'X-Origin-URL' => origin
+        },
+        body: body.to_json,
+        timeout: 10
+      )
+
+      if [200, 201].include?(response.code)
+        parsed_response = JSON.parse(response.body)
+        return { mc: 'ss00', data: { id: parsed_response['id'] } }
+      end
+      { mc: 'se00', msg: "HTTP #{response.code}: #{response.message}", data: {} }
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      { mc: 'se00', msg: "Connection failure: #{e.message}", data: {} }
+    end
   end
 end
-
-# rubocop: enable Metrics/AbcSize
-# rubocop: enable Metrics/MethodLength
-# rubocop: enable Metrics/ClassLength
-# rubocop: enable Metrics/CyclomaticComplexity

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

@@ -29,29 +29,33 @@ module Labimotion
         properties: ods.properties,
         properties_release: ods.properties_release,
         klass_uuid: ods.klass_uuid,
+        metadata: ods.metadata || {}
       )
     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)
+      if ds.present? && (ds.klass_uuid != klass.uuid || ds.properties != props || ds.metadata != metadata)
+        ds.update!(properties_release: klass.properties_release, uuid: uuid, dataset_klass_id: dataset_klass_id, properties: props, klass_uuid: klass.uuid, metadata: metadata)
       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

@@ -9,7 +9,6 @@ module Labimotion
       before_save :check_identifier
     end
 
-
     def check_identifier
       self.identifier = identifier || SecureRandom.uuid if self.has_attribute?(:identifier)
     end
@@ -34,7 +33,7 @@ module Labimotion
         properties_release: properties_release,
         released_at: DateTime.now,
         updated_by: current_user&.id,
-        released_by: current_user&.id,
+        released_by: current_user&.id
       }
 
       self.update!(klass_attributes)
@@ -45,7 +44,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/klass_revision.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Labimotion
+  # Shared concern for all Klass Revision models
+  # Provides a unified interface to access the parent klass object
+  module KlassRevision
+    extend ActiveSupport::Concern
+
+    # Returns the associated klass object (ElementKlass, SegmentKlass, or DatasetKlass)
+    def klass
+      return element_klass if respond_to?(:element_klass)
+      return segment_klass if respond_to?(:segment_klass)
+      return dataset_klass if respond_to?(:dataset_klass)
+
+      nil
+    end
+
+    # Increments the submitted counter and saves the record
+    def increment_submitted!
+      increment!(:submitted)
+    end
+  end
+end

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,9 +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
-    has_one :dataset_klass, class_name: 'Labimotion::DatasetKlass'
+    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

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
 require 'labimotion/models/concerns/workflow'
+require 'labimotion/models/concerns/klass_revision'
+require 'labimotion/models/concerns/metadata_validation'
 
 module Labimotion
   class ElementKlassesRevision < ApplicationRecord
     acts_as_paranoid
     self.table_name = :element_klasses_revisions
     include Workflow
-    has_one :element_klass, class_name: 'Labimotion::ElementKlass'
-
+    include KlassRevision
+    include MetadataValidation
+    belongs_to :element_klass, class_name: 'Labimotion::ElementKlass'
 
     def migrate_workflow
       return if properties_release.nil? || properties_release['flow'].nil?

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,9 +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
-    has_one :segment_klass, class_name: 'Labimotion::SegmentKlass'
+    include KlassRevision
+    include MetadataValidation
+    belongs_to :segment_klass, class_name: 'Labimotion::SegmentKlass'
   end
 end

data/lib/labimotion/models/template_submission.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: template_submissions
+#
+#  id            :bigint           not null, primary key
+#  template_klass :string           not null
+#  template      :jsonb            not null, default: {}
+#  metadata      :jsonb            not null, default: {}
+#  origin        :string           not null
+#  state         :integer          not null, default: 0
+#  created_at    :datetime         not null
+#  updated_at    :datetime
+#  deleted_at    :datetime
+#
+# Indexes
+#
+#  idx_template_submissions_template  (template) USING gin
+#  idx_template_submissions_metadata  (metadata) USING gin
+#
+
+module Labimotion
+  class TemplateSubmission < ApplicationRecord
+    acts_as_paranoid
+
+    # State enum
+    enum state: {
+      pending: 0,
+      approved: 1,
+      rejected: 2,
+      released: 3
+    }
+
+    # Validations
+    validates :template_klass, presence: true
+    validates :template, presence: true
+    validates :metadata, presence: true
+    validates :origin, presence: true
+
+    # Scopes
+    scope :by_template_klass, ->(klass) { where(template_klass: klass) }
+    scope :by_state, ->(state) { where(state: state) }
+    scope :by_origin, ->(origin) { where(origin: origin) }
+    scope :by_email, ->(email) { where("metadata->'submission'->>'email' = ?", email) }
+    scope :by_contact_email, ->(email) { where("metadata->'submission'->>'contact_email' = ?", email) }
+    scope :by_any_email, lambda { |email|
+      where("metadata->'submission'->>'email' = ? OR metadata->'submission'->>'contact_email' = ?", email, email)
+    }
+    scope :recent, -> { order(created_at: :desc) }
+  end
+end

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '2.1.0.rc13'
+  VERSION = '2.1.0.rc15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc13
+  version: 2.1.0.rc15
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-11-28 00:00:00.000000000 Z
+date: 2026-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -120,7 +120,9 @@ files:
 - lib/labimotion/models/concerns/generic_klass.rb
 - lib/labimotion/models/concerns/generic_klass_revisions.rb
 - 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
@@ -145,6 +147,7 @@ files:
 - lib/labimotion/models/segments_revision.rb
 - lib/labimotion/models/std_layer.rb
 - lib/labimotion/models/std_layers_revision.rb
+- lib/labimotion/models/template_submission.rb
 - lib/labimotion/models/vocabulary.rb
 - lib/labimotion/models/wellplate.rb
 - lib/labimotion/utils/con_state.rb