motor-admin 0.2.54 → 0.2.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b533466db4a33c9391b0b6b01ccc843db7f69641e45b94588f8fd73b58bdd6
-  data.tar.gz: 1eca4eb32893da6b571a24e6ce75fa58c2290c759e973fea99186a5e795d2bca
+  metadata.gz: b15459e6ad4c135a1534bf82cf8bb202ef3bcee0ae479b05c316cc07f4abc4a4
+  data.tar.gz: 129ebeba47d066bd9990fbe1408e5a4ae2d2aba49444ba93bdcc7c67c160dd89
 SHA512:
-  metadata.gz: 1526cd8885184c8e4e3b8863f7a5c3c5a6adc240c5dc6cd976a5e804f0538635973977f6bb7dcb23c8042a6997817e529d7ff368fe349d5236c13528ff704301
-  data.tar.gz: 202b9a9b155b23ae205c278d1301d5d58e7eaf19571d2d0b8d539635586c2227d49b72bcbf3a605c2b98e85da5545161ddc46c27837c4343f2a281c981874f04
+  metadata.gz: 97b8da084ad4ab06935288abba3ab0e3a9bae933df5977400049347d35e24dcc18cd6615e527cb55b7bf123da689f187bdacfc00e5041c66b3c1155f7487b968
+  data.tar.gz: 6910ec1a51c0b90781e6dedfa3b602f920297e2d37a32dbf6ea34362c71ffadd70464c88385eea760fc53f0eb1c245300a5942f144ebe56e82d755c7c921d929

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 = form.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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.54'
+  VERSION = '0.2.55'
 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-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"
+  "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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.54
+  version: 0.2.55
 platform: ruby
 authors:
 - Pete Matsyburka
@@ -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-14416e12b7c4f3d4ccf4.css.gz
-- ui/dist/main-14416e12b7c4f3d4ccf4.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