motor-admin 0.2.51 → 0.2.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f96f929aa91537536fb2bf7600c5910fa8c573a8bc39d735a4a1987ed04a8b6
-  data.tar.gz: 2ca104e7ea56a378edcd24f56d4d36e98dbd34df54f12df2d26eec1bdee31b91
+  metadata.gz: e91be0ae4e5eafb52785d52874bd07bdd8596d81c62004298cde44849c706354
+  data.tar.gz: 57ae4b6763ee7b110ec13fc64375322535c0e0bb97d0a8cb5d92977891cc76b0
 SHA512:
-  metadata.gz: 7ded34bfb1ead6be8fbbfdce823cbc5d015bc54c5665b300c5e168ac93bb48e125589a6b5da4d2df6c65c3efb7a6581fa37e7263645e4cac306ffb6657c8dd96
-  data.tar.gz: 494738f22d78e71d28d90753ff1e7a72a9dc7e9362e7aa1d037f076506cbe2316e1fc597778a4070059e232a4d9d8b796070318abe9796998a3031711d2cff52
+  metadata.gz: a16cceb565a38abf5a16a8d12092e919170af044fda5204e9038dcac1f88df01c15052bbaa3f7b1db4e1b7b312e156338efd520e28ad789d2d0e1ed8af99eda4
+  data.tar.gz: cd6a58743490b4e26f75d60597cabc694fddf89bebbbf597453c35dcbfa8caa3d38a5c0e67bcac038c9728248967b7606d4fbf3432439782a0f3ccb54c1d2945

data/config/locales/en.yml

@@ -301,3 +301,4 @@ en:
     add_api: Add API
     on_collection: On collection
     association: Association
+    action_has_been_removed: This action has been removed

data/config/locales/es.yml

@@ -301,6 +301,7 @@ es:
     add_api: De API
     on_collection: En la colección
     association: Asociación
+    action_has_been_removed: Esta acción ha sido eliminada
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -297,6 +297,7 @@ pt:
     add_api: De API
     on_collection: Na coleção
     association: Associação
+    action_has_been_removed: Esta ação foi removida
     i:
       locale: pt
       select:

data/lib/generators/motor/templates/upgrade_motor_api_actions.rb

@@ -0,0 +1,71 @@
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  class MotorApiConfig < ActiveRecord::Base
+    self.table_name = 'motor_api_configs'
+
+    encrypts :credentials if defined?(::Motor::EncryptedConfig)
+
+    serialize :credentials, Motor::HashSerializer
+    serialize :preferences, Motor::HashSerializer
+
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
+    attribute :credentials, default: -> { HashWithIndifferentAccess.new }
+  end
+
+  class MotorForm < ActiveRecord::Base
+    self.table_name = 'motor_forms'
+
+    serialize :preferences, Motor::HashSerializer
+  end
+
+  class MotorResource < ActiveRecord::Base
+    self.table_name = 'motor_resources'
+
+    serialize :preferences, Motor::HashSerializer
+  end
+
+  def up
+    MotorResource.all.each do |resource|
+      resource.preferences.fetch(:actions, []).each do |action|
+        next unless action[:action_type] == 'api'
+
+        api_path = action[:preferences][:api_path]
+        api_url = api_path[%r{\Ahttps?://[^/]+}]
+        api_path = api_path.delete_prefix(api_url).sub(/\A\/?/, '/') if api_url
+
+        api_config =
+          if api_url
+            MotorApiConfig.create_with(url: api_url).find_or_create_by!(name: api_url.sub(%r{\Ahttps?://}))
+          else
+            MotorApiConfig.create_with(url: '/').find_or_create_by!(name: 'origin')
+          end
+
+        resource_display_name = (resource[:preferences][:display_name] || resource.name).titleize.singularize
+
+        form = MotorForm.create_with(
+          api_config_name: api_config.name,
+          api_path: api_path.sub(/\{{1,2}\w+\}{1,2}/, '{{id}}'),
+          http_method: 'POST',
+          preferences: {
+            fields: [{
+              name: 'id',
+              display_name: resource_display_name,
+              default_value: '',
+              field_type: 'reference',
+              reference: { model_name: resource.name },
+              validators: [{ required: true }]
+            }]
+          }
+        ).find_or_create_by!(
+          name: "#{action[:display_name]} #{resource_display_name}"
+        )
+
+        action[:action_type] = 'form'
+        action[:preferences] = { form_id: form.id }
+      end
+
+      resource.save!
+    end
+  end
+
+  def down; end
+end

data/lib/generators/motor/upgrade_generator.rb

@@ -15,11 +15,19 @@ module Motor
       source_root File.expand_path('templates', __dir__)
 
       def copy_migration
-        if Motor::ApiConfig.table_exists?
-          puts 'The latest Motor Admin features are already configured'
-        else
+        has_api_actions = Motor::Resource.all.any? do |resource|
+          resource.preferences[:actions]&.any? { |action| action[:action_type] == 'api' }
+        end
+
+        unless Motor::ApiConfig.table_exists?
           migration_template 'install_api_configs.rb', 'db/migrate/install_motor_api_configs.rb'
+        end
+
+        migration_template 'upgrade_motor_api_actions.rb', 'db/migrate/upgrade_motor_api_actions.rb' if has_api_actions
 
+        if Motor::ApiConfig.table_exists? && !has_api_actions
+          puts 'The latest Motor Admin features are already configured'
+        else
           puts 'Run `rake db:migrate` to update DB schema'
         end
       end

data/lib/motor/admin.rb

@@ -97,10 +97,14 @@ module Motor
 
     initializer 'motor.upgrade' do
       config.after_initialize do
+        next unless Motor.server?
+
         unless Motor::Query.table_exists?
           puts
           puts '  => Run `rails g motor:install && rake db:migrate` in order to create Motor Admin configuration tables'
           puts
+
+          raise
         end
 
         unless Motor::ApiConfig.table_exists?
@@ -108,9 +112,9 @@ module Motor
           puts '  => Run `rails g motor:upgrade && rake db:migrate`' \
                ' to perform data migration and enable the latest features'
           puts
+
+          raise
         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.51'
+  VERSION = '0.2.56'
 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-2d5ae868ed1fe51a0981.css.gz": "main-2d5ae868ed1fe51a0981.css.gz",
+  "main-2d5ae868ed1fe51a0981.js.LICENSE.txt": "main-2d5ae868ed1fe51a0981.js.LICENSE.txt",
+  "main-2d5ae868ed1fe51a0981.js.gz": "main-2d5ae868ed1fe51a0981.js.gz",
+  "main.css": "main-2d5ae868ed1fe51a0981.css",
+  "main.js": "main-2d5ae868ed1fe51a0981.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.56
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -162,6 +162,7 @@ files:
 - lib/generators/motor/migration.rb
 - lib/generators/motor/templates/install.rb
 - lib/generators/motor/templates/install_api_configs.rb
+- lib/generators/motor/templates/upgrade_motor_api_actions.rb
 - lib/generators/motor/upgrade_generator.rb
 - lib/motor-admin.rb
 - lib/motor.rb
@@ -1532,14 +1533,16 @@ 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-2d5ae868ed1fe51a0981.css.gz
+- ui/dist/main-2d5ae868ed1fe51a0981.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: "\n    ==================\n    Run `rails g motor:upgrade &&
+  rake db:migrate`\n    to perform data migration and enable the latest features'\n
+  \   ==================\n  "
 rdoc_options: []
 require_paths:
 - lib