motor-admin 0.2.51 → 0.2.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f96f929aa91537536fb2bf7600c5910fa8c573a8bc39d735a4a1987ed04a8b6
-  data.tar.gz: 2ca104e7ea56a378edcd24f56d4d36e98dbd34df54f12df2d26eec1bdee31b91
+  metadata.gz: 67bb67c4a201104a29894b80a8bd242f1cf10b49cb6d385714581e7cc7497879
+  data.tar.gz: 7982ff5d3c3636c2f6fd4216cd038e33c62f4af603a345900cf05512b5b1fe54
 SHA512:
-  metadata.gz: 7ded34bfb1ead6be8fbbfdce823cbc5d015bc54c5665b300c5e168ac93bb48e125589a6b5da4d2df6c65c3efb7a6581fa37e7263645e4cac306ffb6657c8dd96
-  data.tar.gz: 494738f22d78e71d28d90753ff1e7a72a9dc7e9362e7aa1d037f076506cbe2316e1fc597778a4070059e232a4d9d8b796070318abe9796998a3031711d2cff52
+  metadata.gz: 949241fdf2ac8b47d2eb1ff796f11b2784a45226a2abf23bc4ffcb60a2c5f0947e02dd04b20d488f9fcb52ba06eedffc5cccff9d3fcf1a1dd253157bda133e0d
+  data.tar.gz: '08b26b86e8cdd556b1230a09539a891aa0c6b863b6a6f3bf62ccb69926bdbbd057fb6a38bb5bfd384652fda1a73aab02d2edbebedf6175c254656e6aa2817caa'

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.51'
+  VERSION = '0.2.53'
 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-2f07e682c44815a0eb71.css.gz": "main-2f07e682c44815a0eb71.css.gz",
-  "main-2f07e682c44815a0eb71.js.LICENSE.txt": "main-2f07e682c44815a0eb71.js.LICENSE.txt",
-  "main-2f07e682c44815a0eb71.js.gz": "main-2f07e682c44815a0eb71.js.gz",
-  "main.css": "main-2f07e682c44815a0eb71.css",
-  "main.js": "main-2f07e682c44815a0eb71.js"
+  "main-f5a4c21edafaf5c70b05.css.gz": "main-f5a4c21edafaf5c70b05.css.gz",
+  "main-f5a4c21edafaf5c70b05.js.LICENSE.txt": "main-f5a4c21edafaf5c70b05.js.LICENSE.txt",
+  "main-f5a4c21edafaf5c70b05.js.gz": "main-f5a4c21edafaf5c70b05.js.gz",
+  "main.css": "main-f5a4c21edafaf5c70b05.css",
+  "main.js": "main-f5a4c21edafaf5c70b05.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.51
+  version: 0.2.53
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-01-10 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-2f07e682c44815a0eb71.css.gz
-- ui/dist/main-2f07e682c44815a0eb71.js.gz
+- ui/dist/main-f5a4c21edafaf5c70b05.css.gz
+- ui/dist/main-f5a4c21edafaf5c70b05.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: