labimotion 2.1.0.rc12 → 2.1.0.rc14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3778897d34066e72b55508a3f5788f26f85daa5b30223a81d60736c55150ff3
-  data.tar.gz: dddc91940a4e1f56869ed6e1ff27c155197836f3061eb091258b597884f0cb46
+  metadata.gz: 3be4d822cf9ab027e3d64f1b6356f02a6d696a6125c0db56bf8ca61e342eaabe
+  data.tar.gz: 8038b4423f9c7a26fa01c07defd715809d4698a51b6362948de4560870ab4c61
 SHA512:
-  metadata.gz: c842df479d71468944e769f4f5978ccce3cd4597f6368439b0e2da189f1740434755827787e7201cd3d654268aa0fac00407d4e230b23f767c0f2009f14a08af
-  data.tar.gz: a8a16ba782bb66fdd878aeb8d27b57f7a8c42b669854e274a5081f45c99f772338f1a43bd2728e7ca5b83558c7e5c757877a1696c48bb8148a91667be14deb55
+  metadata.gz: 3c2fe973a0fd5593246206ac697d84ae77bea51f32d1501d3fbd4dc79273d67d9ac04c54866c1cf2a952424043a1edca73591756cd5644c8156d07943bc51208
+  data.tar.gz: 70b348d0130ee3fe9cc72e829013b06357172a16f5cda79e4799dcd019d317f2561ce2910e457382904cda7fe02d36465ef58fbde0de24803990fd0b428ea5c6

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/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/element_entity.rb

@@ -21,6 +21,7 @@ module Labimotion
       expose! :type
       expose! :uuid
       expose! :user_labels
+      expose! :preview_attachment # align with eln change
     end
 
     with_options(anonymize_below: 10) do

data/lib/labimotion/entities/klass_revision_entity.rb

@@ -2,15 +2,12 @@
 
 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 :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 +15,3 @@ module Labimotion
     end
   end
 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/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/dataset_klasses_revision.rb

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

data/lib/labimotion/models/element.rb

@@ -60,6 +60,12 @@ module Labimotion
     after_create :update_counter
     before_destroy :delete_attachment
 
+    # align with eln change on preview attachment
+    def preview_attachment
+      image_atts = attachments.select(&:type_image?)
+      image_atts[0] || attachments[0]
+    end
+
     def user_labels
       tag&.taggable_data&.fetch('user_labels', nil)
     end

data/lib/labimotion/models/element_klasses_revision.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
 require 'labimotion/models/concerns/workflow'
+require 'labimotion/models/concerns/klass_revision'
 
 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
+    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_klasses_revision.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require 'labimotion/models/concerns/klass_revision'
+
 module Labimotion
   class SegmentKlassesRevision < ApplicationRecord
     acts_as_paranoid
     self.table_name = :segment_klasses_revisions
-    has_one :segment_klass, class_name: 'Labimotion::SegmentKlass'
+    include KlassRevision
+    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.rc12'
+  VERSION = '2.1.0.rc14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc12
+  version: 2.1.0.rc14
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-11-19 00:00:00.000000000 Z
+date: 2025-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -120,6 +120,7 @@ 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/segmentable.rb
 - lib/labimotion/models/concerns/workflow.rb
@@ -145,6 +146,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