motor-admin 0.1.43 → 0.1.49

data/lib/motor/active_record_utils/active_storage_links_extension.rb

@@ -4,7 +4,7 @@ module Motor
   module ActiveRecordUtils
     module ActiveStorageLinksExtension
       def path
-        Rails.application.routes.url_helpers.rails_blob_path(self)
+        Rails.application.routes.url_helpers.rails_blob_path(self, only_path: true)
       end
 
       def url

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/api_query/apply_scope.rb

@@ -18,7 +18,7 @@ module Motor
       end
 
       def apply_filter_scope(rel, scope)
-        configs = Motor::Resource.find_by_name(rel.klass.name.underscore)
+        configs = Motor::Resource.find_by(name: rel.klass.name.underscore)
 
         return rel unless configs
 

data/lib/motor/api_query/build_json.rb

@@ -96,8 +96,8 @@ module Motor
       def normalize_include_params(params)
         case params
         when Array
-          params.each_with_object({}) do |name, hash|
-            hash[name] = { 'include' => {} }
+          params.index_with do |_|
+            { 'include' => {} }
           end
         when String
           { params => { 'include' => {} } }

data/lib/motor/api_query/search.rb

@@ -57,13 +57,7 @@ module Motor
       def find_searchable_columns(model)
         model.columns.map do |column|
           next unless column.type.in?(COLUMN_TYPES)
-
-          has_inclusion_validator =
-            model.validators_on(column.name).any? do |e|
-              e.is_a?(ActiveModel::Validations::InclusionValidator)
-            end
-
-          next if has_inclusion_validator
+          next if model.validators_on(column.name).any?(ActiveModel::Validations::InclusionValidator)
 
           column.name
         end.compact

data/lib/motor/assets.rb

@@ -14,6 +14,12 @@ module Motor
       JSON.parse(MANIFEST_PATH.read)
     end
 
+    def icons
+      manifest.select do |k, v|
+        !k.ends_with?('.gz') && v.starts_with?('icons/') && v.exclude?('DS_Store')
+      end.keys
+    end
+
     def asset_path(path)
       Motor::Admin.routes.url_helpers.motor_asset_path(manifest[path])
     end

data/lib/motor/build_schema.rb

@@ -68,8 +68,10 @@ 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/find_icon'
 require_relative './build_schema/persist_resource_configs'
 require_relative './build_schema/reorder_schema'
 require_relative './build_schema/merge_schema_configs'

data/lib/motor/build_schema/active_storage_attachment_schema.rb

@@ -9,14 +9,18 @@ module Motor
       primary_key: 'id',
       display_name: 'Attachments',
       display_column: 'filename',
+      icon: 'paperclip',
       columns: [
         {
           name: 'id',
-          display_name: 'Id',
+          display_name: 'ID',
           column_type: 'integer',
           access_type: 'read_only',
           default_value: nil,
           validators: [],
+          format: {},
+          is_array: false,
+          reference: nil,
           virtual: false
         },
         {
@@ -26,6 +30,9 @@ module Motor
           access_type: 'read_only',
           default_value: nil,
           validators: [],
+          format: {},
+          is_array: false,
+          reference: nil,
           virtual: true
         },
         {
@@ -35,6 +42,9 @@ module Motor
           access_type: 'read_write',
           default_value: nil,
           validators: [],
+          format: {},
+          is_array: false,
+          reference: nil,
           virtual: false
         },
         {
@@ -44,6 +54,9 @@ module Motor
           access_type: 'read_write',
           default_value: nil,
           validators: [],
+          format: {},
+          is_array: false,
+          reference: nil,
           virtual: false
         },
         {
@@ -53,6 +66,16 @@ module Motor
           access_type: 'read_write',
           default_value: nil,
           validators: [],
+          format: {},
+          is_array: false,
+          reference: {
+            name: 'record',
+            display_name: 'Record',
+            model_name: nil,
+            reference_type: 'belongs_to',
+            foreign_key: 'record_id',
+            polymorphic: true
+          },
           virtual: false
         },
         {
@@ -62,6 +85,9 @@ module Motor
           access_type: 'write_only',
           default_value: nil,
           validators: [],
+          format: {},
+          is_array: false,
+          reference: nil,
           virtual: false
         },
         {
@@ -71,6 +97,9 @@ module Motor
           access_type: 'read_only',
           default_value: nil,
           validators: [],
+          format: {},
+          is_array: false,
+          reference: nil,
           virtual: false
         }
       ],

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

@@ -31,6 +31,7 @@ module Motor
           manufacturer
           model
           address
+          code
         ]
       ).freeze
 

data/lib/motor/build_schema/find_icon.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+module Motor
+  module FindIcon
+    ICONS_MAP = {
+      'audit' => 'history',
+      'block' => 'ban',
+      'blocked' => 'ban',
+      'blacklisted' => 'ban',
+      'blocklisted' => 'ban',
+      'banned' => 'ban',
+      'website' => 'world',
+      'location' => 'gps',
+      'photo' => 'photo',
+      'image' => 'photo',
+      'screenshot' => 'photo',
+      'picture' => 'photo',
+      'video' => 'video',
+      'file' => 'file',
+      'pdf' => 'file-text',
+      'ad' => 'ad',
+      'shop' => 'building-store',
+      'store' => 'building-store',
+      'seller' => 'building-store',
+      'app' => 'apps',
+      'book' => 'book',
+      'movie' => 'movie',
+      'country' => 'map',
+      'api' => 'tool',
+      'config' => 'tool',
+      'key' => 'key',
+      'phone' => 'phone',
+      'call' => 'phone',
+      'cell' => 'phone',
+      'token' => 'key',
+      'secret' => 'lock',
+      'automation' => 'manual-gearbox',
+      'relationship' => 'hierarchy',
+      'person' => 'user',
+      'people' => 'users',
+      'mail' => 'mail',
+      'user' => 'user',
+      'rating' => 'star',
+      'article' => 'blockquote',
+      'podcast' => 'headphones',
+      'payment' => 'cash',
+      'log' => 'history',
+      'history' => 'history',
+      'rule' => 'manual-gearbox',
+      'tracking' => 'zoom-question',
+      'github' => 'brand-github',
+      'tag' => 'hash',
+      'category' => 'hash',
+      'label' => 'hash',
+      'twitter' => 'brand-twitter',
+      'facebook' => 'brand-facebook',
+      'google' => 'brand-google',
+      'renewal' => 'repeat',
+      'sales' => 'report-money',
+      'telegram' => 'brand-telegram',
+      'whatsapp' => 'brand-whatsapp',
+      'survey' => 'checkbox',
+      'subcategory' => 'hash',
+      'type' => 'hash',
+      'model' => 'hash',
+      'taxon' => 'hash',
+      'affiliate' => 'affiliate',
+      'chat' => 'message-circle',
+      'message' => 'messages',
+      'poll' => 'messages',
+      'feedpack' => 'messages',
+      'attachment' => 'paperclip',
+      'certificate' => 'certificate',
+      'approval' => 'certificate',
+      'bank' => 'building-bank',
+      'bridge' => 'building-bridge',
+      'car' => 'car',
+      'vehicle' => 'car',
+      'analytic' => 'device-analytics',
+      'stat' => 'device-analytics',
+      'statistic' => 'device-analytics',
+      'link' => 'link',
+      'slug' => 'link',
+      'city' => 'building-skyscraper',
+      'region' => 'map',
+      'district' => 'building-community',
+      'community' => 'building-community',
+      'activity' => 'activity',
+      'invoice' => 'invoice',
+      'settlement' => 'invoice',
+      'state' => 'map',
+      'note' => 'note',
+      'order' => 'truck-delivery',
+      'lead' => 'building-lighthouse',
+      'error' => 'file-alert',
+      'page' => 'brand-pagekit',
+      'date' => 'calendar-event',
+      'customer' => 'users',
+      'contact' => 'users',
+      'member' => 'users',
+      'admin' => 'user-check',
+      'notification' => 'bell',
+      'alert' => 'bell',
+      'team' => 'users',
+      'folder' => 'folder',
+      'subscriber' => 'user-plus',
+      'product' => 'building-store',
+      'html' => 'code',
+      'stripe' => 'brand-stripe',
+      'email' => 'mail'
+    }.freeze
+
+    DEFAULT_ICON = 'database'
+
+    module_function
+
+    def call(text)
+      text = text.downcase
+      icon = ICONS_MAP[text] || ICONS_MAP[text.singularize]
+
+      icon ||=
+        text.split(%r{[\s_/]}).reverse.reduce(nil) do |_acc, word|
+          found_icon = ICONS_MAP[word] || ICONS_MAP[word.singularize]
+
+          break found_icon if found_icon
+        end
+
+      icon || DEFAULT_ICON
+    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'
 
@@ -47,6 +55,7 @@ module Motor
           display_column: FindDisplayColumn.call(model),
           columns: fetch_columns(model),
           associations: fetch_associations(model),
+          icon: Motor::FindIcon.call(model.name.titleize),
           scopes: fetch_scopes(model),
           actions: DEFAULT_ACTIONS,
           tabs: DEFAULT_TABS,
@@ -90,7 +99,7 @@ module Motor
 
         {
           name: column.name,
-          display_name: column.name.humanize,
+          display_name: Utils.humanize_column_name(column.name),
           column_type: is_enum ? 'string' : UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
           is_array: column.array?,
           access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
@@ -108,13 +117,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 +133,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 +150,21 @@ 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
+          association_primary_key: reflection.polymorphic? ? 'id' : reflection.association_primary_key,
+          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 +176,8 @@ 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?,
+            icon: Motor::FindIcon.call(name),
             visible: true
           }
         end.compact
@@ -197,20 +203,33 @@ module Motor
       end
 
       def build_validator_hash(validator)
+        options = validator.options.reject { |_, v| v.is_a?(Proc) }
+
         case validator
         when ActiveModel::Validations::InclusionValidator
           { includes: validator.send(:delimiter) }
         when ActiveRecord::Validations::PresenceValidator
           { required: true }
         when ActiveModel::Validations::FormatValidator
-          { format: JsRegex.new(validator.options[:with]).to_h.slice(:source, :options) }
+          { format: JsRegex.new(options[:with]).to_h.slice(:source, :options) }
         when ActiveRecord::Validations::LengthValidator
-          { length: validator.options }
+          { length: options }
         when ActiveModel::Validations::NumericalityValidator
-          { numeric: validator.options }
+          { numeric: options }
         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)