motor-admin 0.1.28 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5799ce999fa943638fa7c4d655400c1418ee80977bf47f64a71e6d5c496d02de
-  data.tar.gz: da99ec7b1c48708d983b663a7f9cb79b6d0e270b2fc9f5538a8121cfabdbc209
+  metadata.gz: 6d39e56e7ea8a0b52d05594f2b1fb6f12860d9fd5771fbcf9bec758ce5752f08
+  data.tar.gz: 5cd61073f5a310dd5562225476134358cec33ab1df16983b0faca249a434c91e
 SHA512:
-  metadata.gz: c5fc31a79b01ad0e716700a7c3daed980b293d13081294d1013918cce6f4d24cf4c104e0c44144cde225fd3b1ce07253f9b3ddaf44f1eca2252a01ff9124c52e
-  data.tar.gz: efca3a6d85ce6e33c83a63f3cd5addbd75b2baf099bd96c5efbac40445520a7725d68a5c3d0564792f06bdf12fed8958b13a6189047303d3c77f7f0af0ff0bd4
+  metadata.gz: bcb86c3d249b14ae24d8a37fc5418ab41e789602ede38c5ab31dbda19d82100ac1f1321ff868fef6c7e892fdde2559905afbcfe22e85c65b63ce0c826092bfc1
+  data.tar.gz: 051cfe7a8bdcee2ca9f173954de10108d5682c5f59c2a4291443f32552f31020baeaec78a2f7806d78be13df73f5a9a73742b77c9c4943eee1a60db81ec18100

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Motor
+  module WrapIoParams
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :wrap_io_params, only: %i[update create]
+    end
+
+    private
+
+    def wrap_io_params(hash = params)
+      hash.each do |key, value|
+        if key == 'io'
+          hash[key] = StringIO.new(value.encode('ISO-8859-1'))
+        elsif value.is_a?(ActionController::Parameters)
+          wrap_io_params(value)
+        end
+      end
+
+      hash
+    end
+  end
+end

data/app/controllers/motor/active_storage_attachments_controller.rb

@@ -2,16 +2,15 @@
 
 module Motor
   class ActiveStorageAttachmentsController < ApiBaseController
+    include Motor::WrapIoParams
+
     wrap_parameters :data, except: %i[include fields]
 
     load_and_authorize_resource :attachment, class: 'ActiveStorage::Attachment', parent: false
 
     def create
       if attachable?(@attachment.record)
-        @attachment.record.public_send(@attachment.name).attach(
-          io: StringIO.new(params.dig(:data, :file, :io).to_s.encode('ISO-8859-1')),
-          filename: params.dig(:data, :file, :filename)
-        )
+        @attachment.record.public_send(@attachment.name).attach(file_params)
 
         head :ok
       else
@@ -26,8 +25,16 @@ module Motor
         record.respond_to?("#{@attachment.name}_attachments=")
     end
 
+    def file_params
+      params.require(:data).require(:file).permit(:io, :filename).to_h
+    end
+
     def attachment_params
-      params.require(:data).except(:file).permit!
+      if params[:data].present?
+        params.require(:data).except(:file).permit!
+      else
+        {}
+      end
     end
   end
 end

data/app/controllers/motor/data_controller.rb

@@ -2,13 +2,14 @@
 
 module Motor
   class DataController < ApiBaseController
+    include Motor::WrapIoParams
+
     INSTANCE_VARIABLE_NAME = 'resource'
 
     wrap_parameters :data, except: %i[include fields]
 
     before_action :load_and_authorize_resource
     before_action :load_and_authorize_association
-    before_action :wrap_io_params
 
     def index
       @resources = Motor::ApiQuery.call(@resources, params)
@@ -27,12 +28,20 @@ module Motor
       @resource.save!
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params) }
+    rescue ActiveRecord::RecordInvalid
+      render json: { errors: @resource.errors }, status: :unprocessable_entity
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def update
       @resource.update!(resource_params)
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params) }
+    rescue ActiveRecord::RecordInvalid
+      render json: { errors: @resource.errors }, status: :unprocessable_entity
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def destroy
@@ -77,6 +86,10 @@ module Motor
         self,
         options
       ).load_and_authorize_resource
+    rescue ActiveRecord::RecordNotFound
+      head :not_found
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def load_and_authorize_association
@@ -96,6 +109,10 @@ module Motor
       else
         render json: { message: 'Unknown association' }, status: :not_found
       end
+    rescue ActiveRecord::RecordNotFound
+      head :not_found
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def resource_params
@@ -105,17 +122,5 @@ module Motor
         {}
       end
     end
-
-    def wrap_io_params(hash = params)
-      hash.each do |key, value|
-        if key == 'io'
-          hash[key] = StringIO.new(value.encode('ISO-8859-1'))
-        elsif value.is_a?(ActionController::Parameters)
-          wrap_io_params(value)
-        end
-      end
-
-      hash
-    end
   end
 end

data/app/models/motor/query.rb

