motor-admin 0.3.8 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ff52913a60cfabf145dad356facf20ddcd67a5d34d301805b00f035892f004f
-  data.tar.gz: 578f5f5f276856d55b9011347c5e6fe3277f8aac7827a5e919d7d87ecc6e23f9
+  metadata.gz: a029c492eb6a3f916b4797ce0e2d6e8907c64db24c628e478b18dea10ef4d72f
+  data.tar.gz: 549c7618c71983ee94a9647a4b5c781634add40f2f1e8d7a6f976bf63924fb55
 SHA512:
-  metadata.gz: d3611e7b266ee6c5f69543e6de1ea6ca9ed6aa420d7f355d3289a7cbf52c2568aec5941b98043dbc9d1ae7ce12aced943aca8bc04a95c6e67950879622ec83ff
-  data.tar.gz: b77573c1149ca48d113640a31ecfb979f46e71ae5625e2f584c2a6a2c31197d81be3a7cc73136a558903c043adca3a2f2f9d990db0fe69fd7fb130c289c70aa3
+  metadata.gz: 0acddc87b1b0721d209cfa4c66c72c7a8ec5d1f3864bdd22ed441aea26f82e7ede7c29437313b127b611add92afeb272212ebd3abab1eb0b47efa9d8c454eae5
+  data.tar.gz: e96b399b1ea44ba2a11cfa6bd112293ca1fc9acda2ebfbc3c3f240e289fc121a5e9c0b0ad3a2524bfbad8009542685852e3bd4f71dd06919bd63be39696ff9e6

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.8'
+  VERSION = '0.3.11'
 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-51ca7a4e6d0745da1aa5.css.gz": "main-51ca7a4e6d0745da1aa5.css.gz",
-  "main-51ca7a4e6d0745da1aa5.js.LICENSE.txt": "main-51ca7a4e6d0745da1aa5.js.LICENSE.txt",
-  "main-51ca7a4e6d0745da1aa5.js.gz": "main-51ca7a4e6d0745da1aa5.js.gz",
-  "main.css": "main-51ca7a4e6d0745da1aa5.css",
-  "main.js": "main-51ca7a4e6d0745da1aa5.js"
+  "main-c63ca43d4d695590334e.css.gz": "main-c63ca43d4d695590334e.css.gz",
+  "main-c63ca43d4d695590334e.js.LICENSE.txt": "main-c63ca43d4d695590334e.js.LICENSE.txt",
+  "main-c63ca43d4d695590334e.js.gz": "main-c63ca43d4d695590334e.js.gz",
+  "main.css": "main-c63ca43d4d695590334e.css",
+  "main.js": "main-c63ca43d4d695590334e.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.11
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-18 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload
@@ -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-51ca7a4e6d0745da1aa5.css.gz
-- ui/dist/main-51ca7a4e6d0745da1aa5.js.gz
+- ui/dist/main-c63ca43d4d695590334e.css.gz
+- ui/dist/main-c63ca43d4d695590334e.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: