motor-admin 0.1.50 → 0.1.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e5a06d8a42714fbc30464ef704366dc9f3b851df80bd8c9a206a2ed75a6fd23
-  data.tar.gz: 13d46e2d091be7a9b6e9832ab1e036c08734bbe70b0b92b64f1b41dd0f355a17
+  metadata.gz: 0e67ce24b85ae545c7d4f4b2bbda48d660bdcba56849accee1d213ff4c854b3a
+  data.tar.gz: 7f53d4751a1f77a5b75cf27f803390972426a10ab4bd66b0a4903bc2daa1bdab
 SHA512:
-  metadata.gz: 544edcef7fd6e97e1285fff69f1984a0991dc72a1768ebace132faad1a1b6609e68dd7c0ae4e6d573036c171a1b364a65fc52a9f63e653f51e4f33b8b86281ec
-  data.tar.gz: 2cb5fb5c3c47710cfea97550e0f0ac67c2463eb3d71a5a62a8ce6fbff62763e04274d92b6c4c6bc51e2f14e2a4fd84a6d9f290b7586fca407b85a1aa254fa47d
+  metadata.gz: 1a03dff86d33cebf9b32820e5e9fe3e036be360fe749540fed06b5482205bf33a192e982e026d979d1a2f929383fc46ae0ecfd26fcfc072413fe336915c29141
+  data.tar.gz: 6bdf9b79b7fb2c99f2965af0e6651f226673bc3b72dba7b2316855bb064f05aa50ebf45e82d60b1a7da5d4ea228c2f223a365d160837a7ddea0c58f4bfcc6eb6

data/app/controllers/motor/api_base_controller.rb

@@ -12,10 +12,12 @@ module Motor
       end
     end
 
-    rescue_from StandardError do |e|
-      Rails.logger.error(e)
+    unless Rails.env.test?
+      rescue_from StandardError do |e|
+        Rails.logger.error(e)
 
-      render json: { errors: [e.message] }, status: :internal_server_error
+        render json: { errors: [e.message] }, status: :internal_server_error
+      end
     end
 
     def current_ability

data/app/controllers/motor/assets_controller.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class AssetsController < ActionController::Metal
-    CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(coder: ActiveSupport::Cache::NullCoder)
+    CACHE_STORE = ActiveSupport::Cache::MemoryStore.new
 
     GZIP_TYPES = [
       'application/javascript',

data/app/controllers/motor/icons_controller.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class IconsController < ApiBaseController
-    CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(coder: ActiveSupport::Cache::NullCoder)
+    CACHE_STORE = ActiveSupport::Cache::MemoryStore.new
 
     def index
       data = CACHE_STORE.fetch('icons') do

data/app/controllers/motor/run_queries_controller.rb

@@ -9,22 +9,24 @@ module Motor
     before_action :build_query, only: :create
     authorize_resource :query, only: :create
 
-    rescue_from 'ActiveRecord::StatementInvalid' do |e|
-      render json: { errors: [{ detail: e.message }] }, status: :unprocessable_entity
-    end
-
     def show
-      render json: query_result_hash(query_result)
+      render_result
     end
 
     def create
-      render json: query_result_hash(query_result)
+      render_result
     end
 
     private
 
-    def query_result
-      Queries::RunQuery.call(@query, variables_hash: params[:variables])
+    def render_result
+      query_result = Queries::RunQuery.call(@query, variables_hash: params[:variables])
+
+      if query_result.error
+        render json: { errors: [{ detail: query_result.error }] }, status: :unprocessable_entity
+      else
+        render json: query_result_hash(query_result)
+      end
     end
 
     def query_result_hash(query_result)

data/app/models/motor/query.rb

@@ -16,7 +16,7 @@ module Motor
     scope :active, -> { where(deleted_at: nil) }
 
     def result(variables_hash = {})
-      result = Motor::Queries::RunQuery.call(self, variables_hash: variables_hash)
+      result = Motor::Queries::RunQuery.call!(self, variables_hash: variables_hash)
       column_names = result.columns.pluck(:name)
 
       result.data.map { |row| column_names.zip(row).to_h }

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

@@ -1,12 +1,12 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def self.up
     create_table :motor_queries do |t|
-      t.column :name, :text, null: false
+      t.column :name, :string, 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 :author_type, :string
       t.column :deleted_at, :datetime
 
       t.timestamps
@@ -15,16 +15,15 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.index 'name',
               name: 'motor_queries_name_unique_index',
               unique: true,
-              where: 'deleted_at IS NULL',
-              length: { name: 255 }
+              where: 'deleted_at IS NULL'
     end
 
     create_table :motor_dashboards do |t|
-      t.column :title, :text, null: false
+      t.column :title, :string, null: false
       t.column :description, :text
       t.column :preferences, :text, null: false
       t.column :author_id, :bigint
-      t.column :author_type, :text
+      t.column :author_type, :string
       t.column :deleted_at, :datetime
 
       t.timestamps
@@ -33,18 +32,17 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.index 'title',
               name: 'motor_dashboards_title_unique_index',
               unique: true,
-              where: 'deleted_at IS NULL',
-              length: { title: 255 }
+              where: 'deleted_at IS NULL'
     end
 
     create_table :motor_forms do |t|
-      t.column :name, :text, null: false
+      t.column :name, :string, null: false
       t.column :description, :text
       t.column :api_path, :text, null: false
-      t.column :http_method, :text, null: false
+      t.column :http_method, :string, null: false
       t.column :preferences, :text, null: false
       t.column :author_id, :bigint
-      t.column :author_type, :text
+      t.column :author_type, :string
       t.column :deleted_at, :datetime
 
       t.timestamps
@@ -53,12 +51,11 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.index 'name',
               name: 'motor_forms_name_unique_index',
               unique: true,
-              where: 'deleted_at IS NULL',
-              length: { name: 255 }
+              where: 'deleted_at IS NULL'
     end
 
     create_table :motor_resources do |t|
-      t.column :name, :text, null: false, index: { unique: true, length: 255 }
+      t.column :name, :string, null: false, index: { unique: true }
       t.column :preferences, :text, null: false
 
       t.timestamps
@@ -67,7 +64,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     end
 
     create_table :motor_configs do |t|
-      t.column :key, :text, null: false, index: { unique: true, length: 255 }
+      t.column :key, :string, null: false, index: { unique: true }
       t.column :value, :text, null: false
 
       t.timestamps
@@ -77,13 +74,13 @@ 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, :text, null: false
+      t.column :name, :string, 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, :text, null: false
       t.column :author_id, :bigint
-      t.column :author_type, :text
+      t.column :author_type, :string
       t.column :deleted_at, :datetime
 
       t.timestamps
@@ -92,65 +89,59 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.index 'name',
               name: 'motor_alerts_name_unique_index',
               unique: true,
-              where: 'deleted_at IS NULL',
-              length: { name: 255 }
+              where: 'deleted_at IS NULL'
     end
 
     create_table :motor_alert_locks do |t|
       t.references :alert, null: false, foreign_key: { to_table: :motor_alerts }
-      t.column :lock_timestamp, :text, null: false
+      t.column :lock_timestamp, :string, null: false
 
       t.timestamps
 
-      t.index %i[alert_id lock_timestamp], unique: true, length: { lock_timestamp: 255 }
+      t.index %i[alert_id lock_timestamp], unique: true
     end
 
     create_table :motor_tags do |t|
-      t.column :name, :text, null: false
+      t.column :name, :string, null: false
 
       t.timestamps
 
       t.index 'name',
               name: 'motor_tags_name_unique_index',
-              unique: true,
-              length: { name: 255 }
+              unique: true
     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, :bigint, null: false
-      t.column :taggable_type, :text, null: false
+      t.column :taggable_type, :string, null: false
 
       t.index %i[taggable_id taggable_type tag_id],
               name: 'motor_polymorphic_association_tag_index',
-              unique: true,
-              length: { taggable_type: 255 }
+              unique: true
     end
 
     create_table :motor_audits do |t|
       t.column :auditable_id, :bigint
-      t.column :auditable_type, :text
+      t.column :auditable_type, :string
       t.column :associated_id, :bigint
-      t.column :associated_type, :text
+      t.column :associated_type, :string
       t.column :user_id, :bigint
-      t.column :user_type, :text
-      t.column :username, :text
-      t.column :action, :text
+      t.column :user_type, :string
+      t.column :username, :string
+      t.column :action, :string
       t.column :audited_changes, :text
       t.column :version, :bigint, default: 0
       t.column :comment, :text
-      t.column :remote_address, :text
-      t.column :request_uuid, :text
+      t.column :remote_address, :string
+      t.column :request_uuid, :string
       t.column :created_at, :datetime
     end
 
-    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, %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, :created_at
   end
 

data/lib/motor/active_record_utils.rb

@@ -20,3 +20,4 @@ require_relative './active_record_utils/fetch_methods'
 require_relative './active_record_utils/defined_scopes_extension'
 require_relative './active_record_utils/active_storage_links_extension'
 require_relative './active_record_utils/active_storage_blob_patch'
+require_relative './active_record_utils/active_record_filter'

data/lib/motor/active_record_utils/active_record_filter.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+ActiveRecord::Filter.module_eval do
+  def filters
+    @filters ||= HashWithIndifferentAccess.new
+  end
+end

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

data/lib/motor/alerts/scheduled_alerts_cache.rb

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

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

@@ -35,6 +35,8 @@ module Motor
     def load_from_disk(filename, gzip:)
       filename += '.gz' if gzip
 
+      raise InvalidPathError if filename.include?('..')
+
       path = ASSETS_PATH.join(filename)
 
       raise InvalidPathError unless path.to_s.starts_with?(ASSETS_PATH.to_s)

data/lib/motor/configs/build_ui_app_tag.rb

@@ -7,8 +7,7 @@ module Motor
         if Motor.development?
           ActiveSupport::Cache::NullStore.new
         else
-          ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes,
-                                                coder: ActiveSupport::Cache::NullCoder)
+          ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes)
         end
 
       module_function

