motor-admin 0.3.7 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 799c312697a76fa05e0d649406b74a91813667cdd49a4e2cb4b1639764f31916
-  data.tar.gz: 8a6e60ee5510a4fc00dd48384e1ee99cbd845e7b7c8365702e76e1d22c05bdae
+  metadata.gz: f4d2d0831f0cf45e8cccfeaff5cdb7710f36f8f22be28d24b26dd79cda65955a
+  data.tar.gz: 024dc7ac23622a17671d27cb69246242195c3e5bfbd758fea48d9d38df77cf1e
 SHA512:
-  metadata.gz: 505f0fe67aeef3c9292b0f100646c05ea06f728eac8062b6c5f52acba441402d7f62f94b692c608202d3594d1e0a5d92b2d0087fc33674202b4d725843ceeb1c
-  data.tar.gz: 20b5d845816c08787beb5625d36739f730e2e8d6e3fceca8c0ec3e892944fdd5626e2612981a0d7686013264d56ce24e4c55fac18be498ef71423e750ca249fc
+  metadata.gz: cc3931e9d9e70515e98a3acdf47330a7a82c7084f703461e360c083e1ec044f65d1ff160064c9bf7297cd959e8fdd9d4d8d4c6b84fc00bde9caad41264cc0b39
+  data.tar.gz: 322e8d603f75e61ff485ca24b10e335490fbec0d679dde983d0df089cd97747b60e4355604794bea8008071ec442018f5de2931ae46d2c9d4532ce99c56f5726

data/app/models/motor/api_config.rb

@@ -4,12 +4,12 @@ module Motor
   class ApiConfig < ::Motor::ApplicationRecord
     encrypts :credentials if defined?(::Motor::EncryptedConfig)
 
-    serialize :credentials, Motor::HashSerializer
-    serialize :preferences, Motor::HashSerializer
-
     attribute :preferences, default: -> { HashWithIndifferentAccess.new }
     attribute :credentials, default: -> { HashWithIndifferentAccess.new }
 
+    serialize :credentials, Motor::HashSerializer
+    serialize :preferences, Motor::HashSerializer
+
     has_one :form, dependent: nil, foreign_key: :api_config_name, primary_key: :name, inverse_of: :api_config
 
     scope :active, -> { where(deleted_at: nil) }

data/lib/motor/active_record_utils/active_record_filter.rb

@@ -55,7 +55,12 @@ module ActiveRecord
       end
 
       def aliased_table_for_relation(trail, arel_table, &block)
-        @relation_trail[trail] ||= aliased_table_for(arel_table, &block)
+        @relation_trail[trail] ||=
+          if Rails::VERSION::MAJOR >= 6
+            aliased_table_for(arel_table, &block)
+          else
+            aliased_table_for(arel_table.name, trail.last, nil)
+          end
       end
     end
   end
@@ -210,7 +215,7 @@ module ActiveRecord
     end
 
     def expand_filter_for_column(key, column, value, relation_trail)
-      attribute = table.arel_table[column.name]
+      attribute = table.send(:arel_table)[column.name]
       relation_trail.each do |rt|
         attribute = Arel::Attributes::Relation.new(attribute, rt)
       end

data/lib/motor/build_schema/active_storage_attachment_schema.rb

@@ -5,7 +5,7 @@ module Motor
     module ActiveStorageAttachmentSchema
       module_function
 
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def call
         model = ActiveStorage::Attachment
 
@@ -119,7 +119,7 @@ module Motor
           visible: false
         }.with_indifferent_access
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/motor/build_schema/load_from_rails.rb

@@ -256,7 +256,6 @@ module Motor
         }
       end
 
-      # rubocop:disable Metrics/AbcSize
       def fetch_associations(model)
         model.reflections.map do |name, ref|
           next if ref.has_one? || ref.belongs_to?
@@ -281,7 +280,6 @@ module Motor
           }
         end.compact
       end
-      # rubocop:enable Metrics/AbcSize
 
       def fetch_validators(model, column_name, reflection = nil)
         validators =

data/lib/motor/configs/build_configs_hash.rb

@@ -5,7 +5,6 @@ module Motor
     module BuildConfigsHash
       module_function
 
-      # rubocop:disable Metrics/AbcSize
       def call
         cache_keys = LoadFromCache.load_cache_keys
 
@@ -21,7 +20,6 @@ module Motor
           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|

data/lib/motor/configs/sync_from_hash.rb

@@ -95,7 +95,6 @@ module Motor
         end
       end
 
-      # rubocop:disable Metrics/AbcSize
       def sync_resources(configs_hash)
         resources_index = Motor::Configs::LoadFromCache.load_resources.index_by(&:name)
 
@@ -113,7 +112,6 @@ module Motor
 
         ActiveRecordUtils.reset_id_sequence!(Motor::Resource)
       end
-      # rubocop:enable Metrics/AbcSize
 
       def sync_taggable(records, config_items, configs_timestamp, update_proc)
         processed_records, create_items = update_taggable_items(records, config_items, update_proc)

data/lib/motor/resources/fetch_configured_model.rb

@@ -140,18 +140,18 @@ module Motor
       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] || {})
-
         if config[:model_name] == 'active_storage/attachment'
-          klass.has_one_attached config[:name].delete_suffix('_attachment').to_sym
+          klass.has_one_attached(config[:name].delete_suffix('_attachment').to_sym)
         else
-          klass.has_one(config[:name].to_sym, **options.symbolize_keys)
+          options = {
+            **klass.reflections[config[:name]]&.options.to_h,
+            class_name: config[:model_name].classify,
+            foreign_key: config[:foreign_key],
+            primary_key: config[:primary_key],
+            **config[:options].to_h
+          }.symbolize_keys
+
+          klass.has_one(config[:name].to_sym, **options)
         end
       end
 

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -3963,12 +3963,10 @@
   "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
   "images/layers-2x.png": "images/layers-2x.png",
   "images/layers.png": "images/layers.png",
-  "images/marker-icon-2x.png": "images/marker-icon-2x.png",
   "images/marker-icon.png": "images/marker-icon.png",
-  "images/marker-shadow.png": "images/marker-shadow.png",
-  "main-5d47c86ba29167bd4fab.css.gz": "main-5d47c86ba29167bd4fab.css.gz",
-  "main-5d47c86ba29167bd4fab.js.LICENSE.txt": "main-5d47c86ba29167bd4fab.js.LICENSE.txt",
-  "main-5d47c86ba29167bd4fab.js.gz": "main-5d47c86ba29167bd4fab.js.gz",
-  "main.css": "main-5d47c86ba29167bd4fab.css",
-  "main.js": "main-5d47c86ba29167bd4fab.js"
+  "main-6c26686ed04da32a0e42.css.gz": "main-6c26686ed04da32a0e42.css.gz",
+  "main-6c26686ed04da32a0e42.js.LICENSE.txt": "main-6c26686ed04da32a0e42.js.LICENSE.txt",
+  "main-6c26686ed04da32a0e42.js.gz": "main-6c26686ed04da32a0e42.js.gz",
+  "main.css": "main-6c26686ed04da32a0e42.css",
+  "main.js": "main-6c26686ed04da32a0e42.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.10
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '5.2'
 description: |
   Motor Admin allows to create a flexible admin panel with writing less code.
   All customizations to the admin panel can be made directly in the UI without
@@ -2202,11 +2202,9 @@ files:
 - ui/dist/icons/zoom-question.svg.gz
 - ui/dist/images/layers-2x.png
 - ui/dist/images/layers.png
-- ui/dist/images/marker-icon-2x.png
 - ui/dist/images/marker-icon.png
-- ui/dist/images/marker-shadow.png
-- ui/dist/main-5d47c86ba29167bd4fab.css.gz
-- ui/dist/main-5d47c86ba29167bd4fab.js.gz
+- ui/dist/main-6c26686ed04da32a0e42.css.gz
+- ui/dist/main-6c26686ed04da32a0e42.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: