motor-admin 0.1.14 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 690872e084d43d0b2759f48a2d33b7399470b6dec88678248982daf0b0ca2e8a
-  data.tar.gz: 3949cd11e7773c19dd03c77dd1b52477ed282e3e40e9e688bf9018e7c93c2b13
+  metadata.gz: d952208606d9f6e899a942bf6521fa2e4280b699ebe5b33d0e8639f22d6b4cbc
+  data.tar.gz: ad3699eca7039750c3a3c9563ecc7795893aa32e8673c0060a2ecf2fe9f56b88
 SHA512:
-  metadata.gz: 244c24b44ab251e6a71fe9e4200062b8d6c3679effb03c902759f3ef389d87cf87f8cf7fcf5c48c15a0c4358fc0ee750964b03c17eccd2f3af7cba19a0282ba8
-  data.tar.gz: 9225e1067d918fccd2dbef1c661e5128299579bd05fe4b52738bcb1ca2cc90c7495cbd07a556661000654ff0e4f6fd3e76d8049d44e3748f759e39566f89ffeb
+  metadata.gz: 2c3a8d7d355771f8c83edd3048f7417c9bf8459f0ef5900e7a09532b0c9e214bc2f94dbebd58930b939e5d1e28259b8e2e853d369bd24a3727a27d0f30038166
+  data.tar.gz: a14340525096bbe45e9ac32e8f5deafe8ae5b0ed9541b7eb837930853fe2bacdfd1307e63ca9fa811dce3fa67136ddcc55a2191f46d6f2742cb219e004f6944b

data/lib/motor/api_query/build_json.rb

@@ -49,27 +49,27 @@ module Motor
 
         params[:fields].each do |key, fields|
           fields = fields.split(',') if fields.is_a?(String)
-          reflection_class = model.reflections[key]&.klass
-          fields_hash = build_fields_hash(reflection_class || model, fields)
 
           if key == model_name || model_name.split('/').last == key
-            json_params.merge!(fields_hash)
+            json_params.merge!(build_fields_hash(model, fields))
           else
             hash = find_key_in_params(json_params, key)
 
+            fields_hash = build_fields_hash(model.reflections[key]&.klass, fields)
+
             hash.merge!(fields_hash)
           end
         end
       end
 
       def build_fields_hash(model, fields)
-        columns = model.columns.map(&:name)
+        columns = model ? model.columns.map(&:name) : []
         fields_hash = { 'only' => [], 'methods' => [] }
 
         fields.each_with_object(fields_hash) do |field, acc|
           if field.in?(columns)
             acc['only'] << field
-          elsif model.instance_methods.include?(field.to_sym)
+          elsif model.nil? || model.instance_methods.include?(field.to_sym)
             acc['methods'] << field
           end
         end

data/lib/motor/build_schema/load_from_rails.rb

@@ -97,19 +97,6 @@ module Motor
         reference_columns + table_columns
       end
 
-      def build_column(model, column)
-        {
-          name: column.name,
-          display_name: column.name.humanize,
-          column_type: ActiveRecordUtils::Types::UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
-          access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
-          default_value: default_attrs[column.name],
-          validators: fetch_validators(model, column.name),
-          reference: fetch_reference(model, column.name),
-          virtual: false
-        }
-      end
-
       def fetch_reference_columns(model)
         default_attrs = model.new.attributes
 
@@ -122,7 +109,7 @@ module Motor
             next
           end
 
-          column_name = ref.belongs_to? ? ref.foreign_key : name
+          column_name = ref.belongs_to? ? ref.foreign_key.to_s : name
 
           next if ref.klass.name == 'ActiveStorage::Blob'
 

data/lib/motor/build_schema/reorder_schema.rb

@@ -51,7 +51,7 @@ module Motor
         if order.present?
           order.index(item[:name]) || Float::MAX
         else
-          item[:display_name]
+          item[:display_name].to_s
         end
       end
     end

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -5,9 +5,9 @@
   "fonts/ionicons.ttf?v=3.0.0-alpha.3": "fonts/ionicons.ttf",
   "fonts/ionicons.woff2?v=3.0.0-alpha.3": "fonts/ionicons.woff2",
   "fonts/ionicons.woff?v=3.0.0-alpha.3": "fonts/ionicons.woff",
-  "main-f7c7f445c53544d2d7b8.css.gz": "main-f7c7f445c53544d2d7b8.css.gz",
-  "main-f7c7f445c53544d2d7b8.js.LICENSE.txt": "main-f7c7f445c53544d2d7b8.js.LICENSE.txt",
-  "main-f7c7f445c53544d2d7b8.js.gz": "main-f7c7f445c53544d2d7b8.js.gz",
-  "main.css": "main-f7c7f445c53544d2d7b8.css",
-  "main.js": "main-f7c7f445c53544d2d7b8.js"
+  "main-6c3f6ebef4c238d9efa7.css.gz": "main-6c3f6ebef4c238d9efa7.css.gz",
+  "main-6c3f6ebef4c238d9efa7.js.LICENSE.txt": "main-6c3f6ebef4c238d9efa7.js.LICENSE.txt",
+  "main-6c3f6ebef4c238d9efa7.js.gz": "main-6c3f6ebef4c238d9efa7.js.gz",
+  "main.css": "main-6c3f6ebef4c238d9efa7.css",
+  "main.js": "main-6c3f6ebef4c238d9efa7.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.20
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-30 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -213,8 +213,8 @@ files:
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-f7c7f445c53544d2d7b8.css.gz
-- ui/dist/main-f7c7f445c53544d2d7b8.js.gz
+- ui/dist/main-6c3f6ebef4c238d9efa7.css.gz
+- ui/dist/main-6c3f6ebef4c238d9efa7.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: