motor-admin 0.2.28 → 0.2.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 890e9157c807073892957ebdab77377f9cf36b91f5e00f04fd128f5591764fd2
-  data.tar.gz: 41aa043a58ec68f713bf2a75e21464eb8bad07f000cabacd9fa364e821329414
+  metadata.gz: df2bbffc1e4cccc31af216322ef484259e7acc71741bf721dc2359bbd9267c4e
+  data.tar.gz: 8f8f8cfa03ab51e5f3ac697aaa3caf04803523689e8c240df130f2e59696b021
 SHA512:
-  metadata.gz: d5ea14f4ecd4d9deaadac11b12da0d5d689bf8256505a17b632a30a6758fb61e84650f6b997e352f77ccf91a139242aa04f81661d352cfb72087112304383756
-  data.tar.gz: a4ea641247486ee81239eda91e209e421082d8d45fe0dfffde355749f7e273b1f02964f3e668904a493610b38885da87928dbcee151a5c647c60675d84eb6e6a
+  metadata.gz: aaa0388d363a6d3a0116a6f78e6d212027152226cd89faabdcb832f622395426d7487d27a2dd3268d97d6112fb2df6175113183dd689940a9f6748ad306ca134
+  data.tar.gz: b8837f8486c38a10e86f11415ceac1ace48f5bcb113db9a97cf2f0a3cd11cc798f8b401e03015b62594d5f75e1decb7e54c1be51001c60aa0d18e8540859ec97

data/app/controllers/motor/active_storage_attachments_controller.rb

@@ -9,8 +9,8 @@ module Motor
     load_and_authorize_resource :attachment, class: 'ActiveStorage::Attachment', parent: false
 
     def create
-      if attachable?(@attachment.record)
-        @attachment.record.public_send(@attachment.name).attach(file_params)
+      if attachable?(record)
+        record.public_send(@attachment.name).attach(file_params)
 
         head :ok
       else
@@ -20,6 +20,15 @@ module Motor
 
     private
 
+    def record
+      record_pk = @attachment.record.class.primary_key
+
+      Motor::Resources::FetchConfiguredModel.call(
+        @attachment.record.class,
+        cache_key: Motor::Resource.maximum(:updated_at)
+      ).find_by(record_pk => @attachment.record[record_pk])
+    end
+
     def attachable?(record)
       record.respond_to?("#{@attachment.name}_attachment=") ||
         record.respond_to?("#{@attachment.name}_attachments=")

data/lib/motor/active_record_utils/types.rb

@@ -23,7 +23,8 @@ module Motor
         'citext' => 'string',
         'jsonb' => 'json',
         'bool' => 'boolean',
-        'timestamp' => 'datetime'
+        'timestamp' => 'datetime',
+        'timestamptz' => 'datetime'
       }.freeze
 
       module_function

data/lib/motor/resources/fetch_configured_model.rb

@@ -12,6 +12,7 @@ module Motor
       def call(model, cache_key:)
         configs = Motor::Configs::LoadFromCache.load_resources(cache_key: cache_key)
 
+        return model if model.name == 'ActiveStorage::Attachment'
         return model if configs.blank? || sti_model?(model)
 
         maybe_fetch_from_cache(
@@ -128,7 +129,11 @@ module Motor
 
         options = options.merge(config[:options] || {})
 
-        klass.has_one(config[:name].to_sym, **options.symbolize_keys)
+        if config[:model_name] == 'active_storage/attachment'
+          klass.has_one_attached config[:name].delete_suffix('_attachment').to_sym
+        else
+          klass.has_one(config[:name].to_sym, **options.symbolize_keys)
+        end
       end
 
       def configure_reflection_classes(klass, cache_key)
@@ -159,11 +164,17 @@ module Motor
 
           filters = options.delete(:filters)
 
-          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
+          define_association(klass, association[:name], options, filters)
+        end
+      end
+
+      def define_association(klass, name, options, filters)
+        if options[:class_name] == 'ActiveStorage::Attachment'
+          klass.has_many_attached name.delete_suffix('_attachments').to_sym
+        elsif filters.present?
+          klass.has_many(name.to_sym, -> { filter(filters).tap(&:arel) }, **options.symbolize_keys)
+        else
+          klass.has_many(name.to_sym, **options.symbolize_keys)
         end
       end
 

data/lib/motor/version.rb

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

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-9f6b19ff999e209e9d33.css.gz": "main-9f6b19ff999e209e9d33.css.gz",
-  "main-9f6b19ff999e209e9d33.js.LICENSE.txt": "main-9f6b19ff999e209e9d33.js.LICENSE.txt",
-  "main-9f6b19ff999e209e9d33.js.gz": "main-9f6b19ff999e209e9d33.js.gz",
-  "main.css": "main-9f6b19ff999e209e9d33.css",
-  "main.js": "main-9f6b19ff999e209e9d33.js"
+  "main-67a3a033614f741d7e27.css.gz": "main-67a3a033614f741d7e27.css.gz",
+  "main-67a3a033614f741d7e27.js.LICENSE.txt": "main-67a3a033614f741d7e27.js.LICENSE.txt",
+  "main-67a3a033614f741d7e27.js.gz": "main-67a3a033614f741d7e27.js.gz",
+  "main.css": "main-67a3a033614f741d7e27.css",
+  "main.js": "main-67a3a033614f741d7e27.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.2.29
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -1525,8 +1525,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-9f6b19ff999e209e9d33.css.gz
-- ui/dist/main-9f6b19ff999e209e9d33.js.gz
+- ui/dist/main-67a3a033614f741d7e27.css.gz
+- ui/dist/main-67a3a033614f741d7e27.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: