motor-admin 0.1.87 → 0.1.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4920715130ea25a1b4c1d8a0431d8a8753c62461b917f62ea71a7975d4c83ef9
-  data.tar.gz: 8bba1a8fad90615e4710977ccd0990ee3eeb77c8da3cdc37e09d7e88a57b97d9
+  metadata.gz: 415aa5a525bed1a18e83449929aa31d2ff26efbeb74e5fb2fd34aabe647917ff
+  data.tar.gz: a3374ce520a91cf756d1062db6fdde8ac157c36b0d5bdcd6b2a35549a4af3a49
 SHA512:
-  metadata.gz: f31c100b9fa308d083e41a9c6ee7b36dd8276e3c9184194507028e5f5966bdbaa07935942350f208e80a61c2fa8074b94e68c6708c81be6e2b5807f55e279216
-  data.tar.gz: 9d641fcc39f3a76a45da2b57c70e45a95816f03d8ae6c279636769139f47063a2d2441d384618b6337220bf216f942e222d21fb17ba26d6dea944187cd027f58
+  metadata.gz: 2c49ec2643ab788bd85cf9d3d405e2c57a0a79c5bd87cbe484546d80b20373ba3699810e34d980a0e577d897f2dc78c9d925c1310b1048d18a00fc837fa9e177
+  data.tar.gz: 5f15967763bc7b572e0660e607db814f9939757c0c2d544a37b4e5090177969b255f2bc0d490b560f5ff42c24008a4b98f188768edfd5f19b93a322a05bbe6af

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

@@ -13,7 +13,10 @@ module Motor
 
     def resource_class
       @resource_class ||=
-        Motor::BuildSchema::Utils.classify_slug(resource_name_prefix + params[:resource])
+        Motor::Resources::FetchConfiguredModel.call(
+          Motor::BuildSchema::Utils.classify_slug(resource_name_prefix + params[:resource]),
+          cache_key: Motor::Resource.maximum(:updated_at)
+        )
     end
 
     def resource_name_prefix
@@ -40,8 +43,6 @@ module Motor
       ).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
@@ -63,8 +64,6 @@ module Motor
       end
     rescue ActiveRecord::RecordNotFound
       head :not_found
-    rescue StandardError => e
-      render json: { errors: [e.message] }, status: :unprocessable_entity
     end
   end
 end

data/app/controllers/motor/resource_default_queries_controller.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Motor
+  class ResourceDefaultQueriesController < ApiBaseController
+    skip_authorization_check
+
+    before_action :authorize_resource
+
+    def show
+      render json: { data: { sql: resource_class.all.to_sql } }
+    end
+
+    private
+
+    def resource_class
+      @resource_class ||= Motor::BuildSchema::Utils.classify_slug(params[:resource])
+    end
+
+    def authorize_resource
+      authorize!(resource_class, :manage)
+    end
+  end
+end

data/app/controllers/motor/resources_controller.rb

@@ -11,7 +11,7 @@ module Motor
     end
 
     def create
-      Motor::BuildSchema::PersistResourceConfigs.call(@resource)
+      Motor::Resources::PersistConfigs.call(@resource)
       Motor::Configs::WriteToFile.call
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params, current_ability) }

data/app/controllers/motor/schema_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Motor
+  class SchemaController < ApiBaseController
+    skip_authorization_check
+
+    before_action :authorize_resource, only: :show
+
+    def index
+      render json: { data: schema }
+    end
+
+    def show
+      render json: { data: schema.find { |model| model[:name] == resource_class.name.underscore } }
+    end
+
+    private
+
+    def schema
+      @schema ||= Motor::BuildSchema.call(Configs::LoadFromCache.load_cache_keys, current_ability)
+    end
+
+    def resource_class
+      @resource_class ||= Motor::BuildSchema::Utils.classify_slug(params[:resource])
+    end
+
+    def authorize_resource
+      authorize!(resource_class, :read)
+    end
+  end
+end

data/config/locales/en.yml

@@ -238,3 +238,14 @@ en:
     field: Field
     empty: Empty
     not_empty: Not empty
+    general: General
+    run: Run
+    use_default: Use Default
+    query_editor: Query Editor
+    polymorphic: Polymorphic
+    foreign_key: Foreign key
+    primary_key: Primary key
+    through: Through
+    source: Source
+    resource: Resource
+    add_association: Add Association

data/config/locales/es.yml

@@ -238,6 +238,17 @@ es:
     field: Campo
     empty: Vacío
     not_empty: No vacío
+    general: General
+    run: Ejecutar
+    use_default: Uso por defecto
+    query_editor: Editor de consultas
+    polymorphic: Polimórfico
+    foreign_key: Clave externa
+    primary_key: Clave primaria
+    through: Mediante
+    source: Fuente
+    resource: Recurso
+    add_association: Añadir Asociación
     i:
       locale: es
       select:

data/config/routes.rb

@@ -11,12 +11,13 @@ Motor::Admin.routes.draw do
       resources :configs, only: %i[index create]
       resources :resources, only: %i[index create]
       resources :resource_methods, only: %i[show], param: 'resource'
+      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]
       resources :forms, only: %i[index show create update destroy]
       resources :alerts, only: %i[index show create update destroy]
       resources :icons, only: %i[index]
       resources :active_storage_attachments, only: %i[create], path: 'data/active_storage__attachments'
-      resource :schema, only: %i[show update]
       resources :audits, only: %i[index]
       resources :resources, path: '/data/:resource',
                             only: %i[index show update create destroy],

data/lib/motor.rb

@@ -25,6 +25,7 @@ module Motor
         next if f.ends_with?('alerts/scheduled_alerts_cache.rb')
         next if f.ends_with?('configs/load_from_cache.rb')
         next if f.ends_with?('configs/sync_from_file.rb')
+        next if f.ends_with?('resources/custom_sql_columns_cache.rb')
 
         load f
       end
@@ -62,6 +63,7 @@ require 'motor/queries'
 require 'motor/dashboards'
 require 'motor/forms'
 require 'motor/alerts'
+require 'motor/resources'
 require 'motor/hash_serializer'
 require 'motor/net_http_utils'
 require 'motor/railtie'

data/lib/motor/active_record_utils/defined_scopes_extension.rb

@@ -3,6 +3,12 @@
 module Motor
   module ActiveRecordUtils
     module DefinedScopesExtension
+      def inherited(subclass)
+        super
+
+        subclass.instance_variable_set(:@__scopes__, subclass.superclass.instance_variable_get(:@__scopes__).dup)
+      end
+
       def scope(name, _body)
         (@__scopes__ ||= []) << name.to_sym
 

data/lib/motor/active_record_utils/types.rb

@@ -36,8 +36,9 @@ module Motor
         all.invert[name.to_s]
       end
 
-      def find_name_for_class(klass)
-        name = all[klass.to_s]
+      def find_name_for_type(type)
+        name   = all[type.subtype.class.to_s] if type.respond_to?(:subtype)
+        name ||= all[type.class.to_s]
 
         return UNIFIED_TYPES.fetch(name, name) if name
 

data/lib/motor/api_query/build_json.rb

@@ -78,7 +78,7 @@ module Motor
 
           next if !is_permitted_all && permitted_attributes.exclude?(field_symbol)
 
-          if column_names.include?(field_symbol)
+          if model.columns_hash[field]
             acc['only'] << field
           elsif instance_methods.include?(field_symbol)
             acc['methods'] << field

data/lib/motor/build_schema.rb

@@ -15,7 +15,8 @@ module Motor
       ALL = [
         STRING = 'string',
         INTEGER = 'integer',
-        DECIMAL = 'float',
+        FLOAT = 'float',
+        REFERENCE = 'reference',
         DATETIME = 'datetime',
         DATE = 'date',
         BOOLEAN = 'boolean',
@@ -34,8 +35,19 @@ module Motor
       ].freeze
     end
 
+    module ColumnSources
+      ALL = [
+        TABLE = 'table',
+        QUERY = 'query',
+        REFLECTION = 'reflection'
+      ].freeze
+    end
+
     SEARCHABLE_COLUMN_TYPES = %i[citext text string bitstring].freeze
 
+    DEFAULT_TYPE = 'default'
+    DEFAULT_ICON = 'database'
+
     COLUMN_NAME_ACCESS_TYPES = {
       id: ColumnAccessTypes::READ_ONLY,
       created_at: ColumnAccessTypes::READ_ONLY,
@@ -43,7 +55,37 @@ module Motor
       deleted_at: ColumnAccessTypes::READ_ONLY
     }.with_indifferent_access.freeze
 
-    DEFAULT_SCOPE_TYPE = 'default'
+    COLUMN_DEFAULTS = {
+      access_type: ColumnAccessTypes::READ_WRITE,
+      column_source: ColumnSources::TABLE,
+      default_value: nil,
+      reference: nil,
+      format: {},
+      validators: []
+    }.with_indifferent_access
+
+    ACTION_DEFAULTS = {
+      visible: true,
+      preferences: {}
+    }.with_indifferent_access
+
+    TAB_DEFAULTS = {
+      visible: true,
+      tab_type: DEFAULT_TYPE,
+      preferences: {}
+    }.with_indifferent_access
+
+    SCOPE_DEFAULTS = {
+      visible: true,
+      scope_type: DEFAULT_TYPE,
+      preferences: {}
+    }.with_indifferent_access
+
+    ASSOCIATION_DEFAULTS = {
+      visible: true,
+      icon: DEFAULT_ICON,
+      options: {}
+    }.with_indifferent_access
 
     module_function
 
@@ -62,7 +104,6 @@ require_relative './build_schema/adjust_devise_model_schema'
 require_relative './build_schema/load_from_rails'
 require_relative './build_schema/find_display_column'
 require_relative './build_schema/find_icon'
-require_relative './build_schema/persist_resource_configs'
 require_relative './build_schema/reorder_schema'
 require_relative './build_schema/merge_schema_configs'
 require_relative './build_schema/apply_permissions'

data/lib/motor/build_schema/defaults.rb

@@ -11,21 +11,21 @@ module Motor
           {
             name: 'create',
             display_name: I18n.t('motor.create'),
-            action_type: 'default',
+            action_type: BuildSchema::DEFAULT_TYPE,
             preferences: {},
             visible: true
           },
           {
             name: 'edit',
             display_name: I18n.t('motor.edit'),
-            action_type: 'default',
+            action_type: BuildSchema::DEFAULT_TYPE,
             preferences: {},
             visible: true
           },
           {
             name: 'remove',
             display_name: I18n.t('motor.remove'),
-            action_type: 'default',
+            action_type: BuildSchema::DEFAULT_TYPE,
             preferences: {},
             visible: true
           }
@@ -38,7 +38,7 @@ module Motor
           {
             name: 'details',
             display_name: I18n.t('motor.details'),
-            tab_type: 'default',
+            tab_type: BuildSchema::DEFAULT_TYPE,
             preferences: {},
             visible: true
           }

data/lib/motor/build_schema/find_icon.rb

@@ -114,12 +114,12 @@ module Motor
       'status' => 'hash'
     }.freeze
 
-    DEFAULT_ICON = 'database'
+    DEFAULT_ICON = BuildSchema::DEFAULT_ICON
 
     module_function
 
     def call(text)
-      text = text.downcase
+      text = text.underscore
       icon = ICONS_MAP[text] || ICONS_MAP[text.singularize]
 
       icon ||=

data/lib/motor/build_schema/load_from_rails.rb

@@ -43,7 +43,7 @@ module Motor
       def models
         eager_load_models!
 
-        models = ActiveRecord::Base.descendants.reject(&:abstract_class)
+        models = ActiveRecord::Base.descendants.reject { |k| k.abstract_class || k.anonymous? }
 
         models -= Motor::ApplicationRecord.descendants
         models -= [Motor::Audit]
@@ -75,6 +75,7 @@ module Motor
           scopes: fetch_scopes(model),
           actions: BuildSchema::Defaults.actions,
           tabs: BuildSchema::Defaults.tabs,
+          custom_sql: nil,
           visible: true
         }.with_indifferent_access
       end
@@ -91,7 +92,7 @@ module Motor
             display_name: I18n.t(scope_name,
                                  scope: [I18N_SCOPES_KEY, model.name.underscore].join('.'),
                                  default: scope_name.humanize),
-            scope_type: DEFAULT_SCOPE_TYPE,
+            scope_type: DEFAULT_TYPE,
             visible: true,
             preferences: {}
           }
@@ -118,6 +119,7 @@ module Motor
           name: column.name,
           display_name: Utils.humanize_column_name(model.human_attribute_name(column.name)),
           column_type: fetch_column_type(column, model),
+          column_source: ColumnSources::TABLE,
           is_array: column.array?,
           access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
           default_value: default_attrs[column.name],
@@ -173,6 +175,7 @@ module Motor
         end.compact
       end
 
+      # rubocop:disable Metrics/AbcSize
       def build_reflection_column(name, model, ref, default_attrs)
         if !ref.polymorphic? && ref.klass.name == 'ActionText::RichText'
           return build_action_text_column(name, model, ref)
@@ -181,11 +184,14 @@ module Motor
         column_name = ref.belongs_to? ? ref.foreign_key.to_s : name
         is_attachment = !ref.polymorphic? && ref.klass.name == 'ActiveStorage::Attachment'
         access_type = ref.belongs_to? || is_attachment ? ColumnAccessTypes::READ_WRITE : ColumnAccessTypes::READ_ONLY
+        column_type = is_attachment ? ColumnTypes::FILE : ColumnTypes::REFERENCE
+        column_source = model.columns_hash[column_name] ? ColumnSources::TABLE : ColumnSources::REFLECTION
 
         {
           name: column_name,
           display_name: model.human_attribute_name(name),
-          column_type: is_attachment ? ColumnTypes::FILE : ColumnTypes::INTEGER,
+          column_type: column_type,
+          column_source: column_source,
           access_type: access_type,
           default_value: default_attrs[column_name],
           validators: fetch_validators(model, column_name, ref),
@@ -194,6 +200,7 @@ module Motor
           virtual: false
         }
       end
+      # rubocop:enable Metrics/AbcSize
 
       def build_action_text_column(name, model, ref)
         name = name.delete_prefix(ACTION_TEXT_REFLECTION_PREFIX)
@@ -202,6 +209,7 @@ module Motor
           name: name + ACTION_TEXT_COLUMN_SUFFIX,
           display_name: model.human_attribute_name(name),
           column_type: ColumnTypes::RICHTEXT,
+          column_source: ColumnSources::REFLECTION,
           access_type: ColumnAccessTypes::READ_WRITE,
           default_value: '',
           validators: fetch_validators(model, name, ref),
@@ -218,11 +226,14 @@ module Motor
           model_name: reflection.polymorphic? ? nil : reflection.klass.name.underscore,
           reference_type: reflection.belongs_to? ? 'belongs_to' : 'has_one',
           foreign_key: reflection.foreign_key,
-          association_primary_key: reflection.polymorphic? ? 'id' : reflection.association_primary_key,
-          polymorphic: reflection.polymorphic?
+          primary_key: reflection.polymorphic? ? 'id' : reflection.active_record_primary_key,
+          options: reflection.options.slice(:through, :source),
+          polymorphic: reflection.polymorphic?,
+          virtual: false
         }
       end
 
+      # rubocop:disable Metrics/AbcSize
       def fetch_associations(model)
         model.reflections.map do |name, ref|
           next if ref.has_one? || ref.belongs_to?
@@ -238,12 +249,16 @@ module Motor
             slug: name.underscore,
             model_name: model_class.name.underscore,
             foreign_key: ref.foreign_key,
+            primary_key: ref.active_record_primary_key,
             polymorphic: ref.options[:as].present?,
             icon: Motor::FindIcon.call(name),
+            options: ref.options.slice(:through, :source),
+            virtual: false,
             visible: true
           }
         end.compact
       end
+      # rubocop:enable Metrics/AbcSize
 
       def fetch_validators(model, column_name, reflection = nil)
         validators =

data/lib/motor/build_schema/merge_schema_configs.rb

@@ -3,12 +3,6 @@
 module Motor
   module BuildSchema
     module MergeSchemaConfigs
-      RESOURCE_ATTRS = PersistResourceConfigs::RESOURCE_ATTRS
-      COLUMN_DEFAULTS = PersistResourceConfigs::COLUMN_DEFAULTS
-      ACTION_DEFAULTS = PersistResourceConfigs::ACTION_DEFAULTS
-      TAB_DEFAULTS = PersistResourceConfigs::TAB_DEFAULTS
-      SCOPE_DEFAULTS = PersistResourceConfigs::SCOPE_DEFAULTS
-
       module_function
 
       # @param schema [Array<HashWithIndifferentAccess>]
@@ -26,7 +20,7 @@ module Motor
       # @param configs [HashWithIndifferentAccess]
       # @return [HashWithIndifferentAccess]
       def merge_model(model, configs)
-        updated_model = model.merge(configs.slice(*RESOURCE_ATTRS))
+        updated_model = model.merge(configs.slice(*Resources::RESOURCE_ATTRS))
 
         merge_actions!(updated_model, configs)
         merge_associations!(updated_model, configs)
@@ -44,8 +38,8 @@ module Motor
         model[:associations] = merge_by_name(
           model[:associations],
           configs[:associations],
-          {},
-          ->(_) { true }
+          ASSOCIATION_DEFAULTS,
+          ->(scope) { !scope[:virtual] }
         )
 
         model
@@ -56,7 +50,7 @@ module Motor
       # @return [HashWithIndifferentAccess]
       def merge_columns!(model, configs)
         model[:columns] = merge_by_name(
-          model[:columns],
+          merge_custom_sql_columns(model[:columns], configs[:custom_sql]),
           configs[:columns],
           COLUMN_DEFAULTS,
           ->(scope) { !scope[:virtual] }
@@ -121,6 +115,34 @@ module Motor
         end.compact
       end
 
+      # @param columns [Array<HashWithIndifferentAccess>]
+      # @param sql [String]
+      # @return [Array<HashWithIndifferentAccess>]
+      def merge_custom_sql_columns(columns, sql)
+        return columns if sql.blank?
+
+        query_columns = Resources::CustomSqlColumnsCache.call(sql)
+
+        columns_index = columns.index_by { |e| e[:name] }
+
+        merged_columns =
+          query_columns.map do |column|
+            existing_column = columns_index.delete(column[:name])
+
+            next existing_column if existing_column
+
+            column.merge(COLUMN_DEFAULTS).merge(
+              access_type: ColumnAccessTypes::READ_ONLY,
+              column_source: ColumnSources::QUERY,
+              virtual: false
+            )
+          end
+
+        reflection_columns = columns_index.values.select { |c| c[:column_source] == ColumnSources::REFLECTION }
+
+        reflection_columns + merged_columns
+      end
+
       # @param cache_keys [Hash]
       # @return [HashWithIndifferentAccess<String, HashWithIndifferentAccess>]
       def load_configs(cache_keys)

data/lib/motor/queries/run_query.rb

@@ -84,12 +84,13 @@ module Motor
       # @return [Hash]
       def build_columns_hash(result)
         result.columns.map do |column_name|
-          column_type_class = result.column_types[column_name].class
+          column_type = result.column_types[column_name]
 
           {
             name: column_name,
             display_name: column_name.humanize,
-            column_type: ActiveRecordUtils::Types.find_name_for_class(column_type_class)
+            column_type: ActiveRecordUtils::Types.find_name_for_type(column_type),
+            is_array: column_type.class.to_s == 'ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Array'
           }
         end
       end

data/lib/motor/resources.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Motor
+  module Resources
+    RESOURCE_ATTRS = %w[display_name icon custom_sql visible].freeze
+    COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format].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
+    ACTION_ATTRS = %w[name display_name action_type preferences visible].freeze
+    TAB_ATTRS = %w[name display_name tab_type preferences visible].freeze
+  end
+end
+
+require_relative './resources/fetch_configured_model'
+require_relative './resources/persist_configs'
+require_relative './resources/custom_sql_columns_cache'

data/lib/motor/resources/custom_sql_columns_cache.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Motor
+  module Resources
+    module CustomSqlColumnsCache
+      CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes)
+
+      module_function
+
+      def call(sql)
+        CACHE_STORE.fetch(sql.hash) do
+          Queries::RunQuery.call(Query.new(sql_body: sql), limit: 0).columns
+        end
+      end
+    end
+  end
+end

data/lib/motor/resources/fetch_configured_model.rb

@@ -0,0 +1,193 @@
+# frozen_string_literal: true
+
+module Motor
+  module Resources
+    module FetchConfiguredModel
+      CACHE_HASH = HashWithIndifferentAccess.new
+
+      module_function
+
+      def call(model, cache_key:)
+        configs = Motor::Configs::LoadFromCache.load_resources(cache_key: cache_key)
+
+        maybe_fetch_from_cache(
+          model,
+          cache_key,
+          lambda {
+            resource_config = configs.find { |r| r.name == model.name.underscore }
+
+            if resource_config
+              build_configured_model(model, resource_config.preferences)
+            else
+              define_class_name_method(Class.new(model), model)
+            end
+          },
+          ->(klass) { configure_reflection_classes(klass, cache_key) }
+        )
+      end
+
+      def build_configured_model(model, config)
+        klass = Class.new(model)
+
+        define_class_name_method(klass, model)
+
+        define_columns_hash(klass, config)
+        define_default_scope(klass, config)
+        define_column_reflections(klass, config)
+        define_associations(klass, config)
+
+        klass
+      end
+
+      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_eval do
+          default_scope do
+            from(Arel.sql("(#{self.klass.instance_variable_get(:@__motor_custom_sql)})").as(table_name))
+          end
+        end
+
+        klass
+      end
+
+      def define_class_name_method(klass, model)
+        klass.instance_variable_set(:@__motor_model_name, model.name)
+
+        klass.instance_eval do
+          def name
+            @__motor_model_name
+          end
+
+          def inspect
+            super.gsub(/\#<Class:0x\w+>/, name)
+          end
+
+          def to_s
+            super.gsub(/\#<Class:0x\w+>/, name)
+          end
+
+          def anonymous?
+            true
+          end
+        end
+
+        klass
+      end
+
+      def define_columns_hash(klass, config)
+        return klass if config[:custom_sql].blank?
+
+        columns = Resources::CustomSqlColumnsCache.call(config[:custom_sql])
+
+        columns_hash =
+          columns.each_with_object({}) do |column, acc|
+            acc[column[:name]] = ActiveRecord::ConnectionAdapters::Column.new(column[:name], nil)
+          end
+
+        klass.instance_variable_set(:@__motor_custom_sql_columns_hash, columns_hash)
+
+        # rubocop:disable Naming/MemoizedInstanceVariableName
+        klass.instance_eval do
+          def columns_hash
+            @__motor__columns_hash ||= @__motor_custom_sql_columns_hash.merge(super)
+          end
+        end
+        # rubocop:enable Naming/MemoizedInstanceVariableName
+      end
+
+      def define_column_reflections(klass, config)
+        config.fetch(:columns, []).each do |column|
+          reference = column[:reference]
+
+          next if reference.blank?
+          next unless reference[:virtual]
+
+          if reference[:reference_type] == 'belongs_to'
+            define_belongs_to_reflection(klass, reference)
+          else
+            define_has_one_reflection(klass, reference)
+          end
+        end
+      end
+
+      def define_belongs_to_reflection(klass, config)
+        klass.belongs_to(config[:name].to_sym,
+                         class_name: config[:model_name].classify,
+                         foreign_key: config[:foreign_key],
+                         polymorphic: config[:polymorphic],
+                         primary_key: config[:primary_key],
+                         optional: true)
+      end
+
+      def define_has_one_reflection(klass, config)
+        options = {
+          class_name: config[:model_name].classify,
+          foreign_key: config[:foreign_key],
+          primary_key: config[:primary_key]
+        }
+
+        options = options.merge(config[:options] || {})
+
+        klass.has_one(config[:name].to_sym, **options.symbolize_keys)
+      end
+
+      def configure_reflection_classes(klass, cache_key)
+        klass.reflections.each do |key, ref|
+          begin
+            next unless ref.klass
+            next if ref.klass.anonymous?
+          rescue StandardError
+            next
+          end
+
+          ref_dup = ref.dup
+
+          if ref.klass.name == klass.name
+            ref_dup.instance_variable_set(:@klass, klass)
+          else
+            ref_dup.instance_variable_set(:@klass, call(ref.klass, cache_key: cache_key))
+          end
+
+          klass.reflections[key] = ref_dup
+        end
+
+        klass._reflections = klass.reflections
+
+        klass
+      end
+
+      def define_associations(klass, config)
+        config.fetch(:associations, []).each do |association|
+          is_virtual, is_polymorphic = association.values_at(:virtual, :polymorphic)
+
+          next unless is_virtual
+
+          options = association.slice(:foreign_key, :primary_key)
+          options[:class_name] = association[:model_name].classify
+          options[:as] = association[:foreign_key].delete_suffix('_id') if is_polymorphic
+
+          options = options.merge(association[:options] || {})
+
+          klass.has_many(association[:name].to_sym, **options.symbolize_keys)
+        end
+      end
+
+      def maybe_fetch_from_cache(model, cache_key, miss_cache_block, postprocess_block)
+        return yield unless cache_key
+
+        if CACHE_HASH[model.name] && CACHE_HASH[model.name][:key] == cache_key
+          CACHE_HASH[model.name][:value]
+        else
+          result = miss_cache_block.call
+
+          CACHE_HASH[model.name] = { key: cache_key, value: result }
+
+          postprocess_block.call(result)
+        end
+      end
+    end
+  end
+end

data/lib/motor/{build_schema/persist_resource_configs.rb → resources/persist_configs.rb}

@@ -1,39 +1,13 @@
 # frozen_string_literal: true
 
 module Motor
-  module BuildSchema
-    module PersistResourceConfigs
-      RESOURCE_ATTRS = %w[display_name icon visible].freeze
-      COLUMN_ATTRS = %w[name display_name column_type access_type default_value virtual format].freeze
-      ASSOCIATION_ATTRS = %w[name display_name icon visible].freeze
-      SCOPE_ATTRS = %w[name display_name scope_type preferences visible].freeze
-      ACTION_ATTRS = %w[name display_name action_type preferences visible].freeze
-      TAB_ATTRS = %w[name display_name tab_type preferences visible].freeze
-
-      COLUMN_DEFAULTS = {
-        access_type: 'read_write',
-        default_value: nil,
-        reference: nil,
-        format: {},
-        validators: []
-      }.with_indifferent_access
-
-      ACTION_DEFAULTS = {
-        visible: true,
-        preferences: {}
-      }.with_indifferent_access
-
-      TAB_DEFAULTS = {
-        visible: true,
-        tab_type: 'default',
-        preferences: {}
-      }.with_indifferent_access
-
-      SCOPE_DEFAULTS = {
-        visible: true,
-        scope_type: 'default',
-        preferences: {}
-      }.with_indifferent_access
+  module Resources
+    module PersistConfigs
+      COLUMN_DEFAULTS = BuildSchema::COLUMN_DEFAULTS
+      ACTION_DEFAULTS = BuildSchema::ACTION_DEFAULTS
+      TAB_DEFAULTS = BuildSchema::TAB_DEFAULTS
+      SCOPE_DEFAULTS = BuildSchema::SCOPE_DEFAULTS
+      ASSOCIATION_DEFAULTS = BuildSchema::ASSOCIATION_DEFAULTS
 
       module_function
 
@@ -206,12 +180,15 @@ module Motor
       def normalize_associations(default_assocs, existing_assocs, new_assocs)
         (existing_assocs.pluck(:name) + new_assocs.pluck(:name)).uniq.map do |name|
           new_assoc = safe_fetch_by_name(new_assocs, name)
+
+          next if new_assoc[:_remove]
+
           existing_assoc = safe_fetch_by_name(existing_assocs, name)
           default_assoc = safe_fetch_by_name(default_assocs, name)
           assoc_attrs = new_assoc.slice(*ASSOCIATION_ATTRS)
 
           normalized_assoc = existing_assoc.merge(assoc_attrs)
-          normalized_assoc = reject_default(default_assoc, normalized_assoc)
+          normalized_assoc = reject_default(default_assoc.presence || ASSOCIATION_DEFAULTS, normalized_assoc)
 
           normalized_assoc.merge(name: name) if normalized_assoc.present?
         end.compact.presence
@@ -230,7 +207,9 @@ module Motor
       # @param resource_name [String]
       # @return [HashWithIndifferentAccess]
       def fetch_default_schema(resource_name)
-        LoadFromRails.build_model_schema(resource_name.classify.constantize)
+        model = resource_name.classify.constantize
+
+        BuildSchema::LoadFromRails.build_model_schema(model).merge(custom_sql: model.all.to_sql)
       end
 
       # @param default [HashWithIndifferentAccess]
@@ -240,7 +219,12 @@ module Motor
         return new unless default
 
         new.reject do |key, value|
-          default[key].to_json == value.to_json
+          default[key].to_json ==
+            if value.is_a?(Hash) || value.is_a?(ActiveSupport::HashWithIndifferentAccess)
+              value.select { |_, v| v.present? }.to_json
+            else
+              value.to_json
+            end
         end
       end
     end

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.87'
+  VERSION = '0.1.88'
 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-8ddee666c462389f6118.css.gz": "main-8ddee666c462389f6118.css.gz",
-  "main-8ddee666c462389f6118.js.LICENSE.txt": "main-8ddee666c462389f6118.js.LICENSE.txt",
-  "main-8ddee666c462389f6118.js.gz": "main-8ddee666c462389f6118.js.gz",
-  "main.css": "main-8ddee666c462389f6118.css",
-  "main.js": "main-8ddee666c462389f6118.js",
+  "main-fbe1b5253d0be9bdb20b.css.gz": "main-fbe1b5253d0be9bdb20b.css.gz",
+  "main-fbe1b5253d0be9bdb20b.js.LICENSE.txt": "main-fbe1b5253d0be9bdb20b.js.LICENSE.txt",
+  "main-fbe1b5253d0be9bdb20b.js.gz": "main-fbe1b5253d0be9bdb20b.js.gz",
+  "main.css": "main-fbe1b5253d0be9bdb20b.css",
+  "main.js": "main-fbe1b5253d0be9bdb20b.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.87
+  version: 0.1.88
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -138,9 +138,11 @@ files:
 - app/controllers/motor/forms_controller.rb
 - app/controllers/motor/icons_controller.rb
 - app/controllers/motor/queries_controller.rb
+- 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_queries_controller.rb
+- app/controllers/motor/schema_controller.rb
 - app/controllers/motor/send_alerts_controller.rb
 - app/controllers/motor/tags_controller.rb
 - app/controllers/motor/ui_controller.rb
@@ -202,7 +204,6 @@ files:
 - lib/motor/build_schema/find_icon.rb
 - lib/motor/build_schema/load_from_rails.rb
 - lib/motor/build_schema/merge_schema_configs.rb
-- lib/motor/build_schema/persist_resource_configs.rb
 - lib/motor/build_schema/reorder_schema.rb
 - lib/motor/build_schema/utils.rb
 - lib/motor/cancan_utils.rb
@@ -229,6 +230,10 @@ files:
 - lib/motor/queries/render_sql_template.rb
 - lib/motor/queries/run_query.rb
 - lib/motor/railtie.rb
+- lib/motor/resources.rb
+- lib/motor/resources/custom_sql_columns_cache.rb
+- lib/motor/resources/fetch_configured_model.rb
+- lib/motor/resources/persist_configs.rb
 - lib/motor/tags.rb
 - lib/motor/tasks/motor.rake
 - lib/motor/version.rb
@@ -1495,8 +1500,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-8ddee666c462389f6118.css.gz
-- ui/dist/main-8ddee666c462389f6118.js.gz
+- ui/dist/main-fbe1b5253d0be9bdb20b.css.gz
+- ui/dist/main-fbe1b5253d0be9bdb20b.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: