motor-admin 0.1.47 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7c564e999344d1cd2b2939b095e1e5c0b27d441b176365192275f623a1a887
-  data.tar.gz: 748ecbf8188b5375efb7b957503f1d0986144e0fd394956edf81677623a73a59
+  metadata.gz: 8798474d7c7dc20d6410dd00f13950997be5e3f5d67e1d2585a57af92cd8db10
+  data.tar.gz: 90fcc0b1835fe56b78ecfcc28de03f9d4397b213f6e499afc626c3f4d13b1ef9
 SHA512:
-  metadata.gz: 8faab90b6e21873a78e2eab889d2a328550c4533b922040662011930d89e6d9e515ba1eb860ed2978033ab339b0cd686250994cf8ee8a70b89223fb66337ecb5
-  data.tar.gz: f51c89fdcd5f453793b89a37b4868f282ed2bb5d457cd4cb50b0a786592ccbceb8d0d458a98fa19a3b176698a1787b1845e7321a18ad5d3d11bbd94dd4684ca2
+  metadata.gz: c3a34e36e74e5004508e420ba4cdf95e2784d52647dfefccb64fc078b2785cbdd42a7aad84ca41f4c86e2c680b76516f219a41739b7d19601798dda4c9319e06
+  data.tar.gz: 727c31fafba431b69e3206d0fb2cff568171760cd43b36b9a42e97a356d5e344c7cacb069c5e9e79899e0fa804f39fd122ae14e30aece4cb77ca64de31620c5f

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Pete Matsyburka
+Copyright (c) 2021 Pete Matsyburka <pete.matsy@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,9 +2,9 @@
 
 Low-code Admin panel and Business intelligence Rails engine **(no DSL - configurable from the UI)**.
 
-🤓 [Demo App](https://motor-admin-demo.herokuapp.com)
+🤓 [Demo App](https://motor-admin.herokuapp.com/demo) | [Features overview](https://www.youtube.com/watch?v=ngVoci8Hll4&list=PLu7llEMh0KcOkR3Uy_RJT0cXPZQKAYVsq&index=1)
 
-[![Admin Panel](https://user-images.githubusercontent.com/5418788/119258612-2351f780-bbd3-11eb-8264-2e044cde868d.png)](https://motor-admin-demo.herokuapp.com)
+[![Admin Panel](https://user-images.githubusercontent.com/5418788/119318538-1f30e300-bc82-11eb-94a4-107c31c93b13.png)](https://motor-admin.herokuapp.com/demo)
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -20,7 +20,7 @@ $ bundle install
 
 Create and run migration:
 ```bash
-$ rails generate motor:install && rake db:migrate
+$ rails motor:install && rake db:migrate
 ```
 
 ## Features
@@ -38,11 +38,11 @@ $ rails generate motor:install && rake db:migrate
 
 ### Customizable CRUD
 
-![Resource settings](https://user-images.githubusercontent.com/5418788/119262945-b136de00-bbe5-11eb-846a-6e01c8c42904.png)
+![Resource settings](https://user-images.githubusercontent.com/5418788/119318569-2a840e80-bc82-11eb-9ba3-f3964eb6f997.png)
 
 ![Settings UI](https://user-images.githubusercontent.com/5418788/119263883-90708780-bbe9-11eb-9f9f-f76fed0b7f27.png)
 
-Everything in the admin panel can be configured using the intuitive settings that can be opened via the icon in the top right corner.
+Everything in the admin panel can be configured using intuitive settings UI, which can be opened via the icon in the top right corner.
 
 Data displayed on the resource page can be completely custimized via [SQL queries](#sql-queries) and [dashboards](#dashboards) attached to the resource as a tab. Usually, queries used to display resource data should contain `{{resource_name_id}}` [variable](#sql-queries).
 
@@ -50,13 +50,13 @@ Data displayed on the resource page can be completely custimized via [SQL querie
 
 ![Custom actions](https://user-images.githubusercontent.com/5418788/119266132-3c1dd580-bbf2-11eb-9666-09e1640eaf7b.png)
 
-Custom resource actions can be added via Active Record method call, API endpoint, or [custom forms](#forms-builder). Also, it's possible to override default Create/Update/Delete actions.
+Custom resource actions can be added via Active Record method call, API endpoint, or [custom forms](#forms-builder). Also, it's possible to override default create/update/delete actions.
 
 ### Forms Builder
 
 ![Custom form](https://user-images.githubusercontent.com/5418788/119264008-1391dd80-bbea-11eb-9f14-cb405e77fb60.png)
 
-Values from the form fields can be used in API path via `{field_name}` syntax: `/api/some-endpoint/{field_name}/apply`
+Values from the form fields can be used in API path via `{field_name}` syntax: `/api/some-endpoint/{resource_id}/apply`
 
 ### SQL Queries
 
@@ -68,7 +68,7 @@ Queries can include embeded variables via `{{variable}}` syntax ([mustache](http
 
 ![motor-visualization](https://user-images.githubusercontent.com/5418788/119264625-a2075e80-bbec-11eb-986c-6106dd6e47ce.png)
 
-Data from the SQL query can be represented as: [table](https://motor-admin-demo.herokuapp.com/queries/12), [number](https://motor-admin-demo.herokuapp.com/queries/6), [line chart](https://motor-admin-demo.herokuapp.com/queries/3), [bar chart](https://motor-admin-demo.herokuapp.com/queries/1), [pie chart](https://motor-admin-demo.herokuapp.com/queries/9), [funnel](https://motor-admin-demo.herokuapp.com/queries/7), [markdown](https://motor-admin-demo.herokuapp.com/queries/8)
+Data from the SQL query can be represented as: [table](https://motor-admin.herokuapp.com/demo/queries/12), [number](https://motor-admin.herokuapp.com/demo/queries/6), [line chart](https://motor-admin.herokuapp.com/demo/queries/3), [bar chart](https://motor-admin.herokuapp.com/demo/queries/1), [pie chart](https://motor-admin.herokuapp.com/demo/queries/9), [funnel](https://motor-admin.herokuapp.com/demo/queries/7), [markdown](https://motor-admin.herokuapp.com/demo/queries/8)
 
 ### Dashboards
 
@@ -80,20 +80,20 @@ SQL queries can be organized into dashboards to create a convenient representati
 
 ![Email alert](https://user-images.githubusercontent.com/5418788/119265049-feb74900-bbed-11eb-8070-bcc8d6113b9b.png)
 
-Query data can be sent via email periodically using the alerts feature. Interval of the alert email can be specified using natural language, e.g. `every day at midnight`, `every Monday at 8 PM`, `every weekday at 6AM and 6PM`, `every minute`.
+Query data can be sent via email periodically using the alerts feature. Interval of the alert email can be specified using natural language, e.g., `every day at midnight`, `every Monday at 8 PM`, `every weekday at 6AM and 6PM`, `every minute`.
 
-The sender address can be specified using `MOTOR_ADMIN_FROM_ADDRESS` environment variable.
+Sender address can be specified using `MOTOR_ALERTS_FROM_ADDRESS` environment variable.
 
 ### Intelligence Search
 
 ![Intelligence search](https://user-images.githubusercontent.com/5418788/119266559-eea26800-bbf3-11eb-8cb3-d0538aa386a9.png)
 
-Intelligence search can be opened from the top right corner or using <kbd>Cmd</kbd> + <kbd>P</kbd> shortcut.
+Intelligence search can be opened via the top right corner button or using <kbd>Cmd</kbd> + <kbd>P</kbd> shortcut.
 
 
 ### Optimized for Mobile
 
-![motor-mobile](https://user-images.githubusercontent.com/5418788/119265905-38d61a00-bbf1-11eb-95c8-a4c95a2d77f7.png)
+![motor-mobile](https://user-images.githubusercontent.com/5418788/119269566-03392d00-bc01-11eb-9e9d-1f6a58fe0749.png)
 
 
 ### Configurations Sync
@@ -127,6 +127,12 @@ Start webpack dev server:
 yarn install && yarn serve
 ```
 
+Setup development database:
+
+```bash
+rake app:db:create && rake app:db:setup
+```
+
 Start example application in development mode:
 
 ```bash
@@ -143,4 +149,4 @@ MOTOR_DEVELOPMENT=true rails s
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](https://github.com/omohokcoj/motor-admin/blob/master/LICENSE).

data/app/controllers/concerns/motor/current_user_method.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Motor
+  module CurrentUserMethod
+    def current_user
+      if defined?(current_admin)
+        current_admin
+      elsif defined?(current_admin_user)
+        current_admin_user
+      elsif defined?(super)
+        super
+      end
+    end
+  end
+end

data/app/controllers/motor/api_base_controller.rb

@@ -2,30 +2,26 @@
 
 module Motor
   class ApiBaseController < ActionController::API
-    rescue_from StandardError do |e|
-      Rails.logger.error(e)
+    include Motor::CurrentUserMethod
 
-      render json: { errors: [e.message] }, status: :internal_server_error
-    end
+    class CanCanAbilityManageAll
+      include CanCan::Ability
 
-    def current_user
-      if defined?(current_admin)
-        current_admin
-      elsif defined?(current_admin_user)
-        current_admin_user
-      elsif defined?(super)
-        super
+      def initialize(_)
+        can :manage, :all
       end
     end
 
-    def current_ability
-      klass = Class.new
-      klass.include(CanCan::Ability)
-      klass.define_method(:initialize) do |_user|
-        can :manage, :all
+    unless Rails.env.test?
+      rescue_from StandardError do |e|
+        Rails.logger.error(e)
+
+        render json: { errors: [e.message] }, status: :internal_server_error
       end
+    end
 
-      klass.new(current_user)
+    def current_ability
+      CanCanAbilityManageAll.new(current_user)
     end
   end
 end

data/app/controllers/motor/application_controller.rb

@@ -2,5 +2,6 @@
 
 module Motor
   class ApplicationController < ActionController::Base
+    include Motor::CurrentUserMethod
   end
 end

data/app/controllers/motor/assets_controller.rb

@@ -20,7 +20,7 @@ module Motor
     def show
       filename = params[:filename]
 
-      return [404, {}, ''] unless Motor::Assets.manifest.values.include?(filename)
+      return [404, {}, ''] unless Motor::Assets.manifest.value?(filename)
 
       assign_headers(filename)
 

data/app/controllers/motor/ui_controller.rb

@@ -4,15 +4,23 @@ module Motor
   class UiController < ApplicationController
     layout 'motor/application'
 
-    def index
-      Motor.reload! if Motor.development?
+    helper_method :current_user
 
-      Motor::Configs::SyncFromFile.call
+    def index
+      render_ui
+    end
 
-      render :show
+    def new
+      render_ui
     end
 
     def show
+      render_ui
+    end
+
+    private
+
+    def render_ui
       Motor.reload! if Motor.development?
 
       Motor::Configs::SyncFromFile.call

data/app/mailers/motor/alerts_mailer.rb

@@ -26,11 +26,11 @@ module Motor
     end
 
     def from_address
-      from = ENV['MOTOR_ADMIN_FROM_ADDRESS'].presence
+      from = ENV['MOTOR_ALERTS_FROM_ADDRESS'].presence
 
       from ||= application_mailer_default_from
       from ||= mailer_config_from_address
-      from ||= "reports@#{ENV['HOST'].sub(/\Awww\./, '')}" if ENV['HOST'].present?
+      from ||= "reports@#{ENV['HOST'].delete_prefix('www.')}" if ENV['HOST'].present?
 
       from || 'reports@example.com'
     end
@@ -44,7 +44,7 @@ module Motor
     def mailer_config_from_address
       return if Rails.application.config.action_mailer.default_url_options&.dig(:host).blank?
 
-      "reports@#{Rails.application.config.action_mailer.default_url_options[:host].sub(/\Awww\./, '')}"
+      "reports@#{Rails.application.config.action_mailer.default_url_options[:host].delete_prefix('www.')}"
     end
   end
 end

data/app/models/motor/alert.rb

@@ -11,6 +11,7 @@ module Motor
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/dashboard.rb

@@ -9,6 +9,7 @@ module Motor
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/form.rb

@@ -9,6 +9,7 @@ module Motor
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/query.rb

@@ -10,6 +10,7 @@ module Motor
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
     has_many :alerts, dependent: :destroy
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/resource.rb

@@ -4,6 +4,7 @@ module Motor
   class Resource < ::Motor::ApplicationRecord
     audited
 
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
   end
 end

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/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]
@@ -34,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_blob_patch.rb

@@ -13,6 +13,10 @@ module Motor
         super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
       end
 
+      def create_after_upload!(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+
       def create_after_unfurling!(hash)
         super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
       end

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
@@ -66,13 +66,12 @@ module Motor
     end
 
     initializer 'motor.active_storage.extensions' do
-      ActiveSupport.on_load(:active_storage_attachment) do
-        ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
-      end
+      next unless defined?(ActiveStorage::Engine)
 
-      ActiveSupport.on_load(:active_storage_blob) do
-        ActiveStorage::Blob.singleton_class.prepend(Motor::ActiveRecordUtils::ActiveStorageBlobPatch)
-      end
+      ActiveStorage::Engine.eager_load!
+
+      ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
+      ActiveStorage::Blob.singleton_class.prepend(Motor::ActiveRecordUtils::ActiveStorageBlobPatch)
     end
   end
 end

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

@@ -13,7 +13,9 @@ module Motor
         arel_order = build_arel_order(rel.klass, param)
         join_params = build_join_params(rel.klass, param)
 
-        rel.reorder(arel_order).left_joins(join_params)
+        rel = rel.left_joins(join_params) if join_params.present?
+
+        rel.reorder(arel_order)
       end
 
       def build_join_params(_model, param)

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_icon.rb

@@ -13,6 +13,7 @@ module Motor
       'location' => 'gps',
       'photo' => 'photo',
       'image' => 'photo',
+      'screenshot' => 'photo',
       'picture' => 'photo',
       'video' => 'video',
       'file' => 'file',

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

@@ -12,21 +12,21 @@ module Motor
 
       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,7 @@
 module Motor
   module Configs
     module LoadFromCache
-      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 10.megabytes)
+      CACHE_HASH = HashWithIndifferentAccess.new
 
       module_function
 
@@ -56,25 +56,37 @@ module Motor
         end
       end
 
-      def maybe_fetch_from_cache(type, cache_key, &block)
-        return block.call unless cache_key
+      def maybe_fetch_from_cache(type, cache_key)
+        return yield unless cache_key
 
-        CACHE_STORE.fetch(type + cache_key.to_s, &block)
+        if CACHE_HASH[type] && CACHE_HASH[type][:key] == cache_key
+          CACHE_HASH[type][:value]
+        else
+          result = yield
+
+          CACHE_HASH[type] = { key: cache_key, value: result }
+
+          result
+        end
       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

data/lib/motor/queries/persistance.rb

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

data/lib/motor/queries/run_query.rb

@@ -35,8 +35,8 @@ module Motor
 
         ActiveRecord::Base.transaction do
           result =
-            case ActiveRecord::Base.connection
-            when ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+            case ActiveRecord::Base.connection.class.name
+            when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
               PostgresqlExecQuery.call(ActiveRecord::Base.connection, statement)
             else
               ActiveRecord::Base.connection.exec_query(*statement)
@@ -73,7 +73,7 @@ module Motor
 
         attributes = build_statement_attributes(query_variables)
 
-        [format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.gsub(/;\z/, ''), limit: limit), 'SQL', attributes]
+        [format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.delete_suffix(';'), limit: limit), 'SQL', attributes]
       end
 
       # @param variables [Array<(String, Object)>]

data/lib/motor/tags.rb

@@ -8,9 +8,9 @@ module Motor
       return taggable unless tags
 
       tags.each do |tag_name|
-        next if taggable.taggable_tags.find { |tt| tt.tag.name.downcase == tag_name.downcase }
+        next if taggable.taggable_tags.find { |tt| tt.tag.name.casecmp(tag_name).zero? }
 
-        tag = Tag.where('lower(name) = ?', tag_name.downcase).take || Tag.new(name: tag_name)
+        tag = Tag.find_or_initialize_by(name: tag_name)
 
         taggable.taggable_tags.new(tag: tag)
       end

data/lib/motor/tasks/motor.rake

@@ -3,6 +3,10 @@
 namespace :motor do
   desc 'Update configs/motor.yml file'
 
+  task install: :environment do
+    Rails::Generators.invoke('motor:install')
+  end
+
   task dump: :environment do
     Motor::Configs::WriteToFile.write_with_lock
 

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -2068,11 +2068,11 @@
   "mail-opened.svg": "icons/mail-opened.svg",
   "mail.svg": "icons/mail.svg",
   "mailbox.svg": "icons/mailbox.svg",
-  "main-5cac10cadc5aa16e9b69.css.gz": "main-5cac10cadc5aa16e9b69.css.gz",
-  "main-5cac10cadc5aa16e9b69.js.LICENSE.txt": "main-5cac10cadc5aa16e9b69.js.LICENSE.txt",
-  "main-5cac10cadc5aa16e9b69.js.gz": "main-5cac10cadc5aa16e9b69.js.gz",
-  "main.css": "main-5cac10cadc5aa16e9b69.css",
-  "main.js": "main-5cac10cadc5aa16e9b69.js",
+  "main-36a9ee6a9b0427a77d87.css.gz": "main-36a9ee6a9b0427a77d87.css.gz",
+  "main-36a9ee6a9b0427a77d87.js.LICENSE.txt": "main-36a9ee6a9b0427a77d87.js.LICENSE.txt",
+  "main-36a9ee6a9b0427a77d87.js.gz": "main-36a9ee6a9b0427a77d87.js.gz",
+  "main.css": "main-36a9ee6a9b0427a77d87.css",
+  "main.js": "main-36a9ee6a9b0427a77d87.js",
   "man.svg": "icons/man.svg",
   "manual-gearbox.svg": "icons/manual-gearbox.svg",
   "map-2.svg": "icons/map-2.svg",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.52
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -118,6 +118,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/motor/current_user_method.rb
 - app/controllers/concerns/motor/load_and_authorize_dynamic_resource.rb
 - app/controllers/concerns/motor/wrap_io_params.rb
 - app/controllers/motor/active_storage_attachments_controller.rb
@@ -1480,8 +1481,8 @@ files:
 - ui/dist/icons/zoom-money.svg.gz
 - ui/dist/icons/zoom-out.svg.gz
 - ui/dist/icons/zoom-question.svg.gz
-- ui/dist/main-5cac10cadc5aa16e9b69.css.gz
-- ui/dist/main-5cac10cadc5aa16e9b69.js.gz
+- ui/dist/main-36a9ee6a9b0427a77d87.css.gz
+- ui/dist/main-36a9ee6a9b0427a77d87.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: