labimotion 2.2.0.rc6 → 2.2.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33131772f2889ec9b2975e3abc9b498439e7c9aba468a61c83d9572cbb100cbf
-  data.tar.gz: 55bfe79124ed9311ceef46620e4bd32e7fb8f175fd8a116630b859328eb55f20
+  metadata.gz: a7b53d1daca8b636571715c7ff62caa557dc59082c1f7733cdd6e6a875795712
+  data.tar.gz: cab23343b2c90f335571ae7b5b7e714b63cee7e1f403b50b8b3c89e944b23e4a
 SHA512:
-  metadata.gz: 87317b89ef68c85576470d1d29162118343f1f987188f30b7ff48658a19719ac8536c1009fd330582c38d6ff4f045a8cd69a07fe0cd0fc7466fc70c25f9850c7
-  data.tar.gz: 30d9dd24177f85ecd3dfc6ccdfd83dbf86e7db9e33a1d63df8ad60b8ebfa0db5dac03419bcaf1405b5051f4c4ef69bc5c5202b41beac12299370f816ce2ffb57
+  metadata.gz: ffbd3fac0cba826e516a8dd57fed5c0ac0b29a50c15752ca27453cc9dfd28736e71ce44b76efef72690daf1aa23f42a48309228b038a883ac67852564e74c94d
+  data.tar.gz: 7a3da058102e765cdfa54fa5ece7e3dc022cff2a0f39e9eae1cc31e4053b8e7735b5eda17bc2c05927b1e54d81883c3a885e1367eb85624d4e8437505ee96191

data/lib/labimotion/apis/element_variation_api.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Labimotion
+  class ElementVariationAPI < Grape::API
+    rescue_from ActiveRecord::RecordNotFound do
+      error!('404 Element not found', 404)
+    end
+
+    resource :element_variations do
+      params do
+        requires :element_id, type: Integer, desc: 'Generic element id'
+      end
+      route_param :element_id do
+        before do
+          @element = Labimotion::Element.find(params[:element_id])
+          error!('401 Unauthorized', 401) unless ElementPolicy.new(current_user, @element).read?
+        end
+
+        desc 'Return element variations for a generic element'
+        get do
+          record = Labimotion::ElementVariation.find_or_initialize_by(element_id: @element.id)
+          present record, with: Labimotion::ElementVariationEntity, root: 'element_variation'
+        end
+
+        desc 'Upsert element variations for a generic element'
+        params do
+          requires :variations, type: Hash, desc: 'Variations keyed by row uuid'
+          optional :layout, type: Hash, desc: 'Column layout (selected/order/units/rowOrder)'
+        end
+        put do
+          error!('401 Unauthorized', 401) unless ElementPolicy.new(current_user, @element).update?
+
+          record = Labimotion::ElementVariation.find_or_initialize_by(element_id: @element.id)
+          record.variations = params[:variations] || {}
+          if params.key?(:layout) && record.class.column_names.include?('layout')
+            record.layout = params[:layout] || {}
+          end
+          record.save!
+
+          present record, with: Labimotion::ElementVariationEntity, root: 'element_variation'
+        end
+      end
+    end
+  end
+end

data/lib/labimotion/apis/labimotion_api.rb

@@ -14,5 +14,6 @@ module Labimotion
     mount Labimotion::VocabularyAPI
     mount Labimotion::MttAPI
     mount Labimotion::DoseRespRequestAPI
+    mount Labimotion::ElementVariationAPI
   end
 end

data/lib/labimotion/entities/element_entity.rb

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

data/lib/labimotion/entities/element_variation_entity.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'labimotion/entities/application_entity'
+
+module Labimotion
+  class ElementVariationEntity < Labimotion::ApplicationEntity
+    expose :id
+    expose :element_id, as: :elementId
+    expose :variations
+    expose :layout
+
+    def variations
+      rows = object.variations_hash
+      rows.transform_values do |row|
+        next row unless row.is_a?(Hash)
+
+        row.symbolize_keys.slice(:uuid, :name, :properties, :metadata, :segments).tap do |slim|
+          slim[:properties] = (slim[:properties] || {})
+          slim[:metadata] = (slim[:metadata] || {}).slice('notes', 'analyses', 'group', :notes, :analyses, :group)
+          slim[:segments] = (slim[:segments] || {})
+        end
+      end
+    end
+
+    def layout
+      object.layout_hash
+    end
+  end
+end

data/lib/labimotion/helpers/mtt_helpers.rb

@@ -74,6 +74,7 @@ module Labimotion
       response_data = {
         id: dose_resp_request.id.to_s,
         request_id: dose_resp_request.request_id,
+        element_info: extract_element_properties(dose_resp_request.element),
         wellplates: wellplates_data
       }
 
@@ -382,6 +383,30 @@ module Labimotion
       end
     end
 
