motor-admin 0.1.46 → 0.1.51

data/lib/motor.rb

@@ -40,7 +40,6 @@ module Motor
       (defined?(::Puma) && File.basename($PROGRAM_NAME) == 'puma') ||
       defined?(::Unicorn::HttpServer) ||
       defined?(::Mongrel::HttpServer) ||
-      defined?(::WEBrick::VERSION) ||
       defined?(JRuby::Rack::VERSION) ||
       defined?(::Trinidad::Server)
   end

data/lib/motor/active_record_utils.rb

@@ -1,6 +1,18 @@
 # frozen_string_literal: true
 
-module ActiveRecordUtils
+module Motor
+  module ActiveRecordUtils
+    module_function
+
+    def reset_id_sequence!(model)
+      case ActiveRecord::Base.connection.class.name
+      when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
+        ActiveRecord::Base.connection.reset_pk_sequence!(model.table_name)
+      else
+        ActiveRecord::Base.connection.reset_sequence!(model.table_name, 'id')
+      end
+    end
+  end
 end
 
 require_relative './active_record_utils/types'

data/lib/motor/admin.rb

@@ -43,7 +43,7 @@ module Motor
     end
 
     initializer 'motor.alerts.scheduler' do
-      config.after_initialize do |_app|
+      config.after_initialize do
         next unless Motor.server?
 
         Motor::Alerts::Scheduler::SCHEDULER_TASK.execute

data/lib/motor/alerts/persistance.rb

@@ -28,7 +28,7 @@ module Motor
       end
 
       def create_from_params!(params, current_user = nil)
-        raise NameAlreadyExists if Alert.exists?(['lower(name) = ?', params[:name].to_s.downcase])
+        raise NameAlreadyExists if Alert.exists?(name: params[:name])
 
         alert = build_from_params(params, current_user)
 
@@ -77,7 +77,7 @@ module Motor
       end
 
       def archive_with_existing_name(alert)
-        Motor::Alert.where(['lower(name) = ? AND id != ?', alert.name.to_s.downcase, alert.id])
+        Motor::Alert.where(['name = ? AND id != ?', alert.name, alert.id])
                     .update_all(deleted_at: Time.current)
       end
 
@@ -87,9 +87,9 @@ module Motor
 
       def name_already_exists?(alert)
         if alert.new_record?
-          Alert.exists?(['lower(name) = ?', alert.name.to_s.downcase])
+          Alert.exists?(name: alert.name)
         else
-          Alert.exists?(['lower(name) = ? AND id != ?', alert.name.to_s.downcase, alert.id])
+          Alert.exists?(['name = ? AND id != ?', alert.name, alert.id])
         end
       end
     end

data/lib/motor/alerts/scheduled_alerts_cache.rb

@@ -3,7 +3,8 @@
 module Motor
   module Alerts
     module ScheduledAlertsCache
-      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes)
+      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes,
+                                                          coder: ActiveSupport::Cache::NullCoder)
 
       module_function
 

data/lib/motor/alerts/scheduler.rb

@@ -3,7 +3,7 @@
 module Motor
   module Alerts
     module Scheduler
-      SCHEDULER_INTERVAL = 10.seconds
+      SCHEDULER_INTERVAL = 1.minute
       CHECK_BEHIND_DURATION = 15.minutes
 
       SCHEDULER_TASK = Concurrent::TimerTask.new(

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

@@ -10,12 +10,12 @@ module Motor
 
         rel = rel.preload_associations_lazily if rel.is_a?(ActiveRecord::Relation)
 
-        json_params = {}
+        json_params = {}.with_indifferent_access
 
         assign_include_params(json_params, rel, params)
         assign_fields_params(json_params, rel, params)
 
-        rel.as_json(json_params.with_indifferent_access)
+        rel.as_json(json_params)
       end
 
       def assign_include_params(json_params, _rel, api_params)
@@ -51,11 +51,11 @@ module Motor
         params[:fields].each do |key, fields|
           fields = fields.split(',') if fields.is_a?(String)
 
-          merge_fields_params!(key, fields, json_params, model)
+          merge_fields_params!(json_params, key, fields, model)
         end
       end
 
-      def merge_fields_params!(key, fields, json_params, model)
+      def merge_fields_params!(json_params, key, fields, model)
         model_name = model.name.underscore
 
         if key == model_name || model_name.split('/').last == key
@@ -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/paginate.rb

@@ -11,6 +11,7 @@ module Motor
         params ||= {}
 
         rel = rel.limit([MAX_PER_PAGE, (params[:limit] || MAX_PER_PAGE).to_i].min)
+
         rel.offset(params[:offset].to_i)
       end
     end

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

@@ -16,7 +16,7 @@ module Motor
 
     def icons
       manifest.select do |k, v|
-        !k.ends_with?('.gz') && v.starts_with?('icons/') && !v.include?('DS_Store')
+        !k.ends_with?('.gz') && v.starts_with?('icons/') && v.exclude?('DS_Store')
       end.keys
     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

@@ -3,10 +3,17 @@
 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',
@@ -28,7 +35,6 @@ module Motor
       'token' => 'key',
       'secret' => 'lock',
       'automation' => 'manual-gearbox',
-      'email' => 'mail',
       'relationship' => 'hierarchy',
       'person' => 'user',
       'people' => 'users',
@@ -43,7 +49,6 @@ module Motor
       'rule' => 'manual-gearbox',
       'tracking' => 'zoom-question',
       'github' => 'brand-github',
-      'block' => 'ban',
       'tag' => 'hash',
       'category' => 'hash',
       'label' => 'hash',
@@ -60,15 +65,11 @@ module Motor
       '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',
@@ -105,7 +106,8 @@ module Motor
       'subscriber' => 'user-plus',
       'product' => 'building-store',
       'html' => 'code',
-      'stripe' => 'brand-stripe'
+      'stripe' => 'brand-stripe',
+      'email' => 'mail'
     }.freeze
 
     DEFAULT_ICON = 'database'

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)
 
@@ -101,7 +104,7 @@ module Motor
           name: column.name,
           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),

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

data/lib/motor/configs/sync_from_hash.rb

@@ -87,7 +87,7 @@ module Motor
 
         archive_taggable_items(records - processed_records, configs_timestamp)
 
-        ActiveRecord::Base.connection.reset_pk_sequence!(records.klass.table_name)
+        ActiveRecordUtils.reset_id_sequence!(records.klass)
       end
 
       def update_taggable_items(records, config_items, update_proc)

data/lib/motor/configs/sync_with_remote.rb

@@ -9,7 +9,7 @@ module Motor
       module_function
 
       def call(remote_url, api_key)
-        url = remote_url.sub(%r{/\z}, '') + Motor::Configs::SYNC_API_PATH
+        url = remote_url.delete_suffix('/') + Motor::Configs::SYNC_API_PATH
 
         sync_from_remote!(url, api_key)
         sync_to_remote!(url, api_key)

data/lib/motor/configs/write_to_file.rb

@@ -9,6 +9,7 @@ module Motor
       module_function
 
       def call
+        return if Rails.env.test?
         return if THREAD_POOL.queue_length.positive?
 
         THREAD_POOL.post do

data/lib/motor/dashboards/persistance.rb

@@ -16,7 +16,7 @@ module Motor
       end
 
       def create_from_params!(params, current_user = nil)
-        raise TitleAlreadyExists if Dashboard.exists?(['lower(title) = ?', params[:title].to_s.downcase])
+        raise TitleAlreadyExists if Dashboard.exists?(title: params[:title])
 
         dashboard = build_from_params(params, current_user)
 
@@ -57,15 +57,15 @@ module Motor
       end
 
       def archive_with_existing_name(dashboard)
-        Motor::Dashboard.where(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
+        Motor::Dashboard.where(['title = ? AND id != ?', dashboard.title, dashboard.id])
                         .update_all(deleted_at: Time.current)
       end
 
       def title_already_exists?(dashboard)
         if dashboard.new_record?
-          Motor::Dashboard.exists?(['lower(title) = ?', dashboard.title.to_s.downcase])
+          Motor::Dashboard.exists?(title: dashboard.title)
         else
-          Motor::Dashboard.exists?(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
+          Motor::Dashboard.exists?(['title = ? AND id != ?', dashboard.title, dashboard.id])
         end
       end
     end

data/lib/motor/forms/persistance.rb

@@ -16,7 +16,7 @@ module Motor
       end
 
       def create_from_params!(params, current_user = nil)
-        raise NameAlreadyExists if Form.exists?(['lower(name) = ?', params[:name].to_s.downcase])
+        raise NameAlreadyExists if Form.exists?(name: params[:name])
 
         form = build_from_params(params, current_user)
 
@@ -57,15 +57,15 @@ module Motor
       end
 
       def archive_with_existing_name(form)
-        Motor::Form.where(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
+        Motor::Form.where(['name = ? AND id != ?', form.name, form.id])
                    .update_all(deleted_at: Time.current)
       end
 
       def name_already_exists?(form)
         if form.new_record?
-          Motor::Form.exists?(['lower(name) = ?', form.name.to_s.downcase])
+          Motor::Form.exists?(['name = ?', form.name])
         else
-          Motor::Form.exists?(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
+          Motor::Form.exists?(['name = ? AND id != ?', form.name, form.id])
         end
       end
     end