motor-admin 0.1.44 → 0.1.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74c91b2c5dbc0b48fa75a4fa9f5ec2eb8a3848b2e65cf819b9ddc3317e379a19
-  data.tar.gz: bee5733d821cde96004674d36c9be0467e32044d921a4b52e863b4be4e3de55b
+  metadata.gz: 7c9b9e07d46ccb90c2b32def4d67841e5898a6c966377694d3f0984c4a816c71
+  data.tar.gz: 22a9a172949c4276489da4be065ed5ae04a89902fadcc327853809cbf8e7cbfb
 SHA512:
-  metadata.gz: 9bb22f83f9c270696f2d32cc384b98d90a5dab99f7f377258682dbc3622bd574ea0c6bf43de5cd955bb551dd56d6d43b4e618a53803a7d91417a7ec88ae9571f
-  data.tar.gz: 6e1f295abe63ca50e7176789523747810384307c03bcf5c4c719cc41a85296573fb0f6c3e193f06e625ed5801c204a519675539719d966357398293fe3a10977
+  metadata.gz: d2062e9bb0b9573acc873f70736bacd6aa721dfda35e40583d8ea3871404203e2d8ea09fdb08de6f0100e81d12b72f2670e1c69fdc4cd94039b8820351d6b391
+  data.tar.gz: 97920cbbf18eb72bc6d5e0d6c3513c14dfb3cd8b0b273bc5a67ca4945f54babc19577fab6fcd217813f72ef48dd3b07757387a323193a28a0b33b0d08472d562

data/Rakefile

@@ -2,19 +2,10 @@
 
 require 'bundler/setup'
 
-APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
+
 load 'rails/tasks/engine.rake'
 
 load 'rails/tasks/statistics.rake'
 
 require 'bundler/gem_tasks'
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-task default: :test

data/app/controllers/motor/api_base_controller.rb

@@ -2,6 +2,12 @@
 
 module Motor
   class ApiBaseController < ActionController::API
+    rescue_from StandardError do |e|
+      Rails.logger.error(e)
+
+      render json: { errors: [e.message] }, status: :internal_server_error
+    end
+
     def current_user
       if defined?(current_admin)
         current_admin

data/app/controllers/motor/assets_controller.rb

@@ -6,12 +6,14 @@ module Motor
 
     GZIP_TYPES = [
       'application/javascript',
-      'text/css'
+      'text/css',
+      'image/svg+xml'
     ].freeze
 
     MIME_TYPES = {
       '.js' => 'application/javascript',
       '.css' => 'text/css',
+      '.svg' => 'image/svg+xml',
       '.woff2' => 'font/woff2'
     }.freeze
 

data/app/controllers/motor/data_controller.rb

@@ -26,8 +26,6 @@ module Motor
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params) }
     rescue ActiveRecord::RecordInvalid
       render json: { errors: @resource.errors }, status: :unprocessable_entity
-    rescue StandardError => e
-      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def update
@@ -36,8 +34,6 @@ module Motor
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params) }
     rescue ActiveRecord::RecordInvalid
       render json: { errors: @resource.errors }, status: :unprocessable_entity
-    rescue StandardError => e
-      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def destroy
@@ -54,8 +50,6 @@ module Motor
       @resource.public_send(params[:method].to_sym)
 
       head :ok
-    rescue StandardError => e
-      render json: { message: e.message }, status: :unprocessable_entity
     end
 
     private

data/app/controllers/motor/icons_controller.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Motor
+  class IconsController < ApiBaseController
+    CACHE_STORE = ActiveSupport::Cache::MemoryStore.new
+
+    def index
+      data = CACHE_STORE.fetch('icons') do
+        Motor::Assets.icons.map do |icon|
+          svg = Motor::Assets.load_asset("icons/#{icon}", gzip: !Motor.development?)
+          svg = ActiveSupport::Gzip.decompress(svg) unless Motor.development?
+
+          [icon, svg]
+        end
+      end
+
+      render json: { data: data }
+    end
+  end
+end

data/config/routes.rb

@@ -13,6 +13,7 @@ Motor::Admin.routes.draw do
       resources :dashboards, only: %i[index show create update destroy]
       resources :forms, only: %i[index show create update destroy]
       resources :alerts, only: %i[index show create update destroy]
+      resources :icons, only: %i[index]
       resources :active_storage_attachments, only: %i[create], path: 'data/active_storage__attachments'
       resource :schema, only: %i[show update]
       resources :audits, only: %i[index]

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/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.include?('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/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_icon.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module Motor
+  module FindIcon
+    ICONS_MAP = {
+      'website' => 'world',
+      'location' => 'gps',
+      'photo' => 'photo',
+      'image' => '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',
+      'email' => 'mail',
+      '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',
+      'block' => 'ban',
+      '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',
+      'blocked' => 'ban',
+      'blacklisted' => 'ban',
+      'blocklisted' => 'ban',
+      'chat' => 'message-circle',
+      'message' => 'messages',
+      'poll' => 'messages',
+      'feedpack' => 'messages',
+      'attachment' => 'paperclip',
+      'banned' => 'ban',
+      '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'
+    }.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

@@ -55,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,
@@ -98,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),
@@ -155,6 +156,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 +177,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 +203,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/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/version.rb

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