motor-admin 0.2.26 → 0.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04b8a3962312d6df6ee3d75c0ad988f5b3e2011fcc4eacaedc2263739c4b8478
-  data.tar.gz: c034290e1752bff06ea29a2ca2be696576dd46bcbb6f97a22917173e9911c5c0
+  metadata.gz: b96359678dfc2ccb50d6cebf20b99ed6efaeec885d30d383df90d2e4aa160bba
+  data.tar.gz: e0e73cb8c5d252d4398711faa4004ff33ce3d79a1508444ecebd63f440eb0c9f
 SHA512:
-  metadata.gz: 56e2836e3a8723e313a0af989ccb5aa7d8577f6c5982cdc05825ed1ec4061db90a35776e329c4bdcdf4c736405ffeb4d2268131b857bbbd1cab19bdcff34a88f
-  data.tar.gz: a05ce55494fc28825dba93861888aca1c563df270670af2e048828f35db51a0296a263d2211f772d12e5905da7da60458756ef554a1cd1fe83084f938bc6d9c7
+  metadata.gz: f2ad88a6c453842f627de489ce48f6ac8b68336e1cd19f149b76ec2e3fc0698666cc79273f6e43722b73bc3550f1e7594278234530dc474c031e5aebebee8ec6
+  data.tar.gz: 7ca8d4e20c4302f132c351514f94acfa593d97b6673106542f993d78dfc4e80c14d5c7e9e51a31e656319b521ecc19d5201e2692a9e5d701369532fc7d8fc152

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

@@ -116,13 +116,20 @@ module Motor
       end
 
       def build_table_column(column, model, default_attrs)
+        access_type =
+          if model.primary_key == column.name
+            ColumnAccessTypes::READ_ONLY
+          else
+            COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE)
+          end
+
         {
           name: column.name,
           display_name: Utils.humanize_column_name(model.human_attribute_name(column.name)),
           column_type: fetch_column_type(column, model),
           column_source: ColumnSources::TABLE,
           is_array: column.array?,
-          access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
+          access_type: access_type,
           default_value: default_attrs[column.name],
           validators: fetch_validators(model, column.name),
           reference: nil,

data/lib/motor/resources/fetch_configured_model.rb

@@ -5,11 +5,14 @@ module Motor
     module FetchConfiguredModel
       CACHE_HASH = HashWithIndifferentAccess.new
 
+      HAS_AND_BELONGS_TO_MANY_JOIN_MODEL_PREFIX = 'HABTM_'
+
       module_function
 
       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(
@@ -126,17 +129,16 @@ 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)
-        klass.reflections.each do |key, ref|
-          begin
-            next unless ref.klass
-            next if ref.klass.anonymous?
-          rescue StandardError
-            next
-          end
+        klass._reflections.each do |key, ref|
+          next unless configure_reflection_class?(ref)
 
           ref_dup = ref.dup
 
@@ -162,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
 
@@ -203,6 +211,19 @@ module Motor
         end
       end
 
+      def configure_reflection_class?(ref)
+        begin
+          return false unless ref.klass
+        rescue StandardError
+          return false
+        end
+
+        return false if ref.klass.anonymous?
+        return false if ref.klass.name.demodulize.starts_with?(HAS_AND_BELONGS_TO_MANY_JOIN_MODEL_PREFIX)
+
+        true
+      end
+
       def sti_model?(model)
         !model.superclass.abstract_class && model.columns_hash[model.inheritance_column.to_s]
       end

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.26'
+  VERSION = '0.2.30'
 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.26
+  version: 0.2.30
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 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: