motor-admin 0.2.15 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0254bb1cf5ab3176c1c2e923ad755e1f6e445da757aa7981b93b127cb5757c57
-  data.tar.gz: b8c3a27811eb765056a67ffd9f1cb35fbc374b810be25cfa1de2f9791764f162
+  metadata.gz: e1189d1c955046a61940254f58bc78e3743e51e912a6c1e1443ffa9d4df8b22e
+  data.tar.gz: 69cbcc3fcc34ee51c03979896f6862ada18d9bd410c297141d14959009e5f38f
 SHA512:
-  metadata.gz: 07a1cfb97147d11a5f8abd505e7ab2f91a3568a817ced4043b0db394cf3c8d097ae1bbaca27a391af6b133aea89d9a9470afac9ed670b693098d854168c3656c
-  data.tar.gz: be58770afa9930c45e0e66e34d5762de7f3d44acf8775afc01cc945c7a13410a0c1b342f6be0e44f0f59047a5fc7a50d20fec1df5e7d1aaeb3a3c541c3743db3
+  metadata.gz: 57f991559988e88d2a8abc00bc302946dc986fa75b5e6bc6953a1d05552810339a95d5ef5aae8b0c3bc98c806d7ecfc1b2bacf051471fd2088e10594c8e6fed6
+  data.tar.gz: d72ff24ee69ea6db86585efb92dfab69582fb6c712d12c97b19bbd16f5a506b41e72f95d1fea05a153fa430e9a1c014542db8e684dc91dd948027ae9464a5b73

data/config/locales/en.yml

@@ -274,3 +274,5 @@ en:
     sign_out: Sign out
     header: Header
     user_dropdown: User dropdown
+    upload: Upload
+    there_is_nothing_here_yet: There is nothing here yet 🤷‍♂️

data/config/locales/es.yml

@@ -271,9 +271,11 @@ es:
     downloading: Descargando
     display_id: Visualizar ID
     display_settings: Configuración de la pantalla
-    sign_out: Sign out
-    header: Header
-    user_dropdown: User dropdown
+    sign_out: Firmar la salida
+    header: Cabecera
+    user_dropdown: Despliegue del usuario
+    upload: Subir a
+    there_is_nothing_here_yet: Todavía no hay nada aquí 🤷‍♂️
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -267,9 +267,11 @@ pt:
     downloading: Descarregamento
     display_id: Mostrar ID
     display_settings: Definições de visualização
-    sign_out: Sign out
-    header: Header
-    user_dropdown: User dropdown
+    sign_out: Sair
+    header: Cabeçalho
+    user_dropdown: Desistência do utilizador
+    upload: Carregar
+    there_is_nothing_here_yet: Ainda não há nada aqui 🤷‍♂️
     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/build_schema/active_storage_attachment_schema.rb

@@ -12,7 +12,7 @@ module Motor
         {
           name: model.name.underscore,
           slug: Utils.slugify(model),
-          class_name: model.class.name,
+          class_name: model.name,
           table_name: model.table_name,
           primary_key: model.primary_key,
           display_name: model.model_name.human(count: 2, default: 'Attachments'),

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.15'
+  VERSION = '0.2.19'
 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-e5afce0ea81ef4505dc5.css.gz": "main-e5afce0ea81ef4505dc5.css.gz",
-  "main-e5afce0ea81ef4505dc5.js.LICENSE.txt": "main-e5afce0ea81ef4505dc5.js.LICENSE.txt",
-  "main-e5afce0ea81ef4505dc5.js.gz": "main-e5afce0ea81ef4505dc5.js.gz",
-  "main.css": "main-e5afce0ea81ef4505dc5.css",
-  "main.js": "main-e5afce0ea81ef4505dc5.js"
+  "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"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.19
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-11-03 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-e5afce0ea81ef4505dc5.css.gz
-- ui/dist/main-e5afce0ea81ef4505dc5.js.gz
+- ui/dist/main-25e14f5ae8855e7368e7.css.gz
+- ui/dist/main-25e14f5ae8855e7368e7.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: