motor-admin 0.1.25 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25cd72aeb7206cf66b1d9c632491ad8e0e15a356c59e3234f4fcac2ab8e6960
-  data.tar.gz: e4e0458c383689d39a8065b5c1d5ab48d57ebd19b5ea1f2c4f229bf1e070c466
+  metadata.gz: 9db6c3263064796fde708305f78fbc33db762534890eeeb79ec13e2954b8b54b
+  data.tar.gz: 462878ba2c5c21c77af910b27be67a1a8b7518ba73fd2b239c3309f88e9ec49a
 SHA512:
-  metadata.gz: 82f524ca428f34514ad3f6361287de3faf8430da549a371196abaf0dbee0bd02068127be712a208708252d8aa7a7c41c84e8df6bc8f96f8ada747bdebc26a076
-  data.tar.gz: b1921a2b38711019965f178120bff24dbe2f2465e750cdc592b2cac558820c51ce6c0addd9ca414ed4d3c90b4bd2c9aa15c112ed4072181fa47f8534d84b8a2b
+  metadata.gz: 457cfc674fa8845a9a1e21e6177a38a9159c92ad021ffb6af2504eb1df326cf5325efad85efed341082e9c3e3a863aba408d456626f5da167671e60af93f3416
+  data.tar.gz: e13a4a74752db108786a9625d3ea3e851e6bdcc4a7b6ac55f041d3cd753b5993f61e8d825038846603718483733888258e734d2fbc204b27b0149b2c751d0b46

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 @attachment.record.respond_to?("#{@attachment.name}_attachment=") || @attachment.record.respond_to?("#{@attachment.name}_attachments=")
-        @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)
-        )
+      if attachable?(@attachment.record)
+        @attachment.record.public_send(@attachment.name).attach(file_params)
 
         head :ok
       else
@@ -21,8 +20,21 @@ module Motor
 
     private
 
+    def attachable?(record)
+      record.respond_to?("#{@attachment.name}_attachment=") ||
+        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,8 @@ module Motor
         self,
         options
       ).load_and_authorize_resource
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def load_and_authorize_association
@@ -96,6 +107,8 @@ module Motor
       else
         render json: { message: 'Unknown association' }, status: :not_found
       end
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
 
     def resource_params
@@ -105,17 +118,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/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,7 @@ end
 
 require 'motor/version'
 require 'motor/admin'
-require 'motor/api'
+# require 'motor/api'
 require 'motor/assets'
 require 'motor/build_schema'
 require 'motor/api_query'

data/lib/motor/active_record_utils/types.rb

@@ -21,8 +21,7 @@ module Motor
         'text' => 'string',
         'citext' => 'string',
         'jsonb' => 'json',
-        'timestamp' => 'datetime',
-        'money' => 'currency'
+        'timestamp' => 'datetime'
       }.freeze
 
       module_function

data/lib/motor/admin.rb

@@ -2,6 +2,25 @@
 
 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}"
+          puts
+        end
+      end
+    end
+
     initializer 'motor.filter_params' do
       Rails.application.config.filter_parameters += %i[io]
     end
@@ -22,10 +41,10 @@ module Motor
           ::Digest::SHA256.hexdigest(username),
           ::Digest::SHA256.hexdigest(ENV['MOTOR_AUTH_USERNAME'].to_s)
         ) &
-        ActiveSupport::SecurityUtils.secure_compare(
-          ::Digest::SHA256.hexdigest(password),
-          ::Digest::SHA256.hexdigest(ENV['MOTOR_AUTH_PASSWORD'].to_s)
-        )
+          ActiveSupport::SecurityUtils.secure_compare(
+            ::Digest::SHA256.hexdigest(password),
+            ::Digest::SHA256.hexdigest(ENV['MOTOR_AUTH_PASSWORD'].to_s)
+          )
       end
     end
 

data/lib/motor/api_query/build_json.rb

@@ -29,9 +29,11 @@ module Motor
               hash = {}
 
               path.split('.').reduce(hash) do |acc, part|
-                acc[part] = {}
+                acc_hash = {}
 
-                acc[part]
+                acc[part] = acc_hash
+
+                acc_hash
               end
 
               accumulator.deep_merge(hash)
@@ -45,20 +47,25 @@ module Motor
         return if params[:fields].blank?
 
         model = rel.is_a?(ActiveRecord::Relation) ? rel.klass : rel.class
