motor-admin 0.2.37 → 0.2.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a582148a923d7c89a0944ba2c91315b434db0989a6b8918ba4db1f36d8f17480
-  data.tar.gz: ed1d8c3588dff89c78e468b6b4a9ac06def1a3af163dc74d6a6602321a0e6dc1
+  metadata.gz: 89d36e62222311f43cf9df24d7d090d72cb067e9cc713431ff2f7ce39ed8079c
+  data.tar.gz: 40f0520672effff61094e2518afcb216c6da4c2402749bac024648a5a8c491e9
 SHA512:
-  metadata.gz: b3a9a370786068bf97186bf93ef42de50318a2bbbcf2ed52c83aeef3705693d90ecd4fa40e012cb55c56303576eb124a27cb19ac16db584b47138733cca1e223
-  data.tar.gz: 9e03d29bb4d5e9ee67c4c2b7d4d809294caaf2e4bedd2b3b9c2cba61d65888edf2d7cd47ef5c28503bbcef916092e34979c3b4ee34be137cb8fb9306f9cc216a
+  metadata.gz: 89e962e2d87c0171a38961d1f1d0ede97021d5eb8bb0ba071b92d3c114a919d201f11dd25647793efd656823fc7b19c7e913c51a73b7e69b7f472f8772a59fa5
+  data.tar.gz: 38d3105d72a4aca9fa91f0096e92d7c4ef015e0544e877ceb7b844eac6617cbdc1c25a6df20772358b5a93b29b661985d6112719cfae9e62737499306b05c695

data/app/controllers/motor/api_configs_controller.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Motor
+  class ApiConfigsController < ApiBaseController
+    wrap_parameters :data, except: %i[include fields]
+
+    before_action :find_or_initialize_api_config, only: :create
+    load_and_authorize_resource
+
+    def index
+      render json: { data: Motor::ApiQuery::BuildJson.call(@api_configs.active.order(:id), params, current_ability) }
+    end
+
+    def create
+      @api_config.save!
+
+      Motor::Configs::WriteToFile.call
+
+      render json: { data: Motor::ApiQuery::BuildJson.call(@api_config, params, current_ability) }
+    rescue ActiveRecord::RecordNotUnique
+      find_or_initialize_api_config
+
+      retry
+    end
+
+    def destroy
+      @api_config&.update!(deleted_at: Time.current)
+
+      Motor::Configs::WriteToFile.call
+
+      head :ok
+    end
+
+    private
+
+    def find_or_initialize_api_config
+      name, url, description, preferences, credentials =
+        api_config_params.values_at(:name, :url, :description, :preferences, :credentials)
+
+      @api_config =
+        Motor::ApiConfig.find_or_initialize_by(name: name).tap do |config|
+          config.url = url.delete_suffix('/')
+          config.description = description
+          config.preferences.merge!(preferences)
+          config.credentials.merge!(credentials)
+          config.deleted_at = nil
+        end
+    end
+
+    def api_config_params
+      params.require(:data).permit(:name, :url, :description, preferences: {}, credentials: {})
+    end
+  end
+end

data/app/controllers/motor/forms_controller.rb

@@ -54,7 +54,8 @@ module Motor
     end
 
     def form_params
-      params.require(:data).permit(:name, :description, :api_path, :http_method, preferences: {}, tags: [])
+      params.require(:data).permit(:name, :description, :api_path, :http_method,
+                                   :api_config_name, preferences: {}, tags: [])
     end
   end
 end

data/app/controllers/motor/queries_controller.rb

@@ -21,7 +21,11 @@ module Motor
       if Motor::Queries::Persistance.name_already_exists?(@query)
         render json: { errors: [{ source: 'name', detail: 'Name already exists' }] }, status: :unprocessable_entity
       else
-        ApplicationRecord.transaction { @query.save! }
+        ApplicationRecord.transaction do
+          Motor::Queries::Persistance.assign_or_create_api_config!(@query)
+          @query.save!
+        end
+
         Motor::Configs::WriteToFile.call
 
         render json: { data: Motor::ApiQuery::BuildJson.call(@query, params, current_ability) }

data/app/controllers/motor/run_api_requests_controller.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Motor
+  class RunApiRequestsController < ApiBaseController
+    JWT_TTL = 2.hours
+
+    wrap_parameters :data
+
+    def show
+      respond_with_result
+    end
+
+    def create
+      respond_with_result
+    end
+
+    private
+
+    def respond_with_result
+      response = Motor::ApiConfigs.run(find_or_initialize_api_config,
+                                       method: request_params[:method],
+                                       path: request_params[:path],
+                                       body: request_params[:params],
+                                       params: request_params[:body],
+                                       headers: { 'Authorization' => "Bearer #{current_user_jwt}" })
+
+      self.response_body = response.body
+      self.status = response.code.to_i
+    end
+
+    def find_or_initialize_api_config
+      Motor::ApiConfig.find_by(name: request_params[:api_config_name]) ||
+        Motor::ApiConfig.new(url: request_params[:api_config_name])
+    end
+
+    def current_user_jwt
+      return '' unless defined?(JWT)
+      return '' unless current_user
+
+      payload = { uid: current_user.id, email: current_user.email, exp: JWT_TTL.from_now.to_i }
+
+      JWT.encode(payload, Rails.application.secrets.secret_key_base)
+    end
+
+    def request_params
+      params.require(:data).permit!
+    end
+  end
+end

data/app/models/motor/api_config.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Motor
+  class ApiConfig < ::Motor::ApplicationRecord
+    unless table_exists?
+      puts
+      puts ' => Run `rails g motor:upgrade && rake db:migrate` to perform data migration and enable the latest features'
+      puts
+    end
+
+    encrypts :credentials if defined?(::Motor::EncryptedConfig)
+
+    serialize :credentials, Motor::HashSerializer
+    serialize :preferences, Motor::HashSerializer
+
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
+    attribute :credentials, default: -> { HashWithIndifferentAccess.new }
+
+    has_one :form, dependent: nil, foreign_key: :api_config_name, primary_key: :name, inverse_of: :api_config
+
+    scope :active, -> { where(deleted_at: nil) }
+
+    def headers
+      credentials.fetch(:headers, []).each_with_object({}) do |item, acc|
+        acc[item[:key]] = item[:value]
+      end
+    end
+  end
+end

data/app/models/motor/form.rb

@@ -5,6 +5,7 @@ module Motor
     audited
 
     belongs_to :author, polymorphic: true, optional: true
+    belongs_to :api_config, foreign_key: :api_config_name, primary_key: :name, inverse_of: :form
 
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'

data/config/locales/en.yml

@@ -293,3 +293,9 @@ en:
     regexp: RegExp
     message: Message
     should_be_a_valid_regexp: Should be a valid RegExp string
+    order_by: Order by
+    ascending: Ascending
+    descending: Descending
+    url: URL
+    expand: Expand
+    add_api: Add API

data/config/locales/es.yml

@@ -293,6 +293,12 @@ es:
     regexp: RegExp
     message: Mensaje
     should_be_a_valid_regexp: Debe ser una cadena RegExp válida
+    order_by: Ordenar por
+    ascending: Ascendente
+    descending: Descendente
+    url: URL
+    expand: Expandir
+    add_api: De API
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -289,6 +289,12 @@ pt:
     regexp: RegExp
     message: Mensagem
     should_be_a_valid_regexp: Deve ser uma string RegExp válida
+    order_by: Encomendar por
+    ascending: Ascendente
+    descending: Decrescente
+    url: URL
+    expand: Expandir
+    add_api: De API
     i:
       locale: pt
       select:

data/config/routes.rb

@@ -14,6 +14,8 @@ Motor::Admin.routes.draw do
       resources :resource_default_queries, only: %i[show], param: 'resource'
       resources :schema, only: %i[index show], param: 'resource'
       resources :dashboards, only: %i[index show create update destroy]
+      resource :run_api_request, only: %i[show create]
+      resources :api_configs, only: %i[index create destroy]
       resources :forms, only: %i[index show create update destroy]
       resources :alerts, only: %i[index show create update destroy]
       resources :icons, only: %i[index]

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

@@ -44,6 +44,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.column :author_id, :bigint
       t.column :author_type, :string
       t.column :deleted_at, :datetime
+      t.column :api_config_name, :string, null: false
 
       t.timestamps
 
@@ -138,6 +139,22 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.column :created_at, :datetime
     end
 
