motor-admin 0.2.48 → 0.2.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e0b70a3838f3f4f4df56cc8caf0aacf3c07b9826395ee81bad390d6a8952ab1
-  data.tar.gz: cc40b2bdb4a214abcea419ba94781d9dcfcca7d716ae6674ba3497b031adac8d
+  metadata.gz: 67bb67c4a201104a29894b80a8bd242f1cf10b49cb6d385714581e7cc7497879
+  data.tar.gz: 7982ff5d3c3636c2f6fd4216cd038e33c62f4af603a345900cf05512b5b1fe54
 SHA512:
-  metadata.gz: 95bbf8cc2ae3d25b68a1841ac7d1dac45fa798c1da7f0fba031d542a35e6bb28da1e2ee9d27b58b80d9f14ddfb684f2070d47fd53b7e537b3edcc52f01dd5619
-  data.tar.gz: d0cd3d7425e55a43c5a6e774b59aaa89767e78acdbb846a5f52f230cfe7b8d748f7bcdb0ed65d24cf121d7374500fa205a46c4e23a00e6b3caed17ba912252b4
+  metadata.gz: 949241fdf2ac8b47d2eb1ff796f11b2784a45226a2abf23bc4ffcb60a2c5f0947e02dd04b20d488f9fcb52ba06eedffc5cccff9d3fcf1a1dd253157bda133e0d
+  data.tar.gz: '08b26b86e8cdd556b1230a09539a891aa0c6b863b6a6f3bf62ccb69926bdbbd057fb6a38bb5bfd384652fda1a73aab02d2edbebedf6175c254656e6aa2817caa'

data/config/locales/en.yml

@@ -299,3 +299,5 @@ en:
     url: URL
     expand: Expand
     add_api: Add API
+    on_collection: On collection
+    association: Association

data/config/locales/es.yml

@@ -299,6 +299,8 @@ es:
     url: URL
     expand: Expandir
     add_api: De API
+    on_collection: En la colección
+    association: Asociación
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -295,6 +295,8 @@ pt:
     url: URL
     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/defaults.rb

@@ -13,6 +13,7 @@ module Motor
             display_name: I18n.t('motor.create'),
             action_type: BuildSchema::DEFAULT_TYPE,
             preferences: {},
+            apply_on: 'collection',
             visible: true
           },
           {
@@ -20,6 +21,7 @@ module Motor
             display_name: I18n.t('motor.edit'),
             action_type: BuildSchema::DEFAULT_TYPE,
             preferences: {},
+            apply_on: 'member',
             visible: true
           },
           {
@@ -27,6 +29,7 @@ module Motor
             display_name: I18n.t('motor.remove'),
             action_type: BuildSchema::DEFAULT_TYPE,
             preferences: {},
+            apply_on: 'member',
             visible: true
           }
         ].freeze

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/build_schema.rb

@@ -70,6 +70,7 @@ module Motor
 
     ACTION_DEFAULTS = {
       visible: true,
+      apply_on: 'member',
       preferences: {}
     }.with_indifferent_access
 

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/resources.rb

@@ -9,7 +9,7 @@ module Motor
     ASSOCIATION_ATTRS = %w[name display_name model_name icon visible foreign_key primary_key options virtual
                            polymorphic slug].freeze
     SCOPE_ATTRS = %w[name display_name scope_type preferences visible].freeze
-    ACTION_ATTRS = %w[name display_name action_type preferences visible].freeze
+    ACTION_ATTRS = %w[name display_name action_type preferences apply_on visible].freeze
     TAB_ATTRS = %w[name display_name tab_type preferences visible].freeze
   end
 end

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.48'
+  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-6fcd302ba30a65b4d436.css.gz": "main-6fcd302ba30a65b4d436.css.gz",
-  "main-6fcd302ba30a65b4d436.js.LICENSE.txt": "main-6fcd302ba30a65b4d436.js.LICENSE.txt",
-  "main-6fcd302ba30a65b4d436.js.gz": "main-6fcd302ba30a65b4d436.js.gz",
-  "main.css": "main-6fcd302ba30a65b4d436.css",
-  "main.js": "main-6fcd302ba30a65b4d436.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.48
+  version: 0.2.53
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-30 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-6fcd302ba30a65b4d436.css.gz
-- ui/dist/main-6fcd302ba30a65b4d436.js.gz
+- ui/dist/main-f5a4c21edafaf5c70b05.css.gz
+- ui/dist/main-f5a4c21edafaf5c70b05.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: