labimotion 1.1.4 → 1.2.0.0

data/lib/labimotion/entities/properties_entity.rb

@@ -6,39 +6,38 @@ module Labimotion
 
     # TODO: Refactor this method to something more readable/understandable
     def properties
-      (object&.properties.is_a?(Hash) && object.properties['layers']&.keys || []).each do |key|
+      (object&.properties.is_a?(Hash) && object.properties[Labimotion::Prop::LAYERS]&.keys || []).each do |key|
         # layer = object.properties[key]
-        field_sample_molecules = object.properties['layers'][key]['fields'].select { |ss| ss['type'] == 'drag_sample' || ss['type'] == 'drag_molecule' }
+        field_sample_molecules = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_SAMPLE || ss['type'] == Labimotion::FieldType::DRAG_MOLECULE }
         field_sample_molecules.each do |field|
-          idx = object.properties['layers'][key]['fields'].index(field)
+          idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
           sid = field.dig('value', 'el_id')
           next unless sid.present?
 
-          el = field['type'] == 'drag_sample' ? Sample.find_by(id: sid) : Molecule.find_by(id: sid)
+          el = field['type'] == Labimotion::FieldType::DRAG_SAMPLE ? Sample.find_by(id: sid) : Molecule.find_by(id: sid)
           next unless el.present?
-          next unless object.properties.dig('layers', key, 'fields', idx, 'value').present?
+          next unless object.properties.dig(Labimotion::Prop::LAYERS, key, Labimotion::Prop::FIELDS, idx, 'value').present?
 
-          object.properties['layers'][key]['fields'][idx]['value']['el_label'] = el.short_label if field['type'] == 'drag_sample'
-          object.properties['layers'][key]['fields'][idx]['value']['el_tip'] = el.short_label if field['type'] == 'drag_sample'
-          object.properties['layers'][key]['fields'][idx]['value']['el_svg'] = field['type'] == 'drag_sample' ? el.get_svg_path : File.join('/images', 'molecules', el.molecule_svg_file)
+          object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_label'] = el.short_label if field['type'] == Labimotion::FieldType::DRAG_SAMPLE
+          object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_tip'] = el.short_label if field['type'] == Labimotion::FieldType::DRAG_SAMPLE
+          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_tables = object.properties['layers'][key]['fields'].select { |ss| ss['type'] == 'table' }
+        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['layers'][key]['fields'].index(field)
-          next unless field['sub_values'].present? && field['sub_fields'].present?
+          idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
+          next unless field['sub_values'].present? && field[Labimotion::Prop::SUBFIELDS].present?
 
-          field_table_molecules = field['sub_fields'].select { |ss| ss['type'] == 'drag_molecule' }
-          object.properties['layers'][key]['fields'][idx] = set_table(field, field_table_molecules, 'Molecule') if field_table_molecules.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_samples = field['sub_fields'].select { |ss| ss['type'] == 'drag_sample' }
-          object.properties['layers'][key]['fields'][idx] = set_table(field, field_table_samples, 'Sample') if 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?
         end
       end
       object.properties
     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|
@@ -46,16 +45,16 @@ module Labimotion
           next unless sub_value[col_id].present? && sub_value[col_id]['value'].present? && sub_value[col_id]['value']['el_id'].present?
 
           find_obj = obj.constantize.find_by(id: sub_value[col_id]['value']['el_id'])
-          next unless find_obj.present?
+          next if find_obj.blank?
 
           case obj
-          when 'Molecule'
+          when Labimotion::Prop::MOLECULE
             sub_value[col_id]['value']['el_svg'] = File.join('/images', 'molecules', find_obj.molecule_svg_file)
             sub_value[col_id]['value']['el_inchikey'] = find_obj.inchikey
             sub_value[col_id]['value']['el_smiles'] = find_obj.cano_smiles
             sub_value[col_id]['value']['el_iupac'] = find_obj.iupac_name
             sub_value[col_id]['value']['el_molecular_weight'] = find_obj.molecular_weight
-          when 'Sample'
+          when Labimotion::Prop::SAMPLE
             sub_value[col_id]['value']['el_svg'] = find_obj.get_svg_path
             sub_value[col_id]['value']['el_label'] = find_obj.short_label
             sub_value[col_id]['value']['el_short_label'] = find_obj.short_label

data/lib/labimotion/entities/segment_revision_entity.rb

@@ -9,27 +9,27 @@ module Labimotion
     end
 
     def properties
-      object.properties['layers']&.keys.each do |key|
-        field_sample_molecules = object.properties['layers'][key]['fields'].select { |ss| ss['type'] == 'drag_sample' || ss['type'] == 'drag_molecule' }
+      object.properties[Labimotion::Prop::LAYERS]&.keys.each do |key|
+        field_sample_molecules = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_SAMPLE || ss['type'] == Labimotion::FieldType::DRAG_MOLECULE }
         field_sample_molecules.each do |field|
-          idx = object.properties['layers'][key]['fields'].index(field)
+          idx = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].index(field)
           sid = field.dig('value', 'el_id')
           next unless sid.present?
 
-          el = field['type'] == 'drag_sample' ? Sample.find_by(id: sid) : Molecule.find_by(id: sid)
+          el = field['type'] == Labimotion::FieldType::DRAG_SAMPLE ? Sample.find_by(id: sid) : Molecule.find_by(id: sid)
           next unless el.present?
-          next unless object.properties.dig('layers', key, 'fields', idx, 'value').present?
+          next unless object.properties.dig(Labimotion::Prop::LAYERS, key, Labimotion::Prop::FIELDS, idx, 'value').present?
 
-          object.properties['layers'][key]['fields'][idx]['value']['el_label'] = el.short_label if field['type'] == 'drag_sample'
-          object.properties['layers'][key]['fields'][idx]['value']['el_tip'] = el.short_label if field['type'] == 'drag_sample'
-          object.properties['layers'][key]['fields'][idx]['value']['el_svg'] = field['type'] == 'drag_sample' ? el.get_svg_path : File.join('/images', 'molecules', el.molecule_svg_file)
+          object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_label'] = el.short_label if field['type'] == Labimotion::FieldType::DRAG_SAMPLE
+          object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS][idx]['value']['el_tip'] = el.short_label if field['type'] == Labimotion::FieldType::DRAG_SAMPLE
+          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_tables = object.properties['layers'][key]['fields'].select { |ss| ss['type'] == 'table' }
+        field_tables = object.properties[Labimotion::Prop::LAYERS][key][Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::TABLE }
         field_tables.each do |field|
-          next unless field['sub_values'].present? && field['sub_fields'].present?
+          next unless field['sub_values'].present? && field[Labimotion::Prop::SUBFIELDS].present?
 
-          field_table_molecules = field['sub_fields'].select { |ss| ss['type'] == 'drag_molecule' }
+          field_table_molecules = field[Labimotion::Prop::SUBFIELDS].select { |ss| ss['type'] == Labimotion::FieldType::DRAG_MOLECULE }
           next unless field_table_molecules.present?
 
           col_ids = field_table_molecules.map { |x| x.values[0] }

data/lib/labimotion/helpers/element_helpers.rb

@@ -133,10 +133,20 @@ module Labimotion
       raise e
     end
 
+    def split_elements(ui_state, current_user)
+      col_id = ui_state[:currentCollectionId] || 0
+      element_ids = Labimotion::Element.for_user(current_user.id).for_ui_state_with_collection(ui_state[:element], Labimotion::CollectionsElement, col_id)
+      klass_id = Labimotion::ElementKlass.find_by(name: ui_state[:element][:name])&.id
+      Labimotion::Element.where(id: element_ids, element_klass_id: klass_id).each do |element|
+        element.split(current_user, col_id)
+      end
+      {}
+    end
+
     def upload_generics_files(current_user, params)
       attach_ary = []
       att_ary = create_uploads(
-        'Element',
+        Labimotion::Prop::ELEMENT,
         params[:att_id],
         params[:elfiles],
         params[:elInfo],
@@ -146,7 +156,7 @@ module Labimotion
       (attach_ary << att_ary).flatten! unless att_ary&.empty?
 
       att_ary = create_uploads(
-        'Segment',
+        Labimotion::Prop::SEGMENT,
         params[:att_id],
         params[:sefiles],
         params[:seInfo],
@@ -195,7 +205,7 @@ module Labimotion
         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') || []
+        allowed_fields = element_klass.properties_release.dig(Labimotion::Prop::LAYERS, layer, Labimotion::Prop::FIELDS)&.pluck('field') || []
 
         if field.in?(allowed_fields)
           query = ActiveRecord::Base.sanitize_sql(
@@ -258,7 +268,7 @@ module Labimotion
         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') || []
+        allowed_fields = element_klass.properties_release.dig(Labimotion::Prop::LAYERS, layer, Labimotion::Prop::FIELDS)&.pluck('field') || []
 
         if field.in?(allowed_fields)
           query = ActiveRecord::Base.sanitize_sql(

data/lib/labimotion/helpers/generic_helpers.rb

@@ -107,9 +107,9 @@ module Labimotion
 
     def fetch_properties_uploads(properties)
       uploads = []
-      properties['layers'].keys.each do |key|
-        layer = properties['layers'][key]
-        field_uploads = layer['fields'].select { |ss| ss['type'] == 'upload' }
+      properties[Labimotion::Prop::LAYERS].keys.each do |key|
+        layer = properties[Labimotion::Prop::LAYERS][key]
+        field_uploads = layer[Labimotion::Prop::FIELDS].select { |ss| ss['type'] == Labimotion::FieldType::UPLOAD }
         field_uploads.each do |field|
           ((field['value'] && field['value']['files']) || []).each do |file|
             uploads.push({ layer: key, field: field['field'], uid: file['uid'], filename: file['filename'] })
@@ -125,10 +125,10 @@ module Labimotion
     def update_properties_upload(element, properties, att, pa)
       return if pa.nil?
 
-      idx = properties['layers'][pa[:layer]]['fields'].index { |fl| fl['field'] == pa[:field] }
-      fidx = properties['layers'][pa[:layer]]['fields'][idx]['value']['files'].index { |fi| fi['uid'] == pa[:uid] }
-      properties['layers'][pa[:layer]]['fields'][idx]['value']['files'][fidx]['aid'] = att.id
-      properties['layers'][pa[:layer]]['fields'][idx]['value']['files'][fidx]['uid'] = att.identifier
+      idx = properties[Labimotion::Prop::LAYERS][pa[:layer]][Labimotion::Prop::FIELDS].index { |fl| fl['field'] == pa[:field] }
+      fidx = properties[Labimotion::Prop::LAYERS][pa[:layer]][Labimotion::Prop::FIELDS][idx]['value']['files'].index { |fi| fi['uid'] == pa[:uid] }
+      properties[Labimotion::Prop::LAYERS][pa[:layer]][Labimotion::Prop::FIELDS][idx]['value']['files'][fidx]['aid'] = att.id
+      properties[Labimotion::Prop::LAYERS][pa[:layer]][Labimotion::Prop::FIELDS][idx]['value']['files'][fidx]['uid'] = att.identifier
       element.update_columns(properties: properties)
     rescue StandardError => e
       Labimotion.log_exception(e, current_user)
@@ -143,9 +143,9 @@ module Labimotion
       map_info&.keys&.each do |key|
         next if map_info[key]['files'].empty?
 
-        if type == 'Segment'
+        if type == Labimotion::Prop::SEGMENT
           element = Labimotion::Segment.find_by(element_id: id, segment_klass_id: key)
-        elsif type == 'Element'
+        elsif type == Labimotion::Prop::ELEMENT
           element = Labimotion::Element.find_by(id: id)
         end
         next if element.nil?

data/lib/labimotion/helpers/segment_helpers.rb

@@ -73,8 +73,7 @@ module Labimotion
       attributes['updated_by'] = current_user.id
       attributes['sync_by'] = current_user.id
       attributes['sync_time'] = DateTime.now
-
-      element_klass = Labimotion::ElementKlass.find_by(identifier: response['element_klass']['identifier'])
+      element_klass = Labimotion::ElementKlass.find_by(identifier: response['element_klass']['identifier']) if response.dig('element_klass','identifier').present?
       element_klass = Labimotion::ElementKlass.find_by(name: response['element_klass']['name'], is_generic: false) if element_klass.nil?
       return { status: 'error', message: "The element [#{response['element_klass']['name']}] does not exist in this instance" } if element_klass.nil?
 

data/lib/labimotion/libs/converter.rb

@@ -247,38 +247,38 @@ module Labimotion
     end
 
     def self.update_ds(dataset, dsr, current_user = nil) # rubocop: disable Metrics/PerceivedComplexity
-      layers = dataset.properties['layers'] || {}
+      layers = dataset.properties[Labimotion::Prop::LAYERS] || {}
       new_prop = dataset.properties
       dsr.each do |ds|
         layer = layers[ds[:layer]]
-        next if layer.nil? || layer['fields'].nil?
+        next if layer.nil? || layer[Labimotion::Prop::FIELDS].nil?
 
-        fields = layer['fields'].select{ |f| f['field'] == ds[:field] }
+        fields = layer[Labimotion::Prop::FIELDS].select{ |f| f['field'] == ds[:field] }
         fi = fields&.first
-        idx = layer['fields'].find_index(fi)
+        idx = layer[Labimotion::Prop::FIELDS].find_index(fi)
         fi['value'] = ds[:value]
         fi['device'] = ds[:device] || ds[:value]
-        new_prop['layers'][ds[:layer]]['fields'][idx] = fi
+        new_prop[Labimotion::Prop::LAYERS][ds[:layer]][Labimotion::Prop::FIELDS][idx] = fi
       end
-      new_prop.dig('layers', 'general', 'fields')&.each_with_index do |fi, idx|
+      new_prop.dig(Labimotion::Prop::LAYERS, 'general', Labimotion::Prop::FIELDS)&.each_with_index do |fi, idx|
         if fi['field'] == 'creator' && current_user.present?
           fi['value'] = current_user.name
           fi['system'] = current_user.name
-          new_prop['layers']['general']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['general'][Labimotion::Prop::FIELDS][idx] = fi
         end
       end
       element = Container.find(dataset.element_id)&.root_element
-      element.present? && element&.class&.name == 'Sample' && new_prop.dig('layers', 'sample_details', 'fields')&.each_with_index do |fi, idx|
+      element.present? && element&.class&.name == 'Sample' && new_prop.dig(Labimotion::Prop::LAYERS, 'sample_details', Labimotion::Prop::FIELDS)&.each_with_index do |fi, idx|
         if fi['field'] == 'id'
           fi['value'] = element.id
           fi['system'] = element.id
-          new_prop['layers']['sample_details']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['sample_details'][Labimotion::Prop::FIELDS][idx] = fi
         end
 
         if fi['field'] == 'label'
           fi['value'] = element.short_label
           fi['system'] = element.short_label
-          new_prop['layers']['sample_details']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['sample_details'][Labimotion::Prop::FIELDS][idx] = fi
         end
       end
       dataset.properties = new_prop
@@ -344,9 +344,9 @@ module Labimotion
 
     def self.metadata(id)
       att = Attachment.find(id)
-      return if att.nil? || att.attachable_id.nil? || att.attachable_type != 'Container'
+      return if att.nil? || att.attachable_id.nil? || att.attachable_type != Labimotion::Prop::CONTAINER
 
-      ds = Labimotion::Dataset.find_by(element_type: 'Container', element_id: att.attachable_id)
+      ds = Labimotion::Dataset.find_by(element_type: Labimotion::Prop::CONTAINER, element_id: att.attachable_id)
       att.update_column(:con_state, Labimotion::ConState::COMPLETED) if ds.present?
       process_ds(att.id) if ds.nil?
     end

data/lib/labimotion/libs/export_dataset.rb

@@ -18,6 +18,8 @@ module Labimotion
       element_name = Container.find(id)&.root_element&.short_label
       ols = ols_name(id)
       "#{element_name}_#{ols.gsub(' ', '_')}.xlsx"
+    rescue StandardError => e
+      Labimotion.log_exception(e)
     end
 
     def ols_name(id)
@@ -32,6 +34,9 @@ module Labimotion
       name = '1H NMR' if ds.dataset_klass.ols_term_id == 'CHMO:0000593'
       name = '13C NMR' if ds.dataset_klass.ols_term_id == 'CHMO:0000595'
       name.slice(0, 26)
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      'ols_name'
     end
 
     def description(ds, id)
@@ -56,6 +61,8 @@ module Labimotion
       sheet.add_row(['Source data', 'The data from Device or Chemotion, cannot be modified once a generic dataset is created'])
       sheet.add_row([''])
       sheet.add_row([''])
+    rescue StandardError => e
+      Labimotion.log_exception(e)
     end
 
     def export(id)
@@ -74,26 +81,32 @@ module Labimotion
       layer_style = sheet.styles.add_style(b: true, bg_color: 'CEECF5')
       sheet.add_row(header, style: header_style)
 
-      layers = ds.properties['layers'] || {}
+      layers = ds.properties[Labimotion::Prop::LAYERS] || {}
+      options = ds.properties[Labimotion::Prop::SEL_OPTIONS]
       layer_keys = layers.keys.sort_by { |key| layers[key]['position'] }
       layer_keys.each do |key|
         layer = layers[key]
         sheet.add_row([layer['label'], ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '], style: layer_style)
-        sorted_fields = layer['fields'].sort_by { |obj| obj['position'] }
+        sorted_fields = layer[Labimotion::Prop::FIELDS].sort_by { |obj| obj['position'] }
         sorted_fields.each do |field|
           next if field['type'] == 'dummy'
 
           type = field['type']
           from_device = field['device'].present? ? 'Device' : ''
           from_device = field['system'].present? ? 'Chemotion' : from_device
-          type = "#{field['type']}-#{field['option_layers']}" if field['type'] == 'select' || field['type'] == 'system-defined'
+          type = "#{field['type']}-#{field['option_layers']}" if field['type'] == Labimotion::FieldType::SELECT || field['type'] == Labimotion::FieldType::SYSTEM_DEFINED
 
           show_value = field['value'] =~ /\A\d+,\d+\z/ ? field['value']&.gsub(',', '.') : field['value']
           sheet.add_row([' ', field['label'], nil, field['value_system'], field['field'], type, from_device, field['dkey'], nil].freeze)
 
-          if %w[system-defined integer].include? field['type']
-            sheet.rows.last.cells[2].type = :integer
-            sheet.rows.last.cells[8].type = :integer
+          case field['type']
+          when Labimotion::FieldType::SELECT
+            sheet.rows.last.cells[2].type = :string
+            sheet.rows.last.cells[8].type = :string
+            show_value = opt_value(field, options) if show_value.present?
+          when Labimotion::FieldType::SYSTEM_DEFINED, Labimotion::FieldType::INTEGER
+            sheet.rows.last.cells[2].type = :float
+            sheet.rows.last.cells[8].type = :float
           else
             sheet.rows.last.cells[2].type = :string
             sheet.rows.last.cells[8].type = :string
@@ -105,6 +118,19 @@ module Labimotion
         end
         # sheet.column_widths nil, nil, nil, nil, 0, 0, 0, 0, 0
       end
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+    end
+
+    def opt_value(field, options)
+      return nil if field.nil? || options.nil? || field['value']&.empty? || field['option_layers']&.empty?
+      return nil unless opts = options.fetch(field['option_layers'], nil)&.fetch('options', nil)
+
+      selected = opts&.find { |ss| ss['key'] == field['value'] }
+      selected&.fetch('label', nil) || field['value']
+    rescue StandardError => e
+      Labimotion.log_exception(e)
+      field['value']
     end
 
     def spectra(id)

data/lib/labimotion/libs/nmr_mapper.rb

@@ -109,7 +109,7 @@ module Labimotion
       return if field['field'] != field_name || value&.empty?
 
       field['value'] = value
-      prop['layers'][layer_name]['fields'][idx] = field
+      prop[Labimotion::Prop::LAYERS][layer_name][Labimotion::Prop::FIELDS][idx] = field
       prop
     end
 
@@ -117,14 +117,14 @@ module Labimotion
       dataset = obj[:dataset]
       metadata = obj[:metadata]
       new_prop = dataset.properties
-      new_prop.dig('layers', 'general', 'fields')&.each_with_index do |fi, idx|
+      new_prop.dig(Labimotion::Prop::LAYERS, 'general', Labimotion::Prop::FIELDS)&.each_with_index do |fi, idx|
         #  new_prop = set_data(new_prop, fi, idx, 'general', 'title', metadata['NAME'])
         if fi['field'] == 'title' && metadata['NAME'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['NAME']
           fi['device'] = metadata['NAME']
           fi['dkey'] = 'NAME'
-          new_prop['layers']['general']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['general'][Labimotion::Prop::FIELDS][idx] = fi
         end
 
         if fi['field'] == 'date' && metadata['Date_'].present?
@@ -132,7 +132,7 @@ module Labimotion
           fi['value'] = metadata['Date_']
           fi['device'] = metadata['Date_']
           fi['dkey'] = 'Date_'
-          new_prop['layers']['general']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['general'][Labimotion::Prop::FIELDS][idx] = fi
         end
 
         if fi['field'] == 'time' && metadata['Time'].present?
@@ -140,130 +140,130 @@ module Labimotion
           fi['value'] = metadata['Time']
           fi['device'] = metadata['Time']
           fi['dkey'] = 'Time'
-          new_prop['layers']['general']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['general'][Labimotion::Prop::FIELDS][idx] = fi
         end
 
         if fi['field'] == 'creator' && current_user.present?
           ## fi['label'] = fi['label']
           fi['value'] = current_user.name
-          new_prop['layers']['general']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['general'][Labimotion::Prop::FIELDS][idx] = fi
         end
       end
       element = Container.find(id)&.root_element
-      element.present? && element&.class&.name == 'Sample' && new_prop.dig('layers', 'sample_details',
-                                                                          'fields')&.each_with_index do |fi, idx|
+      element.present? && element&.class&.name == 'Sample' && new_prop.dig(Labimotion::Prop::LAYERS, 'sample_details',
+                                                                          Labimotion::Prop::FIELDS)&.each_with_index do |fi, idx|
         if fi['field'] == 'label'
           fi['value'] = element.short_label
-          new_prop['layers']['sample_details']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['sample_details'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'id'
           fi['value'] = element.id
-          new_prop['layers']['sample_details']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['sample_details'][Labimotion::Prop::FIELDS][idx] = fi
         end
       end
 
-      new_prop.dig('layers', 'instrument', 'fields')&.each_with_index do |fi, idx|
+      new_prop.dig(Labimotion::Prop::LAYERS, 'instrument', Labimotion::Prop::FIELDS)&.each_with_index do |fi, idx|
         if fi['field'] == 'instrument' && metadata['INSTRUM'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['INSTRUM']
           fi['device'] = metadata['INSTRUM']
           fi['dkey'] = 'INSTRUM'
-          new_prop['layers']['instrument']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['instrument'][Labimotion::Prop::FIELDS][idx] = fi
         end
       end
 
-      new_prop.dig('layers', 'equipment', 'fields')&.each_with_index do |fi, idx|
+      new_prop.dig(Labimotion::Prop::LAYERS, 'equipment', Labimotion::Prop::FIELDS)&.each_with_index do |fi, idx|
         if fi['field'] == 'probehead' && metadata['PROBHD'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['PROBHD']
           fi['device'] = metadata['PROBHD']
           fi['dkey'] = 'PROBHD'
-          new_prop['layers']['equipment']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['equipment'][Labimotion::Prop::FIELDS][idx] = fi
         end
       end
 
-      new_prop.dig('layers', 'sample_preparation', 'fields')&.each_with_index do |fi, idx|
+      new_prop.dig(Labimotion::Prop::LAYERS, 'sample_preparation', Labimotion::Prop::FIELDS)&.each_with_index do |fi, idx|
         if fi['field'] == 'solvent' && metadata['SOLVENT'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['SOLVENT']
           fi['device'] = metadata['SOLVENT']
           fi['dkey'] = 'SOLVENT'
           fi['value'] = 'chloroform-D1 (CDCl3)' if metadata['SOLVENT'] == 'CDCl3'
-          new_prop['layers']['sample_preparation']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['sample_preparation'][Labimotion::Prop::FIELDS][idx] = fi
         end
       end
 
-      new_prop.dig('layers', 'set', 'fields')&.each_with_index do |fi, idx|
+      new_prop.dig(Labimotion::Prop::LAYERS, 'set', Labimotion::Prop::FIELDS)&.each_with_index do |fi, idx|
         if fi['field'] == 'temperature' && metadata['TE'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['TE'].split(/\s+/).first
           fi['device'] = metadata['TE']
           fi['dkey'] = 'TE'
           fi['value_system'] = metadata['TE'].split(/\s+/).last
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'ns' && metadata['NS'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['NS']
           fi['device'] = metadata['NS']
           fi['dkey'] = 'NS'
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'PULPROG' && metadata['PULPROG'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['PULPROG']
           fi['device'] = metadata['PULPROG']
           fi['dkey'] = 'PULPROG'
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'td' && metadata['TD'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['TD']
           fi['device'] = metadata['TD']
           fi['dkey'] = 'TD'
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'done' && metadata['D1'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['D1']
           fi['device'] = metadata['D1']
           fi['dkey'] = 'D1'
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'sf' && metadata['SF'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['SF']
           fi['device'] = metadata['SF']
           fi['dkey'] = 'SF'
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'sfoone' && metadata['SFO1'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['SFO1']
           fi['device'] = metadata['SFO1']
           fi['dkey'] = 'SFO1'
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'sfotwo' && metadata['SFO2'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['SFO2']
           fi['device'] = metadata['SFO2']
           fi['dkey'] = 'SFO2'
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'nucone' && metadata['NUC1'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['NUC1']
           fi['device'] = metadata['NUC1']
           fi['dkey'] = 'NUC1'
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
         if fi['field'] == 'nuctwo' && metadata['NUC2'].present?
           ## fi['label'] = fi['label']
           fi['value'] = metadata['NUC2']
           fi['device'] = metadata['NUC2']
           fi['dkey'] = 'NUC2'
-          new_prop['layers']['set']['fields'][idx] = fi
+          new_prop[Labimotion::Prop::LAYERS]['set'][Labimotion::Prop::FIELDS][idx] = fi
         end
       end
       dataset.properties = new_prop