+    def extract_element_properties(element)
+      props = {
+        id: element.id.to_s,
+        name: element.name
+      }
+
+      layers = element.properties.dig('layers', 'general_information', 'fields') ||
+               element.properties.dig(:layers, :general_information, :fields) || []
+
+      endpoint_field = layers.find { |f| f['field'] == 'Endpoint' || f[:field] == 'Endpoint' }
+      props[:endpoint] = endpoint_field['value'] || endpoint_field[:value] if endpoint_field
+
+      props
+    end
+
+
+    def generate_element_metadata(element)
+      {
+        id: wellplate.id.to_s,
+        readoutTitles: extract_readout_titles(wellplate),
+        wells: extract_wells(wellplate)
+      }
+    end
+
 
     def generate_json_data(wellplates)
       # # Generate wellplates metadata

data/lib/labimotion/models/element.rb

@@ -41,6 +41,12 @@ module Labimotion
     has_many :samples, through: :elements_samples, source: :sample
     has_one :container, :as => :containable
     has_many :elements_revisions, dependent: :destroy, class_name: 'Labimotion::ElementsRevision'
+    has_one :element_variation, dependent: :destroy, class_name: 'Labimotion::ElementVariation', foreign_key: :element_id
+
+    def variations_count
+      rows = element_variation&.variations
+      rows.is_a?(Hash) ? rows.size : 0
+    end
 
     accepts_nested_attributes_for :collections_elements
 

data/lib/labimotion/models/element_variation.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Labimotion
+  class ElementVariation < ApplicationRecord
+    self.table_name = :element_variations
+
+    belongs_to :element, class_name: 'Labimotion::Element'
+
+    validates :element_id, uniqueness: true
+
+    def variations_hash
+      variations.is_a?(Hash) ? variations : {}
+    end
+
+    def layout_hash
+      return {} unless self.class.column_names.include?('layout')
+
+      layout.is_a?(Hash) ? layout : {}
+    end
+  end
+end

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '2.2.0.rc6'
+  VERSION = '2.2.0.rc7'
 end

data/lib/labimotion.rb

@@ -29,6 +29,7 @@ module Labimotion
   autoload :VocabularyAPI, 'labimotion/apis/vocabulary_api'
   autoload :MttAPI, 'labimotion/apis/mtt_api'
   autoload :DoseRespRequestAPI, 'labimotion/apis/dose_resp_request_api'
+  autoload :ElementVariationAPI, 'labimotion/apis/element_variation_api'
 
   ######## Entities
   autoload :PropertiesEntity, 'labimotion/entities/properties_entity'
@@ -51,6 +52,7 @@ module Labimotion
   autoload :SegmentRevisionEntity, 'labimotion/entities/segment_revision_entity'
   ## autoload :DatasetRevisionEntity, 'labimotion/entities/dataset_revision_entity'
   autoload :VocabularyEntity, 'labimotion/entities/vocabulary_entity'
+  autoload :ElementVariationEntity, 'labimotion/entities/element_variation_entity'
 
   ######## Helpers
   autoload :GenericHelpers, 'labimotion/helpers/generic_helpers'
@@ -123,6 +125,7 @@ module Labimotion
   autoload :Sample, 'labimotion/models/sample'
   autoload :Screen, 'labimotion/models/screen'
   autoload :Wellplate, 'labimotion/models/wellplate'
+  autoload :ElementVariation, 'labimotion/models/element_variation'
 
   ######## Models/Concerns
   autoload :GenericKlassRevisions, 'labimotion/models/concerns/generic_klass_revisions'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc6
+  version: 2.2.0.rc7
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-03-29 00:00:00.000000000 Z
+date: 2026-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -56,6 +56,7 @@ files:
 - lib/labimotion.rb
 - lib/labimotion/apis/converter_api.rb
 - lib/labimotion/apis/dose_resp_request_api.rb
+- lib/labimotion/apis/element_variation_api.rb
 - lib/labimotion/apis/exporter_api.rb
 - lib/labimotion/apis/generic_dataset_api.rb
 - lib/labimotion/apis/generic_element_api.rb
@@ -77,6 +78,7 @@ files:
 - lib/labimotion/entities/element_entity.rb
 - lib/labimotion/entities/element_klass_entity.rb
 - lib/labimotion/entities/element_revision_entity.rb
+- lib/labimotion/entities/element_variation_entity.rb
 - lib/labimotion/entities/eln_element_entity.rb
 - lib/labimotion/entities/generic_entity.rb
 - lib/labimotion/entities/generic_klass_entity.rb
@@ -137,6 +139,7 @@ files:
 - lib/labimotion/models/element.rb
 - lib/labimotion/models/element_klass.rb
 - lib/labimotion/models/element_klasses_revision.rb
+- lib/labimotion/models/element_variation.rb
 - lib/labimotion/models/elements_element.rb
 - lib/labimotion/models/elements_revision.rb
 - lib/labimotion/models/elements_sample.rb