motor-admin 0.2.27 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd8302f343dd0ce3ccad39dd408dc90e7582fb63133cf0abfb3fa1112899cb8
-  data.tar.gz: 21dc6ca6b743b0499e8bf3b314465be503cfcc6ce789bd2653f8e278e72b38dc
+  metadata.gz: 8730558d792eeae0e0468acf367e89e7c9ff55e6fe59c64ff1b8f769fa04e554
+  data.tar.gz: 40b909df7e968eb8c26aa2e06704371ed8b4bebed4d0cf8fce26100cf64d8ad8
 SHA512:
-  metadata.gz: c277ba2eee535baf91c0959d42187e76b0aff57cb24129c1d79917fca6259c2ed2a0b5f59b9fe289dbad1877fc17d7ea3bde2678cf686b5f98ecf558fbe0b0e6
-  data.tar.gz: 3ff35c6aa910c27771f108dd9a6fbedb73efd57f5a16890ef8589fcce4d733f41b584a1a4f6e79faa9554e964e17eb2aa1ff1bc38655ed9c5acb2f9a3520e6ef
+  metadata.gz: d1259b8f633301feaef1d0d05e54a96d5c42e841769e556e1b5382c52375633d282ce502eb87829f9dc462267c1b8e4fe31ad5f6151044b1e4d2d734c422c87d
+  data.tar.gz: da7e9a7d859ebf45fc8ad8da2f8008cbf523ef6a3f53408d8cc31760113dfa7b459447184f14187934a627765995fc2ff83cb98571e7bec64d0a7b7d7d93f0ac

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/build_schema/active_storage_attachment_schema.rb

@@ -115,7 +115,7 @@ module Motor
           scopes: [],
           actions: Motor::BuildSchema::Defaults.actions.reject { |e| e[:name] == 'edit' },
           tabs: Motor::BuildSchema::Defaults.tabs,
-          visible: true
+          visible: false
         }.with_indifferent_access
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize

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)
@@ -143,9 +148,11 @@ module Motor
             ref_dup.instance_variable_set(:@klass, call(ref.klass, cache_key: cache_key))
           end
 
-          klass._reflections[key] = ref_dup
+          klass.reflections[key] = ref_dup
         end
 
+        klass._reflections = klass.reflections
+
         klass
       end
 
@@ -157,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.27'
+  VERSION = '0.2.31'
 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-bbd8f938004172b512b9.css.gz": "main-bbd8f938004172b512b9.css.gz",
+  "main-bbd8f938004172b512b9.js.LICENSE.txt": "main-bbd8f938004172b512b9.js.LICENSE.txt",
+  "main-bbd8f938004172b512b9.js.gz": "main-bbd8f938004172b512b9.js.gz",
+  "main.css": "main-bbd8f938004172b512b9.css",
+  "main.js": "main-bbd8f938004172b512b9.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.2.31
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2021-11-25 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-bbd8f938004172b512b9.css.gz
+- ui/dist/main-bbd8f938004172b512b9.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: