motor-admin 0.1.104 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 266533361474d8854cfc08b9b1b43766bde0fa49dfc6a3d840ab6392dbe6af2d
-  data.tar.gz: 1c0e11689a619fb1afd2f47c47b133f6d1b0a10ccdff01c6fbbb4e78b6e8a6f5
+  metadata.gz: 45ba4c64d6749aa260a6a14f49a3f71484fe1e127f93f31e0adbba201bfe840f
+  data.tar.gz: 483590c08e2194dc9232ed29de69143167723836b05dab95a90cb0e997191590
 SHA512:
-  metadata.gz: 27abaae03cde38935bd4b7801f79375f5297047ab5fc3d25b6c318662d4459b9f29cc4194d8ed3fa9599421241e35df0960ee2755fd773b38eea5d8876377670
-  data.tar.gz: 4b2c7a8b6d14da8e44bbd0bd984168ee4ef2dc8b50fd6904bbf3b45f1854ea0af3dde8ee697264298ea2f9696c0848269ddd454699ad9cb7ca4d2c6a8472128d
+  metadata.gz: 5171324efad5960ed06d800f7872d7b0fbe823486aff3dfe346e9032c8d0bc9667a5a0c77dc106b8c0bfea8a1a4f0d3654c0986976b32744e4c3178be63b2d0a
+  data.tar.gz: 28519dfb8c532d3d803325977a0f65d30bd74277f0826a610f2c7c527d0aa1fc74b1820f01f64a3cf444133f6f5c054651949d8d5cad92c86445bea333ce30e6

data/README.md

@@ -49,6 +49,8 @@ Everything in the admin panel can be configured using the intuitive settings UI,
 
 Data displayed on the resource page can be completely customized via [SQL queries](#sql-queries) and [dashboards](#dashboards) attached to the resource as a tab. Usually, queries used to display resource data should contain `{{resource_name_id}}` [variable](#sql-queries).
 
+[Learn more about resource customizations](https://github.com/omohokcoj/motor-admin/blob/master/guides/customizing_resource_table.md)
+
 ### Custom Actions
 
 ![Custom actions](https://user-images.githubusercontent.com/5418788/119266132-3c1dd580-bbf2-11eb-9666-09e1640eaf7b.png)
@@ -75,8 +77,9 @@ end
 
 ![Custom form](https://user-images.githubusercontent.com/5418788/119264008-1391dd80-bbea-11eb-9f14-cb405e77fb60.png)
 
-Values from the form fields can be used in API path via `{field_name}` syntax: `/api/some-endpoint/{resource_id}/apply`.<br>
-[Learn more about custom forms builder](https://github.com/omohokcoj/motor-admin/blob/master/guides/building_custom_forms.md).
+Values from the form fields can be used in API path via `{field_name}` syntax: `/api/some-endpoint/{resource_id}/apply`.
+
+[Learn more about custom forms builder](https://github.com/omohokcoj/motor-admin/blob/master/guides/building_custom_forms.md)
 
 ### SQL Queries
 

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

@@ -5,6 +5,7 @@ module Motor
     extend ActiveSupport::Concern
 
     INSTANCE_VARIABLE_NAME = 'resource'
+    ASSOCIATION_INSTANCE_VARIABLE_NAME = 'associated_resource'
 
     included do
       before_action :load_and_authorize_resource
@@ -26,7 +27,7 @@ module Motor
     def load_and_authorize_resource
       options = {
         class: resource_class,
-        parent: false,
+        parent: params[:association].present?,
         instance_name: INSTANCE_VARIABLE_NAME
       }
 
@@ -57,7 +58,7 @@ module Motor
           parent: false,
           through: :resource,
           through_association: params[:association].to_sym,
-          instance_name: INSTANCE_VARIABLE_NAME
+          instance_name: params[:action] == 'create' ? ASSOCIATION_INSTANCE_VARIABLE_NAME : INSTANCE_VARIABLE_NAME
         ).load_and_authorize_resource
       else
         render json: { message: 'Unknown association' }, status: :not_found

data/app/controllers/motor/data_controller.rb

@@ -21,7 +21,19 @@ module Motor
     end
 
     def create
-      @resource.save!
+      if @associated_resource
+        if @resource_class.reflections[params[:association]].through_reflection?
+          @associated_resource.save!
+
+          @resource = @associated_resource
+        else
+          @resource.public_send(params[:association].to_sym).create!(@associated_resource.attributes) do |resource|
+            @resource = resource
+          end
+        end
+      else
+        @resource.save!
+      end
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params, current_ability) }
     rescue ActiveRecord::RecordInvalid
@@ -61,7 +73,7 @@ module Motor
 
     def resource_params
       if params[:data].present?
-        params.require(:data).except(resource_class.primary_key).permit!
+        params.require(:data).permit!
       else
         {}
       end

data/app/controllers/motor/ui_controller.rb

@@ -4,7 +4,9 @@ module Motor
   class UiController < ApplicationController
     layout 'motor/application'
 
-    helper_method :current_user, :current_ability
+    helper_method :current_user, :current_ability, :cache_keys
+
+    before_action :set_i18n_locale
 
     def index
       render_ui
@@ -27,5 +29,15 @@ module Motor
 
       render :show
     end
+
+    def set_i18n_locale
+      configs = Motor::Configs::LoadFromCache.load_configs(cache_key: cache_keys[:configs])
+
+      I18n.locale = configs.find { |c| c.key == 'language' }&.value || I18n.locale
+    end
+
+    def cache_keys
+      @cache_keys ||= Configs::LoadFromCache.load_cache_keys
+    end
   end
 end

data/app/mailers/motor/alerts_mailer.rb

@@ -26,7 +26,7 @@ module Motor
     end
 
     def from_address
-      from = ENV['MOTOR_ALERTS_FROM_ADDRESS'].presence
+      from = ENV['MOTOR_ALERTS_FROM_ADDRESS'].presence || ENV['MOTOR_EMAIL_ADDRESS'].presence
 
       from ||= application_mailer_default_from
       from ||= mailer_config_from_address

data/app/views/motor/ui/show.html.erb

@@ -1 +1 @@
-<%= raw(Motor::Configs::BuildUiAppTag.call(current_user, current_ability)) %>
+<%= raw(Motor::Configs::BuildUiAppTag.call(current_user, current_ability, cache_keys: cache_keys)) %>

data/config/locales/en.yml

@@ -87,6 +87,7 @@ en:
     field_name: Field name
     field_value_does_not_match_pattern: '%{field} value does not match %{pattern}'
     file: File
+    filter: Filter
     filters: Filters
     form: Form
     form_has_been_saved: Form has been saved!
@@ -110,7 +111,7 @@ en:
     interval: Interval
     is: Is
     is_not: Is not
-    items_has_been_removed: items has been removed
+    items_have_been_removed: items have been removed
     items_will_be_removed: '%{count} items will be removed'
     json: JSON
     label: Currency
@@ -258,3 +259,6 @@ en:
     add_text: Add Text
     edit_text: Edit Text
     open_in_markdown_editor: Open in markdown editor
+    activate: Activate
+    load_existing_options_from_database: Load existing options from the database
+    add_database: Add Database

data/config/locales/es.yml

@@ -59,6 +59,7 @@ es:
     emails: Emails
     every_day_at_hh_mm: todos los días a las HH:mm PM...
     field_name: Nombre del campo
+    filter: Filtrar
     filters: Filtros
     form: Formulario
     form_has_been_saved: ¡Formulario guardado!
@@ -73,7 +74,7 @@ es:
     hello_admin: Hola Admin 👋
     input_type: Tipo de campo
     interval: Intervalo
-    items_has_been_removed: elementos fueron eliminados
+    items_have_been_removed: elementos fueron eliminados
     label: Moneda
     line_chart: Gráfico de líneas
     link_name: Nombre del link
@@ -258,6 +259,9 @@ es:
     add_text: Añadir Texto
     edit_text: Editar Texto
     open_in_markdown_editor: Abrir en el editor de markdown
+    activate: Activar
+    load_existing_options_from_database: Cargar las opciones existentes de la base de datos
+    add_database: Añadir base de datos
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -96,8 +96,8 @@ pt:
     field_is_required: "%{field} é obrigatório"
     field_list_cant_be_empty: "A lista %{field} não pode estar vazia"
     field_must_be_exactly_in_length: "%{field} deve ter exatamente %{length} de comprimento"
-    field_must_be_less_in_length: '%{campo} deve ser menor que %{comprimento} em comprimento'
-    field_must_be_more_in_length: '%{campo} deve ter mais do que %{comprimento} de comprimento'
+    field_must_be_less_in_length: '%{field} deve ser menor que %{length} em comprimento'
+    field_must_be_more_in_length: '%{field} deve ter mais do que %{length} de comprimento'
     field_name: "Nome do campo"
     field_value_does_not_match_pattern: "%{field} valor não corresponde %{pattern}"
     file: "Arquivo"

data/config/routes.rb

@@ -21,7 +21,8 @@ Motor::Admin.routes.draw do
       resources :audits, only: %i[index]
       resources :resources, path: '/data/:resource',
                             only: %i[index show update create destroy],
-                            controller: 'data' do
+                            controller: 'data',
+                            constraints: { id: %r{[^/]+} } do
         put '/:method', to: 'data#execute'
         resources :association, path: '/:association',
                                 only: %i[index create],

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

@@ -143,6 +143,15 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     add_index :motor_audits, %i[user_id user_type], name: 'motor_auditable_user_index'
     add_index :motor_audits, :request_uuid
     add_index :motor_audits, :created_at
+
+    model = Class.new(ApplicationRecord)
+
+    model.table_name = 'motor_configs'
+
+    model.create!(key: 'header.links', value: [{
+      name: '⭐ Star on GitHub',
+      path: 'https://github.com/omohokcoj/motor-admin'
+    }].to_json)
   end
 
   def self.down

data/lib/motor/active_record_utils/active_record_filter_patch.rb

@@ -14,5 +14,17 @@ if Rails::VERSION::MAJOR == 6
       build_filters(arel, my_alias_tracker)
       arel
     end
+
+    def build_filters(manager, alias_tracker)
+      where_clause = nil
+
+      @filters.each do |filters|
+        where_clause = filter_clause_factory.build(filters, alias_tracker)
+
+        manager.where(where_clause.ast)
+      end
+
+      @values[:where] = where_clause if where_clause
+    end
   end
 end

data/lib/motor/api_query/build_json.rb

@@ -92,7 +92,7 @@ module Motor
       def find_key_in_params(params, key)
         params = params['include']
 
-        return if params.blank?
+        return {} if params.blank?
         return params[key] if params[key]
 
         params.keys.reduce(nil) do |acc, k|

data/lib/motor/build_schema/load_from_rails.rb

@@ -22,9 +22,9 @@ module Motor
 
       def call
         models.map do |model|
-          Object.const_get(model.name)
+          model = Object.const_get(model.name)
 
-          next unless ActiveRecord::Base.connection.table_exists?(model.table_name)
+          next unless model.table_exists?
 
           schema = build_model_schema(model)
 
@@ -37,7 +37,7 @@ module Motor
           Rails.logger.error(e)
 
           next
-        end.compact
+        end.compact.uniq
       end
 
       def models
@@ -225,8 +225,8 @@ module Motor
           display_name: model.human_attribute_name(name),
           model_name: reflection.polymorphic? ? nil : reflection.klass.name.underscore,
           reference_type: reflection.belongs_to? ? 'belongs_to' : 'has_one',
-          foreign_key: reflection.foreign_key,
-          primary_key: reflection.polymorphic? ? 'id' : reflection.active_record_primary_key,
+          foreign_key: reflection.join_foreign_key,
+          primary_key: reflection.polymorphic? ? 'id' : reflection.join_primary_key,
           options: reflection.options.slice(:through, :source),
           polymorphic: reflection.polymorphic?,
           virtual: false
@@ -248,8 +248,8 @@ module Motor
             display_name: model.human_attribute_name(name),
             slug: name.underscore,
             model_name: model_class.name.underscore,
-            foreign_key: ref.foreign_key,
-            primary_key: ref.active_record_primary_key,
+            foreign_key: ref.join_primary_key,
+            primary_key: ref.join_foreign_key,
             polymorphic: ref.options[:as].present?,
             icon: Motor::FindIcon.call(name),
             options: ref.options.slice(:through, :source),
@@ -287,8 +287,6 @@ module Motor
           { includes: validator.send(:delimiter) }
         when ActiveRecord::Validations::PresenceValidator
           { required: true }
-        when ActiveModel::Validations::FormatValidator
-          { format: JsRegex.new(options[:with]).to_h.slice(:source, :options) }
         when ActiveRecord::Validations::LengthValidator
           { length: normalize_length_validation_options(options) }
         when ActiveModel::Validations::NumericalityValidator

data/lib/motor/build_schema/utils.rb

@@ -5,6 +5,7 @@ module Motor
     module Utils
       ABBREVIATIONS = {
         'Id' => 'ID',
+        'Uuid' => 'UUID',
         'Url' => 'URL',
         'Iso' => 'ISO',
         'vip' => 'VIP',

data/lib/motor/build_schema.rb

@@ -51,7 +51,11 @@ module Motor
     COLUMN_NAME_ACCESS_TYPES = {
       id: ColumnAccessTypes::READ_ONLY,
       created_at: ColumnAccessTypes::READ_ONLY,
+      created_on: ColumnAccessTypes::READ_ONLY,
+      inserted_at: ColumnAccessTypes::READ_ONLY,
       updated_at: ColumnAccessTypes::READ_ONLY,
+      updated_on: ColumnAccessTypes::READ_ONLY,
+      modified_at: ColumnAccessTypes::READ_ONLY,
       deleted_at: ColumnAccessTypes::READ_ONLY
     }.with_indifferent_access.freeze
 

data/lib/motor/configs/build_ui_app_tag.rb

@@ -12,9 +12,7 @@ module Motor
 
       module_function
 
-      def call(current_user = nil, current_ability = nil)
-        cache_keys = LoadFromCache.load_cache_keys
-
+      def call(current_user = nil, current_ability = nil, cache_keys: LoadFromCache.load_cache_keys)
         CACHE_STORE.fetch("#{I18n.locale}#{cache_keys.hash}#{current_user&.id}") do
           CACHE_STORE.clear
 
@@ -23,16 +21,19 @@ module Motor
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
       # @return [Hash]
       def build_data(cache_keys = {}, current_user = nil, current_ability = nil)
         configs_cache_key = cache_keys[:configs]
 
         {
+          version: Motor::VERSION,
           current_user: current_user&.as_json(only: %i[id email]),
           current_rules: current_ability.serialized_rules,
           audits_count: Motor::Audit.count,
           i18n: i18n_data,
           base_path: Motor::Admin.routes.url_helpers.motor_path,
+          admin_settings_path: Rails.application.routes.url_helpers.try(:admin_settings_general_path),
           schema: Motor::BuildSchema.call(cache_keys, current_ability),
           header_links: header_links_data_hash(configs_cache_key),
           homepage_layout: homepage_layout_data_hash(configs_cache_key),
@@ -45,6 +46,7 @@ module Motor
           forms: forms_data_hash(build_cache_key(cache_keys, :forms, current_user, current_ability), current_ability)
         }
       end
+      # rubocop:enable Metrics/AbcSize
 
       def i18n_data
         I18n.t('motor', default: I18n.t('motor', locale: :en))

data/lib/motor/configs/sync_from_file.rb

@@ -3,7 +3,6 @@
 module Motor
   module Configs
     module SyncFromFile
-      FILE_PATH = Motor::Configs::FILE_PATH
       MUTEXT = Mutex.new
       FILE_TIMESTAMPS_STORE = ActiveSupport::Cache::MemoryStore.new(size: 1.megabyte)
 
@@ -11,7 +10,7 @@ module Motor
 
       def call(with_exception: false)
         MUTEXT.synchronize do
-          file = Rails.root.join(FILE_PATH)
+          file = Pathname.new(Motor::Configs.file_path)
 
           file_timestamp =
             begin

data/lib/motor/configs/write_to_file.rb

@@ -4,7 +4,6 @@ module Motor
   module Configs
     module WriteToFile
       THREAD_POOL = Concurrent::FixedThreadPool.new(1)
-      FILE_PATH = Motor::Configs::FILE_PATH
 
       module_function
 
@@ -22,7 +21,7 @@ module Motor
       end
 
       def write_with_lock
-        File.open(Rails.root.join(FILE_PATH), 'w') do |file|
+        File.open(Motor::Configs.file_path, 'w') do |file|
           file.flock(File::LOCK_EX)
 
           YAML.dump(Motor::Configs::BuildConfigsHash.call, file)

data/lib/motor/configs.rb

@@ -5,6 +5,19 @@ module Motor
     FILE_PATH = 'config/motor.yml'
     SYNC_API_PATH = '/motor_configs_sync'
     SYNC_ACCESS_KEY = ENV.fetch('MOTOR_SYNC_API_KEY', '')
+    MEMFS_PATH = '/__enclose_io_memfs__/'
+    PWD_FILE_NAME = 'motor-admin.yml'
+
+    module_function
+
+    # @return [String]
+    def file_path
+      if Rails.root.to_s.start_with?(MEMFS_PATH)
+        [ENV['PWD'], PWD_FILE_NAME].join('/')
+      else
+        Rails.root.join(FILE_PATH).to_s
+      end
+    end
   end
 end
 

data/lib/motor/queries/run_query.rb

@@ -63,15 +63,15 @@ module Motor
         result = nil
         statement = prepare_sql_statement(query, limit, variables_hash, filters)
 
-        ActiveRecord::Base.transaction do
+        connection_class.transaction do
           result =
-            case ActiveRecord::Base.connection.class.name
+            case connection_class.connection.class.name
             when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
-              PostgresqlExecQuery.call(ActiveRecord::Base.connection, statement)
+              PostgresqlExecQuery.call(connection_class.connection, statement)
             else
               statement = normalize_statement_for_sql(statement)
 
-              ActiveRecord::Base.connection.exec_query(*statement)
+              connection_class.connection.exec_query(*statement)
             end
 
           raise ActiveRecord::Rollback
@@ -172,6 +172,10 @@ module Motor
           acc[variable[:name]] ||= variables_hash[variable[:name]] || variable[:default_value]
         end
       end
+
+      def connection_class
+        defined?(ResourceRecord) ? ResourceRecord : ActiveRecord::Base
+      end
     end
   end
 end

data/lib/motor/resources/fetch_configured_model.rb

@@ -117,7 +117,7 @@ module Motor
 
       def define_belongs_to_reflection(klass, config)
         klass.belongs_to(config[:name].to_sym,
-                         class_name: config[:model_name].classify,
+                         class_name: config[:model_name]&.classify,
                          foreign_key: config[:foreign_key],
                          polymorphic: config[:polymorphic],
                          primary_key: config[:primary_key],
@@ -163,20 +163,29 @@ module Motor
 
       def define_associations(klass, config)
         config.fetch(:associations, []).each do |association|
-          is_virtual, is_polymorphic = association.values_at(:virtual, :polymorphic)
+          next unless association[:virtual]
 
-          next unless is_virtual
+          options = normalize_association_params(association)
 
-          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
+          filters = options.delete(:filters)
 
-          options = options.merge(association[:options] || {})
-
-          klass.has_many(association[:name].to_sym, **options.symbolize_keys)
+          if filters.present?
+            klass.has_many(association[:name].to_sym, -> { filter(filters).tap(&:arel) }, **options.symbolize_keys)
+          else
+            klass.has_many(association[:name].to_sym, **options.symbolize_keys)
+          end
         end
       end
 
+      def normalize_association_params(params)
+        options = params.slice(:foreign_key, :primary_key).merge(dependent: :destroy)
+
+        options[:class_name] = params[:model_name].classify
+        options[:as] = params[:foreign_key].delete_suffix('_id') if params[:polymorphic]
+
+        options.merge(params[:options] || {})
+      end
+
       def maybe_fetch_from_cache(model, cache_key, miss_cache_block, postprocess_block)
         return miss_cache_block.call unless cache_key
 

data/lib/motor/version.rb

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

data/lib/motor.rb

@@ -4,7 +4,6 @@ require 'concurrent/executor/fixed_thread_pool'
 require 'concurrent/timer_task'
 require 'cancancan'
 require 'ar_lazy_preload'
-require 'js_regex'
 require 'fugit'
 require 'csv'
 require 'active_record/filter'

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-37390abd2976b4fd28f0.css.gz": "main-37390abd2976b4fd28f0.css.gz",
-  "main-37390abd2976b4fd28f0.js.LICENSE.txt": "main-37390abd2976b4fd28f0.js.LICENSE.txt",
-  "main-37390abd2976b4fd28f0.js.gz": "main-37390abd2976b4fd28f0.js.gz",
-  "main.css": "main-37390abd2976b4fd28f0.css",
-  "main.js": "main-37390abd2976b4fd28f0.js"
+  "main-1e1b7c867f581bccfb2d.css.gz": "main-1e1b7c867f581bccfb2d.css.gz",
+  "main-1e1b7c867f581bccfb2d.js.LICENSE.txt": "main-1e1b7c867f581bccfb2d.js.LICENSE.txt",
+  "main-1e1b7c867f581bccfb2d.js.gz": "main-1e1b7c867f581bccfb2d.js.gz",
+  "main.css": "main-1e1b7c867f581bccfb2d.css",
+  "main.js": "main-1e1b7c867f581bccfb2d.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.104
+  version: 0.2.3
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: js_regex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -1537,8 +1523,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-37390abd2976b4fd28f0.css.gz
-- ui/dist/main-37390abd2976b4fd28f0.js.gz
+- ui/dist/main-1e1b7c867f581bccfb2d.css.gz
+- ui/dist/main-1e1b7c867f581bccfb2d.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: