labimotion 1.3.2 → 1.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1618c815a5e643e1defe701789af1eb30a3e7e2a166bf65d0b0657893099cd38
-  data.tar.gz: 66379371379950fb9666a7472954f9b54087b04095ce23444ce8c463c075e173
+  metadata.gz: 04e8244e35f9f07197148e331748e527451dae61be8352729f04b9e7be923e6f
+  data.tar.gz: 334b4f9d71132b30884e522a38cc11e770048d20d8ff4e34bc0f60ddaf45d3df
 SHA512:
-  metadata.gz: f735c423f7975f6155be3d129b9b3918b8c64b019e45c146e148cefd66f5184f62d982d117b6f1c863822446776d6f9a91ba5b4be479ad79457aa9629e903286
-  data.tar.gz: dbb7a6e448818ceceb32f885725167e99efa5bd2ef142e241c6c58f4a9dd74fa36713cf4e66434fed7cf74b3a64b1ef2830e5c2fc258cc8443216bb7e526baef
+  metadata.gz: faf260b294017c7b504aa9eef458736d1076cd5f7198ba15b073f593bc5649d7c6bf892bf9deb3be449ee51ffb3b44b4936719eb1134353fdf9a4535f1d1f9ad
+  data.tar.gz: 5ca488c82012a85bdf51b37c2210ce0a9171935b387a1e6cd31ac8008398be89539c43d1c5f42825834aa013f65b5ae31de14e25d745c505fc361f5e66b5e314

data/lib/labimotion/apis/generic_element_api.rb

@@ -10,6 +10,7 @@ module Labimotion
     helpers ContainerHelpers
     helpers ParamsHelpers
     helpers CollectionHelpers
+    helpers UserLabelHelpers
     helpers Labimotion::SampleAssociationHelpers
     helpers Labimotion::GenericHelpers
     helpers Labimotion::ElementHelpers
@@ -327,7 +328,7 @@ module Labimotion
           Labimotion.log_exception(e, current_user)
           { error: e.message }
         end
-      end      
+      end
 
       desc 'Return serialized elements of current user'
       params do
@@ -336,6 +337,7 @@ module Labimotion
         optional :el_type, type: String, desc: 'element klass name'
         optional :from_date, type: Integer, desc: 'created_date from in ms'
         optional :to_date, type: Integer, desc: 'created_date to in ms'
+        optional :user_label, type: Integer, desc: 'user label'
         optional :filter_created_at, type: Boolean, desc: 'filter by created at or updated at'
         optional :sort_column, type: String, desc: 'sort by updated_at or selected layers property'
       end
@@ -426,7 +428,7 @@ module Labimotion
             raise e
           end
         end
-      end      
+      end
     end
   end
 end

data/lib/labimotion/helpers/element_helpers.rb

@@ -95,6 +95,7 @@ module Labimotion
       element.properties = update_sample_association(params[:properties], current_user, element)
       element.container = update_datamodel(params[:container], current_user)
       element.save!
+      update_element_labels(element, params[:user_labels], current_user.id)
       element.save_segments(segments: params[:segments], current_user_id: current_user.id)
       element
     rescue StandardError => e
@@ -108,6 +109,9 @@ module Labimotion
       properties = update_sample_association(params[:properties], current_user, element)
       params.delete(:container)
       params.delete(:properties)
+      update_element_labels(element, params[:user_labels], current_user.id)
+      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]
@@ -288,6 +292,7 @@ module Labimotion
       scope = scope.elements_created_time_to(Time.at(to) + 1.day) if to && by_created_at
       scope = scope.elements_updated_time_from(Time.at(from)) if from && !by_created_at
       scope = scope.elements_updated_time_to(Time.at(to) + 1.day) if to && !by_created_at
+      scope = scope.by_user_label(params[:user_label]) if params[:user_label]
       scope
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -315,7 +320,7 @@ module Labimotion
           return { status: 'success', message: "The element: #{attributes['name']} has been created using version: #{attributes['version']}!" }
         end
       end
-      
+
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       return { status: 'error', message: e.message }

data/lib/labimotion/helpers/param_helpers.rb

@@ -22,7 +22,7 @@ module Labimotion
         optional :sync_time, type: DateTime, desc: 'Klass sync_time'
         optional :version, type: String, desc: 'Klass version'
       end
-      
+
       params :create_element_klass_params do
         requires :name, type: String, desc: 'Element Klass Name'
         requires :label, type: String, desc: 'Element Klass Label'
@@ -40,7 +40,7 @@ module Labimotion
         optional :desc, type: String, desc: 'Element Klass Desc'
         optional :place, type: String, desc: 'Element Klass Place'
       end
-      
+
       ## Element Params
       params :create_element_params do
         requires :element_klass, type: Hash
@@ -49,18 +49,20 @@ module Labimotion
         optional :properties_release, type: Hash
         optional :collection_id, type: Integer
         requires :container, type: Hash
+        optional :user_labels, type: Array
         optional :segments, type: Array, desc: 'Segments'
       end
-      
+
       params :update_element_params do
         requires :id, type: Integer, desc: 'element id'
         optional :name, type: String
         requires :properties, type: Hash
         optional :properties_release, type: Hash
         requires :container, type: Hash
+        optional :user_labels, type: Array
         optional :segments, type: Array, desc: 'Segments'
       end
-      
+
       ## Segment Klass Params
       params :upload_segment_klass_params do
         requires :label, type: String, desc: 'Klass label'

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '1.3.2'
+  VERSION = '1.4.0.rc1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0.rc1
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,9 +122,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: