motor-admin 0.1.44 → 0.1.50

data/app/models/motor/tag.rb

@@ -2,6 +2,6 @@
 
 module Motor
   class Tag < ::Motor::ApplicationRecord
-    has_many :taggable_tags
+    has_many :taggable_tags, dependent: :destroy
   end
 end

data/app/views/motor/alerts_mailer/alert_email.html.erb

@@ -92,7 +92,7 @@
                                   <th><%= column[:name] %></th>
                                 <% end %>
                               </tr>
-                              <% @query_result.data.first(100).each do |row| %>
+                              <% @query_result.data.first(40).each do |row| %>
                                 <tr>
                                   <% row.each do |col| %>
                                     <td><%= col.respond_to?(:strftime) ? l(col, format: :long) : col.to_s.truncate(100) %></th>

data/app/views/motor/ui/show.html.erb

@@ -1 +1 @@
-<%= raw(Motor::Configs::BuildUiAppTag.call) %>
+<%= raw(Motor::Configs::BuildUiAppTag.call(current_user)) %>

data/config/routes.rb

@@ -2,7 +2,7 @@
 
 Motor::Admin.routes.draw do
   namespace :motor, path: '' do
-    scope 'api', as: 'api' do
+    scope 'api', as: :api do
       resources :run_queries, only: %i[show create]
       resources :send_alerts, only: %i[create]
       resources :queries, only: %i[index show create update destroy]
@@ -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]
@@ -33,16 +34,15 @@ Motor::Admin.routes.draw do
 
     get '/', to: 'ui#show'
 
-    scope as: 'ui' do
+    scope as: :ui do
+      get '/data(/*path)', to: 'ui#index', as: :data
+
       with_options controller: 'ui' do
-        resources :data, only: %i[index show],
-                         param: 'path',
-                         constraints: { path: /.+/ }
         resources :reports, only: %i[index show]
-        resources :queries, only: %i[index show]
-        resources :dashboards, only: %i[index show]
-        resources :alerts, only: %i[index show]
-        resources :forms, only: %i[index show]
+        resources :queries, only: %i[index show new]
+        resources :dashboards, only: %i[index show new]
+        resources :alerts, only: %i[index show new]
+        resources :forms, only: %i[index show new]
       end
     end
   end

data/lib/generators/motor/templates/install.rb

@@ -1,62 +1,65 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def self.up
     create_table :motor_queries do |t|
-      t.column :name, :string, null: false
-      t.column :description, :string
-      t.column :sql_body, :string, null: false
-      t.column :preferences, :string, null: false, default: '{}'
-      t.column :author_id, :integer
-      t.column :author_type, :string
+      t.column :name, :text, null: false
+      t.column :description, :text
+      t.column :sql_body, :text, null: false
+      t.column :preferences, :text, null: false
+      t.column :author_id, :bigint
+      t.column :author_type, :text
       t.column :deleted_at, :datetime
 
       t.timestamps
 
       t.index :updated_at
-      t.index 'lower(name)',
-              name: 'motor_queries_lower_name_unique_index',
+      t.index 'name',
+              name: 'motor_queries_name_unique_index',
               unique: true,
-              where: 'deleted_at IS NULL'
+              where: 'deleted_at IS NULL',
+              length: { name: 255 }
     end
 
     create_table :motor_dashboards do |t|
-      t.column :title, :string, null: false
-      t.column :description, :string
-      t.column :preferences, :string, null: false, default: '{}'
-      t.column :author_id, :integer
-      t.column :author_type, :string
+      t.column :title, :text, null: false
+      t.column :description, :text
+      t.column :preferences, :text, null: false
+      t.column :author_id, :bigint
+      t.column :author_type, :text
       t.column :deleted_at, :datetime
 
       t.timestamps
 
       t.index :updated_at
-      t.index 'lower(title)',
-              name: 'motor_dashboards_lower_title_unique_index',
+      t.index 'title',
+              name: 'motor_dashboards_title_unique_index',
               unique: true,
-              where: 'deleted_at IS NULL'
+              where: 'deleted_at IS NULL',
+              length: { title: 255 }
     end
 
     create_table :motor_forms do |t|
-      t.column :name, :string, null: false
-      t.column :description, :string
-      t.column :api_path, :string, null: false
-      t.column :http_method, :string, null: false
-      t.column :preferences, :string, null: false, default: '{}'
-      t.column :author_id, :integer
-      t.column :author_type, :string
+      t.column :name, :text, null: false
+      t.column :description, :text
+      t.column :api_path, :text, null: false
+      t.column :http_method, :text, null: false
+      t.column :preferences, :text, null: false
+      t.column :author_id, :bigint
+      t.column :author_type, :text
       t.column :deleted_at, :datetime
 
       t.timestamps
 
       t.index :updated_at
-      t.index 'lower(name)',
-              name: 'motor_forms_lower_name_unique_index',
+      t.index 'name',
+              name: 'motor_forms_name_unique_index',
               unique: true,
-              where: 'deleted_at IS NULL'
+              where: 'deleted_at IS NULL',
+              length: { name: 255 }
     end
 
     create_table :motor_resources do |t|
-      t.column :name, :string, null: false, index: { unique: true }
-      t.column :preferences, :string, null: false, default: '{}'
+      t.column :name, :text, null: false, index: { unique: true, length: 255 }
+      t.column :preferences, :text, null: false
 
       t.timestamps
 
@@ -64,8 +67,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     end
 
     create_table :motor_configs do |t|
-      t.column :key, :string, null: false, index: { unique: true }
-      t.column :value, :string, null: false, default: '{}'
+      t.column :key, :text, null: false, index: { unique: true, length: 255 }
+      t.column :value, :text, null: false
 
       t.timestamps
 
@@ -74,74 +77,80 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
 
     create_table :motor_alerts do |t|
       t.references :query, null: false, foreign_key: { to_table: :motor_queries }, index: true
-      t.column :name, :string, null: false
-      t.column :description, :string
-      t.column :to_emails, :string, null: false
+      t.column :name, :text, null: false
+      t.column :description, :text
+      t.column :to_emails, :text, null: false
       t.column :is_enabled, :boolean, null: false, default: true
-      t.column :preferences, :string, null: false, default: '{}'
-      t.column :author_id, :integer
-      t.column :author_type, :string
+      t.column :preferences, :text, null: false
+      t.column :author_id, :bigint
+      t.column :author_type, :text
       t.column :deleted_at, :datetime
 
       t.timestamps
 
       t.index :updated_at
-      t.index 'lower(name)',
-              name: 'motor_alerts_lower_name_unique_index',
+      t.index 'name',
+              name: 'motor_alerts_name_unique_index',
               unique: true,
-              where: 'deleted_at IS NULL'
+              where: 'deleted_at IS NULL',
+              length: { name: 255 }
     end
 
     create_table :motor_alert_locks do |t|
       t.references :alert, null: false, foreign_key: { to_table: :motor_alerts }
-      t.column :lock_timestamp, :string, null: false
+      t.column :lock_timestamp, :text, null: false
 
       t.timestamps
 
-      t.index %i[alert_id lock_timestamp], unique: true
+      t.index %i[alert_id lock_timestamp], unique: true, length: { lock_timestamp: 255 }
     end
 
     create_table :motor_tags do |t|
-      t.column :name, :string, null: false
+      t.column :name, :text, null: false
 
       t.timestamps
 
-      t.index 'lower(name)',
-              name: 'motor_tags_lower_name_unique_index',
-              unique: true
+      t.index 'name',
+              name: 'motor_tags_name_unique_index',
+              unique: true,
+              length: { name: 255 }
     end
 
     create_table :motor_taggable_tags do |t|
       t.references :tag, null: false, foreign_key: { to_table: :motor_tags }, index: true
-      t.column :taggable_id, :integer, null: false
-      t.column :taggable_type, :string, null: false
+      t.column :taggable_id, :bigint, null: false
+      t.column :taggable_type, :text, null: false
 
       t.index %i[taggable_id taggable_type tag_id],
               name: 'motor_polymorphic_association_tag_index',
-              unique: true
+              unique: true,
+              length: { taggable_type: 255 }
     end
 
     create_table :motor_audits do |t|
-      t.column :auditable_id, :integer
-      t.column :auditable_type, :string
-      t.column :associated_id, :integer
-      t.column :associated_type, :string
-      t.column :user_id, :integer
-      t.column :user_type, :string
-      t.column :username, :string
-      t.column :action, :string
+      t.column :auditable_id, :bigint
+      t.column :auditable_type, :text
+      t.column :associated_id, :bigint
+      t.column :associated_type, :text
+      t.column :user_id, :bigint
+      t.column :user_type, :text
+      t.column :username, :text
+      t.column :action, :text
       t.column :audited_changes, :text
-      t.column :version, :integer, default: 0
-      t.column :comment, :string
-      t.column :remote_address, :string
-      t.column :request_uuid, :string
+      t.column :version, :bigint, default: 0
+      t.column :comment, :text
+      t.column :remote_address, :text
+      t.column :request_uuid, :text
       t.column :created_at, :datetime
     end
 
-    add_index :motor_audits, %i[auditable_type auditable_id version], name: 'motor_auditable_index'
-    add_index :motor_audits, %i[associated_type associated_id], name: 'motor_auditable_associated_index'
-    add_index :motor_audits, %i[user_id user_type], name: 'motor_auditable_user_index'
-    add_index :motor_audits, :request_uuid
+    add_index :motor_audits, %i[auditable_type auditable_id version], name: 'motor_auditable_index',
+                                                                      length: { auditable_type: 255 }
+    add_index :motor_audits, %i[associated_type associated_id], name: 'motor_auditable_associated_index',
+                                                                length: { associated_type: 255 }
+    add_index :motor_audits, %i[user_id user_type], name: 'motor_auditable_user_index',
+                                                    length: { user_type: 255 }
+    add_index :motor_audits, :request_uuid, length: { request_uuid: 255 }
     add_index :motor_audits, :created_at
   end
 

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/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/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