labimotion 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7407e7996f74f24add8270076561baf80e5d0ea09a7617f1ad6bd8726fce4f0
-  data.tar.gz: 7579b7fea1a56eab9f8899a6d7f153926eea31493effac70b57c13b31b868062
+  metadata.gz: 4462059ccf7843ed6aee9d493e2fcadf9cb6675fd2e71652eb8ce670cd3e3630
+  data.tar.gz: bf3f3b3c664117b679b19ba27171ed37f45371e267a44988e0a709c98b9b66e7
 SHA512:
-  metadata.gz: b85976e6caf972dc33ce38b2ae128f3270c3f5b594485503d01c1ee3f4100c3cf6ec3352d51c755895a5e12bd19624a604221f9c69a3a4a5d2c0c4fc5bfc0bfb
-  data.tar.gz: f3a777ef610da20216929d7e3278229c848dd56fa8c5a458e88667a6b524313d625fbd09127c96d32f32d99f53673505591129aeb4f6f49e2d4c71f1980f14dd
+  metadata.gz: ec3bfa245f202a31bb6e1a46104296b7ed7eab6500eabc7832adcaf0ded162492d46403459a476f89468ae8a513af83e5f8d23e057efd0820829be745c150e55
+  data.tar.gz: 04f4c1e4856c2a9909a487dfa4e2764aac737ac76379e892d07fd66da5347be2c55ec94281b7241bae57736c2667fe03250c945930295285b447850b9039fd92

data/lib/labimotion/apis/generic_dataset_api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Labimotion
   ## Generic Dataset API
   class GenericDatasetAPI < Grape::API

data/lib/labimotion/apis/generic_element_api.rb

@@ -21,6 +21,8 @@ module Labimotion
         get do
           ek = Labimotion::ElementKlass.find_by(name: params[:name])
           present ek, with: Labimotion::ElementKlassEntity, root: 'klass'
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
         end
       end
 
@@ -32,6 +34,8 @@ module Labimotion
         get do
           list = klass_list(params[:generic_only])
           present list, with: Labimotion::ElementKlassEntity, root: 'klass'
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
         end
       end
 
@@ -67,6 +71,9 @@ module Labimotion
         post do
           authenticate_admin!('elements')
           update_element_klass(current_user, params)
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          raise e
         end
       end
 
@@ -79,6 +86,9 @@ module Labimotion
         get do
           list = list_klass_revisions(params)
           present list, with: Labimotion::KlassRevisionEntity, root: 'revisions'
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          []
         end
       end
 
@@ -90,6 +100,9 @@ module Labimotion
         get do
           list = element_revisions(params)
           present list, with: Labimotion::ElementRevisionEntity, root: 'revisions'
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          []
         end
       end
 
@@ -104,6 +117,9 @@ module Labimotion
           authenticate_admin!(params[:klass].gsub(/(Klass)/, 's').downcase)
           delete_klass_revision(params)
           status 201
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          raise e
         end
       end
 
@@ -117,6 +133,9 @@ module Labimotion
         post do
           delete_revision(params)
           status 201
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          raise e
         end
       end
 
@@ -129,6 +148,9 @@ module Labimotion
           klass = Labimotion::Segment.find(params[:id])
           list = klass.segments_revisions unless klass.nil?
           present list&.sort_by(&:created_at).reverse, with: Labimotion::SegmentRevisionEntity, root: 'revisions'
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          []
         end
       end
 
@@ -152,6 +174,8 @@ module Labimotion
         post do
           upload_generics_files(current_user, params)
           true
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
         end
       end
 
@@ -160,6 +184,30 @@ module Labimotion
         get do
           list = Labimotion::ElementKlass.all.sort_by { |e| e.place }
           present list, with: Labimotion::ElementKlassEntity, root: 'klass'
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          []
+        end
+      end
+
+      namespace :fetch_repo do
+        desc 'fetch Generic Element Klass from Chemotion Repository'
+        get do
+          fetch_repo('ElementKlass')
+        end
+      end
+
+      namespace :create_repo_klass do
+        desc 'create Generic Element Klass'
+        params do
+          requires :identifier, type: String, desc: 'Identifier'
+        end
+        post do
+          create_repo_klass(params, current_user)
+          present ElementKlass.all, with: Labimotion::ElementKlassEntity, root: 'klass'
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          { error: e.message }
         end
       end
 
@@ -176,6 +224,8 @@ module Labimotion
         end
         post do
           deactivate_klass(params)
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
         end
       end
 
@@ -188,6 +238,9 @@ module Labimotion
         delete ':id' do
           delete_klass(params)
           status 201
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          raise e
         end
       end
 
@@ -197,14 +250,17 @@ module Labimotion
           requires :klass, type: String, desc: 'Klass', values: %w[ElementKlass SegmentKlass DatasetKlass]
           requires :id, type: Integer, desc: 'Klass ID'
           requires :properties_template, type: Hash
-          optional :is_release, type: Boolean, default: false
+          optional :release, type: String, default: 'draft', desc: 'release status', values: %w[draft major minor patch]
         end
         after_validation do
           authenticate_admin!(params[:klass].gsub(/(Klass)/, 's').downcase)
           @klz = fetch_klass(params[:klass], params[:id])
         end
         post do
