motor-admin 0.1.43 → 0.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d06115fe373a464d0e64a5f15b6c895d549e7cef2068e9a9e9d9712cc003046d
-  data.tar.gz: d01b6707a80c0d30b8c43c40d9c86a7ee98475cf02ee6b8a296aac3ae25a9d27
+  metadata.gz: 74c91b2c5dbc0b48fa75a4fa9f5ec2eb8a3848b2e65cf819b9ddc3317e379a19
+  data.tar.gz: bee5733d821cde96004674d36c9be0467e32044d921a4b52e863b4be4e3de55b
 SHA512:
-  metadata.gz: 4a9b94292f85849ececb737e5d8a962a7b18989d218c72db520eb6e771b9b703083be6c54bf1894f31e1d894af3fca02065653e97497966c3b1dadbfafb098ac
-  data.tar.gz: c18e73dfd82fa82bf182cc445c22565a73a29006309ccd0ecb1ab92d1f610fe797ee9d4ff6cb84382e039d146ca99d16648a84717f169168e3dc834571c67b7d
+  metadata.gz: 9bb22f83f9c270696f2d32cc384b98d90a5dab99f7f377258682dbc3622bd574ea0c6bf43de5cd955bb551dd56d6d43b4e618a53803a7d91417a7ec88ae9571f
+  data.tar.gz: 6e1f295abe63ca50e7176789523747810384307c03bcf5c4c719cc41a85296573fb0f6c3e193f06e625ed5801c204a519675539719d966357398293fe3a10977

data/app/controllers/motor/active_storage_attachments_controller.rb

@@ -26,7 +26,7 @@ module Motor
     end
 
     def file_params
-      params.require(:data).require(:file).permit(:io, :filename).to_h
+      params.require(:data).require(:file).permit(:io, :filename).to_h.symbolize_keys
     end
 
     def attachment_params

data/config/routes.rb

@@ -47,5 +47,3 @@ Motor::Admin.routes.draw do
     end
   end
 end
-
-ActiveSupport::Notifications.instrument('motor.routes.loaded')

data/lib/motor/active_record_utils.rb

@@ -7,3 +7,4 @@ require_relative './active_record_utils/types'
 require_relative './active_record_utils/fetch_methods'
 require_relative './active_record_utils/defined_scopes_extension'
 require_relative './active_record_utils/active_storage_links_extension'
+require_relative './active_record_utils/active_storage_blob_patch'

data/lib/motor/active_record_utils/active_storage_blob_patch.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Motor
+  module ActiveRecordUtils
+    module ActiveStorageBlobPatch
+      KEYWORD_ARGS = %i[io filename content_type metadata identify].freeze
+
+      def build_after_upload(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+
+      def build_after_unfurling(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+
+      def create_after_unfurling!(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+
+      def create_and_upload!(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+    end
+  end
+end

data/lib/motor/admin.rb

@@ -3,9 +3,11 @@
 module Motor
   class Admin < ::Rails::Engine
     initializer 'motor.startup_message' do
-      ActiveSupport::Notifications.subscribe('motor.routes.loaded') do
+      config.after_initialize do
         next unless Motor.server?
 
+        Rails.application.reload_routes!
+
         if Rails.application.routes.url_helpers.respond_to?(:motor_admin_path)
           url =
             begin
@@ -67,6 +69,10 @@ module Motor
       ActiveSupport.on_load(:active_storage_attachment) do
         ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
       end
+
+      ActiveSupport.on_load(:active_storage_blob) do
+        ActiveStorage::Blob.singleton_class.prepend(Motor::ActiveRecordUtils::ActiveStorageBlobPatch)
+      end
     end
   end
 end

data/lib/motor/build_schema.rb

@@ -68,6 +68,7 @@ module Motor
 end
 
 require_relative './build_schema/active_storage_attachment_schema'
+require_relative './build_schema/adjust_devise_model_schema'
 require_relative './build_schema/load_from_rails'
 require_relative './build_schema/find_display_column'
 require_relative './build_schema/persist_resource_configs'

data/lib/motor/build_schema/adjust_devise_model_schema.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Motor
+  module BuildSchema
+    module AdjustDeviseModelSchema
+      HIDDEN_COLUMNS = %w[
+        encrypted_password
+        reset_password_token
+        confirmation_token
+      ].freeze
+
+      READ_ONLY_COLUMNS = %w[
+        reset_password_sent_at
+        remember_created_at
+        sign_in_count
+        current_sign_in_at
+        last_sign_in_at
+        current_sign_in_ip
+        last_sign_in_ip
+        confirmed_at
+        confirmation_sent_at
+      ].freeze
+
+      module_function
+
+      def call(schema, devise_modules)
+        modify_column_access_types!(schema[:columns])
+        add_password_column!(schema[:columns]) if devise_modules.include?(:database_authenticatable)
+
+        schema
+      end
+
+      def modify_column_access_types!(columns)
+        columns.each do |column|
+          column[:access_type] =
+            case column[:name]
+            when *HIDDEN_COLUMNS
+              ColumnAccessTypes::HIDDEN
+            when *READ_ONLY_COLUMNS
+              ColumnAccessTypes::READ_ONLY
+            else
+              column[:access_type]
+            end
+        end
+      end
+
+      def add_password_column!(columns)
+        columns << {
+          name: 'password',
+          display_name: 'Password',
+          column_type: 'string',
+          access_type: 'write_only',
+          default_value: nil,
+          validators: [],
+          virtual: true
+        }
+      end
+    end
+  end
+end

data/lib/motor/build_schema/load_from_rails.rb

@@ -10,7 +10,15 @@ module Motor
 
       def call
         models.map do |model|
-          build_model_schema(model)
+          Object.const_get(model.name)
+
+          schema = build_model_schema(model)
+
+          if model.respond_to?(:devise_modules)
+            Motor::BuildSchema::AdjustDeviseModelSchema.call(schema, model.devise_modules)
+          end
+
+          schema
         rescue StandardError, NotImplementedError => e
           Rails.logger.error(e) if model.name != 'Audited::Audit'
 
@@ -108,13 +116,15 @@ module Motor
         model.reflections.map do |name, ref|
           next if !ref.has_one? && !ref.belongs_to?
 
-          begin
-            ref.klass
-          rescue StandardError
-            next
-          end
+          unless ref.polymorphic?
+            begin
+              next if ref.klass.name == 'ActiveStorage::Blob'
+            rescue StandardError => e
+              Rails.logger.error(e)
 
-          next if ref.klass.name == 'ActiveStorage::Blob'
+              next
+            end
+          end
 
           build_reflection_column(name, model, ref, default_attrs)
         end.compact
@@ -122,7 +132,7 @@ module Motor
 
       def build_reflection_column(name, model, ref, default_attrs)
         column_name = ref.belongs_to? ? ref.foreign_key.to_s : name
-        is_attachment = ref.klass.name == 'ActiveStorage::Attachment'
+        is_attachment = !ref.polymorphic? && ref.klass.name == 'ActiveStorage::Attachment'
         access_type = ref.belongs_to? || is_attachment ? ColumnAccessTypes::READ_WRITE : ColumnAccessTypes::READ_ONLY
 
         {
@@ -139,27 +149,20 @@ module Motor
       end
 
       def build_reference(name, reflection)
-        is_attachment = reflection.klass.name == 'ActiveStorage::Attachment'
-
         {
           name: name,
           display_name: name.humanize,
-          model_name: reflection.klass.name.underscore,
+          model_name: reflection.polymorphic? ? nil : reflection.klass.name.underscore,
           reference_type: reflection.belongs_to? ? 'belongs_to' : 'has_one',
           foreign_key: reflection.foreign_key,
-          polymorphic: reflection.polymorphic? || is_attachment
+          polymorphic: reflection.polymorphic?
         }
       end
 
       def fetch_associations(model)
         model.reflections.map do |name, ref|
           next if ref.has_one? || ref.belongs_to?
-
-          begin
-            ref.klass
-          rescue StandardError
-            next
-          end
+          next unless valid_reflection?(ref)
 
           model_class = ref.klass
 
@@ -171,7 +174,7 @@ module Motor
             slug: name.underscore,
             model_name: model_class.name.underscore,
             foreign_key: ref.foreign_key,
-            polymorphic: ref.polymorphic? || model_class.name == 'ActiveStorage::Attachment',
+            polymorphic: ref.options[:as].present?,
             visible: true
           }
         end.compact
@@ -211,6 +214,17 @@ module Motor
         end
       end
 
+      def valid_reflection?(reflection)
+        reflection.klass
+        reflection.foreign_key
+
+        true
+      rescue StandardError => e
+        Rails.logger.error(e)
+
+        false
+      end
+
       def eager_load_models!
         MUTEX.synchronize do
           if Rails::VERSION::MAJOR > 5 && defined?(Zeitwerk::Loader)

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.43'
+  VERSION = '0.1.44'
 end

data/ui/dist/manifest.json

@@ -5,9 +5,9 @@
   "fonts/ionicons.ttf?v=3.0.0-alpha.3": "fonts/ionicons.ttf",
   "fonts/ionicons.woff2?v=3.0.0-alpha.3": "fonts/ionicons.woff2",
   "fonts/ionicons.woff?v=3.0.0-alpha.3": "fonts/ionicons.woff",
-  "main-c3893a249308242d20f5.css.gz": "main-c3893a249308242d20f5.css.gz",
-  "main-c3893a249308242d20f5.js.LICENSE.txt": "main-c3893a249308242d20f5.js.LICENSE.txt",
-  "main-c3893a249308242d20f5.js.gz": "main-c3893a249308242d20f5.js.gz",
-  "main.css": "main-c3893a249308242d20f5.css",
-  "main.js": "main-c3893a249308242d20f5.js"
+  "main-e763d59007bb725ea622.css.gz": "main-e763d59007bb725ea622.css.gz",
+  "main-e763d59007bb725ea622.js.LICENSE.txt": "main-e763d59007bb725ea622.js.LICENSE.txt",
+  "main-e763d59007bb725ea622.js.gz": "main-e763d59007bb725ea622.js.gz",
+  "main.css": "main-e763d59007bb725ea622.css",
+  "main.js": "main-e763d59007bb725ea622.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 0.1.44
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -191,6 +191,7 @@ files:
 - lib/motor-admin.rb
 - lib/motor.rb
 - lib/motor/active_record_utils.rb
+- lib/motor/active_record_utils/active_storage_blob_patch.rb
 - lib/motor/active_record_utils/active_storage_links_extension.rb
 - lib/motor/active_record_utils/defined_scopes_extension.rb
 - lib/motor/active_record_utils/fetch_methods.rb
@@ -211,6 +212,7 @@ files:
 - lib/motor/assets.rb
 - lib/motor/build_schema.rb
 - lib/motor/build_schema/active_storage_attachment_schema.rb
+- lib/motor/build_schema/adjust_devise_model_schema.rb
 - lib/motor/build_schema/find_display_column.rb
 - lib/motor/build_schema/load_from_rails.rb
 - lib/motor/build_schema/merge_schema_configs.rb
@@ -242,8 +244,8 @@ files:
 - lib/motor/tasks/motor.rake
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-c3893a249308242d20f5.css.gz
-- ui/dist/main-c3893a249308242d20f5.js.gz
+- ui/dist/main-e763d59007bb725ea622.css.gz
+- ui/dist/main-e763d59007bb725ea622.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: