labimotion 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f80c183c86ccc07a012df8b1aaafdcd4fee0bf2663e1c6096d02792bf42b91d0
-  data.tar.gz: 23bcd1152eed5ceb0d7596e7f60ae6f302d6bef48d2c6972f450ff9b205e0a6f
+  metadata.gz: 327103b60af0374bdfd4fa53653b2f314c3395f3a7e0277022caa9b8a5e865a3
+  data.tar.gz: 118586faba049e9b0db78533e912c1ea1143a27314e4d13395dca19469c9cecd
 SHA512:
-  metadata.gz: 95b5d9f778ca254357e032fb3c3fad35c87056534cb615f06d867b39dfc107188b8bcf9c01ab9a6fa996d019eaaa2c2b41486f219f7304faf748aa7cb1e1c453
-  data.tar.gz: fb8118dc73c028fd4fe693cf4fbacf8124d474f4ecdbf0c14412deef615ef52648d2ce6b0d919087d72f564e24d22e78cebb0a8cc0ae6b521a8747dee074d762
+  metadata.gz: f5efea48afcc6d27d8619039fde17de1d66db7d371f547f05a61ace9a763e7eee539dc79f4c3ff947df497233d4cca74a572d9277cc869bcaa5bae310f16ae1c
+  data.tar.gz: 3be73cae26b84356fdd1d316391552c6e82d4b63b467705d9faad843c2d706c464bf50b1ff3335255e43c76ecffb708e17748dfe659bb23a2c9c4f1ffd9e0668

data/lib/labimotion/apis/generic_element_api.rb

@@ -225,7 +225,7 @@ module Labimotion
           @klz = fetch_klass(params[:klass], params[:id])
         end
         post do
-          update_template(params)
+          update_template(params, current_user)
         end
       end
 
@@ -237,10 +237,10 @@ module Labimotion
         optional :from_date, type: Integer, desc: 'created_date from in ms'
         optional :to_date, type: Integer, desc: 'created_date to in ms'
         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
       paginate per_page: 7, offset: 0, max_per_page: 100
       get do
-
         scope = list_serialized_elements(params, current_user)
 
         reset_pagination_page(scope)

data/lib/labimotion/helpers/dataset_helpers.rb

@@ -16,7 +16,8 @@ module Labimotion
     def create_repo_klass(params, current_user)
       response = Labimotion::TemplateHub.fetch_identifier('DatasetKlass', params[:identifier])
       attributes = response.slice('ols_term_id', 'label', 'desc', 'uuid', 'identifier', 'properties_release', 'version') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
-      attributes['properties_template'] = response['properties_release']
+      attributes['properties_release']['identifier'] = attributes['identifier']
+      attributes['properties_template'] = attributes['properties_release']
       attributes['place'] = ((Labimotion::DatasetKlass.all.length * 10) || 0) + 10
       attributes['is_active'] = false
       attributes['updated_by'] = current_user.id
@@ -29,7 +30,7 @@ module Labimotion
         attributes['created_by'] = current_user.id
         ds = Labimotion::DatasetKlass.create!(attributes)
       end
-      ds.create_klasses_revision(current_user.id)
+      ds.create_klasses_revision(current_user)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       # { error: e.message }

data/lib/labimotion/helpers/element_helpers.rb

@@ -34,7 +34,7 @@ module Labimotion
 
       new_klass = Labimotion::ElementKlass.create!(attributes)
       new_klass.reload
-      new_klass.create_klasses_revision(current_user.id)
+      new_klass.create_klasses_revision(current_user)
       klass_names_file = Rails.root.join('app/packs/klasses.json')
       klasses = Labimotion::ElementKlass.where(is_active: true)&.pluck(:name) || []
       File.write(klass_names_file, klasses)
@@ -71,6 +71,7 @@ module Labimotion
       params[:properties]['klass_uuid'] = klass[:uuid]
       params[:properties]['pkg'] = Labimotion::Utils.pkg(params[:properties]['pkg'])
       params[:properties]['klass'] = 'Element'
+      params[:properties]['identifier'] = klass[:identifier]
       properties = params[:properties]
       properties.delete('flow') unless properties['flow'].nil?
       properties.delete('flowObject') unless properties['flowObject'].nil?
@@ -247,7 +248,7 @@ module Labimotion
           .where(
             element_klasses: { name: params[:el_type] },
             collections_elements: { collection_id: collection_id },
-          ).includes(:tag, collections: :sync_collections_users).order('created_at DESC')
+          ).includes(:tag, collections: :sync_collections_users)
       else
         Labimotion::Element.none
       end
@@ -256,10 +257,35 @@ module Labimotion
       from = params[:from_date]
       to = params[:to_date]
       by_created_at = params[:filter_created_at] || false
-      scope = scope.created_time_from(Time.at(from)) if from && by_created_at
-      scope = scope.created_time_to(Time.at(to) + 1.day) if to && by_created_at
-      scope = scope.updated_time_from(Time.at(from)) if from && !by_created_at
-      scope = scope.updated_time_to(Time.at(to) + 1.day) if to && !by_created_at
+      if params[:sort_column]&.include?('.')
+        layer, field = params[:sort_column].split('.')
+
+        element_klass = Labimotion::ElementKlass.find_by(name: params[:el_type])
+        allowed_fields = element_klass.properties_release.dig('layers', layer, 'fields')&.pluck('field') || []
+
+        if field.in?(allowed_fields)
+          query = ActiveRecord::Base.sanitize_sql(
+            [
+              "LEFT JOIN LATERAL(
+                SELECT field->'value' AS value
+                FROM jsonb_array_elements(properties->'layers'->:layer->'fields') a(field)
+                WHERE field->>'field' = :field
+              ) a ON true",
+              { layer: layer, field: field },
+            ],
+          )
+          scope = scope.joins(query).order('value ASC NULLS FIRST')
+        else
+          scope = scope.order(updated_at: :desc)
+        end
+      else
+        scope = scope.order(updated_at: :desc)
+      end
+
+      scope = scope.elements_created_time_from(Time.at(from)) if from && by_created_at
+      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
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -268,8 +294,9 @@ module Labimotion
 
     def create_repo_klass(params, current_user)
       response = Labimotion::TemplateHub.fetch_identifier('ElementKlass', params[:identifier])
-      attributes = response.slice('name', 'label', 'desc', 'icon_name', 'klass_prefix', 'is_generic', 'identifier', 'properties_release', 'version') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
-      attributes['properties_template'] = response['properties_release']
+      attributes = response.slice('name', 'label', 'desc', 'icon_name', 'klass_prefix', 'is_generic', 'identifier', 'properties_release', 'version')
+      attributes['properties_release']['identifier'] = attributes['identifier']
+      attributes['properties_template'] = attributes['properties_release']
       attributes['place'] = ((Labimotion::DatasetKlass.all.length * 10) || 0) + 10
       attributes['is_active'] = false
       attributes['updated_by'] = current_user.id
@@ -283,7 +310,7 @@ module Labimotion
         attributes['created_by'] = current_user.id
         element_klass = Labimotion::ElementKlass.create!(attributes)
       end
-      element_klass.create_klasses_revision(current_user.id)
+      element_klass.create_klasses_revision(current_user)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       # { error: e.message }

data/lib/labimotion/helpers/generic_helpers.rb

@@ -41,7 +41,7 @@ module Labimotion
       raise e
     end
 
-    def update_template(params)
+    def update_template(params, current_user)
       klz = fetch_klass(params[:klass], params[:id])
       uuid = SecureRandom.uuid
       properties = params[:properties_template]
@@ -51,12 +51,13 @@ module Labimotion
       properties['version'] = klz.version
       properties['pkg'] = Labimotion::Utils.pkg(params['pkg'] || klz.properties_template['pkg'])
       properties['klass'] = klz.class.name.split('::').last
+      properties['identifier'] = klz.identifier
       properties.delete('eln') if properties['eln'].present?
       klz.updated_by = current_user.id
       klz.properties_template = properties
       klz.save!
       klz.reload
-      klz.create_klasses_revision(current_user.id) if params[:release] != 'draft'
+      klz.create_klasses_revision(current_user) if params[:release] != 'draft'
       klz
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)

data/lib/labimotion/helpers/segment_helpers.rb

@@ -38,7 +38,7 @@ module Labimotion
       attributes[:properties_release] = attributes[:properties_template]
       klass = Labimotion::SegmentKlass.create!(attributes)
       klass.reload
-      klass.create_klasses_revision(current_user.id)
+      klass.create_klasses_revision(current_user)
       klass
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -65,8 +65,9 @@ module Labimotion
 
     def create_repo_klass(params, current_user)
       response = Labimotion::TemplateHub.fetch_identifier('SegmentKlass', params[:identifier])
-      attributes = response.slice('label', 'desc', 'uuid', 'identifier', 'released_at', 'properties_release', 'version') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
-      attributes['properties_template'] = response['properties_release']
+      attributes = response.slice('label', 'desc', 'uuid', 'identifier', 'released_at', 'properties_release', 'version')
+      attributes['properties_release']['identifier'] = attributes['identifier']
+      attributes['properties_template'] = attributes['properties_release']
       attributes['place'] = ((Labimotion::SegmentKlass.all.length * 10) || 0) + 10
       attributes['is_active'] = false
       attributes['updated_by'] = current_user.id
@@ -89,7 +90,7 @@ module Labimotion
         attributes['created_by'] = current_user.id
         segment_klass = Labimotion::SegmentKlass.create!(attributes)
       end
-      segment_klass.create_klasses_revision(current_user.id)
+      segment_klass.create_klasses_revision(current_user)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e

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

@@ -23,6 +23,7 @@ module Labimotion
       uuid = SecureRandom.uuid
       props = args[:properties]
       props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
+      props['identifier'] = klass.identifier
       props['uuid'] = uuid
       props['klass'] = 'Dataset'
 

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

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 module Labimotion
-    module GenericKlassRevisions
+  ## Generic Klass Revisions Helpers
+  module GenericKlassRevisions
     extend ActiveSupport::Concern
     included do
       # has_many :element_klasses_revisions, dependent: :destroy
     end
 
-    def create_klasses_revision(user_id=0)
+    def create_klasses_revision(current_user)
       properties_release = properties_template
       migrate_workflow if properties_release['flow'].present?
 
@@ -21,11 +22,19 @@ module Labimotion
         end
         properties_release['flowObject']['nodes'] = elements
       end
+      klass_attributes = {
+        uuid: properties_template['uuid'],
+        properties_template: properties_release,
+        properties_release: properties_release,
+        released_at: DateTime.now,
+        updated_by: current_user&.id,
+        released_by: current_user&.id,
+      }
 
-      self.update!({ uuid: properties_template['uuid'], properties_template: properties_release, properties_release: properties_release, released_at: DateTime.now })
+      self.update!(klass_attributes)
       reload
       attributes = {
-        released_by: user_id,
+        released_by: released_by,
         uuid: uuid,
         version: version,
         properties_release: properties_release,

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

@@ -48,6 +48,7 @@ module Labimotion
         uuid = SecureRandom.uuid
         props = seg['properties']
         props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
+        props['identifier'] = identifier
         props['uuid'] = uuid
         props['klass'] = 'Segment'
         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'])

data/lib/labimotion/utils/utils.rb

@@ -81,7 +81,6 @@ module Labimotion
     end
 
     def self.pkg(pkg)
-byebug
       pkg = {} if pkg.nil?
       pkg['eln'] = Chemotion::Application.config.version
       pkg['labimotion'] = Labimotion::VERSION

data/lib/labimotion/version.rb

@@ -2,6 +2,6 @@
 
 module Labimotion
   # VERSION = '0.1.4'
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
   IS_RAILS5 = false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chia-Lin Lin