data/lib/motor/configs/load_from_cache.rb

@@ -3,8 +3,7 @@
 module Motor
   module Configs
     module LoadFromCache
-      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 10.megabytes,
-                                                          coder: ActiveSupport::Cache::NullCoder)
+      CACHE_HASH = HashWithIndifferentAccess.new
 
       module_function
 
@@ -57,10 +56,18 @@ module Motor
         end
       end
 
-      def maybe_fetch_from_cache(type, cache_key, &block)
+      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

data/lib/motor/queries/run_query.rb

@@ -5,19 +5,24 @@ module Motor
     module RunQuery
       DEFAULT_LIMIT = 100_000
 
-      QueryResult = Struct.new(:data, :columns, keyword_init: true)
+      QueryResult = Struct.new(:data, :columns, :error, keyword_init: true)
+
+      WITH_STATEMENT_START = 'WITH __query__ AS ('
 
       WITH_STATEMENT_TEMPLATE = <<~SQL
-        WITH __query__ AS (%<sql_body>s) SELECT * FROM __query__ LIMIT %<limit>s;
+        #{WITH_STATEMENT_START}%<sql_body>s
+        ) SELECT * FROM __query__ LIMIT %<limit>s;
       SQL
 
+      PG_ERROR_REGEXP = /\APG.+ERROR:/.freeze
+
       module_function
 
       # @param query [Motor::Query]
       # @param variables_hash [Hash]
       # @param limit [Integer]
       # @return [Motor::Queries::RunQuery::QueryResult]
-      def call(query, variables_hash: nil, limit: DEFAULT_LIMIT)
+      def call!(query, variables_hash: nil, limit: DEFAULT_LIMIT)
         variables_hash ||= {}
 
         result = execute_query(query, limit, variables_hash)
@@ -25,6 +30,22 @@ module Motor
         QueryResult.new(data: result.rows, columns: build_columns_hash(result))
       end
 
+      # @param query [Motor::Query]
+      # @param variables_hash [Hash]
+      # @param limit [Integer]
+      # @return [Motor::Queries::RunQuery::QueryResult]
+      def call(query, variables_hash: nil, limit: DEFAULT_LIMIT)
+        call!(query, variables_hash: variables_hash, limit: limit)
+      rescue ActiveRecord::StatementInvalid => e
+        QueryResult.new(error: build_error_message(e))
+      end
+
+      # @param exception [ActiveRecord::StatementInvalid]
+      # @return [String]
+      def build_error_message(exception)
+        exception.message.sub(WITH_STATEMENT_START, '').sub(PG_ERROR_REGEXP, '').strip.upcase_first
+      end
+
       # @param query [Motor::Query]
       # @param limit [Integer]
       # @param variables_hash [Hash]

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.50'
+  VERSION = '0.1.55'
 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-55914a490baf8f7eba59.css.gz": "main-55914a490baf8f7eba59.css.gz",
-  "main-55914a490baf8f7eba59.js.LICENSE.txt": "main-55914a490baf8f7eba59.js.LICENSE.txt",
-  "main-55914a490baf8f7eba59.js.gz": "main-55914a490baf8f7eba59.js.gz",
-  "main.css": "main-55914a490baf8f7eba59.css",
-  "main.js": "main-55914a490baf8f7eba59.js",
+  "main-4d659b311d92611ad5f6.css.gz": "main-4d659b311d92611ad5f6.css.gz",
+  "main-4d659b311d92611ad5f6.js.LICENSE.txt": "main-4d659b311d92611ad5f6.js.LICENSE.txt",
+  "main-4d659b311d92611ad5f6.js.gz": "main-4d659b311d92611ad5f6.js.gz",
+  "main.css": "main-4d659b311d92611ad5f6.css",
+  "main.js": "main-4d659b311d92611ad5f6.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.50
+  version: 0.1.55
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -108,7 +108,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-description: Admin UI and Business Analytics.
+description: |
+  Motor Admin allows to create a flexible admin panel with writing less code.
+  All customizations to the admin panel can be made directly in the UI without
+  the need of writing any configurations code.
 email:
 - pete.matsy@gmail.com
 executables: []
@@ -165,6 +168,7 @@ files:
 - lib/motor-admin.rb
 - lib/motor.rb
 - lib/motor/active_record_utils.rb
+- lib/motor/active_record_utils/active_record_filter.rb
 - lib/motor/active_record_utils/active_storage_blob_patch.rb
 - lib/motor/active_record_utils/active_storage_links_extension.rb
 - lib/motor/active_record_utils/defined_scopes_extension.rb
@@ -1481,8 +1485,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-55914a490baf8f7eba59.css.gz
-- ui/dist/main-55914a490baf8f7eba59.js.gz
+- ui/dist/main-4d659b311d92611ad5f6.css.gz
+- ui/dist/main-4d659b311d92611ad5f6.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:
@@ -1506,5 +1510,5 @@ requirements: []
 rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
-summary: Admin UI and Business Analytics
+summary: Low-code Admin panel and Business intelligence
 test_files: []