@@ -10,5 +10,13 @@ module Motor
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }
+
+    def result(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 }
+    end
+    alias run result
   end
 end

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

@@ -77,7 +77,7 @@
             <% if @query_result.data.length > 1 %>
               <p style="margin: 7px 0; float: left">Showing <%= @query_result.data.first(40).size %> of <%= @query_result.data.size %> rows</p>
             <% end %>
-            <a href="<%= Motor::Admin.routes.url_helpers.motor_ui_query_url(@alert.query, { host: 'localhost:3000'}.merge(Rails.application.config.action_mailer.default_url_options || {})) %>" target="blank" style="margin: 7px 0; float: right">Open query </a>
+            <a href="<%= Motor::Admin.routes.url_helpers.motor_ui_query_url(@alert.query, { host: 'localhost:3000' }.merge(Rails.application.config.action_mailer.default_url_options || {})) %>" target="blank" style="margin: 7px 0; float: right">Open query </a>
             <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 3px;">
               <tr>
                 <td class="wrapper" style="font-family: sans-serif; font-size: 14px; vertical-align: top; box-sizing: border-box; padding: 20px; max-width: 0px; overflow: scroll">

data/config/routes.rb

@@ -47,15 +47,4 @@ Motor::Admin.routes.draw do
   end
 end
 
-Motor::Api.routes.draw do
-  namespace :motor, path: '' do
-    resources :resources, path: '/:resource',
-                          only: %i[index show update create destroy],
-                          controller: 'data' do
-      put '/:method', to: 'data#execute'
-      resources :association, path: '/:association',
-                              only: %i[index create],
-                              controller: 'data'
-    end
-  end
-end
+ActiveSupport::Notifications.instrument('motor.routes.loaded')

data/lib/generators/motor/install_generator.rb

@@ -16,6 +16,8 @@ module Motor
 
       def copy_migration
         migration_template 'install.rb', 'db/migrate/install_motor_admin.rb'
+
+        route "mount Motor::Admin => '/motor_admin'"
       end
     end
   end

data/lib/motor.rb

@@ -45,7 +45,6 @@ end
 
 require 'motor/version'
 require 'motor/admin'
-require 'motor/api'
 require 'motor/assets'
 require 'motor/build_schema'
 require 'motor/api_query'

data/lib/motor/admin.rb

@@ -2,6 +2,32 @@
 
 module Motor
   class Admin < ::Rails::Engine
+    initializer 'motor.startup_message' do
+      ActiveSupport::Notifications.subscribe('motor.routes.loaded') do
+        next unless Motor.server?
+
+        if Rails.application.routes.url_helpers.respond_to?(:motor_admin_path)
+          url =
+            begin
+              Rails.application.routes.url_helpers.motor_admin_url
+            rescue ArgumentError
+              Rails.application.routes.url_helpers.motor_admin_path
+            end
+
+          puts
+          puts "⚡ Motor::Admin is starting under #{url}"
+        else
+          puts
+          puts '⚠️  Motor::Admin is not mounted.'
+          puts 'Add the following line to your config/routes.rb:'
+          puts
+          puts "    mount Motor::Admin => '/admin'"
+        end
+
+        puts
+      end
+    end
+
     initializer 'motor.filter_params' do
       Rails.application.config.filter_parameters += %i[io]
     end

data/lib/motor/api_query/filter.rb

@@ -34,20 +34,29 @@ module Motor
 
       def normalize_filter_hash(hash)
         hash.each_with_object({}) do |(action, value), acc|
-          acc[action] =
+          new_action, new_value =
             if value.is_a?(Hash)
-              normalize_filter_hash(value)
+              [action, normalize_filter_hash(value)]
             else
-              normalize_action_value(action, value)
+              normalize_action(action, value)
             end
+
+          acc[new_action] = new_value
+
+          acc
         end
       end
 
-      def normalize_action_value(action, value)
-        if %w[like ilike].include?(action)
-          value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1%')
+      def normalize_action(action, value)
+        case action
+        when 'contains'
+          ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1%')]
+        when 'starts_with'
+          ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '\1%')]
+        when 'ends_with'
+          ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1')]
         else
-          value
+          [action, value]
         end
       end
     end

data/lib/motor/build_schema.rb

@@ -48,8 +48,8 @@ module Motor
 
     DEFAULT_TABS = [
       {
-        name: 'summary',
-        display_name: 'Summary',
+        name: 'details',
+        display_name: 'Details',
         tab_type: 'default',
         preferences: {},
         visible: true

data/lib/motor/build_schema/load_from_rails.rb

@@ -133,7 +133,7 @@ module Motor
           column_type: is_attachment ? 'file' : 'integer',
           access_type: access_type,
           default_value: default_attrs[column_name],
-          validators: fetch_validators(model, column_name),
+          validators: fetch_validators(model, column_name, ref),
           format: {},
           reference: {
             name: name,
@@ -172,23 +172,34 @@ module Motor
         end.compact
       end
 
-      def fetch_validators(model, column_name)
-        model.validators_on(column_name).map do |validator|
-          case validator
-          when ActiveModel::Validations::InclusionValidator
-            { includes: validator.send(:delimiter) }
-          when ActiveRecord::Validations::PresenceValidator
-            { required: true }
-          when ActiveModel::Validations::FormatValidator
-            { format: JsRegex.new(validator.options[:with]).to_h.slice(:source, :options) }
-          when ActiveRecord::Validations::LengthValidator
-            { length: validator.options }
-          when ActiveModel::Validations::NumericalityValidator
-            { numeric: validator.options }
+      def fetch_validators(model, column_name, reflection = nil)
+        validators =
+          if reflection&.belongs_to? && !reflection.options[:optional]
+            [{ required: true }]
           else
-            next
+            []
           end
+
+        validators += model.validators_on(column_name).map do |validator|
+          build_validator_hash(validator)
         end.compact
+
+        validators.uniq
+      end
+
+      def build_validator_hash(validator)
+        case validator
+        when ActiveModel::Validations::InclusionValidator
+          { includes: validator.send(:delimiter) }
+        when ActiveRecord::Validations::PresenceValidator
+          { required: true }
+        when ActiveModel::Validations::FormatValidator
+          { format: JsRegex.new(validator.options[:with]).to_h.slice(:source, :options) }
+        when ActiveRecord::Validations::LengthValidator
+          { length: validator.options }
+        when ActiveModel::Validations::NumericalityValidator
+          { numeric: validator.options }
+        end
       end
 
       def eager_load_models!

data/lib/motor/build_schema/persist_resource_configs.rb

@@ -90,9 +90,9 @@ module Motor
         return preferences if new_prefs[configs_name].blank?
 
         normalized_configs = public_send("normalize_#{configs_name}",
-                                         default_prefs[:actions],
-                                         existing_prefs.fetch(:actions, []),
-                                         new_prefs.fetch(:actions, []))
+                                         default_prefs[configs_name],
+                                         existing_prefs.fetch(configs_name, []),
+                                         new_prefs.fetch(configs_name, []))
 
         preferences[configs_name] = normalized_configs
 

data/lib/motor/tags.rb

@@ -21,7 +21,8 @@ module Motor
     end
 
     def remove_missing_tags(taggable, tags)
-      tags_to_remove = taggable.tags.reject { |tt| tt.name.downcase.in?(tags) }
+      downcase_tags = tags.map(&:downcase)
+      tags_to_remove = taggable.tags.reject { |tt| tt.name.downcase.in?(downcase_tags) }
 
       taggable.tags -= tags_to_remove
 

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -5,9 +5,9 @@
   "fonts/ionicons.ttf?v=3.0.0-alpha.3": "fonts/ionicons.ttf",
   "fonts/ionicons.woff2?v=3.0.0-alpha.3": "fonts/ionicons.woff2",
   "fonts/ionicons.woff?v=3.0.0-alpha.3": "fonts/ionicons.woff",
-  "main-4da1a5102d7bc66aefd0.css.gz": "main-4da1a5102d7bc66aefd0.css.gz",
-  "main-4da1a5102d7bc66aefd0.js.LICENSE.txt": "main-4da1a5102d7bc66aefd0.js.LICENSE.txt",
-  "main-4da1a5102d7bc66aefd0.js.gz": "main-4da1a5102d7bc66aefd0.js.gz",
-  "main.css": "main-4da1a5102d7bc66aefd0.css",
-  "main.js": "main-4da1a5102d7bc66aefd0.js"
+  "main-052729fa924c6434623f.css.gz": "main-052729fa924c6434623f.css.gz",
+  "main-052729fa924c6434623f.js.LICENSE.txt": "main-052729fa924c6434623f.js.LICENSE.txt",
+  "main-052729fa924c6434623f.js.gz": "main-052729fa924c6434623f.js.gz",
+  "main.css": "main-052729fa924c6434623f.css",
+  "main.js": "main-052729fa924c6434623f.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.34
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -132,6 +132,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/motor/wrap_io_params.rb
 - app/controllers/motor/active_storage_attachments_controller.rb
 - app/controllers/motor/alerts_controller.rb
 - app/controllers/motor/api_base_controller.rb
@@ -182,7 +183,6 @@ files:
 - lib/motor/alerts/persistance.rb
 - lib/motor/alerts/scheduled_alerts_cache.rb
 - lib/motor/alerts/scheduler.rb
-- lib/motor/api.rb
 - lib/motor/api_query.rb
 - lib/motor/api_query/apply_scope.rb
 - lib/motor/api_query/build_json.rb
@@ -214,8 +214,8 @@ files:
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-4da1a5102d7bc66aefd0.css.gz
-- ui/dist/main-4da1a5102d7bc66aefd0.js.gz
+- ui/dist/main-052729fa924c6434623f.css.gz
+- ui/dist/main-052729fa924c6434623f.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:

data/lib/motor/api.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Motor
-  class Api < ::Rails::Engine
-  end
-end