labimotion 1.1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31b676c3d3b051e9dae4da02b070aa56235b835d01b773d29096a0be2a946edc
-  data.tar.gz: 760e38c37701899c5a52320096a936b8c559828a807a62400182314c1e4efe02
+  metadata.gz: 75c0801b117991ca8b6dc96daebfedbfdbdc7d40e31bb8c78fbc3f1089eaff91
+  data.tar.gz: 5f67c104d53b3388549064ab3c8e7bebe5df7d39d1075c3d5c42dce5eee9e07e
 SHA512:
-  metadata.gz: cafa053063812ca19f6ada0142715a9063ad8c8f7c9e0f2c592e09a104eeef6c45e6660804e8b098d6d18c05b60fe4e5e89ff3e2b019c9c474f131f601b70a13
-  data.tar.gz: 94ca185e56c817789ba34c320d32d85cfb78e679f37b77a00ae3b194c1d0eecae4364e142f40dd52392821dcff7cee2dccbb2841aad55992da51df5c6759de1e
+  metadata.gz: a0c036e9a1fc5f3b44130a2e7bf0038f2d0476461ca6a18994564752cf42737486c4d67ec61a0d698af9f28e92bf04c506035954d13b8dbdd2f5a67722c4b694
+  data.tar.gz: 32721efb59f25ed9c2b5ec853987416e2073ab3612881541a9e1e79d2134076998ed18a29cec4efac778f121e6faa3e27d72f0d44e34653e01e9c79e3bebaf95

data/lib/labimotion/libs/converter.rb

@@ -262,7 +262,6 @@ module Labimotion
       end
       new_prop.dig('layers', 'general', 'fields')&.each_with_index do |fi, idx|
         if fi['field'] == 'creator' && current_user.present?
-          fi['label'] = fi['label']
           fi['value'] = current_user.name
           fi['system'] = current_user.name
           new_prop['layers']['general']['fields'][idx] = fi
@@ -273,13 +272,13 @@ module Labimotion
         if fi['field'] == 'id'
           fi['value'] = element.id
           fi['system'] = element.id
-          new_prop['layers']['general']['fields'][idx] = fi
+          new_prop['layers']['sample_details']['fields'][idx] = fi
         end
 
         if fi['field'] == 'label'
           fi['value'] = element.short_label
           fi['system'] = element.short_label
-          new_prop['layers']['general']['fields'][idx] = fi
+          new_prop['layers']['sample_details']['fields'][idx] = fi
         end
       end
       dataset.properties = new_prop

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

@@ -7,7 +7,7 @@ module Labimotion
   module Segmentable
     extend ActiveSupport::Concern
     included do
-      has_many :segments, as: :element, dependent: :destroy, class_name: 'Labimotion::Segment'
+      has_many :segments, -> { select('DISTINCT ON (element_type, segment_klass_id) *').order(element_type: :asc, segment_klass_id: :asc, id: :desc) }, as: :element, dependent: :destroy, class_name: 'Labimotion::Segment'
     end
 
     def copy_segments(**args)
@@ -52,10 +52,11 @@ module Labimotion
         props['uuid'] = uuid
         props['klass'] = 'Segment'
         props = Labimotion::SampleAssociation.update_sample_association(props, args[:current_user_id])
-        segment = Labimotion::Segment.find_by(element_type: Labimotion::Utils.element_name(self.class.name), element_id: self.id, segment_klass_id: seg['segment_klass_id'])
+        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'])
           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?
 

data/lib/labimotion/version.rb

@@ -3,5 +3,5 @@
 ## Labimotion Version
 module Labimotion
   IS_RAILS5 = false
-  VERSION = '1.1.1'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails