motor-admin 0.2.16 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61f88afa9ad5347e0bb47c719212c895b42d687b78e128d2812d15b8099415e9
-  data.tar.gz: f7cdd045280ea0105d6d8022414e627d6cc8bff8519e554349735f55d2d58bf9
+  metadata.gz: 35d64da7a1fa64e919972e887faa99359d26015badb611b4c98cc55cd7f4d683
+  data.tar.gz: 9eb96163006387d2edd1edd76a406fd7ff4b9aa42bdeabc0de093555935e10e2
 SHA512:
-  metadata.gz: 4ae3737a3554d2ba6c5881a18dd3afc3b62bc3f728f73ed2b04ed10ec0ac8abc1790d08dca8c3e8752512a08dea606123c810b0d0f06e3c4d08d486fa16f565f
-  data.tar.gz: 409ec127ab1510c9e6c652e89ccfcff859050f62960fa738f4b803981f506956eac55960a1bc18a4e652e4019aaa343db5ce5cb89d9cacbe62b657cf908541d0
+  metadata.gz: af7ab14732dbbc23938303030fc42b8c2446c3ee9c5ad782967e37a5acd2b12b45799617e31dd128ece07e654df024a1e8eedd43969f515a42187430ad3b757d
+  data.tar.gz: 48276612be7ad9ac6bcae839a2459d2645d69fccb921f8505bf33009d963f6f1cfb8336d214d831ccb9017fb805debb448e37aefebace7fe02eded32fb033afb

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/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.16'
+  VERSION = '0.2.20'
 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-01a0523dc0c6602d6c7a.css.gz": "main-01a0523dc0c6602d6c7a.css.gz",
-  "main-01a0523dc0c6602d6c7a.js.LICENSE.txt": "main-01a0523dc0c6602d6c7a.js.LICENSE.txt",
-  "main-01a0523dc0c6602d6c7a.js.gz": "main-01a0523dc0c6602d6c7a.js.gz",
-  "main.css": "main-01a0523dc0c6602d6c7a.css",
-  "main.js": "main-01a0523dc0c6602d6c7a.js"
+  "main-3053b6cb9c0fbea51e36.css.gz": "main-3053b6cb9c0fbea51e36.css.gz",
+  "main-3053b6cb9c0fbea51e36.js.LICENSE.txt": "main-3053b6cb9c0fbea51e36.js.LICENSE.txt",
+  "main-3053b6cb9c0fbea51e36.js.gz": "main-3053b6cb9c0fbea51e36.js.gz",
+  "main.css": "main-3053b6cb9c0fbea51e36.css",
+  "main.js": "main-3053b6cb9c0fbea51e36.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.20
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-28 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-01a0523dc0c6602d6c7a.css.gz
-- ui/dist/main-01a0523dc0c6602d6c7a.js.gz
+- ui/dist/main-3053b6cb9c0fbea51e36.css.gz
+- ui/dist/main-3053b6cb9c0fbea51e36.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: