labimotion 2.0.0.rc2 → 2.0.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 608624a39eb174198e63db9cde2e4440425aa6bad1c604801c817ea13caea859
-  data.tar.gz: c691e2f9e670d301acc2494745e02836bf8ffcb1479c86c747f02ff9fadc6617
+  metadata.gz: e53e20059dd2a04452a513beb5024c762f8596d5694874c67b58d64baaf0ce47
+  data.tar.gz: d6b10330fe1dbce975b54a799e5a25d4cb13202fcf7b0a909ae9204fa1442146
 SHA512:
-  metadata.gz: e3c03f09293537ad8993158d1e1871fff2bf6a84ff88d90ca5d55af663fa862df4907a72639a2cdfb4bb7a2371911bf37b146cc97fbf0030945d3c23b5777de9
-  data.tar.gz: c746e80182b677d03c5bf06608285441a7b7022fdfcf521aec2aeaab61470d7a774ce059919d35e4b671446890b4055e3707da8b9a7f2fa52b4446fe52fbf655
+  metadata.gz: 118380f7c4b0483f3ceb7b80d5aa324db7d3fcde3e0b7a5ee66a92a02528fd8e8b352072c79fce563c9955eedc7efcf199e1f1645d391736c54715993f8d4c1d
+  data.tar.gz: c23b0428e3854382643548c08abdd0b875efbcdc052b7b6dd7a612996781056679dc23ce09d46b99e844c1e69016bd17dc54d9dd6d99bbfe1d22a6ce9bd06c44

data/lib/labimotion/apis/standard_api.rb

@@ -13,8 +13,7 @@ module Labimotion
           use :create_std_layer_params
         end
         post do
-          # authenticate_admin!('elements')
-          # create_element_klass(current_user, params)
+          authenticate_admin!('standard_layers')
           create_std_layer(current_user, params)
           status 201
         rescue ActiveRecord::RecordInvalid => e

data/lib/labimotion/apis/standard_layer_api.rb

@@ -7,14 +7,13 @@ module Labimotion
   class StandardLayerAPI < Grape::API
     include Grape::Kaminari
     helpers Labimotion::ParamHelpers
+    helpers Labimotion::GenericHelpers
 
     resource :layers do
       namespace :get_all_layers do
         desc 'get all standard layers for designer'
         get do
           list = Labimotion::StdLayer.all.sort_by { |e| e.name }
-          # present list, with: Labimotion::StdLayer, root: 'klass'
-          # data = Labimotion::StdLayer.represent(col_tree, serializable: true)
           return { mc: 'ss00', data: list }
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
@@ -24,17 +23,9 @@ module Labimotion
 
       namespace :get_standard_layer do
         desc 'get standard layer by id'
-        # params do
-        #   requires :id, type: Integer, desc: 'Layer id'
-        # end
         route_param :id do
-          before do
-          #   @element_policy = ElementPolicy.new(current_user, Labimotion::Element.find(params[:id]))
-          #   error!('401 Unauthorized', 401) unless current_user.matrix_check_by_name('genericElement') && @element_policy.read?
-          # rescue ActiveRecord::RecordNotFound
-          #   error!('404 Not Found', 404)
-          end
           get do
+            authenticate_admin!('standard_layers')
             entity = Labimotion::StdLayer.find(params[:id])
             return { mc: 'ss00', data: entity }
           rescue StandardError => e
@@ -50,13 +41,9 @@ module Labimotion
           use :std_layer_save
         end
         before do
+          authenticate_admin!('standard_layers')
           cur_layer = Labimotion::StdLayer.find_by(name: params[:key])
           error!('Error! duplicate name', 409) if cur_layer.present?
-          # @element_policy = ElementPolicy.new(current_user, Labimotion::Element.find(params[:id]))
-          # error!('401 Unauthorized', 401) unless current_user.matrix_check_by_name('genericElement') && @element_policy.read?
-        # rescue ActiveRecord::RecordNotFound
-        #   Labimotion.log_exception(e, current_user)
-        #   error!('404 Not Found', 404)
         end
         post do
           attributes = {
@@ -83,7 +70,7 @@ module Labimotion
         end
         route_param :id do
           before do
-            # error!('401 Unauthorized', 401) unless ElementPolicy.new(current_user, StdLayer.find(params[:id])).destroy?
+            authenticate_admin!('standard_layers')
           end
           delete do
             entity = Labimotion::StdLayer.find(params[:id])

data/lib/labimotion/apis/vocabulary_api.rb

@@ -7,6 +7,7 @@ module Labimotion
   class VocabularyAPI < Grape::API
     include Grape::Kaminari
     helpers Labimotion::ParamHelpers
+    helpers Labimotion::GenericHelpers
 
     resource :vocab do
       namespace :save_vocabulary do
@@ -15,7 +16,7 @@ module Labimotion
           use :vocab_save
         end
         before do
-          # error!('Error! duplicate record', 409) if ???.present?
+          authenticate_admin!('vocabularies')
         rescue ActiveRecord::RecordNotFound
           error!('404 Not Found', 404)
         end
@@ -46,17 +47,8 @@ module Labimotion
       namespace :get_all_vocabularies do
         desc 'get all standard layers for designer'
         get do
-          # merged_data = []
-          # Dir.glob(Rails.public_path.join('generic', 'vocabularies', '*.json')).each do |file_path|
-          #   file_content = File.read(file_path)
-          #   json_data = JSON.parse(file_content)
-          #   merged_data.concat(json_data)
-          # end
-
-          # list = Labimotion::Vocabulary.all.sort_by { |e| e.name }
-          # present list, with: Labimotion::StdLayer, root: 'klass'
+          authenticate_admin!('vocabularies')
           combined_data = Labimotion::VocabularyHandler.load_all_vocabularies
-          # combined_data = Labimotion::VocabularyEntity.represent(vocabularies, serializable: true)
           return { mc: 'ss00', data: combined_data }
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
@@ -67,15 +59,9 @@ module Labimotion
       namespace :field_klasses do
         desc 'get all field klasses for admin function'
         get do
-          # Dir.glob(Rails.public_path.join('generic', 'vocabularies', '*.json')).each do |file_path|
-          #   file_content = File.read(file_path)
-          #   json_data = JSON.parse(file_content)
-          #   merged_data.concat(json_data)
-          # end
+          authenticate_admin!('vocabularies')
           vocabularies = Labimotion::VocabularyHandler.load_app_vocabularies
           merged_data = Labimotion::FieldKlassEntity.represent(vocabularies, serializable: true)
-          # list = Labimotion::Vocabulary.all.sort_by { |e| e.name }
-          # present list, with: Labimotion::VocabularyEntity, root: 'klass'
           merged_data
         rescue StandardError => e
           Labimotion.log_exception(e, current_user)
@@ -90,7 +76,7 @@ module Labimotion
         end
         route_param :id do
           before do
-            # error!('401 Unauthorized', 401) unless ElementPolicy.new(current_user, Vocabulary.find(params[:id])).destroy?
+            authenticate_admin!('vocabularies')
           end
           delete do
             entity = Labimotion::Vocabulary.find(params[:id])

data/lib/labimotion/constants.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Labimotion
+  module Constants
+    module DateTime
+      DATE_FORMAT = '%Y-%m-%d'
+      DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S %Z'
+      TIME_FORMAT = '%H:%M:%S %Z'
+      TIME_ZONE = 'UTC'
+    end
+
+    module File
+      ENCODING = 'UTF-8'
+    end
+
+    module CHMO
+      CV = 'Cyclic Voltammetry'
+    end
+
+    module Mapper
+      NMR_CONFIG = ::File.join(__dir__, 'libs', 'data', 'mapper', 'Source.json').freeze
+      WIKI_CONFIG = ::File.join(__dir__, 'libs', 'data', 'mapper', 'Chemwiki.json').freeze
+    end
+  end
+end

data/lib/labimotion/entities/dataset_entity.rb

@@ -12,6 +12,5 @@ module Labimotion
     def klass_label
       object&.dataset_klass&.label
     end
-
   end
 end

data/lib/labimotion/entities/element_entity.rb

@@ -20,6 +20,7 @@ module Labimotion
       expose! :thumb_svg
       expose! :type
       expose! :uuid
+      expose! :user_labels
     end
 
     with_options(anonymize_below: 10) do

data/lib/labimotion/entities/properties_entity.rb

@@ -12,7 +12,7 @@ module Labimotion
     private
 
     def process_layers
-      (object&.properties.is_a?(Hash) && object.properties[Labimotion::Prop::LAYERS]&.keys || []).each do |key|
+      (object&.properties.is_a?(Hash) && (object.properties[Labimotion::Prop::LAYERS]&.keys || [])).each do |key|
         yield(key, object.properties[Labimotion::Prop::LAYERS][key])
       end
     end
@@ -25,7 +25,8 @@ module Labimotion
     end
 
     def process_sample_and_molecule_fields(key, layer)
-      select_fields(layer, [Labimotion::FieldType::DRAG_SAMPLE, Labimotion::FieldType::DRAG_MOLECULE]).each do |field, idx|
+      select_fields(layer,
+                    [Labimotion::FieldType::DRAG_SAMPLE, Labimotion::FieldType::DRAG_MOLECULE]).each do |field, idx|
         update_sample_or_molecule_field(key, field, idx)
       end
     end
@@ -60,13 +61,20 @@ module Labimotion
       return unless sid.present?
 
       el = field['type'] == Labimotion::FieldType::DRAG_SAMPLE ? Sample.find_by(id: sid) : Molecule.find_by(id: sid)
-      return unless el.present? && object.properties.dig(Labimotion::Prop::LAYERS, key, Labimotion::Prop::FIELDS, idx, 'value').present?
+      return unless el.present? && object.properties.dig(Labimotion::Prop::LAYERS, key, Labimotion::Prop::FIELDS, idx,
+                                                         'value').present?
 
+      label = field['type'] == Labimotion::FieldType::DRAG_SAMPLE ? el&.short_label : el.iupac_name
       update_field_value(key, idx, {
-        'el_label' => el.short_label,
-        'el_tip' => el.short_label,
-        'el_svg' => field['type'] == Labimotion::FieldType::DRAG_SAMPLE ? el.get_svg_path : File.join('/images', 'molecules', el&.molecule_svg_file || 'nosvg')
-      })
+                           'el_label' => label,
+                           'el_tip' => label,
+                           'el_svg' => if field['type'] == Labimotion::FieldType::DRAG_SAMPLE
+                                         el&.get_svg_path
+                                       else
+                                         File.join('/images',
+                                                   'molecules', el&.molecule_svg_file || 'nosvg')
+                                       end
+                         })
     end
 
     def update_reaction_field(key, field, idx)
