motor-admin 0.2.18 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4b3959711130ff5e711c91a8a3ae30f996dcbbf83c98a6d2bb108ffed665e6
-  data.tar.gz: c5090823346eb41d62bb400cce5b7c4c4c17b9a9261017aa374a31fa33ca3630
+  metadata.gz: ed518fa82c6c64047a2cafd677f6e749314e3a38a055ec752cb71b082228e1c6
+  data.tar.gz: 87a804c67093186a0f72ff236b25016614f3e820326404337dd097f0d5672103
 SHA512:
-  metadata.gz: c46b67ac2fe96276806252c3c56e0472b32b6f91aa2351dd7d8ae76485de59260e2079dd42336c61beb1d28de9f6c0177e32e60d9a5e35c9b7dd8b9e770ff0bf
-  data.tar.gz: d49105316054eab5561cfbbad123cf4e106d7d837446cab63f91149f225022466c7ef3e10442e20789c4c920e9a222dbf27ad552a253cd23267e71356d34fa68
+  metadata.gz: 16aff2d26bf9c99340e1af7ac17c889f5ad421cdcd9adbeda0b6590c5421c6e1a92ed354d79a048600488de4bb6384f35bba766d6c266371805d97a44ae57734
+  data.tar.gz: a9e5b0ca229032349ef8f863dfd0f495047a73d7c0f19bce4f2f8c4df12fc22a705eb8dfa36d6549baf161b3a1385407e7fc74eb7b9674bca3b2b2e54c0846e8

data/app/controllers/concerns/motor/current_ability.rb

@@ -4,7 +4,7 @@ module Motor
   module CurrentAbility
     def current_ability
       @current_ability ||=
-        if defined?(Motor::Ability) && current_user
+        if defined?(Motor::Ability)
           klass = Motor::Ability.dup.tap do |k|
             k.prepend(Motor::CancanUtils::AbilityPatch)
           end

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.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,11 @@ module Motor
 
         return { select_options: enum.keys } if enum
 
+        return {} if column.name == 'year'
+
+        return { number_format: true } if !column.name.match?(/_(?:id|year)\z/) &&
+                                          %i[integer float].include?(column.type)
+
         {}
       end
 

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.18'
+  VERSION = '0.2.22'
 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-6570149f716eae327cdc.css.gz": "main-6570149f716eae327cdc.css.gz",
+  "main-6570149f716eae327cdc.js.LICENSE.txt": "main-6570149f716eae327cdc.js.LICENSE.txt",
+  "main-6570149f716eae327cdc.js.gz": "main-6570149f716eae327cdc.js.gz",
+  "main.css": "main-6570149f716eae327cdc.css",
+  "main.js": "main-6570149f716eae327cdc.js"
 }

metadata

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