-        model_name = model.name.underscore
 
         params[:fields].each do |key, fields|
           fields = fields.split(',') if fields.is_a?(String)
 
-          if key == model_name || model_name.split('/').last == key
-            json_params.merge!(build_fields_hash(model, fields))
-          else
-            hash = find_key_in_params(json_params, key)
+          merge_fields_params!(key, fields, json_params, model)
+        end
+      end
 
-            fields_hash = build_fields_hash(model.reflections[key]&.klass, fields)
+      def merge_fields_params!(key, fields, json_params, model)
+        model_name = model.name.underscore
 
-            hash.merge!(fields_hash)
-          end
+        if key == model_name || model_name.split('/').last == key
+          json_params.merge!(build_fields_hash(model, fields))
+        else
+          hash = find_key_in_params(json_params, key)
+
+          fields_hash = build_fields_hash(model.reflections[key]&.klass, fields)
+
+          hash.merge!(fields_hash)
         end
       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/api_query/sort.rb

@@ -22,7 +22,11 @@ module Motor
           *path, _ = key.split('.')
 
           path.reduce(result) do |acc, fragment|
-            acc[fragment] = {}
+            hash = {}
+
+            acc[fragment] = hash
+
+            hash
           end
         end
       end

data/lib/motor/build_schema/load_from_rails.rb

@@ -3,6 +3,8 @@
 module Motor
   module BuildSchema
     module LoadFromRails
+      MUTEX = Mutex.new
+
       module_function
 
       def call
@@ -82,22 +84,26 @@ module Motor
           model.columns.map do |column|
             next if reference_columns.find { |c| c[:name] == column.name }
 
-            {
-              name: column.name,
-              display_name: column.name.humanize,
-              column_type: ActiveRecordUtils::Types::UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
-              access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
-              default_value: default_attrs[column.name],
-              validators: fetch_validators(model, column.name),
-              reference: nil,
-              format: {},
-              virtual: false
-            }
+            build_table_column(column, model, default_attrs)
           end.compact
 
         reference_columns + table_columns
       end
 
+      def build_table_column(column, model, default_attrs)
+        {
+          name: column.name,
+          display_name: column.name.humanize,
+          column_type: ActiveRecordUtils::Types::UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
+          access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
+          default_value: default_attrs[column.name],
+          validators: fetch_validators(model, column.name),
+          reference: nil,
+          format: {},
+          virtual: false
+        }
+      end
+
       def fetch_reference_columns(model)
         default_attrs = model.new.attributes
 
@@ -110,32 +116,36 @@ module Motor
             next
           end
 
-          column_name = ref.belongs_to? ? ref.foreign_key.to_s : name
-
           next if ref.klass.name == 'ActiveStorage::Blob'
 
-          is_attachment = ref.klass.name == 'ActiveStorage::Attachment'
-
-          {
-            name: column_name,
-            display_name: column_name.humanize,
-            column_type: is_attachment ? 'file' : 'integer',
-            access_type: ref.belongs_to? || is_attachment ? ColumnAccessTypes::READ_WRITE : ColumnAccessTypes::READ_ONLY,
-            default_value: default_attrs[column_name],
-            validators: fetch_validators(model, column_name),
-            format: {},
-            reference: {
-              name: name,
-              model_name: ref.klass.name.underscore,
-              reference_type: ref.belongs_to? ? 'belongs_to' : 'has_one',
-              foreign_key: ref.foreign_key,
-              polymorphic: ref.polymorphic? || is_attachment
-            },
-            virtual: false
-          }
+          build_reflection_column(name, model, ref, default_attrs)
         end.compact
       end
 
+      def build_reflection_column(name, model, ref, default_attrs)
+        column_name = ref.belongs_to? ? ref.foreign_key.to_s : name
+        is_attachment = ref.klass.name == 'ActiveStorage::Attachment'
+        access_type = ref.belongs_to? || is_attachment ? ColumnAccessTypes::READ_WRITE : ColumnAccessTypes::READ_ONLY
+
+        {
+          name: column_name,
+          display_name: column_name.humanize,
+          column_type: is_attachment ? 'file' : 'integer',
+          access_type: access_type,
+          default_value: default_attrs[column_name],
+          validators: fetch_validators(model, column_name, ref),
+          format: {},
+          reference: {
+            name: name,
+            model_name: ref.klass.name.underscore,
+            reference_type: ref.belongs_to? ? 'belongs_to' : 'has_one',
+            foreign_key: ref.foreign_key,
+            polymorphic: ref.polymorphic? || is_attachment
+          },
+          virtual: false
+        }
+      end
+
       def fetch_associations(model)
         model.reflections.map do |name, ref|
           next if ref.has_one? || ref.belongs_to?
@@ -162,30 +172,43 @@ 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!
-        if Rails::VERSION::MAJOR > 5 && defined?(Zeitwerk::Loader)
-          Zeitwerk::Loader.eager_load_all
-        else
-          Rails.application.eager_load!
+        MUTEX.synchronize do
+          if Rails::VERSION::MAJOR > 5 && defined?(Zeitwerk::Loader)
+            Zeitwerk::Loader.eager_load_all
+          else
+            Rails.application.eager_load!
+          end
         end
       end
     end

data/lib/motor/build_schema/merge_schema_configs.rb

@@ -27,40 +27,81 @@ module Motor
       def merge_model(model, configs)
         updated_model = model.merge(configs.slice(*RESOURCE_ATTRS))
 
-        updated_model[:associations] = merge_by_name(
+        merge_actions!(updated_model, configs)
+        merge_assiciations!(updated_model, configs)
+        merge_columns!(updated_model, configs)
+        merge_tabs!(updated_model, configs)
+        merge_scopes!(updated_model, configs)
+
+        updated_model
+      end
+
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_assiciations!(model, configs)
+        model[:associations] = merge_by_name(
           model[:associations],
           configs[:associations],
           {},
           ->(_) { true }
         )
 
-        updated_model[:columns] = merge_by_name(
+        model
+      end
+
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_columns!(model, configs)
+        model[:columns] = merge_by_name(
           model[:columns],
           configs[:columns],
           COLUMN_DEFAULTS,
           ->(scope) { !scope[:virtual] }
         )
 
-        updated_model[:actions] = merge_by_name(
+        model
+      end
+
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_actions!(model, configs)
+        model[:actions] = merge_by_name(
           model[:actions],
           configs[:actions],
           ACTION_DEFAULTS
         )
 
-        updated_model[:tabs] = merge_by_name(
+        model
+      end
+
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_tabs!(model, configs)
+        model[:tabs] = merge_by_name(
           model[:tabs],
           configs[:tabs],
           TAB_DEFAULTS
         )
 
-        updated_model[:scopes] = merge_by_name(
+        model
+      end
+
+      # @param model [HashWithIndifferentAccess]
+      # @param configs [HashWithIndifferentAccess]
+      # @return [HashWithIndifferentAccess]
+      def merge_scopes!(model, configs)
+        model[:scopes] = merge_by_name(
           model[:scopes],
           configs[:scopes],
           SCOPE_DEFAULTS,
           ->(scope) { scope[:scope_type] != 'filter' }
         )
 
-        updated_model
+        model
       end
 
       # @param defaults [Array<HashWithIndifferentAccess>]

data/lib/motor/build_schema/persist_resource_configs.rb

@@ -77,47 +77,26 @@ module Motor
         normalized_preferences = existing_prefs.merge(normalized_preferences)
         normalized_preferences = reject_default(default_prefs, normalized_preferences)
 
-        if new_prefs[:columns].present?
-          normalized_preferences[:columns] = normalize_columns(
-            default_prefs[:columns],
-            existing_prefs.fetch(:columns, []),
-            new_prefs.fetch(:columns, [])
-          )
-        end
+        normalize_configs!(normalized_preferences, :columns, default_prefs, existing_prefs, new_prefs)
+        normalize_configs!(normalized_preferences, :associations, default_prefs, existing_prefs, new_prefs)
+        normalize_configs!(normalized_preferences, :actions, default_prefs, existing_prefs, new_prefs)
+        normalize_configs!(normalized_preferences, :tabs, default_prefs, existing_prefs, new_prefs)
+        normalize_configs!(normalized_preferences, :scopes, default_prefs, existing_prefs, new_prefs)
 
-        if new_prefs[:associations].present?
-          normalized_preferences[:associations] = normalize_associations(
-            default_prefs[:associations],
-            existing_prefs.fetch(:associations, []),
-            new_prefs.fetch(:associations, [])
-          )
-        end
+        normalized_preferences.compact
+      end
 
-        if new_prefs[:actions].present?
-          normalized_preferences[:actions] = normalize_actions(
-            default_prefs[:actions],
-            existing_prefs.fetch(:actions, []),
-            new_prefs.fetch(:actions, [])
-          )
-        end
+      def normalize_configs!(preferences, configs_name, default_prefs, existing_prefs, new_prefs)
+        return preferences if new_prefs[configs_name].blank?
 
-        if new_prefs[:tabs].present?
-          normalized_preferences[:tabs] = normalize_tabs(
-            default_prefs[:tabs],
-            existing_prefs.fetch(:tabs, []),
-            new_prefs.fetch(:tabs, [])
-          )
-        end
+        normalized_configs = public_send("normalize_#{configs_name}",
+                                         default_prefs[configs_name],
+                                         existing_prefs.fetch(configs_name, []),
+                                         new_prefs.fetch(configs_name, []))
 
-        if new_prefs[:scopes].present?
-          normalized_preferences[:scopes] = normalize_scopes(
-            default_prefs[:scopes],
-            existing_prefs.fetch(:scopes, []),
-            new_prefs.fetch(:scopes, [])
-          )
-        end
+        preferences[configs_name] = normalized_configs
 
-        normalized_preferences.compact
+        preferences
       end
 
       # @param default_columns [Array<HashWithIndifferentAccess>]

data/lib/motor/build_schema/reorder_schema.rb

@@ -23,21 +23,29 @@ module Motor
 
       schema = sort_by_name(schema, configs['resources.order'])
 
-      schema.map do |model|
-        columns_order = configs["resources.#{model[:name]}.columns.order"]
-        associations_order = configs["resources.#{model[:name]}.associations.order"]
-        actions_order = configs["resources.#{model[:name]}.actions.order"]
-        tabs_order = configs["resources.#{model[:name]}.tabs.order"]
-        scopes_order = configs["resources.#{model[:name]}.scopes.order"]
+      schema.map { |model| reorder_model(model, configs) }
+    end
 
-        model.merge(
-          columns: sort_by_name(sort_columns(model[:columns]), columns_order, sort_alphabetically: false),
-          associations: sort_by_name(model[:associations], associations_order),
-          actions: sort_by_name(model[:actions], actions_order, sort_alphabetically: false),
-          tabs: sort_by_name(model[:tabs], tabs_order, sort_alphabetically: false),
-          scopes: sort_by_name(model[:scopes], scopes_order)
-        )
-      end
+    def reorder_model(model, configs)
+      order_configs = build_order_configs(model[:name], configs)
+
+      model.merge(
+        columns: sort_by_name(sort_columns(model[:columns]), order_configs[:columns], sort_alphabetically: false),
+        associations: sort_by_name(model[:associations], order_configs[:associations]),
+        actions: sort_by_name(model[:actions], order_configs[:actions], sort_alphabetically: false),
+        tabs: sort_by_name(model[:tabs], order_configs[:tabs], sort_alphabetically: false),
+        scopes: sort_by_name(model[:scopes], order_configs[:scopes])
+      )
+    end
+
+    def build_order_configs(model_name, configs)
+      {
+        columns: configs["resources.#{model_name}.columns.order"],
+        associations: configs["resources.#{model_name}.associations.order"],
+        actions: configs["resources.#{model_name}.actions.order"],
+        tabs: configs["resources.#{model_name}.tabs.order"],
+        scopes: configs["resources.#{model_name}.scopes.order"]
+      }
     end
 
     # @param list [Array<HashWithIndifferentAccess>]

data/lib/motor/queries.rb

@@ -5,6 +5,7 @@ module Motor
   end
 end
 
+require_relative './queries/render_sql_template'
 require_relative './queries/run_query'
 require_relative './queries/persistance'
 require_relative './queries/postgresql_exec_query'

data/lib/motor/queries/render_sql_template.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Motor
+  module Queries
+    module RenderSqlTemplate
+      SECTION_OPEN_REGEXP = /{{([#^])\s*(\w+)}}.*\z/m.freeze
+      VARIABLE_REGEXP = /{{\s*(\w+)\s*}}/m.freeze
+
+      module_function
+
+      def call(sql, variables)
+        result = render_sections(sql, variables)
+
+        interpolate_variables(result, variables)
+      end
+
+      def interpolate_variables(sql, variables)
+        selected_variables = []
+
+        rendered =
+          sql.gsub(VARIABLE_REGEXP) do
+            variable_name = Regexp.last_match[1]
+
+            index = selected_variables.index { |name, _| name == variable_name }
+            selected_variables << [variable_name, variables[variable_name]] unless index
+
+            "$#{selected_variables.size}"
+          end
+
+        [rendered, selected_variables]
+      end
+
+      def render_sections(sql, variables)
+        sql.sub(SECTION_OPEN_REGEXP) do |e|
+          variable_name = Regexp.last_match[2]
+          is_negative = Regexp.last_match[1] == '^'
+
+          _, content, rest = e.split(build_section_close_regexp(variable_name), 3)
+
+          is_present = variables[variable_name].present?
+
+          render_sections(is_present ^ is_negative ? content + rest.to_s : rest, variables)
+        end
+      end
+
+      def build_section_close_regexp(variable_name)
+        %r{{{[#^/]s*#{Regexp.escape(variable_name)}\s*}}}m
+      end
+    end
+  end
+end

data/lib/motor/queries/run_query.rb

@@ -3,8 +3,7 @@
 module Motor
   module Queries
     module RunQuery
-      DEFAULT_LIMIT = 1_000_000
-      INTERPOLATION_REGEXP = /{{(\w+)}}/.freeze
+      DEFAULT_LIMIT = 100_000
 
       QueryResult = Struct.new(:data, :columns, keyword_init: true)
 
@@ -14,6 +13,10 @@ module Motor
 
       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)
         variables_hash ||= {}
 
@@ -22,15 +25,27 @@ module Motor
         QueryResult.new(data: result.rows, columns: build_columns_hash(result))
       end
 
+      # @param query [Motor::Query]
+      # @param limit [Integer]
+      # @param variables_hash [Hash]
+      # @return [ActiveRecord::Result]
       def execute_query(query, limit, variables_hash)
+        result = nil
         statement = prepare_sql_statement(query, limit, variables_hash)
 
-        case ActiveRecord::Base.connection
-        when ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-          PostgresqlExecQuery.call(ActiveRecord::Base.connection, statement)
-        else
-          ActiveRecord::Base.connection.exec_query(*statement)
+        ActiveRecord::Base.transaction do
+          result =
+            case ActiveRecord::Base.connection
+            when ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+              PostgresqlExecQuery.call(ActiveRecord::Base.connection, statement)
+            else
+              ActiveRecord::Base.connection.exec_query(*statement)
+            end
+
+          raise ActiveRecord::Rollback
         end
+
+        result
       end
 
       # @param result [ActiveRecord::Result]
@@ -47,27 +62,40 @@ module Motor
         end
       end
 
+      # @param query [Motor::Query]
+      # @param limit [Integer]
+      # @param variables_hash [Hash]
+      # @return [Array]
       def prepare_sql_statement(query, limit, variables_hash)
-        variables = query.preferences.fetch(:variables, []).pluck(:name, :default_value)
-
-        sql =
-          query.sql_body.gsub(INTERPOLATION_REGEXP) do
-            index = variables.index { |name, _| name == (Regexp.last_match[1]) } + 1
+        variables = merge_variable_default_values(query.preferences.fetch(:variables, []), variables_hash)
 
-            "$#{index}"
-          end
+        sql, query_variables = RenderSqlTemplate.call(query.sql_body, variables)
 
-        attributes =
-          variables.map do |variable_name, default_value|
-            ActiveRecord::Relation::QueryAttribute.new(
-              variable_name,
-              variables_hash[variable_name] || default_value,
-              ActiveRecord::Type::Value.new
-            )
-          end
+        attributes = build_statement_attributes(query_variables)
 
         [format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.gsub(/;\z/, ''), limit: limit), 'SQL', attributes]
       end
+
+      # @param variables [Array<(String, Object)>]
+      # @return [Array<ActiveRecord::Relation::QueryAttribute>]
+      def build_statement_attributes(variables)
+        variables.map do |variable_name, value|
+          ActiveRecord::Relation::QueryAttribute.new(
+            variable_name,
+            value,
+            ActiveRecord::Type::Value.new
+          )
+        end
+      end
+
+      # @param variable_configs [Array<Hash>]
+      # @param variable_hash [Hash]
+      # @return [Hash]
+      def merge_variable_default_values(variable_configs, variables_hash)
+        variable_configs.each_with_object({}) do |variable, acc|
+          acc[variable[:name]] = variables_hash[variable[:name]] || variable[:default_value]
+        end
+      end
     end
   end
 end

data/lib/motor/ui_configs.rb

@@ -27,22 +27,42 @@ module Motor
       {
         base_path: Motor::Admin.routes.url_helpers.motor_path,
         schema: Motor::BuildSchema.call,
-        header_links: Motor::Config.find_by(key: 'header.links')&.value || [],
-        queries: Motor::Query.all.active.preload(:tags)
-                             .as_json(only: %i[id name updated_at],
-                                      include: { tags: { only: %i[id name] } }),
-        dashboards: Motor::Dashboard.all.active.preload(:tags)
-                                    .as_json(only: %i[id title updated_at],
-                                             include: { tags: { only: %i[id name] } }),
-        alerts: Motor::Alert.all.active.preload(:tags)
-                            .as_json(only: %i[id name is_enabled updated_at],
-                                     include: { tags: { only: %i[id name] } }),
-        forms: Motor::Form.all.active.preload(:tags)
-                          .as_json(only: %i[id name updated_at],
-                                   include: { tags: { only: %i[id name] } })
+        header_links: header_links_data_hash,
+        queries: queries_data_hash,
+        dashboards: dashboards_data_hash,
+        alerts: alerts_data_hash,
+        forms: forms_data_hash
       }
     end
 
+    def header_links_data_hash
+      Motor::Config.find_by(key: 'header.links')&.value || []
+    end
+
+    def queries_data_hash
+      Motor::Query.all.active.preload(:tags)
+                  .as_json(only: %i[id name updated_at],
+                           include: { tags: { only: %i[id name] } })
+    end
+
+    def dashboards_data_hash
+      Motor::Dashboard.all.active.preload(:tags)
+                      .as_json(only: %i[id title updated_at],
+                               include: { tags: { only: %i[id name] } })
+    end
+
+    def alerts_data_hash
+      Motor::Alert.all.active.preload(:tags)
+                  .as_json(only: %i[id name is_enabled updated_at],
+                           include: { tags: { only: %i[id name] } })
+    end
+
+    def forms_data_hash
+      Motor::Form.all.active.preload(:tags)
+                 .as_json(only: %i[id name updated_at],
+                          include: { tags: { only: %i[id name] } })
+    end
+
     # @return [String]
     def cache_key
       ActiveRecord::Base.connection.execute(

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.25'
+  VERSION = '0.1.32'
 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-07eb806daf063d260c47.css.gz": "main-07eb806daf063d260c47.css.gz",
-  "main-07eb806daf063d260c47.js.LICENSE.txt": "main-07eb806daf063d260c47.js.LICENSE.txt",
-  "main-07eb806daf063d260c47.js.gz": "main-07eb806daf063d260c47.js.gz",
-  "main.css": "main-07eb806daf063d260c47.css",
-  "main.js": "main-07eb806daf063d260c47.js"
+  "main-eea896c6f0ede15495f0.css.gz": "main-eea896c6f0ede15495f0.css.gz",
+  "main-eea896c6f0ede15495f0.js.LICENSE.txt": "main-eea896c6f0ede15495f0.js.LICENSE.txt",
+  "main-eea896c6f0ede15495f0.js.gz": "main-eea896c6f0ede15495f0.js.gz",
+  "main.css": "main-eea896c6f0ede15495f0.css",
+  "main.js": "main-eea896c6f0ede15495f0.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.32
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 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
@@ -208,13 +208,14 @@ files:
 - lib/motor/queries.rb
 - lib/motor/queries/persistance.rb
 - lib/motor/queries/postgresql_exec_query.rb
+- lib/motor/queries/render_sql_template.rb
 - lib/motor/queries/run_query.rb
 - lib/motor/tags.rb
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-07eb806daf063d260c47.css.gz
-- ui/dist/main-07eb806daf063d260c47.js.gz
+- ui/dist/main-eea896c6f0ede15495f0.css.gz
+- ui/dist/main-eea896c6f0ede15495f0.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