@@ -79,23 +87,34 @@ module Labimotion
         return
       end
 
-      return unless object.properties.dig(Labimotion::Prop::LAYERS, key, Labimotion::Prop::FIELDS, idx, 'value').present?
+      return unless object.properties.dig(Labimotion::Prop::LAYERS, key, Labimotion::Prop::FIELDS, idx,
+                                          'value').present?
 
       update_field_value(key, idx, {
-        'el_label' => el.short_label,
-        'el_tip' => el.short_label,
-        'el_svg' => el.reaction_svg_file
-      })
+                           'el_label' => el.short_label,
+                           'el_tip' => el.short_label,
+                           'el_svg' => el.reaction_svg_file
+                         })
     end
 
     def update_table_field(key, field, idx)
       return unless field['sub_values'].present? && field[Labimotion::Prop::SUBFIELDS].present?
 
-      field_table_molecules = field[Labimotion::Prop::SUBFIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_MOLECULE }
-      object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx] = set_table(field, field_table_molecules, Labimotion::Prop::MOLECULE) if field_table_molecules.present?
+      field_table_molecules = field[Labimotion::Prop::SUBFIELDS].select do |ss|
+        ss['type'] == Labimotion::FieldType::DRAG_MOLECULE
+      end
+      if field_table_molecules.present?
+        object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx] =
+          set_table(field, field_table_molecules, Labimotion::Prop::MOLECULE)
+      end
+
+      field_table_samples = field[Labimotion::Prop::SUBFIELDS].select do |ss|
+        ss['type'] == Labimotion::FieldType::DRAG_SAMPLE
+      end
+      return unless field_table_samples.present?
 
-      field_table_samples = field[Labimotion::Prop::SUBFIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_SAMPLE }
-      object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx] = set_table(field, field_table_samples, Labimotion::Prop::SAMPLE) if field_table_samples.present?
+      object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx] =
+        set_table(field, field_table_samples, Labimotion::Prop::SAMPLE)
     end
 
     def update_voc_field(key, field, idx)
@@ -122,9 +141,9 @@ module Labimotion
     end
 
     def update_element_voc_field(key, field, idx, root_element)
-      if field['identifier'] == 'element.name'
-        update_field_value(key, idx, root_element&.name)
-      end
+      return unless field['identifier'] == 'element.name'
+
+      update_field_value(key, idx, root_element&.name)
     end
 
     def update_segment_voc_field(key, field, idx, root_element)
@@ -132,21 +151,28 @@ module Labimotion
       return if segs.empty? || field['layer_id'].blank? || field['field_id'].blank?
 
       seg = segs&.first
-      seg_fields = seg.properties.dig(Labimotion::Prop::LAYERS, field['layer_id'], Labimotion::Prop::FIELDS).select { |ff| ff['field'] == field['field_id'] }
+      seg_fields = seg.properties.dig(Labimotion::Prop::LAYERS, field['layer_id'],
+                                      Labimotion::Prop::FIELDS).select do |ff|
+        ff['field'] == field['field_id']
+      end
       seg_field = seg_fields&.first
       update_field_value(key, idx, seg_field['value'])
     end
 
     def update_dataset_voc_field(key, field, idx, root_element)
-      dk = DatasetKlass.find_by(identifier: field["source_id"])
-      dk["ols_term_id"]
-      anas = root_element.analyses.select { |ana| ana.extended_metadata["kind"].split("|")&.first&.strip == dk["ols_term_id"] }
+      dk = DatasetKlass.find_by(identifier: field['source_id'])
+      dk['ols_term_id']
+      anas = root_element.analyses.select do |ana|
+        ana.extended_metadata['kind'].split('|')&.first&.strip == dk['ols_term_id']
+      end
       anas.each do |ana|
         ana.children.each do |cds|
           next unless cds.dataset.present?
 
           ds_prop = cds.dataset.properties
-          ds_fields = ds_prop.dig(Labimotion::Prop::LAYERS, field['layer_id'], Labimotion::Prop::FIELDS).select { |ff| ff['field'] == field['field_id'] }
+          ds_fields = ds_prop.dig(Labimotion::Prop::LAYERS, field['layer_id'], Labimotion::Prop::FIELDS).select do |ff|
+            ff['field'] == field['field_id']
+          end
           ds_field = ds_fields&.first
           if object.properties[Labimotion::Prop::LAYERS][key].present? && ds_field['value'].present?
             update_field_value(key, idx, ds_field['value'])
@@ -155,15 +181,38 @@ module Labimotion
       end
     end
 
-    def update_field_value(key, idx, value)
-      object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value'] = value
+    def update_field_value(key, idx, value, act = 'merge')
+      field_path = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]
+      original_value = field_path['value']
+
+      field_path['value'] = merge_values(original_value, value, act)
+    end
+
+    def merge_by_type(original_value, new_value)
+      if original_value.is_a?(Hash)
+        merge_hash_values(original_value, new_value)
+      # elsif original_value.is_a?(Array)
+      #   merge_array_values(original_value, new_value)
+      else
+        new_value
+      end
+    end
+
+    def merge_values(original_value, new_value, act)
+      return new_value if act == 'overwrite'
+      return new_value if original_value.blank?
+      return original_value if new_value.blank?
+
+      merge_by_type(original_value, new_value)
     end
 
     def set_table(field, field_table_objs, obj)
       col_ids = field_table_objs.map { |x| x.values[0] }
       col_ids.each do |col_id|
         field['sub_values'].each do |sub_value|
-          next unless sub_value[col_id].present? && sub_value[col_id]['value'].present? && sub_value[col_id]['value']['el_id'].present?
+          unless sub_value[col_id].present? && sub_value[col_id]['value'].present? && sub_value[col_id]['value']['el_id'].present?
+            next
+          end
 
           find_obj = obj.constantize.find_by(id: sub_value[col_id]['value']['el_id'])
           next if find_obj.blank?
@@ -181,23 +230,35 @@ module Labimotion
 
     def update_molecule_sub_value(sub_value, col_id, find_obj)
       sub_value[col_id]['value'].merge!({
-        'el_svg' => File.join('/images', 'molecules', find_obj.molecule_svg_file),
-        'el_inchikey' => find_obj.inchikey,
-        'el_smiles' => find_obj.cano_smiles,
-        'el_iupac' => find_obj.iupac_name,
-        'el_molecular_weight' => find_obj.molecular_weight
-      })
+                                          'el_svg' => File.join('/images', 'molecules', find_obj.molecule_svg_file),
+                                          'el_inchikey' => find_obj.inchikey,
+                                          'el_smiles' => find_obj.cano_smiles,
+                                          'el_iupac' => find_obj.iupac_name,
+                                          'el_molecular_weight' => find_obj.molecular_weight
+                                        })
     end
 
     def update_sample_sub_value(sub_value, col_id, find_obj)
       sub_value[col_id]['value'].merge!({
-        'el_svg' => find_obj.get_svg_path,
-        'el_label' => find_obj.short_label,
-        'el_short_label' => find_obj.short_label,
-        'el_name' => find_obj.name,
-        'el_external_label' => find_obj.external_label,
-        'el_molecular_weight' => find_obj.decoupled ? find_obj.molecular_mass : find_obj.molecule.molecular_weight
-      })
+                                          'el_svg' => find_obj.get_svg_path,
+                                          'el_label' => find_obj.short_label,
+                                          'el_short_label' => find_obj.short_label,
+                                          'el_name' => find_obj.name,
+                                          'el_external_label' => find_obj.external_label,
+                                          'el_molecular_weight' => find_obj.decoupled ? find_obj.molecular_mass : find_obj.molecule.molecular_weight
+                                        })
+    end
+
+    def merge_hash_values(original, new_value)
+      return original unless new_value.is_a?(Hash)
+
+      original.merge(new_value)
+    end
+
+    def merge_array_values(original, new_value)
+      return original unless new_value.respond_to?(:to_a)
+
+      (original + new_value.to_a).uniq
     end
   end
-end
+end

data/lib/labimotion/entities/segment_entity.rb

@@ -9,7 +9,5 @@ module Labimotion
     def klass_label
       object.segment_klass.label
     end
-
-
   end
 end

data/lib/labimotion/entities/vocabulary_entity.rb

@@ -6,16 +6,6 @@ module Labimotion
   class VocabularyEntity < ApplicationEntity
     expose :id, :identifier, :name, :label, :field_type, :opid, :term_id,
            :field_id, :properties, :source, :source_id, :layer_id
-    # expose :source do |obj|
-    #   (obj[:properties] && obj[:properties]['voc'] && obj[:properties]['voc']['source']) || ''
-    # end
-    # expose :source_id do |obj|
-    #   (obj[:properties] && obj[:properties]['voc'] && obj[:properties]['voc']['source_id']) || ''
-    # end
-    # expose :layer_id do |obj|
-    #   (obj[:properties] && obj[:properties]['voc'] && obj[:properties]['voc']['layer_id']) || ''
-    # end
-
     expose :voc do |obj|
       voc = (obj[:properties] && obj[:properties]['voc']) || {}
 

data/lib/labimotion/helpers/element_helpers.rb

@@ -127,12 +127,13 @@ module Labimotion
         attributes['properties']['uuid'] = uuid
         attributes['uuid'] = uuid
         attributes['klass_uuid'] = properties['klass_uuid']
-        element.update(attributes)
+        element.update_columns(attributes)
       end
       element.save_segments(segments: params[:segments], current_user_id: current_user.id)
       element.reload
-      new_properties = update_vocabularies(element.properties, current_user, element)
-      element.update_column(:properties, new_properties)
+      element.properties = update_vocabularies(element.properties, current_user, element)
+      ## element.user_for_revision = current_user
+      element.save!
       element
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)

data/lib/labimotion/helpers/generic_helpers.rb

@@ -9,7 +9,12 @@ module Labimotion
     extend Grape::API::Helpers
 
     def authenticate_admin!(type)
-      error!('401 Unauthorized', 401) unless current_user.generic_admin[type]
+      unauthorized = -> { error!('401 Unauthorized', 401) }
+      if %w[standard_layers vocabularies].include?(type)
+        unauthorized.call unless current_user.generic_admin.values_at('elements', 'segments', 'datasets').any?
+      else
+        unauthorized.call unless current_user.generic_admin[type]
+      end
     end
 
     def fetch_klass(name, id)

data/lib/labimotion/helpers/param_helpers.rb

@@ -134,21 +134,5 @@ module Labimotion
       optional :select_options, type: Hash, desc: 'selections'
       optional :option_layers, type: String, desc: 'option'
     end
-
-    # params :vocabulary_save do
-    #   requires :type, type: String, desc: 'type'
-    #   requires :field, type: String, desc: 'field'
-    #   optional :default, type: String, desc: 'default'
-    #   optional :description, type: String, desc: 'description'
-    #   optional :label, type: String, desc: 'label'
-    #   optional :position, type: Integer, desc: 'position'
-    #   optional :ontology, type: Hash, desc: 'ontology'
-    #   optional :required, type: Boolean, desc: 'is required?'
-    #   optional :sub_fields, type: Array, desc: 'sub_fields'
-    #   optional :text_sub_fields, type: Array, desc: 'text_sub_fields'
-    #   optional :source_type, type: String, desc: 'source type'
-    #   optional :source_id, type: String, desc: 'source id'
-    #   optional :layer_id, type: String, desc: 'layer id'
-    # end
   end
 end

data/lib/labimotion/libs/converter.rb

@@ -123,7 +123,6 @@ module Labimotion
         tmp_file.write(response.parsed_response)
         tmp_file.rewind
 
-        # name = response&.headers && response&.headers['content-disposition']&.split('=')&.last
         filename = oat.filename
         name = "#{File.basename(filename, '.*')}.zip"
         att = Attachment.new(