motor-admin 0.1.52 → 0.1.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8798474d7c7dc20d6410dd00f13950997be5e3f5d67e1d2585a57af92cd8db10
-  data.tar.gz: 90fcc0b1835fe56b78ecfcc28de03f9d4397b213f6e499afc626c3f4d13b1ef9
+  metadata.gz: 2484e6d98ef1891e59ab7bc0e50dc8337f0b99ae3fb35e2d5d72caf84020112c
+  data.tar.gz: 85a1e6334f83ccdd8e49b6f80ef52ff7ef8f169b586fc00b0745d281e1b75f9a
 SHA512:
-  metadata.gz: c3a34e36e74e5004508e420ba4cdf95e2784d52647dfefccb64fc078b2785cbdd42a7aad84ca41f4c86e2c680b76516f219a41739b7d19601798dda4c9319e06
-  data.tar.gz: 727c31fafba431b69e3206d0fb2cff568171760cd43b36b9a42e97a356d5e344c7cacb069c5e9e79899e0fa804f39fd122ae14e30aece4cb77ca64de31620c5f
+  metadata.gz: dabb17786ed10544c54246f0a460cb3507d9cca5cb8269aa4e0cf0962d69f55cb8f63870f0c6ecfe2810da7c174f2cce7f75702f3472be0221a02ad49babb159
+  data.tar.gz: 2a5c5b2c319248b692f6d662c510ca489066a192c613714c9e970352db3a06994d032d01052707799627bf81bca0b6422a399f8584925baa1658d44706043c67

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/admin.rb

@@ -66,12 +66,12 @@ module Motor
     end
 
     initializer 'motor.active_storage.extensions' do
-      next unless defined?(ActiveStorage::Engine)
-
-      ActiveStorage::Engine.eager_load!
+      config.after_initialize do
+        next unless defined?(ActiveStorage::Engine)
 
-      ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
-      ActiveStorage::Blob.singleton_class.prepend(Motor::ActiveRecordUtils::ActiveStorageBlobPatch)
+        ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
+        ActiveStorage::Blob.singleton_class.prepend(Motor::ActiveRecordUtils::ActiveStorageBlobPatch)
+      end
     end
   end
 end

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/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.52'
+  VERSION = '0.1.53'
 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-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",
+  "main-67fbb3a8f6a6388434c8.css.gz": "main-67fbb3a8f6a6388434c8.css.gz",
+  "main-67fbb3a8f6a6388434c8.js.LICENSE.txt": "main-67fbb3a8f6a6388434c8.js.LICENSE.txt",
+  "main-67fbb3a8f6a6388434c8.js.gz": "main-67fbb3a8f6a6388434c8.js.gz",
+  "main.css": "main-67fbb3a8f6a6388434c8.css",
+  "main.js": "main-67fbb3a8f6a6388434c8.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.52
+  version: 0.1.53
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-29 00:00:00.000000000 Z
+date: 2021-05-30 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: []
@@ -1481,8 +1484,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-36a9ee6a9b0427a77d87.css.gz
-- ui/dist/main-36a9ee6a9b0427a77d87.js.gz
+- ui/dist/main-67fbb3a8f6a6388434c8.css.gz
+- ui/dist/main-67fbb3a8f6a6388434c8.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:
@@ -1506,5 +1509,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: []