-          update_template(params)
+          update_template(params, current_user)
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          raise e
         end
       end
 
@@ -216,10 +272,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)
@@ -235,6 +291,9 @@ module Labimotion
           end
         end
         { generic_elements: generic_elements }
+      rescue StandardError => e
+        Labimotion.log_exception(e, current_user)
+        { generic_elements: [] }
       end
 
       desc 'Return serialized element by id'
@@ -262,6 +321,8 @@ module Labimotion
               attachments: Entities::AttachmentEntity.represent(element.attachments),
             }
           end
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
         end
       end
 

data/lib/labimotion/apis/labimotion_hub_api.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'open-uri'
+require 'labimotion/models/hub_log'
 
 # Belong to Chemotion module
 module Labimotion
@@ -19,20 +20,25 @@ module Labimotion
           list = "Labimotion::#{params[:klass]}".constantize.where(is_active: true).where.not(released_at: nil)
           list = list.where(is_generic: true) if params[:klass] == 'ElementKlass'
           entities = Labimotion::GenericPublicEntity.represent(list, displayed: params[:with_props])
-          # entities.length > 1 ? de_encode_json(entities) : []
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          []
         end
       end
       namespace :fetch do
         desc "get active generic templates"
         params do
           requires :klass, type: String, desc: 'Klass', values: %w[ElementKlass SegmentKlass DatasetKlass]
-          # requires :fqdn, type: Integer, desc: 'FQDN'
+          requires :origin, type: String, desc: 'origin'
           requires :identifier, type: String, desc: 'Identifier'
         end
-        get do
+        post do
           entity = "Labimotion::#{params[:klass]}".constantize.find_by(identifier: params[:identifier])
+          Labimotion::HubLog.create(klass: entity, origin: params[:origin], uuid: entity.uuid, version: entity.version)
           "Labimotion::#{params[:klass]}Entity".constantize.represent(entity)
-          # entities.length > 1 ? de_encode_json(entities) : []
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          raise e
         end
       end
 
@@ -45,6 +51,9 @@ module Labimotion
           list = Labimotion::ElementKlass.where(is_active: true) if params[:generic_only].present? && params[:generic_only] == true
           list = Labimotion::ElementKlass.where(is_active: true) unless params[:generic_only].present? && params[:generic_only] == true
           list.pluck(:name)
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          []
         end
       end
 

data/lib/labimotion/entities/generic_klass_entity.rb

@@ -4,7 +4,7 @@ require 'labimotion/entities/application_entity'
 module Labimotion
   # GenericKlassEntity
   class GenericKlassEntity < ApplicationEntity
-    expose :id, :uuid, :label, :desc, :properties_template, :properties_release, :is_active,
+    expose :id, :uuid, :label, :desc, :properties_template, :properties_release, :is_active, :version,
           :place, :released_at, :identifier, :sync_time, :created_by, :updated_by, :created_at, :updated_at
     expose_timestamps(timestamp_fields: [:released_at])
     expose_timestamps(timestamp_fields: [:created_at])

data/lib/labimotion/entities/generic_public_entity.rb

@@ -5,6 +5,7 @@ require 'labimotion/entities/application_entity'
 # Entity module
 module Labimotion
   class GenericPublicEntity < Labimotion::ApplicationEntity
+    expose! :uuid
     expose! :name
     expose! :desc
     expose! :icon_name
@@ -12,6 +13,7 @@ module Labimotion
     expose! :klass_name
     expose! :label
     expose! :identifier
+    expose! :version
     expose! :released_at
     expose! :properties_release, if: :displayed
     expose :element_klass do |obj|

data/lib/labimotion/entities/klass_revision_entity.rb

@@ -3,7 +3,7 @@
 module Labimotion
   # KlassRevisionEntity
   class KlassRevisionEntity < ApplicationEntity
-    expose :id, :uuid, :properties_release, :released_at
+    expose :id, :uuid, :properties_release, :version, :released_at
 
     expose :klass_id do |object|
       klass_id = object.element_klass_id if object.respond_to? :element_klass_id

data/lib/labimotion/helpers/dataset_helpers.rb

@@ -15,8 +15,9 @@ 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') # .except(:id, :is_active, :place, :created_by, :created_at, :updated_at)
-      attributes['properties_template'] = response['properties_release']
+      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_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
@@ -27,8 +28,9 @@ module Labimotion
         ds.update!(attributes)
       else
         attributes['created_by'] = current_user.id
-        Labimotion::DatasetKlass.create!(attributes)
+        ds = Labimotion::DatasetKlass.create!(attributes)
       end
+      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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'grape'
-require 'labimotion/version'
+require 'labimotion/utils/utils'
 # require 'labimotion/models/element_klass'
 module Labimotion
   ## ElementHelpers
@@ -20,11 +20,10 @@ module Labimotion
       uuid = SecureRandom.uuid
       template = { uuid: uuid, layers: {}, select_options: {} }
       attributes = declared(params, include_missing: false)
-      attributes[:properties_template]['uuid'] = uuid if attributes[:properties_template].present?
-      attributes[:properties_template] = template unless attributes[:properties_template].present?
-      attributes[:properties_template]['eln'] = Chemotion::Application.config.version if attributes[:properties_template].present?
-      attributes[:properties_template]['labimotion'] = Labimotion::VERSION if attributes[:properties_template].present?
-      attributes[:properties_template]['klass'] = 'ElementKlass' if attributes[:properties_template].present?
+      attributes[:properties_template] = template if attributes[:properties_template].nil?
+      attributes[:properties_template]['uuid'] = uuid
+      attributes[:properties_template]['pkg'] = Labimotion::Utils.pkg(attributes[:properties_template]['pkg'])
+      attributes[:properties_template]['klass'] = 'ElementKlass'
       attributes[:is_active] = false
       attributes[:uuid] = uuid
       attributes[:released_at] = DateTime.now
@@ -33,8 +32,8 @@ module Labimotion
 
       new_klass = Labimotion::ElementKlass.create!(attributes)
       new_klass.reload
-      new_klass.create_klasses_revision(current_user.id)
-      klass_names_file = Rails.root.join('config', 'klasses.json')
+      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)
       klasses
@@ -68,11 +67,12 @@ module Labimotion
       uuid = SecureRandom.uuid
       params[:properties]['uuid'] = uuid
       params[:properties]['klass_uuid'] = klass[:uuid]
-      params[:properties]['eln'] = Chemotion::Application.config.version
-      params[:properties]['labimotion'] = Labimotion::VERSION
+      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?
       properties.delete('select_options') unless properties['select_options'].nil?
       attributes = {
         name: params[:name],
@@ -109,14 +109,14 @@ module Labimotion
       params.delete(:container)
       params.delete(:properties)
       attributes = declared(params.except(:segments), include_missing: false)
-      properties['eln'] = Chemotion::Application.config.version
-      properties['labimotion'] = Labimotion::VERSION
+      properties['pkg'] = Labimotion::Utils.pkg(properties['pkg'])
       if element.klass_uuid != properties['klass_uuid'] || element.properties != properties || element.name != params[:name]
         properties['klass'] = 'Element'
         uuid = SecureRandom.uuid
         properties['uuid'] = uuid
 
         properties.delete('flow') unless properties['flow'].nil?
+        properties.delete('flowObject') unless properties['flowObject'].nil?
         properties.delete('select_options') unless properties['select_options'].nil?
 
         attributes['properties'] = properties
@@ -180,7 +180,7 @@ module Labimotion
     def element_revisions(params)
       klass = Labimotion::Element.find(params[:id])
       list = klass.elements_revisions unless klass.nil?
-      list&.sort_by(&:created_at)&.reverse
+      list&.sort_by(&:created_at)&.reverse&.first(10)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
@@ -245,7 +245,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
@@ -254,14 +254,65 @@ 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)
       raise e
     end
+
+    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')
+      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
+      attributes['sync_by'] = current_user.id
+      attributes['sync_time'] = DateTime.now
+
+      element_klass = Labimotion::ElementKlass.find_by(identifier: attributes['identifier'])
+      if element_klass.present?
+        element_klass.update!(attributes)
+      else
+        attributes['created_by'] = current_user.id
+        element_klass = Labimotion::ElementKlass.create!(attributes)
+      end
+      element_klass.create_klasses_revision(current_user)
+    rescue StandardError => e
+      Labimotion.log_exception(e, current_user)
+      # { error: e.message }
+      raise e
+    end
+
   end
 end

data/lib/labimotion/helpers/generic_helpers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'grape'
-require 'labimotion/version'
+require 'labimotion/utils/utils'
 # Helper for associated sample
 module Labimotion
   ## Generic Helpers
@@ -41,23 +41,22 @@ 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]
-      if Labimotion::IS_RAILS5 == false
-        properties['uuid'] = uuid unless params[:is_release] == true && @klz.identifier.present?
-      else
-        properties['uuid'] = uuid
-      end
-      properties['eln'] = Chemotion::Application.config.version
-      properties['labimotion'] = Labimotion::VERSION
-      properties['klass'] = @klz.class.name
+      properties['uuid'] = uuid
+      klz.version = Labimotion::Utils.next_version(params[:release], klz.version)
+      properties['version'] = klz.version
+      properties['pkg'] = Labimotion::Utils.pkg(params['pkg'] || (klz.properties_template && 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[:is_release] == true
+      klz.create_klasses_revision(current_user) if params[:release] != 'draft'
       klz
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -89,7 +88,7 @@ module Labimotion
     def list_klass_revisions(params)
       klass = "Labimotion::#{params[:klass]}".constantize.find_by(id: params[:id])
       list = klass.send("#{params[:klass].underscore}es_revisions") unless klass.nil?
-      list.sort_by(&:released_at).reverse
+      list&.order(released_at: :desc)&.limit(10)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e
@@ -97,12 +96,8 @@ module Labimotion
 
 
     ###############
-
-
     def generate_klass_file
-      klass_dir = File.join(Rails.root, 'data')
-      !File.directory?(klass_dir) && FileUtils.mkdir_p(klass_dir)
-      klass_names_file = File.join(klass_dir, 'klasses.json')
+      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)
     rescue StandardError => e
@@ -193,37 +188,37 @@ module Labimotion
       raise e
     end
 
-    def create_attachments(files, del_files, type, id, user_id)
+    def create_attachments(files, del_files, type, id, identifier, user_id)
       attach_ary = []
-      (files || []).each do |file|
+      (files || []).each_with_index do |file, index|
         next unless (tempfile = file[:tempfile])
 
-        a = Attachment.new(
+        att = Attachment.new(
           bucket: file[:container_id],
           filename: file[:filename],
           con_state: Labimotion::ConState::NONE,
           file_path: file[:tempfile],
           created_by: user_id,
           created_for: user_id,
+          identifier: identifier[index],
           content_type: file[:type],
           attachable_type: type,
           attachable_id: id,
         )
         begin
-          a.save!
-          attach_ary.push(a.id)
+          att.save!
+          attach_ary.push(att.id)
         ensure
           tempfile.close
           tempfile.unlink
         end
       end
       unless (del_files || []).empty?
-        Attachment.where('id IN (?) AND attachable_type = (?)', del_files.map!(&:to_i),
-                        type).update_all(attachable_id: nil)
+        Attachment.where('id IN (?) AND attachable_type = (?)', del_files.map!(&:to_i), type).update_all(attachable_id: nil)
       end
       attach_ary
     rescue StandardError => e
-      Labimotion.log_exception(e, current_user)
+      Labimotion.log_exception(e)
       raise e
     end
 
@@ -246,7 +241,7 @@ module Labimotion
       filter_list || []
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
-      raise e
+      { error: 'Cannot connect to Chemotion Repository' }
     end
   end
 end

data/lib/labimotion/helpers/segment_helpers.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 require 'grape'
 require 'labimotion/models/segment_klass'
+require 'labimotion/utils/utils'
+
 module Labimotion
   ## ElementHelpers
   module SegmentHelpers
@@ -26,8 +28,7 @@ module Labimotion
       attributes = declared(params, include_missing: false)
       attributes[:properties_template]['uuid'] = uuid if attributes[:properties_template].present?
       template = (attributes[:properties_template].presence || template)
-      template['eln'] = Chemotion::Application.config.version
-      template['labimotion'] = Labimotion::VERSION
+      template['pkg'] = Labimotion::Utils.pkg(template['pkg'])
       template['klass'] = 'SegmentKlass'
       attributes.merge!(properties_template: template, element_klass: @klass, created_by: current_user.id,
                         place: place)
@@ -37,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)
@@ -64,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') # .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
@@ -74,20 +76,21 @@ module Labimotion
 
       element_klass = Labimotion::ElementKlass.find_by(identifier: response['element_klass']['identifier'])
       element_klass = Labimotion::ElementKlass.find_by(name: response['element_klass']['name']) if element_klass.nil?
-      if element_klass.nil?
-        el_attributes = response['element_klass'].slice('name', 'label', 'desc', 'uuid', 'identifier', 'icon_name', 'klass_prefix', 'is_generic', 'released_at')
-        el_attributes['properties_template'] = response['element_klass']['properties_release']
-        Labimotion::ElementKlass.create!(el_attributes)
-      end
+      return { error: 'ElementKlass not found' } if element_klass.nil?
 
+      # el_attributes = response['element_klass'].slice('name', 'label', 'desc', 'uuid', 'identifier', 'icon_name', 'klass_prefix', 'is_generic', 'released_at')
+      # el_attributes['properties_template'] = response['element_klass']['properties_release']
+      # Labimotion::ElementKlass.create!(el_attributes)
 
-      if Labimotion::SegmentKlass.find_by(ols_term_id: attributes['ols_term_id']).present?
-        ds = Labimotion::SegmentKlass.find_by(ols_term_id: attributes['ols_term_id'])
-        ds.update!(attributes)
+      attributes['element_klass_id'] = element_klass.id
+      segment_klass = Labimotion::SegmentKlass.find_by(identifier: attributes['identifier'])
+      if segment_klass.present?
+        segment_klass.update!(attributes)
       else
         attributes['created_by'] = current_user.id
-        Labimotion::SegmentKlass.create!(attributes)
+        segment_klass = Labimotion::SegmentKlass.create!(attributes)
       end
+      segment_klass.create_klasses_revision(current_user)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
       raise e

data/lib/labimotion/libs/converter.rb

@@ -5,6 +5,7 @@ require 'uri'
 require 'json'
 require 'date'
 require 'labimotion/version'
+require 'labimotion/utils/utils'
 
 # rubocop: disable Metrics/AbcSize
 # rubocop: disable Metrics/MethodLength
@@ -116,7 +117,7 @@ module Labimotion
         )
         # att.attachment_attacher.attach(tmp_file)
         if att.valid? && Labimotion::IS_RAILS5 == false
-          att.attachment_attacher.create_derivatives
+          ## att.attachment_attacher.create_derivatives
           att.save!
         end
         if att.valid? && Labimotion::IS_RAILS5 == true
@@ -143,12 +144,16 @@ module Labimotion
     end
 
     def self.process(data)
-      return if data[:a]&.attachable_type != 'Container'
-
+      return data[:a].con_state if data[:a]&.attachable_type != 'Container'
       response = nil
       begin
         ofile = Rails.root.join(data[:f], data[:a].filename)
-        FileUtils.cp(data[:a].store.path, ofile)
+        if Labimotion::IS_RAILS5 == true
+          FileUtils.cp(data[:a].store.path, ofile)
+        else
+          FileUtils.cp(data[:a].attachment_url, ofile)
+        end
+
         File.open(ofile, 'r') do |f|
           body = { file: f }
           response = HTTParty.post(
@@ -160,12 +165,14 @@ module Labimotion
         end
         if response.ok?
           Labimotion::Converter.handle_response(data[:a], response)
+          Labimotion::ConState::PROCESSED
         else
           Labimotion::Converter.logger.error ["Converter Response Error: id: [#{data[:a]&.id}], filename: [#{data[:a]&.filename}], response: #{response}"].join($INPUT_RECORD_SEPARATOR)
+          Labimotion::ConState::ERROR
         end
-        response
       rescue StandardError => e
-        raise e
+        Labimotion::Converter.logger.error ["process fail: #{id}", e.message, *e.backtrace].join($INPUT_RECORD_SEPARATOR)
+        Labimotion::ConState::ERROR
       ensure
         FileUtils.rm_f(ofile)
       end
@@ -174,14 +181,14 @@ module Labimotion
     def self.jcamp_converter(id)
       resp = nil
       begin
+
         data = Labimotion::Converter.vor_conv(id)
         return if data.nil?
 
-        resp = Labimotion::Converter.process(data)
-        resp&.success? ? Labimotion::ConState::PROCESSED : Labimotion::ConState::ERROR
+        Labimotion::Converter.process(data)
       rescue StandardError => e
-        Labimotion::ConState::ERROR
         Labimotion::Converter.logger.error ["jcamp_converter fail: #{id}", e.message, *e.backtrace].join($INPUT_RECORD_SEPARATOR)
+        Labimotion::ConState::ERROR
       end
     end
 
@@ -209,8 +216,7 @@ module Labimotion
       uuid = SecureRandom.uuid
       props = klass.properties_release
       props['uuid'] = uuid
-      props['eln'] = Chemotion::Application.config.version
-      props['labimotion'] = Labimotion::VERSION
+      props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
       props['klass'] = 'Dataset'
       Labimotion::Dataset.create!(
         uuid: uuid,
@@ -228,6 +234,8 @@ module Labimotion
       new_prop = dataset.properties
       dsr.each do |ds|
         layer = layers[ds[:layer]]
+        next if layer.nil? || layer['fields'].nil?
+
         fields = layer['fields'].select{ |f| f['field'] == ds[:field] }
         fi = fields&.first
         idx = layer['fields'].find_index(fi)

data/lib/labimotion/libs/export_dataset.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'export_table'
+require 'labimotion/version'
 
 module Labimotion
   ## ExportDataset
@@ -101,9 +102,18 @@ module Labimotion
       cds.attachments.where(aasm_state: 'csv').each do |att|
         name = File.basename(att.filename, '.csv')
         sheet = @xfile.workbook.add_worksheet(name: name)
-        File.open(att.store.path) do |fi|
-          fi.each_line do |line|
-            sheet.add_row(line.split(','))
+
+        if Labimotion::IS_RAILS5 == true
+          File.open(att.store.path) do |fi|
+            fi.each_line do |line|
+              sheet.add_row(line.split(','))
+            end
+          end
+        else
+          File.open(att.attachment_url) do |fi|
+            fi.each_line do |line|
+              sheet.add_row(line.split(','))
+            end
           end
         end
       end

data/lib/labimotion/libs/nmr_mapper.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
+require 'labimotion/version'
+require 'labimotion/utils/utils'
+
 module Labimotion
   ## NmrMapper
   class NmrMapper
     def self.is_brucker_binary(id)
       att = Attachment.find(id)
-      if att&.attachment_attacher&.file&.url
-        Zip::File.open(att.attachment_attacher.file.url) do |zip_file|
+      if Labimotion::IS_RAILS5 == true
+        Zip::File.open(att.store.path) do |zip_file|
           zip_file.each do |entry|
             if entry.name.include?('/pdata/') && entry.name.include?('parm.txt')
               metadata = entry.get_input_stream.read.force_encoding('UTF-8')
@@ -14,6 +17,17 @@ module Labimotion
             end
           end
         end
+      else
+        if att&.attachment_attacher&.file&.url
+          Zip::File.open(att.attachment_attacher.file.url) do |zip_file|
+            zip_file.each do |entry|
+              if entry.name.include?('/pdata/') && entry.name.include?('parm.txt')
+                metadata = entry.get_input_stream.read.force_encoding('UTF-8')
+                return metadata
+              end
+            end
+          end
+        end
       end
       nil
     end
@@ -247,8 +261,7 @@ module Labimotion
       uuid = SecureRandom.uuid
       props = klass.properties_release
       props['uuid'] = uuid
-      props['eln'] = Chemotion::Application.config.version
-      props['labimotion'] = Labimotion::VERSION
+      props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
       props['klass'] = 'Dataset'
       dataset = Labimotion::Dataset.create!(
         uuid: uuid,

data/lib/labimotion/libs/nmr_mapper_repo.rb

@@ -1,17 +1,33 @@
 # frozen_string_literal: true
+require 'labimotion/version'
+require 'labimotion/utils/utils'
 
 module Labimotion
   class NmrMapperRepo
     def self.is_brucker_binary(id)
       att = Attachment.find(id)
-      Zip::File.open(att.store.path) do |zip_file|
-        zip_file.each do |entry|
-          if entry.name.include?('/pdata/') && entry.name.include?('parm.txt')
-            metadata = entry.get_input_stream.read.force_encoding('UTF-8')
-            return metadata
+      if Labimotion::IS_RAILS5 == true
+        Zip::File.open(att.store.path) do |zip_file|
+          zip_file.each do |entry|
+            if entry.name.include?('/pdata/') && entry.name.include?('parm.txt')
+              metadata = entry.get_input_stream.read.force_encoding('UTF-8')
+              return metadata
+            end
+          end
+        end
+      else
+        if att&.attachment_attacher&.file&.url
+          Zip::File.open(att.attachment_attacher.file.url) do |zip_file|
+            zip_file.each do |entry|
+              if entry.name.include?('/pdata/') && entry.name.include?('parm.txt')
+                metadata = entry.get_input_stream.read.force_encoding('UTF-8')
+                return metadata
+              end
+            end
           end
         end
       end
+
       nil
     end
 
@@ -245,8 +261,7 @@ module Labimotion
       uuid = SecureRandom.uuid
       props = klass.properties_release
       props['uuid'] = uuid
-      props['eln'] = Chemotion::Application.config.version
-      props['labimotion'] = Labimotion::VERSION
+      props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
       props['klass'] = 'Dataset'
       dataset = Labimotion::Dataset.create!(
         uuid: uuid,

data/lib/labimotion/libs/template_hub.rb

@@ -20,7 +20,7 @@ module Labimotion
 
 
     def self.header(opt = {})
-      opt || {}
+      opt || { timeout: 10, headers: { 'Content-Type' => 'text/json' } }
     end
 
     def self.handle_response(oat, response) # rubocop: disable Metrics/PerceivedComplexity
@@ -35,16 +35,22 @@ module Labimotion
 
     def self.list(klass)
       body = { klass: klass }
-      response = HTTParty.get("#{uri('list')}?klass=#{klass}")
+      response = HTTParty.get("#{uri('list')}?klass=#{klass}", timeout: 10)
       # response.parsed_response if response.code == 200
       JSON.parse(response.body) if response.code == 200
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      error!('Cannot connect to Chemotion Repository', 401)
     end
 
     def self.fetch_identifier(klass, identifier)
       # body = { klass: klass, identifier: identifier }
-      response = HTTParty.get("#{uri('fetch')}?klass=#{klass}&identifier=#{identifier}")
+      response = HTTParty.get("#{uri('fetch')}?klass=#{klass}&identifier=#{identifier}", timeout: 10)
       # response.parsed_response if response.code == 200
       JSON.parse(response.body) if response.code == 200
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      error!('Cannot connect to Chemotion Repository', 401)
     end
   end
 end

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

@@ -9,7 +9,7 @@ module Labimotion
       before_create :init_converter
       after_update :exec_converter
       def init_converter
-        return if con_state.present?
+        return if self.has_attribute?(:con_state) == false || con_state.present?
         if Rails.configuration.try(:converter).try(:url) && ACCEPTED_FORMATS.include?(File.extname(filename&.downcase))
           self.con_state = Labimotion::ConState::WAIT
         end
@@ -23,7 +23,7 @@ module Labimotion
 
       def exec_converter
         #return if attachable_id.nil?
-        return if con_state.nil? || con_state == Labimotion::ConState::NONE
+        return if self.has_attribute?(:con_state) == false || con_state.nil? || con_state == Labimotion::ConState::NONE
         case con_state
         when Labimotion::ConState::NMR
           content = Labimotion::NmrMapperRepo.is_brucker_binary(id)
@@ -36,6 +36,7 @@ module Labimotion
         when Labimotion::ConState::WAIT
           self.con_state = Labimotion::Converter.jcamp_converter(id)
         end
+        update_column(:con_state, con_state)
       end
     end
   end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 # Datasetable concern
+require 'labimotion/utils/utils'
 
 module Labimotion
   ## Datasetable concern
@@ -21,23 +22,18 @@ module Labimotion
       klass = Labimotion::DatasetKlass.find_by(id: args[:dataset_klass_id])
       uuid = SecureRandom.uuid
       props = args[:properties]
-      props['eln'] = Chemotion::Application.config.version
-      props['labimotion'] = Labimotion::VERSION
+      props['pkg'] = Labimotion::Utils.pkg(props['pkg'])
+      props['identifier'] = klass.identifier
+      props['uuid'] = uuid
+      props['klass'] = 'Dataset'
+
       ds = Labimotion::Dataset.find_by(element_type: self.class.name, element_id: id)
       if ds.present? && (ds.klass_uuid != props['klass_uuid'] || ds.properties != props)
-        props['uuid'] = uuid
-        props['eln'] = Chemotion::Application.config.version
-        props['labimotion'] = Labimotion::VERSION
-        props['klass'] = 'Dataset'
         ds.update!(properties_release: klass.properties_release, uuid: uuid, dataset_klass_id: args[:dataset_klass_id], properties: props, klass_uuid: props['klass_uuid'])
       end
       return if ds.present?
 
-      props['uuid'] = uuid
       props['klass_uuid'] = klass.uuid
-      props['eln'] = Chemotion::Application.config.version
-      props['labimotion'] = Labimotion::VERSION
-      props['klass'] = 'Dataset'
       Labimotion::Dataset.create!(properties_release: klass.properties_release, uuid: uuid, dataset_klass_id: args[:dataset_klass_id], element_type: self.class.name, element_id: id, properties: props, klass_uuid: klass.uuid)
     end
 

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

@@ -1,34 +1,42 @@
 # 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
-      # (properties_release['layers'] || {}).keys.each do |key|
-      #   properties_release['layers'][key]['layer'] = properties_release['layers'][key]['key']
-      # end
+      migrate_workflow if properties_release['flow'].present?
 
-      if properties_release['flow'].present?
-        elements = (properties_release['flow']['elements'] || []).map do |el|
+      if properties_release['flowObject'].present?
+        elements = (properties_release['flowObject']['nodes'] || []).map do |el|
           if el['data'].present? && el['data']['lKey'].present?
             layer = properties_release['layers'][el['data']['lKey']]
             el['data']['layer'] = layer if layer.present?
           end
           el
         end
-        properties_release['flow']['elements'] = elements
+        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_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,
         released_at: released_at
       }

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'labimotion/utils/utils'
+
 module Labimotion
   # Segmentable concern
   module Segmentable
@@ -45,25 +47,18 @@ module Labimotion
         klass = Labimotion::SegmentKlass.find_by(id: seg['segment_klass_id'])
         uuid = SecureRandom.uuid
         props = seg['properties']
-        props['eln'] = Chemotion::Application.config.version
-        props['labimotion'] = Labimotion::VERSION
+        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'])
         if segment.present? && (segment.klass_uuid != props['klass_uuid'] || segment.properties != props)
-          props['uuid'] = uuid
-          props['eln'] = Chemotion::Application.config.version
-          props['labimotion'] = Labimotion::VERSION
-          props['klass'] = 'Segment'
-
           segment.update!(properties_release: klass.properties_release, properties: props, uuid: uuid, klass_uuid: props['klass_uuid'])
           segments.push(segment)
         end
         next if segment.present?
 
-        props['uuid'] = uuid
         props['klass_uuid'] = klass.uuid
-        props['eln'] = Chemotion::Application.config.version
-        props['labimotion'] = Labimotion::VERSION
-        props['klass'] = 'Segment'
         segment = Labimotion::Segment.create!(properties_release: klass.properties_release, segment_klass_id: seg['segment_klass_id'], element_type: Labimotion::Utils.element_name(self.class.name), element_id: self.id, properties: props, created_by: args[:current_user_id], uuid: uuid, klass_uuid: klass.uuid)
         segments.push(segment)
       end

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

@@ -0,0 +1,27 @@
+module Labimotion
+  # Segmentable concern
+  module Workflow
+    extend ActiveSupport::Concern
+
+    def split_workflow(properties)
+      return if properties['flow'].nil?
+
+      if properties['flow'].present?
+        properties['flowObject'] = {}
+        elements = properties['flow']['elements'] || {}
+        properties['flowObject']['nodes'] = elements.select { |obj| obj['source'].nil? }
+        properties['flowObject']['edges'] = elements.select { |obj| obj['source'] && obj['source'] != obj['target'] }.map do |obj|
+          obj['markerEnd'] = { 'type': 'arrowclosed' }
+          obj
+        end
+        properties['flowObject']['viewport'] = {
+          "x": properties['flow']['position'][0] || 0,
+          "y": properties['flow']['position'][1] || 0,
+          "zoom": properties['flow']['zoom'] || 1
+        }
+        properties.delete('flow')
+      end
+      properties
+    end
+  end
+end

data/lib/labimotion/models/element.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 require 'labimotion/models/concerns/generic_revisions'
 require 'labimotion/models/concerns/segmentable'
+require 'labimotion/models/concerns/workflow'
 
 module Labimotion
   class Element < ApplicationRecord
     acts_as_paranoid
     self.table_name = :elements
-    include PgSearch
+    include PgSearch if Labimotion::IS_RAILS5 == true
+    include PgSearch::Model if Labimotion::IS_RAILS5 == false
     include ElementUIStateScopes
     include Collectable
     ## include AnalysisCodes
     include Taggable
+    include Workflow
     include Segmentable
     include GenericRevisions
 
@@ -106,6 +109,16 @@ module Labimotion
       preview && Base64.encode64(preview) || 'not available'
     end
 
+
+    def migrate_workflow
+      return if properties.nil? || properties_release.nil?
+
+      return if properties['flow'].nil? && properties_release['flow'].nil?
+
+      update_column(:properties, split_workflow(properties)) if properties['flow']
+      update_column(:properties_release, split_workflow(properties_release)) if properties_release['flow']
+    end
+
     private
 
     def delete_attachment

data/lib/labimotion/models/element_klass.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 require 'labimotion/models/concerns/generic_klass_revisions'
+require 'labimotion/models/concerns/workflow'
 
 module Labimotion
   class ElementKlass < ApplicationRecord
-    acts_as_paranoid
     self.table_name = :element_klasses
+    acts_as_paranoid
     include GenericKlassRevisions
+    include Workflow
     has_many :elements, dependent: :destroy, class_name: 'Labimotion::Element'
     has_many :segment_klasses, dependent: :destroy, class_name: 'Labimotion::SegmentKlass'
     has_many :element_klasses_revisions, dependent: :destroy, class_name: 'Labimotion::ElementKlassesRevision'
@@ -16,10 +18,18 @@ module Labimotion
       klasses = []
     ensure
       File.write(
-        Rails.root.join('config', 'klasses.json'),
+        Rails.root.join('app/packs/klasses.json'),
         klasses&.to_json || []
       )
     end
 
+    def migrate_workflow
+      return if properties_template.nil? || properties_release.nil?
+
+      return if properties_template['flow'].nil? && properties_release['flow'].nil?
+
+      update_column(:properties_template, split_workflow(properties_template)) if properties_template['flow']
+      update_column(:properties_release, split_workflow(properties_release)) if properties_release['flow']
+    end
   end
 end

data/lib/labimotion/models/element_klasses_revision.rb

@@ -1,9 +1,19 @@
 # frozen_string_literal: true
 
+require 'labimotion/models/concerns/workflow'
+
 module Labimotion
   class ElementKlassesRevision < ApplicationRecord
     acts_as_paranoid
     self.table_name = :element_klasses_revisions
+    include Workflow
     has_one :element_klass, class_name: 'Labimotion::ElementKlass'
+
+
+    def migrate_workflow
+      return if properties_release.nil? || properties_release['flow'].nil?
+
+      update_column(:properties_release, split_workflow(properties_release)) if properties_release['flow']
+    end
   end
 end

data/lib/labimotion/models/hub_log.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Labimotion
+  class HubLog < ApplicationRecord
+    self.table_name = :hub_logs
+    belongs_to :klass, polymorphic: true, optional: true
+  end
+end

data/lib/labimotion/utils/utils.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'labimotion/version'
 module Labimotion
+  ## Generic Utils
   class Utils
     def self.klass_by_collection(name)
       names = name.split('::')
@@ -53,5 +55,36 @@ module Labimotion
     def self.element_name_dc(name)
       Labimotion::Utils.element_name(name)&.downcase
     end
+
+    def self.next_version(release, current_version)
+      case release
+      when 'draft'
+        current_version
+      when 'major'
+        if current_version.nil? || current_version.split('.').length < 2
+          '1.0'
+        else
+          "#{current_version&.split('.').first.to_i + 1}.0"
+        end
+      when 'minor'
+        if current_version.nil? || current_version&.split('.').length < 2
+          '0.1'
+        else
+          "#{current_version&.split('.').first.to_i.to_s}.#{current_version&.split('.').last.to_i + 1}"
+        end
+      else
+        current_version
+      end
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      current_version
+    end
+
+    def self.pkg(pkg)
+      pkg = {} if pkg.nil?
+      pkg['eln'] = Chemotion::Application.config.version
+      pkg['labimotion'] = Labimotion::VERSION
+      pkg
+    end
   end
 end

data/lib/labimotion/version.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Labimotion
-  VERSION = '0.1.12'
   IS_RAILS5 = true
+  VERSION = '0.1.14' if Labimotion::IS_RAILS5 == true
+  VERSION = '1.0.1' if Labimotion::IS_RAILS5 == false
 end

data/lib/labimotion.rb

@@ -7,7 +7,7 @@ module Labimotion
     @@labimotion_logger ||= Logger.new(Rails.root.join('log/labimotion.log')) # rubocop:disable Style/ClassVars
   end
 
-  def self.log_exception(exception, current_user = {})
+  def self.log_exception(exception, current_user = nil)
     Labimotion.logger.error("version: #{Labimotion::VERSION}; #{Labimotion::IS_RAILS5}, (#{current_user&.id}) \n Exception: #{exception.message}")
     Labimotion.logger.error(exception.backtrace.join("\n"))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,6 +73,7 @@ files:
 - lib/labimotion/models/concerns/generic_klass_revisions.rb
 - lib/labimotion/models/concerns/generic_revisions.rb
 - lib/labimotion/models/concerns/segmentable.rb
+- lib/labimotion/models/concerns/workflow.rb
 - lib/labimotion/models/dataset.rb
 - lib/labimotion/models/dataset_klass.rb
 - lib/labimotion/models/dataset_klasses_revision.rb
@@ -83,6 +84,7 @@ files:
 - lib/labimotion/models/elements_element.rb
 - lib/labimotion/models/elements_revision.rb
 - lib/labimotion/models/elements_sample.rb
+- lib/labimotion/models/hub_log.rb
 - lib/labimotion/models/segment.rb
 - lib/labimotion/models/segment_klass.rb
 - lib/labimotion/models/segment_klasses_revision.rb