motor-admin 0.2.17 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b28780732981472580aa188997c0dadbe63723c896370c75517e43cc8af86d
-  data.tar.gz: 4be16dd686ef091f7413255df883a740155daa7885c37d600ac23546b839d7fa
+  metadata.gz: a6fc72d7b1968213aa4845a2df527a839baeff558af4676719eaf8ea3f8ddc93
+  data.tar.gz: fdc2e35bbdead105ff8e92f90f7b172320941f7ca92af085918517ea27c6eb52
 SHA512:
-  metadata.gz: 046de91e00db2c5db533ce5eae691719ae50fb049bd9221a56681e3692fc4b42b8b4a090243b9b7b407c24e3cfb21bb208f2ce24a61e8967c0839dc9181a0a7d
-  data.tar.gz: a3dbda01e0d6f121ba9b2a90f5cca87bdb67772964627e134e735b4cace582a5a9869087c777069b5c5d5e2a3cc77e49ab843fb25decde19754b5afe64061eee
+  metadata.gz: fe3ff74c52022c83a4e51c1bdb67b0fe7239f644c1b2d70ad689bb70850a9d1955f5abfe2e92e237b936d01177847e7ac2197e492b024cfc52fbc5b15a07e793
+  data.tar.gz: 00c722957541fcb93b3f22d3c3ed59da71b39517cb9f0f0631990c80f5ae50963a57a26b656d95460175936a6f1214e9bf5185c0f5dfc44aab6252731eccda9d

data/config/locales/en.yml

@@ -276,3 +276,5 @@ en:
     user_dropdown: User dropdown
     upload: Upload
     there_is_nothing_here_yet: There is nothing here yet 🤷‍♂️
+    is_null: Is null
+    is_not_null: Is not null

data/config/locales/es.yml

@@ -276,6 +276,8 @@ es:
     user_dropdown: Despliegue del usuario
     upload: Subir a
     there_is_nothing_here_yet: Todavía no hay nada aquí 🤷‍♂️
+    is_null: Es nulo
+    is_not_null: No es nulo
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -272,6 +272,8 @@ pt:
     user_dropdown: Desistência do utilizador
     upload: Carregar
     there_is_nothing_here_yet: Ainda não há nada aqui 🤷‍♂️
+    is_null: É nulo
+    is_not_null: Não é nulo
     i:
       locale: pt
       select:

data/lib/motor/active_record_utils/types.rb

@@ -16,6 +16,7 @@ module Motor
         'numeric' => 'float',
         'decimal' => 'float',
         'float4' => 'float',
+        'bpchar' => 'string',
         'float8' => 'float',
         'float16' => 'float',
         'text' => 'string',
@@ -43,11 +44,13 @@ module Motor
 
         return UNIFIED_TYPES.fetch(name, name) if name
 
-        DEFAULT_TYPE
+        nil
       end
 
       def build_types_hash
-        type_map = ActiveRecord::Base.connection.send(:type_map)
+        connection_class = defined?(::ResourceRecord) ? ::ResourceRecord : ActiveRecord::Base
+
+        type_map = connection_class.connection.send(:type_map)
 
         type_map.instance_variable_get('@mapping').map do |name, type|
           next unless name.is_a?(String)

data/lib/motor/active_record_utils.rb

@@ -16,7 +16,7 @@ module Motor
     def generate_csv_for_relation(relation, reset_limit: false)
       relation = relation.limit(nil).offset(nil) if reset_limit
 
-      result = relation.klass.connection.exec_query(relation.to_sql)
+      result = load_query_for_csv(relation)
 
       CSV.generate do |csv|
         csv << result.columns
@@ -24,6 +24,14 @@ module Motor
         result.rows.each { |row| csv << row }
       end
     end
+
+    def load_query_for_csv(relation)
+      model_name = relation.klass.model_name.human(count: :many, default: relation.klass.name.titleize.pluralize)
+
+      query = Motor::Query.find_by(name: "Export #{model_name}")
+
+      relation.klass.connection.exec_query(query&.sql_body || relation.to_sql)
+    end
   end
 end
 

data/lib/motor/api_query/filter.rb

@@ -67,6 +67,10 @@ module Motor
           ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '\1%')]
         when 'ends_with'
           ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1')]
+        when 'eqnull'
+          ['eq', nil]
+        when 'neqnull'
+          ['neq', nil]
         else
           [action, value]
         end

data/lib/motor/build_schema/load_from_rails.rb

@@ -142,6 +142,8 @@ module Motor
 
         return { select_options: enum.keys } if enum
 
+        return { number_format: true } if !column.name.ends_with?('_id') && %i[integer float].include?(column.type)
+
         {}
       end
 

data/lib/motor/queries/run_query.rb

@@ -86,10 +86,10 @@ module Motor
         result.columns.map.with_index do |column_name, index|
           column_type_class = result.column_types[column_name]
 
-          column_type =
-            if column_type_class
-              ActiveRecordUtils::Types.find_name_for_type(column_type_class)
-            else
+          column_type = ActiveRecordUtils::Types.find_name_for_type(column_type_class) if column_type_class
+
+          column_type ||=
+            begin
               not_nil_value = result.rows.reduce(nil) do |acc, row|
                 column = row[index]
 

data/lib/motor/resources/fetch_configured_model.rb

@@ -10,26 +10,19 @@ module Motor
       def call(model, cache_key:)
         configs = Motor::Configs::LoadFromCache.load_resources(cache_key: cache_key)
 
-        return model if configs.blank?
+        return model if configs.blank? || sti_model?(model)
 
         maybe_fetch_from_cache(
           model,
           cache_key.to_s + model.object_id.to_s,
-          lambda {
-            resource_config = configs.find { |r| r.name == model.name.underscore }
-
-            if resource_config
-              build_configured_model(model, resource_config.preferences)
-            else
-              define_class_name_method(Class.new(model), model)
-            end
-          },
+          -> { build_configured_model_from_configs(model, configs) },
           ->(klass) { configure_reflection_classes(klass, cache_key) }
         )
       end
 
       def build_configured_model(model, config)
         klass = Class.new(model)
+        klass.inheritance_column = nil if model.superclass.abstract_class
 
         define_class_name_method(klass, model)
 
@@ -199,6 +192,20 @@ module Motor
           postprocess_block.call(result)
         end
       end
+
+      def build_configured_model_from_configs(model, configs)
+        resource_config = configs.find { |r| r.name == model.name.underscore }
+
+        if resource_config
+          build_configured_model(model, resource_config.preferences)
+        else
+          define_class_name_method(Class.new(model), model)
+        end
+      end
+
+      def sti_model?(model)
+        !model.superclass.abstract_class && model.columns_hash[model.inheritance_column.to_s]
+      end
     end
   end
 end

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.17'
+  VERSION = '0.2.21'
 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-25e14f5ae8855e7368e7.css.gz": "main-25e14f5ae8855e7368e7.css.gz",
-  "main-25e14f5ae8855e7368e7.js.LICENSE.txt": "main-25e14f5ae8855e7368e7.js.LICENSE.txt",
-  "main-25e14f5ae8855e7368e7.js.gz": "main-25e14f5ae8855e7368e7.js.gz",
-  "main.css": "main-25e14f5ae8855e7368e7.css",
-  "main.js": "main-25e14f5ae8855e7368e7.js"
+  "main-fa2bc70ab29bad641f1a.css.gz": "main-fa2bc70ab29bad641f1a.css.gz",
+  "main-fa2bc70ab29bad641f1a.js.LICENSE.txt": "main-fa2bc70ab29bad641f1a.js.LICENSE.txt",
+  "main-fa2bc70ab29bad641f1a.js.gz": "main-fa2bc70ab29bad641f1a.js.gz",
+  "main.css": "main-fa2bc70ab29bad641f1a.css",
+  "main.js": "main-fa2bc70ab29bad641f1a.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.21
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -1525,8 +1525,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-25e14f5ae8855e7368e7.css.gz
-- ui/dist/main-25e14f5ae8855e7368e7.js.gz
+- ui/dist/main-fa2bc70ab29bad641f1a.css.gz
+- ui/dist/main-fa2bc70ab29bad641f1a.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: