motor-admin 0.2.33 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b496961d80291a72ecf0017c07d68dee193fff1f89238bd510ad1ca85afe37b
-  data.tar.gz: 18222f2abe4752e73fddf640631b3dc179368d5dc55c0ee6e41a7a9111ad6391
+  metadata.gz: a09f4465600321287f475933421d4c934b71d6a89b80b7f55ecccf4c870b0e99
+  data.tar.gz: cae776e357211ff536cf8f23e2bae358ba331d47aa72d5c9293e43007af1daf1
 SHA512:
-  metadata.gz: 33de92dd60c1f53d6f833646ac388f86434a65be73c1bfde0ab5b037f8cca0f3cec8b51c8cd3fdaba788e4a2ef83c33369a79dba5f543726dfae8ce9e1aa6554
-  data.tar.gz: 1eb89d9c5cc284aba7a1b343c6ebb566075c2c4b7a262c214243f4b141ace04a8eaaa6e7f48cf6cadb17b40f904467b1cfd19694377d538d6a59a8bb7649f763
+  metadata.gz: a7428045f23207b96d6bdce0bac377dbcd732e7e2fbe312f9428676d7242aa1553e602f20df19edbca050d0c7d25c04850d5ba8285ca0f98dd34da99739bc4ce
+  data.tar.gz: 9b2f0168ff6d400ef8d227d77251d45eff0d73e11c19864beb141cfc40ff03fa760014fa142ae4062b5e63466c021d8a06c85b4d589022e4d35a0853d9f34eaa

data/config/locales/en.yml

@@ -286,3 +286,4 @@ en:
     slash: Slash
     sql: SQL
     api: API
+    searchable_columns: Searchable columns

data/config/locales/es.yml

@@ -286,6 +286,7 @@ es:
     slash: Slash
     sql: SQL
     api: API
+    searchable_columns: Columnas de búsqueda
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -282,6 +282,7 @@ pt:
     slash: Slash
     sql: SQL
     api: API
+    searchable_columns: Colunas pesquisáveis
     i:
       locale: pt
       select:

data/lib/motor/admin.rb

@@ -39,7 +39,7 @@ module Motor
     end
 
     initializer 'motor.filter_params' do
-      Rails.application.config.filter_parameters += %i[io]
+      Rails.application.config.filter_parameters += [/\Aio\z/]
     end
 
     initializer 'motor.alerts.scheduler' do

data/lib/motor/api_query/search.rb

@@ -3,9 +3,8 @@
 module Motor
   module ApiQuery
     module Search
-      SELECT_COLUMNS_AMOUNT = 2
-      COLUMN_TYPES = BuildSchema::SEARCHABLE_COLUMN_TYPES
-      ID_REGEXP = /\A\d+\z/.freeze
+      STRING_COLUMN_TYPES = %i[text string].freeze
+      NUMBER_COLUMN_TYPES = %i[integer float].freeze
 
       module_function
 
@@ -20,19 +19,27 @@ module Motor
       end
 
       def fetch_filters(rel, keyword)
-        arel_filters = []
-
         klass = rel.klass
-        arel_table = klass.arel_table
 
-        arel_filters << arel_table[klass.primary_key].eq(keyword) if keyword.match?(ID_REGEXP)
+        selected_columns = find_searchable_columns(klass)
+
+        build_arel_filters(klass, selected_columns, keyword)
+      end
 
-        string_column_names = find_searchable_columns(klass)
-        selected_columns = select_columns(string_column_names)
+      def build_arel_filters(model, column_names, keyword)
+        arel_table = model.arel_table
 
-        selected_columns.each { |name| arel_filters << arel_table[name].matches("%#{keyword}%") }
+        column_names.map do |name|
+          column_type = model.columns_hash[name].type
 
-        arel_filters
+          if STRING_COLUMN_TYPES.include?(column_type)
+            arel_table[name].matches("%#{keyword}%")
+          elsif NUMBER_COLUMN_TYPES.include?(column_type)
+            arel_table[name].eq(keyword.to_f)
+          else
+            arel_table[name].eq(keyword)
+          end
+        end
       end
 
       def build_arel_or_query(filter_array)
@@ -43,23 +50,8 @@ module Motor
         end
       end
 
-      def select_columns(columns)
-        selected_columns =
-          columns.grep(BuildSchema::FindDisplayColumn::DISPLAY_NAME_REGEXP).presence
-
-        selected_columns ||= columns.first(SELECT_COLUMNS_AMOUNT)
-
-        selected_columns
-      end
-
       def find_searchable_columns(model)
-        model.columns.map do |column|
-          next unless column.type.in?(COLUMN_TYPES)
-          next if column.respond_to?(:array?) && column.array?
-          next if model.validators_on(column.name).any?(ActiveModel::Validations::InclusionValidator)
-
-          column.name
-        end.compact
+        model.try(:motor_searchable_columns) || Motor::BuildSchema::FindSearchableColumns.call(model)
       end
     end
   end

data/lib/motor/build_schema/find_searchable_columns.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Motor
+  module BuildSchema
+    module FindSearchableColumns
+      SELECT_COLUMNS_AMOUNT = 2
+      COLUMN_TYPES = BuildSchema::SEARCHABLE_COLUMN_TYPES
+
+      module_function
+
+      def call(model)
+        columns = find_searchable_columns(model)
+
+        selected_columns =
+          columns.grep(BuildSchema::FindDisplayColumn::DISPLAY_NAME_REGEXP).presence
+
+        selected_columns ||= columns.first(SELECT_COLUMNS_AMOUNT)
+
+        ([model.primary_key] + selected_columns).sort
+      end
+
+      def find_searchable_columns(model)
+        model.columns.map do |column|
+          next unless column.type.in?(COLUMN_TYPES)
+          next if column.respond_to?(:array?) && column.array?
+          next if model.validators_on(column.name).any?(ActiveModel::Validations::InclusionValidator)
+
+          column.name
+        end.compact
+      end
+    end
+  end
+end

data/lib/motor/build_schema/load_from_rails.rb

@@ -56,6 +56,7 @@ module Motor
         models
       end
 
+      # rubocop:disable Metrics/MethodLength
       def build_model_schema(model)
         model_name = model.name
 
@@ -65,7 +66,7 @@ module Motor
           name: model_name.underscore,
           slug: Utils.slugify(model),
           table_name: model.table_name,
-          class_name: model.name,
+          class_name: model_name,
           primary_key: model.primary_key,
           display_name: model.model_name.human(count: :many, default: model_name.titleize.pluralize),
           display_column: FindDisplayColumn.call(model),
@@ -75,11 +76,13 @@ module Motor
           scopes: fetch_scopes(model),
           actions: BuildSchema::Defaults.actions,
           tabs: BuildSchema::Defaults.tabs,
+          searchable_columns: FindSearchableColumns.call(model),
           custom_sql: nil,
           visible: true,
           display_primary_key: true
         }.with_indifferent_access
       end
+      # rubocop:enable Metrics/MethodLength
 
       def fetch_scopes(model)
         model.defined_scopes.map do |scope_name|

data/lib/motor/build_schema.rb

@@ -113,3 +113,4 @@ require_relative './build_schema/merge_schema_configs'
 require_relative './build_schema/apply_permissions'
 require_relative './build_schema/utils'
 require_relative './build_schema/defaults'
+require_relative './build_schema/find_searchable_columns'

data/lib/motor/resources/fetch_configured_model.rb

@@ -33,6 +33,7 @@ module Motor
         define_default_scope(klass, config)
         define_column_reflections(klass, config)
         define_associations(klass, config)
+        define_searchable_columns_method(klass, config)
 
         klass
       end
@@ -75,6 +76,18 @@ module Motor
         klass
       end
 
+      def define_searchable_columns_method(klass, config)
+        return if config[:searchable_columns].blank?
+
+        klass.instance_variable_set(:@__motor_searchable_columns, config[:searchable_columns])
+
+        klass.instance_eval do
+          def motor_searchable_columns
+            @__motor_searchable_columns
+          end
+        end
+      end
+
       def define_columns_hash(klass, config)
         return klass if config[:custom_sql].blank?
 
@@ -82,7 +95,13 @@ module Motor
 
         columns_hash =
           columns.each_with_object({}) do |column, acc|
-            acc[column[:name]] = ActiveRecord::ConnectionAdapters::Column.new(column[:name], nil)
+            acc[column[:name]] =
+              ActiveRecord::ConnectionAdapters::Column.new(
+                column[:name],
+                nil,
+                ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: column[:column_type],
+                                                                      type: column[:column_type].to_sym)
+              )
           end
 
         klass.instance_variable_set(:@__motor_custom_sql_columns_hash, columns_hash)

data/lib/motor/resources.rb

@@ -2,7 +2,8 @@
 
 module Motor
   module Resources
-    RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible display_primary_key].freeze
+    RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible display_primary_key
+                        searchable_columns].freeze
     COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format].freeze
     ASSOCIATION_ATTRS = %w[name display_name model_name icon visible foreign_key primary_key options virtual
                            polymorphic slug].freeze

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.33'
+  VERSION = '0.2.34'
 end

data/ui/dist/manifest.json

@@ -2601,9 +2601,9 @@
   "icons/zoom-out.svg.gz": "icons/zoom-out.svg.gz",
   "icons/zoom-question.svg": "icons/zoom-question.svg",
   "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
-  "main-1d882f91707272b39943.css.gz": "main-1d882f91707272b39943.css.gz",
-  "main-1d882f91707272b39943.js.LICENSE.txt": "main-1d882f91707272b39943.js.LICENSE.txt",
-  "main-1d882f91707272b39943.js.gz": "main-1d882f91707272b39943.js.gz",
-  "main.css": "main-1d882f91707272b39943.css",
-  "main.js": "main-1d882f91707272b39943.js"
+  "main-20a597f4a4ce450fb62c.css.gz": "main-20a597f4a4ce450fb62c.css.gz",
+  "main-20a597f4a4ce450fb62c.js.LICENSE.txt": "main-20a597f4a4ce450fb62c.js.LICENSE.txt",
+  "main-20a597f4a4ce450fb62c.js.gz": "main-20a597f4a4ce450fb62c.js.gz",
+  "main.css": "main-20a597f4a4ce450fb62c.css",
+  "main.js": "main-20a597f4a4ce450fb62c.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.34
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -191,6 +191,7 @@ files:
 - lib/motor/build_schema/defaults.rb
 - lib/motor/build_schema/find_display_column.rb
 - lib/motor/build_schema/find_icon.rb
+- lib/motor/build_schema/find_searchable_columns.rb
 - lib/motor/build_schema/load_from_rails.rb
 - lib/motor/build_schema/merge_schema_configs.rb
 - lib/motor/build_schema/reorder_schema.rb
@@ -1525,8 +1526,8 @@ files:
 - ui/dist/icons/zoom-money.svg.gz
 - ui/dist/icons/zoom-out.svg.gz
 - ui/dist/icons/zoom-question.svg.gz
-- ui/dist/main-1d882f91707272b39943.css.gz
-- ui/dist/main-1d882f91707272b39943.js.gz
+- ui/dist/main-20a597f4a4ce450fb62c.css.gz
+- ui/dist/main-20a597f4a4ce450fb62c.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: