motor-admin 0.1.44 → 0.1.50

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

@@ -71,6 +71,7 @@ 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/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

@@ -12,6 +12,8 @@ module Motor
         models.map do |model|
           Object.const_get(model.name)
 
+          next unless ActiveRecord::Base.connection.table_exists?(model.table_name)
+
           schema = build_model_schema(model)
 
           if model.respond_to?(:devise_modules)
@@ -20,7 +22,7 @@ module Motor
 
           schema
         rescue StandardError, NotImplementedError => e
-          Rails.logger.error(e) if model.name != 'Audited::Audit'
+          Rails.logger.error(e)
 
           next
         end.compact
@@ -34,6 +36,7 @@ module Motor
         models -= Motor::ApplicationRecord.descendants
         models -= [Motor::Audit]
         models -= [ActiveRecord::SchemaMigration] if defined?(ActiveRecord::SchemaMigration)
+        models -= [ActiveRecord::InternalMetadata] if defined?(ActiveRecord::InternalMetadata)
         models -= [ActiveStorage::Blob] if defined?(ActiveStorage::Blob)
         models -= [ActiveStorage::VariantRecord] if defined?(ActiveStorage::VariantRecord)
 
@@ -55,6 +58,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,
@@ -98,9 +102,9 @@ 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?,
+          is_array: column.respond_to?(:array?) && column.array?,
           access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
           default_value: default_attrs[column.name],
           validators: fetch_validators(model, column.name),
@@ -155,6 +159,7 @@ module Motor
           model_name: reflection.polymorphic? ? nil : reflection.klass.name.underscore,
           reference_type: reflection.belongs_to? ? 'belongs_to' : 'has_one',
           foreign_key: reflection.foreign_key,
+          association_primary_key: reflection.polymorphic? ? 'id' : reflection.association_primary_key,
           polymorphic: reflection.polymorphic?
         }
       end
@@ -175,6 +180,7 @@ module Motor
             model_name: model_class.name.underscore,
             foreign_key: ref.foreign_key,
             polymorphic: ref.options[:as].present?,
+            icon: Motor::FindIcon.call(name),
             visible: true
           }
         end.compact
@@ -200,17 +206,19 @@ 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
 

data/lib/motor/build_schema/persist_resource_configs.rb

@@ -3,9 +3,9 @@
 module Motor
   module BuildSchema
     module PersistResourceConfigs
-      RESOURCE_ATTRS = %w[display_name visible].freeze
+      RESOURCE_ATTRS = %w[display_name icon visible].freeze
       COLUMN_ATTRS = %w[name display_name column_type access_type default_value virtual format].freeze
-      ASSOCIATION_ATTRS = %w[name display_name visible].freeze
+      ASSOCIATION_ATTRS = %w[name display_name icon visible].freeze
       SCOPE_ATTRS = %w[name display_name scope_type preferences visible].freeze
       ACTION_ATTRS = %w[name display_name action_type preferences visible].freeze
       TAB_ATTRS = %w[name display_name tab_type preferences visible].freeze

data/lib/motor/build_schema/utils.rb

@@ -3,6 +3,15 @@
 module Motor
   module BuildSchema
     module Utils
+      ABBREVIATIONS = {
+        'id' => 'ID',
+        'url' => 'URL',
+        'iso' => 'ISO',
+        'vip' => 'VIP',
+        'ip' => 'IP',
+        'zip' => 'ZIP'
+      }.freeze
+
       module_function
 
       def slugify(model)
@@ -12,6 +21,10 @@ module Motor
       def classify_slug(slug)
         slug.singularize.gsub('__', '/').classify.constantize
       end
+
+      def humanize_column_name(column_name)
+        ABBREVIATIONS.fetch(column_name, column_name.humanize)
+      end
     end
   end
 end

data/lib/motor/configs/build_ui_app_tag.rb

@@ -7,26 +7,27 @@ module Motor
         if Motor.development?
           ActiveSupport::Cache::NullStore.new
         else
-          ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes)
+          ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes,
+                                                coder: ActiveSupport::Cache::NullCoder)
         end
 
       module_function
 
-      def call
+      def call(current_user = nil)
         cache_keys = LoadFromCache.load_cache_keys
 
-        CACHE_STORE.fetch(cache_keys.hash) do
+        CACHE_STORE.fetch("#{cache_keys.hash}#{current_user&.id}") do
           CACHE_STORE.clear
 
-          Motor::ApplicationController.helpers.content_tag(
-            :div, '', id: 'app', data: build_data(cache_keys)
-          )
+          Motor::ApplicationController.helpers.tag.div('', id: 'app', data: build_data(cache_keys, current_user))
         end
       end
 
       # @return [Hash]
-      def build_data(cache_keys = {})
+      def build_data(cache_keys = {}, current_user = nil)
         {
+          current_user: current_user&.as_json(only: %i[id email]),
+          audits_count: Motor::Audit.count,
           base_path: Motor::Admin.routes.url_helpers.motor_path,
           schema: Motor::BuildSchema.call(cache_keys),
           header_links: header_links_data_hash(cache_keys[:configs]),

data/lib/motor/configs/load_from_cache.rb

@@ -3,7 +3,8 @@
 module Motor
   module Configs
     module LoadFromCache
-      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 10.megabytes)
+      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 10.megabytes,
+                                                          coder: ActiveSupport::Cache::NullCoder)
 
       module_function
 
@@ -57,24 +58,28 @@ module Motor
       end
 
       def maybe_fetch_from_cache(type, cache_key, &block)
-        return block.call unless cache_key
+        return yield unless cache_key
 
         CACHE_STORE.fetch(type + cache_key.to_s, &block)
       end
 
       def load_cache_keys
-        ActiveRecord::Base.connection.execute(
-          "(#{
-            [
-              Motor::Config.select("'configs', MAX(updated_at)").to_sql,
-              Motor::Resource.select("'resources', MAX(updated_at)").to_sql,
-              Motor::Dashboard.select("'dashboards', MAX(updated_at)").to_sql,
-              Motor::Alert.select("'alerts', MAX(updated_at)").to_sql,
-              Motor::Query.select("'queries', MAX(updated_at)").to_sql,
-              Motor::Form.select("'forms', MAX(updated_at)").to_sql
-            ].join(') UNION (')
-          })"
-        ).to_a.map(&:values).to_h.with_indifferent_access
+        result = ActiveRecord::Base.connection.execute(cache_keys_sql).to_a
+
+        result = result.map(&:values) if result.first.is_a?(Hash)
+
+        result.to_h.with_indifferent_access
+      end
+
+      def cache_keys_sql
+        [
+          Motor::Config.select("'configs', MAX(updated_at)").to_sql,
+          Motor::Resource.select("'resources', MAX(updated_at)").to_sql,
+          Motor::Dashboard.select("'dashboards', MAX(updated_at)").to_sql,
+          Motor::Alert.select("'alerts', MAX(updated_at)").to_sql,
+          Motor::Query.select("'queries', MAX(updated_at)").to_sql,
+          Motor::Form.select("'forms', MAX(updated_at)").to_sql
+        ].join(' UNION ')
       end
     end
   end