labimotion 1.3.2 → 1.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1618c815a5e643e1defe701789af1eb30a3e7e2a166bf65d0b0657893099cd38
-  data.tar.gz: 66379371379950fb9666a7472954f9b54087b04095ce23444ce8c463c075e173
+  metadata.gz: 6f07e0d77afbb79bc2652b5f7edbc105133f727593a9a9cc236e17762d1b7e15
+  data.tar.gz: a6d9a86cd6363b5d81f1c141f56ac85974d6622c3cfd06dc21a3184610d5c76b
 SHA512:
-  metadata.gz: f735c423f7975f6155be3d129b9b3918b8c64b019e45c146e148cefd66f5184f62d982d117b6f1c863822446776d6f9a91ba5b4be479ad79457aa9629e903286
-  data.tar.gz: dbb7a6e448818ceceb32f885725167e99efa5bd2ef142e241c6c58f4a9dd74fa36713cf4e66434fed7cf74b3a64b1ef2830e5c2fc258cc8443216bb7e526baef
+  metadata.gz: 68ab2a10825518b8c7b22e0ae47aeb48c867404f857e98957082f952f7d42983bc07c50f62ff0dd71be1e6c9bb4f0843fabecdcf7f9ef40f5ce0d253b12dc4f6
+  data.tar.gz: c45113c276c4954803005084733c1e4e13315e9888bb0da50663b3d68577badae0cf5278e2bf1ed4d9cc80002366b981dc80563aa40657cbebf892f34b97f8f7

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/entities/properties_entity.rb

@@ -23,6 +23,26 @@ module Labimotion
           object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_svg'] = field['type'] == Labimotion::FieldType::DRAG_SAMPLE ? el.get_svg_path : File.join('/images', 'molecules', el.molecule_svg_file)
         end
 
+        field_sys_reactions = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::SYS_REACTION }
+        field_sys_reactions.each do |field|
+          idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
+          sid = field.dig('value', 'el_id')
+          next unless sid.present?
+
+          el = Reaction.find_by(id: sid)
+          if el.blank?
+            object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_tip'] = 'ERROR'
+            object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_svg'] = ''
+          end
+
+          next unless el.present?
+          next unless object.properties.dig(Labimotion::Prop::LAYERS, key, Labimotion::Prop::FIELDS, idx, 'value').present?
+
+          object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_label'] = el.short_label
+          object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_tip'] = el.short_label
+          object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_svg'] =  el.reaction_svg_file
+        end
+
         field_tables = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::TABLE }
         field_tables.each do |field|
           idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)

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

@@ -91,6 +91,20 @@ module Labimotion
           obj_final = OpenStruct.new(obj_os)
           field_obj[:structure] = Reporter::Docx::DiagramSample.new(obj: obj_final, format: 'png').generate
         end
+      when Labimotion::FieldType::SYS_REACTION
+        val = field.fetch('value', nil)
+        if val.present?
+          instance = Reaction.find_by(id: val['el_id'])
+          field_obj[:value] = val['el_label']
+          field_obj[:has_structure] = true
+          obj_os = Entities::ReactionReportEntity.new(
+            instance,
+            current_user: @current_user,
+            detail_levels: ElementDetailLevelCalculator.new(user: @current_user, element: instance).detail_levels,
+          ).serializable_hash
+          obj_final = OpenStruct.new(obj_os)
+          field_obj[:structure] = Reporter::Docx::DiagramReaction.new(obj: obj_final, format: 'png').generate
+        end
       when Labimotion::FieldType::DRAG_MOLECULE
         val = field.fetch('value', nil)
         if val.present?

data/lib/labimotion/utils/export_utils.rb

@@ -20,6 +20,8 @@ module Labimotion
         case name
         when Labimotion::FieldType::DRAG_ELEMENT
           Labimotion::Prop::L_ELEMENT
+        when Labimotion::FieldType::SYS_REACTION
+          Labimotion::Prop::REACTION
         when Labimotion::FieldType::DRAG_SAMPLE
           Labimotion::Prop::SAMPLE
         when Labimotion::FieldType::DRAG_MOLECULE
@@ -167,6 +169,7 @@ module Labimotion
       properties[Labimotion::Prop::LAYERS].keys.each do |key|
         properties = set_seg_prop(properties, uuids, key, Labimotion::FieldType::DRAG_ELEMENT)
         properties = set_seg_prop(properties, uuids, key, Labimotion::FieldType::DRAG_SAMPLE)
+        properties = set_seg_prop(properties, uuids, key, Labimotion::FieldType::SYS_REACTION)
       end
       segment['properties'] = properties
       segment
@@ -183,6 +186,7 @@ module Labimotion
         properties = set_prop(properties, uuids, key, Labimotion::FieldType::DRAG_ELEMENT, &fetch_one)
         properties = set_prop(properties, uuids, key, Labimotion::FieldType::DRAG_MOLECULE, &fetch_one)
         properties = set_prop(properties, uuids, key, Labimotion::FieldType::DRAG_SAMPLE, &fetch_one)
+        properties = set_prop(properties, uuids, key, Labimotion::FieldType::SYS_REACTION, &fetch_one)
         properties, attachments = set_upload(instance, properties, attachments, uuids, key, Labimotion::FieldType::UPLOAD, &fetch_one)
         properties = set_table(properties, uuids, key, Labimotion::FieldType::TABLE, &fetch_one)
       end

data/lib/labimotion/utils/field_type.rb

@@ -11,13 +11,14 @@ module Labimotion
     WF_NEXT = 'wf-next'.freeze
     TEXT_FORMULA = 'text-formula'.freeze
     SYSTEM_DEFINED = 'system-defined'.freeze
+    SYS_REACTION = 'sys-reaction'.freeze
     DRAG = 'drag'.freeze
     DRAG_ELEMENT = 'drag_element'.freeze
     DRAG_MOLECULE = 'drag_molecule'.freeze
     DRAG_SAMPLE = 'drag_sample'.freeze
     DRAG_REACTION = 'drag_reaction'.freeze
     DRAG_MS = [DRAG_MOLECULE, DRAG_SAMPLE].freeze
-    DRAG_ALL = [DRAG_ELEMENT, DRAG_MOLECULE, DRAG_SAMPLE, DRAG_REACTION].freeze
+    DRAG_ALL = [DRAG_ELEMENT, DRAG_MOLECULE, DRAG_SAMPLE, DRAG_REACTION, SYS_REACTION].freeze
     TABLE = 'table'.freeze
     UPLOAD = 'upload'.freeze
     TEXT = 'text'.freeze

data/lib/labimotion/utils/import_utils.rb

@@ -51,6 +51,21 @@ module Labimotion
         value
       end
 
+      def proc_assign_reaction(value, reaction)
+        return {} if reaction.nil?
+
+        value = {} if value.nil? || value.is_a?(String)
+        value['el_id'] = reaction.id
+        value['el_type'] = 'reaction' if value['el_type'].nil?
+        value['el_tip'] = reaction.short_label
+        value['el_label'] = reaction.short_label
+        value['el_svg'] = reaction.reaction_svg_file
+        value
+      rescue StandardError => e
+        Labimotion.log_exception(e)
+        value
+      end
+
       def proc_assign_element(value, element)
         return {} if element.nil?
 
@@ -136,6 +151,22 @@ module Labimotion
       end
     end
 
+    def self.proc_reaction(layer, key, data, instances, properties)
+      fields = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::SYS_REACTION }
+      fields.each do |field|
+        idx = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
+        id = field["value"] && field["value"]["el_id"] unless idx.nil?
+        reaction = instances.fetch(Labimotion::Prop::REACTION, nil)&.fetch(id, nil)
+        val = properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']
+        val = proc_assign_reaction(val, reaction)
+        properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value'] = val
+      end
+      properties
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      properties
+    end
+
     def self.proc_sample(layer, key, data, instances, properties)
       fields = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_SAMPLE }
       fields.each do |field|
@@ -149,7 +180,7 @@ module Labimotion
       properties
     rescue StandardError => e
       Labimotion.log_exception(e)
-      raise
+      properties
     end
 
     def self.proc_element(layer, key, data, instances, properties, elements)
@@ -169,7 +200,7 @@ module Labimotion
       properties
     rescue StandardError => e
       Labimotion.log_exception(e)
-      raise
+      properties
     end
 
     def self.proc_upload(layer, key, data, instances, attachments, element)
@@ -221,7 +252,7 @@ module Labimotion
       properties
     rescue StandardError => e
       Labimotion.log_exception(e)
-      raise
+      properties
     end
 
 
@@ -237,7 +268,7 @@ module Labimotion
       properties
     rescue StandardError => e
       Labimotion.log_exception(e)
-      raise
+      properties
     end
 
     def self.properties_handler(data, instances, attachments, elmenet, elements)
@@ -246,6 +277,7 @@ module Labimotion
         layer = properties[Labimotion::Prop::LAYERS][key]
         properties = proc_molecule(layer, key, data, properties)
         properties = proc_upload(layer, key, data, instances, attachments, elmenet)
+        properties = proc_reaction(layer, key, data, instances, properties)
         properties = proc_sample(layer, key, data, instances, properties)
         properties = proc_element(layer, key, data, instances, properties, elements) # unless elements.nil?
         properties = proc_table(layer, key, data, instances, properties)
@@ -253,7 +285,7 @@ module Labimotion
       properties
     rescue StandardError => e
       Labimotion.log_exception(e)
-      raise
+      properties
     end
 
     def self.process_ai(data, instances)
@@ -272,7 +304,7 @@ module Labimotion
       end
     rescue StandardError => e
       Labimotion.log_exception(e)
-      raise
+      properties
     end
 
     def self.create_segment_klass(sk_obj, segment_klass, element_klass, current_user_id)

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '1.3.2'
+  VERSION = '1.4.0.rc2'
 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.rc2
 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-29 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: