labimotion 2.1.0.rc4 → 2.1.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0c3346ede1f92148d84551b0c4052848803e1b6969d14263a771b0fdfe8f2f1
-  data.tar.gz: df2597e134e8adf3e4ff48775578ae507d6c4b022c4abfd368cf01bd53ff1569
+  metadata.gz: e23b274f29ceb300bbb97f91830dbe2fdc454966d229e88608cd434b6586a3b3
+  data.tar.gz: da620e95cb04ce10a69cba25d8cb63f22cb1e21142a1a6a3c93d9fecc33840aa
 SHA512:
-  metadata.gz: 80d8a6c8d32136057e1cbf43a8bfe0526665cc303bb976492f886454561f39ee9bf7d2bc9be6502a3648ab52420e1b37c171a463776ee97d72470e7a6c192555
-  data.tar.gz: 3e4bc196612beac1ad2f8c62bbb608fd1b646385135c0ba3612cd7dc762467a3e0bd73d242b53046cb9a781f8b6214424d5a0a2dee357929fb0eb92712778174
+  metadata.gz: db1827e8ad8c56f05c55215f3cd5e3830174f937875c2af49e7899dc4875180364111b1788eecc430b6f3ca8b39e3e0234eb21a3c1036c3b7ab064676f8bb4d1
+  data.tar.gz: 3f1667aa18030745ab178330cac70f234d4aa3eab46e3622546aeb4268aaf379e9d8dd0369060324327dd3db67efa2da6e94b6568feb33a88e987bec8030a737

data/lib/labimotion/apis/generic_element_api.rb

@@ -87,6 +87,37 @@ module Labimotion
         end
       end
 
+      namespace :search_basic_by_like do
+        desc 'Search basic elements by name and short label (case-insensitive like search)'
+        params do
+          requires :klass_name, type: String, desc: 'Class name (device_description or wellplate or ...etc.)', default: 'device_description'
+          requires :name, type: String, desc: 'Search query for basic element name'
+          requires :short_label, type: String, desc: 'Search query for basic element short label'
+          optional :limit, type: Integer, desc: 'Maximum number of results', default: 20
+        end
+        get do
+          # Convert snake_case to PascalCase (e.g. device_description -> DeviceDescription)
+          klass_name = params[:klass_name].camelize
+          klass = "Labimotion::#{klass_name}".constantize
+
+          scope = klass.fetch_for_user(
+            current_user.id,
+            name: params[:name],
+            short_label: params[:short_label],
+            limit: params[:limit]
+          )
+
+          results = scope.map do |record|
+            Labimotion::ElementLookupEntity.represent(record)
+          end
+
+          { elements: results, total_count: results.count }
+        rescue StandardError => e
+          Labimotion.log_exception(e, current_user)
+          { elements: [], total_count: 0, error: e.message }
+        end
+      end
+
       namespace :export do
         desc 'export element'
         params do
@@ -253,12 +284,13 @@ module Labimotion
         desc 'list Generic Element Klass'
         params do
           optional :is_generic, type: Boolean, desc: 'Is Generic or Non-Generic Element'
-          optional :is_active, type: Boolean, desc: 'Active or Inactive Dataset'
+          optional :is_active, type: Boolean, desc: 'Active or Inactive'
           optional :displayed_in_list, type: Boolean, desc: 'Display in list format', default: true
         end
         get do
           scope = params[:displayed_in_list] ? Labimotion::ElementKlass.for_list_display : Labimotion::ElementKlass.all
           scope = scope.where(is_generic: params[:is_generic]) if params.key?(:is_generic)
+          scope = scope.where(is_active: params[:is_active]) if params.key?(:is_active)
 
           list = scope.sort_by(&:place)
           present list, with: Labimotion::ElementKlassEntity, root: 'klass', displayed_in_list: params[:displayed_in_list]
@@ -498,8 +530,12 @@ module Labimotion
   class ElementLookupEntity < Grape::Entity
     expose :id
     expose :name
-    expose :short_label
-    expose :element_klass_id
+    expose :short_label do |element|
+      element.respond_to?(:short_label) ? element.short_label : nil
+    end
+    expose :element_klass_id, as: :element_klass_id do |element|
+      element.element_klass&.id
+    end
     expose :klass_label, as: :klass_label do |element|
       element.element_klass&.label
     end

data/lib/labimotion/libs/sample_association.rb

@@ -113,11 +113,12 @@ module Labimotion
           Labimotion::ElementsElement.find_or_create_by(parent_id: element.id, element_id: el.id)
           els << el.id
         end
-
       end
       if element.present?
-        es_list = Labimotion::ElementsSample.where(element_id: element.id).where.not(sample_id: sds)
-        ee_list = Labimotion::ElementsElement.where(parent_id: element.id).where.not(element_id: els&.flatten)
+        sds = sds.flatten.uniq
+        els = els.flatten.uniq
+        es_list = sds.present? ? Labimotion::ElementsSample.where(element_id: element.id).where.not(sample_id: sds) : Labimotion::ElementsSample.where(element_id: element.id)
+        ee_list = els.present? ? Labimotion::ElementsElement.where(parent_id: element.id).where.not(element_id: els) : Labimotion::ElementsElement.where(parent_id: element.id)
         es_list.destroy_all if es_list.present?
         ee_list.destroy_all if ee_list.present?
       end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Labimotion
+  module ElementFetchable
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def element_klass
+        Labimotion::ElementKlass.find_by(name: element_klass_name)
+      end
+
+      def fetch_for_user(user_id, name: nil, short_label: nil, limit: 20)
+        # Prevent abuse by capping and validating limit
+        limit = [limit.to_i, 100].min
+        limit = 20 if limit <= 0
+
+        # Build base scope with common filters
+        apply_filters = lambda do |scope|
+          scope = scope.where("#{table_name}.name ILIKE ?", "%#{sanitize_sql_like(name)}%") if name.present?
+          scope = scope.where("#{table_name}.short_label ILIKE ?", "%#{sanitize_sql_like(short_label)}%") if short_label.present? && column_names.include?('short_label')
+          scope
+        end
+
+        # Owned records
+        owned = apply_filters.call(
+          joins(collections: :user).where(collections: { user_id: user_id })
+        )
+
+        # Shared (synced) records
+        shared = apply_filters.call(
+          joins(collections: :sync_collections_users).where(sync_collections_users: { user_id: user_id })
+        )
+
+        # Combine (remove duplicates), order, and limit
+        order_column = column_names.include?('short_label') ? :short_label : :name
+        from("(#{owned.to_sql} UNION #{shared.to_sql}) AS #{table_name}")
+          .order(order_column => :desc)
+          .limit(limit)
+      end
+
+      private
+
+      def element_klass_name
+        raise NotImplementedError, "Subclass must define element_klass_name"
+      end
+    end
+
+    # Instance method to get element_klass for a record
+    def element_klass
+      self.class.element_klass
+    end
+  end
+end

data/lib/labimotion/models/device_description.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# This file extends the existing DeviceDescription model in the consuming app
+# and defines a Labimotion::DeviceDescription wrapper for convenient access.
+
+ActiveSupport.on_load(:active_record) do
+  if defined?(::DeviceDescription)
+    ::DeviceDescription.class_eval do
+      include Labimotion::ElementFetchable
+
+      def self.element_klass_name
+        'device_description'
+      end
+    end
+  else
+    warn "[Labimotion] DeviceDescription is not defined when Labimotion extension was loaded."
+  end
+end
+
+# Namespace wrapper to keep your preferred call style
+module Labimotion
+  module DeviceDescription
+    # Delegate class methods to ::DeviceDescription
+    def self.method_missing(method, *args, &block)
+      if ::DeviceDescription.respond_to?(method)
+        ::DeviceDescription.public_send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def self.respond_to_missing?(method, include_private = false)
+      ::DeviceDescription.respond_to?(method, include_private) || super
+    end
+  end
+end

data/lib/labimotion/models/reaction.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# This file extends the existing Reaction model in the consuming app
+# and defines a Labimotion::Reaction wrapper for convenient access.
+
+ActiveSupport.on_load(:active_record) do
+  if defined?(::Reaction)
+    ::Reaction.class_eval do
+      include Labimotion::ElementFetchable
+
+      def self.element_klass_name
+        'reaction'
+      end
+    end
+  else
+    warn "[Labimotion] Reaction is not defined when Labimotion extension was loaded."
+  end
+end
+
+# Namespace wrapper to keep your preferred call style
+module Labimotion
+  module Reaction
+    # Delegate class methods to ::Reaction
+    def self.method_missing(method, *args, &block)
+      if ::Reaction.respond_to?(method)
+        ::Reaction.public_send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def self.respond_to_missing?(method, include_private = false)
+      ::Reaction.respond_to?(method, include_private) || super
+    end
+  end
+end

data/lib/labimotion/models/research_plan.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# This file extends the existing ResearchPlan model in the consuming app
+# and defines a Labimotion::ResearchPlan wrapper for convenient access.
+
+# rubocop:disable Style/RedundantConstantBase
+
+ActiveSupport.on_load(:active_record) do
+  if defined?(::ResearchPlan)
+    ::ResearchPlan.class_eval do
+      include Labimotion::ElementFetchable
+
+      def self.element_klass_name
+        'research_plan'
+      end
+    end
+  else
+    warn '[Labimotion] ResearchPlan is not defined when Labimotion extension was loaded.'
+  end
+end
+
+# Namespace wrapper to keep your preferred call style
+module Labimotion
+  module ResearchPlan
+    # Delegate class methods to ::ResearchPlan
+    def self.method_missing(method, *args, &block)
+      if ::ResearchPlan.respond_to?(method)
+        ::ResearchPlan.public_send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def self.respond_to_missing?(method, include_private = false)
+      ::ResearchPlan.respond_to?(method, include_private) || super
+    end
+  end
+end
+
+# rubocop:enable Style/RedundantConstantBase

data/lib/labimotion/models/sample.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# This file extends the existing Sample model in the consuming app
+# and defines a Labimotion::Sample wrapper for convenient access.
+
+ActiveSupport.on_load(:active_record) do
+  if defined?(::Sample)
+    ::Sample.class_eval do
+      include Labimotion::ElementFetchable
+
+      def self.element_klass_name
+        'sample'
+      end
+    end
+  else
+    warn "[Labimotion] Sample is not defined when Labimotion extension was loaded."
+  end
+end
+
+# Namespace wrapper to keep your preferred call style
+module Labimotion
+  module Sample
+    # Delegate class methods to ::Sample
+    def self.method_missing(method, *args, &block)
+      if ::Sample.respond_to?(method)
+        ::Sample.public_send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def self.respond_to_missing?(method, include_private = false)
+      ::Sample.respond_to?(method, include_private) || super
+    end
+  end
+end

data/lib/labimotion/models/screen.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# This file extends the existing Screen model in the consuming app
+# and defines a Labimotion::Screen wrapper for convenient access.
+
+ActiveSupport.on_load(:active_record) do
+  if defined?(::Screen)
+    ::Screen.class_eval do
+      include Labimotion::ElementFetchable
+
+      def self.element_klass_name
+        'screen'
+      end
+    end
+  else
+    warn "[Labimotion] Screen is not defined when Labimotion extension was loaded."
+  end
+end
+
+# Namespace wrapper to keep your preferred call style
+module Labimotion
+  module Screen
+    # Delegate class methods to ::Screen
+    def self.method_missing(method, *args, &block)
+      if ::Screen.respond_to?(method)
+        ::Screen.public_send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def self.respond_to_missing?(method, include_private = false)
+      ::Screen.respond_to?(method, include_private) || super
+    end
+  end
+end

data/lib/labimotion/models/wellplate.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# This file extends the existing Wellplate model in the consuming app
+# and defines a Labimotion::Wellplate wrapper for convenient access.
+
+# rubocop:disable Style/RedundantConstantBase
+
+ActiveSupport.on_load(:active_record) do
+  if defined?(::Wellplate)
+    ::Wellplate.class_eval do
+      include Labimotion::ElementFetchable
+
+      def self.element_klass_name
+        'wellplate'
+      end
+    end
+  else
+    warn '[Labimotion] Wellplate is not defined when Labimotion extension was loaded.'
+  end
+end
+
+# Namespace wrapper to keep your preferred call style
+module Labimotion
+  module Wellplate
+    # Delegate class methods to ::Wellplate
+    def self.method_missing(method, *args, &block)
+      if ::Wellplate.respond_to?(method)
+        ::Wellplate.public_send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def self.respond_to_missing?(method, include_private = false)
+      ::Wellplate.respond_to?(method, include_private) || super
+    end
+  end
+end
+
+# rubocop:enable Style/RedundantConstantBase

data/lib/labimotion/version.rb

@@ -2,5 +2,5 @@
 
 ## Labimotion Version
 module Labimotion
-  VERSION = '2.1.0.rc4'
+  VERSION = '2.1.0.rc5'
 end

data/lib/labimotion.rb

@@ -113,9 +113,17 @@ module Labimotion
   autoload :StdLayer, 'labimotion/models/std_layer'
   autoload :StdLayersRevision, 'labimotion/models/std_layers_revision'
 
+  autoload :DeviceDescription, 'labimotion/models/device_description'
+  autoload :Reaction, 'labimotion/models/reaction'
+  autoload :ResearchPlan, 'labimotion/models/research_plan'
+  autoload :Sample, 'labimotion/models/sample'
+  autoload :Screen, 'labimotion/models/screen'
+  autoload :Wellplate, 'labimotion/models/wellplate'
+
   ######## Models/Concerns
   autoload :GenericKlassRevisions, 'labimotion/models/concerns/generic_klass_revisions'
   autoload :GenericRevisions, 'labimotion/models/concerns/generic_revisions'
+  autoload :ElementFetchable, 'labimotion/models/concerns/element_fetchable'
   autoload :Segmentable, 'labimotion/models/concerns/segmentable'
   autoload :Datasetable, 'labimotion/models/concerns/datasetable'
   autoload :AttachmentConverter, 'labimotion/models/concerns/attachment_converter.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: labimotion
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc4
+  version: 2.1.0.rc5
 platform: ruby
 authors:
 - Chia-Lin Lin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-10-20 00:00:00.000000000 Z
+date: 2025-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -116,6 +116,7 @@ files:
 - lib/labimotion/models/collections_element.rb
 - lib/labimotion/models/concerns/attachment_converter.rb
 - lib/labimotion/models/concerns/datasetable.rb
+- lib/labimotion/models/concerns/element_fetchable.rb
 - lib/labimotion/models/concerns/generic_klass.rb
 - lib/labimotion/models/concerns/generic_klass_revisions.rb
 - lib/labimotion/models/concerns/generic_revisions.rb
@@ -126,6 +127,7 @@ files:
 - lib/labimotion/models/dataset_klass.rb
 - lib/labimotion/models/dataset_klasses_revision.rb
 - lib/labimotion/models/datasets_revision.rb
+- lib/labimotion/models/device_description.rb
 - lib/labimotion/models/element.rb
 - lib/labimotion/models/element_klass.rb
 - lib/labimotion/models/element_klasses_revision.rb
@@ -133,6 +135,10 @@ files:
 - lib/labimotion/models/elements_revision.rb
 - lib/labimotion/models/elements_sample.rb
 - lib/labimotion/models/hub_log.rb
+- lib/labimotion/models/reaction.rb
+- lib/labimotion/models/research_plan.rb
+- lib/labimotion/models/sample.rb
+- lib/labimotion/models/screen.rb
 - lib/labimotion/models/segment.rb
 - lib/labimotion/models/segment_klass.rb
 - lib/labimotion/models/segment_klasses_revision.rb
@@ -140,6 +146,7 @@ files:
 - lib/labimotion/models/std_layer.rb
 - lib/labimotion/models/std_layers_revision.rb
 - lib/labimotion/models/vocabulary.rb
+- lib/labimotion/models/wellplate.rb
 - lib/labimotion/utils/con_state.rb
 - lib/labimotion/utils/export_utils.rb
 - lib/labimotion/utils/field_type.rb