+    create_table :motor_api_configs do |t|
+      t.column :name, :string, null: false
+      t.column :url, :string, null: false
+      t.column :preferences, :text, null: false
+      t.column :credentials, :text, null: false
+      t.column :description, :text
+      t.column :deleted_at, :datetime
+
+      t.timestamps
+
+      t.index 'name',
+        name: 'motor_api_configs_name_unique_index',
+        unique: true,
+        where: 'deleted_at IS NULL'
+    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'
@@ -152,6 +169,10 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       name: '⭐ Star on GitHub',
       path: 'https://github.com/motor-admin/motor-admin-rails'
     }].to_json)
+
+    model.table_name = 'motor_api_configs'
+
+    model.create!(name: 'origin', path: '/')
   end
 
   def self.down

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

@@ -0,0 +1,80 @@
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  class MotorApiConfig < ActiveRecord::Base
+    self.table_name = 'motor_api_configs'
+
+    encrypts :credentials if defined?(::Motor::EncryptedConfig)
+
+    serialize :credentials, Motor::HashSerializer
+    serialize :preferences, Motor::HashSerializer
+
+    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
+    attribute :credentials, default: -> { HashWithIndifferentAccess.new }
+  end
+
+  class MotorForm < ActiveRecord::Base
+    self.table_name = 'motor_forms'
+  end
+
+  class MotorQuery < ActiveRecord::Base
+    self.table_name = 'motor_queries'
+
+    serialize :preferences, Motor::HashSerializer
+  end
+
+  def up
+    create_table :motor_api_configs do |t|
+      t.column :name, :string, null: false
+      t.column :url, :string, null: false
+      t.column :preferences, :text, null: false
+      t.column :credentials, :text, null: false
+      t.column :description, :text
+      t.column :deleted_at, :datetime
+
+      t.timestamps
+
+      t.index 'name',
+        name: 'motor_api_configs_name_unique_index',
+        unique: true,
+        where: 'deleted_at IS NULL'
+    end
+
+    add_column :motor_forms, :api_config_name, :string
+
+    MotorForm.all.each do |form|
+      if form.api_path.starts_with?('http')
+        url = form.api_path[%r{\Ahttps?://[^/]+}]
+
+        form.preferences[:default_values_api_path]&.delete(url)
+        form.update!(api_config_name: MotorApiConfig.find_or_create_by!(name: url, url: url).name,
+                     api_path: form.api_path.delete(url))
+      else
+        form.update!(api_config_name: MotorApiConfig.find_or_create_by!(name: 'origin', url: '/').name)
+      end
+    end
+
+    MotorQuery.all.each do |query|
+      next if query.preferences['api_path'].blank?
+
+      if query.preferences['api_path'].starts_with?('http')
+        url = query.preferences['api_path'][%r{\Ahttps?://[^/]+}]
+
+        query.preferences['api_path'].delete(url)
+
+        query.preferences['api_config_name'] = MotorApiConfig.find_or_create_by!(name: url, url: url).name
+      else
+        query.preferences['api_config_name'] = MotorApiConfig.find_or_create_by!(name: 'origin', url: '/').name
+      end
+
+      query.save!
+    end
+
+    change_column_null :motor_forms, :api_config_name, false
+
+    MotorApiConfig.find_or_create_by!(name: 'origin', url: '/')
+  end
+
+  def down
+    remove_column :motor_forms, :api_config_name
+    drop_table :motor_api_configs
+  end
+end

data/lib/generators/motor/upgrade_generator.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'active_record'
+require 'rails/generators/active_record'
+require 'generators/motor/migration'
+
+module Motor
+  module Generators
+    class UpgradeGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      extend Motor::Generators::Migration
+
+      source_root File.expand_path('templates', __dir__)
+
+      def copy_migration
+        if Motor::ApiConfig.table_exists?
+          puts 'The latest Motor Admin features are already configured'
+        else
+          migration_template 'install_api_configs.rb', 'db/migrate/install_motor_api_configs.rb'
+
+          puts 'Run `rake db:migrate` to update DB schema'
+        end
+      end
+    end
+  end
+end

data/lib/motor/active_record_utils/types.rb

@@ -53,7 +53,7 @@ module Motor
 
         type_map = connection_class.connection.send(:type_map)
 
-        type_map.instance_variable_get('@mapping').map do |name, type|
+        type_map.instance_variable_get(:@mapping).map do |name, type|
           next unless name.is_a?(String)
 
           [type.call.class.to_s, name]

data/lib/motor/alerts/persistance.rb

@@ -87,9 +87,9 @@ module Motor
 
       def name_already_exists?(alert)
         if alert.new_record?
-          Alert.exists?(name: alert.name)
+          Alert.exists?(name: alert.name, deleted_at: nil)
         else
-          Alert.exists?(['name = ? AND id != ?', alert.name, alert.id])
+          Alert.exists?(['name = ? AND id != ? AND deleted_at IS NULL', alert.name, alert.id])
         end
       end
     end

data/lib/motor/api_configs.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Motor
+  module ApiConfigs
+    METHODS = %w[get post put delete].freeze
+
+    InvalidHttpMethod = Class.new(StandardError)
+
+    module_function
+
+    def run(api_config, method: nil, path: nil, body: nil, params: {}, headers: {})
+      method ||= 'get'
+
+      raise InvalidHttpMethod unless METHODS.include?(method.downcase)
+
+      Motor::NetHttpUtils.public_send(
+        method.downcase.to_sym,
+        api_config.url.to_s.sub(%r{/?\z}, '/') + path.delete_prefix('/'),
+        params,
+        headers.merge(api_config.headers),
+        body
+      )
+    end
+  end
+end

data/lib/motor/api_query/apply_scope.rb

@@ -26,7 +26,17 @@ module Motor
 
         return rel unless scope_configs
 
-        ApiQuery::Filter.call(rel, scope_configs[:preferences][:filter])
+        rel = ApiQuery::Filter.call(rel, scope_configs[:preferences][:filter])
+
+        apply_order(rel, scope_configs[:preferences][:sort])
+      end
+
+      def apply_order(rel, params)
+        return rel if params.blank?
+
+        sort_key, sort_order = params.values_at(:key, :order)
+
+        rel.order(sort_key => sort_order)
       end
     end
   end

data/lib/motor/build_schema/find_searchable_columns.rb

@@ -16,7 +16,7 @@ module Motor
 
         selected_columns ||= columns.first(SELECT_COLUMNS_AMOUNT)
 
-        ([model.primary_key] + selected_columns).sort
+        ([model.primary_key] + selected_columns).compact.sort
       end
 
       def find_searchable_columns(model)

data/lib/motor/configs/build_configs_hash.rb

@@ -5,6 +5,7 @@ module Motor
     module BuildConfigsHash
       module_function
 
+      # rubocop:disable Metrics/AbcSize
       def call
         cache_keys = LoadFromCache.load_cache_keys
 
@@ -16,9 +17,11 @@ module Motor
           queries: build_queries_hash(cache_keys[:queries]),
           dashboards: build_dashboards_hash(cache_keys[:dashboards]),
           forms: build_forms_hash(cache_keys[:forms]),
-          alerts: build_alerts_hash(cache_keys[:alerts])
+          alerts: build_alerts_hash(cache_keys[:alerts]),
+          api_configs: build_api_configs_hash(cache_keys[:api_configs])
         )
       end
+      # rubocop:enable Metrics/AbcSize
 
       def build_queries_hash(cache_key = nil)
         Motor::Configs::LoadFromCache.load_queries(cache_key: cache_key).sort_by(&:id).map do |query|
@@ -43,11 +46,17 @@ module Motor
 
       def build_forms_hash(cache_key = nil)
         Motor::Configs::LoadFromCache.load_forms(cache_key: cache_key).sort_by(&:id).map do |form|
-          form.slice(%i[id name http_method api_path description preferences])
+          form.slice(%i[id name http_method api_path description preferences api_config_name])
               .merge(tags: form.tags.map(&:name), updated_at: form.updated_at.to_time)
         end
       end
 
+      def build_api_configs_hash(cache_key = nil)
+        Motor::Configs::LoadFromCache.load_api_configs(cache_key: cache_key).sort_by(&:id).map do |config|
+          config.slice(%i[id name url preferences description]).merge(updated_at: config.updated_at.to_time)
+        end
+      end
+
       def build_configs_hash(cache_key = nil)
         Motor::Configs::LoadFromCache.load_configs(cache_key: cache_key).sort_by(&:key).map do |config|
           {

data/lib/motor/configs/load_from_cache.rb

@@ -68,6 +68,12 @@ module Motor
         end
       end
 
+      def load_api_configs(cache_key: nil)
+        maybe_fetch_from_cache('forms', cache_key) do
+          Motor::ApiConfig.all.active.load
+        end
+      end
+
       def maybe_fetch_from_cache(type, cache_key)
         return yield unless cache_key
 
@@ -95,7 +101,8 @@ module Motor
           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
+          Motor::Form.select("'forms', MAX(updated_at)").to_sql,
+          Motor::ApiConfig.select("'api_configs', MAX(updated_at)").to_sql
         ].join(' UNION ')
       end
     end

data/lib/motor/configs/sync_from_hash.rb

@@ -17,6 +17,7 @@ module Motor
           sync_forms(configs_hash)
           sync_configs(configs_hash)
           sync_resources(configs_hash)
+          sync_api_configs(configs_hash)
         end
       end
 
@@ -68,6 +69,28 @@ module Motor
         end
       end
 
+      def sync_api_configs(configs_hash)
+        return if configs_hash[:api_configs].blank?
+
+        configs_index = Motor::Configs::LoadFromCache.load_api_configs.index_by(&:name)
+
+        configs_hash[:api_configs].each do |attrs|
+          record = configs_index[attrs[:name]] || Motor::ApiConfig.new
+
+          next if record.updated_at && attrs[:updated_at] <= record.updated_at
+
+          record.update!(attrs.merge(deleted_at: nil))
+        end
+
+        archive_api_configs(configs_index, configs_hash[:api_configs])
+      end
+
+      def archive_api_configs(configs_index, api_configs)
+        configs_index.except(*api_configs.pluck('name')).each_value do |config|
+          config.update!(deleted_at: Time.current) if config.deleted_at.blank?
+        end
+      end
+
       def sync_resources(configs_hash)
         resources_index = Motor::Configs::LoadFromCache.load_resources.index_by(&:name)
 

data/lib/motor/dashboards/persistance.rb

@@ -63,9 +63,9 @@ module Motor
 
       def title_already_exists?(dashboard)
         if dashboard.new_record?
-          Motor::Dashboard.exists?(title: dashboard.title)
+          Motor::Dashboard.exists?(title: dashboard.title, deleted_at: nil)
         else
-          Motor::Dashboard.exists?(['title = ? AND id != ?', dashboard.title, dashboard.id])
+          Motor::Dashboard.exists?(['title = ? AND id != ? AND deleted_at IS NULL', dashboard.title, dashboard.id])
         end
       end
     end

data/lib/motor/forms/persistance.rb

@@ -38,6 +38,7 @@ module Motor
 
         ApplicationRecord.transaction do
           archive_with_existing_name(form) if force_replace
+          find_or_assign_api_config(form)
 
           form.save!
         end
@@ -50,12 +51,31 @@ module Motor
       end
 
       def assign_attributes(form, params)
-        form.assign_attributes(params.slice(:name, :description, :api_path, :http_method, :preferences))
+        form.assign_attributes(params.slice(:name, :description, :api_path, :http_method, :preferences,
+                                            :api_config_name))
         form.updated_at = [params[:updated_at], Time.current].min if params[:updated_at].present?
 
+        find_or_assign_api_config(form)
+
         Motor::Tags.assign_tags(form, params[:tags])
       end
 
+      def find_or_assign_api_config(form)
+        return if form.api_config.present?
+
+        config = Motor::ApiConfig.find_by(url: [form.api_config_name, form.api_config_name.delete_suffix('/')])
+
+        if config
+          config.update!(deleted_at: nil)
+
+          form.api_config_name = config.name
+        else
+          form.api_config = Motor::ApiConfig.new(url: form.api_config_name.delete_suffix('/')).tap do |c|
+            c.name = c.url.sub(%r{\Ahttps?://}, '').delete_suffix('/')
+          end
+        end
+      end
+
       def archive_with_existing_name(form)
         Motor::Form.where(['name = ? AND id != ?', form.name, form.id])
                    .update_all(deleted_at: Time.current)
@@ -63,9 +83,9 @@ module Motor
 
       def name_already_exists?(form)
         if form.new_record?
-          Motor::Form.exists?(['name = ?', form.name])
+          Motor::Form.exists?(['name = ? AND deleted_at IS NULL', form.name])
         else
-          Motor::Form.exists?(['name = ? AND id != ?', form.name, form.id])
+          Motor::Form.exists?(['name = ? AND id != ? AND deleted_at IS NULL', form.name, form.id])
         end
       end
     end

data/lib/motor/net_http_utils.rb

@@ -4,7 +4,7 @@ module Motor
   module NetHttpUtils
     module_function
 
-    def get(url, params = {}, headers = {})
+    def get(url, params = {}, headers = {}, _body = nil)
       request = build_request(Net::HTTP::Get, url, params, headers, nil)
 
       execute_request(request)
@@ -16,9 +16,21 @@ module Motor
       execute_request(request)
     end
 
+    def put(url, params = {}, headers = {}, body = '')
+      request = build_request(Net::HTTP::Put, url, params, headers, body)
+
+      execute_request(request)
+    end
+
+    def delete(url, params = {}, headers = {}, body = '')
+      request = build_request(Net::HTTP::Delete, url, params, headers, body)
+
+      execute_request(request)
+    end
+
     def build_request(method_class, url, params, headers, body)
       uri = URI(url)
-      uri.query = params.to_query
+      uri.query = params.to_query if params.present?
 
       request = method_class.new(uri)
       request.body = body if body.present?

data/lib/motor/queries/persistance.rb

@@ -38,6 +38,7 @@ module Motor
 
         ApplicationRecord.transaction do
           archive_with_existing_name(query) if force_replace
+          assign_or_create_api_config!(query)
 
           query.save!
         end
@@ -61,11 +62,27 @@ module Motor
                     .update_all(deleted_at: Time.current)
       end
 
+      def assign_or_create_api_config!(query)
+        api_config_name = query.preferences[:api_config_name]
+
+        return if api_config_name.blank?
+        return if Motor::ApiConfig.find_by(name: api_config_name)
+
+        config = Motor::ApiConfig.find_by(url: [api_config_name, api_config_name.delete_suffix('/')])
+
+        config&.update!(deleted_at: nil)
+
+        config ||= Motor::ApiConfig.create!(name: api_config_name.sub(%r{\Ahttps?://}, '').delete_suffix('/'),
+                                            url: api_config_name.delete_suffix('/'))
+
+        query.preferences[:api_config_name] = config.name
+      end
+
       def name_already_exists?(query)
         if query.new_record?
-          Query.exists?(name: query.name)
+          Query.exists?(name: query.name, deleted_at: nil)
         else
-          Query.exists?(['name = ? AND id != ?', query.name, query.id])
+          Query.exists?(['name = ? AND id != ? AND deleted_at IS NULL', query.name, query.id])
         end
       end
     end

data/lib/motor/queries/run_query.rb

@@ -194,7 +194,9 @@ module Motor
       def normalize_statement_for_sql(statement)
         sql, _, attributes = statement
 
-        sql = ActiveRecord::Base.sanitize_sql([sql.gsub(STATEMENT_VARIABLE_REGEXP, '?'), attributes.map(&:value)])
+        sql = ActiveRecord::Base.send(:replace_bind_variables,
+                                      sql.gsub(STATEMENT_VARIABLE_REGEXP, '?'),
+                                      attributes.map(&:value))
 
         [sql, 'SQL', attributes]
       end

data/lib/motor/resources/fetch_configured_model.rb

@@ -41,7 +41,7 @@ module Motor
       def define_default_scope(klass, config)
         return klass if config[:custom_sql].blank?
 
-        klass.instance_variable_set(:@__motor_custom_sql, config[:custom_sql].squish)
+        klass.instance_variable_set(:@__motor_custom_sql, config[:custom_sql].squish.delete_suffix(';'))
 
         klass.instance_eval do
           default_scope do

data/lib/motor/resources.rb

@@ -4,7 +4,8 @@ module Motor
   module Resources
     RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible display_primary_key
                         searchable_columns].freeze
-    COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format validators].freeze
+    COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format
+                      validators].freeze
     ASSOCIATION_ATTRS = %w[name display_name model_name icon visible foreign_key primary_key options virtual
                            polymorphic slug].freeze
     SCOPE_ATTRS = %w[name display_name scope_type preferences visible].freeze

data/lib/motor/version.rb

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

data/lib/motor.rb

@@ -61,6 +61,7 @@ require 'motor/configs'
 require 'motor/queries'
 require 'motor/dashboards'
 require 'motor/forms'
+require 'motor/api_configs'
 require 'motor/alerts'
 require 'motor/resources'
 require 'motor/hash_serializer'

data/ui/dist/manifest.json

@@ -2601,9 +2601,9 @@
   "icons/zoom-out.svg.gz": "icons/zoom-out.svg.gz",
   "icons/zoom-question.svg": "icons/zoom-question.svg",
   "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
-  "main-caf0e2eb1b4372864962.css.gz": "main-caf0e2eb1b4372864962.css.gz",
-  "main-caf0e2eb1b4372864962.js.LICENSE.txt": "main-caf0e2eb1b4372864962.js.LICENSE.txt",
-  "main-caf0e2eb1b4372864962.js.gz": "main-caf0e2eb1b4372864962.js.gz",
-  "main.css": "main-caf0e2eb1b4372864962.css",
-  "main.js": "main-caf0e2eb1b4372864962.js"
+  "main-90db17316da397cbfa9c.css.gz": "main-90db17316da397cbfa9c.css.gz",
+  "main-90db17316da397cbfa9c.js.LICENSE.txt": "main-90db17316da397cbfa9c.js.LICENSE.txt",
+  "main-90db17316da397cbfa9c.js.gz": "main-90db17316da397cbfa9c.js.gz",
+  "main.css": "main-90db17316da397cbfa9c.css",
+  "main.js": "main-90db17316da397cbfa9c.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.37
+  version: 0.2.43
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-19 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -114,6 +114,7 @@ files:
 - app/controllers/motor/active_storage_attachments_controller.rb
 - app/controllers/motor/alerts_controller.rb
 - app/controllers/motor/api_base_controller.rb
+- app/controllers/motor/api_configs_controller.rb
 - app/controllers/motor/application_controller.rb
 - app/controllers/motor/assets_controller.rb
 - app/controllers/motor/audits_controller.rb
@@ -127,6 +128,7 @@ files:
 - app/controllers/motor/resource_default_queries_controller.rb
 - app/controllers/motor/resource_methods_controller.rb
 - app/controllers/motor/resources_controller.rb
+- app/controllers/motor/run_api_requests_controller.rb
 - app/controllers/motor/run_queries_controller.rb
 - app/controllers/motor/schema_controller.rb
 - app/controllers/motor/send_alerts_controller.rb
@@ -139,6 +141,7 @@ files:
 - app/mailers/motor/application_mailer.rb
 - app/models/motor/alert.rb
 - app/models/motor/alert_lock.rb
+- app/models/motor/api_config.rb
 - app/models/motor/application_record.rb
 - app/models/motor/audit.rb
 - app/models/motor/config.rb
@@ -158,6 +161,8 @@ files:
 - lib/generators/motor/install_generator.rb
 - lib/generators/motor/migration.rb
 - lib/generators/motor/templates/install.rb
+- lib/generators/motor/templates/install_api_configs.rb
+- lib/generators/motor/upgrade_generator.rb
 - lib/motor-admin.rb
 - lib/motor.rb
 - lib/motor/active_record_utils.rb
@@ -175,6 +180,7 @@ files:
 - lib/motor/alerts/persistance.rb
 - lib/motor/alerts/scheduled_alerts_cache.rb
 - lib/motor/alerts/scheduler.rb
+- lib/motor/api_configs.rb
 - lib/motor/api_query.rb
 - lib/motor/api_query/apply_scope.rb
 - lib/motor/api_query/build_json.rb
@@ -1526,8 +1532,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-caf0e2eb1b4372864962.css.gz
-- ui/dist/main-caf0e2eb1b4372864962.js.gz
+- ui/dist/main-90db17316da397cbfa9c.css.gz
+- ui/dist/main-90db17316da397cbfa9c.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: