motor-admin 0.2.49 → 0.2.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1454fff2b666e21bca8bff4acf49f1be8d5cbeae176356c051a879f46f78226
-  data.tar.gz: 8c027639c95b04a69e337b8cd5749ed65babeb0df755855fd6ba423cbe8214e5
+  metadata.gz: 15b533466db4a33c9391b0b6b01ccc843db7f69641e45b94588f8fd73b58bdd6
+  data.tar.gz: 1eca4eb32893da6b571a24e6ce75fa58c2290c759e973fea99186a5e795d2bca
 SHA512:
-  metadata.gz: b6e22434dd4b722606f31ecfdc5ed2e0c6e547b115b097dc8f00e885765649cd45be069d19984d72ac8e2cca91544b3fd7c16d8393c7e4aa801e3c77a88c5fa5
-  data.tar.gz: 77839d0bfb147200dfaf46b8e4b105b15ed1230c5fd85cab0954bccd454b76c83229d8fd7cd09a56c558741657be25372eac5c9411d982133d57fc9f117eefc8
+  metadata.gz: 1526cd8885184c8e4e3b8863f7a5c3c5a6adc240c5dc6cd976a5e804f0538635973977f6bb7dcb23c8042a6997817e529d7ff368fe349d5236c13528ff704301
+  data.tar.gz: 202b9a9b155b23ae205c278d1301d5d58e7eaf19571d2d0b8d539635586c2227d49b72bcbf3a605c2b98e85da5545161ddc46c27837c4343f2a281c981874f04

data/config/locales/en.yml

@@ -300,3 +300,4 @@ en:
     expand: Expand
     add_api: Add API
     on_collection: On collection
+    association: Association

data/config/locales/es.yml

@@ -300,6 +300,7 @@ es:
     expand: Expandir
     add_api: De API
     on_collection: En la colección
+    association: Asociación
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -296,6 +296,7 @@ pt:
     expand: Expandir
     add_api: De API
     on_collection: Na coleção
+    association: Associação
     i:
       locale: pt
       select:

data/lib/motor/admin.rb

@@ -109,6 +109,8 @@ module Motor
                ' to perform data migration and enable the latest features'
           puts
         end
+      rescue ActiveRecord::NoDatabaseError
+        nil
       end
     end
   end

data/lib/motor/build_schema/apply_permissions.rb

@@ -21,7 +21,9 @@ module Motor
 
       def filter_associations(associations, ability)
         associations.select do |assoc|
-          ability.can?(:read, assoc[:model_name].classify.constantize)
+          model_class = assoc[:model_name].classify.safe_constantize
+
+          model_class && ability.can?(:read, model_class)
         end
       end
 
@@ -29,8 +31,11 @@ module Motor
         columns.map do |column|
           next unless ability.can?(:read, model, column[:name])
 
-          next if column.dig(:reference, :model_name).present? &&
-                  !ability.can?(:read, column[:reference][:model_name].classify.constantize)
+          reference_model_name = column.dig(:reference, :model_name)
+          model_class = reference_model_name&.classify&.safe_constantize
+
+          next if reference_model_name &&
+                  (model_class.nil? || !ability.can?(:read, model_class))
 
           unless ability.can?(:update, model, column[:name])
             column = column.merge(access_type: BuildSchema::ColumnAccessTypes::READ_ONLY)

data/lib/motor/build_schema/load_from_rails.rb

@@ -154,7 +154,8 @@ module Motor
 
         return {} if column.name == 'year'
 
-        return { number_format: true } if !column.name.match?(/_(?:id|year)\z/) &&
+        return { number_format: true } if !column.name == 'id' &&
+                                          !column.name.match?(/_(?:id|year)\z/) &&
                                           %i[integer float].include?(column.type)
 
         {}

data/lib/motor/configs/build_ui_app_tag.rb

@@ -13,7 +13,7 @@ module Motor
       module_function
 
       def call(current_user = nil, current_ability = nil, cache_keys: LoadFromCache.load_cache_keys)
-        CACHE_STORE.fetch("#{I18n.locale}#{cache_keys.hash}#{current_user&.id}#{current_ability&.rules_hash}") do
+        CACHE_STORE.fetch(app_tag_cache_key(cache_keys, current_user, current_ability)) do
           CACHE_STORE.clear
 
           data = build_data(cache_keys, current_user, current_ability)
@@ -21,6 +21,14 @@ module Motor
         end
       end
 
+      def app_tag_cache_key(cache_keys, current_user, current_ability)
+        key = "#{I18n.locale}#{cache_keys.hash}#{current_user&.id}#{current_ability&.rules_hash}"
+
+        key += Motor::DefineArModels.defined_models_schema_md5.to_s if defined?(Motor::DefineArModels)
+
+        key
+      end
+
       # rubocop:disable Metrics/AbcSize
       # @return [Hash]
       def build_data(cache_keys = {}, current_user = nil, current_ability = nil)

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.49'
+  VERSION = '0.2.54'
 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-405235dcc7061ef18101.css.gz": "main-405235dcc7061ef18101.css.gz",
-  "main-405235dcc7061ef18101.js.LICENSE.txt": "main-405235dcc7061ef18101.js.LICENSE.txt",
-  "main-405235dcc7061ef18101.js.gz": "main-405235dcc7061ef18101.js.gz",
-  "main.css": "main-405235dcc7061ef18101.css",
-  "main.js": "main-405235dcc7061ef18101.js"
+  "main-14416e12b7c4f3d4ccf4.css.gz": "main-14416e12b7c4f3d4ccf4.css.gz",
+  "main-14416e12b7c4f3d4ccf4.js.LICENSE.txt": "main-14416e12b7c4f3d4ccf4.js.LICENSE.txt",
+  "main-14416e12b7c4f3d4ccf4.js.gz": "main-14416e12b7c4f3d4ccf4.js.gz",
+  "main.css": "main-14416e12b7c4f3d4ccf4.css",
+  "main.js": "main-14416e12b7c4f3d4ccf4.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.49
+  version: 0.2.54
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -1532,8 +1532,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-405235dcc7061ef18101.css.gz
-- ui/dist/main-405235dcc7061ef18101.js.gz
+- ui/dist/main-14416e12b7c4f3d4ccf4.css.gz
+- ui/dist/main-14416e12b7c4f3d4ccf4.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: